Skip to content

Commit 14c161c

Browse files
author
Willem Wyndham
committed
Update asc and make globals constant
1 parent 29efdda commit 14c161c

File tree

4 files changed

+71
-63
lines changed

4 files changed

+71
-63
lines changed

‎assembly/__tests__/roundtrip.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,13 +175,13 @@ describe("JSON.parse", () => {
175175
const outerObj = JSON.Value.Object();
176176
outerObj.set("innerObject", primObj);
177177
expect(
178-
parseToString(`{
178+
JSON.parse(`{
179179
"innerObject": {
180180
"number": 42,
181181
"boolean": true,
182182
"string": "Hello"
183183
}
184-
}`)).toStrictEqual(outerObj.toString());
184+
}`)).toStrictEqual(outerObj);
185185
});
186186

187187
it("should handle arrays", () => {

‎assembly/decoder.ts

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ export class ThrowingJSONHandler extends JSONHandler {
6363
const TRUE_STR = "true";
6464
const FALSE_STR = "false";
6565
const NULL_STR = "null";
66-
let CHAR_0 = "0".charCodeAt(0);
67-
let CHAR_9 = "9".charCodeAt(0);
68-
let CHAR_A = "A".charCodeAt(0);
69-
let CHAR_A_LOWER = "a".charCodeAt(0);
66+
const CHAR_0: i32 = 48; //"0".charCodeAt(0);
67+
const CHAR_9: i32 = 57; //"9".charCodeAt(0);
68+
const CHAR_A: i32 = 65; //"A".charCodeAt(0);
69+
const CHAR_A_LOWER: i32 = 97; //"a".charCodeAt(0);
7070

7171
export class DecoderState {
7272
lastKey: string = "";
@@ -84,13 +84,21 @@ export class DecoderState {
8484

8585
export class JSONDecoder<JSONHandlerT extends JSONHandler> {
8686
handler: JSONHandlerT;
87-
state: DecoderState;
87+
_state: DecoderState | null = null;
8888

8989
constructor(handler: JSONHandlerT) {
9090
this.handler = handler;
91-
}
91+
}
92+
93+
get state(): DecoderState {
94+
return <DecoderState>this._state;
95+
}
96+
97+
set state(state: DecoderState) {
98+
this._state = state;
99+
}
92100

93-
deserialize(buffer: Uint8Array, decoderState: DecoderState | null = null): void {
101+
deserialize(buffer: Uint8Array, decoderState: DecoderState | null = null): void {
94102
if (decoderState != null) {
95103
this.state = decoderState;
96104
} else {

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"test": "asp"
1010
},
1111
"devDependencies": {
12-
"@as-pect/cli": "^3.2.4",
13-
"assemblyscript": "^0.10.0"
12+
"@as-pect/cli": "^4.0.0",
13+
"assemblyscript": "^0.13.3"
1414
}
1515
}

‎yarn.lock

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -2,52 +2,52 @@
22
# yarn lockfile v1
33

44

5-
"@as-pect/assembly@^3.2.1":
6-
version "3.2.1"
7-
resolved "https://registry.yarnpkg.com/@as-pect/assembly/-/assembly-3.2.1.tgz#a4f906f9e8a9063517fa833d47a47a08812359ac"
8-
integrity sha512-qok+WPvKV1BLQ+nnpn+hc0PLSZ69Pim4eT72PruA1C+hvMu6HCbNKDFcj4lrL7XNMKuibPf0633SW14asC0//w==
9-
10-
"@as-pect/cli@^3.2.4":
11-
version "3.2.4"
12-
resolved "https://registry.yarnpkg.com/@as-pect/cli/-/cli-3.2.4.tgz#ad7a2d1da9d78563d217f8019c6da83e72110f4a"
13-
integrity sha512-WUvEMMDBYC2NPJ2IYwX/dvWtV4CLj+14nc58j4PmJRj8NfNGMllYcl8ZFHSU0rqn9aVGmg+Njs2PokfkkmWjmQ==
14-
dependencies:
15-
"@as-pect/assembly" "^3.2.1"
16-
"@as-pect/core" "^3.2.2"
17-
chalk "^4.0.0"
5+
"@as-pect/assembly@^4.0.0":
6+
version "4.0.0"
7+
resolved "https://registry.yarnpkg.com/@as-pect/assembly/-/assembly-4.0.0.tgz#88caa5d3b3fc72778d69e2dbc930f96cc810899d"
8+
integrity sha512-xkyyWlpOnD7n01bJQivKAePAvg7D4eygp72BgzRfvZxTTTtGDfLU1jwB5gZr8XX5bFkpF/+W5lk/Uqt5LLchWA==
9+
10+
"@as-pect/cli@^4.0.0":
11+
version "4.0.0"
12+
resolved "https://registry.yarnpkg.com/@as-pect/cli/-/cli-4.0.0.tgz#a8c6836ece7f73759d5cd4a6f19e95c2570482b7"
13+
integrity sha512-OT0iFPmSzmygrLm4lpDgUgbG3KVdE2XoatbNKav0VM7yIIXozc3vwUeDgEwB9NBxnZC/pnp0pZmpM4rXi5IUpw==
14+
dependencies:
15+
"@as-pect/assembly" "^4.0.0"
16+
"@as-pect/core" "^4.0.0"
17+
chalk "^4.1.0"
1818
glob "^7.1.6"
1919
optionalDependencies:
20-
"@as-pect/csv-reporter" "^3.2.2"
21-
"@as-pect/json-reporter" "^3.2.2"
20+
"@as-pect/csv-reporter" "^4.0.0"
21+
"@as-pect/json-reporter" "^4.0.0"
2222

23-
"@as-pect/core@^3.2.2":
24-
version "3.2.2"
25-
resolved "https://registry.yarnpkg.com/@as-pect/core/-/core-3.2.2.tgz#5e064b84a39ba3f6d53ff12d07ef2f6f9aedf94e"
26-
integrity sha512-Gr6ha3WGS/omSLvquDC6WPqZt1vP/hxvWovxgUuqNJ1APymMTjbvP2W86pjKLqvSaZj1gETAr5703PxhnnoL4g==
23+
"@as-pect/core@^4.0.0":
24+
version "4.0.0"
25+
resolved "https://registry.yarnpkg.com/@as-pect/core/-/core-4.0.0.tgz#9ed72266f4d655801543876b428e5d4606d2d735"
26+
integrity sha512-NQhf52uumBuQkqSvfmlMDHPhP/jR+2kkXt5BWQ0LnifWyBIsP4GUIe43VjW5brou2WVk+bDxlyo7lEtqideOKA==
2727
dependencies:
28-
"@as-pect/assembly" "^3.2.1"
29-
"@as-pect/snapshots" "^3.2.2"
30-
chalk "^4.0.0"
28+
"@as-pect/assembly" "^4.0.0"
29+
"@as-pect/snapshots" "^4.0.0"
30+
chalk "^4.1.0"
3131
long "^4.0.0"
3232

33-
"@as-pect/csv-reporter@^3.2.2":
34-
version "3.2.2"
35-
resolved "https://registry.yarnpkg.com/@as-pect/csv-reporter/-/csv-reporter-3.2.2.tgz#7dcf5d1d601343ed96902a049e57439b6d262416"
36-
integrity sha512-LAQcYnJ6PvgEh0ieOHaw5gloFlQIvQpi/gdmBBwdme5wFhiMu7eyJIfBkwjafcqc8B4ZEIWGCuj0s+zuXyDGFQ==
33+
"@as-pect/csv-reporter@^4.0.0":
34+
version "4.0.0"
35+
resolved "https://registry.yarnpkg.com/@as-pect/csv-reporter/-/csv-reporter-4.0.0.tgz#7bdad15f58e17765d19600e03a9bc582e5a11dfa"
36+
integrity sha512-5M4btRHhUZtcdIf4jeaRzwG0+OgTGvIWoUsNyedeuV5HDIjRM8kb9k+IKjfZqD3dU8TD/C2Ca7Gr4zkbAlswkw==
3737
dependencies:
38-
"@as-pect/core" "^3.2.2"
38+
"@as-pect/core" "^4.0.0"
3939

40-
"@as-pect/json-reporter@^3.2.2":
41-
version "3.2.2"
42-
resolved "https://registry.yarnpkg.com/@as-pect/json-reporter/-/json-reporter-3.2.2.tgz#d3cfb831ac9ed0fda13415c21013f46d26e04a67"
43-
integrity sha512-YXm8NO9SyAo5PTSxpu1BJPXQfE+wFATzgSDtejqcsnEtEXb4FprzPpVjU6Et7NIOQBPgAM/4k33ose64noFYzw==
40+
"@as-pect/json-reporter@^4.0.0":
41+
version "4.0.0"
42+
resolved "https://registry.yarnpkg.com/@as-pect/json-reporter/-/json-reporter-4.0.0.tgz#6415d369e8594a66cc88e7e8d2f4e96063597af1"
43+
integrity sha512-1ekBZlAXOqeN6f5abwBtMiRaH6/6UciepArC7O0wkuI+3nAoj6XUSkRonl8kb/j7zmYbjlsD5UqTNILL+kl+Tg==
4444
dependencies:
45-
"@as-pect/core" "^3.2.2"
45+
"@as-pect/core" "^4.0.0"
4646

47-
"@as-pect/snapshots@^3.2.2":
48-
version "3.2.2"
49-
resolved "https://registry.yarnpkg.com/@as-pect/snapshots/-/snapshots-3.2.2.tgz#72a8dff598ac878ec5962fbb6a717460aab700a7"
50-
integrity sha512-uJQwwbgX0gGRVD4Au8r3g9TbPCseBuChSDVjfaNAZifaQ0JKrrzB4tga2PVDrWrZHIgYvajTph5tsN3x9pJ5nA==
47+
"@as-pect/snapshots@^4.0.0":
48+
version "4.0.0"
49+
resolved "https://registry.yarnpkg.com/@as-pect/snapshots/-/snapshots-4.0.0.tgz#e7eb0dd0717d418032ea34c8fedb2bb4d411d28d"
50+
integrity sha512-RBSGTVyBdbpabj/FTp8k3XUTnCSeutmLVgfjVbzzLLZVeNV2i7sVp5acau//qq884ZnXv/gd/g9fleHPYtBxkQ==
5151
dependencies:
5252
diff "^4.0.2"
5353
nearley "^2.19.3"
@@ -65,23 +65,23 @@ ansi-styles@^4.1.0:
6565
"@types/color-name" "^1.1.1"
6666
color-convert "^2.0.1"
6767

68-
assemblyscript@^0.10.0:
69-
version "0.10.0"
70-
resolved "https://registry.yarnpkg.com/assemblyscript/-/assemblyscript-0.10.0.tgz#0d2a0591be77fdd294d720172e307e526a559ba8"
71-
integrity sha512-ErUNhHboD+zsB4oG6X1YICDAIo27Gq7LeNX6jVe+Q0W5cI51/fHwC8yJ68IukqvupmZgYPdp1JqqRXlS+BrUfA==
68+
assemblyscript@^0.13.3:
69+
version "0.13.3"
70+
resolved "https://registry.yarnpkg.com/assemblyscript/-/assemblyscript-0.13.3.tgz#49572ee51d0bae3a890924527664e17fc7c6dfec"
71+
integrity sha512-4Lj7Ci0rW/Ww/++PB3kkcm6EJ+xOnIzbZ+hmg/Q7cAaTaCNNphzjILQkn5Qn6ysKC8vGlcf1Nvwa6XnGCf+d4Q==
7272
dependencies:
73-
binaryen "93.0.0-nightly.20200514"
73+
binaryen "93.0.0-nightly.20200609"
7474
long "^4.0.0"
7575

7676
balanced-match@^1.0.0:
7777
version "1.0.0"
7878
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
7979
integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
8080

81-
[email protected].20200514:
82-
version "93.0.0-nightly.20200514"
83-
resolved "https://registry.yarnpkg.com/binaryen/-/binaryen-93.0.0-nightly.20200514.tgz#af498b5d9f8169254fb0cd385061d94ba9b27b1d"
84-
integrity sha512-SRRItmNvhRVfoWWbRloO4i8IqkKH8rZ7/0QWRgLpM3umupK8gBpo9MY7Zp3pDysRSp+rVoqxvM5x4tFyCSa9zw==
81+
[email protected].20200609:
82+
version "93.0.0-nightly.20200609"
83+
resolved "https://registry.yarnpkg.com/binaryen/-/binaryen-93.0.0-nightly.20200609.tgz#e7c9211911c0cff94b8682e895e4de630f110cd5"
84+
integrity sha512-CIaeav05u+fWRN2h1ecwIoSaOF/Mk6U85M/G6eg1nOHAXYYmOuh9TztF9Fu8krRWnl98J3W+VfDClApMV5zCtw==
8585

8686
brace-expansion@^1.1.7:
8787
version "1.1.11"
@@ -91,10 +91,10 @@ brace-expansion@^1.1.7:
9191
balanced-match "^1.0.0"
9292
concat-map "0.0.1"
9393

94-
chalk@^4.0.0:
95-
version "4.0.0"
96-
resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.0.0.tgz#6e98081ed2d17faab615eb52ac66ec1fe6209e72"
97-
integrity sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==
94+
chalk@^4.1.0:
95+
version "4.1.0"
96+
resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
97+
integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
9898
dependencies:
9999
ansi-styles "^4.1.0"
100100
supports-color "^7.1.0"
@@ -184,9 +184,9 @@ moo@^0.5.0:
184184
integrity sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w==
185185

186186
nearley@^2.19.3:
187-
version "2.19.3"
188-
resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.19.3.tgz#ae3b040e27616b5348102c436d1719209476a5a1"
189-
integrity sha512-FpAy1PmTsUpOtgxr23g4jRNvJHYzZEW2PixXeSzksLR/ykPfwKhAodc2+9wQhY+JneWLcvkDw6q7FJIsIdF/aQ==
187+
version "2.19.4"
188+
resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.19.4.tgz#7518cbdd7d0e8e08b5f82841b9edb0126239c8b1"
189+
integrity sha512-oqj3m4oqwKsN77pETa9IPvxHHHLW68KrDc2KYoWMUOhDlrNUo7finubwffQMBRnwNCOXc4kRxCZO0Rvx4L6Zrw==
190190
dependencies:
191191
commander "^2.19.0"
192192
moo "^0.5.0"

0 commit comments

Comments
 (0)