json-as 1.1.14 → 1.1.15-preview.2
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/CHANGELOG.md +9 -0
- package/README.md +19 -1
- package/assembly/__tests__/array.spec.ts +130 -159
- package/assembly/__tests__/generics.spec.ts +32 -23
- package/assembly/__tests__/lib/index.ts +7 -3
- package/assembly/__tests__/resolving.spec.ts +13 -5
- package/assembly/__tests__/staticarray.spec.ts +12 -0
- package/assembly/__tests__/types.spec.ts +3 -2
- package/assembly/deserialize/simple/array/raw.ts +106 -0
- package/assembly/deserialize/simple/array.ts +5 -1
- package/assembly/index.ts +12 -10
- package/assembly/test.tmp.ts +378 -0
- package/assembly/test.ts +71 -28
- package/assembly/types.ts +26 -18
- package/package.json +23 -23
- package/publish.sh +78 -0
- package/transform/lib/builder.js.map +1 -1
- package/transform/lib/index.js +40 -59
- package/transform/lib/index.js.map +1 -1
- package/transform/lib/linkers/custom.js.map +1 -1
- package/transform/lib/types.js +31 -1
- package/transform/lib/types.js.map +1 -1
- package/transform/src/builder.ts +1 -1
- package/transform/src/index.ts +270 -302
- package/transform/src/linkers/alias.ts +1 -2
- package/transform/src/linkers/classes.ts +1 -1
- package/transform/src/linkers/custom.ts +26 -26
- package/transform/src/types.ts +34 -2
- package/assembly/test.json.ts +0 -388
package/transform/lib/types.js
CHANGED
|
@@ -15,6 +15,27 @@ export class Property {
|
|
|
15
15
|
node;
|
|
16
16
|
byteSize = 0;
|
|
17
17
|
generic = false;
|
|
18
|
+
_custom = false;
|
|
19
|
+
parent;
|
|
20
|
+
set custom(value) {
|
|
21
|
+
this._custom = value;
|
|
22
|
+
}
|
|
23
|
+
get custom() {
|
|
24
|
+
if (this._custom)
|
|
25
|
+
return true;
|
|
26
|
+
if (this.parent.node.isGeneric && this.parent.node.typeParameters.some((p) => p.name.text == this.type)) {
|
|
27
|
+
this.generic = true;
|
|
28
|
+
this._custom = true;
|
|
29
|
+
return true;
|
|
30
|
+
}
|
|
31
|
+
for (const dep of this.parent.deps) {
|
|
32
|
+
if (this.name == dep.name) {
|
|
33
|
+
this._custom = true;
|
|
34
|
+
return true;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
return false;
|
|
38
|
+
}
|
|
18
39
|
}
|
|
19
40
|
export class Schema {
|
|
20
41
|
static = true;
|
|
@@ -25,7 +46,16 @@ export class Schema {
|
|
|
25
46
|
needsLink = null;
|
|
26
47
|
byteSize = 0;
|
|
27
48
|
deps = [];
|
|
28
|
-
|
|
49
|
+
_custom = false;
|
|
50
|
+
set custom(value) {
|
|
51
|
+
this._custom = value;
|
|
52
|
+
}
|
|
53
|
+
get custom() {
|
|
54
|
+
if (this._custom)
|
|
55
|
+
return true;
|
|
56
|
+
if (this.parent)
|
|
57
|
+
return this.parent.custom;
|
|
58
|
+
}
|
|
29
59
|
}
|
|
30
60
|
export class Src {
|
|
31
61
|
internalPath;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAG/C,MAAM,CAAN,IAAY,aAKX;AALD,WAAY,aAAa;IACvB,yDAAQ,CAAA;IACR,qDAAM,CAAA;IACN,+CAAG,CAAA;IACH,qDAAM,CAAA;AACR,CAAC,EALW,aAAa,KAAb,aAAa,QAKxB;AAED,MAAM,OAAO,QAAQ;IACZ,IAAI,GAAW,EAAE,CAAC;IAClB,KAAK,GAAkB,IAAI,CAAC;IAC5B,IAAI,GAAW,EAAE,CAAC;IAClB,KAAK,GAAkB,IAAI,CAAC;IAC5B,KAAK,GAA0C,IAAI,GAAG,EAAoC,CAAC;IAC3F,IAAI,CAAoB;IACxB,QAAQ,GAAW,CAAC,CAAC;IACrB,OAAO,GAAY,KAAK,CAAC;IACzB,OAAO,GAAY,KAAK,CAAC;IACzB,MAAM,CAAS;IACtB,IAAI,MAAM,CAAC,KAAc;QACvB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;IACvB,CAAC;IACD,IAAI,MAAM;QACR,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAC;QAC9B,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAExG,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACpB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACpB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACnC,IAAI,IAAI,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;gBAE1B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;gBACpB,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AAED,MAAM,OAAO,MAAM;IACV,MAAM,GAAY,IAAI,CAAC;IACvB,IAAI,GAAW,EAAE,CAAC;IAClB,OAAO,GAAe,EAAE,CAAC;IACzB,MAAM,GAAkB,IAAI,CAAC;IAC7B,IAAI,CAAoB;IACxB,SAAS,GAAkB,IAAI,CAAC;IAChC,QAAQ,GAAW,CAAC,CAAC;IACrB,IAAI,GAAa,EAAE,CAAC;IACnB,OAAO,GAAY,KAAK,CAAC;IAEjC,IAAI,MAAM,CAAC,KAAc;QACvB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;IACvB,CAAC;IACD,IAAI,MAAM;QACR,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAC;QAC9B,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;IAC7C,CAAC;CACF;AAED,MAAM,OAAO,GAAG;IACP,YAAY,CAAS;IACrB,OAAO,CAAW;IAClB,OAAO,CAAc;IACrB,OAAO,CAAW;IAClB,OAAO,CAAW;IACzB,YAAY,MAAc;QACxB,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;QACxC,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;CACF"}
|
package/transform/src/builder.ts
CHANGED
|
@@ -50,7 +50,7 @@ export class ASTBuilder extends Visitor {
|
|
|
50
50
|
}
|
|
51
51
|
|
|
52
52
|
visitThisExpression(node: ThisExpression, ref?: Node | null): void {
|
|
53
|
-
|
|
53
|
+
this.sb.push("this");
|
|
54
54
|
}
|
|
55
55
|
visitTypeName(node: TypeName): void {
|
|
56
56
|
this.visitIdentifierExpression(node.identifier);
|