@lcap/nasl-language-server-core 4.0.0-rc.3 → 4.0.0-rc.5

package/out/typer/dispatch-expr.js

@@ -84,7 +84,8 @@ function tpPaginate(env, nd, tgtTy) {
     // 分页返回的似乎是 { list:..., total: Integer }
     env.setType(nd, (0, type_manager_1.createAnonymousTyAnn)(['list', 'total'], [env.getRawType(nd.list),
         type_manager_1.naslLongTy]));
-    // 暂时应该不会有这种奇葩的推导，省一点是一点  env.unifier.unify(env.getRawType(nd), tgtTy);
+    // 暂时应该不会有这种奇葩的推导，省一点是一点: ==> 现在加上吧，赋值那边的额外 unify 可以完全去掉
+    env.unifier.unify(env.getRawType(nd), tgtTy);
     return env.getRawType(nd);
 }
 function tpNullLiteral(env, nd, tgtTy) {
@@ -94,9 +95,6 @@ function tpNullLiteral(env, nd, tgtTy) {
     return type_manager_1.naslNullTy;
 }
 function tpDefaultValue(env, nd, tgtTy) {
-    if (nd.playground) {
-        (0, dispatch_stmt_1.tpSolvingPlayground)(env, nd.playground);
-    }
     if (nd.expression) {
         // Date 系列的东西默认值都是 StringLiteral，所以这里要特殊处理。
         if ((0, type_predicate_2.isDateTy)(tgtTy) || (0, type_predicate_2.isTimeTy)(tgtTy) || (0, type_predicate_2.isDateTimeTy)(tgtTy)) {
@@ -119,6 +117,7 @@ function tpDefaultValue(env, nd, tgtTy) {
     }
     // 大有讲究：敢信现在 let x: Decimal = 0 的 0 是 Decimal 类型（与逻辑里不同）
     env.setType(nd, tgtTy ?? env.getRawType(nd.expression));
+    (0, dispatch_stmt_1.tpSolvingPlayground)(env, nd.playground);
     return env.getRawType(nd);
 }
 function tpStringLiteral(env, nd, tgtTy) {
@@ -185,13 +184,6 @@ function tpIdentifier(env, nd, tgtTy) {
         env.setType(nd, tgtTy);
         return;
     }
-    // a.b.c 中的 b 和 c 不应指向局部变量
-    if (!env.isInMemberExpr && (0, nasl_predicate_1.isTypeInferConcept)(def)) {
-        nd.pointToSymbol = def;
-    }
-    else if (nd.pointToSymbol) {
-        nd.pointToSymbol = undefined;
-    }
     let refTy = env.getRawType(def);
     if (refTy) {
         env.setType(nd, refTy);
@@ -201,8 +193,17 @@ function tpIdentifier(env, nd, tgtTy) {
         env.setType(nd, freshTy);
         env.setType(def, freshTy);
     }
-    env.unifier.unify(env.getRawType(nd), tgtTy);
-    return env.getRawType(nd);
+    const ndTy = env.getRawType(nd);
+    // a.b.c 中的 b 和 c 不应指向局部变量、不收集草稿区的推导
+    if (!env.isInMemberExpr && (0, nasl_predicate_1.isTypeInferConcept)(def)) {
+        env.idToVar.set(nd, def);
+        !env.isPlayground && env.allRefsInPlayground.delete(def);
+    }
+    else {
+        env.idToVar.delete(nd);
+    }
+    env.unifier.unify(ndTy, tgtTy);
+    return ndTy;
 }
 function tpMemberExpression(env, nd, tgtTy) {
     let rawObjTyAnn = undefined;
@@ -358,9 +359,6 @@ function tpBinaryArithExpr(env, nd, tgtTy) {
         else if ((0, type_predicate_2.isIntegerTy)(rightTy)) {
             env.unifier.unify(type_manager_1.naslLongTy, leftTy);
         }
-        else {
-            env.unifier.unifyEq(leftTy, rightTy);
-        }
     }
     else if (!(0, type_predicate_2.isTyAnnTyParam)(leftTy) && (0, type_predicate_2.isTyAnnTyParam)(rightTy)) {
         if ((0, type_predicate_2.isDecimalTy)(leftTy)) {
@@ -369,9 +367,6 @@ function tpBinaryArithExpr(env, nd, tgtTy) {
         else if ((0, type_predicate_2.isIntegerTy)(leftTy)) {
             env.unifier.unify(type_manager_1.naslLongTy, rightTy);
         }
-        else {
-            env.unifier.unifyEq(rightTy, leftTy);
-        }
     }
     // 人肉 solve
     const hasString = (0, type_predicate_2.isStringTy)(leftTy) || (0, type_predicate_2.isStringTy)(rightTy);
@@ -504,19 +499,27 @@ function tpPlusExpression(env: SemEnv, nd: BinaryExpression, tgtTy: TypeAnnotati
  * == != 的检查也不好做
  * (==): <T>(Null, T) -> Boolean
  * (==): <T>(T, Null) -> Boolean
- * (==): <T1 extends Integer | Decimal, T2 extends Integer | Decimal>(T1, T2) -> Boolean
+ * (==): <T1 extends Integer | Decimal, T2 extends Integer | Decimal>(T1, T2) -> Boolean  ==> T1、T2 毫无关系
  * (==): <T>(T, T) -> Boolean
  */
 const tpBinaryComparisonExpr = (env, nd, tgtTy) => {
     let leftTy = dispatchExpr(env, nd.left, undefined);
     let rightTy = dispatchExpr(env, nd.right, undefined);
-    if ((0, type_predicate_2.isTyAnnTyParam)(rightTy)) {
-        rightTy = leftTy;
-        env.unifier.unifyEq(rightTy, leftTy);
+    if ((0, type_predicate_2.isTyAnnTyParam)(leftTy) && !(0, type_predicate_2.isTyAnnTyParam)(rightTy)) {
+        if ((0, type_predicate_2.isDecimalTy)(rightTy)) {
+            env.unifier.unify(leftTy, type_manager_1.naslDecimalTy);
+        }
+        else if ((0, type_predicate_2.isIntegerTy)(rightTy)) {
+            env.unifier.unify(type_manager_1.naslLongTy, leftTy);
+        }
     }
-    else if ((0, type_predicate_2.isTyAnnTyParam)(leftTy)) {
-        leftTy = rightTy;
-        env.unifier.unifyEq(leftTy, rightTy);
+    else if (!(0, type_predicate_2.isTyAnnTyParam)(leftTy) && (0, type_predicate_2.isTyAnnTyParam)(rightTy)) {
+        if ((0, type_predicate_2.isDecimalTy)(leftTy)) {
+            env.unifier.unify(rightTy, type_manager_1.naslDecimalTy);
+        }
+        else if ((0, type_predicate_2.isIntegerTy)(leftTy)) {
+            env.unifier.unify(type_manager_1.naslLongTy, rightTy);
+        }
     }
     env.unifier.unify(type_manager_1.naslBooleanTy, tgtTy);
     env.setType(nd, type_manager_1.naslBooleanTy);
@@ -686,7 +689,8 @@ function tpCallLogic(env, nd, tgtTy) {
                 env.setType(arg, parTy);
             }
             else {
-                // 报错
+                // 报错：泛型逻辑调用，最后的 callInfo 里有 type variables，会被判定为 unresolved，目前不检查 arg 会缺少报错
+                // env.addError(`调用逻辑：参数不能为空`, env.getCurFileNode(), arg);
                 env.setType(arg, type_manager_1.naslAnyTy);
             }
         }
@@ -705,11 +709,21 @@ function tpCallLogic(env, nd, tgtTy) {
     // 给 checker 报错用，都给吧，CallLogic 也有要处理 Error | T 返回类型的复杂情形，checker 直接拿结果就行不用重复处理
     // TODO: 前端的部分组件逻辑好像指飞了（env.resoleRef 和 env.resolvedCallInfo 结果不一样）……先用 !env.isView 判断一下
     if (!env.isView || nd.calleeNamespace === 'nasl.util') { // json 序列化 - similarly add param info for nasl.util
-        const callInfo = (0, type_manager_1.createFunctionDef)(fnTy.typeArguments, finalRetTy, def, fnTy.typeParams, // Pass type parameters for generic functions
-        nd.calleeNamespace.startsWith('extensions.') ? nd.calleeNamespace.split('.')[1] : undefined // 是否来自依赖库，TODO：目前只能优化服务端报错，页面的调用没有 callInfo
-        );
+        const callInfo = (0, type_manager_1.createFunctionDef)(fnTy.typeArguments, finalRetTy, def, fnTy.typeParams);
         env.resolvedCallInfo.set(nd, callInfo);
     }
+    if (fnTy.typeParams?.length) {
+        env.addPostCheckTask(nd, (e, pSubst) => {
+            // 写入 __TypeArguments 字段，调用泛型依赖库时，代码生成要用。
+            const typeArgs = fnTy.typeParams
+                ?.map((x) => {
+                return e.getType(pSubst(x));
+            })
+                .filter(types_1.isNotNil) ?? [];
+            // 写入来自：_getQuickInfoNodesTypeMapWithGenerator
+            nd.__TypeArguments = typeArgs;
+        });
+    }
     return finalRetTy;
 }
 exports.tpCallLogic = tpCallLogic;
@@ -808,10 +822,8 @@ function tpCallFunction(env, nd, tgtTy) {
         const fnTy = fnDef?.__TypeAnnotation;
         (0, helper_1.zipWith_)(env.unifier.unify, argTys, fnTy?.typeArguments);
         env.setType(nd, fnTy?.returnType?.[0] ?? type_manager_1.naslAnyTy); // 似乎不可能为空
-        if (!env.isView) {
-            const callInfo = (0, type_manager_1.createFunctionDef)(argTys, fnTy?.returnType?.[0] ?? type_manager_1.naslAnyTy, fnDef);
-            env.resolvedCallInfo.set(nd, callInfo);
-        }
+        const callInfo = (0, type_manager_1.createFunctionDef)(argTys, fnTy?.returnType?.[0] ?? type_manager_1.naslAnyTy, fnDef, undefined);
+        env.resolvedCallInfo.set(nd, callInfo);
         return env.getRawType(nd);
     }
     const fnDef = env.quickGetLibDef(nd);
@@ -839,12 +851,9 @@ function tpCallFunction(env, nd, tgtTy) {
     env.unifier.unify(finalRetTy, tgtTy);
     // TODO:处理可选参数必填选填问题
     env.setType(nd, finalRetTy); // 似乎不可能为空
-    // Extract optional parameter information from type annotations
-    if (!env.isView) {
-        const callInfo = (0, type_manager_1.createFunctionDef)(fnTy.typeArguments, finalRetTy, fnDef, fnTy.typeParams // 实例化后的
-        );
-        env.resolvedCallInfo.set(nd, callInfo);
-    }
+    const callInfo = (0, type_manager_1.createFunctionDef)(fnTy.typeArguments, finalRetTy, fnDef, // 内置函数
+    fnTy.typeParams);
+    env.resolvedCallInfo.set(nd, callInfo);
     return finalRetTy;
     function handleEnumFn(env, nd, tgtTy) {
         const createAnonymousRetTy = (ty) => (0, type_manager_1.createAnonymousTyAnn)(['text', 'value'], [type_manager_1.naslStringTy, ty]);
@@ -952,15 +961,10 @@ function tpLengthAndConvertCall(env, nd, tgtTy) {
         // For Length function, the parameter is required
         // Create a mock definition for the Length function
         const mockLengthDef = {
-            params: [{
-                    name: 'collection',
-                    optional: false
-                }]
+            params: [{ name: 'collection', optional: false }]
         };
-        if (!env.isView) {
-            const callInfo = (0, type_manager_1.createFunctionDef)(argTys, type_manager_1.naslLongTy, mockLengthDef);
-            env.resolvedCallInfo.set(nd, callInfo); // 存储函数定义（含参数和返回类型）
-        }
+        const callInfo = (0, type_manager_1.createFunctionDef)(argTys, type_manager_1.naslLongTy, mockLengthDef, undefined);
+        env.resolvedCallInfo.set(nd, callInfo); // 存储函数定义（含参数和返回类型）
         return type_manager_1.naslLongTy;
     }
     if (calleeName === 'Convert') {
@@ -991,10 +995,8 @@ function tpLengthAndConvertCall(env, nd, tgtTy) {
         const mockConvertDef = {
             params: paramTys?.map(() => ({ optional: false })) || []
         };
-        if (!env.isView) {
-            const callInfo = (0, type_manager_1.createFunctionDef)(argTys, env.getRawType(nd), mockConvertDef);
-            env.resolvedCallInfo.set(nd, callInfo);
-        }
+        const callInfo = (0, type_manager_1.createFunctionDef)(argTys, env.getRawType(nd), mockConvertDef, undefined);
+        env.resolvedCallInfo.set(nd, callInfo);
         return env.getRawType(nd);
     }
 }
@@ -1020,7 +1022,7 @@ function tpCallInterface(env, nd, tgtTy) {
     env.setType(nd, finalRetTy);
     env.unifier.unify(finalRetTy, tgtTy);
     if (!env.isView) {
-        const callInfo = (0, type_manager_1.createFunctionDef)(def.params.map(p => p.typeAnnotation), finalRetTy, def);
+        const callInfo = (0, type_manager_1.createFunctionDef)(def.params.map(p => p.typeAnnotation), finalRetTy, def, undefined);
         env.resolvedCallInfo.set(nd, callInfo);
     }
     return finalRetTy;
@@ -1035,7 +1037,7 @@ function tpCallConnector(env, nd, tgtTy) {
     const ndTy = cDef.returns?.[0]?.typeAnnotation;
     env.setType(nd, ndTy);
     if (!env.isView) {
-        const callInfo = (0, type_manager_1.createFunctionDef)(cDef.params.map(p => p.typeAnnotation), ndTy, cDef);
+        const callInfo = (0, type_manager_1.createFunctionDef)(cDef.params.map(p => p.typeAnnotation), ndTy, cDef, undefined);
         env.resolvedCallInfo.set(nd, callInfo);
     }
     return ndTy;
@@ -1090,10 +1092,6 @@ function tpSubLogic(env, nd, tgtTy) {
     env.setType(nd, ndTy);
     env.unifier.cs = csCopy;
     env.unifier.unify(ndTy, tgtTy); // 这里需要额外的 unify，否则 SubLogic 算出来的类型不能与外侧进来时的约束产生关系
-    if (nd.nodePath?.startsWith('app.logics')) {
-        const postChk = (0, dispatch_def_1.checkVariableAndReturnTypeAnnotations)(nd.variables, nd.returns);
-        env.addPostCheckTask(nd, postChk(env.getCurFileNode(), env.errSeverity));
-    }
     return ndTy;
 }
 function tpArgument(env, nd, tgtTy) {
@@ -1175,9 +1173,10 @@ function tpCallQueryComponent(env, nd, tgtTy) {
     const createdVars = createNameAliasVarNodes(aggrAsNames, groupByAsNames);
     nd.orderBy && nd.orderBy.forEach(tpOrderByExpr);
     nd.having && dispatchExpr(env, nd.having, type_manager_1.naslBooleanTy);
-    nd.havingPlayground && (0, dispatch_stmt_1.tpSolvingPlayground)(env, nd.havingPlayground);
     nd.where && dispatchExpr(env, nd.where, type_manager_1.naslBooleanTy);
-    nd.wherePlayground && (0, dispatch_stmt_1.tpSolvingPlayground)(env, nd.wherePlayground);
+    // 后置检查连 context 都没了，告辞
+    (0, dispatch_stmt_1.tpSolvingPlayground)(env, nd.wherePlayground);
+    (0, dispatch_stmt_1.tpSolvingPlayground)(env, nd.havingPlayground);
     env.ctxTpQFE = undefined;
     env.ctxCQC = undefined;
     createdVars.forEach(v => {
@@ -1321,12 +1320,13 @@ function tpCallQueryComponent(env, nd, tgtTy) {
                 ? (0, type_manager_1.createAnonymousTyAnn)(['list', 'total'], [(0, type_manager_1.createListTyAnn)(nd.typeAnnotation ?? type_manager_1.naslAnyTy), type_manager_1.naslLongTy])
                 : (0, type_manager_1.createListTyAnn)(nd.typeAnnotation ?? type_manager_1.naslAnyTy);
         }
-        if (nd.ideVersion === '2.11' && nd.typeAnnotation) {
-            retTy = nd.typeAnnotation; // 那也没办法了，锁死了
-        }
-        else {
+        // if (nd.ideVersion !== '2.11' && nd.ideVersion !== '2.22' && nd.typeAnnotation) {
+        //   retTy = nd.typeAnnotation; // 那也没办法了，锁死了
+        // } else
+        {
             nd.typeAnnotation = retTy;
             if (!env.isFirstScreenCheck && !(0, type_predicate_1.isEqualTy)(env, nd.typeAnnotation, retTy)) {
+                // @warning: 这个 typeAnnotation 其实没有用，反正发布的时候会标注上去
                 nd.update({ typeAnnotation: retTy });
             }
         }
@@ -1840,21 +1840,21 @@ function tpEntityLogic(env, nd, tgtTy) {
     env.unifier.unify(finalRetTy, tgtTy);
     // Create a mock definition for entity logics
     const mockDef = { params: paramTys.map(() => ({ optional: false })) };
-    const callInfo = (0, type_manager_1.createFunctionDef)(paramTys, finalRetTy, mockDef);
+    const callInfo = (0, type_manager_1.createFunctionDef)(paramTys, finalRetTy, mockDef, undefined);
     env.resolvedCallInfo.set(nd, callInfo);
     return finalRetTy;
     function getRetTy() {
         switch (calleeName) {
             case 'get': return entityRefTy;
             case 'create': return entityOrErrTy; // 带个 Error 类型
-            case 'delete': return type_manager_1.naslVoidTy; // 现在如此
+            case 'delete': return type_manager_1.naslLongTy; // 现在如此
             case 'update': return entityRefTy;
             case 'createOrUpdate': return entityOrErrTy; // 带个 Error 类型
             case 'updateBy': return type_manager_1.naslLongTy;
-            case 'deleteBy': return type_manager_1.naslVoidTy;
+            case 'deleteBy': return type_manager_1.naslLongTy;
             case 'batchCreate': return listEntityRefTy;
             case 'batchUpdate': return listEntityRefTy;
-            case 'batchDelete': return type_manager_1.naslVoidTy;
+            case 'batchDelete': return type_manager_1.naslLongTy;
             case 'import': return type_manager_1.naslStringTy;
         }
     }