diff --git a/.gitignore b/.gitignore
index 3b7c9023b4..73fe25942e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,13 +5,15 @@ build
dev
doc
docs
+export
examples/dataflow-scenegraph
examples/hdc
examples/hdom-class
+examples/hdom-clj
+examples/ts-parse
.DS_Store
tachyons.min.css
bundle.*
-*.html
*.log
*.tgz
*.js
@@ -19,3 +21,5 @@ bundle.*
*.bak*
*.zip
/.gtm/
+
+packages/geom-accel
diff --git a/README.md b/README.md
index a4631f94e7..10565be7f0 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ All / most packages:
- auto-generated online documentation at [docs.thi.ng](http://docs.thi.ng)
- licensed under Apache Software License 2.0
-There's a steadily growing number (20+) of standalone examples
+There's a steadily growing number (30+) of standalone examples
(different difficulties, many combining functionality from several
packages) in the [examples](./examples) directory.
@@ -43,6 +43,7 @@ packages) in the [examples](./examples) directory.
| [`@thi.ng/associative`](./packages/associative) | [](https://www.npmjs.com/package/@thi.ng/associative) | [changelog](./packages/associative/CHANGELOG.md) | Alt Set & Map implementations |
| [`@thi.ng/atom`](./packages/atom) | [](https://www.npmjs.com/package/@thi.ng/atom) | [changelog](./packages/atom/CHANGELOG.md) | Immutable value wrappers, views, history |
| [`@thi.ng/bench`](./packages/bench) | [](https://www.npmjs.com/package/@thi.ng/bench) | [changelog](./packages/bench/CHANGELOG.md) | Basic benchmarking helpers |
+| [`@thi.ng/binary`](./packages/binary) | [](https://www.npmjs.com/package/@thi.ng/binary) | [changelog](./packages/binary/CHANGELOG.md) | Assorted binary / bitwise ops, utilities |
| [`@thi.ng/bitstream`](./packages/bitstream) | [](https://www.npmjs.com/package/@thi.ng/bitstream) | [changelog](./packages/bitstream/CHANGELOG.md) | Bitwise input / output streams |
| [`@thi.ng/cache`](./packages/cache) | [](https://www.npmjs.com/package/@thi.ng/cache) | [changelog](./packages/cache/CHANGELOG.md) | In-memory caches / strategies |
| [`@thi.ng/checks`](./packages/checks) | [](https://www.npmjs.com/package/@thi.ng/checks) | [changelog](./packages/checks/CHANGELOG.md) | Type & value checks |
@@ -52,9 +53,12 @@ packages) in the [examples](./examples) directory.
| [`@thi.ng/defmulti`](./packages/defmulti) | [](https://www.npmjs.com/package/@thi.ng/defmulti) | [changelog](./packages/defmulti/CHANGELOG.md) | Dynamic multiple dispatch |
| [`@thi.ng/dgraph`](./packages/dgraph) | [](https://www.npmjs.com/package/@thi.ng/dgraph) | [changelog](./packages/dgraph/CHANGELOG.md) | Dependency graph |
| [`@thi.ng/diff`](./packages/diff) | [](https://www.npmjs.com/package/@thi.ng/diff) | [changelog](./packages/diff/CHANGELOG.md) | Array & object diffing |
+| [`@thi.ng/dlogic`](./packages/dlogic) | [](https://www.npmjs.com/package/@thi.ng/dlogic) | [changelog](./packages/dlogic/CHANGELOG.md) | Digital logic ops / constructs |
| [`@thi.ng/dot`](./packages/dot) | [](https://www.npmjs.com/package/@thi.ng/dot) | [changelog](./packages/dot/CHANGELOG.md) | Graphviz DOM & export |
+| [`@thi.ng/dsp`](./packages/dsp) | [](https://www.npmjs.com/package/@thi.ng/dsp) | [changelog](./packages/dsp/CHANGELOG.md) | DSP utils, oscillators |
| [`@thi.ng/equiv`](./packages/equiv) | [](https://www.npmjs.com/package/@thi.ng/equiv) | [changelog](./packages/equiv/CHANGELOG.md) | Deep value equivalence checking |
| [`@thi.ng/errors`](./packages/errors) | [](https://www.npmjs.com/package/@thi.ng/errors) | [changelog](./packages/errors/CHANGELOG.md) | Custom error types |
+| [`@thi.ng/geom`](./packages/geom) | [](https://www.npmjs.com/package/@thi.ng/geom) | [changelog](./packages/geom/CHANGELOG.md) | Hiccup based VDOM & diffing |
| [`@thi.ng/hdom`](./packages/hdom) | [](https://www.npmjs.com/package/@thi.ng/hdom) | [changelog](./packages/hdom/CHANGELOG.md) | Hiccup based VDOM & diffing |
| [`@thi.ng/hdom-canvas`](./packages/hdom-canvas) | [](https://www.npmjs.com/package/@thi.ng/hdom-canvas) | [changelog](./packages/hdom-canvas/CHANGELOG.md) | hdom based declarative canvas drawing |
| [`@thi.ng/hdom-components`](./packages/hdom-components) | [](https://www.npmjs.com/package/@thi.ng/hdom-components) | [changelog](./packages/hdom-components/CHANGELOG.md) | hdom based UI components |
@@ -65,7 +69,9 @@ packages) in the [examples](./examples) directory.
| [`@thi.ng/iges`](./packages/iges) | [](https://www.npmjs.com/package/@thi.ng/iges) | [changelog](./packages/iges/CHANGELOG.md) | IGES format geometry serialization |
| [`@thi.ng/interceptors`](./packages/interceptors) | [](https://www.npmjs.com/package/@thi.ng/interceptors) | [changelog](./packages/interceptors/CHANGELOG.md) | Composable event handlers & processor |
| [`@thi.ng/iterators`](./packages/iterators) | [](https://www.npmjs.com/package/@thi.ng/iterators) | [changelog](./packages/iterators/CHANGELOG.md) | ES6 generators / iterators |
+| [`@thi.ng/math`](./packages/math) | [](https://www.npmjs.com/package/@thi.ng/math) | [changelog](./packages/math/CHANGELOG.md) | Assorted common math functions & utilities |
| [`@thi.ng/memoize`](./packages/memoize) | [](https://www.npmjs.com/package/@thi.ng/memoize) | [changelog](./packages/memoize/CHANGELOG.md) | Function memoization w/ customizable caching |
+| [`@thi.ng/morton`](./packages/morton) | [](https://www.npmjs.com/package/@thi.ng/morton) | [changelog](./packages/morton/CHANGELOG.md) | Z-order-curve / Morton coding |
| [`@thi.ng/paths`](./packages/paths) | [](https://www.npmjs.com/package/@thi.ng/paths) | [changelog](./packages/paths/CHANGELOG.md) | Immutable nested object accessors |
| [`@thi.ng/pointfree`](./packages/pointfree) | [](https://www.npmjs.com/package/@thi.ng/pointfree) | [changelog](./packages/pointfree/CHANGELOG.md) | stack-based DSL & functional composition |
| [`@thi.ng/pointfree-lang`](./packages/pointfree-lang) | [](https://www.npmjs.com/package/@thi.ng/pointfree-lang) | [changelog](./packages/pointfree-lang/CHANGELOG.md) | Forth-like syntax layer for @thi.ng/pointfree |
diff --git a/assets/dot/xml-converter.dot b/assets/dot/xml-converter.dot
new file mode 100644
index 0000000000..c4dd90e3d9
--- /dev/null
+++ b/assets/dot/xml-converter.dot
@@ -0,0 +1,34 @@
+digraph g {
+ rankdir=LR;
+ node[fontname="Inconsolata", fontsize="11"];
+ edge[arrowsize="0.75", fontname="Inconsolata", fontsize="9"];
+
+ rank=same {
+ prettyPrint;
+ doubleQuote;
+ trailingComma;
+ removeTags;
+ removeAttribs;
+ xml;
+ }
+
+ prettyPrint -> formatOpts;
+ doubleQuote -> formatOpts;
+ trailingComma -> formatOpts;
+
+ removeTags -> opts;
+ removeAttribs -> opts;
+ formatOpts -> opts;
+
+ xml -> main;
+ opts -> main;
+
+ main -> app -> ui;
+
+ ui -> xml[label="user", style=dashed];
+ ui -> prettyPrint[label="user", style=dashed];
+ ui -> doubleQuote[label="user", style=dashed];
+ ui -> trailingComma[label="user", style=dashed];
+ ui -> removeTags[label="user", style=dashed];
+ ui -> removeAttribs[label="user", style=dashed];
+}
\ No newline at end of file
diff --git a/assets/geom/chaikin-closed.svg b/assets/geom/chaikin-closed.svg
new file mode 100644
index 0000000000..c439bcea88
--- /dev/null
+++ b/assets/geom/chaikin-closed.svg
@@ -0,0 +1,72 @@
+
\ No newline at end of file
diff --git a/assets/geom/chaikin-open.svg b/assets/geom/chaikin-open.svg
new file mode 100644
index 0000000000..04c207342d
--- /dev/null
+++ b/assets/geom/chaikin-open.svg
@@ -0,0 +1,58 @@
+
\ No newline at end of file
diff --git a/assets/geom/tessel.svg b/assets/geom/tessel.svg
new file mode 100644
index 0000000000..ca7ab57ab7
--- /dev/null
+++ b/assets/geom/tessel.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/screenshots/xml-converter.png b/assets/screenshots/xml-converter.png
new file mode 100644
index 0000000000..16aa3ab321
Binary files /dev/null and b/assets/screenshots/xml-converter.png differ
diff --git a/assets/xml-converter.png b/assets/xml-converter.png
new file mode 100644
index 0000000000..ca95fc8e79
Binary files /dev/null and b/assets/xml-converter.png differ
diff --git a/examples/README.md b/examples/README.md
index 1007040b42..16dfc833c0 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -37,3 +37,4 @@ If you want to [contribute](../CONTRIBUTING.md) an example, please get in touch
| 29 | [transducers-hdom](./transducers-hdom) | Transducer & rstream based hdom UI updates | hdom, rstream, transducers-hdom | basic |
| 30 | [triple-query](./triple-query) | Triple store query results & sortable table | atom, hdom, hdom-components, rstream-query, transducers | intermediate |
| 31 | [webgl](./webgl) | Canvas component handling | hdom, hdom-components | basic |
+| 32 | [xml-converter](./xml-converter) | XML/HTML/SVG to hiccup conversion as you type | rstream, sax, transducers, transducers-hdom | advanced |
diff --git a/examples/async-effect/package.json b/examples/async-effect/package.json
index 0098aeece5..31052e68e8 100644
--- a/examples/async-effect/package.json
+++ b/examples/async-effect/package.json
@@ -6,9 +6,9 @@
"license": "Apache-2.0",
"scripts": {
"clean": "rm -rf .cache build out",
- "prepare": "yarn clean && mkdir -p out && cp foo.json out",
- "build": "yarn prepare && parcel build index.html -d out --no-source-maps --no-cache --detailed-report --public-url ./",
- "start": "yarn prepare && parcel index.html -p 8080 --open -d out"
+ "prep": "yarn clean && mkdir -p out && cp foo.json out",
+ "build": "yarn prep && parcel build index.html -d out --no-source-maps --no-cache --detailed-report --public-url ./",
+ "start": "yarn prep && parcel index.html -p 8080 --open -d out"
},
"devDependencies": {
"parcel-bundler": "^1.9.7",
diff --git a/examples/commit-table-ssr/.gitignore b/examples/commit-table-ssr/.gitignore
index 0c5abcab62..aa37efed9a 100644
--- a/examples/commit-table-ssr/.gitignore
+++ b/examples/commit-table-ssr/.gitignore
@@ -2,4 +2,5 @@
out
node_modules
yarn.lock
+table.html
*.js
diff --git a/examples/commit-table-ssr/commits.json b/examples/commit-table-ssr/commits.json
new file mode 100644
index 0000000000..0637a088a0
--- /dev/null
+++ b/examples/commit-table-ssr/commits.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/examples/commit-table-ssr/index.html b/examples/commit-table-ssr/index.html
new file mode 100644
index 0000000000..868c182c64
--- /dev/null
+++ b/examples/commit-table-ssr/index.html
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+ commit-table-hdom
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/examples/commit-table-ssr/package.json b/examples/commit-table-ssr/package.json
index eb6e093ae1..7de550e95a 100644
--- a/examples/commit-table-ssr/package.json
+++ b/examples/commit-table-ssr/package.json
@@ -6,9 +6,9 @@
"license": "Apache-2.0",
"scripts": {
"clean": "rm -rf .cache build out",
- "prepare": "yarn clean && mkdir -p out && cp commits.json out",
+ "prep": "yarn clean && mkdir -p out && cp commits.json out",
"build-static": "tsc && node build/server/static.js",
- "build": "yarn prepare && parcel build index.html -d out --no-source-maps --no-cache --detailed-report --public-url ./",
+ "build": "yarn prep && parcel build index.html -d out --no-source-maps --no-cache --detailed-report --public-url ./",
"start": "tsc && node build/server/index.js"
},
"devDependencies": {
diff --git a/examples/commit-table-ssr/src/server/index.ts b/examples/commit-table-ssr/src/server/index.ts
index 5ac57b254e..0292329c79 100644
--- a/examples/commit-table-ssr/src/server/index.ts
+++ b/examples/commit-table-ssr/src/server/index.ts
@@ -1,6 +1,7 @@
import { TLRUCache } from "@thi.ng/cache";
import * as express from "express";
import * as Bundler from "parcel-bundler";
+import * as fs from "fs";
import { Commit } from "../common/api";
import { ctx } from "../common/config";
@@ -13,13 +14,18 @@ import { repoCommits } from "./git";
const rawCache = new TLRUCache(null, { ttl: 60 * 60 * 1000 });
const htmlCache = new TLRUCache(null, { ttl: 60 * 60 * 1000 });
-// console.log("parcel:", Object.keys(parcel));
const bundler = new Bundler("index.html", {
outDir: "./out",
outFile: "index.html",
publicUrl: "/out",
});
+const getCommits = async () => {
+ const commits = [...repoCommits(ctx.repo.path)];
+ fs.writeFileSync("commits.json", JSON.stringify(commits));
+ return commits;
+};
+
const app = express();
// route for browser version
@@ -34,7 +40,7 @@ app.get("/commits", (_, res) => {
// (re)create if missing...
rawCache.getSet(
ctx.repo.path,
- async () => [...repoCommits(ctx.repo.path)]
+ getCommits
).then(
(commits) => res.type("json").send(commits)
)
@@ -50,7 +56,7 @@ app.get("/ssr", (_, res) => {
async () => buildRepoTableHTML(
await rawCache.getSet(
ctx.repo.path,
- async () => [...repoCommits(ctx.repo.path)]
+ getCommits
)
)
).then((doc) => res.send(doc))
diff --git a/examples/hdom-canvas-clock/src/index.ts b/examples/hdom-canvas-clock/src/index.ts
index 4b3feb3083..e310879045 100644
--- a/examples/hdom-canvas-clock/src/index.ts
+++ b/examples/hdom-canvas-clock/src/index.ts
@@ -50,7 +50,7 @@ const cancel = start(() => {
{
translate: [100, 100],
stroke: "black", fill: "none",
- align: "center", baseLine: "middle",
+ align: "center", baseline: "middle",
__normalize: false
},
// rim
diff --git a/examples/hdom-canvas-shapes/src/index.ts b/examples/hdom-canvas-shapes/src/index.ts
index 6c43014dda..cacd1843cf 100644
--- a/examples/hdom-canvas-shapes/src/index.ts
+++ b/examples/hdom-canvas-shapes/src/index.ts
@@ -122,7 +122,7 @@ const TESTS = {
weight: 1,
stroke: "#00f",
align: "center",
- baseLine: "middle",
+ baseline: "middle",
font: "48px Menlo",
__normalize: false
},
@@ -211,7 +211,7 @@ const TESTS = {
},
["rect", { fill: "#ff0" }, [-50, -50], 100, 100],
["text",
- { fill: "#00f", font: "18px Menlo", align: "center", baseLine: "middle" },
+ { fill: "#00f", font: "18px Menlo", align: "center", baseline: "middle" },
[0, 0], new Date().toISOString()
]
];
diff --git a/examples/router-basics/package.json b/examples/router-basics/package.json
index 3b799bd14e..c54772b5c2 100644
--- a/examples/router-basics/package.json
+++ b/examples/router-basics/package.json
@@ -7,9 +7,9 @@
"license": "Apache-2.0",
"scripts": {
"clean": "rm -rf .cache build out",
- "prepare": "yarn clean && mkdir -p out && cp -R assets out",
- "build": "yarn prepare && parcel build index.html -d out --no-source-maps --no-cache --detailed-report --public-url ./",
- "start": "yarn prepare && parcel index.html -p 8080 --open -d out"
+ "prep": "yarn clean && mkdir -p out && cp -R assets out",
+ "build": "yarn prep && parcel build index.html -d out --no-source-maps --no-cache --detailed-report --public-url ./",
+ "start": "yarn prep && parcel index.html -p 8080 --open -d out"
},
"dependencies": {
"@thi.ng/atom": "latest",
diff --git a/examples/xml-converter/.gitignore b/examples/xml-converter/.gitignore
new file mode 100644
index 0000000000..0c5abcab62
--- /dev/null
+++ b/examples/xml-converter/.gitignore
@@ -0,0 +1,5 @@
+.cache
+out
+node_modules
+yarn.lock
+*.js
diff --git a/examples/xml-converter/README.md b/examples/xml-converter/README.md
new file mode 100644
index 0000000000..c3c9333baa
--- /dev/null
+++ b/examples/xml-converter/README.md
@@ -0,0 +1,90 @@
+# xml-converter
+
+[Live demo](http://demo.thi.ng/umbrella/xml-converter/)
+
+This example uses
+[@thi.ng/sax](https://github.com/thi-ng/umbrella/tree/master/packages/sax)
+to convert XML/HTML/SVG syntax into
+[hiccup](https://github.com/thi-ng/umbrella/tree/master/packages/hiccup)
+/ JSON syntax and provides several options to filter the parsed tree and
+control the resulting output format.
+
+## Dataflow
+
+This diagram illustrates the
+[@thi.ng/rstream](https://github.com/thi-ng/umbrella/tree/master/packages/rstream)
+dataflow topology used by the browser app:
+
+
+
+## Browser version
+```bash
+git clone https://github.com/thi-ng/umbrella.git
+cd umbrella/examples/xml-converter
+yarn install
+yarn start
+```
+
+## CLI version
+
+In addition to the above browser UI, this example can be built as a
+**basic** CLI tool to convert & filter files (the result is always
+written to stdout).
+
+```bash
+# in this example's project root...
+yarn build-cli
+
+bin/hiccup --help
+# Usage: hiccup [options]
+#
+# Options:
+#
+# -V, --version output the version number
+# -t, --tags remove tags from tree
+# -a, --attribs remove attribs from tree
+# -v, --var generate TS export var declaration
+# -s, --single-quote use single quotes
+# -p, --no-pretty disable pretty printing
+# -h, --help output usage information
+
+# Example file
+cat << EOF > foo.svg
+
+
+EOF
+
+bin/hiccup \
+ -v ICON \ # create a target var name
+ -t title,desc,defs \ # remove tags
+ -a id,style,stroke,fill,xmlns,width,height,version \ # remove attribs
+ foo.svg
+# export const ICON =
+# ["svg", { viewBox: "0 0 10 10" },
+# ["g",
+# {
+# "fill-rule": "evenodd",
+# "stroke-width": 1,
+# },
+# ["path", { d: "M6,4 L10,4 L10,6 L6,6 L6,10 L4,10 L4,6 L0,6 L0,4 L4,4 L4,0 L6,0 L6,4 Z" }]]];
+```
+
+## Authors
+
+- Karsten Schmidt
+
+## License
+
+© 2018 Karsten Schmidt // Apache Software License 2.0
diff --git a/examples/xml-converter/bin/hiccup b/examples/xml-converter/bin/hiccup
new file mode 100755
index 0000000000..e4b6448d7d
--- /dev/null
+++ b/examples/xml-converter/bin/hiccup
@@ -0,0 +1,43 @@
+#!/usr/bin/env node
+
+const fs = require("fs");
+const path = require("path");
+const program = require("commander");
+const package = require("../package.json");
+const convert = require("./convert");
+const format = require("./format");
+const utils = require("./utils");
+
+program
+ .version(package.version)
+ .usage("[options] ")
+ .option("-t, --tags ", "remove tags from tree", utils.asSet)
+ .option("-a, --attribs ", "remove attribs from tree", utils.asSet)
+ .option("-v, --var ", "generate TS export var decl")
+ .option("-s, --single-quote", "use single quotes")
+ .option("-p, --no-pretty", "disable pretty printing")
+ .parse(process.argv);
+
+if (program.args.length == 0) {
+ console.log("Please run: hiccup --help");
+ process.exit(1);
+}
+
+const xmlFile = path.resolve(program.args[0]);
+const quote = program.singleQuote ? `'` : `"`;
+const copts = {
+ format: program.pretty ?
+ { ...format.DEFAULT_FORMAT, quote, indent: 4 } :
+ { ...format.COMPACT_FORMAT, quote },
+ removeAttribs: program.attribs || new Set(),
+ removeTags: program.tags || new Set(),
+};
+
+const xml = fs.readFileSync(xmlFile).toString();
+const hiccup = convert.convertXML(xml, copts);
+
+console.log(
+ program.var ?
+ `export const ${program.var} =\n${hiccup};` :
+ hiccup
+);
diff --git a/examples/xml-converter/index.html b/examples/xml-converter/index.html
new file mode 100644
index 0000000000..bca5d4683a
--- /dev/null
+++ b/examples/xml-converter/index.html
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+ xml/html/svg-to-hiccup converter
+
+
+
+
+
+ XML / Hiccup converter
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/examples/xml-converter/package.json b/examples/xml-converter/package.json
new file mode 100644
index 0000000000..096c7a6f1c
--- /dev/null
+++ b/examples/xml-converter/package.json
@@ -0,0 +1,31 @@
+{
+ "name": "xml-converter",
+ "version": "0.0.1",
+ "repository": "https://github.com/thi-ng/umbrella",
+ "author": "Karsten Schmidt ",
+ "license": "Apache-2.0",
+ "scripts": {
+ "clean": "rm -rf .cache build out",
+ "build": "yarn clean && parcel build index.html -d out --public-url ./ --no-source-maps --no-cache --detailed-report",
+ "build-cli": "tsc -p tsconfig-cli.json",
+ "start": "parcel index.html -p 8080 --open"
+ },
+ "devDependencies": {
+ "parcel-bundler": "^1.9.7",
+ "terser": "^3.8.2",
+ "typescript": "^3.0.1"
+ },
+ "dependencies": {
+ "@thi.ng/rstream": "latest",
+ "@thi.ng/sax": "latest",
+ "@thi.ng/strings": "latest",
+ "@thi.ng/transducers-hdom": "latest",
+ "commander": "^2.18.0"
+ },
+ "browserslist": [
+ "last 3 Chrome versions"
+ ],
+ "browser": {
+ "process": false
+ }
+}
\ No newline at end of file
diff --git a/examples/xml-converter/src/convert.ts b/examples/xml-converter/src/convert.ts
new file mode 100644
index 0000000000..08bf73e1ff
--- /dev/null
+++ b/examples/xml-converter/src/convert.ts
@@ -0,0 +1,140 @@
+import { isString } from "@thi.ng/checks/is-string";
+import {
+ parse,
+ ParseElement,
+ ParseEvent,
+ Type
+} from "@thi.ng/sax";
+import { comp } from "@thi.ng/transducers/func/comp";
+import { pairs } from "@thi.ng/transducers/iter/pairs";
+import { assocObj } from "@thi.ng/transducers/rfn/assoc-obj";
+import { last } from "@thi.ng/transducers/rfn/last";
+import { push } from "@thi.ng/transducers/rfn/push";
+import { transduce } from "@thi.ng/transducers/transduce";
+import { filter } from "@thi.ng/transducers/xform/filter";
+import { map } from "@thi.ng/transducers/xform/map";
+import { DEFAULT_FORMAT, format, FormatOpts } from "./format";
+
+export interface ConversionOpts {
+ format: FormatOpts;
+ removeTags: Set;
+ removeAttribs: Set;
+}
+
+export const DEFAULT_OPTS: ConversionOpts = {
+ format: DEFAULT_FORMAT,
+ removeAttribs: new Set(),
+ removeTags: new Set(),
+};
+
+// converts given XMLish string into formatted hiccup
+export const convertXML = (src: string, opts: Partial = {}) => {
+ let tree = transformTree(
+ parseXML(src),
+ { ...DEFAULT_OPTS, ...opts }
+ );
+ return format({ ...DEFAULT_FORMAT, ...opts.format }, "", tree);
+};
+
+// parses given XMLish string using @thi.ng/sax transducer into a
+// sequence of parse events. we only care about the final (or error)
+// event, which will be related to the final close tag and contains the
+// entire tree
+const parseXML = (src: string) =>
+ transduce(
+ comp(
+ parse({ trim: true, boolean: true, entities: true }),
+ filter((e) => e.type === Type.ELEM_END || e.type === Type.ERROR)
+ ),
+ last(),
+ src
+ );
+
+// transforms string of CSS properties into a plain object
+const transformCSS = (css: string) =>
+ css.split(";").reduce(
+ (acc, p) => {
+ const [k, v] = p.split(":");
+ (v != null) && (acc[k.trim()] = parseAttrib([k, v.trim()])[1]);
+ return acc;
+ },
+ {}
+ );
+
+// takes attrib key-value pair and attempts to coerce / transform its
+// value. returns updated pair.
+const parseAttrib = (attrib: string[]) => {
+ let [k, v] = attrib;
+ if (isString(v)) {
+ v = v.replace(/[\n\r]+\s*/g, " ");
+ return k === "style" ?
+ [k, transformCSS(v)] :
+ v === "true" ?
+ [k, true] :
+ v === "false" ?
+ [k, false] :
+ [k, /^[0-9.e+-]+$/.test(v) ?
+ parseFloat(v) :
+ v];
+ }
+ return attrib;
+};
+
+// transforms an entire object of attributes
+const transformAttribs = (attribs: any, remove: Set = new Set()) =>
+ transduce(
+ comp(
+ filter((a) => !remove.has(a[0])),
+ map(parseAttrib)
+ ),
+ assocObj(),
+ {},
+ pairs(attribs)
+ );
+
+// transforms element name by attempting to form Emmet-like tags
+const transformTag = (tag: string, attribs: any) => {
+ if (attribs.id) {
+ tag += "#" + attribs.id;
+ delete attribs.id;
+ }
+ if (isString(attribs.class)) {
+ const classes = attribs.class.replace(/\s+/g, ".");
+ classes.length && (tag += "." + classes);
+ delete attribs.class;
+ }
+ return tag;
+};
+
+// recursively transforms entire parse tree
+const transformTree = (tree: ParseEvent | ParseElement, opts: ConversionOpts) => {
+ if (tree == null) {
+ return "";
+ }
+ if ((tree).type === Type.ERROR) {
+ return ["error", tree.body];
+ }
+ if (opts.removeTags.has(tree.tag)) {
+ return;
+ }
+ const attribs = transformAttribs(tree.attribs, opts.removeAttribs);
+ const res: any[] = [transformTag(tree.tag, attribs)];
+ if (Object.keys(attribs).length) {
+ res.push(attribs);
+ }
+ if (tree.body) {
+ res.push(tree.body);
+ }
+ if (tree.children && tree.children.length) {
+ transduce(
+ comp(
+ map((t: any) => transformTree(t, opts)),
+ filter((t) => !!t)
+ ),
+ push(),
+ res,
+ tree.children
+ )
+ }
+ return res;
+};
diff --git a/examples/xml-converter/src/format.ts b/examples/xml-converter/src/format.ts
new file mode 100644
index 0000000000..db99cc652c
--- /dev/null
+++ b/examples/xml-converter/src/format.ts
@@ -0,0 +1,133 @@
+import { isArray } from "@thi.ng/checks/is-array";
+import { isBoolean } from "@thi.ng/checks/is-boolean";
+import { isNumber } from "@thi.ng/checks/is-number";
+import { isPlainObject } from "@thi.ng/checks/is-plain-object";
+import { DEFAULT, defmulti } from "@thi.ng/defmulti";
+import { repeat } from "@thi.ng/strings/repeat";
+import { peek } from "@thi.ng/transducers/func/peek";
+
+export interface FormatOpts {
+ indent: number;
+ tabSize: number;
+ lineSep: string;
+ prefix?: string;
+ quote: string;
+ ws: string;
+ trailingComma: boolean;
+}
+
+export const DEFAULT_FORMAT: FormatOpts = {
+ indent: 0,
+ tabSize: 4,
+ trailingComma: true,
+ lineSep: "\n",
+ prefix: "",
+ quote: `"`,
+ ws: " "
+};
+
+export const COMPACT_FORMAT: FormatOpts = {
+ indent: 0,
+ tabSize: 0,
+ trailingComma: false,
+ lineSep: "",
+ prefix: "",
+ quote: `"`,
+ ws: ""
+};
+
+// memoized indentations
+export const spaces = (n: number) => repeat(" ", n);
+
+// creates new state with deeper indentation
+const indentState = (opts: FormatOpts): FormatOpts =>
+ ({ ...opts, indent: opts.indent + opts.tabSize });
+
+// dispatch helper function for the `format` defmulti below
+const classify = (x: any) =>
+ isArray(x) ? "array" : isPlainObject(x) ? "obj" : DEFAULT;
+
+// wraps attrib name in quotes if needed
+const formatAttrib = (opts: FormatOpts, x: string) =>
+ /^[a-z]+$/i.test(x) ? x : opts.quote + x + opts.quote;
+
+// attrib or body value formatter
+const formatVal = (opts: FormatOpts, x: any, indent = true) =>
+ isNumber(x) || isBoolean(x) ?
+ x :
+ isPlainObject(x) ?
+ format(indent ? indentState(opts) : opts, "", x) :
+ opts.quote + x + opts.quote;
+
+// attrib key-value pair formatter w/ indentation
+const formatPair = (opts: FormatOpts, x: any, k: string) =>
+ spaces(opts.indent) + formatAttrib(opts, k) + ":" + opts.ws +
+ formatVal(opts, x[k], k !== "style");
+
+// multiple-dispatch function to format the transformed tree (hiccup
+// structure) into a more compact & legible format than produced by
+// standard: `JSON.stringify(tree, null, 4)`
+export const format = defmulti(
+ (_, __, x) => classify(x)
+);
+
+// implementation for array values
+format.add("array", (opts, res, x) => {
+ const hasAttribs = isPlainObject(x[1]);
+ let attribs = hasAttribs ? Object.keys(x[1]) : [];
+ res += spaces(opts.indent) + "[" + opts.quote + x[0] + opts.quote;
+ if (hasAttribs) {
+ res += "," + opts.ws;
+ res = format(
+ {
+ ...indentState(opts),
+ prefix: `${opts.lineSep}${spaces(opts.indent + opts.tabSize)}`
+ },
+ res,
+ x[1]
+ );
+ }
+ // single line if none or only single child
+ // and if no `style` attrib
+ if (x.length === (hasAttribs ? 3 : 2) &&
+ attribs.length < 2 &&
+ attribs[0] !== "style" &&
+ classify(peek(x)) === DEFAULT) {
+ return format({ ...opts, indent: 0 }, res += "," + opts.ws, peek(x)) + "]";
+ }
+ // default format if more children
+ for (let i = hasAttribs ? 2 : 1; i < x.length; i++) {
+ res += "," + opts.lineSep;
+ res = format(indentState(opts), res, x[i]);
+ }
+ res += "]";
+ return res;
+});
+
+// implementation for object values (i.e. attributes in this case)
+format.add("obj", (opts, res, x) => {
+ const keys = Object.keys(x);
+ if (keys.length === 0) {
+ res += `{}`;
+ } else if (keys.length === 1 &&
+ (keys[0] !== "style" || Object.keys(x.style).length < 2)) {
+ res += "{" + opts.ws + formatPair({ ...opts, indent: 0 }, x, keys[0]) + opts.ws + "}";
+ } else {
+ const outer = spaces(opts.indent);
+ res += opts.prefix + "{" + opts.lineSep;
+ for (let i = keys.length; --i >= 0;) {
+ const k = keys[i];
+ res += formatPair(
+ k === "style" ?
+ { ...indentState(opts), prefix: "" } :
+ indentState(opts), x, k);
+ res += (opts.trailingComma || i > 0 ? "," : "") + opts.lineSep;
+ }
+ res += outer + "}";
+ }
+ return res;
+});
+
+// implementation for other values
+format.add(DEFAULT, (opts, res, x) =>
+ res += spaces(opts.indent) + formatVal(opts, x));
diff --git a/examples/xml-converter/src/index.ts b/examples/xml-converter/src/index.ts
new file mode 100644
index 0000000000..402b9c11ef
--- /dev/null
+++ b/examples/xml-converter/src/index.ts
@@ -0,0 +1,98 @@
+import { stream } from "@thi.ng/rstream/stream";
+import { sync } from "@thi.ng/rstream/stream-sync";
+import { updateDOM } from "@thi.ng/transducers-hdom";
+import { map } from "@thi.ng/transducers/xform/map";
+
+import { convertXML } from "./convert";
+import { COMPACT_FORMAT, DEFAULT_FORMAT } from "./format";
+import { app, UI } from "./ui";
+import { xformAsSet } from "./utils";
+
+// input streams (reactive state values)
+const inputs = {
+ xml: stream(),
+ prettyPrint: stream(),
+ doubleQuote: stream(),
+ trailingComma: stream(),
+ removeAttribs: stream(),
+ removeTags: stream(),
+ copyButton: stream(),
+};
+
+// stream combinator to assemble formatter options
+const formatOpts = sync({
+ src: {
+ trailingComma: inputs.trailingComma,
+ doubleQuote: inputs.doubleQuote,
+ prettyPrint: inputs.prettyPrint,
+ },
+ xform: map(
+ (opts: any) => ({
+ ...(opts.prettyPrint ? DEFAULT_FORMAT : COMPACT_FORMAT),
+ trailingComma: opts.trailingComma,
+ quote: opts.doubleQuote ? `"` : `'`,
+ })
+ )
+});
+
+// stream combinator to assemble conversion options
+const opts = sync({
+ src: {
+ format: formatOpts,
+ removeAttribs: inputs.removeAttribs.transform(xformAsSet),
+ removeTags: inputs.removeTags.transform(xformAsSet),
+ }
+});
+
+// main stream combinator to create & update UI
+const main = sync({
+ src: {
+ src: inputs.xml,
+ copy: inputs.copyButton,
+ opts,
+ }
+}).transform(
+ // convert xml -> hiccup
+ map((state: any) => ({
+ ...state,
+ hiccup: convertXML(state.src, state.opts)
+ })),
+ // transform into hdom tree
+ map(app(UI.main, inputs)),
+ // apply to real DOM
+ updateDOM({ ctx: UI })
+);
+
+// all inputs need to be initialized
+// in order for the UI to be rendered at least once
+
+// initial options
+inputs.removeTags.next("head");
+inputs.removeAttribs.next("id,class");
+inputs.trailingComma.next(true);
+inputs.doubleQuote.next(true);
+inputs.prettyPrint.next(true);
+
+inputs.copyButton.next(false);
+
+// seed input and kick off UI/app
+inputs.xml.next(
+ `
+
+ foo
+
+
+
+ HTML & Hiccup walk into a bar...
+
+
+
+
+`
+);
+
+// ParcelJS HMR handling
+if (process.env.NODE_ENV !== "production") {
+ const hot = (module).hot;
+ hot && hot.dispose(() => main.done());
+}
diff --git a/examples/xml-converter/src/ui.ts b/examples/xml-converter/src/ui.ts
new file mode 100644
index 0000000000..738453d71d
--- /dev/null
+++ b/examples/xml-converter/src/ui.ts
@@ -0,0 +1,159 @@
+import { mapIndexed } from "@thi.ng/transducers/xform/map-indexed";
+import { handleTab } from "./utils";
+
+// converted from:
+// https://github.com/IBM/carbon-icons/blob/master/src/svg/copy.svg
+const ICON_COPY =
+ ["svg.mr2", { viewBox: "0 0 16 16", width: "0.7rem", height: "0.7rem", stroke: "white" },
+ ["path", { d: "M1,10H0V2c0-1.1,0.9-2,2-2l8,0l0,1L2,1C1.4,1,1,1.5,1,2L1,10z" }],
+ ["path", { d: "M11,4.2V8h3.8L11,4.2z M15,9h-4c-0.6,0-1-0.4-1-1V4H4.5C4.2,4,4,4.2,4,4.5v10C4,14.8,4.2,15,4.5,15h10 c0.3,0,0.5-0.2,0.5-0.5V9z M11,3c0.1,0,0.3,0.1,0.4,0.1l4.5,4.5C15.9,7.7,16,7.9,16,8v6.5c0,0.8-0.7,1.5-1.5,1.5h-10 C3.7,16,3,15.3,3,14.5v-10C3,3.7,3.7,3,4.5,3H11z" }]];
+
+// component styles:
+// this object will be provided as hdom user context to all
+// component functions
+export const UI = {
+ editor: {
+ root: { class: "w-50-ns pa3" },
+ title: { class: "ma0 mb2" },
+ textarea: { class: "w-100.pa2.bn.f7.code.lh-copy" },
+ stats: { class: "f7" }
+ },
+ input: {
+ root: { class: "mb2" },
+ label: { class: "dib w-100 w-25-l pv2" },
+ input: { class: "w-100 w-75-l pa1 bg-silver white bn" },
+ },
+ button: {
+ href: "#",
+ class: "dib.link.white.pv1.ph2.w4.bn.hover-bg-blue.bg-animate",
+ },
+ copyButton: {
+ style: {
+ position: "relative",
+ top: "-3rem",
+ left: "0.5rem"
+ },
+ },
+ main: {
+ small: { class: "fw1 ml2 dn dib-l" },
+ src: {
+ class: "bg-washed-green",
+ autofocus: true,
+ },
+ result: {
+ success: {
+ disabled: true,
+ class: "bg-light-gray"
+ },
+ error: {
+ disabled: true,
+ class: "bg-washed-red"
+ }
+ },
+ }
+};
+
+// hdom UI root component. this function will be used as stream
+// transformer and receives a tuple of xml & formatted hiccup strings.
+// defined as closure to avoid using global vars. the `ctx` is the above
+// `UI.main` and `inputs` are defined in `index.ts`.
+export const app = (ctx: any, inputs: any) =>
+ ({ src, hiccup }) =>
+ ["div.flex-ns",
+ [editPane,
+ [
+ "XML/HTML source",
+ ["small", ctx.small, "(must be well formed!)"]
+ ],
+ {
+ ...ctx.src,
+ onkeydown: handleTab(inputs.xml),
+ // emitting a new value to the stream will
+ // re-trigger conversion & UI update
+ oninput: (e) => inputs.xml.next(e.target.value),
+ },
+ src],
+ [editPane,
+ ["Transformed Hiccup / JSON"],
+ hiccup.indexOf("error") < 0 ?
+ ctx.result.success :
+ ctx.result.error,
+ hiccup,
+ [copyButton,
+ {
+ class: hiccup.indexOf("error") < 0 ?
+ "bg-green" :
+ "bg-gray"
+ },
+ inputs.copyButton,
+ hiccup],
+ [transformOpts, inputs]]];
+
+// configurable editor panel UI component
+// (uses Tachyons CSS classes for styling)
+const editPane = ({ editor }, title, attribs, value, ...extra) =>
+ ["div", editor.root,
+ ["h3", editor.title, ...title],
+ [`textarea.${editor.textarea.class}`, { rows: 16, value, ...attribs }],
+ ["div", editor.stats, `${value.length} chars`],
+ ...extra];
+
+// configurable input UI component
+const input = ({ input }, label, attribs) =>
+ ["div", input.root,
+ ["label", { ...input.label, for: attribs.id }, label],
+ ["input", { ...input.input, ...attribs }]];
+
+
+const iconButton = ({ button }, attribs, icon, label) =>
+ [`a.${button.class}`, { ...button, ...attribs }, icon, label];
+
+// button which, when clicked, copies given `text` to clipboard and
+// emits true on `stream`. resets stream back to false after given
+// `delay` time.
+const copyButton = ({ copyButton }, attribs, stream, text, delay = 500) =>
+ [iconButton,
+ {
+ ...copyButton,
+ ...attribs,
+ onclick: (e) => {
+ e.preventDefault();
+ e.target.blur();
+ (navigator).clipboard.writeText(text)
+ .then(
+ () => {
+ setTimeout(() => stream.next(false), delay);
+ stream.next(true);
+ },
+ () => alert("Couldn't copy to clipboard")
+ );
+ }
+ },
+ ICON_COPY,
+ stream.deref() ? "Copied" : "Copy"
+ ];
+
+// combined transform options input components
+const transformOpts = (_, inputs) =>
+ ["div",
+ ["h3", "Options"],
+ mapIndexed(
+ (i, [label, type, stream]) => {
+ let v = type === "checkbox" ? "checked" : "value";
+ return [input, label,
+ {
+ id: "opt" + i,
+ type,
+ [v]: stream.deref(),
+ oninput: (e) => stream.next(e.target[v])
+ }];
+ },
+ [
+ ["Remove tags", "text", inputs.removeTags],
+ ["Remove attributes", "text", inputs.removeAttribs],
+ ["Pretty print", "checkbox", inputs.prettyPrint],
+ ["Double quotes", "checkbox", inputs.doubleQuote],
+ ["Trailing commas", "checkbox", inputs.trailingComma],
+ ]
+ )
+ ];
diff --git a/examples/xml-converter/src/utils.ts b/examples/xml-converter/src/utils.ts
new file mode 100644
index 0000000000..008ad8b5e4
--- /dev/null
+++ b/examples/xml-converter/src/utils.ts
@@ -0,0 +1,23 @@
+import { splice } from "@thi.ng/strings/splice";
+import { map } from "@thi.ng/transducers/xform/map";
+
+export const asSet = (x: string) =>
+ new Set(map((x) => x.trim(), x.split(",")));
+
+// helper transducer to convert a CSV string into an ES6 Set
+export const xformAsSet = map(asSet);
+
+// key event handler for textareas to override Tab key behavior and
+// insert spaces at cursor position instead of changing keyboard focus
+export const handleTab = (stream) =>
+ (e: KeyboardEvent) => {
+ // override tab to insert spaces at edit pos
+ if (e.key === "Tab") {
+ e.preventDefault();
+ stream.next(
+ splice((e.target).value, " ",
+ (e.target).selectionStart
+ )
+ );
+ }
+ };
diff --git a/examples/xml-converter/tsconfig-cli.json b/examples/xml-converter/tsconfig-cli.json
new file mode 100644
index 0000000000..8471f0aa29
--- /dev/null
+++ b/examples/xml-converter/tsconfig-cli.json
@@ -0,0 +1,11 @@
+{
+ "extends": "../../tsconfig.json",
+ "compilerOptions": {
+ "outDir": "bin",
+ "target": "es6",
+ "module": "commonjs"
+ },
+ "include": [
+ "./src/**/*.ts"
+ ]
+}
\ No newline at end of file
diff --git a/examples/xml-converter/tsconfig.json b/examples/xml-converter/tsconfig.json
new file mode 100644
index 0000000000..bbf112cc18
--- /dev/null
+++ b/examples/xml-converter/tsconfig.json
@@ -0,0 +1,11 @@
+{
+ "extends": "../../tsconfig.json",
+ "compilerOptions": {
+ "outDir": ".",
+ "target": "es6",
+ "sourceMap": true
+ },
+ "include": [
+ "./src/**/*.ts"
+ ]
+}
diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md
index 9ed7ea26dd..e94e220a40 100644
--- a/packages/api/CHANGELOG.md
+++ b/packages/api/CHANGELOG.md
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [4.2.2](https://github.com/thi-ng/umbrella/compare/@thi.ng/api@4.2.1...@thi.ng/api@4.2.2) (2018-10-17)
+
+**Note:** Version bump only for package @thi.ng/api
+
+
+
+
+
## [4.2.1](https://github.com/thi-ng/umbrella/compare/@thi.ng/api@4.2.0...@thi.ng/api@4.2.1) (2018-09-24)
diff --git a/packages/api/package.json b/packages/api/package.json
index 30720fcae4..cdb59f021a 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
{
"name": "@thi.ng/api",
- "version": "4.2.1",
+ "version": "4.2.2",
"description": "Common, generic types & interfaces for thi.ng projects",
"main": "./index.js",
"typings": "./index.d.ts",
@@ -28,7 +28,7 @@
"typescript": "^3.0.1"
},
"dependencies": {
- "@thi.ng/errors": "^0.1.9"
+ "@thi.ng/errors": "^0.1.10"
},
"keywords": [
"compare",
diff --git a/packages/associative/CHANGELOG.md b/packages/associative/CHANGELOG.md
index d83bf05f48..c16b614119 100644
--- a/packages/associative/CHANGELOG.md
+++ b/packages/associative/CHANGELOG.md
@@ -3,6 +3,41 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [0.6.12](https://github.com/thi-ng/umbrella/compare/@thi.ng/associative@0.6.11...@thi.ng/associative@0.6.12) (2018-10-17)
+
+**Note:** Version bump only for package @thi.ng/associative
+
+
+
+
+
+
+## [0.6.11](https://github.com/thi-ng/umbrella/compare/@thi.ng/associative@0.6.10...@thi.ng/associative@0.6.11) (2018-09-26)
+
+**Note:** Version bump only for package @thi.ng/associative
+
+
+
+
+
+
+## [0.6.10](https://github.com/thi-ng/umbrella/compare/@thi.ng/associative@0.6.9...@thi.ng/associative@0.6.10) (2018-09-25)
+
+**Note:** Version bump only for package @thi.ng/associative
+
+
+
+
+
+
+## [0.6.9](https://github.com/thi-ng/umbrella/compare/@thi.ng/associative@0.6.8...@thi.ng/associative@0.6.9) (2018-09-24)
+
+**Note:** Version bump only for package @thi.ng/associative
+
+
+
+
+
## [0.6.8](https://github.com/thi-ng/umbrella/compare/@thi.ng/associative@0.6.7...@thi.ng/associative@0.6.8) (2018-09-24)
diff --git a/packages/associative/package.json b/packages/associative/package.json
index 9383a0446e..2f1968782a 100644
--- a/packages/associative/package.json
+++ b/packages/associative/package.json
@@ -1,6 +1,6 @@
{
"name": "@thi.ng/associative",
- "version": "0.6.8",
+ "version": "0.6.12",
"description": "Alternative Set & Map data type implementations with customizable equality semantics & supporting operations",
"main": "./index.js",
"typings": "./index.d.ts",
@@ -28,13 +28,13 @@
"typescript": "^3.0.1"
},
"dependencies": {
- "@thi.ng/api": "^4.2.1",
- "@thi.ng/checks": "^1.5.11",
- "@thi.ng/compare": "^0.1.9",
- "@thi.ng/dcons": "^1.1.8",
- "@thi.ng/equiv": "^0.1.11",
- "@thi.ng/errors": "^0.1.9",
- "@thi.ng/transducers": "^2.1.3"
+ "@thi.ng/api": "^4.2.2",
+ "@thi.ng/checks": "^1.5.12",
+ "@thi.ng/compare": "^0.1.10",
+ "@thi.ng/dcons": "^1.1.12",
+ "@thi.ng/equiv": "^0.1.12",
+ "@thi.ng/errors": "^0.1.10",
+ "@thi.ng/transducers": "^2.2.0"
},
"keywords": [
"data structures",
diff --git a/packages/atom/CHANGELOG.md b/packages/atom/CHANGELOG.md
index efde5b5251..6e54d43fcc 100644
--- a/packages/atom/CHANGELOG.md
+++ b/packages/atom/CHANGELOG.md
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.5.5](https://github.com/thi-ng/umbrella/compare/@thi.ng/atom@1.5.4...@thi.ng/atom@1.5.5) (2018-10-17)
+
+**Note:** Version bump only for package @thi.ng/atom
+
+
+
+
+
## [1.5.4](https://github.com/thi-ng/umbrella/compare/@thi.ng/atom@1.5.3...@thi.ng/atom@1.5.4) (2018-09-24)
diff --git a/packages/atom/package.json b/packages/atom/package.json
index d1a9fa720d..d9b99bf035 100644
--- a/packages/atom/package.json
+++ b/packages/atom/package.json
@@ -1,6 +1,6 @@
{
"name": "@thi.ng/atom",
- "version": "1.5.4",
+ "version": "1.5.5",
"description": "Mutable wrapper for immutable values",
"main": "./index.js",
"typings": "./index.d.ts",
@@ -28,11 +28,11 @@
"typescript": "^3.0.1"
},
"dependencies": {
- "@thi.ng/api": "^4.2.1",
- "@thi.ng/checks": "^1.5.11",
- "@thi.ng/equiv": "^0.1.11",
- "@thi.ng/errors": "^0.1.9",
- "@thi.ng/paths": "^1.6.3"
+ "@thi.ng/api": "^4.2.2",
+ "@thi.ng/checks": "^1.5.12",
+ "@thi.ng/equiv": "^0.1.12",
+ "@thi.ng/errors": "^0.1.10",
+ "@thi.ng/paths": "^1.6.4"
},
"keywords": [
"cursor",
diff --git a/packages/bench/CHANGELOG.md b/packages/bench/CHANGELOG.md
index 6e7645f07a..d5fe017ad8 100644
--- a/packages/bench/CHANGELOG.md
+++ b/packages/bench/CHANGELOG.md
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [0.2.4](https://github.com/thi-ng/umbrella/compare/@thi.ng/bench@0.2.3...@thi.ng/bench@0.2.4) (2018-10-17)
+
+**Note:** Version bump only for package @thi.ng/bench
+
+
+
+
+
## [0.2.3](https://github.com/thi-ng/umbrella/compare/@thi.ng/bench@0.2.2...@thi.ng/bench@0.2.3) (2018-09-24)
diff --git a/packages/bench/package.json b/packages/bench/package.json
index b85148ac32..4b201aa343 100644
--- a/packages/bench/package.json
+++ b/packages/bench/package.json
@@ -1,6 +1,6 @@
{
"name": "@thi.ng/bench",
- "version": "0.2.3",
+ "version": "0.2.4",
"description": "Basic benchmarking helpers",
"main": "./index.js",
"typings": "./index.d.ts",
diff --git a/packages/binary/.npmignore b/packages/binary/.npmignore
new file mode 100644
index 0000000000..d703bda97a
--- /dev/null
+++ b/packages/binary/.npmignore
@@ -0,0 +1,10 @@
+build
+coverage
+dev
+doc
+src*
+test
+.nyc_output
+tsconfig.json
+*.tgz
+*.html
diff --git a/packages/binary/CHANGELOG.md b/packages/binary/CHANGELOG.md
new file mode 100644
index 0000000000..8176ab7399
--- /dev/null
+++ b/packages/binary/CHANGELOG.md
@@ -0,0 +1,11 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+# 0.1.0 (2018-10-17)
+
+
+### Features
+
+* **binary:** add [@thi](https://github.com/thi).ng/binary package ([458d4a0](https://github.com/thi-ng/umbrella/commit/458d4a0))
diff --git a/packages/binary/LICENSE b/packages/binary/LICENSE
new file mode 100644
index 0000000000..8dada3edaf
--- /dev/null
+++ b/packages/binary/LICENSE
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "{}"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright {yyyy} {name of copyright owner}
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/packages/binary/README.md b/packages/binary/README.md
new file mode 100644
index 0000000000..e5ea94fe48
--- /dev/null
+++ b/packages/binary/README.md
@@ -0,0 +1,47 @@
+# @thi.ng/binary
+
+[](https://www.npmjs.com/package/@thi.ng/binary)
+
+[](https://twitter.com/thing_umbrella)
+
+This project is part of the
+[@thi.ng/umbrella](https://github.com/thi-ng/umbrella/) monorepo.
+
+
+
+- [About](#about)
+- [Installation](#installation)
+- [Dependencies](#dependencies)
+- [Usage examples](#usage-examples)
+- [Authors](#authors)
+- [License](#license)
+
+
+
+## About
+
+Collection of 50+ binary / bitwise operations, conversions, utilities.
+
+## Installation
+
+```bash
+yarn add @thi.ng/binary
+```
+
+## Dependencies
+
+None.
+
+## Usage examples
+
+```ts
+import * as b from "@thi.ng/binary";
+```
+
+## Authors
+
+- Karsten Schmidt
+
+## License
+
+© 2018 Karsten Schmidt // Apache Software License 2.0
diff --git a/packages/binary/package.json b/packages/binary/package.json
new file mode 100644
index 0000000000..52326e6b4b
--- /dev/null
+++ b/packages/binary/package.json
@@ -0,0 +1,46 @@
+{
+ "name": "@thi.ng/binary",
+ "version": "0.1.0",
+ "description": "Assorted binary / bitwise operations, conversions, utilities.",
+ "main": "./index.js",
+ "typings": "./index.d.ts",
+ "repository": {
+ "type": "git",
+ "url": "https://github.com/thi-ng/umbrella.git"
+ },
+ "homepage": "https://github.com/thi-ng/umbrella/tree/master/packages/binary",
+ "author": "Karsten Schmidt ",
+ "license": "Apache-2.0",
+ "scripts": {
+ "build": "yarn run clean && tsc --declaration",
+ "clean": "rm -rf *.js *.d.ts .nyc_output build coverage doc",
+ "cover": "yarn test && nyc report --reporter=lcov",
+ "doc": "node_modules/.bin/typedoc --mode modules --out doc src",
+ "pub": "yarn run build && yarn publish --access public",
+ "test": "rm -rf build && tsc -p test && nyc mocha build/test/*.js"
+ },
+ "devDependencies": {
+ "@types/mocha": "^5.2.5",
+ "@types/node": "^10.5.5",
+ "mocha": "^5.2.0",
+ "nyc": "^12.0.2",
+ "typedoc": "^0.11.1",
+ "typescript": "^3.0.1"
+ },
+ "keywords": [
+ "alignment",
+ "binary",
+ "bitwise",
+ "conversion",
+ "ES6",
+ "gray code",
+ "logic",
+ "math",
+ "splat",
+ "swizzle",
+ "typescript"
+ ],
+ "publishConfig": {
+ "access": "public"
+ }
+}
diff --git a/packages/binary/src/align.ts b/packages/binary/src/align.ts
new file mode 100644
index 0000000000..244e13c848
--- /dev/null
+++ b/packages/binary/src/align.ts
@@ -0,0 +1,17 @@
+import { Pow2 } from "./api";
+
+/**
+ * Aligns `addr` to next multiple of `size`. The latter must be a power
+ * of 2.
+ *
+ * @param addr
+ * @param size
+ */
+export const align = (addr: number, size: Pow2) =>
+ (size-- , (addr + size) & ~size);
+
+/**
+ * Returns true if `addr` is aligned to wordsize `size`.
+ */
+export const isAligned = (addr: number, size: Pow2) =>
+ !(addr & (size - 1));
diff --git a/packages/binary/src/api.ts b/packages/binary/src/api.ts
new file mode 100644
index 0000000000..c1ced3c2b3
--- /dev/null
+++ b/packages/binary/src/api.ts
@@ -0,0 +1,28 @@
+export type Lane8 =
+ 0 | 1 | 2 | 3;
+
+export type Lane4 =
+ 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7;
+
+export type Lane2 =
+ 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 |
+ 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15;
+
+export type Bit =
+ 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 |
+ 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 |
+ 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 |
+ 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31;
+
+export type Pow2 =
+ 0x1 | 0x2 | 0x4 | 0x8 |
+ 0x10 | 0x20 | 0x40 | 0x80 |
+ 0x100 | 0x200 | 0x400 | 0x800 |
+ 0x1000 | 0x2000 | 0x4000 | 0x8000 |
+ 0x10000 | 0x20000 | 0x40000 | 0x80000 |
+ 0x100000 | 0x200000 | 0x400000 | 0x800000 |
+ 0x1000000 | 0x2000000 | 0x4000000 | 0x8000000 |
+ 0x10000000 | 0x20000000 | 0x40000000 | 0x80000000;
+
+export const MASKS =
+ new Array(33).fill(0).map((_, i) => Math.pow(2, i) - 1);
diff --git a/packages/binary/src/count.ts b/packages/binary/src/count.ts
new file mode 100644
index 0000000000..518ff022a1
--- /dev/null
+++ b/packages/binary/src/count.ts
@@ -0,0 +1,43 @@
+/**
+ * Returns number of 1 bits in `x`.
+ *
+ * @param x
+ */
+export const popCount = (x: number) => (
+ x = x - ((x >>> 1) & 0x55555555),
+ x = (x & 0x33333333) + ((x >>> 2) & 0x33333333),
+ ((x + (x >>> 4) & 0xf0f0f0f) * 0x1010101) >>> 24
+);
+
+/**
+ * https://en.wikipedia.org/wiki/Hamming_distance
+ *
+ * @param x
+ * @param y
+ */
+export const hammingDist = (x: number, y: number) =>
+ popCount(x ^ y);
+
+/**
+ * Math.clz32() polyfill (corrected).
+ *
+ * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/clz32$revision/1426816
+ *
+ * @param x
+ */
+export const clz32 = (x: number) =>
+ x !== 0 ?
+ 31 - ((Math.log(x >>> 0) / Math.LN2) | 0) :
+ 32;
+
+export const ctz32 = (x: number) => {
+ let c = 32;
+ x &= -x;
+ x && (c--);
+ (x & 0x0000ffff) && (c -= 16);
+ (x & 0x00ff00ff) && (c -= 8);
+ (x & 0x0f0f0f0f) && (c -= 4);
+ (x & 0x33333333) && (c -= 2);
+ (x & 0x55555555) && (c -= 1);
+ return c;
+};
diff --git a/packages/binary/src/edit.ts b/packages/binary/src/edit.ts
new file mode 100644
index 0000000000..733af78138
--- /dev/null
+++ b/packages/binary/src/edit.ts
@@ -0,0 +1,37 @@
+import { Bit } from "./api";
+import { defMask } from "./mask";
+
+/**
+ * Clears bit in given uint `x`.
+ *
+ * @param x value
+ * @param bit bit number (0..31)
+ */
+export const bitClear = (x: number, bit: Bit) =>
+ (x & ~(1 << bit)) >>> 0;
+
+/**
+ * Toggles bit in given uint `x`.
+ *
+ * @param x
+ * @param bit
+ */
+export const bitFlip = (x: number, bit: Bit) =>
+ (x ^ (1 << bit)) >>> 0;
+
+/**
+ * Sets bit in given uint `x`.
+ *
+ * @param x value
+ * @param bit bit number (0..31)
+ */
+export const bitSet = (x: number, bit: Bit) =>
+ (x | (1 << bit)) >>> 0;
+
+export const bitSetWindow = (x: number, y: number, from: number, to: number) => {
+ const m = defMask(from, to);
+ return (x & ~m) | ((y << (1 << from)) & m);
+};
+
+export const bitClearWindow = (x: number, from: number, to: number) =>
+ (x & ~defMask(from, to));
diff --git a/packages/binary/src/float.ts b/packages/binary/src/float.ts
new file mode 100644
index 0000000000..f6a204a7c2
--- /dev/null
+++ b/packages/binary/src/float.ts
@@ -0,0 +1,30 @@
+const F32 = new Float32Array(1);
+const I32 = new Int32Array(F32.buffer);
+const U32 = new Uint32Array(F32.buffer);
+
+export const floatToIntBits = (x: number) =>
+ (F32[0] = x, I32[0]);
+
+export const floatToUintBits = (x: number) =>
+ (F32[0] = x, U32[0]);
+
+export const intBitsToFloat = (x: number) =>
+ (I32[0] = x, F32[0]);
+
+export const uintBitsToFloat = (x: number) =>
+ (U32[0] = x, F32[0]);
+
+/**
+ * Converts given float into a sortable integer representation, using
+ * raw bitwise conversion via `floatToIntBits()`.
+ *
+ * https://github.com/tzaeschke/phtree/blob/master/PhTreeRevisited.pdf
+ * (page 3)
+ *
+ * @param x
+ */
+export const floatToSortableInt = (x: number) => {
+ if (x === -0) x = 0;
+ const i = floatToIntBits(x);
+ return x < 0 ? (~i) | (1 << 31) : i;
+};
diff --git a/packages/binary/src/gray.ts b/packages/binary/src/gray.ts
new file mode 100644
index 0000000000..abd891d4a4
--- /dev/null
+++ b/packages/binary/src/gray.ts
@@ -0,0 +1,25 @@
+/**
+ * Converts 32bit unsigned int to Gray code (reflected binary). Gray
+ * codes of successive values always have a Hamming distance of 1 (i.e.
+ * only 1 bit changes at a time).
+ *
+ * https://en.wikipedia.org/wiki/Gray_code
+ *
+ * @param x u32
+ */
+export const encodeGray32 = (x: number) =>
+ (x ^ (x >>> 1)) >>> 0;
+
+/**
+ * Converts 32bit Gray code to binary / unsigned int.
+ *
+ * https://en.wikipedia.org/wiki/Gray_code
+ */
+export const decodeGray32 = (x: number) => {
+ x = x ^ (x >>> 16);
+ x = x ^ (x >>> 8);
+ x = x ^ (x >>> 4);
+ x = x ^ (x >>> 2);
+ x = x ^ (x >>> 1);
+ return x >>> 0;
+};
diff --git a/packages/binary/src/index.ts b/packages/binary/src/index.ts
new file mode 100644
index 0000000000..06b4af8f41
--- /dev/null
+++ b/packages/binary/src/index.ts
@@ -0,0 +1,12 @@
+export * from "./api";
+export * from "./align";
+export * from "./count";
+export * from "./edit";
+export * from "./float";
+export * from "./gray";
+export * from "./logic";
+export * from "./mask";
+export * from "./pow";
+export * from "./rotate";
+export * from "./splat";
+export * from "./swizzle";
diff --git a/packages/binary/src/logic.ts b/packages/binary/src/logic.ts
new file mode 100644
index 0000000000..4e9e03ee0e
--- /dev/null
+++ b/packages/binary/src/logic.ts
@@ -0,0 +1,43 @@
+import { maskL } from "./mask";
+
+export const bitNot = (n: number, x: number) =>
+ maskL(n, ~x);
+
+export const bitAnd = (n: number, a: number, b: number) =>
+ maskL(n, a & b);
+
+export const bitNand = (n: number, a: number, b: number) =>
+ maskL(n, ~(a & b));
+
+export const bitOr = (n: number, a: number, b: number) =>
+ maskL(n, a | b);
+
+export const bitNor = (n: number, a: number, b: number) =>
+ maskL(n, ~(a & b));
+
+export const bitXor = (n: number, a: number, b: number) =>
+ maskL(n, a ^ b);
+
+export const bitXnor = (n: number, a: number, b: number) =>
+ maskL(n, ~(a ^ b));
+
+export const bitImply = (n: number, a: number, b: number) =>
+ maskL(n, (~a) | b);
+
+export const bitAoi21 = (n: number, a: number, b: number, c: number) =>
+ maskL(n, ~(a | (b & c)));
+
+export const bitOai21 = (n: number, a: number, b: number, c: number) =>
+ maskL(n, ~(a & (b | c)));
+
+export const bitAoi22 = (n: number, a: number, b: number, c: number, d: number) =>
+ maskL(n, ~((a & b) | (c & d)));
+
+export const bitOai22 = (n: number, a: number, b: number, c: number, d: number) =>
+ maskL(n, ~((a | b) & (c | d)));
+
+export const bitMux = (n: number, a: number, b: number, s: number) =>
+ maskL(n, (a & ~s) | (b & s));
+
+export const bitDemux = (n: number, a: number, b: number, s: number): [number, number] =>
+ [maskL(n, a & ~s), maskL(n, b & s)];
diff --git a/packages/binary/src/mask.ts b/packages/binary/src/mask.ts
new file mode 100644
index 0000000000..a929ea38af
--- /dev/null
+++ b/packages/binary/src/mask.ts
@@ -0,0 +1,34 @@
+import { MASKS } from "./api";
+
+/**
+ * Creates bit mask by enabling bit `a` to bit `b-1`, both in range
+ * 0-32. `b` MUST be >= `a`.
+ *
+ * ```
+ * defMask(1,31).toString(16) // 7ffffffe
+ * defMask(3,8).toString(16) // f8
+ * ```
+ *
+ * @param a
+ * @param b
+ */
+export const defMask = (a: number, b: number) =>
+ ((~MASKS[a]) & MASKS[b]) >>> 0;
+
+/**
+ * Returns unsigned version of `x` with only lowest `n` bits.
+ *
+ * @param n
+ * @param x
+ */
+export const maskL = (n: number, x: number) =>
+ (x & MASKS[n]) >>> 0;
+
+/**
+ * Returns unsigned version of `x` with only highest `n` bits.
+ *
+ * @param n
+ * @param x
+ */
+export const maskH = (n: number, x: number) =>
+ (x & ~MASKS[n]) >>> 0;
diff --git a/packages/binary/src/pow.ts b/packages/binary/src/pow.ts
new file mode 100644
index 0000000000..e69be6503d
--- /dev/null
+++ b/packages/binary/src/pow.ts
@@ -0,0 +1,24 @@
+// http://graphics.stanford.edu/~seander/bithacks.html
+
+export const isPow2 = (x: number) =>
+ (!!x) && !(x & (x - 1));
+
+export const ceilPow2 = (x: number) => {
+ x += (x === 0);
+ --x;
+ x |= x >>> 1;
+ x |= x >>> 2;
+ x |= x >>> 4;
+ x |= x >>> 8;
+ x |= x >>> 16;
+ return x + 1;
+};
+
+export const floorPow2 = (x: number) => {
+ x |= x >>> 1;
+ x |= x >>> 2;
+ x |= x >>> 4;
+ x |= x >>> 8;
+ x |= x >>> 16;
+ return x - (x >>> 1);
+};
diff --git a/packages/binary/src/rotate.ts b/packages/binary/src/rotate.ts
new file mode 100644
index 0000000000..61bab66df9
--- /dev/null
+++ b/packages/binary/src/rotate.ts
@@ -0,0 +1,19 @@
+import { Bit } from "./api";
+
+/**
+ * Rotates `x` `n` bits to the left.
+ *
+ * @param x
+ * @param n
+ */
+export const rotateLeft = (x: number, n: Bit) =>
+ ((x << n) | (x >>> (32 - n))) >>> 0;
+
+/**
+ * Rotates `x` `n` bits to the right.
+ *
+ * @param x
+ * @param n
+ */
+export const rotateRight = (x: number, n: Bit) =>
+ ((x >>> n) | (x << (32 - n))) >>> 0;
diff --git a/packages/binary/src/splat.ts b/packages/binary/src/splat.ts
new file mode 100644
index 0000000000..175e6c6dbc
--- /dev/null
+++ b/packages/binary/src/splat.ts
@@ -0,0 +1,55 @@
+/**
+ * Repeats lowest nibble of `x` as 24 bit uint.
+ *
+ * @param x
+ */
+export const splat4_24 = (x: number) =>
+ (x &= 0xf, splat8_24(x | x << 4));
+
+/**
+ * Repeats lowest nibble of `x` as 32 bit uint.
+ *
+ * @param x
+ */
+export const splat4_32 = (x: number) =>
+ (x &= 0xf, splat8_32(x | x << 4));
+
+/**
+ * Repeats lowest byte of `x` as 24 bit uint.
+ *
+ * @param x
+ */
+export const splat8_24 = (x: number) =>
+ (x & 0xff) * 0x010101;
+
+/**
+ * Repeats lowest byte of `x` as 32 bit uint.
+ *
+ * @param x
+ */
+export const splat8_32 = (x: number) =>
+ ((x & 0xff) * 0x01010101) >>> 0;
+
+/**
+ * Repeats lowest 16bit of `x` as 32 bit uint.
+ *
+ * @param x
+ */
+export const splat16_32 = (x: number) =>
+ (x &= 0xffff, ((x << 16) | x) >>> 0);
+
+/**
+ * Returns true if bits 0-3 are same as bits 4-7.
+ *
+ * @param x
+ */
+export const same4 = (x: number) =>
+ (x >> 4 & 0xf) === (x & 0xf);
+
+/**
+ * Returns true if bits 0-7 are same as bits 8-15.
+ *
+ * @param x
+ */
+export const same8 = (x: number) =>
+ (x >> 8 & 0xff) === (x & 0xff);
diff --git a/packages/binary/src/swizzle.ts b/packages/binary/src/swizzle.ts
new file mode 100644
index 0000000000..cb83e5eec0
--- /dev/null
+++ b/packages/binary/src/swizzle.ts
@@ -0,0 +1,91 @@
+import { Lane2, Lane4, Lane8 } from "./api";
+
+/**
+ * Extracts 8-bit lane from given 32bit uint.
+ *
+ * - Lane #0: bits 24-31
+ * - Lane #1: bits 16-23
+ * - Lane #2: bits 8-15
+ * - Lane #3: bits 0-7
+ *
+ * @param x
+ * @param l
+ */
+export const lane8 = (x: number, l: Lane8) =>
+ (x >>> ((3 - l) << 3)) & 0xff;
+
+/**
+ * Extracts 4-bit lane from given 32bit uint.
+ *
+ * - Lane #0: bits 28-31
+ * - Lane #1: bits 24-27
+ * - Lane #2: bits 20-23
+ * - Lane #3: bits 16-19
+ * - Lane #4: bits 12-15
+ * - Lane #5: bits 8-11
+ * - Lane #6: bits 4-7
+ * - Lane #7: bits 0-3
+ *
+ * @param x
+ * @param l
+ */
+export const lane4 = (x: number, l: Lane4) =>
+ (x >>> ((7 - l) << 2)) & 0xf;
+
+export const lane2 = (x: number, l: Lane2) =>
+ (x >>> ((15 - l) << 1)) & 0x3;
+
+/**
+ * Re-orders byte lanes in given order (MSB).
+ *
+ * ```
+ * swizzle(0x12345678, 3, 2, 1, 0) // 0x78563412
+ * swizzle(0x12345678, 1, 0, 3, 2) // 0x34127856
+ * swizzle(0x12345678, 2, 2, 0, 0) // 0x56561212
+ * ```
+ *
+ * @param x
+ * @param a
+ * @param b
+ * @param c
+ * @param d
+ */
+export const swizzle8 = (x: number, a: Lane8, b: Lane8, c: Lane8, d: Lane8) =>
+ (
+ lane8(x, a) << 24 |
+ lane8(x, b) << 16 |
+ lane8(x, c) << 8 |
+ lane8(x, d)
+ ) >>> 0;
+
+/**
+ *
+ * @param x
+ * @param a
+ * @param b
+ * @param c
+ * @param d
+ * @param e
+ * @param f
+ * @param g
+ * @param h
+ */
+export const swizzle4 = (x: number, a: Lane4, b: Lane4, c: Lane4, d: Lane4, e: Lane4, f: Lane4, g: Lane4, h: Lane4) =>
+ (
+ lane4(x, a) << 28 |
+ lane4(x, b) << 24 |
+ lane4(x, c) << 20 |
+ lane4(x, d) << 16 |
+ lane4(x, e) << 12 |
+ lane4(x, f) << 8 |
+ lane4(x, g) << 4 |
+ lane4(x, h)
+ ) >>> 0;
+
+/**
+ * Same as `swizzle8(x, 3, 2, 1, 0)`, but faster.
+ *
+ * @param x
+ */
+export const flipBytes = (x: number) =>
+ ((x >>> 24) | (x >> 8 & 0xff00) | (x & 0xff00) << 8 | x << 24) >>> 0;
diff --git a/packages/binary/test/index.ts b/packages/binary/test/index.ts
new file mode 100644
index 0000000000..9d0e8ad0f9
--- /dev/null
+++ b/packages/binary/test/index.ts
@@ -0,0 +1,6 @@
+// import * as assert from "assert";
+// import * as b from "../src/index";
+
+describe("binary", () => {
+ it("tests pending");
+});
diff --git a/packages/binary/test/tsconfig.json b/packages/binary/test/tsconfig.json
new file mode 100644
index 0000000000..bcf29ace54
--- /dev/null
+++ b/packages/binary/test/tsconfig.json
@@ -0,0 +1,10 @@
+{
+ "extends": "../../../tsconfig.json",
+ "compilerOptions": {
+ "outDir": "../build"
+ },
+ "include": [
+ "./**/*.ts",
+ "../src/**/*.ts"
+ ]
+}
diff --git a/packages/binary/tsconfig.json b/packages/binary/tsconfig.json
new file mode 100644
index 0000000000..bd6481a5a6
--- /dev/null
+++ b/packages/binary/tsconfig.json
@@ -0,0 +1,9 @@
+{
+ "extends": "../../tsconfig.json",
+ "compilerOptions": {
+ "outDir": "."
+ },
+ "include": [
+ "./src/**/*.ts"
+ ]
+}
diff --git a/packages/bitstream/CHANGELOG.md b/packages/bitstream/CHANGELOG.md
index 6ecd1c5859..67c60cc29e 100644
--- a/packages/bitstream/CHANGELOG.md
+++ b/packages/bitstream/CHANGELOG.md
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [0.4.19](https://github.com/thi-ng/umbrella/compare/@thi.ng/bitstream@0.4.18...@thi.ng/bitstream@0.4.19) (2018-10-17)
+
+**Note:** Version bump only for package @thi.ng/bitstream
+
+
+
+
+
## [0.4.18](https://github.com/thi-ng/umbrella/compare/@thi.ng/bitstream@0.4.17...@thi.ng/bitstream@0.4.18) (2018-09-24)
diff --git a/packages/bitstream/package.json b/packages/bitstream/package.json
index dfd2e59231..acfb75cff5 100644
--- a/packages/bitstream/package.json
+++ b/packages/bitstream/package.json
@@ -1,6 +1,6 @@
{
"name": "@thi.ng/bitstream",
- "version": "0.4.18",
+ "version": "0.4.19",
"description": "ES6 iterator based read/write bit streams & support for variable word widths",
"main": "./index.js",
"typings": "./index.d.ts",
@@ -20,7 +20,7 @@
"test": "rm -rf build && tsc -p test && nyc mocha build/test/*.js"
},
"dependencies": {
- "@thi.ng/errors": "^0.1.9"
+ "@thi.ng/errors": "^0.1.10"
},
"devDependencies": {
"@types/mocha": "^5.2.5",
diff --git a/packages/cache/CHANGELOG.md b/packages/cache/CHANGELOG.md
index 5e357915c8..40879ad787 100644
--- a/packages/cache/CHANGELOG.md
+++ b/packages/cache/CHANGELOG.md
@@ -3,6 +3,41 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [0.2.29](https://github.com/thi-ng/umbrella/compare/@thi.ng/cache@0.2.28...@thi.ng/cache@0.2.29) (2018-10-17)
+
+**Note:** Version bump only for package @thi.ng/cache
+
+
+
+
+
+
+## [0.2.28](https://github.com/thi-ng/umbrella/compare/@thi.ng/cache@0.2.27...@thi.ng/cache@0.2.28) (2018-09-26)
+
+**Note:** Version bump only for package @thi.ng/cache
+
+
+
+
+
+
+## [0.2.27](https://github.com/thi-ng/umbrella/compare/@thi.ng/cache@0.2.26...@thi.ng/cache@0.2.27) (2018-09-25)
+
+**Note:** Version bump only for package @thi.ng/cache
+
+
+
+
+
+
+## [0.2.26](https://github.com/thi-ng/umbrella/compare/@thi.ng/cache@0.2.25...@thi.ng/cache@0.2.26) (2018-09-24)
+
+**Note:** Version bump only for package @thi.ng/cache
+
+
+
+
+
## [0.2.25](https://github.com/thi-ng/umbrella/compare/@thi.ng/cache@0.2.24...@thi.ng/cache@0.2.25) (2018-09-24)
diff --git a/packages/cache/package.json b/packages/cache/package.json
index ad665eb3e8..ed0722e992 100644
--- a/packages/cache/package.json
+++ b/packages/cache/package.json
@@ -1,6 +1,6 @@
{
"name": "@thi.ng/cache",
- "version": "0.2.25",
+ "version": "0.2.29",
"description": "In-memory cache implementations with ES6 Map-like API and different eviction strategies",
"main": "./index.js",
"typings": "./index.d.ts",
@@ -28,9 +28,9 @@
"typescript": "^3.0.1"
},
"dependencies": {
- "@thi.ng/api": "^4.2.1",
- "@thi.ng/dcons": "^1.1.8",
- "@thi.ng/transducers": "^2.1.3"
+ "@thi.ng/api": "^4.2.2",
+ "@thi.ng/dcons": "^1.1.12",
+ "@thi.ng/transducers": "^2.2.0"
},
"keywords": [
"cache",
diff --git a/packages/cache/src/lru.ts b/packages/cache/src/lru.ts
index 4c03175270..8c9d18026a 100644
--- a/packages/cache/src/lru.ts
+++ b/packages/cache/src/lru.ts
@@ -12,8 +12,8 @@ export class LRUCache implements ICache {
constructor(pairs?: Iterable<[K, V]>, opts?: Partial>) {
const _opts = >Object.assign({
- maxlen: Number.POSITIVE_INFINITY,
- maxsize: Number.POSITIVE_INFINITY,
+ maxlen: Infinity,
+ maxsize: Infinity,
map: () => new Map(),
ksize: () => 0,
vsize: () => 0,
diff --git a/packages/checks/CHANGELOG.md b/packages/checks/CHANGELOG.md
index f796805803..473087d30b 100644
--- a/packages/checks/CHANGELOG.md
+++ b/packages/checks/CHANGELOG.md
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.5.12](https://github.com/thi-ng/umbrella/compare/@thi.ng/checks@1.5.11...@thi.ng/checks@1.5.12) (2018-10-17)
+
+**Note:** Version bump only for package @thi.ng/checks
+
+
+
+
+
## [1.5.11](https://github.com/thi-ng/umbrella/compare/@thi.ng/checks@1.5.10...@thi.ng/checks@1.5.11) (2018-09-24)
diff --git a/packages/checks/package.json b/packages/checks/package.json
index 9aecbff357..31843c17ae 100644
--- a/packages/checks/package.json
+++ b/packages/checks/package.json
@@ -1,6 +1,6 @@
{
"name": "@thi.ng/checks",
- "version": "1.5.11",
+ "version": "1.5.12",
"description": "Single-function sub-modules for type, feature & value checks",
"main": "./index.js",
"typings": "./index.d.ts",
diff --git a/packages/compare/CHANGELOG.md b/packages/compare/CHANGELOG.md
index a3a4bc7c6e..f59d04aa0c 100644
--- a/packages/compare/CHANGELOG.md
+++ b/packages/compare/CHANGELOG.md
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [0.1.10](https://github.com/thi-ng/umbrella/compare/@thi.ng/compare@0.1.9...@thi.ng/compare@0.1.10) (2018-10-17)
+
+**Note:** Version bump only for package @thi.ng/compare
+
+
+
+
+
## [0.1.9](https://github.com/thi-ng/umbrella/compare/@thi.ng/compare@0.1.8...@thi.ng/compare@0.1.9) (2018-09-24)
diff --git a/packages/compare/package.json b/packages/compare/package.json
index a3540fa5bf..8f72bc4360 100644
--- a/packages/compare/package.json
+++ b/packages/compare/package.json
@@ -1,6 +1,6 @@
{
"name": "@thi.ng/compare",
- "version": "0.1.9",
+ "version": "0.1.10",
"description": "Comparator with optional delegation for types implementing @thi.ng/api/ICompare interface",
"main": "./index.js",
"typings": "./index.d.ts",
diff --git a/packages/compose/CHANGELOG.md b/packages/compose/CHANGELOG.md
index 6301293c69..84734f0523 100644
--- a/packages/compose/CHANGELOG.md
+++ b/packages/compose/CHANGELOG.md
@@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+# [0.2.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/compose@0.1.4...@thi.ng/compose@0.2.0) (2018-10-17)
+
+
+### Features
+
+* **compose:** add partial(), update readme ([6851f2c](https://github.com/thi-ng/umbrella/commit/6851f2c))
+
+
+
+
+
## [0.1.4](https://github.com/thi-ng/umbrella/compare/@thi.ng/compose@0.1.3...@thi.ng/compose@0.1.4) (2018-09-24)
diff --git a/packages/compose/README.md b/packages/compose/README.md
index accff7d6d9..f79e40b740 100644
--- a/packages/compose/README.md
+++ b/packages/compose/README.md
@@ -22,9 +22,10 @@ This project is part of the
Functional composition helpers:
-- [comp(...)](https://github.com/thi-ng/umbrella/tree/master/packages/compose/src/comp.ts)
-- [compI(...)](https://github.com/thi-ng/umbrella/tree/master/packages/compose/src/comp.ts)
-- [juxt(...)](https://github.com/thi-ng/umbrella/tree/master/packages/compose/src/juxt.ts)
+- [comp()](https://github.com/thi-ng/umbrella/tree/master/packages/compose/src/comp.ts)
+- [compI()](https://github.com/thi-ng/umbrella/tree/master/packages/compose/src/comp.ts)
+- [juxt()](https://github.com/thi-ng/umbrella/tree/master/packages/compose/src/juxt.ts)
+- [partial()](https://github.com/thi-ng/umbrella/tree/master/packages/compose/src/partial.ts)
## Installation
diff --git a/packages/compose/package.json b/packages/compose/package.json
index 3570ea9b12..dc00447700 100644
--- a/packages/compose/package.json
+++ b/packages/compose/package.json
@@ -1,6 +1,6 @@
{
"name": "@thi.ng/compose",
- "version": "0.1.4",
+ "version": "0.2.0",
"description": "Functional composition helpers",
"main": "./index.js",
"typings": "./index.d.ts",
@@ -28,8 +28,8 @@
"typescript": "^3.0.1"
},
"dependencies": {
- "@thi.ng/api": "^4.2.1",
- "@thi.ng/errors": "^0.1.9"
+ "@thi.ng/api": "^4.2.2",
+ "@thi.ng/errors": "^0.1.10"
},
"keywords": [
"composition",
diff --git a/packages/compose/src/index.ts b/packages/compose/src/index.ts
index 99ae4c440f..ee645566d1 100644
--- a/packages/compose/src/index.ts
+++ b/packages/compose/src/index.ts
@@ -1,2 +1,3 @@
export * from "./comp";
export * from "./juxt";
+export * from "./partial";
diff --git a/packages/compose/src/partial.ts b/packages/compose/src/partial.ts
new file mode 100644
index 0000000000..d8ba1c883d
--- /dev/null
+++ b/packages/compose/src/partial.ts
@@ -0,0 +1,35 @@
+import { illegalArgs } from "@thi.ng/errors/illegal-arguments";
+
+export function partial(fn: (a: A, ...args: any[]) => T, a: A): (...args: any[]) => T;
+export function partial(fn: (a: A, b: B, ...args: any[]) => T, a: A, b: B): (...args: any[]) => T;
+export function partial(fn: (a: A, b: B, c: C, ...args: any[]) => T, a: A, b: B, c: C): (...args: any[]) => T;
+export function partial(fn: (a: A, b: B, c: C, d: D, ...args: any[]) => T, a: A, b: B, c: C, d: D): (...args: any[]) => T;
+export function partial(fn: (a: A, b: B, c: C, d: D, e: E, ...args: any[]) => T, a: A, b: B, c: C, d: D, e: E): (...args: any[]) => T;
+export function partial(fn: (a: A, b: B, c: C, d: D, e: E, f: F, ...args: any[]) => T, a: A, b: B, c: C, d: D, e: E, f: F): (...args: any[]) => T;
+export function partial(fn: (a: A, b: B, c: C, d: D, e: E, f: F, g: G, ...args: any[]) => T, a: A, b: B, c: C, d: D, e: E, f: F, g: G): (...args: any[]) => T;
+export function partial(fn: (a: A, b: B, c: C, d: D, e: E, f: F, g: G, h: H, ...args: any[]) => T, a: A, b: B, c: C, d: D, e: E, f: F, g: G, h: H): (...args: any[]) => T;
+export function partial(fn, ...args: any[]) {
+ let [a, b, c, d, e, f, g, h] = args;
+ switch (args.length) {
+ case 1:
+ return (...xs: any[]) => fn(a, ...xs);
+ case 2:
+ return (...xs: any[]) => fn(a, b, ...xs);
+ case 3:
+ return (...xs: any[]) => fn(a, b, c, ...xs);
+ case 4:
+ return (...xs: any[]) => fn(a, b, c, d, ...xs);
+ case 5:
+ return (...xs: any[]) => fn(a, b, c, d, e, ...xs);
+ case 6:
+ return (...xs: any[]) => fn(a, b, c, d, e, f, ...xs);
+ case 7:
+ return (...xs: any[]) => fn(a, b, c, d, e, f, g, ...xs);
+ case 8:
+ return (...xs: any[]) => fn(a, b, c, d, e, f, g, h, ...xs);
+ default:
+ illegalArgs();
+ }
+}
+
+export const foo = partial((a: string, b: number) => a + b, "a");
diff --git a/packages/csp/CHANGELOG.md b/packages/csp/CHANGELOG.md
index d7aeda7e4a..386b5c7789 100644
--- a/packages/csp/CHANGELOG.md
+++ b/packages/csp/CHANGELOG.md
@@ -3,6 +3,41 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [0.3.68](https://github.com/thi-ng/umbrella/compare/@thi.ng/csp@0.3.67...@thi.ng/csp@0.3.68) (2018-10-17)
+
+**Note:** Version bump only for package @thi.ng/csp
+
+
+
+
+
+
+## [0.3.67](https://github.com/thi-ng/umbrella/compare/@thi.ng/csp@0.3.66...@thi.ng/csp@0.3.67) (2018-09-26)
+
+**Note:** Version bump only for package @thi.ng/csp
+
+
+
+
+
+
+## [0.3.66](https://github.com/thi-ng/umbrella/compare/@thi.ng/csp@0.3.65...@thi.ng/csp@0.3.66) (2018-09-25)
+
+**Note:** Version bump only for package @thi.ng/csp
+
+
+
+
+
+
+## [0.3.65](https://github.com/thi-ng/umbrella/compare/@thi.ng/csp@0.3.64...@thi.ng/csp@0.3.65) (2018-09-24)
+
+**Note:** Version bump only for package @thi.ng/csp
+
+
+
+
+
## [0.3.64](https://github.com/thi-ng/umbrella/compare/@thi.ng/csp@0.3.63...@thi.ng/csp@0.3.64) (2018-09-24)
diff --git a/packages/csp/package.json b/packages/csp/package.json
index b23784230d..a38d0ade23 100644
--- a/packages/csp/package.json
+++ b/packages/csp/package.json
@@ -1,6 +1,6 @@
{
"name": "@thi.ng/csp",
- "version": "0.3.64",
+ "version": "0.3.68",
"description": "ES6 promise based CSP implementation",
"main": "./index.js",
"typings": "./index.d.ts",
@@ -32,11 +32,11 @@
"typescript": "^3.0.1"
},
"dependencies": {
- "@thi.ng/api": "^4.2.1",
- "@thi.ng/checks": "^1.5.11",
- "@thi.ng/dcons": "^1.1.8",
- "@thi.ng/errors": "^0.1.9",
- "@thi.ng/transducers": "^2.1.3"
+ "@thi.ng/api": "^4.2.2",
+ "@thi.ng/checks": "^1.5.12",
+ "@thi.ng/dcons": "^1.1.12",
+ "@thi.ng/errors": "^0.1.10",
+ "@thi.ng/transducers": "^2.2.0"
},
"keywords": [
"async",
diff --git a/packages/dcons/CHANGELOG.md b/packages/dcons/CHANGELOG.md
index 29bc7bcd12..26b5c6d5d8 100644
--- a/packages/dcons/CHANGELOG.md
+++ b/packages/dcons/CHANGELOG.md
@@ -3,6 +3,41 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.1.12](https://github.com/thi-ng/umbrella/compare/@thi.ng/dcons@1.1.11...@thi.ng/dcons@1.1.12) (2018-10-17)
+
+**Note:** Version bump only for package @thi.ng/dcons
+
+
+
+
+
+
+## [1.1.11](https://github.com/thi-ng/umbrella/compare/@thi.ng/dcons@1.1.10...@thi.ng/dcons@1.1.11) (2018-09-26)
+
+**Note:** Version bump only for package @thi.ng/dcons
+
+
+
+
+
+
+## [1.1.10](https://github.com/thi-ng/umbrella/compare/@thi.ng/dcons@1.1.9...@thi.ng/dcons@1.1.10) (2018-09-25)
+
+**Note:** Version bump only for package @thi.ng/dcons
+
+
+
+
+
+
+## [1.1.9](https://github.com/thi-ng/umbrella/compare/@thi.ng/dcons@1.1.8...@thi.ng/dcons@1.1.9) (2018-09-24)
+
+**Note:** Version bump only for package @thi.ng/dcons
+
+
+
+
+
## [1.1.8](https://github.com/thi-ng/umbrella/compare/@thi.ng/dcons@1.1.7...@thi.ng/dcons@1.1.8) (2018-09-24)
diff --git a/packages/dcons/package.json b/packages/dcons/package.json
index 0e484ad8dc..360262dbf1 100644
--- a/packages/dcons/package.json
+++ b/packages/dcons/package.json
@@ -1,6 +1,6 @@
{
"name": "@thi.ng/dcons",
- "version": "1.1.8",
+ "version": "1.1.12",
"description": "Comprehensive doubly linked list structure w/ iterator support",
"main": "./index.js",
"typings": "./index.d.ts",
@@ -28,12 +28,12 @@
"typescript": "^3.0.1"
},
"dependencies": {
- "@thi.ng/api": "^4.2.1",
- "@thi.ng/checks": "^1.5.11",
- "@thi.ng/compare": "^0.1.9",
- "@thi.ng/equiv": "^0.1.11",
- "@thi.ng/errors": "^0.1.9",
- "@thi.ng/transducers": "^2.1.3"
+ "@thi.ng/api": "^4.2.2",
+ "@thi.ng/checks": "^1.5.12",
+ "@thi.ng/compare": "^0.1.10",
+ "@thi.ng/equiv": "^0.1.12",
+ "@thi.ng/errors": "^0.1.10",
+ "@thi.ng/transducers": "^2.2.0"
},
"keywords": [
"datastructure",
diff --git a/packages/defmulti/CHANGELOG.md b/packages/defmulti/CHANGELOG.md
index b2bd426006..85c23a7fed 100644
--- a/packages/defmulti/CHANGELOG.md
+++ b/packages/defmulti/CHANGELOG.md
@@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+# [0.4.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/defmulti@0.3.11...@thi.ng/defmulti@0.4.0) (2018-10-17)
+
+
+### Features
+
+* **defmulti:** add varargs support ([6094738](https://github.com/thi-ng/umbrella/commit/6094738))
+
+
+
+
+
## [0.3.11](https://github.com/thi-ng/umbrella/compare/@thi.ng/defmulti@0.3.10...@thi.ng/defmulti@0.3.11) (2018-09-24)
diff --git a/packages/defmulti/package.json b/packages/defmulti/package.json
index b94d32c73f..91f7cd4b63 100644
--- a/packages/defmulti/package.json
+++ b/packages/defmulti/package.json
@@ -1,6 +1,6 @@
{
"name": "@thi.ng/defmulti",
- "version": "0.3.11",
+ "version": "0.4.0",
"description": "Dynamically extensible multiple dispatch via user supplied dispatch function.",
"main": "./index.js",
"typings": "./index.d.ts",
@@ -28,8 +28,8 @@
"typescript": "^3.0.1"
},
"dependencies": {
- "@thi.ng/api": "^4.2.1",
- "@thi.ng/errors": "^0.1.9"
+ "@thi.ng/api": "^4.2.2",
+ "@thi.ng/errors": "^0.1.10"
},
"keywords": [
"ES6",
diff --git a/packages/defmulti/src/index.ts b/packages/defmulti/src/index.ts
index 4971ec70ca..3c1f974da4 100644
--- a/packages/defmulti/src/index.ts
+++ b/packages/defmulti/src/index.ts
@@ -5,24 +5,24 @@ import { illegalArity } from "@thi.ng/errors/illegal-arity";
export const DEFAULT: unique symbol = Symbol();
export type DispatchFn = (...args) => PropertyKey;
-export type DispatchFn1 = (a: A) => PropertyKey;
-export type DispatchFn2 = (a: A, b: B) => PropertyKey;
-export type DispatchFn3 = (a: A, b: B, c: C) => PropertyKey;
-export type DispatchFn4 = (a: A, b: B, c: C, d: D) => PropertyKey;
-export type DispatchFn5 = (a: A, b: B, c: C, d: D, e: E) => PropertyKey;
-export type DispatchFn6 = (a: A, b: B, c: C, d: D, e: E, f: F) => PropertyKey;
-export type DispatchFn7 = (a: A, b: B, c: C, d: D, e: E, f: F, g: G) => PropertyKey;
-export type DispatchFn8 = (a: A, b: B, c: C, d: D, e: E, f: F, g: G, h: H) => PropertyKey;
+export type DispatchFn1 = (a: A, ...xs: any[]) => PropertyKey;
+export type DispatchFn2 = (a: A, b: B, ...xs: any[]) => PropertyKey;
+export type DispatchFn3 = (a: A, b: B, c: C, ...xs: any[]) => PropertyKey;
+export type DispatchFn4 = (a: A, b: B, c: C, d: D, ...xs: any[]) => PropertyKey;
+export type DispatchFn5 = (a: A, b: B, c: C, d: D, e: E, ...xs: any[]) => PropertyKey;
+export type DispatchFn6 = (a: A, b: B, c: C, d: D, e: E, f: F, ...xs: any[]) => PropertyKey;
+export type DispatchFn7 = (a: A, b: B, c: C, d: D, e: E, f: F, g: G, ...xs: any[]) => PropertyKey;
+export type DispatchFn8 = (a: A, b: B, c: C, d: D, e: E, f: F, g: G, h: H, ...xs: any[]) => PropertyKey;
export type Implementation = (...args: any[]) => T;
-export type Implementation1 = (a: A) => T;
-export type Implementation2 = (a: A, b: B) => T;
-export type Implementation3 = (a: A, b: B, c: C) => T;
-export type Implementation4 = (a: A, b: B, c: C, d: D) => T;
-export type Implementation5 = (a: A, b: B, c: C, d: D, e: E) => T;
-export type Implementation6 = (a: A, b: B, c: C, d: D, e: E, f: F) => T;
-export type Implementation7 = (a: A, b: B, c: C, d: D, e: E, f: F, g: G) => T;
-export type Implementation8 = (a: A, b: B, c: C, d: D, e: E, f: F, g: G, h: H) => T;
+export type Implementation1 = (a: A, ...xs: any[]) => T;
+export type Implementation2 = (a: A, b: B, ...xs: any[]) => T;
+export type Implementation3 = (a: A, b: B, c: C, ...xs: any[]) => T;
+export type Implementation4 = (a: A, b: B, c: C, d: D, ...xs: any[]) => T;
+export type Implementation5 = (a: A, b: B, c: C, d: D, e: E, ...xs: any[]) => T;
+export type Implementation6 = (a: A, b: B, c: C, d: D, e: E, f: F, ...xs: any[]) => T;
+export type Implementation7 = (a: A, b: B, c: C, d: D, e: E, f: F, g: G, ...xs: any[]) => T;
+export type Implementation8 = (a: A, b: B, c: C, d: D, e: E, f: F, g: G, h: H, ...xs: any[]) => T;
export interface MultiFn extends Implementation {
add: (id: PropertyKey, g: Implementation) => boolean;
diff --git a/packages/dgraph/CHANGELOG.md b/packages/dgraph/CHANGELOG.md
index 90a3b677e0..23d8d8675f 100644
--- a/packages/dgraph/CHANGELOG.md
+++ b/packages/dgraph/CHANGELOG.md
@@ -3,6 +3,41 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [0.2.24](https://github.com/thi-ng/umbrella/compare/@thi.ng/dgraph@0.2.23...@thi.ng/dgraph@0.2.24) (2018-10-17)
+
+**Note:** Version bump only for package @thi.ng/dgraph
+
+
+
+
+
+
+## [0.2.23](https://github.com/thi-ng/umbrella/compare/@thi.ng/dgraph@0.2.22...@thi.ng/dgraph@0.2.23) (2018-09-26)
+
+**Note:** Version bump only for package @thi.ng/dgraph
+
+
+
+
+
+
+## [0.2.22](https://github.com/thi-ng/umbrella/compare/@thi.ng/dgraph@0.2.21...@thi.ng/dgraph@0.2.22) (2018-09-25)
+
+**Note:** Version bump only for package @thi.ng/dgraph
+
+
+
+
+
+
+## [0.2.21](https://github.com/thi-ng/umbrella/compare/@thi.ng/dgraph@0.2.20...@thi.ng/dgraph@0.2.21) (2018-09-24)
+
+**Note:** Version bump only for package @thi.ng/dgraph
+
+
+
+
+
## [0.2.20](https://github.com/thi-ng/umbrella/compare/@thi.ng/dgraph@0.2.19...@thi.ng/dgraph@0.2.20) (2018-09-24)
diff --git a/packages/dgraph/package.json b/packages/dgraph/package.json
index ed69d7442d..bf0e7ccbd4 100644
--- a/packages/dgraph/package.json
+++ b/packages/dgraph/package.json
@@ -1,6 +1,6 @@
{
"name": "@thi.ng/dgraph",
- "version": "0.2.20",
+ "version": "0.2.24",
"description": "Type-agnostic directed acyclic graph (DAG) & graph operations",
"main": "./index.js",
"typings": "./index.d.ts",
@@ -28,11 +28,11 @@
"typescript": "^3.0.1"
},
"dependencies": {
- "@thi.ng/api": "^4.2.1",
- "@thi.ng/associative": "^0.6.8",
- "@thi.ng/equiv": "^0.1.11",
- "@thi.ng/errors": "^0.1.9",
- "@thi.ng/transducers": "^2.1.3"
+ "@thi.ng/api": "^4.2.2",
+ "@thi.ng/associative": "^0.6.12",
+ "@thi.ng/equiv": "^0.1.12",
+ "@thi.ng/errors": "^0.1.10",
+ "@thi.ng/transducers": "^2.2.0"
},
"keywords": [
"data structure",
diff --git a/packages/diff/CHANGELOG.md b/packages/diff/CHANGELOG.md
index e72898ca1e..e516f9d532 100644
--- a/packages/diff/CHANGELOG.md
+++ b/packages/diff/CHANGELOG.md
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.1.3](https://github.com/thi-ng/umbrella/compare/@thi.ng/diff@1.1.2...@thi.ng/diff@1.1.3) (2018-10-17)
+
+**Note:** Version bump only for package @thi.ng/diff
+
+
+
+
+
## [1.1.2](https://github.com/thi-ng/umbrella/compare/@thi.ng/diff@1.1.1...@thi.ng/diff@1.1.2) (2018-09-24)
diff --git a/packages/diff/package.json b/packages/diff/package.json
index f244daeb09..6d41d53107 100644
--- a/packages/diff/package.json
+++ b/packages/diff/package.json
@@ -1,6 +1,6 @@
{
"name": "@thi.ng/diff",
- "version": "1.1.2",
+ "version": "1.1.3",
"description": "Array & object Diff",
"main": "./index.js",
"typings": "./index.d.ts",
@@ -26,8 +26,8 @@
"typescript": "^3.0.1"
},
"dependencies": {
- "@thi.ng/api": "^4.2.1",
- "@thi.ng/equiv": "^0.1.11"
+ "@thi.ng/api": "^4.2.2",
+ "@thi.ng/equiv": "^0.1.12"
},
"keywords": [
"array",
diff --git a/packages/dlogic/.npmignore b/packages/dlogic/.npmignore
new file mode 100644
index 0000000000..d703bda97a
--- /dev/null
+++ b/packages/dlogic/.npmignore
@@ -0,0 +1,10 @@
+build
+coverage
+dev
+doc
+src*
+test
+.nyc_output
+tsconfig.json
+*.tgz
+*.html
diff --git a/packages/dlogic/CHANGELOG.md b/packages/dlogic/CHANGELOG.md
new file mode 100644
index 0000000000..b10dc857d2
--- /dev/null
+++ b/packages/dlogic/CHANGELOG.md
@@ -0,0 +1,11 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+# 0.1.0 (2018-10-17)
+
+
+### Features
+
+* **dlogic:** add [@thi](https://github.com/thi).ng/dlogic package ([405cf51](https://github.com/thi-ng/umbrella/commit/405cf51))
diff --git a/packages/dlogic/LICENSE b/packages/dlogic/LICENSE
new file mode 100644
index 0000000000..8dada3edaf
--- /dev/null
+++ b/packages/dlogic/LICENSE
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "{}"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright {yyyy} {name of copyright owner}
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/packages/dlogic/README.md b/packages/dlogic/README.md
new file mode 100644
index 0000000000..5b505d6d78
--- /dev/null
+++ b/packages/dlogic/README.md
@@ -0,0 +1,74 @@
+# @thi.ng/dlogic
+
+[](https://www.npmjs.com/package/@thi.ng/dlogic)
+
+[](https://twitter.com/thing_umbrella)
+
+This project is part of the
+[@thi.ng/umbrella](https://github.com/thi-ng/umbrella/) monorepo.
+
+
+
+- [About](#about)
+- [Status](#status)
+- [Installation](#installation)
+- [Dependencies](#dependencies)
+- [Usage examples](#usage-examples)
+- [Authors](#authors)
+- [License](#license)
+
+
+
+## About
+
+Assorted digital logic gates and ops for boolean values to compose
+complex logic in a more functional manner, e.g. for DSL or simulation
+purposes. Truth tables and references are provided in the doc strings of
+each function.
+
+Also see
+[@thi.ng/binary](https://github.com/thi-ng/umbrella/tree/master/packages/binary/src/logic.ts)
+for binary versions of most of the ops provided by this package.
+
+## Status
+
+ALPHA
+
+## Installation
+
+```bash
+yarn add @thi.ng/dlogic
+```
+
+## Dependencies
+
+None.
+
+## Usage examples
+
+```ts
+import { nand } from "@thi.ng/dlogic";
+
+// XOR construction only using NAND gates
+const xor = (a: boolean, b: boolean) => {
+ const ab = nand(a,b);
+ return nand(nand(a, ab), nand(b, ab));
+};
+
+xor(false, false)
+// false
+xor(false, true)
+// true
+xor(true, false)
+// true
+xor(true, true)
+// false
+```
+
+## Authors
+
+- Karsten Schmidt
+
+## License
+
+© 2017 - 2018 Karsten Schmidt // Apache Software License 2.0
diff --git a/packages/dlogic/package.json b/packages/dlogic/package.json
new file mode 100644
index 0000000000..ea5ee60083
--- /dev/null
+++ b/packages/dlogic/package.json
@@ -0,0 +1,43 @@
+{
+ "name": "@thi.ng/dlogic",
+ "version": "0.1.0",
+ "description": "Assorted digital logic ops / constructs.",
+ "main": "./index.js",
+ "typings": "./index.d.ts",
+ "repository": {
+ "type": "git",
+ "url": "https://github.com/thi-ng/umbrella.git"
+ },
+ "homepage": "https://github.com/thi-ng/umbrella/tree/master/packages/logic",
+ "author": "Karsten Schmidt ",
+ "license": "Apache-2.0",
+ "scripts": {
+ "build": "yarn run clean && tsc --declaration",
+ "clean": "rm -rf *.js *.d.ts .nyc_output build coverage doc",
+ "cover": "yarn test && nyc report --reporter=lcov",
+ "doc": "node_modules/.bin/typedoc --mode modules --out doc src",
+ "pub": "yarn run build && yarn publish --access public",
+ "test": "rm -rf build && tsc -p test && nyc mocha build/test/*.js"
+ },
+ "devDependencies": {
+ "@types/mocha": "^5.2.5",
+ "@types/node": "^10.5.5",
+ "mocha": "^5.2.0",
+ "nyc": "^12.0.2",
+ "typedoc": "^0.11.1",
+ "typescript": "^3.0.1"
+ },
+ "keywords": [
+ "boolean",
+ "digital",
+ "ES6",
+ "functional",
+ "gates",
+ "logic",
+ "simulation",
+ "typescript"
+ ],
+ "publishConfig": {
+ "access": "public"
+ }
+}
diff --git a/packages/dlogic/src/index.ts b/packages/dlogic/src/index.ts
new file mode 100644
index 0000000000..b8b09effc4
--- /dev/null
+++ b/packages/dlogic/src/index.ts
@@ -0,0 +1,286 @@
+export interface Sum {
+ s: T;
+ c: boolean;
+}
+
+
+/**
+ * https://en.wikipedia.org/wiki/Inverter_(logic_gate)
+ *
+ * | X | Q |
+ * |---|---|
+ * | 0 | 1 |
+ * | 1 | 0 |
+ *
+ * @param x
+ */
+export const not = (x: boolean) => !x;
+
+/**
+ * https://en.wikipedia.org/wiki/NAND_gate
+ *
+ * | A | B | Q |
+ * |---|---|---|
+ * | 0 | 0 | 1 |
+ * | 0 | 1 | 1 |
+ * | 1 | 0 | 1 |
+ * | 1 | 1 | 0 |
+ *
+ * @param a
+ * @param b
+ */
+export const nand = (a: boolean, b: boolean) => !(a && b);
+
+/**
+ * https://en.wikipedia.org/wiki/AND_gate
+ *
+ * | A | B | Q |
+ * |---|---|---|
+ * | 0 | 0 | 0 |
+ * | 0 | 1 | 0 |
+ * | 1 | 0 | 0 |
+ * | 1 | 1 | 1 |
+ *
+ * @param a
+ * @param b
+ */
+export const and = (a: boolean, b: boolean) => a && b;
+
+/**
+ * https://en.wikipedia.org/wiki/OR_gate
+ *
+ * | A | B | Q |
+ * |---|---|---|
+ * | 0 | 0 | 0 |
+ * | 0 | 1 | 1 |
+ * | 1 | 0 | 1 |
+ * | 1 | 1 | 1 |
+ *
+ * @param a
+ * @param b
+ */
+export const or = (a: boolean, b: boolean) => a || b;
+
+/**
+ * https://en.wikipedia.org/wiki/NOR_gate
+ *
+ * | A | B | Q |
+ * |---|---|---|
+ * | 0 | 0 | 1 |
+ * | 0 | 1 | 0 |
+ * | 1 | 0 | 0 |
+ * | 1 | 1 | 0 |
+ *
+ * @param a
+ * @param b
+ */
+export const nor = (a: boolean, b: boolean) => !(a || b);
+
+/**
+ * https://en.wikipedia.org/wiki/XOR_gate
+ *
+ * | A | B | Q |
+ * |---|---|---|
+ * | 0 | 0 | 0 |
+ * | 0 | 1 | 1 |
+ * | 1 | 0 | 1 |
+ * | 1 | 1 | 0 |
+ *
+ * @param a
+ * @param b
+ */
+export const xor = (a: boolean, b: boolean) => a !== b;
+
+/**
+ * https://en.wikipedia.org/wiki/XNOR_gate
+ *
+ * | A | B | Q |
+ * |---|---|---|
+ * | 0 | 0 | 1 |
+ * | 0 | 1 | 0 |
+ * | 1 | 0 | 0 |
+ * | 1 | 1 | 1 |
+ *
+ * @param a
+ * @param b
+ */
+export const xnor = (a: boolean, b: boolean) => a === b;
+
+/**
+ * https://web.archive.org/web/20160304050642/http://www.zigwap.com/digital/gates/imply_gate
+ *
+ * | A | B | Q |
+ * |---|---|---|
+ * | 0 | 0 | 1 |
+ * | 0 | 1 | 1 |
+ * | 1 | 0 | 0 |
+ * | 1 | 1 | 1 |
+ * @param a
+ * @param b
+ */
+export const imply = (a: boolean, b: boolean) => !a || b;
+
+/**
+ * https://en.wikipedia.org/wiki/AND-OR-Invert
+ *
+ * `q = nor(a, and(b, c))`
+ *
+ * | A | B | C | Q |
+ * |---|---|---|---|
+ * | 0 | 0 | 0 | 1 |
+ * | 0 | 0 | 1 | 1 |
+ * | 0 | 1 | 0 | 1 |
+ * | 0 | 1 | 1 | 0 |
+ * | 1 | 0 | 0 | 0 |
+ * | 1 | 0 | 1 | 0 |
+ * | 1 | 1 | 0 | 0 |
+ * | 1 | 1 | 1 | 0 |
+ *
+ * @param a
+ * @param b
+ * @param c
+ */
+export const aoi21 = (a: boolean, b: boolean, c: boolean) =>
+ !(a || (b && c));
+
+/**
+ * https://en.wikipedia.org/wiki/AND-OR-Invert
+ *
+ * `q = nor(and(a, b), and(c, d))`
+ *
+ * | A | B | C | D | Q |
+ * |---|---|---|---|---|
+ * | 0 | X | X | 0 | 1 |
+ * | X | 0 | X | 0 | 1 |
+ * | 0 | X | 0 | X | 1 |
+ * | X | 0 | 0 | X | 1 |
+ * | 1 | 1 | X | X | 0 |
+ * | X | X | 1 | 1 | 0 |
+ *
+ * @param a
+ * @param b
+ * @param c
+ */
+export const aoi22 = (a: boolean, b: boolean, c: boolean, d: boolean) =>
+ !((a && b) || (c && d));
+
+/**
+ * Complement logic of `aoi21`.
+ *
+ * `q = nand(a, or(b, c))`
+ *
+ * @param a
+ * @param b
+ * @param c
+ */
+export const oai21 = (a: boolean, b: boolean, c: boolean) =>
+ !(a && (b || c));
+
+/**
+ * Complement logic of `aoi22`.
+ *
+ * `q = nand(or(a, b), or(c, d))`
+ *
+ * @param a
+ * @param b
+ * @param c
+ * @param d
+ */
+export const oai22 = (a: boolean, b: boolean, c: boolean, d: boolean) =>
+ !((a || b) && (c || d));
+
+/**
+ * https://en.wikipedia.org/wiki/NAND_logic#MUX
+ *
+ * | A | B | S | Q |
+ * |---|---|---|---|
+ * | 0 | 0 | 0 | 0 |
+ * | 0 | 1 | 0 | 0 |
+ * | 1 | 0 | 0 | 1 |
+ * | 1 | 1 | 0 | 1 |
+ * | 0 | 0 | 1 | 0 |
+ * | 0 | 1 | 1 | 1 |
+ * | 1 | 0 | 1 | 0 |
+ * | 1 | 1 | 1 | 1 |
+ *
+ * @param a
+ * @param b
+ * @param s
+ */
+export const mux = (a: boolean, b: boolean, s: boolean) =>
+ (a && !s) || (b && s);
+
+/**
+ * https://en.wikipedia.org/wiki/NAND_logic#DEMUX
+ *
+ * | I | S | A | B |
+ * |---|---|---|---|
+ * | 0 | 0 | 0 | 0 |
+ * | 1 | 0 | 1 | 0 |
+ * | 0 | 1 | 0 | 0 |
+ * | 1 | 1 | 0 | 1 |
+ *
+ * @param i
+ * @param s
+ */
+export const demux = (i: boolean, s: boolean): [boolean, boolean] =>
+ [i && !s, i && s];
+
+/**
+ * https://en.wikipedia.org/wiki/Adder_(electronics)#Half_adder
+ *
+ * @param a
+ * @param b
+ */
+export const hadd1 = (a: boolean, b: boolean): Sum =>
+ ({ s: a !== b, c: a && b });
+
+/**
+ * https://en.wikipedia.org/wiki/Adder_(electronics)#Full_adder
+ *
+ * @param a
+ * @param b
+ * @param c
+ */
+export const fadd1 = (a: boolean, b: boolean, c: boolean): Sum =>
+ ({
+ s: (a !== b) !== c,
+ c: ((a !== b) && c) || (a && b)
+ });
+
+/**
+ * https://en.wikipedia.org/wiki/Adder_(electronics)#Ripple-carry_adder
+ *
+ * @param a
+ * @param b
+ * @param c
+ */
+export const rca = (a: boolean[], b: boolean[], c: boolean): Sum => {
+ const s: boolean[] = [];
+ for (let n = a.length, i = 0; i < n; i++) {
+ const r = fadd1(a[i], b[i], c);
+ s.push(r.s);
+ c = r.c;
+ }
+ return { s, c };
+};
+
+/**
+ * HOF delay line generator. Returned function takes single boolean arg,
+ * buffers `n` values (ring buffer) and returns currently oldest. The
+ * first `n` results will always be `false`.
+ *
+ * @param n
+ */
+export const delay = (n: number) => {
+ const buf: boolean[] = new Array(n).fill(false);
+ let i = 0;
+ return n > 0 ?
+ (x: boolean) => {
+ const y = buf[i];
+ buf[i++] = x;
+ i %= n;
+ return y;
+ } :
+ (x: boolean) => x;
+};
diff --git a/packages/dlogic/test/index.ts b/packages/dlogic/test/index.ts
new file mode 100644
index 0000000000..9739c69974
--- /dev/null
+++ b/packages/dlogic/test/index.ts
@@ -0,0 +1,6 @@
+// import * as assert from "assert";
+// import * as dl from "../src/index";
+
+describe("dlogic", () => {
+ it("tests pending");
+});
diff --git a/packages/dlogic/test/tsconfig.json b/packages/dlogic/test/tsconfig.json
new file mode 100644
index 0000000000..bcf29ace54
--- /dev/null
+++ b/packages/dlogic/test/tsconfig.json
@@ -0,0 +1,10 @@
+{
+ "extends": "../../../tsconfig.json",
+ "compilerOptions": {
+ "outDir": "../build"
+ },
+ "include": [
+ "./**/*.ts",
+ "../src/**/*.ts"
+ ]
+}
diff --git a/packages/dlogic/tsconfig.json b/packages/dlogic/tsconfig.json
new file mode 100644
index 0000000000..bd6481a5a6
--- /dev/null
+++ b/packages/dlogic/tsconfig.json
@@ -0,0 +1,9 @@
+{
+ "extends": "../../tsconfig.json",
+ "compilerOptions": {
+ "outDir": "."
+ },
+ "include": [
+ "./src/**/*.ts"
+ ]
+}
diff --git a/packages/dot/CHANGELOG.md b/packages/dot/CHANGELOG.md
index 0c13cfa4d1..f5bc07e7b0 100644
--- a/packages/dot/CHANGELOG.md
+++ b/packages/dot/CHANGELOG.md
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [0.1.16](https://github.com/thi-ng/umbrella/compare/@thi.ng/dot@0.1.15...@thi.ng/dot@0.1.16) (2018-10-17)
+
+**Note:** Version bump only for package @thi.ng/dot
+
+
+
+
+
## [0.1.15](https://github.com/thi-ng/umbrella/compare/@thi.ng/dot@0.1.14...@thi.ng/dot@0.1.15) (2018-09-24)
diff --git a/packages/dot/package.json b/packages/dot/package.json
index 0d0a4f4b9d..ec64aeae51 100644
--- a/packages/dot/package.json
+++ b/packages/dot/package.json
@@ -1,6 +1,6 @@
{
"name": "@thi.ng/dot",
- "version": "0.1.15",
+ "version": "0.1.16",
"description": "Graphviz DOM abstraction as vanilla JS objects & serialization to DOT format",
"main": "./index.js",
"typings": "./index.d.ts",
@@ -28,8 +28,8 @@
"typescript": "^3.0.1"
},
"dependencies": {
- "@thi.ng/api": "^4.2.1",
- "@thi.ng/checks": "^1.5.11"
+ "@thi.ng/api": "^4.2.2",
+ "@thi.ng/checks": "^1.5.12"
},
"keywords": [
"ES6",
diff --git a/packages/dsp/.npmignore b/packages/dsp/.npmignore
new file mode 100644
index 0000000000..d703bda97a
--- /dev/null
+++ b/packages/dsp/.npmignore
@@ -0,0 +1,10 @@
+build
+coverage
+dev
+doc
+src*
+test
+.nyc_output
+tsconfig.json
+*.tgz
+*.html
diff --git a/packages/dsp/CHANGELOG.md b/packages/dsp/CHANGELOG.md
new file mode 100644
index 0000000000..16ca7b8dd5
--- /dev/null
+++ b/packages/dsp/CHANGELOG.md
@@ -0,0 +1,11 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+# 0.1.0 (2018-10-17)
+
+
+### Features
+
+* **dsp:** add oscillators as [@thi](https://github.com/thi).ng/dsp package (from synstack / VEX) ([889730f](https://github.com/thi-ng/umbrella/commit/889730f))
diff --git a/packages/dsp/LICENSE b/packages/dsp/LICENSE
new file mode 100644
index 0000000000..8dada3edaf
--- /dev/null
+++ b/packages/dsp/LICENSE
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "{}"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright {yyyy} {name of copyright owner}
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/packages/dsp/README.md b/packages/dsp/README.md
new file mode 100644
index 0000000000..efb553fcda
--- /dev/null
+++ b/packages/dsp/README.md
@@ -0,0 +1,79 @@
+# @thi.ng/dsp
+
+[](https://www.npmjs.com/package/@thi.ng/dsp)
+
+[](https://twitter.com/thing_umbrella)
+
+This project is part of the
+[@thi.ng/umbrella](https://github.com/thi-ng/umbrella/) monorepo.
+
+
+
+- [About](#about)
+- [Status](#status)
+- [Installation](#installation)
+- [Dependencies](#dependencies)
+- [Usage examples](#usage-examples)
+- [Authors](#authors)
+- [License](#license)
+
+
+
+## About
+
+Assorted DSP utils collected & ported from other thi.ng projects (e.g.
+[thi.ng/synstack](https://github.com/thi-ng/synstack)). Currently only
+features various [stateless & stateful wave generators /
+oscillators](https://github.com/thi-ng/umbrella/tree/master/packages/dsp/src/osc.ts),
+which have been ported from thi.ng/vexed-generation.
+
+## Status
+
+ALPHA / WIP
+
+## Installation
+
+```bash
+yarn add @thi.ng/dsp
+```
+
+## Dependencies
+
+- [@thi.ng/math](https://github.com/thi-ng/umbrella/tree/master/packages/math)
+
+## Usage examples
+
+```ts
+import * as dsp from "@thi.ng/dsp";
+import { take } from "@thi.ng/transducers";
+
+[...take(20, new dsp.Oscillator(dsp.mix(dsp.sin,dsp.rect), 1/20)]
+// [ 0.5,
+// 0.6545084971874737,
+// 0.7938926261462366,
+// 0.9045084971874737,
+// 0.9755282581475768,
+// 1,
+// 0.9755282581475768,
+// 0.9045084971874737,
+// 0.7938926261462367,
+// 0.654508497187474,
+// 0.5000000000000003,
+// -0.6545084971874735,
+// -0.7938926261462365,
+// -0.9045084971874737,
+// -0.9755282581475768,
+// -1,
+// -0.9755282581475766,
+// -0.9045084971874735,
+// -0.793892626146236,
+// -0.6545084971874731 ]
+```
+
+## Authors
+
+- Karsten Schmidt
+
+## License
+
+© 2018 Karsten Schmidt // Apache Software License 2.0
diff --git a/packages/dsp/package.json b/packages/dsp/package.json
new file mode 100644
index 0000000000..bed8f9d548
--- /dev/null
+++ b/packages/dsp/package.json
@@ -0,0 +1,48 @@
+{
+ "name": "@thi.ng/dsp",
+ "version": "0.1.0",
+ "description": "Assorted DSP utils, oscillators etc.",
+ "main": "./index.js",
+ "typings": "./index.d.ts",
+ "repository": {
+ "type": "git",
+ "url": "https://github.com/thi-ng/umbrella.git"
+ },
+ "homepage": "https://github.com/thi-ng/umbrella/tree/master/packages/dsp",
+ "author": "Karsten Schmidt ",
+ "license": "Apache-2.0",
+ "scripts": {
+ "build": "yarn run clean && tsc --declaration",
+ "clean": "rm -rf *.js *.d.ts .nyc_output build coverage doc",
+ "cover": "yarn test && nyc report --reporter=lcov",
+ "doc": "node_modules/.bin/typedoc --mode modules --out doc src",
+ "pub": "yarn run build && yarn publish --access public",
+ "test": "rm -rf build && tsc -p test && nyc mocha build/test/*.js"
+ },
+ "devDependencies": {
+ "@types/mocha": "^5.2.5",
+ "@types/node": "^10.5.5",
+ "mocha": "^5.2.0",
+ "nyc": "^12.0.2",
+ "typedoc": "^0.11.1",
+ "typescript": "^3.0.1"
+ },
+ "dependencies": {
+ "@thi.ng/math": "^0.1.0"
+ },
+ "keywords": [
+ "additive",
+ "DSP",
+ "ES6",
+ "generator",
+ "math",
+ "oscillator",
+ "stateless",
+ "synthesis",
+ "typescript",
+ "waveform"
+ ],
+ "publishConfig": {
+ "access": "public"
+ }
+}
diff --git a/packages/dsp/src/api.ts b/packages/dsp/src/api.ts
new file mode 100644
index 0000000000..99bd50b70f
--- /dev/null
+++ b/packages/dsp/src/api.ts
@@ -0,0 +1 @@
+export type StatelessOscillator = (phase: number, freq: number, amp?: number, dc?: number, opts?: any) => number;
diff --git a/packages/dsp/src/index.ts b/packages/dsp/src/index.ts
new file mode 100644
index 0000000000..fa97ae53fe
--- /dev/null
+++ b/packages/dsp/src/index.ts
@@ -0,0 +1,3 @@
+export * from "./api";
+
+export * from "./osc";
diff --git a/packages/dsp/src/osc.ts b/packages/dsp/src/osc.ts
new file mode 100644
index 0000000000..ce932921eb
--- /dev/null
+++ b/packages/dsp/src/osc.ts
@@ -0,0 +1,157 @@
+import { HALF_PI, TAU } from "@thi.ng/math/api";
+import { mix as _mix } from "@thi.ng/math/mix";
+import { wrap01 } from "@thi.ng/math/interval";
+import { fract } from "@thi.ng/math/prec";
+import { StatelessOscillator } from "./api";
+
+export class Oscillator implements
+ Iterable {
+
+ osc: StatelessOscillator;
+ phase: number;
+ freq: number;
+ amp: number;
+ dc: number;
+ opt: any;
+
+ constructor(osc: StatelessOscillator, freq: number, amp = 1, dc = 0, opt?: any) {
+ this.osc = osc;
+ this.phase = 0;
+ this.freq = freq;
+ this.amp = amp;
+ this.dc = dc;
+ this.opt = opt;
+ }
+
+ *[Symbol.iterator]() {
+ while (true) {
+ yield this.update();
+ }
+ }
+
+ update() {
+ const y = this.osc(this.phase, 1, this.amp, this.dc, this.opt);
+ this.phase = wrap01(this.phase + this.freq);
+ return y;
+ }
+}
+
+export class AMFMOscillator extends Oscillator {
+
+ osc: StatelessOscillator;
+ am: Oscillator;
+ fm: Oscillator;
+
+ constructor(
+ osc: StatelessOscillator,
+ amod: Oscillator,
+ fmod: Oscillator,
+ freq: number,
+ amp = 1,
+ dc = 0,
+ opt?: any
+ ) {
+ super(osc, freq, amp, dc, opt);
+ this.am = amod;
+ this.fm = fmod;
+ }
+
+ update() {
+ const y = this.osc(
+ this.phase,
+ 1,
+ this.am ? this.amp + this.am.update() : this.amp,
+ this.dc,
+ this.opt
+ );
+ this.phase = wrap01(this.phase + this.freq + (this.fm ? this.fm.update() : 0));
+ return y;
+ }
+}
+
+export const sin = (phase: number, freq: number, amp = 1, dc = 0) =>
+ dc + amp * Math.sin(phase * freq * TAU);
+
+export const tri = (phase: number, freq: number, amp = 1, dc = 0) =>
+ dc + amp * (Math.abs((phase * freq * 4) % 4 - 2) - 1);
+
+export const triConcave = (phase: number, freq: number, amp = 1, dc = 0) =>
+ dc + amp * (8 * Math.pow(fract(phase * freq) - 0.5, 2) - 1);
+
+export const rect = (phase: number, freq: number, amp = 1, dc = 0, duty = 0.5) =>
+ dc + amp * (fract(phase * freq) < duty ? 1 : -1);
+
+export const saw = (phase: number, freq: number, amp = 1, dc = 0) =>
+ dc + amp * (1 - 2 * fract(phase * freq));
+
+export const wavetable = (table: number[]): StatelessOscillator => {
+ const n = table.length;
+ return (phase: number, freq: number, amp = 1, dc = 0) => {
+ const i = Math.round(phase * freq * n) % n;
+ return dc + amp * table[i < 0 ? i + n : i];
+ };
+};
+
+export const mix = (osc1: StatelessOscillator, osc2: StatelessOscillator): StatelessOscillator =>
+ (phase: number, freq: number, amp = 1, dc = 0, t = 0.5) =>
+ _mix(osc1(phase, freq, amp, dc), osc2(phase, freq, amp, dc), t);
+
+export const additive = (
+ osc: StatelessOscillator,
+ freqFn: (i: number) => number,
+ ampFn: (i: number) => number, n: number) =>
+
+ (phase: number, freq: number, amp = 1, dc = 0) => {
+ let y = 0;
+ for (let i = 1; i <= n; i++) {
+ y += osc(phase, freq * freqFn(i), amp * ampFn(i));
+ }
+ return dc + y;
+ };
+
+/**
+ * Interactive graph of this oscillator:
+ * https://www.desmos.com/calculator/irugw6gnhy
+ *
+ * @param n
+ */
+export const squareAdditive = (n = 8) =>
+ additive(sin, (i) => 2 * (i - 1) + 1, (i) => 1 / (2 * (i - 1) + 1) * gibbs(n, i), n);
+
+/**
+ * Interactive graph of this oscillator:
+ * https://www.desmos.com/calculator/irugw6gnhy
+ *
+ * @param n
+ */
+export const sawAdditive = (n = 8) =>
+ additive(sin, (i) => i, (i) => 1 / i * gibbs(n, i), n);
+
+/**
+ * https://en.wikipedia.org/wiki/Gibbs_phenomenon
+ * http://www.musicdsp.org/files/bandlimited.pdf
+ *
+ * Interactive graph:
+ * https://www.desmos.com/calculator/irugw6gnhy
+ *
+ * @param n
+ * @param i
+ */
+export const gibbs = (n: number, i: number) =>
+ Math.pow(Math.cos((i - 1) * HALF_PI / n), 2);
+
+/**
+ * Polynomial attenuation to create bandlimited version of a signal.
+ *
+ * - http://research.spa.aalto.fi/publications/papers/smc2010-phaseshaping/
+ * - http://www.kvraudio.com/forum/viewtopic.php?t=375517
+ *
+ * @param eps
+ * @param x
+ */
+export const polyBLEP = (eps: number, x: number) =>
+ x < eps ?
+ (x /= eps, x + x - x * x - 1) :
+ x > 1 - eps ?
+ (x = (x - 1) / eps, x * x + x + x + 1) :
+ 0;
diff --git a/packages/dsp/test/index.ts b/packages/dsp/test/index.ts
new file mode 100644
index 0000000000..fcc7940253
--- /dev/null
+++ b/packages/dsp/test/index.ts
@@ -0,0 +1,6 @@
+// import * as assert from "assert";
+// import * as dsp from "../src/index";
+
+describe("dsp", () => {
+ it("tests pending");
+});
diff --git a/packages/dsp/test/tsconfig.json b/packages/dsp/test/tsconfig.json
new file mode 100644
index 0000000000..bcf29ace54
--- /dev/null
+++ b/packages/dsp/test/tsconfig.json
@@ -0,0 +1,10 @@
+{
+ "extends": "../../../tsconfig.json",
+ "compilerOptions": {
+ "outDir": "../build"
+ },
+ "include": [
+ "./**/*.ts",
+ "../src/**/*.ts"
+ ]
+}
diff --git a/packages/dsp/tsconfig.json b/packages/dsp/tsconfig.json
new file mode 100644
index 0000000000..bd6481a5a6
--- /dev/null
+++ b/packages/dsp/tsconfig.json
@@ -0,0 +1,9 @@
+{
+ "extends": "../../tsconfig.json",
+ "compilerOptions": {
+ "outDir": "."
+ },
+ "include": [
+ "./src/**/*.ts"
+ ]
+}
diff --git a/packages/equiv/CHANGELOG.md b/packages/equiv/CHANGELOG.md
index b0e21dacd9..7d6d945ab9 100644
--- a/packages/equiv/CHANGELOG.md
+++ b/packages/equiv/CHANGELOG.md
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [0.1.12](https://github.com/thi-ng/umbrella/compare/@thi.ng/equiv@0.1.11...@thi.ng/equiv@0.1.12) (2018-10-17)
+
+**Note:** Version bump only for package @thi.ng/equiv
+
+
+
+
+
## [0.1.11](https://github.com/thi-ng/umbrella/compare/@thi.ng/equiv@0.1.10...@thi.ng/equiv@0.1.11) (2018-09-24)
diff --git a/packages/equiv/package.json b/packages/equiv/package.json
index 2d286d5ff4..686e6759c5 100644
--- a/packages/equiv/package.json
+++ b/packages/equiv/package.json
@@ -1,6 +1,6 @@
{
"name": "@thi.ng/equiv",
- "version": "0.1.11",
+ "version": "0.1.12",
"description": "Extensible deep equivalence checking for any data types",
"main": "./index.js",
"typings": "./index.d.ts",
diff --git a/packages/errors/CHANGELOG.md b/packages/errors/CHANGELOG.md
index ca6bd52a00..9d665c30b7 100644
--- a/packages/errors/CHANGELOG.md
+++ b/packages/errors/CHANGELOG.md
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [0.1.10](https://github.com/thi-ng/umbrella/compare/@thi.ng/errors@0.1.9...@thi.ng/errors@0.1.10) (2018-10-17)
+
+**Note:** Version bump only for package @thi.ng/errors
+
+
+
+
+
## [0.1.9](https://github.com/thi-ng/umbrella/compare/@thi.ng/errors@0.1.8...@thi.ng/errors@0.1.9) (2018-09-24)
diff --git a/packages/errors/package.json b/packages/errors/package.json
index ec817aa873..d339952f10 100644
--- a/packages/errors/package.json
+++ b/packages/errors/package.json
@@ -1,6 +1,6 @@
{
"name": "@thi.ng/errors",
- "version": "0.1.9",
+ "version": "0.1.10",
"description": "Custom error types and helper fns.",
"main": "./index.js",
"typings": "./index.d.ts",
diff --git a/packages/geom/.npmignore b/packages/geom/.npmignore
new file mode 100644
index 0000000000..d703bda97a
--- /dev/null
+++ b/packages/geom/.npmignore
@@ -0,0 +1,10 @@
+build
+coverage
+dev
+doc
+src*
+test
+.nyc_output
+tsconfig.json
+*.tgz
+*.html
diff --git a/packages/geom/CHANGELOG.md b/packages/geom/CHANGELOG.md
new file mode 100644
index 0000000000..dd6f46e729
--- /dev/null
+++ b/packages/geom/CHANGELOG.md
@@ -0,0 +1,19 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+# 0.1.0 (2018-10-17)
+
+
+### Features
+
+* **geom:** add ICollate & ICopy impls, re-add/update convexHull2 ([3b1bf64](https://github.com/thi-ng/umbrella/commit/3b1bf64))
+* **geom:** add/update factory fns, arg handling, tessel, poly area ([555fc51](https://github.com/thi-ng/umbrella/commit/555fc51))
+* **geom:** add/update interfaces & impls ([2657df6](https://github.com/thi-ng/umbrella/commit/2657df6))
+* **geom:** add/update tessellate() impls ([fa87f1e](https://github.com/thi-ng/umbrella/commit/fa87f1e))
+* **geom:** add/update various shape impls & ops ([3a20ef3](https://github.com/thi-ng/umbrella/commit/3a20ef3))
+* **geom:** import (updated) old thi.ng/geom package (minus vectors) ([c03259c](https://github.com/thi-ng/umbrella/commit/c03259c))
+* **geom:** re-add Arc2, update Circle2, update helper fns ([aa6b120](https://github.com/thi-ng/umbrella/commit/aa6b120))
+* **geom:** re-import & refactor partial port of thi.ng/geom (clojure) ([d655ec2](https://github.com/thi-ng/umbrella/commit/d655ec2))
+* **geom:** update all shape types, add interfaces & ops, update tests ([9c27c77](https://github.com/thi-ng/umbrella/commit/9c27c77))
diff --git a/packages/geom/LICENSE b/packages/geom/LICENSE
new file mode 100644
index 0000000000..8dada3edaf
--- /dev/null
+++ b/packages/geom/LICENSE
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "{}"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright {yyyy} {name of copyright owner}
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/packages/geom/README.md b/packages/geom/README.md
new file mode 100644
index 0000000000..7107802064
--- /dev/null
+++ b/packages/geom/README.md
@@ -0,0 +1,98 @@
+# @thi.ng/geom
+
+[](https://www.npmjs.com/package/@thi.ng/geom)
+
+This project is part of the
+[@thi.ng/umbrella](https://github.com/thi-ng/umbrella/) monorepo.
+
+
+
+- [About](#about)
+- [Status](#status)
+- [Installation](#installation)
+- [Usage examples](#usage-examples)
+ - [Tessellations](#tessellations)
+ - [Subdivision curves](#subdivision-curves)
+- [Authors](#authors)
+- [License](#license)
+
+
+
+## About
+
+This package is a partial WIP port of selected features of the
+[Clojure/ClojureScript version of
+thi.ng/geom](https://github.com/thi-ng/geom), as well as
+[c.thi.ng](https://github.com/thi-ng/c-thing). Currently only 2D shapes
+& operations are supported.
+
+## Status
+
+ALPHA - major breaking changes forthcoming...
+
+## Installation
+
+```bash
+yarn add @thi.ng/geom
+```
+
+## Usage examples
+
+### Tessellations
+
+
+
+```ts
+import * as g from "@thi.ng/geom";
+import * as v from "@thi.ng/vectors";
+import * as h from "@thi.ng/hiccup";
+import * as svg from "@thi.ng/hiccup-svg";
+import * as fs from "fs";
+
+const tintedPoly = (points) => {
+ const p = g.polygon2(points);
+ const c = p.centroid().toPolar();
+ p.attribs = { fill: `hsl(${v.deg(c.y)},${c.x}%,${100-c.x/2}%)` };
+ return p;
+};
+
+fs.writeFileSync(
+ "tessel.svg",
+ h.serialize(
+ svg.svg(
+ {
+ width: 1000, height: 1000,
+ viewBox: "-100 -100 200 200",
+ fill: "none",
+ stroke: "#000",
+ "stroke-width": 0.5,
+ },
+ svg.convertTree(
+ g.circle2(100)
+ .toPolygon(6)
+ .tessellate([g.quadFan, g.triFan, g.edgeSplit, g.quadFan])
+ .map((pts) => tintedPoly(pts).toHiccup())
+ )
+ )
+ )
+);
+```
+
+### Subdivision curves
+
+| Chaikin (closed) | Chaikin (open) |
+|---------------------------------------------------------|-----------------------------------------------------|
+|  |  |
+
+```ts
+g.polygon2([-100,-100, 0,100, 100,-100, 0,0]).subdivide(g.CHAIKIN_CLOSED, 4);
+g.polyline2([-100,100, -100,-100, 0,0, 100,-100, 100,100]).subdivide(g.CHAIKIN_OPEN, 4);
+```
+
+## Authors
+
+- Karsten Schmidt
+
+## License
+
+© 2013 - 2018 Karsten Schmidt // Apache Software License 2.0
diff --git a/packages/geom/package.json b/packages/geom/package.json
new file mode 100644
index 0000000000..5402cc43ce
--- /dev/null
+++ b/packages/geom/package.json
@@ -0,0 +1,49 @@
+{
+ "name": "@thi.ng/geom",
+ "version": "0.1.0",
+ "description": "2D/3D geometry primitives",
+ "main": "./index.js",
+ "typings": "./index.d.ts",
+ "repository": {
+ "type": "git",
+ "url": "https://github.com/thi-ng/umbrella.git"
+ },
+ "homepage": "https://github.com/thi-ng/umbrella/tree/master/packages/geom",
+ "author": "Karsten Schmidt ",
+ "license": "Apache-2.0",
+ "scripts": {
+ "build": "yarn run clean && tsc --declaration",
+ "clean": "rm -rf *.js *.d.ts .nyc_output build coverage doc internal",
+ "cover": "yarn test && nyc report --reporter=lcov",
+ "doc": "node_modules/.bin/typedoc --mode modules --out doc src",
+ "pub": "yarn run build && yarn publish --access public",
+ "test": "rm -rf build && tsc -p test && nyc mocha build/test/*.js"
+ },
+ "devDependencies": {
+ "@types/mocha": "^5.2.5",
+ "@types/node": "^10.5.5",
+ "mocha": "^5.2.0",
+ "nyc": "^12.0.2",
+ "typedoc": "^0.12.0",
+ "typescript": "^3.0.1"
+ },
+ "dependencies": {
+ "@thi.ng/api": "^4.2.2",
+ "@thi.ng/checks": "^1.5.12",
+ "@thi.ng/math": "^0.1.0",
+ "@thi.ng/transducers": "^2.2.0",
+ "@thi.ng/vectors": "^1.4.0"
+ },
+ "keywords": [
+ "ES6",
+ "geometry",
+ "2d",
+ "3d",
+ "shapes",
+ "intersection",
+ "typescript"
+ ],
+ "publishConfig": {
+ "access": "public"
+ }
+}
diff --git a/packages/geom/src/api.ts b/packages/geom/src/api.ts
new file mode 100644
index 0000000000..05e02f7306
--- /dev/null
+++ b/packages/geom/src/api.ts
@@ -0,0 +1,263 @@
+import { IObjectOf } from "@thi.ng/api/api";
+import { IVector, ReadonlyVec, Vec } from "@thi.ng/vectors/api";
+import { Vec2 } from "@thi.ng/vectors/vec2";
+
+export const DEFAULT_SAMPLES = 32;
+
+export type Attribs = IObjectOf;
+
+export type Tessellator> =
+ (points: ReadonlyArray) => T[][];
+
+export const enum LineIntersectionType {
+ PARALLEL,
+ COINCIDENT,
+ COINCIDENT_NO_INTERSECT,
+ INTERSECT,
+ INTERSECT_OUTSIDE,
+}
+
+export const enum SegmentType {
+ MOVE,
+ LINE,
+ POLYLINE,
+ ARC,
+ CUBIC,
+ QUADRATIC,
+ CLOSE,
+}
+
+export interface CollateOpts {
+ buf: Vec;
+ start: number;
+ cstride: number;
+ estride: number;
+}
+
+export interface LineIntersection {
+ type: LineIntersectionType;
+ isec?: T;
+ det?: number;
+ alpha?: number;
+ beta?: number;
+}
+
+export interface PathSegment {
+ type: SegmentType;
+ point?: Vec2;
+ geo?: IBoundsRaw & IVertices & IHiccupPathSegment;
+}
+
+export interface SamplingOpts {
+ /**
+ * Number of points to sample & return. Defaults to the implementing
+ * type's `DEFAULT_RES` if neither this nor `theta` option is given
+ * (see `ArcSamplingOpts`).
+ */
+ num: number;
+ /**
+ * Approximate desired distance between sampled result points. If
+ * given, takes priority over the `num` option, but the latter MIGHT
+ * be used as part of the sampling process (implementation
+ * specific). Note: For circles this value is interpreted as arc
+ * length, not cartesian distance (error will be proportional to the
+ * given value relative to the circle's radius).
+ */
+ dist: number;
+ /**
+ * Currently only used by these types:
+ *
+ * - Arc2
+ * - Circle2
+ *
+ * Defines the target angle between sampled points. If greater than
+ * the actual range of the arc, only the two end points will be
+ * returned at most. This option is used to derive a `num` value and
+ * takes priority if `num` is given as well.
+ *
+ * This option is useful to adapt the sampling based on angular
+ * resolution, rather than a fixed number of samples.
+ */
+ theta: number;
+ /**
+ * If `true`, the shape's end point will be included in the result
+ * array. The default setting for open geometries is `true`, for
+ * closed ones `false`. This option has no influence on any internal
+ * resolution calculation.
+ *
+ * For open geometry this option is useful to when re-sampling paths
+ * of consecutive segments, where the end points of each segment
+ * coincide with the start points of the next segment. For all but
+ * the last segment, this option should be `false` and so can be
+ * used to avoid duplicate vertices in the concatenated result.
+ *
+ * When sampling closed shapes, enabling this option will include an
+ * extra point (start), i.e. if the `num` option was given, results
+ * in `num+1` points.
+ */
+ last: boolean;
+}
+
+export interface SubdivKernel> {
+ fn: (pts: T[], i: number, nump: number) => T[];
+ size: number;
+}
+
+export interface IArea {
+ /**
+ * Computes and returns area. For types where orientation is taken
+ * into account, setting `signed` to false will always return the
+ * absolute area (default is `true`).
+ *
+ * @param unsigned
+ */
+ area(signed?: boolean): number;
+}
+
+export interface IArcLength {
+ /**
+ * Returns arc length, or for closed shapes, circumference.
+ */
+ arcLength(): number;
+}
+
+export interface IBoundsRaw {
+ /**
+ * @return min / max points
+ */
+ boundsRaw(): [V, V];
+}
+
+export interface IBounds {
+ /**
+ * Bounding shape
+ */
+ bounds(): T;
+}
+
+export interface ICentroid {
+ /**
+ * Computes & returns centroid. If `c` is given it MUST be a zero
+ * vector and will be used to store result.
+ *
+ * @param c
+ */
+ centroid(c?: T): T;
+}
+
+export interface ICenter {
+ center(origin?: Readonly): this;
+}
+
+export interface IClassifyPoint {
+ classifyPoint(p: Readonly): number;
+}
+
+export interface IPointInside {
+ pointInside(p: Readonly): boolean;
+}
+
+export interface ICollate {
+ /**
+ * Collates all points into a single buffer and remaps existing
+ * vertices (by default). Points will written from given `start`
+ * index, using layout defined by `cstride` and `estride`.
+ *
+ * @param opts
+ */
+ collate(opts?: Partial): Vec;
+}
+
+export interface IEdges {
+ edges(opts?: any): Iterable;
+}
+
+export interface IHiccupPathSegment {
+ toHiccupPathSegments(): any[];
+}
+
+export interface IPointMap {
+ mapPoint(p: Readonly, out?: B): B;
+ unmapPoint(p: Readonly, out?: A): A;
+}
+
+export interface IToPolygon {
+ // FIXME return type should be interface
+ toPolygon(opts?: O): any;
+}
+
+export interface ITessellateable> {
+ tessellate(tessel: Tessellator, iter?: number): T[][];
+ tessellate(tessel: Iterable>): T[][];
+}
+
+export interface ITransformable {
+ transform(mat: M): this;
+}
+
+export interface IUnion {
+ union(x: T): T;
+}
+
+export interface IVertices {
+ vertices(opts?: O): Iterable;
+}
+
+export interface JsonShape {
+ type: string;
+ attribs?: Attribs;
+}
+
+export interface JsonArc2 extends JsonShape {
+ pos: Vec;
+ r: Vec;
+ axis: number;
+ start: number;
+ end: number;
+ xl: boolean;
+ clockwise: boolean;
+}
+
+export interface JsonCircle2 extends JsonShape {
+ pos: Vec;
+ r: number;
+}
+
+export interface JsonCubic2 extends JsonShape {
+ points: Vec[];
+}
+
+export interface JsonQuadratic2 extends JsonShape {
+ points: Vec[];
+}
+
+export interface JsonPolygon2 extends JsonShape {
+ points: Vec[];
+}
+
+export interface JsonPolyline2 extends JsonShape {
+ points: Vec[];
+}
+
+export interface JsonRect2 extends JsonShape {
+ pos: Vec;
+ size: Vec[];
+}
+
+export type HiccupArc2 =
+ ["arc", Attribs, ReadonlyVec, ReadonlyVec, number, number, number, boolean, boolean];
+
+export type HiccupCircle2 =
+ ["circle", Attribs, ReadonlyVec, number];
+
+export type HiccupLine2 =
+ ["line", Attribs, ReadonlyVec, ReadonlyVec];
+
+export type HiccupPolygon2 =
+ ["polygon", Attribs, number[] | number[][]];
+
+export type HiccupPolyline2 =
+ ["polyline", Attribs, number[] | number[][]];
+
+export type HiccupRect2 =
+ ["rect", Attribs, ReadonlyVec, number, number, number?];
diff --git a/packages/geom/src/arc2.ts b/packages/geom/src/arc2.ts
new file mode 100644
index 0000000000..6622b9f0ba
--- /dev/null
+++ b/packages/geom/src/arc2.ts
@@ -0,0 +1,246 @@
+import { ICopy } from "@thi.ng/api";
+import { isNumber } from "@thi.ng/checks/is-number";
+import { isPlainObject } from "@thi.ng/checks/is-plain-object";
+import { HALF_PI, PI, TAU } from "@thi.ng/math/api";
+import { inRange } from "@thi.ng/math/interval";
+import { mix } from "@thi.ng/math/mix";
+import { range } from "@thi.ng/transducers/iter/range";
+import { push } from "@thi.ng/transducers/rfn/push";
+import { transduce } from "@thi.ng/transducers/transduce";
+import { filter } from "@thi.ng/transducers/xform/filter";
+import { map } from "@thi.ng/transducers/xform/map";
+import { Vec } from "@thi.ng/vectors/api";
+import {
+ add2,
+ asVec2,
+ rotate2,
+ setS2,
+ Vec2
+} from "@thi.ng/vectors/vec2";
+import {
+ Attribs,
+ DEFAULT_SAMPLES,
+ HiccupArc2,
+ IBounds,
+ IBoundsRaw,
+ IEdges,
+ IVertices,
+ JsonArc2,
+ SamplingOpts
+} from "./api";
+import { bounds } from "./internal/bounds";
+import { edges } from "./internal/edges";
+import { Rect2 } from "./rect2";
+import { Sampler } from "./sampler";
+
+export class Arc2 implements
+ IBounds,
+ IBoundsRaw,
+ ICopy,
+ IEdges,
+ IVertices> {
+
+ static fromJSON(spec: JsonArc2) {
+ return new Arc2(
+ new Vec2(spec.pos),
+ new Vec2(spec.r),
+ spec.axis,
+ spec.start,
+ spec.end,
+ spec.xl,
+ spec.clockwise,
+ spec.attribs
+ );
+ }
+
+ static fromHiccup(spec: HiccupArc2) {
+ return new Arc2(
+ asVec2(spec[2]),
+ asVec2(spec[3]),
+ spec[4],
+ spec[5],
+ spec[6],
+ spec[7],
+ spec[8],
+ spec[1]
+ );
+ }
+
+ static from2Points(
+ a: Readonly,
+ b: Readonly,
+ radii: Readonly,
+ axisTheta = 0,
+ large = false,
+ clockwise = true) {
+
+ const r = radii.copy().abs();
+ const co = Math.cos(axisTheta);
+ const si = Math.sin(axisTheta);
+ const m = a.subNew(b).mulN(0.5);
+ const p = new Vec2([co * m.x + si * m.y, -si * m.x + co * m.y]);
+ const px2 = p.x * p.x;
+ const py2 = p.y * p.y;
+ const l = px2 / (r.x * r.x) + py2 / (r.y * r.y);
+ l > 1 && r.mulN(Math.sqrt(l));
+ const rx2 = r.x * r.x;
+ const ry2 = r.y * r.y;
+ const rxpy = rx2 * py2;
+ const rypx = ry2 * px2;
+ const root = ((large === clockwise) ? -1 : 1) *
+ Math.sqrt(Math.abs((rx2 * ry2 - rxpy - rypx)) / (rxpy + rypx));
+ const tc = new Vec2([r.x * p.y / r.y, -r.y * p.x / r.x]).mulN(root);
+ const c = new Vec2([co * tc.x - si * tc.y, si * tc.x + co * tc.y]).add(a.mixNewN(b));
+ const d1 = new Vec2([(p.x - tc.x) / r.x, (p.y - tc.y) / r.y]);
+ const d2 = new Vec2([(-p.x - tc.x) / r.x, (-p.y - tc.y) / r.y]);
+ const theta = Vec2.X_AXIS.angleBetween(d1, true);
+ let delta = d1.angleBetween(d2, true);
+ if (clockwise && delta < 0) {
+ delta += TAU;
+ } else if (!clockwise && delta > 0) {
+ delta -= TAU;
+ }
+ return new Arc2(c, r, axisTheta, theta, theta + delta, large, clockwise);
+ }
+
+ pos: Vec2;
+ r: Vec2;
+ axis: number;
+ start: number;
+ end: number;
+ xl: boolean;
+ clockwise: boolean;
+ attribs: Attribs;
+
+ constructor(
+ pos: Vec2,
+ r: Vec2,
+ axis: number,
+ start: number,
+ end: number,
+ xl = false,
+ clockwise = false,
+ attribs?: Attribs) {
+
+ this.pos = pos;
+ this.r = r;
+ this.axis = axis;
+ this.start = start;
+ this.end = end;
+ this.clockwise = clockwise;
+ this.xl = xl;
+ this.attribs = attribs;
+ }
+
+ copy() {
+ return new Arc2(
+ this.pos.copy(),
+ this.r.copy(),
+ this.axis,
+ this.start,
+ this.end,
+ this.xl,
+ this.clockwise,
+ { ...this.attribs }
+ );
+ }
+
+ boundsRaw() {
+ // https://stackoverflow.com/a/1336739/294515
+ const pts = transduce(
+ map(this.pointAtTheta.bind(this)),
+ push(),
+ [
+ this.start,
+ this.end,
+ // multiples of HALF_PI in arc range
+ ...filter(
+ (t: number) => inRange(t, this.start, this.end),
+ range(-3 * PI, 3.01 * PI, HALF_PI)
+ )
+ ]
+ );
+ return bounds(pts, Vec2.MAX.copy(), Vec2.MIN.copy());
+ }
+
+ bounds() {
+ return Rect2.fromMinMax(...this.boundsRaw());
+ }
+
+ edges(opts?: number | Partial) {
+ return edges(this.vertices(opts));
+ }
+
+ pointAt(t: number) {
+ return this.pointAtTheta(mix(this.start, this.end, t));
+ }
+
+ pointAtTheta(theta: number) {
+ return new Vec2([Math.cos(theta), Math.sin(theta)])
+ .mul(this.r)
+ .rotate(this.axis)
+ .add(this.pos);
+ }
+
+ vertices(opts?: number | Partial): Vec2[] {
+ if (isPlainObject(opts) && (opts).dist !== undefined) {
+ return new Sampler(this.vertices((opts).num || DEFAULT_SAMPLES))
+ .sampleUniform((opts).dist, (opts).last !== false);
+ }
+ opts = isNumber(opts) ?
+ { num: opts, last: true } :
+ { num: DEFAULT_SAMPLES, ...opts };
+ let num: number;
+ const start = this.start;
+ let delta = this.end - start;
+ num = opts.theta ?
+ Math.round(delta / opts.theta) :
+ opts.num;
+ delta /= num;
+ opts.last !== false && num++;
+ const pts: Vec = new Array(num * 2);
+ const pos = this.pos;
+ const [rx, ry] = this.r;
+ const axis = this.axis;
+ for (let i = 0, j = 0; i < num; i++ , j += 2) {
+ const t = start + i * delta;
+ setS2(pts, Math.cos(t) * rx, Math.sin(t) * ry, j);
+ rotate2(pts, axis, j);
+ add2(pts, pos.buf, j, pos.i, 1, pos.s);
+ }
+ return Vec2.mapBuffer(pts, num);
+ }
+
+ toHiccup() {
+ return ["path", this.attribs,
+ [
+ ["M", this.pointAtTheta(this.start)],
+ ...this.toHiccupPathSegments()
+ ]
+ ];
+ }
+
+ toHiccupPathSegments() {
+ return [["A",
+ this.r,
+ this.axis,
+ this.xl ? 1 : 0,
+ this.clockwise ? 1 : 0,
+ this.pointAtTheta(this.end)
+ ]];
+ }
+
+ toJSON(): JsonArc2 {
+ return {
+ type: "arc2",
+ pos: this.pos.toJSON(),
+ r: this.r.toJSON(),
+ start: this.start,
+ end: this.end,
+ axis: this.axis,
+ xl: this.xl,
+ clockwise: this.clockwise,
+ attribs: this.attribs,
+ };
+ }
+}
diff --git a/packages/geom/src/bezier2.ts b/packages/geom/src/bezier2.ts
new file mode 100644
index 0000000000..4af770b8ea
--- /dev/null
+++ b/packages/geom/src/bezier2.ts
@@ -0,0 +1,317 @@
+import { ICopy } from "@thi.ng/api";
+import { isNumber } from "@thi.ng/checks/is-number";
+import { isPlainObject } from "@thi.ng/checks/is-plain-object";
+import { IMath, ReadonlyVec, Vec } from "@thi.ng/vectors/api";
+import { clamp01 } from "@thi.ng/math/interval";
+import { Vec2 } from "@thi.ng/vectors/vec2";
+import {
+ Attribs,
+ DEFAULT_SAMPLES,
+ IVertices,
+ JsonCubic2,
+ JsonQuadratic2,
+ SamplingOpts
+} from "./api";
+import { PointContainer2 } from "./container2";
+import { args3, args4 } from "./internal/args";
+import { Sampler } from "./sampler";
+
+export const mixQuadratic1 = (a: number, b: number, c: number, t: number) => {
+ const s = 1 - t;
+ return a * s * s + b * 2 * s * t + c * t * t;
+};
+
+export const mixCubic1 = (a: number, b: number, c: number, d: number, t: number) => {
+ const t2 = t * t;
+ const s = 1 - t;
+ const s2 = s * s;
+ return a * s2 * s + b * 3 * s2 * t + c * 3 * t2 * s + d * t2 * t;
+};
+
+export const mixQuadratic = & IMath>(a: T, b: T, c: T, t: number) => {
+ const s = 1 - t;
+ return a.mulNewN(s * s)
+ .maddN(b, 2 * s * t)
+ .maddN(c, t * t);
+};
+
+export const mixCubic = & IMath>(a: T, b: T, c: T, d: T, t: number) => {
+ const t2 = t * t;
+ const s = 1 - t;
+ const s2 = s * s;
+ return a.mulNewN(s2 * s)
+ .maddN(b, 3 * s2 * t)
+ .maddN(c, 3 * t2 * s)
+ .maddN(d, t2 * t);
+};
+
+const cubicAxisBounds = (pa: number, pb: number, pc: number, pd: number) => {
+ let a = 3 * pd - 9 * pc + 9 * pb - 3 * pa;
+ let b = 6 * pa - 12 * pb + 6 * pc;
+ let c = 3 * pb - 3 * pa;
+ let disc = b * b - 4 * a * c;
+ let l = pa;
+ let h = pa;
+
+ const bounds = (t: number) => {
+ if (t > 0 && t < 1) {
+ const x = mixCubic1(pa, pb, pc, pd, t);
+ x < l && (l = x);
+ x > h && (h = x);
+ }
+ };
+
+ pd < l && (l = pd);
+ pd > h && (h = pd);
+ if (disc >= 0) {
+ disc = Math.sqrt(disc);
+ a *= 2;
+ bounds((-b + disc) / a);
+ bounds((-b - disc) / a);
+ }
+ return [l, h];
+};
+
+export class Cubic2 extends PointContainer2 implements
+ IVertices> {
+
+ static fromJSON(spec: JsonCubic2) {
+ return cubic2(spec.points, spec.attribs);
+ }
+
+ static fromLine(a: Vec2, b: Vec2) {
+ return new Cubic2([a, a.mixNewN(b, 1 / 3), b.mixNewN(a, 1 / 3), b]);
+ }
+
+ copy() {
+ return new Cubic2(this._copy(), this.attribs);
+ }
+
+ boundsRaw(): [Vec2, Vec2] {
+ // https://stackoverflow.com/a/24814530/294515
+ // https://iquilezles.org/www/articles/bezierbbox/bezierbbox.htm
+ const [a, b, c, d] = this.points;
+ const x = cubicAxisBounds(a.x, b.x, c.x, d.x);
+ const y = cubicAxisBounds(a.y, b.y, c.y, d.y);
+ return Vec2.mapBuffer([x[0], y[0], x[1], y[1]], 2);
+ }
+
+ pointAt(t: number) {
+ const pts = this.points;
+ return mixCubic(pts[0], pts[1], pts[2], pts[3], t);
+ }
+
+ /**
+ * Splits curve into 2 sub-curves at position `t`.
+ *
+ * http://en.wikipedia.org/wiki/De_Casteljau%27s_algorithm
+ *
+ * @param t
+ */
+ splitAt(t: number): [Cubic2, Cubic2] {
+ const [a, b, c, d] = this.points;
+ if (t <= 0 || t >= 1) {
+ const p = t <= 0 ? a : d;
+ const c1 = new Cubic2(Vec2.mapBuffer([p.x, p.y, p.x, p.y, p.x, p.y], 4));
+ const c2 = new Cubic2(Vec2.mapBuffer([a.x, a.y, b.x, b.y, c.x, c.y, d.x, d.y], 4));
+ return t <= 0 ? [c1, c2] : [c2, c1];
+ }
+ const ab = a.mixNewN(b, t);
+ const bc = b.mixNewN(c, t);
+ const cd = c.mixNewN(d, t);
+ const abc = ab.mixNewN(bc, t);
+ const bcd = bc.mixNewN(cd, t);
+ const p = abc.mixNewN(bcd, t);
+ return [
+ new Cubic2(Vec2.mapBuffer([a.x, a.y, ab.x, ab.y, abc.x, abc.y, p.x, p.y], 4)),
+ new Cubic2(Vec2.mapBuffer([p.x, p.y, bcd.x, bcd.y, cd.x, cd.y, d.x, d.y], 4))
+ ];
+ }
+
+ vertices(opts?: Partial) {
+ if (isPlainObject(opts) && (opts).dist !== undefined) {
+ return new Sampler(this.vertices((opts).num || DEFAULT_SAMPLES))
+ .sampleUniform((opts).dist, (opts).last !== false);
+ }
+ opts = isNumber(opts) ?
+ {
+ num: opts,
+ last: true
+ } :
+ {
+ num: DEFAULT_SAMPLES,
+ ...opts
+ };
+ const res: number[] = [];
+ const [a, b, c, d] = this.points;
+ const delta = 1 / opts.num;
+ for (let t = 0; t < opts.num; t++) {
+ res.push(
+ mixCubic1(a.x, b.x, c.x, d.x, t * delta),
+ mixCubic1(a.y, b.y, c.y, d.y, t * delta)
+ );
+ }
+ opts.last && res.push(d.x, d.y);
+ return Vec2.mapBuffer(res);
+ }
+
+ toHiccup() {
+ return ["path", this.attribs,
+ [
+ ["M", this.points[0]],
+ ...this.toHiccupPathSegments()
+ ]
+ ];
+ }
+
+ toHiccupPathSegments() {
+ const pts = this.points;
+ return [["C", pts[1], pts[2], pts[3]]];
+ }
+
+ toJSON() {
+ return this._toJSON("cubic2");
+ }
+}
+
+export class Quadratic2 extends PointContainer2 implements
+ IVertices> {
+
+ static fromJSON(spec: JsonQuadratic2) {
+ return quadratic2(spec.points, spec.attribs);
+ }
+
+ static fromLine(a: Vec2, b: Vec2) {
+ return new Quadratic2([a, a.mixNewN(b), b]);
+ }
+
+ copy() {
+ return new Quadratic2(this._copy(), this.attribs);
+ }
+
+ boundsRaw(): [Vec2, Vec2] {
+ const [a, b, c] = this.points;
+ const mi = a.copy().min(c);
+ const ma = a.copy().max(c);
+ const solve = (a, b, c) => {
+ const t = clamp01((a - b) / (a - 2.0 * b + c));
+ const s = 1 - t;
+ return s * s * a + 2.0 * s * t * b + t * t * c;
+ };
+ if (b.x < mi.x || b.x > ma.x || b.y < mi.y || b.y > ma.y) {
+ const q = new Vec2([
+ solve(a.x, b.x, c.x),
+ solve(a.y, b.y, c.y),
+ ]);
+ mi.min(q);
+ ma.max(q);
+ }
+ return [mi, ma];
+ }
+
+ pointAt(t: number) {
+ const pts = this.points;
+ return mixQuadratic(pts[0], pts[1], pts[2], t);
+ }
+
+ /**
+ * Splits curve into 2 sub-curves at position `t`.
+ *
+ * http://en.wikipedia.org/wiki/De_Casteljau%27s_algorithm
+ *
+ * @param t
+ */
+ splitAt(t: number): [Quadratic2, Quadratic2] {
+ const [a, b, c] = this.points;
+ if (t == 0) {
+ return [
+ new Quadratic2(this._copy([a, a, a])),
+ new Quadratic2(this._copy([a, b, c]))
+ ];
+ }
+ if (t == 1) {
+ return [
+ new Quadratic2(this._copy([a, b, c])),
+ new Quadratic2(this._copy([c, c, c]))
+ ];
+ }
+ const ab = a.mixNewN(b, t);
+ const bc = b.mixNewN(c, t);
+ const p = ab.mixNewN(bc, t);
+ return [
+ new Quadratic2([a.copy(), ab, p]),
+ new Quadratic2([p, bc, c.copy()])
+ ];
+ }
+
+ vertices(opts?: number | Partial) {
+ if (isPlainObject(opts) && (opts).dist !== undefined) {
+ return new Sampler(this.vertices((opts).num || DEFAULT_SAMPLES))
+ .sampleUniform((opts).dist, (opts).last !== false);
+ }
+ opts = isNumber(opts) ?
+ {
+ num: opts,
+ last: true
+ } :
+ {
+ num: DEFAULT_SAMPLES,
+ ...opts
+ };
+ const res: number[] = [];
+ const delta = 1 / opts.num;
+ const [a, b, c] = this.points;
+ for (let t = 0; t < opts.num; t++) {
+ res.push(
+ mixQuadratic1(a.x, b.x, c.x, t * delta),
+ mixQuadratic1(a.y, b.y, c.y, t * delta)
+ );
+ }
+ opts.last && res.push(c.x, c.y);
+ return Vec2.mapBuffer(res);
+ }
+
+ toCubic() {
+ const [a, b, c] = this.points;
+ return new Cubic2([
+ a.copy(),
+ a.mulNewN(1 / 3).maddN(b, 2 / 3),
+ c.mulNewN(1 / 3).maddN(b, 2 / 3),
+ c.copy()
+ ]);
+ }
+
+ toHiccup() {
+ return ["path", this.attribs,
+ [
+ ["M", this.points[0]],
+ ...this.toHiccupPathSegments()
+ ]
+ ];
+ }
+
+ toHiccupPathSegments() {
+ const pts = this.points;
+ return [["Q", pts[1], pts[2]]];
+ }
+
+ toJSON() {
+ return this._toJSON("quadratic2");
+ }
+}
+
+export function cubic2(points: Vec, start?: number, cstride?: number, estride?: number, attribs?: Attribs): Cubic2;
+export function cubic2(a: ReadonlyVec, b: ReadonlyVec, c: ReadonlyVec, d: ReadonlyVec, attribs?: Attribs): Cubic2;
+export function cubic2(points: ReadonlyVec[], attribs?: Attribs): Cubic2;
+export function cubic2(...args: any[]) {
+ const [points, attribs] = args4(args);
+ return new Cubic2(points, attribs);
+}
+
+export function quadratic2(points: Vec, start?: number, cstride?: number, estride?: number, attribs?: Attribs): Quadratic2;
+export function quadratic2(a: Vec2 | ReadonlyVec, b: Vec2 | ReadonlyVec, c: Vec2 | ReadonlyVec, attribs?: Attribs): Quadratic2;
+export function quadratic2(points: ReadonlyVec[], attribs?: Attribs): Quadratic2;
+export function quadratic2(...args: any[]) {
+ const [points, attribs] = args3(args);
+ return new Quadratic2(points, attribs);
+}
diff --git a/packages/geom/src/circle2.ts b/packages/geom/src/circle2.ts
new file mode 100644
index 0000000000..edbec805e1
--- /dev/null
+++ b/packages/geom/src/circle2.ts
@@ -0,0 +1,193 @@
+import { IToHiccup } from "@thi.ng/api/api";
+import { isArrayLike } from "@thi.ng/checks/is-arraylike";
+import { isNumber } from "@thi.ng/checks/is-number";
+import { isPlainObject } from "@thi.ng/checks/is-plain-object";
+import { PI, TAU } from "@thi.ng/math/api";
+import { eqDelta } from "@thi.ng/math/eqdelta";
+import { ReadonlyVec, Vec } from "@thi.ng/vectors/api";
+import {
+ asVec2,
+ setS2,
+ toCartesian2,
+ Vec2
+} from "@thi.ng/vectors/vec2";
+import {
+ Attribs,
+ DEFAULT_SAMPLES,
+ HiccupCircle2,
+ IArcLength,
+ IBounds,
+ IBoundsRaw,
+ ICentroid,
+ IClassifyPoint,
+ IPointInside,
+ IToPolygon,
+ IVertices,
+ JsonCircle2,
+ SamplingOpts
+} from "./api";
+import { circumCenter } from "./internal/circumcenter";
+import { edges } from "./internal/edges";
+import { Polygon2 } from "./polygon2";
+import { Rect2 } from "./rect2";
+
+export class Circle2 implements
+ IArcLength,
+ IBoundsRaw,
+ IBounds,
+ ICentroid,
+ IClassifyPoint,
+ IPointInside,
+ IToHiccup,
+ IToPolygon>,
+ IVertices> {
+
+ static fromJSON(spec: JsonCircle2) {
+ return new Circle2(
+ new Vec2(spec.pos),
+ spec.r,
+ spec.attribs
+ );
+ }
+
+ static fromHiccup(spec: HiccupCircle2) {
+ return new Circle2(asVec2(spec[2]), spec[3], spec[1]);
+ }
+
+ static from2Points(a: Readonly, b: Readonly, attribs?: Attribs) {
+ return new Circle2(a.mixNewN(b), a.dist(b) / 2, attribs);
+ }
+ static from3Points(a: Readonly, b: Readonly, c: Readonly, attribs?: Attribs) {
+ const o = circumCenter(a, b, c);
+ if (o) {
+ return new Circle2(o, a.dist(o), attribs);
+ }
+ }
+
+ pos: Vec2;
+ r: number;
+ attribs: Attribs;
+
+ constructor(pos: Vec2, r = 1, attribs?: Attribs) {
+ this.pos = pos;
+ this.r = r;
+ this.attribs = attribs;
+ }
+
+ copy() {
+ return new Circle2(this.pos.copy(), this.r, { ...this.attribs });
+ }
+
+ edges(opts?: Partial) {
+ return edges(this.vertices(opts));
+ }
+
+ vertices(opts?: number | Partial) {
+ let [num, last] = isNumber(opts) ?
+ [opts, false] :
+ [
+ opts.theta ?
+ Math.floor(TAU / opts.theta) :
+ opts.dist ?
+ Math.floor(TAU / (opts.dist / this.r)) :
+ opts.num || DEFAULT_SAMPLES,
+ opts.last === true
+ ];
+ const buf: Vec = [];
+ const pos = this.pos.buf;
+ const po = this.pos.i;
+ const ps = this.pos.s;
+ const r = this.r;
+ const delta = TAU / num;
+ last && num++;
+ for (let i = 0; i < num; i++) {
+ toCartesian2(
+ setS2(buf, r, i * delta, i * 2),
+ pos, i * 2, po, 1, ps
+ );
+ }
+ return Vec2.mapBuffer(buf, num);
+ }
+
+ area() {
+ return PI * this.r * this.r;
+ }
+
+ arcLength() {
+ return TAU * this.r;
+ }
+
+ boundsRaw(): [Vec2, Vec2] {
+ return [
+ this.pos.subNewN(this.r),
+ this.pos.addNewN(this.r)
+ ];
+ }
+
+ bounds(): Rect2 {
+ return new Rect2(
+ this.pos.subNewN(this.r),
+ new Vec2([this.r, this.r])
+ );
+ }
+
+ centroid(c?: Vec2) {
+ return c ? c.set(this.pos) : this.pos;
+ }
+
+ classifyPoint(p: Readonly) {
+ const d = p.distSq(this.pos);
+ const r = this.r * this.r;
+ return eqDelta(d, r) ? 0 : d < r ? 1 : -1;
+ }
+
+ pointInside(p: Readonly) {
+ return this.classifyPoint(p) >= 0;
+ }
+
+ toPolygon(opts?: number | Partial) {
+ return new Polygon2(this.vertices(opts));
+ }
+
+ toHiccup(): HiccupCircle2 {
+ return ["circle", this.attribs || {}, this.pos, this.r];
+ }
+
+ toJSON() {
+ return {
+ type: "circle2",
+ pos: this.pos.toJSON(),
+ r: this.r,
+ attribs: this.attribs,
+ };
+ }
+}
+
+export function circle2(r: number, attribs?: Attribs): Circle2;
+export function circle2(x: number, y: number, attribs?: Attribs): Circle2;
+export function circle2(x: number, y: number, r: number, attribs?: Attribs): Circle2;
+export function circle2(pos: ReadonlyVec, attribs?: Attribs): Circle2;
+export function circle2(pos: ReadonlyVec, r: number, attribs?: Attribs): Circle2;
+export function circle2(...args: any[]) {
+ let attribs;
+ let n = args.length - 1;
+ if (isPlainObject(args[n]) || args[n] == null) {
+ attribs = args[n];
+ n--;
+ }
+ if (isArrayLike(args[0])) {
+ return new Circle2(
+ asVec2(args[0]),
+ n === 1 ? args[n] : 1,
+ attribs
+ );
+ }
+ if (n > 0) {
+ return new Circle2(
+ new Vec2([args[0], args[1]]),
+ n === 2 ? args[n] : 1,
+ attribs
+ );
+ }
+ return new Circle2(new Vec2(), args[0], attribs);
+}
diff --git a/packages/geom/src/container2.ts b/packages/geom/src/container2.ts
new file mode 100644
index 0000000000..d3f8c066fa
--- /dev/null
+++ b/packages/geom/src/container2.ts
@@ -0,0 +1,134 @@
+import { Mat23 } from "@thi.ng/vectors/mat23";
+import { Vec2 } from "@thi.ng/vectors/vec2";
+import {
+ Attribs,
+ CollateOpts,
+ IBounds,
+ IBoundsRaw,
+ ICenter,
+ ICentroid,
+ ICollate,
+ IVertices
+} from "./api";
+import { fitIntoBounds2 } from "./fit";
+import { bounds } from "./internal/bounds";
+import { centroid } from "./internal/centroid";
+import { collateWith } from "./internal/collate";
+import { convexHull } from "./internal/graham-scan";
+import { Rect2 } from "./rect2";
+
+export class PointContainer2 implements
+ IBoundsRaw,
+ IBounds,
+ ICentroid,
+ ICenter,
+ ICollate,
+ IVertices {
+
+ points: Vec2[];
+ attribs: Attribs;
+
+ constructor(pts: Vec2[], attribs?: Attribs) {
+ this.points = pts;
+ this.attribs = attribs;
+ }
+
+ *[Symbol.iterator]() {
+ yield* this.vertices();
+ }
+
+ collate(opts?: Partial) {
+ return collateWith(Vec2.intoBuffer, this.points, opts, 2);
+ }
+
+ vertices() {
+ return this.points;
+ }
+
+ boundsRaw() {
+ return bounds(this.points, Vec2.MAX.copy(), Vec2.MIN.copy());
+ }
+
+ bounds(): Rect2 {
+ return Rect2.fromMinMax(...this.boundsRaw());
+ }
+
+ convextHull() {
+ return convexHull(this.points);
+ }
+
+ centroid(c?: Vec2) {
+ return centroid(this.points, c || new Vec2());
+ }
+
+ center(origin?: Readonly) {
+ const d = this.centroid().neg();
+ return this.translate(origin ? d.add(origin) : d);
+ }
+
+ flip() {
+ this.points.reverse();
+ return this;
+ }
+
+ fit(bounds: Rect2) {
+ fitIntoBounds2(this, bounds);
+ return this;
+ }
+
+ rotate(theta: number) {
+ const pts = this.points;
+ for (let i = pts.length; --i >= 0;) {
+ pts[i].rotate(theta);
+ }
+ return this;
+ }
+
+ scale(v: Readonly) {
+ const pts = this.points;
+ for (let i = pts.length; --i >= 0;) {
+ pts[i].mul(v);
+ }
+ return this;
+ }
+
+ scaleN(n: number) {
+ const pts = this.points;
+ for (let i = pts.length; --i >= 0;) {
+ pts[i].mulN(n);
+ }
+ return this;
+ }
+
+ translate(v: Readonly) {
+ const pts = this.points;
+ for (let i = pts.length; --i >= 0;) {
+ pts[i].add(v);
+ }
+ return this;
+ }
+
+ transform(mat: Readonly) {
+ const pts = this.points;
+ for (let i = pts.length; --i >= 0;) {
+ mat.mulV(pts[i]);
+ }
+ return this;
+ }
+
+ protected _copy(pts = this.points) {
+ return Vec2.mapBuffer(Vec2.intoBuffer([], pts), pts.length);
+ }
+
+ protected _toJSON(type: string) {
+ return {
+ type,
+ attribs: this.attribs,
+ points: this.points.map((p) => p.toJSON())
+ };
+ }
+
+ protected _toHiccup(type: string) {
+ return [type, this.attribs, this.points];
+ }
+}
diff --git a/packages/geom/src/container3.ts b/packages/geom/src/container3.ts
new file mode 100644
index 0000000000..c8149bfad0
--- /dev/null
+++ b/packages/geom/src/container3.ts
@@ -0,0 +1,109 @@
+import { illegalArgs } from "@thi.ng/errors/illegal-arguments";
+import { Mat44 } from "@thi.ng/vectors/mat44";
+import { Vec3, vec3 } from "@thi.ng/vectors/vec3";
+import {
+ Attribs,
+ CollateOpts,
+ IBounds,
+ IBoundsRaw,
+ ICenter,
+ ICentroid,
+ ICollate,
+ IVertices
+} from "./api";
+import { bounds } from "./internal/bounds";
+import { collateWith } from "./internal/collate";
+
+export class PointContainer3 implements
+ IBoundsRaw,
+ IBounds, // TODO
+ ICentroid,
+ ICenter,
+ ICollate,
+ IVertices {
+
+ points: Vec3[];
+ attribs: Attribs;
+
+ constructor(pts: Vec3[], attribs?: Attribs) {
+ this.points = pts;
+ this.attribs = attribs;
+ }
+
+ *[Symbol.iterator]() {
+ yield* this.vertices();
+ }
+
+ collate(opts?: Partial) {
+ return collateWith(Vec3.intoBuffer, this.points, opts, 3);
+ }
+
+ vertices() {
+ return this.points;
+ }
+
+ boundsRaw() {
+ return bounds(this.points, Vec3.MAX.copy(), Vec3.MIN.copy());
+ }
+
+ bounds() {
+ return this.boundsRaw();
+ }
+
+ centroid(c?: Vec3): Vec3 {
+ const pts = this.points;
+ const num = pts.length;
+ !num && illegalArgs("no points available");
+ !c && (c = vec3());
+ for (let i = num; --i >= 0;) {
+ c.add(pts[i]);
+ }
+ return c.divN(num);
+ }
+
+ center(p?: Readonly) {
+ const d = this.centroid().neg();
+ return this.translate(p ? d.add(p) : d);
+ }
+
+ flip() {
+ this.points.reverse();
+ return this;
+ }
+
+ scale(v: Readonly) {
+ const pts = this.points;
+ for (let i = pts.length; --i >= 0;) {
+ pts[i].mul(v);
+ }
+ return this;
+ }
+
+ translate(v: Readonly) {
+ const pts = this.points;
+ for (let i = pts.length; --i >= 0;) {
+ pts[i].add(v);
+ }
+ return this;
+ }
+
+ transform(mat: Readonly) {
+ const pts = this.points;
+ for (let i = pts.length; --i >= 0;) {
+ mat.mulV3(pts[i]);
+ }
+ return this;
+ }
+
+ protected _copy() {
+ return Vec3.mapBuffer(Vec3.intoBuffer([], this.points), this.points.length);
+ }
+
+ protected _toJSON(type: string) {
+ return {
+ type,
+ attribs: this.attribs,
+ points: this.points.map((p) => p.toJSON())
+ };
+ }
+}
diff --git a/packages/geom/src/fit.ts b/packages/geom/src/fit.ts
new file mode 100644
index 0000000000..2c7828dcbb
--- /dev/null
+++ b/packages/geom/src/fit.ts
@@ -0,0 +1,42 @@
+import { Mat23 } from "@thi.ng/vectors/mat23";
+import { Vec2 } from "@thi.ng/vectors/vec2";
+import { IBounds, ICentroid, ITransformable } from "./api";
+import { collBounds } from "./internal/bounds";
+import { Rect2 } from "./rect2";
+
+const translateScale = (shape: ITransformable, c1: Vec2, c2: Vec2, smat: Mat23) =>
+ shape.transform(
+ Mat23.concat(
+ Mat23.translation(c1),
+ smat,
+ Mat23.translation(c2)
+ )
+ );
+
+export const fitIntoBounds2 = & ITransformable>(shape: T, bounds: Rect2) => {
+ const obounds = shape.bounds();
+ const tscale = bounds.size.copy().divNew(obounds.size);
+ const scale = Math.min(tscale.x, tscale.y);
+ return translateScale(
+ shape,
+ bounds.centroid(),
+ obounds.centroid().neg(),
+ Mat23.scale(scale)
+ );
+}
+
+export const fitAllIntoBounds2 = & ICentroid & ITransformable>(shapes: T[], dest: Rect2) => {
+ const src: Rect2 = collBounds(shapes);
+ const w = dest.size.x / src.size.x;
+ const h = dest.size.y / src.size.y;
+ const s = w > 0 && h > 0 ? Math.min(w, h) : w > 0 ? w : h;
+ const b = src.copy().scaleN(s).center(dest.centroid());
+ const smat = Mat23.scale(s);
+ for (let i = shapes.length; --i >= 0;) {
+ const s = shapes[i];
+ const c1 = s.centroid();
+ const c2 = b.unmapPoint(src.mapPoint(c1));
+ translateScale(s, c2, c1.neg(), smat);
+ }
+ return shapes;
+};
diff --git a/packages/geom/src/index.ts b/packages/geom/src/index.ts
new file mode 100644
index 0000000000..46762d01db
--- /dev/null
+++ b/packages/geom/src/index.ts
@@ -0,0 +1,22 @@
+export * from "./api";
+export * from "./container2";
+export * from "./container3";
+
+export * from "./arc2";
+export * from "./bezier2";
+export * from "./circle2";
+export * from "./container2";
+export * from "./container3";
+export * from "./line2";
+export * from "./path2";
+export * from "./polygon2";
+export * from "./polyline2";
+export * from "./quad2";
+export * from "./rect2";
+export * from "./sampler";
+export * from "./triangle2";
+
+export * from "./fit";
+export * from "./subdiv-curve";
+export * from "./tessellate";
+export * from "./warp";
diff --git a/packages/geom/src/internal/arc-length.ts b/packages/geom/src/internal/arc-length.ts
new file mode 100644
index 0000000000..31ed1e0fbe
--- /dev/null
+++ b/packages/geom/src/internal/arc-length.ts
@@ -0,0 +1,14 @@
+import { IVector } from "@thi.ng/vectors/api";
+
+export const arcLength = >(pts: ReadonlyArray, closed = false) => {
+ const num = pts.length;
+ if (num < 2) return 0;
+ let res = 0;
+ let p = pts[0];
+ let q = pts[1];
+ for (let i = 1; i < num; i++ , p = q, q = pts[i]) {
+ res += p.dist(q);
+ }
+ closed && (res += p.dist(pts[0]));
+ return res;
+};
diff --git a/packages/geom/src/internal/area.ts b/packages/geom/src/internal/area.ts
new file mode 100644
index 0000000000..73b8d795b9
--- /dev/null
+++ b/packages/geom/src/internal/area.ts
@@ -0,0 +1,9 @@
+import { Vec2 } from "@thi.ng/vectors/vec2";
+
+export const polygonArea = (pts: ReadonlyArray) => {
+ let res = 0;
+ for (let n = pts.length - 1, i = n, j = 0; n >= 0; i = j, j++ , n--) {
+ res += pts[i].cross(pts[j]);
+ }
+ return res / 2;
+};
diff --git a/packages/geom/src/internal/args.ts b/packages/geom/src/internal/args.ts
new file mode 100644
index 0000000000..8d430d07b3
--- /dev/null
+++ b/packages/geom/src/internal/args.ts
@@ -0,0 +1,76 @@
+import { isArrayLike } from "@thi.ng/checks/is-arraylike";
+import { isNumber } from "@thi.ng/checks/is-number";
+import { illegalArgs } from "@thi.ng/errors/illegal-arguments";
+import { ReadonlyVec } from "@thi.ng/vectors/api";
+import { asVec2, Vec2 } from "@thi.ng/vectors/vec2";
+
+export const args3 = (args: any[]) => {
+ let points = args[0], attribs;
+ if (isArrayLike(points[0])) {
+ points = (points).map(asVec2);
+ attribs = args[1];
+ } else if (args.length >= 3 &&
+ isArrayLike(points) &&
+ isArrayLike(args[1]) &&
+ isArrayLike(args[2])) {
+ points = [asVec2(points), asVec2(args[1]), asVec2(args[2])];
+ attribs = args[3];
+ } else if (isNumber(points[0])) {
+ points = Vec2.mapBuffer(
+ points,
+ 3,
+ args[1] || 0,
+ args[2] || 1,
+ args[3] || 2
+ );
+ attribs = args[4];
+ } else {
+ illegalArgs();
+ }
+ return [points, attribs];
+};
+
+export const args4 = (args: any[]) => {
+ let points = args[0], attribs;
+ if (isArrayLike(points[0])) {
+ points = (points).map(asVec2);
+ attribs = args[1];
+ } else if (args.length >= 4 &&
+ isArrayLike(points) &&
+ isArrayLike(args[1]) &&
+ isArrayLike(args[2]) &&
+ isArrayLike(args[3])) {
+ points = [asVec2(points), asVec2(args[1]), asVec2(args[2]), asVec2(args[3])];
+ attribs = args[4];
+ } else if (isNumber(points[0])) {
+ points = Vec2.mapBuffer(
+ points,
+ 4,
+ args[1] || 0,
+ args[2] || 1,
+ args[3] || 2
+ );
+ attribs = args[4];
+ } else {
+ illegalArgs();
+ }
+ return [points, attribs];
+};
+
+export const argsN = (args: any[]) => {
+ let points = args[0], attribs;
+ if (isNumber(points[0])) {
+ points = Vec2.mapBuffer(
+ points,
+ args[1] || points.length / 2,
+ args[2] || 0,
+ args[3] || 1,
+ args[4] || 2
+ );
+ attribs = args[5];
+ } else if (isArrayLike(points[0])) {
+ points = (points).map(asVec2);
+ attribs = args[1];
+ }
+ return [points, attribs];
+};
diff --git a/packages/geom/src/internal/barycentric.ts b/packages/geom/src/internal/barycentric.ts
new file mode 100644
index 0000000000..0eb94072f0
--- /dev/null
+++ b/packages/geom/src/internal/barycentric.ts
@@ -0,0 +1,25 @@
+import { IVector } from "@thi.ng/vectors/api";
+import { Vec3 } from "@thi.ng/vectors/vec3";
+
+export const toBarycentric =
+ >
+ (a: Readonly, b: Readonly, c: Readonly, p: Readonly, out = new Vec3()) => {
+
+ const u = b.subNew(a);
+ const v = c.subNew(a);
+ const w = p.subNew(a);
+ const uu = u.magSq();
+ const vv = v.magSq();
+ const uv = u.dot(v);
+ const uw = u.dot(w);
+ const vw = v.dot(w);
+ const d = 1 / (uv * uv - uu * vv);
+ const s = d * (uv * vw - vv * uw);
+ const t = d * (uv * uw - uu * vw);
+ return out.setS(1 - (s + t), s, t);
+ };
+
+export const fromBarycentric =
+ >
+ (a: Readonly, b: Readonly, c: Readonly, p: Readonly, out?: T) =>
+ a.mulNewN(p.x, out).maddN(b, p.y).maddN(c, p.z);
diff --git a/packages/geom/src/internal/bounds.ts b/packages/geom/src/internal/bounds.ts
new file mode 100644
index 0000000000..5d4cb1118d
--- /dev/null
+++ b/packages/geom/src/internal/bounds.ts
@@ -0,0 +1,40 @@
+import { IVector } from "@thi.ng/vectors/api";
+import { IBounds, IUnion } from "../api";
+
+export const axisBounds =
+ >
+ (points: ReadonlyArray, axis: number): [number, number] => {
+
+ let min = Infinity;
+ let max = -Infinity;
+ for (let i = points.length; --i >= 0;) {
+ const x = points[i][axis];
+ x < min && (min = x);
+ x > max && (max = x);
+ }
+ return [min, max];
+ };
+
+export const bounds =
+ >
+ (pts: ReadonlyArray, vmin: T, vmax: T): [T, T] => {
+
+ for (let i = pts.length; --i >= 0;) {
+ const p = pts[i];
+ vmin.min(p);
+ vmax.max(p);
+ }
+ return [vmin, vmax];
+ };
+
+export const collBounds =
+ , B extends IBounds & IUnion>
+ (shapes: T[]) => {
+
+ let n = shapes.length - 1;
+ let res: B = n > 0 ? shapes[n].bounds() : undefined;
+ for (; --n >= 0;) {
+ res = res.union(shapes[n].bounds());
+ }
+ return res;
+ };
diff --git a/packages/geom/src/internal/centroid.ts b/packages/geom/src/internal/centroid.ts
new file mode 100644
index 0000000000..e84643f1ef
--- /dev/null
+++ b/packages/geom/src/internal/centroid.ts
@@ -0,0 +1,29 @@
+import { illegalArgs } from "@thi.ng/errors/illegal-arguments";
+import { IVector } from "@thi.ng/vectors/api";
+import { Vec2 } from "@thi.ng/vectors/vec2";
+
+export const centroid = >(pts: ReadonlyArray, c?: T) => {
+ const num = pts.length;
+ !num && illegalArgs("no points available");
+ !c && (c = pts[0].empty());
+ for (let i = num; --i >= 0;) {
+ c.add(pts[i]);
+ }
+ return c.divN(num);
+};
+
+export const centerOfWeight = (pts: Vec2[], c?: Vec2) => {
+ let area = 0;
+ let x = 0;
+ let y = 0;
+ for (let n = pts.length - 1, i = pts[n], j = pts[0], k = 0; k <= n; k++ , i = j, j = pts[k]) {
+ const z = i.cross(j);
+ area += z;
+ x += (i.x + j.x) * z;
+ y += (i.y + j.y) * z;
+ }
+ area = 1 / (area * 3);
+ x *= area;
+ y *= area;
+ return c ? c.setS(x, y) : new Vec2([x, y]);
+};
diff --git a/packages/geom/src/internal/circumcenter.ts b/packages/geom/src/internal/circumcenter.ts
new file mode 100644
index 0000000000..65517cf648
--- /dev/null
+++ b/packages/geom/src/internal/circumcenter.ts
@@ -0,0 +1,43 @@
+import { EPS } from "@thi.ng/math/api";
+import { Vec2 } from "@thi.ng/vectors/vec2";
+
+export const circumCenter =
+ (a: Readonly, b: Readonly, c: Readonly, eps = EPS) => {
+
+ const deltaAB = Math.abs(a.y - b.y);
+ const deltaBC = Math.abs(b.y - c.y);
+ if (deltaAB < eps && deltaBC < eps) {
+ return null;
+ }
+ const ax = a.x, ay = a.y;
+ const bx = b.x, by = b.y;
+ const cx = c.x, cy = c.y;
+ let m1, m2, mx1, mx2, my1, my2, xc, yc;
+ if (deltaAB < eps) {
+ m2 = - (cx - bx) / (cy - by);
+ mx2 = (bx + cx) / 2;
+ my2 = (by + cy) / 2;
+ xc = (bx + ax) / 2;
+ yc = m2 * (xc - mx2) + my2;
+ } else if (deltaBC < eps) {
+ m1 = - (bx - ax) / (by - ay);
+ mx1 = (ax + bx) / 2;
+ my1 = (ay + by) / 2;
+ xc = (cx + bx) / 2;
+ yc = m1 * (xc - mx1) + my1;
+ } else {
+ m1 = - (bx - ax) / (by - ay);
+ m2 = - (cx - bx) / (cy - by);
+ mx1 = (ax + bx) / 2;
+ my1 = (ay + by) / 2;
+ mx2 = (bx + cx) / 2;
+ my2 = (by + cy) / 2;
+ xc = (m1 * mx1 - m2 * mx2 + my2 - my1) / (m1 - m2);
+ if (deltaAB > deltaBC) {
+ yc = m1 * (xc - mx1) + my1;
+ } else {
+ yc = m2 * (xc - mx2) + my2;
+ }
+ }
+ return new Vec2(xc, yc);
+ };
diff --git a/packages/geom/src/internal/closest-point.ts b/packages/geom/src/internal/closest-point.ts
new file mode 100644
index 0000000000..ca8db6d33f
--- /dev/null
+++ b/packages/geom/src/internal/closest-point.ts
@@ -0,0 +1,99 @@
+import { IVector } from "@thi.ng/vectors/api";
+
+export const closestPoint =
+ >(p: T, pts: T[]) => {
+
+ let minD = Infinity;
+ let closest: T;
+ for (let i = pts.length; --i >= 0;) {
+ const d = pts[i].distSq(p);
+ if (d < minD) {
+ minD = d;
+ closest = pts[i];
+ }
+ }
+ return closest;
+ };
+
+export const closestCoeff =
+ >(p: T, a: T, b: T) => {
+
+ const d = b.subNew(a);
+ const l = d.magSq();
+ if (l > 1e-6) {
+ return p.subNew(a).dot(d) / l;
+ }
+ };
+
+export const closestPointSegment =
+ >(p: T, a: T, b: T, out: T) => {
+
+ const t = closestCoeff(p, a, b);
+ if (t !== undefined) {
+ return t <= 0.0 ?
+ out.set(a) :
+ t >= 1.0 ?
+ out.set(b) :
+ a.mixNewN(b, t, out);
+ }
+ };
+
+export const closestPointPolyline =
+ >(p: Readonly, pts: ReadonlyArray, closed = false) => {
+
+ const closest = pts[0].empty();
+ const tmp = closest.empty();
+ const n = pts.length - 1;
+ let minD = Infinity, i, j;
+ if (closed) {
+ i = n;
+ j = 0;
+ } else {
+ i = 0;
+ j = 1;
+ }
+ for (; j <= n; i = j, j++) {
+ if (closestPointSegment(p, pts[i], pts[j], tmp)) {
+ const d = p.distSq(tmp);
+ if (d < minD) {
+ minD = d;
+ closest.set(tmp);
+ }
+ }
+ }
+ return closest;
+ };
+
+/**
+ * Returns the index of the start point containing the segment in the
+ * polyline array `points` farthest away from `p` with regards to the
+ * line segment `a` to `b`. `points` is only checked between indices
+ * `from` and `to`.
+ *
+ * @param a
+ * @param b
+ * @param points
+ * @param from
+ * @param to
+ */
+export const farthestPointSegment =
+ >(
+ a: T,
+ b: T,
+ points: T[],
+ from = 0,
+ to = points.length) => {
+
+ let maxD = -1;
+ let maxIdx;
+ const tmp = a.empty();
+ for (let i = from; i < to; i++) {
+ const p = points[i];
+ const d = p.distSq(closestPointSegment(p, a, b, tmp) || a);
+ if (d > maxD) {
+ maxD = d;
+ maxIdx = i;
+ }
+ }
+ return [maxIdx, Math.sqrt(maxD)];
+ };
diff --git a/packages/geom/src/internal/collate.ts b/packages/geom/src/internal/collate.ts
new file mode 100644
index 0000000000..c29f1e1a28
--- /dev/null
+++ b/packages/geom/src/internal/collate.ts
@@ -0,0 +1,37 @@
+import { Vec, IVec } from "@thi.ng/vectors/api";
+import { CollateOpts } from "../api";
+
+export const remap = (buf: Vec, pts: IVec[], start: number, cstride: number, estride: number) => {
+ for (let i = pts.length; --i >= 0;) {
+ const p = pts[i];
+ p.buf = buf;
+ p.i = start + i * estride;
+ p.s = cstride;
+ }
+ return buf;
+};
+
+export const collateWith = (
+ fn: (buf: Vec, src: Iterable>, start, cstride, estride) => Vec,
+ pts: T[],
+ opts: Partial,
+ stride: number) => {
+
+ opts = {
+ start: 0,
+ cstride: 1,
+ estride: stride,
+ ...opts
+ };
+ const { start, cstride, estride } = opts;
+ return remap(
+ fn(
+ opts.buf || new Array(start + pts.length * estride).fill(0),
+ pts,
+ start,
+ cstride,
+ estride
+ ),
+ pts, start, cstride, estride
+ );
+};
diff --git a/packages/geom/src/internal/corner.ts b/packages/geom/src/internal/corner.ts
new file mode 100644
index 0000000000..8bf3274009
--- /dev/null
+++ b/packages/geom/src/internal/corner.ts
@@ -0,0 +1,38 @@
+import { sign } from "@thi.ng/math/abs";
+import { EPS } from "@thi.ng/math/api";
+import { Vec2 } from "@thi.ng/vectors/vec2";
+
+export const corner =
+ (a: Readonly, b: Readonly, c: Readonly) => {
+ const ax = a.x;
+ const ay = a.y;
+ return (b.x - ax) * (c.y - ay) - (c.x - ax) * (b.y - ay);
+ };
+
+export const classify =
+ (a: Readonly, b: Readonly, c: Readonly, eps = EPS) =>
+ sign(corner(a, b, c), eps);
+
+export const clockwise2 =
+ (a: Readonly, b: Readonly, c: Readonly) =>
+ corner(a, b, c) < 0;
+
+export const classifyPointInTriangle2 =
+ (p: Readonly, a: Readonly, b: Readonly, c: Readonly) => {
+ const s = clockwise2(a, b, c) ? 1 : -1;
+ return sign(
+ Math.min(
+ s * corner(a, c, p),
+ s * corner(b, a, p),
+ s * corner(c, b, p)
+ )
+ );
+ };
+
+export const pointInTriangle2 =
+ (p: Readonly, a: Readonly, b: Readonly, c: Readonly) => {
+ const s = clockwise2(a, b, c) ? 1 : -1;
+ return s * corner(a, c, p) >= 0 &&
+ s * corner(b, a, p) >= 0 &&
+ s * corner(c, b, p) >= 0;
+ };
diff --git "a/packages/geom/src/internal/douglas\342\200\223peucker.ts" "b/packages/geom/src/internal/douglas\342\200\223peucker.ts"
new file mode 100644
index 0000000000..b2a7061dc1
--- /dev/null
+++ "b/packages/geom/src/internal/douglas\342\200\223peucker.ts"
@@ -0,0 +1,43 @@
+import { peek } from "@thi.ng/transducers/func/peek";
+import { IVector } from "@thi.ng/vectors/api";
+import { farthestPointSegment } from "./closest-point";
+
+// https://en.wikipedia.org/wiki/Ramer%E2%80%93Douglas%E2%80%93Peucker_algorithm
+
+export const simplifyPolyline =
+ >(pts: T[], eps = 0, closed = false) => {
+
+ let num = pts.length;
+ const visited: boolean[] = [];
+ if (num <= 2) {
+ return pts.slice();
+ }
+ if (closed && !pts[0].eqDelta(peek(pts))) {
+ pts = pts.slice();
+ pts.push(pts[0]);
+ num++;
+ }
+
+ const $ = (from: number, to: number) => {
+ visited[from] = visited[to] = true;
+ if (to <= from + 1) {
+ return;
+ }
+ const [maxIdx, maxD] = farthestPointSegment(pts[from], pts[to], pts, from + 1, to);
+ if (maxD <= eps) {
+ return;
+ }
+ $(from, maxIdx);
+ $(maxIdx, to);
+ };
+
+ $(0, num - 1);
+
+ const res: T[] = [];
+ for (let i = 0, n = closed ? num - 1 : num; i < n; i++) {
+ if (visited[i]) {
+ res.push(pts[i]);
+ }
+ }
+ return res;
+ };
diff --git a/packages/geom/src/internal/edges.ts b/packages/geom/src/internal/edges.ts
new file mode 100644
index 0000000000..fe9bed6d49
--- /dev/null
+++ b/packages/geom/src/internal/edges.ts
@@ -0,0 +1,6 @@
+import { wrap } from "@thi.ng/transducers/iter/wrap";
+import { partition } from "@thi.ng/transducers/xform/partition";
+
+export const edges =