greybel-type-analyzer 1.0.11 → 1.0.12
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.
|
@@ -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":";;;AAAA,2CAOoB;AAGpB,oDAAyD;AAIzD,wCAauB;AACvB,wDAAkD;AAClD,+CAA2C;AAC3C,mDAA+C;AAC/C,2CAAuC;AACvC,yCAAqC;AACrC,iCAA8B;AAE9B,MAAa,SAAU,SAAQ,WAAI;IAIjC,YACE,EAAU,EACV,gBAAiC,IAAI,EACrC,cAA8C,IAAI,EAClD,WAAyB,EACzB,QAAoB,EACpB,KAAc,EACd,UAAqC,EACrC,MAAgB;QAEhB,KAAK,CACH,EAAE,EACF,eAAQ,CAAC,SAAS,EAClB,WAAW,EACX,WAAW,EACX,QAAQ,EACR,KAAK,EACL,MAAM,CACP,CAAC;QACF,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,UAAU,GAAG,UAAU,IAAI,IAAI,GAAG,EAAE,CAAC;IAC5C,CAAC;IAED,gBAAgB,CAAC,QAAgB,EAAE,UAA+B;QAChE,IAAI,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC;YAAE,OAAO;QAEvC,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;QAE5C,QAAQ,cAAc,CAAC,IAAI,EAAE;YAC3B,KAAK,wCAA2B,CAAC,QAAQ,CAAC,CAAC;gBACzC,MAAM,WAAW,GAAG,IAAI,4BAAY,CAClC,wCAA2B,CAAC,QAAQ,EACpC,UAAyC,EACzC,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,KAAK,CACX,CAAC;gBACF,MAAM,UAAU,GAAG,IAAI,wBAAU,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;gBACzD,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;gBACvC,MAAM;aACP;YACD,KAAK,wCAA2B,CAAC,IAAI,CAAC,CAAC;gBACrC,MAAM,WAAW,GAAG,IAAI,oBAAQ,CAC9B,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,eAAQ,CAAC,QAAQ,CAAC,EAC9C,WAAI,CAAC,cAAc,CACjB,cAAc,CAAC,SAAS,CAAC,IAAI,IAAI,sBAAe,EAChD,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,KAAK,CACX,EACD,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,KAAK,CACX,CAAC;gBACF,MAAM,UAAU,GAAG,IAAI,wBAAU,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;gBACzD,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;gBACvC,MAAM;aACP;YACD,KAAK,wCAA2B,CAAC,GAAG,CAAC,CAAC;gBACpC,MAAM,WAAW,GAAG,IAAI,kBAAO,CAC7B,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,eAAQ,CAAC,OAAO,CAAC,EAC7C,WAAI,CAAC,cAAc,CACjB,cAAc,CAAC,OAAO,CAAC,IAAI,IAAI,sBAAe,EAC9C,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,KAAK,CACX,EACD,WAAI,CAAC,cAAc,CACjB,cAAc,CAAC,SAAS,CAAC,IAAI,IAAI,sBAAe,EAChD,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,KAAK,CACX,EACD,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,KAAK,EACV,IAAI,CACL,CAAC;gBACF,MAAM,UAAU,GAAG,IAAI,wBAAU,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;gBACzD,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;gBACvC,MAAM;aACP;YACD,KAAK,wCAA2B,CAAC,MAAM,CAAC;YACxC,KAAK,wCAA2B,CAAC,MAAM,CAAC;YACxC,KAAK,wCAA2B,CAAC,GAAG,CAAC,CAAC;gBACpC,MAAM,WAAW,GAAG,WAAI,CAAC,cAAc,CACrC,cAAc,CAAC,IAAI,IAAI,wCAA2B,CAAC,GAAG,EACtD,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,KAAK,CACX,CAAC;gBACF,MAAM,UAAU,GAAG,IAAI,wBAAU,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;gBACzD,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;gBACvC,MAAM;aACP;YACD,OAAO,CAAC,CAAC;gBACP,MAAM,WAAW,GAAG,WAAI,CAAC,cAAc,CACrC,cAAc,CAAC,IAAI,IAAI,wCAA2B,CAAC,GAAG,EACtD,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,KAAK,CACX,CAAC;gBACF,MAAM,UAAU,GAAG,IAAI,wBAAU,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;gBACzD,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;gBACvC,MAAM;aACP;SACF;IACH,CAAC;IAED,eAAe,CAAC,SAAoB;QAClC,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC,CAAC;QAE3D,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;YACtD,MAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;YACnC,MAAM,UAAU,GAAG,SAAS,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAErD,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;SAC7C;IACH,CAAC;IAED,QAAQ,CAAC,WAAuB;QAC9B,IAAI,CAAC,IAAA,kBAAW,EAAC,WAAW,CAAC;YAAE,OAAO,KAAK,CAAC;QAC5C,OAAO,CACL,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC;YACnC,CAAC,IAAI,CAAC,EAAE,KAAK,WAAW,CAAC,EAAE,IAAI,IAAI,CAAC,QAAQ,KAAK,WAAW,CAAC,QAAQ,CAAC,CACvE,CAAC;IACJ,CAAC;IAED,WAAW,CAAC,GAAa,EAAE,QAAgB,CAAC;QAC1C,IAAI,KAAK,GAAG,wBAAS;YAAE,OAAO;QAC9B,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,OAAO;QACpC,IAAI,IAAI,CAAC,aAAa,EAAE;YACtB,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;YACnE,IAAI,WAAW;gBAAE,OAAO,WAAW,CAAC;SACrC;QACD,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC7C,IAAI,WAAW;YAAE,OAAO,WAAW,CAAC;QACpC,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI;YAAE,OAAO;QACrC,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC1D,OAAO,WAAW,EAAE,WAAW,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;IAClD,CAAC;IAED,WAAW,CAAC,GAAa,EAAE,IAAiB;QAC1C,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,OAAO;QACpC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAC/B,IAAI,IAAI,CAAC,EAAE,KAAK,wCAA2B,CAAC,OAAO;YACjD,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACzC,CAAC;IAED,WAAW,CAAC,GAAa;QACvB,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC;QAC1C,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAClC,CAAC;IAED,qBAAqB;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,gBAAgB,CAAC,QAAgB,CAAC;QAChC,IAAI,KAAK,GAAG,+BAAwB;YAAE,OAAO,EAAE,CAAC;QAChD,MAAM,UAAU,GAA8B,IAAI,GAAG,EAAE,CAAC;QACxD,MAAM,YAAY,GAAG,oBAAa,CAAC,GAAG,CACpC,IAAI,CAAC,EAAiC,CACvC,CAAC;QAEF,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YACzC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gBACxB,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE;oBAClB,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,IAAI,EAAE,YAAY;wBAChB,CAAC,CAAC,IAAA,qBAAc,EAAC,IAAI,CAAC,IAAI,CAAC;4BACzB,CAAC,CAAC,+BAAkB,CAAC,gBAAgB;4BACrC,CAAC,CAAC,+BAAkB,CAAC,gBAAgB;wBACvC,CAAC,CAAC,IAAA,qBAAc,EAAC,IAAI,CAAC,IAAI,CAAC;4BACzB,CAAC,CAAC,+BAAkB,CAAC,QAAQ;4BAC7B,CAAC,CAAC,+BAAkB,CAAC,QAAQ;iBAClC,CAAC,CAAC;aACJ;SACF;QAED,IAAI,IAAI,CAAC,aAAa,EAAE;YACtB,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,KAAK,GAAG,CAAC,CAAC,EAAE;gBACrE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;oBAClC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;iBACzC;aACF;SACF;QAED,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;YAC1D,KAAK,MAAM,QAAQ,IAAI,WAAW,CAAC,gBAAgB,CAAC,KAAK,GAAG,CAAC,CAAC,EAAE;gBAC9D,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;oBAClC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;iBACzC;aACF;SACF;QAED,OAAO,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;IACzC,CAAC;IAED,QAAQ,CACN,UAAmB,EACnB,WAA0B,EAC1B,QAAoB,EACpB,KAAc,EACd,MAAgB,EAChB,OAA8B,IAAI,OAAO,EAAE;QAE3C,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACpC,IAAI,YAAY;YAAE,OAAO,YAAY,CAAC;QAEtC,MAAM,WAAW,GAAG,IAAI,SAAS,CAC/B,IAAI,CAAC,EAAE,EACP,IAAI,EACJ,IAAI,CAAC,WAAW,EAChB,WAAW,IAAI,IAAI,CAAC,WAAW,EAC/B,QAAQ,IAAI,IAAI,CAAC,QAAQ,EACzB,KAAK,IAAI,IAAI,CAAC,KAAK,EACnB,IAAI,GAAG,EAAE,EACT,MAAM,CACP,CAAC;QAEF,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAE5B,mBAAmB;QACnB,WAAW,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa;YAC5C,CAAC,CAAE,IAAI,CAAC,aAAa,CAAC,QAAQ,CAC1B,UAAU,EACV,WAAW,EACX,QAAQ,EACR,KAAK,EACL,MAAM,EACN,IAAI,CACQ;YAChB,CAAC,CAAC,IAAI,CAAC;QAET,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YACzC,WAAW,CAAC,UAAU,CAAC,GAAG,CACxB,GAAG,EACH,IAAI,wBAAU,CACZ,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,IAAI,CAAC,QAAQ,CAChB,UAAU,EACV,WAAW,EACX,QAAQ,EACR,KAAK,EACL,IAAI,EACJ,IAAI,CACL,CACF,CACF,CAAC;SACH;QAED,IAAI,UAAU,EAAE;YACd,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SAC9C;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,IAAI,CACF,UAAmB,EACnB,MAAe,EACf,WAA0B,EAC1B,QAAoB,EACpB,KAAc,EACd,MAAgB;QAEhB,MAAM,WAAW,GAAG,IAAI,SAAS,CAC/B,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,WAAW,EAChB,WAAW,IAAI,IAAI,CAAC,WAAW,EAC/B,QAAQ,IAAI,IAAI,CAAC,QAAQ,EACzB,KAAK,IAAI,IAAI,CAAC,KAAK,EACnB,MAAM,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CACpD,CAAC;QAEF,IAAI,UAAU,EAAE;YACd,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SAC9C;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,MAAa;QACjB,IAAI,CAAC,IAAA,kBAAW,EAAC,MAAM,CAAC,EAAE;YACxB,OAAO;SACR;QAED,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,UAAU,EAAE;YAC5C,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC;gBAAE,SAAS;YACvC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,wBAAU,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;SAClE;QAED,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAC1C,CAAC;IAED,MAAM,CAAC,MAAe;QACpB,OAAO;YACL;gBACE,IAAI,EAAE,IAAI,CAAC,EAAE;aACd;SACF,CAAC;IACJ,CAAC;CACF;AAtTD,8BAsTC"}
|
|
@@ -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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"}
|