@lcap/nasl-language-server-core 4.5.0-beta.3 → 4.5.0-beta.5

package/out/utils/bind-expression-hack.js

@@ -23,20 +23,142 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.inferStaticValueTypeAsLiteral = void 0;
+exports.inferStaticValueTypeAsLiteral = exports.tryParseJson5AsStructuredType = exports.inferTypeFromJsonValue = void 0;
 const nasl_concepts_1 = require("@lcap/nasl-concepts");
 const json5 = __importStar(require("json5"));
 const typer_1 = require("../typer");
-function inferStaticValueTypeAsLiteral(staticValue) {
+/**
+ * 从 List 类型的 hint 中提取元素类型 hint。
+ * 仅在 hint 为 List<T> 时返回 T，否则返回 undefined。
+ */
+function extractListElemHint(hint) {
+    if (hint?.typeName === 'List' && hint.typeArguments?.length) {
+        return hint.typeArguments[0];
+    }
+    return undefined;
+}
+/**
+ * 从 anonymousStructure 类型的 hint 中提取指定属性名的类型 hint。
+ */
+function extractPropHint(hint, key) {
+    if (hint?.typeKind === 'anonymousStructure') {
+        return hint.properties?.find((p) => p.name === key)?.typeAnnotation;
+    }
+    return undefined;
+}
+/**
+ * 将解析后的 JSON 值递归推断为对应的 TypeAnnotation。
+ * - 原始值：直接返回对应基础类型
+ * - 数组：取所有元素属性的并集，推断为 List<AnonymousStructure>
+ * - 对象：推断为 AnonymousStructure，不在所有元素中出现的属性标记为 optional
+ * - 嵌套超过 depth 限制时返回 naslAnyTy，防止无限递归
+ * @param hint 同层级的目标类型，用于在歧义情况下收窄推断结果（如整数提升为 Decimal）
+ */
+function inferTypeFromJsonValue(val, depth = 0, hint) {
+    if (depth > 8)
+        return typer_1.naslAnyTy;
+    if (val === null || val === undefined)
+        return typer_1.naslAnyTy;
+    if (typeof val === 'string')
+        return typer_1.naslStringTy;
+    if (typeof val === 'boolean')
+        return typer_1.naslBooleanTy;
+    if (typeof val === 'number') {
+        if (Number.isInteger(val)) {
+            // 整数赋给 Decimal 字段是合法的，按 hint 提升；其他类型 hint 对不上则忽略
+            if (hint?.typeName === 'Decimal' && hint?.typeKind === 'primitive') {
+                return typer_1.naslDecimalTy;
+            }
+            return typer_1.naslLongTy;
+        }
+        return typer_1.naslDecimalTy;
+    }
+    if (Array.isArray(val)) {
+        if (val.length === 0) {
+            return nasl_concepts_1.TypeAnnotation.createGeneric('List', { typeArguments: [typer_1.naslAnyTy] });
+        }
+        const elemHint = extractListElemHint(hint);
+        const elemTy = inferObjectArrayElementType(val, depth, elemHint);
+        return nasl_concepts_1.TypeAnnotation.createGeneric('List', { typeArguments: [elemTy] });
+    }
+    if (typeof val === 'object') {
+        return inferObjectType(val, depth, hint);
+    }
+    return typer_1.naslAnyTy;
+}
+exports.inferTypeFromJsonValue = inferTypeFromJsonValue;
+/**
+ * 推断对象数组的元素类型：
+ * 收集所有元素所有 key，若某 key 不在全部元素中出现则标记为 optional
+ */
+function inferObjectArrayElementType(arr, depth, elemHint) {
+    const allObjects = arr.filter((item) => item !== null && typeof item === 'object' && !Array.isArray(item));
+    if (allObjects.length === 0) {
+        return inferTypeFromJsonValue(arr[0], depth + 1, elemHint);
+    }
+    // 收集所有 key 及其出现次数
+    const keyCount = new Map();
+    for (const obj of allObjects) {
+        for (const key of Object.keys(obj)) {
+            keyCount.set(key, (keyCount.get(key) ?? 0) + 1);
+        }
+    }
+    // 合并各 key 的类型（取第一个非 null 值推断），不在所有元素中出现的 key 标记为 optional
+    const properties = Array.from(keyCount.entries()).map(([key, count]) => {
+        const sampleVal = allObjects.find((obj) => key in obj)?.[key];
+        const propTy = inferTypeFromJsonValue(sampleVal, depth + 1, extractPropHint(elemHint, key));
+        const prop = nasl_concepts_1.StructureProperty.from({ name: key, typeAnnotation: propTy });
+        if (count < allObjects.length) {
+            prop.typeAnnotation.optional = true;
+        }
+        return prop;
+    });
+    return nasl_concepts_1.TypeAnnotation.createTypeAnonymousStructure(properties);
+}
+/**
+ * 推断单个对象的类型为 AnonymousStructure
+ */
+function inferObjectType(obj, depth, hint) {
+    const properties = Object.entries(obj).map(([key, value]) => {
+        const propTy = inferTypeFromJsonValue(value, depth + 1, extractPropHint(hint, key));
+        return nasl_concepts_1.StructureProperty.from({ name: key, typeAnnotation: propTy });
+    });
+    return nasl_concepts_1.TypeAnnotation.createTypeAnonymousStructure(properties);
+}
+/**
+ * 尝试将字符串作为 JSON5 解析，若结果为对象/数组则推断其结构类型。
+ * 解析失败或结果为原始值时返回 undefined。
+ */
+function tryParseJson5AsStructuredType(code, hint) {
+    try {
+        const val = json5.parse(code.trim());
+        if (val !== null && typeof val === 'object') {
+            return inferTypeFromJsonValue(val, 0, hint);
+        }
+    }
+    catch {
+        // 不是合法的 JSON5，或结果为原始值，忽略
+    }
+    return undefined;
+}
+exports.tryParseJson5AsStructuredType = tryParseJson5AsStructuredType;
+function inferStaticValueTypeAsLiteral(staticValue, tgtTy) {
     if (typeof staticValue !== 'string') {
         return nasl_concepts_1.TypeAnnotation.createLiteral(staticValue);
     }
     const formattedValue = staticValue.trim();
+    const structuredTy = tryParseJson5AsStructuredType(formattedValue, tgtTy);
+    if (structuredTy)
+        return structuredTy;
     try {
         const val = json5.parse(formattedValue);
+        // 对于数字类型，传入 tgtTy 作为 hint 以收窄推断（如整数提升为 Decimal）
+        if (typeof val === 'number') {
+            return inferTypeFromJsonValue(val, 0, tgtTy);
+        }
         return nasl_concepts_1.TypeAnnotation.createLiteral(val);
     }
-    catch (error) {
+    catch {
         return typer_1.naslAnyTy;
     }
 }

package/out/utils/bind-expression-hack.js.map

@@ -1 +1 @@
-{"version":3,"file":"bind-expression-hack.js","sourceRoot":"","sources":["../../src/utils/bind-expression-hack.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAqD;AACrD,6CAA+B;AAC/B,oCAAqC;AAErC,SAAgB,6BAA6B,CAAC,WAAsC;IAClF,IAAG,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;QACnC,OAAO,8BAAc,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IACnD,CAAC;IACD,MAAM,cAAc,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC;IAC1C,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,cAAwB,CAAC,CAAC;QAClD,OAAO,8BAAc,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC3C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,iBAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAXD,sEAWC"}
+{"version":3,"file":"bind-expression-hack.js","sourceRoot":"","sources":["../../src/utils/bind-expression-hack.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lcap/nasl-language-server-core",
   "description": "NetEase Application Specific Language",
-  "version": "4.5.0-beta.3",
+  "version": "4.5.0-beta.5",
   "main": "./out",
   "types": "./out",
   "source": "./src",
@@ -16,9 +16,9 @@
     "json5": "2.2.3",
     "lodash": "4.17.21",
     "mnemonist": "^0.40.3",
-    "@lcap/nasl-concepts": "4.5.0-beta.3",
-    "@lcap/nasl-utils": "4.5.0-beta.3",
-    "@lcap/nasl-types": "4.5.0-beta.3"
+    "@lcap/nasl-concepts": "4.5.0-beta.5",
+    "@lcap/nasl-types": "4.5.0-beta.5",
+    "@lcap/nasl-utils": "4.5.0-beta.5"
   },
   "devDependencies": {
     "@types/lodash": "4.17.0",
@@ -35,8 +35,8 @@
     "typescript": "5.4.4",
     "vite": "6.3.5",
     "vitest": "3.2.4",
+    "@lcap/nasl-translator": "4.5.0-beta.5",
     "@lcap/nasl-test-toolkit": "1.0.0",
-    "@lcap/nasl-translator": "4.5.0-beta.3",
     "@lcap/nasl-tsconfig": "1.0.1"
   },
   "scripts": {