@lcap/nasl-language-server-core 3.14.0-beta.5 → 3.14.0-beta.7

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,EAEpF,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;AAiQF;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,eAAe;oCAs3HpB,OAAO;sDAPW,gBAAgB,EAAE;;;;sBAfjD,UAAU,GAAG,SAAS;;;6BAqChB,UAAU;2BAsBZ,UAAU;kBA33HnB,UAAU,WAAW,MAAM,YAAY,YAAY;EA24HzE;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,EAEpF,MAAM,qBAAqB,CAAC;AAM7B,OAAO,EAA4C,MAAM,EAAE,MAAM,SAAS,CAAC;AAE3E,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;AAiQF;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,eAAe;oCAs7HpB,OAAO;sDAPW,gBAAgB,EAAE;;;;sBAfjD,UAAU,GAAG,SAAS;;;6BAqChB,UAAU;2BAsBZ,UAAU;kBA37HnB,UAAU,WAAW,MAAM,YAAY,YAAY;EA28HzE;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,6 +1,7 @@
 "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");
@@ -740,7 +741,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) => {
@@ -806,10 +807,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';
     }
     /**
@@ -819,9 +821,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;
@@ -1152,7 +1159,8 @@ function createErrorDiagnoser(context) {
      */
     function* checkVariable(node) {
         yield* checkNode(node.defaultValue);
-        yield* checkVariableType(node);
+        // 前面加了报错，省点时间，报错不用那么精确
+        // yield* checkVariableType(node);
     }
     /**
      * 检查 前端全局变量
@@ -1494,7 +1502,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;
@@ -1671,7 +1681,8 @@ function createErrorDiagnoser(context) {
      */
     function* checkReturn(node) {
         yield* checkNode(node.defaultValue);
-        yield* checkVariableType(node);
+        // 前面加了报错，省点时间，报错不用那么精确
+        // yield* checkVariableType(node);
     }
     /**
      * 检查 接口
@@ -2306,6 +2317,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);
@@ -2324,6 +2337,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
@@ -2716,7 +2763,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 中别的类型会强校验，但是内置函数，不会强制校验，下面这几个其实是走的内置函数的实现，所以需要手动增加一下校验
@@ -3135,19 +3182,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
@@ -3317,7 +3370,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') {
@@ -3778,7 +3831,7 @@ function createErrorDiagnoser(context) {
             if (ensureNodeKeyExists(node, 'typeName') && node.typeKind === 'reference') {
                 const ref = env.resolveRef(node);
                 if (!ref) {
-                    error(node, `找不到类型${node.typeName}`);
+                    error(node, `找不到类型 ${node.typeName}`);
                 }
             }
         }
@@ -3922,6 +3975,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':
@@ -4144,7 +4205,6 @@ function createErrorDiagnoser(context) {
         error,
     };
 }
-exports.createErrorDiagnoser = createErrorDiagnoser;
 const transformDiagnosticsToRecords = (fileNode, diagnostics) => {
     const records = [];
     let filePath;