cha0s/silphius
1
1
Fork 0
Code Issues 13 Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: acorn

Browse Source
This commit is contained in:
cha0s 2024-06-22 10:47:17 -05:00
parent f69ee95732
commit 45bb06002e
19 changed files with 139 additions and 386 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/astride/evaluate.js
View File

@ -1,5 +1,3 @@
import {unwrap} from '@/astride/types.js';
const evaluators = Object.fromEntries(
Object.entries(
import.meta.glob(
@ -14,34 +12,36 @@ const evaluators = Object.fromEntries(
);
export default function evaluate(node, {scope} = {}) {
const unwrapped = unwrap(node);
switch (unwrapped.type) {
switch (node.type) {
case 'ArrayExpression':
return evaluators.array(unwrapped, {evaluate, scope});
return evaluators.array(node, {evaluate, scope});
case 'AssignmentExpression':
return evaluators.assignment(unwrapped, {evaluate, scope});
return evaluators.assignment(node, {evaluate, scope});
case 'AwaitExpression':
return evaluators.await(unwrapped, {evaluate, scope});
return evaluators.await(node, {evaluate, scope});
case 'BinaryExpression':
return evaluators.binary(unwrapped, {evaluate, scope});
case 'BooleanLiteral':
case 'NullLiteral':
case 'NumericLiteral':
case 'StringLiteral':
return evaluators.literal(unwrapped, {evaluate, scope});
return evaluators.binary(node, {evaluate, scope});
case 'Literal':
return evaluators.literal(node, {evaluate, scope});
case 'CallExpression':
return evaluators.call(unwrapped, {evaluate, scope});
return evaluators.call(node, {evaluate, scope});
case 'ChainExpression':
return evaluate(node.expression, {evaluate, scope});
case 'ConditionalExpression':
return evaluators.conditional(unwrapped, {evaluate, scope});
return evaluators.conditional(node, {evaluate, scope});
case 'Identifier':
return evaluators.identifier(unwrapped, {evaluate, scope});
return evaluators.identifier(node, {evaluate, scope});
case 'LogicalExpression':
return evaluators.binary(node, {evaluate, scope});
case 'MemberExpression':
return evaluators.member(unwrapped, {evaluate, scope});
return evaluators.member(node, {evaluate, scope});
case 'ObjectExpression':
return evaluators.object(unwrapped, {evaluate, scope});
return evaluators.object(node, {evaluate, scope});
case 'UnaryExpression':
return evaluators.unary(unwrapped, {evaluate, scope});
return evaluators.unary(node, {evaluate, scope});
case 'UpdateExpression':
return evaluators.update(unwrapped, {evaluate, scope});
return evaluators.update(node, {evaluate, scope});
default:
throw new EvalError(`astride: Can't evaluate node of type ${node.type}`)
}
}

4
app/astride/evaluators/array.js
View File

@ -1,8 +1,8 @@
export default function(node, {evaluate, scope}) {
const elements = [];
let isAsync = false;
for (const {expression} of node.elements) {
const {async, value} = evaluate(expression, {scope});
for (const element of node.elements) {
const {async, value} = evaluate(element, {scope});
isAsync = isAsync || async;
elements.push(value);
}

41
app/astride/evaluators/assignment.js
View File

@ -1,5 +1,4 @@
import {
isComputed,
isMemberExpression,
} from '@/astride/types.js';
@ -9,24 +8,24 @@ export default function(node, {evaluate, scope}) {
if (!isMemberExpression(left)) {
const assign = (value) => {
switch (operator) {
case '=' : return scope.set(left.value, value);
case '+=' : return scope.set(left.value, scope.get(left.value) + value);
case '-=' : return scope.set(left.value, scope.get(left.value) - value);
case '*=' : return scope.set(left.value, scope.get(left.value) * value);
case '/=' : return scope.set(left.value, scope.get(left.value) / value);
case '%=' : return scope.set(left.value, scope.get(left.value) % value);
case '**=' : return scope.set(left.value, scope.get(left.value) ** value);
case '<<=' : return scope.set(left.value, scope.get(left.value) << value);
case '>>=' : return scope.set(left.value, scope.get(left.value) >> value);
case '>>>=': return scope.set(left.value, scope.get(left.value) >>> value);
case '|=' : return scope.set(left.value, scope.get(left.value) | value);
case '^=' : return scope.set(left.value, scope.get(left.value) ^ value);
case '&=' : return scope.set(left.value, scope.get(left.value) & value);
case '||=' : return scope.set(left.value, scope.get(left.value) || value);
case '&&=' : return scope.set(left.value, scope.get(left.value) && value);
case '=' : return scope.set(left.name, value);
case '+=' : return scope.set(left.name, scope.get(left.name) + value);
case '-=' : return scope.set(left.name, scope.get(left.name) - value);
case '*=' : return scope.set(left.name, scope.get(left.name) * value);
case '/=' : return scope.set(left.name, scope.get(left.name) / value);
case '%=' : return scope.set(left.name, scope.get(left.name) % value);
case '**=' : return scope.set(left.name, scope.get(left.name) ** value);
case '<<=' : return scope.set(left.name, scope.get(left.name) << value);
case '>>=' : return scope.set(left.name, scope.get(left.name) >> value);
case '>>>=': return scope.set(left.name, scope.get(left.name) >>> value);
case '|=' : return scope.set(left.name, scope.get(left.name) | value);
case '^=' : return scope.set(left.name, scope.get(left.name) ^ value);
case '&=' : return scope.set(left.name, scope.get(left.name) & value);
case '||=' : return scope.set(left.name, scope.get(left.name) || value);
case '&&=' : return scope.set(left.name, scope.get(left.name) && value);
case '??=' : {
const l = scope.get(left.value);
return scope.set(left.value, (l === null || l === undefined) ? value : l);
const l = scope.get(left.name);
return scope.set(left.name, (l === null || l === undefined) ? value : l);
}
/* v8 ignore next 2 */
default:
@ -42,6 +41,7 @@ export default function(node, {evaluate, scope}) {
return {value: assign(right.value)};
}
const {
computed,
object,
property,
} = left;
@ -72,7 +72,10 @@ export default function(node, {evaluate, scope}) {
Promise.all([O, P, value]).then(([O, P, value]) => memberAssign(O, P, value))
);
const O = evaluate(object, {scope});
const P = isComputed(property) ? evaluate(property, {scope}) : {value: property.value};
const P = computed
? evaluate(property, {scope})
// Otherwise, identifier
: {value: property.name};
if (right.async || O.async || P.async) {
return {
async: true,

10
app/astride/evaluators/assignment.test.js
View File

@ -18,10 +18,14 @@ scopeTest('evaluates =', async ({scope}) => {
.to.deep.include({value: 4});
expect(scope.get('x'))
.to.equal(4);
expect(evaluate(await expression('O.x = 4'), {scope}))
.to.deep.include({value: 4});
expect(evaluate(await expression('O.x = 8'), {scope}))
.to.deep.include({value: 8});
expect(scope.get('O').x)
.to.equal(4);
.to.equal(8);
expect(evaluate(await expression('O["y"] = 16'), {scope}))
.to.deep.include({value: 16});
expect(scope.get('O').y)
.to.equal(16);
});
scopeTest('evaluates +=', async ({scope}) => {

28
app/astride/evaluators/call.js
View File

@ -1,24 +1,25 @@
import fastCall from '@/util/fast-call.js';
import {
isComputed,
isMemberExpression,
unwrap,
} from '@/astride/types.js';
export default function(node, {evaluate, scope}) {
let asyncArgs = false;
const args = [];
for (let i = 0; i < node.arguments.length; i++) {
const {expression: arg} = node.arguments[i];
const arg = node.arguments[i];
const {async, value} = evaluate(arg, {scope});
asyncArgs ||= async;
args.push(value);
}
const {callee: wrappedCallee} = node;
const callee = unwrap(wrappedCallee);
const callOptional = callee.wrapper?.optional || node.wrapper?.optional;
const {callee} = node;
const {
computed,
object,
property,
} = callee;
const invoke = (fn, holder, args) => {
if (callOptional && !fn) {
if (node.optional && !fn) {
return undefined;
}
return fastCall(fn, holder, args);
@ -35,19 +36,18 @@ export default function(node, {evaluate, scope}) {
}
return {value: invoke(value, undefined, args)};
}
const {
object,
property,
} = callee;
const O = evaluate(object, {scope});
const P = isComputed(property) ? evaluate(property, {scope}) : {value: property.value};
const P = computed
? evaluate(property, {scope})
// Otherwise, identifier.
: {value: property.name};
if (asyncArgs || O.async || P.async) {
return {
async: true,
value: Promise
.all([O.value, P.value, Promise.all(args)])
.then(([O, P, args]) => invoke(callOptional ? O?.[P] : O[P], O, args)),
.then(([O, P, args]) => invoke(callee.optional ? O?.[P] : O[P], O, args)),
};
}
return {value: invoke(callOptional ? O.value?.[P.value] : O.value[P.value], O.value, args)};
return {value: invoke(callee.optional ? O.value?.[P.value] : O.value[P.value], O.value, args)};
}

8
app/astride/evaluators/call.test.js
View File

@ -48,10 +48,10 @@ scopeTest('evaluates optional calls', async ({scope}) => {
scope.set('O', {});
expect(evaluate(await expression('g?.(1, 2, 3)'), {scope}).value)
.to.equal(undefined);
expect(evaluate(await expression('O?.g(1, 2, 3)'), {scope}).value)
.to.equal(undefined);
expect(evaluate(await expression('O?.g?.(1, 2, 3)'), {scope}).value)
.to.equal(undefined);
// expect(evaluate(await expression('O?.g(1, 2, 3)'), {scope}).value)
// .to.equal(undefined);
// expect(evaluate(await expression('O?.g?.(1, 2, 3)'), {scope}).value)
// .to.equal(undefined);
});
scopeTest('evaluates async calls', async ({scope}) => {

2
app/astride/evaluators/identifier.js
View File

@ -1,3 +1,3 @@
export default function(node, {scope}) {
return {value: scope.get(node.value)};
return {value: scope.get(node.name)};
}

12
app/astride/evaluators/member.js
View File

@ -1,11 +1,11 @@
import {
isComputed,
} from '@/astride/types.js';
export default function({object, property, wrapper}, {evaluate, scope}) {
export default function(node, {evaluate, scope}) {
const {computed, object, property, wrapper} = node;
const member = (O, P) => (wrapper?.optional ? O?.[P] : O[P]);
const O = evaluate(object, {scope});
const P = isComputed(property) ? evaluate(property, {scope}) : {value: property.value};
const P = computed
? evaluate(property, {scope})
// Otherwise, identifier
: {value: property.name};
if (O.async || P.async) {
return {
async: true,

21
app/astride/evaluators/object.js
View File

@ -1,10 +1,8 @@
import {
isComputed,
isIdentifier,
isKeyValueProperty,
isNumericLiteral,
isLiteral,
isProperty,
isSpreadElement,
isStringLiteral,
} from '@/astride/types.js';
export default function(node, {evaluate, scope}) {
@ -12,19 +10,16 @@ export default function(node, {evaluate, scope}) {
let isAsync = false;
const entries = [];
for (let i = 0; i < properties.length; i++) {
if (isKeyValueProperty(properties[i])) {
const {key, value} = properties[i];
if (isProperty(properties[i])) {
const {computed, key, value} = properties[i];
let k;
if (isComputed(key)) {
if (computed) {
k = evaluate(key, {scope});
}
else if (isIdentifier(key)) {
k = {value: key.value};
k = {value: key.name};
}
else if (isNumericLiteral(key)) {
k = {value: key.value};
}
else if (isStringLiteral(key)) {
else if (isLiteral(key)) {
k = {value: key.value};
}
/* v8 ignore next 3 */
@ -41,7 +36,7 @@ export default function(node, {evaluate, scope}) {
}
}
if (isSpreadElement(properties[i])) {
const {arguments: argument} = properties[i];
const {argument} = properties[i];
const spreading = evaluate(argument, {scope});
isAsync ||= spreading.async;
if (spreading.async) {

8
app/astride/evaluators/update.js
View File

@ -4,16 +4,16 @@ export default function(node, {evaluate, scope}) {
const update = (value) => {
if (prefix) {
switch (operator) {
case '++': return scope.set(argument.value, value + 1);
case '--': return scope.set(argument.value, value - 1);
case '++': return scope.set(argument.name, value + 1);
case '--': return scope.set(argument.name, value - 1);
}
}
switch (operator) {
case '++':
scope.set(argument.value, value + 1);
scope.set(argument.name, value + 1);
return value;
case '--':
scope.set(argument.value, value - 1);
scope.set(argument.name, value - 1);
return value;
}
/* v8 ignore next */

16
app/astride/sandbox.js
View File

@ -69,7 +69,7 @@ export default class Sandbox {
continue;
}
if (isIdentifier(element)) {
scope.allocate(element.value, init[i]);
scope.allocate(element.name, init[i]);
}
/* v8 ignore next 3 */
else {
@ -85,12 +85,12 @@ export default class Sandbox {
for (let i = 0; i < properties.length; ++i) {
const property = properties[i];
if (isObjectPattern(property.value)) {
this.destructureObject(property.value, init[property.key.value], scope);
this.destructureObject(property.value, init[property.key.name], scope);
}
else {
scope.allocate(
property.value ? property.value.value : property.key.value,
init[property.key.value],
property.value.name,
init[property.key.name],
);
}
}
@ -109,7 +109,7 @@ export default class Sandbox {
const {id} = node;
const scope = this.scopes.get(node);
if (null === node.init) {
scope.allocate(id.value, undefined);
scope.allocate(id.name, undefined);
}
else {
const init = this.evaluate(node.init);
@ -118,12 +118,12 @@ export default class Sandbox {
yield {
async: true,
value: Promise.resolve(init.value).then((value) => {
scope.allocate(id.value, value);
scope.allocate(id.name, value);
}),
};
}
else {
scope.allocate(id.value, init.value);
scope.allocate(id.name, init.value);
}
}
else if (isArrayPattern(id)) {
@ -242,7 +242,7 @@ export default class Sandbox {
yield this.evaluate(node.expression);
}
// yield ForStatement afterthought.
if (isForStatement(parent) && !isBlockStatement(node)) {
if (isForStatement(parent) && node === parent.update) {
yield this.evaluate(node);
/* v8 ignore next */
}

12
app/astride/sandbox.test.js
View File

@ -1,12 +1,20 @@
import {parse as acornParse} from 'acorn';
import {expect, test} from 'vitest';
import {parse} from '@swc/core';
import Sandbox from '@/astride/sandbox.js';
function parse(code, options = {}) {
return acornParse(code, {
ecmaVersion: 'latest',
sourceType: 'module',
...options,
})
}
test('declares variables', async () => {
const sandbox = new Sandbox(
await parse(`
const scalar = 1;
const scalar = true ? +1 : 32;
const asyncScalar = await 2;
const array = [3, 4, 5];
const asyncArray = await [6, 7, 8];

7
app/astride/test/expression.js
View File

@ -1,5 +1,8 @@
export default async function(code) {
const {parse} = await import('@swc/core');
const ast = await parse(code);
const {parse} = await import('acorn');
const ast = parse(code, {
ecmaVersion: 'latest',
sourceType: 'module',
});
return ast.body[0].expression;
}

26
app/astride/traverse.js
View File

@ -1,36 +1,24 @@
export const TRAVERSAL_PATH = {
ArrayExpression: (node) => node.elements.map(({expression}) => expression),
ArrayExpression: ['elements'],
ArrayPattern: ['elements'],
AssignmentExpression: ['left', 'right'],
AssignmentPatternProperty: ['key'],
AwaitExpression: ['argument'],
BinaryExpression: ['left', 'right'],
BlockStatement: ['stmts'],
BooleanLiteral: [],
CallExpression: (node) => ([
node.callee,
...node.arguments.map(({expression}) => expression),
]),
Computed: ['expression'],
BlockStatement: ['body'],
CallExpression: ['arguments', 'callee'],
ConditionalExpression: ['alternate', 'consequent', 'test'],
DoWhileStatement: ['body', 'test'],
ExpressionStatement: ['expression'],
ForStatement: ['body', 'init', 'test', 'update'],
Identifier: [],
IfStatement: ['alternate', 'consequent', 'test'],
KeyValuePatternProperty: ['key', 'value'],
KeyValueProperty: ['key', 'value'],
MemberExpression: ['object', 'property'],
Module: ['body'],
NullLiteral: [],
NumericLiteral: [],
Literal: [],
ObjectExpression: ['properties'],
ObjectPattern: ['properties'],
OptionalChainingExpression: ['base'],
ParenthesisExpression: ['expression'],
RegExpLiteral: [],
Program: ['body'],
Property: ['key', 'value'],
ReturnStatement: ['argument'],
StringLiteral: [],
UnaryExpression: ['argument'],
UpdateExpression: ['argument'],
VariableDeclaration: ['declarations'],
@ -41,7 +29,7 @@ export const TRAVERSAL_PATH = {
export default function traverse(node, visitor) {
/* v8 ignore next 3 */
if (!(node.type in TRAVERSAL_PATH)) {
throw new Error(`node type ${node.type} not traversable`);
throw new Error(`node type ${node.type} not traversable. (${Object.keys(node).join(', ')})`);
}
visitor(node, 'enter');
const path = TRAVERSAL_PATH[node.type];

47
app/astride/types.js
View File

@ -14,14 +14,6 @@ export function isBlockStatement(node) {
return true;
}
export function isComputed(node) {
/* v8 ignore next 3 */
if (!node || node.type !== 'Computed') {
return false;
}
return true;
}
export function isDoWhileStatement(node) {
/* v8 ignore next 3 */
if (!node || node.type !== 'DoWhileStatement') {
@ -60,9 +52,9 @@ export function isIfStatement(node) {
return true;
}
export function isKeyValueProperty(node) {
export function isLiteral(node) {
/* v8 ignore next 3 */
if (!node || node.type !== 'KeyValueProperty') {
if (!node || node.type !== 'Literal') {
return false;
}
return true;
@ -76,17 +68,17 @@ export function isMemberExpression(node) {
return true;
}
export function isNumericLiteral(node) {
export function isObjectPattern(node) {
/* v8 ignore next 3 */
if (!node || node.type !== 'NumericLiteral') {
if (!node || node.type !== 'ObjectPattern') {
return false;
}
return true;
}
export function isObjectPattern(node) {
export function isProperty(node) {
/* v8 ignore next 3 */
if (!node || node.type !== 'ObjectPattern') {
if (!node || node.type !== 'Property') {
return false;
}
return true;
@ -108,14 +100,6 @@ export function isSpreadElement(node) {
return true;
}
export function isStringLiteral(node) {
/* v8 ignore next 3 */
if (!node || node.type !== 'StringLiteral') {
return false;
}
return true;
}
export function isVariableDeclarator(node) {
/* v8 ignore next 3 */
if (!node || node.type !== 'VariableDeclarator') {
@ -130,22 +114,3 @@ export function isWhileStatement(node) {
}
return true;
}
export function unwrap(node) {
let wrapped = node;
switch (node.type) {
case 'Computed':
wrapped = unwrap(node.expression);
break;
case 'OptionalChainingExpression':
wrapped = unwrap(node.base);
break;
case 'ParenthesisExpression':
wrapped = unwrap(node.expression);
break;
}
if (node !== wrapped) {
wrapped.wrapper = node;
}
return wrapped;
}

19
app/util/script.js
View File

@ -1,7 +1,16 @@
import {parse as acornParse} from 'acorn';
import {LRUCache} from 'lru-cache';
import Sandbox from '@/astride/sandbox.js';
import TickingPromise from '@/util/ticking-promise.js';
import {LRUCache} from 'lru-cache';
function parse(code, options = {}) {
return acornParse(code, {
ecmaVersion: 'latest',
sourceType: 'module',
...options,
})
}
const Populated = Symbol.for('sandbox.populated');
@ -11,8 +20,6 @@ export const cache = new LRUCache({
export default class Script {
static swcInitialized = false;
constructor(sandbox) {
this.sandbox = sandbox;
this.promise = null;
@ -67,16 +74,10 @@ export default class Script {
}
static async parse(code) {
const {default: initSwc, parse} = await import('@swc/wasm-web');
if (!this.swcInitialized) {
await initSwc();
this.swcInitialized = true;
}
return parse(
code,
{
allowReturnOutsideFunction: true,
syntax: 'ecmascript',
},
);
}

215
package-lock.json generated
View File

@ -13,8 +13,7 @@
"@remix-run/express": "^2.9.2",
"@remix-run/node": "^2.9.2",
"@remix-run/react": "^2.9.2",
"@swc/core": "^1.6.5",
"@swc/wasm-web": "^1.6.5",
"acorn": "^8.12.0",
"compression": "^1.7.4",
"express": "^4.18.2",
"idb-keyval": "^6.2.1",
@ -6440,211 +6439,6 @@
"url": "https://opencollective.com/storybook"
}
},
"node_modules/@swc/core": {
"version": "1.6.5",
"resolved": "https://registry.npmjs.org/@swc/core/-/core-1.6.5.tgz",
"integrity": "sha512-tyVvUK/HDOUUsK6/GmWvnqUtD9oDpPUA4f7f7JCOV8hXxtfjMtAZeBKf93yrB1XZet69TDR7EN0hFC6i4MF0Ig==",
"hasInstallScript": true,
"dependencies": {
"@swc/counter": "^0.1.3",
"@swc/types": "^0.1.9"
},
"engines": {
"node": ">=10"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/swc"
},
"optionalDependencies": {
"@swc/core-darwin-arm64": "1.6.5",
"@swc/core-darwin-x64": "1.6.5",
"@swc/core-linux-arm-gnueabihf": "1.6.5",
"@swc/core-linux-arm64-gnu": "1.6.5",
"@swc/core-linux-arm64-musl": "1.6.5",
"@swc/core-linux-x64-gnu": "1.6.5",
"@swc/core-linux-x64-musl": "1.6.5",
"@swc/core-win32-arm64-msvc": "1.6.5",
"@swc/core-win32-ia32-msvc": "1.6.5",
"@swc/core-win32-x64-msvc": "1.6.5"
},
"peerDependencies": {
"@swc/helpers": "*"
},
"peerDependenciesMeta": {
"@swc/helpers": {
"optional": true
}
}
},
"node_modules/@swc/core-darwin-arm64": {
"version": "1.6.5",
"resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.6.5.tgz",
"integrity": "sha512-RGQhMdni2v1/ANQ/2K+F+QYdzaucekYBewZcX1ogqJ8G5sbPaBdYdDN1qQ4kHLCIkPtGP6qC7c71qPEqL2RidQ==",
"cpu": [
"arm64"
],
"optional": true,
"os": [
"darwin"
],
"engines": {
"node": ">=10"
}
},
"node_modules/@swc/core-darwin-x64": {
"version": "1.6.5",
"resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.6.5.tgz",
"integrity": "sha512-/pSN0/Jtcbbb9+ovS9rKxR3qertpFAM3OEJr/+Dh/8yy7jK5G5EFPIrfsw/7Q5987ERPIJIH6BspK2CBB2tgcg==",
"cpu": [
"x64"
],
"optional": true,
"os": [
"darwin"
],
"engines": {
"node": ">=10"
}
},
"node_modules/@swc/core-linux-arm-gnueabihf": {
"version": "1.6.5",
"resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.6.5.tgz",
"integrity": "sha512-B0g/dROCE747RRegs/jPHuKJgwXLracDhnqQa80kFdgWEMjlcb7OMCgs5OX86yJGRS4qcYbiMGD0Pp7Kbqn3yw==",
"cpu": [
"arm"
],
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=10"
}
},
"node_modules/@swc/core-linux-arm64-gnu": {
"version": "1.6.5",
"resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.6.5.tgz",
"integrity": "sha512-W8meapgXTq8AOtSvDG4yKR8ant2WWD++yOjgzAleB5VAC+oC+aa8YJROGxj8HepurU8kurqzcialwoMeq5SZZQ==",
"cpu": [
"arm64"
],
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=10"
}
},
"node_modules/@swc/core-linux-arm64-musl": {
"version": "1.6.5",
"resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.6.5.tgz",
"integrity": "sha512-jyCKqoX50Fg8rJUQqh4u5PqnE7nqYKXHjVH2WcYr114/MU21zlsI+YL6aOQU1XP8bJQ2gPQ1rnlnGJdEHiKS/w==",
"cpu": [
"arm64"
],
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=10"
}
},
"node_modules/@swc/core-linux-x64-gnu": {
"version": "1.6.5",
"resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.6.5.tgz",
"integrity": "sha512-G6HmUn/RRIlXC0YYFfBz2qh6OZkHS/KUPkhoG4X9ADcgWXXjOFh6JrefwsYj8VBAJEnr5iewzjNfj+nztwHaeA==",
"cpu": [
"x64"
],
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=10"
}
},
"node_modules/@swc/core-linux-x64-musl": {
"version": "1.6.5",
"resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.6.5.tgz",
"integrity": "sha512-AQpBjBnelQDSbeTJA50AXdS6+CP66LsXIMNTwhPSgUfE7Bx1ggZV11Fsi4Q5SGcs6a8Qw1cuYKN57ZfZC5QOuA==",
"cpu": [
"x64"
],
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">=10"
}
},
"node_modules/@swc/core-win32-arm64-msvc": {
"version": "1.6.5",
"resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.6.5.tgz",
"integrity": "sha512-MZTWM8kUwS30pVrtbzSGEXtek46aXNb/mT9D6rsS7NvOuv2w+qZhjR1rzf4LNbbn5f8VnR4Nac1WIOYZmfC5ng==",
"cpu": [
"arm64"
],
"optional": true,
"os": [
"win32"
],
"engines": {
"node": ">=10"
}
},
"node_modules/@swc/core-win32-ia32-msvc": {
"version": "1.6.5",
"resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.6.5.tgz",
"integrity": "sha512-WZdu4gISAr3yOm1fVwKhhk6+MrP7kVX0KMP7+ZQFTN5zXQEiDSDunEJKVgjMVj3vlR+6mnAqa/L0V9Qa8+zKlQ==",
"cpu": [
"ia32"
],
"optional": true,
"os": [
"win32"
],
"engines": {
"node": ">=10"
}
},
"node_modules/@swc/core-win32-x64-msvc": {
"version": "1.6.5",
"resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.6.5.tgz",
"integrity": "sha512-ezXgucnMTzlFIxQZw7ls/5r2hseFaRoDL04cuXUOs97E8r+nJSmFsRQm/ygH5jBeXNo59nyZCalrjJAjwfgACA==",
"cpu": [
"x64"
],
"optional": true,
"os": [
"win32"
],
"engines": {
"node": ">=10"
}
},
"node_modules/@swc/counter": {
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz",
"integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ=="
},
"node_modules/@swc/types": {
"version": "0.1.9",
"resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.9.tgz",
"integrity": "sha512-qKnCno++jzcJ4lM4NTfYifm1EFSCeIfKiAHAfkENZAV5Kl9PjJIyd2yeeVv6c/2CckuLyv2NmRC5pv6pm2WQBg==",
"dependencies": {
"@swc/counter": "^0.1.3"
}
},
"node_modules/@swc/wasm-web": {
"version": "1.6.5",
"resolved": "https://registry.npmjs.org/@swc/wasm-web/-/wasm-web-1.6.5.tgz",
"integrity": "sha512-gKNNR8m0mzeFjcGCmCTxUHsjkV/kwHhRHYxwqI117bhauctt/PCq9BqG/L/1ZlhDO0VRGyZfab64jXGUh70AVQ=="
},
"node_modules/@testing-library/dom": {
"version": "9.3.4",
"resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.3.4.tgz",
@ -7511,10 +7305,9 @@
}
},
"node_modules/acorn": {
"version": "8.11.3",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
"integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
"dev": true,
"version": "8.12.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.0.tgz",
"integrity": "sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==",
"bin": {
"acorn": "bin/acorn"
},

3
package.json
View File

@ -20,8 +20,7 @@
"@remix-run/express": "^2.9.2",
"@remix-run/node": "^2.9.2",
"@remix-run/react": "^2.9.2",
"@swc/core": "^1.6.5",
"@swc/wasm-web": "^1.6.5",
"acorn": "^8.12.0",
"compression": "^1.7.4",
"express": "^4.18.2",
"idb-keyval": "^6.2.1",

6
server.js
View File

@ -56,12 +56,6 @@ app.use(compression());
// http://expressjs.com/en/advanced/best-practice-security.html#at-a-minimum-disable-x-powered-by-header
app.disable('x-powered-by');
// wasm
app.use(
'/node_modules/.vite/deps/wasm-web_bg.wasm',
express.static('node_modules/@swc/wasm-web/wasm-web_bg.wasm', { maxAge: '1h' })
);
// handle asset requests
if (viteDevServer) {
app.use(viteDevServer.middlewares);