@ldsg/utils 0.3.28 → 0.3.30

package/dist/browser.cjs

@@ -1,5 +1,14 @@
 "use strict";
 var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
+        __webpack_require__.d(getter, {
+            a: getter
+        });
+        return getter;
+    };
+})();
 (()=>{
     __webpack_require__.d = (exports1, definition)=>{
         for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
@@ -55,10 +64,19 @@ const getTreeResourceRecords = (params)=>{
     };
     return res;
 };
+const external_lodash_namespaceObject = require("lodash");
+var external_lodash_default = /*#__PURE__*/ __webpack_require__.n(external_lodash_namespaceObject);
 const replaceResourceIdsInString = (params)=>{
     const { jsonString, oldResourceIdToNewResourceIdMap } = params;
+    const invalidOldResourceIds = external_lodash_default().filter(Object.keys(oldResourceIdToNewResourceIdMap), (id)=>!id || !/^[a-zA-Z0-9_-]+$/.test(id)).map((id)=>id || '(empty)');
+    if (invalidOldResourceIds.length > 0) throw new Error(`Invalid old resource IDs: ${invalidOldResourceIds.join(', ')}. Only [a-zA-Z0-9_-] are allowed and must not be empty.`);
     let result = jsonString;
-    for (const [oldResourceId, newResourceId] of Object.entries(oldResourceIdToNewResourceIdMap))result = result.split(oldResourceId).join(newResourceId);
+    const entries = Object.entries(oldResourceIdToNewResourceIdMap).sort((a, b)=>b[0].length - a[0].length);
+    for (const [oldResourceId, newResourceId] of entries){
+        const escaped = oldResourceId.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+        const regex = new RegExp(`(?<=^|[^a-zA-Z0-9_-])${escaped}(?=$|[^a-zA-Z0-9_-])`, 'g');
+        result = result.replace(regex, newResourceId);
+    }
     const res = {
         jsonString: result
     };

package/dist/browser.js

@@ -1,3 +1,4 @@
+import lodash from "lodash";
 const getTreeResourceRecords = (params)=>{
     const { resourceRecords, rootId } = params;
     const childrenMap = new Map();
@@ -28,8 +29,15 @@ const getTreeResourceRecords = (params)=>{
 };
 const replaceResourceIdsInString = (params)=>{
     const { jsonString, oldResourceIdToNewResourceIdMap } = params;
+    const invalidOldResourceIds = lodash.filter(Object.keys(oldResourceIdToNewResourceIdMap), (id)=>!id || !/^[a-zA-Z0-9_-]+$/.test(id)).map((id)=>id || '(empty)');
+    if (invalidOldResourceIds.length > 0) throw new Error(`Invalid old resource IDs: ${invalidOldResourceIds.join(', ')}. Only [a-zA-Z0-9_-] are allowed and must not be empty.`);
     let result = jsonString;
-    for (const [oldResourceId, newResourceId] of Object.entries(oldResourceIdToNewResourceIdMap))result = result.split(oldResourceId).join(newResourceId);
+    const entries = Object.entries(oldResourceIdToNewResourceIdMap).sort((a, b)=>b[0].length - a[0].length);
+    for (const [oldResourceId, newResourceId] of entries){
+        const escaped = oldResourceId.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+        const regex = new RegExp(`(?<=^|[^a-zA-Z0-9_-])${escaped}(?=$|[^a-zA-Z0-9_-])`, 'g');
+        result = result.replace(regex, newResourceId);
+    }
     const res = {
         jsonString: result
     };

package/dist/index.cjs

@@ -265,29 +265,14 @@ const readSourceData = async (uri)=>{
     if (external_path_default().isAbsolute(uri)) return external_fs_extra_default().readJson(uri);
     return external_fs_extra_default().readJson(external_path_default().resolve(process.cwd(), uri));
 };
-const normalizeSourceData = async (rawData, expression)=>{
-    if (expression) {
-        console.debug("normalizeSourceData expression",expression)
-
-        const exp = external_jsonata_default()(expression);
-
-        console.debug("normalizeSourceData exp",exp)
-        const res = await exp.evaluate(rawData);
-
-        console.debug("normalizeSourceData res",res)
-
-        return res
-    }
-    return rawData;
-};
 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 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,
@@ -382,8 +367,15 @@ const prepare = async (params)=>{
 };
 const replaceResourceIdsInString = (params)=>{
     const { jsonString, oldResourceIdToNewResourceIdMap } = params;
+    const invalidOldResourceIds = external_lodash_default().filter(Object.keys(oldResourceIdToNewResourceIdMap), (id)=>!id || !/^[a-zA-Z0-9_-]+$/.test(id)).map((id)=>id || '(empty)');
+    if (invalidOldResourceIds.length > 0) throw new Error(`Invalid old resource IDs: ${invalidOldResourceIds.join(', ')}. Only [a-zA-Z0-9_-] are allowed and must not be empty.`);
     let result = jsonString;
-    for (const [oldResourceId, newResourceId] of Object.entries(oldResourceIdToNewResourceIdMap))result = result.split(oldResourceId).join(newResourceId);
+    const entries = Object.entries(oldResourceIdToNewResourceIdMap).sort((a, b)=>b[0].length - a[0].length);
+    for (const [oldResourceId, newResourceId] of entries){
+        const escaped = oldResourceId.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+        const regex = new RegExp(`(?<=^|[^a-zA-Z0-9_-])${escaped}(?=$|[^a-zA-Z0-9_-])`, 'g');
+        result = result.replace(regex, newResourceId);
+    }
     const res = {
         jsonString: result
     };

package/dist/index.js

@@ -203,18 +203,14 @@ const readSourceData = async (uri)=>{
     if (path_0.isAbsolute(uri)) return fs_extra.readJson(uri);
     return fs_extra.readJson(path_0.resolve(process.cwd(), uri));
 };
-const normalizeSourceData = async (rawData, expression)=>{
-    if (expression) {
-        const exp = jsonata(expression);
-        return await exp.evaluate(rawData);
-    }
-    return rawData;
-};
 const loadAppResourceRecords = async (params)=>{
     const { appDataUri, apaasAppDataUri, apaasAppDataExpression } = params;
     if (apaasAppDataUri) {
         const rawData = await readSourceData(apaasAppDataUri);
-        const { resourceRecords } = await normalizeSourceData(rawData, apaasAppDataExpression);
+        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,
@@ -307,8 +303,15 @@ const prepare = async (params)=>{
 };
 const replaceResourceIdsInString = (params)=>{
     const { jsonString, oldResourceIdToNewResourceIdMap } = params;
+    const invalidOldResourceIds = lodash.filter(Object.keys(oldResourceIdToNewResourceIdMap), (id)=>!id || !/^[a-zA-Z0-9_-]+$/.test(id)).map((id)=>id || '(empty)');
+    if (invalidOldResourceIds.length > 0) throw new Error(`Invalid old resource IDs: ${invalidOldResourceIds.join(', ')}. Only [a-zA-Z0-9_-] are allowed and must not be empty.`);
     let result = jsonString;
-    for (const [oldResourceId, newResourceId] of Object.entries(oldResourceIdToNewResourceIdMap))result = result.split(oldResourceId).join(newResourceId);
+    const entries = Object.entries(oldResourceIdToNewResourceIdMap).sort((a, b)=>b[0].length - a[0].length);
+    for (const [oldResourceId, newResourceId] of entries){
+        const escaped = oldResourceId.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+        const regex = new RegExp(`(?<=^|[^a-zA-Z0-9_-])${escaped}(?=$|[^a-zA-Z0-9_-])`, 'g');
+        result = result.replace(regex, newResourceId);
+    }
     const res = {
         jsonString: result
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ldsg/utils",
-  "version": "0.3.28",
+  "version": "0.3.30",
   "description": "",
   "license": "MIT",
   "author": "wanxger",
@@ -33,11 +33,11 @@
     "jsonata": "^2.0.6",
     "jszip": "^3.10.1",
     "lodash": "^4.17.21",
-    "@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"
+    "@ldsg/apaas-constants": "0.3.30",
+    "@ldsg/constants": "0.3.30",
+    "@ldsg/core": "0.3.30",
+    "@ldsg/handler": "0.3.30",
+    "@ldsg/types": "0.3.30"
   },
   "devDependencies": {
     "@rslib/core": "^0.17.1",