api-core-lib 12.0.51 → 12.0.52

package/dist/cli.cjs

@@ -75,15 +75,19 @@ function getInputOutputTypes(endpoint) {
   const responseSchema = successResponse?.content?.["application/json"]?.schema;
   let outputType = "unknown";
   if (responseSchema) {
-    if (responseSchema.$ref) {
+    if (responseSchema.title) {
+      outputType = responseSchema.title.replace(/\[\]/g, "") + (responseSchema.type === "array" ? "[]" : "");
+    } else if (responseSchema.$ref) {
       outputType = refToTypeName(responseSchema.$ref);
-    } else if (responseSchema.type === "array" && responseSchema.items?.$ref) {
-      outputType = `${refToTypeName(responseSchema.items.$ref)}[]`;
+    } else if (responseSchema.type === "array" && (responseSchema.items?.title || responseSchema.items?.$ref)) {
+      outputType = (responseSchema.items.title || refToTypeName(responseSchema.items.$ref)) + "[]";
     }
   }
   let inputType = "undefined";
   if (requestBody) {
-    if (requestBody.$ref) {
+    if (requestBody.title) {
+      inputType = requestBody.title;
+    } else if (requestBody.$ref) {
       inputType = refToTypeName(requestBody.$ref);
     } else if (requestBody.type === "object") {
       inputType = "any";
@@ -93,24 +97,6 @@ function getInputOutputTypes(endpoint) {
   }
   return { inputType, outputType };
 }
-function getAllReferencedTypes(initialTypes, allSchemas) {
-  const finalTypes = new Set(initialTypes);
-  const queue = [...initialTypes];
-  while (queue.length > 0) {
-    const typeName = queue.shift();
-    if (!typeName || !allSchemas[typeName]) continue;
-    const schemaString = JSON.stringify(allSchemas[typeName]);
-    const references = schemaString.match(/"\$ref":\s*"#\/components\/schemas\/([^"]+)"/g) || [];
-    for (const ref of references) {
-      const referencedTypeName = ref.split("/").pop()?.replace(/"/g, "") || "";
-      if (referencedTypeName && !finalTypes.has(referencedTypeName)) {
-        finalTypes.add(referencedTypeName);
-        queue.push(referencedTypeName);
-      }
-    }
-  }
-  return finalTypes;
-}
 function sanitizeTagName(tagName) {
   return tagName.replace(/[^a-zA-Z0-9]/g, "").replace(/Central|Tenant/g, "");
 }
@@ -133,16 +119,16 @@ async function generateModuleFiles(moduleName, moduleData, spec, outputDir) {
   if (!import_fs.default.existsSync(moduleFolderPath)) {
     import_fs.default.mkdirSync(moduleFolderPath, { recursive: true });
   }
-  const allTypeNames = getAllReferencedTypes(moduleData.types, spec.components.schemas);
-  await generateTypesFile(moduleFolderPath, allTypeNames, spec);
-  await generateConfigFile(moduleFolderPath, moduleName, moduleData, allTypeNames);
+  await generateTypesFile(moduleFolderPath, moduleData.types, spec);
+  await generateConfigFile(moduleFolderPath, moduleName, moduleData, moduleData.types);
 }
-async function generateTypesFile(moduleFolderPath, allTypeNames, spec) {
+async function generateTypesFile(moduleFolderPath, typeNames, spec) {
   let typesContent = `// This file is auto-generated by the API generator. Do not edit.
 
 `;
-  for (const typeName of allTypeNames) {
-    const schema = spec.components?.schemas?.[typeName];
+  const allSchemas = spec.components?.schemas || {};
+  for (const typeName of typeNames) {
+    const schema = allSchemas[typeName];
     if (schema) {
       const tsType = await (0, import_json_schema_to_typescript.compile)(schema, typeName, {
         bannerComment: "",
@@ -163,8 +149,8 @@ async function generateTypesFile(moduleFolderPath, allTypeNames, spec) {
   const typesFilePath = import_path.default.join(moduleFolderPath, "types.ts");
   import_fs.default.writeFileSync(typesFilePath, typesContent);
 }
-async function generateConfigFile(moduleFolderPath, moduleName, moduleData, allTypeNames) {
-  const typeNamesArray = [...allTypeNames];
+async function generateConfigFile(moduleFolderPath, moduleName, moduleData, typeNames) {
+  const typeNamesArray = [...typeNames];
   const typesImportStatement = typeNamesArray.length > 0 ? `import type { ${typeNamesArray.join(", ")} } from './types';` : ``;
   const actionsTypeParts = Object.entries(moduleData.actions).map(
     ([actionName, actionData]) => `  ${actionName}: ActionConfigModule<${actionData._inputType}, ${actionData._outputType}>;`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api-core-lib",
-  "version": "12.0.51",
+  "version": "12.0.52",
   "description": "A flexible and powerful API client library for modern web applications.",
   "type": "module",
   "exports": {