@spakhm/ts-parsec 0.1.7 → 0.2.0

package/dist/base.d.ts

@@ -1,27 +1,28 @@
-import type { stream } from './stream';
-export declare type result<T, E> = {
-    type: 'ok';
-    res: T;
-} | {
-    type: 'err';
-    err: E;
-};
-export declare type parser_error = {
-    row: number;
-    col: number;
-    msg: string;
-};
-export declare const ok: <T>(res: T) => result<T, never>;
-export declare const err: (row: number, col: number, msg: string) => result<never, parser_error>;
-export declare type parserFn<T> = (source: stream) => result<T, parser_error>;
-export declare type parser<T> = parserFn<T> & {
-    map: <U>(fn: ((value: T) => U)) => parser<U>;
-};
-export declare type parserlike<T> = parserFn<T> | parser<T> | string;
-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 fwd: <T>(thunk: () => parserlike<T>) => parser<T>;
+import type { stream } from './stream';
+export type result<T, E> = {
+    type: 'ok';
+    res: T;
+} | {
+    type: 'err';
+    err: E;
+};
+export type parser_error = {
+    row: number;
+    col: number;
+    msg: string;
+};
+export declare const ok: <T>(res: T) => result<T, never>;
+export declare const err: (row: number, col: number, msg: string) => result<never, parser_error>;
+export type parserFn<T> = (source: stream) => result<T, parser_error>;
+export type parser<T> = parserFn<T> & {
+    map: <U>(fn: ((value: T) => U)) => parser<U>;
+};
+export type parserlike<T> = parserFn<T> | parser<T> | string;
+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 fwd: <T>(thunk: (() => parserlike<T>)) => parser<T>;
+//# sourceMappingURL=base.d.ts.map

package/dist/base.d.ts.map

@@ -0,0 +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"}

package/dist/index.d.ts

@@ -1,3 +1,4 @@
-export * from './base';
-export * from './lib';
-export * from './stream';
+export * from './base';
+export * from './lib';
+export * from './stream';
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,QAAQ,CAAC;AACvB,cAAc,OAAO,CAAC;AACtB,cAAc,UAAU,CAAC"}

package/dist/index.js

@@ -1,8 +1,295 @@
-
-'use strict'
-
-if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./ts-parsec.cjs.production.min.js')
-} else {
-  module.exports = require('./ts-parsec.cjs.development.js')
+// src/base.ts
+var ok = (res) => ({ type: "ok", res });
+var err = (row, col, msg) => ({ type: "err", err: { row, col, msg } });
+function toParser(pl) {
+  if (typeof pl == "string") {
+    return str(pl);
+  }
+  if ("map" in pl) {
+    return pl;
+  }
+  const fn_ = pl;
+  fn_.map = (fnTransform) => {
+    return toParser((source) => {
+      const res = fn_(source);
+      if (res.type == "ok") {
+        return ok(fnTransform(res.res));
+      } else {
+        return res;
+      }
+    });
+  };
+  return fn_;
 }
+var str = (match) => lex(toParser((source) => {
+  for (let i = 0;i < match.length; i++) {
+    if (source.next() != match[i]) {
+      return err(0, 0, "");
+    }
+  }
+  return ok(match);
+}));
+var lex = (p) => toParser((source) => {
+  if (!source.drop_ws) {
+    return toParser(p)(source);
+  } else {
+    return keepWs((source2) => {
+      ws(source2);
+      return toParser(p)(source2);
+    })(source);
+  }
+});
+var keepWs = (p) => toParser((source) => {
+  const prev_drop_ws = source.drop_ws;
+  source.drop_ws = false;
+  const res = toParser(p)(source);
+  source.drop_ws = prev_drop_ws;
+  return res;
+});
+var ws = toParser((source) => {
+  while (true) {
+    source.push();
+    const ch = source.next();
+    if (ch?.trim() === "") {
+      source.pop_continue();
+    } else {
+      source.pop_rollback();
+      break;
+    }
+  }
+  return ok({});
+});
+var fwd = (thunk) => toParser((source) => toParser(thunk())(source));
+// src/lib.ts
+var attempt = (parser) => toParser((source) => {
+  source.push();
+  const res = toParser(parser)(source);
+  if (res.type == "ok") {
+    source.pop_continue();
+  } else {
+    source.pop_rollback();
+  }
+  return res;
+});
+var range = (start, end) => toParser((source) => {
+  const next = source.next();
+  if (!next)
+    return err(0, 0, "");
+  if (next >= start[0] && next <= end[0])
+    return ok(next);
+  return err(0, 0, "");
+});
+var either = (...parsers) => toParser((source) => {
+  for (const parser of parsers) {
+    const res = attempt(parser)(source);
+    if (res.type == "ok") {
+      return res;
+    }
+  }
+  return err(0, 0, "");
+});
+var seq = (...parsers) => {
+  const p = toParser((source) => {
+    const res = [];
+    for (const parser of parsers) {
+      const res_ = toParser(parser)(source);
+      if (res_.type == "ok") {
+        res.push(res_.res);
+      } else {
+        return err(0, 0, "");
+      }
+    }
+    return ok(res);
+  });
+  p.map2 = (fn) => p.map((x) => fn(...x));
+  return p;
+};
+var many = (parser) => toParser((source) => {
+  const res = [];
+  while (true) {
+    const _res = attempt(parser)(source);
+    if (_res.type == "ok") {
+      res.push(_res.res);
+    } else {
+      break;
+    }
+  }
+  return ok(res);
+});
+var some = (parser) => seq(parser, many(parser)).map2((ft, rt) => [ft, ...rt]);
+var digit = range("0", "9");
+var nat = lex(some(digit)).map((val) => parseInt(val.join("")));
+var maybe = (p) => toParser((source) => {
+  const res = attempt(p)(source);
+  return res.type == "ok" ? res : ok(null);
+});
+var int = seq(maybe(either("-", "+")), nat).map2((sign, val) => {
+  if (sign === "-") {
+    return -val;
+  } else {
+    return val;
+  }
+});
+var lower = range("a", "z");
+var upper = range("A", "Z");
+var alpha = either(lower, upper);
+var alnum = either(alpha, digit);
+var sepBy = (item, sep, trailingSep = "allow") => toParser((source) => {
+  const res = [];
+  const res_ = attempt(item)(source);
+  if (res_.type == "err") {
+    return ok(res);
+  } else {
+    res.push(res_.res);
+  }
+  while (true) {
+    const sepres_ = attempt(sep)(source);
+    if (sepres_.type == "err") {
+      return trailingSep === "require" ? err(0, 0, "") : ok(res);
+    }
+    const res_2 = attempt(item)(source);
+    if (res_2.type == "err") {
+      return trailingSep === "forbid" ? err(0, 0, "") : ok(res);
+    } else {
+      res.push(res_2.res);
+    }
+  }
+});
+var sepBy1 = (item, sep, trailingSep = "allow") => toParser((source) => {
+  const res = sepBy(item, sep, trailingSep)(source);
+  if (res.type == "err")
+    return res;
+  return res.res.length >= 1 ? res : err(0, 0, "");
+});
+function binop(operator, operand, makeNode) {
+  return toParser((source) => {
+    const p = seq(operand, many(seq(operator, operand))).map2((left, rights) => {
+      const acc = rights.reduce((acc2, [op, right]) => makeNode(op, acc2, right), left);
+      return acc;
+    });
+    return p(source);
+  });
+}
+function binopr(operator, operand, makeNode) {
+  return toParser((source) => {
+    const p = seq(operand, many(seq(operator, operand))).map2((left, rights) => {
+      if (rights.length === 0)
+        return left;
+      let acc = rights[rights.length - 1][1];
+      for (let i = rights.length - 2;i >= 0; i--) {
+        const [op, right] = rights[i];
+        acc = makeNode(op, right, acc);
+      }
+      return makeNode(rights[0][0], left, acc);
+    });
+    return p(source);
+  });
+}
+var noop = toParser((_) => ok(true));
+var not = (p) => toParser((source) => {
+  const res = toParser(p)(source);
+  if (res.type == "ok") {
+    return err(0, 0, "");
+  } else {
+    return ok(null);
+  }
+});
+var peek = (p) => toParser((source) => {
+  source.push();
+  const res = toParser(p)(source);
+  source.pop_rollback();
+  return res;
+});
+var anych = (opts) => toParser((source) => {
+  if (opts?.but) {
+    const res2 = peek(opts.but)(source);
+    if (res2.type == "ok") {
+      return err(0, 0, "");
+    }
+  }
+  const res = source.next();
+  return res ? ok(res) : err(0, 0, "");
+});
+var eof = not(anych());
+// src/stream.ts
+class string_stream {
+  source;
+  drop_ws;
+  row = 1;
+  col = 1;
+  idx = 0;
+  stack = [];
+  constructor(source, drop_ws = true) {
+    this.source = source;
+    this.drop_ws = drop_ws;
+  }
+  next() {
+    if (this.idx == this.source.length) {
+      return null;
+    }
+    const ch = this.source[this.idx++];
+    this.col++;
+    if (ch == "\n") {
+      this.row++;
+      this.col = 1;
+    }
+    if (this.drop_ws && ch.trim() === "") {
+      return this.next();
+    } else {
+      return ch;
+    }
+  }
+  push() {
+    this.stack.push({
+      row: this.row,
+      col: this.col,
+      idx: this.idx
+    });
+  }
+  pop_continue() {
+    this.stack.pop();
+  }
+  pop_rollback() {
+    const x = this.stack.pop();
+    this.row = x.row;
+    this.col = x.col;
+    this.idx = x.idx;
+  }
+}
+var fromString = (source) => {
+  return new string_stream(source);
+};
+export {
+  ws,
+  upper,
+  toParser,
+  str,
+  some,
+  seq,
+  sepBy1,
+  sepBy,
+  range,
+  peek,
+  ok,
+  not,
+  noop,
+  nat,
+  maybe,
+  many,
+  lower,
+  lex,
+  keepWs,
+  int,
+  fwd,
+  fromString,
+  err,
+  eof,
+  either,
+  digit,
+  binopr,
+  binop,
+  attempt,
+  anych,
+  alpha,
+  alnum
+};

package/dist/lib.d.ts

@@ -1,25 +1,30 @@
-import type { parser, parserlike } from './base';
-export declare const attempt: <T>(parser: parserlike<T>) => parser<T>;
-export declare const range: (start: string, end: string) => parser<string>;
-export declare const either: <Ts extends any[]>(...parsers: { [K in keyof Ts]: parserlike<Ts[K]>; }) => parser<Ts[number]>;
-export declare type seq_parser<T extends any[]> = parser<T> & {
-    map2: <U>(fn: ((...values: T) => U)) => parser<U>;
-};
-export declare const seq: <Ts extends any[]>(...parsers: { [K in keyof Ts]: parserlike<Ts[K]>; }) => seq_parser<Ts>;
-export declare const many: <T>(parser: parserlike<T>) => parser<T[]>;
-export declare const some: <T>(parser: parserlike<T>) => parser<T[]>;
-export declare const digit: parser<string>;
-export declare const nat: parser<number>;
-export declare const maybe: <T>(p: parserlike<T>) => parser<T | null>;
-export declare const int: parser<number>;
-export declare const lower: parser<string>;
-export declare const upper: parser<string>;
-export declare const alpha: parser<string>;
-export declare const alnum: parser<string>;
-export declare const sepBy: <T, U>(item: parserlike<T>, sep: parserlike<U>, allowTrailingSep?: boolean) => parser<T[]>;
-export declare function binop<O, D, N>(operator: parserlike<O>, operand: parserlike<D>, makeNode: (op: O, left: D | N, right: D) => N): parser<N | D>;
-export declare function binopr<O, D, N>(operator: parserlike<O>, operand: parserlike<D>, makeNode: (op: O, left: D, right: D | N) => N): parser<N | D>;
-export declare const noop: parser<boolean>;
-export declare const not: <T>(p: parserlike<T>) => parser<null>;
-export declare const peek: <T>(p: parserlike<T>) => parser<T>;
-export declare const anych: parser<string>;
+import type { parser, parserlike } from './base';
+export declare const attempt: <T>(parser: parserlike<T>) => parser<T>;
+export declare const range: (start: string, end: string) => parser<string>;
+export declare const either: <Ts extends any[]>(...parsers: { [K in keyof Ts]: parserlike<Ts[K]>; }) => parser<Ts[number]>;
+export type seq_parser<T extends any[]> = parser<T> & {
+    map2: <U>(fn: ((...values: T) => U)) => parser<U>;
+};
+export declare const seq: <Ts extends any[]>(...parsers: { [K in keyof Ts]: parserlike<Ts[K]>; }) => seq_parser<Ts>;
+export declare const many: <T>(parser: parserlike<T>) => parser<T[]>;
+export declare const some: <T>(parser: parserlike<T>) => parser<T[]>;
+export declare const digit: parser<string>;
+export declare const nat: parser<number>;
+export declare const maybe: <T>(p: parserlike<T>) => parser<T | null>;
+export declare const int: parser<number>;
+export declare const lower: parser<string>;
+export declare const upper: parser<string>;
+export declare const alpha: parser<string>;
+export declare const alnum: parser<string>;
+export declare const sepBy: <T, U>(item: parserlike<T>, sep: parserlike<U>, trailingSep?: "allow" | "forbid" | "require") => parser<T[]>;
+export declare const sepBy1: <T, U>(item: parserlike<T>, sep: parserlike<U>, trailingSep?: "allow" | "forbid" | "require") => parser<T[]>;
+export declare function binop<O, D, N>(operator: parserlike<O>, operand: parserlike<D>, makeNode: (op: O, left: D | N, right: D) => N): parser<N | D>;
+export declare function binopr<O, D, N>(operator: parserlike<O>, operand: parserlike<D>, makeNode: (op: O, left: D, right: D | N) => N): parser<N | D>;
+export declare const noop: parser<boolean>;
+export declare const not: <T>(p: parserlike<T>) => parser<null>;
+export declare const peek: <T>(p: parserlike<T>) => parser<T>;
+export declare const anych: (opts?: {
+    but: parserlike<unknown>;
+}) => parser<string>;
+export declare const eof: parser<null>;
+//# sourceMappingURL=lib.d.ts.map

package/dist/lib.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../src/lib.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAGjD,eAAO,MAAM,OAAO,GAAI,CAAC,EAAE,QAAQ,UAAU,CAAC,CAAC,CAAC,KAAG,MAAM,CAAC,CAAC,CAUvD,CAAC;AAEL,eAAO,MAAM,KAAK,GAAI,OAAO,MAAM,EAAE,KAAK,MAAM,KAAG,MAAM,CAAC,MAAM,CAM5D,CAAC;AAEL,eAAO,MAAM,MAAM,GAAI,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,SAAS,GAAG,CAAC,IAAI,MAAM,EAAE,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAE,KAAG,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,CAS3G,CAAC;AAEL,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,GAAG,EAAE,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG;IACpD,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC;CACnD,CAAC;AAEF,eAAO,MAAM,GAAG,GAAI,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,SAAS,GAAG,CAAC,IAAI,MAAM,EAAE,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAE,KAAG,UAAU,CAAC,EAAE,CAgBvG,CAAA;AAED,eAAO,MAAM,IAAI,GAAI,CAAC,EAAE,QAAQ,UAAU,CAAC,CAAC,CAAC,KAAG,MAAM,CAAC,CAAC,EAAE,CAatD,CAAC;AAEL,eAAO,MAAM,IAAI,GAAI,CAAC,EAAE,QAAQ,UAAU,CAAC,CAAC,CAAC,KAAG,MAAM,CAAC,CAAC,EAAE,CACD,CAAC;AAE1D,eAAO,MAAM,KAAK,gBAAkB,CAAC;AAErC,eAAO,MAAM,GAAG,gBACS,CAAC;AAE1B,eAAO,MAAM,KAAK,GAAI,CAAC,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,qBAIrC,CAAC;AAEL,eAAO,MAAM,GAAG,gBAMd,CAAC;AAEH,eAAO,MAAM,KAAK,gBAAkB,CAAC;AACrC,eAAO,MAAM,KAAK,gBAAkB,CAAC;AACrC,eAAO,MAAM,KAAK,gBAAuB,CAAC;AAC1C,eAAO,MAAM,KAAK,gBAAuB,CAAC;AAE1C,eAAO,MAAM,KAAK,GAAI,CAAC,EAAE,CAAC,EAAE,MAAM,UAAU,CAAC,CAAC,CAAC,EAAE,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,cAAa,OAAO,GAAG,QAAQ,GAAG,SAAmB,KAAG,MAAM,CAAC,CAAC,EAAE,CAwBnI,CAAC;AAEL,eAAO,MAAM,MAAM,GAAI,CAAC,EAAE,CAAC,EAAE,MAAM,UAAU,CAAC,CAAC,CAAC,EAAE,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,cAAa,OAAO,GAAG,QAAQ,GAAG,SAAmB,KAAG,MAAM,CAAC,CAAC,EAAE,CAKpI,CAAC;AAEL,wBAAgB,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAC3B,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,EACvB,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,EACtB,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,CAAC,GAC5C,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CASf;AAED,wBAAgB,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAC5B,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,EACvB,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,EACtB,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAC5C,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAiBf;AAED,eAAO,MAAM,IAAI,iBAAoC,CAAC;AAEtD,eAAO,MAAM,GAAG,GAAI,CAAC,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,iBAOrC,CAAC;AAEH,eAAO,MAAM,IAAI,GAAI,CAAC,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,cAKtC,CAAC;AAEH,eAAO,MAAM,KAAK,GAAI,OAAO;IAAE,GAAG,EAAE,UAAU,CAAC,OAAO,CAAC,CAAA;CAAE,mBASvD,CAAC;AAEH,eAAO,MAAM,GAAG,cAAe,CAAC"}

package/dist/stream.d.ts

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

package/dist/stream.d.ts.map

@@ -0,0 +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"}

package/package.json

@@ -1 +1,27 @@
-{"version":"0.1.7","license":"MIT","main":"dist/index.js","typings":"dist/index.d.ts","files":["dist","src"],"engines":{"node":">=10"},"scripts":{"start":"tsdx watch","build":"tsdx build","test":"tsdx test","lint":"tsdx lint","prepare":"tsdx build","size":"size-limit","analyze":"size-limit --why"},"husky":{"hooks":{"pre-commit":"tsdx lint"}},"prettier":{"printWidth":80,"semi":true,"singleQuote":true,"trailingComma":"es5"},"name":"@spakhm/ts-parsec","author":"Slava Akhmechet","module":"dist/ts-parsec.esm.js","size-limit":[{"path":"dist/ts-parsec.cjs.production.min.js","limit":"10 KB"},{"path":"dist/ts-parsec.esm.js","limit":"10 KB"}],"devDependencies":{"@size-limit/preset-small-lib":"^11.1.6","husky":"^9.1.6","size-limit":"^11.1.6","tsdx":"^0.14.1","tslib":"^2.7.0","typescript":"^3.9.10"}}
+{
+  "name": "@spakhm/ts-parsec",
+  "version": "0.2.0",
+  "license": "MIT",
+  "author": "Slava Akhmechet",
+  "type": "module",
+  "main": "dist/index.js",
+  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "files": ["dist", "src"],
+  "scripts": {
+    "build": "bun build ./src/index.ts --outdir ./dist --target node && bun run build:types",
+    "build:types": "tsc --emitDeclarationOnly",
+    "test": "bun test",
+    "prepublishOnly": "bun run build"
+  },
+  "devDependencies": {
+    "@types/bun": "^1.1.14",
+    "typescript": "^5.7.2"
+  },
+  "prettier": {
+    "printWidth": 80,
+    "semi": true,
+    "singleQuote": true,
+    "trailingComma": "es5"
+  }
+}

package/src/lib.ts

@@ -97,7 +97,7 @@ export const upper = range('A', 'Z');
 export const alpha = either(lower, upper);
 export const alnum = either(alpha, digit);
 
-export const sepBy = <T, U>(item: parserlike<T>, sep: parserlike<U>, allowTrailingSep: boolean = true): parser<T[]> =>
+export const sepBy = <T, U>(item: parserlike<T>, sep: parserlike<U>, trailingSep: 'allow' | 'forbid' | 'require' = 'allow'): parser<T[]> =>
   toParser((source: stream) => {
     const res: T[] = [];
 
@@ -111,18 +111,25 @@ export const sepBy = <T, U>(item: parserlike<T>, sep: parserlike<U>, allowTraili
     while (true) {
       const sepres_ = attempt(sep)(source);
       if (sepres_.type == 'err') {
-        return ok(res);
+        return trailingSep === 'require' ? err(0, 0, '') : ok(res);
       }
-  
+
       const res_ = attempt(item)(source);
       if (res_.type == 'err') {
-        return allowTrailingSep ? ok(res) : err(0, 0, '');
+        return trailingSep === 'forbid' ? err(0, 0, '') : ok(res);
       } else {
         res.push(res_.res);
       }
     }
   });
 
+export const sepBy1 = <T, U>(item: parserlike<T>, sep: parserlike<U>, trailingSep: 'allow' | 'forbid' | 'require' = 'allow'): parser<T[]> =>
+  toParser((source: stream) => {
+    const res = sepBy(item, sep, trailingSep)(source);
+    if (res.type == 'err') return res;
+    return res.res.length >= 1 ? res : err(0, 0, '');
+  });
+
 export function binop<O, D, N>(
   operator: parserlike<O>,
   operand: parserlike<D>,
@@ -179,7 +186,15 @@ export const peek = <T>(p: parserlike<T>) => toParser((source: stream) => {
   return res;
 });
 
-export const anych = toParser((source: stream) => {
+export const anych = (opts?: { but: parserlike<unknown> }) => toParser((source: stream) => {
+  if (opts?.but) {
+    const res = peek(opts.but)(source);
+    if (res.type == 'ok') {
+      return err(0, 0, "");
+    }
+  }
   const res = source.next()
   return res ? ok(res) : err(0, 0, "");
 });
+
+export const eof = not(anych());