Skip to content

Integrate ohm-js v18 for faster parsing #1128

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

Draft
pdubroy wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Integrate ohm-js v18 for faster parsing #1128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bda435a
Update CI and tsconfig for Node 20 / ESM module resolution
pdubroy Feb 17, 2026
d637ad1
Upgrade to ohm-js v18 (beta.7) with @ohm-js/compiler and to-ast-compat
pdubroy Feb 17, 2026
12724d0
Fix cleanErrorMessage regex (`not` is not guaranteed to come last)
pdubroy Feb 17, 2026
97d6052
Merge branch 'main' into ohm-js-v18
pdubroy Feb 17, 2026
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
5 changes: 5 additions & 0 deletions .changeset/ohm-wasm-browser-parsing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@shopify/liquid-html-parser': minor
---

Integrate @ohm-js/wasm for browser-compatible parsing
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
strategy:
matrix:
os: [windows-latest, ubuntu-latest]
node-version: [18, 20]
node-version: [20]

name: Tests / OS ${{ matrix.os }} / NodeJS ${{ matrix.node-version }}

Expand Down
1 change: 1 addition & 0 deletions 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 Down
1 change: 1 addition & 0 deletions 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 Down
4 changes: 3 additions & 1 deletion packages/liquid-html-parser/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@
"type-check": "tsc --noEmit"
},
"dependencies": {
"@ohm-js/compiler": "18.0.0-beta.7",
"@ohm-js/to-ast-compat": "18.0.0-beta.7",
"line-column": "^1.0.2",
"ohm-js": "^17.0.0"
"ohm-js": "18.0.0-beta.7"
},
"devDependencies": {
"@types/line-column": "^1.0.0"
Expand Down
8 changes: 4 additions & 4 deletions 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 { FailedMatchResult } from 'ohm-js';
import { NodeTypes, Position } from './types';

interface LineColPosition {
Expand All @@ -10,12 +10,12 @@ interface LineColPosition {
export class LiquidHTMLCSTParsingError extends SyntaxError {
loc?: { start: LineColPosition; end: LineColPosition };

constructor(ohm: MatchResult) {
constructor(ohm: FailedMatchResult) {
super(ohm.shortMessage);
this.name = 'LiquidHTMLParsingError';

const input = (ohm as any).input;
const errorPos = (ohm as any)._rightmostFailurePosition;
const input = ohm.input;
const errorPos = ohm.getRightmostFailurePosition();
const lineCol = lineColumn(input).fromIndex(Math.min(errorPos, input.length - 1));

// Plugging ourselves into @babel/code-frame since this is how
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/compiler/compat';

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

Expand Down
Loading
Loading