@bleedingdev/modern-js-server-utils 3.4.0-ultramodern.2 → 3.4.0-ultramodern.20

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

@@ -75,6 +75,7 @@ const createResolvedTsgoConfig = async (appDirectory, tsconfigPath, distDir, sou
     config.compilerOptions.rootDir = appDirectory;
     config.compilerOptions.outDir = distDir;
     config.compilerOptions.noEmit = false;
+    if (true === config.compilerOptions.allowImportingTsExtensions) config.compilerOptions.rewriteRelativeImportExtensions = true;
     config.files = filterSourceFiles(tsconfigDir, sourceDirs, config.files);
     delete config.include;
     delete config.compilerOptions.baseUrl;
@@ -107,9 +108,11 @@ const filterSourceFiles = (tsconfigDir, sourceDirs, files = [])=>{
     const sourcePosixPaths = sourceDirs.map((sourceDir)=>sourceDir.split(external_path_default().sep).join(external_path_default().posix.sep));
     return files.filter((fileName)=>{
         const absoluteFileName = external_path_default().resolve(tsconfigDir, fileName).split(external_path_default().sep).join(external_path_default().posix.sep);
+        if (isAppRouterGeneratedDeclaration(absoluteFileName)) return false;
         return fileName.endsWith('.d.ts') || sourcePosixPaths.some((sourceDir)=>absoluteFileName.includes(sourceDir));
     });
 };
+const isAppRouterGeneratedDeclaration = (absoluteFileName)=>/\/src\/modern-tanstack\/.*\.gen\.d\.ts$/u.test(absoluteFileName);
 const runTsgo = (tsgoBinPath, args, options)=>new Promise((resolve, reject)=>{
         const child = (0, external_child_process_namespaceObject.spawn)(process.execPath, [
             tsgoBinPath,
@@ -238,6 +241,7 @@ const compileByTs = async (appDirectory, config, compileOptions)=>{
     }
     if (result.stderr) utils_namespaceObject.logger.error(result.stderr);
     if (result.stdout) utils_namespaceObject.logger.info(result.stdout);
+    await rewriteOutputSpecifiers(appDirectory, distDir, absoluteBaseUrl, paths, compileOptions.moduleType);
     if (0 !== result.code) {
         const noEmitOnError = tsgoConfig.compilerOptions?.noEmitOnError;
         if (void 0 === noEmitOnError || true === noEmitOnError) if (compileOptions.throwErrorInsteadOfExit) {
@@ -248,7 +252,6 @@ const compileByTs = async (appDirectory, config, compileOptions)=>{
             ].filter(Boolean).join('\n'));
         } else process.exit(1);
     }
-    await rewriteOutputSpecifiers(appDirectory, distDir, absoluteBaseUrl, paths, compileOptions.moduleType);
     for (const source of sourceDirs)await copyFiles(source, distDir, appDirectory);
     utils_namespaceObject.logger.info("TS-Go compile succeed");
 };

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

@@ -42,9 +42,16 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const utils_namespaceObject = require("@modern-js/utils");
 const tsconfig_paths_namespaceObject = require("@modern-js/utils/tsconfig-paths");
-const external_os_namespaceObject = require("os");
 const external_path_namespaceObject = require("path");
 var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
+const windowsAbsolutePathRE = /^[A-Za-z]:[\\/]/u;
+const isAbsolutePath = (input)=>external_path_default().isAbsolute(input) || external_path_default().win32.isAbsolute(input);
+const pathApiFor = (...inputs)=>inputs.some((input)=>windowsAbsolutePathRE.test(input)) ? external_path_default().win32 : external_path_default();
+const toImportSpecifier = (sourceFile, resolvedPath)=>{
+    const pathApi = pathApiFor(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 toEsmOutputPath = (resolvedPath)=>{
     const sourcePath = (0, utils_namespaceObject.findSourceEntry)(resolvedPath) || resolvedPath;
     const ext = external_path_default().extname(sourcePath);
@@ -52,8 +59,8 @@ const toEsmOutputPath = (resolvedPath)=>{
 };
 const resolveRelativeEsmSpecifier = (sourceFile, text)=>{
     if (!text.startsWith('./') && !text.startsWith('../')) return;
-    const importerDir = (0, external_path_namespaceObject.dirname)(sourceFile);
-    return external_path_default().resolve(importerDir, text);
+    const pathApi = pathApiFor(sourceFile);
+    return pathApi.resolve(pathApi.dirname(sourceFile), text);
 };
 const isRegExpKey = (str)=>str.startsWith('^') || str.endsWith('$');
 const resolveAliasPath = (baseUrl, filePath)=>{
@@ -116,8 +123,7 @@ function getNotAliasedPath(sourceFile, matcher, text, moduleType) {
     let result = (0, utils_namespaceObject.findMatchedSourcePath)(matcher, text);
     if (!result && 'module' === moduleType) result = resolveRelativeEsmSpecifier(sourceFile, text);
     if (!result) return;
-    if ('win32' === external_os_namespaceObject.platform()) result = result.replace(/\\/g, '/');
-    if (!external_path_default().isAbsolute(result)) {
+    if (!isAbsolutePath(result)) {
         if (!result.startsWith('.') && !result.startsWith('..')) try {
             const packagePath = require.resolve(result, {
                 paths: [
@@ -138,8 +144,7 @@ function getNotAliasedPath(sourceFile, matcher, text, moduleType) {
         } catch  {}
     }
     if ('module' === moduleType) result = toEsmOutputPath(result);
-    const resolvedPath = external_path_namespaceObject.posix.relative((0, external_path_namespaceObject.dirname)(sourceFile), result) || './';
-    return '.' === resolvedPath[0] ? resolvedPath : `./${resolvedPath}`;
+    return toImportSpecifier(sourceFile, result) || './';
 }
 exports.createTsconfigPathsMatcher = __webpack_exports__.createTsconfigPathsMatcher;
 exports.getNotAliasedPath = __webpack_exports__.getNotAliasedPath;

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

@@ -30,6 +30,7 @@ const createResolvedTsgoConfig = async (appDirectory, tsconfigPath, distDir, sou
     config.compilerOptions.rootDir = appDirectory;
     config.compilerOptions.outDir = distDir;
     config.compilerOptions.noEmit = false;
+    if (true === config.compilerOptions.allowImportingTsExtensions) config.compilerOptions.rewriteRelativeImportExtensions = true;
     config.files = filterSourceFiles(tsconfigDir, sourceDirs, config.files);
     delete config.include;
     delete config.compilerOptions.baseUrl;
@@ -62,9 +63,11 @@ const filterSourceFiles = (tsconfigDir, sourceDirs, files = [])=>{
     const sourcePosixPaths = sourceDirs.map((sourceDir)=>sourceDir.split(path.sep).join(path.posix.sep));
     return files.filter((fileName)=>{
         const absoluteFileName = path.resolve(tsconfigDir, fileName).split(path.sep).join(path.posix.sep);
+        if (isAppRouterGeneratedDeclaration(absoluteFileName)) return false;
         return fileName.endsWith('.d.ts') || sourcePosixPaths.some((sourceDir)=>absoluteFileName.includes(sourceDir));
     });
 };
+const isAppRouterGeneratedDeclaration = (absoluteFileName)=>/\/src\/modern-tanstack\/.*\.gen\.d\.ts$/u.test(absoluteFileName);
 const runTsgo = (tsgoBinPath, args, options)=>new Promise((resolve, reject)=>{
         const child = spawn(process.execPath, [
             tsgoBinPath,
@@ -193,6 +196,7 @@ const compileByTs = async (appDirectory, config, compileOptions)=>{
     }
     if (result.stderr) logger.error(result.stderr);
     if (result.stdout) logger.info(result.stdout);
+    await rewriteOutputSpecifiers(appDirectory, distDir, absoluteBaseUrl, paths, compileOptions.moduleType);
     if (0 !== result.code) {
         const noEmitOnError = tsgoConfig.compilerOptions?.noEmitOnError;
         if (void 0 === noEmitOnError || true === noEmitOnError) if (compileOptions.throwErrorInsteadOfExit) {
@@ -203,7 +207,6 @@ const compileByTs = async (appDirectory, config, compileOptions)=>{
             ].filter(Boolean).join('\n'));
         } else process.exit(1);
     }
-    await rewriteOutputSpecifiers(appDirectory, distDir, absoluteBaseUrl, paths, compileOptions.moduleType);
     for (const source of sourceDirs)await copyFiles(source, distDir, appDirectory);
     logger.info("TS-Go compile succeed");
 };

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

@@ -1,7 +1,14 @@
 import { findMatchedSourcePath, findSourceEntry } from "@modern-js/utils";
 import { createMatchPath } from "@modern-js/utils/tsconfig-paths";
-import path, { dirname, posix } from "path";
-import * as __rspack_external_os from "os";
+import path from "path";
+const windowsAbsolutePathRE = /^[A-Za-z]:[\\/]/u;
+const isAbsolutePath = (input)=>path.isAbsolute(input) || path.win32.isAbsolute(input);
+const pathApiFor = (...inputs)=>inputs.some((input)=>windowsAbsolutePathRE.test(input)) ? path.win32 : path;
+const toImportSpecifier = (sourceFile, resolvedPath)=>{
+    const pathApi = pathApiFor(sourceFile, resolvedPath);
+    const relativePath = pathApi.relative(pathApi.dirname(sourceFile), resolvedPath).split(pathApi.sep).join(path.posix.sep);
+    return '.' === relativePath[0] ? relativePath : `./${relativePath}`;
+};
 const toEsmOutputPath = (resolvedPath)=>{
     const sourcePath = findSourceEntry(resolvedPath) || resolvedPath;
     const ext = path.extname(sourcePath);
@@ -9,8 +16,8 @@ const toEsmOutputPath = (resolvedPath)=>{
 };
 const resolveRelativeEsmSpecifier = (sourceFile, text)=>{
     if (!text.startsWith('./') && !text.startsWith('../')) return;
-    const importerDir = dirname(sourceFile);
-    return path.resolve(importerDir, text);
+    const pathApi = pathApiFor(sourceFile);
+    return pathApi.resolve(pathApi.dirname(sourceFile), text);
 };
 const isRegExpKey = (str)=>str.startsWith('^') || str.endsWith('$');
 const resolveAliasPath = (baseUrl, filePath)=>{
@@ -73,8 +80,7 @@ function getNotAliasedPath(sourceFile, matcher, text, moduleType) {
     let result = findMatchedSourcePath(matcher, text);
     if (!result && 'module' === moduleType) result = resolveRelativeEsmSpecifier(sourceFile, text);
     if (!result) return;
-    if ('win32' === __rspack_external_os.platform()) result = result.replace(/\\/g, '/');
-    if (!path.isAbsolute(result)) {
+    if (!isAbsolutePath(result)) {
         if (!result.startsWith('.') && !result.startsWith('..')) try {
             const packagePath = require.resolve(result, {
                 paths: [
@@ -95,7 +101,6 @@ function getNotAliasedPath(sourceFile, matcher, text, moduleType) {
         } catch  {}
     }
     if ('module' === moduleType) result = toEsmOutputPath(result);
-    const resolvedPath = posix.relative(dirname(sourceFile), result) || './';
-    return '.' === resolvedPath[0] ? resolvedPath : `./${resolvedPath}`;
+    return toImportSpecifier(sourceFile, result) || './';
 }
 export { createTsconfigPathsMatcher, getNotAliasedPath };

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

@@ -35,6 +35,7 @@ const createResolvedTsgoConfig = async (appDirectory, tsconfigPath, distDir, sou
     config.compilerOptions.rootDir = appDirectory;
     config.compilerOptions.outDir = distDir;
     config.compilerOptions.noEmit = false;
+    if (true === config.compilerOptions.allowImportingTsExtensions) config.compilerOptions.rewriteRelativeImportExtensions = true;
     config.files = filterSourceFiles(tsconfigDir, sourceDirs, config.files);
     delete config.include;
     delete config.compilerOptions.baseUrl;
@@ -67,9 +68,11 @@ const filterSourceFiles = (tsconfigDir, sourceDirs, files = [])=>{
     const sourcePosixPaths = sourceDirs.map((sourceDir)=>sourceDir.split(path.sep).join(path.posix.sep));
     return files.filter((fileName)=>{
         const absoluteFileName = path.resolve(tsconfigDir, fileName).split(path.sep).join(path.posix.sep);
+        if (isAppRouterGeneratedDeclaration(absoluteFileName)) return false;
         return fileName.endsWith('.d.ts') || sourcePosixPaths.some((sourceDir)=>absoluteFileName.includes(sourceDir));
     });
 };
+const isAppRouterGeneratedDeclaration = (absoluteFileName)=>/\/src\/modern-tanstack\/.*\.gen\.d\.ts$/u.test(absoluteFileName);
 const runTsgo = (tsgoBinPath, args, options)=>new Promise((resolve, reject)=>{
         const child = spawn(process.execPath, [
             tsgoBinPath,
@@ -198,6 +201,7 @@ const compileByTs = async (appDirectory, config, compileOptions)=>{
     }
     if (result.stderr) logger.error(result.stderr);
     if (result.stdout) logger.info(result.stdout);
+    await rewriteOutputSpecifiers(appDirectory, distDir, absoluteBaseUrl, paths, compileOptions.moduleType);
     if (0 !== result.code) {
         const noEmitOnError = tsgoConfig.compilerOptions?.noEmitOnError;
         if (void 0 === noEmitOnError || true === noEmitOnError) if (compileOptions.throwErrorInsteadOfExit) {
@@ -208,7 +212,6 @@ const compileByTs = async (appDirectory, config, compileOptions)=>{
             ].filter(Boolean).join('\n'));
         } else process.exit(1);
     }
-    await rewriteOutputSpecifiers(appDirectory, distDir, absoluteBaseUrl, paths, compileOptions.moduleType);
     for (const source of sourceDirs)await copyFiles(source, distDir, appDirectory);
     logger.info("TS-Go compile succeed");
 };

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

@@ -2,8 +2,15 @@ import __rslib_shim_module__ from "node:module";
 const require = /*#__PURE__*/ __rslib_shim_module__.createRequire(/*#__PURE__*/ (()=>import.meta.url)());
 import { findMatchedSourcePath, findSourceEntry } from "@modern-js/utils";
 import { createMatchPath } from "@modern-js/utils/tsconfig-paths";
-import path, { dirname, posix } from "path";
-import * as __rspack_external_os from "os";
+import path from "path";
+const windowsAbsolutePathRE = /^[A-Za-z]:[\\/]/u;
+const isAbsolutePath = (input)=>path.isAbsolute(input) || path.win32.isAbsolute(input);
+const pathApiFor = (...inputs)=>inputs.some((input)=>windowsAbsolutePathRE.test(input)) ? path.win32 : path;
+const toImportSpecifier = (sourceFile, resolvedPath)=>{
+    const pathApi = pathApiFor(sourceFile, resolvedPath);
+    const relativePath = pathApi.relative(pathApi.dirname(sourceFile), resolvedPath).split(pathApi.sep).join(path.posix.sep);
+    return '.' === relativePath[0] ? relativePath : `./${relativePath}`;
+};
 const toEsmOutputPath = (resolvedPath)=>{
     const sourcePath = findSourceEntry(resolvedPath) || resolvedPath;
     const ext = path.extname(sourcePath);
@@ -11,8 +18,8 @@ const toEsmOutputPath = (resolvedPath)=>{
 };
 const resolveRelativeEsmSpecifier = (sourceFile, text)=>{
     if (!text.startsWith('./') && !text.startsWith('../')) return;
-    const importerDir = dirname(sourceFile);
-    return path.resolve(importerDir, text);
+    const pathApi = pathApiFor(sourceFile);
+    return pathApi.resolve(pathApi.dirname(sourceFile), text);
 };
 const isRegExpKey = (str)=>str.startsWith('^') || str.endsWith('$');
 const resolveAliasPath = (baseUrl, filePath)=>{
@@ -75,8 +82,7 @@ function getNotAliasedPath(sourceFile, matcher, text, moduleType) {
     let result = findMatchedSourcePath(matcher, text);
     if (!result && 'module' === moduleType) result = resolveRelativeEsmSpecifier(sourceFile, text);
     if (!result) return;
-    if ('win32' === __rspack_external_os.platform()) result = result.replace(/\\/g, '/');
-    if (!path.isAbsolute(result)) {
+    if (!isAbsolutePath(result)) {
         if (!result.startsWith('.') && !result.startsWith('..')) try {
             const packagePath = require.resolve(result, {
                 paths: [
@@ -97,7 +103,6 @@ function getNotAliasedPath(sourceFile, matcher, text, moduleType) {
         } catch  {}
     }
     if ('module' === moduleType) result = toEsmOutputPath(result);
-    const resolvedPath = posix.relative(dirname(sourceFile), result) || './';
-    return '.' === resolvedPath[0] ? resolvedPath : `./${resolvedPath}`;
+    return toImportSpecifier(sourceFile, result) || './';
 }
 export { createTsconfigPathsMatcher, getNotAliasedPath };

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

@@ -1,6 +1,7 @@
 import type { CompileFunc } from '../../common';
 type TsgoConfig = {
     compilerOptions?: {
+        allowImportingTsExtensions?: boolean;
         baseUrl?: unknown;
         module?: string;
         moduleResolution?: string;
@@ -8,6 +9,7 @@ type TsgoConfig = {
         noEmitOnError?: boolean;
         outDir?: string;
         rootDir?: string;
+        rewriteRelativeImportExtensions?: boolean;
         verbatimModuleSyntax?: boolean;
     };
     files?: string[];

package/package.json

@@ -17,7 +17,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.4.0-ultramodern.2",
+  "version": "3.4.0-ultramodern.20",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "exports": {
@@ -40,13 +40,13 @@
   },
   "dependencies": {
     "@swc/helpers": "^0.5.23",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.4.0-ultramodern.2"
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.4.0-ultramodern.20"
   },
   "devDependencies": {
     "@rslib/core": "0.23.0",
     "@types/node": "^26.0.1",
     "@typescript/native-preview": "7.0.0-dev.20260624.1",
-    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.4.0-ultramodern.2",
+    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.4.0-ultramodern.20",
     "@scripts/rstest-config": "2.66.0"
   },
   "peerDependencies": {