@lcap/nasl-language-server-core 4.0.1-rc.0 → 4.0.1-rc.1
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/README.md +85 -0
- package/out/checker.d.ts.map +1 -1
- package/out/checker.js +28 -13
- package/out/checker.js.map +1 -1
- package/out/index.d.ts +2 -1
- package/out/index.d.ts.map +1 -1
- package/out/index.js +2 -1
- package/out/index.js.map +1 -1
- package/out/query/context-variable-query.d.ts +31 -0
- package/out/query/context-variable-query.d.ts.map +1 -0
- package/out/query/context-variable-query.js +105 -0
- package/out/query/context-variable-query.js.map +1 -0
- package/out/query/index.d.ts +2 -0
- package/out/query/index.d.ts.map +1 -0
- package/out/query/index.js +18 -0
- package/out/query/index.js.map +1 -0
- package/out/reference-manager/builtin-q-name.d.ts +1 -1
- package/out/reference-manager/builtin-q-name.d.ts.map +1 -1
- package/out/reference-manager/builtin-q-name.js +2 -2
- package/out/reference-manager/builtin-q-name.js.map +1 -1
- package/out/reference-manager/collect-q-name.d.ts +2 -1
- package/out/reference-manager/collect-q-name.d.ts.map +1 -1
- package/out/reference-manager/collect-q-name.js +8 -4
- package/out/reference-manager/collect-q-name.js.map +1 -1
- package/out/reference-manager/get-q-name.d.ts +1 -1
- package/out/reference-manager/get-q-name.d.ts.map +1 -1
- package/out/reference-manager/get-q-name.js +35 -31
- package/out/reference-manager/get-q-name.js.map +1 -1
- package/out/reference-manager/reference-manager.d.ts +6 -7
- package/out/reference-manager/reference-manager.d.ts.map +1 -1
- package/out/reference-manager/reference-manager.js +7 -6
- package/out/reference-manager/reference-manager.js.map +1 -1
- package/out/reference-manager/remove-q-name.d.ts +30 -28
- package/out/reference-manager/remove-q-name.d.ts.map +1 -1
- package/out/reference-manager/remove-q-name.js +54 -47
- package/out/reference-manager/remove-q-name.js.map +1 -1
- package/out/reference-manager/rename-q-name.d.ts +2 -1
- package/out/reference-manager/rename-q-name.d.ts.map +1 -1
- package/out/reference-manager/rename-q-name.js +31 -36
- package/out/reference-manager/rename-q-name.js.map +1 -1
- package/out/reference-manager/symbol-type.d.ts +2 -2
- package/out/reference-manager/symbol-type.d.ts.map +1 -1
- package/out/reference-manager/symbol-type.js +1 -1
- package/out/reference-manager/symbol-type.js.map +1 -1
- package/out/reference-manager/update-nasl-fragment.d.ts +2 -1
- package/out/reference-manager/update-nasl-fragment.d.ts.map +1 -1
- package/out/reference-manager/update-nasl-fragment.js +9 -1
- package/out/reference-manager/update-nasl-fragment.js.map +1 -1
- package/out/typer/collectGlobalDefs.d.ts.map +1 -1
- package/out/typer/collectGlobalDefs.js.map +1 -1
- package/out/typer/component-def-manager/component-def-manager.d.ts +32 -5
- package/out/typer/component-def-manager/component-def-manager.d.ts.map +1 -1
- package/out/typer/component-def-manager/component-def-manager.js +96 -19
- package/out/typer/component-def-manager/component-def-manager.js.map +1 -1
- package/out/typer/component-def-manager/utils.d.ts.map +1 -1
- package/out/typer/component-def-manager/utils.js +39 -12
- package/out/typer/component-def-manager/utils.js.map +1 -1
- package/out/typer/dispatch-all.d.ts +1 -1
- package/out/typer/dispatch-all.d.ts.map +1 -1
- package/out/typer/dispatch-all.js +3 -7
- package/out/typer/dispatch-all.js.map +1 -1
- package/out/typer/dispatch-def.d.ts +1 -1
- package/out/typer/dispatch-def.d.ts.map +1 -1
- package/out/typer/dispatch-def.js +7 -5
- package/out/typer/dispatch-def.js.map +1 -1
- package/out/typer/dispatch-expr.d.ts +1 -1
- package/out/typer/dispatch-expr.d.ts.map +1 -1
- package/out/typer/dispatch-expr.js +28 -14
- package/out/typer/dispatch-expr.js.map +1 -1
- package/out/typer/dispatch-stmt.d.ts.map +1 -1
- package/out/typer/dispatch-stmt.js +10 -1
- package/out/typer/dispatch-stmt.js.map +1 -1
- package/out/typer/dispatch-view.d.ts.map +1 -1
- package/out/typer/dispatch-view.js +115 -115
- package/out/typer/dispatch-view.js.map +1 -1
- package/out/typer/helper.js +3 -3
- package/out/typer/helper.js.map +1 -1
- package/out/typer/incremental-update.d.ts +15 -13
- package/out/typer/incremental-update.d.ts.map +1 -1
- package/out/typer/incremental-update.js +89 -42
- package/out/typer/incremental-update.js.map +1 -1
- package/out/typer/nasl-predicate.d.ts +1 -1
- package/out/typer/nasl-predicate.d.ts.map +1 -1
- package/out/typer/solver.d.ts +37 -24
- package/out/typer/solver.d.ts.map +1 -1
- package/out/typer/solver.js +205 -426
- package/out/typer/solver.js.map +1 -1
- package/out/typer/subster.d.ts +2 -4
- package/out/typer/subster.d.ts.map +1 -1
- package/out/typer/subster.js +42 -34
- package/out/typer/subster.js.map +1 -1
- package/out/typer/topo-sort.d.ts.map +1 -1
- package/out/typer/topo-sort.js +9 -2
- package/out/typer/topo-sort.js.map +1 -1
- package/out/typer/type-hint-manager/type-hint-manager.d.ts +3 -0
- package/out/typer/type-hint-manager/type-hint-manager.d.ts.map +1 -1
- package/out/typer/type-hint-manager/type-hint-manager.js +2 -0
- package/out/typer/type-hint-manager/type-hint-manager.js.map +1 -1
- package/out/typer/type-manager.d.ts +6 -2
- package/out/typer/type-manager.d.ts.map +1 -1
- package/out/typer/type-manager.js.map +1 -1
- package/out/typer/type-predicate.d.ts.map +1 -1
- package/out/typer/type-predicate.js +61 -6
- package/out/typer/type-predicate.js.map +1 -1
- package/out/typer/typer.d.ts +10 -5
- package/out/typer/typer.d.ts.map +1 -1
- package/out/typer/typer.js +34 -60
- package/out/typer/typer.js.map +1 -1
- package/out/typer/unifier.d.ts +0 -3
- package/out/typer/unifier.d.ts.map +1 -1
- package/out/typer/unifier.js +58 -35
- package/out/typer/unifier.js.map +1 -1
- package/out/utils/nasl-type-manipulation.d.ts +1 -0
- package/out/utils/nasl-type-manipulation.d.ts.map +1 -1
- package/out/utils/nasl-type-manipulation.js +3 -1
- package/out/utils/nasl-type-manipulation.js.map +1 -1
- package/out/utils/parseTsClassType.d.ts.map +1 -1
- package/out/utils/parseTsClassType.js +7 -3
- package/out/utils/parseTsClassType.js.map +1 -1
- package/out/utils/type-operator.d.ts.map +1 -1
- package/out/utils/type-operator.js.map +1 -1
- package/package.json +13 -6
|
@@ -21,7 +21,7 @@ export declare class ComponentDefManager {
|
|
|
21
21
|
* 覆盖业务组件的定义,保证一个业务组件只会有一个定义。若无定义则初始化。
|
|
22
22
|
* @param bs 业务组件
|
|
23
23
|
* @param def 组件定义
|
|
24
|
-
* TODO
|
|
24
|
+
* TODO: rename to addUniqueBusinessComponentDefAnd
|
|
25
25
|
*/
|
|
26
26
|
overwriteBusinessComponentDef(bs: BusinessComponent, def: ViewElementDefinition): void;
|
|
27
27
|
removeBusinessComponentDef(bs: BusinessComponent): void;
|
|
@@ -31,7 +31,11 @@ export declare class ComponentDefManager {
|
|
|
31
31
|
* @param debugSource 用于调试的 来源名称
|
|
32
32
|
* @returns
|
|
33
33
|
*/
|
|
34
|
-
add(def: GeneralViewElementDefinition
|
|
34
|
+
add(def: GeneralViewElementDefinition | {
|
|
35
|
+
concept: undefined;
|
|
36
|
+
name: string;
|
|
37
|
+
title: string;
|
|
38
|
+
}, debugSource?: string): void;
|
|
35
39
|
removeComponentGroup(def: GeneralViewElementDefinition): void;
|
|
36
40
|
private clearNormalizedTag;
|
|
37
41
|
/**
|
|
@@ -39,7 +43,8 @@ export declare class ComponentDefManager {
|
|
|
39
43
|
* @returns
|
|
40
44
|
*/
|
|
41
45
|
debugAllComponentKeys(): NormalizedTag[];
|
|
42
|
-
private
|
|
46
|
+
private addImplicitToStringPropsSet;
|
|
47
|
+
private queryByNormalizedTag;
|
|
43
48
|
/**
|
|
44
49
|
* 根据ViewElement,查询组件的定义(若有多个返回最先注册的一个)
|
|
45
50
|
* @param nd
|
|
@@ -63,12 +68,16 @@ declare class ViewElementDefinitionHelper {
|
|
|
63
68
|
* 原始组件定义
|
|
64
69
|
*/
|
|
65
70
|
private rawDef;
|
|
66
|
-
|
|
71
|
+
readonly implicitToStringPropsSet: ReadonlySet<string>;
|
|
72
|
+
constructor(option: {
|
|
73
|
+
def: ViewElementDefinition;
|
|
74
|
+
implicitToStringPropsSet: Set<string>;
|
|
75
|
+
}, env: SemEnv);
|
|
67
76
|
/**
|
|
68
77
|
* 为组件定义增加 _if: boolean 属性
|
|
69
78
|
* 使用缓存优化性能,但只针对增加 _if: boolean 属性的部分
|
|
70
79
|
*
|
|
71
|
-
* TODO
|
|
80
|
+
* TODO: 想想有什么机制可以处理一下,避免hardcode
|
|
72
81
|
* @deprecated
|
|
73
82
|
*/
|
|
74
83
|
private modifyToExtendBaseViewComponent;
|
|
@@ -77,11 +86,29 @@ declare class ViewElementDefinitionHelper {
|
|
|
77
86
|
* @returns
|
|
78
87
|
*/
|
|
79
88
|
getInstanceProps(): StructureProperty[];
|
|
89
|
+
/**
|
|
90
|
+
* 检查属性是否标记为implicitToString
|
|
91
|
+
* @param propName 属性名
|
|
92
|
+
* @returns 是否标记为implicitToString
|
|
93
|
+
*/
|
|
94
|
+
isPropertyImplicitToString(propName: string): boolean;
|
|
80
95
|
/**
|
|
81
96
|
* 组件的初始化参数, 需要对BindAttribute做类型检查
|
|
82
97
|
* @returns
|
|
83
98
|
*/
|
|
84
99
|
getInitPropsTypeAnnotation(): TypeAnnotation | undefined;
|
|
100
|
+
/**
|
|
101
|
+
* 根据 slotTarget 获取slot的参数类型
|
|
102
|
+
* @param slotTarget
|
|
103
|
+
* @returns
|
|
104
|
+
* 返回值需要编码两种语义:
|
|
105
|
+
* 1. 返回 非null,表示需要引入current
|
|
106
|
+
* 2. 返回 null, 表示不需要引入current
|
|
107
|
+
*/
|
|
108
|
+
getSlotScopeTypeBySlotTarget(slotTarget: string): [{
|
|
109
|
+
name: string;
|
|
110
|
+
type: TypeAnnotation;
|
|
111
|
+
}] | null;
|
|
85
112
|
getRenamedTypeParamWrappers(): RenamedTypeParamWrapper[];
|
|
86
113
|
}
|
|
87
114
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component-def-manager.d.ts","sourceRoot":"","sources":["../../../src/typer/component-def-manager/component-def-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAK7D,OAAO,EAAE,iBAAiB,
|
|
1
|
+
{"version":3,"file":"component-def-manager.d.ts","sourceRoot":"","sources":["../../../src/typer/component-def-manager/component-def-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAK7D,OAAO,EAAE,iBAAiB,EAAmB,iBAAiB,EAAE,cAAc,EAAE,aAAa,EAAE,wBAAwB,EAAE,WAAW,EAAE,KAAK,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACnL,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGlC,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAWpE,MAAM,MAAM,4BAA4B,GACpC,qBAAqB,GACrB,aAAa,GACb,wBAAwB,CAAC;AAE7B,OAAO,CAAC,MAAM,aAAa,EAAE,OAAO,MAAM,CAAC;AAC3C,KAAK,aAAa,GAAG,MAAM,GAAG;IAAE,CAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAO3D,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,UAAU,GAAG,GAAG,IAAI,qBAAqB,CASrF;AAED,wBAAgB,8BAA8B,CAC5C,GAAG,EAAE,UAAU,GACd,GAAG,IAAI,4BAA4B,CAErC;AAoBD,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,WAAW,CAAqC;IAExD,OAAO,CAAC,QAAQ;IAmBhB;;OAEG;IACH,QAAQ;IAIR,SAAS,CAAC,GAAG,EAAE,sBAAsB,EAAE,WAAW,CAAC,EAAE,MAAM;IAI3D;;;;;OAKG;IACH,6BAA6B,CAAC,EAAE,EAAE,iBAAiB,EAAE,GAAG,EAAE,qBAAqB;IAU/E,0BAA0B,CAAC,EAAE,EAAE,iBAAiB;IAKhD;;;;;OAKG;IACH,GAAG,CACD,GAAG,EAAE,4BAA4B,GAAG;QAAE,OAAO,EAAE,SAAS,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EACvF,WAAW,CAAC,EAAE,MAAM;IA+BtB,oBAAoB,CAAC,GAAG,EAAE,4BAA4B;IAStD,OAAO,CAAC,kBAAkB;IAI1B;;;OAGG;IACH,qBAAqB;IAIrB,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,oBAAoB;IAuB5B;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,EAAE,WAAW;;;;CAQnC;AAED,KAAK,uBAAuB,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,cAAc,CAAA;CAAE,CAAC;AAgB5E,cAAM,2BAA2B;IAC/B;;OAEG;IACH,OAAO,CAAC,UAAU,CAAwB;IAC1C;;OAEG;IACH,OAAO,CAAC,MAAM,CAAwB;IACtC,QAAQ,CAAC,wBAAwB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;gBAErD,MAAM,EAAE;QAAE,GAAG,EAAE,qBAAqB,CAAC;QAAC,wBAAwB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;KAAE,EAC7E,GAAG,EAAE,MAAM;IAmBb;;;;;;OAMG;IACH,OAAO,CAAC,+BAA+B;IAoEvC;;;OAGG;IACH,gBAAgB;IAIhB;;;;OAIG;IACH,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAGrD;;;OAGG;IACH,0BAA0B;IAI1B;;;;;;;OAOG;IACH,4BAA4B,CAC1B,UAAU,EAAE,MAAM,GACjB,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,cAAc,CAAA;KAAE,CAAC,GAAG,IAAI;IA0BlD,2BAA2B,IAAI,uBAAuB,EAAE;CASzD"}
|
|
@@ -1,21 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ComponentDefManager = exports.isGeneralViewElementDefinition = exports.isViewElementDefinition = void 0;
|
|
4
|
-
const helper_1 = require("../helper");
|
|
5
4
|
const type_manager_1 = require("../type-manager");
|
|
6
5
|
const lodash_1 = require("lodash");
|
|
7
|
-
const
|
|
6
|
+
const nasl_utils_1 = require("@lcap/nasl-utils");
|
|
8
7
|
const nasl_concepts_1 = require("@lcap/nasl-concepts");
|
|
9
8
|
const asserts_1 = require("@lcap/nasl-concepts/asserts");
|
|
10
9
|
const utils_1 = require("./utils");
|
|
11
10
|
const assertion_1 = require("../../utils/assertion");
|
|
12
11
|
const reference_manager_1 = require("../../reference-manager/reference-manager");
|
|
13
12
|
function kebabToPascal(input) {
|
|
14
|
-
const camel = (0,
|
|
13
|
+
const camel = (0, nasl_utils_1.kebab2Camel2)(input);
|
|
15
14
|
return camel.charAt(0).toUpperCase() + camel.slice(1);
|
|
16
15
|
}
|
|
17
16
|
function isViewElementDefinition(def) {
|
|
18
|
-
// FIXME
|
|
17
|
+
// FIXME: 处理一下这个函数
|
|
19
18
|
return (def.concept === 'TypeAnnotation' &&
|
|
20
19
|
// 排除 nasl.ui.showMessage 这种函数
|
|
21
20
|
def.typeKind !== 'function' &&
|
|
@@ -79,13 +78,16 @@ class ComponentDefManager {
|
|
|
79
78
|
* 覆盖业务组件的定义,保证一个业务组件只会有一个定义。若无定义则初始化。
|
|
80
79
|
* @param bs 业务组件
|
|
81
80
|
* @param def 组件定义
|
|
82
|
-
* TODO
|
|
81
|
+
* TODO: rename to addUniqueBusinessComponentDefAnd
|
|
83
82
|
*/
|
|
84
83
|
overwriteBusinessComponentDef(bs, def) {
|
|
85
84
|
const tag = this.defToTag(bs);
|
|
86
85
|
// 业务组件不允许多定义存在,因此每次加定义之前先清空
|
|
87
86
|
this.clearNormalizedTag(tag);
|
|
88
|
-
|
|
87
|
+
this.gComponents.set(tag, {
|
|
88
|
+
defs: [{ def, debugSource: '业务组件' }],
|
|
89
|
+
implicitToStringPropsSet: new Set(),
|
|
90
|
+
});
|
|
89
91
|
}
|
|
90
92
|
removeBusinessComponentDef(bs) {
|
|
91
93
|
const tag = this.defToTag(bs);
|
|
@@ -98,13 +100,34 @@ class ComponentDefManager {
|
|
|
98
100
|
* @returns
|
|
99
101
|
*/
|
|
100
102
|
add(def, debugSource) {
|
|
101
|
-
if (
|
|
102
|
-
//
|
|
103
|
+
if (def.concept === 'ViewComponentDeclaration') {
|
|
104
|
+
// def 可能不是一个实例化了的节点。因此只用concept来判断
|
|
105
|
+
// ViewComponentDeclaration 的定义无需添加为定义
|
|
106
|
+
// 1. 只需要遍历这个组件的props,找到其中implicitToString为true的属性,关联给这个组件的定义
|
|
107
|
+
const tag = this.defToTag(def);
|
|
108
|
+
def.props.forEach((prop) => {
|
|
109
|
+
if (prop.implicitToString) {
|
|
110
|
+
this.addImplicitToStringPropsSet(tag, prop);
|
|
111
|
+
}
|
|
112
|
+
});
|
|
113
|
+
return;
|
|
114
|
+
}
|
|
115
|
+
else if (def.concept === undefined) {
|
|
116
|
+
// 奇怪定义,直接跳过
|
|
103
117
|
return;
|
|
104
118
|
}
|
|
105
119
|
const tag = this.defToTag(def);
|
|
106
120
|
const unifiedDef = (0, utils_1.transformGeneralViewElementDefinition)(def);
|
|
107
|
-
|
|
121
|
+
if (!this.gComponents.has(tag)) {
|
|
122
|
+
this.gComponents.set(tag, {
|
|
123
|
+
defs: [],
|
|
124
|
+
implicitToStringPropsSet: new Set(),
|
|
125
|
+
});
|
|
126
|
+
}
|
|
127
|
+
const group = this.gComponents.get(tag);
|
|
128
|
+
if (group) {
|
|
129
|
+
group.defs.push({ def: unifiedDef, debugSource });
|
|
130
|
+
}
|
|
108
131
|
}
|
|
109
132
|
removeComponentGroup(def) {
|
|
110
133
|
if ((0, asserts_1.isViewComponentDeclaration)(def)) {
|
|
@@ -124,13 +147,22 @@ class ComponentDefManager {
|
|
|
124
147
|
debugAllComponentKeys() {
|
|
125
148
|
return Array.from(this.gComponents.keys());
|
|
126
149
|
}
|
|
127
|
-
|
|
150
|
+
addImplicitToStringPropsSet(tag, prop) {
|
|
151
|
+
const group = this.gComponents.get(tag);
|
|
152
|
+
if (group) {
|
|
153
|
+
group.implicitToStringPropsSet.add(prop.name);
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
queryByNormalizedTag(tag) {
|
|
128
157
|
// 返回最先注册的一个。没有特殊的原因,返回最后一个注册的也可以。
|
|
129
|
-
const rawDef = (0, lodash_1.head)(this.gComponents.get(tag))?.def;
|
|
158
|
+
const rawDef = (0, lodash_1.head)(this.gComponents.get(tag)?.defs)?.def;
|
|
130
159
|
if (rawDef) {
|
|
131
160
|
return {
|
|
132
161
|
rawDef,
|
|
133
|
-
instantiate: (env) => new ViewElementDefinitionHelper(
|
|
162
|
+
instantiate: (env) => new ViewElementDefinitionHelper({
|
|
163
|
+
def: rawDef,
|
|
164
|
+
implicitToStringPropsSet: this.gComponents.get(tag)?.implicitToStringPropsSet ?? new Set(),
|
|
165
|
+
}, env),
|
|
134
166
|
};
|
|
135
167
|
}
|
|
136
168
|
return undefined;
|
|
@@ -144,19 +176,29 @@ class ComponentDefManager {
|
|
|
144
176
|
const possibleBC = nd.correspondingBusinessComponent;
|
|
145
177
|
if (possibleBC) {
|
|
146
178
|
const tag = this.defToTag(possibleBC);
|
|
147
|
-
return this.
|
|
179
|
+
return this.queryByNormalizedTag(tag);
|
|
148
180
|
}
|
|
149
|
-
return this.
|
|
181
|
+
return this.queryByNormalizedTag(ComponentTagUtils.normalizeTag(nd.tag));
|
|
150
182
|
}
|
|
151
183
|
}
|
|
152
184
|
exports.ComponentDefManager = ComponentDefManager;
|
|
153
185
|
// Shared cache for the base enhanced definition (before type parameter renaming)
|
|
154
186
|
const enhancedBaseDefCache = new Map();
|
|
187
|
+
// 迁移自 ViewElement,垃圾代码
|
|
188
|
+
class NameTransformer {
|
|
189
|
+
static toHump(name) {
|
|
190
|
+
return name.replace(/-(\w)/g, (all, letter) => letter.toUpperCase());
|
|
191
|
+
}
|
|
192
|
+
static toFirstUpper(name) {
|
|
193
|
+
return name.replace(/^\S/, (s) => s.toUpperCase());
|
|
194
|
+
}
|
|
195
|
+
}
|
|
155
196
|
class ViewElementDefinitionHelper {
|
|
156
|
-
constructor(
|
|
157
|
-
this.rawDef = def;
|
|
197
|
+
constructor(option, env) {
|
|
198
|
+
this.rawDef = option.def;
|
|
199
|
+
this.implicitToStringPropsSet = option.implicitToStringPropsSet;
|
|
158
200
|
// Get the enhanced definition (with _if property added)
|
|
159
|
-
const enhancedDef = this.modifyToExtendBaseViewComponent(def);
|
|
201
|
+
const enhancedDef = this.modifyToExtendBaseViewComponent(option.def);
|
|
160
202
|
// Create a copy that will be modified by inPlaceRenameTy
|
|
161
203
|
const defWithTypeParams = enhancedDef.typeParams ? (0, type_manager_1.copyTyAnn)(enhancedDef) : enhancedDef;
|
|
162
204
|
// Rename type parameters if needed
|
|
@@ -169,7 +211,7 @@ class ViewElementDefinitionHelper {
|
|
|
169
211
|
* 为组件定义增加 _if: boolean 属性
|
|
170
212
|
* 使用缓存优化性能,但只针对增加 _if: boolean 属性的部分
|
|
171
213
|
*
|
|
172
|
-
* TODO
|
|
214
|
+
* TODO: 想想有什么机制可以处理一下,避免hardcode
|
|
173
215
|
* @deprecated
|
|
174
216
|
*/
|
|
175
217
|
modifyToExtendBaseViewComponent(def) {
|
|
@@ -208,7 +250,7 @@ class ViewElementDefinitionHelper {
|
|
|
208
250
|
typeArguments: def.returnType[0].typeArguments,
|
|
209
251
|
returnType: def.returnType[0].returnType,
|
|
210
252
|
// Make a copy of the properties array if it exists
|
|
211
|
-
properties: def.returnType[0].properties ? [...def.returnType[0].properties] : []
|
|
253
|
+
properties: def.returnType[0].properties ? [...def.returnType[0].properties] : [],
|
|
212
254
|
});
|
|
213
255
|
enhancedDef.returnType[0] = returnType;
|
|
214
256
|
}
|
|
@@ -237,6 +279,14 @@ class ViewElementDefinitionHelper {
|
|
|
237
279
|
getInstanceProps() {
|
|
238
280
|
return this.renamedDef.returnType?.[0]?.properties ?? [];
|
|
239
281
|
}
|
|
282
|
+
/**
|
|
283
|
+
* 检查属性是否标记为implicitToString
|
|
284
|
+
* @param propName 属性名
|
|
285
|
+
* @returns 是否标记为implicitToString
|
|
286
|
+
*/
|
|
287
|
+
isPropertyImplicitToString(propName) {
|
|
288
|
+
return this.implicitToStringPropsSet.has(propName);
|
|
289
|
+
}
|
|
240
290
|
/**
|
|
241
291
|
* 组件的初始化参数, 需要对BindAttribute做类型检查
|
|
242
292
|
* @returns
|
|
@@ -244,6 +294,33 @@ class ViewElementDefinitionHelper {
|
|
|
244
294
|
getInitPropsTypeAnnotation() {
|
|
245
295
|
return this.renamedDef.typeArguments?.[0];
|
|
246
296
|
}
|
|
297
|
+
/**
|
|
298
|
+
* 根据 slotTarget 获取slot的参数类型
|
|
299
|
+
* @param slotTarget
|
|
300
|
+
* @returns
|
|
301
|
+
* 返回值需要编码两种语义:
|
|
302
|
+
* 1. 返回 非null,表示需要引入current
|
|
303
|
+
* 2. 返回 null, 表示不需要引入current
|
|
304
|
+
*/
|
|
305
|
+
getSlotScopeTypeBySlotTarget(slotTarget) {
|
|
306
|
+
const slotMethodName = `slot${NameTransformer.toFirstUpper(NameTransformer.toHump(slotTarget))}`;
|
|
307
|
+
const slotProp = this.getInitPropsTypeAnnotation()?.properties?.find((prop) => prop.name === slotMethodName);
|
|
308
|
+
if (slotProp?.typeAnnotation?.typeKind === 'function' &&
|
|
309
|
+
slotProp.typeAnnotation.fnArgs?.length) {
|
|
310
|
+
// 如果slotProp.typeAnnotation.fnArgs[0]?.name !== 'current',那么报错提示一下用户
|
|
311
|
+
if (slotProp.typeAnnotation.fnArgs[0]?.name !== 'current') {
|
|
312
|
+
console.error(`[getSlotParamTypeBySlotTarget] slotTarget: ${slotTarget}, 目前只支持current作为slot变量的名字,请使用current作为slot变量的名字`);
|
|
313
|
+
}
|
|
314
|
+
return [
|
|
315
|
+
{
|
|
316
|
+
// 因为目前整个 pipeline 只支持current作为slot变量的名字,所以name固定为current而不是尊重slotProp.typeAnnotation.fnArgs[0]?.name
|
|
317
|
+
name: 'current',
|
|
318
|
+
type: slotProp.typeAnnotation.fnArgs[0]?.type ?? type_manager_1.naslAnyTy,
|
|
319
|
+
},
|
|
320
|
+
];
|
|
321
|
+
}
|
|
322
|
+
return null;
|
|
323
|
+
}
|
|
247
324
|
getRenamedTypeParamWrappers() {
|
|
248
325
|
return (this.renamedDef.typeParams?.map((x, index) => {
|
|
249
326
|
const rawName = this.rawDef.typeParams?.[index]?.typeName;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component-def-manager.js","sourceRoot":"","sources":["../../../src/typer/component-def-manager/component-def-manager.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"component-def-manager.js","sourceRoot":"","sources":["../../../src/typer/component-def-manager/component-def-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,
|
|
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,CAiBvB;AA0LD,wBAAgB,mDAAmD,CACjE,GAAG,EAAE,sBAAsB,GAC1B,qBAAqB,CAEvB"}
|
|
@@ -7,23 +7,13 @@ const assertion_1 = require("../../utils/assertion");
|
|
|
7
7
|
const asserts_1 = require("@lcap/nasl-concepts/asserts");
|
|
8
8
|
function checkNever(a) {
|
|
9
9
|
console.error('checkNever failed: got', a);
|
|
10
|
-
throw new Error(`checkNever failed
|
|
10
|
+
throw new Error(`checkNever failed`);
|
|
11
11
|
}
|
|
12
12
|
exports.checkNever = checkNever;
|
|
13
13
|
function transformGeneralViewElementDefinition(def) {
|
|
14
14
|
if (def.concept === 'TypeAnnotation') {
|
|
15
|
-
/**
|
|
16
|
-
* 标准化 returnType
|
|
17
|
-
**/
|
|
18
|
-
function normalizeReturnType(ty) {
|
|
19
|
-
if (ty.typeKind !== 'function') {
|
|
20
|
-
return;
|
|
21
|
-
}
|
|
22
|
-
if ((ty.returnType?.length ?? 0) === 0) {
|
|
23
|
-
ty.returnType = [type_manager_1.naslVoidTy];
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
15
|
normalizeReturnType(def);
|
|
16
|
+
trimEventHandlerParams(def);
|
|
27
17
|
return def;
|
|
28
18
|
}
|
|
29
19
|
switch (def.concept) {
|
|
@@ -217,4 +207,41 @@ function hasDataSource(props) {
|
|
|
217
207
|
function isDataSourceAttr(attr) {
|
|
218
208
|
return ['data-source', 'dataSource'].includes(attr.name);
|
|
219
209
|
}
|
|
210
|
+
/**
|
|
211
|
+
* 如果事件处理器有多于1个参数,那么只保留第一个参数,并且将他命名为 event。这个特性来自于旧 LS 的实现。
|
|
212
|
+
* @param def
|
|
213
|
+
* @returns
|
|
214
|
+
*/
|
|
215
|
+
function trimEventHandlerParams(def) {
|
|
216
|
+
const initProps = def.typeArguments?.[0]?.properties;
|
|
217
|
+
if (initProps) {
|
|
218
|
+
initProps.forEach((prop) => {
|
|
219
|
+
if (prop.name.startsWith('on') && prop.typeAnnotation?.typeKind === 'function') {
|
|
220
|
+
const fnTy = prop.typeAnnotation;
|
|
221
|
+
if (fnTy &&
|
|
222
|
+
fnTy.typeArguments &&
|
|
223
|
+
fnTy.typeArguments.length > 1 &&
|
|
224
|
+
fnTy.fnArgs &&
|
|
225
|
+
fnTy.fnArgs.length > 1) {
|
|
226
|
+
fnTy.typeArguments = [fnTy.typeArguments[0]];
|
|
227
|
+
fnTy.typeArguments[0].name = 'event';
|
|
228
|
+
fnTy.fnArgs = [fnTy.fnArgs[0]];
|
|
229
|
+
fnTy.fnArgs[0].name = 'event';
|
|
230
|
+
}
|
|
231
|
+
}
|
|
232
|
+
});
|
|
233
|
+
}
|
|
234
|
+
}
|
|
235
|
+
/**
|
|
236
|
+
* 标准化 returnType
|
|
237
|
+
**/
|
|
238
|
+
function normalizeReturnType(ty) {
|
|
239
|
+
// FIXME wudengke ty 来自 dts 的时候,几乎一定为 generic,因此这个逻辑无效。需要修复。
|
|
240
|
+
if (ty.typeKind !== 'function') {
|
|
241
|
+
return;
|
|
242
|
+
}
|
|
243
|
+
if ((ty.returnType?.length ?? 0) === 0) {
|
|
244
|
+
ty.returnType = [type_manager_1.naslVoidTy];
|
|
245
|
+
}
|
|
246
|
+
}
|
|
220
247
|
//# sourceMappingURL=utils.js.map
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/typer/component-def-manager/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { App, BaseNode, Logic, OverriddenLogic, SyntaxNode } from '@lcap/nasl-concepts';
|
|
2
2
|
import { SemEnv } from './index';
|
|
3
|
-
import { DefConcept } from '../reference-manager/
|
|
3
|
+
import { type DefConcept } from '../reference-manager/symbol-type';
|
|
4
4
|
import { CallableNaslLogic } from './nasl-predicate';
|
|
5
5
|
export declare function dispatchAsyncDef(env: SemEnv, nd: SyntaxNode): Promise<void>;
|
|
6
6
|
export declare function traverseListAndCompareType(env: SemEnv, nodes: Array<BaseNode>, isProfile?: boolean): Promise<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dispatch-all.d.ts","sourceRoot":"","sources":["../../src/typer/dispatch-all.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,GAAG,EACH,QAAQ,EAER,KAAK,EAML,eAAe,EACf,UAAU,EACX,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,MAAM,EAIP,MAAM,SAAS,CAAC;AAejB,OAAO,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"dispatch-all.d.ts","sourceRoot":"","sources":["../../src/typer/dispatch-all.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,GAAG,EACH,QAAQ,EAER,KAAK,EAML,eAAe,EACf,UAAU,EACX,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,MAAM,EAIP,MAAM,SAAS,CAAC;AAejB,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAWnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AASrD,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,iBAOjE;AAGD,wBAAsB,0BAA0B,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC,EAAE,OAAO;;;;;GAkExG;AAaD,eAAO,MAAM,sBAAsB,UACzB,MAAM,WACR;IACJ,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,oBAAoB,EAAE,MAAM,CAAC;CAC9B,YACM,QAAQ,SAoJd,CAAC;AAGJ,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,GAAG,GAAG,KAAK,CAAC,KAAK,GAAG,eAAe,CAAC,CAiBxE;AAqBD,wBAAsB,0BAA0B,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,CAAC,CAgErH;AAED,eAAO,MAAM,cAAc,QAAS,MAAM,OAAO,GAAG,SAInD,CAAA;AAED,eAAO,MAAM,kBAAkB,QAAS,GAAG,KAAG,UAAU,EAUvD,CAAA;AAED;;;EAGE;AACF,eAAO,MAAM,2BAA2B,QAAS,MAAM,OAAO,GAAG,SAYhE,CAAA;AAGD,eAAO,MAAM,wBAAwB,qCAAsC,MAAM,aAAa,MAAM,CAAC,CAAC,KAAG,MAAM,CAAC,CAiB/G,CAAA"}
|
|
@@ -6,7 +6,7 @@ const index_1 = require("./index");
|
|
|
6
6
|
const type_predicate_1 = require("./type-predicate");
|
|
7
7
|
const type_manager_1 = require("./type-manager");
|
|
8
8
|
const type_predicate_2 = require("./type-predicate");
|
|
9
|
-
const
|
|
9
|
+
const get_q_name_1 = require("../reference-manager/get-q-name");
|
|
10
10
|
const topo_sort_1 = require("./topo-sort");
|
|
11
11
|
const dispatch_process_1 = require("./dispatch-process");
|
|
12
12
|
const dispatch_def_1 = require("./dispatch-def");
|
|
@@ -278,12 +278,8 @@ async function firstScreenCheckAndCompare(env, app, profile) {
|
|
|
278
278
|
console.error(`定义、逻辑、流程: ${((defCheckEndTime - defCheckStartTime) / 1000).toFixed(3)}s`);
|
|
279
279
|
// 页面需要用到流程的数据,所以先检查了流程吧
|
|
280
280
|
// 检查业务组件、前端全局变量、前端页面等
|
|
281
|
-
console.log('Fourth:
|
|
281
|
+
console.log('Fourth: 检查前端');
|
|
282
282
|
const frontendsCheckStartTime = performance.now();
|
|
283
|
-
const bsComponents = (0, exports.collectBsComponent)(app);
|
|
284
|
-
for (const bc of bsComponents) {
|
|
285
|
-
await dispatchAsyncDef(env, bc);
|
|
286
|
-
}
|
|
287
283
|
for (const ft of app.frontendTypes) {
|
|
288
284
|
await dispatchAsyncDef(env, ft);
|
|
289
285
|
}
|
|
@@ -336,7 +332,7 @@ exports.initAppGlobalVariablesTypes = initAppGlobalVariablesTypes;
|
|
|
336
332
|
const topoSortLogicAndSetTypes = (env, allLogics) => {
|
|
337
333
|
const [errMutRefFns, sigCompleteFns, sigIncompleteFns] = (0, topo_sort_1.getLogicCheckingOrder)(env.refMgr, allLogics);
|
|
338
334
|
errMutRefFns.forEach(fnGroup => {
|
|
339
|
-
env.addError((0, sem_diag_1.mkErrMutRecFnErr)(fnGroup.map(fn => (0,
|
|
335
|
+
env.addError((0, sem_diag_1.mkErrMutRecFnErr)(fnGroup.map(fn => (0, get_q_name_1.getTokenQualifiedName)(fn))), fnGroup[0], fnGroup[0]);
|
|
340
336
|
});
|
|
341
337
|
errMutRefFns.flat().forEach(fn => {
|
|
342
338
|
env.setType(fn, (0, type_manager_1.createRefTyAnnFromDef)(fn, env));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dispatch-all.js","sourceRoot":"","sources":["../../src/typer/dispatch-all.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"dispatch-all.js","sourceRoot":"","sources":["../../src/typer/dispatch-all.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Logic, SyntaxNode, Interface, AuthInterface, OverriddenLogic, AuthLogic, AuthLogicForCallInterface, ConnectorLogic, Connector, App, Namespace, Module, ViewComponent, ViewComponentDeclaration, ProcessComponent, View, Process, ProcessV2, TypeAnnotation } from '@lcap/nasl-concepts';
|
|
2
|
-
import { DefConcept } from '../reference-manager/
|
|
2
|
+
import { type DefConcept } from '../reference-manager/symbol-type';
|
|
3
3
|
import { type SemEnv } from './typer';
|
|
4
4
|
import { CallableNaslLogic } from './nasl-predicate';
|
|
5
5
|
export declare function dispatchDef(env: SemEnv, nd: SyntaxNode): undefined;
|
|
@@ -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,
|
|
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,KAAK,UAAU,EAAmB,MAAM,kCAAkC,CAAC;AAyBpF,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;AAUD,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;AAiFD,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"}
|
|
@@ -5,7 +5,7 @@ const nasl_concepts_1 = require("@lcap/nasl-concepts");
|
|
|
5
5
|
const file_node_cache_1 = require("../utils/file-node-cache");
|
|
6
6
|
const index_1 = require("./index");
|
|
7
7
|
const dispatch_process_1 = require("./dispatch-process");
|
|
8
|
-
const
|
|
8
|
+
const get_q_name_1 = require("../reference-manager/get-q-name");
|
|
9
9
|
const dispatch_stmt_1 = require("./dispatch-stmt");
|
|
10
10
|
const fix_use_before_assign_1 = require("./fix-use-before-assign");
|
|
11
11
|
const type_manager_1 = require("./type-manager");
|
|
@@ -141,7 +141,7 @@ function tpInterface(env, nd) {
|
|
|
141
141
|
const logicDefCachedRefs = env.refMgr.cachedQNameSymbolRefs.get(`app.logics.${nd.originLogicName}`);
|
|
142
142
|
// @ts-expect-error 凑合一下吧遭不住
|
|
143
143
|
logicDefCachedRefs?.add(nd);
|
|
144
|
-
const ndCachedRefs = env.refMgr.cachedQNameSymbolRefs.get(`${(0,
|
|
144
|
+
const ndCachedRefs = env.refMgr.cachedQNameSymbolRefs.get(`${(0, get_q_name_1.getTokenQualifiedName)(nd)}`);
|
|
145
145
|
// @ts-expect-error 凑合一下吧遭不住
|
|
146
146
|
ndCachedRefs?.add(logicDef);
|
|
147
147
|
}
|
|
@@ -199,7 +199,9 @@ exports.tpLogic = tpLogic;
|
|
|
199
199
|
const tpOverriddenLogic = (env, nd) => {
|
|
200
200
|
tpLogic(env, nd);
|
|
201
201
|
const lgc = nd.getOverriddenDepLogic();
|
|
202
|
-
|
|
202
|
+
if (lgc) {
|
|
203
|
+
env.overriddenLogic.set(lgc, nd);
|
|
204
|
+
}
|
|
203
205
|
};
|
|
204
206
|
const fixAllUseBeforeAssign = (env, logics) => {
|
|
205
207
|
const updates = [];
|
|
@@ -428,7 +430,7 @@ exports.getAllProcessLikeFromNamespaceOrModuleOrOtherRubbish = getAllProcessLike
|
|
|
428
430
|
// 建立用户自定义单向子类型关系
|
|
429
431
|
function tpMetaDatatype(env, nd) {
|
|
430
432
|
// the underlying type
|
|
431
|
-
const qName = (0,
|
|
433
|
+
const qName = (0, get_q_name_1.getTokenQualifiedName)(nd);
|
|
432
434
|
qName && env.typeAlias.set(qName, nd.typeAnnotation);
|
|
433
435
|
}
|
|
434
436
|
const tpConfigGroup = (env, nd) => {
|
|
@@ -441,7 +443,7 @@ const tpIntegration = (env, nd) => {
|
|
|
441
443
|
nd.connectors.forEach(c => (0, exports.tpConnector)(env, c));
|
|
442
444
|
};
|
|
443
445
|
const tpEvent = (env, nd) => {
|
|
444
|
-
const qName = (0,
|
|
446
|
+
const qName = (0, get_q_name_1.getTokenQualifiedName)(nd);
|
|
445
447
|
if (qName) {
|
|
446
448
|
env.refMgr.addQNameDef(qName, nd);
|
|
447
449
|
}
|