@vkontakte/api-schema-typescript-generator 0.11.0 → 0.13.1

package/dist/constants.js

@@ -21,7 +21,7 @@ exports.scalarTypes = {
 exports.primitiveTypes = {
     ...exports.scalarTypes,
     array: 'any[]',
-    object: '{}',
+    object: '{ [key: string]: unknown }',
     mixed: 'any /* mixed primitive */',
 };
 exports.spaceChar = ' ';

package/dist/generators/APITypingsGenerator.js

@@ -154,7 +154,6 @@ class APITypingsGenerator {
         let imports = {};
         let codeBlocks = [];
         const properties = this.getObjectProperties(object);
-        const requiredProperties = utils_1.arrayToMap(object.required);
         const codeBlock = new TypeCodeBlock_1.TypeCodeBlock({
             type: TypeCodeBlock_1.TypeScriptCodeTypes.Interface,
             refName: object.name,
@@ -176,7 +175,7 @@ class APITypingsGenerator {
                 name: property.name,
                 description: [property.description, description].join(constants_1.newLineChar),
                 value,
-                isRequired: helpers_1.isPatternProperty(property.name) || requiredProperties[property.name],
+                isRequired: helpers_1.isPatternProperty(property.name) || property.isRequired,
             });
         });
         return {

package/dist/generators/typeString.js

@@ -94,9 +94,6 @@ function generateTypeString(object, objects, options = {}) {
             codeBlocks = [...codeBlocks, ...newCodeBlocks];
         }
     }
-    else if (object.type) {
-        return generateBaseType(object, options);
-    }
     else if (object.ref) {
         const refName = helpers_1.getObjectNameByRef(object.ref);
         switch (refName) {
@@ -134,6 +131,9 @@ function generateTypeString(object, objects, options = {}) {
             }
         }
     }
+    else if (object.type) {
+        return generateBaseType(object, options);
+    }
     return {
         codeBlocks,
         imports,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/api-schema-typescript-generator",
-  "version": "0.11.0",
+  "version": "0.13.1",
   "license": "MIT",
   "description": "VK API TypeScript generator",
   "author": {

package/src/constants.ts

@@ -23,7 +23,7 @@ export const scalarTypes: Dictionary<string> = {
 export const primitiveTypes: Dictionary<string> = {
   ...scalarTypes,
   array: 'any[]',
-  object: '{}',
+  object: '{ [key: string]: unknown }',
   mixed: 'any /* mixed primitive */',
 };
 

package/src/generators/APITypingsGenerator.ts

@@ -15,7 +15,7 @@ import {
 } from '../helpers';
 import { CodeBlocksArray, GeneratorResultInterface } from './BaseCodeBlock';
 import { TypeCodeBlock, TypeScriptCodeTypes } from './TypeCodeBlock';
-import { arrayToMap, isObject, sortArrayAlphabetically, uniqueArray } from '../utils';
+import { isObject, sortArrayAlphabetically, uniqueArray } from '../utils';
 import {
   baseAPIParamsInterfaceName,
   baseBoolIntRef,
@@ -229,7 +229,6 @@ export class APITypingsGenerator {
     let codeBlocks: CodeBlocksArray = [];
 
     const properties = this.getObjectProperties(object);
-    const requiredProperties = arrayToMap(object.required);
 
     const codeBlock = new TypeCodeBlock({
       type: TypeScriptCodeTypes.Interface,
@@ -261,7 +260,7 @@ export class APITypingsGenerator {
         name: property.name,
         description: [property.description, description].join(newLineChar),
         value,
-        isRequired: isPatternProperty(property.name) || requiredProperties[property.name],
+        isRequired: isPatternProperty(property.name) || property.isRequired,
       });
     });
 

package/src/generators/typeString.ts

@@ -134,8 +134,6 @@ export function generateTypeString(
       imports = { ...imports, ...newImports };
       codeBlocks = [...codeBlocks, ...newCodeBlocks];
     }
-  } else if (object.type) {
-    return generateBaseType(object, options);
   } else if (object.ref) {
     const refName = getObjectNameByRef(object.ref);
 
@@ -174,6 +172,8 @@ export function generateTypeString(
         }
       }
     }
+  } else if (object.type) {
+    return generateBaseType(object, options);
   }
 
   return {