Skip to content

ohm-js: minor type improvements #596

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

Merged
pdubroy merged 1 commit into from
Mar 13, 2026
Merged

ohm-js: minor type improvements #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions packages/compiler/scripts/modparse.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ const WASM_NUMTYPES = [0x7c, 0x7d, 0x7e, 0x7f];
const WASM_VECTYPE = 0x7b;
const WASM_REFTYPES = [0x6f, 0x70];

function checkNotNull<T>(x): NonNullable<T> {
function checkNotNull<T>(x: T): NonNullable<T> {
assert(x !== null, 'unexpected null value');
return x;
return x as NonNullable<T>;
}

function skipPreamble(bytes: Uint8Array): void {
Expand Down
8 changes: 6 additions & 2 deletions packages/compiler/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,12 @@
},
"include": [
"src/**/*",
"test/**/*.ts",
"scripts/**/*.ts",
"build/ohmRuntime.wasm_sections.ts",
"build/ohm-grammar-wasm.ts",
"index.ts"
]
"index.ts",
"tsdown.config.ts"
],
"exclude": ["test/_stage-1-cst.spec.ts"]
}
34 changes: 26 additions & 8 deletions packages/ohm-js/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,16 @@ export class PExpr {
toString(): string;
toDisplayString(): string;
}
export class Terminal extends PExpr {}
export class Range extends PExpr {}
export class Param extends PExpr {}
export class Terminal extends PExpr {
obj: string;
}
export class Range extends PExpr {
from: string;
to: string;
}
export class Param extends PExpr {
index: number;
}
export class Alt extends PExpr {
terms: PExpr[];
}
Expand All @@ -116,14 +123,25 @@ export class Splice extends Alt {}
export class Seq extends PExpr {
factors: PExpr[];
}
export class Iter extends PExpr {}
export class Iter extends PExpr {
expr: PExpr;
}
export class Star extends Iter {}
export class Plus extends Iter {}
export class Opt extends Iter {}
export class Not extends PExpr {}
export class Lookahead extends PExpr {}
export class Lex extends PExpr {}
export class Apply extends PExpr {}
export class Not extends PExpr {
expr: PExpr;
}
export class Lookahead extends PExpr {
expr: PExpr;
}
export class Lex extends PExpr {
expr: PExpr;
}
export class Apply extends PExpr {
ruleName: string;
args: PExpr[];
}
export class UnicodeChar extends PExpr {}
export class CaseInsensitiveTerminal extends PExpr {}

Expand Down
34 changes: 26 additions & 8 deletions packages/ohm-js/scripts/data/index.d.ts.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,16 @@ export class PExpr {
toString(): string;
toDisplayString(): string;
}
export class Terminal extends PExpr {}
export class Range extends PExpr {}
export class Param extends PExpr {}
export class Terminal extends PExpr {
obj: string;
}
export class Range extends PExpr {
from: string;
to: string;
}
export class Param extends PExpr {
index: number;
}
export class Alt extends PExpr {
terms: PExpr[];
}
Expand All @@ -115,14 +122,25 @@ export class Splice extends Alt {}
export class Seq extends PExpr {
factors: PExpr[];
}
export class Iter extends PExpr {}
export class Iter extends PExpr {
expr: PExpr;
}
export class Star extends Iter {}
export class Plus extends Iter {}
export class Opt extends Iter {}
export class Not extends PExpr {}
export class Lookahead extends PExpr {}
export class Lex extends PExpr {}
export class Apply extends PExpr {}
export class Not extends PExpr {
expr: PExpr;
}
export class Lookahead extends PExpr {
expr: PExpr;
}
export class Lex extends PExpr {
expr: PExpr;
}
export class Apply extends PExpr {
ruleName: string;
args: PExpr[];
}
export class UnicodeChar extends PExpr {}
export class CaseInsensitiveTerminal extends PExpr {}

Expand Down
Loading