dtsgenerator 3.19.1 → 4.0.0

package/.husky/pre-commit

@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 npx lint-staged

package/.nycrc

@@ -4,10 +4,10 @@
   "check-coverage": true,
   "exclude": [
     "**/*.js",
+    "**/*.cjs",
     "coverage/**",
     "node_modules/**",
     "**/*.d.ts",
     "**/*_test.ts"
   ]
 }
-

package/README.md

@@ -2,12 +2,13 @@
 
 TypeScript d.ts file generator from JSON Schema file or OpenAPI(Swagger) spec file.
 
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/horiuchi/dtsgenerator)
 [![nodejs version](https://img.shields.io/node/v/dtsgenerator.svg)](#)
 [![npm version](https://badge.fury.io/js/dtsgenerator.svg)](https://www.npmjs.com/package/dtsgenerator)
 [![Build Status](https://github.com/horiuchi/dtsgenerator/actions/workflows/workflow-ci.yaml/badge.svg)](https://github.com/horiuchi/dtsgenerator/actions/workflows/workflow-ci.yaml)
 [![Coverage Status](https://coveralls.io/repos/github/horiuchi/dtsgenerator/badge.svg?branch=master)](https://coveralls.io/github/horiuchi/dtsgenerator?branch=master)
 [![npm download count](https://img.shields.io/npm/dt/dtsgenerator.svg)](https://www.npmjs.com/package/dtsgenerator)
-[![Stake to support us](https://badge.devprotocol.xyz/0x68c824db5A1634940BB838468Ff2aee2bDa5794B/descriptive)](https://stakes.social/0x68c824db5A1634940BB838468Ff2aee2bDa5794B)
+<!-- [![Stake to support us](https://badge.devprotocol.xyz/0x68c824db5A1634940BB838468Ff2aee2bDa5794B/descriptive)](https://stakes.social/0x68c824db5A1634940BB838468Ff2aee2bDa5794B) -->
 [![MIT license](https://img.shields.io/npm/l/dtsgenerator.svg)](#)
 
 ## Table of Contents
@@ -143,6 +144,11 @@ Output debug message by [debug](https://www.npmjs.com/package/debug) library.
 
 ## ChangeLog
 
+### [v3.19.2](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.19.2) (2024-06-11)
+
+- fixed:
+  - Support a negative number by #566. Thank you @maximebiloe :+1:
+
 ### [v3.19.1](https://github.com/horiuchi/dtsgenerator/releases/tag/v3.19.1) (2023-08-25)
 
 - features:

package/dist/commandOptions.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clear = exports.initialize = exports.CommandOptions = exports.defaultConfigFile = void 0;
+exports.CommandOptions = exports.defaultConfigFile = void 0;
+exports.initialize = initialize;
+exports.clear = clear;
 const tslib_1 = require("tslib");
 const commander = tslib_1.__importStar(require("commander"));
 exports.defaultConfigFile = 'dtsgen.json';
@@ -17,7 +19,6 @@ exports.default = opts;
 function initialize(argv) {
     return parse(opts, argv);
 }
-exports.initialize = initialize;
 function clear() {
     opts.configFile = undefined;
     opts.files = [];
@@ -28,7 +29,6 @@ function clear() {
     opts.info = undefined;
     opts.outputAST = undefined;
 }
-exports.clear = clear;
 function parse(options, argv) {
     const program = new commander.Command();
     function collectUrl(val, memo) {
@@ -47,6 +47,7 @@ function parse(options, argv) {
         .option('-t, --target <version>', "Specify ECMAScript target version: 'ES3', 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT' (default).")
         .option('--info', 'for developer mode. output loaded config and plugin details only.')
         .option('--output-ast', 'output TypeScript AST instead of d.ts file.')
+        .allowExcessArguments(true)
         .addHelpText('afterAll', `
 Examples:
   $ dtsgen --help

package/dist/core/astBuilder.js

@@ -1,6 +1,29 @@
 "use strict";
 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;
+exports.buildKeyword = buildKeyword;
+exports.buildAnyKeyword = buildAnyKeyword;
+exports.buildNeverKeyword = buildNeverKeyword;
+exports.buildUnknownKeyword = buildUnknownKeyword;
+exports.buildVoidKeyword = buildVoidKeyword;
+exports.buildStringKeyword = buildStringKeyword;
+exports.buildSimpleArrayNode = buildSimpleArrayNode;
+exports.buildNullKeyword = buildNullKeyword;
+exports.buildStringLiteralTypeNode = buildStringLiteralTypeNode;
+exports.buildNumericLiteralTypeNode = buildNumericLiteralTypeNode;
+exports.buildBooleanLiteralTypeNode = buildBooleanLiteralTypeNode;
+exports.buildNamespaceNode = buildNamespaceNode;
+exports.buildInterfaceNode = buildInterfaceNode;
+exports.buildTypeAliasNode = buildTypeAliasNode;
+exports.buildPropertySignature = buildPropertySignature;
+exports.buildIndexSignatureNode = buildIndexSignatureNode;
+exports.buildTypeLiteralNode = buildTypeLiteralNode;
+exports.buildFreeFormObjectTypeLiteralNode = buildFreeFormObjectTypeLiteralNode;
+exports.buildUnionTypeNode = buildUnionTypeNode;
+exports.buildIntersectionTypeNode = buildIntersectionTypeNode;
+exports.buildTupleTypeNode = buildTupleTypeNode;
+exports.buildTypeReferenceNode = buildTypeReferenceNode;
+exports.addComment = addComment;
+exports.addOptionalInformation = addOptionalInformation;
 const tslib_1 = require("tslib");
 const ts = tslib_1.__importStar(require("typescript"));
 const config_1 = tslib_1.__importDefault(require("./config"));
@@ -19,47 +42,39 @@ function buildPropertyNameIdentifier(name) {
 function buildKeyword(kind) {
     return ts.factory.createKeywordTypeNode(kind);
 }
-exports.buildKeyword = buildKeyword;
 function buildAnyKeyword() {
     return buildKeyword(ts.SyntaxKind.AnyKeyword);
 }
-exports.buildAnyKeyword = buildAnyKeyword;
 function buildNeverKeyword() {
     return buildKeyword(ts.SyntaxKind.NeverKeyword);
 }
-exports.buildNeverKeyword = buildNeverKeyword;
 function buildUnknownKeyword() {
     return buildKeyword(ts.SyntaxKind.UnknownKeyword);
 }
-exports.buildUnknownKeyword = buildUnknownKeyword;
 function buildVoidKeyword() {
     return buildKeyword(ts.SyntaxKind.VoidKeyword);
 }
-exports.buildVoidKeyword = buildVoidKeyword;
 function buildStringKeyword() {
     return buildKeyword(ts.SyntaxKind.StringKeyword);
 }
-exports.buildStringKeyword = buildStringKeyword;
 function buildSimpleArrayNode(element) {
     return ts.factory.createArrayTypeNode(element);
 }
-exports.buildSimpleArrayNode = buildSimpleArrayNode;
 function buildNullKeyword() {
     return ts.factory.createLiteralTypeNode(ts.factory.createToken(ts.SyntaxKind.NullKeyword));
 }
-exports.buildNullKeyword = buildNullKeyword;
 function buildStringLiteralTypeNode(s) {
     return ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral(s));
 }
-exports.buildStringLiteralTypeNode = buildStringLiteralTypeNode;
 function buildNumericLiteralTypeNode(n) {
+    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));
 }
-exports.buildNumericLiteralTypeNode = buildNumericLiteralTypeNode;
 function buildBooleanLiteralTypeNode(b) {
     return ts.factory.createLiteralTypeNode(b ? ts.factory.createTrue() : ts.factory.createFalse());
 }
-exports.buildBooleanLiteralTypeNode = buildBooleanLiteralTypeNode;
 function buildNamespaceNode(name, statements, root) {
     const modifiers = root
         ? [ts.factory.createModifier(ts.SyntaxKind.DeclareKeyword)]
@@ -68,7 +83,6 @@ function buildNamespaceNode(name, statements, root) {
         ts.NodeFlags.ExportContext |
         ts.NodeFlags.ContextFlags);
 }
-exports.buildNamespaceNode = buildNamespaceNode;
 function buildInterfaceNode(id, members, root) {
     const name = getLastTypeName(id);
     const modifiers = root
@@ -76,7 +90,6 @@ function buildInterfaceNode(id, members, root) {
         : [ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)];
     return ts.factory.createInterfaceDeclaration(modifiers, buildTypeNameIdentifier(name), undefined, undefined, members);
 }
-exports.buildInterfaceNode = buildInterfaceNode;
 function buildTypeAliasNode(id, type, root) {
     const name = getLastTypeName(id);
     const modifiers = root
@@ -84,10 +97,9 @@ function buildTypeAliasNode(id, type, root) {
         : [ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)];
     return ts.factory.createTypeAliasDeclaration(modifiers, buildTypeNameIdentifier(name), undefined, type);
 }
-exports.buildTypeAliasNode = buildTypeAliasNode;
 function buildPropertySignature(_schema, propertyName, valueType, required, isPattern) {
     const modifiers = undefined;
-    const questionToken = required == null || !required.includes(propertyName)
+    const questionToken = !(required === null || required === void 0 ? void 0 : required.includes(propertyName))
         ? ts.factory.createToken(ts.SyntaxKind.QuestionToken)
         : undefined;
     if (isPattern) {
@@ -97,23 +109,19 @@ function buildPropertySignature(_schema, propertyName, valueType, required, isPa
     }
     return ts.factory.createPropertySignature(modifiers, buildPropertyNameIdentifier(propertyName), questionToken, valueType);
 }
-exports.buildPropertySignature = buildPropertySignature;
 function buildIndexSignatureNode(name, indexType, valueType) {
     return ts.factory.createIndexSignature(undefined, [
         ts.factory.createParameterDeclaration(undefined, undefined, buildTypeNameIdentifier(name), undefined, indexType, undefined),
     ], valueType);
 }
-exports.buildIndexSignatureNode = buildIndexSignatureNode;
 function buildTypeLiteralNode(elements) {
     return ts.factory.createTypeLiteralNode(elements);
 }
-exports.buildTypeLiteralNode = buildTypeLiteralNode;
 function buildFreeFormObjectTypeLiteralNode() {
     return ts.factory.createTypeLiteralNode([
         buildIndexSignatureNode('key', buildStringKeyword(), buildAnyKeyword()),
     ]);
 }
-exports.buildFreeFormObjectTypeLiteralNode = buildFreeFormObjectTypeLiteralNode;
 function buildUnionTypeNode(types, builder, terminate) {
     const node = ts.factory.createUnionTypeNode(types.map(builder));
     if (terminate) {
@@ -121,7 +129,6 @@ function buildUnionTypeNode(types, builder, terminate) {
     }
     return ts.factory.createParenthesizedType(node);
 }
-exports.buildUnionTypeNode = buildUnionTypeNode;
 function buildIntersectionTypeNode(types, terminate) {
     const node = ts.factory.createIntersectionTypeNode(types);
     if (terminate) {
@@ -129,7 +136,6 @@ function buildIntersectionTypeNode(types, terminate) {
     }
     return ts.factory.createParenthesizedType(node);
 }
-exports.buildIntersectionTypeNode = buildIntersectionTypeNode;
 function buildTupleTypeNode(types, minItems, maxItems, additionalItems) {
     function typesIsArray(types) {
         return Array.isArray(types);
@@ -147,8 +153,7 @@ 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()
@@ -170,7 +175,6 @@ function buildTupleTypeNode(types, minItems, maxItems, additionalItems) {
     }
     return ts.factory.createTupleTypeNode(nodes);
 }
-exports.buildTupleTypeNode = buildTupleTypeNode;
 function buildTypeReferenceNode(schema, currentSchema) {
     const typeName = getTypename(schema.id, currentSchema);
     let node;
@@ -187,7 +191,6 @@ function buildTypeReferenceNode(schema, currentSchema) {
     }
     return ts.factory.createTypeReferenceNode(node, undefined);
 }
-exports.buildTypeReferenceNode = buildTypeReferenceNode;
 function getTypename(id, baseSchema) {
     const result = id.toNames();
     const baseId = baseSchema.id;
@@ -223,7 +226,6 @@ function addComment(node, schema, terminate) {
         return ts.addSyntheticLeadingComment(node, ts.SyntaxKind.MultiLineCommentTrivia, result, true);
     }
 }
-exports.addComment = addComment;
 function getComment(schema) {
     const content = schema.content;
     let comments = [];
@@ -279,7 +281,6 @@ function addOptionalInformation(node, schema, terminate) {
         : ts.SyntaxKind.MultiLineCommentTrivia;
     return ts.addSyntheticTrailingComment(node, kind, comment, false);
 }
-exports.addOptionalInformation = addOptionalInformation;
 function getLastTypeName(id) {
     var _a;
     const names = id.toNames();

package/dist/core/config.d.ts

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

package/dist/core/config.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.showConfig = exports.clearToDefault = exports.setConfig = void 0;
+exports.setConfig = setConfig;
+exports.clearToDefault = clearToDefault;
+exports.showConfig = showConfig;
 const typescript_1 = require("typescript");
 const type_1 = require("./type");
 const defaultConfig = {
@@ -19,11 +21,9 @@ let config = Object.assign({}, defaultConfig);
 function setConfig(input) {
     config = Object.assign(config, input);
 }
-exports.setConfig = setConfig;
 function clearToDefault() {
     setConfig(defaultConfig);
 }
-exports.clearToDefault = clearToDefault;
 async function showConfig(version, c) {
     var _a, _b, _c;
     console.log('Version: ' + version);
@@ -65,7 +65,6 @@ async function showConfig(version, c) {
     }
     console.log();
 }
-exports.showConfig = showConfig;
 function showScriptTarget(target) {
     switch (target) {
         case typescript_1.ScriptTarget.ES3:

package/dist/core/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SchemaId = void 0;
+exports.default = dtsGenerator;
 const tslib_1 = require("tslib");
 const config_1 = require("./config");
 const dtsGenerator_1 = tslib_1.__importDefault(require("./dtsGenerator"));
@@ -14,4 +15,3 @@ async function dtsGenerator(options) {
     const generator = new dtsGenerator_1.default(options.contents);
     return await generator.generate();
 }
-exports.default = dtsGenerator;

package/dist/core/jsonSchema.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.selectSchemaType = exports.searchAllSubSchema = exports.setId = exports.getId = exports.getSubSchema = void 0;
+exports.getSubSchema = getSubSchema;
+exports.getId = getId;
+exports.setId = setId;
+exports.searchAllSubSchema = searchAllSubSchema;
+exports.selectSchemaType = selectSchemaType;
 const tslib_1 = require("tslib");
 const JsonPointer = tslib_1.__importStar(require("../jsonPointer"));
 const schemaId_1 = tslib_1.__importDefault(require("./schemaId"));
@@ -32,7 +36,6 @@ function getSubSchema(rootSchema, pointer, id) {
         rootSchema,
     };
 }
-exports.getSubSchema = getSubSchema;
 const Draft04Id = 'id';
 const Draft07Id = '$id';
 function getId(type, content) {
@@ -44,7 +47,6 @@ function getId(type, content) {
         return (_b = content[Draft07Id]) !== null && _b !== void 0 ? _b : '';
     }
 }
-exports.getId = getId;
 function setId(type, content, id) {
     var _a, _b;
     if ((0, type_1.isJsonSchemaDraft04)(content, type)) {
@@ -54,7 +56,6 @@ function setId(type, content, id) {
         (_b = content[Draft07Id]) !== null && _b !== void 0 ? _b : (content[Draft07Id] = id);
     }
 }
-exports.setId = setId;
 function searchAllSubSchema(schema, onFoundSchema, onFoundReference) {
     const walkArray = (array, paths, parentIds) => {
         if (array == null) {
@@ -226,7 +227,7 @@ function searchAllSubSchema(schema, onFoundSchema, onFoundReference) {
             }
             if ('schema' in response) {
                 const s = response.schema;
-                if (s != null && s.type === 'file') {
+                if ((s === null || s === void 0 ? void 0 : s.type) === 'file') {
                     return;
                 }
                 setSubId(s, keys);
@@ -385,7 +386,6 @@ function searchAllSubSchema(schema, onFoundSchema, onFoundReference) {
     }
     walk(schema.content, ['#'], []);
 }
-exports.searchAllSubSchema = searchAllSubSchema;
 function selectSchemaType(content) {
     var _a;
     if (typeof content === 'boolean') {
@@ -395,7 +395,7 @@ function selectSchemaType(content) {
         throw new Error(`expect parameter of type object, received ${typeof content}`);
     }
     if ('$schema' in content) {
-        const schema = (_a = content['$schema']) !== null && _a !== void 0 ? _a : '';
+        const schema = (_a = content.$schema) !== null && _a !== void 0 ? _a : '';
         if (/^https?:\/\/json-schema.org\/schema#?$/.test(schema)) {
             return { type: 'Latest' };
         }
@@ -435,4 +435,3 @@ function selectSchemaType(content) {
     }
     return { type: 'Draft04' };
 }
-exports.selectSchemaType = selectSchemaType;

package/dist/core/jsonSchemaDraft04.d.ts

@@ -25,18 +25,10 @@ export declare 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 | Schema.Definitions.SimpleTypes[];
         format?: string;

package/dist/core/jsonSchemaDraft07.d.ts

@@ -1,5 +1,5 @@
 export declare namespace JsonSchemaDraft07 {
-    type SchemaObject = {
+    interface SchemaObject {
         $id?: string;
         $schema?: string;
         $ref?: string;
@@ -28,18 +28,10 @@ export declare 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[];
@@ -54,7 +46,7 @@ export declare namespace JsonSchemaDraft07 {
         anyOf?: Schema.Definitions.SchemaArray;
         oneOf?: Schema.Definitions.SchemaArray;
         not?: Schema;
-    };
+    }
     type Schema = SchemaObject | boolean;
     namespace Schema {
         namespace Definitions {

package/dist/core/openApiV2.d.ts

@@ -44,13 +44,9 @@ export declare namespace OpenApisV2 {
                 email?: string;
             }
             type Default = JsonSchemaDraft04.Schema.Properties.Default;
-            interface Definitions {
-                [name: string]: Schema;
-            }
+            type Definitions = Record<string, Schema>;
             type Enum = JsonSchemaDraft04.Schema.Properties.Enum;
-            interface Examples {
-                [name: string]: any;
-            }
+            type Examples = Record<string, any>;
             type ExclusiveMaximum = JsonSchemaDraft04.Schema.Properties.ExclusiveMaximum;
             type ExclusiveMinimum = JsonSchemaDraft04.Schema.Properties.ExclusiveMinimum;
             interface ExternalDocs {
@@ -135,9 +131,7 @@ export declare namespace OpenApisV2 {
                 enum?: Enum;
                 multipleOf?: MultipleOf;
             }
-            interface Headers {
-                [name: string]: Header;
-            }
+            type Headers = Record<string, Header>;
             interface Info {
                 title: string;
                 version: string;
@@ -192,9 +186,7 @@ export declare namespace OpenApisV2 {
                 tokenUrl: string;
                 description?: string;
             }
-            interface Oauth2Scopes {
-                [name: string]: string;
-            }
+            type Oauth2Scopes = Record<string, string>;
             interface Operation {
                 tags?: string[];
                 summary?: string;
@@ -210,9 +202,7 @@ export declare namespace OpenApisV2 {
                 security?: Security;
             }
             type Parameter = BodyParameter | NonBodyParameter;
-            interface ParameterDefinitions {
-                [name: string]: Parameter;
-            }
+            type ParameterDefinitions = Record<string, Parameter>;
             type ParametersList = (Parameter | JsonReference)[];
             interface PathItem {
                 $ref?: string;
@@ -248,9 +238,7 @@ export declare namespace OpenApisV2 {
                 enum?: Enum;
                 multipleOf?: MultipleOf;
             }
-            interface Paths {
-                [pattern: string]: PathItem;
-            }
+            type Paths = Record<string, PathItem>;
             type Pattern = JsonSchemaDraft04.Schema.Properties.Pattern;
             interface PrimitivesItems {
                 type?: 'string' | 'number' | 'integer' | 'boolean' | 'array';
@@ -301,13 +289,9 @@ export declare namespace OpenApisV2 {
                 headers?: Headers;
                 examples?: Examples;
             }
-            interface ResponseDefinitions {
-                [name: string]: Response;
-            }
+            type ResponseDefinitions = Record<string, Response>;
             type ResponseValue = Response | JsonReference;
-            interface Responses {
-                [pattern: string]: ResponseValue;
-            }
+            type Responses = Record<string, ResponseValue>;
             interface Schema {
                 $ref?: string;
                 format?: string;
@@ -339,9 +323,7 @@ export declare namespace OpenApisV2 {
                     Schema,
                     ...Schema[]
                 ];
-                properties?: {
-                    [name: string]: Schema;
-                };
+                properties?: Record<string, Schema>;
                 discriminator?: string;
                 readOnly?: boolean;
                 xml?: Xml;
@@ -350,12 +332,8 @@ export declare namespace OpenApisV2 {
             }
             type SchemesList = ('http' | 'https' | 'ws' | 'wss')[];
             type Security = SecurityRequirement[];
-            interface SecurityDefinitions {
-                [name: string]: BasicAuthenticationSecurity | ApiKeySecurity | Oauth2ImplicitSecurity | Oauth2PasswordSecurity | Oauth2ApplicationSecurity | Oauth2AccessCodeSecurity;
-            }
-            interface SecurityRequirement {
-                [name: string]: string[];
-            }
+            type SecurityDefinitions = Record<string, BasicAuthenticationSecurity | ApiKeySecurity | Oauth2ImplicitSecurity | Oauth2PasswordSecurity | Oauth2ApplicationSecurity | Oauth2AccessCodeSecurity>;
+            type SecurityRequirement = Record<string, string[]>;
             interface Tag {
                 name: string;
                 description?: string;