@moccona/apicodegen 0.0.2 → 0.0.3

package/npm/index.d.cts

@@ -154,7 +154,7 @@ interface ProviderInitResult {
 
 /**
  * @file Adapter abstract class definition
- * @author [Your Name]
+ * @author wp.l
  * @description Base adapter implementation for various code generation tools
  */
 
@@ -200,7 +200,7 @@ declare abstract class Adapter {
 
 /**
  * @file Base class implementation
- * @author [Your Name]
+ * @author wp.l
  * @description Base utility class providing common methods for code generation and API handling
  */
 
@@ -314,13 +314,13 @@ declare abstract class Base {
      * @param schema - The object to check.
      * @returns - True if the object is a reference.
      */
-    static isRef(schema: any): schema is ReferenceObject;
+    static isRef(schema: unknown): schema is ReferenceObject;
 }
 
 /**
- * @file Provider abstract class.
- * This file defines the `Provider` abstract class, which serves as a base for providers responsible for parsing
- * and processing API documentation.
+ * @file Base class implementation
+ * @author wp.l
+ * @description This file defines the `Provider` abstract class, which serves as a base for providers responsible for parsing and processing API documentation.
  */
 
 /**
@@ -507,7 +507,7 @@ declare class Generator {
     static isBinarySchema(schema: SchemaObject): boolean;
     static toRequestBodyTypeNode(schema: SchemaObject): ParameterDeclaration;
     static toTypeNode(schema: SchemaObject): TypeNode;
-    static toDeclarationNode(parameters: ParameterObject[]): ParameterDeclaration;
+    static toDeclarationNodes(parameters: ParameterObject[]): ParameterDeclaration[];
     static toFormDataStatement(parameters: ParameterObject[], requestBody?: SchemaObject): Statement[];
     static bodyBlock(uri: string, method: string, parameters: ParameterObject[], requestBody: MediaTypeObject | undefined, response: MediaTypeObject | undefined, adapter: Adapter): Block;
     static schemaToStatemets(parsedDoc: ProviderInitResult, adaptor: Adapter, options: Omit<ProviderInitOptions, "docURL" | "output" | "requestOptions">): Statement[];
@@ -530,7 +530,7 @@ type apiCodeGenPluginOptions = ProviderInitOptions & {
     name: string;
     proxy?: ServerOptions["proxy"];
 };
-declare const tsc: () => Promise<void>;
+declare const tsc: (path: string) => Promise<void>;
 declare function apiCodeGenPlugin(options: apiCodeGenPluginOptions[]): PluginOption;
 
 export { Adapter, Adaptors, ArraySchemaType, type ArrayTypeSchemaObject, AxiosAdapter, Base, type CommentObject, type Comments, type EnumSchemaObject, FetchAdapter, type FetchDocRequestInit, Generator, HttpMethods, type JSONValue, type MediaTypeObject, MediaTypes, NonArraySchemaType, OpenAPIProvider, OpenAPIVersion, type OperationObject, ParameterIn, type ParameterObject, type PathObject, type PathsObject, Provider, type ProviderInitOptions, type ProviderInitResult, type ReferenceObject, type RequestBodyObject, type ResponsesObject, SchemaFormatType, type SchemaObject, SchemaType, type SingleTypeSchemaObject, SuccessHttpStatusCode, apiCodeGenPlugin, type apiCodeGenPluginOptions, codeGen, tsc };

package/npm/index.d.ts

@@ -154,7 +154,7 @@ interface ProviderInitResult {
 
 /**
  * @file Adapter abstract class definition
- * @author [Your Name]
+ * @author wp.l
  * @description Base adapter implementation for various code generation tools
  */
 
@@ -200,7 +200,7 @@ declare abstract class Adapter {
 
 /**
  * @file Base class implementation
- * @author [Your Name]
+ * @author wp.l
  * @description Base utility class providing common methods for code generation and API handling
  */
 
@@ -314,13 +314,13 @@ declare abstract class Base {
      * @param schema - The object to check.
      * @returns - True if the object is a reference.
      */
-    static isRef(schema: any): schema is ReferenceObject;
+    static isRef(schema: unknown): schema is ReferenceObject;
 }
 
 /**
- * @file Provider abstract class.
- * This file defines the `Provider` abstract class, which serves as a base for providers responsible for parsing
- * and processing API documentation.
+ * @file Base class implementation
+ * @author wp.l
+ * @description This file defines the `Provider` abstract class, which serves as a base for providers responsible for parsing and processing API documentation.
  */
 
 /**
@@ -507,7 +507,7 @@ declare class Generator {
     static isBinarySchema(schema: SchemaObject): boolean;
     static toRequestBodyTypeNode(schema: SchemaObject): ParameterDeclaration;
     static toTypeNode(schema: SchemaObject): TypeNode;
-    static toDeclarationNode(parameters: ParameterObject[]): ParameterDeclaration;
+    static toDeclarationNodes(parameters: ParameterObject[]): ParameterDeclaration[];
     static toFormDataStatement(parameters: ParameterObject[], requestBody?: SchemaObject): Statement[];
     static bodyBlock(uri: string, method: string, parameters: ParameterObject[], requestBody: MediaTypeObject | undefined, response: MediaTypeObject | undefined, adapter: Adapter): Block;
     static schemaToStatemets(parsedDoc: ProviderInitResult, adaptor: Adapter, options: Omit<ProviderInitOptions, "docURL" | "output" | "requestOptions">): Statement[];
@@ -530,7 +530,7 @@ type apiCodeGenPluginOptions = ProviderInitOptions & {
     name: string;
     proxy?: ServerOptions["proxy"];
 };
-declare const tsc: () => Promise<void>;
+declare const tsc: (path: string) => Promise<void>;
 declare function apiCodeGenPlugin(options: apiCodeGenPluginOptions[]): PluginOption;
 
 export { Adapter, Adaptors, ArraySchemaType, type ArrayTypeSchemaObject, AxiosAdapter, Base, type CommentObject, type Comments, type EnumSchemaObject, FetchAdapter, type FetchDocRequestInit, Generator, HttpMethods, type JSONValue, type MediaTypeObject, MediaTypes, NonArraySchemaType, OpenAPIProvider, OpenAPIVersion, type OperationObject, ParameterIn, type ParameterObject, type PathObject, type PathsObject, Provider, type ProviderInitOptions, type ProviderInitResult, type ReferenceObject, type RequestBodyObject, type ResponsesObject, SchemaFormatType, type SchemaObject, SchemaType, type SingleTypeSchemaObject, SuccessHttpStatusCode, apiCodeGenPlugin, type apiCodeGenPluginOptions, codeGen, tsc };

package/npm/index.js

@@ -255,19 +255,24 @@ var Base = class _Base {
    */
   static async fetchDoc(url, requestInit = {}) {
     const agent = new Agent({
-      connect: {
-        rejectUnauthorized: false
-      }
+      connect: { rejectUnauthorized: false }
+    });
+    const { body, statusCode } = await 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 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)}`
+      );
     }
   }
   /**
@@ -276,12 +281,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.
@@ -316,17 +320,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.
@@ -343,7 +351,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";
   }
 };
 
@@ -613,24 +621,24 @@ var Generator = class _Generator {
     }
     return t.createToken(SyntaxKind.UnknownKeyword);
   }
-  static toDeclarationNode(parameters) {
+  static toDeclarationNodes(parameters) {
     const objectElements = [];
     const typeObjectElements = [];
+    const refParameters = [];
     for (const parameter of parameters) {
       if (parameter.ref) {
-        t.createParameterDeclaration(
-          void 0,
-          void 0,
-          t.createIdentifier(
-            Base.camelCase(Base.normalize(Base.ref2name(parameter.ref)))
-          ),
-          void 0,
-          t.createTypeReferenceNode(
-            t.createIdentifier(
-              Base.upperCamelCase(Base.normalize(Base.ref2name(parameter.ref)))
-            )
-          ),
-          void 0
+        const refName = Base.ref2name(parameter.ref);
+        refParameters.push(
+          t.createParameterDeclaration(
+            void 0,
+            void 0,
+            t.createIdentifier(Base.camelCase(Base.normalize(refName))),
+            void 0,
+            t.createTypeReferenceNode(
+              t.createIdentifier(Base.upperCamelCase(Base.normalize(refName)))
+            ),
+            void 0
+          )
         );
       } else {
         const { name, schema, required } = parameter;
@@ -651,14 +659,18 @@ var Generator = class _Generator {
         );
       }
     }
-    return t.createParameterDeclaration(
-      void 0,
-      void 0,
-      t.createObjectBindingPattern(objectElements),
-      void 0,
-      t.createTypeLiteralNode(typeObjectElements),
-      void 0
-    );
+    if (objectElements.length > 0) {
+      const objectParam = t.createParameterDeclaration(
+        void 0,
+        void 0,
+        t.createObjectBindingPattern(objectElements),
+        void 0,
+        t.createTypeLiteralNode(typeObjectElements),
+        void 0
+      );
+      return [objectParam, ...refParameters];
+    }
+    return refParameters;
   }
   static toFormDataStatement(parameters, requestBody) {
     const statements = [];
@@ -912,8 +924,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(
@@ -1033,7 +1045,6 @@ var AxiosAdapter = class extends Adapter {
             )
           ) : []
         ).concat(
-          // Add body if needed
           shouldUseFormData || inBody.length > 0 || requestBody?.schema ? t2.createPropertyAssignment(
             t2.createIdentifier(adapter.bodyFieldName),
             shouldUseFormData ? t2.createIdentifier("fd") : inBody.length > 0 || requestBody?.schema && !Generator.isBinarySchema(requestBody.schema) ? t2.createIdentifier("req") : t2.createIdentifier("req")
@@ -1119,7 +1130,6 @@ var FetchAdapter = class extends Adapter {
             )
           ) : []
         ).concat(
-          // Add body if needed
           shouldUseFormData || inBody.length > 0 || requestBody?.schema ? t3.createPropertyAssignment(
             t3.createIdentifier(adapter.bodyFieldName),
             shouldUseFormData ? t3.createIdentifier("fd") : inBody.length > 0 || requestBody?.schema && !Generator.isBinarySchema(requestBody.schema) ? t3.createCallExpression(
@@ -1573,7 +1583,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);
   }
@@ -1582,7 +1596,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,
@@ -1631,7 +1652,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) => ({
@@ -1644,7 +1669,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) => ({
@@ -2268,8 +2297,8 @@ import { execaCommand } from "execa";
 import fs from "fs-extra";
 var PLUGIN_NAME = "apiCodeGen";
 var logger2 = createScopedLogger2("api-codegen-vite-plugin");
-var tsc = async () => {
-  await execaCommand("npx tsc -b");
+var tsc = async (path) => {
+  await execaCommand(`npx tsc ${path} --noEmit`);
 };
 function apiCodeGenPlugin(options) {
   let firstRun = true;
@@ -2287,9 +2316,13 @@ function apiCodeGenPlugin(options) {
             const code = await codeGen(codeGenInitOptions);
             await fs.createFile(codeGenInitOptions.output);
             await fs.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_,
@@ -2299,11 +2332,6 @@ function apiCodeGenPlugin(options) {
         Promise.resolve({})
       );
       logger2.info("-------> api codegen finished <--------");
-      try {
-        await tsc();
-      } catch (error) {
-        logger2.error(error);
-      }
       return {
         ...config,
         server: {