@keq-request/cli 5.0.0-alpha.27 → 5.0.0-alpha.28

package/dist/models/module-definition.d.ts

@@ -1,7 +1,8 @@
+import { Address } from '../types/address.js';
 export declare class ModuleDefinition {
     name: string;
-    address: string;
-    constructor(name: string, address: string);
+    address: Address;
+    constructor(name: string, address: string | Address);
     static unknown(): ModuleDefinition;
 }
 //# sourceMappingURL=module-definition.d.ts.map

package/dist/models/module-definition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module-definition.d.ts","sourceRoot":"","sources":["../../src/models/module-definition.ts"],"names":[],"mappings":"AAAA,qBAAa,gBAAgB;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;gBAEH,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAKzC,MAAM,CAAC,OAAO,IAAI,gBAAgB;CAGnC"}
+{"version":3,"file":"module-definition.d.ts","sourceRoot":"","sources":["../../src/models/module-definition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAG5C,qBAAa,gBAAgB;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,OAAO,CAAA;gBAEJ,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO;IAUnD,MAAM,CAAC,OAAO,IAAI,gBAAgB;CAGnC"}

package/dist/plugins/download-http-file/download-http-file.plugin.d.ts

@@ -1,8 +1,8 @@
 import { Compiler } from '../../compiler/index.js';
-import { Plugin } from '../../types/plugin.js';
+import { Plugin, Address } from '../../types/index.js';
 export declare class DownloadHttpFilePlugin implements Plugin {
     apply(compiler: Compiler): void;
-    download(address: any): Promise<string>;
+    download(address: Address): Promise<string>;
     deserialize(content: string): object;
 }
 //# sourceMappingURL=download-http-file.plugin.d.ts.map

package/dist/plugins/download-http-file/download-http-file.plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"download-http-file.plugin.d.ts","sourceRoot":"","sources":["../../../src/plugins/download-http-file/download-http-file.plugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAI1C,qBAAa,sBAAuB,YAAW,MAAM;IACnD,KAAK,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IASzB,QAAQ,CAAC,OAAO,KAAA,GAAG,OAAO,CAAC,MAAM,CAAC;IAexC,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;CAKrC"}
+{"version":3,"file":"download-http-file.plugin.d.ts","sourceRoot":"","sources":["../../../src/plugins/download-http-file/download-http-file.plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAIlD,qBAAa,sBAAuB,YAAW,MAAM;IACnD,KAAK,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAYzB,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAiBjD,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;CAKrC"}

package/dist/plugins/download-local-file/download-local-file.plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"download-local-file.plugin.d.ts","sourceRoot":"","sources":["../../../src/plugins/download-local-file/download-local-file.plugin.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAIzC,qBAAa,uBAAwB,YAAW,MAAM;IACpD,KAAK,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;CAehC"}
+{"version":3,"file":"download-local-file.plugin.d.ts","sourceRoot":"","sources":["../../../src/plugins/download-local-file/download-local-file.plugin.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAKzC,qBAAa,uBAAwB,YAAW,MAAM;IACpD,KAAK,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;CAkBhC"}

package/dist/plugins/shaking/shaking.plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shaking.plugin.d.ts","sourceRoot":"","sources":["../../../src/plugins/shaking/shaking.plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAC9C,OAAO,EAAE,eAAe,EAAyC,MAAM,mBAAmB,CAAA;AAK1F,qBAAa,aAAc,YAAW,MAAM;IAC1C,KAAK,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAY/B,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,eAAe,GAAG,eAAe;CA+BxE"}
+{"version":3,"file":"shaking.plugin.d.ts","sourceRoot":"","sources":["../../../src/plugins/shaking/shaking.plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAC9C,OAAO,EAAE,eAAe,EAAyC,MAAM,mBAAmB,CAAA;AAK1F,qBAAa,aAAc,YAAW,MAAM;IAC1C,KAAK,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAY/B,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,eAAe,GAAG,eAAe;CAmCxE"}

package/dist/plugins.cjs

@@ -251,10 +251,14 @@ var ModuleDefinition = class _ModuleDefinition {
   address;
   constructor(name, address) {
     this.name = name;
-    this.address = address;
+    if (typeof address === "string") {
+      this.address = { url: address, headers: {}, encoding: "utf8" };
+    } else {
+      this.address = address;
+    }
   }
   static unknown() {
-    return new _ModuleDefinition("", "");
+    return new _ModuleDefinition("", { url: "", headers: {}, encoding: "utf8" });
   }
 };
 
@@ -2121,24 +2125,25 @@ var ChineseToPinyinPlugin = class _ChineseToPinyinPlugin {
 };
 
 // src/plugins/download-http-file/download-http-file.plugin.ts
-var validUrl = __toESM(require("valid-url"), 1);
 var DownloadHttpFilePlugin = class _DownloadHttpFilePlugin {
   apply(compiler) {
     compiler.hooks.download.tapPromise(_DownloadHttpFilePlugin.name, async (address, task) => {
-      if (!validUrl.isUri(address)) return void 0;
+      const { url } = address;
+      if (!url.startsWith("http://") && !url.startsWith("https://")) return void 0;
       const content = await this.download(address);
       const spec = this.deserialize(content);
       return JSON.stringify(spec);
     });
   }
   async download(address) {
+    const { url, headers } = address;
     try {
-      const res = await fetch(address);
+      const res = await fetch(url, { headers });
       if (res.status >= 400) throw new Error(`failed with status code ${res.status}`);
       return await res.text();
     } catch (e) {
       if (e instanceof Error) {
-        e.message = `Unable get the openapi/swagger file from ${address}: ${e.message}`;
+        e.message = `Unable get the openapi/swagger file from ${url}: ${e.message}`;
       }
       throw e;
     }
@@ -2154,17 +2159,21 @@ var DownloadHttpFilePlugin = class _DownloadHttpFilePlugin {
 var path9 = __toESM(require("path"), 1);
 var fs = __toESM(require("fs/promises"), 1);
 var yaml = __toESM(require("js-yaml"), 1);
+var import_url = require("url");
 var DownloadLocalFilePlugin = class _DownloadLocalFilePlugin {
   apply(compiler) {
     compiler.hooks.download.tapPromise(_DownloadLocalFilePlugin.name, async (address, task) => {
-      if (!address.startsWith("./") && !address.startsWith("/") && !address.startsWith("../")) return void 0;
-      const fileExt = path9.extname(address);
-      const content = await fs.readFile(address, "utf8");
+      const { url, encoding } = address;
+      if (!url.startsWith("file://")) return void 0;
+      const filepath = (0, import_url.fileURLToPath)(url);
+      const fileExt = path9.extname(filepath);
+      const content = await fs.readFile(filepath, encoding);
+      const str = typeof content === "string" ? content : content.toString(encoding);
       if ([".yml", ".yaml"].includes(fileExt)) {
-        const value = yaml.load(content);
+        const value = yaml.load(str);
         return JSON.stringify(OpenapiUtils.to3_1(value));
       } else if (fileExt === ".json") {
-        return JSON.stringify(OpenapiUtils.to3_1(JSON.parse(content)));
+        return JSON.stringify(OpenapiUtils.to3_1(JSON.parse(str)));
       }
     });
   }
@@ -2202,7 +2211,11 @@ var ShakingPlugin = class _ShakingPlugin {
       sharkedSwagger,
       new ModuleDefinition(
         document.module.name,
-        `file://${document.module.name}.v3_1.sharked.json`
+        {
+          url: `memory://${document.module.name}.v3_1.sharked.json`,
+          headers: {},
+          encoding: "utf8"
+        }
       )
     );
   }