@moccona/apicodegen 0.0.1 → 0.0.2

package/npm/index.d.cts

@@ -239,7 +239,7 @@ declare abstract class Base {
      * @param [operationId] - Unique identifier for the operation.
      * @returns - The generated function name.
      */
-    static pathToFnName(path: string, method?: string, operationId?: string): string;
+    static pathToFnName(path: string, method?: string, _operationId?: string): string;
     /**
      * Normalizes a string by replacing special characters and avoiding TypeScript keywords.
      * @param text - Input text to normalize.
@@ -488,7 +488,7 @@ declare class Generator {
      * @param path - The base path string containing placeholders.
      * @param parameters - Array of parameter objects defining the parameters.
      * @param basePath - Optional base path to prepend (default: "").
-     * @returns A TypeScript template expression node.
+     * @returns A TypeScript template expressi
      */
     static toUrlTemplate(path: string, parameters: ParameterObject[], basePath?: string): typescript.NoSubstitutionTemplateLiteral | typescript.TemplateExpression;
     /**

package/npm/index.d.ts

@@ -239,7 +239,7 @@ declare abstract class Base {
      * @param [operationId] - Unique identifier for the operation.
      * @returns - The generated function name.
      */
-    static pathToFnName(path: string, method?: string, operationId?: string): string;
+    static pathToFnName(path: string, method?: string, _operationId?: string): string;
     /**
      * Normalizes a string by replacing special characters and avoiding TypeScript keywords.
      * @param text - Input text to normalize.
@@ -488,7 +488,7 @@ declare class Generator {
      * @param path - The base path string containing placeholders.
      * @param parameters - Array of parameter objects defining the parameters.
      * @param basePath - Optional base path to prepend (default: "").
-     * @returns A TypeScript template expression node.
+     * @returns A TypeScript template expressi
      */
     static toUrlTemplate(path: string, parameters: ParameterObject[], basePath?: string): typescript.NoSubstitutionTemplateLiteral | typescript.TemplateExpression;
     /**

package/npm/index.js

@@ -205,10 +205,10 @@ var Base = class _Base {
    * @param [operationId] - Unique identifier for the operation.
    * @returns - The generated function name.
    */
-  static pathToFnName(path, method, operationId) {
-    const name = this.camelCase(this.normalize(path));
+  static pathToFnName(path, method, _operationId = "") {
+    const name = this.normalize(this.camelCase(this.normalize(path)));
     const suffix = method ? this.capitalize(this.upperCamelCase(`using_${method}`)) : "";
-    return (operationId ? this.camelCase(this.normalize(operationId)) : name) + suffix;
+    return name + suffix;
   }
   /**
    * Normalizes a string by replacing special characters and avoiding TypeScript keywords.
@@ -219,7 +219,7 @@ var Base = class _Base {
     if (typescriptKeywords.has(text)) {
       text += "_";
     }
-    return text.replace(/[/\-_{}():\s`,*<>$]/gm, "_").replaceAll("...", "");
+    return text.replace(/[/\-_{}():\s`,*<>$#.]/gm, "_").replace(/^\d./gm, "").replaceAll("...", "");
   }
   /**
    * Capitalizes the first character of a string.
@@ -435,7 +435,7 @@ var Generator = class _Generator {
    * @param path - The base path string containing placeholders.
    * @param parameters - Array of parameter objects defining the parameters.
    * @param basePath - Optional base path to prepend (default: "").
-   * @returns A TypeScript template expression node.
+   * @returns A TypeScript template expressi
    */
   static toUrlTemplate(path, parameters, basePath = "") {
     const queryParameters = parameters.filter(
@@ -443,7 +443,7 @@ var Generator = class _Generator {
     );
     if (queryParameters.length > 0) {
       const queryString = queryParameters.map(
-        (qp, index) => `${index === 0 ? "?" : "&"}${encodeURIComponent(qp.name)}={${qp.name}}`
+        (qp, index) => `${index === 0 ? "?" : "&"}${encodeURIComponent(qp.name)}={${Base.camelCase(Base.normalize(qp.name))}}`
       ).join("");
       path += queryString;
     }
@@ -558,7 +558,7 @@ var Generator = class _Generator {
       case "boolean" /* boolean */:
         return t.createToken(SyntaxKind.BooleanKeyword);
       case "file" /* file */:
-        return t.createTypeReferenceNode(t.createIdentifier("File"));
+        return t.createTypeReferenceNode(t.createIdentifier("Blob"));
       default:
         const {
           format: format2,
@@ -577,7 +577,7 @@ var Generator = class _Generator {
             return t.createToken(SyntaxKind.BooleanKeyword);
           case "blob" /* blob */:
           case "binary" /* binary */:
-            return t.createTypeReferenceNode(t.createIdentifier("File"));
+            return t.createTypeReferenceNode(t.createIdentifier("Blob"));
           default:
         }
         if (enum_) {
@@ -601,13 +601,13 @@ var Generator = class _Generator {
           );
         }
         if (allOf) {
-          return t.createUnionTypeNode(
+          return t.createIntersectionTypeNode(
             allOf.map((schema2) => this.toTypeNode(schema2))
           );
         }
         if (type2 && typeof type2 === "string") {
           return t.createTypeReferenceNode(
-            type2 !== "unknown" ? t.createIdentifier(Base.upperCamelCase(type2)) : type2
+            type2 !== "unknown" && type2 !== "null" ? t.createIdentifier(Base.upperCamelCase(type2)) : type2
           );
         }
     }
@@ -681,16 +681,11 @@ var Generator = class _Generator {
       )
     );
     statements.push(fdDeclaration);
-    parameters.filter(
-      (parameter) => parameter.ref !== void 0 && (parameter.in === "formData" /* formData */ || parameter.schema && this.isBinarySchema(parameter.schema))
-    ).forEach((parameter) => {
+    parameters.forEach((parameter) => {
       statements.push(
         t.createExpressionStatement(
           t.createBinaryExpression(
-            t.createElementAccessExpression(
-              t.createIdentifier("req"),
-              t.createStringLiteral(parameter.name)
-            ),
+            t.createIdentifier(parameter.name),
             t.createToken(SyntaxKind.AmpersandAmpersandToken),
             t.createCallExpression(
               t.createPropertyAccessExpression(
@@ -734,7 +729,13 @@ var Generator = class _Generator {
                       t.createStringLiteral(key),
                       t.createIdentifier("file"),
                       t.createPropertyAccessExpression(
-                        t.createIdentifier("file"),
+                        t.createAsExpression(
+                          t.createIdentifier("file"),
+                          t.createTypeReferenceNode(
+                            t.createIdentifier("File"),
+                            void 0
+                          )
+                        ),
                         t.createIdentifier("name")
                       )
                     ]
@@ -819,25 +820,28 @@ var Generator = class _Generator {
     );
     const shouldParseResponseToJSON = "application/json" === response?.type;
     const isRequestBodyBinary = requestBody?.schema && requestBody.schema.type === "array" /* array */ && this.isBinarySchema(requestBody.schema);
-    const inFormDataParameters = parameters.filter(
-      (p) => p.in === "formData" /* formData */
+    const parametersShouldPutInFormData = parameters.filter(
+      (p) => p.in === "formData" /* formData */ || p.schema && this.isBinarySchema(p.schema)
     );
-    const notInFormDataParameters = parameters.filter(
-      (p) => p.in !== "formData" /* formData */
+    const parametersShouldNotPutInFormData = parameters.filter(
+      (p) => !parametersShouldPutInFormData.includes(p)
     );
-    const isRequestBodyContainsBinary = requestBody?.schema && "properties" in requestBody.schema && Object.values(requestBody.schema.properties).some(
+    const isRequestBodyContainsBinary = requestBody?.schema && "properties" in requestBody.schema && Object.values(requestBody.schema?.properties ?? {}).some(
       (p) => this.isBinarySchema(p)
     );
     const hasBinaryInParameters = parameters.some(
       (p) => p?.schema && this.isBinarySchema(p.schema)
     );
-    const shouldPutParametersOrBodyInFormData = isFormDataRequest || isRequestBodyBinary || hasBinaryInParameters || isRequestBodyContainsBinary || inFormDataParameters.length > 0;
+    const shouldPutParametersOrBodyInFormData = isFormDataRequest || isRequestBodyBinary || hasBinaryInParameters || isRequestBodyContainsBinary || parametersShouldPutInFormData.length > 0;
     return t.createBlock([
-      ...shouldPutParametersOrBodyInFormData ? this.toFormDataStatement(inFormDataParameters, requestBody?.schema) : [],
+      ...shouldPutParametersOrBodyInFormData ? this.toFormDataStatement(
+        parametersShouldPutInFormData,
+        requestBody?.schema
+      ) : [],
       ...adapter.client(
         uri,
         method,
-        notInFormDataParameters,
+        parametersShouldNotPutInFormData,
         requestBody,
         response,
         adapter,
@@ -1173,7 +1177,7 @@ var FetchAdapter = class extends Adapter {
                 ],
                 void 0,
                 t3.createToken(SyntaxKind2.EqualsGreaterThanToken),
-                t3.createAsExpression(
+                response?.schema ? t3.createAsExpression(
                   t3.createParenthesizedExpression(
                     t3.createAwaitExpression(
                       t3.createCallExpression(
@@ -1187,6 +1191,17 @@ var FetchAdapter = class extends Adapter {
                     )
                   ),
                   response?.schema ? Generator.toTypeNode(response.schema) : t3.createToken(SyntaxKind2.UnknownKeyword)
+                ) : t3.createParenthesizedExpression(
+                  t3.createAwaitExpression(
+                    t3.createCallExpression(
+                      t3.createPropertyAccessExpression(
+                        t3.createIdentifier("response"),
+                        t3.createIdentifier("json")
+                      ),
+                      void 0,
+                      []
+                    )
+                  )
                 )
               )
             ]
@@ -1297,13 +1312,25 @@ var V2 = class {
         enum: enum_,
         format: format2,
         allOf: allOf?.map(
-          (s) => Base.isRef(s) ? { type: Base.upperCamelCase(Base.ref2name(s.$ref, this.doc)) } : this.toBaseSchema(s, enums)
+          (s) => Base.isRef(s) ? {
+            ...s,
+            ref: s.$ref,
+            type: Base.upperCamelCase(Base.ref2name(s.$ref, this.doc))
+          } : this.toBaseSchema(s, enums)
         ),
         anyOf: anyOf?.map(
-          (s) => Base.isRef(s) ? { type: Base.upperCamelCase(Base.ref2name(s.$ref, this.doc)) } : this.toBaseSchema(s, enums)
+          (s) => Base.isRef(s) ? {
+            ...s,
+            ref: s.$ref,
+            type: Base.upperCamelCase(Base.ref2name(s.$ref, this.doc))
+          } : this.toBaseSchema(s, enums)
         ),
         oneOf: oneOf?.map(
-          (s) => Base.isRef(s) ? { type: Base.upperCamelCase(Base.ref2name(s.$ref, this.doc)) } : this.toBaseSchema(s, enums)
+          (s) => Base.isRef(s) ? {
+            ...s,
+            ref: s.$ref,
+            type: Base.upperCamelCase(Base.ref2name(s.$ref, this.doc))
+          } : this.toBaseSchema(s, enums)
         ),
         properties: Object.keys(properties).reduce((acc, p) => {
           const propSchema = properties[p];
@@ -1333,7 +1360,8 @@ var V2 = class {
       type,
       items,
       enum: enum_,
-      properties
+      properties,
+      schema
     } = parameter;
     if (enum_) {
       const type2 = Base.upperCamelCase(upLevelSchemaKey) + Base.upperCamelCase(name);
@@ -1355,17 +1383,36 @@ var V2 = class {
         }
       };
     }
+    if (items) {
+      return {
+        name,
+        required,
+        description,
+        in: parameter.in,
+        schema: {
+          type,
+          items
+        }
+      };
+    }
+    if (schema && Base.isRef(schema)) {
+      return {
+        name,
+        required,
+        description,
+        in: parameter.in,
+        schema: {
+          type: Base.upperCamelCase(Base.ref2name(schema.$ref))
+        }
+      };
+    }
     return {
       name,
       required,
       description,
       in: parameter.in,
-      schema: items ? {
+      schema: {
         type,
-        items
-      } : {
-        type,
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         properties
       }
     };
@@ -1444,6 +1491,7 @@ var V2 = class {
               if (code in responses2) {
                 const response = responses2[code];
                 const responseSchema = this.getResponseByRef(response);
+                const inBodyOnlyHasBody = inBody && inBody.length === 1 && inBody[0].in === "body" && inBody[0].name === "body";
                 methodApis.push({
                   method,
                   operationId,
@@ -1452,7 +1500,12 @@ var V2 = class {
                   description: description_,
                   parameters: uniqueParameterName.map((name) => notInBody.find((p) => p.name === name)).filter(Boolean),
                   responses: responseSchema,
-                  requestBody: inBody.length > 0 ? [
+                  requestBody: inBody.length > 0 ? inBodyOnlyHasBody ? [
+                    {
+                      type: "application/json" /* JSON */,
+                      schema: inBody[0].schema
+                    }
+                  ] : [
                     {
                       type: "application/json" /* JSON */,
                       schema: {
@@ -1660,13 +1713,25 @@ var V3 = class {
         enum: enum_,
         format: format2,
         allOf: allOf?.map(
-          (s) => Base.isRef(s) ? { type: Base.capitalize(Base.ref2name(s.$ref, this.doc)) } : this.toBaseSchema(s, enums)
+          (s) => Base.isRef(s) ? {
+            ...s,
+            ref: s.$ref,
+            type: Base.capitalize(Base.ref2name(s.$ref, this.doc))
+          } : this.toBaseSchema(s, enums)
         ),
         anyOf: anyOf?.map(
-          (s) => Base.isRef(s) ? { type: Base.capitalize(Base.ref2name(s.$ref, this.doc)) } : this.toBaseSchema(s, enums)
+          (s) => Base.isRef(s) ? {
+            ...s,
+            ref: s.$ref,
+            type: Base.capitalize(Base.ref2name(s.$ref, this.doc))
+          } : this.toBaseSchema(s, enums)
         ),
         oneOf: oneOf?.map(
-          (s) => Base.isRef(s) ? { type: Base.capitalize(Base.ref2name(s.$ref, this.doc)) } : this.toBaseSchema(s, enums)
+          (s) => Base.isRef(s) ? {
+            ...s,
+            ref: s.$ref,
+            type: Base.capitalize(Base.ref2name(s.$ref, this.doc))
+          } : this.toBaseSchema(s, enums)
         ),
         properties: Object.keys(properties).reduce((acc, p) => {
           const propSchema = properties[p];
@@ -1963,13 +2028,25 @@ var V3_1 = class {
         enum: enum_,
         format: format2,
         allOf: allOf?.map(
-          (s) => Base.isRef(s) ? { type: Base.upperCamelCase(Base.ref2name(s.$ref, this.doc)) } : this.toBaseSchema(s, enums)
+          (s) => Base.isRef(s) ? {
+            ...s,
+            ref: s.$ref,
+            type: Base.upperCamelCase(Base.ref2name(s.$ref, this.doc))
+          } : this.toBaseSchema(s, enums)
         ),
         anyOf: anyOf?.map(
-          (s) => Base.isRef(s) ? { type: Base.upperCamelCase(Base.ref2name(s.$ref, this.doc)) } : this.toBaseSchema(s, enums)
+          (s) => Base.isRef(s) ? {
+            ...s,
+            ref: s.$ref,
+            type: Base.upperCamelCase(Base.ref2name(s.$ref, this.doc))
+          } : this.toBaseSchema(s, enums)
         ),
         oneOf: oneOf?.map(
-          (s) => Base.isRef(s) ? { type: Base.upperCamelCase(Base.ref2name(s.$ref, this.doc)) } : this.toBaseSchema(s, enums)
+          (s) => Base.isRef(s) ? {
+            ...s,
+            ref: s.$ref,
+            type: Base.upperCamelCase(Base.ref2name(s.$ref, this.doc))
+          } : this.toBaseSchema(s, enums)
         ),
         properties: Object.keys(properties).reduce((acc, p) => {
           const propSchema = properties[p];
@@ -2226,13 +2303,12 @@ function apiCodeGenPlugin(options) {
         await tsc();
       } catch (error) {
         logger2.error(error);
-        process.exit(1);
       }
       return {
         ...config,
         server: {
           ...config.server ?? {},
-          proxy: proxies
+          proxy: Object.assign({}, config.server?.proxy ?? {}, proxies)
         }
       };
     }