dtsgenerator 3.15.0 → 3.15.1

package/README.md

@@ -143,6 +143,11 @@ Output debug message by [debug](https://www.npmjs.com/package/debug) library.
 
 ## ChangeLog
 
+### [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:

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));

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) {

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));

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,7 +1,7 @@
 "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) {

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,7 +81,7 @@ async function loadPlugin(name, option) {
     if (!option) {
         return undefined;
     }
-    const mod = (await Promise.resolve().then(() => (0, tslib_1.__importStar)(require(name))));
+    const mod = (await Promise.resolve().then(() => tslib_1.__importStar(require(name))));
     if (!(mod === null || mod === void 0 ? void 0 : 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/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,6 +1,6 @@
 {
   "name": "dtsgenerator",
-  "version": "3.15.0",
+  "version": "3.15.1",
   "description": "TypeScript d.ts file generator for JSON Schema file",
   "bin": {
     "dtsgen": "bin/dtsgen"
@@ -51,7 +51,7 @@
     "https-proxy-agent": "^5.0.0",
     "js-yaml": "^4.1.0",
     "tslib": "^2.3.1",
-    "typescript": "^4.5.5"
+    "typescript": "^4.6.2"
   },
   "devDependencies": {
     "@dtsgenerator/do-nothing": "^2.5.1",
@@ -64,17 +64,17 @@
     "@types/js-yaml": "^4.0.5",
     "@types/mkdirp": "^1.0.2",
     "@types/mocha": "^9.1.0",
-    "@types/node": "^16.11.22",
+    "@types/node": "^16.11.26",
     "cross-env": "^7.0.3",
-    "eslint": "^8.8.0",
+    "eslint": "^8.10.0",
     "husky": "^7.0.4",
-    "lint-staged": "^12.3.3",
-    "mocha": "^9.2.0",
+    "lint-staged": "^12.3.5",
+    "mocha": "^9.2.1",
     "nyc": "^15.1.0",
     "prettier": "^2.5.1",
     "rimraf": "^3.0.2",
     "source-map-support": "^0.5.21",
-    "ts-node": "^10.4.0"
+    "ts-node": "^10.7.0"
   },
   "lint-staged": {
     "**/*.ts": [

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();

package/src/utils.ts

@@ -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;