@lcap/nasl-language-server-core 4.3.0-beta.26 → 4.3.0-beta.27

package/out/checker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"checker.d.ts","sourceRoot":"","sources":["../src/checker.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,UAAU,EAU2G,GAAG,EAMxH,QAAQ,EAET,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACgE,cAAc,EAGpF,MAAM,qBAAqB,CAAC;AAS7B,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,eAAe,CAAC;AAK5C,OAAO,EAAE,UAAU,IAAI,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAMpE,oBAAY,QAAQ;IAClB,IAAI,YAAY;IAChB,KAAK,UAAU;CAChB;AAED,MAAM,MAAM,UAAU,GAAG,kBAAkB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;AAEnE,KAAK,YAAY,GAAG;IAClB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAC;AAMF,MAAM,MAAM,kBAAkB,GAAG,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;AAEpE,MAAM,MAAM,kBAAkB,GAAG,GAAG,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;AAMrE,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAqBF,KAAK,eAAe,GAAG;IACrB,GAAG,EAAE,GAAG,CAAC;IACT,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,OAAO,CAAC;IACf,yBAAyB,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAC/C,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAC;AA4OF;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,eAAe;oCA4yIpB,OAAO;sDAPW,gBAAgB,EAAE;;;;sBAhBjD,UAAU,GAAG,SAAS;;;8BA4Df,UAAU;2BAyBb,UAAU;;;iBAW3B,MAAM;kBACL,MAAM;kBACN,MAAM;qBACH,MAAM;;kBA/zIF,UAAU,WAAW,MAAM,YAAY,YAAY;EAk2IzE;AAGD,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IAEX,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IACrC,mBAAmB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IACvC,qBAAqB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;CAC1C;AAMD,eAAO,MAAM,6BAA6B,aAC9B,UAAU,+DAGnB,MAAM,gBAAgB,CAyCxB,CAAC;AAMF,MAAM,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC"}
+{"version":3,"file":"checker.d.ts","sourceRoot":"","sources":["../src/checker.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,UAAU,EAU2G,GAAG,EAMxH,QAAQ,EAGT,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACgE,cAAc,EAGpF,MAAM,qBAAqB,CAAC;AAS7B,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,eAAe,CAAC;AAK5C,OAAO,EAAE,UAAU,IAAI,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAMpE,oBAAY,QAAQ;IAClB,IAAI,YAAY;IAChB,KAAK,UAAU;CAChB;AAED,MAAM,MAAM,UAAU,GAAG,kBAAkB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;AAEnE,KAAK,YAAY,GAAG;IAClB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAC;AAMF,MAAM,MAAM,kBAAkB,GAAG,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;AAEpE,MAAM,MAAM,kBAAkB,GAAG,GAAG,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;AAMrE,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAqBF,KAAK,eAAe,GAAG;IACrB,GAAG,EAAE,GAAG,CAAC;IACT,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,OAAO,CAAC;IACf,yBAAyB,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAC/C,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAC;AA4OF;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,eAAe;oCA83IpB,OAAO;sDAPW,gBAAgB,EAAE;;;;sBAhBjD,UAAU,GAAG,SAAS;;;8BA4Df,UAAU;2BAuBb,UAAU;;;iBAW3B,MAAM;kBACL,MAAM;kBACN,MAAM;qBACH,MAAM;;kBA/4IF,UAAU,WAAW,MAAM,YAAY,YAAY;EAk7IzE;AAGD,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IAEX,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IACrC,mBAAmB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IACvC,qBAAqB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;CAC1C;AAMD,eAAO,MAAM,6BAA6B,aAC9B,UAAU,+DAGnB,MAAM,gBAAgB,CAyCxB,CAAC;AAMF,MAAM,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC"}

package/out/checker.js

@@ -571,6 +571,9 @@ function createErrorDiagnoser(context) {
         else if (nasl_concepts_1.asserts.isValidationLogic(node)) {
             message = '验证函数：参数不能为空！';
         }
+        else if (nasl_concepts_1.asserts.isNewComposite(node)) {
+            message = '新建实体/数据结构：参数不能为空！';
+        }
         if (message) {
             error(node, message);
         }
@@ -1097,6 +1100,11 @@ function createErrorDiagnoser(context) {
                 });
             }
         }
+        if (node.interfaces?.length) {
+            yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.interfaces, function* (node) {
+                yield* checkNode(node);
+            });
+        }
         yield* checkNode(node.configuration);
         if (node.type === 'sharedApp') {
             const status = getStatusOfSharedApp(node);
@@ -1316,6 +1324,11 @@ function createErrorDiagnoser(context) {
                 yield* checkNode(node);
             });
         }
+        if (node.indexes?.length) {
+            yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.indexes, function* (node) {
+                yield* checkNode(node);
+            });
+        }
         // 在多模式切换为单模式的时候，数据库表名是否符合规范
         // /^[a-zA-Z0-9_]+$/ 由字母、数字、下划线组成
         const dataSource = node.dataSource;
@@ -1643,6 +1656,23 @@ function createErrorDiagnoser(context) {
             }
         }
     }
+    /**
+     * 检查 实体索引
+     * @param node
+     */
+    function* checkEntityIndex(node) {
+        if (node.propertyNames?.length) {
+            const entity = node.parentNode;
+            node.propertyNames.forEach((propertyName) => {
+                const prop = findPropertyByName(entity, propertyName);
+                if (!prop) {
+                    const scope = node?.constructor?.nodeTitle;
+                    error(node, `${scope}：索引${node.name}找不到 实体上的 ${propertyName}属性。`);
+                    return errorType;
+                }
+            });
+        }
+    }
     /**
      * 检查 枚举
      * @param node
@@ -1783,6 +1813,17 @@ function createErrorDiagnoser(context) {
                 yield* checkNode(node);
             });
         }
+        // 仅对内部接口（app.interfaces，由 Logic 导出）校验 originLogicName；外部接口（interfaceDependencies 等）无此字段
+        const isInternalInterface = nasl_concepts_1.asserts.isApp(node.parentNode);
+        if (isInternalInterface) {
+            if (ensureNodeKeyExists(node, 'originLogicName')) {
+                const originLogicName = node.originLogicName;
+                const ref = app.logics.find((item) => item.name === originLogicName);
+                if (!ref) {
+                    error(node, `接口 ${node.title || node.name} 引用了不存在的逻辑 ${originLogicName}`);
+                }
+            }
+        }
         yield* checkNode(node.validation);
         yield* checkTimeout(node);
         env.exitScope();
@@ -1970,6 +2011,17 @@ function createErrorDiagnoser(context) {
      */
     function* checkBusinessComponent(node) {
         env.enterScope(node);
+        if (node.params?.length) {
+            yield* checkParams(node.params);
+            yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.params, function* (node) {
+                yield* checkNode(node);
+            });
+        }
+        if (node.variables?.length) {
+            yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.variables, function* (node) {
+                yield* checkNode(node);
+            });
+        }
         // 组件元素
         if (node.elements?.length) {
             yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.elements, function* (node) {
@@ -3379,11 +3431,23 @@ function createErrorDiagnoser(context) {
                 }
                 else {
                     const { name } = node;
+                    // 检查是否在 NewComposite 的 properties（左边）中
+                    // 如果在 properties 中，可以跳过未定义检查（因为 properties 是属性名，不是变量）
+                    // 但如果是在 rights（右边）中，即使有类型也应该检查变量是否定义
+                    const newComposite = node.getAncestor('NewComposite');
+                    if (newComposite) {
+                        const { properties = [] } = newComposite;
+                        // 只对 properties 中的 node 允许跳过未定义检查
+                        // 无论是否有类型都应该返回，因为 properties 是属性名，不是变量，不应该报"未定义"错误
+                        if (properties.some((item) => item === node)) {
+                            const type = env.getType(node);
+                            return type || errorType;
+                        }
+                    }
                     if (
                     // name 是 A.B.C
                     name?.split('.')?.length > 1
-                        || node.getAncestor('CallQueryComponent')
-                        || node.getAncestor('NewComposite')) {
+                        || node.getAncestor('CallQueryComponent')) {
                         const type = env.getType(node);
                         if (type) {
                             return type;
@@ -3570,6 +3634,7 @@ function createErrorDiagnoser(context) {
      */
     function* checkNewComposite(node) {
         yield* semantic_rules_1.ExtraSemanticRules.rejectFileTypes(node, env, error);
+        ensureNodeKeyExists(node, 'typeAnnotation');
         const type = env.getType(node);
         if (node.properties?.length) {
             yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.properties, function* (property, index) {
@@ -3809,7 +3874,13 @@ function createErrorDiagnoser(context) {
             return;
         }
         const { entityAsName } = node;
-        const entityNamespace = node.entityNamespace ?? node.getAncestor('CallQueryComponent')?.from?.entityNamespace;
+        const callQueryComponent = node.getAncestor('CallQueryComponent');
+        if (!callQueryComponent.inFromJoinPart(entityAsName)) {
+            // 实体不存在from中
+            error(node, '数据查询：所查询的实体不存在数据源中。');
+            return;
+        }
+        const entityNamespace = node.entityNamespace ?? callQueryComponent?.from?.entityNamespace;
         const entityQName = `${entityNamespace}.${entityAsName}`;
         const ref = referenceManager.gQNameDefs.get(entityQName);
         if (!ref) {
@@ -4194,6 +4265,8 @@ function createErrorDiagnoser(context) {
                     return yield* checkBackendVariable(node);
                 case 'Param':
                     return yield* checkParam(node);
+                case 'ParamWithGroup':
+                    return yield* checkParam(node);
                 case 'Return':
                     return yield* checkReturn(node);
                 case 'DefaultValue':
@@ -4208,6 +4281,8 @@ function createErrorDiagnoser(context) {
                     return yield* checkEntity(node);
                 case 'EntityProperty':
                     return yield* checkEntityProperty(node);
+                case 'EntityIndex':
+                    return yield* checkEntityIndex(node);
                 case 'Enum':
                     return yield* checkEnum(node);
                 case 'EnumItem':
@@ -4419,6 +4494,10 @@ function createErrorDiagnoser(context) {
         // TODO: checkNodeIsFileModuleInIdeWithCache 也慢，后续可以优化
         const isFileModule = fileNodes.length ? (0, file_node_cache_1.checkNodeIsFileModuleInIdeWithCache)(node) : true;
         if (isFileModule) {
+            // 增量更新时按文件逐个 checkNode，需重置闭包状态；若本文件在 Module 内，inModule 需为 true（否则不会经过 checkModule，inModule 会失效）
+            inModule = !!node.getAncestor?.('Module');
+            inPlayground = 0;
+            inAuthLogic = false;
             fileNodes.push(node);
             let diagnostics = diagnosticMap.get(node);
             if (!diagnostics) {
@@ -4503,8 +4582,6 @@ function createErrorDiagnoser(context) {
                 }
             });
             diagnostics?.clear();
-            // 删除 diagnosticMap 中的 key，避免内存泄漏和冗余报错
-            diagnosticMap.delete(node);
         }
         else {
             diagnosticMap.clear();