@lcap/nasl-language-server-core 4.4.0-beta.33 → 4.4.0-beta.35

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,EAC4C,QAAQ,EAC5B,IAAI,EAQ+E,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;AAYpE,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;AAOF,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;AAmPF;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,eAAe;oCA2nKpB,OAAO;sDAPW,gBAAgB,EAAE;;;;sBAhBjD,UAAU,GAAG,SAAS;;;8BA4Df,UAAU;2BAyBb,UAAU;;iDAztFY,GAAG,KAAG,IAAI;;iBAouFjD,MAAM;kBACL,MAAM;kBACN,MAAM;qBACH,MAAM;;kBAxoKF,UAAU,WAAW,MAAM,YAAY,YAAY;sCA04D/B,IAAI,GAAG,QAAQ;2CAiyGxC,UAAU,gBACV,CAAC,YAAY,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,gBAC/C,CAAC,GAAG,EAAE,UAAU,KAAK,OAAO,qBACvB,MAAM,EAAE,oBACT,CAAC,YAAY,EAAE,UAAU,KAAK,UAAU,EAAE,KAC3D,kBAAkB,GAAG,IAAI;EAwF7B;AAqED,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,EAC4C,QAAQ,EAC5B,IAAI,EAQ+E,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;AAYpE,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;AAOF,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;AAmPF;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,eAAe;oCA2oKpB,OAAO;sDAPW,gBAAgB,EAAE;;;;sBAhBjD,UAAU,GAAG,SAAS;;;8BA4Df,UAAU;2BAyBb,UAAU;;iDAluFY,GAAG,KAAG,IAAI;;iBA6uFjD,MAAM;kBACL,MAAM;kBACN,MAAM;qBACH,MAAM;;kBAvpKF,UAAU,WAAW,MAAM,YAAY,YAAY;sCAg5D/B,IAAI,GAAG,QAAQ;2CA0yGxC,UAAU,gBACV,CAAC,YAAY,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,gBAC/C,CAAC,GAAG,EAAE,UAAU,KAAK,OAAO,qBACvB,MAAM,EAAE,oBACT,CAAC,YAAY,EAAE,UAAU,KAAK,UAAU,EAAE,KAC3D,kBAAkB,GAAG,IAAI;EAwF7B;AAqED,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

@@ -285,6 +285,7 @@ function createErrorDiagnoser(context) {
         Param: 'getVarExistingNames',
         Return: 'getVarExistingNames',
         Variable: 'getVarExistingNames',
+        Identifier: 'getPropertyExistingNames',
         Enum: 'getEnumExistingNames',
         EnumItem: 'getEnumItemExistingNames',
         EnumItemInteger: 'getEnumItemExistingNames',
@@ -499,7 +500,8 @@ function createErrorDiagnoser(context) {
             conceptValidator = nasl_concepts_1.staticRules['EnumItemInteger'];
             validatorMapKey = 'EnumItemInteger';
         }
-        else if (concept === 'StructureProperty' && node?.parentNode?.concept !== 'Structure') {
+        else if ((concept === 'StructureProperty' && node.parentNode?.concept !== 'Structure')
+            || (concept === 'Identifier' && node.parentNode?.concept === 'NewComposite')) {
             conceptValidator = nasl_concepts_1.staticRules['TypeStructureProperty'];
             validatorMapKey = 'TypeStructureProperty';
         }
@@ -792,24 +794,27 @@ function createErrorDiagnoser(context) {
         return false;
     }
     /**
-     * 获取 ViewElement 的数据源类型（T 或 T1）
-     * 参考 util.js 中的 getDataTypeOfViewElement 实现
+     * 获取 ViewElement 的数据源类型
+     * 基于 __ViewElementTV 中存储的 role === 'dataItem' 查找，优先返回有自有数据源的 dataItem。
      */
     function getDataSourceTypeAnnotation(viewElement) {
-        // 向上查找定义了数据源类型的祖先组件
         let currentNode = viewElement;
         let depth = 0;
         const maxSearchDepth = 5;
         while (currentNode?.concept === 'ViewElement' && depth <= maxSearchDepth) {
-            // 使用 __ViewElementTV 获取类型，与 IDE 前端 getDataTypeOfViewElement 保持一致
-            if (currentNode.__TypeAnnotation && currentNode.__ViewElementTV?.length) {
-                // 先查找 T1（动态列），若无再查找 T（普通数据源组件）
-                const t1 = currentNode.__ViewElementTV.find((x) => x.rawName === 'T1');
-                if (t1?.renamed)
-                    return t1.renamed;
-                const t = currentNode.__ViewElementTV.find((x) => x.rawName === 'T');
-                if (t?.renamed)
-                    return t.renamed;
+            if (currentNode.__ViewElementTV?.length) {
+                // 优先查找有自有数据源的 dataItem（如动态列的 T1）
+                for (const tv of currentNode.__ViewElementTV) {
+                    if (tv.role === 'dataItem' && tv.hasOwnDataSource && tv.renamed) {
+                        return tv.renamed;
+                    }
+                }
+                // 兜底查找无自有数据源的 dataItem（如子组件继承的 T）
+                for (const tv of currentNode.__ViewElementTV) {
+                    if (tv.role === 'dataItem' && tv.renamed) {
+                        return tv.renamed;
+                    }
+                }
             }
             currentNode = currentNode.parentNode;
             depth++;
@@ -4147,6 +4152,9 @@ function createErrorDiagnoser(context) {
      */
     function* checkNewList(node) {
         yield* semantic_rules_1.ExtraSemanticRules.rejectFileTypes(node, env, error);
+        if (node.typeAnnotation) {
+            yield* checkNode(node.typeAnnotation);
+        }
         // 匿名函数返回值有可能是newList，需要过滤。代码来源：AnonymousFunction.__ts
         const grandParent = node.parentNode?.parentNode?.parentNode;
         if (isEntityUpdate(grandParent)) {
@@ -4184,6 +4192,9 @@ function createErrorDiagnoser(context) {
      */
     function* checkNewMap(node) {
         yield* semantic_rules_1.ExtraSemanticRules.rejectFileTypes(node, env, error);
+        if (node.typeAnnotation) {
+            yield* checkNode(node.typeAnnotation);
+        }
         if (node.keys?.length) {
             yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.keys, function* (node) {
                 yield* checkNode(node);
@@ -4222,6 +4233,9 @@ function createErrorDiagnoser(context) {
      */
     function* checkNewComposite(node) {
         yield* semantic_rules_1.ExtraSemanticRules.rejectFileTypes(node, env, error);
+        if (node.typeAnnotation) {
+            yield* checkNode(node.typeAnnotation);
+        }
         ensureNodeKeyExists(node, 'typeAnnotation');
         const type = env.getType(node);
         if (node.properties?.length) {