@lcap/nasl 2.18.0 → 2.20.0-beta.1

package/src/concepts/Identifier__.ts

@@ -39,8 +39,6 @@ export class Identifier extends LogicItem {
     @property()
     name: string = undefined;
 
-    
-
     /**
      * @param source 需要合并的部分参数
      */
@@ -54,13 +52,6 @@ export class Identifier extends LogicItem {
         return super.from(source, parentNode, parentKey) as Identifier;
     }
 
-    
-    
-
-    
-
-    
-
     //================================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
@@ -95,6 +86,8 @@ export class Identifier extends LogicItem {
                     enumName = `${this.namespace}.${this.name}`;
                 }
                 name = enumName;
+            } else if (this.namespace.endsWith('logics')) {
+                name = `'${this.namespace}.${name}'`;
             }
         }
         return name;
@@ -134,6 +127,8 @@ export class Identifier extends LogicItem {
                     enumName = `${this.namespace}.${this.name}`;
                 }
                 name = enumName;
+            } else if (this.namespace.endsWith('logics')) {
+                name = `'${this.namespace}.${name}'`;
             }
         }
         return name;
@@ -189,13 +184,10 @@ export class Identifier extends LogicItem {
                 return this.name;
             }
         }
-        // 因为右侧枚举要赋值就赋值toList方法一下
-        if (this.namespace && this.namespace.endsWith('enums')) {
-            // 绑定类型
-            if (this.parentNode instanceof BindAttribute) {
-                // this.parentNode.name === 'data-source'
-                return (this.namespace + '.' || '') + this.name + '.toList';
-            }
+
+        // 全局变量在不是页面的地方放置，就会报错
+        if (this.namespace?.startsWith('app.frontendVariables') && !this.view) {
+            return '__FRONTENDVARIABLES__';
         }
 
         // 如果是nasl.util.Enum 的子集里的 Identifier > MemberExpression > Argument > callfunction
@@ -271,6 +263,16 @@ export class Identifier extends LogicItem {
         });
     }
 
+    setNameAndNamespace(name: string, namespace: string) {
+        const object = {
+            name,
+            namespace,
+        };
+        this.update({
+            ...object,
+        });
+    }
+
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
     // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/LogicItem__.ts

@@ -17,6 +17,7 @@ import Logic from './Logic__';
 import Module from './Module__';
 import App from './App__';
 import View from './View__';
+import Frontend from './Frontend__';
 import ProcessElement from './ProcessElement__';
 import Process from './Process__';
 
@@ -29,7 +30,7 @@ export class LogicItem extends BaseNode {
      * 产品概念
      */
     @property()
-    concept: 'LogicItem' | 'Start' | 'End' | 'IfStatement' | 'SwitchStatement' | 'SwitchCase' | 'ForEachStatement' | 'WhileStatement' | 'Assignment' | 'BatchAssignment' | 'Comment' | 'CallLogic' | 'CallFunction' | 'CallInterface' | 'Destination' | 'ExternalDestination' | 'ValidationRule' | 'Argument' | 'Anchor' | 'JSBlock' | 'Identifier' | 'NullLiteral' | 'BooleanLiteral' | 'StringLiteral' | 'StringInterpolation' | 'NumericLiteral' | 'BinaryExpression' | 'MatchCase' | 'Match' | 'UnaryExpression' | 'MemberExpression' | 'Unparsed' | 'CallQueryComponent' | 'QueryFromExpression' | 'QueryJoinExpression' | 'QueryFieldExpression' | 'QueryAggregateExpression' | 'QueryOrderByExpression' | 'QueryGroupByExpression' | 'QuerySelectExpression' | 'QueryLimitExpression' | 'SqlQueryComponent' | 'OqlQueryComponent' | 'ProcessOutcome' | 'Assignee' = 'LogicItem';
+    concept: 'LogicItem' | 'Start' | 'End' | 'IfStatement' | 'SwitchStatement' | 'SwitchCase' | 'ForEachStatement' | 'WhileStatement' | 'Assignment' | 'BatchAssignment' | 'Comment' | 'CallLogic' | 'CallFunction' | 'CallInterface' | 'Destination' | 'ExternalDestination' | 'ValidationRule' | 'Argument' | 'Anchor' | 'JSBlock' | 'Identifier' | 'NullLiteral' | 'BooleanLiteral' | 'StringLiteral' | 'StringInterpolation' | 'NumericLiteral' | 'BinaryExpression' | 'MatchCase' | 'Match' | 'UnaryExpression' | 'MemberExpression' | 'Unparsed' | 'New' | 'NewComposite' | 'NewList' | 'NewMap' | 'CallQueryComponent' | 'QueryFromExpression' | 'QueryJoinExpression' | 'QueryFieldExpression' | 'QueryAggregateExpression' | 'QueryOrderByExpression' | 'QueryGroupByExpression' | 'QuerySelectExpression' | 'QueryLimitExpression' | 'SqlQueryComponent' | 'OqlQueryComponent' | 'ProcessOutcome' | 'Assignee' | 'ProcessOutcomes' = 'LogicItem';
 
     /**
      * 逻辑项标题
@@ -85,6 +86,12 @@ export class LogicItem extends BaseNode {
     get view() {
         return this.getAncestor('View') as View;
     }
+    /**
+     * 祖先 Frontend
+     */
+    get frontend() {
+        return this.getAncestor('Frontend') as Frontend;
+    }
     /**
      * 祖先 ProcessElement
      */