dtsgenerator 3.17.0 → 3.18.0

package/README.md

@@ -143,6 +143,11 @@ Output debug message by [debug](https://www.npmjs.com/package/debug) library.
 
 ## ChangeLog
 
+### [v3.18.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.18.0) (2023-03-02)
+
+- features:
+  - Support 'application/json' with parameter media type for #551. Thank you @denizkenan :+1:
+
 ### [v3.17.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.17.0) (2023-02-21)
 
 - features:

package/dist/core/jsonSchema.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const JsonPointer = tslib_1.__importStar(require("../jsonPointer"));
 const schemaId_1 = tslib_1.__importDefault(require("./schemaId"));
 const type_1 = require("./type");
+const utils_1 = require("./utils");
 function getSubSchema(rootSchema, pointer, id) {
     const content = JsonPointer.get(rootSchema.content, JsonPointer.parse(pointer));
     if (id == null) {
@@ -258,7 +259,7 @@ 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$|^application\/jwt$|^application\/vnd.apple.pkpass$|^multipart\/form-data$|^image\//.test(mime)) {
+                if ((0, utils_1.checkValidMIMEType)(mime)) {
                     const mt = types[mime];
                     if (mt != null) {
                         setSubId(mt.schema, keys);

package/dist/core/utils.d.ts

@@ -4,4 +4,5 @@ import { JsonSchemaObject } from './type';
 import SimpleTypes = JsonSchemaDraft04.Schema.Definitions.SimpleTypes;
 export declare function toTSType(type: string, debugSource?: JsonSchemaObject): ts.KeywordTypeSyntaxKind | ts.SyntaxKind.NullKeyword | undefined;
 export declare function reduceTypes(types: SimpleTypes[]): SimpleTypes[];
+export declare function checkValidMIMEType(mime: string): boolean;
 export declare function mergeSchema(a: any, b: any): boolean;

package/dist/core/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeSchema = exports.reduceTypes = exports.toTSType = void 0;
+exports.mergeSchema = exports.checkValidMIMEType = exports.reduceTypes = exports.toTSType = void 0;
 const tslib_1 = require("tslib");
 const debug_1 = tslib_1.__importDefault(require("debug"));
 const ts = tslib_1.__importStar(require("typescript"));
@@ -42,6 +42,27 @@ function reduceTypes(types) {
     return Array.from(set.values());
 }
 exports.reduceTypes = reduceTypes;
+function checkValidMIMEType(mime) {
+    var _a;
+    const type = (_a = mime.toLowerCase().split(';')[0]) === null || _a === void 0 ? void 0 : _a.trim();
+    if (type == null) {
+        return false;
+    }
+    if ([
+        'application/octet-stream',
+        'application/x-www-form-urlencoded',
+        'multipart/form-data',
+        'application/jwt',
+        'application/vnd.apple.pkpass',
+    ].includes(type)) {
+        return true;
+    }
+    if (type.startsWith('text/') || type.startsWith('image/')) {
+        return true;
+    }
+    return /^application\/(?:[a-z0-9-_.]+\+)?json5?$/.test(type);
+}
+exports.checkValidMIMEType = checkValidMIMEType;
 function mergeSchema(a, b) {
     if ('$ref' in a || '$ref' in b) {
         a.$ref = b.$ref || a.$ref;

package/dist/utils.d.ts

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

package/dist/utils.js

@@ -62,16 +62,15 @@ function buildProxyOptions(url) {
     return undefined;
 }
 exports.buildProxyOptions = buildProxyOptions;
-function globFiles(pattern, options) {
-    return new Promise((resolve, reject) => {
-        (0, glob_1.default)(pattern, options !== null && options !== void 0 ? options : {}, (err, matches) => {
-            if (err) {
-                reject(err);
-            }
-            else {
-                resolve(matches);
-            }
-        });
+async function globFiles(pattern, options) {
+    const res = await (0, glob_1.default)(pattern, options !== null && options !== void 0 ? options : {});
+    return res.map((r) => {
+        if (typeof r === 'string') {
+            return r;
+        }
+        else {
+            return r.fullpath();
+        }
     });
 }
 exports.globFiles = globFiles;
@@ -150,6 +149,10 @@ function convertToScriptTarget(target) {
             return typescript_1.ScriptTarget.ES2019;
         case 'es2020':
             return typescript_1.ScriptTarget.ES2020;
+        case 'es2021':
+            return typescript_1.ScriptTarget.ES2021;
+        case 'es2022':
+            return typescript_1.ScriptTarget.ES2022;
         case 'esnext':
             return typescript_1.ScriptTarget.ESNext;
         default:

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dtsgenerator",
-    "version": "3.17.0",
+    "version": "3.18.0",
     "description": "TypeScript d.ts file generator for JSON Schema file",
     "bin": {
         "dtsgen": "bin/dtsgen"
@@ -47,7 +47,7 @@
         "commander": "^10.0.0",
         "cross-fetch": "^3.1.5",
         "debug": "^4.3.4",
-        "glob": "^8.1.0",
+        "glob": "^9.1.2",
         "https-proxy-agent": "^5.0.1",
         "js-yaml": "^4.1.0",
         "tslib": "^2.5.0",
@@ -60,10 +60,10 @@
         "@dtsgenerator/single-quote": "^1.6.3",
         "@istanbuljs/nyc-config-typescript": "^1.0.2",
         "@types/debug": "^4.1.7",
-        "@types/glob": "^8.0.1",
+        "@types/glob": "^8.1.0",
         "@types/js-yaml": "^4.0.5",
         "@types/mocha": "^10.0.1",
-        "@types/node": "^16.18.12",
+        "@types/node": "^16.18.14",
         "cross-env": "^7.0.3",
         "eslint": "^8.34.0",
         "husky": "^8.0.3",
@@ -71,7 +71,7 @@
         "mocha": "^10.2.0",
         "nyc": "^15.1.0",
         "prettier": "^2.8.4",
-        "rimraf": "^4.1.2",
+        "rimraf": "^4.1.3",
         "source-map-support": "^0.5.21",
         "ts-node": "^10.9.1"
     },

package/src/core/jsonSchema.ts

@@ -11,6 +11,7 @@ import {
     JsonSchema,
     isJsonSchemaDraft04,
 } from './type';
+import { checkValidMIMEType } from './utils';
 
 type OpenApiSchema = OpenApisV2.SchemaJson | OpenApisV3.SchemaJson;
 type ParametersList =
@@ -382,11 +383,7 @@ export function searchAllSubSchema(
                 return;
             }
             for (const mime of Object.keys(types)) {
-                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
-                    )
-                ) {
+                if (checkValidMIMEType(mime)) {
                     const mt = types[mime];
                     if (mt != null) {
                         setSubId(mt.schema, keys);

package/src/core/utils.ts

@@ -55,6 +55,29 @@ export function reduceTypes(types: SimpleTypes[]): SimpleTypes[] {
     return Array.from(set.values());
 }
 
+export function checkValidMIMEType(mime: string): boolean {
+    const type = mime.toLowerCase().split(';')[0]?.trim();
+    if (type == null) {
+        return false;
+    }
+    if (
+        [
+            'application/octet-stream',
+            'application/x-www-form-urlencoded',
+            'multipart/form-data',
+
+            'application/jwt',
+            'application/vnd.apple.pkpass',
+        ].includes(type)
+    ) {
+        return true;
+    }
+    if (type.startsWith('text/') || type.startsWith('image/')) {
+        return true;
+    }
+    return /^application\/(?:[a-z0-9-_.]+\+)?json5?$/.test(type);
+}
+
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 export function mergeSchema(a: any, b: any): boolean {
     if ('$ref' in a || '$ref' in b) {

package/src/utils.ts

@@ -1,6 +1,6 @@
 import * as fs from 'fs';
 import { URL } from 'url';
-import glob from 'glob';
+import glob, { GlobOptions } from 'glob';
 import proxy from 'https-proxy-agent';
 import { ScriptTarget } from 'typescript';
 import { CommandOptions, defaultConfigFile } from './commandOptions';
@@ -63,18 +63,17 @@ export function buildProxyOptions(url: string): RequestInit | undefined {
     return undefined;
 }
 
-export function globFiles(
+export async function globFiles(
     pattern: string,
-    options?: glob.IOptions
+    options?: GlobOptions
 ): Promise<string[]> {
-    return new Promise((resolve, reject) => {
-        glob(pattern, options ?? {}, (err, matches) => {
-            if (err) {
-                reject(err);
-            } else {
-                resolve(matches);
-            }
-        });
+    const res = await glob(pattern, options ?? {});
+    return res.map((r) => {
+        if (typeof r === 'string') {
+            return r;
+        } else {
+            return r.fullpath();
+        }
     });
 }
 
@@ -150,6 +149,10 @@ function convertToScriptTarget(target: string): ScriptTarget {
             return ScriptTarget.ES2019;
         case 'es2020':
             return ScriptTarget.ES2020;
+        case 'es2021':
+            return ScriptTarget.ES2021;
+        case 'es2022':
+            return ScriptTarget.ES2022;
         case 'esnext':
             return ScriptTarget.ESNext;
         default: