api-farmer 0.0.20 → 0.0.21

package/README.md

@@ -210,6 +210,10 @@ export interface ApiModulePayload {
    * such as User, Comment, Post, etc.
    */
   entity: string
+  /**
+   * The request content type of the API endpoint, such as 'application/json', 'application/x-www-form-urlencoded'.
+   */
+  requestContentType?: string
   /**
    * The type name of the API endpoint,
    * such as ApiGetUsers, ApiCreatePost, ApiUpdateComment, etc.

package/dist/{chunk-5YXY7GCE.js → chunk-GMB5TIVL.js}

@@ -1,12 +1,13 @@
 import {
   CWD,
   SUPPORTED_HTTP_METHODS,
-  getValidResponseMetadataItems,
+  getRequestBodyContentType,
+  getResponseMetadataItems,
   hasQueryParameter,
   isRequiredRequestBody,
   readSchema,
   readTemplateFile
-} from "./chunk-NFK24PSA.js";
+} from "./chunk-PTGO2Y5X.js";
 
 // src/generate.ts
 import { resolve } from "path";
@@ -91,9 +92,10 @@ function transformTypeRequestBody({
 }
 function transformTypeRequestBodyValue({
   type,
-  required
+  required,
+  requestContentType
 }) {
-  return required ? `${type}['requestBody']['content']['application/json']` : `NonNullable<${type}['requestBody']>['content']['application/json'] | undefined`;
+  return required ? `${type}['requestBody']['content']['${requestContentType}']` : `NonNullable<${type}['requestBody']>['content']['${requestContentType}'] | undefined`;
 }
 function transformTypeResponseBody({
   type
@@ -104,7 +106,7 @@ function transformTypeResponseBodyValue({
   type,
   responseMetadataItems
 }) {
-  return responseMetadataItems.map(({ status, mime }) => `${type}['responses']['${status}']['content']['${mime}']`).join(" | ");
+  return responseMetadataItems.map(({ status, responseContentType }) => `${type}['responses']['${status}']['content']['${responseContentType}']`).join(" | ");
 }
 function createTransformer() {
   return {
@@ -132,21 +134,23 @@ function transformPayloads(pathItems, options) {
     const args = { path, base, url, method, operation };
     const entity = transformer.entity(args);
     const verb = transformer.verb(args);
+    const requestContentType = operation.requestBody ? getRequestBodyContentType(operation.requestBody) : void 0;
+    const responseMetadataItems = getResponseMetadataItems(operation, validateStatus);
     const fn = transformer.fn({ ...args, verb, entity });
     const type = transformer.type({ ...args, verb, entity });
     const typeValue = transformer.typeValue({ ...args, verb, entity });
     const typeQuery = transformer.typeQuery({ ...args, type, verb, entity });
     const typeQueryValue = hasQueryParameter(operation) ? transformer.typeQueryValue({ ...args, type, verb, entity }) : "undefined";
     const typeRequestBody = transformer.typeRequestBody({ ...args, type, verb, entity });
-    const typeRequestBodyValue = operation.requestBody ? transformer.typeRequestBodyValue({
+    const typeRequestBodyValue = operation.requestBody && requestContentType ? transformer.typeRequestBodyValue({
       ...args,
       type,
       verb,
       entity,
-      required: isRequiredRequestBody(operation.requestBody)
+      required: isRequiredRequestBody(operation.requestBody),
+      requestContentType
     }) : "undefined";
     const typeResponseBody = transformer.typeResponseBody({ ...args, type, verb, entity });
-    const responseMetadataItems = getValidResponseMetadataItems(operation, validateStatus);
     const typeResponseBodyValue = responseMetadataItems.length > 0 ? transformer.typeResponseBodyValue({ ...args, type, verb, entity, responseMetadataItems }) : "undefined";
     payloads.push({
       fn,
@@ -154,6 +158,7 @@ function transformPayloads(pathItems, options) {
       method,
       verb,
       entity,
+      requestContentType,
       type,
       typeValue,
       typeQuery,

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

@@ -14,7 +14,10 @@ var SUPPORTED_HTTP_METHODS = ["get", "post", "put", "delete", "patch", "options"
 
 // src/utils.ts
 import { resolve as resolve2 } from "path";
+import { createAxle } from "@varlet/axle";
 import fse from "fs-extra";
+import { tryParseJSON } from "rattail";
+import { logger } from "rslog";
 import swagger from "swagger2openapi";
 import yaml from "yaml";
 function createStatusCodesByStrategy(strategy) {
@@ -49,13 +52,29 @@ function createStatusCodesByStrategy(strategy) {
   }[strategy];
 }
 async function readSchema(input) {
-  const isYaml = input.endsWith(".yaml");
-  const path2 = resolve2(CWD, input);
-  const content = fse.readFileSync(path2, "utf-8");
-  const swaggerOrOpenapiSchema = isYaml ? yaml.parse(content) : JSON.parse(content);
+  const content = await readSchemaContent(input);
+  const jsonSchema = tryParseJSON(content);
+  const swaggerOrOpenapiSchema = jsonSchema ? jsonSchema : yaml.parse(content);
   const schema = swaggerOrOpenapiSchema.swagger ? (await swagger.convert(swaggerOrOpenapiSchema, {})).openapi : swaggerOrOpenapiSchema;
   return schema;
 }
+async function readSchemaContent(input) {
+  if (isRemoteSchema(input)) {
+    try {
+      logger.info("Fetching remote schema...");
+      const { data } = await createAxle().get(input);
+      return JSON.stringify(data);
+    } catch {
+      throw new Error("Failed to fetch remote schema");
+    }
+  }
+  const path2 = resolve2(CWD, input);
+  const content = fse.readFileSync(path2, "utf-8");
+  return content;
+}
+function isRemoteSchema(path2) {
+  return path2.startsWith("http://") || path2.startsWith("https://");
+}
 function readTemplateFile(preset = "axle") {
   if (fse.existsSync(CUSTOM_TEMPLATE_FILE)) {
     return fse.readFileSync(CUSTOM_TEMPLATE_FILE, "utf-8");
@@ -71,18 +90,27 @@ function getCliVersion() {
 function isRequiredRequestBody(value) {
   return "required" in value && value.required === true;
 }
-function getValidResponseMetadataItems(operation, validateStatus) {
+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;
+}
+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 results = validStatusResults.map((status) => {
-    const content = operation.responses?.[status]?.content;
-    const mime = content?.["application/json"] ? "application/json" : content?.["*/*"] ? "*/*" : void 0;
+  const metadataItems = validStatusResults.map((status) => {
+    const content = operation.responses?.[status]?.content ?? {};
+    const responseContentType = findResponseContentType(content);
     return {
       status,
-      mime
+      responseContentType
     };
-  }).filter((result) => result.mime);
-  return results;
+  }).filter((result) => result.responseContentType);
+  function findResponseContentType(content) {
+    return content["application/json"] ? "application/json" : content["*/*"] ? "*/*" : void 0;
+  }
+  return metadataItems;
 }
 
 export {
@@ -90,9 +118,12 @@ export {
   SUPPORTED_HTTP_METHODS,
   createStatusCodesByStrategy,
   readSchema,
+  readSchemaContent,
+  isRemoteSchema,
   readTemplateFile,
   hasQueryParameter,
   getCliVersion,
   isRequiredRequestBody,
-  getValidResponseMetadataItems
+  getRequestBodyContentType,
+  getResponseMetadataItems
 };

package/dist/cli.cjs

@@ -53,13 +53,29 @@ var init_constants = __esm({
 
 // src/utils.ts
 async function readSchema(input) {
-  const isYaml = input.endsWith(".yaml");
-  const path = (0, import_path2.resolve)(CWD, input);
-  const content = import_fs_extra.default.readFileSync(path, "utf-8");
-  const swaggerOrOpenapiSchema = isYaml ? import_yaml.default.parse(content) : JSON.parse(content);
+  const content = await readSchemaContent(input);
+  const jsonSchema = (0, import_rattail.tryParseJSON)(content);
+  const swaggerOrOpenapiSchema = jsonSchema ? jsonSchema : import_yaml.default.parse(content);
   const schema = swaggerOrOpenapiSchema.swagger ? (await import_swagger2openapi.default.convert(swaggerOrOpenapiSchema, {})).openapi : swaggerOrOpenapiSchema;
   return schema;
 }
+async function readSchemaContent(input) {
+  if (isRemoteSchema(input)) {
+    try {
+      import_rslog.logger.info("Fetching remote schema...");
+      const { data } = await (0, import_axle.createAxle)().get(input);
+      return JSON.stringify(data);
+    } catch {
+      throw new Error("Failed to fetch remote schema");
+    }
+  }
+  const path = (0, import_path2.resolve)(CWD, input);
+  const content = import_fs_extra.default.readFileSync(path, "utf-8");
+  return content;
+}
+function isRemoteSchema(path) {
+  return path.startsWith("http://") || path.startsWith("https://");
+}
 function readTemplateFile(preset = "axle") {
   if (import_fs_extra.default.existsSync(CUSTOM_TEMPLATE_FILE)) {
     return import_fs_extra.default.readFileSync(CUSTOM_TEMPLATE_FILE, "utf-8");
@@ -75,26 +91,38 @@ function getCliVersion() {
 function isRequiredRequestBody(value) {
   return "required" in value && value.required === true;
 }
-function getValidResponseMetadataItems(operation, validateStatus) {
+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;
+}
+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 results = validStatusResults.map((status) => {
-    const content = operation.responses?.[status]?.content;
-    const mime = content?.["application/json"] ? "application/json" : content?.["*/*"] ? "*/*" : void 0;
+  const metadataItems = validStatusResults.map((status) => {
+    const content = operation.responses?.[status]?.content ?? {};
+    const responseContentType = findResponseContentType(content);
     return {
       status,
-      mime
+      responseContentType
     };
-  }).filter((result) => result.mime);
-  return results;
+  }).filter((result) => result.responseContentType);
+  function findResponseContentType(content) {
+    return content["application/json"] ? "application/json" : content["*/*"] ? "*/*" : void 0;
+  }
+  return metadataItems;
 }
-var import_path2, import_fs_extra, import_swagger2openapi, import_yaml;
+var import_path2, import_axle, import_fs_extra, import_rattail, import_rslog, import_swagger2openapi, import_yaml;
 var init_utils = __esm({
   "src/utils.ts"() {
     "use strict";
     init_cjs_shims();
     import_path2 = require("path");
+    import_axle = require("@varlet/axle");
     import_fs_extra = __toESM(require("fs-extra"), 1);
+    import_rattail = require("rattail");
+    import_rslog = require("rslog");
     import_swagger2openapi = __toESM(require("swagger2openapi"), 1);
     import_yaml = __toESM(require("yaml"), 1);
     init_constants();
@@ -123,7 +151,7 @@ var init_config = __esm({
 
 // src/transformer.ts
 function transformModuleName({ name }) {
-  return (0, import_rattail.camelize)(name);
+  return (0, import_rattail2.camelize)(name);
 }
 function transformUrl({ path, base }) {
   return (base ? path.replace(base, "") : path).replace(/{/g, ":").replace(/}/g, "");
@@ -135,7 +163,7 @@ function transformVerb({ method }) {
     case "put":
       return "Update";
     default:
-      return (0, import_rattail.pascalCase)(method);
+      return (0, import_rattail2.pascalCase)(method);
   }
 }
 function transformEntity({ path, method, base }) {
@@ -146,7 +174,7 @@ 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 = import_pluralize.default.singular((0, import_rattail2.pascalCase)(word));
     if (method === "get" && index === words.length - 1) {
       word = import_pluralize.default.plural(word);
     }
@@ -177,9 +205,10 @@ function transformTypeRequestBody({
 }
 function transformTypeRequestBodyValue({
   type,
-  required
+  required,
+  requestContentType
 }) {
-  return required ? `${type}['requestBody']['content']['application/json']` : `NonNullable<${type}['requestBody']>['content']['application/json'] | undefined`;
+  return required ? `${type}['requestBody']['content']['${requestContentType}']` : `NonNullable<${type}['requestBody']>['content']['${requestContentType}'] | undefined`;
 }
 function transformTypeResponseBody({
   type
@@ -190,7 +219,7 @@ function transformTypeResponseBodyValue({
   type,
   responseMetadataItems
 }) {
-  return responseMetadataItems.map(({ status, mime }) => `${type}['responses']['${status}']['content']['${mime}']`).join(" | ");
+  return responseMetadataItems.map(({ status, responseContentType }) => `${type}['responses']['${status}']['content']['${responseContentType}']`).join(" | ");
 }
 function createTransformer() {
   return {
@@ -209,13 +238,13 @@ function createTransformer() {
     typeResponseBodyValue: transformTypeResponseBodyValue
   };
 }
-var import_pluralize, import_rattail;
+var import_pluralize, import_rattail2;
 var init_transformer = __esm({
   "src/transformer.ts"() {
     "use strict";
     init_cjs_shims();
     import_pluralize = __toESM(require("pluralize"), 1);
-    import_rattail = require("rattail");
+    import_rattail2 = require("rattail");
   }
 });
 
@@ -235,21 +264,23 @@ function transformPayloads(pathItems, options) {
     const args = { path, base, url, method, operation };
     const entity = transformer.entity(args);
     const verb = transformer.verb(args);
+    const requestContentType = operation.requestBody ? getRequestBodyContentType(operation.requestBody) : void 0;
+    const responseMetadataItems = getResponseMetadataItems(operation, validateStatus);
     const fn = transformer.fn({ ...args, verb, entity });
     const type = transformer.type({ ...args, verb, entity });
     const typeValue = transformer.typeValue({ ...args, verb, entity });
     const typeQuery = transformer.typeQuery({ ...args, type, verb, entity });
     const typeQueryValue = hasQueryParameter(operation) ? transformer.typeQueryValue({ ...args, type, verb, entity }) : "undefined";
     const typeRequestBody = transformer.typeRequestBody({ ...args, type, verb, entity });
-    const typeRequestBodyValue = operation.requestBody ? transformer.typeRequestBodyValue({
+    const typeRequestBodyValue = operation.requestBody && requestContentType ? transformer.typeRequestBodyValue({
       ...args,
       type,
       verb,
       entity,
-      required: isRequiredRequestBody(operation.requestBody)
+      required: isRequiredRequestBody(operation.requestBody),
+      requestContentType
     }) : "undefined";
     const typeResponseBody = transformer.typeResponseBody({ ...args, type, verb, entity });
-    const responseMetadataItems = getValidResponseMetadataItems(operation, validateStatus);
     const typeResponseBodyValue = responseMetadataItems.length > 0 ? transformer.typeResponseBodyValue({ ...args, type, verb, entity, responseMetadataItems }) : "undefined";
     payloads.push({
       fn,
@@ -257,6 +288,7 @@ function transformPayloads(pathItems, options) {
       method,
       verb,
       entity,
+      requestContentType,
       type,
       typeValue,
       typeQuery,
@@ -273,7 +305,7 @@ function partitionApiModules(schema, options) {
   const { base, transformer, validateStatus } = options;
   const schemaPaths = schema.paths ?? {};
   const schemaPathKeys = base ? Object.keys(schemaPaths).map((key) => key.replace(base, "")) : Object.keys(schemaPaths);
-  const keyToPaths = (0, import_rattail2.groupBy)(schemaPathKeys, (key) => key.split("/")[1]);
+  const keyToPaths = (0, import_rattail3.groupBy)(schemaPathKeys, (key) => key.split("/")[1]);
   const apiModules = Object.entries(keyToPaths).reduce((apiModules2, [name, paths]) => {
     const payloads = paths.reduce((payloads2, path) => {
       const pathItems = schemaPaths[path];
@@ -307,14 +339,14 @@ function renderApiModules(apiModules, options) {
           printWidth: 120
         }).then((content) => {
           const path = (0, import_path3.resolve)(output, `${apiModule.name}.${ts ? "ts" : "js"}`);
-          const shouldSkip = (!overrides || (0, import_rattail2.isArray)(overrides) && !overrides.includes(apiModule.name)) && import_fs_extra2.default.existsSync(path);
+          const shouldSkip = (!overrides || (0, import_rattail3.isArray)(overrides) && !overrides.includes(apiModule.name)) && import_fs_extra2.default.existsSync(path);
           if (shouldSkip) {
-            import_rslog.logger.warn(`File already exists, skip: ${path}`);
+            import_rslog2.logger.warn(`File already exists, skip: ${path}`);
             promiseResolve(content);
             return;
           }
           import_fs_extra2.default.outputFileSync(path, content);
-          import_rslog.logger.success(`Generated ${path}`);
+          import_rslog2.logger.success(`Generated ${path}`);
           promiseResolve(content);
         });
       })
@@ -326,11 +358,11 @@ async function generateTypes(schema, output, typesFilename) {
   const contents = (0, import_openapi_typescript.astToString)(ast);
   const typesFilepath = (0, import_path3.resolve)(CWD, output, typesFilename);
   import_fs_extra2.default.outputFileSync(typesFilepath, contents);
-  import_rslog.logger.success(`Generated ${typesFilepath}`);
+  import_rslog2.logger.success(`Generated ${typesFilepath}`);
 }
 async function generate(userOptions = {}) {
   const config = await getConfig();
-  const options = (0, import_rattail2.merge)(config, userOptions);
+  const options = (0, import_rattail3.merge)(config, userOptions);
   const {
     base,
     ts = true,
@@ -345,7 +377,7 @@ async function generate(userOptions = {}) {
   } = options;
   const mergedTransformer = { ...createTransformer(), ...transformer };
   const schema = await readSchema(input);
-  import_rslog.logger.info("Generating API modules...");
+  import_rslog2.logger.info("Generating API modules...");
   if (ts) {
     await generateTypes(schema, output, typesFilename);
   }
@@ -355,9 +387,9 @@ async function generate(userOptions = {}) {
     validateStatus
   });
   await renderApiModules(apiModules, { output, typesFilename, ts, typesOnly, overrides, preset });
-  import_rslog.logger.success("Done");
+  import_rslog2.logger.success("Done");
 }
-var import_path3, import_ejs, import_fs_extra2, import_openapi_typescript, import_prettier, import_rattail2, import_rslog;
+var import_path3, import_ejs, import_fs_extra2, import_openapi_typescript, import_prettier, import_rattail3, import_rslog2;
 var init_generate = __esm({
   "src/generate.ts"() {
     "use strict";
@@ -367,8 +399,8 @@ var init_generate = __esm({
     import_fs_extra2 = __toESM(require("fs-extra"), 1);
     import_openapi_typescript = __toESM(require("openapi-typescript"), 1);
     import_prettier = __toESM(require("prettier"), 1);
-    import_rattail2 = require("rattail");
-    import_rslog = require("rslog");
+    import_rattail3 = require("rattail");
+    import_rslog2 = require("rslog");
     init_config();
     init_constants();
     init_transformer();

package/dist/cli.js

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

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

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

package/dist/index.cjs

@@ -37,12 +37,15 @@ __export(index_exports, {
   generateTypes: () => generateTypes,
   getCliVersion: () => getCliVersion,
   getConfig: () => getConfig,
-  getValidResponseMetadataItems: () => getValidResponseMetadataItems,
+  getRequestBodyContentType: () => getRequestBodyContentType,
+  getResponseMetadataItems: () => getResponseMetadataItems,
   hasQueryParameter: () => hasQueryParameter,
+  isRemoteSchema: () => isRemoteSchema,
   isRequiredRequestBody: () => isRequiredRequestBody,
   partitionApiModules: () => partitionApiModules,
   pluralize: () => import_pluralize2.default,
   readSchema: () => readSchema,
+  readSchemaContent: () => readSchemaContent,
   readTemplateFile: () => readTemplateFile,
   renderApiModules: () => renderApiModules,
   transformEntity: () => transformEntity,
@@ -120,9 +123,10 @@ function transformTypeRequestBody({
 }
 function transformTypeRequestBodyValue({
   type,
-  required
+  required,
+  requestContentType
 }) {
-  return required ? `${type}['requestBody']['content']['application/json']` : `NonNullable<${type}['requestBody']>['content']['application/json'] | undefined`;
+  return required ? `${type}['requestBody']['content']['${requestContentType}']` : `NonNullable<${type}['requestBody']>['content']['${requestContentType}'] | undefined`;
 }
 function transformTypeResponseBody({
   type
@@ -133,7 +137,7 @@ function transformTypeResponseBodyValue({
   type,
   responseMetadataItems
 }) {
-  return responseMetadataItems.map(({ status, mime }) => `${type}['responses']['${status}']['content']['${mime}']`).join(" | ");
+  return responseMetadataItems.map(({ status, responseContentType }) => `${type}['responses']['${status}']['content']['${responseContentType}']`).join(" | ");
 }
 function createTransformer() {
   return {
@@ -159,8 +163,8 @@ var import_ejs = __toESM(require("ejs"), 1);
 var import_fs_extra2 = __toESM(require("fs-extra"), 1);
 var import_openapi_typescript = __toESM(require("openapi-typescript"), 1);
 var import_prettier = __toESM(require("prettier"), 1);
-var import_rattail2 = require("rattail");
-var import_rslog = require("rslog");
+var import_rattail3 = require("rattail");
+var import_rslog2 = require("rslog");
 
 // src/config.ts
 var import_unconfig = require("unconfig");
@@ -187,7 +191,10 @@ var SUPPORTED_HTTP_METHODS = ["get", "post", "put", "delete", "patch", "options"
 
 // src/utils.ts
 var import_path2 = require("path");
+var import_axle = require("@varlet/axle");
 var import_fs_extra = __toESM(require("fs-extra"), 1);
+var import_rattail2 = require("rattail");
+var import_rslog = require("rslog");
 var import_swagger2openapi = __toESM(require("swagger2openapi"), 1);
 var import_yaml = __toESM(require("yaml"), 1);
 function createStatusCodesByStrategy(strategy) {
@@ -222,13 +229,29 @@ function createStatusCodesByStrategy(strategy) {
   }[strategy];
 }
 async function readSchema(input) {
-  const isYaml = input.endsWith(".yaml");
-  const path = (0, import_path2.resolve)(CWD, input);
-  const content = import_fs_extra.default.readFileSync(path, "utf-8");
-  const swaggerOrOpenapiSchema = isYaml ? import_yaml.default.parse(content) : JSON.parse(content);
+  const content = await readSchemaContent(input);
+  const jsonSchema = (0, import_rattail2.tryParseJSON)(content);
+  const swaggerOrOpenapiSchema = jsonSchema ? jsonSchema : import_yaml.default.parse(content);
   const schema = swaggerOrOpenapiSchema.swagger ? (await import_swagger2openapi.default.convert(swaggerOrOpenapiSchema, {})).openapi : swaggerOrOpenapiSchema;
   return schema;
 }
+async function readSchemaContent(input) {
+  if (isRemoteSchema(input)) {
+    try {
+      import_rslog.logger.info("Fetching remote schema...");
+      const { data } = await (0, import_axle.createAxle)().get(input);
+      return JSON.stringify(data);
+    } catch {
+      throw new Error("Failed to fetch remote schema");
+    }
+  }
+  const path = (0, import_path2.resolve)(CWD, input);
+  const content = import_fs_extra.default.readFileSync(path, "utf-8");
+  return content;
+}
+function isRemoteSchema(path) {
+  return path.startsWith("http://") || path.startsWith("https://");
+}
 function readTemplateFile(preset = "axle") {
   if (import_fs_extra.default.existsSync(CUSTOM_TEMPLATE_FILE)) {
     return import_fs_extra.default.readFileSync(CUSTOM_TEMPLATE_FILE, "utf-8");
@@ -244,18 +267,27 @@ function getCliVersion() {
 function isRequiredRequestBody(value) {
   return "required" in value && value.required === true;
 }
-function getValidResponseMetadataItems(operation, validateStatus) {
+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;
+}
+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 results = validStatusResults.map((status) => {
-    const content = operation.responses?.[status]?.content;
-    const mime = content?.["application/json"] ? "application/json" : content?.["*/*"] ? "*/*" : void 0;
+  const metadataItems = validStatusResults.map((status) => {
+    const content = operation.responses?.[status]?.content ?? {};
+    const responseContentType = findResponseContentType(content);
     return {
       status,
-      mime
+      responseContentType
     };
-  }).filter((result) => result.mime);
-  return results;
+  }).filter((result) => result.responseContentType);
+  function findResponseContentType(content) {
+    return content["application/json"] ? "application/json" : content["*/*"] ? "*/*" : void 0;
+  }
+  return metadataItems;
 }
 
 // src/generate.ts
@@ -266,21 +298,23 @@ function transformPayloads(pathItems, options) {
     const args = { path, base, url, method, operation };
     const entity = transformer.entity(args);
     const verb = transformer.verb(args);
+    const requestContentType = operation.requestBody ? getRequestBodyContentType(operation.requestBody) : void 0;
+    const responseMetadataItems = getResponseMetadataItems(operation, validateStatus);
     const fn = transformer.fn({ ...args, verb, entity });
     const type = transformer.type({ ...args, verb, entity });
     const typeValue = transformer.typeValue({ ...args, verb, entity });
     const typeQuery = transformer.typeQuery({ ...args, type, verb, entity });
     const typeQueryValue = hasQueryParameter(operation) ? transformer.typeQueryValue({ ...args, type, verb, entity }) : "undefined";
     const typeRequestBody = transformer.typeRequestBody({ ...args, type, verb, entity });
-    const typeRequestBodyValue = operation.requestBody ? transformer.typeRequestBodyValue({
+    const typeRequestBodyValue = operation.requestBody && requestContentType ? transformer.typeRequestBodyValue({
       ...args,
       type,
       verb,
       entity,
-      required: isRequiredRequestBody(operation.requestBody)
+      required: isRequiredRequestBody(operation.requestBody),
+      requestContentType
     }) : "undefined";
     const typeResponseBody = transformer.typeResponseBody({ ...args, type, verb, entity });
-    const responseMetadataItems = getValidResponseMetadataItems(operation, validateStatus);
     const typeResponseBodyValue = responseMetadataItems.length > 0 ? transformer.typeResponseBodyValue({ ...args, type, verb, entity, responseMetadataItems }) : "undefined";
     payloads.push({
       fn,
@@ -288,6 +322,7 @@ function transformPayloads(pathItems, options) {
       method,
       verb,
       entity,
+      requestContentType,
       type,
       typeValue,
       typeQuery,
@@ -304,7 +339,7 @@ function partitionApiModules(schema, options) {
   const { base, transformer, validateStatus } = options;
   const schemaPaths = schema.paths ?? {};
   const schemaPathKeys = base ? Object.keys(schemaPaths).map((key) => key.replace(base, "")) : Object.keys(schemaPaths);
-  const keyToPaths = (0, import_rattail2.groupBy)(schemaPathKeys, (key) => key.split("/")[1]);
+  const keyToPaths = (0, import_rattail3.groupBy)(schemaPathKeys, (key) => key.split("/")[1]);
   const apiModules = Object.entries(keyToPaths).reduce((apiModules2, [name, paths]) => {
     const payloads = paths.reduce((payloads2, path) => {
       const pathItems = schemaPaths[path];
@@ -338,14 +373,14 @@ function renderApiModules(apiModules, options) {
           printWidth: 120
         }).then((content) => {
           const path = (0, import_path3.resolve)(output, `${apiModule.name}.${ts ? "ts" : "js"}`);
-          const shouldSkip = (!overrides || (0, import_rattail2.isArray)(overrides) && !overrides.includes(apiModule.name)) && import_fs_extra2.default.existsSync(path);
+          const shouldSkip = (!overrides || (0, import_rattail3.isArray)(overrides) && !overrides.includes(apiModule.name)) && import_fs_extra2.default.existsSync(path);
           if (shouldSkip) {
-            import_rslog.logger.warn(`File already exists, skip: ${path}`);
+            import_rslog2.logger.warn(`File already exists, skip: ${path}`);
             promiseResolve(content);
             return;
           }
           import_fs_extra2.default.outputFileSync(path, content);
-          import_rslog.logger.success(`Generated ${path}`);
+          import_rslog2.logger.success(`Generated ${path}`);
           promiseResolve(content);
         });
       })
@@ -357,11 +392,11 @@ async function generateTypes(schema, output, typesFilename) {
   const contents = (0, import_openapi_typescript.astToString)(ast);
   const typesFilepath = (0, import_path3.resolve)(CWD, output, typesFilename);
   import_fs_extra2.default.outputFileSync(typesFilepath, contents);
-  import_rslog.logger.success(`Generated ${typesFilepath}`);
+  import_rslog2.logger.success(`Generated ${typesFilepath}`);
 }
 async function generate(userOptions = {}) {
   const config = await getConfig();
-  const options = (0, import_rattail2.merge)(config, userOptions);
+  const options = (0, import_rattail3.merge)(config, userOptions);
   const {
     base,
     ts = true,
@@ -376,7 +411,7 @@ async function generate(userOptions = {}) {
   } = options;
   const mergedTransformer = { ...createTransformer(), ...transformer };
   const schema = await readSchema(input);
-  import_rslog.logger.info("Generating API modules...");
+  import_rslog2.logger.info("Generating API modules...");
   if (ts) {
     await generateTypes(schema, output, typesFilename);
   }
@@ -386,7 +421,7 @@ async function generate(userOptions = {}) {
     validateStatus
   });
   await renderApiModules(apiModules, { output, typesFilename, ts, typesOnly, overrides, preset });
-  import_rslog.logger.success("Done");
+  import_rslog2.logger.success("Done");
 }
 
 // src/index.ts
@@ -400,12 +435,15 @@ var import_pluralize2 = __toESM(require("pluralize"), 1);
   generateTypes,
   getCliVersion,
   getConfig,
-  getValidResponseMetadataItems,
+  getRequestBodyContentType,
+  getResponseMetadataItems,
   hasQueryParameter,
+  isRemoteSchema,
   isRequiredRequestBody,
   partitionApiModules,
   pluralize,
   readSchema,
+  readSchemaContent,
   readTemplateFile,
   renderApiModules,
   transformEntity,

package/dist/index.d.cts

@@ -38,15 +38,18 @@ declare function createStatusCodesByStrategy(strategy: StatusCodeStrategy): {
     head: number;
 };
 declare function readSchema(input: string): Promise<OpenAPI3>;
+declare function readSchemaContent(input: string): Promise<string>;
+declare function isRemoteSchema(path: string): boolean;
 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;
 type ResponseMetadataItem = {
     status: number;
-    mime: string;
+    responseContentType: string;
 };
-declare function getValidResponseMetadataItems(operation: OperationObject, validateStatus: (status: number) => boolean): ResponseMetadataItem[];
+declare function getResponseMetadataItems(operation: OperationObject, validateStatus: (status: number) => boolean): ResponseMetadataItem[];
 
 type TransformerBaseArgs = {
     path: string;
@@ -93,11 +96,12 @@ declare function transformTypeRequestBody({ type, }: {
     verb: string;
     entity: string;
 } & TransformerBaseArgs): string;
-declare function transformTypeRequestBodyValue({ type, required, }: {
+declare function transformTypeRequestBodyValue({ type, required, requestContentType, }: {
     type: string;
     verb: string;
     entity: string;
     required: boolean;
+    requestContentType: string;
 } & TransformerBaseArgs): string;
 declare function transformTypeResponseBody({ type, }: {
     type: string;
@@ -176,6 +180,10 @@ interface ApiModulePayload {
      * The entity name of the API endpoint, such as User, Comment, Post, etc.
      */
     entity: string;
+    /**
+     * The request content type of the API endpoint, such as 'application/json', 'application/x-www-form-urlencoded'.
+     */
+    requestContentType?: string;
     /**
      * The type name of the API endpoint, such as ApiGetUsers, ApiCreatePost, ApiUpdateComment, etc.
      */
@@ -285,4 +293,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, getValidResponseMetadataItems, hasQueryParameter, isRequiredRequestBody, partitionApiModules, readSchema, 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, 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

@@ -38,15 +38,18 @@ declare function createStatusCodesByStrategy(strategy: StatusCodeStrategy): {
     head: number;
 };
 declare function readSchema(input: string): Promise<OpenAPI3>;
+declare function readSchemaContent(input: string): Promise<string>;
+declare function isRemoteSchema(path: string): boolean;
 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;
 type ResponseMetadataItem = {
     status: number;
-    mime: string;
+    responseContentType: string;
 };
-declare function getValidResponseMetadataItems(operation: OperationObject, validateStatus: (status: number) => boolean): ResponseMetadataItem[];
+declare function getResponseMetadataItems(operation: OperationObject, validateStatus: (status: number) => boolean): ResponseMetadataItem[];
 
 type TransformerBaseArgs = {
     path: string;
@@ -93,11 +96,12 @@ declare function transformTypeRequestBody({ type, }: {
     verb: string;
     entity: string;
 } & TransformerBaseArgs): string;
-declare function transformTypeRequestBodyValue({ type, required, }: {
+declare function transformTypeRequestBodyValue({ type, required, requestContentType, }: {
     type: string;
     verb: string;
     entity: string;
     required: boolean;
+    requestContentType: string;
 } & TransformerBaseArgs): string;
 declare function transformTypeResponseBody({ type, }: {
     type: string;
@@ -176,6 +180,10 @@ interface ApiModulePayload {
      * The entity name of the API endpoint, such as User, Comment, Post, etc.
      */
     entity: string;
+    /**
+     * The request content type of the API endpoint, such as 'application/json', 'application/x-www-form-urlencoded'.
+     */
+    requestContentType?: string;
     /**
      * The type name of the API endpoint, such as ApiGetUsers, ApiCreatePost, ApiUpdateComment, etc.
      */
@@ -285,4 +293,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, getValidResponseMetadataItems, hasQueryParameter, isRequiredRequestBody, partitionApiModules, readSchema, 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, 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,16 +20,19 @@ import {
   transformTypeValue,
   transformUrl,
   transformVerb
-} from "./chunk-5YXY7GCE.js";
+} from "./chunk-GMB5TIVL.js";
 import {
   createStatusCodesByStrategy,
   getCliVersion,
-  getValidResponseMetadataItems,
+  getRequestBodyContentType,
+  getResponseMetadataItems,
   hasQueryParameter,
+  isRemoteSchema,
   isRequiredRequestBody,
   readSchema,
+  readSchemaContent,
   readTemplateFile
-} from "./chunk-NFK24PSA.js";
+} from "./chunk-PTGO2Y5X.js";
 
 // src/index.ts
 import { default as default2 } from "pluralize";
@@ -41,12 +44,15 @@ export {
   generateTypes,
   getCliVersion,
   getConfig,
-  getValidResponseMetadataItems,
+  getRequestBodyContentType,
+  getResponseMetadataItems,
   hasQueryParameter,
+  isRemoteSchema,
   isRequiredRequestBody,
   partitionApiModules,
   default2 as pluralize,
   readSchema,
+  readSchemaContent,
   readTemplateFile,
   renderApiModules,
   transformEntity,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api-farmer",
-  "version": "0.0.20",
+  "version": "0.0.21",
   "description": "API module generation tool based on Openapi3/Swagger2.",
   "keywords": [
     "cli",
@@ -49,7 +49,7 @@
   },
   "dependencies": {
     "@types/pluralize": "^0.0.33",
-    "@varlet/axle": "^0.10.1",
+    "@varlet/axle": "^0.10.3",
     "commander": "^13.0.0",
     "ejs": "^3.1.10",
     "fs-extra": "^11.2.0",

package/templates/axios.ejs

@@ -4,11 +4,16 @@
 
 <% if (!typesOnly) { %>
 <% apiModule.payloads.forEach(payload => { %> -%>
-export const <%- payload.fn %> = (config<% if (ts) { %>: RequestConfig<<%- payload.typeRequestBody %>> <% } %> = {}) 
-=> request<% if (ts) { %><any, <%- payload.typeResponseBody %>><% } %>({
+export const <%- payload.fn %> = (config<% if (ts) { %>: RequestConfig<<%- payload.typeQuery %>, <%- payload.typeRequestBody %>> <% } %> = {}) 
+=> request<% if (ts) { %><<%- payload.typeResponseBody %>><% } %>({
   url: '<%- payload.url %>', 
   method: '<%- payload.method %>',
-  ...config
+  ...config,
+  <% if (payload.requestContentType === 'application/x-www-form-urlencoded') { %>headers: {
+    'Content-Type': 'application/x-www-form-urlencoded',
+    ...config.headers,
+  },
+  <% } %>
 })
 
 <% }) %>

package/templates/axle.ejs

@@ -10,9 +10,11 @@ export const <%- payload.fn %> = api
   <%- payload.typeQuery %> 
 <% } else { %>
   <%- payload.typeRequestBody %> 
-<% } %>, <%- payload.typeRequestBody %>>
+<% } %>, 
+<%- payload.typeRequestBody %>>
 <% } %>
-('<%- payload.url %>', '<%- payload.method %>')
+('<%- payload.url %>', 
+<% if (payload.requestContentType === 'application/x-www-form-urlencoded' && payload.method === 'post') { %> 'postUrlEncode'<% } else { %> '<%- payload.method %>' <% } %>)
 
 <% }) %>
 <% } %>