@keq-request/cli 5.0.0-alpha.23 → 5.0.0-alpha.25

package/dist/cli.js

@@ -124,29 +124,8 @@ var IgnoreMatcher = class _IgnoreMatcher {
   }
 };
 
-// src/types/qs.ts
-import { Type } from "@sinclair/typebox";
-
-// src/constants/qs-array-format.ts
-var QsArrayFormat = /* @__PURE__ */ ((QsArrayFormat2) => {
-  QsArrayFormat2["brackets"] = "brackets";
-  QsArrayFormat2["indices"] = "indices";
-  QsArrayFormat2["repeat"] = "repeat";
-  QsArrayFormat2["comma"] = "comma";
-  QsArrayFormat2["space"] = "space";
-  QsArrayFormat2["pipe"] = "pipe";
-  return QsArrayFormat2;
-})(QsArrayFormat || {});
-
-// src/types/qs.ts
-var Qs = Type.Object({
-  indices: Type.Optional(Type.Boolean()),
-  arrayFormat: Type.Optional(Type.Enum(QsArrayFormat)),
-  allowDots: Type.Optional(Type.Boolean())
-});
-
 // src/types/runtime-config.ts
-import { Type as Type2 } from "@sinclair/typebox";
+import { Type } from "@sinclair/typebox";
 
 // src/constants/file-naming-style.ts
 var FileNamingStyle = /* @__PURE__ */ ((FileNamingStyle2) => {
@@ -165,12 +144,12 @@ var FileNamingStyle = /* @__PURE__ */ ((FileNamingStyle2) => {
 })(FileNamingStyle || {});
 
 // src/types/runtime-config.ts
-var RuntimeConfig = Type2.Object({
-  mode: Type2.Optional(
-    Type2.Union([
-      Type2.Literal("micro-function"),
-      Type2.Literal("nestjs-module"),
-      Type2.Literal("none")
+var RuntimeConfig = Type.Object({
+  mode: Type.Optional(
+    Type.Union([
+      Type.Literal("micro-function"),
+      Type.Literal("nestjs-module"),
+      Type.Literal("none")
     ], { default: "micro-function" })
   ),
   /**
@@ -179,27 +158,22 @@ var RuntimeConfig = Type2.Object({
    * If not specified, the module system will be inferred from the nearest package.json "type" field
    * or defaults to "cjs" if no package.json is found.
    */
-  esm: Type2.Optional(Type2.Boolean({ default: false })),
+  esm: Type.Optional(Type.Boolean({ default: false })),
   /**
    * Output directory for generated files
    */
-  outdir: Type2.String({ default: `${process.cwd()}/api` }),
+  outdir: Type.String({ default: `${process.cwd()}/api` }),
   /**
    * File naming style for generated files
    */
-  fileNamingStyle: Type2.Enum(FileNamingStyle, { default: "snakeCase" /* snakeCase */ }),
-  modules: Type2.Record(Type2.String(), Type2.String()),
-  operationIdFactory: Type2.Optional(Type2.Function([Type2.Any()], Type2.String())),
-  qs: Type2.Optional(Type2.Union([
-    Qs,
-    Type2.Function([Type2.Any()], Qs)
-  ])),
-  debug: Type2.Optional(Type2.Boolean({ default: false })),
+  fileNamingStyle: Type.Enum(FileNamingStyle, { default: "snakeCase" /* snakeCase */ }),
+  modules: Type.Record(Type.String(), Type.String()),
+  debug: Type.Optional(Type.Boolean({ default: false })),
   /**
    * Whether to tolerate wrong openapi/swagger structure
    */
-  tolerant: Type2.Optional(Type2.Boolean({ default: false })),
-  plugins: Type2.Optional(Type2.Array(Type2.Any(), { default: [] }))
+  tolerant: Type.Optional(Type.Boolean({ default: false })),
+  plugins: Type.Optional(Type.Array(Type.Any(), { default: [] }))
 });
 
 // src/compiler/tasks/setup/utils/validate-modules.ts
@@ -277,20 +251,13 @@ function main(compiler, options) {
         await fs3.ensureDir(".keq");
         rc.debug = true;
       }
-      if (options?.tolerant) {
-        rc.tolerant = true;
-      }
+      rc.tolerant = Boolean(rc.tolerant);
       const packageJsonInfo = findNearestPackageJson();
       if (packageJsonInfo) {
         const moduleSystem = getProjectModuleSystem(packageJsonInfo);
         rc.esm = moduleSystem === "esm";
       }
       context.rc = rc;
-      if (rc.plugins && rc.plugins.length) {
-        for (const plugin of rc.plugins) {
-          plugin.apply(compiler);
-        }
-      }
       let matcher = new IgnoreMatcher([]);
       if (result.filepath) {
         const ignoreFilepath = path2.resolve(path2.dirname(result.filepath), ".keqignore");
@@ -339,12 +306,6 @@ import { validate } from "@scalar/openapi-parser";
 // src/models/artifact.ts
 import * as path3 from "path";
 
-// src/models/utils/to-comment.ts
-function toComment(msg) {
-  if (!msg) return "";
-  return msg.split("\n").map((str) => `// ${str}`).join("\n");
-}
-
 // src/models/anchor.ts
 var AnchorBlock = class {
   constructor(artifact) {
@@ -423,7 +384,6 @@ var HeaderComment = [
 var Artifact = class {
   id;
   filepath;
-  warns = [];
   content;
   extensionName;
   anchor = new Anchor(this);
@@ -436,20 +396,8 @@ var Artifact = class {
   get dirname() {
     return path3.dirname(this.filepath);
   }
-  addWarn(message) {
-    this.warns.push(message);
-  }
   renderer() {
-    let $warns = "";
-    if (this.warns.length) {
-      $warns = toComment([
-        "!!! Here is some Problems !!!",
-        "",
-        this.warns
-      ].join("\n"));
-      $warns += "\n\n";
-    }
-    return `${HeaderComment}${$warns}${this.content}`;
+    return `${HeaderComment}${this.content}`;
   }
 };
 
@@ -640,7 +588,6 @@ var OperationDefinition = class {
 };
 
 // src/models/api-document_v3_1.ts
-import { openapiShakingSync } from "@opendoc/openapi-shaking";
 var ApiDocumentV3_1 = class _ApiDocumentV3_1 {
   module;
   specification;
@@ -683,31 +630,6 @@ var ApiDocumentV3_1 = class _ApiDocumentV3_1 {
     }
     return false;
   }
-  sharking(filter2) {
-    const isAccepted = (pathname, method, operation) => {
-      if (!SupportedMethods.includes(method)) return false;
-      const operationDefinition = new OperationDefinition({
-        method,
-        pathname,
-        operation,
-        module: this.module,
-        document: this
-      });
-      return filter2(operationDefinition);
-    };
-    const sharkedSwagger = openapiShakingSync(
-      this.specification,
-      isAccepted,
-      { tolerant: true }
-    );
-    return new _ApiDocumentV3_1(
-      sharkedSwagger,
-      new ModuleDefinition(
-        this.module.name,
-        `file://${this.module.name}.v3_1.sharked.json`
-      )
-    );
-  }
   static unknown() {
     return new _ApiDocumentV3_1({}, ModuleDefinition.unknown());
   }
@@ -845,25 +767,6 @@ function dereferenceOperation(swagger) {
   return removeUndefinedRef(shadow);
 }
 
-// src/utils/openapi-utils/update-operation-id.ts
-import * as R9 from "ramda";
-function updateOperationId(swagger, fn) {
-  const shadow = R9.clone(swagger);
-  for (const [pathname, pathItem] of Object.entries(shadow.paths || {})) {
-    for (const m in pathItem) {
-      const method = m.toLowerCase();
-      if (!SupportedMethods.includes(method)) continue;
-      if (typeof pathItem[m] !== "object" || Array.isArray(pathItem[m]) || pathItem[m] === null) continue;
-      const operation = pathItem[m];
-      const operationId = fn(method, pathname, operation);
-      if (typeof operationId === "string" && operationId.length > 0) {
-        operation.operationId = operationId;
-      }
-    }
-  }
-  return shadow;
-}
-
 // src/utils/json-schema-utils/is-array.ts
 function isArray(schema) {
   return schema.type === "array";
@@ -919,6 +822,31 @@ function To3_1(openapi) {
   return specification;
 }
 
+// src/utils/openapi-utils/map-operation.ts
+import * as R9 from "ramda";
+function mapOperation(specification, mapper) {
+  const shadow = R9.clone(specification);
+  for (const [pathname, pathItem] of Object.entries(shadow.paths || {})) {
+    for (const m in pathItem) {
+      const method = m.toLowerCase();
+      if (!SupportedMethods.includes(method)) continue;
+      if (typeof pathItem[m] !== "object" || Array.isArray(pathItem[m]) || pathItem[m] === null) continue;
+      const operation = pathItem[m];
+      pathItem[m] = mapper(method, pathname, operation);
+    }
+  }
+  return shadow;
+}
+
+// src/utils/openapi-utils/map-parameter.ts
+function mapParameter(specification, mapper) {
+  return mapOperation(specification, (method, pathname, operation) => {
+    if (!operation.parameters) return operation;
+    operation.parameters = operation.parameters.map((parameter) => mapper(method, pathname, operation, parameter));
+    return operation;
+  });
+}
+
 // src/utils/openapi-utils/index.ts
 var OpenapiUtils = class {
   static isRefDefined = isRefDefined;
@@ -926,7 +854,9 @@ var OpenapiUtils = class {
   static dereferenceDeep = dereferenceDeep;
   static removeUndefinedRef = removeUndefinedRef;
   static dereferenceOperation = dereferenceOperation;
-  static updateOperationId = updateOperationId;
+  static mapOperation = mapOperation;
+  static mapParameter = mapParameter;
+  // static updateOperationId = updateOperationId
   static to3_1 = To3_1;
 };
 
@@ -953,7 +883,7 @@ function main2(compiler, options) {
             if (!content) {
               throw new Exception(moduleDefinition, `Cannot download document from ${moduleDefinition.address}`);
             }
-            let spec = JSON.parse(content);
+            const spec = JSON.parse(content);
             const { valid, errors } = await validate(spec);
             if (!valid) {
               const message = `${moduleDefinition.name} module openapi/swagger file does not conform to the openapi specifications or have grammatical errors, which may cause unexpected errors: 
@@ -961,14 +891,6 @@ ${errors?.map((e) => `  - ${e.message}`).join("\n")}`;
               task2.output = message;
             }
             OpenapiUtils.dereferenceOperation(spec);
-            const rc2 = context.rc;
-            if (rc2?.operationIdFactory) {
-              const operationIdFactory = rc2.operationIdFactory;
-              spec = OpenapiUtils.updateOperationId(
-                spec,
-                (method, pathname, operation) => operationIdFactory({ method, pathname, operation, module: moduleDefinition })
-              );
-            }
             const document = new ApiDocumentV3_1(
               spec,
               moduleDefinition
@@ -1212,7 +1134,7 @@ function perfectErrorMessage() {
 // src/plugins/eslint/index.ts
 import { ESLint } from "eslint";
 
-// src/plugins/prettier/index.ts
+// src/plugins/prettier/prettier.plugin.ts
 import { exec } from "child_process";
 import { promisify } from "util";
 var execAsync = promisify(exec);
@@ -1494,7 +1416,12 @@ var DeclarationRenderer2 = class {
     }
     const $responses = Object.entries(operation.responses).map(([statusCode, response]) => {
       if (!JsonSchemaUtils.isRef(response)) {
-        const $value = Object.values(response.content || {}).map((mediaTypeObject) => mediaTypeObject.schema).filter((schema) => !!schema).map((schema) => JsonSchemaTransformer.toDeclaration(schema, options)).join(" | ");
+        const $value = Object.entries(response.content || {}).map(([mediaType, mediaTypeObject]) => [mediaType, mediaTypeObject.schema]).map(([mediaType, schema]) => {
+          if (mediaType.includes("text/event-stream")) return "ReadableStream<ServerSentEvent>";
+          if (mediaType.includes("multipart/form-data")) return "FormData";
+          if (!schema) return "unknown";
+          return JsonSchemaTransformer.toDeclaration(schema, options);
+        }).join(" | ");
         return indent(2, `${statusCode}: ${$value || "void"}`);
       }
     }).join("\n");
@@ -1576,7 +1503,7 @@ var DeclarationRenderer2 = class {
       return `import type { ${schemaName} as ${alias(schemaName)} } from "${filepath}"`;
     }).map((str) => str.replace(/ from "(\.\.?\/.+?)(\.ts|\.mts|\.cts|\.js|\.cjs|\.mjs)?"/, this.options.esm ? ' from "$1.js"' : ' from "$1"'));
     return [
-      'import type { KeqOperation, KeqPathParameterInit, KeqQueryInit } from "keq"',
+      'import type { KeqOperation, KeqPathParameterInit, KeqQueryInit, ServerSentEvent } from "keq"',
       ...$schemaDefinitions
     ].join("\n");
   }
@@ -1642,8 +1569,21 @@ var DeclarationRenderer2 = class {
 // src/transformers/operation-definition/micro-function.renderer.ts
 import * as R17 from "ramda";
 
-// src/transformers/operation-definition/typescript-helper.ts
+// src/transformers/operation-definition/typescript-snippet.ts
 import * as R16 from "ramda";
+
+// src/constants/qs-array-format.ts
+var QsArrayFormat = /* @__PURE__ */ ((QsArrayFormat2) => {
+  QsArrayFormat2["brackets"] = "brackets";
+  QsArrayFormat2["indices"] = "indices";
+  QsArrayFormat2["repeat"] = "repeat";
+  QsArrayFormat2["comma"] = "comma";
+  QsArrayFormat2["space"] = "space";
+  QsArrayFormat2["pipe"] = "pipe";
+  return QsArrayFormat2;
+})(QsArrayFormat || {});
+
+// src/transformers/operation-definition/typescript-snippet.ts
 var OperationDefinitionSnippet = class {
   constructor(operationDefinition, options) {
     this.operationDefinition = operationDefinition;
@@ -1652,27 +1592,42 @@ var OperationDefinitionSnippet = class {
   }
   typeName;
   getQsParameters(parameter) {
-    if (typeof this.options.qs === "function") {
-      return this.options.qs(parameter);
-    } else if (typeof this.options.qs === "object") {
-      return this.options.qs;
-    }
+    let arrayFormat;
+    let allowDots;
+    let indices;
     const style = parameter.style || "form";
     const explode = parameter.explode ?? true;
-    if (style === "deepObject") {
-      return { arrayFormat: "brackets" };
-    } else if (explode) {
-      return { arrayFormat: "repeat" };
+    if ("x-qs-array-format" in parameter) {
+      arrayFormat = parameter["x-qs-array-format"];
     } else {
-      if (style === "form") {
-        return { arrayFormat: "comma" };
-      } else if (style === "spaceDelimited") {
-        return { arrayFormat: "space" };
-      } else if (style === "pipeDelimited") {
-        return { arrayFormat: "pipe" };
+      if (style === "deepObject") {
+        arrayFormat = "brackets" /* brackets */;
+      } else if (explode) {
+        arrayFormat = "repeat" /* repeat */;
+      } else {
+        if (style === "form") {
+          arrayFormat = "comma" /* comma */;
+        } else if (style === "spaceDelimited") {
+          arrayFormat = "space" /* space */;
+        } else if (style === "pipeDelimited") {
+          arrayFormat = "pipe" /* pipe */;
+        }
       }
     }
-    return {};
+    if ("x-qs-allow-dots" in parameter) {
+      allowDots = Boolean(parameter["x-qs-allow-dots"]);
+    }
+    if ("x-qs-indices" in parameter) {
+      indices = Boolean(parameter["x-qs-indices"]);
+    }
+    if (arrayFormat || allowDots !== void 0 || indices !== void 0) {
+      return {
+        ...arrayFormat ? { arrayFormat } : {},
+        ...allowDots !== void 0 ? { allowDots } : {},
+        ...indices !== void 0 ? { indices } : {}
+      };
+    }
+    return void 0;
   }
   // render: "if (args && 'Authorization' in args) req.header('Authorization', args['Authorization'])"
   renderRequestHeaders() {
@@ -1806,7 +1761,7 @@ var OperationDefinitionMicroFunctionRenderer = class {
       `  const req = request.${$method}<${this.typeName("ResponseBodies")}[STATUS]>("${pathname}")`,
       "    .option('module', { name: moduleName, pathname, method })",
       "",
-      $mediaType || void 0,
+      $mediaType ? indent(2, $mediaType) : void 0,
       "  /* @anchor:query:start */",
       $queryParameters ? indent(2, $queryParameters) : void 0,
       "  /* @anchor:query:end */",
@@ -1988,8 +1943,7 @@ var NestjsClientRenderer = class {
     const moduleName = changeCase2.pascalCase(this.document.module.name);
     const $dependencies = this.renderDependencies();
     const $operations = this.document.operations.map((operation) => OperationDefinitionTransformer.toNestjsMethod(operation, {
-      esm: this.options.esm,
-      qs: this.options.qs
+      esm: this.options.esm
     })).join("\n\n");
     return [
       "/* @anchor:file:start */",
@@ -2376,7 +2330,6 @@ var MicroFunctionGenerator = class _MicroFunctionGenerator {
       id: _MicroFunctionGenerator.getOperationDefinitionArtifactId(operationDefinition),
       filepath,
       content: OperationDefinitionTransformer.toMicroFunction(operationDefinition, {
-        qs: rc.qs,
         esm: rc.esm,
         getOperationDefinitionDeclarationFilepath(operationDefinition2) {
           const relativePath = path10.relative(
@@ -2501,7 +2454,6 @@ var NestjsModuleGenerator = class _NestjsModuleGenerator {
       filepath,
       content: ApiDocumentTransformer.toNestjsClient(document, {
         esm: rc.esm,
-        qs: rc.qs,
         getOperationDefinitionDeclarationFilepath(operationDefinition) {
           const relativePath = path11.relative(
             dirpath,
@@ -2638,7 +2590,7 @@ var DownloadLocalFilePlugin = class _DownloadLocalFilePlugin {
 };
 
 // src/plugins/shaking/shaking.plugin.ts
-import { openapiShakingSync as openapiShakingSync2 } from "@opendoc/openapi-shaking";
+import { openapiShakingSync } from "@opendoc/openapi-shaking";
 var ShakingPlugin = class _ShakingPlugin {
   apply(compiler) {
     compiler.hooks.beforeCompile.tap(_ShakingPlugin.name, (task) => {
@@ -2648,6 +2600,7 @@ var ShakingPlugin = class _ShakingPlugin {
     });
   }
   shaking(compiler, document) {
+    const rc = compiler.context.rc;
     const matcher = compiler.context.matcher;
     const isAccepted = (pathname, method, operation) => {
       if (!SupportedMethods.includes(method)) return false;
@@ -2659,10 +2612,10 @@ var ShakingPlugin = class _ShakingPlugin {
         document
       }));
     };
-    const sharkedSwagger = openapiShakingSync2(
+    const sharkedSwagger = openapiShakingSync(
       document.specification,
       isAccepted,
-      { tolerant: true }
+      { tolerant: rc.tolerant }
     );
     return new ApiDocumentV3_1(
       sharkedSwagger,
@@ -2756,6 +2709,11 @@ var InitializePlugin = class _InitializePlugin {
       } else if (rc.mode === "nestjs-module") {
         new GenerateNestjsModulePlugin().apply(compiler);
       }
+      if (rc.plugins && rc.plugins.length) {
+        for (const plugin of rc.plugins) {
+          plugin.apply(compiler);
+        }
+      }
     });
     if (this.options.includes && this.options.includes.length) {
       const modulesIncludes = this.options.includes;
@@ -2781,6 +2739,9 @@ var InitializePlugin = class _InitializePlugin {
   }
 };
 
+// src/plugins/overwrite-query-options/overwrite-query-options.plugin.ts
+var QsArrayFormatUnion = Object.values(QsArrayFormat);
+
 // src/compiler/compiler.ts
 var Compiler = class {
   constructor(options) {