api-farmer 0.0.12 → 0.0.14

package/README.md

@@ -36,8 +36,8 @@ import { defineConfig } from 'api-farmer'
 export default defineConfig({
   // openapi or swagger schema path, defaults './schema.json'
   input: './schema.yaml',
-  // generated codes output path, defaults './src/apis'
-  output: './src/apis',
+  // generated codes output path, defaults './src/apis/generated'
+  output: './src/apis/generated',
   // 'axle' or 'axios', defaults 'axle'.
   preset: 'axios',
 })
@@ -242,8 +242,8 @@ export interface ApiModulePayload {
    */
   typeQuery: string
   /**
-   * The value of the type of the query parameters of the API endpoint,
-   * such as ApiGetUsersQuery['parameters']['query'], ApiCreatePostQuery['parameters']['query'],
+   * The value of the type of the query parameters of the API endpoint, such as
+   * ApiGetUsersQuery['parameters']['query'], ApiCreatePostQuery['parameters']['query'],
    * ApiUpdateCommentQuery['parameters']['query'], etc.
    */
   typeQueryValue: string
@@ -253,8 +253,8 @@ export interface ApiModulePayload {
    */
   typeRequestBody: string
   /**
-   * The value of the type of the request body of the API endpoint,
-   * such as ApiGetUsersRequestBody['requestBody']['content']['application/json'],
+   * The value of the type of the request body of the API endpoint, such as
+   * ApiGetUsersRequestBody['requestBody']['content']['application/json'],
    * ApiCreatePostRequestBody['requestBody']['content']['application/json'],
    * ApiUpdateCommentRequestBody['requestBody']['content']['application/json'], etc.
    */

package/dist/{chunk-DVS6RR7Q.js → chunk-7HSWACLR.js}

@@ -7,7 +7,7 @@ import {
   isRequiredRequestBody,
   readSchema,
   readTemplateFile
-} from "./chunk-IYZKIOO6.js";
+} from "./chunk-LYOTF4II.js";
 import {
   __export
 } from "./chunk-6OIOYGN7.js";
@@ -22838,7 +22838,7 @@ function transformPayloads(pathItems, options8) {
     const type2 = transformer.type({ ...args, verb, entity });
     const typeValue = transformer.typeValue({ ...args, verb, entity });
     const typeQuery = transformer.typeQuery({ ...args, type: type2, verb, entity });
-    const typeQueryValue = hasQueryParameter(operation) ? transformer.typeQueryValue({ ...args, type: type2, verb, entity }) : "never";
+    const typeQueryValue = hasQueryParameter(operation) ? transformer.typeQueryValue({ ...args, type: type2, verb, entity }) : "undefined";
     const typeRequestBody = transformer.typeRequestBody({ ...args, type: type2, verb, entity });
     const typeRequestBodyValue = operation.requestBody ? transformer.typeRequestBodyValue({
       ...args,
@@ -22846,14 +22846,14 @@ function transformPayloads(pathItems, options8) {
       verb,
       entity,
       required: isRequiredRequestBody(operation.requestBody)
-    }) : "never";
+    }) : "undefined";
     const { mime, statusCode } = doStatusCodeStrategy(
       operation,
       statusCodes[method] ?? 200,
       statusCodeStrategy
     );
     const typeResponseBody = transformer.typeResponseBody({ ...args, type: type2, verb, entity });
-    const typeResponseBodyValue = mime && statusCode ? transformer.typeResponseBodyValue({ ...args, type: type2, verb, entity, statusCode, mime }) : "never";
+    const typeResponseBodyValue = mime && statusCode ? transformer.typeResponseBodyValue({ ...args, type: type2, verb, entity, statusCode, mime }) : "undefined";
     payloads.push({
       fn,
       url: url2,
@@ -22938,8 +22938,8 @@ async function generate(userOptions = {}) {
     preset = "axle",
     statusCodeStrategy = "smart",
     input = "./schema.json",
-    output = "./src/apis",
-    typesFilename = "types.generated.ts",
+    output = "./src/apis/generated",
+    typesFilename = "_types.ts",
     transformer = {}
   } = options8;
   const statusCodes = {

package/dist/{chunk-IYZKIOO6.js → chunk-LYOTF4II.js}

@@ -71,7 +71,7 @@ function isRequiredRequestBody(value) {
 function doStatusCodeStrategy(operation, statusCode, strategy) {
   if (strategy === "smart") {
     const responses = operation.responses ?? {};
-    const codeKey = Object.keys(responses).sort((a, b) => Number(a) - Number(b)).find((codeKey2) => Number(codeKey2) >= statusCode && Number(codeKey2) <= 299);
+    const codeKey = Object.keys(responses).sort((a, b) => Number(a) - Number(b)).find((codeKey2) => Number(codeKey2) >= 200 && Number(codeKey2) <= 299);
     if (!codeKey) {
       return {
         statusCode: void 0,

package/dist/cli.cjs

@@ -112,7 +112,7 @@ function isRequiredRequestBody(value) {
 function doStatusCodeStrategy(operation, statusCode, strategy) {
   if (strategy === "smart") {
     const responses = operation.responses ?? {};
-    const codeKey = Object.keys(responses).sort((a5, b8) => Number(a5) - Number(b8)).find((codeKey2) => Number(codeKey2) >= statusCode && Number(codeKey2) <= 299);
+    const codeKey = Object.keys(responses).sort((a5, b8) => Number(a5) - Number(b8)).find((codeKey2) => Number(codeKey2) >= 200 && Number(codeKey2) <= 299);
     if (!codeKey) {
       return {
         statusCode: void 0,
@@ -102139,7 +102139,7 @@ function transformPayloads(pathItems, options8) {
     const type2 = transformer.type({ ...args, verb, entity });
     const typeValue = transformer.typeValue({ ...args, verb, entity });
     const typeQuery = transformer.typeQuery({ ...args, type: type2, verb, entity });
-    const typeQueryValue = hasQueryParameter(operation) ? transformer.typeQueryValue({ ...args, type: type2, verb, entity }) : "never";
+    const typeQueryValue = hasQueryParameter(operation) ? transformer.typeQueryValue({ ...args, type: type2, verb, entity }) : "undefined";
     const typeRequestBody = transformer.typeRequestBody({ ...args, type: type2, verb, entity });
     const typeRequestBodyValue = operation.requestBody ? transformer.typeRequestBodyValue({
       ...args,
@@ -102147,14 +102147,14 @@ function transformPayloads(pathItems, options8) {
       verb,
       entity,
       required: isRequiredRequestBody(operation.requestBody)
-    }) : "never";
+    }) : "undefined";
     const { mime, statusCode } = doStatusCodeStrategy(
       operation,
       statusCodes[method] ?? 200,
       statusCodeStrategy
     );
     const typeResponseBody = transformer.typeResponseBody({ ...args, type: type2, verb, entity });
-    const typeResponseBodyValue = mime && statusCode ? transformer.typeResponseBodyValue({ ...args, type: type2, verb, entity, statusCode, mime }) : "never";
+    const typeResponseBodyValue = mime && statusCode ? transformer.typeResponseBodyValue({ ...args, type: type2, verb, entity, statusCode, mime }) : "undefined";
     payloads.push({
       fn: fn8,
       url: url2,
@@ -102239,8 +102239,8 @@ async function generate(userOptions = {}) {
     preset = "axle",
     statusCodeStrategy = "smart",
     input = "./schema.json",
-    output = "./src/apis",
-    typesFilename = "types.generated.ts",
+    output = "./src/apis/generated",
+    typesFilename = "_types.ts",
     transformer = {}
   } = options8;
   const statusCodes = {

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   getCliVersion
-} from "./chunk-IYZKIOO6.js";
+} from "./chunk-LYOTF4II.js";
 import "./chunk-6OIOYGN7.js";
 
 // src/cli.ts
@@ -9,7 +9,7 @@ import { Command } from "commander";
 var program = new Command();
 program.version(getCliVersion());
 program.action(async () => {
-  const { generate } = await import("./generate-T2F6BJAQ.js");
+  const { generate } = await import("./generate-2D36YQRL.js");
   return generate();
 });
 program.parse();

package/dist/{generate-T2F6BJAQ.js → generate-2D36YQRL.js}

@@ -4,8 +4,8 @@ import {
   partitionApiModules,
   renderApiModules,
   transformPayloads
-} from "./chunk-DVS6RR7Q.js";
-import "./chunk-IYZKIOO6.js";
+} from "./chunk-7HSWACLR.js";
+import "./chunk-LYOTF4II.js";
 import "./chunk-6OIOYGN7.js";
 export {
   generate,

package/dist/index.cjs

@@ -102148,7 +102148,7 @@ function isRequiredRequestBody(value) {
 function doStatusCodeStrategy(operation, statusCode, strategy) {
   if (strategy === "smart") {
     const responses = operation.responses ?? {};
-    const codeKey = Object.keys(responses).sort((a5, b8) => Number(a5) - Number(b8)).find((codeKey2) => Number(codeKey2) >= statusCode && Number(codeKey2) <= 299);
+    const codeKey = Object.keys(responses).sort((a5, b8) => Number(a5) - Number(b8)).find((codeKey2) => Number(codeKey2) >= 200 && Number(codeKey2) <= 299);
     if (!codeKey) {
       return {
         statusCode: void 0,
@@ -102177,7 +102177,7 @@ function transformPayloads(pathItems, options8) {
     const type2 = transformer.type({ ...args, verb, entity });
     const typeValue = transformer.typeValue({ ...args, verb, entity });
     const typeQuery = transformer.typeQuery({ ...args, type: type2, verb, entity });
-    const typeQueryValue = hasQueryParameter(operation) ? transformer.typeQueryValue({ ...args, type: type2, verb, entity }) : "never";
+    const typeQueryValue = hasQueryParameter(operation) ? transformer.typeQueryValue({ ...args, type: type2, verb, entity }) : "undefined";
     const typeRequestBody = transformer.typeRequestBody({ ...args, type: type2, verb, entity });
     const typeRequestBodyValue = operation.requestBody ? transformer.typeRequestBodyValue({
       ...args,
@@ -102185,14 +102185,14 @@ function transformPayloads(pathItems, options8) {
       verb,
       entity,
       required: isRequiredRequestBody(operation.requestBody)
-    }) : "never";
+    }) : "undefined";
     const { mime, statusCode } = doStatusCodeStrategy(
       operation,
       statusCodes[method] ?? 200,
       statusCodeStrategy
     );
     const typeResponseBody = transformer.typeResponseBody({ ...args, type: type2, verb, entity });
-    const typeResponseBodyValue = mime && statusCode ? transformer.typeResponseBodyValue({ ...args, type: type2, verb, entity, statusCode, mime }) : "never";
+    const typeResponseBodyValue = mime && statusCode ? transformer.typeResponseBodyValue({ ...args, type: type2, verb, entity, statusCode, mime }) : "undefined";
     payloads.push({
       fn: fn8,
       url: url2,
@@ -102277,8 +102277,8 @@ async function generate(userOptions = {}) {
     preset = "axle",
     statusCodeStrategy = "smart",
     input = "./schema.json",
-    output = "./src/apis",
-    typesFilename = "types.generated.ts",
+    output = "./src/apis/generated",
+    typesFilename = "_types.ts",
     transformer = {}
   } = options8;
   const statusCodes = {

package/dist/index.js

@@ -20,7 +20,7 @@ import {
   transformTypeValue,
   transformUrl,
   transformVerb
-} from "./chunk-DVS6RR7Q.js";
+} from "./chunk-7HSWACLR.js";
 import {
   createStatusCodesByStrategy,
   doStatusCodeStrategy,
@@ -29,7 +29,7 @@ import {
   isRequiredRequestBody,
   readSchema,
   readTemplateFile
-} from "./chunk-IYZKIOO6.js";
+} from "./chunk-LYOTF4II.js";
 import "./chunk-6OIOYGN7.js";
 
 // src/index.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api-farmer",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "description": "API module generation tool based on Openapi3/Swagger2.",
   "keywords": [
     "cli",
@@ -89,6 +89,6 @@
     "dev": "tsup src/index.ts src/cli.ts --format esm,cjs --watch --dts --shims",
     "format": "prettier --write .",
     "lint": "eslint . --fix",
-    "release": "vr release"
+    "release": "pnpm build && vr release"
   }
 }