@ldsg/utils 0.3.37 → 0.3.40

package/dist/common/utils/zip-app-data/utils/generate-app-index-ts.d.ts

@@ -0,0 +1,23 @@
+import { HandlerResourceSettings } from "@ldsg/handler";
+import { ResourceRecords } from "@ldsg/types";
+export interface GenerateAppIndexTsParams {
+    /**
+     * Handler 资源记录
+     */
+    handlerResourceRecords: ResourceRecords<HandlerResourceSettings>;
+    /**
+     * 根据 handler id 生成其在 app 入口文件中的相对导入路径
+     * - FLAT:  `../<id>`
+     * - NESTED: `./handlers/<id>`
+     */
+    getHandlerImportPath: (handlerId: string) => string;
+}
+/**
+ * 生成应用入口文件（app/index.ts）
+ *
+ * 将 handler 引入 app 并放入相应 handler 资源中：
+ * 1. 静态 import 每个 handler 模块
+ * 2. 把模块导出的 handler 注入到对应 handler 资源记录的 settings.handler
+ *    使运行时无需通过 require(moduleId) 动态加载 handler 模块
+ */
+export declare const generateAppIndexTs: (params: GenerateAppIndexTsParams) => string;

package/dist/common/utils/zip-app-data/utils/index.d.ts

@@ -1,2 +1,3 @@
 export * from "./add-file-to-zip-folder";
+export * from "./generate-app-index-ts";
 export * from "./get-handler-package-json";

package/dist/fetch-app-data.d.ts

@@ -1,12 +1,10 @@
 import { AppData, ResourceRecords } from "@ldsg/types";
 export interface LoadAppResourceRecordsParams {
     appDataUri?: string;
-    apaasAppDataUri?: string;
-    apaasAppDataExpression?: string;
+    appDataExpression?: string;
 }
 export interface LoadAppResourceRecordsRes {
     resourceRecords: ResourceRecords;
-    sourceType: "apaas" | "runtime";
 }
 export declare const loadAppResourceRecords: (params: LoadAppResourceRecordsParams) => Promise<LoadAppResourceRecordsRes>;
 export interface FetchAppDataParams {

package/dist/index.cjs

@@ -40,6 +40,7 @@ __webpack_require__.d(__webpack_exports__, {
     instantiateServices: ()=>instantiateServices,
     RUSH_JSON_PATH: ()=>RUSH_JSON_PATH,
     addFileToZipFolder: ()=>addFileToZipFolder,
+    generateAppIndexTs: ()=>generateAppIndexTs,
     getTreeResourceRecords: ()=>getTreeResourceRecords,
     zipAppData: ()=>zipAppData,
     fetchAppData: ()=>fetchAppData,
@@ -111,7 +112,6 @@ function syncRushProjects(rushJsonPath, generatedProjects) {
         spaces: 2
     });
 }
-const apaas_constants_namespaceObject = require("@ldsg/apaas-constants");
 const constants_namespaceObject = require("@ldsg/constants");
 const external_jszip_namespaceObject = require("jszip");
 var external_jszip_default = /*#__PURE__*/ __webpack_require__.n(external_jszip_namespaceObject);
@@ -126,6 +126,66 @@ const addFileToZipFolder = (params)=>{
     const { folder, path, data } = params;
     folder.file(path, external_lodash_default().isObject(data) ? JSON.stringify(data, null, 2) : data);
 };
+const normalizeHandlerAlias = (handlerId)=>handlerId.replace(/[^a-zA-Z0-9_$]/g, "_");
+const generateAppIndexTs = (params)=>{
+    const { handlerResourceRecords, getHandlerImportPath } = params;
+    const handlerImports = handlerResourceRecords.map((resourceRecord)=>{
+        const { id } = resourceRecord;
+        const alias = `handlerModule_${normalizeHandlerAlias(id)}`;
+        const handlerImportPath = id;
+        return `import * as ${alias} from "${handlerImportPath}";`;
+    });
+    const handlerModulesEntries = handlerResourceRecords.map((resourceRecord)=>{
+        const { id } = resourceRecord;
+        const alias = `handlerModule_${normalizeHandlerAlias(id)}`;
+        return `  ${JSON.stringify(id)}: ${alias},`;
+    });
+    const res = `import { createApp } from "@ldsg/create-app";
+import MANIFEST_JSON from "./manifest.json" with { type: "json" };
+${handlerImports.length ? `${handlerImports.join("\n")}\n` : ""}const { resourceRecords } = MANIFEST_JSON as any;
+
+const handlerModules: Record<string, any> = {
+${handlerModulesEntries.join("\n")}
+};
+
+/**
+ * 将 handler 引入 app 并放入相应 handler 资源中
+ * 使运行时无需通过 require(moduleId) 动态加载 handler 模块
+ */
+const wiredResourceRecords = (resourceRecords as any[]).map((resourceRecord: any) => {
+  const { kind, id, settings } = resourceRecord;
+
+  if (kind === "handler" && handlerModules[id]) {
+    return {
+      ...resourceRecord,
+      settings: {
+        ...settings,
+        handler: handlerModules[id].handler,
+      },
+    };
+  }
+
+  return resourceRecord;
+});
+
+const start = async () => {
+  const app = await createApp({
+    resourceRecords: wiredResourceRecords,
+  });
+
+  const port = process.env.PORT || "3253";
+
+  app.listen(port, () => {
+    console.log(\`App listening on http://localhost:\${port}\`);
+
+    console.log(\`GraphQL listening on http://localhost:\${port}/graphql\`);
+  });
+};
+
+start();
+`;
+    return res;
+};
 const getHandlerPackageJson = (params)=>{
     const { moduleName, dependencies, reuseMainAppDependencies, packageJson } = params;
     external_lodash_default().set(packageJson, "name", moduleName);
@@ -144,7 +204,7 @@ const zipAppData = async (params)=>{
     const rootZip = new (external_jszip_default())();
     const handlerResourceRecords = resourceRecords.filter((resourceRecord)=>{
         const { kind } = resourceRecord;
-        return kind === apaas_constants_namespaceObject.ApaasResourceKind.HANDLER;
+        return "handler" === kind;
     });
     let appModuleFolder;
     let handlerModuleParentFolder;
@@ -168,6 +228,15 @@ const zipAppData = async (params)=>{
             case "manifest.json":
                 data = external_lodash_default().pick(params, "resourceRecords");
                 break;
+            case "index.ts":
+                data = generateAppIndexTs({
+                    handlerResourceRecords,
+                    getHandlerImportPath: (handlerId)=>{
+                        if (layout === constants_ZipAppDataLayout.FLAT) return `../${handlerId}`;
+                        return `./${DEFAULT_HANDLER_MODULE_PARENT_DIR_NAME}/${handlerId}`;
+                    }
+                });
+                break;
             case ".env":
                 if (environmentVariables) data = external_lodash_default().toPairs(environmentVariables).map((value)=>value.join("=")).join("\n");
                 break;
@@ -258,7 +327,8 @@ var external_jsonata_default = /*#__PURE__*/ __webpack_require__.n(external_json
 const readSourceData = async (uri)=>{
     if (external_lodash_default().startsWith(uri, "http")) {
         const axiosRes = await external_axios_default()({
-            url: uri
+            url: uri,
+            timeout: 60000
         });
         return axiosRes.data;
     }
@@ -266,29 +336,12 @@ const readSourceData = async (uri)=>{
     return external_fs_extra_default().readJson(external_path_default().resolve(process.cwd(), uri));
 };
 const loadAppResourceRecords = async (params)=>{
-    const { appDataUri, apaasAppDataUri, apaasAppDataExpression } = params;
-    if (apaasAppDataUri) {
-        const rawData = await readSourceData(apaasAppDataUri);
-        const expression = apaasAppDataExpression || "$";
-        const exp = external_jsonata_default()(expression);
-        const appData = await exp.evaluate(rawData);
-        const { resourceRecords } = appData;
-        const apaasRecords = resourceRecords.map((record)=>({
-                id: record.id,
-                kind: record.kind,
-                parentId: record.parentId ?? null,
-                settings: record.settings ?? {}
-            }));
-        return {
-            resourceRecords: apaasRecords,
-            sourceType: "apaas"
-        };
-    }
-    if (!appDataUri) throw new Error("Missing appDataUri or apaasAppDataUri");
-    const appData = await readSourceData(appDataUri);
+    const { appDataUri, appDataExpression } = params;
+    if (!appDataUri) throw new Error("Missing appDataUri");
+    const rawData = await readSourceData(appDataUri);
+    const appData = appDataExpression ? await external_jsonata_default()(appDataExpression).evaluate(rawData) : rawData;
     return {
-        resourceRecords: appData.resourceRecords,
-        sourceType: "runtime"
+        resourceRecords: appData.resourceRecords
     };
 };
 const fetchAppData = async (params)=>{
@@ -404,6 +457,7 @@ exports.extendAppData = __webpack_exports__.extendAppData;
 exports.extendAppDataWithPath = __webpack_exports__.extendAppDataWithPath;
 exports.fetchAppData = __webpack_exports__.fetchAppData;
 exports.generate = __webpack_exports__.generate;
+exports.generateAppIndexTs = __webpack_exports__.generateAppIndexTs;
 exports.generateByAppData = __webpack_exports__.generateByAppData;
 exports.getAppData = __webpack_exports__.getAppData;
 exports.getHandlerPackageJson = __webpack_exports__.getHandlerPackageJson;
@@ -426,6 +480,7 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "extendAppDataWithPath",
     "fetchAppData",
     "generate",
+    "generateAppIndexTs",
     "generateByAppData",
     "getAppData",
     "getHandlerPackageJson",

package/dist/index.js

@@ -2,7 +2,6 @@ import { Service } from "@ldsg/core";
 import fs_extra from "fs-extra";
 import lodash from "lodash";
 import path_0 from "path";
-import { ApaasResourceKind } from "@ldsg/apaas-constants";
 import { FILES_IN_APP_TEMPLATE_MODULE, FILES_IN_HANDLER_TEMPLATE_MODULE } from "@ldsg/constants";
 import jszip from "jszip";
 import axios from "axios";
@@ -68,6 +67,66 @@ const addFileToZipFolder = (params)=>{
     const { folder, path, data } = params;
     folder.file(path, lodash.isObject(data) ? JSON.stringify(data, null, 2) : data);
 };
+const normalizeHandlerAlias = (handlerId)=>handlerId.replace(/[^a-zA-Z0-9_$]/g, "_");
+const generateAppIndexTs = (params)=>{
+    const { handlerResourceRecords, getHandlerImportPath } = params;
+    const handlerImports = handlerResourceRecords.map((resourceRecord)=>{
+        const { id } = resourceRecord;
+        const alias = `handlerModule_${normalizeHandlerAlias(id)}`;
+        const handlerImportPath = id;
+        return `import * as ${alias} from "${handlerImportPath}";`;
+    });
+    const handlerModulesEntries = handlerResourceRecords.map((resourceRecord)=>{
+        const { id } = resourceRecord;
+        const alias = `handlerModule_${normalizeHandlerAlias(id)}`;
+        return `  ${JSON.stringify(id)}: ${alias},`;
+    });
+    const res = `import { createApp } from "@ldsg/create-app";
+import MANIFEST_JSON from "./manifest.json" with { type: "json" };
+${handlerImports.length ? `${handlerImports.join("\n")}\n` : ""}const { resourceRecords } = MANIFEST_JSON as any;
+
+const handlerModules: Record<string, any> = {
+${handlerModulesEntries.join("\n")}
+};
+
+/**
+ * 将 handler 引入 app 并放入相应 handler 资源中
+ * 使运行时无需通过 require(moduleId) 动态加载 handler 模块
+ */
+const wiredResourceRecords = (resourceRecords as any[]).map((resourceRecord: any) => {
+  const { kind, id, settings } = resourceRecord;
+
+  if (kind === "handler" && handlerModules[id]) {
+    return {
+      ...resourceRecord,
+      settings: {
+        ...settings,
+        handler: handlerModules[id].handler,
+      },
+    };
+  }
+
+  return resourceRecord;
+});
+
+const start = async () => {
+  const app = await createApp({
+    resourceRecords: wiredResourceRecords,
+  });
+
+  const port = process.env.PORT || "3253";
+
+  app.listen(port, () => {
+    console.log(\`App listening on http://localhost:\${port}\`);
+
+    console.log(\`GraphQL listening on http://localhost:\${port}/graphql\`);
+  });
+};
+
+start();
+`;
+    return res;
+};
 const getHandlerPackageJson = (params)=>{
     const { moduleName, dependencies, reuseMainAppDependencies, packageJson } = params;
     lodash.set(packageJson, "name", moduleName);
@@ -86,7 +145,7 @@ const zipAppData = async (params)=>{
     const rootZip = new jszip();
     const handlerResourceRecords = resourceRecords.filter((resourceRecord)=>{
         const { kind } = resourceRecord;
-        return kind === ApaasResourceKind.HANDLER;
+        return "handler" === kind;
     });
     let appModuleFolder;
     let handlerModuleParentFolder;
@@ -110,6 +169,15 @@ const zipAppData = async (params)=>{
             case "manifest.json":
                 data = lodash.pick(params, "resourceRecords");
                 break;
+            case "index.ts":
+                data = generateAppIndexTs({
+                    handlerResourceRecords,
+                    getHandlerImportPath: (handlerId)=>{
+                        if (layout === constants_ZipAppDataLayout.FLAT) return `../${handlerId}`;
+                        return `./${DEFAULT_HANDLER_MODULE_PARENT_DIR_NAME}/${handlerId}`;
+                    }
+                });
+                break;
             case ".env":
                 if (environmentVariables) data = lodash.toPairs(environmentVariables).map((value)=>value.join("=")).join("\n");
                 break;
@@ -196,7 +264,8 @@ const extendAppDataWithPath = async (params)=>{
 const readSourceData = async (uri)=>{
     if (lodash.startsWith(uri, "http")) {
         const axiosRes = await axios({
-            url: uri
+            url: uri,
+            timeout: 60000
         });
         return axiosRes.data;
     }
@@ -204,29 +273,12 @@ const readSourceData = async (uri)=>{
     return fs_extra.readJson(path_0.resolve(process.cwd(), uri));
 };
 const loadAppResourceRecords = async (params)=>{
-    const { appDataUri, apaasAppDataUri, apaasAppDataExpression } = params;
-    if (apaasAppDataUri) {
-        const rawData = await readSourceData(apaasAppDataUri);
-        const expression = apaasAppDataExpression || "$";
-        const exp = jsonata(expression);
-        const appData = await exp.evaluate(rawData);
-        const { resourceRecords } = appData;
-        const apaasRecords = resourceRecords.map((record)=>({
-                id: record.id,
-                kind: record.kind,
-                parentId: record.parentId ?? null,
-                settings: record.settings ?? {}
-            }));
-        return {
-            resourceRecords: apaasRecords,
-            sourceType: "apaas"
-        };
-    }
-    if (!appDataUri) throw new Error("Missing appDataUri or apaasAppDataUri");
-    const appData = await readSourceData(appDataUri);
+    const { appDataUri, appDataExpression } = params;
+    if (!appDataUri) throw new Error("Missing appDataUri");
+    const rawData = await readSourceData(appDataUri);
+    const appData = appDataExpression ? await jsonata(appDataExpression).evaluate(rawData) : rawData;
     return {
-        resourceRecords: appData.resourceRecords,
-        sourceType: "runtime"
+        resourceRecords: appData.resourceRecords
     };
 };
 const fetchAppData = async (params)=>{
@@ -331,4 +383,4 @@ const replaceResourceIds = (params)=>{
     return res;
 };
 var __webpack_exports__DEFAULT_APP_MODULE_DIR_NAME = "app";
-export { DEFAULT_APP_MODULE_HANDLER_DEPENDENCY_VERSION_TEMPLATE, DEFAULT_HANDLER_MODULE_PARENT_DIR_NAME, RUSH_JSON_PATH, constants_ZipAppDataLayout as ZipAppDataLayout, addFileToZipFolder, extendAppData, extendAppDataWithPath, fetchAppData, generate, generateByAppData, getAppData, getHandlerPackageJson, getTreeResourceRecords, instantiate_service_instantiateService as instantiateService, instantiateServices, loadAppResourceRecords, prepare, replaceResourceIds, syncRushProjects, zipAppData, __webpack_exports__DEFAULT_APP_MODULE_DIR_NAME as DEFAULT_APP_MODULE_DIR_NAME };
+export { DEFAULT_APP_MODULE_HANDLER_DEPENDENCY_VERSION_TEMPLATE, DEFAULT_HANDLER_MODULE_PARENT_DIR_NAME, RUSH_JSON_PATH, constants_ZipAppDataLayout as ZipAppDataLayout, addFileToZipFolder, extendAppData, extendAppDataWithPath, fetchAppData, generate, generateAppIndexTs, generateByAppData, getAppData, getHandlerPackageJson, getTreeResourceRecords, instantiate_service_instantiateService as instantiateService, instantiateServices, loadAppResourceRecords, prepare, replaceResourceIds, syncRushProjects, zipAppData, __webpack_exports__DEFAULT_APP_MODULE_DIR_NAME as DEFAULT_APP_MODULE_DIR_NAME };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ldsg/utils",
-  "version": "0.3.37",
+  "version": "0.3.40",
   "description": "",
   "license": "MIT",
   "author": "wanxger",
@@ -36,11 +36,10 @@
     "jsonata": "2.2.2",
     "jszip": "^3.10.1",
     "lodash": "^4.17.21",
-    "@ldsg/apaas-constants": "0.3.37",
-    "@ldsg/constants": "0.3.37",
-    "@ldsg/core": "0.3.37",
-    "@ldsg/types": "0.3.37",
-    "@ldsg/handler": "0.3.37"
+    "@ldsg/core": "0.3.40",
+    "@ldsg/handler": "0.3.40",
+    "@ldsg/types": "0.3.40",
+    "@ldsg/constants": "0.3.40"
   },
   "devDependencies": {
     "@rslib/core": "^0.17.1",