@lcap/nasl 1.0.0-alpha → 1.0.0-alpha.1

package/src/concepts/View__.ts

@@ -1,6 +1,6 @@
 import Namespace from './Namespace__';
 import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
-import translator from '../../bak/translator';
+import translator from '../bak/translator';
 import Role from './Role__';
 import { ElementToVueOptions } from './ViewElement__';
 import { Structure } from './Structure__';
@@ -233,29 +233,29 @@ export class View extends BaseNode {
         });
     }
 
-        getViewElementUniqueName(name = 'viewElement1') {
+    getViewElementUniqueName(name = 'viewElement1') {
         return utils.unique(name, this.getViewElementExistingNames());
     }
 
     /**
-    * 插入页面元素
-    * @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) {
@@ -370,7 +370,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
     getParamExistingNames(excludedList: Array<Param> = []) {
         const excludedSet = new Set(excludedList);
         return this.params.filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -380,24 +379,24 @@ export class View extends BaseNode {
     }
 
     /**
-    * 插入输入参数
-    * @internal
-    * @param name 输入参数名称，如果不填会自动生成一个唯一名称
-    */
+     * 插入输入参数
+     * @internal
+     * @param name 输入参数名称，如果不填会自动生成一个唯一名称
+     */
     _insertParamAt(name: string, index: number): Param;
 
     /**
-    * 插入输入参数
-    * @internal
-    * @param paramOptions 输入参数参数
-    */
+     * 插入输入参数
+     * @internal
+     * @param paramOptions 输入参数参数
+     */
     _insertParamAt(paramOptions: Partial<Param>, index: number): Param;
 
     /**
-    * 插入输入参数
-    * @internal
-    * @param param 已有的输入参数实例
-    */
+     * 插入输入参数
+     * @internal
+     * @param param 已有的输入参数实例
+     */
     _insertParamAt(param: Param, index: number): Param;
 
     _insertParamAt(options: string | Partial<Param> | Param, index: number) {
@@ -512,7 +511,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
     getVariableExistingNames(excludedList: Array<Variable> = []) {
         const excludedSet = new Set(excludedList);
         return this.variables.filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -522,24 +520,24 @@ export class View extends BaseNode {
     }
 
     /**
-    * 插入局部变量
-    * @internal
-    * @param name 局部变量名称，如果不填会自动生成一个唯一名称
-    */
+     * 插入局部变量
+     * @internal
+     * @param name 局部变量名称，如果不填会自动生成一个唯一名称
+     */
     _insertVariableAt(name: string, index: number): Variable;
 
     /**
-    * 插入局部变量
-    * @internal
-    * @param variableOptions 局部变量参数
-    */
+     * 插入局部变量
+     * @internal
+     * @param variableOptions 局部变量参数
+     */
     _insertVariableAt(variableOptions: Partial<Variable>, index: number): Variable;
 
     /**
-    * 插入局部变量
-    * @internal
-    * @param variable 已有的局部变量实例
-    */
+     * 插入局部变量
+     * @internal
+     * @param variable 已有的局部变量实例
+     */
     _insertVariableAt(variable: Variable, index: number): Variable;
 
     _insertVariableAt(options: string | Partial<Variable> | Variable, index: number) {
@@ -654,7 +652,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
     getBindEventExistingNames(excludedList: Array<BindEvent> = []) {
         const excludedSet = new Set(excludedList);
         return this.events.filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -664,24 +661,24 @@ export class View 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) {
@@ -796,7 +793,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
     getLogicExistingNames(excludedList: Array<Logic> = []) {
         const excludedSet = new Set(excludedList);
         return this.logics.filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -806,24 +802,24 @@ export class View extends BaseNode {
     }
 
     /**
-    * 插入逻辑
-    * @internal
-    * @param name 逻辑名称，如果不填会自动生成一个唯一名称
-    */
+     * 插入逻辑
+     * @internal
+     * @param name 逻辑名称，如果不填会自动生成一个唯一名称
+     */
     _insertLogicAt(name: string, index: number): Logic;
 
     /**
-    * 插入逻辑
-    * @internal
-    * @param logicOptions 逻辑参数
-    */
+     * 插入逻辑
+     * @internal
+     * @param logicOptions 逻辑参数
+     */
     _insertLogicAt(logicOptions: Partial<Logic>, index: number): Logic;
 
     /**
-    * 插入逻辑
-    * @internal
-    * @param logic 已有的逻辑实例
-    */
+     * 插入逻辑
+     * @internal
+     * @param logic 已有的逻辑实例
+     */
     _insertLogicAt(logic: Logic, index: number): Logic;
 
     _insertLogicAt(options: string | Partial<Logic> | Logic, index: number) {
@@ -938,9 +934,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
-
-
     getViewExistingNames(excludedList: Array<View> = []) {
         const excludedSet = new Set(excludedList);
         return this.children.filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -950,24 +943,24 @@ export class View extends BaseNode {
     }
 
     /**
-    * 插入页面
-    * @internal
-    * @param name 页面名称，如果不填会自动生成一个唯一名称
-    */
+     * 插入页面
+     * @internal
+     * @param name 页面名称，如果不填会自动生成一个唯一名称
+     */
     _insertViewAt(name: string, index: number): View;
 
     /**
-    * 插入页面
-    * @internal
-    * @param viewOptions 页面参数
-    */
+     * 插入页面
+     * @internal
+     * @param viewOptions 页面参数
+     */
     _insertViewAt(viewOptions: Partial<View>, index: number): View;
 
     /**
-    * 插入页面
-    * @internal
-    * @param view 已有的页面实例
-    */
+     * 插入页面
+     * @internal
+     * @param view 已有的页面实例
+     */
     _insertViewAt(view: View, index: number): View;
 
     _insertViewAt(options: string | Partial<View> | View, index: number) {
@@ -1082,13 +1075,10 @@ export class View extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
-    * 删除页面元素
-    * @param name 页面元素名称
-    */
+     * 删除页面元素
+     * @param name 页面元素名称
+     */
     removeViewElement(name: string): void;
 
     /**
@@ -1133,12 +1123,10 @@ export class View extends BaseNode {
         return params;
     }
 
-
-
     /**
-    * 删除输入参数
-    * @param name 输入参数名称
-    */
+     * 删除输入参数
+     * @param name 输入参数名称
+     */
     removeParam(name: string): void;
 
     /**
@@ -1183,12 +1171,10 @@ export class View extends BaseNode {
         return params;
     }
 
-
-
     /**
-    * 删除局部变量
-    * @param name 局部变量名称
-    */
+     * 删除局部变量
+     * @param name 局部变量名称
+     */
     removeVariable(name: string): void;
 
     /**
@@ -1233,12 +1219,10 @@ export class View extends BaseNode {
         return params;
     }
 
-
-
     /**
-    * 删除元素绑定事件
-    * @param name 元素绑定事件名称
-    */
+     * 删除元素绑定事件
+     * @param name 元素绑定事件名称
+     */
     removeBindEvent(name: string): void;
 
     /**
@@ -1283,12 +1267,10 @@ export class View extends BaseNode {
         return params;
     }
 
-
-
     /**
-    * 删除逻辑
-    * @param name 逻辑名称
-    */
+     * 删除逻辑
+     * @param name 逻辑名称
+     */
     removeLogic(name: string): void;
 
     /**
@@ -1333,12 +1315,10 @@ export class View extends BaseNode {
         return params;
     }
 
-
-
     /**
-    * 删除页面
-    * @param name 页面名称
-    */
+     * 删除页面
+     * @param name 页面名称
+     */
     removeView(name: string): void;
 
     /**
@@ -1834,7 +1814,7 @@ export class View extends BaseNode {
     //================================================================================
 }
 
-classMap['View'] = View;
+classMap.View = View;
 export default View;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/server/getLogics.ts

@@ -52,7 +52,7 @@ function iterator(tree: FakeNode | FakeProcessNode, searchContent: string, fakeN
     }
 }
 
-export async function getLogics(node: CallLogic | BindEvent, filterText?: string) {
+export async function getLogics(node: CallLogic | BindEvent) {
     const app = node.rootNode as App;
     if (node.concept === 'CallLogic' || node.concept === 'BindEvent') {
         const nc = app.entities.map((entity) => entity2LogicNamespace(entity));
@@ -63,7 +63,6 @@ export async function getLogics(node: CallLogic | BindEvent, filterText?: string
 
         const ps = app.processes.map((p) => process2LogicNamespace(p));
 
-        const fakeNode = {};
         const tree = new Namespace({
             name: 'logics',
             path: `${app.getNamespace()}.logics`,
@@ -71,24 +70,52 @@ export async function getLogics(node: CallLogic | BindEvent, filterText?: string
             logics: app.logics,
             children: [...nc, ...(app.dependencies.slice(1) as any as Namespace[]), ...ps],
         });
-        iterator(tree, filterText, fakeNode);
-        const result = [fakeNode];
+        const result = [tree];
         if (node.view && node.view.logics) {
+            // 获取组件逻辑, 获取传入字段的子集
+            const elementsMethod = await naslServer.getElementsMethod(node, '__elements');
+
+            const viewElements: Array<Namespace> = [];
+            (elementsMethod as Array<any>).forEach((item) => {
+                const { text, children } = item;
+                if (children && children.length) {
+                    const logics = children.map((method: any) =>
+                        new Logic({
+                            name: method.text,
+                            params: [],
+                            returns: [],
+                            body: [],
+                        }));
+                    const viewElement = new Namespace({
+                        title: text,
+                        name: 'methods',
+                        logics,
+                    });
+                    viewElements.push(viewElement);
+                }
+            });
+
             // 增加页面逻辑
-            const fakeNode = {};
-            const tree = new Namespace(new Namespace({
+            const tree = new Namespace({
                 name: 'logics',
                 path: `${node.view.getNamespace()}.${node.view.name}.logics`,
                 title: '页面逻辑',
                 logics: node.view.logics,
-            }));
-            iterator(tree, filterText, fakeNode);
-            result.push(fakeNode);
-            // 获取组件逻辑, 获取传入字段的子集
-            // const elementsMethod = await naslServer.getElementsMethod(node, '__elements');
-            // console.log(elementsMethod);
+                children: viewElements,
+            });
+            result.push(tree);
         }
-
+        // console.log(result);
         return result;
     }
 }
+
+export function iteratorTree(treeList: {}[], filterText?: string) {
+    const result: {}[] = [];
+    treeList.forEach((item) => {
+        const fakeNode = {};
+        iterator(item, filterText, fakeNode);
+        result.push(fakeNode);
+    });
+    return result;
+}

package/src/server/getMemberIdentifier.ts

@@ -1,4 +1,4 @@
-import { BaseNode, CompletionProperty, App, Identifier, MemberExpression, Enum, NullLiteral, BooleanLiteral } from '..';
+import { BaseNode, CompletionProperty, App, Identifier, MemberExpression, Enum, NullLiteral, BooleanLiteral, Param } from '..';
 import naslServer from './naslServer';
 
 interface variableItem {
@@ -10,7 +10,7 @@ interface variableItem {
     expression: MemberExpression | Identifier;
 }
 // 格式化变量数据
-function formatVariableData(data: unknown | variableItem[], parent?: any) {
+function formatVariableData(data: unknown | variableItem[], node: BaseNode, parent?: any) {
     if (Array.isArray(data)) {
         const result = data.map((item) => {
             // value需要拼接生成
@@ -28,13 +28,40 @@ function formatVariableData(data: unknown | variableItem[], parent?: any) {
                 });
             }
             if (item.children) {
-                item.children = formatVariableData(item.children, item);
+                item.children = formatVariableData(item.children, node, item);
+            }
+            if (!parent) {
+                const completionProperty = new CompletionProperty(item);
+                // 变量 param return 在这里添加图标
+                completionProperty.level = getNodeLevelFromLogic(completionProperty, node);
+                return completionProperty;
+            } else {
+                const completionProperty = new CompletionProperty(item);
+                completionProperty.level = 'refProperty';
+                return completionProperty;
             }
-            return new CompletionProperty(item);
         });
         return result;
     }
 }
+// 从logic获取节点的level
+function getNodeLevelFromLogic(completionProperty: CompletionProperty, node: BaseNode): string {
+    const logic = (node as Param).logic;
+    if (logic) {
+        const { params, variables, returns } = logic;
+        if (params.find((item) => item.name === completionProperty.name))
+            return 'param';
+
+        if (returns.find((item) => item.name === completionProperty.name))
+            return 'return';
+        // if (variables.find((item) => item.name === completionProperty.name))
+        // return 'variable';
+
+        // 其余的全部按variable展示
+        return 'variable';
+    }
+    return 'variable';
+}
 
 // 简单实现一版本的格式化nums
 function formatEnums(enums: Array<Enum>) {
@@ -52,9 +79,13 @@ function formatEnums(enums: Array<Enum>) {
                 objectqwer: item.expression,
                 property: new Identifier({ name: newEnumItem.value }),
             });
-            return new CompletionProperty(newEnumItem);
+            const completionProperty = new CompletionProperty(newEnumItem);
+            completionProperty.level = 'enumItem';
+            return completionProperty;
         });
-        return new CompletionProperty(item as any);
+        const completionProperty = new CompletionProperty(item as any);
+        completionProperty.level = 'enum';
+        return completionProperty;
     });
     return result;
 }
@@ -72,7 +103,9 @@ function formatLiterals() {
     ];
     const newList = list.map((item) => {
         item.expression = new Identifier({ name: item.name });
-        return new CompletionProperty(item);
+        const completionProperty = new CompletionProperty(item);
+        completionProperty.level = 'literal';
+        return completionProperty;
     });
     return newList;
 }
@@ -81,7 +114,7 @@ export async function getMemberIdentifier(node: BaseNode, filterText?: string) {
     if (node) {
         // 先去获取
         const completion = await naslServer.getSelectCompletion(node) as variableItem[];
-        const completionData = formatVariableData(completion);
+        const completionData = formatVariableData(completion, node);
         // 获取枚举
         const app = node.rootNode as App;
         const literals = formatLiterals();
@@ -92,9 +125,9 @@ export async function getMemberIdentifier(node: BaseNode, filterText?: string) {
         // },
         // 这个可能需要自己算一下
         const result = [
-            { name: '字面量', children: literals },
-            { name: '枚举', children: newEnums },
-            { name: '变量', children: completionData },
+            { name: '字面量', children: literals, level: 'category' },
+            { name: '枚举', children: newEnums, level: 'category' },
+            { name: '变量', children: completionData, level: 'category' },
             // { name: '流程变量', children: [] },
         ];
         return result;

package/src/server/index.ts

@@ -1,4 +1,4 @@
-import { getLogics } from './getLogics';
+import { getLogics, iteratorTree } from './getLogics';
 import { getInterfaces } from './getInterfaces';
 import { getFunctions, getBuildInFunction } from './getFunctions';
 import { getValidates, getValidateFunction } from './getValidates';
@@ -9,6 +9,7 @@ import naslServer from './naslServer';
 const server: any = {
     ...naslServer,
     getLogics,
+    iteratorTree,
     getInterfaces,
     getFunctions,
     getBuildInFunction,

package/src/server/naslServer.ts

@@ -857,6 +857,26 @@ const naslServer = {
             }
         }
     },
+    // 获取element方法的可选值
+    getElementsMethod(node: CallLogic | BindEvent, getFieldKey: string) {
+        const { currentSource, fileNode } = naslServer.getCurrentSource(node);
+        console.log(currentSource);
+        if (currentSource && fileNode) {
+            return naslServer._getFieldKeySelectCompletion({
+                file: (fileNode as FileNode).getEmbeddedFilePath(),
+                range: {
+                    line: lsp2tspNumber(currentSource.range.start.line),
+                    offset: lsp2tspNumber(currentSource.range.start.character),
+                },
+                getFieldKey,
+            });
+        } else {
+            console.log('没找到节点', currentSource, fileNode);
+        }
+    },
+    _getFieldKeySelectCompletion(args: any) {
+        return this.messager.requestCommand('getFieldKeySelectCompletion', args);
+    },
 };
 /**
  * 处理删除节点

package/tsconfig.json

@@ -12,7 +12,7 @@
         "experimentalDecorators": true,
         "resolveJsonModule": true,
         "sourceMap": true,
-        "rootDir": ".",
+        "rootDir": "src",
         "outDir": "out",
         "pretty": true,
         "baseUrl": ".",