@lcap/nasl 2.22.0-beta.5 → 3.0.0-beta.1

package/src/concepts/Param__.ts

@@ -259,7 +259,7 @@ export class Param extends BaseNode {
   defaultExpression: LogicItem | Function | AnonymousFunction = undefined;
   @excludedInJSON()
   @property()
-  options: Array<{ text?: string; value: string }> = undefined;
+  options: Array<{ text?: string; value: string, description?: string }> = undefined;
   @excludedInJSON()
   @property()
   useComponent: {
@@ -350,6 +350,7 @@ export class Param extends BaseNode {
           code += this.required ? ': ' : '?: ';
           code += this.defaultExpression.toEmbeddedTSDefinition(shiftState(state, code));
       } else if (!dontType && this.typeAnnotation) {
+        // TODO
           code += ': ';
           code += this.typeAnnotation.toEmbeddedTS(shiftState(state, code));
           // toTS暂时只需要翻译引用数据类型的，因为值都是字符串
@@ -434,8 +435,6 @@ export class Param extends BaseNode {
       this._readonly = val;
   }
 
-
-
   setnNewTypeAnnotation(oldTypeAnnotation: TypeAnnotation) {
       const json = oldTypeAnnotation.toJSON();
       const typeAnnotation = TypeAnnotation.from(json);
@@ -458,6 +457,17 @@ export class Param extends BaseNode {
       }
   }
 
+  /**
+     * 祖先 Logic
+     */
+  get AuthLogic() {
+      return this.getAncestor('AuthLogic') as Logic;
+  }
+
+  get AuthLogicForCallInterface() {
+      return this.getAncestor('AuthLogicForCallInterface') as Logic;
+  }
+
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
     // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/QueryFieldExpression__.ts

@@ -48,6 +48,8 @@ export class QueryFieldExpression extends LogicItem {
     @property()
     propertyName: string = undefined;
 
+    
+
     /**
      * @param source 需要合并的部分参数
      */
@@ -64,6 +66,7 @@ export class QueryFieldExpression extends LogicItem {
         return super.from(source, parentNode, parentKey) as QueryFieldExpression;
     }
 
+    
     /**
      * 设置entityAsName
      */
@@ -88,6 +91,10 @@ export class QueryFieldExpression extends LogicItem {
         });
     }
 
+    
+
+    
+
     //================================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
@@ -109,6 +116,17 @@ export class QueryFieldExpression extends LogicItem {
         };
     }
 
+    setEntityAsNameAndEffect(entityAsName: string) {
+        this.setEntityAsName(entityAsName);
+        this.effect();
+    }
+
+    effect() {
+        // 处理选中的此实体的 CallQueryComponent
+        const callQueryComponent = this.getAncestor('CallQueryComponent') as CallQueryComponent;
+        callQueryComponent.saveStructure();
+    }
+
     setName(asName: string) {
         this.update({ asName });
     }

package/src/concepts/QuerySelectExpression__.ts

@@ -37,11 +37,13 @@ export class QuerySelectExpression extends LogicItem {
     star: boolean = true;
 
     /**
-     * 查询聚合函数列表
+     * selectElements
      */
     @property('QueryAggregateExpression | QueryFieldExpression')
     selectElements: Array<QueryAggregateExpression | QueryFieldExpression> = [];
 
+    
+
     /**
      * @param source 需要合并的部分参数
      */
@@ -58,8 +60,9 @@ export class QuerySelectExpression extends LogicItem {
         return super.from(source, parentNode, parentKey) as QuerySelectExpression;
     }
 
+    
     /**
-     * 设置查询聚合函数列表
+     * 设置selectElements
      */
     setSelectElements(selectElements: Array<QueryAggregateExpression | QueryFieldExpression>) {
         const object = {
@@ -70,7 +73,7 @@ export class QuerySelectExpression extends LogicItem {
         });
     }
 
-    getQueryAggregateExpressionExistingNames(excludedList: Array<QueryAggregateExpression> = []) {
+        getQueryAggregateExpressionExistingNames(excludedList: Array<QueryAggregateExpression> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.selectElements as QueryAggregateExpression[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -344,6 +347,9 @@ export class QuerySelectExpression extends LogicItem {
         return node;
     }
 
+
+    
+
     /**
     * 删除查询聚合函数
     * @param name 查询聚合函数名称
@@ -369,6 +375,8 @@ export class QuerySelectExpression extends LogicItem {
         return queryAggregateExpression.delete();
     }
 
+    
+
     /**
     * 删除查询属性
     * @param name 查询属性名称

package/src/concepts/TypeAnnotation__.ts

@@ -73,6 +73,7 @@ export const GENERIC_DESC: Record<string, string> = {
     Map: '从K类型到V类型的映射',
 };
 
+
 /**
  * 判断是否是联合类型
  * @param typeAnnotation
@@ -157,6 +158,8 @@ export class TypeAnnotation extends BaseNode {
     @property()
     ruleMap: Object = undefined;
 
+    
+
     /**
      * @param source 需要合并的部分参数
      */
@@ -196,6 +199,10 @@ export class TypeAnnotation extends BaseNode {
         });
     }
 
+    
+
+    
+
     /**
     * 插入类型标注
     * @internal
@@ -228,6 +235,8 @@ export class TypeAnnotation extends BaseNode {
         return typeAnnotation;
     }
 
+    
+
     /**
      * 插入类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -250,6 +259,8 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
+    
+
     /**
      * 添加类型标注
      * @internal
@@ -269,6 +280,8 @@ export class TypeAnnotation extends BaseNode {
         return this._insertTypeAnnotationInTypeArgumentsAt(options as any, index);
     }
 
+    
+
     /**
      * 添加类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -292,6 +305,8 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
+    
+
     /**
     * 插入类型标注
     * @internal
@@ -324,6 +339,8 @@ export class TypeAnnotation extends BaseNode {
         return typeAnnotation;
     }
 
+    
+
     /**
      * 插入类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -346,6 +363,8 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
+    
+
     /**
      * 添加类型标注
      * @internal
@@ -365,6 +384,8 @@ export class TypeAnnotation extends BaseNode {
         return this._insertTypeAnnotationInReturnTypeAt(options as any, index);
     }
 
+    
+
     /**
      * 添加类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -388,6 +409,11 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
+
+
+
+    
+
     /**
     * 插入数据结构属性
     * @internal
@@ -420,6 +446,8 @@ export class TypeAnnotation extends BaseNode {
         return structureProperty;
     }
 
+    
+
     /**
      * 插入数据结构属性
      * @param structurePropertyOptions 数据结构属性参数
@@ -442,6 +470,8 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
+    
+
     /**
      * 添加数据结构属性
      * @internal
@@ -461,6 +491,8 @@ export class TypeAnnotation extends BaseNode {
         return this._insertStructurePropertyAt(options as any, index);
     }
 
+    
+
     /**
      * 添加数据结构属性
      * @param structurePropertyOptions 数据结构属性参数
@@ -484,6 +516,9 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
+
+    
+
     /**
      * 删除类型标注
      * @param typeAnnotation 已有的类型标注实例
@@ -491,10 +526,12 @@ export class TypeAnnotation extends BaseNode {
     removeTypeAnnotationInTypeArguments(typeAnnotation: TypeAnnotation): void;
 
     removeTypeAnnotationInTypeArguments(options: TypeAnnotation) {
-        const typeAnnotation: TypeAnnotation = options;
+        let typeAnnotation: TypeAnnotation = options;
         return typeAnnotation.delete();
     }
 
+    
+
     /**
      * 删除类型标注
      * @param typeAnnotation 已有的类型标注实例
@@ -502,7 +539,7 @@ export class TypeAnnotation extends BaseNode {
     removeTypeAnnotationInReturnType(typeAnnotation: TypeAnnotation): void;
 
     removeTypeAnnotationInReturnType(options: TypeAnnotation) {
-        const typeAnnotation: TypeAnnotation = options;
+        let typeAnnotation: TypeAnnotation = options;
         return typeAnnotation.delete();
     }
 
@@ -529,6 +566,8 @@ export class TypeAnnotation extends BaseNode {
         return params;
     }
 
+
+
     /**
      * 删除数据结构属性
      * @param structureProperty 已有的数据结构属性实例
@@ -536,7 +575,7 @@ export class TypeAnnotation extends BaseNode {
     removeStructureProperty(structureProperty: StructureProperty): void;
 
     removeStructureProperty(options: StructureProperty) {
-        const structureProperty: StructureProperty = options;
+        let structureProperty: StructureProperty = options;
         return structureProperty.delete();
     }
 
@@ -858,13 +897,13 @@ export class TypeAnnotation extends BaseNode {
             });
             return code;
         } else if (this.typeKind === 'anonymousStructure') {
-            let code = `{ __name: "AStructure_${this.hash}", `;
+            let code = `{ `;
             (this.properties || []).forEach((property, i) => {
                 code += `${property.name}: `;
                 code += `${property.typeAnnotation ? property.typeAnnotation.toEmbeddedTS(shiftState(state, code, { inline: true, tabSize: (state?.tabSize || 0) + 1 })) : '`未知`'}`;
-                if (i < this.properties?.length - 1)
-                    code += ', ';
+                code += ', ';
             });
+            code += `__name: "AStructure_${this.hash}" `;
             code += ' }';
             return code;
         } else {

package/src/concepts/Variable__.ts

@@ -29,6 +29,8 @@ import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
 import TypeAnnotation from './TypeAnnotation__';
 import Logic from './Logic__';
+import AuthInterface from './AuthInterface__';
+import AuthLogicForCallInterface from './AuthLogicForCallInterface__';
 import View from './View__';
 import Module from './Module__';
 import App from './App__';
@@ -113,6 +115,18 @@ export class Variable extends BaseNode {
     get process() {
         return this.getAncestor('Process') as Process;
     }
+    /**
+     * 祖先 AuthInterface
+     */
+    get AuthLogic() {
+        return this.getAncestor('AuthInterface') as AuthInterface;
+    }
+    /**
+     * 祖先 AuthLogicForCallInterface
+     */
+    get AuthLogicForCallInterface() {
+        return this.getAncestor('AuthLogicForCallInterface') as AuthLogicForCallInterface;
+    }
 
     /**
      * @param source 需要合并的部分参数

package/src/concepts/ViewComponent__.ts

@@ -18,9 +18,9 @@ import Module from './Module__';
 import App from './App__';
 
 /**
- * 页面组件
+ * 平台类型
  */
-@concept('页面组件')
+@concept('平台类型')
 export class ViewComponent extends BaseNode {
     /**
      * 产品概念
@@ -29,19 +29,19 @@ export class ViewComponent extends BaseNode {
     concept: 'ViewComponent' = 'ViewComponent';
 
     /**
-     * 页面组件名称
+     * 平台类型名称
      */
     @property()
     name: string = undefined;
 
     /**
-     * 页面组件标题
+     * 平台类型标题
      */
     @property()
     title: string = undefined;
 
     /**
-     * 页面组件描述
+     * 平台类型描述
      */
     @property()
     description: string = undefined;
@@ -77,7 +77,7 @@ export class ViewComponent extends BaseNode {
     methods: Array<Logic> = [];
 
     /**
-     * 页面组件列表
+     * 平台类型列表
      */
     @property('ViewComponent')
     children: Array<ViewComponent> = [];
@@ -713,23 +713,23 @@ export class ViewComponent extends BaseNode {
     }
 
     /**
-    * 插入页面组件
+    * 插入平台类型
     * @internal
-    * @param name 页面组件名称，如果不填会自动生成一个唯一名称
+    * @param name 平台类型名称，如果不填会自动生成一个唯一名称
     */
     _insertViewComponentAt(name: string, index: number): ViewComponent;
 
     /**
-    * 插入页面组件
+    * 插入平台类型
     * @internal
-    * @param viewComponentOptions 页面组件参数
+    * @param viewComponentOptions 平台类型参数
     */
     _insertViewComponentAt(viewComponentOptions: Partial<ViewComponent>, index: number): ViewComponent;
 
     /**
-    * 插入页面组件
+    * 插入平台类型
     * @internal
-    * @param viewComponent 已有的页面组件实例
+    * @param viewComponent 已有的平台类型实例
     */
     _insertViewComponentAt(viewComponent: ViewComponent, index: number): ViewComponent;
 
@@ -762,20 +762,20 @@ export class ViewComponent extends BaseNode {
     }
 
     /**
-     * 插入页面组件
-     * @param name 页面组件名称，如果不填会自动生成一个唯一名称
+     * 插入平台类型
+     * @param name 平台类型名称，如果不填会自动生成一个唯一名称
      */
     insertViewComponentAt(name: string, index: number): ViewComponent;
 
     /**
-     * 插入页面组件
-     * @param viewComponentOptions 页面组件参数
+     * 插入平台类型
+     * @param viewComponentOptions 平台类型参数
      */
     insertViewComponentAt(viewComponentOptions: Partial<ViewComponent>, index: number): ViewComponent;
 
     /**
-     * 插入页面组件
-     * @param viewComponent 已有的页面组件实例
+     * 插入平台类型
+     * @param viewComponent 已有的平台类型实例
      */
     insertViewComponentAt(viewComponent: ViewComponent, index: number): ViewComponent;
 
@@ -790,23 +790,23 @@ export class ViewComponent extends BaseNode {
     }
 
     /**
-     * 添加页面组件
+     * 添加平台类型
      * @internal
-     * @param name 页面组件名称，如果不填会自动生成一个唯一名称
+     * @param name 平台类型名称，如果不填会自动生成一个唯一名称
      */
     _addViewComponent(name?: string): ViewComponent;
 
     /**
-     * 添加页面组件
+     * 添加平台类型
      * @internal
-     * @param viewComponentOptions 页面组件参数
+     * @param viewComponentOptions 平台类型参数
      */
     _addViewComponent(viewComponentOptions: Partial<ViewComponent>): ViewComponent;
 
     /**
-     * 添加页面组件
+     * 添加平台类型
      * @internal
-     * @param viewComponent 已有的页面组件实例
+     * @param viewComponent 已有的平台类型实例
      */
     _addViewComponent(viewComponent: ViewComponent): ViewComponent;
 
@@ -816,21 +816,21 @@ export class ViewComponent extends BaseNode {
     }
 
     /**
-     * 添加页面组件
+     * 添加平台类型
      * @internal
-     * @param name 页面组件名称，如果不填会自动生成一个唯一名称
+     * @param name 平台类型名称，如果不填会自动生成一个唯一名称
      */
     addViewComponent(name?: string): ViewComponent;
 
     /**
-     * 添加页面组件
-     * @param viewComponentOptions 页面组件参数
+     * 添加平台类型
+     * @param viewComponentOptions 平台类型参数
      */
     addViewComponent(viewComponentOptions: Partial<ViewComponent>): ViewComponent;
 
     /**
-     * 添加页面组件
-     * @param viewComponent 已有的页面组件实例
+     * 添加平台类型
+     * @param viewComponent 已有的平台类型实例
      */
     addViewComponent(viewComponent: ViewComponent): ViewComponent;
 
@@ -1191,14 +1191,14 @@ export class ViewComponent extends BaseNode {
 
 
     /**
-    * 删除页面组件
-    * @param name 页面组件名称
+    * 删除平台类型
+    * @param name 平台类型名称
     */
     removeViewComponent(name: string): void;
 
     /**
-     * 删除页面组件
-     * @param viewComponent 已有的页面组件实例
+     * 删除平台类型
+     * @param viewComponent 已有的平台类型实例
      */
     removeViewComponent(viewComponent: ViewComponent): void;
 
@@ -1207,7 +1207,7 @@ export class ViewComponent extends BaseNode {
         if (typeof options === 'string') {
             viewComponent = (this.children as ViewComponent[]).find((item) => item.name === options);
             if (!viewComponent) {
-                throw new Error('找不到页面组件 ' + options);
+                throw new Error('找不到平台类型 ' + options);
             }
         } else {
             viewComponent = options;

package/src/concepts/ViewElement__.ts

@@ -1406,7 +1406,7 @@ export class ViewElement extends BaseNode {
     }
 
     toHump(name: string): string {
-        return name.replace(/\-(\w)/g, (all, letter) => letter.toUpperCase());
+        return name.replace(/-(\w)/g, (all, letter) => letter.toUpperCase());
     }
     toFirstUpper(name: string): string {
         return name.replace(/^\S/, (s) => s.toUpperCase());
@@ -2242,6 +2242,109 @@ export class ViewElement extends BaseNode {
         current = (index === 0 ? 'current' : 'current' + index);
         return current;
     }
+
+    /**
+     * 计算约束样式
+     */
+    computeConstraintStyle(nodeRect: DOMRect, parentRect: DOMRect) {
+        const constraintWidth = nodeRect.width;
+        const constraintHeight = nodeRect.height;
+        const constraintLeft = nodeRect.x - parentRect.x;
+        const constraintTop = nodeRect.y - parentRect.y;
+        const constraintRight = (parentRect.width - nodeRect.width - constraintLeft);
+        const constraintBottom = (parentRect.height - nodeRect.height - constraintTop);
+        const styleObj = this.parseStyleToObject(this.staticStyle);
+        const { '--constraint-x': constraintHorizontal = 'left',
+            '--constraint-y': constraintVertical = 'top',
+            width: staticWidth = '',
+            height: staticHeight = '' } = styleObj;
+        let left = '';
+        let right = '';
+        let top = '';
+        let bottom = '';
+        let transform = '';
+        let width = staticWidth;
+        let height = staticHeight;
+
+        const parentWidth = constraintLeft + constraintWidth + constraintRight;
+        const parentHeight = constraintTop + constraintHeight + constraintBottom;
+
+        if (constraintHorizontal === 'left') {
+            left = constraintLeft + 'px';
+            right = '';
+        } else if (constraintHorizontal === 'right') {
+            left = '';
+            right = constraintRight + 'px';
+        } else if (constraintHorizontal === 'center') {
+            const offset = constraintLeft + constraintWidth / 2 - parentWidth / 2;
+            left = `calc(50% ${offset > 0 ? '+' : '-'} ${Math.abs(offset)}px)`;
+            right = '';
+            transform = 'translateX(-50%)';
+        } else if (constraintHorizontal === 'scale') {
+            left = constraintLeft * 100 / parentWidth + '%';
+            right = constraintRight * 100 / parentWidth + '%';
+            width = 'auto';
+        } else if (constraintHorizontal === 'left-right') {
+            left = constraintLeft + 'px';
+            right = constraintRight + 'px';
+            width = 'auto';
+        }
+
+        if (constraintVertical === 'top') {
+            top = constraintTop + 'px';
+            bottom = '';
+        } else if (constraintVertical === 'bottom') {
+            top = '';
+            bottom = constraintBottom + 'px';
+        } else if (constraintVertical === 'center') {
+            const offset = constraintTop + constraintHeight / 2 - parentHeight / 2;
+            top = `calc(50% ${offset > 0 ? '+' : '-'} ${Math.abs(offset)}px)`;
+            bottom = '';
+            transform = transform ? 'translate(-50%, -50%)' : 'translateY(-50%)';
+        } else if (constraintVertical === 'scale') {
+            top = constraintTop * 100 / parentHeight + '%';
+            bottom = constraintBottom * 100 / parentHeight + '%';
+            height = 'auto';
+        } else if (constraintVertical === 'top-bottom') {
+            top = constraintTop + 'px';
+            bottom = constraintBottom + 'px';
+            height = 'auto';
+        }
+        const newStyleObj: Record<string, any> = {
+            ...styleObj,
+            left,
+            right,
+            top,
+            bottom,
+            transform,
+            width,
+            height,
+        };
+        const newStaticStyle = this.stringifyStyleAttr(newStyleObj);
+        this.update({
+            staticStyle: newStaticStyle,
+        });
+    }
+
+    parseStyleToObject(styleStr: string = '') {
+        const styleObj = styleStr.split(/;/gim).reduce((obj:Record<string, string | number>, item) => {
+            // background-image:url(http://www...)
+            item = item.trim();
+            const pos = item.indexOf(':');
+            if (pos >= 0) {
+                const key = item.slice(0, pos).trim();
+                const value = item.slice(pos + 1).trim();
+                obj[key] = value;
+            }
+            return obj;
+        }, {});
+        return styleObj;
+    }
+    stringifyStyleAttr(styleObj: Record<string, string | number>) {
+        return Object.keys(styleObj)
+            .map((key) => `${key}:${String(styleObj[key]).trim()};`)
+            .join('');
+    }
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
     // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓