api-farmer 0.0.25 → 0.0.26-alpha.1743347452766

package/dist/{chunk-KEUG7T6E.js → chunk-3VOSIUFI.js}

@@ -16,7 +16,7 @@ var SUPPORTED_HTTP_METHODS = ["get", "post", "put", "delete", "patch", "options"
 import { resolve as resolve2 } from "path";
 import { createAxle } from "@varlet/axle";
 import fse from "fs-extra";
-import { tryParseJSON } from "rattail";
+import { isObject, isPlainObject, tryParseJSON } from "rattail";
 import { logger } from "rslog";
 import swagger from "swagger2openapi";
 import yaml from "yaml";
@@ -56,8 +56,31 @@ async function readSchema(input) {
   const jsonSchema = tryParseJSON(content);
   const swaggerOrOpenapiSchema = jsonSchema ? jsonSchema : yaml.parse(content);
   const schema = swaggerOrOpenapiSchema.swagger ? (await swagger.convert(swaggerOrOpenapiSchema, {})).openapi : swaggerOrOpenapiSchema;
+  unrefSchema(schema, schema);
   return schema;
 }
+function unrefSchema(node, schema) {
+  if (!isObject(node)) {
+    return;
+  }
+  for (const [key, value] of Object.entries(node)) {
+    if (!isPlainObject(value) || !value.$ref || !value.$ref.startsWith("#/")) {
+      unrefSchema(value, schema);
+      continue;
+    }
+    const refNode = getSchemaNode(schema, value.$ref.slice(2));
+    if (refNode) {
+      node[key] = refNode;
+      unrefSchema(node, schema);
+    } else {
+      logger.warn(`Unresolved reference: ${value.$ref}`);
+    }
+  }
+}
+function getSchemaNode(schema, path2) {
+  const paths = path2.split("/");
+  return paths.reduce((node, path3) => node[path3], schema);
+}
 async function readSchemaContent(input) {
   if (isRemoteSchema(input)) {
     try {
@@ -118,6 +141,8 @@ export {
   SUPPORTED_HTTP_METHODS,
   createStatusCodesByStrategy,
   readSchema,
+  unrefSchema,
+  getSchemaNode,
   readSchemaContent,
   isRemoteSchema,
   readTemplateFile,

package/dist/{chunk-AHZLGQI5.js → chunk-JQIHZEB4.js}

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

package/dist/cli.cjs

@@ -57,8 +57,31 @@ async function readSchema(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;
+  unrefSchema(schema, schema);
   return schema;
 }
+function unrefSchema(node, schema) {
+  if (!(0, import_rattail.isObject)(node)) {
+    return;
+  }
+  for (const [key, value] of Object.entries(node)) {
+    if (!(0, import_rattail.isPlainObject)(value) || !value.$ref || !value.$ref.startsWith("#/")) {
+      unrefSchema(value, schema);
+      continue;
+    }
+    const refNode = getSchemaNode(schema, value.$ref.slice(2));
+    if (refNode) {
+      node[key] = refNode;
+      unrefSchema(node, schema);
+    } else {
+      import_rslog.logger.warn(`Unresolved reference: ${value.$ref}`);
+    }
+  }
+}
+function getSchemaNode(schema, path) {
+  const paths = path.split("/");
+  return paths.reduce((node, path2) => node[path2], schema);
+}
 async function readSchemaContent(input) {
   if (isRemoteSchema(input)) {
     try {

package/dist/cli.js

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

package/dist/{generate-UUTBYLAG.js → generate-KVWODGEV.js}

@@ -4,8 +4,8 @@ import {
   partitionApiModules,
   renderApiModules,
   transformPayloads
-} from "./chunk-AHZLGQI5.js";
-import "./chunk-KEUG7T6E.js";
+} from "./chunk-JQIHZEB4.js";
+import "./chunk-3VOSIUFI.js";
 export {
   generate,
   generateTypes,

package/dist/index.cjs

@@ -40,6 +40,7 @@ __export(index_exports, {
   getConfig: () => getConfig,
   getRequestBodyContentType: () => getRequestBodyContentType,
   getResponseMetadataItems: () => getResponseMetadataItems,
+  getSchemaNode: () => getSchemaNode,
   hasQueryParameter: () => hasQueryParameter,
   isRemoteSchema: () => isRemoteSchema,
   isRequiredRequestBody: () => isRequiredRequestBody,
@@ -62,7 +63,8 @@ __export(index_exports, {
   transformTypeResponseBodyValue: () => transformTypeResponseBodyValue,
   transformTypeValue: () => transformTypeValue,
   transformUrl: () => transformUrl,
-  transformVerb: () => transformVerb
+  transformVerb: () => transformVerb,
+  unrefSchema: () => unrefSchema
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -236,8 +238,31 @@ async function readSchema(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;
+  unrefSchema(schema, schema);
   return schema;
 }
+function unrefSchema(node, schema) {
+  if (!(0, import_rattail2.isObject)(node)) {
+    return;
+  }
+  for (const [key, value] of Object.entries(node)) {
+    if (!(0, import_rattail2.isPlainObject)(value) || !value.$ref || !value.$ref.startsWith("#/")) {
+      unrefSchema(value, schema);
+      continue;
+    }
+    const refNode = getSchemaNode(schema, value.$ref.slice(2));
+    if (refNode) {
+      node[key] = refNode;
+      unrefSchema(node, schema);
+    } else {
+      import_rslog.logger.warn(`Unresolved reference: ${value.$ref}`);
+    }
+  }
+}
+function getSchemaNode(schema, path) {
+  const paths = path.split("/");
+  return paths.reduce((node, path2) => node[path2], schema);
+}
 async function readSchemaContent(input) {
   if (isRemoteSchema(input)) {
     try {
@@ -449,6 +474,7 @@ var import_pluralize2 = __toESM(require("pluralize"), 1);
   getConfig,
   getRequestBodyContentType,
   getResponseMetadataItems,
+  getSchemaNode,
   hasQueryParameter,
   isRemoteSchema,
   isRequiredRequestBody,
@@ -471,5 +497,6 @@ var import_pluralize2 = __toESM(require("pluralize"), 1);
   transformTypeResponseBodyValue,
   transformTypeValue,
   transformUrl,
-  transformVerb
+  transformVerb,
+  unrefSchema
 });

package/dist/index.d.cts

@@ -38,6 +38,8 @@ declare function createStatusCodesByStrategy(strategy: StatusCodeStrategy): {
     head: number;
 };
 declare function readSchema(input: string): Promise<OpenAPI3>;
+declare function unrefSchema(node: Record<string, any> | any[], schema: OpenAPI3): void;
+declare function getSchemaNode(schema: OpenAPI3, path: string): any;
 declare function readSchemaContent(input: string): Promise<string>;
 declare function isRemoteSchema(path: string): boolean;
 declare function readTemplateFile(preset?: Preset): string;
@@ -301,4 +303,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, 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 };
+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, getSchemaNode, hasQueryParameter, isRemoteSchema, isRequiredRequestBody, partitionApiModules, readSchema, readSchemaContent, readTemplateFile, renderApiModules, transformEntity, transformFn, transformModuleName, transformPayloads, transformType, transformTypeQuery, transformTypeQueryValue, transformTypeRequestBody, transformTypeRequestBodyValue, transformTypeResponseBody, transformTypeResponseBodyValue, transformTypeValue, transformUrl, transformVerb, unrefSchema };

package/dist/index.d.ts

@@ -38,6 +38,8 @@ declare function createStatusCodesByStrategy(strategy: StatusCodeStrategy): {
     head: number;
 };
 declare function readSchema(input: string): Promise<OpenAPI3>;
+declare function unrefSchema(node: Record<string, any> | any[], schema: OpenAPI3): void;
+declare function getSchemaNode(schema: OpenAPI3, path: string): any;
 declare function readSchemaContent(input: string): Promise<string>;
 declare function isRemoteSchema(path: string): boolean;
 declare function readTemplateFile(preset?: Preset): string;
@@ -301,4 +303,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, 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 };
+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, getSchemaNode, hasQueryParameter, isRemoteSchema, isRequiredRequestBody, partitionApiModules, readSchema, readSchemaContent, readTemplateFile, renderApiModules, transformEntity, transformFn, transformModuleName, transformPayloads, transformType, transformTypeQuery, transformTypeQueryValue, transformTypeRequestBody, transformTypeRequestBodyValue, transformTypeResponseBody, transformTypeResponseBodyValue, transformTypeValue, transformUrl, transformVerb, unrefSchema };

package/dist/index.js

@@ -20,20 +20,22 @@ import {
   transformTypeValue,
   transformUrl,
   transformVerb
-} from "./chunk-AHZLGQI5.js";
+} from "./chunk-JQIHZEB4.js";
 import {
   createStatusCodesByStrategy,
   findObjectKey,
   getCliVersion,
   getRequestBodyContentType,
   getResponseMetadataItems,
+  getSchemaNode,
   hasQueryParameter,
   isRemoteSchema,
   isRequiredRequestBody,
   readSchema,
   readSchemaContent,
-  readTemplateFile
-} from "./chunk-KEUG7T6E.js";
+  readTemplateFile,
+  unrefSchema
+} from "./chunk-3VOSIUFI.js";
 
 // src/index.ts
 import { default as default2 } from "pluralize";
@@ -48,6 +50,7 @@ export {
   getConfig,
   getRequestBodyContentType,
   getResponseMetadataItems,
+  getSchemaNode,
   hasQueryParameter,
   isRemoteSchema,
   isRequiredRequestBody,
@@ -70,5 +73,6 @@ export {
   transformTypeResponseBodyValue,
   transformTypeValue,
   transformUrl,
-  transformVerb
+  transformVerb,
+  unrefSchema
 };

package/package.json

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