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

package/src/concepts/ViewElement__.ts

@@ -80,6 +80,8 @@ function genArgumentMemberExpression(arr: string[]) {
 }
 export interface ElementToVueOptions {
   filterAttr?:  Array<string>;
+  /** 生成器镜像的导出流程 */
+  isGeneratorExport?: boolean;
   isExport?: boolean;
   isRelease?: boolean;
   isRoot?: boolean;
@@ -287,7 +289,7 @@ function transAstNodeToNaslNode(astNode: any, namespace?: string): any {
 function transAstNodeToNaslTypeNode(astNode: any, namespace?: string): any {
   let node = null;
   // 单独特殊处理枚举因为他不是MemberExpression，而是Identifier_
-  if (astNode?.value?.startsWith('__enumTypeAnnotation_')) {
+  if (astNode?.value?.startsWith?.('__enumTypeAnnotation_')) {
     const valueArr = astNode.value.replace('__enumTypeAnnotation_', '')?.split('.');
     const name = valueArr.pop();
     const namespace = valueArr.join('.');
@@ -1634,7 +1636,7 @@ export class ViewElement extends Annotatable {
     let levelIndex = parentLevel || 0;
     code += `${self.name}: () => {\n`;
 
-    const getMultipleDefaultValue = (name: string) => {
+    const getPropInitialValue = (name: string) => {
       let v = 'new nasl.core.BooleanFalse()';
       const attr = self.bindAttrs?.find((attr) => attr.name === name);
       if (['static', 'string'].includes(attr?.type)) {
@@ -1783,18 +1785,19 @@ export class ViewElement extends Annotatable {
     // 分页
     let pageableDefaultValue: string;
     if (hasDataSource && P && !T1) {
-      pageableDefaultValue = getMultipleDefaultValue('pageable');
+      pageableDefaultValue = getPropInitialValue('pageable');
       code += `let __pageable = ${pageableDefaultValue};\n`;
     }
     // 多选
     let multipleDefaultValue: string;
     if (hasDataSource && M && !T1) {
-      multipleDefaultValue = getMultipleDefaultValue('multiple');
+      const name = config?.allNodesAPI?.[self.tag]?.props?.find((prop) => ['M'].includes(prop.tsType))?.name;
+      multipleDefaultValue = getPropInitialValue(name || 'multiple');
       code += `let __multiple = ${multipleDefaultValue};\n`;
     }
     if (hasDataSource && V && !T1) {
       code += `// @ts-ignore
-      let __value: typeof __multiple extends nasl.core.BooleanTrue ? ${valueType}[] : ${valueType};\n`;
+      let __value: typeof __multiple extends nasl.core.BooleanTrue ? nasl.collection.List<${valueType}> : ${valueType};\n`;
       code += `// @ts-ignore
       let __V: ${valueType};\n`;
     }
@@ -2914,6 +2917,7 @@ export class ViewElement extends Annotatable {
                   return `:${name}="${value.replace(/"/g, "'")}"`;
                 }
               } catch (e) {
+                if (apiOfAttr && apiOfAttr.type && !apiOfAttr.type.includes('string')) return '';
                 if (apiOfAttr && apiOfAttr.tsType && !apiOfAttr.tsType.includes('nasl.core.String')) return '';
               }
               value = value

package/src/concepts/View__.ts

@@ -15,6 +15,7 @@ import {
   withSourceMapGenerator,
   withGenerator,
   TranslatorGenerator,
+  createDecoratorCode,
 } from '../translator';
 import translator from '../bak/translator';
 import { ElementToVueOptions } from './ViewElement__';
@@ -2559,11 +2560,11 @@ export class View extends Annotatable {
         code += variable.toNaturalTS(shiftState(state, code, { inline: true }));
         code += ';\n';
       });
+      if (this.variables.length) code += '\n';
 
       if (callback) {
         code += callback.call(this, state);
       } else {
-        code += '\n';
         code += this.elements[0].toNaturalTS(shiftState(state, code, { tabSize: state.tabSize + 1 }));
       }
 
@@ -2573,6 +2574,60 @@ export class View extends Annotatable {
     return code;
   }
 
+  @withSourceMap()
+  toTextualNASL(state = createCompilerState(), callback?: (this: View, state: TranslatorState) => string): string {
+    const viewName = state.rename ?? this.tsName;
+    let code = '';
+    code += createDecoratorCode(state, this, ['pageTemplateId', 'uuid', 'title', 'crumb', 'auth', 'authDescription', 'isIndex']);
+
+    if (state.declaration) {
+      code += `declare view ${viewName}`;
+      // 有参数长度
+      code += '(';
+      this.params.forEach((param, index) => {
+        code += param.toTextualNASL(shiftState(state, code, { tabSize: 0 }));
+        if (index !== this.params.length - 1) code += ', ';
+      });
+      code += ') {';
+      if (state.convertChildren && this.children?.length) {
+        this.children.forEach((child) => {
+          code += child.toTextualNASL(shiftState(state, code, { tabSize: state?.tabSize || 0 + 1 }), callback);
+          code += '\n';
+        });
+      }
+      code += '}';
+    } else {
+      code += `view ${viewName}`;
+
+      // 有参数长度
+      code += '(';
+      this.params.forEach((param, index) => {
+        code += param.toTextualNASL(shiftState(state, code, { inline: true }));
+        if (index !== this.params.length - 1) code += ', ';
+      });
+      code += ')';
+
+      code += ' {\n';
+
+      this.variables.forEach((variable) => {
+        code += `${indent(state.tabSize + 1)}let `;
+        code += variable.toTextualNASL(shiftState(state, code, { inline: true }));
+        code += ';\n';
+      });
+      if (this.variables.length) code += '\n';
+
+      if (callback) {
+        code += callback.call(this, state);
+      } else {
+        code += this.elements[0].toTextualNASL(shiftState(state, code, { tabSize: state.tabSize + 1 }));
+      }
+
+      code += `\n${indent(state.tabSize)}}\n`;
+    }
+
+    return code;
+  }
+
   *toEmbeddedTSFile(): EmbeddedTSFileGenerator {
     let code = `namespace ${this.getTsNamespace()} {\n`;
     const state = createCompilerState(code, {

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'] : [];
 
@@ -1056,7 +1063,6 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
       output.content = replaceContentFilePath(output.content || '');
     })
   }
-  console.log('outputs', outputs)
   return outputs;
 }
 
@@ -1143,7 +1149,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 +1186,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 +1199,5 @@ export function getOneFiles(options: { view: View; action: string; cacheRouterDa
       item.ideVersion = cacheRouterData.ideVersion;
     }
   });
-  console.log('outputs: ', outputs);
   return outputs;
 }

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;