swgto-ts 3.2.0 → 3.3.0

package/dist/{chunk-4K4VW2PJ.js → chunk-5YE6QJXH.js}

@@ -553,7 +553,7 @@ function formatDocLines(lines) {
   }
   return ["/**", ...lines.map((line) => ` * ${line}`), " */"].join("\n");
 }
-function buildSchemaDoc(schema) {
+function buildSchemaDocLines(schema) {
   const lines = [];
   if (schema?.description) {
     lines.push(schema.description);
@@ -561,7 +561,10 @@ function buildSchemaDoc(schema) {
   if (schema && schema.example !== void 0) {
     lines.push(`@example ${JSON.stringify(schema.example)}`);
   }
-  return formatDocLines(lines);
+  return lines;
+}
+function buildSchemaDoc(schema) {
+  return formatDocLines(buildSchemaDocLines(schema));
 }
 function jsdocToInline(doc, indent) {
   return doc.split("\n").filter((line) => {
@@ -616,6 +619,24 @@ function renderComponentSchemas(document) {
 function toJSDocType(typeText) {
   return typeText.replace(/;\s*/g, ", ").replace(/,\s*\}/g, " }");
 }
+function renderJsTypedef(name, schema) {
+  const typed = schema;
+  const properties = Object.entries(typed?.properties ?? {});
+  if (properties.length && (typed?.type === "object" || typed?.properties)) {
+    const requiredSet = new Set(typed?.required ?? []);
+    const lines = [...buildSchemaDocLines(typed), `@typedef {Object} ${name}`];
+    for (const [key, value] of properties) {
+      const propName = toTypePropertyName(key);
+      const fieldDoc = buildSchemaDocLines(value).join(" ");
+      const field = requiredSet.has(key) ? propName : `[${propName}]`;
+      lines.push(`@property {${toJSDocType(schemaToTs(value))}} ${field}${fieldDoc ? ` - ${fieldDoc}` : ""}`);
+    }
+    return formatDocLines(lines);
+  }
+  const doc = buildSchemaDocLines(typed);
+  const type = toJSDocType(schemaToTs(schema));
+  return doc.length ? formatDocLines([...doc, `@typedef {${type}} ${name}`]) : `/** @typedef {${type}} ${name} */`;
+}
 function generateTypesFile(documentMap, operations, config) {
   if (config.outputType === "js") {
     const parts2 = [
@@ -627,12 +648,12 @@ function generateTypesFile(documentMap, operations, config) {
       const moduleName = config.moduleName?.(docUrl) ?? "services";
       parts2.push(`// Types from ${moduleName}`);
       for (const [name, schema] of Object.entries(document.components?.schemas ?? {})) {
-        parts2.push(`/** @typedef {${toJSDocType(schemaToTs(schema))}} ${sanitizeSchemaTypeName(name)} */`);
+        parts2.push(renderJsTypedef(sanitizeSchemaTypeName(name), schema));
       }
     }
     for (const operation of operations) {
       if (operation.responseTypeName) {
-        parts2.push(`/** @typedef {${toJSDocType(schemaToTs(operation.responseSchema))}} ${operation.responseTypeName} */`);
+        parts2.push(renderJsTypedef(operation.responseTypeName, operation.responseSchema));
       }
     }
     parts2.push("export {};");

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   generateFromConfig
-} from "./chunk-4K4VW2PJ.js";
+} from "./chunk-5YE6QJXH.js";
 import "./chunk-EAGONRXV.js";
 
 // src/cli.ts

package/dist/index.js

@@ -1,6 +1,6 @@
 import {
   generateFromConfig
-} from "./chunk-4K4VW2PJ.js";
+} from "./chunk-5YE6QJXH.js";
 import "./chunk-EAGONRXV.js";
 export {
   generateFromConfig

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swgto-ts",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "description": "Generate API request files from OpenAPI 3.x documents.",
   "license": "MIT",
   "type": "module",