@esportsplus/typescript 0.26.2 → 0.26.4

package/build/compiler/coordinator.d.ts

@@ -6,7 +6,7 @@ type CoordinatorResult = {
     sourceFile: ts.SourceFile;
 };
 declare const _default: {
-    transform: (plugins: Plugin[], sourceCode: string, sourceFile: ts.SourceFile, program: ts.Program, shared: SharedContext) => CoordinatorResult;
+    transform: (plugins: Plugin[], code: string, file: ts.SourceFile, program: ts.Program, shared: SharedContext) => CoordinatorResult;
 };
 export default _default;
 export type { CoordinatorResult };

package/build/compiler/coordinator.js

@@ -1,81 +1,75 @@
 import { ts } from '../index.js';
 import imports from './imports.js';
-function applyImports(sourceCode, sourceFile, intents) {
-    let result = sourceCode;
+function applyImports(code, file, intents) {
     for (let i = 0, n = intents.length; i < n; i++) {
         let intent = intents[i];
-        result = modify(result, sourceFile, intent.package, {
+        code = modify(code, file, intent.package, {
             add: intent.add,
             namespace: intent.namespace,
             remove: intent.remove
         });
         if (i < n - 1) {
-            sourceFile = ts.createSourceFile(sourceFile.fileName, result, sourceFile.languageVersion, true);
+            file = ts.createSourceFile(file.fileName, code, file.languageVersion, true);
         }
     }
-    return result;
+    return code;
 }
-function applyIntents(sourceCode, sourceFile, intents) {
+function applyIntents(code, file, intents) {
     if (intents.length === 0) {
-        return sourceCode;
+        return code;
     }
-    return replaceReverse(sourceCode, intents.map(intent => ({
+    return replaceReverse(code, intents.map(intent => ({
         end: intent.node.end,
-        newText: intent.generate(sourceFile),
-        start: intent.node.getStart(sourceFile)
+        newText: intent.generate(file),
+        start: intent.node.getStart(file)
     })));
 }
-function applyPrepend(sourceCode, sourceFile, prepend) {
+function applyPrepend(code, file, prepend) {
     if (prepend.length === 0) {
-        return sourceCode;
-    }
-    let insertPos = findLastImportEnd(sourceFile), prependText = prepend.join('\n') + '\n';
-    if (insertPos === 0) {
-        return prependText + sourceCode;
+        return code;
     }
-    return sourceCode.slice(0, insertPos) + '\n' + prependText + sourceCode.slice(insertPos);
-}
-function findLastImportEnd(sourceFile) {
-    let lastEnd = 0;
-    for (let i = 0, n = sourceFile.statements.length; i < n; i++) {
-        let stmt = sourceFile.statements[i];
+    let position = 0;
+    for (let i = 0, n = file.statements.length; i < n; i++) {
+        let stmt = file.statements[i];
         if (ts.isImportDeclaration(stmt)) {
-            lastEnd = stmt.end;
+            position = stmt.end;
         }
         else {
             break;
         }
     }
-    return lastEnd;
+    if (position === 0) {
+        return prepend.join('\n') + code;
+    }
+    return code.slice(0, position) + prepend.join('\n') + code.slice(position);
 }
-function hasPattern(sourceCode, patterns) {
+function hasPattern(code, patterns) {
     for (let i = 0, n = patterns.length; i < n; i++) {
-        if (sourceCode.indexOf(patterns[i]) !== -1) {
+        if (code.indexOf(patterns[i]) !== -1) {
             return true;
         }
     }
     return false;
 }
-const modify = (sourceCode, sourceFile, packageName, options) => {
-    let { namespace } = options;
+function modify(code, file, pkg, options) {
     if (!options.add && !options.namespace && !options.remove) {
-        return sourceCode;
+        return code;
     }
-    let add = options.add ? new Set(options.add) : null, found = imports.find(sourceFile, packageName), remove = options.remove ? new Set(options.remove) : null;
+    let { namespace } = options, add = options.add ? new Set(options.add) : null, found = imports.find(file, pkg);
     if (found.length === 0) {
         let statements = [];
         if (namespace) {
-            statements.push(`import * as ${namespace} from '${packageName}';`);
+            statements.push(`import * as ${namespace} from '${pkg}';`);
         }
         if (add && add.size > 0) {
-            statements.push(`import { ${[...add].sort().join(', ')} } from '${packageName}';`);
+            statements.push(`import { ${[...add].sort().join(', ')} } from '${pkg}';`);
         }
         if (statements.length === 0) {
-            return sourceCode;
+            return code;
         }
-        return statements.join('\n') + '\n' + sourceCode;
+        return statements.join('\n') + '\n' + code;
     }
-    let specifiers = new Set();
+    let remove = options.remove ? new Set(options.remove) : null, specifiers = new Set();
     for (let i = 0, n = found.length; i < n; i++) {
         for (let [name, alias] of found[i].specifiers) {
             if (!remove || (!remove.has(name) && !remove.has(alias))) {
@@ -90,10 +84,10 @@ const modify = (sourceCode, sourceFile, packageName, options) => {
     }
     let statements = [];
     if (namespace) {
-        statements.push(`import * as ${namespace} from '${packageName}';`);
+        statements.push(`import * as ${namespace} from '${pkg}';`);
     }
     if (specifiers.size > 0) {
-        statements.push(`import { ${[...specifiers].sort().join(', ')} } from '${packageName}';`);
+        statements.push(`import { ${[...specifiers].sort().join(', ')} } from '${pkg}';`);
     }
     let replacements = [];
     for (let i = 0, n = found.length; i < n; i++) {
@@ -103,9 +97,10 @@ const modify = (sourceCode, sourceFile, packageName, options) => {
             start: found[i].start
         });
     }
-    return replaceReverse(sourceCode, replacements);
-};
-const replaceReverse = (code, replacements) => {
+    return replaceReverse(code, replacements);
+}
+;
+function replaceReverse(code, replacements) {
     if (replacements.length === 0) {
         return code;
     }
@@ -116,12 +111,13 @@ const replaceReverse = (code, replacements) => {
         result = result.substring(0, r.start) + r.newText + result.substring(r.end);
     }
     return result;
-};
-const transform = (plugins, sourceCode, sourceFile, program, shared) => {
+}
+;
+const transform = (plugins, code, file, program, shared) => {
     if (plugins.length === 0) {
-        return { changed: false, code: sourceCode, sourceFile };
+        return { changed: false, code, sourceFile: file };
     }
-    let changed = false, currentCode = sourceCode, currentSourceFile = sourceFile;
+    let changed = false, currentCode = code, currentSourceFile = file;
     for (let i = 0, n = plugins.length; i < n; i++) {
         let plugin = plugins[i];
         if (plugin.patterns && !hasPattern(currentCode, plugin.patterns)) {

package/build/compiler/plugins/vite.js

@@ -16,8 +16,7 @@ export default ({ name, onWatchChange, plugins }) => {
                     return null;
                 }
                 try {
-                    let prog = program.get(root || ''), shared = contexts.get(root || '') ?? contexts.set(root || '', new Map()).get(root || ''), sourceFile = ts.createSourceFile(id, code, ts.ScriptTarget.Latest, true);
-                    let result = coordinator.transform(plugins, code, sourceFile, prog, shared);
+                    let result = coordinator.transform(plugins, code, ts.createSourceFile(id, code, ts.ScriptTarget.Latest, true), program.get(root || ''), contexts.get(root || '') ?? contexts.set(root || '', new Map()).get(root || ''));
                     if (!result.changed) {
                         return null;
                     }

package/package.json

@@ -37,7 +37,7 @@
   },
   "type": "module",
   "types": "build/index.d.ts",
-  "version": "0.26.2",
+  "version": "0.26.4",
   "scripts": {
     "build": "tsc && tsc-alias",
     "-": "-"

package/src/compiler/coordinator.ts

@@ -10,89 +10,72 @@ type CoordinatorResult = {
 };
 
 
-function applyImports(
-    sourceCode: string,
-    sourceFile: ts.SourceFile,
-    intents: ImportIntent[]
-): string {
-    let result = sourceCode;
-
+function applyImports(code: string, file: ts.SourceFile, intents: ImportIntent[]): string {
     for (let i = 0, n = intents.length; i < n; i++) {
         let intent = intents[i];
 
-        result = modify(result, sourceFile, intent.package, {
+        code = modify(code, file, intent.package, {
             add: intent.add,
             namespace: intent.namespace,
             remove: intent.remove
         });
 
         if (i < n - 1) {
-            sourceFile = ts.createSourceFile(
-                sourceFile.fileName,
-                result,
-                sourceFile.languageVersion,
+            file = ts.createSourceFile(
+                file.fileName,
+                code,
+                file.languageVersion,
                 true
             );
         }
     }
 
-    return result;
+    return code;
 }
 
-function applyIntents(
-    sourceCode: string,
-    sourceFile: ts.SourceFile,
-    intents: ReplacementIntent[]
-): string {
+function applyIntents(code: string, file: ts.SourceFile, intents: ReplacementIntent[]): string {
     if (intents.length === 0) {
-        return sourceCode;
+        return code;
     }
 
     return replaceReverse(
-        sourceCode,
+        code,
         intents.map(intent => ({
             end: intent.node.end,
-            newText: intent.generate(sourceFile),
-            start: intent.node.getStart(sourceFile)
+            newText: intent.generate(file),
+            start: intent.node.getStart(file)
         }))
     );
 }
 
-function applyPrepend(sourceCode: string, sourceFile: ts.SourceFile, prepend: string[]): string {
+function applyPrepend(code: string, file: ts.SourceFile, prepend: string[]): string {
     if (prepend.length === 0) {
-        return sourceCode;
-    }
-
-    let insertPos = findLastImportEnd(sourceFile),
-        prependText = prepend.join('\n') + '\n';
-
-    if (insertPos === 0) {
-        return prependText + sourceCode;
+        return code;
     }
 
-    return sourceCode.slice(0, insertPos) + '\n' + prependText + sourceCode.slice(insertPos);
-}
-
-function findLastImportEnd(sourceFile: ts.SourceFile): number {
-    let lastEnd = 0;
+    let position = 0;
 
-    for (let i = 0, n = sourceFile.statements.length; i < n; i++) {
-        let stmt = sourceFile.statements[i];
+    for (let i = 0, n = file.statements.length; i < n; i++) {
+        let stmt = file.statements[i];
 
         if (ts.isImportDeclaration(stmt)) {
-            lastEnd = stmt.end;
+            position = stmt.end;
         }
         else {
             break;
         }
     }
 
-    return lastEnd;
+    if (position === 0) {
+        return prepend.join('\n') + code;
+    }
+
+    return code.slice(0, position) + prepend.join('\n') + code.slice(position);
 }
 
-function hasPattern(sourceCode: string, patterns: string[]): boolean {
+function hasPattern(code: string, patterns: string[]): boolean {
     for (let i = 0, n = patterns.length; i < n; i++) {
-        if (sourceCode.indexOf(patterns[i]) !== -1) {
+        if (code.indexOf(patterns[i]) !== -1) {
             return true;
         }
     }
@@ -100,43 +83,36 @@ function hasPattern(sourceCode: string, patterns: string[]): boolean {
     return false;
 }
 
-const modify = (
-    sourceCode: string,
-    sourceFile: ts.SourceFile,
-    packageName: string,
-    options: ModifyOptions
-): string => {
-    let { namespace } = options;
-
-    // Fast path: nothing to change
+function modify(code: string, file: ts.SourceFile, pkg: string, options: ModifyOptions): string {
     if (!options.add && !options.namespace && !options.remove) {
-        return sourceCode;
+        return code;
     }
 
-    let add = options.add ? new Set(options.add) : null,
-        found = imports.find(sourceFile, packageName),
-        remove = options.remove ? new Set(options.remove) : null;
+    let { namespace } = options,
+        add = options.add ? new Set(options.add) : null,
+        found = imports.find(file, pkg);
 
     if (found.length === 0) {
         let statements: string[] = [];
 
         if (namespace) {
-            statements.push(`import * as ${namespace} from '${packageName}';`);
+            statements.push(`import * as ${namespace} from '${pkg}';`);
         }
 
         if (add && add.size > 0) {
-            statements.push(`import { ${[...add].sort().join(', ')} } from '${packageName}';`);
+            statements.push(`import { ${[...add].sort().join(', ')} } from '${pkg}';`);
         }
 
         if (statements.length === 0) {
-            return sourceCode;
+            return code;
         }
 
-        return statements.join('\n') + '\n' + sourceCode;
+        return statements.join('\n') + '\n' + code;
     }
 
-    // Collect all non-removed specifiers from existing imports
-    let specifiers = new Set<string>();
+    let remove = options.remove ? new Set(options.remove) : null,
+        // Collect all non-removed specifiers from existing imports
+        specifiers = new Set<string>();
 
     for (let i = 0, n = found.length; i < n; i++) {
         for (let [name, alias] of found[i].specifiers) {
@@ -156,11 +132,11 @@ const modify = (
     let statements: string[] = [];
 
     if (namespace) {
-        statements.push(`import * as ${namespace} from '${packageName}';`);
+        statements.push(`import * as ${namespace} from '${pkg}';`);
     }
 
     if (specifiers.size > 0) {
-        statements.push(`import { ${[...specifiers].sort().join(', ')} } from '${packageName}';`);
+        statements.push(`import { ${[...specifiers].sort().join(', ')} } from '${pkg}';`);
     }
 
     // Build replacements - replace first import, remove others
@@ -174,10 +150,10 @@ const modify = (
         });
     }
 
-    return replaceReverse(sourceCode, replacements);
+    return replaceReverse(code, replacements);
 };
 
-const replaceReverse = (code: string, replacements: Replacement[]): string => {
+function replaceReverse(code: string, replacements: Replacement[]): string {
     if (replacements.length === 0) {
         return code;
     }
@@ -202,18 +178,18 @@ const replaceReverse = (code: string, replacements: Replacement[]): string => {
  */
 const transform = (
     plugins: Plugin[],
-    sourceCode: string,
-    sourceFile: ts.SourceFile,
+    code: string,
+    file: ts.SourceFile,
     program: ts.Program,
     shared: SharedContext
 ): CoordinatorResult => {
     if (plugins.length === 0) {
-        return { changed: false, code: sourceCode, sourceFile };
+        return { changed: false, code, sourceFile: file };
     }
 
     let changed = false,
-        currentCode = sourceCode,
-        currentSourceFile = sourceFile;
+        currentCode = code,
+        currentSourceFile = file;
 
     for (let i = 0, n = plugins.length; i < n; i++) {
         let plugin = plugins[i];
@@ -223,12 +199,12 @@ const transform = (
         }
 
         let result = plugin.transform({
-            checker: program.getTypeChecker(),
-            code: currentCode,
-            program,
-            shared,
-            sourceFile: currentSourceFile
-        });
+                checker: program.getTypeChecker(),
+                code: currentCode,
+                program,
+                shared,
+                sourceFile: currentSourceFile
+            });
 
         let hasChanges = (result.imports && result.imports.length > 0) ||
             (result.prepend && result.prepend.length > 0) ||

package/src/compiler/plugins/vite.ts

@@ -40,11 +40,13 @@ export default ({ name, onWatchChange, plugins }: VitePluginOptions) => {
                 }
 
                 try {
-                    let prog = program.get(root || ''),
-                        shared = contexts.get(root || '') ?? contexts.set(root || '', new Map()).get(root || '')!,
-                        sourceFile = ts.createSourceFile(id, code, ts.ScriptTarget.Latest, true);
-
-                    let result = coordinator.transform(plugins, code, sourceFile, prog, shared);
+                    let result = coordinator.transform(
+                            plugins,
+                            code,
+                            ts.createSourceFile(id, code, ts.ScriptTarget.Latest, true),
+                            program.get(root || ''),
+                            contexts.get(root || '') ?? contexts.set(root || '', new Map()).get(root || '')!
+                        );
 
                     if (!result.changed) {
                         return null;