Provide recommended lib files to the playground

ark120202 · ark120202 · commit 8173512b3cc1 · 2020-02-20T20:10:24.000Z
diff --git a/package.json b/package.json
@@ -41,6 +41,7 @@
         "worker-loader": "^2.0.0"
     },
     "dependencies": {
+        "@types/webpack-env": "^1.15.1",
         "fengari-web": "^0.1.4",
         "highlight.js": "^9.18.0",
         "monaco-editor": "^0.19.3",
diff --git a/src/empty.ts b/src/empty.ts
diff --git a/src/playground/index.ts b/src/playground/index.ts
@@ -68,7 +68,7 @@ async function onCodeChanged() {
     const getWorker = await monaco.languages.typescript.getTypeScriptWorker();
     const client: CustomTypeScriptWorker = await getWorker(model.uri);
 
-    const { code, ast } = await client.getTranspileOutput();
+    const { code, ast } = await client.getTranspileOutput(model.uri.toString());
     luaEditor.setValue(code);
     setLuaAST(ast);
     fengariWorker.postMessage({ code });
@@ -80,6 +80,14 @@ fengariWorker.onmessage = event => {
     outputTerminalContent.innerText = messages.map(m => m.text).join("\n");
 };
 
+function addLibsFromContext(context: __WebpackModuleApi.RequireContext) {
+    for (const request of context.keys()) {
+        monaco.languages.typescript.typescriptDefaults.addExtraLib(context(request).default);
+    }
+}
+
+addLibsFromContext(require.context("!!raw-loader!typescript/lib/", false, /lib(\.es(.+))?\.d\.ts$/));
+
 const tsEditor = monaco.editor.create(tsEditorContainer, {
     value: getInitialCode(),
     language: "typescript",
diff --git a/src/playground/ts.worker.ts b/src/playground/ts.worker.ts
@@ -4,40 +4,44 @@ import { TypeScriptWorker } from "monaco-editor/esm/vs/language/typescript/tsWor
 import * as ts from "typescript";
 import * as tstl from "typescript-to-lua";
 
+const libContext = require.context(`raw-loader!typescript-to-lua/dist/lualib`, true, /(.+)(?<!lualib_bundle)\.lua$/);
 const emitHost: tstl.EmitHost = {
-    getCurrentDirectory: () => ".",
+    getCurrentDirectory: () => "",
     readFile: (fileName: string) => {
-        const featureName = fileName.replace("/dist/lualib/", "").replace(".lua", "");
-        return require(`raw-loader!typescript-to-lua/dist/lualib/${featureName}.lua`).default;
+        const [, featureName] = fileName.match(/\/dist\/lualib\/(.+)\.lua$/) ?? [];
+        if (featureName === undefined) {
+            throw new Error(`Unexpected file to read: ${fileName}`);
+        }
+
+        return libContext(`./${featureName}.lua`).default;
     },
 };
 
 // TODO: In latest monaco-typescript it returns `ts.Diagnostic[]`
 const clearDiagnostics = (TypeScriptWorker as any).clearFiles;
 
 export class CustomTypeScriptWorker extends TypeScriptWorker {
-    public async getTranspileOutput() {
-        const { transpiledFiles } = this.transpileLua();
+    public async getTranspileOutput(fileName: string) {
+        const { transpiledFiles } = this.transpileLua(fileName);
         const [transpiledFile] = transpiledFiles;
         return { code: transpiledFile.lua!, ast: transpiledFile.luaAst! };
     }
 
     public async getSemanticDiagnostics(fileName: string) {
         const diagnostics = await super.getSemanticDiagnostics(fileName);
-        const { diagnostics: transpileDiagnostics } = this.transpileLua();
+        const { diagnostics: transpileDiagnostics } = this.transpileLua(fileName);
         clearDiagnostics(transpileDiagnostics);
         return [...diagnostics, ...transpileDiagnostics];
     }
 
-    private transpileLua() {
+    private transpileLua(fileName: string) {
         const program = ((this as any)._languageService as ts.LanguageService).getProgram()!;
 
         const compilerOptions = program.getCompilerOptions();
         compilerOptions.luaLibImport = tstl.LuaLibImportKind.Inline;
         compilerOptions.luaTarget = tstl.LuaTarget.Lua53;
 
-        const sourceFiles = program.getRootFileNames().map(n => program.getSourceFile(n)!);
-        return tstl.transpile({ program, emitHost, sourceFiles });
+        return tstl.transpile({ program, emitHost, sourceFiles: [program.getSourceFile(fileName)!] });
     }
 }
 
diff --git a/webpack.config.js b/webpack.config.js
@@ -20,10 +20,13 @@ module.exports = {
         extensions: [".tsx", ".ts", ".js"],
         plugins: [PnpWebpackPlugin],
         alias: {
-            // Replace vendored `monaco-typescript` services build with `typescript`, already used by `typescript-to-lua`
+            // Replace vendored monaco-typescript services build with typescript, already used by typescript-to-lua
             [require.resolve("monaco-editor/esm/vs/language/typescript/lib/typescriptServices.js")]: require.resolve(
                 "typescript",
             ),
+
+            // Exclude builtin monaco-typescript libs
+            [require.resolve("monaco-editor/esm/vs/language/typescript/lib/lib.js")]: resolve("src/empty.ts"),
         },
     },
     resolveLoader: {
@@ -62,7 +65,7 @@ module.exports = {
 
         new webpack.DefinePlugin({ __LUA_SYNTAX_KIND__: JSON.stringify(LuaSyntaxKind) }),
 
-        // Ignore `pnpapi` reference in patched `typescript` source
+        // Ignore "pnpapi" reference in patched typescript source
         new webpack.IgnorePlugin(/pnpapi/),
     ],
 };
diff --git a/yarn.lock b/yarn.lock
@@ -43,6 +43,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/webpack-env@npm:^1.15.1":
+  version: 1.15.1
+  resolution: "@types/webpack-env@npm:1.15.1"
+  checksum: 481065aa7573f836e4e62dad60f81f6b51d0dfbe050ca9dcf624dd9dc4b95f10fe23ea61dc9c730fba9e4a3fdffc5231f5670f8d874f063b6bd326b5f9766612
+  languageName: node
+  linkType: hard
+
 "@webassemblyjs/ast@npm:1.8.5":
   version: 1.8.5
   resolution: "@webassemblyjs/ast@npm:1.8.5"
@@ -6332,6 +6339,7 @@ resolve@^1.13.1:
   dependencies:
     "@types/highlight.js": ^9.12.3
     "@types/node": ^13.5.0
+    "@types/webpack-env": ^1.15.1
     css-loader: ^3.4.2
     fengari-web: ^0.1.4
     file-loader: ^5.0.2
