@thi.ng/pointfree 2.0.36 → 3.0.3

package/CHANGELOG.md

@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [2.0.36](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@2.0.35...@thi.ng/pointfree@2.0.36) (2021-09-03)
+## [3.0.3](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@3.0.2...@thi.ng/pointfree@3.0.3) (2021-10-15)
 
 **Note:** Version bump only for package @thi.ng/pointfree
 
@@ -11,149 +11,169 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [2.0.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@1.3.3...@thi.ng/pointfree@2.0.0) (2020-04-16)
+## [3.0.2](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@3.0.1...@thi.ng/pointfree@3.0.2) (2021-10-15)
+
+**Note:** Version bump only for package @thi.ng/pointfree
+
+
+
+
+
+## [3.0.1](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@3.0.0...@thi.ng/pointfree@3.0.1) (2021-10-13)
+
+**Note:** Version bump only for package @thi.ng/pointfree
+
 
 
-### Features
 
-* **pointfree:** add new words, rename HOF words ([0d19c9a](https://github.com/thi-ng/umbrella/commit/0d19c9a23de3fc4188d8d0329783211f5013716b)), closes [#210](https://github.com/thi-ng/umbrella/issues/210)
+
+# [3.0.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@2.0.36...@thi.ng/pointfree@3.0.0) (2021-10-12)
+
+
+### Build System
+
+* major update of ALL pkgs (export maps, ESM only) ([0d1d6ea](https://github.com/thi-ng/umbrella/commit/0d1d6ea9fab2a645d6c5f2bf2591459b939c09b6))
 
 
 ### BREAKING CHANGES
 
-* **pointfree:** rename HOF words
+* discontinue CommonJS & UMD versions
 
+- only ESM modules will be published from now on
+- CJS obsolete due to ESM support in recent versions of node:
+  - i.e. launch NodeJS via:
+  - `node --experimental-specifier-resolution=node --experimental-repl-await`
+  - in the node REPL use `await import(...)` instead of `require()`
+- UMD obsolete due to widespread browser support for ESM
 
+Also:
+- normalize/restructure/reorg all package.json files
+- cleanup all build scripts, remove obsolete
+- switch from mocha to @thi.ng/testament for all tests
 
 
 
-# [1.3.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@1.2.10...@thi.ng/pointfree@1.3.0) (2020-03-29)
 
 
-### Features
 
-* **pointfree:** add $try word, update compile() to allow empty quotations ([41de106](https://github.com/thi-ng/umbrella/commit/41de106e776ad102e827ccc062a19a4e637613a0))
-* **pointfree:** add tojson()/fromjson() conversion ops ([829f3ab](https://github.com/thi-ng/umbrella/commit/829f3ab129084619c05b434732b46b6c26d32b5e))
-* **pointfree:** add whenq(), ismatch() ([44ab1d7](https://github.com/thi-ng/umbrella/commit/44ab1d7f5ff52a9226b873b42adada3eac1674e9))
+#  [2.0.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@1.3.3...@thi.ng/pointfree@2.0.0) (2020-04-16) 
 
+###  Features 
 
+- **pointfree:** add new words, rename HOF words ([0d19c9a](https://github.com/thi-ng/umbrella/commit/0d19c9a23de3fc4188d8d0329783211f5013716b)), closes [#210](https://github.com/thi-ng/umbrella/issues/210) 
 
+###  BREAKING CHANGES 
 
+- **pointfree:** rename HOF words 
 
-# [1.2.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@1.1.3...@thi.ng/pointfree@1.2.0) (2019-08-21)
+#  [1.3.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@1.2.10...@thi.ng/pointfree@1.3.0) (2020-03-29) 
 
-### Features
+###  Features 
 
-* **pointfree:** add new r-stack words, refactor ([dbad162](https://github.com/thi-ng/umbrella/commit/dbad162))
+- **pointfree:** add $try word, update compile() to allow empty quotations ([41de106](https://github.com/thi-ng/umbrella/commit/41de106e776ad102e827ccc062a19a4e637613a0)) 
+- **pointfree:** add tojson()/fromjson() conversion ops ([829f3ab](https://github.com/thi-ng/umbrella/commit/829f3ab129084619c05b434732b46b6c26d32b5e)) 
+- **pointfree:** add whenq(), ismatch() ([44ab1d7](https://github.com/thi-ng/umbrella/commit/44ab1d7f5ff52a9226b873b42adada3eac1674e9)) 
 
-# [1.1.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@1.0.14...@thi.ng/pointfree@1.1.0) (2019-07-07)
+#  [1.2.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@1.1.3...@thi.ng/pointfree@1.2.0) (2019-08-21) 
 
-### Features
+###  Features 
 
-* **pointfree:** enable TS strict compiler flags (refactor) ([1f9d155](https://github.com/thi-ng/umbrella/commit/1f9d155))
+- **pointfree:** add new r-stack words, refactor ([dbad162](https://github.com/thi-ng/umbrella/commit/dbad162)) 
 
-## [1.0.14](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@1.0.13...@thi.ng/pointfree@1.0.14) (2019-05-22)
+#  [1.1.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@1.0.14...@thi.ng/pointfree@1.1.0) (2019-07-07) 
 
-### Bug Fixes
+###  Features 
 
-* **pointfree:** update safeMode handling ([d27bcba](https://github.com/thi-ng/umbrella/commit/d27bcba))
+- **pointfree:** enable TS strict compiler flags (refactor) ([1f9d155](https://github.com/thi-ng/umbrella/commit/1f9d155)) 
 
-# [1.0.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@0.8.15...@thi.ng/pointfree@1.0.0) (2019-01-21)
+##  [1.0.14](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@1.0.13...@thi.ng/pointfree@1.0.14) (2019-05-22) 
 
-### Build System
+###  Bug Fixes 
 
-* update package build scripts & outputs, imports in ~50 packages ([b54b703](https://github.com/thi-ng/umbrella/commit/b54b703))
+- **pointfree:** update safeMode handling ([d27bcba](https://github.com/thi-ng/umbrella/commit/d27bcba)) 
 
-### BREAKING CHANGES
+#  [1.0.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@0.8.15...@thi.ng/pointfree@1.0.0) (2019-01-21) 
+
+###  Build System 
+
+- update package build scripts & outputs, imports in ~50 packages ([b54b703](https://github.com/thi-ng/umbrella/commit/b54b703)) 
 
-* enabled multi-outputs (ES6 modules, CJS, UMD)
+###  BREAKING CHANGES 
 
-- build scripts now first build ES6 modules in package root, then call
-  `scripts/bundle-module` to build minified CJS & UMD bundles in `/lib`
-- all imports MUST be updated to only refer to package level
-  (not individual files anymore). tree shaking in user land will get rid of
-  all unused imported symbols.
+- enabled multi-outputs (ES6 modules, CJS, UMD) 
+- build scripts now first build ES6 modules in package root, then call   `scripts/bundle-module` to build minified CJS & UMD bundles in `/lib` 
+- all imports MUST be updated to only refer to package level   (not individual files anymore). tree shaking in user land will get rid of   all unused imported symbols. 
 
-<a name="0.8.0"></a>
-# [0.8.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@0.7.10...@thi.ng/pointfree@0.8.0) (2018-05-13)
+#  [0.8.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@0.7.10...@thi.ng/pointfree@0.8.0) (2018-05-13) 
 
-### Features
+###  Features 
 
-* **pointfree:** add execjs for host calls, update readme ([373701b](https://github.com/thi-ng/umbrella/commit/373701b))
+- **pointfree:** add execjs for host calls, update readme ([373701b](https://github.com/thi-ng/umbrella/commit/373701b)) 
 
-<a name="0.7.9"></a>
-## [0.7.9](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@0.7.8...@thi.ng/pointfree@0.7.9) (2018-05-10)
+##  [0.7.9](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@0.7.8...@thi.ng/pointfree@0.7.9) (2018-05-10) 
 
-### Bug Fixes
+###  Bug Fixes 
 
-* **pointfree:** minor update error handling ([5391d98](https://github.com/thi-ng/umbrella/commit/5391d98))
+- **pointfree:** minor update error handling ([5391d98](https://github.com/thi-ng/umbrella/commit/5391d98)) 
 
-<a name="0.7.0"></a>
-# [0.7.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@0.6.2...@thi.ng/pointfree@0.7.0) (2018-04-03)
+#  [0.7.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@0.6.2...@thi.ng/pointfree@0.7.0) (2018-04-03) 
 
-### Features
+###  Features 
 
-* **pointfree:** add copy() word ([68a8dba](https://github.com/thi-ng/umbrella/commit/68a8dba))
-* **pointfree:** add math ops, update load/loadkey, update tests ([2101e92](https://github.com/thi-ng/umbrella/commit/2101e92))
+- **pointfree:** add copy() word ([68a8dba](https://github.com/thi-ng/umbrella/commit/68a8dba)) 
+- **pointfree:** add math ops, update load/loadkey, update tests ([2101e92](https://github.com/thi-ng/umbrella/commit/2101e92)) 
 
-<a name="0.6.1"></a>
-## [0.6.1](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@0.6.0...@thi.ng/pointfree@0.6.1) (2018-03-31)
+##  [0.6.1](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@0.6.0...@thi.ng/pointfree@0.6.1) (2018-03-31) 
 
-### Bug Fixes
+###  Bug Fixes 
 
-* **pointfree:** reexport ensureStack fns ([a0bf781](https://github.com/thi-ng/umbrella/commit/a0bf781))
+- **pointfree:** reexport ensureStack fns ([a0bf781](https://github.com/thi-ng/umbrella/commit/a0bf781)) 
 
-<a name="0.6.0"></a>
-# [0.6.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@0.5.0...@thi.ng/pointfree@0.6.0) (2018-03-31)
+#  [0.6.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@0.5.0...@thi.ng/pointfree@0.6.0) (2018-03-31) 
 
-### Features
+###  Features 
 
-* **pointfree:** add caseq() ([5db90c5](https://github.com/thi-ng/umbrella/commit/5db90c5))
+- **pointfree:** add caseq() ([5db90c5](https://github.com/thi-ng/umbrella/commit/5db90c5)) 
 
-<a name="0.5.0"></a>
-# [0.5.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@0.4.0...@thi.ng/pointfree@0.5.0) (2018-03-29)
+#  [0.5.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@0.4.0...@thi.ng/pointfree@0.5.0) (2018-03-29) 
 
-### Features
+###  Features 
 
-* **pointfree:** add combinators, update controlflow words, remove execq ([3dc30a8](https://github.com/thi-ng/umbrella/commit/3dc30a8))
-* **pointfree:** add more dataflow combinators, words & tests ([b096e43](https://github.com/thi-ng/umbrella/commit/b096e43))
+- **pointfree:** add combinators, update controlflow words, remove execq ([3dc30a8](https://github.com/thi-ng/umbrella/commit/3dc30a8)) 
+- **pointfree:** add more dataflow combinators, words & tests ([b096e43](https://github.com/thi-ng/umbrella/commit/b096e43)) 
 
-<a name="0.4.0"></a>
-# [0.4.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@0.3.0...@thi.ng/pointfree@0.4.0) (2018-03-29)
+#  [0.4.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@0.3.0...@thi.ng/pointfree@0.4.0) (2018-03-29) 
 
-### Features
+###  Features 
 
-* **pointfree:** add new words, constructs, aliases, fix re-exports ([943b4f9](https://github.com/thi-ng/umbrella/commit/943b4f9))
+- **pointfree:** add new words, constructs, aliases, fix re-exports ([943b4f9](https://github.com/thi-ng/umbrella/commit/943b4f9)) 
 
-<a name="0.3.0"></a>
-# [0.3.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@0.2.1...@thi.ng/pointfree@0.3.0) (2018-03-28)
+#  [0.3.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@0.2.1...@thi.ng/pointfree@0.3.0) (2018-03-28) 
 
-### Bug Fixes
+###  Bug Fixes 
 
-* **pointfree:** add 0-arity comp() (identity fn) ([10d5a34](https://github.com/thi-ng/umbrella/commit/10d5a34))
-* **pointfree:** wordU(), add tests ([1a01f9a](https://github.com/thi-ng/umbrella/commit/1a01f9a))
+- **pointfree:** add 0-arity comp() (identity fn) ([10d5a34](https://github.com/thi-ng/umbrella/commit/10d5a34)) 
+- **pointfree:** wordU(), add tests ([1a01f9a](https://github.com/thi-ng/umbrella/commit/1a01f9a)) 
 
-### Features
+###  Features 
 
-* **pointfree:** add new words, rename words, remove mapnth, pushl2 ([0f0c382](https://github.com/thi-ng/umbrella/commit/0f0c382))
-* **pointfree:** add rstack, update StackContext ([1c4cd2f](https://github.com/thi-ng/umbrella/commit/1c4cd2f))
-* **pointfree:** further restructure, perf, add tests ([3252554](https://github.com/thi-ng/umbrella/commit/3252554))
-* **pointfree:** major refactor & restructure ([a48361d](https://github.com/thi-ng/umbrella/commit/a48361d))
-* **pointfree:** major update readme, package ([e52b869](https://github.com/thi-ng/umbrella/commit/e52b869))
-* **pointfree:** update all words to return stack ([79b4ce3](https://github.com/thi-ng/umbrella/commit/79b4ce3))
-* **pointfree:** update word/wordU, add append(), tuple(), join() ([f3f0bec](https://github.com/thi-ng/umbrella/commit/f3f0bec))
+- **pointfree:** add new words, rename words, remove mapnth, pushl2 ([0f0c382](https://github.com/thi-ng/umbrella/commit/0f0c382)) 
+- **pointfree:** add rstack, update StackContext ([1c4cd2f](https://github.com/thi-ng/umbrella/commit/1c4cd2f)) 
+- **pointfree:** further restructure, perf, add tests ([3252554](https://github.com/thi-ng/umbrella/commit/3252554)) 
+- **pointfree:** major refactor & restructure ([a48361d](https://github.com/thi-ng/umbrella/commit/a48361d)) 
+- **pointfree:** major update readme, package ([e52b869](https://github.com/thi-ng/umbrella/commit/e52b869)) 
+- **pointfree:** update all words to return stack ([79b4ce3](https://github.com/thi-ng/umbrella/commit/79b4ce3)) 
+- **pointfree:** update word/wordU, add append(), tuple(), join() ([f3f0bec](https://github.com/thi-ng/umbrella/commit/f3f0bec)) 
 
-<a name="0.2.1"></a>
-## [0.2.1](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@0.2.0...@thi.ng/pointfree@0.2.1) (2018-03-23)
+##  [0.2.1](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@0.2.0...@thi.ng/pointfree@0.2.1) (2018-03-23) 
 
-### Bug Fixes
+###  Bug Fixes 
 
-* **pointfree:** fix readme/docs ([f211c39](https://github.com/thi-ng/umbrella/commit/f211c39))
+- **pointfree:** fix readme/docs ([f211c39](https://github.com/thi-ng/umbrella/commit/f211c39)) 
 
-<a name="0.2.0"></a>
-# [0.2.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@0.1.0...@thi.ng/pointfree@0.2.0) (2018-03-23)
+#  [0.2.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/pointfree@0.1.0...@thi.ng/pointfree@0.2.0) (2018-03-23) 
 
-### Features
+###  Features 
 
-* **pointfree:** add unwrap, quatations, math/bitops, array/obj access ([f75486d](https://github.com/thi-ng/umbrella/commit/f75486d))
-* **pointfree:** support data vals in program, add collect(), update readme ([6cac0c7](https://github.com/thi-ng/umbrella/commit/6cac0c7))
+- **pointfree:** add unwrap, quatations, math/bitops, array/obj access ([f75486d](https://github.com/thi-ng/umbrella/commit/f75486d)) 
+- **pointfree:** support data vals in program, add collect(), update readme ([6cac0c7](https://github.com/thi-ng/umbrella/commit/6cac0c7))

package/README.md

@@ -198,15 +198,24 @@ non-linear control flow.
 yarn add @thi.ng/pointfree
 ```
 
+ES module import:
+
 ```html
-// ES module
-<script type="module" src="https://unpkg.com/@thi.ng/pointfree?module" crossorigin></script>
+<script type="module" src="https://cdn.skypack.dev/@thi.ng/pointfree"></script>
+```
+
+[Skypack documentation](https://docs.skypack.dev/)
+
+For Node.js REPL:
+
+```text
+# with flag only for < v16
+node --experimental-repl-await
 
-// UMD
-<script src="https://unpkg.com/@thi.ng/pointfree/lib/index.umd.js" crossorigin></script>
+> const pointfree = await import("@thi.ng/pointfree");
 ```
 
-Package sizes (gzipped, pre-treeshake): ESM: 3.32 KB / CJS: 3.86 KB / UMD: 3.58 KB
+Package sizes (gzipped, pre-treeshake): ESM: 3.33 KB
 
 ## Dependencies
 

package/array.d.ts

@@ -1,4 +1,4 @@
-import type { StackContext, StackFn } from "./api";
+import type { StackContext, StackFn } from "./api.js";
 /**
  * Pushes a new empty array on the d-stack. While it's easily possible to
  * use `[]` as part of a stack program, the `list` word is intended to

package/array.js

@@ -1,9 +1,11 @@
-import { isArray, isPlainObject } from "@thi.ng/checks";
-import { illegalArgs, illegalState } from "@thi.ng/errors";
-import { defOp1, defOp2, defOp2v } from "./ops";
-import { $, $n } from "./safe";
-import { invrot, swap } from "./stack";
-import { $stackFn, defWord } from "./word";
+import { isArray } from "@thi.ng/checks/is-array";
+import { isPlainObject } from "@thi.ng/checks/is-plain-object";
+import { illegalArgs } from "@thi.ng/errors/illegal-arguments";
+import { illegalState } from "@thi.ng/errors/illegal-state";
+import { defOp1, defOp2, defOp2v } from "./ops.js";
+import { $, $n } from "./safe.js";
+import { invrot, swap } from "./stack.js";
+import { $stackFn, defWord } from "./word.js";
 //////////////////// Array / list ops  ////////////////////
 /**
  * Pushes a new empty array on the d-stack. While it's easily possible to
@@ -318,7 +320,8 @@ export const length = defOp1((x) => x.length);
 export const copy = defOp1((x) => isArray(x)
     ? x.slice()
     : isPlainObject(x)
-        ? Object.assign({}, x) : illegalArgs(`can't copy type ${typeof x}`));
+        ? { ...x }
+        : illegalArgs(`can't copy type ${typeof x}`));
 /**
  * Reads key/index from object/array.
  *

package/binary.d.ts

@@ -3,41 +3,41 @@
  *
  * @param ctx -
  */
-export declare const bitand: (ctx: import("./api").StackContext) => import("./api").StackContext;
+export declare const bitand: (ctx: import("./api.js").StackContext) => import("./api.js").StackContext;
 /**
  * ( x y -- x|y )
  *
  * @param ctx -
  */
-export declare const bitor: (ctx: import("./api").StackContext) => import("./api").StackContext;
+export declare const bitor: (ctx: import("./api.js").StackContext) => import("./api.js").StackContext;
 /**
  * ( x y -- x^y )
  *
  * @param ctx -
  */
-export declare const bitxor: (ctx: import("./api").StackContext) => import("./api").StackContext;
+export declare const bitxor: (ctx: import("./api.js").StackContext) => import("./api.js").StackContext;
 /**
  * ( x -- ~x )
  *
  * @param ctx -
  */
-export declare const bitnot: (ctx: import("./api").StackContext) => import("./api").StackContext;
+export declare const bitnot: (ctx: import("./api.js").StackContext) => import("./api.js").StackContext;
 /**
  * ( x y -- x<<y )
  *
  * @param ctx -
  */
-export declare const lsl: (ctx: import("./api").StackContext) => import("./api").StackContext;
+export declare const lsl: (ctx: import("./api.js").StackContext) => import("./api.js").StackContext;
 /**
  * ( x y -- x>>y )
  *
  * @param ctx -
  */
-export declare const lsr: (ctx: import("./api").StackContext) => import("./api").StackContext;
+export declare const lsr: (ctx: import("./api.js").StackContext) => import("./api.js").StackContext;
 /**
  * ( x y -- x>>>y )
  *
  * @param ctx -
  */
-export declare const lsru: (ctx: import("./api").StackContext) => import("./api").StackContext;
+export declare const lsru: (ctx: import("./api.js").StackContext) => import("./api.js").StackContext;
 //# sourceMappingURL=binary.d.ts.map

package/binary.js

@@ -1,4 +1,4 @@
-import { defOp1, defOp2 } from "./ops";
+import { defOp1, defOp2 } from "./ops.js";
 //////////////////// Binary ops ////////////////////
 /**
  * ( x y -- x&y )

package/cond.d.ts

@@ -1,5 +1,5 @@
 import type { IObjectOf } from "@thi.ng/api";
-import type { StackContext, StackProc } from "./api";
+import type { StackContext, StackProc } from "./api.js";
 /**
  * Higher order word. Takes two stack programs: truthy and falsey
  * branches, respectively. When executed, pops TOS and runs only one of

package/cond.js

@@ -1,7 +1,7 @@
-import { illegalState } from "@thi.ng/errors";
-import { $ } from "./safe";
-import { nop } from "./stack";
-import { $stackFn } from "./word";
+import { illegalState } from "@thi.ng/errors/illegal-state";
+import { $ } from "./safe.js";
+import { nop } from "./stack.js";
+import { $stackFn } from "./word.js";
 //////////////////// Conditionals  ////////////////////
 /**
  * Higher order word. Takes two stack programs: truthy and falsey
@@ -16,7 +16,10 @@ import { $stackFn } from "./word";
  * @param _then -
  * @param _else -
  */
-export const defCond = (_then, _else = nop) => (ctx) => ($(ctx[0], 1), $stackFn(ctx[0].pop() ? _then : _else)(ctx));
+export const defCond = (_then, _else = nop) => (ctx) => {
+    $(ctx[0], 1);
+    return $stackFn(ctx[0].pop() ? _then : _else)(ctx);
+};
 /**
  * Non-HOF version of {@link cond}, expects `test` result and both branches on
  * d-stack. Executes `thenq` word/quotation if `test` is truthy, else

package/context.d.ts

@@ -1,4 +1,4 @@
-import type { Stack, StackContext, StackEnv } from "./api";
+import type { Stack, StackContext, StackEnv } from "./api.js";
 /**
  * Creates a new StackContext tuple from given d-stack and/or
  * environment only (the r-stack is always initialized empty).

package/dataflow.d.ts

@@ -1,4 +1,4 @@
-import type { StackContext } from "./api";
+import type { StackContext } from "./api.js";
 /**
  * Removes `x` from d-stack, calls `q` and restores `x` to the top of
  * the d-stack after quotation is finished.
@@ -17,131 +17,131 @@ export declare const dip: (ctx: StackContext) => StackContext;
  *
  * ( x y q -- x y )
  */
-export declare const dip2: import("./api").StackFn;
+export declare const dip2: import("./api.js").StackFn;
 /**
  * Removes `x y z` from d-stack, calls `q` and restores removed
  * vals to the top of the d-stack after quotation is finished.
  *
  * ( x y z q -- x y z )
  */
-export declare const dip3: import("./api").StackFn;
+export declare const dip3: import("./api.js").StackFn;
 /**
  * Removes `x y z w` from d-stack, calls `q` and restores removed
  * vals to the top of the d-stack after quotation is finished.
  *
  * ( x y z w q -- x y z w )
  */
-export declare const dip4: import("./api").StackFn;
+export declare const dip4: import("./api.js").StackFn;
 /**
  * Calls a quotation with a value on the d-stack, restoring the value
  * after quotation finished.
  *
  * ( x q -- .. x )
  */
-export declare const keep: import("./api").StackFn;
+export declare const keep: import("./api.js").StackFn;
 /**
  * Call a quotation with two values on the stack, restoring the values
  * after quotation finished.
  *
  * ( x y q -- .. x y )
  */
-export declare const keep2: import("./api").StackFn;
+export declare const keep2: import("./api.js").StackFn;
 /**
  * Call a quotation with three values on the stack, restoring the values
  * after quotation finished.
  *
  * ( x y z q -- .. x y z )
  */
-export declare const keep3: import("./api").StackFn;
+export declare const keep3: import("./api.js").StackFn;
 /**
  * First applies `p` to the value `x`, then applies `q` to the same
  * value.
  *
  * ( x p q -- px qx )
  */
-export declare const bi: import("./api").StackFn;
+export declare const bi: import("./api.js").StackFn;
 /**
  * First applies `p` to the two input values `x y`, then applies `q` to
  * the same values.
  *
  * ( x y p q -- pxy qxy )
  */
-export declare const bi2: import("./api").StackFn;
+export declare const bi2: import("./api.js").StackFn;
 /**
  * First applies `p` to the three input values `x y z`, then applies `q`
  * to the same values.
  *
  * ( x y z p q -- pxyz qxyz )
  */
-export declare const bi3: import("./api").StackFn;
+export declare const bi3: import("./api.js").StackFn;
 /**
  * Applies `p` to `x`, then `q` to `x`, and finally `r` to `x`
  *
  * ( x p q r -- px qx rx )
  */
-export declare const tri: import("./api").StackFn;
+export declare const tri: import("./api.js").StackFn;
 /**
  * Applies `p` to the two input values `x y`, then same with `q`, and
  * finally with `r`.
  *
  * ( x y p q r -- pxy qxy rxy )
  */
-export declare const tri2: import("./api").StackFn;
+export declare const tri2: import("./api.js").StackFn;
 /**
  * Applies `p` to the three input values `x y z`, then same with `q`,
  * and finally with `r`.
  *
  * ( x y z p q r -- pxyz qxyz rxyz )
  */
-export declare const tri3: import("./api").StackFn;
+export declare const tri3: import("./api.js").StackFn;
 /**
  * Applies `p` to `x`, then applies `q` to `y`.
  *
  * ( x y p q -- px qy )
  */
-export declare const bis: import("./api").StackFn;
+export declare const bis: import("./api.js").StackFn;
 /**
  * Applies `p` to `a b`, then applies `q` to `c d`.
  *
  * ( a b c d p q -- pab qcd )
  */
-export declare const bis2: import("./api").StackFn;
+export declare const bis2: import("./api.js").StackFn;
 /**
  * Applies `p` to `x`, then `q` to `y`, and finally `r` to `z`.
  *
  * ( x y z p q r -- )
  */
-export declare const tris: import("./api").StackFn;
+export declare const tris: import("./api.js").StackFn;
 /**
  * Applies `p` to `u v`, then `q` to `w x`, and finally `r` to `y z`.
  *
  * ( u v w x y z p q r -- puv qwx ryz )
  */
-export declare const tris2: import("./api").StackFn;
+export declare const tris2: import("./api.js").StackFn;
 /**
  * Applies the quotation `q` to `x`, then to `y`.
  *
  * ( x y q -- qx qy )
  */
-export declare const bia: import("./api").StackFn;
+export declare const bia: import("./api.js").StackFn;
 /**
  * Applies the quotation `q` to `x y`, then to `z w`.
  *
  * ( x y z w q -- qxy qzw )
  */
-export declare const bia2: import("./api").StackFn;
+export declare const bia2: import("./api.js").StackFn;
 /**
  * Applies the `q` to `x`, then to `y`, and finally to `z`.
  *
  * ( x y z q -- qx qy qz )
  */
-export declare const tria: import("./api").StackFn;
+export declare const tria: import("./api.js").StackFn;
 /**
  * Applies the quotation to `u v`, then to `w x`, and then to `y z`.
  *
  * ( u v w x y z q -- quv qwx qyz )
  */
-export declare const tria2: import("./api").StackFn;
+export declare const tria2: import("./api.js").StackFn;
 /**
  * Applies `q` individually to both input vals `x y` and combines
  * results with `and`. The final result will be true if both interim
@@ -149,7 +149,7 @@ export declare const tria2: import("./api").StackFn;
  *
  * ( x y q -- qx && qy )
  */
-export declare const both: import("./api").StackFn;
+export declare const both: import("./api.js").StackFn;
 /**
  * Applies `q` individually to both input vals `x y` and combines results with `or`.
  * The final result will be true if at least one of the interim results
@@ -157,5 +157,5 @@ export declare const both: import("./api").StackFn;
  *
  * ( x y q -- qx || qy )
  */
-export declare const either: import("./api").StackFn;
+export declare const either: import("./api.js").StackFn;
 //# sourceMappingURL=dataflow.d.ts.map

package/dataflow.js

@@ -1,7 +1,7 @@
-import { and, or } from "./logic";
-import { $ } from "./safe";
-import { dup, dup2, dup3, over, swap } from "./stack";
-import { $stackFn, defWord, exec } from "./word";
+import { and, or } from "./logic.js";
+import { $ } from "./safe.js";
+import { dup, dup2, dup3, over, swap } from "./stack.js";
+import { $stackFn, defWord, exec } from "./word.js";
 //////////////////// Dataflow combinators  ////////////////////
 // these combinators have been ported from Factor:
 // http://docs.factorcode.org:8080/content/article-dataflow-combinators.html

package/env.d.ts

@@ -1,4 +1,4 @@
-import type { StackContext } from "./api";
+import type { StackContext } from "./api.js";
 /**
  * Pushes current env onto d-stack.
  *

package/env.js

@@ -1,5 +1,5 @@
-import { illegalArgs } from "@thi.ng/errors";
-import { $ } from "./safe";
+import { illegalArgs } from "@thi.ng/errors/illegal-arguments";
+import { $ } from "./safe.js";
 //////////////////// Environment  ////////////////////
 /**
  * Pushes current env onto d-stack.
@@ -61,4 +61,8 @@ export const defLoadKey = (key) => (ctx) => {
  * @param ctx -
  * @param env -
  */
-export const defStoreKey = (key) => (ctx) => ($(ctx[0], 1), (ctx[2][key] = ctx[0].pop()), ctx);
+export const defStoreKey = (key) => (ctx) => {
+    $(ctx[0], 1);
+    ctx[2][key] = ctx[0].pop();
+    return ctx;
+};