api-farmer 0.0.26 → 0.0.28

package/dist/{chunk-POFI6LCY.js → chunk-XM2F7GOE.js}

@@ -39,8 +39,8 @@ import { camelize, pascalCase } from "rattail";
 function transformModuleName({ name }) {
   return camelize(name);
 }
-function transformUrl({ path, base }) {
-  return (base ? path.replace(base, "") : path).replace(/{/g, ":").replace(/}/g, "");
+function transformUrl({ path }) {
+  return path.replace(/{/g, ":").replace(/}/g, "");
 }
 function transformVerb({ method }) {
   switch (method) {
@@ -52,8 +52,7 @@ function transformVerb({ method }) {
       return pascalCase(method);
   }
 }
-function transformEntity({ path, method, base, uncountableNouns }) {
-  path = base ? path.replace(base, "") : path;
+function transformEntity({ path, method, uncountableNouns }) {
   const words = path.split("/").filter(Boolean);
   return words.reduce((entity, word, index) => {
     if (word.includes("{")) {
@@ -75,8 +74,8 @@ function transformFn({ verb, entity }) {
 function transformType({ verb, entity }) {
   return `Api${verb}${entity}`;
 }
-function transformTypeValue({ path, method }) {
-  return `paths['${path}']['${method}']`;
+function transformTypeValue({ fullPath, method }) {
+  return `paths['${fullPath}']['${method}']`;
 }
 function transformTypeQuery({ type }) {
   return `${type}Query`;
@@ -129,10 +128,10 @@ function createTransformer() {
 
 // src/generate.ts
 function transformPayloads(pathItems, options) {
-  const { transformer, path, base, uncountableNouns, validateStatus } = options;
+  const { transformer, path, fullPath, 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, uncountableNouns, operation };
+    const url = transformer.url({ path, base, fullPath });
+    const args = { path, base, fullPath, url, method, uncountableNouns, operation };
     const entity = transformer.entity(args);
     const verb = transformer.verb(args);
     const requestContentType = operation.requestBody ? getRequestBodyContentType(operation.requestBody) : void 0;
@@ -179,11 +178,13 @@ function partitionApiModules(schema, options) {
   const keyToPaths = 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];
+      const fullPath = base ? base + path : path;
+      const pathItems = schemaPaths[fullPath];
       payloads2.push(
         ...transformPayloads(pathItems, {
           ...options,
-          path: base ? base + path : path,
+          path,
+          fullPath,
           transformer,
           uncountableNouns,
           validateStatus
@@ -231,7 +232,9 @@ function renderApiModules(apiModules, options) {
   );
 }
 async function generateTypes(schema, output, typesFilename) {
-  const ast = await openapiTS(schema);
+  const ast = await openapiTS(schema, {
+    defaultNonNullable: false
+  });
   const contents = astToString(ast);
   const typesFilepath = resolve(CWD, output, typesFilename);
   fse.outputFileSync(typesFilepath, contents);

package/dist/cli.cjs

@@ -150,8 +150,8 @@ var init_config = __esm({
 function transformModuleName({ name }) {
   return (0, import_rattail2.camelize)(name);
 }
-function transformUrl({ path, base }) {
-  return (base ? path.replace(base, "") : path).replace(/{/g, ":").replace(/}/g, "");
+function transformUrl({ path }) {
+  return path.replace(/{/g, ":").replace(/}/g, "");
 }
 function transformVerb({ method }) {
   switch (method) {
@@ -163,8 +163,7 @@ function transformVerb({ method }) {
       return (0, import_rattail2.pascalCase)(method);
   }
 }
-function transformEntity({ path, method, base, uncountableNouns }) {
-  path = base ? path.replace(base, "") : path;
+function transformEntity({ path, method, uncountableNouns }) {
   const words = path.split("/").filter(Boolean);
   return words.reduce((entity, word, index) => {
     if (word.includes("{")) {
@@ -186,8 +185,8 @@ function transformFn({ verb, entity }) {
 function transformType({ verb, entity }) {
   return `Api${verb}${entity}`;
 }
-function transformTypeValue({ path, method }) {
-  return `paths['${path}']['${method}']`;
+function transformTypeValue({ fullPath, method }) {
+  return `paths['${fullPath}']['${method}']`;
 }
 function transformTypeQuery({ type }) {
   return `${type}Query`;
@@ -257,10 +256,10 @@ __export(generate_exports, {
   transformPayloads: () => transformPayloads
 });
 function transformPayloads(pathItems, options) {
-  const { transformer, path, base, uncountableNouns, validateStatus } = options;
+  const { transformer, path, fullPath, 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, uncountableNouns, operation };
+    const url = transformer.url({ path, base, fullPath });
+    const args = { path, base, fullPath, url, method, uncountableNouns, operation };
     const entity = transformer.entity(args);
     const verb = transformer.verb(args);
     const requestContentType = operation.requestBody ? getRequestBodyContentType(operation.requestBody) : void 0;
@@ -307,11 +306,13 @@ function partitionApiModules(schema, options) {
   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];
+      const fullPath = base ? base + path : path;
+      const pathItems = schemaPaths[fullPath];
       payloads2.push(
         ...transformPayloads(pathItems, {
           ...options,
-          path: base ? base + path : path,
+          path,
+          fullPath,
           transformer,
           uncountableNouns,
           validateStatus
@@ -359,7 +360,9 @@ function renderApiModules(apiModules, options) {
   );
 }
 async function generateTypes(schema, output, typesFilename) {
-  const ast = await (0, import_openapi_typescript.default)(schema);
+  const ast = await (0, import_openapi_typescript.default)(schema, {
+    defaultNonNullable: false
+  });
   const contents = (0, import_openapi_typescript.astToString)(ast);
   const typesFilepath = (0, import_path3.resolve)(CWD, output, typesFilename);
   import_fs_extra2.default.outputFileSync(typesFilepath, contents);

package/dist/cli.js

@@ -8,7 +8,7 @@ import { Command } from "commander";
 var program = new Command();
 program.version(getCliVersion());
 program.action(async () => {
-  const { generate } = await import("./generate-KSN6M7JH.js");
+  const { generate } = await import("./generate-NRJ4NQ4O.js");
   return generate();
 });
 program.parse();

package/dist/{generate-KSN6M7JH.js → generate-NRJ4NQ4O.js}

@@ -4,7 +4,7 @@ import {
   partitionApiModules,
   renderApiModules,
   transformPayloads
-} from "./chunk-POFI6LCY.js";
+} from "./chunk-XM2F7GOE.js";
 import "./chunk-56NOW5DM.js";
 export {
   generate,

package/dist/index.cjs

@@ -72,8 +72,8 @@ var import_rattail = require("rattail");
 function transformModuleName({ name }) {
   return (0, import_rattail.camelize)(name);
 }
-function transformUrl({ path, base }) {
-  return (base ? path.replace(base, "") : path).replace(/{/g, ":").replace(/}/g, "");
+function transformUrl({ path }) {
+  return path.replace(/{/g, ":").replace(/}/g, "");
 }
 function transformVerb({ method }) {
   switch (method) {
@@ -85,8 +85,7 @@ function transformVerb({ method }) {
       return (0, import_rattail.pascalCase)(method);
   }
 }
-function transformEntity({ path, method, base, uncountableNouns }) {
-  path = base ? path.replace(base, "") : path;
+function transformEntity({ path, method, uncountableNouns }) {
   const words = path.split("/").filter(Boolean);
   return words.reduce((entity, word, index) => {
     if (word.includes("{")) {
@@ -108,8 +107,8 @@ function transformFn({ verb, entity }) {
 function transformType({ verb, entity }) {
   return `Api${verb}${entity}`;
 }
-function transformTypeValue({ path, method }) {
-  return `paths['${path}']['${method}']`;
+function transformTypeValue({ fullPath, method }) {
+  return `paths['${fullPath}']['${method}']`;
 }
 function transformTypeQuery({ type }) {
   return `${type}Query`;
@@ -296,10 +295,10 @@ function getResponseMetadataItems(operation, validateStatus) {
 
 // src/generate.ts
 function transformPayloads(pathItems, options) {
-  const { transformer, path, base, uncountableNouns, validateStatus } = options;
+  const { transformer, path, fullPath, 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, uncountableNouns, operation };
+    const url = transformer.url({ path, base, fullPath });
+    const args = { path, base, fullPath, url, method, uncountableNouns, operation };
     const entity = transformer.entity(args);
     const verb = transformer.verb(args);
     const requestContentType = operation.requestBody ? getRequestBodyContentType(operation.requestBody) : void 0;
@@ -346,11 +345,13 @@ function partitionApiModules(schema, options) {
   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];
+      const fullPath = base ? base + path : path;
+      const pathItems = schemaPaths[fullPath];
       payloads2.push(
         ...transformPayloads(pathItems, {
           ...options,
-          path: base ? base + path : path,
+          path,
+          fullPath,
           transformer,
           uncountableNouns,
           validateStatus
@@ -398,7 +399,9 @@ function renderApiModules(apiModules, options) {
   );
 }
 async function generateTypes(schema, output, typesFilename) {
-  const ast = await (0, import_openapi_typescript.default)(schema);
+  const ast = await (0, import_openapi_typescript.default)(schema, {
+    defaultNonNullable: false
+  });
   const contents = (0, import_openapi_typescript.astToString)(ast);
   const typesFilepath = (0, import_path3.resolve)(CWD, output, typesFilename);
   import_fs_extra2.default.outputFileSync(typesFilepath, contents);

package/dist/index.d.cts

@@ -54,6 +54,7 @@ declare function getResponseMetadataItems(operation: OperationObject, validateSt
 
 type TransformerBaseArgs = {
     path: string;
+    fullPath: string;
     base: string | undefined;
     url: string;
     method: string;
@@ -63,14 +64,15 @@ type TransformerBaseArgs = {
 declare function transformModuleName({ name }: {
     name: string;
 }): string;
-declare function transformUrl({ path, base }: {
+declare function transformUrl({ path }: {
     path: string;
+    fullPath: string;
     base: string | undefined;
 }): string;
 declare function transformVerb({ method }: {
     method: string;
 }): string;
-declare function transformEntity({ path, method, base, uncountableNouns }: TransformerBaseArgs): string;
+declare function transformEntity({ path, method, uncountableNouns }: TransformerBaseArgs): string;
 declare function transformFn({ verb, entity }: {
     verb: string;
     entity: string;
@@ -79,7 +81,7 @@ declare function transformType({ verb, entity }: {
     verb: string;
     entity: string;
 } & TransformerBaseArgs): string;
-declare function transformTypeValue({ path, method }: {
+declare function transformTypeValue({ fullPath, method }: {
     verb: string;
     entity: string;
 } & TransformerBaseArgs): string;
@@ -275,8 +277,9 @@ interface GenerateOptions {
 }
 declare function transformPayloads(pathItems: Record<string, OperationObject>, options: {
     path: string;
-    transformer: Transformer;
+    fullPath: string;
     base: string | undefined;
+    transformer: Transformer;
     uncountableNouns: string[];
     validateStatus: (status: number) => boolean;
 }): ApiModulePayload[];

package/dist/index.d.ts

@@ -54,6 +54,7 @@ declare function getResponseMetadataItems(operation: OperationObject, validateSt
 
 type TransformerBaseArgs = {
     path: string;
+    fullPath: string;
     base: string | undefined;
     url: string;
     method: string;
@@ -63,14 +64,15 @@ type TransformerBaseArgs = {
 declare function transformModuleName({ name }: {
     name: string;
 }): string;
-declare function transformUrl({ path, base }: {
+declare function transformUrl({ path }: {
     path: string;
+    fullPath: string;
     base: string | undefined;
 }): string;
 declare function transformVerb({ method }: {
     method: string;
 }): string;
-declare function transformEntity({ path, method, base, uncountableNouns }: TransformerBaseArgs): string;
+declare function transformEntity({ path, method, uncountableNouns }: TransformerBaseArgs): string;
 declare function transformFn({ verb, entity }: {
     verb: string;
     entity: string;
@@ -79,7 +81,7 @@ declare function transformType({ verb, entity }: {
     verb: string;
     entity: string;
 } & TransformerBaseArgs): string;
-declare function transformTypeValue({ path, method }: {
+declare function transformTypeValue({ fullPath, method }: {
     verb: string;
     entity: string;
 } & TransformerBaseArgs): string;
@@ -275,8 +277,9 @@ interface GenerateOptions {
 }
 declare function transformPayloads(pathItems: Record<string, OperationObject>, options: {
     path: string;
-    transformer: Transformer;
+    fullPath: string;
     base: string | undefined;
+    transformer: Transformer;
     uncountableNouns: string[];
     validateStatus: (status: number) => boolean;
 }): ApiModulePayload[];

package/dist/index.js

@@ -20,7 +20,7 @@ import {
   transformTypeValue,
   transformUrl,
   transformVerb
-} from "./chunk-POFI6LCY.js";
+} from "./chunk-XM2F7GOE.js";
 import {
   createStatusCodesByStrategy,
   findObjectKey,

package/package.json

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