Skip to content

[WIP] Switch to @ohm-js/wasm #1070

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pdubroy wants to merge 18 commits into
base: main
Choose a base branch
from
Open

[WIP] Switch to @ohm-js/wasm #1070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
9fcf918
add dependency on Ohm wasm packages
pdubroy Oct 2, 2025
4aa4628
package.json: Change moduleResolution to node16
pdubroy Oct 7, 2025
0a04143
pld: refactor to use AstBuilder
pdubroy Sep 22, 2025
22537b1
pld: fix some issues due to different Cst format
pdubroy Sep 22, 2025
f7de78f
pld: fix some issues due to diff't arity of iter nodes
pdubroy Sep 23, 2025
970c327
pld: fix more issues
pdubroy Sep 24, 2025
f24ea44
pld: get rid of locEndSecondToLast (lookahead no longer binds)
pdubroy Sep 25, 2025
df1a06a
pld: more fixes due to arity changes
pdubroy Sep 26, 2025
6db5d74
fix: access of `this`
pdubroy Sep 26, 2025
9034370
pld: fix up one more arity issue
pdubroy Sep 26, 2025
6d476b9
pld: make sure MatchResults are properly used()
pdubroy Sep 29, 2025
5dd086f
upgrade to latest version of @ohm-js/wasm
pdubroy Oct 8, 2025
51fae52
update imports
pdubroy Oct 8, 2025
4cca53e
fix types
pdubroy Oct 8, 2025
d96801f
FIXME: ts-ignore last type error
pdubroy Oct 8, 2025
27dce6d
fix up build issues due to pure-ESM package
pdubroy Oct 8, 2025
a99d8b8
Use' using' to ensure MatchResults are properly disposed
pdubroy Oct 8, 2025
b9def04
use `when` for proper handling of Opt nodes
pdubroy Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/codemirror-language-client/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"outDir": "./dist/esm",
"tsBuildInfoFile": "./dist/esm/tsconfig.tsbuildInfo",
"module": "es6",
"moduleResolution": "node",
"rootDir": "src",
"resolveJsonModule": false,
"lib": [
Expand All @@ -15,4 +16,3 @@
]
}
}

2 changes: 1 addition & 1 deletion packages/lang-jsonc/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"outDir": "./dist/esm",
"tsBuildInfoFile": "./dist/esm/tsconfig.tsbuildInfo",
"module": "es6",
"moduleResolution": "node",
"rootDir": "src",
"resolveJsonModule": false,
"lib": [
Expand All @@ -15,4 +16,3 @@
]
}
}

1 change: 1 addition & 0 deletions packages/liquid-html-parser/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"type-check": "tsc --noEmit"
},
"dependencies": {
"@ohm-js/wasm": "^0.6.8",
"line-column": "^1.0.2",
"ohm-js": "^17.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/liquid-html-parser/src/errors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import lineColumn from 'line-column';
import { MatchResult } from 'ohm-js';
import { MatchResult } from '@ohm-js/wasm';
import { NodeTypes, Position } from './types';

interface LineColPosition {
Expand Down
6 changes: 3 additions & 3 deletions packages/liquid-html-parser/src/grammar.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ describe('Unit: liquidHtmlGrammar', () => {
expectMatchSucceeded('<6h>').to.be.false;

function expectMatchSucceeded(text: string) {
const match = grammar.LiquidHTML.match(text, 'Node');
using match = grammar.LiquidHTML.match(text, 'Node');
return expect(match.succeeded(), text);
}
});
Expand Down Expand Up @@ -129,7 +129,7 @@ describe('Unit: liquidHtmlGrammar', () => {
`).to.be.true;

function expectMatchSucceeded(text: string) {
const match = grammar.LiquidStatement.match(text.trimStart(), 'Node');
using match = grammar.LiquidStatement.match(text.trimStart(), 'Node');
return expect(match.succeeded(), text);
}
});
Expand All @@ -156,7 +156,7 @@ describe('Unit: liquidHtmlGrammar', () => {
});

function expectMatchSucceeded(text: string) {
const match = placeholderGrammars.LiquidHTML.match(text.trimStart(), 'Node');
using match = placeholderGrammars.LiquidHTML.match(text.trimStart(), 'Node');
return expect(match.succeeded(), text);
}
});
Expand Down
2 changes: 1 addition & 1 deletion packages/liquid-html-parser/src/grammar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { grammars, Grammar } from 'ohm-js';
import { grammars, Grammar } from '@ohm-js/wasm/compat';

export const liquidHtmlGrammars = grammars(require('../grammar/liquid-html.ohm.js'));

Expand Down
Loading
Loading