@lcap/nasl 1.0.0-alpha.13 → 1.0.0-alpha.14

package/src/concepts/ViewElement__.ts

@@ -86,7 +86,8 @@ function transAstNodeToNaslNode(astNode: any, namespace?: string): any {
         }
     } else if (astNode.type === 'MemberExpression') {
         if (astNode.object?.name === '$global') {
-            node = transAstNodeToNaslNode(astNode.property, 'nasl.browser');
+            // 目前只有权限相关的
+            node = transAstNodeToNaslNode(astNode.property, 'nasl.auth');
         } else {
             node = {
                 concept: 'MemberExpression',
@@ -305,24 +306,24 @@ export class ViewElement extends BaseNode {
     }
 
     /**
-    * 插入元素绑定属性
-    * @internal
-    * @param name 元素绑定属性名称，如果不填会自动生成一个唯一名称
-    */
+     * 插入元素绑定属性
+     * @internal
+     * @param name 元素绑定属性名称，如果不填会自动生成一个唯一名称
+     */
     _insertBindAttributeAt(name: string, index: number): BindAttribute;
 
     /**
-    * 插入元素绑定属性
-    * @internal
-    * @param bindAttributeOptions 元素绑定属性参数
-    */
+     * 插入元素绑定属性
+     * @internal
+     * @param bindAttributeOptions 元素绑定属性参数
+     */
     _insertBindAttributeAt(bindAttributeOptions: Partial<BindAttribute>, index: number): BindAttribute;
 
     /**
-    * 插入元素绑定属性
-    * @internal
-    * @param bindAttribute 已有的元素绑定属性实例
-    */
+     * 插入元素绑定属性
+     * @internal
+     * @param bindAttribute 已有的元素绑定属性实例
+     */
     _insertBindAttributeAt(bindAttribute: BindAttribute, index: number): BindAttribute;
 
     _insertBindAttributeAt(options: string | Partial<BindAttribute> | BindAttribute, index: number) {
@@ -340,7 +341,7 @@ export class ViewElement extends BaseNode {
                 name: options,
             }, this, 'bindAttrs');
         } else if (options instanceof BindAttribute) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             bindAttribute = options;
             Object.assign(bindAttribute, relationOptions);
         } else {
@@ -446,24 +447,24 @@ export class ViewElement extends BaseNode {
     }
 
     /**
-    * 插入元素绑定事件
-    * @internal
-    * @param name 元素绑定事件名称，如果不填会自动生成一个唯一名称
-    */
+     * 插入元素绑定事件
+     * @internal
+     * @param name 元素绑定事件名称，如果不填会自动生成一个唯一名称
+     */
     _insertBindEventAt(name: string, index: number): BindEvent;
 
     /**
-    * 插入元素绑定事件
-    * @internal
-    * @param bindEventOptions 元素绑定事件参数
-    */
+     * 插入元素绑定事件
+     * @internal
+     * @param bindEventOptions 元素绑定事件参数
+     */
     _insertBindEventAt(bindEventOptions: Partial<BindEvent>, index: number): BindEvent;
 
     /**
-    * 插入元素绑定事件
-    * @internal
-    * @param bindEvent 已有的元素绑定事件实例
-    */
+     * 插入元素绑定事件
+     * @internal
+     * @param bindEvent 已有的元素绑定事件实例
+     */
     _insertBindEventAt(bindEvent: BindEvent, index: number): BindEvent;
 
     _insertBindEventAt(options: string | Partial<BindEvent> | BindEvent, index: number) {
@@ -481,7 +482,7 @@ export class ViewElement extends BaseNode {
                 name: options,
             }, this, 'bindEvents');
         } else if (options instanceof BindEvent) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             bindEvent = options;
             Object.assign(bindEvent, relationOptions);
         } else {
@@ -587,24 +588,24 @@ export class ViewElement extends BaseNode {
     }
 
     /**
-    * 插入元素指令
-    * @internal
-    * @param name 元素指令名称，如果不填会自动生成一个唯一名称
-    */
+     * 插入元素指令
+     * @internal
+     * @param name 元素指令名称，如果不填会自动生成一个唯一名称
+     */
     _insertBindDirectiveAt(name: string, index: number): BindDirective;
 
     /**
-    * 插入元素指令
-    * @internal
-    * @param bindDirectiveOptions 元素指令参数
-    */
+     * 插入元素指令
+     * @internal
+     * @param bindDirectiveOptions 元素指令参数
+     */
     _insertBindDirectiveAt(bindDirectiveOptions: Partial<BindDirective>, index: number): BindDirective;
 
     /**
-    * 插入元素指令
-    * @internal
-    * @param bindDirective 已有的元素指令实例
-    */
+     * 插入元素指令
+     * @internal
+     * @param bindDirective 已有的元素指令实例
+     */
     _insertBindDirectiveAt(bindDirective: BindDirective, index: number): BindDirective;
 
     _insertBindDirectiveAt(options: string | Partial<BindDirective> | BindDirective, index: number) {
@@ -622,7 +623,7 @@ export class ViewElement extends BaseNode {
                 name: options,
             }, this, 'bindDirectives');
         } else if (options instanceof BindDirective) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             bindDirective = options;
             Object.assign(bindDirective, relationOptions);
         } else {
@@ -720,24 +721,24 @@ export class ViewElement extends BaseNode {
     }
 
     /**
-    * 插入页面元素
-    * @internal
-    * @param name 页面元素名称，如果不填会自动生成一个唯一名称
-    */
+     * 插入页面元素
+     * @internal
+     * @param name 页面元素名称，如果不填会自动生成一个唯一名称
+     */
     _insertViewElementAt(name: string, index: number): ViewElement;
 
     /**
-    * 插入页面元素
-    * @internal
-    * @param viewElementOptions 页面元素参数
-    */
+     * 插入页面元素
+     * @internal
+     * @param viewElementOptions 页面元素参数
+     */
     _insertViewElementAt(viewElementOptions: Partial<ViewElement>, index: number): ViewElement;
 
     /**
-    * 插入页面元素
-    * @internal
-    * @param viewElement 已有的页面元素实例
-    */
+     * 插入页面元素
+     * @internal
+     * @param viewElement 已有的页面元素实例
+     */
     _insertViewElementAt(viewElement: ViewElement, index: number): ViewElement;
 
     _insertViewElementAt(options: string | Partial<ViewElement> | ViewElement, index: number) {
@@ -755,7 +756,7 @@ export class ViewElement extends BaseNode {
                 name: options,
             }, this, 'children');
         } else if (options instanceof ViewElement) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             viewElement = options;
             Object.assign(viewElement, relationOptions);
         } else {
@@ -853,9 +854,9 @@ export class ViewElement extends BaseNode {
     }
 
     /**
-    * 删除元素绑定属性
-    * @param name 元素绑定属性名称
-    */
+     * 删除元素绑定属性
+     * @param name 元素绑定属性名称
+     */
     removeBindAttribute(name: string): void;
 
     /**
@@ -901,9 +902,9 @@ export class ViewElement extends BaseNode {
     }
 
     /**
-    * 删除元素绑定事件
-    * @param name 元素绑定事件名称
-    */
+     * 删除元素绑定事件
+     * @param name 元素绑定事件名称
+     */
     removeBindEvent(name: string): void;
 
     /**
@@ -949,9 +950,9 @@ export class ViewElement extends BaseNode {
     }
 
     /**
-    * 删除元素指令
-    * @param name 元素指令名称
-    */
+     * 删除元素指令
+     * @param name 元素指令名称
+     */
     removeBindDirective(name: string): void;
 
     /**
@@ -997,9 +998,9 @@ export class ViewElement extends BaseNode {
     }
 
     /**
-    * 删除页面元素
-    * @param name 页面元素名称
-    */
+     * 删除页面元素
+     * @param name 页面元素名称
+     */
     removeViewElement(name: string): void;
 
     /**
@@ -1053,7 +1054,7 @@ export class ViewElement extends BaseNode {
     get parentAuth() {
         const _nameSpace = this.view.getNamespace();
         const mainViewName = _nameSpace.split('.')[2];
-        return this.app.views.find((item) => item.name === mainViewName)?.auth;
+        return this.view.parentNode.concept === 'App' ? this.view.auth : this.app.views.find((item) => item.name === mainViewName)?.auth;
     }
 
     getViewElementUniqueName(name = 'viewElement1') {
@@ -1092,8 +1093,9 @@ export class ViewElement extends BaseNode {
     }
 
     haveScope(node: ViewElement): boolean {
-        const dataSourcePcList = ['uGallery', 'uTableView', 'uListView', 'uGridView', 'uCalendarView', 'uListComponents', 'uSelect'];
-        const dataSourceH5List = ['vanListView', 'vanForComponents', 'lcapEchartsLine', 'lcapEchartsBar', 'lcapEchartsPie'];
+        // uGallery 没有子集不需要scope
+        const dataSourcePcList = ['uTableView', 'uListView', 'uGridView', 'uCalendarView', 'uListComponents', 'uSelect'];
+        const dataSourceH5List = ['vanListView', 'vanGridView', 'vanForComponents', 'lcapEchartsLine', 'lcapEchartsBar', 'lcapEchartsPie'];
         const dataSourceList = [...dataSourcePcList, ...dataSourceH5List];
         return dataSourceList.includes(node.toHump(node.tag));
     }
@@ -1231,6 +1233,11 @@ export class ViewElement extends BaseNode {
                                 tabSize: state.tabSize + 2,
                             })) + ',\n';
                     }
+                    if (Array.isArray(attr.rules) && attr.rules.length) {
+                        attr.rules.forEach((item) => {
+                            code += item.toEmbeddedTS(shiftState(state, code)) + ',\n';
+                        });
+                    }
                 });
                 this.bindDirectives.forEach((directive) => {
                     if (directive.expression) {
@@ -1336,6 +1343,11 @@ export class ViewElement extends BaseNode {
      */
     private static _fromASTNode(astNode: compiler.ASTElement, context?: ParseContext): ViewElement {
         const view: View = context?.view;
+        // 从祖先节点收集的slot列表
+        let slotScopeList: string[] = [];
+        if (Array.isArray(context?.slotScopeList)) {
+            slotScopeList = [...context?.slotScopeList];
+        }
         // 临时处理组件的 text
         //h5-mock
         if (
@@ -1350,13 +1362,13 @@ export class ViewElement extends BaseNode {
             });
             astNode.children = [];
         }
-
         // 将 scopedSlots 合并到 children 中
         if (astNode.scopedSlots) {
             astNode.children = astNode.children || [];
             Object.keys(astNode.scopedSlots).forEach((key) => {
-                if (!astNode.children.find((child) => key === (child as compiler.ASTElement).slotTarget))
+                if (!astNode.children.find((child) => key === (child as compiler.ASTElement).slotTarget)) {
                     astNode.children.unshift(astNode.scopedSlots[key]);
+                }
             });
             delete astNode.scopedSlots;
         }
@@ -1375,8 +1387,17 @@ export class ViewElement extends BaseNode {
                 } else {
                     astNode.tag = 'u-router-view';
                 }
+            } else if (astNode.tag === 'template') {
+                slotScopeList.unshift(astNode.slotScope);
             }
             const tagName = astNode.tag.replace(ViewElement.TAG_NAME_PREFIX_REG, '').replace(/-/g, '_');
+            let newContext: any = {};
+            if (context) {
+                newContext = {
+                    ...context,
+                };
+            }
+            newContext.slotScopeList = slotScopeList;
             element = new ViewElement({
                 tag: astNode.tag,
                 name: astNode.attrsMap.ref || view.getViewElementUniqueName(`${tagName}1`),
@@ -1384,45 +1405,43 @@ export class ViewElement extends BaseNode {
                 staticStyle: astNode.attrsMap.style,
                 slotTarget: astNode.slotTarget && json5.parse(astNode.slotTarget),
                 slotScope: astNode.slotScope === '_empty_' ? '' : astNode.slotScope,
-                children: astNode.children.map((item) => this._fromASTNode(item as compiler.ASTElement, context)) as unknown as Array<ViewElement>,
+                children: astNode.children.map((item) => this._fromASTNode(item as compiler.ASTElement, newContext)) as unknown as Array<ViewElement>,
             });
-
-            astNode.attrs
-                && astNode.attrs.forEach((oldAttr) => {
-                    let attr: BindAttribute;
-                    if (oldAttr.value === '""' && (oldAttr as any).end - (oldAttr as any).start === oldAttr.name.length) {
+            astNode?.attrs?.forEach((oldAttr) => {
+                let attr: BindAttribute;
+                if (oldAttr.value === '""' && (oldAttr as any).end - (oldAttr as any).start === oldAttr.name.length) {
+                    attr = new BindAttribute({
+                        type: 'static',
+                        name: oldAttr.name,
+                        value: 'true',
+                    });
+                } else {
+                    try {
+                        const tmp = json5.parse(oldAttr.value);
+                        const source: any = {
+                            type: typeof tmp === 'string' ? 'string' : 'static',
+                            name: oldAttr.name,
+                            value: typeof tmp === 'string' ? tmp : oldAttr.value,
+                        };
+                        if (oldAttr.name === 'rules') {
+                            source.rules = tmp?.split('|').map((ruleStr: string) => this._parseValidationRule(ruleStr.trim()));
+                        }
+                        attr = new BindAttribute(source);
+                    } catch (e) {
+                        const expression = <any> this._parseExpression(oldAttr.value);
                         attr = new BindAttribute({
-                            type: 'static',
+                            type: 'dynamic',
                             name: oldAttr.name,
-                            value: 'true',
+                            value: expression ? '' : oldAttr.value,
+                            expression,
                         });
-                    } else {
-                        try {
-                            const tmp = json5.parse(oldAttr.value);
-                            const source: any = {
-                                type: typeof tmp === 'string' ? 'string' : 'static',
-                                name: oldAttr.name,
-                                value: typeof tmp === 'string' ? tmp : oldAttr.value,
-                            };
-                            if (oldAttr.name === 'rules') {
-                                source.rules = tmp?.split('|').map((ruleStr: string) => this._parseValidationRule(ruleStr.trim()));
-                            }
-                            attr = new BindAttribute(source);
-                        } catch (e) {
-                            const expression = <any> this._parseExpression(oldAttr.value);
-                            attr = new BindAttribute({
-                                type: 'dynamic',
-                                name: oldAttr.name,
-                                value: expression ? '' : oldAttr.value,
-                                expression,
-                            });
-                            if (astNode.attrsMap[`:${attr.name}.sync`]) {
-                                attr.sync = true;
-                            }
+                        if (astNode.attrsMap[`:${attr.name}.sync`]) {
+                            attr.sync = true;
                         }
                     }
-                    element.addBindAttribute(attr);
-                });
+                }
+                element.addBindAttribute(attr);
+            });
 
             // compiler 处理:value.sync 时会加上update:value事件，需要过滤
             astNode.events
@@ -1437,19 +1456,24 @@ export class ViewElement extends BaseNode {
                         if (matchArr?.length >= 2) {
                             argsStr = matchArr[1];
                         }
+                        const newArgList = ['$event', ...slotScopeList];
                         let args: any[] = [];
-                        if (argsStr) {
-                            args = argsStr.split(',').map((argStr) => {
-                                const keyword = argStr.trim().split('.');
-                                return {
-                                    concept: 'Argument',
-                                    expression: genArgumentMemberExpression(keyword),
-                                };
-                            });
-                        }
-                        const viewNamespace = view?.getNamespace();
-                        const viewName = `${view?.name}`;
-                        let calleeNamespace = `${viewNamespace}.${viewName}.logics`;
+                        const argStrs: string[] = argsStr.split(',');
+                        argStrs.forEach((argStr) => {
+                            const index = newArgList.indexOf(argStr.trim());
+                            if (index !== -1) {
+                                newArgList.splice(index, 1);
+                            }
+                        });
+                        argStrs.push(...newArgList);
+                        args = argStrs.filter((argStr) => !!argStr && argStr !== '_empty_').map((argStr) => {
+                            const keyword = argStr.trim().split('.');
+                            return {
+                                concept: 'Argument',
+                                expression: genArgumentMemberExpression(keyword),
+                            };
+                        });
+                        let calleeNamespace = '';
                         if (calleeName) {
                             const namespaceArr = calleeName.split('.');
                             const start = namespaceArr.shift();
@@ -1504,15 +1528,12 @@ export class ViewElement extends BaseNode {
                 }));
             }
         } else if (astNode.type === 2) {
-            if (config.scope === 'h5') {
-                element = new ViewElement({
-                    tag: 'van-text',
-                });
-            } else {
-                element = new ViewElement({
-                    tag: 'u-text',
-                });
-            }
+            const tagName = config.scope === 'h5' ? 'van-text' : 'u-text';
+            const baseName = tagName.replace(ViewElement.TAG_NAME_PREFIX_REG, '').replace(/-/g, '_');
+            element = new ViewElement({
+                tag: tagName,
+                name: view.getViewElementUniqueName(`${baseName}1`),
+            });
             const value = astNode.text.match(/{{(.*?)}}/)[1].trim();
             const expression = <any> this._parseExpression(value);
             element.addBindAttribute(new BindAttribute({
@@ -1522,15 +1543,12 @@ export class ViewElement extends BaseNode {
                 expression,
             }));
         } else if (astNode.type === 3) {
-            if (config.scope === 'h5') {
-                element = new ViewElement({
-                    tag: 'van-text',
-                });
-            } else {
-                element = new ViewElement({
-                    tag: 'u-text',
-                });
-            }
+            const tagName = config.scope === 'h5' ? 'van-text' : 'u-text';
+            const baseName = tagName.replace(ViewElement.TAG_NAME_PREFIX_REG, '').replace(/-/g, '_');
+            element = new ViewElement({
+                tag: tagName,
+                name: view.getViewElementUniqueName(`${baseName}1`),
+            });
             element.addBindAttribute(new BindAttribute({
                 name: 'text',
                 type: 'string',
@@ -1557,24 +1575,14 @@ export class ViewElement extends BaseNode {
         let ast = compiler.compile(html, compilerOptions).ast;
         if (ast.tag === 'template' && !ast.slotTarget)
             ast = ast.children[0] as compiler.ASTElement;
-
-        let root: ViewElement;
-        utils.traverse((current) => {
-            // 处理 scopedSlots;
-            if (!current.parent)
-                root = this._fromASTNode(current.node, context);
-            else
-                (current.parent.children as any)[current.index] = this._fromASTNode(current.node, context);
-        }, { node: ast });
-        return root;
+        return this._fromASTNode(ast, context);
     }
 
     /**
      * 从模板生成规范的 ViewElement 对象
      */
     public static fromHTML(html: string, context?: ParseContext) {
-        const element = this.parse(html, context);
-        return element;
+        return this.parse(html, context);
     }
 
     /**
@@ -1613,7 +1621,12 @@ export class ViewElement extends BaseNode {
                                 if (apiOfAttr && !apiOfAttr.type.includes('string'))
                                     return '';
                             }
-                            return `${name}="{{ ${value.replace(/"/g, "'").replace(/\$utils\['(.+?)'\]/g, '$1')} }}"`;
+                            value = value
+                                .replace(/"/g, "'")
+                                .replace(/\$utils\['(.+?)'\]/g, '$1')
+                                .replace(/\$refs./g, 'elements.')
+                                .replace(/\$global./g, 'nasl.auth.');
+                            return `${name}="{{ ${value} }}"`;
                         });
                     else
                         return defaultResult;
@@ -1728,11 +1741,34 @@ export class ViewElement extends BaseNode {
         let params: Params = null;
         if (this.parentNode) {
             params = (this.parentNode as any)?.__removeViewElement?.(this);
-            (this.view as any)?.removeExistingViewElement(this);
+            this.traverseChildren((ele: ViewElement) => {
+                (this.view as any)?.removeExistingViewElement(ele);
+            });
         }
         return params;
     }
 
+    findElementByName(name: string): ViewElement {
+        return utils.traverse((current) => {
+            if (current.node.name === name)
+                return current.node;
+        }, { node: this });
+    }
+
+    findElementByTag(tag: string): ViewElement {
+        return utils.traverse((current) => {
+            if (current.node.tag === tag)
+                return current.node;
+        }, { node: this });
+    }
+
+    findElementByAttr(name: string, value: string): ViewElement {
+        return utils.traverse((current) => {
+            if (current.node.bindAttrs.some((attr) => attr.name === name && attr.value === value))
+                return current.node;
+        }, { node: this });
+    }
+
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
     // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓