@ldsg/cli 0.3.47 → 0.3.49

package/CHANGELOG.json

@@ -1,6 +1,64 @@
 {
   "name": "@ldsg/cli",
   "entries": [
+    {
+      "version": "0.3.49",
+      "tag": "@ldsg/cli_v0.3.49",
+      "date": "Thu, 05 Nov 2026 00:13:54 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "发布更新"
+          }
+        ],
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@ldsg/generator-app\" to `0.3.49`"
+          },
+          {
+            "comment": "Updating dependency \"@ldsg/handler\" to `0.3.49`"
+          },
+          {
+            "comment": "Updating dependency \"@ldsg/resource\" to `0.3.49`"
+          },
+          {
+            "comment": "Updating dependency \"@ldsg/utils\" to `0.3.49`"
+          },
+          {
+            "comment": "Updating dependency \"@ldsg/types\" to `0.3.49`"
+          }
+        ]
+      }
+    },
+    {
+      "version": "0.3.48",
+      "tag": "@ldsg/cli_v0.3.48",
+      "date": "Wed, 04 Nov 2026 15:43:23 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "发布更新"
+          }
+        ],
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@ldsg/generator-app\" to `0.3.48`"
+          },
+          {
+            "comment": "Updating dependency \"@ldsg/handler\" to `0.3.48`"
+          },
+          {
+            "comment": "Updating dependency \"@ldsg/resource\" to `0.3.48`"
+          },
+          {
+            "comment": "Updating dependency \"@ldsg/utils\" to `0.3.48`"
+          },
+          {
+            "comment": "Updating dependency \"@ldsg/types\" to `0.3.48`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.3.47",
       "tag": "@ldsg/cli_v0.3.47",

package/CHANGELOG.md

@@ -1,6 +1,20 @@
 # Change Log - @ldsg/cli
 
-This log was last generated on Wed, 04 Nov 2026 04:53:36 GMT and should not be manually modified.
+This log was last generated on Thu, 05 Nov 2026 00:13:54 GMT and should not be manually modified.
+
+## 0.3.49
+Thu, 05 Nov 2026 00:13:54 GMT
+
+### Patches
+
+- 发布更新
+
+## 0.3.48
+Wed, 04 Nov 2026 15:43:23 GMT
+
+### Patches
+
+- 发布更新
 
 ## 0.3.47
 Wed, 04 Nov 2026 04:53:36 GMT

package/dist/commands/generate/utils/generate-application/index.js

@@ -6,12 +6,45 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateApplication = void 0;
 const utils_1 = require("@ldsg/utils");
 const fs_extra_1 = __importDefault(require("fs-extra"));
+const lodash_1 = __importDefault(require("lodash"));
 const node_path_1 = __importDefault(require("node:path"));
 const utils_2 = require("./utils");
 const generateApplication = async (params) => {
-    const { outputPath, isZip } = params;
-    const { metaGenerator } = await (0, utils_2.buildMetaGeneratorApp)(params);
-    const { appGenerator } = await (0, utils_2.buildAppGeneratorApp)({ metaGenerator, ...params });
+    const { data, outputPath, isZip } = params;
+    const { resourceRecords: dataResourceRecords } = data;
+    let generatorRequiredResourceRecords;
+    let generatorNames;
+    {
+        const generatorRequiredResourceKinds = ["generator", "generator_app"];
+        generatorRequiredResourceRecords = (0, utils_1.filterRequiredResourceRecords)({
+            requiredResourceKinds: generatorRequiredResourceKinds,
+            resourceRecords: dataResourceRecords,
+        }).requiredResourceRecords;
+        const generatorResourceRecords = lodash_1.default.filter(generatorRequiredResourceRecords, (resourceRecord) => {
+            const { kind } = resourceRecord;
+            return kind === "generator";
+        });
+        generatorNames = lodash_1.default.map(generatorResourceRecords, (resourceRecord) => {
+            const { slug } = resourceRecord.settings;
+            return lodash_1.default.snakeCase(slug);
+        });
+    }
+    let metaGenerator;
+    {
+        const hasMetaGenerator = generatorNames.includes("meta");
+        if (hasMetaGenerator) {
+            const buildMetaGeneratorAppRes = await (0, utils_2.buildMetaGeneratorApp)(params);
+            metaGenerator = buildMetaGeneratorAppRes.metaGenerator;
+        }
+    }
+    let appGenerator;
+    {
+        const hasAppGenerator = generatorNames.includes("app");
+        if (hasAppGenerator) {
+            const buildAppGeneratorAppRes = await (0, utils_2.buildAppGeneratorApp)({ metaGenerator, ...params });
+            appGenerator = buildAppGeneratorAppRes.appGenerator;
+        }
+    }
     const generateAppRes = await (0, utils_2.generateApp)({ appGenerator, ...params });
     {
         const { archive } = generateAppRes;

package/dist/commands/generate/utils/generate-application/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/commands/generate/utils/generate-application/index.ts"],"names":[],"mappings":";;;;;;AAAA,uCAAiD;AACjD,wDAA0B;AAC1B,0DAA6B;AAE7B,mCAAmF;AAa5E,MAAM,mBAAmB,GAAwB,KAAK,EAAE,MAAM,EAAE,EAAE;IACvE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;IAKrC,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,IAAA,6BAAqB,EAAC,MAAM,CAAC,CAAC;IAK9D,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,IAAA,4BAAoB,EAAC,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC;IAKlF,MAAM,cAAc,GAAG,MAAM,IAAA,mBAAW,EAAC,EAAE,YAAY,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC;IAKtE,CAAC;QACC,MAAM,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC;QAEnC,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,aAAa,GAAG,mBAAI,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;YAEvD,MAAM,kBAAE,CAAC,UAAU,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QAC9C,CAAC;aAAM,CAAC;YACN,IAAA,0BAAkB,EAAC,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAhCW,QAAA,mBAAmB,uBAgC9B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/commands/generate/utils/generate-application/index.ts"],"names":[],"mappings":";;;;;;AAAA,uCAAgF;AAChF,wDAA0B;AAC1B,oDAAuB;AACvB,0DAA6B;AAE7B,mCAAmF;AAa5E,MAAM,mBAAmB,GAAwB,KAAK,EAAE,MAAM,EAAE,EAAE;IACvE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;IAE3C,MAAM,EAAE,eAAe,EAAE,mBAAmB,EAAE,GAAG,IAAI,CAAC;IAEtD,IAAI,gCAAiD,CAAC;IAEtD,IAAI,cAAwB,CAAC;IAE7B,CAAC;QAIC,MAAM,8BAA8B,GAAG,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QAEtE,gCAAgC,GAAG,IAAA,qCAA6B,EAAC;YAC/D,qBAAqB,EAAE,8BAA8B;YACrD,eAAe,EAAE,mBAAmB;SACrC,CAAC,CAAC,uBAAuB,CAAC;QAE3B,MAAM,wBAAwB,GAAG,gBAAC,CAAC,MAAM,CACvC,gCAAgC,EAChC,CAAC,cAAc,EAAE,EAAE;YACjB,MAAM,EAAE,IAAI,EAAE,GAAG,cAAc,CAAC;YAEhC,OAAO,IAAI,KAAK,WAAW,CAAC;QAC9B,CAAC,CACF,CAAC;QAEF,cAAc,GAAG,gBAAC,CAAC,GAAG,CAAC,wBAAwB,EAAE,CAAC,cAAc,EAAE,EAAE;YAClE,MAAM,EAAE,IAAI,EAAE,GAAG,cAAc,CAAC,QAAQ,CAAC;YAEzC,OAAO,gBAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,aAAoC,CAAC;IAQzC,CAAC;QAIC,MAAM,gBAAgB,GAAG,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAEzD,IAAI,gBAAgB,EAAE,CAAC;YACrB,MAAM,wBAAwB,GAAG,MAAM,IAAA,6BAAqB,EAAC,MAAM,CAAC,CAAC;YAErE,aAAa,GAAG,wBAAwB,CAAC,aAAa,CAAC;QACzD,CAAC;IACH,CAAC;IAED,IAAI,YAAmC,CAAC;IAQxC,CAAC;QAIC,MAAM,eAAe,GAAG,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAEvD,IAAI,eAAe,EAAE,CAAC;YACpB,MAAM,uBAAuB,GAAG,MAAM,IAAA,4BAAoB,EAAC,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC;YAEzF,YAAY,GAAG,uBAAuB,CAAC,YAAY,CAAC;QACtD,CAAC;IACH,CAAC;IAKD,MAAM,cAAc,GAAG,MAAM,IAAA,mBAAW,EAAC,EAAE,YAAY,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC;IAKtE,CAAC;QACC,MAAM,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC;QAEnC,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,aAAa,GAAG,mBAAI,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;YAEvD,MAAM,kBAAE,CAAC,UAAU,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QAC9C,CAAC;aAAM,CAAC;YACN,IAAA,0BAAkB,EAAC,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAjGW,QAAA,mBAAmB,uBAiG9B"}

package/dist/commands/generate/utils/generate-application/utils/build-app-generator-app/index.d.ts

@@ -1,6 +1,6 @@
 import { GenerateParams, Generator } from "@ldsg/types";
 export interface BuildAppGeneratorAppParams extends GenerateParams {
-    metaGenerator: Generator;
+    metaGenerator?: Generator;
 }
 export interface BuildAppGeneratorAppRes {
     appGenerator: Generator;

package/dist/commands/generate/utils/generate-application/utils/build-app-generator-app/index.js

@@ -7,14 +7,20 @@ exports.buildAppGeneratorApp = void 0;
 const node_os_1 = __importDefault(require("node:os"));
 const node_path_1 = __importDefault(require("node:path"));
 const load_generator_app_1 = require("../load-generator-app");
-const META_GENERATOR_KIND = "meta_generator";
 const buildAppGeneratorApp = async (params) => {
     const { metaGenerator, ...restParams } = params;
-    const { archive } = await metaGenerator.generate({ ...restParams, kind: META_GENERATOR_KIND });
-    const appGenerator = await (0, load_generator_app_1.loadGeneratorApp)({
+    let generateRes;
+    if (metaGenerator) {
+        generateRes = await metaGenerator.generate({ ...restParams });
+    }
+    else {
+    }
+    const { archive } = generateRes;
+    const generatorApp = await (0, load_generator_app_1.loadGeneratorApp)({
         archive,
         outputPath: node_path_1.default.join(node_os_1.default.homedir(), ".ldsg", "app-generator"),
     });
+    const appGenerator = generatorApp.generators["app"];
     const res = {
         appGenerator,
     };

package/dist/commands/generate/utils/generate-application/utils/build-app-generator-app/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../src/commands/generate/utils/generate-application/utils/build-app-generator-app/index.ts"],"names":[],"mappings":";;;;;;AACA,sDAAyB;AACzB,0DAA6B;AAC7B,8DAAyD;AAiBzD,MAAM,mBAAmB,GAAG,gBAAgB,CAAC;AAEtC,MAAM,oBAAoB,GAAyB,KAAK,EAAE,MAAM,EAAE,EAAE;IACzE,MAAM,EAAE,aAAa,EAAE,GAAG,UAAU,EAAE,GAAG,MAAM,CAAC;IAKhD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,aAAa,CAAC,QAAQ,CAAC,EAAE,GAAG,UAAU,EAAE,IAAI,EAAE,mBAAmB,EAAE,CAAC,CAAC;IAE/F,MAAM,YAAY,GAAG,MAAM,IAAA,qCAAgB,EAAC;QAC1C,OAAO;QACP,UAAU,EAAE,mBAAI,CAAC,IAAI,CAAC,iBAAE,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,eAAe,CAAC;KAC9D,CAAC,CAAC;IAEH,MAAM,GAAG,GAA4B;QACnC,YAAY;KACb,CAAC;IAEF,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAlBW,QAAA,oBAAoB,wBAkB/B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../src/commands/generate/utils/generate-application/utils/build-app-generator-app/index.ts"],"names":[],"mappings":";;;;;;AACA,sDAAyB;AACzB,0DAA6B;AAC7B,8DAAyD;AAclD,MAAM,oBAAoB,GAAyB,KAAK,EAAE,MAAM,EAAE,EAAE;IACzE,MAAM,EAAE,aAAa,EAAE,GAAG,UAAU,EAAE,GAAG,MAAM,CAAC;IAEhD,IAAI,WAAwB,CAAC;IAE7B,IAAI,aAAa,EAAE,CAAC;QAIlB,WAAW,GAAG,MAAM,aAAa,CAAC,QAAQ,CAAC,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC;IAChE,CAAC;SAAM,CAAC;IAKR,CAAC;IAED,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;IAEhC,MAAM,YAAY,GAAG,MAAM,IAAA,qCAAgB,EAAC;QAC1C,OAAO;QACP,UAAU,EAAE,mBAAI,CAAC,IAAI,CAAC,iBAAE,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,eAAe,CAAC;KAC9D,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAEpD,MAAM,GAAG,GAA4B;QACnC,YAAY;KACb,CAAC;IAEF,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AA/BW,QAAA,oBAAoB,wBA+B/B"}

package/dist/commands/generate/utils/generate-application/utils/build-meta-generator-app/index.js

@@ -9,11 +9,12 @@ const node_os_1 = __importDefault(require("node:os"));
 const node_path_1 = __importDefault(require("node:path"));
 const load_generator_app_1 = require("../load-generator-app");
 const buildMetaGeneratorApp = async (params) => {
-    const { archive } = await (0, utils_1.generateMetaGeneratorApp)(params);
-    const metaGenerator = await (0, load_generator_app_1.loadGeneratorApp)({
+    const { archive } = await (0, utils_1.generateGeneratorApp)(params);
+    const generatorApp = await (0, load_generator_app_1.loadGeneratorApp)({
         archive,
         outputPath: node_path_1.default.join(node_os_1.default.homedir(), ".ldsg", "meta-generator"),
     });
+    const metaGenerator = generatorApp.generators["meta"];
     const res = {
         metaGenerator,
     };

package/dist/commands/generate/utils/generate-application/utils/build-meta-generator-app/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../src/commands/generate/utils/generate-application/utils/build-meta-generator-app/index.ts"],"names":[],"mappings":";;;;;;AAAA,uCAAuD;AAEvD,sDAAyB;AACzB,0DAA6B;AAC7B,8DAAyD;AAYlD,MAAM,qBAAqB,GAA0B,KAAK,EAAE,MAAM,EAAE,EAAE;IAC3E,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,gCAAwB,EAAC,MAAM,CAAC,CAAC;IAE3D,MAAM,aAAa,GAAG,MAAM,IAAA,qCAAgB,EAAC;QAC3C,OAAO;QACP,UAAU,EAAE,mBAAI,CAAC,IAAI,CAAC,iBAAE,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,gBAAgB,CAAC;KAC/D,CAAC,CAAC;IAEH,MAAM,GAAG,GAA6B;QACpC,aAAa;KACd,CAAC;IAEF,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAbW,QAAA,qBAAqB,yBAahC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../src/commands/generate/utils/generate-application/utils/build-meta-generator-app/index.ts"],"names":[],"mappings":";;;;;;AAAA,uCAAmD;AAEnD,sDAAyB;AACzB,0DAA6B;AAC7B,8DAAyD;AAYlD,MAAM,qBAAqB,GAA0B,KAAK,EAAE,MAAM,EAAE,EAAE;IAC3E,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,4BAAoB,EAAC,MAAM,CAAC,CAAC;IAEvD,MAAM,YAAY,GAAG,MAAM,IAAA,qCAAgB,EAAC;QAC1C,OAAO;QACP,UAAU,EAAE,mBAAI,CAAC,IAAI,CAAC,iBAAE,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,gBAAgB,CAAC;KAC/D,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAEtD,MAAM,GAAG,GAA6B;QACpC,aAAa;KACd,CAAC;IAEF,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAfW,QAAA,qBAAqB,yBAehC"}

package/dist/commands/generate/utils/generate-application/utils/generate-app/index.d.ts

@@ -1,8 +1,6 @@
 import { GenerateParams, GenerateRes, Generator } from "@ldsg/types";
 export interface GenerateAppParams extends GenerateParams {
-    appGenerator: Generator;
+    appGenerator?: Generator;
 }
-export interface GenerateAppRes extends GenerateRes {
-}
-export type GenerateApp = (params: GenerateAppParams) => Promise<GenerateAppRes>;
+export type GenerateApp = (params: GenerateAppParams) => Promise<GenerateRes>;
 export declare const generateApp: GenerateApp;

package/dist/commands/generate/utils/generate-application/utils/generate-app/index.js

@@ -3,7 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateApp = void 0;
 const generateApp = async (params) => {
     const { appGenerator, ...restParams } = params;
-    const res = await appGenerator.generate(restParams);
+    let res;
+    if (appGenerator) {
+        res = await appGenerator.generate({ ...restParams });
+    }
+    else {
+    }
     return res;
 };
 exports.generateApp = generateApp;

package/dist/commands/generate/utils/generate-application/utils/generate-app/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../src/commands/generate/utils/generate-application/utils/generate-app/index.ts"],"names":[],"mappings":";;;AAUO,MAAM,WAAW,GAAgB,KAAK,EAAE,MAAM,EAAE,EAAE;IACvD,MAAM,EAAE,YAAY,EAAE,GAAG,UAAU,EAAE,GAAG,MAAM,CAAC;IAE/C,MAAM,GAAG,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAEpD,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AANW,QAAA,WAAW,eAMtB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../src/commands/generate/utils/generate-application/utils/generate-app/index.ts"],"names":[],"mappings":";;;AAQO,MAAM,WAAW,GAAgB,KAAK,EAAE,MAAM,EAAE,EAAE;IACvD,MAAM,EAAE,YAAY,EAAE,GAAG,UAAU,EAAE,GAAG,MAAM,CAAC;IAE/C,IAAI,GAAgB,CAAC;IAErB,IAAI,YAAY,EAAE,CAAC;QACjB,GAAG,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC;IACvD,CAAC;SAAM,CAAC;IAER,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAZW,QAAA,WAAW,eAYtB"}

package/dist/commands/generate/utils/generate-application/utils/load-generator-app/index.d.ts

@@ -1,7 +1,7 @@
-import { Generator } from "@ldsg/types";
+import { GeneratorApp } from "@ldsg/generator-app";
 export interface LoadGeneratorAppParams {
     archive: Buffer<ArrayBufferLike>;
     outputPath: string;
 }
-export type LoadGeneratorApp = (params: LoadGeneratorAppParams) => Promise<Generator>;
+export type LoadGeneratorApp = (params: LoadGeneratorAppParams) => Promise<GeneratorApp>;
 export declare const loadGeneratorApp: LoadGeneratorApp;

package/dist/commands/generate/utils/generate-application/utils/load-generator-app/index.js

@@ -20,11 +20,10 @@ const loadGeneratorApp = async (params) => {
     const importModule = new Function("specifier", "return import(specifier)");
     const entryPath = node_path_1.default.join(outputPath, "dist", "index.js");
     const entryUrl = `${(0, node_url_1.pathToFileURL)(entryPath).href}?t=${Date.now()}`;
-    const { generate } = (await importModule(entryUrl));
-    const res = {
-        generate,
-    };
-    return res;
+    const { instantiateAppResource } = (await importModule(entryUrl));
+    const appResource = await instantiateAppResource();
+    const { app: generatorApp } = appResource.createGeneratorApp();
+    return generatorApp;
 };
 exports.loadGeneratorApp = loadGeneratorApp;
 //# sourceMappingURL=index.js.map

package/dist/commands/generate/utils/generate-application/utils/load-generator-app/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../src/commands/generate/utils/generate-application/utils/load-generator-app/index.ts"],"names":[],"mappings":";;;;;;AACA,uCAA8F;AAC9F,wDAA0B;AAC1B,0DAA6B;AAC7B,uCAAyC;AAgBlC,MAAM,gBAAgB,GAAqB,KAAK,EAAE,MAAM,EAAE,EAAE;IACjE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC;IAKvC,MAAM,kBAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAE5B,IAAA,0BAAkB,EAAC;QACjB,OAAO;QACP,UAAU;KACX,CAAC,CAAC;IAEH,MAAM,IAAA,2BAAmB,EAAC,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;IAE/C,MAAM,IAAA,8BAAsB,EAAC,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;IAOlD,MAAM,YAAY,GAAG,IAAI,QAAQ,CAAC,WAAW,EAAE,0BAA0B,CAEpD,CAAC;IAEtB,MAAM,SAAS,GAAG,mBAAI,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;IAK5D,MAAM,QAAQ,GAAG,GAAG,IAAA,wBAAa,EAAC,SAAS,CAAC,CAAC,IAAI,MAAM,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;IAEpE,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,YAAY,CAAC,QAAQ,CAAC,CAEjD,CAAC;IAEF,MAAM,GAAG,GAAc;QACrB,QAAQ;KACT,CAAC;IAEF,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AA1CW,QAAA,gBAAgB,oBA0C3B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../src/commands/generate/utils/generate-application/utils/load-generator-app/index.ts"],"names":[],"mappings":";;;;;;AAAA,uCAA8F;AAE9F,wDAA0B;AAC1B,0DAA6B;AAC7B,uCAAyC;AAiBlC,MAAM,gBAAgB,GAAqB,KAAK,EAAE,MAAM,EAAE,EAAE;IACjE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC;IAKvC,MAAM,kBAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAE5B,IAAA,0BAAkB,EAAC;QACjB,OAAO;QACP,UAAU;KACX,CAAC,CAAC;IAEH,MAAM,IAAA,2BAAmB,EAAC,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;IAE/C,MAAM,IAAA,8BAAsB,EAAC,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;IAOlD,MAAM,YAAY,GAAG,IAAI,QAAQ,CAAC,WAAW,EAAE,0BAA0B,CAEpD,CAAC;IAEtB,MAAM,SAAS,GAAG,mBAAI,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;IAK5D,MAAM,QAAQ,GAAG,GAAG,IAAA,wBAAa,EAAC,SAAS,CAAC,CAAC,IAAI,MAAM,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;IAEpE,MAAM,EAAE,sBAAsB,EAAE,GAAG,CAAC,MAAM,YAAY,CAAC,QAAQ,CAAC,CAE/D,CAAC;IAEF,MAAM,WAAW,GAAG,MAAM,sBAAsB,EAAE,CAAC;IAEnD,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,WAAW,CAAC,kBAAkB,EAAE,CAAC;IAE/D,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AA1CW,QAAA,gBAAgB,oBA0C3B"}

package/dist/commands/generate/utils/generate-application/utils/load-generator-app/types.d.ts

@@ -0,0 +1,2 @@
+import { Resource } from "@ldsg/resource";
+export type InstantiateAppResource<T extends Resource> = () => Promise<T>;

package/dist/commands/generate/utils/generate-application/utils/load-generator-app/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/dist/commands/generate/utils/generate-application/utils/load-generator-app/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../../../src/commands/generate/utils/generate-application/utils/load-generator-app/types.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ldsg/cli",
-  "version": "0.3.47",
+  "version": "0.3.49",
   "description": "",
   "keywords": [],
   "license": "ISC",
@@ -17,8 +17,10 @@
     "commander": "^12.0.0",
     "fs-extra": "^11.3.0",
     "js-yaml": "^4.1.0",
-    "@ldsg/handler": "0.3.47",
-    "@ldsg/utils": "0.3.47"
+    "@ldsg/generator-app": "0.3.49",
+    "@ldsg/resource": "0.3.49",
+    "@ldsg/handler": "0.3.49",
+    "@ldsg/utils": "0.3.49"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
@@ -37,7 +39,7 @@
     "ts-node": "^10.9.2",
     "tslib": "^2.8.1",
     "typescript": "^5.3.3",
-    "@ldsg/types": "0.3.47"
+    "@ldsg/types": "0.3.49"
   },
   "scripts": {
     "build": "tsc --project tsconfig.build.json",

package/src/commands/generate/utils/generate-application/index.ts

@@ -1,7 +1,8 @@
-import { extractZipToFolder } from "@ldsg/utils";
+import { extractZipToFolder, filterRequiredResourceRecords } from "@ldsg/utils";
 import fs from "fs-extra";
+import _ from "lodash";
 import path from "node:path";
-import type { GenerateParams } from "@ldsg/types";
+import type { GenerateParams, Generator, ResourceRecords } from "@ldsg/types";
 import { buildAppGeneratorApp, buildMetaGeneratorApp, generateApp } from "./utils";
 
 interface GenerateApplicationParams extends GenerateParams {}
@@ -16,20 +17,85 @@ type GenerateApplication = (params: GenerateApplicationParams) => Promise<void>;
  * 4. 输出压缩包或解压至目标输出路径。
  */
 export const generateApplication: GenerateApplication = async (params) => {
-  const { outputPath, isZip } = params;
+  const { data, outputPath, isZip } = params;
+
+  const { resourceRecords: dataResourceRecords } = data;
+
+  let generatorRequiredResourceRecords: ResourceRecords;
+
+  let generatorNames: string[];
+
+  {
+    /**
+     * 生成器所需资源类型
+     */
+    const generatorRequiredResourceKinds = ["generator", "generator_app"];
+
+    generatorRequiredResourceRecords = filterRequiredResourceRecords({
+      requiredResourceKinds: generatorRequiredResourceKinds,
+      resourceRecords: dataResourceRecords,
+    }).requiredResourceRecords;
+
+    const generatorResourceRecords = _.filter(
+      generatorRequiredResourceRecords,
+      (resourceRecord) => {
+        const { kind } = resourceRecord;
+
+        return kind === "generator";
+      },
+    );
+
+    generatorNames = _.map(generatorResourceRecords, (resourceRecord) => {
+      const { slug } = resourceRecord.settings;
+
+      return _.snakeCase(slug);
+    });
+  }
+
+  let metaGenerator: Generator | undefined;
 
   /**
-   * 1. 基于资源记录，使用此应用（@ldsg/cli）内置能力构建（含生成、依赖安装、构建）元生成器（Meta Generator）；
+   * 1. 基于资源记录，使用此应用（@ldsg/cli）内置能力构建（含生成、依赖安装、构建）元生成器（Meta Generator）：
+   * 1.1. 检查资源记录中，是否有元生成器资源记录；
+   * 1.2. 若有，则使用此应用（@ldsg/cli）内置能力根据元生成器资源记录构建（含生成、依赖安装、构建）元生成器（Meta Generator）；
+   * 1.3. 若没有，则跳过生成元生成器，直接使用默认元生成器。
    */
-  const { metaGenerator } = await buildMetaGeneratorApp(params);
+  {
+    /**
+     * 是否有元生成器
+     */
+    const hasMetaGenerator = generatorNames.includes("meta");
+
+    if (hasMetaGenerator) {
+      const buildMetaGeneratorAppRes = await buildMetaGeneratorApp(params);
+
+      metaGenerator = buildMetaGeneratorAppRes.metaGenerator;
+    }
+  }
+
+  let appGenerator: Generator | undefined;
 
   /**
    * 2. 基于资源记录，使用元生成器（Meta Generator）能力构建（含生成、依赖安装、构建）应用生成器（App Generator）；
+   * 2.1. 检查资源记录中，是否有应用生成器资源记录；
+   * 2.2. 若有，则使用此应用（@ldsg/cli）内置能力根据应用生成器资源记录构建（含生成、依赖安装、构建）应用生成器；
+   * 2.3. 若没有，则跳过生成应用生成器，直接使用默认应用生成器。
    */
-  const { appGenerator } = await buildAppGeneratorApp({ metaGenerator, ...params });
+  {
+    /**
+     * 是否有应用的生成器
+     */
+    const hasAppGenerator = generatorNames.includes("app");
+
+    if (hasAppGenerator) {
+      const buildAppGeneratorAppRes = await buildAppGeneratorApp({ metaGenerator, ...params });
+
+      appGenerator = buildAppGeneratorAppRes.appGenerator;
+    }
+  }
 
   /**
-   * 3. 基于资源记录，使用应用生成器（App Generator）能力生成（仅含生成，不含依赖安装、构建）生成应用（App）压缩包；
+   * 3. 基于资源记录，使用应用生成器（App Generator）能力根据应用资源记录生成（仅含生成，不含依赖安装、构建）生成应用（App）压缩包；
    */
   const generateAppRes = await generateApp({ appGenerator, ...params });
 

package/src/commands/generate/utils/generate-application/utils/build-app-generator-app/index.ts

@@ -1,10 +1,10 @@
-import { GenerateParams, Generator } from "@ldsg/types";
+import { GenerateParams, GenerateRes, Generator } from "@ldsg/types";
 import os from "node:os";
 import path from "node:path";
 import { loadGeneratorApp } from "../load-generator-app";
 
 export interface BuildAppGeneratorAppParams extends GenerateParams {
-  metaGenerator: Generator;
+  metaGenerator?: Generator;
 }
 
 export interface BuildAppGeneratorAppRes {
@@ -15,24 +15,32 @@ export type BuildAppGeneratorApp = (
   params: BuildAppGeneratorAppParams,
 ) => Promise<BuildAppGeneratorAppRes>;
 
-/**
- * 元生成器在生成器集合中的 kind，与默认生成器资源 settings.kind 一致
- */
-const META_GENERATOR_KIND = "meta_generator";
-
 export const buildAppGeneratorApp: BuildAppGeneratorApp = async (params) => {
   const { metaGenerator, ...restParams } = params;
 
-  /**
-   * 使用元生成器生成应用生成器应用
-   */
-  const { archive } = await metaGenerator.generate({ ...restParams, kind: META_GENERATOR_KIND });
+  let generateRes: GenerateRes;
+
+  if (metaGenerator) {
+    /**
+     * 使用元生成器生成应用生成器应用
+     */
+    generateRes = await metaGenerator.generate({ ...restParams });
+  } else {
+    /**
+     * 使用内置通用生成器生成
+     */
+    // generateRes = await generate({ ...restParams });
+  }
 
-  const appGenerator = await loadGeneratorApp({
+  const { archive } = generateRes;
+
+  const generatorApp = await loadGeneratorApp({
     archive,
     outputPath: path.join(os.homedir(), ".ldsg", "app-generator"),
   });
 
+  const appGenerator = generatorApp.generators["app"];
+
   const res: BuildAppGeneratorAppRes = {
     appGenerator,
   };

package/src/commands/generate/utils/generate-application/utils/build-meta-generator-app/index.ts

@@ -1,4 +1,4 @@
-import { generateMetaGeneratorApp } from "@ldsg/utils";
+import { generateGeneratorApp } from "@ldsg/utils";
 import { GenerateParams, Generator } from "@ldsg/types";
 import os from "node:os";
 import path from "node:path";
@@ -15,13 +15,15 @@ export type BuildMetaGeneratorApp = (
 ) => Promise<BuildMetaGeneratorAppRes>;
 
 export const buildMetaGeneratorApp: BuildMetaGeneratorApp = async (params) => {
-  const { archive } = await generateMetaGeneratorApp(params);
+  const { archive } = await generateGeneratorApp(params);
 
-  const metaGenerator = await loadGeneratorApp({
+  const generatorApp = await loadGeneratorApp({
     archive,
     outputPath: path.join(os.homedir(), ".ldsg", "meta-generator"),
   });
 
+  const metaGenerator = generatorApp.generators["meta"];
+
   const res: BuildMetaGeneratorAppRes = {
     metaGenerator,
   };

package/src/commands/generate/utils/generate-application/utils/generate-app/index.ts

@@ -1,17 +1,21 @@
 import { GenerateParams, GenerateRes, Generator } from "@ldsg/types";
 
 export interface GenerateAppParams extends GenerateParams {
-  appGenerator: Generator;
+  appGenerator?: Generator;
 }
 
-export interface GenerateAppRes extends GenerateRes {}
-
-export type GenerateApp = (params: GenerateAppParams) => Promise<GenerateAppRes>;
+export type GenerateApp = (params: GenerateAppParams) => Promise<GenerateRes>;
 
 export const generateApp: GenerateApp = async (params) => {
   const { appGenerator, ...restParams } = params;
 
-  const res = await appGenerator.generate(restParams);
+  let res: GenerateRes;
+
+  if (appGenerator) {
+    res = await appGenerator.generate({ ...restParams });
+  } else {
+    // res = await  generate({ ...restParams });
+  }
 
   return res;
 };

package/src/commands/generate/utils/generate-application/utils/load-generator-app/index.ts

@@ -1,8 +1,9 @@
-import { Generator } from "@ldsg/types";
 import { buildWithPnpmWorkspace, extractZipToFolder, installDependencies } from "@ldsg/utils";
+import { GeneratorApp, GeneratorAppResource } from "@ldsg/generator-app";
 import fs from "fs-extra";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
+import { InstantiateAppResource } from "./types";
 
 export interface LoadGeneratorAppParams {
   archive: Buffer<ArrayBufferLike>;
@@ -13,7 +14,7 @@ export interface LoadGeneratorAppParams {
   outputPath: string;
 }
 
-export type LoadGeneratorApp = (params: LoadGeneratorAppParams) => Promise<Generator>;
+export type LoadGeneratorApp = (params: LoadGeneratorAppParams) => Promise<GeneratorApp>;
 
 /**
  * 解压、安装依赖、构建并加载生成器应用，返回其 generate 能力
@@ -51,13 +52,13 @@ export const loadGeneratorApp: LoadGeneratorApp = async (params) => {
    */
   const entryUrl = `${pathToFileURL(entryPath).href}?t=${Date.now()}`;
 
-  const { generate } = (await importModule(entryUrl)) as {
-    generate: Generator["generate"];
+  const { instantiateAppResource } = (await importModule(entryUrl)) as {
+    instantiateAppResource: InstantiateAppResource<GeneratorAppResource>;
   };
 
-  const res: Generator = {
-    generate,
-  };
+  const appResource = await instantiateAppResource();
+
+  const { app: generatorApp } = appResource.createGeneratorApp();
 
-  return res;
+  return generatorApp;
 };

package/src/commands/generate/utils/generate-application/utils/load-generator-app/types.ts

@@ -0,0 +1,3 @@
+import { Resource } from "@ldsg/resource";
+
+export type InstantiateAppResource<T extends Resource> = () => Promise<T>;