api-farmer 0.0.22 → 0.0.24

package/README.md

@@ -148,6 +148,10 @@ export interface Config {
    * The transformer api options, used to override the default transformation rules.
    */
   transformer?: Partial<Transformer>
+  /**
+   * Certain uncountable nouns that do not change from singular to plural
+   */
+  uncountableNouns?: string[]
 }
 ```
 

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/{chunk-GMB5TIVL.js → chunk-MMYZTUXF.js}

@@ -7,7 +7,7 @@ import {
   isRequiredRequestBody,
   readSchema,
   readTemplateFile
-} from "./chunk-PTGO2Y5X.js";
+} from "./chunk-KEUG7T6E.js";
 
 // src/generate.ts
 import { resolve } from "path";
@@ -53,7 +53,7 @@ function transformVerb({ method }) {
       return pascalCase(method);
   }
 }
-function transformEntity({ path, method, base }) {
+function transformEntity({ path, method, base, uncountableNouns }) {
   path = base ? path.replace(base, "") : path;
   const words = path.split("/").filter(Boolean);
   return words.reduce((entity, word, index) => {
@@ -61,9 +61,9 @@ function transformEntity({ path, method, base }) {
       return entity;
     }
     word = word.replace(/\.([a-z])/g, (_, p) => p.toUpperCase());
-    word = pluralize.singular(pascalCase(word));
+    word = uncountableNouns.includes(word) ? word : pluralize.singular(pascalCase(word));
     if (method === "get" && index === words.length - 1) {
-      word = pluralize.plural(word);
+      word = uncountableNouns.includes(word) ? `${word}List` : pluralize.plural(word);
     }
     return `${entity}${word}`;
   }, "");
@@ -128,10 +128,10 @@ function createTransformer() {
 
 // src/generate.ts
 function transformPayloads(pathItems, options) {
-  const { transformer, path, base, validateStatus } = options;
+  const { transformer, path, base, uncountableNouns, validateStatus } = options;
   return Object.entries(pathItems).filter(([key]) => SUPPORTED_HTTP_METHODS.includes(key)).reduce((payloads, [method, operation]) => {
     const url = transformer.url({ path, base });
-    const args = { path, base, url, method, operation };
+    const args = { path, base, url, method, uncountableNouns, operation };
     const entity = transformer.entity(args);
     const verb = transformer.verb(args);
     const requestContentType = operation.requestBody ? getRequestBodyContentType(operation.requestBody) : void 0;
@@ -172,7 +172,7 @@ function transformPayloads(pathItems, options) {
   }, []);
 }
 function partitionApiModules(schema, options) {
-  const { base, transformer, validateStatus } = options;
+  const { base, transformer, uncountableNouns, validateStatus } = options;
   const schemaPaths = schema.paths ?? {};
   const schemaPathKeys = base ? Object.keys(schemaPaths).map((key) => key.replace(base, "")) : Object.keys(schemaPaths);
   const keyToPaths = groupBy(schemaPathKeys, (key) => key.split("/")[1]);
@@ -180,7 +180,13 @@ function partitionApiModules(schema, options) {
     const payloads = paths.reduce((payloads2, path) => {
       const pathItems = schemaPaths[path];
       payloads2.push(
-        ...transformPayloads(pathItems, { ...options, path: base ? base + path : path, transformer, validateStatus })
+        ...transformPayloads(pathItems, {
+          ...options,
+          path: base ? base + path : path,
+          transformer,
+          uncountableNouns,
+          validateStatus
+        })
       );
       return payloads2;
     }, []);
@@ -243,7 +249,8 @@ async function generate(userOptions = {}) {
     output = "./src/apis/generated",
     typesFilename = "_types.ts",
     validateStatus = (status) => status >= 200 && status < 300,
-    transformer = {}
+    transformer = {},
+    uncountableNouns = []
   } = options;
   const mergedTransformer = { ...createTransformer(), ...transformer };
   const schema = await readSchema(input);
@@ -253,6 +260,7 @@ async function generate(userOptions = {}) {
   }
   const apiModules = partitionApiModules(schema, {
     base,
+    uncountableNouns,
     transformer: mergedTransformer,
     validateStatus
   });

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;
@@ -166,7 +166,7 @@ function transformVerb({ method }) {
       return (0, import_rattail2.pascalCase)(method);
   }
 }
-function transformEntity({ path, method, base }) {
+function transformEntity({ path, method, base, uncountableNouns }) {
   path = base ? path.replace(base, "") : path;
   const words = path.split("/").filter(Boolean);
   return words.reduce((entity, word, index) => {
@@ -174,9 +174,9 @@ function transformEntity({ path, method, base }) {
       return entity;
     }
     word = word.replace(/\.([a-z])/g, (_, p) => p.toUpperCase());
-    word = import_pluralize.default.singular((0, import_rattail2.pascalCase)(word));
+    word = uncountableNouns.includes(word) ? word : import_pluralize.default.singular((0, import_rattail2.pascalCase)(word));
     if (method === "get" && index === words.length - 1) {
-      word = import_pluralize.default.plural(word);
+      word = uncountableNouns.includes(word) ? `${word}List` : import_pluralize.default.plural(word);
     }
     return `${entity}${word}`;
   }, "");
@@ -258,10 +258,10 @@ __export(generate_exports, {
   transformPayloads: () => transformPayloads
 });
 function transformPayloads(pathItems, options) {
-  const { transformer, path, base, validateStatus } = options;
+  const { transformer, path, base, uncountableNouns, validateStatus } = options;
   return Object.entries(pathItems).filter(([key]) => SUPPORTED_HTTP_METHODS.includes(key)).reduce((payloads, [method, operation]) => {
     const url = transformer.url({ path, base });
-    const args = { path, base, url, method, operation };
+    const args = { path, base, url, method, uncountableNouns, operation };
     const entity = transformer.entity(args);
     const verb = transformer.verb(args);
     const requestContentType = operation.requestBody ? getRequestBodyContentType(operation.requestBody) : void 0;
@@ -302,7 +302,7 @@ function transformPayloads(pathItems, options) {
   }, []);
 }
 function partitionApiModules(schema, options) {
-  const { base, transformer, validateStatus } = options;
+  const { base, transformer, uncountableNouns, validateStatus } = options;
   const schemaPaths = schema.paths ?? {};
   const schemaPathKeys = base ? Object.keys(schemaPaths).map((key) => key.replace(base, "")) : Object.keys(schemaPaths);
   const keyToPaths = (0, import_rattail3.groupBy)(schemaPathKeys, (key) => key.split("/")[1]);
@@ -310,7 +310,13 @@ function partitionApiModules(schema, options) {
     const payloads = paths.reduce((payloads2, path) => {
       const pathItems = schemaPaths[path];
       payloads2.push(
-        ...transformPayloads(pathItems, { ...options, path: base ? base + path : path, transformer, validateStatus })
+        ...transformPayloads(pathItems, {
+          ...options,
+          path: base ? base + path : path,
+          transformer,
+          uncountableNouns,
+          validateStatus
+        })
       );
       return payloads2;
     }, []);
@@ -373,7 +379,8 @@ async function generate(userOptions = {}) {
     output = "./src/apis/generated",
     typesFilename = "_types.ts",
     validateStatus = (status) => status >= 200 && status < 300,
-    transformer = {}
+    transformer = {},
+    uncountableNouns = []
   } = options;
   const mergedTransformer = { ...createTransformer(), ...transformer };
   const schema = await readSchema(input);
@@ -383,6 +390,7 @@ async function generate(userOptions = {}) {
   }
   const apiModules = partitionApiModules(schema, {
     base,
+    uncountableNouns,
     transformer: mergedTransformer,
     validateStatus
   });

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-FIMT7H74.js");
   return generate();
 });
 program.parse();

package/dist/{generate-HKA2M6ER.js → generate-FIMT7H74.js}

@@ -4,8 +4,8 @@ import {
   partitionApiModules,
   renderApiModules,
   transformPayloads
-} from "./chunk-GMB5TIVL.js";
-import "./chunk-PTGO2Y5X.js";
+} from "./chunk-MMYZTUXF.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,
@@ -84,7 +85,7 @@ function transformVerb({ method }) {
       return (0, import_rattail.pascalCase)(method);
   }
 }
-function transformEntity({ path, method, base }) {
+function transformEntity({ path, method, base, uncountableNouns }) {
   path = base ? path.replace(base, "") : path;
   const words = path.split("/").filter(Boolean);
   return words.reduce((entity, word, index) => {
@@ -92,9 +93,9 @@ function transformEntity({ path, method, base }) {
       return entity;
     }
     word = word.replace(/\.([a-z])/g, (_, p) => p.toUpperCase());
-    word = import_pluralize.default.singular((0, import_rattail.pascalCase)(word));
+    word = uncountableNouns.includes(word) ? word : import_pluralize.default.singular((0, import_rattail.pascalCase)(word));
     if (method === "get" && index === words.length - 1) {
-      word = import_pluralize.default.plural(word);
+      word = uncountableNouns.includes(word) ? `${word}List` : import_pluralize.default.plural(word);
     }
     return `${entity}${word}`;
   }, "");
@@ -267,35 +268,35 @@ 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;
 }
 
 // src/generate.ts
 function transformPayloads(pathItems, options) {
-  const { transformer, path, base, validateStatus } = options;
+  const { transformer, path, base, uncountableNouns, validateStatus } = options;
   return Object.entries(pathItems).filter(([key]) => SUPPORTED_HTTP_METHODS.includes(key)).reduce((payloads, [method, operation]) => {
     const url = transformer.url({ path, base });
-    const args = { path, base, url, method, operation };
+    const args = { path, base, url, method, uncountableNouns, operation };
     const entity = transformer.entity(args);
     const verb = transformer.verb(args);
     const requestContentType = operation.requestBody ? getRequestBodyContentType(operation.requestBody) : void 0;
@@ -336,7 +337,7 @@ function transformPayloads(pathItems, options) {
   }, []);
 }
 function partitionApiModules(schema, options) {
-  const { base, transformer, validateStatus } = options;
+  const { base, transformer, uncountableNouns, validateStatus } = options;
   const schemaPaths = schema.paths ?? {};
   const schemaPathKeys = base ? Object.keys(schemaPaths).map((key) => key.replace(base, "")) : Object.keys(schemaPaths);
   const keyToPaths = (0, import_rattail3.groupBy)(schemaPathKeys, (key) => key.split("/")[1]);
@@ -344,7 +345,13 @@ function partitionApiModules(schema, options) {
     const payloads = paths.reduce((payloads2, path) => {
       const pathItems = schemaPaths[path];
       payloads2.push(
-        ...transformPayloads(pathItems, { ...options, path: base ? base + path : path, transformer, validateStatus })
+        ...transformPayloads(pathItems, {
+          ...options,
+          path: base ? base + path : path,
+          transformer,
+          uncountableNouns,
+          validateStatus
+        })
       );
       return payloads2;
     }, []);
@@ -407,7 +414,8 @@ async function generate(userOptions = {}) {
     output = "./src/apis/generated",
     typesFilename = "_types.ts",
     validateStatus = (status) => status >= 200 && status < 300,
-    transformer = {}
+    transformer = {},
+    uncountableNouns = []
   } = options;
   const mergedTransformer = { ...createTransformer(), ...transformer };
   const schema = await readSchema(input);
@@ -417,6 +425,7 @@ async function generate(userOptions = {}) {
   }
   const apiModules = partitionApiModules(schema, {
     base,
+    uncountableNouns,
     transformer: mergedTransformer,
     validateStatus
   });
@@ -431,6 +440,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;
@@ -57,6 +58,7 @@ type TransformerBaseArgs = {
     url: string;
     method: string;
     operation: OperationObject;
+    uncountableNouns: string[];
 };
 declare function transformModuleName({ name }: {
     name: string;
@@ -68,7 +70,7 @@ declare function transformUrl({ path, base }: {
 declare function transformVerb({ method }: {
     method: string;
 }): string;
-declare function transformEntity({ path, method, base }: TransformerBaseArgs): string;
+declare function transformEntity({ path, method, base, uncountableNouns }: TransformerBaseArgs): string;
 declare function transformFn({ verb, entity }: {
     verb: string;
     entity: string;
@@ -266,16 +268,22 @@ interface GenerateOptions {
      * The transformer api options, used to override the default transformation rules.
      */
     transformer?: Partial<Transformer>;
+    /**
+     * Certain uncountable nouns that do not change from singular to plural
+     */
+    uncountableNouns?: string[];
 }
 declare function transformPayloads(pathItems: Record<string, OperationObject>, options: {
     path: string;
     transformer: Transformer;
     base: string | undefined;
+    uncountableNouns: string[];
     validateStatus: (status: number) => boolean;
 }): ApiModulePayload[];
 declare function partitionApiModules(schema: OpenAPI3, options: {
     transformer: Transformer;
     base: string | undefined;
+    uncountableNouns: string[];
     validateStatus: (status: number) => boolean;
 }): ApiModule[];
 declare function renderApiModules(apiModules: ApiModule[], options: {
@@ -293,4 +301,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;
@@ -57,6 +58,7 @@ type TransformerBaseArgs = {
     url: string;
     method: string;
     operation: OperationObject;
+    uncountableNouns: string[];
 };
 declare function transformModuleName({ name }: {
     name: string;
@@ -68,7 +70,7 @@ declare function transformUrl({ path, base }: {
 declare function transformVerb({ method }: {
     method: string;
 }): string;
-declare function transformEntity({ path, method, base }: TransformerBaseArgs): string;
+declare function transformEntity({ path, method, base, uncountableNouns }: TransformerBaseArgs): string;
 declare function transformFn({ verb, entity }: {
     verb: string;
     entity: string;
@@ -266,16 +268,22 @@ interface GenerateOptions {
      * The transformer api options, used to override the default transformation rules.
      */
     transformer?: Partial<Transformer>;
+    /**
+     * Certain uncountable nouns that do not change from singular to plural
+     */
+    uncountableNouns?: string[];
 }
 declare function transformPayloads(pathItems: Record<string, OperationObject>, options: {
     path: string;
     transformer: Transformer;
     base: string | undefined;
+    uncountableNouns: string[];
     validateStatus: (status: number) => boolean;
 }): ApiModulePayload[];
 declare function partitionApiModules(schema: OpenAPI3, options: {
     transformer: Transformer;
     base: string | undefined;
+    uncountableNouns: string[];
     validateStatus: (status: number) => boolean;
 }): ApiModule[];
 declare function renderApiModules(apiModules: ApiModule[], options: {
@@ -293,4 +301,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-MMYZTUXF.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.24",
   "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 %>
+      
+    <% } %>
+  <% }) %>
 <% } %>