take empty properties into account

dylibso · Jul 4, 2024 · 82061a5 · 82061a5
1 parent 7c14d94
commit 82061a5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -29,6 +29,11 @@ function toTypeScriptType(property: Property) {
   }
 }
 
+function propertyIsEmpty(p: Property | null) {
+  if (!p) return true
+  return !p.type && !p.$ref
+}
+
 function propertyHasComment(p: Property | null) {
   if (!p) return false
   return p.description || p.$ref
@@ -56,6 +61,7 @@ export function render() {
     ...getContext(),
     toTypeScriptType,
     propertyHasComment,
+    propertyIsEmpty,
     exportHasComment,
     formatBlockComment,
     formatComment,

diff --git a/template/src/index.ts.ejs b/template/src/index.ts.ejs
@@ -9,7 +9,7 @@ import {
 
 <% schema.exports.forEach(ex => { -%>
 export function <%= ex.name %>(): number {
-  <% if (ex.input) { -%>
+  <% if (!propertyIsEmpty(ex.input)) { -%>
     <% if (ex.input.contentType === 'application/json') { -%>
       const input: <%= toTypeScriptType(ex.input) %> = JSON.parse(Host.inputString())
     <% } else if (ex.input.type === 'string') { -%>
@@ -18,20 +18,20 @@ export function <%= ex.name %>(): number {
       const input: ArrayBufferLike = Host.inputBytes()
     <% } -%>
 
-    <% if (ex.output) { -%>
+    <% if (!propertyIsEmpty(ex.output)) { -%>
       const output = main.<%= ex.name %>Impl(input)
     <% } else { -%>
       main.<%= ex.name %>Impl(input)
     <% } -%>
   <% } else { -%>
-    <% if (ex.output) { -%>
+    <% if (!propertyIsEmpty(ex.output)) { -%>
       const output = main.<%= ex.name %>Impl()
     <% } else { -%>
       main.<%= ex.name %>Impl()
     <% } -%>
   <% } -%>
 
-  <% if (ex.output) { -%>
+  <% if (!propertyIsEmpty(ex.output)) { -%>
     <% if (ex.output.contentType === 'application/json') { -%>
       Host.outputString(JSON.stringify(output))
     <% } else if (ex.output.type === 'string') { -%>

diff --git a/template/src/main.ts.ejs b/template/src/main.ts.ejs
@@ -27,7 +27,7 @@ import {
 <% } -%>
  */
 <% -%>
-export function <%= ex.name %>Impl(<%= ex.input ? `input: ${toTypeScriptType(ex.input)}` : "" %>)<%= ex.output ? `:${toTypeScriptType(ex.output)}` : "" %> {
+export function <%= ex.name %>Impl(<%= propertyIsEmpty(ex.input) ? "" : `input: ${toTypeScriptType(ex.input)}` %>)<%= propertyIsEmpty(ex.output) ? "" : `:${toTypeScriptType(ex.output)}` %> {
   // TODO: fill out your implementation here
   throw new Error("Function not implemented.");
 }