dtsgenerator 3.12.1 → 3.14.0

package/dist/utils.js

@@ -1,10 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.globFiles = exports.readUrl = exports.readStream = void 0;
+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 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 = (0, tslib_1.__importDefault)(require("glob"));
+const https_proxy_agent_1 = (0, tslib_1.__importDefault)(require("https-proxy-agent"));
+const typescript_1 = require("typescript");
+const commandOptions_1 = require("./commandOptions");
 function readStream(stream, encoding = 'utf8') {
     stream.setEncoding(encoding);
     return new Promise((resolve, reject) => {
@@ -54,13 +57,14 @@ function buildProxyOptions(url) {
         if (proxyUrl.username) {
             agentOptions.auth = proxyUrl.username + ':' + proxyUrl.password;
         }
-        return { agent: https_proxy_agent_1.default(agentOptions) };
+        return { agent: (0, https_proxy_agent_1.default)(agentOptions) };
     }
     return undefined;
 }
+exports.buildProxyOptions = buildProxyOptions;
 function globFiles(pattern, options) {
     return new Promise((resolve, reject) => {
-        glob_1.default(pattern, options !== null && options !== void 0 ? options : {}, (err, matches) => {
+        (0, glob_1.default)(pattern, options !== null && options !== void 0 ? options : {}, (err, matches) => {
             if (err) {
                 reject(err);
             }
@@ -71,3 +75,77 @@ function globFiles(pattern, options) {
     });
 }
 exports.globFiles = globFiles;
+function readConfig(options) {
+    var _a;
+    let pc = {};
+    const configFile = (_a = options.configFile) !== null && _a !== void 0 ? _a : commandOptions_1.defaultConfigFile;
+    try {
+        pc = loadJSON(configFile);
+        pc.configFile = configFile;
+    }
+    catch (err) {
+        if (options.configFile != null) {
+            console.error('Error to load config file from ' + options.configFile);
+        }
+    }
+    if (pc.input == null) {
+        pc.input = {
+            files: [],
+            urls: [],
+            stdin: false,
+        };
+    }
+    if (options.files.length > 0) {
+        pc.input.files = options.files;
+    }
+    else if (pc.input.files == null) {
+        pc.input.files = [];
+    }
+    if (options.urls.length > 0) {
+        pc.input.urls = options.urls;
+    }
+    else if (pc.input.urls == null) {
+        pc.input.urls = [];
+    }
+    pc.input.stdin = options.isReadFromStdin();
+    if (options.out != null) {
+        pc.outputFile = options.out;
+    }
+    if (options.target != null) {
+        pc.target = convertToScriptTarget(options.target);
+    }
+    else if (pc.target != null) {
+        pc.target = convertToScriptTarget(pc.target);
+    }
+    pc.outputAST = !!options.outputAST;
+    return pc;
+}
+exports.readConfig = readConfig;
+function loadJSON(file) {
+    const content = fs.readFileSync(file, 'utf-8');
+    return JSON.parse(content);
+}
+function convertToScriptTarget(target) {
+    switch (target.trim().toLowerCase()) {
+        case 'es3':
+            return typescript_1.ScriptTarget.ES3;
+        case 'es5':
+            return typescript_1.ScriptTarget.ES5;
+        case 'es2015':
+            return typescript_1.ScriptTarget.ES2015;
+        case 'es2016':
+            return typescript_1.ScriptTarget.ES2016;
+        case 'es2017':
+            return typescript_1.ScriptTarget.ES2017;
+        case 'es2018':
+            return typescript_1.ScriptTarget.ES2018;
+        case 'es2019':
+            return typescript_1.ScriptTarget.ES2019;
+        case 'es2020':
+            return typescript_1.ScriptTarget.ES2020;
+        case 'esnext':
+            return typescript_1.ScriptTarget.ESNext;
+        default:
+            return typescript_1.ScriptTarget.Latest;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtsgenerator",
-  "version": "3.12.1",
+  "version": "3.14.0",
   "description": "TypeScript d.ts file generator for JSON Schema file",
   "bin": {
     "dtsgen": "bin/dtsgen"
@@ -11,17 +11,16 @@
     "build": "tsc -p ./tsconfig-build.json",
     "clean": "rimraf dist/ build/ {src,test}/**/*.{js,js.map} *.tsbuildinfo",
     "compile": "tsc -p .",
-    "coverage": "nyc report --reporter=text-lcov | coveralls",
-    "do-test": "cross-env TS_NODE_FILES=true mocha --exit --require ts-node/register --colors test/*_test.ts",
-    "lint:fix": "npm run lint -- --fix",
-    "lint": "eslint --ext ts src/ test/",
+    "lint": "eslint --fix --ext ts src/ test/",
     "format": "prettier --write 'src/**/*.ts' 'test/*.ts' 'test/core/*.ts'",
-    "precompile": "npm run lint:fix && npm run format",
+    "precompile": "npm run lint && npm run format",
     "prepublishOnly": "npm run build",
     "pretest": "npm run compile",
-    "test:update-snapshot": "UPDATE_SNAPSHOT=1 npm run test",
+    "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",
-    "watch": "npm run compile -- -w"
+    "test:update-snapshot": "UPDATE_SNAPSHOT=1 npm run test",
+    "coverage": "nyc report --reporter=lcov",
+    "prepare": "husky install"
   },
   "directories": {
     "test": "test/"
@@ -45,50 +44,42 @@
     "node": ">= 10.0"
   },
   "dependencies": {
-    "commander": "^7.2.0",
-    "cross-fetch": "^3.1.4",
-    "debug": "^4.3.1",
-    "glob": "^7.1.7",
+    "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.2.0",
-    "typescript": "^4.2.4"
+    "tslib": "^2.3.1",
+    "typescript": "^4.5.5"
   },
   "devDependencies": {
-    "@dtsgenerator/do-nothing": "^2.4.0",
-    "@dtsgenerator/replace-namespace": "^1.4.1",
-    "@dtsgenerator/single-quote": "^1.5.1",
-    "@types/debug": "^4.1.5",
-    "@types/glob": "^7.1.3",
-    "@types/js-yaml": "^4.0.1",
-    "@types/mkdirp": "^1.0.1",
-    "@types/mocha": "^8.2.2",
-    "@types/node": "^10.17.60",
-    "@types/prettier": "^2.2.3",
-    "@typescript-eslint/eslint-plugin": "^4.24.0",
-    "@typescript-eslint/parser": "^4.24.0",
-    "coveralls": "^3.1.0",
+    "@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": "^7.26.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-import-resolver-typescript": "^2.4.0",
-    "eslint-plugin-import": "^2.23.2",
-    "eslint-plugin-prettier": "^3.4.0",
-    "eslint-plugin-sort-imports-es6-autofix": "^0.6.0",
-    "husky": "^6.0.0",
-    "lint-staged": "^11.0.0",
-    "mocha": "^8.4.0",
+    "eslint": "^8.7.0",
+    "husky": "^7.0.4",
+    "lint-staged": "^12.3.2",
+    "mocha": "^9.2.0",
     "nyc": "^15.1.0",
-    "prettier": "^2.3.0",
+    "prettier": "^2.5.1",
     "rimraf": "^3.0.2",
-    "ts-node": "^9.1.1"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
+    "source-map-support": "^0.5.21",
+    "ts-node": "^10.4.0"
   },
   "lint-staged": {
-    "*.ts": "npm run precompile"
+    "**/*.ts": [
+      "prettier --write",
+      "eslint --fix"
+    ]
   }
 }

package/src/cli.ts

@@ -1,89 +1,14 @@
 import * as fs from 'fs';
 import { dirname } from 'path';
-import { ScriptTarget } from 'typescript';
-import opts, {
-    initialize,
-    CommandOptions,
-    defaultConfigFile,
-} from './commandOptions';
+import opts, { initialize } from './commandOptions';
 import dtsgenerator, {
     Schema,
     readSchemaFromStdin,
     readSchemasFromFile,
     readSchemaFromUrl,
 } from './core';
-import config, { Config, setConfig, showConfig } from './core/config';
-
-function readConfig(options: CommandOptions): Partial<Config> {
-    let pc: Partial<Config> = {};
-    const configFile = options.configFile ?? defaultConfigFile;
-    try {
-        pc = loadJSON(configFile);
-        pc.configFile = configFile;
-    } catch (err) {
-        if (options.configFile != null) {
-            console.error(
-                'Error to load config file from ' + options.configFile
-            );
-        }
-    }
-
-    if (pc.input == null) {
-        pc.input = {
-            files: [],
-            urls: [],
-            stdin: false,
-        };
-    }
-    if (options.files.length > 0) {
-        pc.input.files = options.files;
-    } else if (pc.input.files == null) {
-        pc.input.files = [];
-    }
-    if (options.urls.length > 0) {
-        pc.input.urls = options.urls;
-    } else if (pc.input.urls == null) {
-        pc.input.urls = [];
-    }
-    pc.input.stdin = options.isReadFromStdin();
-
-    if (options.out != null) {
-        pc.outputFile = options.out;
-    }
-    if (options.target != null) {
-        pc.target = convertToScriptTarget(options.target);
-    }
-    pc.outputAST = !!options.outputAST;
-    return pc;
-}
-function loadJSON(file: string): Partial<Config> {
-    const content = fs.readFileSync(file, 'utf-8');
-    return JSON.parse(content) as Partial<Config>;
-}
-function convertToScriptTarget(target: string): ScriptTarget {
-    switch (target.trim().toLowerCase()) {
-        case 'es3':
-            return ScriptTarget.ES3;
-        case 'es5':
-            return ScriptTarget.ES5;
-        case 'es2015':
-            return ScriptTarget.ES2015;
-        case 'es2016':
-            return ScriptTarget.ES2016;
-        case 'es2017':
-            return ScriptTarget.ES2017;
-        case 'es2018':
-            return ScriptTarget.ES2018;
-        case 'es2019':
-            return ScriptTarget.ES2019;
-        case 'es2020':
-            return ScriptTarget.ES2020;
-        case 'esnext':
-            return ScriptTarget.ESNext;
-        default:
-            return ScriptTarget.Latest;
-    }
-}
+import config, { setConfig, showConfig } from './core/config';
+import { readConfig } from './utils';
 
 async function loadContents(): Promise<Schema[]> {
     let contents: Schema[] = [];

package/src/commandOptions.ts

@@ -47,7 +47,7 @@ function parse(options: CommandOptions, argv: string[]): commander.Command {
     }
 
     // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
-    const pkg: Record<string, any> = require('../package.json');
+    const pkg: Record<string, string> = require('../package.json');
 
     // <hoge> is required, [hoge] is optional
     program

package/src/core/astBuilder.ts

@@ -9,9 +9,6 @@ function buildTypeNameIdentifier(name: string): ts.Identifier {
     return ts.factory.createIdentifier(toValidIdentifier(name, config.target));
 }
 function buildPropertyNameIdentifier(name: string): ts.PropertyName {
-    if (/^\d/.test(name)) {
-        name = '$' + name;
-    }
     if (checkInvalidCharacter(name, config.target)) {
         return ts.factory.createIdentifier(name);
     } else {
@@ -198,6 +195,17 @@ export function buildUnionTypeNode<T>(
     return ts.factory.createParenthesizedType(node);
 }
 
+export function buildIntersectionTypeNode(
+    types: readonly ts.TypeNode[],
+    terminate: boolean
+): ts.TypeNode {
+    const node = ts.factory.createIntersectionTypeNode(types);
+    if (terminate) {
+        return node;
+    }
+    return ts.factory.createParenthesizedType(node);
+}
+
 export function buildTupleTypeNode(
     types: ts.TypeNode | ts.TypeNode[],
     minItems?: number,
@@ -325,7 +333,7 @@ function getComment(schema: NormalizedSchema): string[] {
     function protectComment(str: string): string {
         return str.replace(/\*\//g, '*\u200B/'); // Unicode [ZERO WIDTH SPACE]
     }
-    function appendComment(value?: string): void {
+    function appendComment(value?: any): void {
         if (value == null) {
             return;
         }

package/src/core/config.ts

@@ -18,13 +18,15 @@ export interface Config {
 }
 
 const defaultConfig: Config = {
+    configFile: undefined,
     input: {
         files: [],
         urls: [],
         stdin: false,
     },
-    outputAST: false,
+    outputFile: undefined,
     target: ScriptTarget.Latest,
+    outputAST: false,
     plugins: {},
 };