@lcap/nasl-language-server-core 4.0.0-alpha.1 → 4.0.0-beta.2

package/out/checker.d.ts

@@ -37,10 +37,10 @@ export declare function createErrorDiagnoser(context: DiagnoseContext): {
     setLatestVersionsOfSharedApp: (sharedAppVersions: SharedAppVersion[]) => void;
     diagnosticApp: () => Generator<TypeAnnotation | {
         typeKind: string;
-    } | undefined, void, unknown>;
+    } | undefined, void, any>;
     checkNode: (node: SyntaxNode | undefined) => Generator<TypeAnnotation | {
         typeKind: string;
-    } | undefined, any, unknown>;
+    } | undefined, any, any>;
     clearDiagnostics: (node: SyntaxNode) => void;
     getDiagnostics: (node: SyntaxNode) => NodeDiagnosticsMap | FileDiagnosticsMap | undefined;
     error: (node: SyntaxNode, message: string, context?: ErrorContext) => void;

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,EAU0F,GAAG,EAMvG,QAAQ,EACT,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACgE,cAAc,EAGpF,MAAM,qBAAqB,CAAC;AAM7B,OAAO,EAAgC,MAAM,EAAE,MAAM,SAAS,CAAC;AAE/D,oBAAY,QAAQ;IAClB,IAAI,YAAY;IAChB,KAAK,UAAU;CAChB;AAED,MAAM,WAAW,UAAU;IAEzB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAEpB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,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;AA+PF;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,eAAe;oCAwgIpB,OAAO;sDAPW,gBAAgB,EAAE;;;;sBAhBjD,UAAU,GAAG,SAAS;;;6BAsChB,UAAU;2BAuBZ,UAAU;kBAt/HnB,UAAU,WAAW,MAAM,YAAY,YAAY;EAsgIzE;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;AAED,eAAO,MAAM,6BAA6B,aAAc,UAAU,sCAAoC,MAAM,gBAAgB,CAmC3H,CAAA"}
+{"version":3,"file":"checker.d.ts","sourceRoot":"","sources":["../src/checker.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,UAAU,EAU0F,GAAG,EAMvG,QAAQ,EACT,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACgE,cAAc,EAGpF,MAAM,qBAAqB,CAAC;AAM7B,OAAO,EAA4B,MAAM,EAAE,MAAM,SAAS,CAAC;AAI3D,oBAAY,QAAQ;IAClB,IAAI,YAAY;IAChB,KAAK,UAAU;CAChB;AAED,MAAM,WAAW,UAAU;IAEzB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAEpB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,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;AAgQF;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,eAAe;oCAwhIpB,OAAO;sDAPW,gBAAgB,EAAE;;;;sBAhBjD,UAAU,GAAG,SAAS;;;6BAsChB,UAAU;2BAuBZ,UAAU;kBAtgInB,UAAU,WAAW,MAAM,YAAY,YAAY;EAshIzE;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;AAED,eAAO,MAAM,6BAA6B,GAAI,UAAU,UAAU,EAAE,aAAa,kBAAkB,KAAG,KAAK,CAAC,gBAAgB,CAmC3H,CAAA"}

package/out/checker.js

@@ -1,11 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformDiagnosticsToRecords = exports.createErrorDiagnoser = exports.Severity = void 0;
+exports.transformDiagnosticsToRecords = exports.Severity = void 0;
+exports.createErrorDiagnoser = createErrorDiagnoser;
 const decimal_js_1 = require("decimal.js");
 const nasl_concepts_1 = require("@lcap/nasl-concepts");
 const service_1 = require("@lcap/nasl-concepts/service");
 const nasl_utils_1 = require("@lcap/nasl-utils");
 const typer_1 = require("./typer");
+const type_predicate_1 = require("./typer/type-predicate");
+const type_manager_1 = require("./typer/type-manager");
 var Severity;
 (function (Severity) {
     Severity["WARN"] = "warning";
@@ -47,6 +50,7 @@ const isContinue = (node) => node.concept === 'Continue';
  * @param node
  */
 const fastIsControlFlowNode = (node) => isEnd(node) || isAbort(node) || isBreak(node) || isContinue(node);
+const isArgument = (node) => node.concept === 'Argument';
 /**
  * 是端类型下的参数
  * @param node
@@ -314,7 +318,7 @@ function createErrorDiagnoser(context) {
         if (diagnostics) {
             const diagnostic = {
                 message,
-                severity: inPlayground > 0 ? Severity.WARN : severity ?? Severity.ERROR,
+                severity: inPlayground > 0 ? Severity.WARN : (severity ?? Severity.ERROR),
                 ...others,
             };
             if (isDebug) {
@@ -375,6 +379,7 @@ function createErrorDiagnoser(context) {
             timeoutConfig.values.forEach((value) => {
                 const __env = value.env;
                 const timeout = Number(value.value);
+                const label = value.envDisplayLabel;
                 if (timeout * 1000 < retryInterval * retryTimes) {
                     const HTTP_TIMEOUT_ORIGIN_MESSAGE = 'the local timeout is greater than the system timeout';
                     error(node, `${nodeType}“${node.title ?? node.name}”配置的重试间隔时间乘以重试次数大于${__env === 'dev' ? '开发环境' : '生产环境'}接口超时时间，可能导致重试失败`, {
@@ -447,6 +452,10 @@ function createErrorDiagnoser(context) {
             conceptValidator = nasl_concepts_1.staticRules['EnumItemInteger'];
             validatorMapKey = 'EnumItemInteger';
         }
+        else if (concept === 'StructureProperty' && node?.parentNode?.concept !== 'Structure') {
+            conceptValidator = nasl_concepts_1.staticRules['TypeStructureProperty'];
+            validatorMapKey = 'TypeStructureProperty';
+        }
         if (conceptValidator) {
             let toBeVerifiedName = node;
             const map = {
@@ -688,14 +697,11 @@ function createErrorDiagnoser(context) {
      */
     function getMinArgsCount(params) {
         const paramLen = params?.length;
-        let minArgsCount = paramLen;
-        for (let i = paramLen - 1; i >= 0; i--) {
+        let minArgsCount = 0;
+        for (let i = 0; i < paramLen; i++) {
             const param = params[i];
-            if (isNonRequiredParam(param)) {
-                minArgsCount--;
-            }
-            else { // 如果参数有默认值，则跳过
-                break;
+            if (!isNonRequiredParam(param)) {
+                minArgsCount++; // 如果参数有默认值，则跳过
             }
         }
         return minArgsCount;
@@ -799,10 +805,12 @@ function createErrorDiagnoser(context) {
      * @param ref
      */
     function* checkCallExpressionParameters(node, ref) {
-        const params = nasl_concepts_1.asserts.isTypeAnnotation(ref) ? ref.typeArguments : ref.params;
+        // Handle both TypeAnnotation and FunctionDefinition formats
+        const params = ref.params ?? ref.typeArguments;
         const { arguments: args } = node;
         const paramsLen = params?.length || 0;
         const argsLen = args?.length || 0;
+        // For FunctionDefinition format, check spread and optional params
         const spreadParamIndex = params?.findIndex((param) => param.spread);
         const hasSpreadParam = spreadParamIndex !== -1;
         const minArgsCount = getMinArgsCount(params);
@@ -814,11 +822,12 @@ function createErrorDiagnoser(context) {
         }
         yield* (0, nasl_utils_1.wrapForEachToGenerator)(args, function* (arg, index) {
             const param = params?.[index];
-            const isParamRequired = !(hasSpreadParam && index > spreadParamIndex) && !isNonRequiredParam(param);
-            arg.paramRequired = isParamRequired;
             if (!param)
                 return;
-            const paramType = (nasl_concepts_1.asserts.isTypeAnnotation(param) ? param : env.getType(param));
+            const isParamRequired = !(hasSpreadParam && index > spreadParamIndex) && !isNonRequiredParam(param);
+            arg.paramRequired = isParamRequired;
+            const paramType = param.typeAnnotation ??
+                (nasl_concepts_1.asserts.isTypeAnnotation(param) ? param : env.getType(param));
             const argType = yield* checkNode(arg);
             if (paramType?.typeKind === 'function' && argType?.typeKind === 'function') {
                 const argTypeArgs = argType?.typeArguments || [];
@@ -835,7 +844,7 @@ function createErrorDiagnoser(context) {
      */
     function* checkVariableType(node) {
         const type = env.getType(node);
-        if (isUninstantiatedType(type)) {
+        if (isUnresolvedType(type)) {
             const logic = node.getAncestor('SubLogic') || node.getAncestor('Logic');
             let used = false;
             logic.traverseStrictChildren((item) => {
@@ -901,10 +910,11 @@ function createErrorDiagnoser(context) {
     }
     /**
      * 未推导出的类型
+     * 这个可能有问题，因为可能是 type 的嵌套结构没有推导出类型，看使用场景了
      * @param type
      * @returns
      */
-    function isUninstantiatedType(type) {
+    function isUnresolvedType(type) {
         return !type || type?.typeKind === 'typeParam' || type?.typeName === 'Null' || type?.typeName === 'void';
     }
     /**
@@ -914,9 +924,14 @@ function createErrorDiagnoser(context) {
      */
     function* checkNonNullExpression(node) {
         const type = yield* checkNode(node);
-        if (isUninstantiatedType(type)) {
+        if (isUnresolvedType(type)) {
             const scope = node?.constructor?.nodeTitle;
-            error(node, `${scope}：所选择的内容未定义。`);
+            if (node.concept === 'Identifier') {
+                error(node, `${scope}：${node.name} 未定义。`);
+            }
+            else {
+                error(node, `${scope}：所选择的内容未定义。`);
+            }
             return errorType;
         }
         return type;
@@ -1066,11 +1081,6 @@ function createErrorDiagnoser(context) {
             return;
         }
         inModule = true;
-        if (node.structures?.length) {
-            yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.structures, function* (node) {
-                yield* checkNode(node);
-            });
-        }
         // 启用元数据时才翻译
         if ((node.type === 'sharedApp')) {
             if (node.metadataTypes?.length) {
@@ -1079,41 +1089,6 @@ function createErrorDiagnoser(context) {
                 });
             }
         }
-        if (node.frontends?.length) {
-            yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.frontends, function* (node) {
-                yield* checkNode(node);
-            });
-        }
-        if (node.dataSources?.length) {
-            yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.dataSources, function* (node) {
-                yield* checkNode(node);
-            });
-        }
-        if (node.interfaces?.length) {
-            yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.interfaces, function* (node) {
-                yield* checkNode(node);
-            });
-        }
-        if (node.enums?.length) {
-            yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.enums, function* (node) {
-                yield* checkNode(node);
-            });
-        }
-        if (node.logics?.length) {
-            yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.logics, function* (node) {
-                yield* checkNode(node);
-            });
-        }
-        if (node.processes?.length) {
-            yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.processes, function* (node) {
-                yield* checkNode(node);
-            });
-        }
-        if (node.processV2s?.length) {
-            yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.processV2s, function* (node) {
-                yield* checkNode(node);
-            });
-        }
         yield* checkNode(node.configuration);
         if (node.type === 'sharedApp') {
             const status = getStatusOfSharedApp(node);
@@ -1249,7 +1224,8 @@ function createErrorDiagnoser(context) {
      */
     function* checkVariable(node) {
         yield* checkNode(node.defaultValue);
-        yield* checkVariableType(node);
+        // 前面加了报错，省点时间，报错不用那么精确
+        // yield* checkVariableType(node);
     }
     /**
      * 检查 前端全局变量
@@ -1305,33 +1281,16 @@ function createErrorDiagnoser(context) {
                     if (!propertyValue.value && node.name !== 'defaultDS') {
                         // prod 环境数据源未配置数据信息 时，不再给出其他提示
                         // https://projectmanage.netease-official.lcap.163yun.com/dashboard/FeatureDetail?id=2782461488301056
-                        if (propertyValue.env === 'online')
-                            return;
-                        error(node, `数据源配置：数据源${property.name}${propertyValue.env === 'dev' ? '开发环境' : '生产环境'}未配置数据信息`);
+                        if (propertyValue.env === 'dev') {
+                            error(node, `数据源配置：数据源${property.name}${propertyValue.envDisplayLabel}未配置数据信息`);
+                        }
                     }
                     else if (propertyValue.value) {
                         const dataSource = node;
                         // 数据源有连接错误
-                        let envText;
-                        if (propertyValue.env === 'dev') {
-                            if (dataSource.__devConnectError) {
-                                envText = '开发';
-                            }
-                            else if (dataSource.__devConnectError === false) {
-                                return;
-                            }
-                        }
-                        else if (propertyValue.env === 'online') {
-                            if (dataSource.__onlineConnectError) {
-                                envText = '生产';
-                            }
-                            else if (dataSource.__onlineConnectError === false) {
-                                return;
-                            }
-                        }
                         // 手动插入报错
-                        if (envText) {
-                            error(node, `数据源配置：数据源 ${property.name} ${envText}环境数据源连接不通，请先检查${envText}环境数据源配置`, {
+                        if (dataSource[`__${propertyValue.env}ConnectError`]) {
+                            error(node, `数据源配置：数据源 ${property.name} ${propertyValue.envDisplayLabel}环境数据源连接不通，请先检查${propertyValue.envDisplayLabel}环境数据源配置`, {
                                 severity: Severity.WARN,
                             });
                         }
@@ -1586,7 +1545,9 @@ function createErrorDiagnoser(context) {
                                 const value = numeric.value;
                                 const decimalPlaces = value?.split('.')[1]?.length || 0;
                                 if (decimalPlaces > +scale) {
-                                    error(node, `实体字段${node.name}默认值的小数位数不能大于设置的小数位数${scale}，否则将会按照小数位数自动截断`);
+                                    error(node, `实体字段${node.name}默认值的小数位数不能大于设置的小数位数${scale}，否则将会按照小数位数自动截断`, {
+                                        severity: Severity.WARN,
+                                    });
                                 }
                             }
                             break;
@@ -1763,7 +1724,8 @@ function createErrorDiagnoser(context) {
      */
     function* checkReturn(node) {
         yield* checkNode(node.defaultValue);
-        yield* checkVariableType(node);
+        // 前面加了报错，省点时间，报错不用那么精确
+        // yield* checkVariableType(node);
     }
     /**
      * 检查 接口
@@ -2104,7 +2066,9 @@ function createErrorDiagnoser(context) {
         if (processElement || node.type === 'dynamic') {
             yield* checkNode(node.destination);
         }
-        yield* checkNode(node.externalDestination);
+        if (node.name === 'externalDestination' && node.type === 'dynamic') {
+            yield* checkNode(node.externalDestination);
+        }
         if (node.rules?.length) {
             yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.rules, function* (node) {
                 yield* checkNode(node);
@@ -2194,7 +2158,7 @@ function createErrorDiagnoser(context) {
             error(node, '流程暂不支持可变参数');
         }
         if (node.includeTypeArgs) {
-            error(node, '流程暂不支持范型参数');
+            error(node, '流程暂不支持泛型参数');
         }
         const unbindVariables = env.temporarilyBindVariables([
             ...(node?.params || []),
@@ -2308,7 +2272,7 @@ function createErrorDiagnoser(context) {
             error(node, '流程暂不支持可变参数');
         }
         if (node.includeTypeArgs) {
-            error(node, '流程暂不支持范型参数');
+            error(node, '流程暂不支持泛型参数');
         }
     }
     /**
@@ -2396,6 +2360,8 @@ function createErrorDiagnoser(context) {
                 yield* checkNode(node);
             });
         }
+        // 无人审批策略
+        yield* checkNode(node.unmannedApprovalStrategy);
         if (node.fieldPermissions?.length) {
             yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.fieldPermissions, function* (node) {
                 yield* checkNode(node);
@@ -2414,6 +2380,40 @@ function createErrorDiagnoser(context) {
         }
         unbindVariables();
     }
+    /**
+     * 检查 无人时，自动转派审批策略
+     * @param node
+     */
+    function* checkReassignUnmannedV2(node) {
+        return yield* checkNode(node.assignees);
+    }
+    /**
+     * 检查 用户经办人
+     * @param node
+     */
+    function* checkUserAssignees(node) {
+        if (!node.users?.length) {
+            error(node, '转派人员为空');
+        }
+    }
+    /**
+     * 检查 角色经办人
+     * @param node
+     */
+    function* checkRoleAssignees(node) {
+        if (!node.roles?.length) {
+            error(node, '转派角色为空');
+        }
+    }
+    /**
+     * 检查 部门经办人
+     * @param node
+     */
+    function* checkDepartmentAssignees(node) {
+        if (!node.departments?.length) {
+            error(node, '转派部门为空');
+        }
+    }
     /**
      * 检查 字段权限控制详情
      * @param node
@@ -2533,7 +2533,7 @@ function createErrorDiagnoser(context) {
                     if (logicReturns[0].name !== itfReturns[0].name) {
                         isSame = false;
                     }
-                    else if (!(logicReturns[0]?.typeAnnotation ?? env.getType(logicReturns[0]))?.isSame?.(itfReturns[0]?.typeAnnotation)) {
+                    else if (!(0, type_predicate_1.isEqualTy)(env, env.getType(logicReturns[0]), env.getType(itfReturns[0]))) {
                         isSame = false;
                     }
                 }
@@ -2736,8 +2736,14 @@ function createErrorDiagnoser(context) {
             return;
         }
         yield* checkVoidCallUsedAsStatement(node);
-        const ref = env.resolvedCallTypeBindings.get(node) ?? env.resolveRef(node);
-        if (ref && !(0, typer_1.isUnResolvedTy)(ref)) {
+        const ref = env.resolvedCallInfo.get(node) ?? env.resolveRef(node);
+        // Handle the new FunctionDefinition structure
+        if (ref?.params && !(0, type_manager_1.hasUnresolvedTyInCallInfo)(ref)) {
+            // It's a FunctionDefinition object
+            yield* checkScopeOfUse(node, ref);
+            yield* checkCallExpressionParameters(node, ref);
+        }
+        else if (ref && !(0, type_predicate_1.isUnResolvedTy)(ref)) {
             // 检查使用范围
             yield* checkScopeOfUse(node, ref);
             yield* checkCallExpressionParameters(node, ref);
@@ -2793,7 +2799,7 @@ function createErrorDiagnoser(context) {
             node.parentKey !== 'consequent' &&
             node.parentNode?.parentNode?.concept !== 'CallInterface' &&
             node.parentNode.concept !== 'Block' &&
-            isUninstantiatedType(type)) {
+            isUnresolvedType(type)) {
             let showErr = false;
             if (node.parentNode?.parentNode?.concept === 'CallLogic') {
                 // calllogic 中别的类型会强校验，但是内置函数，不会强制校验，下面这几个其实是走的内置函数的实现，所以需要手动增加一下校验
@@ -3212,19 +3218,25 @@ function createErrorDiagnoser(context) {
                 ? getPropertyOfType(node.parentNode.typeAnnotation, node.name)
                 : env.resolveRef(node);
             if (!ref) {
-                if (node.name === 'it') {
+                if (node.namespace === 'backend') {
+                    /**
+                     * 参考类型检查器的 {@link tpIdentifier}方法
+                     */
+                    return typer_1.naslLongTy;
+                }
+                else if (node.name === 'it') {
                     return env.getType(node);
                 }
                 else {
                     const { name } = node;
                     // 之前有一些脏数据，先兼容
-                    if (['true', 'false'].includes(name)) {
-                        return new nasl_concepts_1.TypeAnnotation({
-                            typeKind: 'primitive',
-                            typeName: 'Boolean',
-                            typeNamespace: 'nasl.core',
-                        });
-                    }
+                    // if (['true', 'false'].includes(name)) {
+                    //   return new TypeAnnotation({
+                    //     typeKind: 'primitive',
+                    //     typeName: 'Boolean',
+                    //     typeNamespace: 'nasl.core',
+                    //   });
+                    // }
                     if (
                     // name 是 A.B.C
                     name?.split('.')?.length > 1
@@ -3402,7 +3414,7 @@ function createErrorDiagnoser(context) {
                 const prop = getPropertyOfType(type, propertyName);
                 if (prop) {
                     const propertyType = yield* checkNode(property);
-                    if (isUninstantiatedType(propertyType)) {
+                    if (isUnresolvedType(propertyType)) {
                         error(node, `${property.name}推导不出类型！请连线或手动设置`);
                     }
                     else if (type.typeKind === 'anonymousStructure') {
@@ -3774,20 +3786,6 @@ function createErrorDiagnoser(context) {
         if (ensureNodeKeyExists(node, 'argument')) {
             yield* checkNode(node.argument);
         }
-        if (node.operator === 'isNull' && !!node.getAncestor('CallQueryComponent')) {
-            function useVariable(node) {
-                let res = false;
-                node.traverseStrictChildren((child) => {
-                    if (child.concept === 'Identifier' && child.namespace !== 'inner') {
-                        res = true;
-                    }
-                });
-                return res;
-            }
-            if (useVariable(node)) {
-                error(node, '空值匹配组件暂不支持使用变量');
-            }
-        }
         return env.getType(node);
     }
     /**
@@ -3942,11 +3940,11 @@ function createErrorDiagnoser(context) {
             nasl_concepts_1.asserts.isWhileStatement(parentNode) ||
             nasl_concepts_1.asserts.isIfStatement(parentNode) ||
             nasl_concepts_1.asserts.isMatchCase(parentNode) && !parentNode.parentNode.isExpression ||
-            nasl_concepts_1.asserts.isSwitchStatement(parentNode) ||
+            nasl_concepts_1.asserts.isSwitchCase(parentNode) ||
             nasl_concepts_1.asserts.isBlock(parentNode));
         const nodeType = env.getType(node);
-        if (isUninstantiatedType(nodeType) && !usedAsStatement) {
-            error(node, `无返回值的${node?.constructor?.nodeTitle}不能在${parentNode?.constructor?.nodeTitle}中作为表达式使用。`);
+        if (isUnresolvedType(nodeType) && !usedAsStatement) {
+            error(node, `无返回值的${node?.constructor?.nodeTitle}${node.calleeName} 不能在${parentNode?.constructor?.nodeTitle}中作为表达式使用。`);
         }
     }
     function* dispatchNode(node) {
@@ -4059,6 +4057,14 @@ function createErrorDiagnoser(context) {
                     return yield* checkProcessDefinitionV2(node);
                 case 'ProcessElementV2':
                     return yield* checkProcessElementV2(node);
+                case 'ReassignUnmannedV2':
+                    return yield* checkReassignUnmannedV2(node);
+                case 'UserAssignees':
+                    return yield* checkUserAssignees(node);
+                case 'RoleAssignees':
+                    return yield* checkRoleAssignees(node);
+                case 'DepartmentAssignees':
+                    return yield* checkDepartmentAssignees(node);
                 case 'FieldPermissionV2':
                     return yield* checkFieldPermissionV2(node);
                 case 'MsgTriggerLauncher':
@@ -4283,7 +4289,6 @@ function createErrorDiagnoser(context) {
         error,
     };
 }
-exports.createErrorDiagnoser = createErrorDiagnoser;
 const transformDiagnosticsToRecords = (fileNode, diagnostics) => {
     const records = [];
     let filePath;