dtsgenerator 3.14.0 → 3.16.0

package/README.md

@@ -29,6 +29,7 @@ TypeScript d.ts file generator from JSON Schema file or OpenAPI(Swagger) spec fi
 ## Usage
 
 ### CLI
+
 ```sh
 $ dtsgen --help
 Usage: dtsgenerator [options] <file ... | file patterns using node-glob>
@@ -58,6 +59,7 @@ Examples:
 For the configuration file, please refer to the file in the [config_sample](https://github.com/horiuchi/dtsgenerator/tree/master/config_sample/) directory.
 
 ### NodeJS API
+
 ```js
 const { default: dtsgenerator, parseSchema } = require('dtsgenerator');
 
@@ -88,21 +90,20 @@ The dtsgenerator v3 has made the following braking changes from v2.
 
 - Support Plug-in feature. See the Plug-in section for more information.
 - Change the command line options.
-    - Remove the `--namespace` option. Use the `@dtsgenerator/replace-namespace` plug-in instead.
-    - Add the `--config` option. Mainly for setting up the Plug-in.
-    - And add more options.
+  - Remove the `--namespace` option. Use the `@dtsgenerator/replace-namespace` plug-in instead.
+  - Add the `--config` option. Mainly for setting up the Plug-in.
+  - And add more options.
 - TypeScript AST is now used internally to generate type definitions.
 
-
 ## Plug-in
 
 ### How to find plug-in
 
-- Search by npm: https://www.npmjs.com/search?q=dtsgenerator%20plugin
-- Find by the @dtsgenerator repositories: https://github.com/dtsgenerator
-    - `@dtsgenerator/replace-namespace` : This plug-in is instead the `--namespace` option on old version.
-    - `@dtsgenerator/decorate-typename` : This plug-in can decorate the output type name.
-    - `@dtsgenerator/single-quote` : This plug-in replace the quote mark to single.
+- Search by npm: <https://www.npmjs.com/search?q=dtsgenerator%20plugin>
+- Find by the @dtsgenerator repositories: <https://github.com/dtsgenerator>
+  - `@dtsgenerator/replace-namespace` : This plug-in is instead the `--namespace` option on old version.
+  - `@dtsgenerator/decorate-typename` : This plug-in can decorate the output type name.
+  - `@dtsgenerator/single-quote` : This plug-in replace the quote mark to single.
 
 ### How to create plug-in
 
@@ -122,8 +123,7 @@ The dtsgenerator v3 has made the following braking changes from v2.
 
 Output debug message by [debug](https://www.npmjs.com/package/debug) library.
 
-    $ DEBUG=dtsgen dtsgen schema/news.json
-
+    DEBUG=dtsgen dtsgen schema/news.json
 
 ### Links about JSON Schema and Swagger
 
@@ -143,7 +143,22 @@ Output debug message by [debug](https://www.npmjs.com/package/debug) library.
 
 ## ChangeLog
 
-### [v3.14.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.13.2) (2022-01-27)
+### [v3.16.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.16.0) (2022-06-10)
+
+- 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:

package/SupportedFeatures.md

@@ -112,5 +112,8 @@ The base JSON Schema version is Draft-07
 - `application/x-www-form-urlencoded`
 - `application/*+json`
 - `application/octet-stream`
+- `application/jwt`
+- `application/vnd.apple.pkpass`
 - `multipart/form-data`
 - `text/*`
+- `image/*`

package/dist/cli.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const fs = (0, tslib_1.__importStar)(require("fs"));
+const fs = tslib_1.__importStar(require("fs"));
 const path_1 = require("path");
-const commandOptions_1 = (0, tslib_1.__importStar)(require("./commandOptions"));
-const core_1 = (0, tslib_1.__importStar)(require("./core"));
-const config_1 = (0, tslib_1.__importStar)(require("./core/config"));
+const commandOptions_1 = tslib_1.__importStar(require("./commandOptions"));
+const core_1 = tslib_1.__importStar(require("./core"));
+const config_1 = tslib_1.__importStar(require("./core/config"));
 const utils_1 = require("./utils");
 async function loadContents() {
     let contents = [];

package/dist/commandOptions.d.ts

@@ -9,7 +9,6 @@ export declare class CommandOptions {
     target?: string;
     info?: boolean;
     outputAST?: boolean;
-    isReadFromStdin(): boolean;
 }
 declare const opts: CommandOptions;
 export default opts;

package/dist/commandOptions.js

@@ -2,16 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.clear = exports.initialize = exports.CommandOptions = exports.defaultConfigFile = void 0;
 const tslib_1 = require("tslib");
-const commander = (0, tslib_1.__importStar)(require("commander"));
+const commander = tslib_1.__importStar(require("commander"));
 exports.defaultConfigFile = 'dtsgen.json';
 class CommandOptions {
     constructor() {
         this.files = [];
         this.urls = [];
     }
-    isReadFromStdin() {
-        return (this.stdin || (this.files.length === 0 && this.urls.length === 0));
-    }
 }
 exports.CommandOptions = CommandOptions;
 const opts = new CommandOptions();

package/dist/core/astBuilder.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addOptionalInformation = exports.addComment = exports.buildTypeReferenceNode = exports.buildTupleTypeNode = exports.buildIntersectionTypeNode = exports.buildUnionTypeNode = exports.buildFreeFormObjectTypeLiteralNode = exports.buildTypeLiteralNode = exports.buildIndexSignatureNode = exports.buildPropertySignature = exports.buildTypeAliasNode = exports.buildInterfaceNode = exports.buildNamespaceNode = exports.buildBooleanLiteralTypeNode = exports.buildNumericLiteralTypeNode = exports.buildStringLiteralTypeNode = exports.buildNullKeyword = exports.buildSimpleArrayNode = exports.buildStringKeyword = exports.buildVoidKeyword = exports.buildUnknownKeyword = exports.buildNeverKeyword = exports.buildAnyKeyword = exports.buildKeyword = void 0;
 const tslib_1 = require("tslib");
-const ts = (0, tslib_1.__importStar)(require("typescript"));
-const config_1 = (0, tslib_1.__importDefault)(require("./config"));
+const ts = tslib_1.__importStar(require("typescript"));
+const config_1 = tslib_1.__importDefault(require("./config"));
 const validateIdentifier_1 = require("./validateIdentifier");
 function buildTypeNameIdentifier(name) {
     return ts.factory.createIdentifier((0, validateIdentifier_1.toValidIdentifier)(name, config_1.default.target));
@@ -87,7 +87,7 @@ function buildTypeAliasNode(id, type, root) {
 exports.buildTypeAliasNode = buildTypeAliasNode;
 function buildPropertySignature(_schema, propertyName, valueType, required, isPattern) {
     const modifiers = undefined;
-    const questionToken = required == null || required.indexOf(propertyName) < 0
+    const questionToken = required == null || !required.includes(propertyName)
         ? ts.factory.createToken(ts.SyntaxKind.QuestionToken)
         : undefined;
     if (isPattern) {
@@ -147,7 +147,8 @@ function buildTupleTypeNode(types, minItems, maxItems, additionalItems) {
     for (let i = 0; i < itemCount; i++) {
         let node = typesIsArray(types)
             ? i < types.length
-                ? types[i]
+                ?
+                    types[i]
                 : additionalItems !== undefined
                     ? additionalItems === false
                         ? buildNeverKeyword()
@@ -172,12 +173,17 @@ function buildTupleTypeNode(types, minItems, maxItems, additionalItems) {
 exports.buildTupleTypeNode = buildTupleTypeNode;
 function buildTypeReferenceNode(schema, currentSchema) {
     const typeName = getTypename(schema.id, currentSchema);
-    if (typeName.length === 0) {
-        throw new Error('TypeName array must not be empty.');
+    let node;
+    for (const name of typeName) {
+        if (node == null) {
+            node = buildTypeNameIdentifier(name);
+        }
+        else {
+            node = ts.factory.createQualifiedName(node, buildTypeNameIdentifier(name));
+        }
     }
-    let node = buildTypeNameIdentifier(typeName[0]);
-    for (let i = 1; i < typeName.length; i++) {
-        node = ts.factory.createQualifiedName(node, buildTypeNameIdentifier(typeName[i]));
+    if (node == null) {
+        throw new Error('TypeName array must not be empty.');
     }
     return ts.factory.createTypeReferenceNode(node, undefined);
 }
@@ -185,29 +191,28 @@ exports.buildTypeReferenceNode = buildTypeReferenceNode;
 function getTypename(id, baseSchema) {
     const result = id.toNames();
     const baseId = baseSchema.id;
-    if (baseId) {
-        const baseTypes = baseId.toNames().slice(0, -1);
-        for (const type of baseTypes) {
-            if (result.length === 1) {
-                break;
-            }
-            if (result[0] === type) {
-                result.shift();
-            }
-            else {
-                break;
-            }
+    const baseTypes = baseId.toNames().slice(0, -1);
+    for (const type of baseTypes) {
+        if (result.length === 1) {
+            break;
+        }
+        if (result[0] === type) {
+            result.shift();
+        }
+        else {
+            break;
         }
     }
     return result;
 }
 function addComment(node, schema, terminate) {
+    var _a;
     const comments = getComment(schema);
     if (comments.length === 0) {
         return node;
     }
     else if (!terminate && comments.length === 1) {
-        return ts.addSyntheticLeadingComment(node, ts.SyntaxKind.MultiLineCommentTrivia, ` ${comments[0]} `, false);
+        return ts.addSyntheticLeadingComment(node, ts.SyntaxKind.MultiLineCommentTrivia, ` ${(_a = comments[0]) !== null && _a !== void 0 ? _a : ''} `, false);
     }
     else {
         let result = '*\n';
@@ -276,11 +281,7 @@ function addOptionalInformation(node, schema, terminate) {
 }
 exports.addOptionalInformation = addOptionalInformation;
 function getLastTypeName(id) {
+    var _a;
     const names = id.toNames();
-    if (names.length > 0) {
-        return names[names.length - 1];
-    }
-    else {
-        return '';
-    }
+    return (_a = names[names.length - 1]) !== null && _a !== void 0 ? _a : '';
 }

package/dist/core/config.d.ts

@@ -1,11 +1,7 @@
 import { ScriptTarget } from 'typescript';
 export interface Config {
     configFile?: string;
-    input: {
-        files: string[];
-        urls: string[];
-        stdin: boolean;
-    };
+    input: InputConfig;
     outputFile?: string;
     target: ScriptTarget;
     outputAST: boolean;
@@ -13,8 +9,16 @@ export interface Config {
         [pluginName: string]: boolean | Record<string, unknown>;
     };
 }
+interface InputConfig {
+    files: string[];
+    urls: string[];
+    stdin: boolean;
+}
+export declare type PartialConfig = Omit<Partial<Config>, 'input'> & {
+    input?: Partial<InputConfig>;
+};
 declare let config: Config;
-export declare function setConfig(input: Partial<Config>): void;
+export declare function setConfig(input: PartialConfig): void;
 export declare function clearToDefault(): void;
 export declare function showConfig(version: string, c: Config): Promise<void>;
 export default config;

package/dist/core/dtsGenerator.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const debug_1 = (0, tslib_1.__importDefault)(require("debug"));
-const ts = (0, tslib_1.__importStar)(require("typescript"));
+const debug_1 = tslib_1.__importDefault(require("debug"));
+const ts = tslib_1.__importStar(require("typescript"));
 const jsonPointer_1 = require("../jsonPointer");
-const ast = (0, tslib_1.__importStar)(require("./astBuilder"));
-const config_1 = (0, tslib_1.__importDefault)(require("./config"));
+const ast = tslib_1.__importStar(require("./astBuilder"));
+const config_1 = tslib_1.__importDefault(require("./config"));
 const jsonSchema_1 = require("./jsonSchema");
-const referenceResolver_1 = (0, tslib_1.__importDefault)(require("./referenceResolver"));
+const referenceResolver_1 = tslib_1.__importDefault(require("./referenceResolver"));
 const type_1 = require("./type");
 const typeTree_1 = require("./typeTree");
-const utils = (0, tslib_1.__importStar)(require("./utils"));
+const utils = tslib_1.__importStar(require("./utils"));
 const debug = (0, debug_1.default)('dtsgen');
 class DtsGenerator {
     constructor(contents) {
@@ -243,9 +243,6 @@ class DtsGenerator {
         const content = schema.content;
         if (content.$ref) {
             const ref = this.resolver.dereference(content.$ref);
-            if (ref.id == null) {
-                throw new Error('target referenced id is nothing: ' + content.$ref);
-            }
             const refSchema = this.normalizeContent(ref);
             const node = ast.addOptionalInformation(ast.addComment(ast.buildTypeReferenceNode(refSchema, this.currentSchema), refSchema, false), refSchema, false);
             return node;
@@ -280,6 +277,7 @@ class DtsGenerator {
         }
     }
     checkExistOtherType(content, base) {
+        var _a;
         const schema = Object.assign({}, base, { content });
         const result = this.generateLiteralTypeProperty(schema, false);
         if (result.kind === ts.SyntaxKind.AnyKeyword) {
@@ -288,7 +286,7 @@ class DtsGenerator {
         else if (result.kind === ts.SyntaxKind.TypeLiteral) {
             const node = result;
             if (node.members.length === 1 &&
-                node.members[0].kind === ts.SyntaxKind.IndexSignature) {
+                ((_a = node.members[0]) === null || _a === void 0 ? void 0 : _a.kind) === ts.SyntaxKind.IndexSignature) {
                 return undefined;
             }
         }

package/dist/core/index.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SchemaId = void 0;
 const tslib_1 = require("tslib");
 const config_1 = require("./config");
-const dtsGenerator_1 = (0, tslib_1.__importDefault)(require("./dtsGenerator"));
+const dtsGenerator_1 = tslib_1.__importDefault(require("./dtsGenerator"));
 var schemaId_1 = require("./schemaId");
-Object.defineProperty(exports, "SchemaId", { enumerable: true, get: function () { return (0, tslib_1.__importDefault)(schemaId_1).default; } });
-(0, tslib_1.__exportStar)(require("./type"), exports);
+Object.defineProperty(exports, "SchemaId", { enumerable: true, get: function () { return tslib_1.__importDefault(schemaId_1).default; } });
+tslib_1.__exportStar(require("./type"), exports);
 async function dtsGenerator(options) {
     if (options.config) {
         (0, config_1.setConfig)(options.config);

package/dist/core/jsonSchema.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.selectSchemaType = exports.searchAllSubSchema = exports.setId = exports.getId = exports.getSubSchema = void 0;
 const tslib_1 = require("tslib");
-const JsonPointer = (0, tslib_1.__importStar)(require("../jsonPointer"));
-const schemaId_1 = (0, tslib_1.__importDefault)(require("./schemaId"));
+const JsonPointer = tslib_1.__importStar(require("../jsonPointer"));
+const schemaId_1 = tslib_1.__importDefault(require("./schemaId"));
 const type_1 = require("./type");
 function getSubSchema(rootSchema, pointer, id) {
     const content = JsonPointer.get(rootSchema.content, JsonPointer.parse(pointer));
@@ -144,7 +144,9 @@ function searchAllSubSchema(schema, onFoundSchema, onFoundReference) {
             }
             Object.keys(obj).forEach((key) => {
                 const item = obj[key];
-                f(item, keys.concat(convertKeyToTypeName(key)));
+                if (item != null) {
+                    f(item, keys.concat(convertKeyToTypeName(key)));
+                }
             });
         }
         function setSubIdToParameterObject(obj, keys) {
@@ -256,9 +258,11 @@ function searchAllSubSchema(schema, onFoundSchema, onFoundReference) {
                 return;
             }
             for (const mime of Object.keys(types)) {
-                if (/^text\/|^(?:application\/x-www-form-urlencoded$|^application\/([a-z0-9-_.]+\+)?json)$|^application\/octet-stream$|^multipart\/form-data$/.test(mime)) {
+                if (/^text\/|^(?:application\/x-www-form-urlencoded$|^application\/([a-z0-9-_.]+\+)?json)$|^application\/octet-stream$|^application\/jwt$|^application\/vnd.apple.pkpass$|^multipart\/form-data$|^image\//.test(mime)) {
                     const mt = types[mime];
-                    setSubId(mt.schema, keys);
+                    if (mt != null) {
+                        setSubId(mt.schema, keys);
+                    }
                 }
             }
         }

package/dist/core/referenceResolver.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 require("cross-fetch/polyfill");
-const debug_1 = (0, tslib_1.__importDefault)(require("debug"));
+const debug_1 = tslib_1.__importDefault(require("debug"));
 const jsonSchema_1 = require("./jsonSchema");
-const schemaId_1 = (0, tslib_1.__importDefault)(require("./schemaId"));
+const schemaId_1 = tslib_1.__importDefault(require("./schemaId"));
 const type_1 = require("./type");
 const debug = (0, debug_1.default)('dtsgen');
 class ReferenceResolver {

package/dist/core/schemaId.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const url = (0, tslib_1.__importStar)(require("url"));
+const url = tslib_1.__importStar(require("url"));
 const validateIdentifier_1 = require("./validateIdentifier");
 class SchemaId {
     constructor(inputId, parentIds) {
-        var _a;
         this.inputId = inputId;
         let absoluteId = url.resolve('', inputId);
         if (parentIds) {
@@ -15,16 +14,16 @@ class SchemaId {
                 }
             });
         }
-        if (absoluteId.indexOf('#') < 0) {
+        if (!absoluteId.includes('#')) {
             absoluteId += '#';
         }
-        if (absoluteId.indexOf('://') < 0 &&
-            absoluteId[0] !== '/' &&
-            absoluteId[0] !== '#') {
+        if (!absoluteId.includes('://') &&
+            !absoluteId.startsWith('/') &&
+            !absoluteId.startsWith('#')) {
             absoluteId = '/' + absoluteId;
         }
         this.id = url.parse(absoluteId);
-        this.absoluteId = (_a = this.id.href) !== null && _a !== void 0 ? _a : '';
+        this.absoluteId = this.id.href;
     }
     getAbsoluteId() {
         return this.absoluteId;
@@ -39,11 +38,11 @@ class SchemaId {
         return this.absoluteId.replace(/#.*$/, '#');
     }
     existsJsonPointerHash() {
-        return this.absoluteId === '#' || /#\//.test(this.absoluteId);
+        return this.absoluteId === '#' || this.absoluteId.includes('#/');
     }
     getJsonPointerHash() {
         const m = /(#\/.*)$/.exec(this.absoluteId);
-        if (m == null) {
+        if ((m === null || m === void 0 ? void 0 : m[1]) == null) {
             return '#';
         }
         return decodeURIComponent(m[1]);

package/dist/core/type.js

@@ -2,12 +2,12 @@
 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");
-const fs = (0, tslib_1.__importStar)(require("fs"));
+const fs = tslib_1.__importStar(require("fs"));
 const path_1 = require("path");
 const js_yaml_1 = require("js-yaml");
 const utils_1 = require("../utils");
 const jsonSchema_1 = require("./jsonSchema");
-const schemaId_1 = (0, tslib_1.__importDefault)(require("./schemaId"));
+const schemaId_1 = tslib_1.__importDefault(require("./schemaId"));
 exports.ts = require("typescript");
 function isJsonSchemaDraft04(_content, type) {
     return type === 'Draft04';
@@ -81,8 +81,8 @@ async function loadPlugin(name, option) {
     if (!option) {
         return undefined;
     }
-    const mod = (await Promise.resolve().then(() => (0, tslib_1.__importStar)(require(name))));
-    if (!(mod === null || mod === void 0 ? void 0 : mod.default)) {
+    const mod = (await Promise.resolve().then(() => tslib_1.__importStar(require(name))));
+    if (!mod.default) {
         console.warn(`The plugin (${name}) is invalid module. That is not default export format.`);
         return undefined;
     }

package/dist/core/utils.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeSchema = exports.reduceTypes = exports.toTSType = void 0;
 const tslib_1 = require("tslib");
-const debug_1 = (0, tslib_1.__importDefault)(require("debug"));
-const ts = (0, tslib_1.__importStar)(require("typescript"));
+const debug_1 = tslib_1.__importDefault(require("debug"));
+const ts = tslib_1.__importStar(require("typescript"));
 const debug = (0, debug_1.default)('dtsgen');
 function toTSType(type, debugSource) {
     switch (type) {

package/dist/jsonPointer.js

@@ -43,7 +43,7 @@ function set(obj, path, value) {
 }
 exports.set = set;
 function parse(s) {
-    if (/^#/.test(s)) {
+    if (s.startsWith('#')) {
         s = s.substring(1);
     }
     const path = s.split('/');

package/dist/utils.d.ts

@@ -1,9 +1,10 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import glob from 'glob';
 import { CommandOptions } from './commandOptions';
-import { Config } from './core/config';
+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 globFiles(pattern: string, options?: glob.IOptions): Promise<string[]>;
-export declare function readConfig(options: CommandOptions): Partial<Config>;
+export declare function readConfig(options: CommandOptions): PartialConfig;

package/dist/utils.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readConfig = exports.globFiles = exports.buildProxyOptions = exports.readUrl = exports.readStream = void 0;
 const tslib_1 = require("tslib");
-const fs = (0, tslib_1.__importStar)(require("fs"));
+const fs = tslib_1.__importStar(require("fs"));
 const url_1 = require("url");
-const glob_1 = (0, tslib_1.__importDefault)(require("glob"));
-const https_proxy_agent_1 = (0, tslib_1.__importDefault)(require("https-proxy-agent"));
+const glob_1 = tslib_1.__importDefault(require("glob"));
+const https_proxy_agent_1 = tslib_1.__importDefault(require("https-proxy-agent"));
 const typescript_1 = require("typescript");
 const commandOptions_1 = require("./commandOptions");
 function readStream(stream, encoding = 'utf8') {
@@ -107,7 +107,14 @@ function readConfig(options) {
     else if (pc.input.urls == null) {
         pc.input.urls = [];
     }
-    pc.input.stdin = options.isReadFromStdin();
+    if (options.stdin != null) {
+        pc.input.stdin = options.stdin;
+    }
+    else {
+        pc.input.stdin =
+            pc.input.stdin ||
+                (pc.input.files.length === 0 && pc.input.urls.length === 0);
+    }
     if (options.out != null) {
         pc.outputFile = options.out;
     }

package/package.json

@@ -1,85 +1,85 @@
 {
-  "name": "dtsgenerator",
-  "version": "3.14.0",
-  "description": "TypeScript d.ts file generator for JSON Schema file",
-  "bin": {
-    "dtsgen": "bin/dtsgen"
-  },
-  "main": "dist/core/",
-  "typings": "dist/core/index.d.ts",
-  "scripts": {
-    "build": "tsc -p ./tsconfig-build.json",
-    "clean": "rimraf dist/ build/ {src,test}/**/*.{js,js.map} *.tsbuildinfo",
-    "compile": "tsc -p .",
-    "lint": "eslint --fix --ext ts src/ test/",
-    "format": "prettier --write 'src/**/*.ts' 'test/*.ts' 'test/core/*.ts'",
-    "precompile": "npm run lint && npm run format",
-    "prepublishOnly": "npm run build",
-    "pretest": "npm run compile",
-    "do-test": "cross-env TS_NODE_FILES=true mocha --exit --require ts-node/register --require source-map-support/register --colors test/*_test.ts test/**/*_test.ts",
-    "test": "nyc npm run do-test",
-    "test:update-snapshot": "UPDATE_SNAPSHOT=1 npm run test",
-    "coverage": "nyc report --reporter=lcov",
-    "prepare": "husky install"
-  },
-  "directories": {
-    "test": "test/"
-  },
-  "keywords": [
-    "TypeScript",
-    "JSON Schema",
-    "OpenAPI"
-  ],
-  "author": "horiuchi",
-  "license": "MIT",
-  "homepage": "https://github.com/horiuchi/dtsgenerator",
-  "repository": {
-    "type": "git",
-    "url": "git@github.com:horiuchi/dtsgenerator.git"
-  },
-  "bugs": {
-    "url": "https://github.com/horiuchi/dtsgenerator/issues"
-  },
-  "engines": {
-    "node": ">= 10.0"
-  },
-  "dependencies": {
-    "commander": "^8.3.0",
-    "cross-fetch": "^3.1.5",
-    "debug": "^4.3.3",
-    "glob": "^7.2.0",
-    "https-proxy-agent": "^5.0.0",
-    "js-yaml": "^4.1.0",
-    "tslib": "^2.3.1",
-    "typescript": "^4.5.5"
-  },
-  "devDependencies": {
-    "@dtsgenerator/do-nothing": "^2.5.1",
-    "@dtsgenerator/eslint-config": "^0.5.0",
-    "@dtsgenerator/replace-namespace": "^1.5.1",
-    "@dtsgenerator/single-quote": "^1.6.1",
-    "@istanbuljs/nyc-config-typescript": "^1.0.2",
-    "@types/debug": "^4.1.7",
-    "@types/glob": "^7.2.0",
-    "@types/js-yaml": "^4.0.5",
-    "@types/mkdirp": "^1.0.2",
-    "@types/mocha": "^9.1.0",
-    "@types/node": "^16.11.21",
-    "cross-env": "^7.0.3",
-    "eslint": "^8.7.0",
-    "husky": "^7.0.4",
-    "lint-staged": "^12.3.2",
-    "mocha": "^9.2.0",
-    "nyc": "^15.1.0",
-    "prettier": "^2.5.1",
-    "rimraf": "^3.0.2",
-    "source-map-support": "^0.5.21",
-    "ts-node": "^10.4.0"
-  },
-  "lint-staged": {
-    "**/*.ts": [
-      "prettier --write",
-      "eslint --fix"
-    ]
-  }
+    "name": "dtsgenerator",
+    "version": "3.16.0",
+    "description": "TypeScript d.ts file generator for JSON Schema file",
+    "bin": {
+        "dtsgen": "bin/dtsgen"
+    },
+    "main": "dist/core/",
+    "typings": "dist/core/index.d.ts",
+    "scripts": {
+        "build": "tsc -p ./tsconfig-build.json",
+        "clean": "rimraf dist/ build/ {src,test}/**/*.{js,js.map} *.tsbuildinfo",
+        "compile": "tsc -p .",
+        "lint": "eslint --fix --ext ts src/ test/",
+        "format": "prettier --write 'src/**/*.ts' 'test/*.ts' 'test/core/*.ts'",
+        "precompile": "npm run lint && npm run format",
+        "prepublishOnly": "npm run build",
+        "pretest": "npm run compile",
+        "do-test": "cross-env TS_NODE_FILES=true mocha --exit --require ts-node/register --require source-map-support/register --colors test/*_test.ts test/**/*_test.ts",
+        "test": "nyc npm run do-test",
+        "test:update-snapshot": "UPDATE_SNAPSHOT=1 npm run test",
+        "coverage": "nyc report --reporter=lcov",
+        "prepare": "husky install"
+    },
+    "directories": {
+        "test": "test/"
+    },
+    "keywords": [
+        "TypeScript",
+        "JSON Schema",
+        "OpenAPI"
+    ],
+    "author": "horiuchi",
+    "license": "MIT",
+    "homepage": "https://github.com/horiuchi/dtsgenerator",
+    "repository": {
+        "type": "git",
+        "url": "git@github.com:horiuchi/dtsgenerator.git"
+    },
+    "bugs": {
+        "url": "https://github.com/horiuchi/dtsgenerator/issues"
+    },
+    "engines": {
+        "node": ">= 10.0"
+    },
+    "dependencies": {
+        "commander": "^9.3.0",
+        "cross-fetch": "^3.1.5",
+        "debug": "^4.3.4",
+        "glob": "^8.0.3",
+        "https-proxy-agent": "^5.0.1",
+        "js-yaml": "^4.1.0",
+        "tslib": "^2.4.0",
+        "typescript": "^4.7.3"
+    },
+    "devDependencies": {
+        "@dtsgenerator/do-nothing": "^2.5.2",
+        "@dtsgenerator/eslint-config": "^0.6.1",
+        "@dtsgenerator/replace-namespace": "^1.5.2",
+        "@dtsgenerator/single-quote": "^1.6.2",
+        "@istanbuljs/nyc-config-typescript": "^1.0.2",
+        "@types/debug": "^4.1.7",
+        "@types/glob": "^7.2.0",
+        "@types/js-yaml": "^4.0.5",
+        "@types/mkdirp": "^1.0.2",
+        "@types/mocha": "^9.1.1",
+        "@types/node": "^16.11.39",
+        "cross-env": "^7.0.3",
+        "eslint": "^8.17.0",
+        "husky": "^8.0.1",
+        "lint-staged": "^13.0.1",
+        "mocha": "^10.0.0",
+        "nyc": "^15.1.0",
+        "prettier": "^2.6.2",
+        "rimraf": "^3.0.2",
+        "source-map-support": "^0.5.21",
+        "ts-node": "^10.8.1"
+    },
+    "lint-staged": {
+        "**/*.ts": [
+            "prettier --write",
+            "eslint --fix"
+        ]
+    }
 }

package/src/commandOptions.ts

@@ -11,12 +11,6 @@ export class CommandOptions {
     public target?: string;
     public info?: boolean;
     public outputAST?: boolean;
-
-    public isReadFromStdin(): boolean {
-        return (
-            this.stdin || (this.files.length === 0 && this.urls.length === 0)
-        );
-    }
 }
 
 const opts = new CommandOptions();
@@ -46,8 +40,8 @@ function parse(options: CommandOptions, argv: string[]): commander.Command {
         return memo;
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
-    const pkg: Record<string, string> = require('../package.json');
+    // eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-unsafe-assignment
+    const pkg: { name: string; version: string } = require('../package.json');
 
     // <hoge> is required, [hoge] is optional
     program

package/src/core/astBuilder.ts

@@ -121,7 +121,7 @@ export function buildPropertySignature(
 ): ts.PropertySignature | ts.IndexSignatureDeclaration {
     const modifiers = undefined;
     const questionToken =
-        required == null || required.indexOf(propertyName) < 0
+        required == null || !required.includes(propertyName)
             ? ts.factory.createToken(ts.SyntaxKind.QuestionToken)
             : undefined;
     if (isPattern) {
@@ -230,7 +230,8 @@ export function buildTupleTypeNode(
     for (let i = 0; i < itemCount; i++) {
         let node = typesIsArray(types)
             ? i < types.length
-                ? types[i]
+                ? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                  types[i]!
                 : additionalItems !== undefined
                 ? additionalItems === false
                     ? buildNeverKeyword()
@@ -266,32 +267,34 @@ export function buildTypeReferenceNode(
     currentSchema: Schema
 ): ts.TypeReferenceNode {
     const typeName = getTypename(schema.id, currentSchema);
-    if (typeName.length === 0) {
-        throw new Error('TypeName array must not be empty.');
+    let node: ts.EntityName | undefined;
+    for (const name of typeName) {
+        if (node == null) {
+            node = buildTypeNameIdentifier(name);
+        } else {
+            node = ts.factory.createQualifiedName(
+                node,
+                buildTypeNameIdentifier(name)
+            );
+        }
     }
-    let node: ts.EntityName = buildTypeNameIdentifier(typeName[0]);
-    for (let i = 1; i < typeName.length; i++) {
-        node = ts.factory.createQualifiedName(
-            node,
-            buildTypeNameIdentifier(typeName[i])
-        );
+    if (node == null) {
+        throw new Error('TypeName array must not be empty.');
     }
     return ts.factory.createTypeReferenceNode(node, undefined);
 }
 function getTypename(id: SchemaId, baseSchema: Schema): string[] {
     const result = id.toNames();
     const baseId = baseSchema.id;
-    if (baseId) {
-        const baseTypes = baseId.toNames().slice(0, -1);
-        for (const type of baseTypes) {
-            if (result.length === 1) {
-                break;
-            }
-            if (result[0] === type) {
-                result.shift();
-            } else {
-                break;
-            }
+    const baseTypes = baseId.toNames().slice(0, -1);
+    for (const type of baseTypes) {
+        if (result.length === 1) {
+            break;
+        }
+        if (result[0] === type) {
+            result.shift();
+        } else {
+            break;
         }
     }
     return result;
@@ -309,7 +312,7 @@ export function addComment<T extends ts.Node>(
         return ts.addSyntheticLeadingComment(
             node,
             ts.SyntaxKind.MultiLineCommentTrivia,
-            ` ${comments[0]} `,
+            ` ${comments[0] ?? ''} `,
             false
         );
     } else {
@@ -394,9 +397,5 @@ export function addOptionalInformation<T extends ts.Node>(
 
 function getLastTypeName(id: SchemaId): string {
     const names = id.toNames();
-    if (names.length > 0) {
-        return names[names.length - 1];
-    } else {
-        return '';
-    }
+    return names[names.length - 1] ?? '';
 }

package/src/core/config.ts

@@ -3,11 +3,7 @@ import { Plugin, loadPlugin } from './type';
 
 export interface Config {
     configFile?: string;
-    input: {
-        files: string[];
-        urls: string[];
-        stdin: boolean;
-    };
+    input: InputConfig;
     outputFile?: string;
     target: ScriptTarget;
     outputAST: boolean;
@@ -17,6 +13,16 @@ export interface Config {
     };
 }
 
+interface InputConfig {
+    files: string[];
+    urls: string[];
+    stdin: boolean;
+}
+
+export type PartialConfig = Omit<Partial<Config>, 'input'> & {
+    input?: Partial<InputConfig>;
+};
+
 const defaultConfig: Config = {
     configFile: undefined,
     input: {
@@ -32,7 +38,7 @@ const defaultConfig: Config = {
 
 let config: Config = Object.assign({}, defaultConfig);
 
-export function setConfig(input: Partial<Config>): void {
+export function setConfig(input: PartialConfig): void {
     config = Object.assign(config, input);
 }
 

package/src/core/dtsGenerator.ts

@@ -57,7 +57,8 @@ export default class DtsGenerator {
 
         const postProcess = await this.getPostProcess(plugins.post);
         const result = ts.transform(file, postProcess);
-        const transformedNodes = result.transformed[0];
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        const transformedNodes = result.transformed[0]!;
 
         const transformedContent = config.outputAST
             ? JSON.stringify(transformedNodes, null, 2)
@@ -374,11 +375,6 @@ export default class DtsGenerator {
         const content = schema.content;
         if (content.$ref) {
             const ref = this.resolver.dereference(content.$ref);
-            if (ref.id == null) {
-                throw new Error(
-                    'target referenced id is nothing: ' + content.$ref
-                );
-            }
             const refSchema = this.normalizeContent(ref);
             const node = ast.addOptionalInformation(
                 ast.addComment(
@@ -448,7 +444,7 @@ export default class DtsGenerator {
             const node = result as ts.TypeLiteralNode;
             if (
                 node.members.length === 1 &&
-                node.members[0].kind === ts.SyntaxKind.IndexSignature
+                node.members[0]?.kind === ts.SyntaxKind.IndexSignature
             ) {
                 return undefined;
             }

package/src/core/jsonSchema.ts

@@ -209,7 +209,9 @@ export function searchAllSubSchema(
             }
             Object.keys(obj).forEach((key) => {
                 const item = obj[key];
-                f(item, keys.concat(convertKeyToTypeName(key)));
+                if (item != null) {
+                    f(item, keys.concat(convertKeyToTypeName(key)));
+                }
             });
         }
 
@@ -272,6 +274,7 @@ export function searchAllSubSchema(
                 if ('$ref' in item) {
                     setSubId(item, keys.concat(key));
                 }
+                // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
                 if ('type' in item && item.in !== undefined) {
                     setSubId(
                         item as JsonSchemaDraft04.Schema,
@@ -343,7 +346,8 @@ export function searchAllSubSchema(
             }
             const operationId = ops.operationId;
             if (operationId) {
-                keys = [keys[0], convertKeyToTypeName(operationId)];
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                keys = [keys[0]!, convertKeyToTypeName(operationId)];
             }
             setSubIdToParameters(ops.parameters, keys.concat('parameters'));
             setSubIdToResponsesV2(ops.responses, keys.concat('responses'));
@@ -379,12 +383,14 @@ export function searchAllSubSchema(
             }
             for (const mime of Object.keys(types)) {
                 if (
-                    /^text\/|^(?:application\/x-www-form-urlencoded$|^application\/([a-z0-9-_.]+\+)?json)$|^application\/octet-stream$|^multipart\/form-data$/.test(
+                    /^text\/|^(?:application\/x-www-form-urlencoded$|^application\/([a-z0-9-_.]+\+)?json)$|^application\/octet-stream$|^application\/jwt$|^application\/vnd.apple.pkpass$|^multipart\/form-data$|^image\//.test(
                         mime
                     )
                 ) {
                     const mt = types[mime];
-                    setSubId(mt.schema, keys);
+                    if (mt != null) {
+                        setSubId(mt.schema, keys);
+                    }
                 }
             }
         }
@@ -443,7 +449,8 @@ export function searchAllSubSchema(
             }
             const operationId = ops.operationId;
             if (operationId) {
-                keys = [keys[0], convertKeyToTypeName(operationId)];
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                keys = [keys[0]!, convertKeyToTypeName(operationId)];
             }
             setSubIdToParameters(ops.parameters, keys.concat('parameters'));
             setSubIdToRequestBody(ops.requestBody, keys.concat('requestBody'));
@@ -579,6 +586,7 @@ export function selectSchemaType(content: JsonSchema | OpenApiSchema): {
             }
         }
     }
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     if ('swagger' in content && content.swagger === '2.0') {
         return {
             type: 'Draft04',

package/src/core/schemaId.ts

@@ -15,18 +15,18 @@ export default class SchemaId {
                 }
             });
         }
-        if (absoluteId.indexOf('#') < 0) {
+        if (!absoluteId.includes('#')) {
             absoluteId += '#';
         }
         if (
-            absoluteId.indexOf('://') < 0 &&
-            absoluteId[0] !== '/' &&
-            absoluteId[0] !== '#'
+            !absoluteId.includes('://') &&
+            !absoluteId.startsWith('/') &&
+            !absoluteId.startsWith('#')
         ) {
             absoluteId = '/' + absoluteId;
         }
         this.id = url.parse(absoluteId);
-        this.absoluteId = this.id.href ?? '';
+        this.absoluteId = this.id.href;
     }
 
     public getAbsoluteId(): string {
@@ -42,11 +42,11 @@ export default class SchemaId {
         return this.absoluteId.replace(/#.*$/, '#');
     }
     public existsJsonPointerHash(): boolean {
-        return this.absoluteId === '#' || /#\//.test(this.absoluteId);
+        return this.absoluteId === '#' || this.absoluteId.includes('#/');
     }
     public getJsonPointerHash(): string {
         const m = /(#\/.*)$/.exec(this.absoluteId);
-        if (m == null) {
+        if (m?.[1] == null) {
             return '#';
         }
         return decodeURIComponent(m[1]);

package/src/core/type.ts

@@ -142,7 +142,7 @@ export async function loadPlugin(
     }
 
     const mod = (await import(name)) as { default?: Plugin };
-    if (!mod?.default) {
+    if (!mod.default) {
         console.warn(
             `The plugin (${name}) is invalid module. That is not default export format.`
         );

package/src/core/validateIdentifier.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
 import { ScriptTarget } from 'typescript';
 
 // via. https://github.com/microsoft/TypeScript/blob/v3.7.5/src/services/codefixes/importFixes.ts#L689
@@ -752,7 +753,7 @@ const unicodeESNextIdentifierPart = [
 
 function lookupInUnicodeMap(code: number, map: readonly number[]): boolean {
     // Bail out quickly if it couldn't possibly be in the map.
-    if (code < map[0]) {
+    if (code < map[0]!) {
         return false;
     }
 
@@ -765,11 +766,11 @@ function lookupInUnicodeMap(code: number, map: readonly number[]): boolean {
         mid = lo + (hi - lo) / 2;
         // mid has to be even to catch a range's beginning
         mid -= mid % 2;
-        if (map[mid] <= code && code <= map[mid + 1]) {
+        if (map[mid]! <= code && code <= map[mid + 1]!) {
             return true;
         }
 
-        if (code < map[mid]) {
+        if (code < map[mid]!) {
             hi = mid;
         } else {
             lo = mid + 2;

package/src/jsonPointer.ts

@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
@@ -12,9 +12,9 @@ export function get(
         return obj;
     }
     let o = obj;
-    const lastKey = path[path.length - 1];
+    const lastKey = path[path.length - 1]!;
     for (let i = 0; i < path.length - 1; i++) {
-        const key = path[i];
+        const key = path[i]!;
         let next = o[key];
         if (next == null) {
             if (isCreateOnNotExists) {
@@ -34,9 +34,9 @@ export function set(obj: any, path: string[], value: any): void {
         return;
     }
     let o = obj;
-    const lastKey = path[path.length - 1];
+    const lastKey = path[path.length - 1]!;
     for (let i = 0; i < path.length - 1; i++) {
-        const key = path[i];
+        const key = path[i]!;
         let next = o[key];
         if (next == null) {
             next = {};
@@ -48,7 +48,7 @@ export function set(obj: any, path: string[], value: any): void {
 }
 
 export function parse(s: string): string[] {
-    if (/^#/.test(s)) {
+    if (s.startsWith('#')) {
         s = s.substring(1);
     }
     const path = s.split('/');

package/src/utils.ts

@@ -4,7 +4,7 @@ import glob from 'glob';
 import proxy from 'https-proxy-agent';
 import { ScriptTarget } from 'typescript';
 import { CommandOptions, defaultConfigFile } from './commandOptions';
-import { Config } from './core/config';
+import { PartialConfig } from './core/config';
 
 export function readStream(
     stream: NodeJS.ReadableStream,
@@ -78,8 +78,8 @@ export function globFiles(
     });
 }
 
-export function readConfig(options: CommandOptions): Partial<Config> {
-    let pc: Partial<Config> = {};
+export function readConfig(options: CommandOptions): PartialConfig {
+    let pc: PartialConfig = {};
     const configFile = options.configFile ?? defaultConfigFile;
     try {
         pc = loadJSON(configFile);
@@ -109,7 +109,13 @@ export function readConfig(options: CommandOptions): Partial<Config> {
     } else if (pc.input.urls == null) {
         pc.input.urls = [];
     }
-    pc.input.stdin = options.isReadFromStdin();
+    if (options.stdin != null) {
+        pc.input.stdin = options.stdin;
+    } else {
+        pc.input.stdin =
+            pc.input.stdin ||
+            (pc.input.files.length === 0 && pc.input.urls.length === 0);
+    }
 
     if (options.out != null) {
         pc.outputFile = options.out;
@@ -122,9 +128,9 @@ export function readConfig(options: CommandOptions): Partial<Config> {
     pc.outputAST = !!options.outputAST;
     return pc;
 }
-function loadJSON(file: string): Partial<Config> {
+function loadJSON(file: string): PartialConfig {
     const content = fs.readFileSync(file, 'utf-8');
-    return JSON.parse(content) as Partial<Config>;
+    return JSON.parse(content) as PartialConfig;
 }
 function convertToScriptTarget(target: string): ScriptTarget {
     switch (target.trim().toLowerCase()) {

package/tsconfig.json

@@ -37,6 +37,7 @@
     "noUnusedParameters": true,               /* Report errors on unused parameters. */
     "noImplicitReturns": true,                /* Report error when not all code paths in function return a value. */
     "noFallthroughCasesInSwitch": true,       /* Report errors for fallthrough cases in switch statement. */
+    "noUncheckedIndexedAccess": true,
 
     /* Module Resolution Options */
     // "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */