greybel-type-analyzer 1.0.11 → 1.0.13
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/dist/aggregator/ast-definition-aggregator.js +3 -0
- package/dist/aggregator/ast-definition-aggregator.js.map +1 -1
- package/dist/entities/class-type.js +2 -0
- package/dist/entities/class-type.js.map +1 -1
- package/dist/storage/type-storage.js +5 -3
- package/dist/storage/type-storage.js.map +1 -1
- package/package.json +1 -1
|
@@ -25,6 +25,9 @@ class ASTDefinitionAggregator {
|
|
|
25
25
|
}
|
|
26
26
|
makeTypeCompatibleWithProperties(resolvePath, context) {
|
|
27
27
|
const variableSetterCtx = this.document.chunkHelper.findAssignmentVariableSetterContext(resolvePath);
|
|
28
|
+
if (variableSetterCtx == null) {
|
|
29
|
+
return;
|
|
30
|
+
}
|
|
28
31
|
if ((0, ast_1.isVariableSetterContextVariable)(variableSetterCtx)) {
|
|
29
32
|
this.scope.setProperty(variableSetterCtx.property, map_type_1.MapType.createDefault(this.typeStorage, this.document, this.scope));
|
|
30
33
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast-definition-aggregator.js","sourceRoot":"","sources":["../../src/aggregator/ast-definition-aggregator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ast-definition-aggregator.js","sourceRoot":"","sources":["../../src/aggregator/ast-definition-aggregator.ts"],"names":[],"mappings":"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"}
|
|
@@ -169,6 +169,8 @@ class ClassType extends type_2.Type {
|
|
|
169
169
|
return;
|
|
170
170
|
}
|
|
171
171
|
for (const [key, value] of source.properties) {
|
|
172
|
+
if (this.properties.has(key))
|
|
173
|
+
continue;
|
|
172
174
|
this.properties.set(key, new entity_info_1.EntityInfo(value.name, value.type));
|
|
173
175
|
}
|
|
174
176
|
this.sourceMap.extend(source.sourceMap);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"class-type.js","sourceRoot":"","sources":["../../src/entities/class-type.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"class-type.js","sourceRoot":"","sources":["../../src/entities/class-type.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,8 +15,10 @@ class TypeStorage {
|
|
|
15
15
|
/* By default it should not add anything to any */
|
|
16
16
|
}
|
|
17
17
|
addType(type) {
|
|
18
|
-
|
|
19
|
-
|
|
18
|
+
const existingType = this.typeInterfaces.get(type.id);
|
|
19
|
+
if (existingType) {
|
|
20
|
+
existingType.merge(type);
|
|
21
|
+
return;
|
|
20
22
|
}
|
|
21
23
|
this.typeInterfaces.set(type.id, type);
|
|
22
24
|
}
|
|
@@ -48,7 +50,7 @@ class TypeStorage {
|
|
|
48
50
|
}
|
|
49
51
|
addKeyType(keyType) {
|
|
50
52
|
if (this.keyTypes.has(keyType.id)) {
|
|
51
|
-
|
|
53
|
+
return;
|
|
52
54
|
}
|
|
53
55
|
this.keyTypes.set(keyType.id, keyType);
|
|
54
56
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type-storage.js","sourceRoot":"","sources":["../../src/storage/type-storage.ts"],"names":[],"mappings":";;;AAYA,wDAAkD;AAElD,MAAa,WAAW;IAQtB,YAAY,MAAoB;QANhB,WAAM,GAAuB,IAAI,GAAG,EAAE,CAAC;QAOrD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,cAAc,GAAG,IAAI,GAAG,EAAE,CAAC;QAChC,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC;QAC1B,IAAI,CAAC,uBAAuB,GAAG,CAAC,CAAC;IACnC,CAAC;IAED,QAAQ,CAAC,GAAa,EAAE,IAAiB;QACvC,kDAAkD;IACpD,CAAC;IAED,OAAO,CAAC,IAAgB;QACtB,
|
|
1
|
+
{"version":3,"file":"type-storage.js","sourceRoot":"","sources":["../../src/storage/type-storage.ts"],"names":[],"mappings":"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"}
|