dtsgenerator 3.18.0 → 3.19.1

package/CHANGELOG.md

@@ -1,5 +1,161 @@
 # ChangeLog
 
+## v3
+
+### [v3.15.1](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.15.1) (2022-03-10)
+
+- fixed:
+  - Fix handling of stdin option with config file for #534. Thank you @arnestaphorsius :+1:
+
+### [v3.15.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.15.0) (2022-02-06)
+
+- features:
+  - Support mobile wallet media types(`application/jwt` and `application/vnd.apple.pkpass`) for #530. Thank you @eostrom :+1:
+
+### [v3.14.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.14.0) (2022-01-27)
+
+- features:
+  - Support the nested `allOf` and `oneOf` schema for #513. Thank you for your report @Cry0nicS :+1:
+
+### [v3.13.2](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.13.2) (2021-10-08)
+
+- features:
+  - Fix the type generation malformed objects with number-like keys for #523. Thank you for your report @DamianOsipiuk :+1:
+
+### [v3.13.1](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.13.1) (2021-09-29)
+
+- features:
+  - Change the plug-in interface, the PluginContext::inputSchemas to IterableIterator for #521. Thank you @djrollins :+1:
+
+### [v3.13.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.13.0) (2021-08-31)
+
+- features:
+  - Support new `$schema` types for #507.
+
+### [v3.12.1](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.12.1) (2021-05-19)
+
+- fixed:
+  - Fix referenced parameters not resolved error by #471. Thank you @jschirrmacher :+1:
+
+### [v3.12.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.12.0) (2021-05-13)
+
+- features:
+  - Support input type `file` by #496. Thank you @Christian24 :+1:
+  - Improve the conversion results of parameters property on OpenAPI by #501.
+
+### [v3.11.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.11.0) (2021-05-11)
+
+- features:
+  - Support vendor media types (allow periods in application/*+json) by #497. Thank you @glen-84 :+1:
+- fixed:
+  - Remove to support the `readOnly` property, because of wrong interpretation by #498. Thank you @hallsbyra :+1:
+
+### [v3.10.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.10.0) (2021-04-26)
+
+- features:
+  - Support freeform objects w/ index signature instead of `unknown` keyword by #488. Thank you @medfreeman :+1:
+  - Support the `content` property in `Parameters` by #472. Thank you for report @npdev453 :+1:
+
+### [v3.9.2](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.9.2) (2021-04-19)
+
+- fixed:
+  - Fix nested `oneOf` & `anyOf` keywords by #486. Thank you @medfreeman :+1:
+
+### [v3.9.1](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.9.1) (2021-04-16)
+
+- fixed:
+  - Update `generate` function to use recommended immutable approach for typescript transforms by #483. Thank you again @medfreeman :+1:
+
+### [v3.9.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.9.0) (2021-04-13)
+
+- features:
+  - support for additionalItems property by #481. Thank you again @medfreeman :+1:
+
+### [v3.8.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.8.0) (2021-04-08)
+
+- features:
+  - full support for minItems & maxItems properties by #476. Thank you @medfreeman :+1:
+
+### [v3.7.1](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.7.1) (2021-02-18)
+
+- fixed:
+  - add truthy check for value in `mergeSchema` by #474. Thank you @ricokahler :+1:
+
+### [v3.7.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.7.0) (2021-01-05)
+
+- features:
+  - Add the `void` type support by #468. Thank you for your propose @henhal by #445 :+1:
+
+### [v3.6.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.6.0) (2020-12-25)
+
+- features:
+  - Improve the type result of oneOf/anyOf property by #467. Thank you for your report @crizo23 by #452 :+1:
+  - Improve the internal eslint configuration by #466. Thank you @Goldziher :+1:
+
+### [v3.5.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.5.0) (2020-12-21)
+
+- features:
+  - Add to export `ts` object for to use the same version TypeScript in all plugins by #465.
+
+### [v3.4.1](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.4.1) (2020-12-16)
+
+- fixed:
+  - Fix using package without esModuleInterop setting on tsconfig by #460. Thank you @wszydlak :+1:
+  - Update TypeScript v4 by #462. Thank you @wszydlak :+1:
+  - Add to support the null type enum value by #464. Thank you for your report @Goldziher :+1:
+
+### [v3.4.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.4.0) (2020-12-15)
+
+- features:
+  - Add support for multipart media type by #455. Thank you @wszydlak :+1:
+  - Add support for passing config object with NodeJS API usage by #456. Thank you @wszydlak :+1:
+
+### [v3.3.1](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.3.1) (2020-10-05)
+
+- fixed:
+  - Elements get type "any" instead of the correct one by #448. Thank you for your report @nachtigall-83 :+1:
+
+### [v3.3.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.3.0) (2020-07-29)
+
+- features:
+  - Support the `patternProperties` by #436. Thank you @nfroidure :+1:
+- fixed:
+  - Definition generated improperly when multiple instances of a resource are inherited by #279. Thank you @btg5679 :+1:
+  - Apply the `prettier` config on `.eslintrc.json`.
+
+### [v3.2.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.2.0) (2020-07-20)
+
+- features:
+  - Add support for application/octet-stream media type by #431. Thank you @MisterChateau :+1:
+
+### [v3.1.1](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.1.1) (2020-06-23)
+
+- fixed:
+  - Cannot load config file of relative path by #428. Thank you @DamianOsipiuk :+1:
+
+### [v3.1.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.1.0) (2020-06-22)
+
+- features:
+  - Add support for nullable anyOf in OpenApi v3 by #426. Thank you @joost-kersjes-webpower :+1:
+
+### [v3.0.3](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.0.3) (2020-06-15)
+
+- fixed:
+  - Fix the command option example by #422. Thank you @maapteh :+1:
+  - Omit load config error on not config option by #425. Thank you @Christian24 :+1:
+
+### [v3.0.2](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.0.2) (2020-06-11)
+
+- fixed:
+  - Remove old example by #421. Thank you @maapteh :+1:
+
+### [v3.0.1](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.0.1) (2020-06-09)
+
+- features:
+  - Support the plug-in for pre-process and post-process.
+  - Change command line options and Support config file.
+  - Use the TypeScript AST for intermediate format.
+
 ## v2
 
 ### [v2.7.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v2.7.0) (2020-06-05)
@@ -82,7 +238,7 @@
 
 - features
   - Add to support the `nullable` property on OpenAPI by #319. Thank you @sakari :+1:
-    https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#data-types
+    <https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#data-types>
 
 ### [v2.0.4](https://github.com/horiuchi/dtsgenerator/releases/tag/v2.0.4) (2019-01-07)
 
@@ -100,7 +256,6 @@
 - features
   - Add to support emit the Request/Response object schema of OpenAPI by #304.
 
-
 ## v1
 
 ### [v1.2.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v1.2.0) (2018-09-12)

package/README.md

@@ -143,6 +143,12 @@ Output debug message by [debug](https://www.npmjs.com/package/debug) library.
 
 ## ChangeLog
 
+### [v3.19.1](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.19.1) (2023-08-25)
+
+- features:
+  - Update plugins for new TypeScript AST.
+  - Changed supported Node.js version to 16 or later. Also, we have confirmed that it works with Node.js v20.
+
 ### [v3.18.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.18.0) (2023-03-02)
 
 - features:
@@ -163,160 +169,6 @@ Output debug message by [debug](https://www.npmjs.com/package/debug) library.
 - features:
   - Support 'image/*' media types for #539. Thank you @Geloosa :+1:
 
-### [v3.15.1](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.15.1) (2022-03-10)
-
-- fixed:
-  - Fix handling of stdin option with config file for #534. Thank you @arnestaphorsius :+1:
-
-### [v3.15.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.15.0) (2022-02-06)
-
-- features:
-  - Support mobile wallet media types(`application/jwt` and `application/vnd.apple.pkpass`) for #530. Thank you @eostrom :+1:
-
-### [v3.14.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.14.0) (2022-01-27)
-
-- features:
-  - Support the nested `allOf` and `oneOf` schema for #513. Thank you for your report @Cry0nicS :+1:
-
-### [v3.13.2](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.13.2) (2021-10-08)
-
-- features:
-  - Fix the type generation malformed objects with number-like keys for #523. Thank you for your report @DamianOsipiuk :+1:
-
-### [v3.13.1](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.13.1) (2021-09-29)
-
-- features:
-  - Change the plug-in interface, the PluginContext::inputSchemas to IterableIterator for #521. Thank you @djrollins :+1:
-
-### [v3.13.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.13.0) (2021-08-31)
-
-- features:
-  - Support new `$schema` types for #507.
-
-### [v3.12.1](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.12.1) (2021-05-19)
-
-- fixed:
-  - Fix referenced parameters not resolved error by #471. Thank you @jschirrmacher :+1:
-
-### [v3.12.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.12.0) (2021-05-13)
-
-- features:
-  - Support input type `file` by #496. Thank you @Christian24 :+1:
-  - Improve the conversion results of parameters property on OpenAPI by #501.
-
-### [v3.11.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.11.0) (2021-05-11)
-
-- features:
-  - Support vendor media types (allow periods in application/*+json) by #497. Thank you @glen-84 :+1:
-- fixed:
-  - Remove to support the `readOnly` property, because of wrong interpretation by #498. Thank you @hallsbyra :+1:
-
-### [v3.10.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.10.0) (2021-04-26)
-
-- features:
-  - Support freeform objects w/ index signature instead of `unknown` keyword by #488. Thank you @medfreeman :+1:
-  - Support the `content` property in `Parameters` by #472. Thank you for report @npdev453 :+1:
-
-### [v3.9.2](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.9.2) (2021-04-19)
-
-- fixed:
-  - Fix nested `oneOf` & `anyOf` keywords by #486. Thank you @medfreeman :+1:
-
-### [v3.9.1](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.9.1) (2021-04-16)
-
-- fixed:
-  - Update `generate` function to use recommended immutable approach for typescript transforms by #483. Thank you again @medfreeman :+1:
-
-### [v3.9.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.9.0) (2021-04-13)
-
-- features:
-  - support for additionalItems property by #481. Thank you again @medfreeman :+1:
-
-### [v3.8.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.8.0) (2021-04-08)
-
-- features:
-  - full support for minItems & maxItems properties by #476. Thank you @medfreeman :+1:
-
-### [v3.7.1](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.7.1) (2021-02-18)
-
-- fixed:
-  - add truthy check for value in `mergeSchema` by #474. Thank you @ricokahler :+1:
-
-### [v3.7.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.7.0) (2021-01-05)
-
-- features:
-  - Add the `void` type support by #468. Thank you for your propose @henhal by #445 :+1:
-
-### [v3.6.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.6.0) (2020-12-25)
-
-- features:
-  - Improve the type result of oneOf/anyOf property by #467. Thank you for your report @crizo23 by #452 :+1:
-  - Improve the internal eslint configuration by #466. Thank you @Goldziher :+1:
-
-### [v3.5.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.5.0) (2020-12-21)
-
-- features:
-  - Add to export `ts` object for to use the same version TypeScript in all plugins by #465.
-
-### [v3.4.1](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.4.1) (2020-12-16)
-
-- fixed:
-  - Fix using package without esModuleInterop setting on tsconfig by #460. Thank you @wszydlak :+1:
-  - Update TypeScript v4 by #462. Thank you @wszydlak :+1:
-  - Add to support the null type enum value by #464. Thank you for your report @Goldziher :+1:
-
-### [v3.4.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.4.0) (2020-12-15)
-
-- features:
-  - Add support for multipart media type by #455. Thank you @wszydlak :+1:
-  - Add support for passing config object with NodeJS API usage by #456. Thank you @wszydlak :+1:
-
-### [v3.3.1](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.3.1) (2020-10-05)
-
-- fixed:
-  - Elements get type "any" instead of the correct one by #448. Thank you for your report @nachtigall-83 :+1:
-
-### [v3.3.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.3.0) (2020-07-29)
-
-- features:
-  - Support the `patternProperties` by #436. Thank you @nfroidure :+1:
-- fixed:
-  - Definition generated improperly when multiple instances of a resource are inherited by #279. Thank you @btg5679 :+1:
-  - Apply the `prettier` config on `.eslintrc.json`.
-
-### [v3.2.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.2.0) (2020-07-20)
-
-- features:
-  - Add support for application/octet-stream media type by #431. Thank you @MisterChateau :+1:
-
-### [v3.1.1](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.1.1) (2020-06-23)
-
-- fixed:
-  - Cannot load config file of relative path by #428. Thank you @DamianOsipiuk :+1:
-
-### [v3.1.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.1.0) (2020-06-22)
-
-- features:
-  - Add support for nullable anyOf in OpenApi v3 by #426. Thank you @joost-kersjes-webpower :+1:
-
-### [v3.0.3](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.0.3) (2020-06-15)
-
-- fixed:
-  - Fix the command option example by #422. Thank you @maapteh :+1:
-  - Omit load config error on not config option by #425. Thank you @Christian24 :+1:
-
-### [v3.0.2](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.0.2) (2020-06-11)
-
-- fixed:
-  - Remove old example by #421. Thank you @maapteh :+1:
-
-### [v3.0.1](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.0.1) (2020-06-09)
-
-- features:
-  - Support the plug-in for pre-process and post-process.
-  - Change command line options and Support config file.
-  - Use the TypeScript AST for intermediate format.
-
 ### older versions history
 
 [ChangeLogs](https://github.com/horiuchi/dtsgenerator/blob/master/CHANGELOG.md)

package/dist/core/dtsGenerator.js

@@ -90,7 +90,7 @@ class DtsGenerator {
             const factory = await p({ inputSchemas, option: pc.option });
             if (factory != null) {
                 result.push(factory);
-                debug('  pre process plugin:', pc.plugin.meta.name, pc.plugin.meta.description);
+                debug('  post process plugin:', pc.plugin.meta.name, pc.plugin.meta.description);
             }
         }
         return result;
@@ -140,6 +140,7 @@ class DtsGenerator {
         });
     }
     normalizeSchemaContent(content) {
+        var _a;
         if (typeof content === 'boolean') {
             content = content ? {} : { not: {} };
         }
@@ -163,7 +164,7 @@ class DtsGenerator {
                 content = Object.assign(content, work);
             }
             if (content.type === undefined &&
-                (content.properties || content.additionalProperties)) {
+                ((_a = content.properties) !== null && _a !== void 0 ? _a : content.additionalProperties)) {
                 content.type = 'object';
             }
             if (content.nullable) {
@@ -379,9 +380,7 @@ class DtsGenerator {
             const additionalItemsNode = getAdditionalItemNode();
             return additionalItemsNode === false
                 ? ast.buildTupleTypeNode([], 0, 0, additionalItemsNode)
-                : ast.buildSimpleArrayNode(additionalItemsNode === undefined
-                    ? ast.buildAnyKeyword()
-                    : additionalItemsNode);
+                : ast.buildSimpleArrayNode(additionalItemsNode !== null && additionalItemsNode !== void 0 ? additionalItemsNode : ast.buildAnyKeyword());
         }
         else if (minItems != null &&
             maxItems != null &&

package/dist/core/openApiV3.d.ts

@@ -41,7 +41,7 @@ export declare namespace OpenApisV3 {
                 url?: string;
                 email?: string;
             }
-            type DefaultType = null | any[] | unknown | number | boolean | string;
+            type DefaultType = null | any[] | number | boolean | string;
             interface Discriminator {
                 propertyName: string;
                 mapping?: Strings;
@@ -242,7 +242,7 @@ export declare namespace OpenApisV3 {
             interface ServerVariables {
                 [name: string]: ServerVariable;
             }
-            type SpecificationExtension = null | number | boolean | string | unknown | any[];
+            type SpecificationExtension = null | number | boolean | string | any[];
             interface Strings {
                 [name: string]: string;
             }

package/dist/core/schemaId.js

@@ -71,5 +71,5 @@ class SchemaId {
         return ids.map(validateIdentifier_1.toTypeName);
     }
 }
-exports.default = SchemaId;
 SchemaId.empty = new SchemaId('');
+exports.default = SchemaId;

package/dist/core/type.js

@@ -1,5 +1,4 @@
 "use strict";
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadPlugin = exports.parseFileContent = exports.readSchemaFromUrl = exports.readSchemasFromFile = exports.readSchemaFromStdin = exports.parseSchema = exports.isJsonSchemaDraft04 = void 0;
 const tslib_1 = require("tslib");
@@ -82,7 +81,7 @@ async function loadPlugin(name, option) {
     if (!option) {
         return undefined;
     }
-    const mod = (await (_a = name, Promise.resolve().then(() => tslib_1.__importStar(require(_a)))));
+    const mod = (await Promise.resolve(`${name}`).then(s => tslib_1.__importStar(require(s))));
     if (!mod.default) {
         console.warn(`The plugin (${name}) is invalid module. That is not default export format.`);
         return undefined;

package/dist/utils.d.ts

@@ -5,6 +5,6 @@ import { CommandOptions } from './commandOptions';
 import { PartialConfig } from './core/config';
 export declare function readStream(stream: NodeJS.ReadableStream, encoding?: BufferEncoding): Promise<string>;
 export declare function readUrl(url: string): Promise<string>;
-export declare function buildProxyOptions(url: string): RequestInit | undefined;
+export declare function buildProxyOptions<Uri extends string>(url: Uri): RequestInit | undefined;
 export declare function globFiles(pattern: string, options?: GlobOptions): Promise<string[]>;
 export declare function readConfig(options: CommandOptions): PartialConfig;

package/dist/utils.js

@@ -4,8 +4,9 @@ exports.readConfig = exports.globFiles = exports.buildProxyOptions = exports.rea
 const tslib_1 = require("tslib");
 const fs = tslib_1.__importStar(require("fs"));
 const url_1 = require("url");
-const glob_1 = tslib_1.__importDefault(require("glob"));
-const https_proxy_agent_1 = tslib_1.__importDefault(require("https-proxy-agent"));
+const glob_1 = require("glob");
+const http_proxy_agent_1 = require("http-proxy-agent");
+const https_proxy_agent_1 = require("https-proxy-agent");
 const typescript_1 = require("typescript");
 const commandOptions_1 = require("./commandOptions");
 function readStream(stream, encoding = 'utf8') {
@@ -40,38 +41,32 @@ function noProxy(url) {
 }
 function buildProxyOptions(url) {
     const parsedUrl = new url_1.URL(url);
-    let proxyUrl;
     if (!noProxy(parsedUrl)) {
         if (parsedUrl.protocol === 'http:' && process.env.HTTP_PROXY) {
-            proxyUrl = new url_1.URL(process.env.HTTP_PROXY);
+            return {
+                agent: new http_proxy_agent_1.HttpProxyAgent(process.env.HTTP_PROXY),
+            };
         }
         else if (parsedUrl.protocol === 'https:' && process.env.HTTPS_PROXY) {
-            proxyUrl = new url_1.URL(process.env.HTTPS_PROXY);
+            return {
+                agent: new https_proxy_agent_1.HttpsProxyAgent(process.env.HTTPS_PROXY),
+            };
         }
     }
-    if (proxyUrl) {
-        const agentOptions = {};
-        agentOptions.protocol = proxyUrl.protocol;
-        agentOptions.host = proxyUrl.hostname;
-        agentOptions.port = proxyUrl.port;
-        if (proxyUrl.username) {
-            agentOptions.auth = proxyUrl.username + ':' + proxyUrl.password;
-        }
-        return { agent: (0, https_proxy_agent_1.default)(agentOptions) };
-    }
     return undefined;
 }
 exports.buildProxyOptions = buildProxyOptions;
 async function globFiles(pattern, options) {
-    const res = await (0, glob_1.default)(pattern, options !== null && options !== void 0 ? options : {});
-    return res.map((r) => {
+    const result = [];
+    for await (const r of (0, glob_1.globIterate)(pattern, options !== null && options !== void 0 ? options : {})) {
         if (typeof r === 'string') {
-            return r;
+            result.push(r);
         }
         else {
-            return r.fullpath();
+            result.push(r.fullpath());
         }
-    });
+    }
+    return result;
 }
 exports.globFiles = globFiles;
 function readConfig(options) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dtsgenerator",
-    "version": "3.18.0",
+    "version": "3.19.1",
     "description": "TypeScript d.ts file generator for JSON Schema file",
     "bin": {
         "dtsgen": "bin/dtsgen"
@@ -41,37 +41,38 @@
         "url": "https://github.com/horiuchi/dtsgenerator/issues"
     },
     "engines": {
-        "node": ">= 14.0"
+        "node": ">= 16.0"
     },
     "dependencies": {
-        "commander": "^10.0.0",
-        "cross-fetch": "^3.1.5",
+        "commander": "^11.0.0",
+        "cross-fetch": "^4.0.0",
         "debug": "^4.3.4",
-        "glob": "^9.1.2",
-        "https-proxy-agent": "^5.0.1",
+        "glob": "^10.3.3",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.1",
         "js-yaml": "^4.1.0",
-        "tslib": "^2.5.0",
-        "typescript": "^4.9.5"
+        "tslib": "^2.6.2",
+        "typescript": "^5.1.6"
     },
     "devDependencies": {
-        "@dtsgenerator/do-nothing": "^2.5.3",
-        "@dtsgenerator/eslint-config": "^0.6.4",
-        "@dtsgenerator/replace-namespace": "^1.5.4",
-        "@dtsgenerator/single-quote": "^1.6.3",
+        "@dtsgenerator/do-nothing": "^2.6.0",
+        "@dtsgenerator/eslint-config": "^0.6.5",
+        "@dtsgenerator/replace-namespace": "^1.6.0",
+        "@dtsgenerator/single-quote": "^1.7.0",
         "@istanbuljs/nyc-config-typescript": "^1.0.2",
-        "@types/debug": "^4.1.7",
+        "@types/debug": "^4.1.8",
         "@types/glob": "^8.1.0",
         "@types/js-yaml": "^4.0.5",
         "@types/mocha": "^10.0.1",
-        "@types/node": "^16.18.14",
+        "@types/node": "^16.18.46",
         "cross-env": "^7.0.3",
-        "eslint": "^8.34.0",
+        "eslint": "^8.47.0",
         "husky": "^8.0.3",
-        "lint-staged": "^13.1.2",
+        "lint-staged": "^14.0.1",
         "mocha": "^10.2.0",
         "nyc": "^15.1.0",
-        "prettier": "^2.8.4",
-        "rimraf": "^4.1.3",
+        "prettier": "^3.0.2",
+        "rimraf": "^5.0.1",
         "source-map-support": "^0.5.21",
         "ts-node": "^10.9.1"
     },

package/src/cli.ts

@@ -17,21 +17,21 @@ async function loadContents(): Promise<Schema[]> {
         ps.push(
             readSchemaFromStdin().then((s) => {
                 contents.push(s);
-            })
+            }),
         );
     }
     for (const pattern of config.input.files) {
         ps.push(
             readSchemasFromFile(pattern).then((ss) => {
                 contents = contents.concat(ss);
-            })
+            }),
         );
     }
     for (const url of config.input.urls) {
         ps.push(
             readSchemaFromUrl(url).then((s) => {
                 contents.push(s);
-            })
+            }),
         );
     }
     await Promise.all(ps);

package/src/commandOptions.ts

@@ -53,17 +53,17 @@ function parse(options: CommandOptions, argv: string[]): commander.Command {
             '--url <url>',
             'input json schema from the url.',
             collectUrl,
-            []
+            [],
         )
         .option('--stdin', 'read stdin with other files or urls.')
         .option('-o, --out <file>', 'output filename.')
         .option(
             '-t, --target <version>',
-            "Specify ECMAScript target version: 'ES3', 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT' (default)."
+            "Specify ECMAScript target version: 'ES3', 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT' (default).",
         )
         .option(
             '--info',
-            'for developer mode. output loaded config and plugin details only.'
+            'for developer mode. output loaded config and plugin details only.',
         )
         .option('--output-ast', 'output TypeScript AST instead of d.ts file.')
         .addHelpText(
@@ -76,7 +76,7 @@ Examples:
   $ dtsgen -o swaggerSchema.d.ts --url https://raw.githubusercontent.com/OAI/OpenAPI-Specification/master/schemas/v2.0/schema.json
   $ dtsgen -o petstore.d.ts --url https://raw.githubusercontent.com/OAI/OpenAPI-Specification/master/examples/v2.0/yaml/petstore.yaml
   $ dtsgen -c dtsgen-test.json --info
-`
+`,
         )
         .parse(argv);