@esportsplus/typescript 0.16.0 → 0.17.1

package/build/cli/tsc.js

@@ -19,12 +19,37 @@ async function build(tsconfig, plugins) {
         process.exit(1);
     }
     await loadTransformers(plugins, root).then((transformers) => {
-        let program = ts.createProgram(parsed.fileNames, parsed.options), result = program.emit(undefined, undefined, undefined, false, {
-            after: transformers.after.map(f => f(program)),
-            afterDeclarations: transformers.afterDeclarations.map(f => f(program)),
-            before: transformers.before.map(f => f(program))
-        });
-        let diagnostics = ts.getPreEmitDiagnostics(program).concat(result.diagnostics);
+        let beforeTransformers = transformers.before.map(f => f(program)), printer = ts.createPrinter(), program = ts.createProgram(parsed.fileNames, parsed.options), transformedFiles = new Map();
+        for (let i = 0, n = parsed.fileNames.length; i < n; i++) {
+            let fileName = parsed.fileNames[i], sourceFile = program.getSourceFile(fileName);
+            if (!sourceFile) {
+                continue;
+            }
+            let result = ts.transform(sourceFile, beforeTransformers), transformed = result.transformed[0];
+            if (transformed !== sourceFile) {
+                transformedFiles.set(fileName, printer.printFile(transformed));
+            }
+            result.dispose();
+        }
+        if (transformedFiles.size > 0) {
+            let customHost = ts.createCompilerHost(parsed.options), originalGetSourceFile = customHost.getSourceFile.bind(customHost), originalReadFile = customHost.readFile.bind(customHost);
+            customHost.readFile = (fileName) => {
+                let transformed = transformedFiles.get(path.resolve(fileName));
+                if (transformed) {
+                    return transformed;
+                }
+                return originalReadFile(fileName);
+            };
+            customHost.getSourceFile = (fileName, languageVersion, onError, shouldCreateNewSourceFile) => {
+                let resolved = path.resolve(fileName), transformed = transformedFiles.get(resolved);
+                if (transformed) {
+                    return ts.createSourceFile(fileName, transformed, languageVersion, true);
+                }
+                return originalGetSourceFile(fileName, languageVersion, onError, shouldCreateNewSourceFile);
+            };
+            program = ts.createProgram(parsed.fileNames, parsed.options, customHost);
+        }
+        let diagnostics = ts.getPreEmitDiagnostics(program).concat(program.emit().diagnostics);
         if (diagnostics.length > 0) {
             console.error(ts.formatDiagnosticsWithColorAndContext(diagnostics, {
                 getCanonicalFileName: (fileName) => fileName,
@@ -32,7 +57,7 @@ async function build(tsconfig, plugins) {
                 getNewLine: () => '\n'
             }));
         }
-        if (result.emitSkipped) {
+        if (program.emit().emitSkipped) {
             process.exit(1);
         }
         if (shouldRunTscAlias(process.argv.slice(2))) {

package/build/transformer/index.d.ts

@@ -1,10 +1,9 @@
 import type { QuickCheckPattern, Replacement } from './types.js';
 import program from './program.js';
 declare const addImport: (code: string, module: string, specifiers: string[]) => string;
-declare const applyReplacements: (code: string, replacements: Replacement[]) => string;
 declare const applyReplacementsReverse: (code: string, replacements: Replacement[]) => string;
 declare const mightNeedTransform: (code: string, check: QuickCheckPattern) => boolean;
 declare const uid: (prefix: string, updateUUID?: boolean) => string;
-export { addImport, applyReplacements, applyReplacementsReverse, mightNeedTransform, program, uid };
+export { addImport, applyReplacementsReverse, mightNeedTransform, program, uid };
 export type * from './types.js';
 export * from './constants.js';

package/build/transformer/index.js

@@ -61,25 +61,6 @@ const addImport = (code, module, specifiers) => {
     }
     return code.substring(0, first) + adding + code.substring(first);
 };
-const applyReplacements = (code, replacements) => {
-    if (replacements.length === 0) {
-        return code;
-    }
-    replacements.sort((a, b) => a.start - b.start);
-    let parts = [], pos = 0;
-    for (let i = 0, n = replacements.length; i < n; i++) {
-        let r = replacements[i];
-        if (r.start > pos) {
-            parts.push(code.substring(pos, r.start));
-        }
-        parts.push(r.newText);
-        pos = r.end;
-    }
-    if (pos < code.length) {
-        parts.push(code.substring(pos));
-    }
-    return parts.join('');
-};
 const applyReplacementsReverse = (code, replacements) => {
     if (replacements.length === 0) {
         return code;
@@ -108,5 +89,5 @@ const mightNeedTransform = (code, check) => {
 const uid = (prefix, updateUUID = false) => {
     return prefix + '_' + (updateUUID ? uuid().replace(UUID_DASH_REGEX, '') : uidSuffix) + '_' + (i++).toString(36);
 };
-export { addImport, applyReplacements, applyReplacementsReverse, mightNeedTransform, program, uid };
+export { addImport, applyReplacementsReverse, mightNeedTransform, program, uid };
 export * from './constants.js';

package/package.json

@@ -34,7 +34,7 @@
   },
   "type": "module",
   "types": "build/index.d.ts",
-  "version": "0.16.0",
+  "version": "0.17.1",
   "scripts": {
     "build": "tsc && tsc-alias",
     "-": "-"

package/src/cli/tsc.ts

@@ -42,14 +42,64 @@ async function build(tsconfig: string, plugins: PluginConfig[]): Promise<void> {
     }
 
     await loadTransformers(plugins, root).then((transformers) => {
-        let program = ts.createProgram(parsed.fileNames, parsed.options),
-            result = program.emit(undefined, undefined, undefined, false, {
-                after: transformers.after.map(f => f(program)),
-                afterDeclarations: transformers.afterDeclarations.map(f => f(program)) as ts.TransformerFactory<ts.SourceFile | ts.Bundle>[],
-                before: transformers.before.map(f => f(program))
-            });
+        let beforeTransformers = transformers.before.map(f => f(program)),
+            printer = ts.createPrinter(),
+            program = ts.createProgram(parsed.fileNames, parsed.options),
+            transformedFiles = new Map<string, string>();
+
+        for (let i = 0, n = parsed.fileNames.length; i < n; i++) {
+            let fileName = parsed.fileNames[i],
+                sourceFile = program.getSourceFile(fileName);
+
+            if (!sourceFile) {
+                continue;
+            }
+
+            let result = ts.transform(sourceFile, beforeTransformers),
+                transformed = result.transformed[0];
+
+            if (transformed !== sourceFile) {
+                transformedFiles.set(fileName, printer.printFile(transformed));
+            }
+
+            result.dispose();
+        }
+
+        if (transformedFiles.size > 0) {
+            let customHost = ts.createCompilerHost(parsed.options),
+                originalGetSourceFile = customHost.getSourceFile.bind(customHost),
+                originalReadFile = customHost.readFile.bind(customHost);
+
+            customHost.readFile = (fileName: string): string | undefined => {
+                let transformed = transformedFiles.get(path.resolve(fileName));
+
+                if (transformed) {
+                    return transformed;
+                }
+
+                return originalReadFile(fileName);
+            };
+
+            customHost.getSourceFile = (
+                fileName: string,
+                languageVersion: ts.ScriptTarget,
+                onError?: (message: string) => void,
+                shouldCreateNewSourceFile?: boolean
+            ): ts.SourceFile | undefined => {
+                let resolved = path.resolve(fileName),
+                    transformed = transformedFiles.get(resolved);
+
+                if (transformed) {
+                    return ts.createSourceFile(fileName, transformed, languageVersion, true);
+                }
+
+                return originalGetSourceFile(fileName, languageVersion, onError, shouldCreateNewSourceFile);
+            };
+
+            program = ts.createProgram(parsed.fileNames, parsed.options, customHost);
+        }
 
-        let diagnostics = ts.getPreEmitDiagnostics(program).concat(result.diagnostics);
+        let diagnostics = ts.getPreEmitDiagnostics(program).concat(program.emit().diagnostics);
 
         if (diagnostics.length > 0) {
             console.error(
@@ -61,7 +111,7 @@ async function build(tsconfig: string, plugins: PluginConfig[]): Promise<void> {
             );
         }
 
-        if (result.emitSkipped) {
+        if (program.emit().emitSkipped) {
             process.exit(1);
         }
 

package/src/transformer/index.ts

@@ -99,34 +99,6 @@ const addImport = (code: string, module: string, specifiers: string[]): string =
     return code.substring(0, first) + adding + code.substring(first);
 };
 
-const applyReplacements = (code: string, replacements: Replacement[]): string => {
-    if (replacements.length === 0) {
-        return code;
-    }
-
-    replacements.sort((a, b) => a.start - b.start);
-
-    let parts: string[] = [],
-        pos = 0;
-
-    for (let i = 0, n = replacements.length; i < n; i++) {
-        let r = replacements[i];
-
-        if (r.start > pos) {
-            parts.push(code.substring(pos, r.start));
-        }
-
-        parts.push(r.newText);
-        pos = r.end;
-    }
-
-    if (pos < code.length) {
-        parts.push(code.substring(pos));
-    }
-
-    return parts.join('');
-};
-
 const applyReplacementsReverse = (code: string, replacements: Replacement[]): string => {
     if (replacements.length === 0) {
         return code;
@@ -167,7 +139,7 @@ const uid = (prefix: string, updateUUID = false): string => {
 
 
 export {
-    addImport, applyReplacements, applyReplacementsReverse,
+    addImport, applyReplacementsReverse,
     mightNeedTransform,
     program,
     uid