@lcap/nasl 2.18.0 → 2.20.0-beta.1

package/src/concepts/TypeAnnotation__.ts

@@ -121,8 +121,6 @@ export class TypeAnnotation extends BaseNode {
     @property()
     ruleMap: Object = undefined;
 
-    
-
     /**
      * @param source 需要合并的部分参数
      */
@@ -159,10 +157,6 @@ export class TypeAnnotation extends BaseNode {
         });
     }
 
-    
-
-    
-
     /**
     * 插入类型标注
     * @internal
@@ -195,8 +189,6 @@ export class TypeAnnotation extends BaseNode {
         return typeAnnotation;
     }
 
-    
-
     /**
      * 插入类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -219,8 +211,6 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
-    
-
     /**
      * 添加类型标注
      * @internal
@@ -240,8 +230,6 @@ export class TypeAnnotation extends BaseNode {
         return this._insertTypeAnnotationInTypeArgumentsAt(options as any, index);
     }
 
-    
-
     /**
      * 添加类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -265,8 +253,6 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
-    
-
     /**
     * 插入类型标注
     * @internal
@@ -299,8 +285,6 @@ export class TypeAnnotation extends BaseNode {
         return typeAnnotation;
     }
 
-    
-
     /**
      * 插入类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -323,8 +307,6 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
-    
-
     /**
      * 添加类型标注
      * @internal
@@ -344,8 +326,6 @@ export class TypeAnnotation extends BaseNode {
         return this._insertTypeAnnotationInReturnTypeAt(options as any, index);
     }
 
-    
-
     /**
      * 添加类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -369,11 +349,6 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
-
-
-
-    
-
     /**
     * 插入数据结构属性
     * @internal
@@ -406,8 +381,6 @@ export class TypeAnnotation extends BaseNode {
         return structureProperty;
     }
 
-    
-
     /**
      * 插入数据结构属性
      * @param structurePropertyOptions 数据结构属性参数
@@ -430,8 +403,6 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
-    
-
     /**
      * 添加数据结构属性
      * @internal
@@ -451,8 +422,6 @@ export class TypeAnnotation extends BaseNode {
         return this._insertStructurePropertyAt(options as any, index);
     }
 
-    
-
     /**
      * 添加数据结构属性
      * @param structurePropertyOptions 数据结构属性参数
@@ -476,9 +445,6 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
      * 删除类型标注
      * @param typeAnnotation 已有的类型标注实例
@@ -486,12 +452,10 @@ export class TypeAnnotation extends BaseNode {
     removeTypeAnnotationInTypeArguments(typeAnnotation: TypeAnnotation): void;
 
     removeTypeAnnotationInTypeArguments(options: TypeAnnotation) {
-        let typeAnnotation: TypeAnnotation = options;
+        const typeAnnotation: TypeAnnotation = options;
         return typeAnnotation.delete();
     }
 
-    
-
     /**
      * 删除类型标注
      * @param typeAnnotation 已有的类型标注实例
@@ -499,7 +463,7 @@ export class TypeAnnotation extends BaseNode {
     removeTypeAnnotationInReturnType(typeAnnotation: TypeAnnotation): void;
 
     removeTypeAnnotationInReturnType(options: TypeAnnotation) {
-        let typeAnnotation: TypeAnnotation = options;
+        const typeAnnotation: TypeAnnotation = options;
         return typeAnnotation.delete();
     }
 
@@ -526,8 +490,6 @@ export class TypeAnnotation extends BaseNode {
         return params;
     }
 
-
-
     /**
      * 删除数据结构属性
      * @param structureProperty 已有的数据结构属性实例
@@ -535,7 +497,7 @@ export class TypeAnnotation extends BaseNode {
     removeStructureProperty(structureProperty: StructureProperty): void;
 
     removeStructureProperty(options: StructureProperty) {
-        let structureProperty: StructureProperty = options;
+        const structureProperty: StructureProperty = options;
         return structureProperty.delete();
     }
 
@@ -571,6 +533,24 @@ export class TypeAnnotation extends BaseNode {
         return this.headTitle;
     }
 
+    traverse(callback: (arg: TypeAnnotation) => void,
+        enter: (arg: TypeAnnotation) => void,
+        leave: (arg: TypeAnnotation) => void,
+        onJoin: (arg: TypeAnnotation, arg2: TypeAnnotation) => void) {
+        enter(this);
+        callback(this);
+        if (this.typeArguments && ['generic', 'union'].includes(this.typeKind)) {
+            const l = this.typeArguments.length;
+            this.typeArguments.forEach((arg, idx) => {
+                arg.traverse(callback, enter, leave, onJoin);
+                if (idx < l - 1) {
+                    onJoin(this, arg);
+                }
+            });
+        }
+        leave(this);
+    }
+
     get typeKey(): string {
         if (this.typeKind === 'primitive' || this.typeKind === 'reference') {
             return `${this.typeNamespace}.${this.typeName}`;
@@ -578,7 +558,7 @@ export class TypeAnnotation extends BaseNode {
             return `${this.typeNamespace}.${this.typeName}<${(this.typeArguments || []).map((arg) => arg.typeKey)}>`;
         } else if (this.typeKind === 'anonymousStructure') {
             return `{ ${this.properties.map(({ name, typeAnnotation }) =>
-                (`${name}: ${typeAnnotation.typeKey}`)).join(', ')} }`;
+                (`${name}: ${typeAnnotation ? typeAnnotation.typeKey : 'any'}`)).join(', ')} }`;
         } else if (this.typeKind === 'union') {
             return `${this.typeArguments.map((arg) => arg.typeKey).join(' | ')}`;
         } else {
@@ -591,7 +571,7 @@ export class TypeAnnotation extends BaseNode {
         if (this.typeKind === 'anonymousStructure') {
             // 按匿名数据结构的key排序
             return `{${this.properties.sort(({ name: name1 }, { name: name2 }) => name1 > name2 ? 1 : -1).map(({ name, typeAnnotation }) =>
-                (`${name}: ${typeAnnotation.sortedTypeKey}`)).join(', ')}}`;
+                (`${name}: ${typeAnnotation ? typeAnnotation.sortedTypeKey : 'any'}`)).join(', ')}}`;
         } else if (this.typeKind === 'union') {
             // 按返回的每个具体项排序
             return `${this.typeArguments.map((arg) => arg.sortedTypeKey).sort((name1, name2) => name1 > name2 ? 1 : -1).join(' | ')}`;
@@ -606,10 +586,12 @@ export class TypeAnnotation extends BaseNode {
         const typeKey = typeArr.join('.');
         if (this.typeKind === 'generic') {
             let code = typeKey;
+            code += '<';
             if (Array.isArray(this.typeArguments) && this.typeArguments.length) {
                 // 必须按typeArguments定义的顺序，否则实参位置不对
-                code += `<${(this.typeArguments || []).map((arg) => arg.sortedTypeKey).join(', ')}>`;
+                code += `${(this.typeArguments || []).map((arg) => arg.sortedTypeKey).join(', ')}`;
             }
+            code += '>';
             return code;
         }
         return typeKey;
@@ -661,7 +643,7 @@ export class TypeAnnotation extends BaseNode {
             return `${this.typeName}<${this.typeArguments.map((arg) => arg.typeTitle || arg.name || 'T').join(', ')}>`;
         } else if (this.typeKind === 'anonymousStructure') {
             return `{ ${this.properties?.map(({ name, typeAnnotation }) =>
-                (`${name}: ${typeAnnotation.typeTitle}`)).join(', ')} }`;
+                (`${name}: ${typeAnnotation ? typeAnnotation.typeTitle : 'any'}`)).join(', ')} }`;
         } else if (this.typeKind === 'union') {
             return `${this.typeArguments.map((arg) => arg.typeTitle || arg.name).join(' 或 ')}`;
         } else {
@@ -676,9 +658,9 @@ export class TypeAnnotation extends BaseNode {
             const length = this.properties?.length;
             this.properties?.forEach(({ name, typeAnnotation }, index) => {
                 if (index === length - 1) {
-                    typeTitleList.push({ key: name, value: typeAnnotation.typeTitle });
+                    typeTitleList.push({ key: name, value: `${typeAnnotation ? typeAnnotation.typeTitle : 'any'}` });
                 } else {
-                    typeTitleList.push({ key: name, value: typeAnnotation.typeTitle, dot: ',' });
+                    typeTitleList.push({ key: name, value: `${typeAnnotation ? typeAnnotation.typeTitle : 'any'}`, dot: ',' });
                 }
             });
             typeTitleList.push({ key: '}' });
@@ -797,7 +779,7 @@ export class TypeAnnotation extends BaseNode {
             let code = `{ __name: "AStructure_${this.hash}", `;
             (this.properties || []).forEach((property, i) => {
                 code += `${property.name}: `;
-                code += `${property.typeAnnotation.toEmbeddedTS(shiftState(state, code, { inline: true, tabSize: (state?.tabSize || 0) + 1 }))}`;
+                code += `${property.typeAnnotation ? property.typeAnnotation.toEmbeddedTS(shiftState(state, code, { inline: true, tabSize: (state?.tabSize || 0) + 1 })) : 'any'}`;
                 code += i < this.properties?.length - 1 ? ', ' : ' }';
             });
             return code;
@@ -824,7 +806,7 @@ export class TypeAnnotation extends BaseNode {
                     return 1;
                 return aName < bName ? -1 : 0;
             }).map(({ name, typeAnnotation }) =>
-                (`${name}: ${typeAnnotation.anonymousStructureTypeDesc}`)).join(', ')} }`;
+                (`${name}: ${typeAnnotation ? typeAnnotation.anonymousStructureTypeDesc : 'any'}`)).join(', ')} }`;
         } else {
             return this.typeName;
         }
@@ -907,6 +889,29 @@ export class TypeAnnotation extends BaseNode {
         }
     }
 
+    // 是否是复合类型 List|Map|entities|structures
+    isComplexType() {
+        const namespaceType = this.typeNamespace.split('.').pop();
+        return ['Map', 'List'].includes(this.typeName) || (this.typeKind === 'reference' && ['entities', 'structures'].includes(namespaceType));
+    }
+    /*  类型签名 */
+    get sign() {
+        let str: string = '';
+        if (['Map', 'List'].includes(this.typeName)) {
+            str += this.typeName + '<';
+            (this.typeArguments || []).forEach((item, index) => {
+                str += item.sign;
+                if (index + 1 !== this.typeArguments.length) {
+                    str += ',';
+                }
+            });
+            str += '>';
+        } else {
+            str += this.typeName;
+        }
+        return str;
+    }
+
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
     // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/ValidationRule__.ts

@@ -60,6 +60,8 @@ export class ValidationRule extends LogicItem {
     @property('LogicItem')
     errorMessage: LogicItem = undefined;
 
+    
+
     /**
      * @param source 需要合并的部分参数
      */
@@ -73,6 +75,7 @@ export class ValidationRule extends LogicItem {
         return super.from(source, parentNode, parentKey) as ValidationRule;
     }
 
+    
     /**
      * 设置错误信息
      */
@@ -88,6 +91,10 @@ export class ValidationRule extends LogicItem {
         });
     }
 
+    
+
+    
+
     /**
     * 插入实际参数
     * @internal
@@ -120,6 +127,8 @@ export class ValidationRule extends LogicItem {
         return argument;
     }
 
+    
+
     /**
      * 插入实际参数
      * @param argumentOptions 实际参数参数
@@ -142,6 +151,8 @@ export class ValidationRule extends LogicItem {
         return node;
     }
 
+    
+
     /**
      * 添加实际参数
      * @internal
@@ -161,6 +172,8 @@ export class ValidationRule extends LogicItem {
         return this._insertArgumentAt(options as any, index);
     }
 
+    
+
     /**
      * 添加实际参数
      * @param argumentOptions 实际参数参数
@@ -184,6 +197,9 @@ export class ValidationRule extends LogicItem {
         return node;
     }
 
+
+    
+
     /**
      * 删除实际参数
      * @param argument 已有的实际参数实例
@@ -191,10 +207,12 @@ export class ValidationRule extends LogicItem {
     removeArgumentInArguments(argument: Argument): void;
 
     removeArgumentInArguments(options: Argument) {
-        const argument: Argument = options;
+        let argument: Argument = options;
         return argument.delete();
     }
 
+    
+
     /**
     * 删除逻辑项
     * @param name 逻辑项名称

package/src/concepts/Variable__.ts

@@ -32,6 +32,7 @@ import Logic from './Logic__';
 import View from './View__';
 import Module from './Module__';
 import App from './App__';
+import Frontend from './Frontend__';
 import ProcessElement from './ProcessElement__';
 import Process from './Process__';
 
@@ -94,6 +95,12 @@ export class Variable extends BaseNode {
     get view() {
         return this.getAncestor('View') as View;
     }
+    /**
+     * 祖先 Frontend
+     */
+    get frontend() {
+        return this.getAncestor('Frontend') as Frontend;
+    }
     /**
      * 祖先 ProcessElement
      */
@@ -168,10 +175,6 @@ export class Variable extends BaseNode {
         });
     }
 
-    
-
-    
-
     /**
     * 删除类型标注
     * @param name 类型标注名称
@@ -240,7 +243,10 @@ export class Variable extends BaseNode {
     toJS(state?: TranslatorState): string {
         const context = this.view ? 'this' : 'Vue.prototype';
         const typeAnnotation = this.typeAnnotation || this.__TypeAnnotation;
-        const needGenInitFromSchema = typeAnnotation && !['primitive', 'union'].includes(typeAnnotation.typeKind);
+        const needGenInitFromSchema = typeAnnotation && (
+            !['primitive', 'union'].includes(typeAnnotation.typeKind)
+            || typeAnnotation.typeName === 'DateTime'
+        );
         let code = `${this.name} =`;
         if (needGenInitFromSchema) {
             code += `${context}.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}',`;
@@ -315,7 +321,7 @@ export class Variable extends BaseNode {
      * @param name 一般不用传，用于 rename
      */
     getEmbeddedFilePath(name = this.name) {
-        return `/embedded/${this.app.name}/frontendVariables/${name}.ts`;
+        return `/embedded/${this.app.name}/frontends/${this.parentNode.name}/variables/${name}.ts`;
     }
 
     toEmbeddedTSFile() {

package/src/concepts/ViewElement__.ts

@@ -191,6 +191,7 @@ import BindStyle from './BindStyle__';
 import View from './View__';
 import Module from './Module__';
 import App from './App__';
+import Frontend from './Frontend__';
 
 /**
  * 页面元素
@@ -305,6 +306,12 @@ export class ViewElement extends BaseNode {
     get app() {
         return this.getAncestor('App') as App;
     }
+    /**
+     * 祖先 Frontend
+     */
+    get frontend() {
+        return this.getAncestor('Frontend') as Frontend;
+    }
 
     /**
      * @param source 需要合并的部分参数
@@ -1669,7 +1676,7 @@ export class ViewElement extends BaseNode {
                     expression: transAstNodeToNaslNode(Object.assign({}, argument)),
                 }));
             }
-        } catch (error) {}
+        } catch (error) { }
         return {
             concept: 'ValidationRule',
             name: '',
@@ -1721,7 +1728,7 @@ export class ViewElement extends BaseNode {
         let element: ViewElement;
         if (astNode.type === 1) {
             if (astNode.tag === 'router-view') {
-                if (config.scope === 'h5') {
+                if (view.frontend.type === 'h5') {
                     astNode.tag = 'van-router-view';
                 } else {
                     astNode.tag = 'u-router-view';
@@ -1925,7 +1932,7 @@ export class ViewElement extends BaseNode {
             finalCode: false,
             nodePathAttr: true,
             attrFormat: (attr: BindAttribute | BindEvent | BindDirective, element?: ViewElement, defaultResult?: string) => {
-                if (attr.concept === 'BindAttribute') {
+                if (attr.concept === 'BindAttribute' && !['href', 'destination', 'externalDestination', 'download'].includes(attr.name)) {
                     const api = config.allNodesAPI[element.tag];
                     const apiOfAttr = api && api.attrs && api.attrs.find((_attr) => _attr.name === attr.name);
                     if (['u-form-item', 'u-validator', 'van-field'].includes(element.tag) && attr.name === 'rules') {
@@ -2084,11 +2091,27 @@ export class ViewElement extends BaseNode {
         this.staticClass && parts.push(`class="${this.staticClass}"`);
         this.staticStyle && parts.push(`style="${this.staticStyle}"`);
 
+        const vIfs: string[] = [];
         [].concat(this.bindAttrs, this.bindDirectives, this.bindEvents).forEach((attr: BindAttribute | BindDirective | BindEvent) => {
             const result = newOptions.attrFormat(attr, this, attr?.toVue(newOptions));
+
+            // v-auth v-if 都翻译成 v-if
+            if(attr instanceof BindDirective && ['if', 'auth'].includes(attr.name) && result !== false) {
+                const expr = result.replace(/v-(if|auth)="(.*)"/, (match, p1, p2) => p2);
+                if(expr)
+                    vIfs.push(attr.name === 'if' ? expr : `$auth.has(${expr})`);
+
+                return;
+            }
+
             result && parts.push(result);
         });
 
+        if(vIfs.length === 2)
+            parts.push(`v-if="(${vIfs[0]}) && (${vIfs[1]})"`);
+        else if(vIfs.length === 1)
+            parts.push(`v-if="${vIfs[0]}"`)
+
         const bindStyles = newOptions.bindStylesFormat(this.bindStyles, this);
         if (bindStyles)
             parts.push(bindStyles);

package/src/concepts/View__.ts

@@ -28,6 +28,7 @@ import Variable from './Variable__';
 import Logic from './Logic__';
 import BindEvent from './BindEvent__';
 import Module from './Module__';
+import Frontend from './Frontend__';
 import App from './App__';
 
 /**
@@ -161,6 +162,12 @@ export class View extends BaseNode {
     get app() {
         return this.getAncestor('App') as App;
     }
+    /**
+     * 祖先 Frontend
+     */
+    get frontend() {
+        return this.getAncestor('Frontend') as Frontend;
+    }
 
     /**
      * @param source 需要合并的部分参数
@@ -259,8 +266,6 @@ export class View extends BaseNode {
         });
     }
 
-
-
     /**
     * 插入页面元素
     * @internal
@@ -394,7 +399,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
     getParamUniqueName(name = 'param1') {
         return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
@@ -532,7 +536,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
     getVariableUniqueName(name = 'variable1') {
         return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
@@ -670,7 +673,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
     getLogicUniqueName(name = 'logic1') {
         return utils.unique(name, this.getLogicExistingNames(), undefined, false);
     }
@@ -808,7 +810,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
     getBindEventExistingNames(excludedList: Array<BindEvent> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.bindEvents as BindEvent[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -950,9 +951,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
-
-
     getViewExistingNames(excludedList: Array<View> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.children as View[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1094,9 +1092,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
-
-
     /**
     * 删除页面元素
     * @param name 页面元素名称
@@ -1145,8 +1140,6 @@ export class View extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除输入参数
     * @param name 输入参数名称
@@ -1195,8 +1188,6 @@ export class View extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除变量
     * @param name 变量名称
@@ -1245,8 +1236,6 @@ export class View extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除逻辑
     * @param name 逻辑名称
@@ -1295,8 +1284,6 @@ export class View extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除元素绑定事件
     * @param name 元素绑定事件名称
@@ -1345,8 +1332,6 @@ export class View extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除页面
     * @param name 页面名称
@@ -1404,7 +1389,7 @@ export class View extends BaseNode {
     get parentAuth() {
         const _nameSpace = this.getTsNamespace();
         const mainViewName = _nameSpace.split('.')[2];
-        return mainViewName ? this.app.views.find((item) => item.name === mainViewName)?.auth : this.auth;
+        return mainViewName ? this.frontend.views.find((item) => item.name === mainViewName)?.auth : this.auth;
     }
     /**
      * 设置页面权限
@@ -1710,7 +1695,7 @@ export class View extends BaseNode {
                 parent = parent.parentNode;
             }
         }
-        return `/embedded/${this.app.name}/views/${pathName}.ts`;
+        return `/embedded/${this.app.name}/frontends/${this.frontend.name}/views/${pathName}.ts`;
     }
 
     getNamespace(): string {
@@ -1918,6 +1903,7 @@ export class View extends BaseNode {
     }
 
     get path() {
+        const basePath = this.frontend.basePath;
         const _path = [];
         let view: View = this;
         while (view.concept === 'View') {
@@ -1928,7 +1914,7 @@ export class View extends BaseNode {
         if (_path.length) {
             path += `${_path.reverse().join('/')}`;
         }
-        return path;
+        return `${basePath}${path}`;
     }
 
     /**
@@ -2153,6 +2139,10 @@ export class View extends BaseNode {
                 return replaceCode;
 
             let fnCode = $1;
+            if ($1.startsWith(`${variable}.`))
+                fnCode = $1.replaceAll(`${variable}.`, `${replaceCode}.`);
+            if ($1.startsWith(`${variable},`))
+                fnCode = $1.replaceAll(`${variable},`, `${replaceCode},`);
             if ($1.includes(`(${variable},`))
                 fnCode = $1.replaceAll(`(${variable},`, `(${replaceCode},`);
             if ($1.includes(`(${variable}.`))
@@ -2206,6 +2196,16 @@ export class View extends BaseNode {
         return code;
     }
 
+    getViewCallLogics():string[] {
+        const callbackLogics :string[] = [];
+        this.traverseChildren((el) => {
+            if (el instanceof Identifier && el.namespace?.endsWith('logics')) {
+                callbackLogics.push(el.namespace + '.' + el.name);
+            }
+        });
+        return callbackLogics;
+    }
+
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
     // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/basics/stdlib/nasl.auth.ts

@@ -93,7 +93,7 @@ export default new Namespace({
             returns: [],
         }),
         new Logic({
-            name: 'getProcessStartBy',
+            name: 'getUserList',
             params: [
                 new Param({
                     name: 'userNameFilter',