@lcap/nasl-language-server-core 4.1.0-rc.9 → 4.2.0-beta.2

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;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;AAOpE,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;AAiQF;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,eAAe;oCAomIpB,OAAO;sDAPW,gBAAgB,EAAE;;;;sBAhBjD,UAAU,GAAG,SAAS;;;8BA4Df,UAAU;2BAuBb,UAAU;;kBAxmInB,UAAU,WAAW,MAAM,YAAY,YAAY;EA0nIzE;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,EAU0F,GAAG,EAMvG,QAAQ,EACT,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;AAKpE,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;oCA4pIpB,OAAO;sDAPW,gBAAgB,EAAE;;;;sBAhBjD,UAAU,GAAG,SAAS;;;8BA4Df,UAAU;2BAuBb,UAAU;;kBAhqInB,UAAU,WAAW,MAAM,YAAY,YAAY;EAkrIzE;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

@@ -31,19 +31,6 @@ const processV2TaskTitleMap = {
     SubmitTask: '执行任务',
     CCTask: '抄送任务',
 };
-/**
- * 是否属于 控制流节点
- * @param node
- */
-function isControlFlowNode(node) {
-    return nasl_concepts_1.asserts.isStrictEnd(node) || nasl_concepts_1.asserts.isStrictAbort(node) || nasl_concepts_1.asserts.isStrictBreak(node) || nasl_concepts_1.asserts.isStrictContinue(node);
-}
-/**
- * 是否属于 调用表达式
- */
-function isCallExpression(node) {
-    return nasl_concepts_1.asserts.isCallFunction(node) || nasl_concepts_1.asserts.isCallInterface(node) || nasl_concepts_1.asserts.isCallLogic(node) || nasl_concepts_1.asserts.isCallConnector(node) || nasl_concepts_1.asserts.isCallEvent(node);
-}
 const isEnd = (node) => node.concept === 'End';
 const isAbort = (node) => node.concept === 'Abort';
 const isBreak = (node) => node.concept === 'Break';
@@ -53,7 +40,6 @@ 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
@@ -80,7 +66,8 @@ function getExpressionNodeName(concept) {
         CallInterface: '接口',
         CallAuthInterface: '鉴权接口',
         CallConnector: '连接器',
-        CallMicroserviceInterface: '',
+        CallMicroserviceInterface: '微服务接口',
+        CallGatewayInterface: '网关接口',
         CallEvent: '事件',
     };
     return expressionNodeName[concept];
@@ -249,11 +236,6 @@ function resolveMetadataType(typeArg, app) {
         return metadataTypes?.find(metadataType => metadataType.name === typeArg.typeName)?.typeAnnotation;
     }
 }
-const cheapNewError = (obj) => {
-    const err = Object.create(Error.prototype);
-    Object.assign(err, obj);
-    return err;
-};
 /**
  * 创建错误诊断器
  * @returns
@@ -391,7 +373,6 @@ 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' ? '开发环境' : '生产环境'}接口超时时间，可能导致重试失败`, {
@@ -821,7 +802,7 @@ function createErrorDiagnoser(context) {
      */
     function* checkCallExpressionParameters(node, ref) {
         // Handle both TypeAnnotation and FunctionDefinition formats
-        const params = ref.params ?? ref.typeArguments;
+        const params = ref?.params ?? ref?.typeArguments;
         const { arguments: args } = node;
         const paramsLen = params?.length || 0;
         const argsLen = args?.length || 0;
@@ -960,7 +941,7 @@ function createErrorDiagnoser(context) {
      * @param ref
      */
     function* checkScopeOfUse(node, ref) {
-        const range = getRange(ref);
+        const range = ref && getRange(ref);
         if (range && !isNodeWithinRange(node, range)) {
             error(node, range.errMsg);
         }
@@ -1628,6 +1609,30 @@ function createErrorDiagnoser(context) {
                 error(node, message);
             }
         }
+        const relationEntity = node.relationEntity;
+        const relationNamespace = node.relationNamespace;
+        const relationProperty = node.relationProperty;
+        if (relationEntity && relationNamespace && relationProperty) {
+            const releationEntityQName = `${relationNamespace}.${relationEntity}`;
+            const releationEntityPropertyQName = `${releationEntityQName}.properties.${relationProperty}`;
+            const entityEntityDef = env.refMgr.queryQNameDef(releationEntityQName);
+            const entityPropertyDef = env.refMgr.queryQNameDef(releationEntityPropertyQName);
+            if (entityPropertyDef) {
+                const equal = (0, type_predicate_1.isEqualTy)(env, entityPropertyDef.typeAnnotation, node.typeAnnotation);
+                if (equal) {
+                    return;
+                }
+                const content = (0, sem_diag_1.mkIncompatibleTyErr)(env, entityPropertyDef.typeAnnotation, node.typeAnnotation);
+                const message = `关联属性${content}`;
+                error(node, message);
+            }
+            else {
+                const message = entityEntityDef
+                    ? `找不到 ${relationEntity} 上的 ${relationProperty}`
+                    : `找不到实体 ${relationEntity}`;
+                error(node, message);
+            }
+        }
     }
     /**
      * 检查 枚举
@@ -1774,6 +1779,24 @@ function createErrorDiagnoser(context) {
         env.exitScope();
         pConn && env.exitScope();
     }
+    /**
+     * 检查 Mcp工具
+     * @param node
+     */
+    function* checkMcpInterface(node) {
+        env.enterScope(node);
+        if (node.params?.length) {
+            yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.params, function* (node) {
+                yield* checkNode(node);
+            });
+        }
+        if (node.returns?.length) {
+            yield* (0, nasl_utils_1.wrapForEachToGenerator)(node.returns, function* (node) {
+                yield* checkNode(node);
+            });
+        }
+        env.exitScope();
+    }
     /**
      * 检查 鉴权接口
      * @param node
@@ -2500,59 +2523,63 @@ function createErrorDiagnoser(context) {
                 error(node.sharedScope, '共享范围为指定应用时，必须指定共享应用');
             }
             // 导出接口
-            if (node?.exportInterface) {
-                let isSame = true;
-                const itf = node.exportInterface;
-                const { params: logicParams = [], returns: logicReturns = [] } = node;
-                const { params: itfParams = [], returns: itfReturns = [] } = itf;
-                // 参数和返回数量不同
-                if (logicParams.length !== itfParams.length || logicReturns.length !== itfReturns.length) {
-                    isSame = false;
-                }
-                if (isSame && logicParams.length === itfParams.length) {
-                    const logicParamMap = logicParams?.reduce((acc, param) => {
-                        acc[param.name] = param.typeAnnotation;
-                        return acc;
-                    }, {});
-                    itfParams.forEach((param) => {
-                        const logicParam = logicParamMap?.[param.name];
-                        if (!logicParam) {
-                            isSame = false;
-                            return;
-                        }
-                        // 枚举会被转为 String
-                        else if (logicParam.typeKind === 'reference' && logicParam.typeNamespace?.endsWith('enums')) {
-                            if (param.typeAnnotation.typeName !== 'String') {
+            if (node?.exportInterfaces?.length) {
+                node?.exportInterfaces?.forEach?.((exportInterface) => {
+                    let isSame = true;
+                    const itf = exportInterface;
+                    const { params: logicParams = [], returns: logicReturns = [] } = node;
+                    const { params: itfParams = [], returns: itfReturns = [] } = itf;
+                    // 参数和返回数量不同
+                    if (logicParams.length !== itfParams.length || logicReturns.length !== itfReturns.length) {
+                        isSame = false;
+                    }
+                    if (isSame && logicParams.length === itfParams.length) {
+                        const logicParamMap = logicParams?.reduce((acc, param) => {
+                            acc[param.name] = param.typeAnnotation;
+                            return acc;
+                        }, {});
+                        itfParams.forEach((param) => {
+                            const logicParam = logicParamMap?.[param.name];
+                            if (!logicParam) {
                                 isSame = false;
                                 return;
                             }
+                            // 枚举会被转为 String
+                            else if (logicParam.typeKind === 'reference' && logicParam.typeNamespace?.endsWith('enums')) {
+                                if (param.typeAnnotation.typeName !== 'String') {
+                                    isSame = false;
+                                    return;
+                                }
+                            }
+                            else if (!logicParam.isSame(param.typeAnnotation)) {
+                                isSame = false;
+                                return;
+                            }
+                        });
+                    }
+                    if (isSame && logicReturns.length === itfReturns.length && logicReturns.length > 0) {
+                        if (logicReturns[0].name !== itfReturns[0].name) {
+                            isSame = false;
                         }
-                        else if (!logicParam.isSame(param.typeAnnotation)) {
+                        else if (!(0, type_predicate_1.isEqualTy)(env, env.getType(logicReturns[0]), env.getType(itfReturns[0]))) {
                             isSame = false;
-                            return;
                         }
-                    });
-                }
-                if (isSame && logicReturns.length === itfReturns.length && logicReturns.length > 0) {
-                    if (logicReturns[0].name !== itfReturns[0].name) {
-                        isSame = false;
                     }
-                    else if (!(0, type_predicate_1.isEqualTy)(env, env.getType(logicReturns[0]), env.getType(itfReturns[0]))) {
-                        isSame = false;
+                    if (!isSame) {
+                        const macthed = exportInterface.concept === 'McpInterface';
+                        const key = macthed ? 'exportMcpInterface' : 'exportInterface';
+                        error(node, `逻辑已变更，请确认请求类型无误后重新导出${'${event}'}`, {
+                            severity: Severity.ERROR,
+                            events: [
+                                {
+                                    key,
+                                    label: '接口配置',
+                                    params: node,
+                                },
+                            ],
+                        });
                     }
-                }
-                if (!isSame) {
-                    error(node, `逻辑已变更，请确认请求类型无误后重新导出${'${event}'}`, {
-                        severity: Severity.ERROR,
-                        events: [
-                            {
-                                key: 'exportInterface',
-                                label: '接口配置',
-                                params: node,
-                            },
-                        ],
-                    });
-                }
+                });
             }
         }
         const likeComponent = (node.getAncestorRaw('View') || node.getAncestorRaw('BusinessComponent'));
@@ -3851,7 +3878,7 @@ function createErrorDiagnoser(context) {
             return errorType;
         }
         const typeAnnotation = (yield* checkNode(node.expression));
-        if (typeAnnotation.typeKind === 'generic') {
+        if (typeAnnotation?.typeKind === 'generic') {
             yield* checkGenericTypeHasExpectedTyArgs(typeAnnotation);
         }
         return typeAnnotation;
@@ -4067,6 +4094,8 @@ function createErrorDiagnoser(context) {
                     return yield* checkMsgTriggerEvent(node);
                 case 'Interface':
                     return yield* checkInterface(node);
+                case 'McpInterface':
+                    return yield* checkMcpInterface(node);
                 case 'AuthInterface':
                     return yield* checkAuthInterface(node);
                 case 'InterfaceParam':
@@ -4244,7 +4273,7 @@ function createErrorDiagnoser(context) {
             }
         }
         catch (err) {
-            // console.error(err);
+            console.error(err);
         }
     }
     /**