@lcap/nasl 3.8.0-beta.6 → 3.8.0-beta.8

package/src/generator/genBundleFiles.ts

@@ -176,7 +176,6 @@ function genRouteFiles(routes: Route[], defaultRoute: string,config?: any) {
   // 生成路由文件列表
   const routeFiles: any[] = [];
   function routeToFile(route: Route) {
-    console.log(route, 'route');
     if (route?.component?.script) {
       const content = genExportComponetCode(route.component);
       const lazyPath = getCompletePath(null, content, config);
@@ -236,6 +235,7 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
   try {
     config?.debug && genBreakpoints(app);
     app.curDeployEnv  = config.env
+    console.time('toVueOptions');
 
     utils.traverse(
       (current) => {
@@ -252,6 +252,7 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
         } as View,
       }
     );
+    console.timeEnd('toVueOptions');
 
     businessComponents.forEach((businessComponent) => {
       const frontendI18nEnabled = frontend?.i18nInfo?.enabled
@@ -543,8 +544,16 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
             } else if(window.parent.isGlobalScaleTop) {
                 // 点击跳转到外部页面时，通知顶层页面
                 document.body.addEventListener('click', (e) => {
-                  if(e.target.href){
-                    parent.location.href = e.target.href;
+                  if(!e.target.href) return;
+                  if(typeof e.target.href !== 'string') return;
+                  if(e.target.tagName !== 'A') return;
+                  try {
+                    const url = new URL(e.target.href);
+                    if(url.host !== location.host){
+                      parent.location.href = e.target.href;
+                    }
+                  } catch(err) {
+                    console.error(err);
                   }
                 });
             }
@@ -618,8 +627,8 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
               }
               return response.text();
             }).then(function(scriptText) {
-              var func = new Function(scriptText);
-              var result = func();
+              var func = new Function('importComponent', scriptText);
+              var result = func(window.importComponent);
               return result;
             })
             .catch(error => {
@@ -879,9 +888,7 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
 
 
 
-  console.time('genHash')
   let bundleMinPath = completePath + getCompletePath(getBundleFileName(), content, config);
-  console.timeEnd('genHash');
 
   const otherJsList = (frontend as any)?.appletsConfig?.enable ? ['//res.wx.qq.com/open/js/jweixin-1.3.2.js'] : [];
 
@@ -1018,45 +1025,7 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
     },
     ...routerFiles,
   ];
-  const assets = config.assets;
-  // 导出源码才处理
-  if (config.isExport && Array.isArray(assets) && assets.length) {
-    function replaceContentFilePath(content: string) {
-      const assetsMap = config.assetsMap;
-      // 正则
-      const regex = utils.transAssetsToRegx(assets, 'fileUrl');
-      content = content.replace(regex, (url) => {
-        const asset: Asset = utils.getAssetFromAssetsMap(assetsMap, url);
-        if (asset) {
-          const basePath = frontend?.basePath;
-          const assetName = asset.name;
-          const assetDir = basePath ? `${basePath}/assets/${assetName}` : `/assets/${assetName}`;
-          let path = assetDir;
-          const sysPrefixPath = frontend?.app?.sysPrefixPath;
-          if (sysPrefixPath) {
-            path = `${sysPrefixPath}${assetDir}`;
-          }
-          globalConfig.assets.push({
-            path: assetDir,
-            isDir: false,
-            url,
-          });
-          const encodeAssetName = encodeURIComponent(assetName);
-          let encodeAssetDir = basePath ? `${basePath}/assets/${encodeAssetName}` : `/assets/${encodeAssetName}`;
-          if (sysPrefixPath) {
-            encodeAssetDir = `${sysPrefixPath}${encodeAssetDir}`;
-          }
-          return encodeAssetDir;
-        }
-        return url;
-      });
-      return content;
-    }
-    outputs.forEach((output) => {
-      output.content = replaceContentFilePath(output.content || '');
-    })
-  }
-  console.log('outputs', outputs)
+  processAssetsInOutputs(outputs, frontend, config);
   return outputs;
 }
 
@@ -1067,11 +1036,11 @@ export async function genFrontendBundleFiles(app: App, frontends: Array<Frontend
   for (const frontend of frontends) {
     if(frontend.frameworkKind === 'react'){
       const files: {path: string, content: string}[] = await compileNASLToReactDist(app, frontend, config as any);
-      result.push(
-        ...files.map((x) => {
-          return { name: x.path, content: x.content };
-        })
-      );
+      const outputs = files.map((x) => {
+        return { name: x.path, content: x.content };
+      });
+      processAssetsInOutputs(outputs, frontend, config);
+      result.push(...outputs);
     }else{
       const data = await genBundleFiles(app, frontend, config);
       result.push(...data);
@@ -1143,7 +1112,6 @@ export function getOneFiles(options: { view: View; action: string; cacheRouterDa
     }
     currentView = currentView.parentNode;
   }
-  console.log(currentRoute);
 
   function addOrUpdateRoute(routes: Route[], newRoute: Route) {
     const existingRoute = routes.find((route) => route.path === newRoute.path);
@@ -1181,7 +1149,6 @@ export function getOneFiles(options: { view: View; action: string; cacheRouterDa
   } else {
     addOrUpdateRoute(cacheRouters, currentRoute);
   }
-  console.log(cacheRouters, 111);
   const routerFiles = genRouteFiles(cacheRouters, null);
   const completePath = `${cacheRouterData.baseUrl}${frontend.basePath || ''}/`;
   const outputs = routerFiles;
@@ -1195,6 +1162,52 @@ export function getOneFiles(options: { view: View; action: string; cacheRouterDa
       item.ideVersion = cacheRouterData.ideVersion;
     }
   });
-  console.log('outputs: ', outputs);
   return outputs;
 }
+
+function processAssetsInOutputs(
+  outputs: { name: string; content: string }[],
+  frontend: Frontend,
+  config: Config
+) {
+  const assets = config.assets;
+  // 导出源码才处理
+  if (config.isExport && Array.isArray(assets) && assets.length) {
+    function replaceContentFilePath(content: string) {
+      const assetsMap = config.assetsMap;
+      // 正则
+      const regex = utils.transAssetsToRegx(assets, 'fileUrl');
+      content = content.replace(regex, (url) => {
+        const asset: Asset = utils.getAssetFromAssetsMap(assetsMap, url);
+        if (asset) {
+          const basePath = frontend?.basePath;
+          const assetName = asset.name;
+          const assetDir = basePath ? `${basePath}/assets/${assetName}` : `/assets/${assetName}`;
+          let path = assetDir;
+          const sysPrefixPath = frontend?.app?.sysPrefixPath;
+          if (sysPrefixPath) {
+            path = `${sysPrefixPath}${assetDir}`;
+          }
+          globalConfig.assets.push({
+            path: assetDir,
+            isDir: false,
+            url,
+          });
+          const encodeAssetName = encodeURIComponent(assetName);
+          let encodeAssetDir = basePath
+            ? `${basePath}/assets/${encodeAssetName}`
+            : `/assets/${encodeAssetName}`;
+          if (sysPrefixPath) {
+            encodeAssetDir = `${sysPrefixPath}${encodeAssetDir}`;
+          }
+          return encodeAssetDir;
+        }
+        return url;
+      });
+      return content;
+    }
+    outputs.forEach((output) => {
+      output.content = replaceContentFilePath(output.content || '');
+    });
+  }
+}

package/src/generator/genHash.ts

@@ -1,13 +1,39 @@
-import * as crypto from 'crypto';
+// cyrb53 (c) 2018 bryc (github.com/bryc). License: Public domain. Attribution appreciated.
+// A fast and simple 64-bit (or 53-bit) string hash function with decent collision resistance.
+// Largely inspired by MurmurHash2/3, but with a focus on speed/simplicity.
+// See https://stackoverflow.com/questions/7616461/generate-a-hash-from-string-in-javascript/52171480#52171480
+// https://github.com/bryc/code/blob/master/jshash/experimental/cyrb53.js
+const cyrb64 = (str : string, seed = 0) => {
+  let h1 = 0xdeadbeef ^ seed, h2 = 0x41c6ce57 ^ seed;
+  for(let i = 0, ch; i < str.length; i++) {
+    ch = str.charCodeAt(i);
+    h1 = Math.imul(h1 ^ ch, 2654435761);
+    h2 = Math.imul(h2 ^ ch, 1597334677);
+  }
+  h1  = Math.imul(h1 ^ (h1 >>> 16), 2246822507);
+  h1 ^= Math.imul(h2 ^ (h2 >>> 13), 3266489909);
+  h2  = Math.imul(h2 ^ (h2 >>> 16), 2246822507);
+  h2 ^= Math.imul(h1 ^ (h1 >>> 13), 3266489909);
+  // For a single 53-bit numeric return value we could return
+  // 4294967296 * (2097151 & h2) + (h1 >>> 0);
+  // but we instead return the full 64-bit value:
+  return [h2>>>0, h1>>>0];
+};
+
+// An improved, *insecure* 64-bit hash that's short, fast, and has no dependencies.
+// Output is always 14 characters.
+const cyrb64Hash = (str : string, seed = 0) => {
+  const [h2, h1] = cyrb64(str, seed);
+  return h2.toString(36).padStart(7, '0') + h1.toString(36).padStart(7, '0');
+}
+
 
 /**
  *
  * @param 文件内容 content
- * @returns MD5 hash值8位
+ * @returns cyrb64 弱 hash，取前 8 位
  */
-export function genHash(content: string) {
-  const hash = crypto.createHash('md5').update(content, 'utf8').digest('hex');
-  return hash.slice(0, 8);
-}
+
+export const genHash = (str : string) => cyrb64Hash(str, 0).slice(0, 8);
 
 export default genHash;

package/src/generator/permission.ts

@@ -15,6 +15,8 @@ import {
   BindStyle,
   BindDirective,
   Connector,
+  Identifier,
+  Event,
 } from '../concepts';
 import { processToTreeFragment } from '../server/process2LogicNamespace';
 
@@ -145,14 +147,14 @@ function removeRedundantResourceData(resources: ResourceNode[][]) {
   resources.sort((a, b) => wm.get(a).length - wm.get(b).length);
 
   const res: ResourceNode[][] = [];
-  const hashs: string[] = [];
+  const hashes: string[] = [];
 
   for (const resource of resources) {
     const hash = wm.get(resource);
-    if (hashs.some((h) => hash.endsWith(h))) continue;
+    if (hashes.some((h) => hash.endsWith(h))) continue;
 
     res.push(resource);
-    hashs.push(hash);
+    hashes.push(hash);
   }
   return res;
 }
@@ -278,7 +280,7 @@ function checkUploadAuth(uploaders: Map<string, ViewElement[]>) {
   // 如果开启控制权限-component，没开启权限-page
   uploaders.forEach((value, key) => {
     const authValue: ResourceNode[] = [];
-    value.map((node) => {
+    value.forEach((node) => {
       if (node instanceof ViewElement && node.view) {
         const path = node.auth ? node.authPath : `${node.view.path}`;
         const type = node.auth ? 'component' : 'page';
@@ -290,25 +292,29 @@ function checkUploadAuth(uploaders: Map<string, ViewElement[]>) {
   });
   return res;
 }
-function checkPageAndUploadAuth(uploaders: Map<string, ViewElement[]>, key: string) {
-  let flag: number = -1;
-  flag = uploaders.get(key)?.findIndex((node) => {
-    if (node.getAncestor('View') instanceof View) {
+
+function checkPageAndUploadAuth(uploaders: Map<string, ViewElement[]>, key: string): boolean {
+  let flag: boolean = false;
+
+  uploaders.get(key).forEach((node) => {
+    if (node.view instanceof View) {
       // 当前页面未开启权限且文件上传组件也未开启权限
-      if (!(node.getAncestor('View') as View).auth && node instanceof ViewElement && !node.auth) {
-        return true;
+      if (!node.view.auth && node instanceof ViewElement && !node.auth) {
+        flag = true;
       }
     } else if (node.getAncestor('BusinessComponent')) {
-      return true;
+      flag = true;
     }
   });
+
   return flag;
 }
+
 function convertArray(arr: ResourceNode[]) {
   return arr.map((item: any) => [item]);
 }
-export async function genPermissionData(app: App) {
-  // console.time('xxx');
+
+export async function genPermissionDataOld(app: App) {
   openCache();
   const logicPageResourceDtoList: { [key: string]: ResourceNode[][]; } = {};
   const { logics, processLogics } = getAllLogics(app);
@@ -316,31 +322,335 @@ export async function genPermissionData(app: App) {
   for (const logic of [...logics, ...processLogics]) {
     const resources = await findResourcesOfLogic(logic, uploaders);
     if (resources.length === 0) continue;
-    const service = logics.includes(logic) ? logic.toService() : (logic.toProcessService() as { url: { method: string; path: string; }; });
+    const service = logics.includes(logic)
+      ? logic.toService()
+      : (logic.toProcessService() as { url: { method: string; path: string; }; });
     const key = `${service.url.path}:${service.url.method}`;
     logicPageResourceDtoList[key] = resources;
   }
-  const authValue = checkUploadAuth(uploaders);
-  if (authValue?.length) {
-    authValue.forEach((item) => {
+  const authVals = checkUploadAuth(uploaders);
+  if (authVals?.length) {
+    authVals.forEach((item) => {
       const { key, authValue } = item;
       if (key.startsWith('/upload' || '/api/')) {
-        logicPageResourceDtoList[`${key}:POST`] = checkPageAndUploadAuth(uploaders, key) !== -1 ? [[]] : convertArray(authValue);
+        logicPageResourceDtoList[`${key}:POST`] = checkPageAndUploadAuth(uploaders, key) ? [[]] : convertArray(authValue);
       }
     });
   }
   logicPageResourceDtoList['/upload/download_files:POST'] = callLogicUploadList;
   closeCache();
-  // console.timeEnd('xxx');
   return logicPageResourceDtoList;
 }
+
+
+
+function generateServiceKey(logic : Logic, kind : 'server' | 'process') {
+  let service : { url: { method: string; path: string; }};
+  if (kind === 'server') {
+    service = logic.toService()
+  } else if (kind === 'process') {
+    service  = (logic.toProcessService() as { url: { method: string; path: string; }; })
+  } else {
+    throw new Error('Invalid service key kind')
+  }
+  const key = `${service.url.path}:${service.url.method}`;
+  return key;
+}
+
+function createArrayOnAdd<K, V>(k : K, v : V, m: Map<K, Array<V>>) {
+  if (m.get(k)) {
+    m.get(k).push(v);
+  } else {
+    m.set(k, [v]);
+  }
+}
+
+// 需要区分：前端逻辑、后端逻辑、流程逻辑
+// 需要的信息：后端逻辑、流程逻辑的 service path；逻辑调用到其定义的映射；
+// 流程逻辑 call 的 getCallNode() 每次都不同
+// 表单验证 $refs.validate 的定义缺少 calleewholeKey 且访问时会抛异常
+// 不跳过 playground 草稿区内容：赫基有用到 JS代码块，在代码块里调用逻辑。JS代码块里的引用没有识别出来。但恰巧在草稿区的东西，提供了引用关系。赫基项目，删除了草稿区的东西会导致401。
+export function genPermissionData(app: App): { [key: string]: ResourceNode[][]; } {
+  type TraverseCtx = { viewElement : ViewElement, viewElements: Set<ViewElement>, thisLogic : Logic, bindEvent : BindEvent, event : Event, view : View};
+  type LogicCtx = { view : View, viewElements : Set<ViewElement> }
+  type FrontendLogicCtx = { view : View, viewElements : Set<ViewElement>, thisLogic : Logic }
+
+  function clearCtx(ctx: TraverseCtx) {
+    ctx.viewElement = null;
+    ctx.viewElements = new Set();
+    ctx.thisLogic = null;
+    ctx.bindEvent = null;
+    ctx.event = null;
+    ctx.view = null;
+  }
+  const { logics : tmpLogics, processLogics : tmpProcessLogics } = getAllLogics(app);
+
+  // 调用后端逻辑的Map
+  const backendLogicCallCtx : Map<string, Array<LogicCtx>> = new Map();
+
+  // 调用前端逻辑的Map
+  const frontendLogicCallCtx: Array<FrontendLogicCtx> = [];
+
+  // from calleeWholeKey to Logic，消除流程逻辑每次找到的定义都是即时演算生成的，地址不同的问题。
+  const frontNdCache = new Map<string, Logic>();
+  const processNdCache = new Map<string, Logic>();
+  const serverNdCache = new Map<string, Logic>();
+
+  tmpProcessLogics.forEach(l => processNdCache.set(l.calleewholeKey, l));
+  tmpLogics.forEach(l => serverNdCache.set(l.calleewholeKey, l));
+
+  // 上传组件
+  const uploaders = new Map<string, Array<ViewElement>>();
+  const callLogicUploadList = new Map<string, any>();
+  let callLogicUploadFlag = false;
+
+  const defToCalls : Map<Logic, Array<CallLogic>> = new Map();
+  app.frontendTypes.forEach((frontendType) => {
+    frontendType.traverseChildrenWithContext((nd, ctx : TraverseCtx) => {
+      switch (nd.concept) {
+        case 'ViewElement': {
+          ctx.thisLogic = null;
+          ctx.viewElement = nd;
+          ctx.viewElements = new Set(ctx.viewElements); // if use ctx.viewElements.add(node) directly, will encounter a SEVERE slow down. For example, 3s vs 12s
+          ctx.viewElements.add(nd);
+          // collect uploaders
+          if (nd.tag?.includes('uploader')) {
+            const urlAttr = nd.bindAttrs.find((item : BindAttribute) => item.name === 'url');
+            const url = urlAttr?.value;
+            if (url) {
+              if (!uploaders.has(url)) uploaders.set(url, [nd]);
+              else uploaders.get(url).push(nd);
+            }
+          }
+          break;
+        }
+        case 'BindEvent': ctx.bindEvent = nd; break;
+        case 'Event': ctx.event = nd; break;
+        case 'CallLogic': {
+          const { thisLogic, event, bindEvent, view, viewElement, viewElements } = ctx;
+          createArrayOnAdd(thisLogic, nd, defToCalls);
+          if (viewElement || bindEvent || event) {
+            const [kind, logicDecl] = (nd as CallLogic).getCallNodeUsingCache(frontNdCache, serverNdCache, processNdCache);
+            switch (kind) {
+              case 'server': {
+                const key = generateServiceKey(logicDecl, 'server');
+                createArrayOnAdd(key, { view, viewElements }, backendLogicCallCtx);
+                break;
+              }
+              case 'process': {
+                const key = generateServiceKey(logicDecl, 'process');
+                createArrayOnAdd(key, { view, viewElements }, backendLogicCallCtx);
+                break;
+              }
+              case 'front': {
+                frontendLogicCallCtx.push({ view, viewElements, thisLogic: logicDecl });
+                break;
+              }
+              default: throw new Error('Invalid logic kind');
+            }
+          }
+
+          // 收集 callLogicUploadList
+          if (nd?.calleeName?.includes('downloadFile') && nd?.calleeNamespace === 'nasl.io' && !callLogicUploadFlag) {
+            // ViewElement 权限优先
+            if (viewElement instanceof ViewElement && viewElement?.auth) {
+              callLogicUploadList.set(viewElement?.authPath, [{
+                type: 'component',
+                path: viewElement?.authPath
+              }]);
+            } else if (view instanceof View && view?.auth) {
+              callLogicUploadList.set(view?.authPath, [{
+                type: 'page',
+                path: view?.authPath
+              }]);
+            } else {
+              // 如果开启权限和未开启权限都有，以未开启权限为准，清空 map，设置为 [[]]
+              callLogicUploadFlag = true;
+              callLogicUploadList.clear()
+            }
+          }
+          break;
+        }
+        case 'BindAttribute': {
+          if (nd.name === 'dataSource'
+              && nd.type === 'dynamic'
+              && nd.expression instanceof Identifier
+              && (ctx.view) // View | BusinessComponent
+          ) {
+            const viewLogics = ctx.view.logics; // Array<Logic> | Array<BusinessLogic>
+            const identName = nd.expression.name;
+            const logic = viewLogics.find((viewLogic : any) => {
+              return viewLogic?.name === identName;
+            });
+            if (logic) {
+              const { viewElements, view } = ctx;
+              frontendLogicCallCtx.push({ viewElements, view, thisLogic: logic });
+            }
+          }
+          break;
+        }
+        case 'Logic': ctx.thisLogic = nd; break;
+        case 'BusinessLogic': ctx.thisLogic = nd; break;
+        case 'View': clearCtx(ctx); ctx.view = nd; break;
+        case 'Identifier': {
+          // 参数选了函数名。高阶函数。
+          if (nd?.namespace === "app.logics") {
+            const key = `/api/lcplogics/${nd.name}:POST`;
+            createArrayOnAdd(key, { view: ctx.view, viewElements: ctx.viewElements }, backendLogicCallCtx);
+          }
+          // 草稿区也可能有这种 concept 是 Identifier 的调用
+          if (ctx?.view) {
+            const viewLogics = ctx.view.logics; // Array<Logic> | Array<BusinessLogic>
+            const identName = nd.name;
+            const logic = viewLogics.find((viewLogic : any) => {
+              return viewLogic?.name === identName;
+            });
+            if (logic) {
+              const { viewElements, view } = ctx;
+              frontendLogicCallCtx.push({ viewElements, view, thisLogic: logic });
+            }
+          }
+          break;
+        }
+        case 'BusinessComponent': clearCtx(ctx); ctx.view = nd; break;
+        default: break;
+      }
+    });
+  });
+
+  frontendLogicCallCtx.forEach(({ view, viewElements, thisLogic }) => {
+    const findCallBackendLogic = ([kind, l] : ['process' | 'server' | 'front', Logic]) => {
+      if (!l) {
+        return;
+      }
+      switch (kind) {
+        case 'server': {
+          const key = generateServiceKey(l, 'server');
+          createArrayOnAdd(key, { view, viewElements }, backendLogicCallCtx);
+          break;
+        }
+        case 'process': {
+          const key = generateServiceKey(l, 'process');
+          createArrayOnAdd(key, { view, viewElements }, backendLogicCallCtx);
+          break;
+        }
+        case 'front': {
+          const lgcCalls : Array<CallLogic> = defToCalls.get(l);
+          lgcCalls?.forEach( call => findCallBackendLogic(call.getCallNodeUsingCache(frontNdCache, serverNdCache, processNdCache)));
+          break;
+        }
+        default: {
+          throw new Error('Invalid logic kind in frontendLogicCallCtx');
+        }
+      }
+    };
+    findCallBackendLogic(['front', thisLogic]);
+  });
+
+  const logicPageResourceDtoList: { [key: string]: ResourceNode[][]; } = {};
+  backendLogicCallCtx.forEach((ctx, key) => {
+    const resources: ResourceNode[][] = [];
+    ctx?.forEach(({ viewElements, view }) => {
+      const pathInfos: Array<ResourceNode> = [];
+      viewElements?.forEach((viewElement) => {
+        if (viewElement?.auth) {
+          pathInfos.push({
+            path: viewElement?.authPath,
+            type: 'component',
+          });
+        }
+      });
+      let viewIter : BaseNode = view;
+      while (viewIter) {
+        if (viewIter instanceof View && viewIter.auth) {
+          pathInfos.push({
+            path: viewIter.authPath,
+            type: 'page',
+          });
+        }
+        viewIter = viewIter.parentNode;
+      }
+      resources.push(pathInfos);
+    });
+    logicPageResourceDtoList[key] = optimizeResourceData(resources);
+  });
+
+  const authVals = checkUploadAuth(uploaders);
+  if (authVals?.length) {
+    authVals.forEach((item) => {
+      const { key, authValue } = item;
+      if (key.startsWith('/upload' || '/api/')) {
+        logicPageResourceDtoList[`${key}:POST`] =
+            checkPageAndUploadAuth(uploaders, key) ? [[]] : convertArray(authValue);
+      }
+    });
+  }
+  logicPageResourceDtoList['/upload/download_files:POST'] =
+      callLogicUploadList.size === 0 ? [[]] : Array.from(callLogicUploadList.values());
+
+  return logicPageResourceDtoList;
+}
+
 export function genLogicAuthFlag(app: App) {
   let flag = false;
-  app.traverseChildren((node) => {
-    if (flag) return;
-
+  app.traverseStrictChildrenStopWhen((node) => {
     if ((node instanceof View || node instanceof ViewElement) && node.auth) flag = true;
-  });
+  }, (nd) => (nd instanceof View || nd instanceof ViewElement) && Boolean(nd.auth), []);
 
   return flag;
 }
+
+
+function compareResourceNode(a: ResourceNode, b: ResourceNode) {
+  if (a.path < b.path) {
+    return -1;
+  }
+  if (a.path > b.path) {
+    return 1;
+  }
+  if (a.type < b.type) {
+    return -1;
+  }
+  if (a.type > b.type) {
+    return 1;
+  }
+  return 0;
+}
+
+function compareResourceNodeList(a: Array<ResourceNode>, b: Array<ResourceNode>) {
+  a.sort(compareResourceNode);
+  b.sort(compareResourceNode);
+  for (let i = 0; i < a.length; i++) {
+    const result = compareResourceNode(a[i], b[i]);
+    if (result !== 0) {
+      return result;
+    }
+  }
+  return 0;
+}
+
+export function sortResourceDtoMap<K>(m : Map<K, Array<Array<ResourceNode>>>){
+  const keys = Array.from(m.keys()).sort();
+  const sortedMap = new Map<K,Array<Array<ResourceNode>>>();
+  keys.forEach((key) => {
+    sortedMap.set(key, m.get(key).sort(compareResourceNodeList));
+  });
+
+  keys.forEach((key) => {
+    sortedMap.get(key).forEach((item) => {
+      item.sort(compareResourceNode);
+    });
+  });
+  return sortedMap;
+}
+
+export async function testWithOldPermissionResult(app: App, newRes : { [key: string]: ResourceNode[][]; }) {
+  const newResMap = sortResourceDtoMap(new Map(Object.entries(newRes)));
+  console.log('newResMap', newResMap)
+  const oldRes : { [key: string]: ResourceNode[][]; } = await genPermissionDataOld(app);
+  const oldResMap = sortResourceDtoMap(new Map(Object.entries(oldRes)));
+  console.log('oldResMap', oldResMap)
+
+  console.log("oldLogicPageResourceDtoListMap  ===  newLogicPageResourceDtoListMap?",
+    JSON.stringify(Array.from(newResMap.entries())) === JSON.stringify(Array.from(oldResMap.entries())));
+}