dtsgenerator 3.19.0 → 3.19.2

package/dist/core/openApiV3.d.ts

@@ -12,19 +12,13 @@ export declare namespace OpenApisV3 {
     }
     namespace SchemaJson {
         namespace Definitions {
-            interface Any {
-                [name: string]: any;
-            }
+            type Any = Record<string, any>;
             type AnyOrExpression = Any | Expression;
-            interface AnysOrExpressions {
-                [name: string]: AnyOrExpression;
-            }
+            type AnysOrExpressions = Record<string, AnyOrExpression>;
             interface Callback {
             }
             type CallbackOrReference = Callback | Reference;
-            interface CallbacksOrReferences {
-                [name: string]: CallbackOrReference;
-            }
+            type CallbacksOrReferences = Record<string, CallbackOrReference>;
             interface Components {
                 schemas?: SchemasOrReferences;
                 responses?: ResponsesOrReferences;
@@ -53,9 +47,7 @@ export declare namespace OpenApisV3 {
                 explode?: boolean;
                 allowReserved?: boolean;
             }
-            interface Encodings {
-                [name: string]: Encoding;
-            }
+            type Encodings = Record<string, Encoding>;
             interface Example {
                 summary?: string;
                 description?: string;
@@ -63,12 +55,8 @@ export declare namespace OpenApisV3 {
                 externalValue?: string;
             }
             type ExampleOrReference = Example | Reference;
-            interface ExamplesOrReferences {
-                [name: string]: ExampleOrReference;
-            }
-            interface Expression {
-                [name: string]: any;
-            }
+            type ExamplesOrReferences = Record<string, ExampleOrReference>;
+            type Expression = Record<string, any>;
             interface ExternalDocs {
                 description?: string;
                 url: string;
@@ -87,9 +75,7 @@ export declare namespace OpenApisV3 {
                 content?: MediaTypes;
             }
             type HeaderOrReference = Header | Reference;
-            interface HeadersOrReferences {
-                [name: string]: HeaderOrReference;
-            }
+            type HeadersOrReferences = Record<string, HeaderOrReference>;
             interface Info {
                 title: string;
                 description?: string;
@@ -111,18 +97,14 @@ export declare namespace OpenApisV3 {
                 server?: Server;
             }
             type LinkOrReference = Link | Reference;
-            interface LinksOrReferences {
-                [name: string]: LinkOrReference;
-            }
+            type LinksOrReferences = Record<string, LinkOrReference>;
             interface MediaType {
                 schema?: SchemaOrReference;
                 example?: Any;
                 examples?: ExamplesOrReferences;
                 encoding?: Encodings;
             }
-            interface MediaTypes {
-                [name: string]: MediaType;
-            }
+            type MediaTypes = Record<string, MediaType>;
             interface OauthFlow {
                 authorizationUrl?: string;
                 tokenUrl?: string;
@@ -165,9 +147,7 @@ export declare namespace OpenApisV3 {
                 content?: MediaTypes;
             }
             type ParameterOrReference = Parameter | Reference;
-            interface ParametersOrReferences {
-                [name: string]: ParameterOrReference;
-            }
+            type ParametersOrReferences = Record<string, ParameterOrReference>;
             interface PathItem {
                 $ref?: string;
                 summary?: string;
@@ -184,15 +164,11 @@ export declare namespace OpenApisV3 {
                 parameters?: ParameterOrReference[];
             }
             type PathItemOrReference = PathItem | Reference;
-            interface Paths {
-                [name: string]: PathItemOrReference;
-            }
+            type Paths = Record<string, PathItemOrReference>;
             interface Reference {
                 $ref: string;
             }
-            interface RequestBodiesOrReferences {
-                [name: string]: RequestBodyOrReference;
-            }
+            type RequestBodiesOrReferences = Record<string, RequestBodyOrReference>;
             interface RequestBody {
                 description?: string;
                 content: MediaTypes;
@@ -206,13 +182,9 @@ export declare namespace OpenApisV3 {
                 links?: LinksOrReferences;
             }
             type ResponseOrReference = Response | Reference;
-            interface ResponsesOrReferences {
-                [name: string]: ResponseOrReference;
-            }
+            type ResponsesOrReferences = Record<string, ResponseOrReference>;
             type SchemaOrReference = JsonSchemaDraft07.SchemaObject | Reference;
-            interface SchemasOrReferences {
-                [name: string]: SchemaOrReference;
-            }
+            type SchemasOrReferences = Record<string, SchemaOrReference>;
             interface SecurityRequirement {
             }
             interface SecurityScheme {
@@ -226,9 +198,7 @@ export declare namespace OpenApisV3 {
                 openIdConnectUrl?: string;
             }
             type SecuritySchemeOrReference = SecurityScheme | Reference;
-            interface SecuritySchemesOrReferences {
-                [name: string]: SecuritySchemeOrReference;
-            }
+            type SecuritySchemesOrReferences = Record<string, SecuritySchemeOrReference>;
             interface Server {
                 url: string;
                 description?: string;
@@ -239,13 +209,9 @@ export declare namespace OpenApisV3 {
                 default: string;
                 description?: string;
             }
-            interface ServerVariables {
-                [name: string]: ServerVariable;
-            }
+            type ServerVariables = Record<string, ServerVariable>;
             type SpecificationExtension = null | number | boolean | string | any[];
-            interface Strings {
-                [name: string]: string;
-            }
+            type Strings = Record<string, string>;
             interface Tag {
                 name: string;
                 description?: string;

package/dist/core/type.d.ts

@@ -27,7 +27,7 @@ export interface PluginContext {
     inputSchemas: IterableIterator<[string, Schema]>;
 }
 export type PreProcessHandler = (contents: Schema[]) => Schema[];
-export type Plugin = {
+export interface Plugin {
     meta: {
         name: string;
         version: string;
@@ -35,5 +35,5 @@ export type Plugin = {
     };
     preProcess?: (context: PluginContext) => Promise<PreProcessHandler | undefined>;
     postProcess?: (context: PluginContext) => Promise<TransformerFactory<SourceFile> | undefined>;
-};
+}
 export declare function loadPlugin(name: string, option: boolean | Record<string, unknown>): Promise<Plugin | undefined>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dtsgenerator",
-    "version": "3.19.0",
+    "version": "3.19.2",
     "description": "TypeScript d.ts file generator for JSON Schema file",
     "bin": {
         "dtsgen": "bin/dtsgen"
@@ -11,7 +11,7 @@
         "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/",
+        "lint": "eslint --fix --report-unused-disable-directives --ext ts src/ test/",
         "format": "prettier --cache --write 'src/**/*.ts' 'test/*.ts' 'test/core/*.ts'",
         "precompile": "npm run lint && npm run format",
         "prepublishOnly": "npm run build",
@@ -41,40 +41,40 @@
         "url": "https://github.com/horiuchi/dtsgenerator/issues"
     },
     "engines": {
-        "node": ">= 16.0"
+        "node": ">= 18.0"
     },
     "dependencies": {
-        "commander": "^11.0.0",
+        "commander": "^12.1.0",
         "cross-fetch": "^4.0.0",
-        "debug": "^4.3.4",
-        "glob": "^10.3.3",
-        "http-proxy-agent": "^7.0.0",
-        "https-proxy-agent": "^7.0.1",
+        "debug": "^4.3.5",
+        "glob": "^10.4.1",
+        "http-proxy-agent": "^7.0.2",
+        "https-proxy-agent": "^7.0.4",
         "js-yaml": "^4.1.0",
-        "tslib": "^2.6.2",
-        "typescript": "^5.1.6"
+        "tslib": "^2.6.3",
+        "typescript": "^5.4.5"
     },
     "devDependencies": {
-        "@dtsgenerator/do-nothing": "^2.5.4",
-        "@dtsgenerator/eslint-config": "^0.6.5",
-        "@dtsgenerator/replace-namespace": "^1.5.5",
-        "@dtsgenerator/single-quote": "^1.6.5",
+        "@dtsgenerator/do-nothing": "^2.6.0",
+        "@dtsgenerator/eslint-config": "^0.7.1",
+        "@dtsgenerator/replace-namespace": "^1.6.0",
+        "@dtsgenerator/single-quote": "^1.7.0",
         "@istanbuljs/nyc-config-typescript": "^1.0.2",
-        "@types/debug": "^4.1.8",
+        "@types/debug": "^4.1.12",
         "@types/glob": "^8.1.0",
-        "@types/js-yaml": "^4.0.5",
-        "@types/mocha": "^10.0.1",
-        "@types/node": "^16.18.41",
+        "@types/js-yaml": "^4.0.9",
+        "@types/mocha": "^10.0.6",
+        "@types/node": "^18.19.34",
         "cross-env": "^7.0.3",
-        "eslint": "^8.47.0",
-        "husky": "^8.0.3",
-        "lint-staged": "^14.0.1",
-        "mocha": "^10.2.0",
-        "nyc": "^15.1.0",
-        "prettier": "^3.0.2",
-        "rimraf": "^5.0.1",
+        "eslint": "^8.56.0",
+        "husky": "^9.0.11",
+        "lint-staged": "^15.2.5",
+        "mocha": "^10.4.0",
+        "nyc": "^17.0.0",
+        "prettier": "^3.3.1",
+        "rimraf": "^5.0.7",
         "source-map-support": "^0.5.21",
-        "ts-node": "^10.9.1"
+        "ts-node": "^10.9.2"
     },
     "lint-staged": {
         "**/*.ts": [

package/src/core/astBuilder.ts

@@ -48,6 +48,15 @@ export function buildStringLiteralTypeNode(s: string): ts.LiteralTypeNode {
     return ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral(s));
 }
 export function buildNumericLiteralTypeNode(n: string): ts.LiteralTypeNode {
+    if (!isNaN(parseFloat(n)) && parseFloat(n) < 0) {
+        return ts.factory.createLiteralTypeNode(
+            ts.factory.createPrefixUnaryExpression(
+                ts.SyntaxKind.MinusToken,
+                ts.factory.createNumericLiteral(Math.abs(parseFloat(n))),
+            ),
+        );
+    }
+
     return ts.factory.createLiteralTypeNode(ts.factory.createNumericLiteral(n));
 }
 export function buildBooleanLiteralTypeNode(b: boolean): ts.LiteralTypeNode {
@@ -117,10 +126,9 @@ export function buildPropertySignature(
     isPattern: boolean | undefined,
 ): ts.PropertySignature | ts.IndexSignatureDeclaration {
     const modifiers = undefined;
-    const questionToken =
-        required == null || !required.includes(propertyName)
-            ? ts.factory.createToken(ts.SyntaxKind.QuestionToken)
-            : undefined;
+    const questionToken = !required?.includes(propertyName)
+        ? ts.factory.createToken(ts.SyntaxKind.QuestionToken)
+        : undefined;
     if (isPattern) {
         return ts.factory.createIndexSignature(
             modifiers,
@@ -223,13 +231,12 @@ export function buildTupleTypeNode(
     for (let i = 0; i < itemCount; i++) {
         let node = typesIsArray(types)
             ? i < types.length
-                ? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                  types[i]!
+                ? types[i]!
                 : additionalItems !== undefined
-                ? additionalItems === false
-                    ? buildNeverKeyword()
-                    : additionalItems
-                : buildAnyKeyword()
+                  ? additionalItems === false
+                      ? buildNeverKeyword()
+                      : additionalItems
+                  : buildAnyKeyword()
             : types;
         if (minItems == null || i >= minItems) {
             node = ts.factory.createOptionalTypeNode(node);

package/src/core/config.ts

@@ -8,9 +8,7 @@ export interface Config {
     target: ScriptTarget;
     outputAST: boolean;
 
-    plugins: {
-        [pluginName: string]: boolean | Record<string, unknown>;
-    };
+    plugins: Record<string, boolean | Record<string, unknown>>;
 }
 
 interface InputConfig {

package/src/core/dtsGenerator.ts

@@ -57,7 +57,7 @@ export default class DtsGenerator {
 
         const postProcess = await this.getPostProcess(plugins.post);
         const result = ts.transform(file, postProcess);
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+
         const transformedNodes = result.transformed[0]!;
 
         const transformedContent = config.outputAST
@@ -553,14 +553,14 @@ export default class DtsGenerator {
             const additionalItems = schema.content.additionalItems
                 ? this.normalizeContent(schema, '/additionalItems')
                 : schema.content.additionalItems === false
-                ? false
-                : undefined;
+                  ? false
+                  : undefined;
 
             return additionalItems === undefined
                 ? undefined
                 : additionalItems === false
-                ? false
-                : this.generateTypeProperty(additionalItems, false);
+                  ? false
+                  : this.generateTypeProperty(additionalItems, false);
         };
 
         if (items == null) {

package/src/core/jsonSchema.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import * as JsonPointer from '../jsonPointer';
 import { JsonSchemaDraft04 } from './jsonSchemaDraft04';
 import { OpenApisV2 } from './openApiV2';
@@ -103,7 +102,7 @@ export function searchAllSubSchema(
         });
     };
     const walkObject = (
-        obj: { [name: string]: JsonSchema } | undefined,
+        obj: Record<string, JsonSchema> | undefined,
         paths: string[],
         parentIds: string[],
     ): void => {
@@ -202,7 +201,7 @@ export function searchAllSubSchema(
         }
         function setSubIdToAnyObject<T>(
             f: (t: T, keys: string[]) => void,
-            obj: { [key: string]: T } | undefined,
+            obj: Record<string, T> | undefined,
             keys: string[],
         ): void {
             if (obj == null) {
@@ -297,7 +296,7 @@ export function searchAllSubSchema(
             const paths = keys
                 .slice(0, keys.length - 1)
                 .concat(inType + 'Parameters');
-            const properties: { [name: string]: JsonSchemaDraft04.Schema } = {};
+            const properties: Record<string, JsonSchemaDraft04.Schema> = {};
             params.forEach(([key, _]) => {
                 properties[key] = {
                     $ref: createId(keys.concat(key)),
@@ -347,7 +346,6 @@ export function searchAllSubSchema(
             }
             const operationId = ops.operationId;
             if (operationId) {
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 keys = [keys[0]!, convertKeyToTypeName(operationId)];
             }
             setSubIdToParameters(ops.parameters, keys.concat('parameters'));
@@ -446,7 +444,6 @@ export function searchAllSubSchema(
             }
             const operationId = ops.operationId;
             if (operationId) {
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 keys = [keys[0]!, convertKeyToTypeName(operationId)];
             }
             setSubIdToParameters(ops.parameters, keys.concat('parameters'));
@@ -476,7 +473,7 @@ export function searchAllSubSchema(
         }
 
         function setSubIdToObject(
-            obj: { [name: string]: JsonSchema } | undefined,
+            obj: Record<string, JsonSchema> | undefined,
             paths: string[],
         ): void {
             if (obj == null) {
@@ -558,7 +555,7 @@ export function selectSchemaType(content: JsonSchema | OpenApiSchema): {
         );
     }
     if ('$schema' in content) {
-        const schema = content['$schema'] ?? '';
+        const schema = content.$schema ?? '';
         if (/^https?:\/\/json-schema.org\/schema#?$/.test(schema)) {
             return { type: 'Latest' };
         }

package/src/core/jsonSchemaDraft04.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-namespace */
 
 export namespace JsonSchemaDraft04 {
@@ -31,18 +30,10 @@ export namespace JsonSchemaDraft04 {
         minProperties?: Schema.Definitions.PositiveIntegerDefault0;
         required?: Schema.Definitions.StringArray;
         additionalProperties?: boolean | Schema;
-        definitions?: {
-            [name: string]: Schema;
-        };
-        properties?: {
-            [name: string]: Schema;
-        };
-        patternProperties?: {
-            [name: string]: Schema;
-        };
-        dependencies?: {
-            [name: string]: Schema | Schema.Definitions.StringArray;
-        };
+        definitions?: Record<string, Schema>;
+        properties?: Record<string, Schema>;
+        patternProperties?: Record<string, Schema>;
+        dependencies?: Record<string, Schema | Schema.Definitions.StringArray>;
         enum?: any[];
         type?:
             | Schema.Definitions.SimpleTypes

package/src/core/jsonSchemaDraft07.ts

@@ -1,8 +1,7 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-namespace */
 
 export namespace JsonSchemaDraft07 {
-    export type SchemaObject = {
+    export interface SchemaObject {
         $id?: string; // uri-reference
         $schema?: string; // uri
         $ref?: string; // uri-reference
@@ -31,18 +30,10 @@ export namespace JsonSchemaDraft07 {
         minProperties?: Schema.Definitions.NonNegativeIntegerDefault0;
         required?: Schema.Definitions.StringArray;
         additionalProperties?: Schema;
-        definitions?: {
-            [name: string]: Schema;
-        };
-        properties?: {
-            [name: string]: Schema;
-        };
-        patternProperties?: {
-            [name: string]: Schema;
-        };
-        dependencies?: {
-            [name: string]: Schema | Schema.Definitions.StringArray;
-        };
+        definitions?: Record<string, Schema>;
+        properties?: Record<string, Schema>;
+        patternProperties?: Record<string, Schema>;
+        dependencies?: Record<string, Schema | Schema.Definitions.StringArray>;
         propertyNames?: Schema;
         const?: any;
         enum?: any[];
@@ -59,7 +50,7 @@ export namespace JsonSchemaDraft07 {
         anyOf?: Schema.Definitions.SchemaArray;
         oneOf?: Schema.Definitions.SchemaArray;
         not?: Schema;
-    };
+    }
     export type Schema = SchemaObject | boolean;
     export namespace Schema {
         export namespace Definitions {

package/src/core/openApiV2.ts

@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-empty-interface */
-/* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-namespace */
 import { JsonSchemaDraft04 } from './jsonSchemaDraft04';
 
@@ -98,15 +96,9 @@ export namespace OpenApisV2 {
             /**
              * One or more JSON objects describing the schemas being consumed and produced by the API.
              */
-            export interface Definitions {
-                [
-                    name: string
-                ]: /* A deterministic version of a JSON Schema object. */ Schema;
-            }
+            export type Definitions = Record<string, Schema>;
             export type Enum = JsonSchemaDraft04.Schema.Properties.Enum;
-            export interface Examples {
-                [name: string]: any;
-            }
+            export type Examples = Record<string, any>;
             export type ExclusiveMaximum =
                 JsonSchemaDraft04.Schema.Properties.ExclusiveMaximum;
             export type ExclusiveMinimum =
@@ -232,9 +224,7 @@ export namespace OpenApisV2 {
                 enum?: Enum;
                 multipleOf?: MultipleOf;
             }
-            export interface Headers {
-                [name: string]: Header;
-            }
+            export type Headers = Record<string, Header>;
             /**
              * General information about the API.
              */
@@ -323,9 +313,7 @@ export namespace OpenApisV2 {
                 tokenUrl: string; // uri
                 description?: string;
             }
-            export interface Oauth2Scopes {
-                [name: string]: string;
-            }
+            export type Oauth2Scopes = Record<string, string>;
             export interface Operation {
                 tags?: string[];
                 /**
@@ -359,9 +347,7 @@ export namespace OpenApisV2 {
             /**
              * One or more JSON representations for parameters
              */
-            export interface ParameterDefinitions {
-                [name: string]: Parameter;
-            }
+            export type ParameterDefinitions = Record<string, Parameter>;
             /**
              * The parameters needed to send a valid API call.
              */
@@ -415,9 +401,7 @@ export namespace OpenApisV2 {
             /**
              * Relative paths to the individual endpoints. They must be relative to the 'basePath'.
              */
-            export interface Paths {
-                [pattern: string]: PathItem;
-            }
+            export type Paths = Record<string, PathItem>;
             export type Pattern =
                 JsonSchemaDraft04.Schema.Properties.Pattern /* regex */;
             export interface PrimitivesItems {
@@ -489,18 +473,12 @@ export namespace OpenApisV2 {
             /**
              * One or more JSON representations for responses
              */
-            export interface ResponseDefinitions {
-                [name: string]: Response;
-            }
+            export type ResponseDefinitions = Record<string, Response>;
             export type ResponseValue = Response | JsonReference;
             /**
              * Response objects names can either be any valid HTTP status code or 'default'.
              */
-            export interface Responses {
-                [
-                    pattern: string
-                ]: ResponseValue /* Patterns: ^([0-9]{3})$|^(default)$ | ^x- */;
-            }
+            export type Responses = Record<string, ResponseValue>;
             /**
              * A deterministic version of a JSON Schema object.
              */
@@ -538,11 +516,7 @@ export namespace OpenApisV2 {
                     /* A deterministic version of a JSON Schema object. */ Schema,
                     .../* A deterministic version of a JSON Schema object. */ Schema[],
                 ];
-                properties?: {
-                    [
-                        name: string
-                    ]: /* A deterministic version of a JSON Schema object. */ Schema;
-                };
+                properties?: Record<string, Schema>;
                 discriminator?: string;
                 readOnly?: boolean;
                 xml?: Xml;
@@ -554,18 +528,16 @@ export namespace OpenApisV2 {
              */
             export type SchemesList = ('http' | 'https' | 'ws' | 'wss')[];
             export type Security = SecurityRequirement[];
-            export interface SecurityDefinitions {
-                [name: string]:
-                    | BasicAuthenticationSecurity
-                    | ApiKeySecurity
-                    | Oauth2ImplicitSecurity
-                    | Oauth2PasswordSecurity
-                    | Oauth2ApplicationSecurity
-                    | Oauth2AccessCodeSecurity;
-            }
-            export interface SecurityRequirement {
-                [name: string]: string[];
-            }
+            export type SecurityDefinitions = Record<
+                string,
+                | BasicAuthenticationSecurity
+                | ApiKeySecurity
+                | Oauth2ImplicitSecurity
+                | Oauth2PasswordSecurity
+                | Oauth2ApplicationSecurity
+                | Oauth2AccessCodeSecurity
+            >;
+            export type SecurityRequirement = Record<string, string[]>;
             export interface Tag {
                 name: string;
                 description?: string;
@@ -583,5 +555,5 @@ export namespace OpenApisV2 {
         }
     }
 }
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
+
 export import SwaggerIo = OpenApisV2;