@lcap/nasl-language-server-core 4.0.0-beta.21 → 4.0.0-beta.23
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/out/typer/component-def-manager/utils.d.ts.map +1 -1
- package/out/typer/component-def-manager/utils.js +5 -3
- package/out/typer/component-def-manager/utils.js.map +1 -1
- package/out/typer/dispatch-def.d.ts.map +1 -1
- package/out/typer/dispatch-def.js +6 -6
- package/out/typer/dispatch-def.js.map +1 -1
- package/out/typer/dispatch-expr.d.ts.map +1 -1
- package/out/typer/dispatch-expr.js +72 -25
- package/out/typer/dispatch-expr.js.map +1 -1
- package/out/typer/dispatch-view.d.ts.map +1 -1
- package/out/typer/dispatch-view.js +45 -14
- package/out/typer/dispatch-view.js.map +1 -1
- package/out/typer/subster.d.ts.map +1 -1
- package/out/typer/subster.js +4 -7
- package/out/typer/subster.js.map +1 -1
- package/out/typer/type-manager.d.ts +2 -0
- package/out/typer/type-manager.d.ts.map +1 -1
- package/out/typer/type-manager.js +8 -2
- package/out/typer/type-manager.js.map +1 -1
- package/out/typer/type-predicate.d.ts +11 -2
- package/out/typer/type-predicate.d.ts.map +1 -1
- package/out/typer/type-predicate.js +34 -19
- package/out/typer/type-predicate.js.map +1 -1
- package/out/typer/typer.d.ts +6 -0
- package/out/typer/typer.d.ts.map +1 -1
- package/out/typer/typer.js +6 -0
- package/out/typer/typer.js.map +1 -1
- package/out/typer/unifier.d.ts.map +1 -1
- package/out/typer/unifier.js +20 -22
- package/out/typer/unifier.js.map +1 -1
- package/out/utils/type-operator.d.ts +1 -1
- package/out/utils/type-operator.d.ts.map +1 -1
- package/out/utils/type-operator.js +6 -4
- package/out/utils/type-operator.js.map +1 -1
- package/package.json +5 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/typer/component-def-manager/utils.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,4BAA4B,EAAE,MAAM,gDAAgD,CAAC;AAE9F,OAAO,EAAE,sBAAsB,EAAgC,MAAM,4BAA4B,CAAC;AAIlG,wBAAgB,UAAU,CAAC,CAAC,EAAE,KAAK,GAAG,KAAK,CAG1C;AAED,wBAAgB,qCAAqC,CACnD,GAAG,EAAE,4BAA4B,GAChC,qBAAqB,CA2BvB;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/typer/component-def-manager/utils.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,4BAA4B,EAAE,MAAM,gDAAgD,CAAC;AAE9F,OAAO,EAAE,sBAAsB,EAAgC,MAAM,4BAA4B,CAAC;AAIlG,wBAAgB,UAAU,CAAC,CAAC,EAAE,KAAK,GAAG,KAAK,CAG1C;AAED,wBAAgB,qCAAqC,CACnD,GAAG,EAAE,4BAA4B,GAChC,qBAAqB,CA2BvB;AA0LD,wBAAgB,mDAAmD,CACjE,GAAG,EAAE,sBAAsB,GAC1B,qBAAqB,CAEvB"}
|
|
@@ -45,14 +45,15 @@ function extractLogicTypeAsFunction(def) {
|
|
|
45
45
|
const params = ('params' in def ? def.params : []) ?? [];
|
|
46
46
|
const typeParams = ('typeParams' in def ? def.typeParams : []) ?? [];
|
|
47
47
|
const returns = ('returns' in def ? def.returns : []) ?? [];
|
|
48
|
+
const allParams = [...extraParams, ...params];
|
|
48
49
|
return (options) => nasl_concepts_1.TypeAnnotation.createProtoTypeOnly({
|
|
49
50
|
typeKind: 'function',
|
|
50
51
|
typeParams: typeParams.map(type_manager_1.tyParam2TyAnn),
|
|
51
|
-
typeArguments:
|
|
52
|
+
typeArguments: allParams.map(getTyOrAny),
|
|
52
53
|
typeNamespace: options.nsp,
|
|
53
54
|
returnType: returns.map(getTyOrAny),
|
|
54
55
|
id: 'placeholder',
|
|
55
|
-
fnArgs:
|
|
56
|
+
fnArgs: allParams.map(p => ({
|
|
56
57
|
name: p.name || '',
|
|
57
58
|
type: getTyOrAny(p)
|
|
58
59
|
}))
|
|
@@ -150,7 +151,8 @@ function transformViewComponentToViewElementDefinition(def) {
|
|
|
150
151
|
(0, assertion_1.assertTrusy)(param.name, '参数名不能为空');
|
|
151
152
|
// TODO 还有一种情况：wangEditor中存在多个param name形如"$event.value"与"$event.editor"等等。
|
|
152
153
|
const renameParam = (param) => {
|
|
153
|
-
|
|
154
|
+
// HACK: 若参数名称为$event，或者只有一个参数，则命名为event
|
|
155
|
+
if (param.name === '$event' || event.params?.length === 1) {
|
|
154
156
|
param.name = 'event';
|
|
155
157
|
}
|
|
156
158
|
return param;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/typer/component-def-manager/utils.ts"],"names":[],"mappings":";;;AAAA,uDAQ6B;AAG7B,kDAAgH;AAEhH,qDAAoD;AACpD,yDAAsD;AAEtD,SAAgB,UAAU,CAAC,CAAQ;IACjC,OAAO,CAAC,KAAK,CAAC,wBAAwB,EAAE,CAAC,CAAC,CAAC;IAC3C,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,EAAE,CAAC,CAAC;AACjD,CAAC;AAHD,gCAGC;AAED,SAAgB,qCAAqC,CACnD,GAAiC;IAEjC,IAAI,GAAG,CAAC,OAAO,KAAK,gBAAgB,EAAE,CAAC;QACrC;;YAEI;QACJ,SAAS,mBAAmB,CAAC,EAAkB;YAC7C,IAAG,EAAE,CAAC,QAAQ,KAAK,UAAU,EAAC,CAAC;gBAC7B,OAAO;YACT,CAAC;YACD,IAAG,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,IAAI,CAAC,CAAC,KAAK,CAAC,EAAC,CAAC;gBACrC,EAAE,CAAC,UAAU,GAAG,CAAC,yBAAU,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC;QACD,mBAAmB,CAAC,GAAG,CAAC,CAAC;QACzB,OAAO,GAAG,CAAC;IACb,CAAC;IACD,QAAQ,GAAG,CAAC,OAAO,EAAE,CAAC;QACpB,KAAK,eAAe,CAAC,CAAC,CAAC;YACrB,OAAO,6CAA6C,CAAC,GAAG,CAAC,CAAC;QAC5D,CAAC;QACD,KAAK,0BAA0B,CAAC,CAAC,CAAC;YAChC,OAAO,wDAAwD,CAAC,GAAG,CAAC,CAAC;QACvE,CAAC;QACD,OAAO,CAAC,CAAC,CAAC;YACR,UAAU,CAAC,GAAG,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;AACH,CAAC;AA7BD,sFA6BC;AAED,SAAS,0BAA0B,CAAC,GAAyC;IAC3E,MAAM,UAAU,GAAG,CAAC,EAA4C,EAAE,EAAE,CAClE,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,wBAAS,CAAC;IACxE,MAAM,WAAW,GAAG,CAAC,eAAe,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;IAC5E,MAAM,MAAM,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;IACzD,MAAM,UAAU,GAAG,CAAC,YAAY,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;IACrE,MAAM,OAAO,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;IAC5D,OAAO,CAAC,OAAwB,EAAE,EAAE,CAClC,8BAAc,CAAC,mBAAmB,CAAC;QACjC,QAAQ,EAAE,UAAU;QACpB,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,4BAAa,CAAC;QACzC,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/typer/component-def-manager/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dispatch-def.d.ts","sourceRoot":"","sources":["../../src/typer/dispatch-def.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,KAAK,EAIL,UAAU,EAGV,SAAS,EACT,aAAa,EACb,eAAe,EACf,SAAS,EACT,yBAAyB,EACzB,cAAc,EAEd,SAAS,EACT,GAAG,EACH,SAAS,EACT,MAAM,EAEN,aAAa,EACb,wBAAwB,EACxB,gBAAgB,EAChB,IAAI,EACJ,OAAO,EACP,SAAS,EAQT,cAAc,EACjB,MAAM,qBAAqB,CAAC;AAW7B,OAAO,EAAE,UAAU,EAAqC,MAAM,wCAAwC,CAAC;AAwBvG,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAC;AAGtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAGrD,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,aAuDtD;AAqCD,eAAO,MAAM,kBAAkB,oCAAqC,CAAC,YAEtC,IAAI,GAwBlC,CAAA;AAED,wBAAgB,OAAO,CAAC,CAAC,SAAS,iBAAiB,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,8BAuBtE;AAQD,eAAO,MAAM,qBAAqB,QAAS,MAAM,UAAU,MAAM,iBAAiB,CAAC,KAAG,MAAM,MAAM,IAAI,CAWrG,CAAA;AAED,eAAO,MAAM,qBAAqB,WAAY,MAAM,iBAAiB,GAAG,SAAS,GAAG,aAAa,CAAC,SAUjG,CAAA;
|
|
1
|
+
{"version":3,"file":"dispatch-def.d.ts","sourceRoot":"","sources":["../../src/typer/dispatch-def.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,KAAK,EAIL,UAAU,EAGV,SAAS,EACT,aAAa,EACb,eAAe,EACf,SAAS,EACT,yBAAyB,EACzB,cAAc,EAEd,SAAS,EACT,GAAG,EACH,SAAS,EACT,MAAM,EAEN,aAAa,EACb,wBAAwB,EACxB,gBAAgB,EAChB,IAAI,EACJ,OAAO,EACP,SAAS,EAQT,cAAc,EACjB,MAAM,qBAAqB,CAAC;AAW7B,OAAO,EAAE,UAAU,EAAqC,MAAM,wCAAwC,CAAC;AAwBvG,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAC;AAGtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAGrD,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,aAuDtD;AAqCD,eAAO,MAAM,kBAAkB,oCAAqC,CAAC,YAEtC,IAAI,GAwBlC,CAAA;AAED,wBAAgB,OAAO,CAAC,CAAC,SAAS,iBAAiB,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,8BAuBtE;AAQD,eAAO,MAAM,qBAAqB,QAAS,MAAM,UAAU,MAAM,iBAAiB,CAAC,KAAG,MAAM,MAAM,IAAI,CAWrG,CAAA;AAED,eAAO,MAAM,qBAAqB,WAAY,MAAM,iBAAiB,GAAG,SAAS,GAAG,aAAa,CAAC,SAUjG,CAAA;AAgFD,eAAO,MAAM,WAAW,QAAS,MAAM,MAAM,SAAS,SAerD,CAAA;AAGD,eAAO,MAAM,WAAW,QAAS,MAAM,MAAM,SAAS,SAiBrD,CAAA;AAGD,eAAO,MAAM,QAAQ,QAAS,MAAM,MAAM,MAAM,SAoB/C,CAAA;AAID,wBAAgB,qEAAqE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC,CA6B9J;AAGD,wBAAgB,+DAA+D,CAAC,EAAE,EAAE,GAAG,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,GAClH,KAAK,CAAC,KAAK,GAAG,eAAe,GAAG,SAAS,GAAG,yBAAyB,GAAG,cAAc,CAAC,CA2B5F;AAGD,wBAAgB,iDAAiD,CAAC,EAAE,EAAE,SAAS,GAAG,MAAM,GAClF,KAAK,CAAC,IAAI,GAAG,aAAa,GAAG,wBAAwB,CAAC,CAW3D;AAED,wBAAgB,oDAAoD,CAAC,EAAE,EAAE,SAAS,GAAG,MAAM,GACvF,KAAK,CAAC,OAAO,GAAG,SAAS,GAAG,gBAAgB,CAAC,CAShD;AA8BD;;;GAGG;AACH,eAAO,MAAM,wBAAwB,QAAS,MAAM,SA+BnD,CAAA"}
|
|
@@ -226,6 +226,11 @@ const setParamOptionalFlags = (logics) => {
|
|
|
226
226
|
}
|
|
227
227
|
};
|
|
228
228
|
exports.setParamOptionalFlags = setParamOptionalFlags;
|
|
229
|
+
/**
|
|
230
|
+
* 检查变量和返回值的类型
|
|
231
|
+
* @param env
|
|
232
|
+
* @param nd
|
|
233
|
+
*/
|
|
229
234
|
function tpVariable(env, nd) {
|
|
230
235
|
env.allRefsInPlayground.add(nd);
|
|
231
236
|
(0, index_1.createOnPush)(env.nameBindings, nd.name, nd); // 当前 namespace 为 '' 或 undefined
|
|
@@ -247,13 +252,8 @@ function tpFrontendVariable(env, nd) {
|
|
|
247
252
|
(0, dispatch_expr_1.dispatchExpr)(env, nd.defaultValue, nd.typeAnnotation);
|
|
248
253
|
env.setType(nd, nd.typeAnnotation);
|
|
249
254
|
}
|
|
250
|
-
// 函数的"返回"，类似变量，不是语句。
|
|
251
255
|
function tpReturn(env, nd) {
|
|
252
|
-
env
|
|
253
|
-
(0, index_1.createOnPush)(env.nameBindings, nd.name, nd); // 当前 namespace 为 '' 或 undefined
|
|
254
|
-
const ty = nd.typeAnnotation ?? env.unifier.nextFreshTyAnn('free');
|
|
255
|
-
env.setType(nd, ty);
|
|
256
|
-
(0, dispatch_expr_1.dispatchExpr)(env, nd.defaultValue, env.getRawType(nd)); // nd.typeAnnotation 优先
|
|
256
|
+
return tpVariable(env, nd);
|
|
257
257
|
}
|
|
258
258
|
function tpParam(env, nd) {
|
|
259
259
|
if (nd.concept !== 'InterfaceParam') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dispatch-def.js","sourceRoot":"","sources":["../../src/typer/dispatch-def.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"dispatch-def.js","sourceRoot":"","sources":["../../src/typer/dispatch-def.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dispatch-expr.d.ts","sourceRoot":"","sources":["../../src/typer/dispatch-expr.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,QAAQ,EAER,eAAe,EAGf,aAAa,EACb,YAAY,EACZ,aAAa,EACb,SAAS,EAYT,aAAa,EACb,KAAK,EAIL,YAAY,EAqBZ,UAAU,EACV,cAAc,EAIf,MAAM,qBAAqB,CAAC;AAsC7B,OAAO,EACa,KAAK,UAAU,EAMlC,MAAM,wCAAwC,CAAC;AAMhD,OAAO,EACL,KAAK,MAAM,EACZ,MAAM,SAAS,CAAC;AAwFjB,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,GAAG,SAAS,EAAE,KAAK,EAAE,cAAc,GAAG,SAAS,GAAG,cAAc,GAAG,SAAS,CAoDnI;
|
|
1
|
+
{"version":3,"file":"dispatch-expr.d.ts","sourceRoot":"","sources":["../../src/typer/dispatch-expr.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,QAAQ,EAER,eAAe,EAGf,aAAa,EACb,YAAY,EACZ,aAAa,EACb,SAAS,EAYT,aAAa,EACb,KAAK,EAIL,YAAY,EAqBZ,UAAU,EACV,cAAc,EAIf,MAAM,qBAAqB,CAAC;AAsC7B,OAAO,EACa,KAAK,UAAU,EAMlC,MAAM,wCAAwC,CAAC;AAMhD,OAAO,EACL,KAAK,MAAM,EACZ,MAAM,SAAS,CAAC;AAwFjB,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,GAAG,SAAS,EAAE,KAAK,EAAE,cAAc,GAAG,SAAS,GAAG,cAAc,GAAG,SAAS,CAoDnI;AAmoBD,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,cAAc,GAAG,SAAS,GAAG,cAAc,GAAG,SAAS,CAqHrH;AAGD,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,UAAU,GAAG,SAAS,GAAG,cAAc,GAAG,SAAS,CA6B1H;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,QAUpF;AA4BD,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,cAAc,GAAG,SAAS,8BA+L9F;AAwED,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,cAAc,GAAG,SAAS,8BAmChG;AAED,eAAO,MAAM,mBAAmB,wBAAkB,CAAC;AACnD,eAAO,MAAM,2BAA2B,wBAAkB,CAAC;AAE3D,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,cAAc,GAAG,SAAS,8BAkBhG;AAuiBD,eAAO,MAAM,iBAAiB,QAAS,MAAM,MAAM,cAAc,GAAG,SAAS,KAAG,MAAM,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC,CAapH,CAAA;AA8FD,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,cAAc,GAAG,SAAS,GAAG,cAAc,GAAG,SAAS,CAU1H;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,cAAc,GAAG,SAAS,GAAG,cAAc,GAAG,SAAS,CA8G7G;AAWD,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,cAAc,GAAG,SAAS,GAAG,cAAc,GAAG,SAAS,CA6IvH;AAkCD;;GAEG;AACH,eAAO,MAAM,YAAY,QAAS,MAAM,MAAM,SAAS,SAAS,cAAc,GAAG,SAAS,KAAG,cAAc,GAAG,SAe7G,CAAA;AA6BD,eAAO,MAAM,cAAc,OAAQ,eAAe,GAAG,YAAY,WAAW,MAAM,WAAW,MAAM,KAAG,aAMrG,CAAC"}
|
|
@@ -417,6 +417,48 @@ function tpBinaryExpression(env, nd, tgtTy) {
|
|
|
417
417
|
});
|
|
418
418
|
env.unifier.unify(retTy, tgtTy);
|
|
419
419
|
env.setType(nd, retTy);
|
|
420
|
+
// 添加Add操作的类型兼容性检查
|
|
421
|
+
const postChk = (fileNode, errBoundary, severity) => (env) => {
|
|
422
|
+
const leftTy = env.getType(nd.left);
|
|
423
|
+
const rightTy = env.getType(nd.right);
|
|
424
|
+
// 获取类型的底层类型，如果是元数据类型则返回其底层类型
|
|
425
|
+
const getBaseType = (ty) => {
|
|
426
|
+
if (!ty)
|
|
427
|
+
return ty;
|
|
428
|
+
if ((0, type_predicate_2.isMetadataType)(ty)) {
|
|
429
|
+
// 使用typeAlias来查找元数据类型的底层类型
|
|
430
|
+
const qName = (0, reference_manager_1.getTokenQualifiedName)(ty);
|
|
431
|
+
if (qName && env.typeAlias.has(qName)) {
|
|
432
|
+
return env.typeAlias.get(qName);
|
|
433
|
+
}
|
|
434
|
+
}
|
|
435
|
+
return ty;
|
|
436
|
+
};
|
|
437
|
+
const baseLeftTy = getBaseType(leftTy);
|
|
438
|
+
const baseRightTy = getBaseType(rightTy);
|
|
439
|
+
// 检查Union类型的数值成员
|
|
440
|
+
const isUnionNumericTy = (ty) => {
|
|
441
|
+
if (!ty)
|
|
442
|
+
return false;
|
|
443
|
+
if ((0, type_predicate_2.isNumericTy)(ty))
|
|
444
|
+
return true;
|
|
445
|
+
if ((0, type_predicate_1.isUnionTy)(ty)) {
|
|
446
|
+
return ty.typeArguments?.every(memberTy => (0, type_predicate_2.isNumericTy)(memberTy)) ?? false;
|
|
447
|
+
}
|
|
448
|
+
return false;
|
|
449
|
+
};
|
|
450
|
+
// 允许的Add操作情况：
|
|
451
|
+
// 1. 任一操作数是String类型（字符串拼接）
|
|
452
|
+
// 2. 两个操作数都是数值类型（Long、Decimal等），包括数值Union类型
|
|
453
|
+
// 3. 包含Any类型的情况
|
|
454
|
+
// 4. 元数据类型按其底层类型进行检查
|
|
455
|
+
const isStringOperationValid = (0, type_predicate_2.isStringTy)(baseLeftTy) || (0, type_predicate_2.isStringTy)(baseRightTy) || (0, type_predicate_2.isAnyTy)(baseLeftTy) || (0, type_predicate_2.isAnyTy)(baseRightTy);
|
|
456
|
+
const isNumericOperationValid = isUnionNumericTy(baseLeftTy) && isUnionNumericTy(baseRightTy);
|
|
457
|
+
if (!isStringOperationValid && !isNumericOperationValid && baseLeftTy && baseRightTy) {
|
|
458
|
+
env.addError((0, sem_diag_1.mkIncompatibleTyErr)(env, leftTy || type_manager_1.naslAnyTy, rightTy || type_manager_1.naslAnyTy), fileNode, errBoundary, severity);
|
|
459
|
+
}
|
|
460
|
+
};
|
|
461
|
+
env.addPostCheckTask(nd, postChk(env.getCurFileNode(), nd, env.errSeverity));
|
|
420
462
|
return retTy;
|
|
421
463
|
}
|
|
422
464
|
case '-':
|
|
@@ -525,23 +567,26 @@ const tpBinaryComparisonExpr = (env, nd, tgtTy) => {
|
|
|
525
567
|
env.setType(nd, type_manager_1.naslBooleanTy);
|
|
526
568
|
// 不调用 solver 则无法判断，调用则影响速度，所以报错后移了
|
|
527
569
|
const postChk = (fileNode, errBoundary, severity) => (env) => {
|
|
528
|
-
|
|
529
|
-
const
|
|
530
|
-
|
|
570
|
+
// 保留原始类型，用于报错
|
|
571
|
+
const leftTy = env.getType(nd.left) ?? type_manager_1.naslAnyTy;
|
|
572
|
+
const rightTy = env.getType(nd.right) ?? type_manager_1.naslAnyTy;
|
|
573
|
+
const castLeftTy = (0, type_predicate_1.isDecimalUnionLongTy)(leftTy) ? type_manager_1.naslDecimalTy : leftTy;
|
|
574
|
+
const castRightTy = (0, type_predicate_1.isDecimalUnionLongTy)(rightTy) ? type_manager_1.naslDecimalTy : rightTy;
|
|
575
|
+
if ((0, type_predicate_2.isNullTy)(castLeftTy)) {
|
|
531
576
|
// rightTy 不做要求
|
|
532
577
|
}
|
|
533
|
-
else if ((0, type_predicate_2.isNullTy)(
|
|
578
|
+
else if ((0, type_predicate_2.isNullTy)(castRightTy)) {
|
|
534
579
|
// leftTy 不做要求
|
|
535
580
|
}
|
|
536
|
-
else if ((0, type_predicate_2.isNumericTy)(
|
|
537
|
-
if (!(0, type_predicate_1.binaryOpCompatibleNumTys)(
|
|
538
|
-
env.addError((0, sem_diag_1.mkIncompatibleTyErr)(env, leftTy
|
|
581
|
+
else if ((0, type_predicate_2.isNumericTy)(castLeftTy) && (0, type_predicate_2.isNumericTy)(castRightTy)) {
|
|
582
|
+
if (!(0, type_predicate_1.binaryOpCompatibleNumTys)(castLeftTy, castRightTy)) {
|
|
583
|
+
env.addError((0, sem_diag_1.mkIncompatibleTyErr)(env, leftTy, rightTy), fileNode, errBoundary, severity);
|
|
539
584
|
}
|
|
540
585
|
}
|
|
541
586
|
else {
|
|
542
|
-
// 非数字、非 Null、非 Enum
|
|
543
|
-
if (
|
|
544
|
-
env.addError((0, sem_diag_1.mkIncompatibleTyErr)(env, leftTy
|
|
587
|
+
// 非数字、非 Null、非 Enum 类型则要求完全相等，但支持Union类型的兼容性检查
|
|
588
|
+
if (!(0, type_predicate_1.isEqualTy)(env, leftTy, rightTy)) {
|
|
589
|
+
env.addError((0, sem_diag_1.mkIncompatibleTyErr)(env, leftTy, rightTy), fileNode, errBoundary, severity);
|
|
545
590
|
}
|
|
546
591
|
}
|
|
547
592
|
};
|
|
@@ -568,36 +613,40 @@ const tpBinaryOrderExpr = (env, nd, tgtTy) => {
|
|
|
568
613
|
env.unifier.unifyEq(leftTy, rightTy);
|
|
569
614
|
}
|
|
570
615
|
const isValidTy = (ty) => {
|
|
571
|
-
// weak test for the sake of performance and 后向兼容性，鬼知道 NASL 上还有 typeName: 'Integer' 这种奇葩？？？
|
|
572
616
|
if (!ty) {
|
|
573
617
|
return false;
|
|
574
618
|
}
|
|
575
619
|
if ((0, type_predicate_2.isPrimitiveTy)(ty) && orderableTyNames.includes(ty.typeName)) {
|
|
576
620
|
return true;
|
|
577
621
|
}
|
|
622
|
+
// 支持Union类型：如果所有成员都是可排序类型，则Union类型也是可排序的
|
|
623
|
+
if ((0, type_predicate_1.isUnionTy)(ty)) {
|
|
624
|
+
return ty.typeArguments?.every(memberTy => isValidTy(memberTy)) ?? false;
|
|
625
|
+
}
|
|
578
626
|
const qName = (0, reference_manager_1.getTokenQualifiedName)(ty);
|
|
579
|
-
return qName && env.typeAlias.has(qName);
|
|
627
|
+
return !!qName && env.typeAlias.has(qName);
|
|
580
628
|
};
|
|
581
629
|
// 不调用 solver 则无法判断，调用则影响速度，所以报错后移了
|
|
582
630
|
const postChk = (fileNode, errBoundary, severity) => (env) => {
|
|
583
|
-
const leftTy = env.getType(nd.left);
|
|
584
|
-
const rightTy = env.getType(nd.right);
|
|
631
|
+
const leftTy = env.getType(nd.left) ?? type_manager_1.naslAnyTy;
|
|
632
|
+
const rightTy = env.getType(nd.right) ?? type_manager_1.naslAnyTy;
|
|
633
|
+
const castLeftTy = (0, type_predicate_1.isDecimalUnionLongTy)(leftTy) ? type_manager_1.naslDecimalTy : leftTy;
|
|
634
|
+
const castRightTy = (0, type_predicate_1.isDecimalUnionLongTy)(rightTy) ? type_manager_1.naslDecimalTy : rightTy;
|
|
585
635
|
if (!isValidTy(leftTy)) {
|
|
586
636
|
env.addError((0, sem_diag_1.mkIncompatibleTyErr)(env, leftTy || type_manager_1.naslAnyTy, '整数、字符串 等基础类型'), fileNode, errBoundary, severity);
|
|
587
637
|
}
|
|
588
638
|
else if (!isValidTy(rightTy)) {
|
|
589
639
|
env.addError((0, sem_diag_1.mkIncompatibleTyErr)(env, rightTy || type_manager_1.naslAnyTy, '整数、字符串 等基础类型'), fileNode, errBoundary, severity);
|
|
590
640
|
}
|
|
591
|
-
else if ((0, type_predicate_2.isNumericTy)(
|
|
592
|
-
if (!(0, type_predicate_1.binaryOpCompatibleNumTys)(
|
|
593
|
-
env.addError((0, sem_diag_1.mkIncompatibleTyErr)(env, leftTy
|
|
641
|
+
else if ((0, type_predicate_2.isNumericTy)(castLeftTy) && (0, type_predicate_2.isNumericTy)(castRightTy)) {
|
|
642
|
+
if (!(0, type_predicate_1.binaryOpCompatibleNumTys)(castLeftTy, castRightTy)) {
|
|
643
|
+
env.addError((0, sem_diag_1.mkIncompatibleTyErr)(env, leftTy, rightTy), fileNode, errBoundary, severity);
|
|
594
644
|
}
|
|
595
645
|
}
|
|
596
646
|
else {
|
|
597
|
-
// 非数字、非 Null、非 Enum
|
|
598
|
-
|
|
599
|
-
|
|
600
|
-
env.addError((0, sem_diag_1.mkIncompatibleTyErr)(env, leftTy || type_manager_1.naslAnyTy, rightTy || type_manager_1.naslAnyTy), fileNode, errBoundary, severity);
|
|
647
|
+
// 非数字、非 Null、非 Enum 类型则要求完全相等，但支持Union类型的兼容性检查
|
|
648
|
+
if (!(0, type_predicate_1.isEqualTy)(env, leftTy, rightTy)) {
|
|
649
|
+
env.addError((0, sem_diag_1.mkIncompatibleTyErr)(env, leftTy, rightTy), fileNode, errBoundary, severity);
|
|
601
650
|
}
|
|
602
651
|
}
|
|
603
652
|
};
|
|
@@ -1642,8 +1691,6 @@ function tpMatch(env, nd, tgtTy) {
|
|
|
1642
1691
|
// type patterns must be type annotations
|
|
1643
1692
|
exprRefinedTy = (0, type_manager_1.createUnionTyAnnIfNecessary)(env, mc.patterns.map(inferTy));
|
|
1644
1693
|
// TODO wudengke 求解完成之后，报错
|
|
1645
|
-
// if (!isSubTy(env, exprRefinedTy, exprTy)) {
|
|
1646
|
-
// }
|
|
1647
1694
|
}
|
|
1648
1695
|
else { // '其他' 分支或 空模式的分支
|
|
1649
1696
|
// 对其他所有 case 的所有类型取关于全集 exprTy 的补集
|
|
@@ -1653,7 +1700,7 @@ function tpMatch(env, nd, tgtTy) {
|
|
|
1653
1700
|
// 确保我们在处理纯类型的匹配
|
|
1654
1701
|
if (pureTys.length === prevPatterns.length) {
|
|
1655
1702
|
// 单例模式后改为直接比较内存地址
|
|
1656
|
-
const caseRefinedTys = (0,
|
|
1703
|
+
const caseRefinedTys = (0, type_predicate_1.isUnionTy)(exprTy) ? exprTy?.typeArguments?.filter(t1 => !pureTys.find(t2 => {
|
|
1657
1704
|
return (0, type_predicate_1.isEqualTy)(env, t1, t2);
|
|
1658
1705
|
})) : [];
|
|
1659
1706
|
if (caseRefinedTys?.length) {
|
|
@@ -1900,7 +1947,7 @@ const removeErrTys = (env, nd, retTy) => {
|
|
|
1900
1947
|
finalRetTy = (0, fp_macros_1.IfBind)(finalRetTy.typeArguments?.filter(ty => !((0, type_predicate_2.isErrorTy)(ty))))(filteredRetTys => (0, type_manager_1.createUnionTyAnnIfNecessary)(env, filteredRetTys))((0, fp_macros_1.feed)(finalRetTy));
|
|
1901
1948
|
}
|
|
1902
1949
|
// @ts-ignore
|
|
1903
|
-
if ((0,
|
|
1950
|
+
if ((0, type_predicate_1.isUnionTy)(finalRetTy) && !finalRetTy.typeArguments?.length) {
|
|
1904
1951
|
return type_manager_1.naslVoidTy; // createUnionTyAnnIfNecessary 得到 Union<> 时表示无返回类型
|
|
1905
1952
|
}
|
|
1906
1953
|
return finalRetTy;
|