@lcap/nasl 3.7.0-alpha.1 → 3.7.0-beta.1

package/src/server/getConnector.ts

@@ -8,56 +8,64 @@ export function getConnections(node: CallConnector) {
     return app?.connections || [];
 }
 
+function getConnectorIcon(connector: Connector) {
+  if (connector.previewImg) {
+    return connector.previewImg;
+  }
+  return '';
+}
+
 export function getConnectorTree(node: CallConnector, filterText: string) {
     const source: Connection[] = getConnections(node);
     let target = source;
     if (filterText) {
         target = source.filter((dep) => new RegExp(filterText).test(dep.name));
     }
-    const tree = [];
-    const redises = target.filter((dep) => dep.connector.connectorKind === 'redis');
-    const kafkas = target.filter((dep) => dep.connector.connectorKind === 'kafka');
-    if (redises.length) {
-        tree.push({
-            name: 'Redis连接器',
-            title: 'Redis连接器',
-            icon: 'redis',
-            expanded: true,
-            unselectable: true, // 自定义属性。用于标注当前选项是否可以被选择
-            children: redises,
-        });
-    }
-    if (kafkas.length) {
-        tree.push({
-            name: 'Kafka连接器',
-            title: 'Kafka连接器',
-            icon: 'kafka',
-            expanded: true,
-            unselectable: true, // 自定义属性。用于标注当前选项是否可以被选择
-            children: kafkas,
-        });
-    }
+    const tree: {
+      name: string; title: string; icon: string; expanded: boolean; unselectable: boolean; // 自定义属性。用于标注当前选项是否可以被选择
+      isCustom: boolean; // 自定义属性。用于标注当前选项是否是自定义连接器
+      children: Connection[];
+    }[] = [];
+    // const redises = target.filter((dep) => dep.connector.connectorKind === 'redis');
+    // const kafkas = target.filter((dep) => dep.connector.connectorKind === 'kafka');
+    // if (redises.length) {
+    //     tree.push({
+    //         name: 'Redis连接器',
+    //         title: 'Redis连接器',
+    //         icon: 'redis',
+    //         expanded: true,
+    //         unselectable: true, // 自定义属性。用于标注当前选项是否可以被选择
+    //         children: redises,
+    //     });
+    // }
+    // if (kafkas.length) {
+    //     tree.push({
+    //         name: 'Kafka连接器',
+    //         title: 'Kafka连接器',
+    //         icon: 'kafka',
+    //         expanded: true,
+    //         unselectable: true, // 自定义属性。用于标注当前选项是否可以被选择
+    //         children: kafkas,
+    //     });
+    // }
     // 自定义连接器相关逻辑处理
     const customConnectionNameMap = new Map<Connector, Connection[]>();
     target?.forEach((item) => {
         const { connector } = item;
-        const { connectorKind } = connector;
-        if (connectorKind === 'app') {
-            if (customConnectionNameMap.has(connector)) {
-                customConnectionNameMap.get(connector).push(item);
-            } else {
-                customConnectionNameMap.set(connector, [item]);
-            }
+        if (customConnectionNameMap.has(connector)) {
+            customConnectionNameMap.get(connector).push(item);
+        } else {
+            customConnectionNameMap.set(connector, [item]);
         }
     });
     customConnectionNameMap.forEach((value, key) => {
         tree.push({
             name: key.title,
             title: key.title,
-            icon: key.previewImg,
+            icon: getConnectorIcon(key),
             expanded: true,
             unselectable: true, // 自定义属性。用于标注当前选项是否可以被选择
-            isCustom: true, // 自定义属性。用于标注当前选项是否是自定义连接器
+            isCustom: key.connectorKind === 'app', // 自定义属性。用于标注当前选项是否是自定义连接器
             children: value,
         });
     });
@@ -88,14 +96,14 @@ export function publishConnector(app: App, connector: Connector) {
     if (dependenciesNames.includes(connector.name)) {
         const connectorIndex = app.dependencies.findIndex((dep) => dep.name === connector.name);
         const oldConnector = app.dependencies[connectorIndex] as Connector;
-        app.removeConnectorInDependencies(oldConnector);
+        app.removeConnector(oldConnector);
         // 由于 CallInterface 会在setTimeout 中处理删除Interface
         // 为了防止误删已经增加的。需要同样做一个延迟操作
         setTimeout(() => {
-            app.insertConnectorInDependenciesAt(connector, connectorIndex);
+            app.insertConnectorAt(connector, connectorIndex);
             notifyTsWorkToUpdateConnections(app, connector);
         }, 500)
         return;
     }
-    app.addConnectorInDependencies(connector);
+    app.addConnector(connector);
 }

package/src/server/getFunctions.ts

@@ -1,12 +1,12 @@
 import { getStdlibNamespace } from '..';
 
 export function getFunctions() {
-  return getStdlibNamespace().findChild('util');
+  return getStdlibNamespace()?.findChild?.('util');
 }
 
 export function getBuildInFunction(name: string) {
-  const utilFunctions = getFunctions().functions;
-  return utilFunctions.find((f) => f.name === name);
+  const utilFunctions = getFunctions()?.functions;
+  return utilFunctions?.find?.((f) => f.name === name);
 }
 
 export function getValidationInFunction(name: string) {

package/src/server/getLogics.ts

@@ -20,6 +20,7 @@ import {
 } from '..';
 import { process2LogicNamespace } from './process2LogicNamespace';
 import { moduleToLogicNamesapce } from './getExtensionModules';
+import * as utils from '../utils';
 
 type FakeNode = Partial<Namespace> & {
   children?: Array<FakeNode>;
@@ -132,11 +133,11 @@ function getElementsMethods(likeComponent: View | BusinessComponent, parentNodeN
         return logic.isPublic;
       });
     } else {
-      const itemTag = toHump(item.tag);
+      const itemTag = utils.kebab2Pascal(item.tag);
       const naslServer = (app as any).naslServer;
-      const elementsLogic = naslServer.elementsLogic;
+      const elementsLogic = naslServer?.elementsLogic;
       const elementsLogicName = itemTag;
-      eleLogis = elementsLogic[elementsLogicName];
+      eleLogis = elementsLogic?.[elementsLogicName];
     }
     // 看是不是有已经有有参数的函数了
     if (Array.isArray(eleLogis) && eleLogis.length) {
@@ -146,7 +147,7 @@ function getElementsMethods(likeComponent: View | BusinessComponent, parentNodeN
       }
       const viewElement = new Namespace({
         title: toHump(item.name),
-        logics: eleLogis.map((item: Logic) => Logic.from(item.toJSON())),
+        logics: eleLogis.filter(e => e).map((item: Logic) => Logic.from(item.toJSON())),
         path,
         originConcept: 'ViewElement',
       });
@@ -321,7 +322,7 @@ export function getLogicsSync(node: CallLogic | BindEvent | Identifier | Logic,
             name: 'category',
             path: `auth`,
             title: '认证与权限',
-            logics: getStdlibNamespace().findChild('auth').logics.filter((item) => item.name !== 'getCurrentUser'),
+            logics: getStdlibNamespace().findChild('auth').logics.filter((item) => !['getCurrentUser', 'encryptPassword', 'validatePassword', 'generateUserId'].includes(item.name)),
             expanded: false,
           }),
           new Namespace({
@@ -357,16 +358,32 @@ export function getLogicsSync(node: CallLogic | BindEvent | Identifier | Logic,
           systemTree.children[1].logics.push(compareKeyboardInput);
         }
 
-        if (logicNode.virtualParams?.length && ['MouseEvent', 'KeyboardEvent'].includes(logicNode.virtualParams[0]?.__TypeAnnotation?.typeName)) {
-          systemTree.children.push(
-            new Namespace({
-              name: 'category',
-              path: `event`,
-              title: '事件逻辑',
-              logics: getStdlibNamespace().findChild('event').logics,
-              expanded: false,
-            })
-          );
+        // 判断当前event是否支持事件逻辑
+        if (logicNode.virtualParams?.length) {
+          const eventParam = logicNode.virtualParams[0];
+
+          let isMatch = false;
+
+          if (['MouseEvent', 'KeyboardEvent'].includes(eventParam?.__TypeAnnotation?.typeName)) {
+            isMatch = true;
+          } else if (
+            eventParam?.__TypeAnnotation?.typeKind === 'anonymousStructure' &&
+            eventParam?.__TypeAnnotation?.properties?.some(item => ['altKey', 'ctrlKey', 'metaKey'].includes(item.name))
+          ) {
+            isMatch = true;
+          }
+
+          if (isMatch) {
+            systemTree.children.push(
+              new Namespace({
+                name: 'category',
+                path: `event`,
+                title: '事件逻辑',
+                logics: getStdlibNamespace().findChild('event').logics,
+                expanded: false,
+              })
+            );
+          }
         }
       }
       /**
@@ -438,8 +455,8 @@ export function getLogicsSync(node: CallLogic | BindEvent | Identifier | Logic,
           new Namespace({
             name: 'category',
             path: `auth`,
-            title: '用户',
-            logics: getStdlibNamespace().findChild('auth').logics.filter((item) => item.name === 'getCurrentUser'),
+            title: '认证与权限',
+            logics: getStdlibNamespace().findChild('auth').logics.filter((item) => ['getCurrentUser', 'encryptPassword', 'validatePassword', 'generateUserId'].includes(item.name)),
             expanded: false,
           }),
         ],

package/src/server/getMemberIdentifier.ts

@@ -15,6 +15,7 @@ import {
   types,
   ViewElement,
   PAGE_COMPONENT_INCLUDE_TAG_MAP,
+  ComponentCompletionPropertyMap,
 } from '..';
 import { formatVariableData, formatFrontEndVariables, formatConfigProperties, formatBackendVariables } from './formatTsUtils';
 
@@ -98,22 +99,22 @@ function formatGlobalVariable() {
     value: 'userInfo',
     children: [
       { name: 'Status', value: 'userInfo.Status' },
-      {
-        name: 'UserInfoExtend',
-        value: 'userInfo.UserInfoExtend',
-        children: [
-          { name: 'Company', value: 'userInfo.UserInfoExtend.Company' },
-          { name: 'JobLevel', value: 'userInfo.UserInfoExtend.JobLevel' },
-          { name: 'JobNum', value: 'userInfo.UserInfoExtend.JobNum' },
-          { name: 'JobYear', value: 'userInfo.UserInfoExtend.JobYear' },
-          { name: 'RealName', value: 'userInfo.UserInfoExtend.RealName' },
-          { name: 'NickName', value: 'userInfo.UserInfoExtend.NickName' },
-          { name: 'NameAndEmail', value: 'userInfo.UserInfoExtend.NameAndEmail' },
-          { name: 'Position', value: 'userInfo.UserInfoExtend.Position' },
-          { name: 'Department', value: 'userInfo.UserInfoExtend.Department' },
-          { name: 'EmployeeId', value: 'userInfo.UserInfoExtend.EmployeeId' },
-        ],
-      },
+      // {
+      //   name: 'UserInfoExtend',
+      //   value: 'userInfo.UserInfoExtend',
+      //   children: [
+      //     { name: 'Company', value: 'userInfo.UserInfoExtend.Company' },
+      //     { name: 'JobLevel', value: 'userInfo.UserInfoExtend.JobLevel' },
+      //     { name: 'JobNum', value: 'userInfo.UserInfoExtend.JobNum' },
+      //     { name: 'JobYear', value: 'userInfo.UserInfoExtend.JobYear' },
+      //     { name: 'RealName', value: 'userInfo.UserInfoExtend.RealName' },
+      //     { name: 'NickName', value: 'userInfo.UserInfoExtend.NickName' },
+      //     { name: 'NameAndEmail', value: 'userInfo.UserInfoExtend.NameAndEmail' },
+      //     { name: 'Position', value: 'userInfo.UserInfoExtend.Position' },
+      //     { name: 'Department', value: 'userInfo.UserInfoExtend.Department' },
+      //     { name: 'EmployeeId', value: 'userInfo.UserInfoExtend.EmployeeId' },
+      //   ],
+      // },
       { name: 'UserName', value: 'userInfo.UserName' },
       { name: 'Email', value: 'userInfo.Email' },
       { name: 'UserId', value: 'userInfo.UserId' },
@@ -143,9 +144,9 @@ function formatGlobalVariable() {
     (item as any).expression = expression;
     const completionProperty = new CompletionProperty(item as any);
     completionProperty.icon = 'literal';
-    if (item.children) {
+    if ((item as any).children ) {
       const children: LogicItem[] = [];
-      item.children.forEach((child) => {
+      (item as any).children.forEach((child:any) => {
         const childExpression = new MemberExpression({
           object: expression,
           property: new Identifier({ name: child.name }),
@@ -200,12 +201,12 @@ function getCurrentLogic(
     icon: string;
   }[]
 ) {
-  // 只有data-source check-file可以
+  // 只有dataSource checkFile可以
   if (
-    (node instanceof BindAttribute && (node.name === 'data-source' || node.name === 'check-file' || node.name === 'can-dragable-handler' || node.name === 'can-dropin-handler')) ||
+    (node instanceof BindAttribute && (node.name === 'dataSource' || node.name === 'checkFile' || node.name === 'canDragableHandler' || node.name === 'canDropinHandler')) ||
     (node instanceof Identifier &&
       node.parentNode instanceof BindAttribute &&
-      (node.parentNode.name === 'data-source' || node.parentNode.name === 'check-file' || node.parentNode.name === 'can-dragable-handler' || node.parentNode.name === 'can-dropin-handler'))
+      (node.parentNode.name === 'dataSource' || node.parentNode.name === 'checkFile' || node.parentNode.name === 'canDragableHandler' || node.parentNode.name === 'canDropinHandler'))
   ) {
     const view = node.view || node.getAncestor('BusinessComponent') as BusinessComponent;
     const viewLogics = view.logics;
@@ -314,10 +315,10 @@ export function getBackendVariablesIdentifier(node: BaseNode): CompletionPropert
 export async function getVariableIdentifier(node: types.SyntaxNode): Promise<CompletionProperty[]> {
   let completionData: CompletionProperty[] = [new CompletionProperty({})];
   // 只获取第一层内容
-  const app = node.getAncestor('App');
+  const app = node?.getAncestor('App');
   const { naslServer } = app as any;
-  let nextCompletion = await naslServer.getFieldKeySelectCompletion(node, '');
-  const logic = node.getAncestor('AuthLogicForCallInterface');
+  let nextCompletion = await naslServer?.getFieldKeySelectCompletion(node, '');
+  const logic = node?.getAncestor('AuthLogicForCallInterface');
   if (logic) {
     // 祖先节点是 AuthLogicForCallInterface 时，需要过滤掉 api 以及 ${logicName}Result 两个内置参数
     const filterList = ['api', `${logic.name}Result`];
@@ -328,6 +329,26 @@ export async function getVariableIdentifier(node: types.SyntaxNode): Promise<Com
       return true;
     });
   }
+
+
+  /**
+   * 过滤stringLiteral
+   * 场景是，属性动态绑定时，会自动补全union类型的枚举值
+   */
+  nextCompletion = nextCompletion?.filter((item: any) => {
+    const { completionDetail } = item;
+    const { displayParts = [] } = completionDetail || {}
+    if ((displayParts || []).length) {
+      const type = displayParts[displayParts.length - 1]
+      if (type?.kind === 'stringLiteral') {
+        return false
+      }
+    }
+
+    return true;
+  })
+
+
   completionData = formatVariableData(nextCompletion, node);
 
   return completionData;
@@ -387,143 +408,66 @@ export function getConfigsIdentifier(node: BaseNode): CompletionProperty[] {
   });
   return newProperties.concat(extensionConfigProperties);
 }
-function flatElements(elements: ViewElement[], componentList: CompletionProperty[], nodeParentElement: string, currentAttriBute: string) {
+function flatElements(elements: ViewElement[], componentList: CompletionProperty[], nodeParentElement: string, currentAttriBute: string, parentNodeNames: string[]) {
   elements?.forEach((item) => {
-    if (PAGE_COMPONENT_INCLUDE_TAG_MAP?.[item.tag]) {
-      const current = item.name === nodeParentElement
+    // 根据ComponentCompletionPropertyMap添加
+    if (ComponentCompletionPropertyMap?.[item.tag]) {
+      // 是否当前组件
+      const isCurrent = item.name === nodeParentElement;
       const stashItem: any = {
-        name: `${item.name}${current ? '(当前组件)' : ''}`,
+        name: `${item.name}${isCurrent ? '(当前组件)' : ''}`,
         value: item.name,
         expression: new Identifier({
-          name: current ? '当前组件' : item.name,
-          namespace: `elements.${current ? '$ce' : item.name}.property`
+          name: isCurrent ? '当前组件' : `${item.name}`,
+          namespace: `elements.${isCurrent ? '$ce' : item.name}.property`
         }),
         children: [],
-      };
-      const attrsList = item.bindAttrs.filter((attr) => {
-        if (PAGE_COMPONENT_INCLUDE_TAG_MAP[item.tag]?.[attr.name]) {
-          if (current && attr.name === currentAttriBute) {
-            return false
-          } else {
-            return true
-          }
-        }
-      })
-      const decoTagAtrrs = (attrName: any) => {
-        const filterAttr: any = {
-          name: attrName,
-          value: `${item.name}.${attrName}`,
-          expression: new MemberExpression({
-            object: stashItem.expression,
-            property: new Identifier({
-              name: attrName,
-              namespace: attrName
-            }),
-          }),
-        };
-        return filterAttr;
       }
-      attrsList.forEach((attr) => {
-        const currentAttrInfo = PAGE_COMPONENT_INCLUDE_TAG_MAP[item.tag]?.[attr.name]
-        if (attr.name !== 'sorting') {
-          const stashAttr: any = {
-            ...attr,
-            name: attr.name,
-            value: `${item.name}.${attr.name}`,
-            expression: new MemberExpression({
-              object: stashItem.expression,
-              property: new Identifier({
-                name: currentAttrInfo.value,
-                namespace: attr.name
-              }),
-            }),
-          };
-          const completionProperty = new CompletionProperty(stashAttr);
-          completionProperty.name = currentAttrInfo ? `${currentAttrInfo.value}（${currentAttrInfo.label}）` : attr.name;
-          completionProperty.icon = 'attr'
-          stashItem.children.push(completionProperty)
+
+      for (const key in ComponentCompletionPropertyMap[item.tag]) {
+        if (Object.prototype.hasOwnProperty.call(ComponentCompletionPropertyMap[item.tag], key)) {
+          const property = ComponentCompletionPropertyMap[item.tag][key];
+
+          // 如果是当前组件，过滤掉当前属性
+          if (!isCurrent || currentAttriBute !== property.prop) {
+            const completionProperty = new CompletionProperty({
+              name: key,
+              value: `${item.name}.${key}`,
+              expression: new MemberExpression({
+                object: stashItem.expression,
+                property: new Identifier({
+                  name: key,
+                  namespace: key,
+                }),
+              })
+            })
+
+            completionProperty.name = `${key}（${property.label}）`;
+            completionProperty.icon = property.icon || 'attr'
+            stashItem.children.push(completionProperty)
+          }
         }
-      })
-      if (['u-list-view', 'van-grid-view', 'van-list-view', 'u-cascader', 'van-cascader'].includes(item.tag)) {
-        const filterAttr = decoTagAtrrs('filterText');
-        const filterTextCompletionProperty = new CompletionProperty(filterAttr);
-        filterTextCompletionProperty.name = 'filterText（过滤文本）';
-        filterTextCompletionProperty.icon = 'attr'
-        stashItem.children.push(filterTextCompletionProperty)
-      }
-      if (['u-select', 'van-pickerson'].includes(item.tag)) {
-        const pageAttr: any = {
-          name: 'page-number',
-          value: `${item.name}.page-number`,
-          expression: new MemberExpression({
-            object: stashItem.expression,
-            property: new Identifier({
-              name: 'page',
-              namespace: 'page-number'
-            }),
-          }),
-        };
-        const completionProperty = new CompletionProperty(pageAttr);
-        completionProperty.name = 'page（当前页数）';
-        completionProperty.icon = 'attr'
-        stashItem.children.push(completionProperty)
-        const filterAttr: any = {
-          name: 'filterText',
-          value: `${item.name}.filterText`,
-          expression: new MemberExpression({
-            object: stashItem.expression,
-            property: new Identifier({
-              name: 'filterText',
-              namespace: 'filterText'
-            }),
-          }),
-        };
-        const filterTextCompletionProperty = new CompletionProperty(filterAttr);
-        filterTextCompletionProperty.name = 'filterText（过滤文本）';
-        filterTextCompletionProperty.icon = 'attr'
-        stashItem.children.push(filterTextCompletionProperty)
-      } else if (['u-list-view', 'u-grid-view', 'u-table-view', 'van-list-view', 'van-grid-view'].includes(item.tag)) {
-        const sortAttr: any = {
-          name: 'sort',
-          value: `${item.name}.sort`,
-          expression: new MemberExpression({
-            object: stashItem.expression,
-            property: new Identifier({
-              name: 'sort',
-              namespace: 'sorting.field'
-            }),
-          }),
-        };
-        const sortCompletionProperty = new CompletionProperty(sortAttr);
-        sortCompletionProperty.name = 'sort（排序属性）';
-        sortCompletionProperty.icon = 'attr'
-        stashItem.children.push(sortCompletionProperty)
-        const orderAttr: any = {
-          name: 'order',
-          value: `${item.name}.order`,
-          expression: new MemberExpression({
-            object: stashItem.expression,
-            property: new Identifier({
-              name: 'order',
-              namespace: 'sorting.order'
-            }),
-          }),
-        };
-        const orderCompletionProperty = new CompletionProperty(orderAttr);
-        orderCompletionProperty.name = 'order（排序顺序）';
-        orderCompletionProperty.icon = 'attr'
-        stashItem.children.push(orderCompletionProperty)
       }
+
       const completionProperty = new CompletionProperty(stashItem);
       completionProperty.icon = 'element';
-      if (current) {
+      if (isCurrent) {
         componentList.unshift(completionProperty)
       } else {
         componentList.push(completionProperty)
       }
     }
+
+    const isHasDataSource = item.bindAttrs.some(attr => ['data-source', 'dataSource'].includes(attr.name));
+    const isInclude = parentNodeNames.includes(item.name);
     if (item.children.length > 0) {
-      flatElements(item.children, componentList, nodeParentElement, currentAttriBute)
+      if (isHasDataSource) {
+          if (isInclude) {
+            flatElements(item.children, componentList, nodeParentElement, currentAttriBute, parentNodeNames)
+          }
+      } else {
+        flatElements(item.children, componentList, nodeParentElement, currentAttriBute, parentNodeNames)
+      }
     }
   })
 }
@@ -535,10 +479,22 @@ export function getPageComponentsIdentifier(node: types.SyntaxNode): CompletionP
   const componentList: CompletionProperty[] = []
   const nodeParentElement = getCurrentElement(node)?.name
   const currentAttriBute = getCurrentAttriBute(node)?.name
-  flatElements(stashElements, componentList, nodeParentElement, currentAttriBute)
+  // 遍历node的parentNode，获取viewElement层级节点
+  const parentNodeNames: Array<string> = [];
+  getViewElementPath(node.parentNode, parentNodeNames);
+  flatElements(stashElements, componentList, nodeParentElement, currentAttriBute, parentNodeNames)
   return componentList
 }
 
+function getViewElementPath(node: BaseNode, parentNodeNames: Array<string>) {
+  if (node) {
+    if (node.concept === 'ViewElement') {
+      parentNodeNames.push(node.name);
+    }
+    getViewElementPath(node.parentNode, parentNodeNames);
+  }
+}
+
 function getCurrentElement(item: any): ViewElement | undefined {
   if (!item?.parentNode) return undefined
   if (item.parentNode?.concept === 'ViewElement') {