openxiangda 1.0.44 → 1.0.45

package/package.json

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

package/packages/sdk/src/build-source/scripts/publish-oss.mjs

@@ -17,6 +17,8 @@ import { loadConfig, rootDir } from "./utils/load-config.mjs";
 import { getContentType, getCacheControl } from "./utils/mime-types.mjs";
 import { createOSSClient, uploadWithRetry, ensureBucketCors } from "./utils/oss-client.mjs";
 import { createProgressTracker } from "./utils/progress.mjs";
+import { discoverPages } from "./utils/pages.mjs";
+import { buildUploadPatterns } from "./utils/publish-oss-patterns.mjs";
 
 const args = minimist(process.argv.slice(2).filter((arg) => arg !== "--"));
 const dryRun = Boolean(args["dry-run"]);
@@ -58,18 +60,11 @@ if (
 
 const client = dryRun ? null : createOSSClient(config.oss);
 
-/**
- * 构建文件扫描 glob 模式
- * @returns {string} glob 模式
- */
-function buildPattern() {
-  if (targetForm) return `{form-runtime/**/*,forms/${targetForm}/**/*}`;
-  if (targetPage) return `{page-runtime/**/*,pages/${targetPage}/**/*}`;
-  return "{form-runtime,page-runtime,forms,pages}/**/*";
-}
-
 const distDir = path.resolve(rootDir, "dist");
-const files = (await glob(buildPattern(), { cwd: distDir, nodir: true })).filter(
+const files = (await glob(
+  await buildUploadPatterns({ targetForm, targetPage, discoverPages }),
+  { cwd: distDir, nodir: true },
+)).filter(
   (file) => !file.endsWith("/build-cache.json"),
 );
 

package/packages/sdk/src/build-source/scripts/utils/publish-oss-patterns.mjs

@@ -0,0 +1,20 @@
+export function getPageUploadPatterns(targetPage, pages = []) {
+  const names = new Set([targetPage].filter(Boolean));
+  for (const page of pages) {
+    const code = page?.config?.code;
+    if (page?.dirName === targetPage || code === targetPage) {
+      if (page.dirName) names.add(page.dirName);
+      if (code) names.add(code);
+    }
+  }
+  return ["page-runtime/**/*", ...[...names].map((name) => `pages/${name}/**/*`)];
+}
+
+export async function buildUploadPatterns({ targetForm, targetPage, discoverPages }) {
+  if (targetForm) return ["form-runtime/**/*", `forms/${targetForm}/**/*`];
+  if (targetPage) {
+    const pages = discoverPages ? await discoverPages() : [];
+    return getPageUploadPatterns(targetPage, pages);
+  }
+  return ["{form-runtime,page-runtime,forms,pages}/**/*"];
+}

package/packages/sdk/src/build-source/scripts/utils/publish-oss-patterns.test.ts

@@ -0,0 +1,39 @@
+import { describe, expect, it } from "vitest";
+
+import { buildUploadPatterns, getPageUploadPatterns } from "./publish-oss-patterns.mjs";
+
+describe("publish oss upload patterns", () => {
+  it("uploads both page dir name and page config code assets", () => {
+    expect(
+      getPageUploadPatterns("runtime-workbench", [
+        {
+          dirName: "runtime-workbench",
+          config: { code: "runtime_workbench" },
+        },
+      ]),
+    ).toEqual([
+      "page-runtime/**/*",
+      "pages/runtime-workbench/**/*",
+      "pages/runtime_workbench/**/*",
+    ]);
+  });
+
+  it("resolves page config code when target page is already code", async () => {
+    await expect(
+      buildUploadPatterns({
+        targetForm: "",
+        targetPage: "runtime_workbench",
+        discoverPages: async () => [
+          {
+            dirName: "runtime-workbench",
+            config: { code: "runtime_workbench" },
+          },
+        ],
+      }),
+    ).resolves.toEqual([
+      "page-runtime/**/*",
+      "pages/runtime_workbench/**/*",
+      "pages/runtime-workbench/**/*",
+    ]);
+  });
+});