add createError

.zed/settings.json

@@ -1,7 +1,3 @@
-// Folder-specific settings
-//
-// For a full list of overridable settings, and general information on folder-specific settings,
-// see the documentation: https://zed.dev/docs/configuring-zed#settings-files
 {
   "lsp": {
     "deno": {
@@ -15,21 +11,21 @@
   "languages": {
     "TypeScript": {
       "language_servers": [
-        "deno",
-        "!biome",
-        "!typescript-language-server",
         "!vtsls",
-        "!eslint"
+        "!typescript-language-server",
+        "deno",
+        "!eslint",
+        "!biome"
       ],
       "formatter": "language_server"
     },
     "TSX": {
       "language_servers": [
-        "deno",
-        "!biome",
-        "!typescript-language-server",
         "!vtsls",
-        "!eslint"
+        "!typescript-language-server",
+        "deno",
+        "!eslint",
+        "!biome"
       ],
       "formatter": "language_server"
     }

deno.json

@@ -1,5 +1,5 @@
 {
   "name": "@marcisbee/nanolex",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "exports": "./src/nanolex.ts"
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nanolex",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Parser grammar builder",
   "main": "./dist/nanolex.js",
   "module": "./dist/nanolex.mjs",

src/nanolex.ts

@@ -1,9 +1,16 @@
+// deno-lint-ignore-file ban-unused-ignore no-explicit-any ban-types
 type ErrorToken = {
-  got: string;
+  value?: string;
+  got?: string;
   token?: TokenLike;
   i: number;
 };
 
+type ComposedTokens = {
+  id: number;
+  tokensParse: RegExp;
+};
+
 export const EOF = Symbol("EOF") as any as TokenLike;
 
 export function createToken(
@@ -42,7 +49,46 @@ const chunksCache: Record<string, string[]> = {};
 export function nanolex(
   value: string,
   { id, tokensParse }: ReturnType<typeof getComposedTokens>,
-) {
+): {
+  consume: <Return = string>(
+    token: TokenLike,
+    transform?: ((value: string) => Return) | undefined,
+  ) => GrammarLike<(Return extends any ? string : Return) | undefined>;
+  consumeUntil: (token: TokenLike) => GrammarLike<any[]>;
+  peek: (rule: GrammarLike) => GrammarLike;
+  oneOrMany: (
+    rule: GrammarLike,
+    transformer?: ((value: any) => any) | undefined,
+  ) => GrammarLike<any>;
+  zeroOrMany: (
+    rule: GrammarLike,
+    transformer?: ((value: any) => any) | undefined,
+  ) => GrammarLike<any>;
+  oneOrManySep: (
+    rule: GrammarLike,
+    sep: GrammarLike,
+    transformer?: ((value: any) => any) | undefined,
+  ) => GrammarLike<any>;
+  zeroOrManySep: (
+    rule: GrammarLike,
+    sep: GrammarLike,
+    transformer?: ((value: any) => any) | undefined,
+  ) => GrammarLike<any>;
+  zeroOrOne: <T extends GrammarLike<any>>(rule: T) => GrammarLike;
+  not: (rule: GrammarLike) => GrammarLike;
+  and: <T extends GrammarLike<any>[]>(
+    rules: T,
+    transform?: ((value: any) => any) | undefined,
+  ) => GrammarLike;
+  or: <T extends GrammarLike<any>[]>(
+    rules: T,
+    transform?: ((value: any) => any) | undefined,
+  ) => GrammarLike;
+  breakLoop: <T extends Function>(type: number, fn: T) => T;
+  patternToSkip: (tokens: GrammarLike) => void;
+  throwIfError: <T extends GrammarLike<any>>(rule: T) => any;
+  createError: (value: string) => void;
+} {
   let skipCheck = false;
   let tokensSkip: Function = () => void 0;
   const loopIndexMap: Record<number, number> = {};
@@ -83,6 +129,7 @@ export function nanolex(
     breakLoop,
     patternToSkip,
     throwIfError,
+    createError,
   };
 
   function patternToSkip(tokens: GrammarLike) {
@@ -110,6 +157,13 @@ export function nanolex(
     return deepestError;
   }
 
+  function createError(value: string) {
+    saveError({
+      value,
+      i,
+    });
+  }
+
   function many(
     rule: GrammarLike,
     atLest: number,
@@ -390,12 +444,13 @@ export function nanolex(
     // console.log({ consumeTimes });
 
     if (i !== chunksLength && deepestError) {
-      const i = deepestError.i;
+      const i = deepestError.value ? deepestError.i - 1 : deepestError.i;
 
       const [codeLens, position] = getCodeLens(chunks, i);
-      const deepestErrorMessage = `expecting "${
-        deepestError.token?.name ?? "EOF"
-      }", got "${deepestError.got ?? "EOF"}"`;
+      const deepestErrorMessage = deepestError.value ||
+        `expecting "${deepestError.token?.name ?? "EOF"}", got "${
+          deepestError.got ?? "EOF"
+        }"`;
 
       throw new Error(`${deepestErrorMessage} at ${position}${codeLens}`);
     }
@@ -459,7 +514,7 @@ interface TokenLike {
 }
 
 let composedTokenId = 0;
-export function getComposedTokens(tokens: TokenLike[]) {
+export function getComposedTokens(tokens: TokenLike[]): ComposedTokens {
   return {
     id: composedTokenId++,
     tokensParse: new RegExp("(" + tokens.map((t) => t.source).join("|") + ")"),

tests/css.ts

@@ -1,3 +1,4 @@
+// deno-lint-ignore-file ban-unused-ignore no-explicit-any no-unused-vars ban-types
 import {
   createToken,
   EOF,

tests/jsexpression.ts

@@ -1,3 +1,4 @@
+// deno-lint-ignore-file ban-unused-ignore no-explicit-any no-unused-vars ban-types
 import {
   createToken,
   EOF,

tests/json.ts

@@ -1,3 +1,4 @@
+// deno-lint-ignore-file ban-unused-ignore no-explicit-any no-unused-vars
 import {
   createToken,
   EOF,