@esmx/core 3.0.0-rc.37 → 3.0.0-rc.38

package/dist/cli/cli.mjs

@@ -1,10 +1,10 @@
 import module from "node:module";
-import path from "node:path";
 import { styleText } from "node:util";
 import pkg from "../../package.json" with { type: "json" };
 import { COMMAND, Esmx } from "../core.mjs";
+import { resolveImportPath } from "../utils/resolve-path.mjs";
 async function getSrcOptions() {
-  return import(path.resolve(process.cwd(), "./src/entry.node.ts")).then(
+  return import(resolveImportPath(process.cwd(), "./src/entry.node.ts")).then(
     (m) => m.default
   );
 }
@@ -56,7 +56,7 @@ export async function cli(command) {
       opts = null;
       break;
     default:
-      await import(path.resolve(process.cwd(), command));
+      await import(resolveImportPath(process.cwd(), command));
       break;
   }
 }

package/dist/utils/resolve-path.d.ts

@@ -1,2 +1,3 @@
 export type ProjectPath = './' | 'dist' | 'dist/index.mjs' | 'dist/package.json' | 'dist/client' | 'dist/client/manifest.json' | 'dist/client/js' | 'dist/client/css' | 'dist/client/images' | 'dist/client/media' | 'dist/client/fonts' | 'dist/client/workers' | 'dist/client/importmap' | 'dist/client/versions/latest.tgz' | 'dist/server' | 'dist/server/js' | 'dist/server/manifest.json' | 'dist/node' | 'dist/node/js' | 'src' | 'src/entry.node.ts' | 'src/entry.client.ts' | 'src/entry.server.ts' | 'package.json';
 export declare function resolvePath(root: string, projectPath: ProjectPath, ...args: string[]): string;
+export declare function resolveImportPath(...paths: string[]): string;

package/dist/utils/resolve-path.mjs

@@ -1,4 +1,9 @@
 import path from "node:path";
+import { pathToFileURL } from "node:url";
 export function resolvePath(root, projectPath, ...args) {
   return path.resolve(root, projectPath, ...args);
 }
+export function resolveImportPath(...paths) {
+  const absolutePath = path.resolve(...paths);
+  return pathToFileURL(absolutePath).href;
+}

package/dist/utils/resolve-path.test.mjs

@@ -1,6 +1,7 @@
 import path from "node:path";
-import { assert, test } from "vitest";
-import { resolvePath } from "./resolve-path.mjs";
+import { pathToFileURL } from "node:url";
+import { assert, describe, test } from "vitest";
+import { resolveImportPath, resolvePath } from "./resolve-path.mjs";
 const TEST_ROOT = "/test/root";
 test("basic path resolution", () => {
   const result = resolvePath(TEST_ROOT, "./");
@@ -50,3 +51,31 @@ test("with additional arguments", () => {
     path.resolve(TEST_ROOT, "src", "entry.client.ts")
   );
 });
+describe("resolveImportPath", () => {
+  test("should handle multiple path segments", () => {
+    const result = resolveImportPath("base", "path", "file.ts");
+    assert.typeOf(result, "string");
+    const expectedPath = pathToFileURL(
+      path.resolve("base", "path", "file.ts")
+    ).href;
+    assert.equal(result, expectedPath);
+  });
+  test("should resolve from cwd when using relative paths", () => {
+    const result = resolveImportPath("./relative/file.ts");
+    const expected = pathToFileURL(path.resolve("./relative/file.ts")).href;
+    assert.equal(result, expected);
+  });
+  test("should handle absolute paths", () => {
+    const absolutePath = path.resolve("/absolute/path/file.ts");
+    const result = resolveImportPath(absolutePath);
+    const expected = pathToFileURL(absolutePath).href;
+    assert.equal(result, expected);
+  });
+  test("should work with process.cwd()", () => {
+    const result = resolveImportPath(process.cwd(), "src", "file.ts");
+    const expected = pathToFileURL(
+      path.resolve(process.cwd(), "src", "file.ts")
+    ).href;
+    assert.equal(result, expected);
+  });
+});

package/package.json

@@ -59,7 +59,7 @@
         "build": "unbuild"
     },
     "dependencies": {
-        "@esmx/import": "3.0.0-rc.37",
+        "@esmx/import": "3.0.0-rc.38",
         "@types/serialize-javascript": "^5.0.4",
         "es-module-lexer": "^1.7.0",
         "find": "^0.3.0",
@@ -68,7 +68,7 @@
     },
     "devDependencies": {
         "@biomejs/biome": "1.9.4",
-        "@esmx/lint": "3.0.0-rc.37",
+        "@esmx/lint": "3.0.0-rc.38",
         "@types/find": "^0.2.4",
         "@types/node": "^24.0.0",
         "@types/send": "^0.17.4",
@@ -79,7 +79,7 @@
         "unbuild": "3.5.0",
         "vitest": "3.2.4"
     },
-    "version": "3.0.0-rc.37",
+    "version": "3.0.0-rc.38",
     "type": "module",
     "private": false,
     "exports": {
@@ -102,5 +102,5 @@
         "template",
         "public"
     ],
-    "gitHead": "ca2747fe29a9a48b942dfd9bf5a99742211afd3f"
+    "gitHead": "f90b5aae594164a5f62369d4999437ab49993c71"
 }

package/src/cli/cli.ts

@@ -1,13 +1,12 @@
 import module from 'node:module';
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
 import { styleText } from 'node:util';
 import pkg from '../../package.json' with { type: 'json' };
 
 import { COMMAND, Esmx, type EsmxOptions } from '../core';
+import { resolveImportPath } from '../utils/resolve-path';
 
 async function getSrcOptions(): Promise<EsmxOptions> {
-    return import(path.resolve(process.cwd(), './src/entry.node.ts')).then(
+    return import(resolveImportPath(process.cwd(), './src/entry.node.ts')).then(
         (m) => m.default
     );
 }
@@ -26,7 +25,6 @@ export async function cli(command: string) {
             esmx = new Esmx(opts);
             exit(await esmx.init(COMMAND.dev));
 
-            // 释放内存
             esmx = null;
             opts = null;
             break;
@@ -35,14 +33,12 @@ export async function cli(command: string) {
                 `Please use 'NODE_ENV=production node dist/index.mjs' to run the built program`
             );
         case COMMAND.build:
-            // 编译代码。
             opts = await getSrcOptions();
             esmx = new Esmx(opts);
             exit(await esmx.init(COMMAND.build));
             exit(await esmx.destroy());
 
             if (typeof opts.postBuild === 'function') {
-                // 生产模式运行
                 esmx = new Esmx({
                     ...opts,
                     server: undefined
@@ -51,28 +47,25 @@ export async function cli(command: string) {
                 exit(await esmx.postBuild());
             }
 
-            // 释放内存
             esmx = null;
             opts = null;
             break;
         case COMMAND.preview:
             opts = await getSrcOptions();
-            // 编译代码
+
             esmx = new Esmx(opts);
             exit(await esmx.init(COMMAND.build));
             exit(await esmx.destroy());
 
-            // 生产模式运行
             esmx = new Esmx(opts);
             exit(await esmx.init(COMMAND.start));
             exit(await esmx.postBuild());
 
-            // 释放内存
             esmx = null;
             opts = null;
             break;
         default:
-            await import(path.resolve(process.cwd(), command));
+            await import(resolveImportPath(process.cwd(), command));
             break;
     }
 }
@@ -83,7 +76,6 @@ function exit(ok: boolean) {
     }
 }
 
-// Support TS files without .ts suffix.
 module.register(import.meta.url, {
     parentURL: import.meta.url
 });

package/src/utils/resolve-path.test.ts

@@ -1,6 +1,7 @@
 import path from 'node:path';
-import { assert, test } from 'vitest';
-import { resolvePath } from './resolve-path';
+import { pathToFileURL } from 'node:url';
+import { assert, describe, test } from 'vitest';
+import { resolveImportPath, resolvePath } from './resolve-path';
 
 const TEST_ROOT = '/test/root';
 
@@ -56,3 +57,35 @@ test('with additional arguments', () => {
         path.resolve(TEST_ROOT, 'src', 'entry.client.ts')
     );
 });
+
+describe('resolveImportPath', () => {
+    test('should handle multiple path segments', () => {
+        const result = resolveImportPath('base', 'path', 'file.ts');
+        assert.typeOf(result, 'string');
+        const expectedPath = pathToFileURL(
+            path.resolve('base', 'path', 'file.ts')
+        ).href;
+        assert.equal(result, expectedPath);
+    });
+
+    test('should resolve from cwd when using relative paths', () => {
+        const result = resolveImportPath('./relative/file.ts');
+        const expected = pathToFileURL(path.resolve('./relative/file.ts')).href;
+        assert.equal(result, expected);
+    });
+
+    test('should handle absolute paths', () => {
+        const absolutePath = path.resolve('/absolute/path/file.ts');
+        const result = resolveImportPath(absolutePath);
+        const expected = pathToFileURL(absolutePath).href;
+        assert.equal(result, expected);
+    });
+
+    test('should work with process.cwd()', () => {
+        const result = resolveImportPath(process.cwd(), 'src', 'file.ts');
+        const expected = pathToFileURL(
+            path.resolve(process.cwd(), 'src', 'file.ts')
+        ).href;
+        assert.equal(result, expected);
+    });
+});

package/src/utils/resolve-path.ts

@@ -1,4 +1,5 @@
 import path from 'node:path';
+import { pathToFileURL } from 'node:url';
 
 export type ProjectPath =
     | './'
@@ -33,3 +34,8 @@ export function resolvePath(
 ): string {
     return path.resolve(root, projectPath, ...args);
 }
+
+export function resolveImportPath(...paths: string[]): string {
+    const absolutePath = path.resolve(...paths);
+    return pathToFileURL(absolutePath).href;
+}