fix: support TypeScriptToLua v0.35.0

Author: ark120202

package.json

@@ -39,7 +39,7 @@
     "resolve-from": "^5.0.0",
     "resolve-global": "^1.0.0",
     "tslib": "^2.0.0",
-    "typescript-to-lua": "^0.34.0"
+    "typescript-to-lua": "^0.35.0"
   },
   "devDependencies": {
     "@ark120202/eslint-config": "^2.3.0",

src/index.ts

@@ -2,8 +2,8 @@ import mockRequire from 'mock-require';
 import path from 'path';
 import resolveFrom from 'resolve-from';
 import resolveGlobal from 'resolve-global';
-import { ParsedCommandLine } from 'typescript-to-lua';
-import * as tsserverlibrary from 'typescript/lib/tsserverlibrary';
+import type * as tstl from 'typescript-to-lua';
+import type * as tsserverlibrary from 'typescript/lib/tsserverlibrary';
 
 const pluginMarker = Symbol('pluginMarker');
 class TSTLPlugin {
@@ -18,7 +18,7 @@ class TSTLPlugin {
     this.project.log(`[typescript-tstl-plugin] ${this.project.getProjectName()}: ${message}`);
   }
 
-  private parsedCommandLine?: ParsedCommandLine;
+  private parsedCommandLine?: tstl.ParsedCommandLine;
   public update() {
     this.log('Updating project');
     if (!(this.project instanceof this.ts.server.ConfiguredProject)) return;
@@ -90,8 +90,26 @@ class TSTLPlugin {
       programOptions.emitDeclarationOnly = false;
 
       try {
-        const { diagnostics } = this.tstl.transpile({ program, sourceFiles: [sourceFile] });
-        return diagnostics;
+        let diagnostics: tsserverlibrary.Diagnostic[] | undefined;
+
+        // >=0.35.0
+        if (this.tstl.getProgramTranspileResult !== undefined) {
+          ({ diagnostics } = this.tstl.getProgramTranspileResult(this.serverHost, () => {}, {
+            program,
+            sourceFiles: [sourceFile],
+          }));
+        }
+
+        // >=0.19.0
+        if (this.tstl.transpile !== undefined) {
+          ({ diagnostics } = this.tstl.transpile({ program, sourceFiles: [sourceFile] }));
+        }
+
+        if (diagnostics === undefined) {
+          throw new Error(`Unsupported TypeScriptToLua version: ${this.tstl.version}`);
+        }
+
+        return diagnostics.map(diag => ({ ...diag, code: undefined! }));
       } catch (error) {
         this.log(`Error during transpilation: ${error.stack}`);
       }

src/tstl.d.ts

@@ -0,0 +1,6 @@
+/* eslint-disable @typescript-eslint/no-unnecessary-qualifier */
+import * as tstl from 'typescript-to-lua';
+
+declare module 'typescript-to-lua' {
+  export const transpile: ((options: tstl.TranspileOptions) => tstl.TranspileResult) | undefined;
+}

test-workspace/yarn.lock

@@ -34,6 +34,11 @@ normalize-path@^2.1.1:
   dependencies:
     remove-trailing-separator "^1.0.1"
 
+path-parse@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
@@ -51,15 +56,26 @@ resolve-global@^1.0.0:
   dependencies:
     global-dirs "^0.1.1"
 
+resolve@^1.15.1:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
+  integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
+  dependencies:
+    path-parse "^1.0.6"
+
 source-map@^0.7.3:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
 
-tslib@^1.9.3:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
-  integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
+tslib@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.0.tgz#18d13fc2dce04051e20f074cc8387fd8089ce4f3"
+  integrity sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==
+
+typescript-to-lua@^0.35.0:
+  version "0.0.0"
+  uid ""
 
 "typescript-to-lua@link:../node_modules/typescript-to-lua":
   version "0.0.0"
@@ -69,7 +85,7 @@ tslib@^1.9.3:
   version "0.0.0"
   uid ""
 
-typescript@^3.4.5:
-  version "3.4.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.5.tgz#2d2618d10bb566572b8d7aad5180d84257d70a99"
-  integrity sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw==
+typescript@^3.9.2:
+  version "3.9.6"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.6.tgz#8f3e0198a34c3ae17091b35571d3afd31999365a"
+  integrity sha512-Pspx3oKAPJtjNwE92YS05HQoY7z2SFyOpHo9MqJor3BXAGNaPUs83CuVp9VISFkSjyRfiTpmKuAYGJB7S7hOxw==

yarn.lock

@@ -1898,10 +1898,10 @@ type-fest@^0.8.1:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
-typescript-to-lua@^0.34.0:
-  version "0.34.0"
-  resolved "https://registry.yarnpkg.com/typescript-to-lua/-/typescript-to-lua-0.34.0.tgz#bd9cba84ce3fd8f44b13f17c7bd39ef2f3bf08db"
-  integrity sha512-00Sh6Pv90r664dEp1svHbML1A6/d8+SDdzeDFS3K6vFi9xht8ZGAxy8QRePK25/pclj9EV3caKYxb2x2mKv/PA==
+typescript-to-lua@^0.35.0:
+  version "0.35.0"
+  resolved "https://registry.yarnpkg.com/typescript-to-lua/-/typescript-to-lua-0.35.0.tgz#abe468401ff7679abbd267c4faecfeef81bf0857"
+  integrity sha512-r79LfK1nWauFO4SR7q7pMCYjwW412Z17yx1WKp00SnVmYNwbm4fB/TsJuZe5jLtpZxAuGG8nVqtJEAsU5d1Bhg==
   dependencies:
     resolve "^1.15.1"
     source-map "^0.7.3"