@spakhm/ts-parsec 0.3.0 → 0.4.0

package/dist/base.d.ts

@@ -22,7 +22,7 @@ export declare function toParser<T extends string>(p: T): parser<T>;
 export declare function toParser<T>(p: parserlike<T>): parser<T>;
 export declare const str: <T extends string>(match: T) => parser<T>;
 export declare const lex: <T>(p: parserlike<T>) => parser<T>;
-export declare const keepWs: <T>(p: parserlike<T>) => parser<T>;
-export declare const ws: parser<{}>;
+export declare const lexMode: (wsMode: "keep_all" | "keep_newlines") => <T>(p: parserlike<T>) => parser<T>;
+export declare const ws: (wsMode: "drop_all" | "keep_newlines") => parser<{}>;
 export declare const fwd: <T>(thunk: (() => parserlike<T>)) => parser<T>;
 //# sourceMappingURL=base.d.ts.map

package/dist/base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../src/base.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAKvC,MAAM,MAAM,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI;IAAE,IAAI,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,CAAC,CAAC;CAAE,GAAG;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,GAAG,EAAE,CAAC,CAAC;CAAE,CAAC;AAC9E,MAAM,MAAM,YAAY,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;CAAE,CAAC;AAEtE,eAAO,MAAM,EAAE,GAAI,CAAC,EAAE,KAAK,CAAC,KAAG,MAAM,CAAC,CAAC,EAAE,KAAK,CAA2B,CAAC;AAC1E,eAAO,MAAM,GAAG,GAAI,KAAK,MAAM,EAAE,KAAK,MAAM,EAAE,KAAK,MAAM,KAAG,MAAM,CAAC,KAAK,EAAE,YAAY,CAC3C,CAAC;AAK5C,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;AACtE,MAAM,MAAM,MAAM,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,GAAG;IACpC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC;CAC9C,CAAC;AACF,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC;AAK7D,wBAAgB,QAAQ,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;AAC5D,wBAAgB,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;AA6BzD,eAAO,MAAM,GAAG,GAAI,CAAC,SAAS,MAAM,EAAE,OAAO,CAAC,KAAG,MAAM,CAAC,CAAC,CAQpD,CAAC;AAEN,eAAO,MAAM,GAAG,GAAI,CAAC,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,cAWrC,CAAC;AAEH,eAAO,MAAM,MAAM,GAAI,CAAC,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,cAOtC,CAAC;AAEL,eAAO,MAAM,EAAE,YAYb,CAAC;AAKH,eAAO,MAAM,GAAG,GAAI,CAAC,EAAE,OAAO,CAAC,MAAM,UAAU,CAAC,CAAC,CAAC,CAAC,KAAG,MAAM,CAAC,CAAC,CACL,CAAC"}
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../src/base.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAKvC,MAAM,MAAM,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI;IAAE,IAAI,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,CAAC,CAAC;CAAE,GAAG;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,GAAG,EAAE,CAAC,CAAC;CAAE,CAAC;AAC9E,MAAM,MAAM,YAAY,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;CAAE,CAAC;AAEtE,eAAO,MAAM,EAAE,GAAI,CAAC,EAAE,KAAK,CAAC,KAAG,MAAM,CAAC,CAAC,EAAE,KAAK,CAA2B,CAAC;AAC1E,eAAO,MAAM,GAAG,GAAI,KAAK,MAAM,EAAE,KAAK,MAAM,EAAE,KAAK,MAAM,KAAG,MAAM,CAAC,KAAK,EAAE,YAAY,CAC3C,CAAC;AAK5C,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;AACtE,MAAM,MAAM,MAAM,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,GAAG;IACpC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC;CAC9C,CAAC;AACF,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC;AAK7D,wBAAgB,QAAQ,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;AAC5D,wBAAgB,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;AA6BzD,eAAO,MAAM,GAAG,GAAI,CAAC,SAAS,MAAM,EAAE,OAAO,CAAC,KAAG,MAAM,CAAC,CAAC,CAQpD,CAAC;AAEN,eAAO,MAAM,GAAG,GAAI,CAAC,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,cAUrC,CAAC;AAEH,eAAO,MAAM,OAAO,GAAI,QAAQ,UAAU,GAAG,eAAe,MACzD,CAAC,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,cAOhB,CAAC;AAEP,eAAO,MAAM,EAAE,GAAI,QAAQ,UAAU,GAAG,eAAe,eAqBnD,CAAC;AAKL,eAAO,MAAM,GAAG,GAAI,CAAC,EAAE,OAAO,CAAC,MAAM,UAAU,CAAC,CAAC,CAAC,CAAC,KAAG,MAAM,CAAC,CAAC,CACL,CAAC"}

package/dist/index.js

@@ -30,32 +30,35 @@ var str = (match) => lex(toParser((source) => {
   return ok(match);
 }));
 var lex = (p) => toParser((source) => {
-  if (!source.drop_ws) {
+  if (source.ws_mode === "keep_all") {
     return toParser(p)(source);
   } else {
-    return keepWs((source2) => {
-      ws(source2);
+    return lexMode("keep_all")((source2) => {
+      ws("drop_all")(source2);
       return toParser(p)(source2);
     })(source);
   }
 });
-var keepWs = (p) => toParser((source) => {
-  const prev_drop_ws = source.drop_ws;
-  source.drop_ws = false;
+var lexMode = (wsMode) => (p) => toParser((source) => {
+  const prev_ws_mode = source.ws_mode;
+  source.ws_mode = wsMode;
   const res = toParser(p)(source);
-  source.drop_ws = prev_drop_ws;
+  source.ws_mode = prev_ws_mode;
   return res;
 });
-var ws = toParser((source) => {
+var ws = (wsMode) => toParser((source) => {
   while (true) {
     source.push();
     const ch = source.next();
-    if (ch?.trim() === "") {
-      source.pop_continue();
-    } else {
+    if (wsMode == "keep_newlines" && ch == "\n") {
+      source.pop_rollback();
+      break;
+    }
+    if (ch === null || ch.trim() !== "") {
       source.pop_rollback();
       break;
     }
+    source.pop_continue();
   }
   return ok({});
 });
@@ -211,33 +214,55 @@ var anych = (opts) => toParser((source) => {
   return res ? ok(res) : err(0, 0, "");
 });
 var eof = not(anych());
+var eol = str("\n");
 // src/stream.ts
 class string_stream {
   source;
-  drop_ws;
+  ws_mode;
   row = 1;
   col = 1;
   idx = 0;
   stack = [];
-  constructor(source, drop_ws = true) {
+  constructor(source, ws_mode = "drop_all") {
     this.source = source;
-    this.drop_ws = drop_ws;
+    this.ws_mode = ws_mode;
   }
   next() {
     if (this.idx == this.source.length) {
       return null;
     }
-    const ch = this.source[this.idx++];
-    this.col++;
+    const ch = this.normalizeNewline(this.source[this.idx++]);
     if (ch == "\n") {
       this.row++;
       this.col = 1;
-    }
-    if (this.drop_ws && ch.trim() === "") {
-      return this.next();
     } else {
+      this.col++;
+    }
+    if (this.ws_mode === "keep_all") {
       return ch;
     }
+    if (this.ws_mode === "drop_all" && ch.trim() === "") {
+      return this.next();
+    }
+    if (this.ws_mode === "keep_newlines") {
+      if (ch === "\n") {
+        return ch;
+      }
+      if (ch.trim() === "") {
+        return this.next();
+      }
+    }
+    return ch;
+  }
+  normalizeNewline(ch) {
+    const peek2 = () => this.idx == this.source.length ? null : this.source[this.idx];
+    if (ch == "\r") {
+      if (peek2() == "\n") {
+        this.idx++;
+      }
+      ch = "\n";
+    }
+    return ch;
   }
   push() {
     this.stack.push({
@@ -256,8 +281,8 @@ class string_stream {
     this.idx = x.idx;
   }
 }
-var fromString = (source) => {
-  return new string_stream(source);
+var fromString = (source, ws_mode = "drop_all") => {
+  return new string_stream(source, ws_mode);
 };
 export {
   ws,
@@ -277,12 +302,13 @@ export {
   maybe,
   many,
   lower,
+  lexMode,
   lex,
-  keepWs,
   int,
   fwd,
   fromString,
   err,
+  eol,
   eof,
   either,
   digit,

package/dist/lib.d.ts

@@ -27,4 +27,5 @@ export declare const anych: (opts?: {
     but: parserlike<unknown>;
 }) => parser<string>;
 export declare const eof: parser<null>;
+export declare const eol: parser<"\n">;
 //# sourceMappingURL=lib.d.ts.map

package/dist/lib.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../src/lib.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../src/lib.ts"],"names":[],"mappings":"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"}

package/dist/stream.d.ts

@@ -1,11 +1,12 @@
+export type ws_mode = 'keep_all' | 'drop_all' | 'keep_newlines';
 export type stream = {
     row: number;
     col: number;
-    drop_ws: boolean;
+    ws_mode: ws_mode;
     next: () => string | null;
     push: () => void;
     pop_continue: () => void;
     pop_rollback: () => void;
 };
-export declare const fromString: (source: string) => stream;
+export declare const fromString: (source: string, ws_mode?: ws_mode) => stream;
 //# sourceMappingURL=stream.d.ts.map

package/dist/stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../src/stream.ts"],"names":[],"mappings":"AACA,MAAM,MAAM,MAAM,GAAG;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IAC1B,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,YAAY,EAAE,MAAM,IAAI,CAAC;CAC1B,CAAC;AAmDF,eAAO,MAAM,UAAU,GAAI,QAAQ,MAAM,KAAG,MAE3C,CAAA"}
+{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../src/stream.ts"],"names":[],"mappings":"AACA,MAAM,MAAM,OAAO,GAAG,UAAU,GAAG,UAAU,GAAG,eAAe,CAAC;AAEhE,MAAM,MAAM,MAAM,GAAG;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IAC1B,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,YAAY,EAAE,MAAM,IAAI,CAAC;CAC1B,CAAC;AA+EF,eAAO,MAAM,UAAU,GAAI,QAAQ,MAAM,EAAE,UAAS,OAAoB,KAAG,MAE1E,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spakhm/ts-parsec",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "license": "MIT",
   "author": "Slava Akhmechet",
   "type": "module",

package/src/base.ts

@@ -63,40 +63,49 @@ export const str = <T extends string>(match: T): parser<T> =>
   }));
 
 export const lex = <T>(p: parserlike<T>) => toParser((source: stream) => {
-  if (!source.drop_ws) {
-    // this call to lex is nested (i.e. we're in lex mode already)
-    // don't drop more whitespace
+  if (source.ws_mode === 'keep_all') {
+    // nested lex call, don't drop more whitespace
     return toParser(p)(source);
   } else {
-    return keepWs((source: stream) => {
-      ws(source);
+    return lexMode('keep_all')((source: stream) => {
+      ws('drop_all')(source);  // lex always drops all ws including newlines
       return toParser(p)(source);
     })(source);
   }
 });
 
-export const keepWs = <T>(p: parserlike<T>) =>
+export const lexMode = (wsMode: 'keep_all' | 'keep_newlines') =>
+  <T>(p: parserlike<T>) =>
+    toParser((source: stream) => {
+      const prev_ws_mode = source.ws_mode;
+      source.ws_mode = wsMode;
+      const res = toParser(p)(source);
+      source.ws_mode = prev_ws_mode;
+      return res;
+    });
+
+export const ws = (wsMode: 'drop_all' | 'keep_newlines') =>
   toParser((source: stream) => {
-    const prev_drop_ws = source.drop_ws;
-    source.drop_ws = false;
-    const res = toParser(p)(source);
-    source.drop_ws = prev_drop_ws;
-    return res;
-  });
+    while (true) {
+      source.push();
+      const ch = source.next();
+
+      // If we gotta keep newlines and we hit one, return it
+      if (wsMode == 'keep_newlines' && ch == '\n') {
+        source.pop_rollback();
+        break;
+      }
+
+      // If we hit eof or a non-whitespace character, return it
+      if (ch === null || ch.trim() !== '') {
+        source.pop_rollback();
+        break;
+      }
 
-export const ws = toParser((source: stream) => {
-  while (true) {
-    source.push();
-    const ch = source.next();
-    if (ch?.trim() === "") {
       source.pop_continue();
-    } else {
-      source.pop_rollback();
-      break;
     }
-  }
-  return ok({});
-});
+    return ok({});
+  });
 
 /*
   Laziness helper

package/src/lib.ts

@@ -1,6 +1,6 @@
 import type { stream } from './stream';
 import type { parser, parserlike } from './base';
-import { err, ok, toParser, lex } from './base';
+import { err, ok, toParser, lex, str } from './base';
 
 export const attempt = <T>(parser: parserlike<T>): parser<T> =>
   toParser((source: stream) => {
@@ -198,3 +198,5 @@ export const anych = (opts?: { but: parserlike<unknown> }) => toParser((source:
 });
 
 export const eof = not(anych());
+
+export const eol = str('\n');

package/src/stream.ts

@@ -1,8 +1,10 @@
 
+export type ws_mode = 'keep_all' | 'drop_all' | 'keep_newlines';
+
 export type stream = {
   row: number,
   col: number,
-  drop_ws: boolean,
+  ws_mode: ws_mode,
   next: () => string | null,
   push: () => void,
   pop_continue: () => void,
@@ -20,24 +22,52 @@ class string_stream {
     idx: number,
   }[] = [];
 
-  constructor(public source: string, public drop_ws: boolean = true) {}
+  constructor(public source: string, public ws_mode: ws_mode = 'drop_all') {}
 
   next(): string | null {
     if (this.idx == this.source.length) {
       return null;
     }
-    const ch = this.source[this.idx++];
-    this.col++;
+
+    const ch = this.normalizeNewline(this.source[this.idx++]);
     if (ch == '\n') {
       this.row++;
       this.col = 1;
+    } else {
+      this.col++;
     }
 
-    if (this.drop_ws && ch.trim() === "") {
-      return this.next();
-    } else {
+    if (this.ws_mode === 'keep_all') {
       return ch;
     }
+
+    if (this.ws_mode === 'drop_all' && ch.trim() === '') {
+      return this.next();
+    }
+
+    if (this.ws_mode === 'keep_newlines') {
+      if (ch === '\n') {
+        return ch;
+      }
+      if (ch.trim() === '') {
+        return this.next();
+      }
+    }
+
+    return ch;
+  }
+
+  private normalizeNewline(ch: string) {
+    const peek = () =>
+      this.idx == this.source.length ? null : this.source[this.idx];
+
+    if (ch == '\r') {
+      if (peek() == '\n') {
+        this.idx++;
+      }
+      ch = '\n';
+    }
+    return ch;
   }
 
   push() {
@@ -58,6 +88,6 @@ class string_stream {
   }
 }
 
-export const fromString = (source: string): stream => {
-  return new string_stream(source);
+export const fromString = (source: string, ws_mode: ws_mode = 'drop_all'): stream => {
+  return new string_stream(source, ws_mode);
 }