Skip to content

Commit 0ca8ae8

Browse files
alexander-akaitalexander-akait
committed
chore: update assemblyscript
1 parent f01902c commit 0ca8ae8

File tree

6 files changed

+49
-42
lines changed

6 files changed

+49
-42
lines changed

‎.eslintrc.js

+7
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,13 @@ module.exports = {
9090
ecmaVersion: 5
9191
}
9292
},
93+
{
94+
files: ["tooling/**/*.js"],
95+
env: { es6: true },
96+
parserOptions: {
97+
ecmaVersion: 2020
98+
}
99+
},
93100
{
94101
files: ["test/**/*.js"],
95102
env: {

‎lib/util/hash/md4.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/util/hash/xxhash64.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const create = require("./wasm-hash");
1111
const xxhash64 = new WebAssembly.Module(
1212
Buffer.from(
1313
// 1170 bytes
14-
"AGFzbQEAAAABCAJgAX8AYAAAAwQDAQAABQMBAAEGGgV+AUIAC34BQgALfgFCAAt+AUIAC34BQgALByIEBGluaXQAAAZ1cGRhdGUAAQVmaW5hbAACBm1lbW9yeQIACrIIAzAAQtbrgu7q/Yn14AAkAELP1tO+0ser2UIkAUIAJAJC+erQ0OfJoeThACQDQgAkBAvUAQIBfwR+IABFBEAPCyMEIACtfCQEIwAhAiMBIQMjAiEEIwMhBQNAIAIgASkDAELP1tO+0ser2UJ+fEIfiUKHla+vmLbem55/fiECIAMgASkDCELP1tO+0ser2UJ+fEIfiUKHla+vmLbem55/fiEDIAQgASkDEELP1tO+0ser2UJ+fEIfiUKHla+vmLbem55/fiEEIAUgASkDGELP1tO+0ser2UJ+fEIfiUKHla+vmLbem55/fiEFIAAgAUEgaiIBSw0ACyACJAAgAyQBIAQkAiAFJAMLqAYCAX8EfiMEQgBSBH4jACICQgGJIwEiA0IHiXwjAiIEQgyJfCMDIgVCEol8IAJCz9bTvtLHq9lCfkIfiUKHla+vmLbem55/foVCh5Wvr5i23puef35CnaO16oOxjYr6AH0gA0LP1tO+0ser2UJ+Qh+JQoeVr6+Ytt6bnn9+hUKHla+vmLbem55/fkKdo7Xqg7GNivoAfSAEQs/W077Sx6vZQn5CH4lCh5Wvr5i23puef36FQoeVr6+Ytt6bnn9+Qp2jteqDsY2K+gB9IAVCz9bTvtLHq9lCfkIfiUKHla+vmLbem55/foVCh5Wvr5i23puef35CnaO16oOxjYr6AH0FQsXP2bLx5brqJwsjBCAArXx8IQIDQCABQQhqIABNBEAgAiABKQMAQs/W077Sx6vZQn5CH4lCh5Wvr5i23puef36FQhuJQoeVr6+Ytt6bnn9+Qp2jteqDsY2K+gB9IQIgAUEIaiEBDAELCyABQQRqIABNBEAgAiABNQIAQoeVr6+Ytt6bnn9+hUIXiULP1tO+0ser2UJ+Qvnz3fGZ9pmrFnwhAiABQQRqIQELA0AgACABRwRAIAIgATEAAELFz9my8eW66id+hUILiUKHla+vmLbem55/fiECIAFBAWohAQwBCwtBACACIAJCIYiFQs/W077Sx6vZQn4iAkIdiCAChUL5893xmfaZqxZ+IgJCIIggAoUiAkIgiCIDQv//A4NCIIYgA0KAgPz/D4NCEIiEIgNC/4GAgPAfg0IQhiADQoD+g4CA4D+DQgiIhCIDQo+AvIDwgcAHg0IIhiADQvCBwIeAnoD4AINCBIiEIgNChoyYsODAgYMGfEIEiEKBgoSIkKDAgAGDQid+IANCsODAgYOGjJgwhHw3AwBBCCACQv////8PgyICQv//A4NCIIYgAkKAgPz/D4NCEIiEIgJC/4GAgPAfg0IQhiACQoD+g4CA4D+DQgiIhCICQo+AvIDwgcAHg0IIhiACQvCBwIeAnoD4AINCBIiEIgJChoyYsODAgYMGfEIEiEKBgoSIkKDAgAGDQid+IAJCsODAgYOGjJgwhHw3AwAL",
14+
"AGFzbQEAAAABCAJgAX8AYAAAAwQDAQAABQMBAAEGGgV+AUIAC34BQgALfgFCAAt+AUIAC34BQgALByIEBGluaXQAAAZ1cGRhdGUAAQVmaW5hbAACBm1lbW9yeQIACrIIAzAAQtbrgu7q/Yn14AAkAELP1tO+0ser2UIkAUIAJAJC+erQ0OfJoeThACQDQgAkBAvUAQIBfwR+IABFBEAPCyMEIACtfCQEIwAhAiMBIQMjAiEEIwMhBQNAIAIgASkDAELP1tO+0ser2UJ+fEIfiUKHla+vmLbem55/fiECIAMgASkDCELP1tO+0ser2UJ+fEIfiUKHla+vmLbem55/fiEDIAQgASkDEELP1tO+0ser2UJ+fEIfiUKHla+vmLbem55/fiEEIAUgASkDGELP1tO+0ser2UJ+fEIfiUKHla+vmLbem55/fiEFIAFBIGoiASAASQ0ACyACJAAgAyQBIAQkAiAFJAMLqAYCAX8EfiMEQgBSBH4jACICQgGJIwEiA0IHiXwjAiIEQgyJfCMDIgVCEol8IAJCz9bTvtLHq9lCfkIfiUKHla+vmLbem55/foVCh5Wvr5i23puef35CnaO16oOxjYr6AH0gA0LP1tO+0ser2UJ+Qh+JQoeVr6+Ytt6bnn9+hUKHla+vmLbem55/fkKdo7Xqg7GNivoAfSAEQs/W077Sx6vZQn5CH4lCh5Wvr5i23puef36FQoeVr6+Ytt6bnn9+Qp2jteqDsY2K+gB9IAVCz9bTvtLHq9lCfkIfiUKHla+vmLbem55/foVCh5Wvr5i23puef35CnaO16oOxjYr6AH0FQsXP2bLx5brqJwsjBCAArXx8IQIDQCABQQhqIABNBEAgAiABKQMAQs/W077Sx6vZQn5CH4lCh5Wvr5i23puef36FQhuJQoeVr6+Ytt6bnn9+Qp2jteqDsY2K+gB9IQIgAUEIaiEBDAELCyABQQRqIABNBEAgAiABNQIAQoeVr6+Ytt6bnn9+hUIXiULP1tO+0ser2UJ+Qvnz3fGZ9pmrFnwhAiABQQRqIQELA0AgACABRwRAIAIgATEAAELFz9my8eW66id+hUILiUKHla+vmLbem55/fiECIAFBAWohAQwBCwtBACACIAJCIYiFQs/W077Sx6vZQn4iAkIdiCAChUL5893xmfaZqxZ+IgJCIIggAoUiAkIgiCIDQv//A4NCIIYgA0KAgPz/D4NCEIiEIgNC/4GAgPAfg0IQhiADQoD+g4CA4D+DQgiIhCIDQo+AvIDwgcAHg0IIhiADQvCBwIeAnoD4AINCBIiEIgNChoyYsODAgYMGfEIEiEKBgoSIkKDAgAGDQid+IANCsODAgYOGjJgwhHw3AwBBCCACQv////8PgyICQv//A4NCIIYgAkKAgPz/D4NCEIiEIgJC/4GAgPAfg0IQhiACQoD+g4CA4D+DQgiIhCICQo+AvIDwgcAHg0IIhiACQvCBwIeAnoD4AINCBIiEIgJChoyYsODAgYMGfEIEiEKBgoSIkKDAgAGDQid+IAJCsODAgYOGjJgwhHw3AwAL",
1515
"base64"
1616
)
1717
);

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"@types/es-module-lexer": "^0.4.1",
4242
"@types/jest": "^27.4.0",
4343
"@types/node": "^18.15.11",
44-
"assemblyscript": "^0.19.16",
44+
"assemblyscript": "^0.25.2",
4545
"babel-loader": "^8.1.0",
4646
"benchmark": "^2.1.4",
4747
"bundle-loader": "^0.5.6",

‎tooling/generate-wasm-code.js

+28-27
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
const path = require("path");
22
const fs = require("fs");
3-
const asc = require("assemblyscript/cli/asc");
43

54
// When --write is set, files will be written in place
65
// Otherwise it only prints outdated files
@@ -9,7 +8,12 @@ const doWrite = process.argv.includes("--write");
98
const files = ["lib/util/hash/xxhash64.js", "lib/util/hash/md4.js"];
109

1110
(async () => {
12-
await asc.ready;
11+
// TODO: fix me after update typescript to v5
12+
// eslint-disable-next-line no-warning-comments
13+
// @ts-ignore
14+
// eslint-disable-next-line node/no-missing-import, node/no-unsupported-features/es-syntax
15+
const asc = (await import("assemblyscript/asc")).default;
16+
1317
for (const file of files) {
1418
const filePath = path.resolve(__dirname, "..", file);
1519
const content = fs.readFileSync(filePath, "utf-8");
@@ -29,31 +33,28 @@ const files = ["lib/util/hash/xxhash64.js", "lib/util/hash/md4.js"];
2933
path.basename(sourcePath)
3034
);
3135

32-
await new Promise((resolve, reject) => {
33-
asc.main(
34-
[
35-
sourcePath,
36-
// cspell:word Ospeed
37-
"-Ospeed",
38-
"--noAssert",
39-
"--converge",
40-
"--textFile",
41-
sourcePathBase + ".wat",
42-
"--binaryFile",
43-
sourcePathBase + ".wasm",
44-
...flags.split(" ").filter(Boolean)
45-
],
46-
{
47-
stdout: process.stdout,
48-
stderr: process.stderr
49-
},
50-
err => {
51-
if (err) return reject(err), 0;
52-
resolve();
53-
return 0;
54-
}
55-
);
56-
});
36+
const { error } = await asc.main(
37+
[
38+
sourcePath,
39+
// cspell:word Ospeed
40+
"-Ospeed",
41+
"--noAssert",
42+
"--converge",
43+
"--textFile",
44+
sourcePathBase + ".wat",
45+
"--outFile",
46+
sourcePathBase + ".wasm",
47+
...flags.split(" ").filter(Boolean)
48+
],
49+
{
50+
stdout: process.stdout,
51+
stderr: process.stderr
52+
}
53+
);
54+
55+
if (error) {
56+
throw error;
57+
}
5758

5859
const wasm = fs.readFileSync(sourcePathBase + ".wasm");
5960

‎yarn.lock

+10-11
Original file line numberDiff line numberDiff line change
@@ -1579,14 +1579,13 @@ asn1@~0.2.3:
15791579
dependencies:
15801580
safer-buffer "~2.1.0"
15811581

1582-
assemblyscript@^0.19.16:
1583-
version "0.19.23"
1584-
resolved "https://registry.yarnpkg.com/assemblyscript/-/assemblyscript-0.19.23.tgz#16ece69f7f302161e2e736a0f6a474e6db72134c"
1585-
integrity sha512-fwOQNZVTMga5KRsfY80g7cpOl4PsFQczMwHzdtgoqLXaYhkhavufKb0sB0l3T1DUxpAufA0KNhlbpuuhZUwxMA==
1582+
assemblyscript@^0.25.2:
1583+
version "0.25.2"
1584+
resolved "https://registry.yarnpkg.com/assemblyscript/-/assemblyscript-0.25.2.tgz#49de9cac3d2657d6419f4214e33c3de6253daa83"
1585+
integrity sha512-67TQOMvKo23htvSK6lhOzsoQjnplNKkdwgq925uBvQZLDbg9pHfAWhg/R8i8tqKrtk6GH8haOJbQY4oNSQqehA==
15861586
dependencies:
1587-
binaryen "102.0.0-nightly.20211028"
1587+
binaryen "110.0.0-nightly.20221105"
15881588
long "^5.2.0"
1589-
source-map-support "^0.5.20"
15901589

15911590
assert-never@^1.2.1:
15921591
version "1.2.1"
@@ -1731,10 +1730,10 @@ binary-extensions@^2.0.0:
17311730
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
17321731
integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
17331732

1734-
binaryen@102.0.0-nightly.20211028:
1735-
version "102.0.0-nightly.20211028"
1736-
resolved "https://registry.yarnpkg.com/binaryen/-/binaryen-102.0.0-nightly.20211028.tgz#8f1efb0920afd34509e342e37f84313ec936afb2"
1737-
integrity sha512-GCJBVB5exbxzzvyt8MGDv/MeUjs6gkXDvf4xOIItRBptYl0Tz5sm1o/uG95YK0L0VeG5ajDu3hRtkBP2kzqC5w==
1733+
binaryen@110.0.0-nightly.20221105:
1734+
version "110.0.0-nightly.20221105"
1735+
resolved "https://registry.yarnpkg.com/binaryen/-/binaryen-110.0.0-nightly.20221105.tgz#9e3c47e8ffa31521acd125013dca3ceea143d0bf"
1736+
integrity sha512-OBESOc51q3SwgG8Uv8nMzGnSq7LJpSB/Fu8B3AjlZg6YtCEwRnlDWlnwNB6mdql+VdexfKmNcsrs4K7MYidmdQ==
17381737

17391738
brace-expansion@^1.1.7:
17401739
version "1.1.11"
@@ -5708,7 +5707,7 @@ source-map-js@^1.0.2:
57085707
resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
57095708
integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
57105709

5711-
source-map-support@^0.5.20, source-map-support@^0.5.6, source-map-support@~0.5.20:
5710+
source-map-support@^0.5.6, source-map-support@~0.5.20:
57125711
version "0.5.21"
57135712
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
57145713
integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==

0 commit comments

Comments
 (0)