openxiangda 1.0.43 → 1.0.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openxiangda",
-  "version": "1.0.43",
+  "version": "1.0.44",
   "description": "OpenXiangda CLI, workspace build tools, runtime SDK, and form components.",
   "private": false,
   "bin": {

package/packages/sdk/src/build-source/scripts/utils/pages.mjs

@@ -18,9 +18,79 @@ async function fileExists(targetPath) {
   }
 }
 
+async function resolveExistingModulePath(basePath) {
+  const candidates = [
+    basePath,
+    `${basePath}.ts`,
+    `${basePath}.tsx`,
+    `${basePath}.js`,
+    `${basePath}.jsx`,
+    `${basePath}.mjs`,
+    `${basePath}.cjs`,
+    path.join(basePath, "index.ts"),
+    path.join(basePath, "index.tsx"),
+    path.join(basePath, "index.js"),
+    path.join(basePath, "index.jsx"),
+    path.join(basePath, "index.mjs"),
+    path.join(basePath, "index.cjs"),
+  ];
+
+  for (const candidate of candidates) {
+    if (await fileExists(candidate)) return candidate;
+  }
+  throw new Error(`无法解析工作区别名导入: @/${path.relative(srcRoot, basePath)}`);
+}
+
+async function rewriteWorkspaceAliasImports(source) {
+  const importSpecifierPattern =
+    /(\bfrom\s*["']|^\s*import\s*["']|import\s*\(\s*["'])(@\/[^"']+)(["'])/gm;
+  const replacements = [];
+  let match;
+  while ((match = importSpecifierPattern.exec(source))) {
+    const [, prefix, specifier, suffix] = match;
+    const targetPath = await resolveExistingModulePath(
+      path.join(srcRoot, specifier.slice(2)),
+    );
+    replacements.push({
+      start: match.index,
+      end: match.index + match[0].length,
+      value: `${prefix}${pathToFileURL(targetPath).href}${suffix}`,
+    });
+  }
+
+  if (replacements.length === 0) return source;
+
+  let cursor = 0;
+  let next = "";
+  for (const replacement of replacements) {
+    next += source.slice(cursor, replacement.start);
+    next += replacement.value;
+    cursor = replacement.end;
+  }
+  next += source.slice(cursor);
+  return next;
+}
+
 async function loadTypeScriptModule(filePath) {
-  const loaded = await import(pathToFileURL(filePath).href);
-  return loaded.default || loaded;
+  const source = await fs.readFile(filePath, "utf8");
+  const rewritten = await rewriteWorkspaceAliasImports(source);
+  let importPath = filePath;
+  if (rewritten !== source) {
+    importPath = path.join(
+      path.dirname(filePath),
+      `.page.config.openxiangda-loader-${process.pid}-${Date.now()}.ts`,
+    );
+    await fs.writeFile(importPath, rewritten, "utf8");
+  }
+
+  try {
+    const loaded = await import(`${pathToFileURL(importPath).href}?t=${Date.now()}`);
+    return loaded.default || loaded;
+  } finally {
+    if (importPath !== filePath) {
+      await fs.rm(importPath, { force: true });
+    }
+  }
 }
 
 export async function discoverPages(filterName = "") {

package/packages/sdk/src/build-source/scripts/utils/register-payload.test.ts

@@ -70,6 +70,60 @@ describe("register payload helpers", () => {
     }
   });
 
+  it("loads page configs that import workspace @ alias modules", async () => {
+    const workspaceRoot = await mkdtemp(
+      join(process.cwd(), ".tmp-openxiangda-pages-alias-test-"),
+    );
+    const previousWorkspaceRoot = process.env.LOWCODE_WORKSPACE_ROOT;
+
+    try {
+      const typesDir = join(workspaceRoot, "src/types");
+      const pageDir = join(workspaceRoot, "src/pages/runtime-workbench");
+      await mkdir(typesDir, { recursive: true });
+      await mkdir(pageDir, { recursive: true });
+      await writeFile(
+        join(typesDir, "app-workspace.types.ts"),
+        `export function definePageConfig(config) { return config; }\n`,
+        "utf8",
+      );
+      await writeFile(join(pageDir, "index.tsx"), "export {};\n", "utf8");
+      await writeFile(
+        join(pageDir, "App.tsx"),
+        "export default function App() { return null; }\n",
+        "utf8",
+      );
+      await writeFile(
+        join(pageDir, "page.config.ts"),
+        `import { definePageConfig } from "@/types/app-workspace.types";
+
+export default definePageConfig({
+  code: "runtime-workbench",
+  name: "运行时工作台",
+  route: { pathKey: "runtime_workbench" },
+});
+`,
+        "utf8",
+      );
+
+      process.env.LOWCODE_WORKSPACE_ROOT = workspaceRoot;
+      vi.resetModules();
+      const { discoverPages } = await import("./pages.mjs");
+      const pages = await discoverPages("runtime-workbench");
+
+      expect(pages).toHaveLength(1);
+      expect(pages[0].config.code).toBe("runtime-workbench");
+      expect(pages[0].config.route.pathKey).toBe("runtime_workbench");
+    } finally {
+      if (previousWorkspaceRoot === undefined) {
+        delete process.env.LOWCODE_WORKSPACE_ROOT;
+      } else {
+        process.env.LOWCODE_WORKSPACE_ROOT = previousWorkspaceRoot;
+      }
+      vi.resetModules();
+      await rm(workspaceRoot, { recursive: true, force: true });
+    }
+  });
+
   it("builds stable form and page asset URLs from one build id", () => {
     expect(getFormBundleUrl(config, "customer-info", "index.js")).toBe(
       "https://bucket.oss-cn-hangzhou.aliyuncs.com/lowcode/app-workspace/dev/1.2.3/BUILD_001/forms/customer-info/index.js",