@vkontakte/api-schema-typescript-generator 0.14.0 → 0.16.0

package/.github/CODEOWNERS

@@ -1,2 +1 @@
-yarn.lock  @VKCOM/vk-sec
-.yarnrc    @VKCOM/vk-sec
+.github/dependabot.yml  @VKCOM/vk-sec

package/.github/dependabot.yml

@@ -0,0 +1,17 @@
+version: 2
+updates:
+  - package-ecosystem: 'npm'
+    directory: '/'
+    schedule:
+      interval: 'daily'
+    allow:
+      - dependency-type: 'direct'
+    reviewers:
+      - 'VKCOM/vk-sec'
+
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'daily'
+    reviewers:
+      - 'VKCOM/vk-sec'

package/.github/workflows/publish.yml

@@ -11,13 +11,15 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           token: ${{ secrets.DEVTOOLS_GITHUB_TOKEN }}
 
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v3
         with:
-          node-version: 12
+          node-version: 18
+          cache: 'yarn'
+          always-auth: true
           registry-url: 'https://registry.npmjs.org'
 
       - run: yarn install --frozen-lockfile

package/.github/workflows/pull_request.yml

@@ -6,11 +6,12 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v3
         with:
-          node-version: 12
+          node-version: 18
+          cache: 'yarn'
 
       - run: yarn install --frozen-lockfile
 

package/dist/cli.js

@@ -7,7 +7,7 @@ exports.parseArguments = void 0;
 const arg_1 = __importDefault(require("arg"));
 const utils_1 = require("./utils");
 function parseArguments() {
-    const args = arg_1.default({
+    const args = (0, arg_1.default)({
         '--help': Boolean,
         '--schemaDir': String,
         '--outDir': String,
@@ -21,9 +21,9 @@ function parseArguments() {
     const outDir = args['--outDir'];
     return {
         help: args['--help'] || false,
-        schemaDir: utils_1.isString(schemaDir) ? schemaDir.trim() : null,
-        outDir: utils_1.isString(outDir) ? outDir.trim() : null,
-        methods: utils_1.trimArray(args['--methods'] || []),
+        schemaDir: (0, utils_1.isString)(schemaDir) ? schemaDir.trim() : null,
+        outDir: (0, utils_1.isString)(outDir) ? outDir.trim() : null,
+        methods: (0, utils_1.trimArray)(args['--methods'] || []),
     };
 }
 exports.parseArguments = parseArguments;

package/dist/constants.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.baseAPIParamsInterfaceName = exports.basePropertyExistsRef = exports.baseOkResponseRef = exports.baseBoolIntRef = exports.newLineChar = exports.tabChar = exports.spaceChar = exports.primitiveTypes = exports.scalarTypes = exports.PropertyType = exports.DEFAULT_API_VERSION = void 0;
 const os_1 = require("os");
-exports.DEFAULT_API_VERSION = '5.130';
+exports.DEFAULT_API_VERSION = '5.131';
 exports.PropertyType = {
     INTEGER: 'integer',
     BOOLEAN: 'boolean',

package/dist/generator.js

@@ -9,11 +9,11 @@ function generateImportsBlock(refs, section, type) {
     let importRefs = Object.entries(refs)
         .filter(([, type]) => type === types_1.RefsDictionaryType.GenerateAndImport)
         .map(([key]) => key);
-    importRefs = utils_1.uniqueArray(importRefs);
+    importRefs = (0, utils_1.uniqueArray)(importRefs);
     const paths = {};
     importRefs.forEach((objectName) => {
-        const importSection = helpers_1.getSectionFromObjectName(objectName);
-        const interfaceName = helpers_1.getInterfaceName(objectName);
+        const importSection = (0, helpers_1.getSectionFromObjectName)(objectName);
+        const interfaceName = (0, helpers_1.getInterfaceName)(objectName);
         let path;
         if (type === types_1.ObjectType.Object) {
             if (section === importSection) {
@@ -32,8 +32,8 @@ function generateImportsBlock(refs, section, type) {
         paths[path].push(interfaceName);
     });
     const importLines = [];
-    utils_1.sortArrayAlphabetically(Object.keys(paths)).forEach((path) => {
-        const interfaces = utils_1.sortArrayAlphabetically(paths[path]).join(', ');
+    (0, utils_1.sortArrayAlphabetically)(Object.keys(paths)).forEach((path) => {
+        const interfaces = (0, utils_1.sortArrayAlphabetically)(paths[path]).join(', ');
         importLines.push(`import { ${interfaces} } from '${path}';`);
     });
     return importLines.join(constants_1.newLineChar);

package/dist/generators/APITypingsGenerator.js

@@ -17,11 +17,12 @@ const CommentCodeBlock_1 = require("./CommentCodeBlock");
 const log_1 = require("../log");
 const generator_1 = require("../generator");
 const typeString_1 = require("./typeString");
+const mergeImports_1 = require("./utils/mergeImports");
 class APITypingsGenerator {
     constructor(options) {
         this.needEmit = options.needEmit;
         this.outDirPath = options.outDirPath;
-        this.methodsPattern = helpers_1.prepareMethodsPattern(options.methodsPattern);
+        this.methodsPattern = (0, helpers_1.prepareMethodsPattern)(options.methodsPattern);
         this.methodsDefinitions = options.methodsDefinitions;
         this.methodsList = options.methodsDefinitions.methods || [];
         this.objects = this.convertJSONSchemaDictionary(options.objects);
@@ -78,10 +79,7 @@ class APITypingsGenerator {
             codeBlocks: [],
         };
         this.methodFilesMap[section] = {
-            imports: {
-                ...methodFile.imports,
-                ...imports,
-            },
+            imports: (0, mergeImports_1.mergeImports)(methodFile.imports, imports),
             codeBlocks: [...methodFile.codeBlocks, ...codeBlocks],
         };
     }
@@ -102,7 +100,7 @@ class APITypingsGenerator {
                     allOfItem = tempAllOfItem;
                 }
                 else {
-                    log_1.consoleLogErrorAndExit(`${refName} ref not found`);
+                    (0, log_1.consoleLogErrorAndExit)(`${refName} ref not found`);
                 }
             }
             if (allOfItem.allOf) {
@@ -118,7 +116,7 @@ class APITypingsGenerator {
         let properties = object.properties || [];
         if (object.allOf) {
             this.collectAllOf(object).forEach((allOfItem) => {
-                object.required = utils_1.uniqueArray([...object.required, ...allOfItem.required]);
+                object.required = (0, utils_1.uniqueArray)([...object.required, ...allOfItem.required]);
                 let additionalProperties = [];
                 if (allOfItem.properties) {
                     additionalProperties = allOfItem.properties;
@@ -126,7 +124,7 @@ class APITypingsGenerator {
                 else if (allOfItem.ref) {
                     const refObject = this.getObjectByRef(allOfItem.ref);
                     if (!refObject) {
-                        log_1.consoleLogErrorAndExit(`${object.name} ref object in allOf is not found`);
+                        (0, log_1.consoleLogErrorAndExit)(`${object.name} ref object in allOf is not found`);
                         return;
                     }
                     additionalProperties = this.getObjectProperties(refObject, deep + 1);
@@ -166,7 +164,7 @@ class APITypingsGenerator {
         const codeBlock = new TypeCodeBlock_1.TypeCodeBlock({
             type: TypeCodeBlock_1.TypeScriptCodeTypes.Interface,
             refName: object.name,
-            interfaceName: helpers_1.getInterfaceName(object.name),
+            interfaceName: (0, helpers_1.getInterfaceName)(object.name),
             needExport: true,
             description: object.oneOf ? 'Object has oneOf' : '',
             properties: [],
@@ -175,16 +173,16 @@ class APITypingsGenerator {
             return this.getPrimitiveInterfaceCode(object);
         }
         properties.forEach((property) => {
-            const { imports: newImports, value, codeBlocks: newCodeBlocks, description, } = typeString_1.generateTypeString(property, this.objects, {
+            const { imports: newImports, value, codeBlocks: newCodeBlocks, description, } = (0, typeString_1.generateTypeString)(property, this.objects, {
                 objectParentName: object.name,
             });
-            imports = { ...imports, ...newImports };
+            imports = (0, mergeImports_1.mergeImports)(imports, newImports);
             codeBlocks = [...codeBlocks, ...newCodeBlocks];
             codeBlock.addProperty({
                 name: property.name,
                 description: [property.description, description].join(constants_1.newLineChar),
                 value,
-                isRequired: helpers_1.isPatternProperty(property.name) || property.isRequired,
+                isRequired: (0, helpers_1.isPatternProperty)(property.name) || property.isRequired,
             });
         });
         return {
@@ -198,7 +196,7 @@ class APITypingsGenerator {
             return this.getObjectCodeBlockAsType(object);
         }
         if (object.enum) {
-            const { codeBlocks } = enums_1.generateEnumAsUnionType(object);
+            const { codeBlocks } = (0, enums_1.generateEnumAsUnionType)(object);
             return {
                 codeBlocks: codeBlocks,
                 imports: {},
@@ -215,54 +213,56 @@ class APITypingsGenerator {
         }
         this.generatedObjects[object.name] = true;
         let result = false;
-        if (!object.type && object.ref) {
+        if (object.ref && object.type === 'object') {
             result = this.getPrimitiveInterfaceCode(object);
         }
-        switch (object.type) {
-            case 'object':
-                result = this.getObjectInterfaceCode(object);
-                break;
-            case 'string':
-            case 'number':
-            case 'integer':
-            case 'array':
-            case 'boolean':
-                result = this.getPrimitiveInterfaceCode(object);
-                break;
-            default:
-                if (!result) {
-                    log_1.consoleLogErrorAndExit(helpers_1.getInterfaceName(object.name), 'Unknown type of object', object);
-                }
+        else {
+            switch (object.type) {
+                case 'object':
+                    result = this.getObjectInterfaceCode(object);
+                    break;
+                case 'string':
+                case 'number':
+                case 'integer':
+                case 'array':
+                case 'boolean':
+                    result = this.getPrimitiveInterfaceCode(object);
+                    break;
+                default:
+                    if (!result) {
+                        (0, log_1.consoleLogErrorAndExit)((0, helpers_1.getInterfaceName)(object.name), 'Unknown type of object', object);
+                    }
+            }
         }
         if (!result) {
-            log_1.consoleLogErrorAndExit('empty object result', object);
+            (0, log_1.consoleLogErrorAndExit)('empty object result', object);
             return;
         }
         const { codeBlocks, imports } = result;
         const stringCodeBlocks = codeBlocks.map((codeBlock) => codeBlock.toString());
-        const section = helpers_1.getSectionFromObjectName(object.name);
+        const section = (0, helpers_1.getSectionFromObjectName)(object.name);
         delete imports[object.name];
-        stringCodeBlocks.unshift(generator_1.generateImportsBlock(imports, section, types_1.ObjectType.Object));
+        stringCodeBlocks.unshift((0, generator_1.generateImportsBlock)(imports, section, types_1.ObjectType.Object));
         if (stringCodeBlocks.length > 0) {
             const code = stringCodeBlocks.join(constants_1.newLineChar.repeat(2));
-            this.registerResultFile(path_1.default.join('objects', section, `${helpers_1.getInterfaceName(object.name)}.ts`), code);
+            this.registerResultFile(path_1.default.join('objects', section, `${(0, helpers_1.getInterfaceName)(object.name)}.ts`), code);
         }
         codeBlocks.forEach((codeBlock) => {
             if (codeBlock instanceof TypeCodeBlock_1.TypeCodeBlock && codeBlock.needExport && codeBlock.interfaceName) {
-                this.registerExport(`./objects/${section}/${helpers_1.getInterfaceName(object.name)}.ts`, codeBlock.interfaceName);
+                this.registerExport(`./objects/${section}/${(0, helpers_1.getInterfaceName)(object.name)}.ts`, codeBlock.interfaceName);
             }
         });
         this.generateObjectsFromImports(imports);
     }
     getObjectByRef(ref) {
-        const refName = helpers_1.getObjectNameByRef(ref);
+        const refName = (0, helpers_1.getObjectNameByRef)(ref);
         return this.objects[refName];
     }
     generateObjectsFromRefs(refs) {
         Object.keys(refs).forEach((ref) => {
             const refObject = this.getObjectByRef(ref);
             if (!refObject) {
-                log_1.consoleLogInfo(`"${ref}" ref is not found`);
+                (0, log_1.consoleLogInfo)(`"${ref}" ref is not found`);
                 return;
             }
             this.generateObject(refObject);
@@ -272,29 +272,29 @@ class APITypingsGenerator {
         Object.keys(imports).forEach((ref) => {
             const refObject = this.getObjectByRef(ref);
             if (!refObject) {
-                log_1.consoleLogInfo(`"${ref}" ref is not found`);
+                (0, log_1.consoleLogInfo)(`"${ref}" ref is not found`);
                 return;
             }
             this.generateObject(refObject);
         });
     }
     generateMethodParams(methodInfo) {
-        const section = helpers_1.getMethodSection(methodInfo.name);
+        const section = (0, helpers_1.getMethodSection)(methodInfo.name);
         const interfaceName = `${methodInfo.name} params`;
         let imports = {};
         let codeBlocks = [];
         const codeBlock = new TypeCodeBlock_1.TypeCodeBlock({
             type: TypeCodeBlock_1.TypeScriptCodeTypes.Interface,
-            interfaceName: helpers_1.getInterfaceName(interfaceName),
+            interfaceName: (0, helpers_1.getInterfaceName)(interfaceName),
             needExport: true,
             allowEmptyInterface: true,
             properties: [],
         });
         methodInfo.parameters.forEach((property) => {
-            const { imports: newImports, value, codeBlocks: newCodeBlocks, } = typeString_1.generateTypeString(property, this.objects, {
+            const { imports: newImports, value, codeBlocks: newCodeBlocks, } = (0, typeString_1.generateTypeString)(property, this.objects, {
                 needEnumNamesConstant: false,
             });
-            imports = { ...imports, ...newImports };
+            imports = (0, mergeImports_1.mergeImports)(imports, newImports);
             codeBlocks = [...codeBlocks, ...newCodeBlocks];
             codeBlock.addProperty({
                 name: property.name,
@@ -307,7 +307,7 @@ class APITypingsGenerator {
         this.generateObjectsFromImports(imports);
     }
     getResponseObjectRef(ref) {
-        const objectName = helpers_1.getObjectNameByRef(ref);
+        const objectName = (0, helpers_1.getObjectNameByRef)(ref);
         if (this.responses[objectName]) {
             return this.responses[objectName];
         }
@@ -317,15 +317,15 @@ class APITypingsGenerator {
         let codeBlocks = [];
         let imports = {};
         if (object.enum) {
-            const { codeBlocks: newCodeBlocks } = enums_1.generateEnumAsUnionType(object);
+            const { codeBlocks: newCodeBlocks } = (0, enums_1.generateEnumAsUnionType)(object);
             codeBlocks = [...newCodeBlocks];
         }
         else {
-            const { imports: newImports, value, codeBlocks: newCodeBlocks, } = typeString_1.generateTypeString(object, this.objects);
+            const { imports: newImports, value, codeBlocks: newCodeBlocks, } = (0, typeString_1.generateTypeString)(object, this.objects);
             const codeBlock = new TypeCodeBlock_1.TypeCodeBlock({
                 type: TypeCodeBlock_1.TypeScriptCodeTypes.Type,
                 refName: object.name,
-                interfaceName: helpers_1.getInterfaceName(object.name),
+                interfaceName: (0, helpers_1.getInterfaceName)(object.name),
                 description: object.description,
                 needExport: true,
                 properties: [],
@@ -341,13 +341,13 @@ class APITypingsGenerator {
         };
     }
     getResponseCodeBlockAsType(object, response) {
-        const { imports, value, codeBlocks, description } = typeString_1.generateTypeString(response, this.objects, {
+        const { imports, value, codeBlocks, description } = (0, typeString_1.generateTypeString)(response, this.objects, {
             objectParentName: ' ', // TODO: Refactor
         });
         const codeBlock = new TypeCodeBlock_1.TypeCodeBlock({
             type: TypeCodeBlock_1.TypeScriptCodeTypes.Type,
             refName: object.name,
-            interfaceName: helpers_1.getInterfaceName(object.name),
+            interfaceName: (0, helpers_1.getInterfaceName)(object.name),
             description: [object.description, description || ''].join(constants_1.newLineChar),
             needExport: true,
             properties: [],
@@ -362,7 +362,7 @@ class APITypingsGenerator {
     }
     getResponseCodeBlock(object) {
         if (!object.ref) {
-            log_1.consoleLogError(`response schema object "${object.name}" has no ref`, object);
+            (0, log_1.consoleLogError)(`response schema object "${object.name}" has no ref`, object);
             return false;
         }
         const nonBuildableRefs = {
@@ -370,13 +370,13 @@ class APITypingsGenerator {
             [constants_1.baseOkResponseRef]: true,
             [constants_1.basePropertyExistsRef]: true,
         };
-        const objectName = helpers_1.getObjectNameByRef(object.ref);
+        const objectName = (0, helpers_1.getObjectNameByRef)(object.ref);
         if (nonBuildableRefs[objectName]) {
             return this.getObjectCodeBlockAsType(object);
         }
         let response = this.getResponseObjectRef(object.ref);
         if (!response) {
-            log_1.consoleLogError(`response schema object "${object.name}" has no response`, object);
+            (0, log_1.consoleLogError)(`response schema object "${object.name}" has no response`, object);
             return false;
         }
         // VK API JSON Schema specific heuristic
@@ -397,7 +397,7 @@ class APITypingsGenerator {
             case 'array':
                 return this.getResponseCodeBlockAsType(object, response);
             default:
-                log_1.consoleLogErrorAndExit(response.name, 'unknown type', response.type);
+                (0, log_1.consoleLogErrorAndExit)(response.name, 'unknown type', response.type);
                 return false;
         }
     }
@@ -412,13 +412,13 @@ class APITypingsGenerator {
     }
     generateMethodParamsAndResponses(method) {
         const { name: methodName } = method;
-        const section = helpers_1.getMethodSection(methodName);
-        if (!utils_1.isObject(method.responses)) {
-            log_1.consoleLogErrorAndExit(`"${methodName}" "responses" field is not an object.`);
+        const section = (0, helpers_1.getMethodSection)(methodName);
+        if (!(0, utils_1.isObject)(method.responses)) {
+            (0, log_1.consoleLogErrorAndExit)(`"${methodName}" "responses" field is not an object.`);
             return;
         }
         if (Object.keys(method.responses).length === 0) {
-            log_1.consoleLogErrorAndExit(`"${methodName}" "responses" field is empty.`);
+            (0, log_1.consoleLogErrorAndExit)(`"${methodName}" "responses" field is empty.`);
             return;
         }
         // Comment with method name for visual sections in file
@@ -427,7 +427,7 @@ class APITypingsGenerator {
             methodNameComment.appendLines(['', method.description]);
         }
         this.appendToFileMap(section, {}, [methodNameComment]);
-        const { method: normalizedMethod, parameterRefs } = methods_1.normalizeMethodInfo(method);
+        const { method: normalizedMethod, parameterRefs } = (0, methods_1.normalizeMethodInfo)(method);
         method = normalizedMethod;
         this.generateObjectsFromRefs(parameterRefs);
         this.generateMethodParams(new SchemaObject_1.SchemaObject(method.name, method));
@@ -440,9 +440,9 @@ class APITypingsGenerator {
         });
     }
     generateMethods() {
-        log_1.consoleLogInfo('creating method params and responses...');
+        (0, log_1.consoleLogInfo)('creating method params and responses...');
         this.methodsList.forEach((methodInfo) => {
-            if (helpers_1.isMethodNeeded(this.methodsPattern, methodInfo.name)) {
+            if ((0, helpers_1.isMethodNeeded)(this.methodsPattern, methodInfo.name)) {
                 this.generateMethodParamsAndResponses(methodInfo);
             }
         });
@@ -453,12 +453,12 @@ class APITypingsGenerator {
                     this.registerExport(`./methods/${section}`, codeBlock.interfaceName);
                 }
             });
-            const code = [generator_1.generateImportsBlock(imports, null), ...codeBlocks];
+            const code = [(0, generator_1.generateImportsBlock)(imports, null), ...codeBlocks];
             this.registerResultFile(path_1.default.join('methods', `${section}.ts`), code.join(constants_1.newLineChar.repeat(2)));
         });
     }
     generateErrors() {
-        log_1.consoleLogInfo('creating errors...');
+        (0, log_1.consoleLogInfo)('creating errors...');
         const code = [];
         Object.entries(this.errors)
             .reduce((acc, [name, error]) => {
@@ -483,14 +483,14 @@ class APITypingsGenerator {
         this.registerResultFile(path_1.default.join('common', 'errors.ts'), code.join(constants_1.newLineChar.repeat(2)));
     }
     createCommonTypes() {
-        log_1.consoleLogInfo('creating common types...');
+        (0, log_1.consoleLogInfo)('creating common types...');
         const code = [];
         const apiVersion = this.methodsDefinitions.version || constants_1.DEFAULT_API_VERSION;
         code.push(`export const API_VERSION = '${apiVersion}'`);
         code.push('export type ValueOf<T> = T[keyof T];');
         code.push(new TypeCodeBlock_1.TypeCodeBlock({
             type: TypeCodeBlock_1.TypeScriptCodeTypes.Interface,
-            interfaceName: helpers_1.getInterfaceName(constants_1.baseAPIParamsInterfaceName),
+            interfaceName: (0, helpers_1.getInterfaceName)(constants_1.baseAPIParamsInterfaceName),
             needExport: true,
             properties: [
                 {
@@ -514,24 +514,24 @@ class APITypingsGenerator {
             ],
         }).toString());
         this.registerExport('./common/common', 'API_VERSION');
-        this.registerExport('./common/common', helpers_1.getInterfaceName(constants_1.baseAPIParamsInterfaceName));
+        this.registerExport('./common/common', (0, helpers_1.getInterfaceName)(constants_1.baseAPIParamsInterfaceName));
         this.registerResultFile(path_1.default.join('common', 'common.ts'), code.join(constants_1.newLineChar.repeat(2)));
     }
     /**
      * This method creates index.ts file with exports of all generated params, responses and objects
      */
     createIndexExports() {
-        log_1.consoleLogInfo('creating index.ts exports...');
+        (0, log_1.consoleLogInfo)('creating index.ts exports...');
         const blocks = [];
         let exportedObjects = {};
-        utils_1.sortArrayAlphabetically(Object.keys(this.exports)).forEach((path) => {
+        (0, utils_1.sortArrayAlphabetically)(Object.keys(this.exports)).forEach((path) => {
             const objects = Object.keys(this.exports[path]);
             if (!objects.length) {
                 return;
             }
             const blockLines = [];
             blockLines.push('export {');
-            utils_1.sortArrayAlphabetically(objects).forEach((object) => {
+            (0, utils_1.sortArrayAlphabetically)(objects).forEach((object) => {
                 if (exportedObjects[object]) {
                     return;
                 }
@@ -542,21 +542,21 @@ class APITypingsGenerator {
             blocks.push(blockLines.join(constants_1.newLineChar));
         });
         this.registerResultFile('index.ts', blocks.join(constants_1.newLineChar.repeat(2)));
-        log_1.consoleLogInfo(`${Object.keys(exportedObjects).length} objects successfully generated`);
+        (0, log_1.consoleLogInfo)(`${Object.keys(exportedObjects).length} objects successfully generated`);
     }
     generate() {
-        log_1.consoleLogInfo('generate');
+        (0, log_1.consoleLogInfo)('generate');
         this.generateMethods();
         this.generateErrors();
         if (this.needEmit) {
             this.createCommonTypes();
             this.createIndexExports();
-            log_1.consoleLogInfo('prepare out directory');
-            helpers_1.prepareBuildDirectory(this.outDirPath);
-            log_1.consoleLogInfo('write files');
+            (0, log_1.consoleLogInfo)('prepare out directory');
+            (0, helpers_1.prepareBuildDirectory)(this.outDirPath);
+            (0, log_1.consoleLogInfo)('write files');
             Object.keys(this.resultFiles).forEach((filePath) => {
                 const fileContent = this.resultFiles[filePath];
-                helpers_1.writeFile(path_1.default.join(this.outDirPath, filePath), fileContent);
+                (0, helpers_1.writeFile)(path_1.default.join(this.outDirPath, filePath), fileContent);
             });
         }
     }

package/dist/generators/SchemaObject.js

@@ -6,8 +6,8 @@ const helpers_1 = require("../helpers");
 const log_1 = require("../log");
 class SchemaObject {
     constructor(name, object, parentName) {
-        if (!utils_1.isObject(object)) {
-            log_1.consoleLogErrorAndExit(`[SchemaObject] "${name}" is not an object.`, {
+        if (!(0, utils_1.isObject)(object)) {
+            (0, log_1.consoleLogErrorAndExit)(`[SchemaObject] "${name}" is not an object.`, {
                 name,
                 object,
                 parentName,
@@ -18,16 +18,16 @@ class SchemaObject {
         if (parentName) {
             this.parentObjectName = parentName;
         }
-        if (utils_1.isString(object.type)) {
+        if ((0, utils_1.isString)(object.type)) {
             this.type = object.type;
         }
         else if (Array.isArray(object.type)) {
             this.type = object.type;
         }
-        if (utils_1.isString(object.description)) {
+        if ((0, utils_1.isString)(object.description)) {
             this.description = object.description;
         }
-        if (utils_1.isString(object.$ref)) {
+        if ((0, utils_1.isString)(object.$ref)) {
             this.ref = object.$ref;
         }
         if (Array.isArray(object.enum)) {
@@ -59,10 +59,10 @@ class SchemaObject {
         }
         if (object.patternProperties) {
             Object.entries(object.patternProperties).forEach(([propertyName, property]) => {
-                this.properties.push(new SchemaObject(helpers_1.transformPatternPropertyName(propertyName), property, name));
+                this.properties.push(new SchemaObject((0, helpers_1.transformPatternPropertyName)(propertyName), property, name));
             });
         }
-        if (utils_1.isObject(object.items)) {
+        if ((0, utils_1.isObject)(object.items)) {
             this.items = new SchemaObject(name + '_items', object.items, this.name);
         }
         if (Array.isArray(object.oneOf) && object.oneOf.length > 0) {

package/dist/generators/TypeCodeBlock.js

@@ -13,7 +13,7 @@ var TypeScriptCodeTypes;
     TypeScriptCodeTypes["ConstantObject"] = "constant_object";
     TypeScriptCodeTypes["Type"] = "type";
     TypeScriptCodeTypes["Const"] = "const";
-})(TypeScriptCodeTypes = exports.TypeScriptCodeTypes || (exports.TypeScriptCodeTypes = {}));
+})(TypeScriptCodeTypes || (exports.TypeScriptCodeTypes = TypeScriptCodeTypes = {}));
 class TypeCodeBlock extends BaseCodeBlock_1.BaseCodeBlock {
     constructor(options) {
         super();
@@ -40,7 +40,7 @@ class TypeCodeBlock extends BaseCodeBlock_1.BaseCodeBlock {
         this.properties.push(property);
     }
     getPropertiesCode() {
-        const quoteChar = this.properties.some((property) => helpers_1.areQuotesNeededForProperty(property.name))
+        const quoteChar = this.properties.some((property) => (0, helpers_1.areQuotesNeededForProperty)(property.name))
             ? "'"
             : '';
         return this.properties
@@ -61,12 +61,12 @@ class TypeCodeBlock extends BaseCodeBlock_1.BaseCodeBlock {
                     lineEnd = ',';
                     break;
             }
-            let value = property.wrapValue ? utils_1.quoteJavaScriptValue(property.value) : property.value;
+            let value = property.wrapValue ? (0, utils_1.quoteJavaScriptValue)(property.value) : property.value;
             let propertyCode = [
                 `  ${quoteChar}${property.name}${quoteChar}${divider} ${value}${lineEnd}`,
             ];
             if (property.description) {
-                const commentLines = helpers_1.joinCommentLines(2, property.description);
+                const commentLines = (0, helpers_1.joinCommentLines)(2, property.description);
                 if (commentLines.length) {
                     propertyCode.unshift(commentLines.join(constants_1.newLineChar));
                 }
@@ -85,7 +85,7 @@ class TypeCodeBlock extends BaseCodeBlock_1.BaseCodeBlock {
             before.push(`// ${this.refName}`);
         }
         if (this.description) {
-            before = [...before, ...helpers_1.joinCommentLines(0, this.description)];
+            before = [...before, ...(0, helpers_1.joinCommentLines)(0, this.description)];
         }
         switch (this.type) {
             case TypeScriptCodeTypes.Interface: {
@@ -101,7 +101,7 @@ class TypeCodeBlock extends BaseCodeBlock_1.BaseCodeBlock {
                     ? this.extendsInterfaces.join(', ')
                     : '';
                 code = [
-                    utils_1.trimStringDoubleSpaces(`${exportKeyword} interface ${this.interfaceName} ${extendsInterfaces} {`),
+                    (0, utils_1.trimStringDoubleSpaces)(`${exportKeyword} interface ${this.interfaceName} ${extendsInterfaces} {`),
                     propertiesCode,
                     '}',
                 ].join(propertiesCode.length ? constants_1.newLineChar : '');
@@ -109,32 +109,32 @@ class TypeCodeBlock extends BaseCodeBlock_1.BaseCodeBlock {
             }
             case TypeScriptCodeTypes.Enum:
                 code = [
-                    utils_1.trimStringDoubleSpaces(`${exportKeyword} enum ${this.interfaceName} {`),
+                    (0, utils_1.trimStringDoubleSpaces)(`${exportKeyword} enum ${this.interfaceName} {`),
                     propertiesCode,
                     '}',
                 ].join(constants_1.newLineChar);
                 break;
             case TypeScriptCodeTypes.ConstantObject:
                 code = [
-                    utils_1.trimStringDoubleSpaces(`${exportKeyword} const ${this.interfaceName} = {`),
+                    (0, utils_1.trimStringDoubleSpaces)(`${exportKeyword} const ${this.interfaceName} = {`),
                     propertiesCode,
                     '} as const;',
                 ].join(constants_1.newLineChar);
                 break;
             case TypeScriptCodeTypes.Type:
                 if (!this.value) {
-                    log_1.consoleLogErrorAndExit(`"${this.interfaceName}" type has empty value`);
+                    (0, log_1.consoleLogErrorAndExit)(`"${this.interfaceName}" type has empty value`);
                 }
                 code = [
-                    utils_1.trimStringDoubleSpaces(`${exportKeyword} type ${this.interfaceName} = ${this.value};`),
+                    (0, utils_1.trimStringDoubleSpaces)(`${exportKeyword} type ${this.interfaceName} = ${this.value};`),
                 ].join(constants_1.newLineChar);
                 break;
             case TypeScriptCodeTypes.Const:
                 if (!this.value) {
-                    log_1.consoleLogErrorAndExit(`"${this.interfaceName}" type has empty value`);
+                    (0, log_1.consoleLogErrorAndExit)(`"${this.interfaceName}" type has empty value`);
                 }
                 code = [
-                    utils_1.trimStringDoubleSpaces(`${exportKeyword} const ${this.interfaceName} = ${this.value};`),
+                    (0, utils_1.trimStringDoubleSpaces)(`${exportKeyword} const ${this.interfaceName} = ${this.value};`),
                 ].join(constants_1.newLineChar);
                 break;
         }

package/dist/generators/enums.js

@@ -17,7 +17,7 @@ function getEnumNamesIdentifier(name) {
 }
 exports.getEnumNamesIdentifier = getEnumNamesIdentifier;
 function generateEnumConstantObject(object, objectName, enumNames) {
-    const enumInterfaceName = helpers_1.getInterfaceName(objectName);
+    const enumInterfaceName = (0, helpers_1.getInterfaceName)(objectName);
     const codeBlock = new TypeCodeBlock_1.TypeCodeBlock({
         type: TypeCodeBlock_1.TypeScriptCodeTypes.ConstantObject,
         refName: objectName,
@@ -27,7 +27,7 @@ function generateEnumConstantObject(object, objectName, enumNames) {
     });
     enumNames.forEach((name, index) => {
         codeBlock.addProperty({
-            name: helpers_1.getEnumPropertyName(name.toString()),
+            name: (0, helpers_1.getEnumPropertyName)(name.toString()),
             value: object.enum[index],
             wrapValue: true,
         });
@@ -45,7 +45,7 @@ function generateEnumAsUnionType(object) {
     const unionType = new TypeCodeBlock_1.TypeCodeBlock({
         type: TypeCodeBlock_1.TypeScriptCodeTypes.Type,
         refName: object.name,
-        interfaceName: helpers_1.getInterfaceName(object.name),
+        interfaceName: (0, helpers_1.getInterfaceName)(object.name),
         description: [object.description, description].join(constants_1.newLineChar),
         needExport: true,
         properties: [],
@@ -88,7 +88,7 @@ function generateInlineEnum(object, options = {}) {
             if (isNumericEnum && options.refName) {
                 descriptionLines.push('');
                 descriptionLines.push('@note This enum have auto-generated constant with keys and values');
-                descriptionLines.push(`@see ${helpers_1.getInterfaceName(options.refName)}`);
+                descriptionLines.push(`@see ${(0, helpers_1.getInterfaceName)(options.refName)}`);
             }
             descriptionLines.push('');
             enumNames.forEach((name, index) => {
@@ -104,11 +104,11 @@ function generateInlineEnum(object, options = {}) {
             codeBlocks.push(codeBlock);
         }
     }
-    const values = object.enum.map((value) => utils_1.quoteJavaScriptValue(value));
+    const values = object.enum.map((value) => (0, utils_1.quoteJavaScriptValue)(value));
     return {
         codeBlocks,
         imports: {},
-        value: helpers_1.joinOneOfValues(values, true),
+        value: (0, helpers_1.joinOneOfValues)(values, true),
         description: descriptionLines.join(constants_1.newLineChar),
     };
 }

package/dist/generators/methods.js

@@ -30,7 +30,7 @@ function normalizeMethodInfo(method) {
             parameterRefs[ref] = types_1.RefsDictionaryType.Generate;
             parameter.description +=
                 constants_1.newLineChar.repeat(2) +
-                    [`@see ${helpers_1.getInterfaceName(helpers_1.getObjectNameByRef(ref))} (${ref})`].join(constants_1.newLineChar);
+                    [`@see ${(0, helpers_1.getInterfaceName)((0, helpers_1.getObjectNameByRef)(ref))} (${ref})`].join(constants_1.newLineChar);
         }
     });
     return {

package/dist/generators/typeString.js

@@ -7,13 +7,14 @@ const helpers_1 = require("../helpers");
 const log_1 = require("../log");
 const types_1 = require("../types");
 const utils_1 = require("../utils");
+const mergeImports_1 = require("./utils/mergeImports");
 function generateBaseType(object, options) {
     let codeBlocks = [];
     let typeString = 'any /* default type */';
     let imports = {};
     let description = '';
     if (object.enum) {
-        const { value, codeBlocks: newCodeBlocks, description: newDescription, } = enums_1.generateInlineEnum(object, {
+        const { value, codeBlocks: newCodeBlocks, description: newDescription, } = (0, enums_1.generateInlineEnum)(object, {
             // TODO: Refactor
             // section_object_name -> property_name -> items => section_object_name_property_name_items enumNames
             objectParentName: options.objectParentName || object.parentObjectName,
@@ -23,15 +24,15 @@ function generateBaseType(object, options) {
         codeBlocks = newCodeBlocks;
         description = newDescription;
     }
-    else if (utils_1.isString(object.type)) {
+    else if ((0, utils_1.isString)(object.type)) {
         const primitive = constants_1.primitiveTypes[object.type];
         if (!primitive) {
-            log_1.consoleLogErrorAndExit(object.name, `Error, type "${object.type}" is not declared type`);
+            (0, log_1.consoleLogErrorAndExit)(object.name, `Error, type "${object.type}" is not declared type`);
         }
         typeString = primitive;
     }
     else if (Array.isArray(object.type)) {
-        const primitivesTypesArray = helpers_1.resolvePrimitiveTypesArray(object.type);
+        const primitivesTypesArray = (0, helpers_1.resolvePrimitiveTypesArray)(object.type);
         if (primitivesTypesArray !== null) {
             typeString = primitivesTypesArray;
         }
@@ -55,10 +56,10 @@ function generateTypeString(object, objects, options = {}) {
     if (object.oneOf) {
         const values = object.oneOf.map((oneOfObject) => {
             const { value, imports: newImports } = generateTypeString(oneOfObject, objects);
-            imports = { ...imports, ...newImports };
+            imports = (0, mergeImports_1.mergeImports)(imports, newImports);
             return value;
         });
-        typeString = helpers_1.joinOneOfValues(values);
+        typeString = (0, helpers_1.joinOneOfValues)(values);
     }
     else if (object.type === constants_1.PropertyType.ARRAY && object.items) {
         let depth = 1;
@@ -74,13 +75,13 @@ function generateTypeString(object, objects, options = {}) {
             }
         }
         if (items.ref) {
-            const refName = helpers_1.getObjectNameByRef(items.ref);
+            const refName = (0, helpers_1.getObjectNameByRef)(items.ref);
             const refObject = objects[refName];
             if (!refObject) {
-                log_1.consoleLogErrorAndExit(`Error, object for "${refName}" ref is not found.`);
+                (0, log_1.consoleLogErrorAndExit)(`Error, object for "${refName}" ref is not found.`);
             }
             imports[refName] = types_1.RefsDictionaryType.GenerateAndImport;
-            typeString = helpers_1.formatArrayDepth(helpers_1.getInterfaceName(refName), depth);
+            typeString = (0, helpers_1.formatArrayDepth)((0, helpers_1.getInterfaceName)(refName), depth);
         }
         else {
             const { value, description: newDescription, imports: newImports, codeBlocks: newCodeBlocks, } = generateBaseType(items, {
@@ -88,14 +89,14 @@ function generateTypeString(object, objects, options = {}) {
                 // TODO: Refactor
                 objectParentName: object.parentObjectName,
             });
-            typeString = helpers_1.formatArrayDepth(value, depth);
+            typeString = (0, helpers_1.formatArrayDepth)(value, depth);
             description = newDescription;
-            imports = { ...imports, ...newImports };
+            imports = (0, mergeImports_1.mergeImports)(imports, newImports);
             codeBlocks = [...codeBlocks, ...newCodeBlocks];
         }
     }
     else if (object.ref) {
-        const refName = helpers_1.getObjectNameByRef(object.ref);
+        const refName = (0, helpers_1.getObjectNameByRef)(object.ref);
         switch (refName) {
             case constants_1.baseOkResponseRef:
             case constants_1.basePropertyExistsRef:
@@ -107,26 +108,30 @@ function generateTypeString(object, objects, options = {}) {
             default: {
                 const refObject = objects[refName];
                 if (!refObject) {
-                    log_1.consoleLogErrorAndExit(`Error, object for "${refName}" ref is not found.`);
+                    (0, log_1.consoleLogErrorAndExit)(`Error, object for "${refName}" ref is not found.`);
                 }
                 if (refObject.enum) {
                     imports[refName] = types_1.RefsDictionaryType.GenerateAndImport;
-                    typeString = helpers_1.getInterfaceName(refName);
+                    typeString = (0, helpers_1.getInterfaceName)(refName);
                 }
                 else if (refObject.oneOf) {
                     const values = refObject.oneOf.map((oneOfObject) => {
                         const { value, imports: newImports } = generateTypeString(oneOfObject, objects);
-                        imports = { ...imports, ...newImports };
+                        imports = (0, mergeImports_1.mergeImports)(imports, newImports);
                         return value;
                     });
-                    typeString = helpers_1.joinOneOfValues(values);
+                    typeString = (0, helpers_1.joinOneOfValues)(values);
                 }
-                else if (utils_1.isString(refObject.type) && constants_1.scalarTypes[refObject.type] && !refObject.ref) {
+                else if ((0, utils_1.isString)(refObject.type) && constants_1.scalarTypes[refObject.type] && !refObject.ref) {
                     typeString = constants_1.scalarTypes[refObject.type];
                 }
+                else if (object.type === constants_1.PropertyType.STRING) {
+                    imports[refName] = types_1.RefsDictionaryType.Generate;
+                    typeString = constants_1.scalarTypes.string;
+                }
                 else {
                     imports[refName] = types_1.RefsDictionaryType.GenerateAndImport;
-                    typeString = helpers_1.getInterfaceName(refName);
+                    typeString = (0, helpers_1.getInterfaceName)(refName);
                 }
             }
         }

package/dist/generators/utils/mergeImports.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeImports = void 0;
+const types_1 = require("../../types");
+function mergeImports(oldImports, newImports) {
+    const result = { ...oldImports };
+    Object.entries(newImports).forEach(([name, newImportValue]) => {
+        const oldImportValue = oldImports[name];
+        if (oldImportValue === types_1.RefsDictionaryType.GenerateAndImport) {
+            return;
+        }
+        result[name] = newImportValue;
+    });
+    return result;
+}
+exports.mergeImports = mergeImports;

package/dist/helpers.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -81,7 +85,7 @@ function writeFile(filePath, code, insertAutoGeneratedNote = true) {
 exports.writeFile = writeFile;
 function prepareMethodsPattern(methodsPattern) {
     if (!methodsPattern) {
-        log_1.consoleLogErrorAndExit('methodsPattern is empty. Pass "*" to generate all methods');
+        (0, log_1.consoleLogErrorAndExit)('methodsPattern is empty. Pass "*" to generate all methods');
     }
     return methodsPattern
         .replace(/\s+/g, '')
@@ -114,9 +118,9 @@ function getInterfaceName(name) {
     name = name
         .replace(/\.|(\s+)|_/g, ' ')
         .split(' ')
-        .map((v) => utils_1.capitalizeFirstLetter(v))
+        .map((v) => (0, utils_1.capitalizeFirstLetter)(v))
         .join('');
-    return utils_1.capitalizeFirstLetter(name);
+    return (0, utils_1.capitalizeFirstLetter)(name);
 }
 exports.getInterfaceName = getInterfaceName;
 function getEnumPropertyName(name) {
@@ -160,14 +164,14 @@ function joinCommentLines(indent = 2, ...description) {
         if (typeof entry === 'string') {
             descriptionLines = [
                 ...descriptionLines,
-                ...utils_1.trimArray((entry || '').trim().split(constants_1.newLineChar)),
+                ...(0, utils_1.trimArray)((entry || '').trim().split(constants_1.newLineChar)),
             ];
         }
         else if (Array.isArray(entry)) {
             descriptionLines = [...descriptionLines, ...entry];
         }
     });
-    descriptionLines = utils_1.trimArray(descriptionLines);
+    descriptionLines = (0, utils_1.trimArray)(descriptionLines);
     if (!descriptionLines.length) {
         return [];
     }

package/dist/helpers.test.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const helpers_1 = require("./helpers");
 test('areQuotesNeededForProperty', () => {
-    expect(helpers_1.areQuotesNeededForProperty('user_id')).toBe(false);
-    expect(helpers_1.areQuotesNeededForProperty('uuid4')).toBe(false);
-    expect(helpers_1.areQuotesNeededForProperty('_foo')).toBe(false);
-    expect(helpers_1.areQuotesNeededForProperty('4uuid')).toBe(true);
-    expect(helpers_1.areQuotesNeededForProperty('user-id')).toBe(true);
-    expect(helpers_1.areQuotesNeededForProperty('user&id')).toBe(true);
-    expect(helpers_1.areQuotesNeededForProperty('идентификатор')).toBe(true);
+    expect((0, helpers_1.areQuotesNeededForProperty)('user_id')).toBe(false);
+    expect((0, helpers_1.areQuotesNeededForProperty)('uuid4')).toBe(false);
+    expect((0, helpers_1.areQuotesNeededForProperty)('_foo')).toBe(false);
+    expect((0, helpers_1.areQuotesNeededForProperty)('4uuid')).toBe(true);
+    expect((0, helpers_1.areQuotesNeededForProperty)('user-id')).toBe(true);
+    expect((0, helpers_1.areQuotesNeededForProperty)('user&id')).toBe(true);
+    expect((0, helpers_1.areQuotesNeededForProperty)('идентификатор')).toBe(true);
 });

package/dist/index.js

@@ -30,7 +30,7 @@ const helpMessage = `
 async function main() {
     console.log(chalk_1.default.bold('VK API Schema TypeScript generator'));
     const startTime = perf_hooks_1.performance.now();
-    const args = cli_1.parseArguments();
+    const args = (0, cli_1.parseArguments)();
     let { help, schemaDir, outDir, methods } = args;
     if (help) {
         console.log(helpMessage);
@@ -38,36 +38,36 @@ async function main() {
     }
     const helpHint = `Use ${chalk_1.default.greenBright('--help')} to see all options.`;
     if (!schemaDir) {
-        log_1.consoleLogErrorAndExit(`You should specify ${chalk_1.default.greenBright('schemaDir')}. ${helpHint}`);
+        (0, log_1.consoleLogErrorAndExit)(`You should specify ${chalk_1.default.greenBright('schemaDir')}. ${helpHint}`);
         return;
     }
     if (!outDir) {
-        log_1.consoleLogInfo(`${chalk_1.default.greenBright('outDir')} option is empty. ${helpHint}`);
-        log_1.consoleLogInfo('Script will work in linter mode without emitting files to file system.');
+        (0, log_1.consoleLogInfo)(`${chalk_1.default.greenBright('outDir')} option is empty. ${helpHint}`);
+        (0, log_1.consoleLogInfo)('Script will work in linter mode without emitting files to file system.');
     }
     if (!Array.isArray(methods) || !methods.length) {
-        log_1.consoleLogErrorAndExit(`You should specify ${chalk_1.default.greenBright('methods')}. ${helpHint}`);
+        (0, log_1.consoleLogErrorAndExit)(`You should specify ${chalk_1.default.greenBright('methods')}. ${helpHint}`);
         return;
     }
     schemaDir = path_1.default.resolve(schemaDir);
     outDir = outDir ? path_1.default.resolve(outDir) : '';
     // Read and check required schema files
     const [methodsDefinitions, { definitions: responsesDefinitions }, { definitions: objectsDefinitions }, { errors: errorsDefinitions },] = await Promise.all([
-        helpers_1.readJSONFile(path_1.default.resolve(schemaDir, 'methods.json')),
-        helpers_1.readJSONFile(path_1.default.resolve(schemaDir, 'responses.json')),
-        helpers_1.readJSONFile(path_1.default.resolve(schemaDir, 'objects.json')),
-        helpers_1.readJSONFile(path_1.default.resolve(schemaDir, 'errors.json')),
+        (0, helpers_1.readJSONFile)(path_1.default.resolve(schemaDir, 'methods.json')),
+        (0, helpers_1.readJSONFile)(path_1.default.resolve(schemaDir, 'responses.json')),
+        (0, helpers_1.readJSONFile)(path_1.default.resolve(schemaDir, 'objects.json')),
+        (0, helpers_1.readJSONFile)(path_1.default.resolve(schemaDir, 'errors.json')),
     ]);
     if (!Object.keys(methodsDefinitions).length) {
-        log_1.consoleLogErrorAndExit(`${chalk_1.default.greenBright('responses.json')} file is invalid.`);
+        (0, log_1.consoleLogErrorAndExit)(`${chalk_1.default.greenBright('responses.json')} file is invalid.`);
         return;
     }
     if (!Object.keys(responsesDefinitions).length) {
-        log_1.consoleLogErrorAndExit(`${chalk_1.default.greenBright('responses.json')} file is invalid.`);
+        (0, log_1.consoleLogErrorAndExit)(`${chalk_1.default.greenBright('responses.json')} file is invalid.`);
         return;
     }
     if (!Object.keys(objectsDefinitions).length) {
-        log_1.consoleLogErrorAndExit(`${chalk_1.default.greenBright('objects.json')} file is invalid.`);
+        (0, log_1.consoleLogErrorAndExit)(`${chalk_1.default.greenBright('objects.json')} file is invalid.`);
         return;
     }
     const needEmit = !!outDir;
@@ -82,6 +82,6 @@ async function main() {
     });
     generator.generate();
     const endTime = perf_hooks_1.performance.now();
-    log_1.consoleLog(`✨ Done in ${((endTime - startTime) / 1000).toFixed(2)}s.`);
+    (0, log_1.consoleLog)(`✨ Done in ${((endTime - startTime) / 1000).toFixed(2)}s.`);
 }
 exports.main = main;

package/dist/log.js

@@ -9,7 +9,7 @@ const util_1 = require("util");
 function getInspectArgs(args) {
     return args.map((arg) => {
         if (typeof arg === 'object') {
-            return util_1.inspect(arg, {
+            return (0, util_1.inspect)(arg, {
                 showHidden: false,
                 depth: 10,
                 colors: true,

package/dist/types.js

@@ -5,10 +5,10 @@ var RefsDictionaryType;
 (function (RefsDictionaryType) {
     RefsDictionaryType[RefsDictionaryType["GenerateAndImport"] = 0] = "GenerateAndImport";
     RefsDictionaryType[RefsDictionaryType["Generate"] = 1] = "Generate";
-})(RefsDictionaryType = exports.RefsDictionaryType || (exports.RefsDictionaryType = {}));
+})(RefsDictionaryType || (exports.RefsDictionaryType = RefsDictionaryType = {}));
 var ObjectType;
 (function (ObjectType) {
     ObjectType["Object"] = "object";
     ObjectType["Response"] = "response";
     ObjectType["Params"] = "params";
-})(ObjectType = exports.ObjectType || (exports.ObjectType = {}));
+})(ObjectType || (exports.ObjectType = ObjectType = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/api-schema-typescript-generator",
-  "version": "0.14.0",
+  "version": "0.16.0",
   "license": "MIT",
   "description": "VK API TypeScript generator",
   "author": {
@@ -46,17 +46,17 @@
   },
   "devDependencies": {
     "@types/jest": "^28.1.5",
-    "@types/node": "^14.0.13",
+    "@types/node": "^18.17.3",
     "@typescript-eslint/eslint-plugin": "5.30.6",
-    "@typescript-eslint/parser": "5.30.6",
+    "@typescript-eslint/parser": "5.62.0",
     "@vkontakte/eslint-config": "3.1.0",
     "eslint": "8.19.0",
-    "eslint-plugin-react": "7.30.1",
+    "eslint-plugin-react": "7.33.1",
     "eslint-plugin-react-hooks": "4.6.0",
     "jest": "28.1.3",
     "pre-commit": "1.2.2",
     "rimraf": "^3.0.2",
     "ts-jest": "^28.0.6",
-    "typescript": "4.3.5"
+    "typescript": "^5.1.6"
   }
 }

package/src/constants.ts

@@ -1,7 +1,7 @@
 import { EOL } from 'os';
 import { Dictionary } from './types';
 
-export const DEFAULT_API_VERSION = '5.130';
+export const DEFAULT_API_VERSION = '5.131';
 
 export const PropertyType = {
   INTEGER: 'integer',

package/src/generators/APITypingsGenerator.ts

@@ -31,6 +31,7 @@ import { consoleLogError, consoleLogErrorAndExit, consoleLogInfo } from '../log'
 import { generateImportsBlock } from '../generator';
 import { generateTypeString } from './typeString';
 import { ErrorInterface } from '../types/schema';
+import { mergeImports } from './utils/mergeImports';
 
 interface APITypingsGeneratorOptions {
   needEmit: boolean;
@@ -131,10 +132,7 @@ export class APITypingsGenerator {
     };
 
     this.methodFilesMap[section] = {
-      imports: {
-        ...methodFile.imports,
-        ...imports,
-      },
+      imports: mergeImports(methodFile.imports, imports),
       codeBlocks: [...methodFile.codeBlocks, ...codeBlocks],
     };
   }
@@ -253,7 +251,7 @@ export class APITypingsGenerator {
         objectParentName: object.name,
       });
 
-      imports = { ...imports, ...newImports };
+      imports = mergeImports(imports, newImports);
       codeBlocks = [...codeBlocks, ...newCodeBlocks];
 
       codeBlock.addProperty({
@@ -297,27 +295,27 @@ export class APITypingsGenerator {
 
     let result: GeneratorResultInterface | false = false;
 
-    if (!object.type && object.ref) {
+    if (object.ref && object.type === 'object') {
       result = this.getPrimitiveInterfaceCode(object);
-    }
-
-    switch (object.type) {
-      case 'object':
-        result = this.getObjectInterfaceCode(object);
-        break;
-
-      case 'string':
-      case 'number':
-      case 'integer':
-      case 'array':
-      case 'boolean':
-        result = this.getPrimitiveInterfaceCode(object);
-        break;
-
-      default:
-        if (!result) {
-          consoleLogErrorAndExit(getInterfaceName(object.name), 'Unknown type of object', object);
-        }
+    } else {
+      switch (object.type) {
+        case 'object':
+          result = this.getObjectInterfaceCode(object);
+          break;
+
+        case 'string':
+        case 'number':
+        case 'integer':
+        case 'array':
+        case 'boolean':
+          result = this.getPrimitiveInterfaceCode(object);
+          break;
+
+        default:
+          if (!result) {
+            consoleLogErrorAndExit(getInterfaceName(object.name), 'Unknown type of object', object);
+          }
+      }
     }
 
     if (!result) {
@@ -406,7 +404,7 @@ export class APITypingsGenerator {
         needEnumNamesConstant: false,
       });
 
-      imports = { ...imports, ...newImports };
+      imports = mergeImports(imports, newImports);
       codeBlocks = [...codeBlocks, ...newCodeBlocks];
 
       codeBlock.addProperty({

package/src/generators/typeString.ts

@@ -19,6 +19,7 @@ import { Dictionary, RefsDictionary, RefsDictionaryType } from '../types';
 import { isString } from '../utils';
 import { CodeBlocksArray, GeneratorResultInterface } from './BaseCodeBlock';
 import { SchemaObject } from './SchemaObject';
+import { mergeImports } from './utils/mergeImports';
 
 interface GenerateTypeStringOptions {
   objectParentName?: string;
@@ -92,7 +93,7 @@ export function generateTypeString(
   if (object.oneOf) {
     const values = object.oneOf.map((oneOfObject) => {
       const { value, imports: newImports } = generateTypeString(oneOfObject, objects);
-      imports = { ...imports, ...newImports };
+      imports = mergeImports(imports, newImports);
       return value;
     });
 
@@ -134,7 +135,7 @@ export function generateTypeString(
 
       typeString = formatArrayDepth(value, depth);
       description = newDescription;
-      imports = { ...imports, ...newImports };
+      imports = mergeImports(imports, newImports);
       codeBlocks = [...codeBlocks, ...newCodeBlocks];
     }
   } else if (object.ref) {
@@ -162,13 +163,16 @@ export function generateTypeString(
         } else if (refObject.oneOf) {
           const values = refObject.oneOf.map((oneOfObject) => {
             const { value, imports: newImports } = generateTypeString(oneOfObject, objects);
-            imports = { ...imports, ...newImports };
+            imports = mergeImports(imports, newImports);
             return value;
           });
 
           typeString = joinOneOfValues(values);
         } else if (isString(refObject.type) && scalarTypes[refObject.type] && !refObject.ref) {
           typeString = scalarTypes[refObject.type];
+        } else if (object.type === PropertyType.STRING) {
+          imports[refName] = RefsDictionaryType.Generate;
+          typeString = scalarTypes.string;
         } else {
           imports[refName] = RefsDictionaryType.GenerateAndImport;
           typeString = getInterfaceName(refName);

package/src/generators/utils/mergeImports.ts

@@ -0,0 +1,17 @@
+import { RefsDictionary, RefsDictionaryType } from '../../types';
+
+export function mergeImports(oldImports: RefsDictionary, newImports: RefsDictionary) {
+  const result = { ...oldImports };
+
+  Object.entries(newImports).forEach(([name, newImportValue]) => {
+    const oldImportValue = oldImports[name];
+
+    if (oldImportValue === RefsDictionaryType.GenerateAndImport) {
+      return;
+    }
+
+    result[name] = newImportValue;
+  });
+
+  return result;
+}