api-farmer 0.0.22 → 0.0.23

package/dist/{chunk-GMB5TIVL.js → chunk-DJ4JEQRW.js}

@@ -7,7 +7,7 @@ import {
   isRequiredRequestBody,
   readSchema,
   readTemplateFile
-} from "./chunk-PTGO2Y5X.js";
+} from "./chunk-KEUG7T6E.js";
 
 // src/generate.ts
 import { resolve } from "path";

package/dist/{chunk-PTGO2Y5X.js → chunk-KEUG7T6E.js}

@@ -90,26 +90,26 @@ function getCliVersion() {
 function isRequiredRequestBody(value) {
   return "required" in value && value.required === true;
 }
+function findObjectKey(object, targetKeys) {
+  return Object.keys(object).find((key) => targetKeys.includes(key));
+}
 function getRequestBodyContentType(value) {
   if (!("content" in value)) {
     return "";
   }
-  return value.content["application/json"] ? "application/json" : value.content["application/x-www-form-urlencoded"] ? "application/x-www-form-urlencoded" : void 0;
+  return findObjectKey(value.content, ["application/json", "application/x-www-form-urlencoded", "multipart/form-data"]);
 }
 function getResponseMetadataItems(operation, validateStatus) {
   const responses = operation.responses ?? {};
   const validStatusResults = Object.keys(responses).sort((a, b) => Number(a) - Number(b)).filter((key) => validateStatus(Number(key))).map(Number);
   const metadataItems = validStatusResults.map((status) => {
     const content = operation.responses?.[status]?.content ?? {};
-    const responseContentType = findResponseContentType(content);
+    const responseContentType = findObjectKey(content, ["application/json", "*/*"]);
     return {
       status,
       responseContentType
     };
   }).filter((result) => result.responseContentType);
-  function findResponseContentType(content) {
-    return content["application/json"] ? "application/json" : content["*/*"] ? "*/*" : void 0;
-  }
   return metadataItems;
 }
 
@@ -124,6 +124,7 @@ export {
   hasQueryParameter,
   getCliVersion,
   isRequiredRequestBody,
+  findObjectKey,
   getRequestBodyContentType,
   getResponseMetadataItems
 };

package/dist/cli.cjs

@@ -91,26 +91,26 @@ function getCliVersion() {
 function isRequiredRequestBody(value) {
   return "required" in value && value.required === true;
 }
+function findObjectKey(object, targetKeys) {
+  return Object.keys(object).find((key) => targetKeys.includes(key));
+}
 function getRequestBodyContentType(value) {
   if (!("content" in value)) {
     return "";
   }
-  return value.content["application/json"] ? "application/json" : value.content["application/x-www-form-urlencoded"] ? "application/x-www-form-urlencoded" : void 0;
+  return findObjectKey(value.content, ["application/json", "application/x-www-form-urlencoded", "multipart/form-data"]);
 }
 function getResponseMetadataItems(operation, validateStatus) {
   const responses = operation.responses ?? {};
   const validStatusResults = Object.keys(responses).sort((a, b) => Number(a) - Number(b)).filter((key) => validateStatus(Number(key))).map(Number);
   const metadataItems = validStatusResults.map((status) => {
     const content = operation.responses?.[status]?.content ?? {};
-    const responseContentType = findResponseContentType(content);
+    const responseContentType = findObjectKey(content, ["application/json", "*/*"]);
     return {
       status,
       responseContentType
     };
   }).filter((result) => result.responseContentType);
-  function findResponseContentType(content) {
-    return content["application/json"] ? "application/json" : content["*/*"] ? "*/*" : void 0;
-  }
   return metadataItems;
 }
 var import_path2, import_axle, import_fs_extra, import_rattail, import_rslog, import_swagger2openapi, import_yaml;

package/dist/cli.js

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
 import {
   getCliVersion
-} from "./chunk-PTGO2Y5X.js";
+} from "./chunk-KEUG7T6E.js";
 
 // src/cli.ts
 import { Command } from "commander";
 var program = new Command();
 program.version(getCliVersion());
 program.action(async () => {
-  const { generate } = await import("./generate-HKA2M6ER.js");
+  const { generate } = await import("./generate-5XSJIKDA.js");
   return generate();
 });
 program.parse();

package/dist/{generate-HKA2M6ER.js → generate-5XSJIKDA.js}

@@ -4,8 +4,8 @@ import {
   partitionApiModules,
   renderApiModules,
   transformPayloads
-} from "./chunk-GMB5TIVL.js";
-import "./chunk-PTGO2Y5X.js";
+} from "./chunk-DJ4JEQRW.js";
+import "./chunk-KEUG7T6E.js";
 export {
   generate,
   generateTypes,

package/dist/index.cjs

@@ -33,6 +33,7 @@ __export(index_exports, {
   createStatusCodesByStrategy: () => createStatusCodesByStrategy,
   createTransformer: () => createTransformer,
   defineConfig: () => defineConfig,
+  findObjectKey: () => findObjectKey,
   generate: () => generate,
   generateTypes: () => generateTypes,
   getCliVersion: () => getCliVersion,
@@ -267,26 +268,26 @@ function getCliVersion() {
 function isRequiredRequestBody(value) {
   return "required" in value && value.required === true;
 }
+function findObjectKey(object, targetKeys) {
+  return Object.keys(object).find((key) => targetKeys.includes(key));
+}
 function getRequestBodyContentType(value) {
   if (!("content" in value)) {
     return "";
   }
-  return value.content["application/json"] ? "application/json" : value.content["application/x-www-form-urlencoded"] ? "application/x-www-form-urlencoded" : void 0;
+  return findObjectKey(value.content, ["application/json", "application/x-www-form-urlencoded", "multipart/form-data"]);
 }
 function getResponseMetadataItems(operation, validateStatus) {
   const responses = operation.responses ?? {};
   const validStatusResults = Object.keys(responses).sort((a, b) => Number(a) - Number(b)).filter((key) => validateStatus(Number(key))).map(Number);
   const metadataItems = validStatusResults.map((status) => {
     const content = operation.responses?.[status]?.content ?? {};
-    const responseContentType = findResponseContentType(content);
+    const responseContentType = findObjectKey(content, ["application/json", "*/*"]);
     return {
       status,
       responseContentType
     };
   }).filter((result) => result.responseContentType);
-  function findResponseContentType(content) {
-    return content["application/json"] ? "application/json" : content["*/*"] ? "*/*" : void 0;
-  }
   return metadataItems;
 }
 
@@ -431,6 +432,7 @@ var import_pluralize2 = __toESM(require("pluralize"), 1);
   createStatusCodesByStrategy,
   createTransformer,
   defineConfig,
+  findObjectKey,
   generate,
   generateTypes,
   getCliVersion,

package/dist/index.d.cts

@@ -44,7 +44,8 @@ declare function readTemplateFile(preset?: Preset): string;
 declare function hasQueryParameter(operation: OperationObject): boolean;
 declare function getCliVersion(): any;
 declare function isRequiredRequestBody(value: RequestBodyObject | ReferenceObject): boolean;
-declare function getRequestBodyContentType(value: RequestBodyObject | ReferenceObject): "" | "application/json" | "application/x-www-form-urlencoded" | undefined;
+declare function findObjectKey(object: Record<string, any>, targetKeys: string[]): string | undefined;
+declare function getRequestBodyContentType(value: RequestBodyObject | ReferenceObject): string | undefined;
 type ResponseMetadataItem = {
     status: number;
     responseContentType: string;
@@ -293,4 +294,4 @@ type Config = GenerateOptions;
 declare function defineConfig(config: Config): GenerateOptions;
 declare function getConfig(): Promise<Config>;
 
-export { type ApiModule, type ApiModulePayload, type ApiModuleTemplateData, type Config, type GenerateOptions, type Preset, type ResponseMetadataItem, type StatusCodeStrategy, type StatusCodes, type Transformer, type TransformerBaseArgs, createStatusCodesByStrategy, createTransformer, defineConfig, generate, generateTypes, getCliVersion, getConfig, getRequestBodyContentType, getResponseMetadataItems, hasQueryParameter, isRemoteSchema, isRequiredRequestBody, partitionApiModules, readSchema, readSchemaContent, readTemplateFile, renderApiModules, transformEntity, transformFn, transformModuleName, transformPayloads, transformType, transformTypeQuery, transformTypeQueryValue, transformTypeRequestBody, transformTypeRequestBodyValue, transformTypeResponseBody, transformTypeResponseBodyValue, transformTypeValue, transformUrl, transformVerb };
+export { type ApiModule, type ApiModulePayload, type ApiModuleTemplateData, type Config, type GenerateOptions, type Preset, type ResponseMetadataItem, type StatusCodeStrategy, type StatusCodes, type Transformer, type TransformerBaseArgs, createStatusCodesByStrategy, createTransformer, defineConfig, findObjectKey, generate, generateTypes, getCliVersion, getConfig, getRequestBodyContentType, getResponseMetadataItems, hasQueryParameter, isRemoteSchema, isRequiredRequestBody, partitionApiModules, readSchema, readSchemaContent, readTemplateFile, renderApiModules, transformEntity, transformFn, transformModuleName, transformPayloads, transformType, transformTypeQuery, transformTypeQueryValue, transformTypeRequestBody, transformTypeRequestBodyValue, transformTypeResponseBody, transformTypeResponseBodyValue, transformTypeValue, transformUrl, transformVerb };

package/dist/index.d.ts

@@ -44,7 +44,8 @@ declare function readTemplateFile(preset?: Preset): string;
 declare function hasQueryParameter(operation: OperationObject): boolean;
 declare function getCliVersion(): any;
 declare function isRequiredRequestBody(value: RequestBodyObject | ReferenceObject): boolean;
-declare function getRequestBodyContentType(value: RequestBodyObject | ReferenceObject): "" | "application/json" | "application/x-www-form-urlencoded" | undefined;
+declare function findObjectKey(object: Record<string, any>, targetKeys: string[]): string | undefined;
+declare function getRequestBodyContentType(value: RequestBodyObject | ReferenceObject): string | undefined;
 type ResponseMetadataItem = {
     status: number;
     responseContentType: string;
@@ -293,4 +294,4 @@ type Config = GenerateOptions;
 declare function defineConfig(config: Config): GenerateOptions;
 declare function getConfig(): Promise<Config>;
 
-export { type ApiModule, type ApiModulePayload, type ApiModuleTemplateData, type Config, type GenerateOptions, type Preset, type ResponseMetadataItem, type StatusCodeStrategy, type StatusCodes, type Transformer, type TransformerBaseArgs, createStatusCodesByStrategy, createTransformer, defineConfig, generate, generateTypes, getCliVersion, getConfig, getRequestBodyContentType, getResponseMetadataItems, hasQueryParameter, isRemoteSchema, isRequiredRequestBody, partitionApiModules, readSchema, readSchemaContent, readTemplateFile, renderApiModules, transformEntity, transformFn, transformModuleName, transformPayloads, transformType, transformTypeQuery, transformTypeQueryValue, transformTypeRequestBody, transformTypeRequestBodyValue, transformTypeResponseBody, transformTypeResponseBodyValue, transformTypeValue, transformUrl, transformVerb };
+export { type ApiModule, type ApiModulePayload, type ApiModuleTemplateData, type Config, type GenerateOptions, type Preset, type ResponseMetadataItem, type StatusCodeStrategy, type StatusCodes, type Transformer, type TransformerBaseArgs, createStatusCodesByStrategy, createTransformer, defineConfig, findObjectKey, generate, generateTypes, getCliVersion, getConfig, getRequestBodyContentType, getResponseMetadataItems, hasQueryParameter, isRemoteSchema, isRequiredRequestBody, partitionApiModules, readSchema, readSchemaContent, readTemplateFile, renderApiModules, transformEntity, transformFn, transformModuleName, transformPayloads, transformType, transformTypeQuery, transformTypeQueryValue, transformTypeRequestBody, transformTypeRequestBodyValue, transformTypeResponseBody, transformTypeResponseBodyValue, transformTypeValue, transformUrl, transformVerb };

package/dist/index.js

@@ -20,9 +20,10 @@ import {
   transformTypeValue,
   transformUrl,
   transformVerb
-} from "./chunk-GMB5TIVL.js";
+} from "./chunk-DJ4JEQRW.js";
 import {
   createStatusCodesByStrategy,
+  findObjectKey,
   getCliVersion,
   getRequestBodyContentType,
   getResponseMetadataItems,
@@ -32,7 +33,7 @@ import {
   readSchema,
   readSchemaContent,
   readTemplateFile
-} from "./chunk-PTGO2Y5X.js";
+} from "./chunk-KEUG7T6E.js";
 
 // src/index.ts
 import { default as default2 } from "pluralize";
@@ -40,6 +41,7 @@ export {
   createStatusCodesByStrategy,
   createTransformer,
   defineConfig,
+  findObjectKey,
   generate,
   generateTypes,
   getCliVersion,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api-farmer",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "description": "API module generation tool based on Openapi3/Swagger2.",
   "keywords": [
     "cli",

package/templates/axios.ejs

@@ -2,48 +2,49 @@
 <% if (!typesOnly) { %> import { request } from '@/request' <% } %>
 <% if (ts) { %> import { type paths } from './<%- typesFilename %>' <% } %>
 
-<% if (!typesOnly) { %>
-<% apiModule.payloads.forEach(payload => { %> -%>
-export const <%- payload.fn %> = (config<% if (ts) { %>: RequestConfig<<%- payload.typeQuery %>, <%- payload.typeRequestBody %>> <% } %> = {}) 
-=> request<% if (ts) { %><<%- payload.typeResponseBody %>><% } %>({
-  url: '<%- payload.url %>', 
-  method: '<%- payload.method %>',
-  ...config,
-  <% if (payload.requestContentType === 'application/x-www-form-urlencoded') { %>headers: {
-    'Content-Type': 'application/x-www-form-urlencoded',
-    ...config.headers,
-  },
-  <% } %>
-})
-
-<% }) %>
-<% } %>
+<%_ if (!typesOnly) { _%>
+  <% apiModule.payloads.forEach(payload => { %> %>
+    export const <%- payload.fn %> = 
+      (config<% if (ts) { %>: RequestConfig<<%- payload.typeQuery %>, <%- payload.typeRequestBody %>> <% } %> = {}) => request
+        <% if (ts) { %><<%- payload.typeResponseBody %>><% } %>({
+          url: '<%- payload.url %>', 
+          method: '<%- payload.method %>',
+          ...config,
+          <%_ if (payload.requestContentType && payload.requestContentType !== 'application/json') { _%>
+          headers: {
+            'Content-Type': '<%- payload.requestContentType %>',
+            ...config.headers,
+          }
+        <% } %>
+        })
+  <% }) %>
+<%_ } _%>
 
 <% if (ts) { %>
-<% apiModule.payloads.forEach(payload => { %> -%>
-export type <%- payload.type %> = <%- payload.typeValue %>
-
-<% }) %>
-
-<% apiModule.payloads.forEach(payload => { %> -%>
-  <% if (payload.typeQueryValue) { %>
-  export type <%- payload.typeQuery %> = <%- payload.typeQueryValue %>
-  
-<% } %>
-<% }) %>
-
-<% apiModule.payloads.forEach(payload => { %> -%>
-<% if (payload.typeRequestBodyValue) { %>
-export type <%- payload.typeRequestBody %> = <%- payload.typeRequestBodyValue %>
-
-<% } %>
-<% }) %>
-
-<% apiModule.payloads.forEach(payload => { %> -%>
-<% if (payload.typeResponseBodyValue) { %>
-export type <%- payload.typeResponseBody %> = <%- payload.typeResponseBodyValue %>
-  
-<% } %>
-<% }) %>
+  <% apiModule.payloads.forEach(payload => { %> %>
+    export type <%- payload.type %> = <%- payload.typeValue %>
+
+  <% }) %>
+
+  <% apiModule.payloads.forEach(payload => { %> %>
+    <% if (payload.typeQueryValue) { %>
+      export type <%- payload.typeQuery %> = <%- payload.typeQueryValue %>
+    
+    <% } %>
+  <% }) %>
+
+  <% apiModule.payloads.forEach(payload => { %> %>
+    <% if (payload.typeRequestBodyValue) { %>
+      export type <%- payload.typeRequestBody %> = <%- payload.typeRequestBodyValue %>
+
+    <% } %>
+  <% }) %>
+
+  <% apiModule.payloads.forEach(payload => { %> %>
+    <% if (payload.typeResponseBodyValue) { %>
+      export type <%- payload.typeResponseBody %> = <%- payload.typeResponseBodyValue %>
+      
+    <% } %>
+  <% }) %>
 <% } %>
 

package/templates/axle.ejs

@@ -1,49 +1,59 @@
 <% if (!typesOnly) { %> import { api } from '@/request' <% } %>
-<% if (ts) { %> import { type paths } from './<%- typesFilename %>' <% } %>
+<% if (ts) { %>  import { type paths } from './<%- typesFilename %>' <% } %>
 
 <% if (!typesOnly) { %>
-<% apiModule.payloads.forEach(payload => { %> -%>
-export const <%- payload.fn %> = api
-<% if (ts) { %>
-<<%- payload.typeResponseBody %>, 
-<% if (['get', 'delete', 'head', 'options'].includes(payload.method)) { %> 
-  <%- payload.typeQuery %> 
-<% } else { %>
-  <%- payload.typeRequestBody %> 
-<% } %>, 
-<%- payload.typeRequestBody %>>
-<% } %>
-('<%- payload.url %>', 
-<% if (payload.requestContentType === 'application/x-www-form-urlencoded') { %> '<%- payload.method %>UrlEncode' <% } else { %> '<%- payload.method %>' <% } %>)
-
-<% }) %>
+  <% apiModule.payloads.forEach(payload => { %> %>
+    export const <%- payload.fn %> = api
+
+    <% if (ts) { %>
+    <
+    <%- payload.typeResponseBody %>, 
+    <% if (['get', 'delete', 'head', 'options'].includes(payload.method)) { %> 
+    <%- payload.typeQuery %> 
+    <% } else { %>
+    <%- payload.typeRequestBody %> 
+    <% } %>, 
+    <%- payload.typeRequestBody %>
+    >
+    <% } %>
+
+    ('<%- payload.url %>', 
+    <%_ if (payload.requestContentType === 'application/x-www-form-urlencoded') { _%> 
+    '<%- payload.method %>UrlEncode' 
+    <%_ } else if (payload.requestContentType === 'multipart/form-data') { _%> 
+    '<%- payload.method %>Multipart'
+    <%_ } else { _%> 
+    '<%- payload.method %>' 
+    <%_ } _%>)
+
+  <% }) %>
 <% } %>
 
 <% if (ts) { %>
-<% apiModule.payloads.forEach(payload => { %> -%>
-export type <%- payload.type %> = <%- payload.typeValue %>
-
-<% }) %>
-
-<% apiModule.payloads.forEach(payload => { %> -%>
-  <% if (payload.typeQueryValue) { %>
-  export type <%- payload.typeQuery %> = <%- payload.typeQueryValue %>
-  
-<% } %>
-<% }) %>
-
-<% apiModule.payloads.forEach(payload => { %> -%>
-<% if (payload.typeRequestBodyValue) { %>
-export type <%- payload.typeRequestBody %> = <%- payload.typeRequestBodyValue %>
-
-<% } %>
-<% }) %>
-
-<% apiModule.payloads.forEach(payload => { %> -%>
-<% if (payload.typeResponseBodyValue) { %>
-export type <%- payload.typeResponseBody %> = <%- payload.typeResponseBodyValue %>
-  
-<% } %>
-<% }) %>
+  <% apiModule.payloads.forEach(payload => { %> %>
+    export type <%- payload.type %> = <%- payload.typeValue %>
+
+  <% }) %>
+
+  <% apiModule.payloads.forEach(payload => { %> %>
+    <% if (payload.typeQueryValue) { %>
+      export type <%- payload.typeQuery %> = <%- payload.typeQueryValue %>
+    
+    <% } %>
+  <% }) %>
+
+  <% apiModule.payloads.forEach(payload => { %> %>
+    <% if (payload.typeRequestBodyValue) { %>
+      export type <%- payload.typeRequestBody %> = <%- payload.typeRequestBodyValue %>
+
+    <% } %>
+  <% }) %>
+
+  <% apiModule.payloads.forEach(payload => { %> %>
+    <% if (payload.typeResponseBodyValue) { %>
+      export type <%- payload.typeResponseBody %> = <%- payload.typeResponseBodyValue %>
+      
+    <% } %>
+  <% }) %>
 <% } %>