@bleedingdev/modern-js-server-utils 3.8.2-ultramodern.9 → 3.8.3-ultramodern.2

package/dist/esm-node/compilers/typescript/importRewriter.mjs

@@ -1,204 +1,109 @@
 import "node:module";
-const IDENTIFIER_CHAR = /[A-Za-z0-9_$]/;
-const WHITESPACE = /\s/;
-const KEYWORDS_BEFORE_REGEX = new Set([
-    'return',
-    'typeof',
-    'instanceof',
-    'in',
-    'of',
-    'new',
-    'delete',
-    'void',
-    'throw',
-    'case',
-    'do',
-    'else',
-    'yield',
-    'await'
-]);
-const PUNCTUATORS_BEFORE_REGEX = new Set('{}(,;[=:?!&|+-*%^~<>/');
-const isRegexAllowed = (lastToken)=>{
-    if (!lastToken) return true;
-    if (KEYWORDS_BEFORE_REGEX.has(lastToken)) return true;
-    return 1 === lastToken.length && PUNCTUATORS_BEFORE_REGEX.has(lastToken);
+import { parseSync } from "@swc/core";
+const assertNoNativeModuleOutputCollision = (sourceFile, fileExists)=>{
+    const rawModuleFile = sourceFile.endsWith('.mts') ? `${sourceFile.slice(0, -4)}.mjs` : sourceFile.endsWith('.cts') ? `${sourceFile.slice(0, -4)}.cjs` : void 0;
+    if (rawModuleFile && fileExists(rawModuleFile)) throw new Error(`Native module sources collide: "${sourceFile}" and "${rawModuleFile}" publish the same output.`);
 };
-const isSpecifierContext = (prev1, prev2, prev3)=>{
-    if (('from' === prev1 || 'import' === prev1) && '.' !== prev2) return true;
-    return '(' === prev1 && ('import' === prev2 || 'require' === prev2) && '.' !== prev3;
+const isObjectRecord = (value)=>'object' == typeof value && null !== value;
+const isAstNode = (value)=>isObjectRecord(value) && 'string' == typeof value.type;
+const isStringLiteral = (value)=>isAstNode(value) && 'StringLiteral' === value.type && 'string' == typeof value.value && 'object' == typeof value.span && null !== value.span && 'number' == typeof value.span.start && 'number' == typeof value.span.end;
+const getCallSpecifier = (node)=>{
+    if ('CallExpression' !== node.type || !Array.isArray(node.arguments)) return;
+    const callee = node.callee;
+    const isDynamicImport = isAstNode(callee) && 'Import' === callee.type;
+    const isCommonJsRequire = isAstNode(callee) && 'Identifier' === callee.type && 'require' === callee.value;
+    if (!isDynamicImport && !isCommonJsRequire) return;
+    const firstArgument = node.arguments[0];
+    if (!isObjectRecord(firstArgument)) return;
+    return isStringLiteral(firstArgument.expression) ? firstArgument.expression : void 0;
 };
-const isCallSpecifierContext = (prev1, prev2, prev3)=>'(' === prev1 && ('import' === prev2 || 'require' === prev2) && '.' !== prev3;
-const nextNonTriviaChar = (content, start)=>{
-    let i = start;
-    while(i < content.length){
-        if (WHITESPACE.test(content[i])) {
-            i++;
-            continue;
-        }
-        if ('/' === content[i] && '/' === content[i + 1]) {
-            const newline = content.indexOf('\n', i + 2);
-            i = -1 === newline ? content.length : newline + 1;
-            continue;
-        }
-        if ('/' === content[i] && '*' === content[i + 1]) {
-            const end = content.indexOf('*/', i + 2);
-            i = -1 === end ? content.length : end + 2;
-            continue;
+const collectSpecifierLiterals = (content)=>{
+    const parserOptions = {
+        decorators: true,
+        syntax: "typescript",
+        target: 'esnext'
+    };
+    let program;
+    try {
+        program = parseSync(content, parserOptions);
+    } catch (typescriptError) {
+        try {
+            program = parseSync(content, {
+                ...parserOptions,
+                tsx: true
+            });
+        } catch  {
+            throw typescriptError;
         }
-        return content[i];
     }
-    return '';
-};
-const skipRegexLiteral = (content, start)=>{
-    let i = start + 1;
-    let inClass = false;
-    while(i < content.length){
-        const ch = content[i];
-        if ('\\' === ch) {
-            i += 2;
-            continue;
+    const literals = [];
+    const seenSpans = new Set();
+    const add = (value)=>{
+        if (!isStringLiteral(value)) return;
+        const spanKey = `${value.span.start}:${value.span.end}`;
+        if (!seenSpans.has(spanKey)) {
+            seenSpans.add(spanKey);
+            literals.push(value);
         }
-        if ('\n' === ch) break;
-        if ('[' === ch) inClass = true;
-        else if (']' === ch) inClass = false;
-        else if ('/' === ch && !inClass) {
-            i++;
-            while(i < content.length && IDENTIFIER_CHAR.test(content[i]))i++;
-            break;
+    };
+    const visit = (value)=>{
+        if (Array.isArray(value)) return void value.forEach(visit);
+        if (!isObjectRecord(value)) return;
+        if (isAstNode(value)) switch(value.type){
+            case 'ImportDeclaration':
+            case 'ExportAllDeclaration':
+            case 'ExportNamedDeclaration':
+                add(value.source);
+                break;
+            case 'TsImportType':
+                add(value.argument);
+                break;
+            case 'TsExternalModuleReference':
+                add(value.expression);
+                break;
+            case 'CallExpression':
+                add(getCallSpecifier(value));
+                break;
         }
-        i++;
+        for (const [key, child] of Object.entries(value))if ('span' !== key) visit(child);
+    };
+    visit(program);
+    return literals.sort((left, right)=>left.span.start - right.span.start);
+};
+const mapUtf8ByteOffsets = (content, byteOffsets)=>{
+    const pending = new Set(byteOffsets);
+    const result = new Map();
+    let byteOffset = 0;
+    let stringOffset = 0;
+    while(stringOffset <= content.length && pending.size > 0){
+        if (pending.delete(byteOffset)) result.set(byteOffset, stringOffset);
+        if (stringOffset === content.length) break;
+        const codePoint = content.codePointAt(stringOffset);
+        if (void 0 === codePoint) break;
+        const character = String.fromCodePoint(codePoint);
+        byteOffset += Buffer.byteLength(character);
+        stringOffset += character.length;
     }
-    return i;
+    if (pending.size > 0) throw new Error('SWC returned an import specifier span outside its source');
+    return result;
 };
 const scanSpecifiers = (content)=>{
-    const specifiers = [];
-    const length = content.length;
-    const templateExpressionDepths = [];
-    let prev1 = '';
-    let prev2 = '';
-    let prev3 = '';
-    const pushToken = (token)=>{
-        prev3 = prev2;
-        prev2 = prev1;
-        prev1 = token;
-    };
-    let mode = 'code';
-    let i = 0;
-    while(i < length){
-        const ch = content[i];
-        if ('template' === mode) {
-            if ('\\' === ch) {
-                i += 2;
-                continue;
-            }
-            if ('`' === ch) {
-                mode = 'code';
-                pushToken('`');
-                i++;
-                continue;
-            }
-            if ('$' === ch && '{' === content[i + 1]) {
-                templateExpressionDepths.push(0);
-                mode = 'code';
-                pushToken('{');
-                i += 2;
-                continue;
-            }
-            i++;
-            continue;
-        }
-        if (WHITESPACE.test(ch)) {
-            i++;
-            continue;
-        }
-        if ('/' === ch) {
-            const next = content[i + 1];
-            if ('/' === next) {
-                const newline = content.indexOf('\n', i + 2);
-                i = -1 === newline ? length : newline + 1;
-                continue;
-            }
-            if ('*' === next) {
-                const end = content.indexOf('*/', i + 2);
-                i = -1 === end ? length : end + 2;
-                continue;
-            }
-            if (isRegexAllowed(prev1)) {
-                i = skipRegexLiteral(content, i);
-                pushToken('/regex/');
-                continue;
-            }
-            pushToken('/');
-            i++;
-            continue;
-        }
-        if ('`' === ch) {
-            mode = 'template';
-            i++;
-            continue;
-        }
-        if ('{' === ch) {
-            if (templateExpressionDepths.length > 0) templateExpressionDepths[templateExpressionDepths.length - 1]++;
-            pushToken('{');
-            i++;
-            continue;
-        }
-        if ('}' === ch) {
-            if (templateExpressionDepths.length > 0) {
-                const top = templateExpressionDepths.length - 1;
-                if (0 === templateExpressionDepths[top]) {
-                    templateExpressionDepths.pop();
-                    mode = 'template';
-                    i++;
-                    continue;
-                }
-                templateExpressionDepths[top]--;
-            }
-            pushToken('}');
-            i++;
-            continue;
-        }
-        if ('"' === ch || "'" === ch) {
-            const start = i;
-            let j = i + 1;
-            let terminated = false;
-            while(j < length){
-                const sch = content[j];
-                if ('\\' === sch) {
-                    j += 2;
-                    continue;
-                }
-                if (sch === ch) {
-                    terminated = true;
-                    j++;
-                    break;
-                }
-                if ('\n' === sch) break;
-                j++;
-            }
-            const callSpecifier = isCallSpecifierContext(prev1, prev2, prev3);
-            const nextChar = callSpecifier ? nextNonTriviaChar(content, j) : '';
-            const isCompleteCallSpecifier = !callSpecifier || ')' === nextChar || ',' === nextChar;
-            if (terminated && isSpecifierContext(prev1, prev2, prev3) && isCompleteCallSpecifier) specifiers.push({
-                start: start + 1,
-                end: j - 1,
-                value: content.slice(start + 1, j - 1)
-            });
-            pushToken('"string"');
-            i = j;
-            continue;
-        }
-        if (IDENTIFIER_CHAR.test(ch)) {
-            let j = i + 1;
-            while(j < length && IDENTIFIER_CHAR.test(content[j]))j++;
-            pushToken(content.slice(i, j));
-            i = j;
-            continue;
-        }
-        pushToken(ch);
-        i++;
-    }
-    return specifiers;
+    const literals = collectSpecifierLiterals(content);
+    const byteOffsets = literals.flatMap((literal)=>[
+            literal.span.start,
+            literal.span.end - 2
+        ]);
+    const stringOffsets = mapUtf8ByteOffsets(content, byteOffsets);
+    return literals.map((literal)=>{
+        const start = stringOffsets.get(literal.span.start);
+        const end = stringOffsets.get(literal.span.end - 2);
+        if (void 0 === start || void 0 === end) throw new Error('Could not locate an SWC import specifier in its source');
+        return {
+            start,
+            end,
+            value: content.slice(start, end)
+        };
+    });
 };
 const rewriteImportSpecifiers = (content, rewrite)=>{
     const specifiers = scanSpecifiers(content);
@@ -227,4 +132,4 @@ const rewriteImportSpecifiers = (content, rewrite)=>{
         changed: true
     };
 };
-export { rewriteImportSpecifiers };
+export { assertNoNativeModuleOutputCollision, rewriteImportSpecifiers };

package/dist/esm-node/compilers/typescript/index.mjs

@@ -3,7 +3,7 @@ const require = /*#__PURE__*/ __rslib_shim_module__.createRequire(/*#__PURE__*/
 import { fs, getAliasConfig, logger } from "@modern-js/utils";
 import { spawn } from "child_process";
 import path from "path";
-import { rewriteImportSpecifiers } from "./importRewriter.mjs";
+import { assertNoNativeModuleOutputCollision, rewriteImportSpecifiers } from "./importRewriter.mjs";
 import { createTsconfigPathsMatcher, getNotAliasedPath } from "./tsconfigPathsPlugin.mjs";
 import { fileURLToPath as __rspack_fileURLToPath } from "node:url";
 import { dirname as __rspack_dirname } from "node:path";
@@ -13,12 +13,7 @@ const copyFiles = async (from, to, appDirectory)=>{
         const relativePath = path.relative(appDirectory, from);
         const targetDir = path.join(to, relativePath);
         await fs.copy(from, targetDir, {
-            filter: (src)=>![
-                    '.ts',
-                    '.tsx',
-                    '.js',
-                    '.jsx'
-                ].includes(path.extname(src)) && !src.endsWith('tsconfig.json')
+            filter: (src)=>!/\.(?:[cm]?ts|tsx|jsx?)$/u.test(src) && !src.endsWith('tsconfig.json')
         });
     }
 };
@@ -115,7 +110,7 @@ const runTsgo = (tsgoBinPath, args, options)=>new Promise((resolve, reject)=>{
     });
 const getTsgoBinEntry = (pkg)=>{
     if ('string' == typeof pkg.bin) return pkg.bin;
-    return pkg.bin?.tsgo;
+    return pkg.bin?.tsc ?? pkg.bin?.tsgo;
 };
 const resolveTsgoBinPath = (pkgPath)=>{
     const pkgDir = path.dirname(pkgPath);
@@ -132,12 +127,19 @@ const getTsgoBinPath = (appDirectory, resolvePaths = [
     __rspack_import_meta_dirname__
 ])=>{
     try {
-        const pkgPath = require.resolve("@typescript/native-preview/package.json", {
-            paths: resolvePaths
-        });
+        let pkgPath;
+        try {
+            pkgPath = require.resolve("@typescript/native/package.json", {
+                paths: resolvePaths
+            });
+        } catch  {
+            pkgPath = require.resolve("@typescript/native-preview/package.json", {
+                paths: resolvePaths
+            });
+        }
         return resolveTsgoBinPath(pkgPath);
     } catch  {
-        throw new Error('tsgo could not be found! Please install "@typescript/native-preview" in your project to compile BFF/server code.');
+        throw new Error('tsgo could not be found! Please install "@typescript/native" (or legacy "@typescript/native-preview") in your project to compile BFF/server code.');
     }
 };
 const OUTPUT_SOURCE_EXTENSIONS = {
@@ -197,6 +199,7 @@ const rewriteOutputSpecifiers = async (appDirectory, distDir, baseUrl, paths, mo
     await Promise.all(files.map(async (file)=>{
         const sourceFile = getSourceFileForOutput(appDirectory, distDir, file);
         if (!sourceFile) return;
+        assertNoNativeModuleOutputCollision(sourceFile, fs.existsSync);
         const content = await fs.readFile(file, 'utf8');
         const { content: rewritten, changed } = rewriteImportSpecifiers(content, (specifier)=>getNotAliasedPath(sourceFile, matcher, specifier, moduleType));
         if (changed) await fs.writeFile(file, await dropStaleSourceMap(file, rewritten));
@@ -253,6 +256,7 @@ const compileByTs = async (appDirectory, config, compileOptions)=>{
         } else process.exit(1);
     }
     for (const source of sourceDirs)await copyFiles(source, distDir, appDirectory);
+    await rewriteOutputSpecifiers(appDirectory, distDir, absoluteBaseUrl, paths, compileOptions.moduleType);
     logger.info("TS-Go compile succeed");
 };
 export { compileByTs, createResolvedTsgoConfig, getTsgoBinPath, rewriteOutputSpecifiers };

package/dist/esm-node/compilers/typescript/tsconfigPathsPlugin.mjs

@@ -11,18 +11,47 @@ const toImportSpecifier = (sourceFile, resolvedPath)=>{
     const relativePath = pathApi.relative(pathApi.dirname(sourceFile), resolvedPath).split(pathApi.sep).join(path.posix.sep);
     return '.' === relativePath[0] ? relativePath : `./${relativePath}`;
 };
-const COMPILED_TO_JS_EXTENSIONS = new Set([
-    '.ts',
-    '.tsx',
-    '.js',
-    '.jsx'
+const SOURCE_TO_OUTPUT_EXTENSION = new Map([
+    [
+        '.ts',
+        '.js'
+    ],
+    [
+        '.tsx',
+        '.js'
+    ],
+    [
+        '.js',
+        '.js'
+    ],
+    [
+        '.jsx',
+        '.js'
+    ],
+    [
+        '.mts',
+        '.mjs'
+    ],
+    [
+        '.mjs',
+        '.mjs'
+    ],
+    [
+        '.cts',
+        '.cjs'
+    ],
+    [
+        '.cjs',
+        '.cjs'
+    ]
 ]);
 const toEsmOutputPath = (resolvedPath)=>{
     const sourcePath = (findSourceEntry(resolvedPath) || resolvedPath).replace(/\\/g, '/');
     const ext = path.extname(sourcePath);
     if (!ext) return `${sourcePath}.js`;
-    if (!COMPILED_TO_JS_EXTENSIONS.has(ext)) return sourcePath;
-    return `${sourcePath.slice(0, -ext.length)}.js`;
+    const outputExtension = SOURCE_TO_OUTPUT_EXTENSION.get(ext);
+    if (!outputExtension) return sourcePath;
+    return `${sourcePath.slice(0, -ext.length)}${outputExtension}`;
 };
 const resolveRelativeEsmSpecifier = (sourceFile, text)=>{
     if (!text.startsWith('./') && !text.startsWith('../')) return;
@@ -110,7 +139,7 @@ function getNotAliasedPath(sourceFile, matcher, text, moduleType) {
             if (packagePath) return text;
         } catch  {}
     }
-    if ('module' === moduleType) result = toEsmOutputPath(result);
+    if ('module' === moduleType || /\.[cm]ts$/iu.test(result)) result = toEsmOutputPath(result);
     return toImportSpecifier(sourceFile, result) || './';
 }
 export { createTsconfigPathsMatcher, getNotAliasedPath };

package/dist/types/compilers/typescript/importRewriter.d.ts

@@ -1,11 +1,6 @@
 type SpecifierRewrite = (specifier: string) => string | undefined;
-/**
- * Rewrite the import/export/require specifiers of emitted JavaScript.
- *
- * Specifiers whose contents contain escape sequences are left untouched (the
- * raw source slice would not round-trip), which never happens for the
- * compiler-emitted relative/alias specifiers this is used on.
- */
+export declare const assertNoNativeModuleOutputCollision: (sourceFile: string, fileExists: (file: string) => boolean) => void;
+/** Rewrite static module specifiers without touching runtime data or syntax. */
 export declare const rewriteImportSpecifiers: (content: string, rewrite: SpecifierRewrite) => {
     content: string;
     changed: boolean;

package/package.json

@@ -17,7 +17,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.8.2-ultramodern.9",
+  "version": "3.8.3-ultramodern.2",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "exports": {
@@ -38,11 +38,12 @@
     }
   },
   "dependencies": {
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.8.2-ultramodern.9",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.8.3-ultramodern.2",
+    "@swc/core": "1.15.43",
     "@swc/helpers": "^0.5.23"
   },
   "devDependencies": {
-    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.8.2-ultramodern.9",
+    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.8.3-ultramodern.2",
     "@rslib/core": "0.23.2",
     "@scripts/rstest-config": "2.66.0",
     "@types/node": "^26.2.0",
@@ -62,7 +63,7 @@
   },
   "scripts": {
     "dev": "rslib build --watch",
-    "build": "rslib build && pnpm -w tsgo:dts \"$PWD\"",
+    "build": "rslib build",
     "test": "rstest --passWithNoTests"
   }
 }