@bleedingdev/modern-js-server-utils 3.5.0-ultramodern.10 → 3.5.0-ultramodern.101

package/dist/cjs/compilers/typescript/importRewriter.js

@@ -55,6 +55,28 @@ const isSpecifierContext = (prev1, prev2, prev3)=>{
     if (('from' === prev1 || 'import' === prev1) && '.' !== prev2) return true;
     return '(' === prev1 && ('import' === prev2 || 'require' === prev2) && '.' !== prev3;
 };
+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;
+        }
+        return content[i];
+    }
+    return '';
+};
 const skipRegexLiteral = (content, start)=>{
     let i = start + 1;
     let inClass = false;
@@ -182,7 +204,10 @@ const scanSpecifiers = (content)=>{
                 if ('\n' === sch) break;
                 j++;
             }
-            if (terminated && isSpecifierContext(prev1, prev2, prev3)) specifiers.push({
+            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)

package/dist/cjs/compilers/typescript/index.js

@@ -55,7 +55,9 @@ const copyFiles = async (from, to, appDirectory)=>{
         await utils_namespaceObject.fs.copy(from, targetDir, {
             filter: (src)=>![
                     '.ts',
-                    '.js'
+                    '.tsx',
+                    '.js',
+                    '.jsx'
                 ].includes(external_path_default().extname(src)) && !src.endsWith('tsconfig.json')
         });
     }
@@ -74,10 +76,18 @@ const createResolvedTsgoConfig = async (appDirectory, tsconfigPath, distDir, sou
     config.compilerOptions ??= {};
     config.compilerOptions.rootDir = appDirectory;
     config.compilerOptions.outDir = distDir;
+    config.compilerOptions.composite = false;
+    config.compilerOptions.declaration = false;
+    config.compilerOptions.declarationMap = false;
+    config.compilerOptions.emitDeclarationOnly = false;
+    config.compilerOptions.incremental = false;
     config.compilerOptions.noEmit = false;
+    if (void 0 === config.compilerOptions.jsx || 'preserve' === config.compilerOptions.jsx) config.compilerOptions.jsx = 'react-jsx';
+    delete config.compilerOptions.tsBuildInfoFile;
     if (true === config.compilerOptions.allowImportingTsExtensions) config.compilerOptions.rewriteRelativeImportExtensions = true;
     config.files = filterSourceFiles(tsconfigDir, sourceDirs, config.files);
     delete config.include;
+    delete config.references;
     delete config.compilerOptions.baseUrl;
     if ([
         'node',
@@ -204,7 +214,7 @@ const dropStaleSourceMap = async (outputFile, content)=>{
     return content.replace(sourceMappingUrlRE, '');
 };
 const rewriteOutputSpecifiers = async (appDirectory, distDir, baseUrl, paths, moduleType)=>{
-    if (0 === Object.keys(paths).length || !await utils_namespaceObject.fs.pathExists(distDir)) return;
+    if (!await utils_namespaceObject.fs.pathExists(distDir)) return;
     const matcher = (0, external_tsconfigPathsPlugin_js_namespaceObject.createTsconfigPathsMatcher)(baseUrl, paths);
     if (!matcher) return;
     const files = await collectOutputFiles(distDir);

package/dist/cjs/compilers/typescript/tsconfigPathsPlugin.js

@@ -52,10 +52,18 @@ const toImportSpecifier = (sourceFile, resolvedPath)=>{
     const relativePath = pathApi.relative(pathApi.dirname(sourceFile), resolvedPath).split(pathApi.sep).join(external_path_default().posix.sep);
     return '.' === relativePath[0] ? relativePath : `./${relativePath}`;
 };
+const COMPILED_TO_JS_EXTENSIONS = new Set([
+    '.ts',
+    '.tsx',
+    '.js',
+    '.jsx'
+]);
 const toEsmOutputPath = (resolvedPath)=>{
-    const sourcePath = (0, utils_namespaceObject.findSourceEntry)(resolvedPath) || resolvedPath;
+    const sourcePath = ((0, utils_namespaceObject.findSourceEntry)(resolvedPath) || resolvedPath).replace(/\\/g, '/');
     const ext = external_path_default().extname(sourcePath);
-    return ext ? `${sourcePath.slice(0, -ext.length)}.js` : `${sourcePath}.js`;
+    if (!ext) return `${sourcePath}.js`;
+    if (!COMPILED_TO_JS_EXTENSIONS.has(ext)) return sourcePath;
+    return `${sourcePath.slice(0, -ext.length)}.js`;
 };
 const resolveRelativeEsmSpecifier = (sourceFile, text)=>{
     if (!text.startsWith('./') && !text.startsWith('../')) return;

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

@@ -26,6 +26,28 @@ const isSpecifierContext = (prev1, prev2, prev3)=>{
     if (('from' === prev1 || 'import' === prev1) && '.' !== prev2) return true;
     return '(' === prev1 && ('import' === prev2 || 'require' === prev2) && '.' !== prev3;
 };
+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;
+        }
+        return content[i];
+    }
+    return '';
+};
 const skipRegexLiteral = (content, start)=>{
     let i = start + 1;
     let inClass = false;
@@ -153,7 +175,10 @@ const scanSpecifiers = (content)=>{
                 if ('\n' === sch) break;
                 j++;
             }
-            if (terminated && isSpecifierContext(prev1, prev2, prev3)) specifiers.push({
+            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)

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

@@ -10,7 +10,9 @@ const copyFiles = async (from, to, appDirectory)=>{
         await fs.copy(from, targetDir, {
             filter: (src)=>![
                     '.ts',
-                    '.js'
+                    '.tsx',
+                    '.js',
+                    '.jsx'
                 ].includes(path.extname(src)) && !src.endsWith('tsconfig.json')
         });
     }
@@ -29,10 +31,18 @@ const createResolvedTsgoConfig = async (appDirectory, tsconfigPath, distDir, sou
     config.compilerOptions ??= {};
     config.compilerOptions.rootDir = appDirectory;
     config.compilerOptions.outDir = distDir;
+    config.compilerOptions.composite = false;
+    config.compilerOptions.declaration = false;
+    config.compilerOptions.declarationMap = false;
+    config.compilerOptions.emitDeclarationOnly = false;
+    config.compilerOptions.incremental = false;
     config.compilerOptions.noEmit = false;
+    if (void 0 === config.compilerOptions.jsx || 'preserve' === config.compilerOptions.jsx) config.compilerOptions.jsx = 'react-jsx';
+    delete config.compilerOptions.tsBuildInfoFile;
     if (true === config.compilerOptions.allowImportingTsExtensions) config.compilerOptions.rewriteRelativeImportExtensions = true;
     config.files = filterSourceFiles(tsconfigDir, sourceDirs, config.files);
     delete config.include;
+    delete config.references;
     delete config.compilerOptions.baseUrl;
     if ([
         'node',
@@ -159,7 +169,7 @@ const dropStaleSourceMap = async (outputFile, content)=>{
     return content.replace(sourceMappingUrlRE, '');
 };
 const rewriteOutputSpecifiers = async (appDirectory, distDir, baseUrl, paths, moduleType)=>{
-    if (0 === Object.keys(paths).length || !await fs.pathExists(distDir)) return;
+    if (!await fs.pathExists(distDir)) return;
     const matcher = createTsconfigPathsMatcher(baseUrl, paths);
     if (!matcher) return;
     const files = await collectOutputFiles(distDir);

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

@@ -9,10 +9,18 @@ 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 toEsmOutputPath = (resolvedPath)=>{
-    const sourcePath = findSourceEntry(resolvedPath) || resolvedPath;
+    const sourcePath = (findSourceEntry(resolvedPath) || resolvedPath).replace(/\\/g, '/');
     const ext = path.extname(sourcePath);
-    return ext ? `${sourcePath.slice(0, -ext.length)}.js` : `${sourcePath}.js`;
+    if (!ext) return `${sourcePath}.js`;
+    if (!COMPILED_TO_JS_EXTENSIONS.has(ext)) return sourcePath;
+    return `${sourcePath.slice(0, -ext.length)}.js`;
 };
 const resolveRelativeEsmSpecifier = (sourceFile, text)=>{
     if (!text.startsWith('./') && !text.startsWith('../')) return;

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

@@ -27,6 +27,28 @@ const isSpecifierContext = (prev1, prev2, prev3)=>{
     if (('from' === prev1 || 'import' === prev1) && '.' !== prev2) return true;
     return '(' === prev1 && ('import' === prev2 || 'require' === prev2) && '.' !== prev3;
 };
+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;
+        }
+        return content[i];
+    }
+    return '';
+};
 const skipRegexLiteral = (content, start)=>{
     let i = start + 1;
     let inClass = false;
@@ -154,7 +176,10 @@ const scanSpecifiers = (content)=>{
                 if ('\n' === sch) break;
                 j++;
             }
-            if (terminated && isSpecifierContext(prev1, prev2, prev3)) specifiers.push({
+            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)

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

@@ -15,7 +15,9 @@ const copyFiles = async (from, to, appDirectory)=>{
         await fs.copy(from, targetDir, {
             filter: (src)=>![
                     '.ts',
-                    '.js'
+                    '.tsx',
+                    '.js',
+                    '.jsx'
                 ].includes(path.extname(src)) && !src.endsWith('tsconfig.json')
         });
     }
@@ -34,10 +36,18 @@ const createResolvedTsgoConfig = async (appDirectory, tsconfigPath, distDir, sou
     config.compilerOptions ??= {};
     config.compilerOptions.rootDir = appDirectory;
     config.compilerOptions.outDir = distDir;
+    config.compilerOptions.composite = false;
+    config.compilerOptions.declaration = false;
+    config.compilerOptions.declarationMap = false;
+    config.compilerOptions.emitDeclarationOnly = false;
+    config.compilerOptions.incremental = false;
     config.compilerOptions.noEmit = false;
+    if (void 0 === config.compilerOptions.jsx || 'preserve' === config.compilerOptions.jsx) config.compilerOptions.jsx = 'react-jsx';
+    delete config.compilerOptions.tsBuildInfoFile;
     if (true === config.compilerOptions.allowImportingTsExtensions) config.compilerOptions.rewriteRelativeImportExtensions = true;
     config.files = filterSourceFiles(tsconfigDir, sourceDirs, config.files);
     delete config.include;
+    delete config.references;
     delete config.compilerOptions.baseUrl;
     if ([
         'node',
@@ -164,7 +174,7 @@ const dropStaleSourceMap = async (outputFile, content)=>{
     return content.replace(sourceMappingUrlRE, '');
 };
 const rewriteOutputSpecifiers = async (appDirectory, distDir, baseUrl, paths, moduleType)=>{
-    if (0 === Object.keys(paths).length || !await fs.pathExists(distDir)) return;
+    if (!await fs.pathExists(distDir)) return;
     const matcher = createTsconfigPathsMatcher(baseUrl, paths);
     if (!matcher) return;
     const files = await collectOutputFiles(distDir);

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

@@ -11,10 +11,18 @@ 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 toEsmOutputPath = (resolvedPath)=>{
-    const sourcePath = findSourceEntry(resolvedPath) || resolvedPath;
+    const sourcePath = (findSourceEntry(resolvedPath) || resolvedPath).replace(/\\/g, '/');
     const ext = path.extname(sourcePath);
-    return ext ? `${sourcePath.slice(0, -ext.length)}.js` : `${sourcePath}.js`;
+    if (!ext) return `${sourcePath}.js`;
+    if (!COMPILED_TO_JS_EXTENSIONS.has(ext)) return sourcePath;
+    return `${sourcePath.slice(0, -ext.length)}.js`;
 };
 const resolveRelativeEsmSpecifier = (sourceFile, text)=>{
     if (!text.startsWith('./') && !text.startsWith('../')) return;

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

@@ -1,4 +1,4 @@
-export type SpecifierRewrite = (specifier: string) => string | undefined;
+type SpecifierRewrite = (specifier: string) => string | undefined;
 /**
  * Rewrite the import/export/require specifiers of emitted JavaScript.
  *
@@ -10,3 +10,4 @@ export declare const rewriteImportSpecifiers: (content: string, rewrite: Specifi
     content: string;
     changed: boolean;
 };
+export {};

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

@@ -3,6 +3,12 @@ type TsgoConfig = {
     compilerOptions?: {
         allowImportingTsExtensions?: boolean;
         baseUrl?: unknown;
+        composite?: boolean;
+        declaration?: boolean;
+        declarationMap?: boolean;
+        emitDeclarationOnly?: boolean;
+        incremental?: boolean;
+        jsx?: string;
         module?: string;
         moduleResolution?: string;
         noEmit?: boolean;
@@ -10,10 +16,14 @@ type TsgoConfig = {
         outDir?: string;
         rootDir?: string;
         rewriteRelativeImportExtensions?: boolean;
+        tsBuildInfoFile?: string;
         verbatimModuleSyntax?: boolean;
     };
     files?: string[];
     include?: string[];
+    references?: Array<{
+        path: string;
+    }>;
 };
 export declare const createResolvedTsgoConfig: (appDirectory: string, tsconfigPath: string, distDir: string, sourceDirs: string[], moduleType: 'module' | 'commonjs' | undefined, tsgoBinPath: string) => Promise<{
     config: TsgoConfig;

package/package.json

@@ -17,13 +17,12 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.5.0-ultramodern.10",
+  "version": "3.5.0-ultramodern.101",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "exports": {
     ".": {
       "types": "./dist/types/index.d.ts",
-      "modern:source": "./src/index.ts",
       "node": {
         "import": "./dist/esm-node/index.mjs",
         "require": "./dist/cjs/index.js"
@@ -39,15 +38,15 @@
     }
   },
   "dependencies": {
-    "@swc/helpers": "^0.5.23",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.10"
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.101",
+    "@swc/helpers": "^0.5.23"
   },
   "devDependencies": {
-    "@rslib/core": "0.23.1",
-    "@types/node": "^26.0.1",
-    "@typescript/native-preview": "7.0.0-dev.20260628.1",
+    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.5.0-ultramodern.101",
+    "@rslib/core": "0.23.2",
     "@scripts/rstest-config": "2.66.0",
-    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.5.0-ultramodern.10"
+    "@types/node": "^26.1.1",
+    "@typescript/native-preview": "7.0.0-dev.20260707.2"
   },
   "peerDependencies": {
     "@typescript/native-preview": ">=7.0.0-dev.20260628.1"
@@ -59,7 +58,6 @@
   },
   "sideEffects": false,
   "publishConfig": {
-    "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
   "scripts": {