@ldsg/cli 0.3.38 → 0.3.40

package/src/__tests__/generate-app-index-ts.test.ts

@@ -0,0 +1,141 @@
+import { createRequire } from "module";
+import { generateAppIndexTs, ZipAppDataLayout, zipAppData } from "@ldsg/utils";
+
+/**
+ * jszip 是 @ldsg/utils 的依赖，不在 @ldsg/cli 的依赖里；
+ * 这里直接复用 utils 的 node_modules，避免为测试引入额外依赖。
+ */
+const nodeRequire = createRequire(__filename);
+const JSZip = nodeRequire("../../../../libs/utils/node_modules/jszip");
+
+const sampleHandlerRecords = [
+  {
+    id: "application-resource-handler",
+    kind: "handler",
+    parentId: null,
+    settings: {
+      code: 'export * from "@ldsg/application";',
+      dependencies: [{ name: "@ldsg/application" }],
+    },
+  },
+  {
+    id: "my-handler-1",
+    kind: "handler",
+    parentId: null,
+    settings: {
+      code: 'export * from "@ldsg/handler";',
+      dependencies: [{ name: "@ldsg/handler" }],
+    },
+  },
+];
+
+const sampleResourceRecords = [
+  {
+    id: "application-resource-definition",
+    kind: "resource_definition",
+    parentId: "root",
+    settings: {
+      title: "应用资源定义",
+      kind: "application",
+      handlerResourceId: "application-resource-handler",
+    },
+  },
+  ...sampleHandlerRecords,
+  {
+    id: "main-app",
+    kind: "application",
+    parentId: "root",
+    settings: { title: "主要应用" },
+  },
+];
+
+describe("generateAppIndexTs", () => {
+  it("should generate NESTED handler import paths", () => {
+    const content = generateAppIndexTs({
+      handlerResourceRecords: sampleHandlerRecords as never,
+      getHandlerImportPath: (id) => `./handlers/${id}`,
+    });
+
+    expect(content).toContain(
+      'import * as handlerModule_application_resource_handler from "./handlers/application-resource-handler";',
+    );
+    expect(content).toContain(
+      'import * as handlerModule_my_handler_1 from "./handlers/my-handler-1";',
+    );
+  });
+
+  it("should generate FLAT handler import paths", () => {
+    const content = generateAppIndexTs({
+      handlerResourceRecords: sampleHandlerRecords as never,
+      getHandlerImportPath: (id) => `../${id}`,
+    });
+
+    expect(content).toContain(
+      'import * as handlerModule_application_resource_handler from "../application-resource-handler";',
+    );
+  });
+
+  it("should inject handler into the corresponding handler resource", () => {
+    const content = generateAppIndexTs({
+      handlerResourceRecords: sampleHandlerRecords as never,
+      getHandlerImportPath: (id) => `./handlers/${id}`,
+    });
+
+    expect(content).toContain(
+      '"application-resource-handler": handlerModule_application_resource_handler',
+    );
+    expect(content).toContain('"my-handler-1": handlerModule_my_handler_1');
+    expect(content).toContain('if (kind === "handler" && handlerModules[id])');
+    expect(content).toContain("handler: handlerModules[id].handler");
+    expect(content).toContain("resourceRecords: wiredResourceRecords");
+  });
+
+  it("should generate a valid base app when there are no handlers", () => {
+    const content = generateAppIndexTs({
+      handlerResourceRecords: [],
+      getHandlerImportPath: (id) => `./handlers/${id}`,
+    });
+
+    expect(content).not.toContain("import * as handlerModule_");
+    expect(content).toContain("const handlerModules: Record<string, any> = {");
+    expect(content).toContain("resourceRecords: wiredResourceRecords");
+  });
+});
+
+describe("zipAppData", () => {
+  it("should write a handler-aware app index.ts for NESTED layout", async () => {
+    const { archive } = await zipAppData({
+      resourceRecords: sampleResourceRecords as never,
+      type: "nodebuffer",
+      layout: ZipAppDataLayout.NESTED,
+    });
+
+    const zip = await JSZip.loadAsync(archive);
+
+    const indexTs = await zip.file("index.ts")?.async("string");
+
+    expect(indexTs).toBeTruthy();
+    expect(indexTs).toContain(
+      'import * as handlerModule_application_resource_handler from "./handlers/application-resource-handler";',
+    );
+    expect(indexTs).toContain("handler: handlerModules[id].handler");
+  });
+
+  it("should write a handler-aware app index.ts for FLAT layout", async () => {
+    const { archive } = await zipAppData({
+      resourceRecords: sampleResourceRecords as never,
+      type: "nodebuffer",
+      layout: ZipAppDataLayout.FLAT,
+    });
+
+    const zip = await JSZip.loadAsync(archive);
+
+    const indexTs = await zip.file("app/index.ts")?.async("string");
+
+    expect(indexTs).toBeTruthy();
+    expect(indexTs).toContain(
+      'import * as handlerModule_application_resource_handler from "../application-resource-handler";',
+    );
+    expect(indexTs).toContain("handler: handlerModules[id].handler");
+  });
+});

package/src/__tests__/get-extend-app-data-params-using-workspace-ldsg-module.test.ts

@@ -0,0 +1,109 @@
+import { AppData } from "@ldsg/types";
+import { getExtendAppDataParamsUsingWorkspaceLdsgModule } from "../utils/get-extend-app-data-params-using-workspace-ldsg-module";
+
+/**
+ * 拦截 syncRushProjects，避免测试写入真实 rush.json
+ */
+jest.mock("@ldsg/utils", () => {
+  const actual = jest.requireActual("@ldsg/utils");
+
+  return {
+    ...actual,
+    RUSH_JSON_PATH: "/mock/rush.json",
+    syncRushProjects: jest.fn(),
+  };
+});
+
+import { syncRushProjects, ZipAppDataLayout } from "@ldsg/utils";
+
+const mockedSyncRushProjects = syncRushProjects as jest.Mock;
+
+const handlerId = "handler-1";
+
+const appData: AppData = {
+  resourceRecords: [
+    {
+      id: handlerId,
+      kind: "handler",
+      parentId: "root",
+      settings: {
+        slug: "handler-1",
+        title: "应用实例化资源处理程序",
+        description: "",
+        code: 'export * from "@ldsg/application";',
+        dependencies: [
+          { name: "@ldsg/application", version: "^1.0.0" },
+          { name: "lodash", version: "^4.17.21" },
+        ],
+      },
+    },
+  ],
+};
+
+describe("getExtendAppDataParamsUsingWorkspaceLdsgModule", () => {
+  beforeEach(() => {
+    mockedSyncRushProjects.mockClear();
+  });
+
+  it("NESTED 布局：app 与 handler 项目文件夹按嵌套结构计算", async () => {
+    const res = await getExtendAppDataParamsUsingWorkspaceLdsgModule({
+      appData,
+      layout: ZipAppDataLayout.NESTED,
+      outputPath: "../../apps/rrm",
+    });
+
+    expect(mockedSyncRushProjects).toHaveBeenCalledWith("/mock/rush.json", [
+      { packageName: "@ldsg/app", projectFolder: "apps/rrm" },
+      { packageName: handlerId, projectFolder: "apps/rrm/handlers/handler-1" },
+    ]);
+
+    const packageJsonFile = res.extraAppData.filesInAppModele.find(
+      (file) => file.path === "package.json",
+    );
+    expect(packageJsonFile).toBeDefined();
+  });
+
+  it("FLAT 布局（默认）：app 在输出根目录 app/ 下，handler 平铺", async () => {
+    await getExtendAppDataParamsUsingWorkspaceLdsgModule({
+      appData,
+      outputPath: "../../generated",
+    });
+
+    expect(mockedSyncRushProjects).toHaveBeenCalledWith("/mock/rush.json", [
+      { packageName: "@ldsg/app", projectFolder: "generated/app" },
+      { packageName: handlerId, projectFolder: "generated/handler-1" },
+    ]);
+  });
+
+  it("NESTED 布局：app 包名使用传入的 appPackageName，且 @ldsg 依赖改为 workspace:*", async () => {
+    const res = await getExtendAppDataParamsUsingWorkspaceLdsgModule({
+      appData,
+      layout: ZipAppDataLayout.NESTED,
+      outputPath: "../../apps/rrm",
+      appPackageName: "@ldsg/rrm",
+    });
+
+    const packageJsonFile = res.extraAppData.filesInAppModele.find(
+      (file) => file.path === "package.json",
+    );
+    expect(packageJsonFile).toBeDefined();
+    expect((packageJsonFile as { data: { name: string } }).data.name).toBe("@ldsg/rrm");
+
+    const handlerRecord = res.appData.resourceRecords.find((record) => record.id === handlerId);
+    expect(handlerRecord).toBeDefined();
+    expect(
+      (
+        handlerRecord as unknown as {
+          settings: { dependencies: { name: string; version: string }[] };
+        }
+      ).settings.dependencies,
+    ).toEqual(
+      expect.arrayContaining([
+        { name: "@ldsg/application", version: "workspace:*" },
+        { name: "lodash", version: "^4.17.21" },
+        { name: "@types/node", version: "^24.1.0" },
+        { name: "typescript", version: "^5.3.3" },
+      ]),
+    );
+  });
+});

package/src/__tests__/json-file-mutator.test.ts

@@ -9,10 +9,30 @@ const mockedFs = fs as jest.Mocked<typeof fs>;
 
 describe("json-file-mutator", () => {
   const arrayRecords: ResourceRecords = [
-    { id: "1", kind: "application", parentId: null, settings: { title: "App1" } },
-    { id: "2", kind: "form", parentId: "1", settings: { title: "Form1" } },
-    { id: "3", kind: "table", parentId: "1", settings: { title: "Table1" } },
-    { id: "4", kind: "field", parentId: "3", settings: { title: "Field1" } },
+    {
+      id: "1",
+      kind: "application",
+      parentId: null,
+      settings: { slug: "app1", title: "App1", description: "" },
+    },
+    {
+      id: "2",
+      kind: "form",
+      parentId: "1",
+      settings: { slug: "form1", title: "Form1", description: "" },
+    },
+    {
+      id: "3",
+      kind: "table",
+      parentId: "1",
+      settings: { slug: "table1", title: "Table1", description: "" },
+    },
+    {
+      id: "4",
+      kind: "field",
+      parentId: "3",
+      settings: { slug: "field1", title: "Field1", description: "" },
+    },
   ];
 
   const arraySourceData: SourceData = {
@@ -49,7 +69,12 @@ describe("json-file-mutator", () => {
     it("should append a new record to array format", async () => {
       mockedFs.readJson.mockResolvedValue([...arrayRecords]);
 
-      const newRecord = { id: "5", kind: "form", parentId: "1", settings: { title: "Form2" } };
+      const newRecord = {
+        id: "5",
+        kind: "form",
+        parentId: "1",
+        settings: { slug: "form2", title: "Form2", description: "" },
+      };
       const result = await appendRecord(arraySourceData, newRecord);
 
       expect(result.record.id).toBe("5");
@@ -64,7 +89,12 @@ describe("json-file-mutator", () => {
     it("should append to object format preserving structure", async () => {
       mockedFs.readJson.mockResolvedValue({ resourceRecords: [...arrayRecords] });
 
-      const newRecord = { id: "5", kind: "form", parentId: "1", settings: {} };
+      const newRecord = {
+        id: "5",
+        kind: "form",
+        parentId: "1",
+        settings: { slug: "form2", title: "Form2", description: "" },
+      };
       await appendRecord(objectSourceData, newRecord);
 
       expect(mockedFs.writeJson).toHaveBeenCalledWith(
@@ -77,12 +107,22 @@ describe("json-file-mutator", () => {
     });
 
     it("should throw on duplicate id", async () => {
-      const dupRecord = { id: "1", kind: "application", parentId: null, settings: {} };
+      const dupRecord = {
+        id: "1",
+        kind: "application",
+        parentId: null,
+        settings: { slug: "app1", title: "App1", description: "" },
+      };
       await expect(appendRecord(arraySourceData, dupRecord)).rejects.toThrow("already exists");
     });
 
     it("should not write file in dry-run mode", async () => {
-      const newRecord = { id: "5", kind: "form", parentId: "1", settings: {} };
+      const newRecord = {
+        id: "5",
+        kind: "form",
+        parentId: "1",
+        settings: { slug: "form2", title: "Form2", description: "" },
+      };
       await appendRecord(arraySourceData, newRecord, true);
 
       expect(mockedFs.writeJson).not.toHaveBeenCalled();
@@ -98,7 +138,12 @@ describe("json-file-mutator", () => {
         newField: "value",
       });
 
-      expect(result.record.settings).toEqual({ title: "Updated App", newField: "value" });
+      expect(result.record.settings).toEqual({
+        slug: "app1",
+        title: "Updated App",
+        description: "",
+        newField: "value",
+      });
       expect(mockedFs.writeJson).toHaveBeenCalled();
     });