@vkontakte/api-schema-typescript-generator 0.14.0 → 0.15.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/generators/APITypingsGenerator.js

@@ -215,24 +215,26 @@ class APITypingsGenerator {
         }
         this.generatedObjects[object.name] = true;
         let result = false;
-        if (!object.type && object.ref) {
+        if (object.ref) {
             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) {
+                        log_1.consoleLogErrorAndExit(helpers_1.getInterfaceName(object.name), 'Unknown type of object', object);
+                    }
+            }
         }
         if (!result) {
             log_1.consoleLogErrorAndExit('empty object result', object);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/api-schema-typescript-generator",
-  "version": "0.14.0",
+  "version": "0.15.0",
   "license": "MIT",
   "description": "VK API TypeScript generator",
   "author": {
@@ -48,7 +48,7 @@
     "@types/jest": "^28.1.5",
     "@types/node": "^14.0.13",
     "@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",

package/src/generators/APITypingsGenerator.ts

@@ -297,27 +297,27 @@ export class APITypingsGenerator {
 
     let result: GeneratorResultInterface | false = false;
 
-    if (!object.type && object.ref) {
+    if (object.ref) {
       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) {