@moccona/apicodegen 0.0.2 → 0.0.3

package/npm/index.cjs

@@ -310,19 +310,24 @@ var Base = class _Base {
    */
   static async fetchDoc(url, requestInit = {}) {
     const agent = new import_undici.Agent({
-      connect: {
-        rejectUnauthorized: false
-      }
+      connect: { rejectUnauthorized: false }
+    });
+    const { body, statusCode } = await (0, import_undici.request)(url, {
+      method: "GET",
+      dispatcher: agent,
+      ...requestInit
     });
+    if (statusCode >= 400) {
+      throw new Error(
+        `Failed to fetch OpenAPI documentation from ${url}: HTTP ${statusCode}`
+      );
+    }
     try {
-      const { body } = await (0, import_undici.request)(url, {
-        method: "GET",
-        dispatcher: agent,
-        ...requestInit
-      });
       return body.json();
     } catch (error) {
-      throw error;
+      throw new Error(
+        `Failed to parse JSON response from ${url}: ${error instanceof Error ? error.message : String(error)}`
+      );
     }
   }
   /**
@@ -331,12 +336,11 @@ var Base = class _Base {
    * @returns - The matched MediaTypes or null.
    */
   static getMediaType(mediaType) {
-    for (const type in Object.values(MediaTypes)) {
-      if (new RegExp(type).test(mediaType)) {
-        return type;
-      }
-    }
-    return;
+    const mediaTypeValues = Object.values(MediaTypes);
+    const found = mediaTypeValues.find(
+      (type) => mediaType.includes(type)
+    );
+    return found;
   }
   /**
    * Checks if a schema is a valid enum type that isn't boolean.
@@ -371,17 +375,21 @@ var Base = class _Base {
    * @returns - Array of unique enum schemas.
    */
   static uniqueEnums(enums) {
-    const uniqueEnums_ = [];
-    for (const enumObject of enums) {
-      if (uniqueEnums_.length === 0) {
-        uniqueEnums_.push(enumObject);
-      } else {
-        if (!uniqueEnums_.some((a) => this.isSameEnum(a, enumObject))) {
-          uniqueEnums_.push(enumObject);
+    const enumMap = /* @__PURE__ */ new Map();
+    for (const e of enums) {
+      const existing = enumMap.get(e.name);
+      if (existing) {
+        for (const value of e.enum) {
+          existing.add(value);
         }
+      } else {
+        enumMap.set(e.name, new Set(e.enum));
       }
     }
-    return uniqueEnums_;
+    return Array.from(enumMap.entries()).map(([name, values]) => ({
+      name,
+      enum: Array.from(values)
+    }));
   }
   /**
    * Finds the first occurrence of a matching enum schema in an array.
@@ -398,7 +406,7 @@ var Base = class _Base {
    * @returns - True if the object is a reference.
    */
   static isRef(schema) {
-    return "$ref" in schema && typeof schema.$ref === "string";
+    return typeof schema === "object" && schema !== null && "$ref" in schema && typeof schema.$ref === "string";
   }
 };
 
@@ -662,24 +670,24 @@ var Generator = class _Generator {
     }
     return import_typescript.factory.createToken(import_typescript.SyntaxKind.UnknownKeyword);
   }
-  static toDeclarationNode(parameters) {
+  static toDeclarationNodes(parameters) {
     const objectElements = [];
     const typeObjectElements = [];
+    const refParameters = [];
     for (const parameter of parameters) {
       if (parameter.ref) {
-        import_typescript.factory.createParameterDeclaration(
-          void 0,
-          void 0,
-          import_typescript.factory.createIdentifier(
-            Base.camelCase(Base.normalize(Base.ref2name(parameter.ref)))
-          ),
-          void 0,
-          import_typescript.factory.createTypeReferenceNode(
-            import_typescript.factory.createIdentifier(
-              Base.upperCamelCase(Base.normalize(Base.ref2name(parameter.ref)))
-            )
-          ),
-          void 0
+        const refName = Base.ref2name(parameter.ref);
+        refParameters.push(
+          import_typescript.factory.createParameterDeclaration(
+            void 0,
+            void 0,
+            import_typescript.factory.createIdentifier(Base.camelCase(Base.normalize(refName))),
+            void 0,
+            import_typescript.factory.createTypeReferenceNode(
+              import_typescript.factory.createIdentifier(Base.upperCamelCase(Base.normalize(refName)))
+            ),
+            void 0
+          )
         );
       } else {
         const { name, schema, required } = parameter;
@@ -700,14 +708,18 @@ var Generator = class _Generator {
         );
       }
     }
-    return import_typescript.factory.createParameterDeclaration(
-      void 0,
-      void 0,
-      import_typescript.factory.createObjectBindingPattern(objectElements),
-      void 0,
-      import_typescript.factory.createTypeLiteralNode(typeObjectElements),
-      void 0
-    );
+    if (objectElements.length > 0) {
+      const objectParam = import_typescript.factory.createParameterDeclaration(
+        void 0,
+        void 0,
+        import_typescript.factory.createObjectBindingPattern(objectElements),
+        void 0,
+        import_typescript.factory.createTypeLiteralNode(typeObjectElements),
+        void 0
+      );
+      return [objectParam, ...refParameters];
+    }
+    return refParameters;
   }
   static toFormDataStatement(parameters, requestBody) {
     const statements = [];
@@ -961,8 +973,8 @@ var Generator = class _Generator {
             Base.pathToFnName(uri, method, operationId) + (shouldAddExtraMethodNameSuffix ? Base.capitalize(req.type.split("/")[1]) : ""),
             void 0,
             [
-              parameters.length > 0 ? _Generator.toDeclarationNode(parameters) : void 0,
-              req?.schema ? _Generator.toRequestBodyTypeNode(req.schema) : void 0
+              ...parameters.length > 0 ? _Generator.toDeclarationNodes(parameters) : [],
+              ...req?.schema ? [_Generator.toRequestBodyTypeNode(req.schema)] : []
             ].filter(Boolean),
             void 0,
             this.bodyBlock(
@@ -1082,7 +1094,6 @@ var AxiosAdapter = class extends Adapter {
             )
           ) : []
         ).concat(
-          // Add body if needed
           shouldUseFormData || inBody.length > 0 || requestBody?.schema ? import_typescript2.factory.createPropertyAssignment(
             import_typescript2.factory.createIdentifier(adapter.bodyFieldName),
             shouldUseFormData ? import_typescript2.factory.createIdentifier("fd") : inBody.length > 0 || requestBody?.schema && !Generator.isBinarySchema(requestBody.schema) ? import_typescript2.factory.createIdentifier("req") : import_typescript2.factory.createIdentifier("req")
@@ -1168,7 +1179,6 @@ var FetchAdapter = class extends Adapter {
             )
           ) : []
         ).concat(
-          // Add body if needed
           shouldUseFormData || inBody.length > 0 || requestBody?.schema ? import_typescript3.factory.createPropertyAssignment(
             import_typescript3.factory.createIdentifier(adapter.bodyFieldName),
             shouldUseFormData ? import_typescript3.factory.createIdentifier("fd") : inBody.length > 0 || requestBody?.schema && !Generator.isBinarySchema(requestBody.schema) ? import_typescript3.factory.createCallExpression(
@@ -1622,7 +1632,11 @@ var V3 = class {
           type: upLevelSchemaKey + refName
         };
       }
-      schema = this.doc.components?.schemas?.[Base.ref2name(schema.$ref, this.doc)];
+      const resolvedSchema = this.doc.components?.schemas?.[Base.ref2name(schema.$ref, this.doc)];
+      if (!resolvedSchema) {
+        return { type: "unknown" };
+      }
+      schema = resolvedSchema;
     }
     return this.toBaseSchema(schema, enums, "", upLevelSchemaKey + refName);
   }
@@ -1631,7 +1645,14 @@ var V3 = class {
    */
   getParameterByRef(schema, enums = [], upLevelSchemaKey = "") {
     if (Base.isRef(schema)) {
-      schema = this.doc.components?.parameters?.[Base.ref2name(schema.$ref, this.doc)];
+      const resolvedSchema = this.doc.components?.parameters?.[Base.ref2name(schema.$ref, this.doc)];
+      if (!resolvedSchema) {
+        return {
+          name: "unknown",
+          in: "query"
+        };
+      }
+      schema = resolvedSchema;
     }
     const {
       name,
@@ -1680,7 +1701,11 @@ var V3 = class {
    */
   getResponseByRef(schema) {
     if (Base.isRef(schema)) {
-      schema = this.doc.components?.responses?.[Base.ref2name(schema.$ref, this.doc)];
+      const resolvedSchema = this.doc.components?.responses?.[Base.ref2name(schema.$ref, this.doc)];
+      if (!resolvedSchema) {
+        return [];
+      }
+      schema = resolvedSchema;
     }
     const { content = {} } = schema;
     return Object.keys(content).map((c) => ({
@@ -1693,7 +1718,11 @@ var V3 = class {
    */
   getRequestBodyByRef(schema, enums = []) {
     if (Base.isRef(schema)) {
-      schema = this.doc.components?.requestBodies?.[Base.ref2name(schema.$ref, this.doc)];
+      const resolvedSchema = this.doc.components?.requestBodies?.[Base.ref2name(schema.$ref, this.doc)];
+      if (!resolvedSchema) {
+        return [];
+      }
+      schema = resolvedSchema;
     }
     const { content = {} } = schema;
     return Object.keys(content).map((c) => ({
@@ -2317,8 +2346,8 @@ var import_execa = require("execa");
 var import_fs_extra = __toESM(require("fs-extra"), 1);
 var PLUGIN_NAME = "apiCodeGen";
 var logger2 = (0, import_logger2.createScopedLogger)("api-codegen-vite-plugin");
-var tsc = async () => {
-  await (0, import_execa.execaCommand)("npx tsc -b");
+var tsc = async (path) => {
+  await (0, import_execa.execaCommand)(`npx tsc ${path} --noEmit`);
 };
 function apiCodeGenPlugin(options) {
   let firstRun = true;
@@ -2336,9 +2365,13 @@ function apiCodeGenPlugin(options) {
             const code = await codeGen(codeGenInitOptions);
             await import_fs_extra.default.createFile(codeGenInitOptions.output);
             await import_fs_extra.default.writeFile(codeGenInitOptions.output, code);
+            try {
+              await tsc(codeGenInitOptions.output);
+            } catch (error) {
+              logger2.error(error);
+            }
           } catch (error) {
-            logger2.error(`Failed to generate api ${name}`);
-            console.error(error);
+            logger2.error(`Failed to generate api ${name}: ${error}`);
           }
           return {
             ...proxies_,
@@ -2348,11 +2381,6 @@ function apiCodeGenPlugin(options) {
         Promise.resolve({})
       );
       logger2.info("-------> api codegen finished <--------");
-      try {
-        await tsc();
-      } catch (error) {
-        logger2.error(error);
-      }
       return {
         ...config,
         server: {