@thi.ng/parse 2.4.62 → 2.4.64

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2024-12-27T14:11:37Z
+- **Last updated**: 2025-01-14T12:23:33Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.
@@ -9,6 +9,12 @@ See [Conventional Commits](https://conventionalcommits.org/) for commit guidelin
 **Note:** Unlisted _patch_ versions only involve non-code or otherwise excluded changes
 and/or version bumps of transitive dependencies.
 
+### [2.4.64](https://github.com/thi-ng/umbrella/tree/@thi.ng/parse@2.4.64) (2025-01-14)
+
+#### ♻️ Refactoring
+
+- various minor updates ([42ce3f6](https://github.com/thi-ng/umbrella/commit/42ce3f6))
+
 ### [2.4.52](https://github.com/thi-ng/umbrella/tree/@thi.ng/parse@2.4.52) (2024-08-29)
 
 #### ⏱ Performance improvements

package/README.md

@@ -657,4 +657,4 @@ If this project contributes to an academic publication, please cite it as:
 
 ## License
 
-© 2020 - 2024 Karsten Schmidt // Apache License 2.0
+© 2020 - 2025 Karsten Schmidt // Apache License 2.0

package/context.js

@@ -88,8 +88,7 @@ class ParseContext {
     );
     child.state = this._retain ? parent.state.copy() : null;
     parent.state = cstate;
-    const children = parent.children;
-    children ? children.push(child) : parent.children = [child];
+    parent.children?.push(child) ?? (parent.children = [child]);
     this._curr = parent;
     return true;
   }
@@ -104,8 +103,7 @@ class ParseContext {
     this._debug && console.log(
       `${__indent(this._scopes.length + 1)}addChild: ${id} (${curr.state.p})`
     );
-    const children = curr.children;
-    children ? children.push(child) : curr.children = [child];
+    curr.children?.push(child) ?? (curr.children = [child]);
     if (newState !== false) {
       newState === true ? this.reader.next(curr.state) : this._curr.state = newState;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/parse",
-  "version": "2.4.62",
+  "version": "2.4.64",
   "description": "Purely functional parser combinators & AST generation for generic inputs",
   "type": "module",
   "module": "./index.js",
@@ -40,11 +40,11 @@
     "tool:tangle": "../../node_modules/.bin/tangle src/**/*.ts"
   },
   "dependencies": {
-    "@thi.ng/api": "^8.11.15",
-    "@thi.ng/checks": "^3.6.17",
-    "@thi.ng/defmulti": "^3.0.53",
-    "@thi.ng/errors": "^2.5.21",
-    "@thi.ng/strings": "^3.8.13"
+    "@thi.ng/api": "^8.11.16",
+    "@thi.ng/checks": "^3.6.19",
+    "@thi.ng/defmulti": "^3.0.55",
+    "@thi.ng/errors": "^2.5.22",
+    "@thi.ng/strings": "^3.9.0"
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.48.1",
@@ -246,5 +246,5 @@
     ],
     "year": 2020
   },
-  "gitHead": "48bf4c22bf23f88ac99f435106af2214f79a0be1\n"
+  "gitHead": "6542b842120bef47cc18d45a1b1db68307a7f04b\n"
 }

package/prims/anchor.js

@@ -1,18 +1,14 @@
 import { ALPHA_NUM } from "@thi.ng/strings/groups";
-const anchor = (fn) => (ctx) => {
-  const state = ctx.state;
-  return fn(state.last, state.done ? null : ctx.reader.read(state));
-};
+const anchor = (fn) => ({ reader, state }) => fn(state.last, state.done ? null : reader.read(state));
 const inputStart = (ctx) => ctx.state.last == null;
-const inputEnd = (ctx) => ctx.state.done || ctx.reader.read(ctx.state) === void 0;
+const inputEnd = ({ reader, state }) => state.done || reader.read(state) === void 0;
 const lineStart = (ctx) => {
   const l = ctx.state.last;
   return l == null || l === "\n" || l === "\r";
 };
-const lineEnd = (ctx) => {
-  const state = ctx.state;
+const lineEnd = ({ reader, state }) => {
   let c;
-  return state.done || (c = ctx.reader.read(state)) === "\n" || c === "\r";
+  return state.done || (c = reader.read(state)) === "\n" || c === "\r";
 };
 const wordBoundaryP = (prev, next) => {
   return prev ? next ? ALPHA_NUM[prev] && !ALPHA_NUM[next] : ALPHA_NUM[prev] : next ? ALPHA_NUM[next] : false;

package/prims/lit.js

@@ -1,7 +1,7 @@
 import { satisfyD, satisfy } from "./satisfy.js";
 const litP = (c) => (x) => x === c;
-const lit = (c, id = "lit") => satisfy(litP(c), id);
-const litD = (c) => satisfyD(litP(c));
+const lit = (c, id = "lit") => satisfy((x) => x === c, id);
+const litD = (c) => satisfyD((x) => x === c);
 export {
   lit,
   litD,

package/prims/none-of.js

@@ -1,7 +1,7 @@
 import { isPlainObject } from "@thi.ng/checks/is-plain-object";
 import { isSet } from "@thi.ng/checks/is-set";
 import { satisfy, satisfyD } from "./satisfy.js";
-const noneOfP = (opts) => isSet(opts) ? (x) => !opts.has(x) : isPlainObject(opts) ? (x) => !opts[x] : (x) => opts.indexOf(x) < 0;
+const noneOfP = (opts) => isSet(opts) ? (x) => !opts.has(x) : isPlainObject(opts) ? (x) => !opts[x] : (x) => !opts.includes(x);
 function noneOf(opts, id = "noneOf") {
   return satisfy(noneOfP(opts), id);
 }

package/prims/one-of.js

@@ -1,7 +1,7 @@
 import { isPlainObject } from "@thi.ng/checks/is-plain-object";
 import { isSet } from "@thi.ng/checks/is-set";
 import { satisfy, satisfyD } from "./satisfy.js";
-const oneOfP = (opts) => isSet(opts) ? (x) => opts.has(x) : isPlainObject(opts) ? (x) => opts[x] : (x) => opts.indexOf(x) >= 0;
+const oneOfP = (opts) => isSet(opts) ? (x) => opts.has(x) : isPlainObject(opts) ? (x) => opts[x] : (x) => opts.includes(x);
 function oneOf(opts, id = "oneOf") {
   return satisfy(oneOfP(opts), id);
 }

package/prims/satisfy.js

@@ -5,8 +5,7 @@ const satisfy = (pred, id = "satisfy") => (ctx) => {
 };
 const satisfyD = (pred) => (ctx) => {
   if (ctx.done) return false;
-  const state = ctx.state;
-  const reader = ctx.reader;
+  const { reader, state } = ctx;
   return pred(reader.read(state)) ? (reader.next(state), true) : false;
 };
 export {

package/prims/string.js

@@ -5,8 +5,7 @@ const string = (str, id = "string") => (ctx) => {
   const reader = ctx.reader;
   for (let i = 0, n = str.length; i < n; i++) {
     if (state.done) return false;
-    const r = reader.read(state);
-    if (r !== str[i]) {
+    if (reader.read(state) !== str[i]) {
       return ctx.discard();
     }
     reader.next(state);
@@ -20,8 +19,7 @@ const stringD = (str) => (ctx) => {
   const reader = ctx.reader;
   for (let i = 0, n = str.length; i < n; i++) {
     if (state.done) return false;
-    const r = reader.read(state);
-    if (r !== str[i]) {
+    if (reader.read(state) !== str[i]) {
       return false;
     }
     reader.next(state);