@ldsg/utils 0.3.26 → 0.3.28

package/dist/common/utils/index.d.ts

@@ -1,3 +1,4 @@
 export * from './instantiate-service';
 export * from './instantiate-services';
+export * from './sync-rush-projects';
 export * from './zip-app-data';

package/dist/common/utils/sync-rush-projects.d.ts

@@ -0,0 +1,6 @@
+export declare const RUSH_JSON_PATH: string;
+export interface RushProject {
+    packageName: string;
+    projectFolder: string;
+}
+export declare function syncRushProjects(rushJsonPath: string, generatedProjects: RushProject[]): void;

package/dist/index.cjs

@@ -38,15 +38,17 @@ __webpack_require__.d(__webpack_exports__, {
     generate: ()=>generate,
     generateByAppData: ()=>generateByAppData,
     instantiateServices: ()=>instantiateServices,
+    RUSH_JSON_PATH: ()=>RUSH_JSON_PATH,
     addFileToZipFolder: ()=>addFileToZipFolder,
     getTreeResourceRecords: ()=>getTreeResourceRecords,
     zipAppData: ()=>zipAppData,
     fetchAppData: ()=>fetchAppData,
-    instantiateService: ()=>instantiate_service_instantiateService,
+    extendAppData: ()=>extendAppData,
     getAppData: ()=>getAppData,
     getHandlerPackageJson: ()=>getHandlerPackageJson,
-    extendAppData: ()=>extendAppData,
     extendAppDataWithPath: ()=>extendAppDataWithPath,
+    instantiateService: ()=>instantiate_service_instantiateService,
+    syncRushProjects: ()=>syncRushProjects,
     DEFAULT_HANDLER_MODULE_PARENT_DIR_NAME: ()=>DEFAULT_HANDLER_MODULE_PARENT_DIR_NAME,
     prepare: ()=>prepare,
     replaceResourceIds: ()=>replaceResourceIds,
@@ -91,12 +93,28 @@ const instantiate_service_instantiateService = (params)=>{
     };
     return res;
 };
+const external_fs_extra_namespaceObject = require("fs-extra");
+var external_fs_extra_default = /*#__PURE__*/ __webpack_require__.n(external_fs_extra_namespaceObject);
+const external_lodash_namespaceObject = require("lodash");
+var external_lodash_default = /*#__PURE__*/ __webpack_require__.n(external_lodash_namespaceObject);
+const external_path_namespaceObject = require("path");
+var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
+const RUSH_JSON_PATH = external_path_default().resolve(process.cwd(), '../../rush.json');
+function syncRushProjects(rushJsonPath, generatedProjects) {
+    const rushJson = external_fs_extra_default().readJsonSync(rushJsonPath);
+    const nonGenerated = rushJson.projects.filter((p)=>!p.projectFolder.startsWith('generated/'));
+    rushJson.projects = external_lodash_default().sortBy(external_lodash_default().uniqBy([
+        ...nonGenerated,
+        ...generatedProjects
+    ], 'projectFolder'), 'projectFolder');
+    external_fs_extra_default().writeJsonSync(rushJsonPath, rushJson, {
+        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);
-const external_lodash_namespaceObject = require("lodash");
-var external_lodash_default = /*#__PURE__*/ __webpack_require__.n(external_lodash_namespaceObject);
 const DEFAULT_APP_MODULE_HANDLER_DEPENDENCY_VERSION_TEMPLATE = 'workspace:*';
 const DEFAULT_HANDLER_MODULE_PARENT_DIR_NAME = 'handlers';
 var constants_ZipAppDataLayout = /*#__PURE__*/ function(ZipAppDataLayout) {
@@ -147,24 +165,6 @@ const zipAppData = async (params)=>{
         const { path } = file;
         let data;
         switch(path){
-            case 'package.json':
-                {
-                    const packageJson = file.data;
-                    data = {
-                        ...packageJson,
-                        dependencies: {
-                            ...external_lodash_default().fromPairs(handlerResourceRecords.map((handlerResourceRecord)=>{
-                                const { id: moduleName } = handlerResourceRecord;
-                                return [
-                                    moduleName,
-                                    appModuleHandlerDependencyVersionTemplate.replace('MODULE_NAME', moduleName)
-                                ];
-                            })),
-                            ...packageJson.dependencies
-                        }
-                    };
-                    break;
-                }
             case 'manifest.json':
                 data = external_lodash_default().pick(params, 'resourceRecords');
                 break;
@@ -238,8 +238,6 @@ const extendAppData = (params)=>{
     };
     return res;
 };
-const external_fs_extra_namespaceObject = require("fs-extra");
-var external_fs_extra_default = /*#__PURE__*/ __webpack_require__.n(external_fs_extra_namespaceObject);
 const extendAppDataWithPath = async (params)=>{
     const { appData, extraAppDataPath } = params;
     let extraAppData = {};
@@ -257,8 +255,6 @@ const external_axios_namespaceObject = require("axios");
 var external_axios_default = /*#__PURE__*/ __webpack_require__.n(external_axios_namespaceObject);
 const external_jsonata_namespaceObject = require("jsonata");
 var external_jsonata_default = /*#__PURE__*/ __webpack_require__.n(external_jsonata_namespaceObject);
-const external_path_namespaceObject = require("path");
-var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
 const readSourceData = async (uri)=>{
     if (external_lodash_default().startsWith(uri, 'http')) {
         const axiosRes = await external_axios_default()({
@@ -271,8 +267,16 @@ const readSourceData = async (uri)=>{
 };
 const normalizeSourceData = async (rawData, expression)=>{
     if (expression) {
+        console.debug("normalizeSourceData expression",expression)
+
         const exp = external_jsonata_default()(expression);
-        return await exp.evaluate(rawData);
+
+        console.debug("normalizeSourceData exp",exp)
+        const res = await exp.evaluate(rawData);
+
+        console.debug("normalizeSourceData res",res)
+
+        return res
     }
     return rawData;
 };
@@ -280,7 +284,10 @@ const loadAppResourceRecords = async (params)=>{
     const { appDataUri, apaasAppDataUri, apaasAppDataExpression } = params;
     if (apaasAppDataUri) {
         const rawData = await readSourceData(apaasAppDataUri);
+        console.debug("loadAppResourceRecords rawData",rawData)
+        console.debug("loadAppResourceRecords apaasAppDataExpression",apaasAppDataExpression)
         const { resourceRecords } = await normalizeSourceData(rawData, apaasAppDataExpression);
+        console.debug("loadAppResourceRecords resourceRecords",resourceRecords)
         const apaasRecords = resourceRecords.map((record)=>({
                 id: record.id,
                 kind: record.kind,
@@ -398,6 +405,7 @@ const replaceResourceIds = (params)=>{
 exports.DEFAULT_APP_MODULE_DIR_NAME = __webpack_exports__.DEFAULT_APP_MODULE_DIR_NAME;
 exports.DEFAULT_APP_MODULE_HANDLER_DEPENDENCY_VERSION_TEMPLATE = __webpack_exports__.DEFAULT_APP_MODULE_HANDLER_DEPENDENCY_VERSION_TEMPLATE;
 exports.DEFAULT_HANDLER_MODULE_PARENT_DIR_NAME = __webpack_exports__.DEFAULT_HANDLER_MODULE_PARENT_DIR_NAME;
+exports.RUSH_JSON_PATH = __webpack_exports__.RUSH_JSON_PATH;
 exports.ZipAppDataLayout = __webpack_exports__.ZipAppDataLayout;
 exports.addFileToZipFolder = __webpack_exports__.addFileToZipFolder;
 exports.extendAppData = __webpack_exports__.extendAppData;
@@ -413,11 +421,13 @@ exports.instantiateServices = __webpack_exports__.instantiateServices;
 exports.loadAppResourceRecords = __webpack_exports__.loadAppResourceRecords;
 exports.prepare = __webpack_exports__.prepare;
 exports.replaceResourceIds = __webpack_exports__.replaceResourceIds;
+exports.syncRushProjects = __webpack_exports__.syncRushProjects;
 exports.zipAppData = __webpack_exports__.zipAppData;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "DEFAULT_APP_MODULE_DIR_NAME",
     "DEFAULT_APP_MODULE_HANDLER_DEPENDENCY_VERSION_TEMPLATE",
     "DEFAULT_HANDLER_MODULE_PARENT_DIR_NAME",
+    "RUSH_JSON_PATH",
     "ZipAppDataLayout",
     "addFileToZipFolder",
     "extendAppData",
@@ -433,6 +443,7 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "loadAppResourceRecords",
     "prepare",
     "replaceResourceIds",
+    "syncRushProjects",
     "zipAppData"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

package/dist/index.js

@@ -1,12 +1,12 @@
 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 lodash from "lodash";
-import fs_extra from "fs-extra";
 import axios from "axios";
 import jsonata from "jsonata";
-import path_0 from "path";
 import adm_zip from "adm-zip";
 const instantiateServices = (params)=>{
     const { serviceRecords, instantiateService = instantiate_service_instantiateService, serviceTypeMap } = params;
@@ -45,6 +45,18 @@ const instantiate_service_instantiateService = (params)=>{
     };
     return res;
 };
+const RUSH_JSON_PATH = path_0.resolve(process.cwd(), '../../rush.json');
+function syncRushProjects(rushJsonPath, generatedProjects) {
+    const rushJson = fs_extra.readJsonSync(rushJsonPath);
+    const nonGenerated = rushJson.projects.filter((p)=>!p.projectFolder.startsWith('generated/'));
+    rushJson.projects = lodash.sortBy(lodash.uniqBy([
+        ...nonGenerated,
+        ...generatedProjects
+    ], 'projectFolder'), 'projectFolder');
+    fs_extra.writeJsonSync(rushJsonPath, rushJson, {
+        spaces: 2
+    });
+}
 const DEFAULT_APP_MODULE_HANDLER_DEPENDENCY_VERSION_TEMPLATE = 'workspace:*';
 const DEFAULT_HANDLER_MODULE_PARENT_DIR_NAME = 'handlers';
 var constants_ZipAppDataLayout = /*#__PURE__*/ function(ZipAppDataLayout) {
@@ -95,24 +107,6 @@ const zipAppData = async (params)=>{
         const { path } = file;
         let data;
         switch(path){
-            case 'package.json':
-                {
-                    const packageJson = file.data;
-                    data = {
-                        ...packageJson,
-                        dependencies: {
-                            ...lodash.fromPairs(handlerResourceRecords.map((handlerResourceRecord)=>{
-                                const { id: moduleName } = handlerResourceRecord;
-                                return [
-                                    moduleName,
-                                    appModuleHandlerDependencyVersionTemplate.replace('MODULE_NAME', moduleName)
-                                ];
-                            })),
-                            ...packageJson.dependencies
-                        }
-                    };
-                    break;
-                }
             case 'manifest.json':
                 data = lodash.pick(params, 'resourceRecords');
                 break;
@@ -334,4 +328,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, constants_ZipAppDataLayout as ZipAppDataLayout, addFileToZipFolder, extendAppData, extendAppDataWithPath, fetchAppData, generate, generateByAppData, getAppData, getHandlerPackageJson, getTreeResourceRecords, instantiate_service_instantiateService as instantiateService, instantiateServices, loadAppResourceRecords, prepare, replaceResourceIds, 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, 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.26",
+  "version": "0.3.28",
   "description": "",
   "license": "MIT",
   "author": "wanxger",
@@ -33,11 +33,11 @@
     "jsonata": "^2.0.6",
     "jszip": "^3.10.1",
     "lodash": "^4.17.21",
-    "@ldsg/apaas-constants": "0.3.26",
-    "@ldsg/core": "0.3.26",
-    "@ldsg/types": "0.3.26",
-    "@ldsg/constants": "0.3.26",
-    "@ldsg/handler": "0.3.26"
+    "@ldsg/constants": "0.3.28",
+    "@ldsg/apaas-constants": "0.3.28",
+    "@ldsg/handler": "0.3.28",
+    "@ldsg/core": "0.3.28",
+    "@ldsg/types": "0.3.28"
   },
   "devDependencies": {
     "@rslib/core": "^0.17.1",