refactor: minor pkg restructure (various)

thi-ng · Sep 29, 2021 · 47f88d2 · 47f88d2
1 parent ce4d3e8
commit 47f88d2
Show file tree

Hide file tree

Showing 25 changed files with 38 additions and 60 deletions.
diff --git a/packages/adjacency/package.json b/packages/adjacency/package.json
@@ -104,9 +104,6 @@
         },
         "./sparse": {
             "import": "./sparse.js"
-        },
-        "./utils": {
-            "import": "./utils.js"
         }
     },
     "thi.ng": {

diff --git a/packages/adjacency/src/utils.ts b/packages/adjacency/src/utils.ts
@@ -1,3 +1,4 @@
+// thing:no-export
 import type { Pair } from "@thi.ng/api";
 import type { Edge, IGraph } from "./api";
 

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -57,7 +57,6 @@
     "files": [
         "*.js",
         "*.d.ts",
-        "api",
         "decorators",
         "mixins"
     ],

diff --git a/packages/atom/package.json b/packages/atom/package.json
@@ -85,9 +85,6 @@
         "./history": {
             "import": "./history.js"
         },
-        "./idgen": {
-            "import": "./idgen.js"
-        },
         "./transacted": {
             "import": "./transacted.js"
         },

diff --git a/packages/atom/src/idgen.ts b/packages/atom/src/idgen.ts
@@ -1,3 +1,4 @@
+// thing:no-export
 let NEXT_ID = 0;
 
 export const nextID = () => NEXT_ID++;
diff --git a/packages/bitfield/package.json b/packages/bitfield/package.json
@@ -72,9 +72,6 @@
         },
         "./bitmatrix": {
             "import": "./bitmatrix.js"
-        },
-        "./util": {
-            "import": "./util.js"
         }
     },
     "thi.ng": {

diff --git a/packages/bitfield/src/util.ts b/packages/bitfield/src/util.ts
@@ -1,3 +1,4 @@
+// thing:no-export
 import type { Fn2 } from "@thi.ng/api";
 import { popCount as $popCount } from "@thi.ng/binary/count";
 import { B32 } from "@thi.ng/strings/radix";

diff --git a/packages/colored-noise/package.json b/packages/colored-noise/package.json
@@ -86,9 +86,6 @@
         "./red": {
             "import": "./red.js"
         },
-        "./utils": {
-            "import": "./utils.js"
-        },
         "./violet": {
             "import": "./violet.js"
         },

diff --git a/packages/colored-noise/src/utils.ts b/packages/colored-noise/src/utils.ts
@@ -1,3 +1,4 @@
+// thing:no-export
 import type { INorm } from "@thi.ng/random";
 
 export const preseed = (n: number, scale: number, rnd: INorm) => {

diff --git a/packages/geom-accel/package.json b/packages/geom-accel/package.json
@@ -101,9 +101,6 @@
         },
         "./spatial-grid3": {
             "import": "./spatial-grid3.js"
-        },
-        "./utils": {
-            "import": "./utils.js"
         }
     },
     "thi.ng": {

diff --git a/packages/geom-accel/src/utils.ts b/packages/geom-accel/src/utils.ts
@@ -1,3 +1,4 @@
+// thing:no-export
 import type { Fn, Fn3, Nullable, Pair } from "@thi.ng/api";
 
 /** @internal */

diff --git a/packages/gp/package.json b/packages/gp/package.json
@@ -82,9 +82,6 @@
         },
         "./mep": {
             "import": "./mep.js"
-        },
-        "./utils": {
-            "import": "./utils.js"
         }
     },
     "thi.ng": {

diff --git a/packages/gp/src/utils.ts b/packages/gp/src/utils.ts
@@ -1,3 +1,4 @@
+// thing:no-export
 import { assert } from "@thi.ng/errors/assert";
 import { add } from "@thi.ng/transducers/add";
 import { choices } from "@thi.ng/transducers/choices";

diff --git a/packages/grid-iterators/package.json b/packages/grid-iterators/package.json
@@ -110,9 +110,6 @@
         "./spiral": {
             "import": "./spiral.js"
         },
-        "./utils": {
-            "import": "./utils.js"
-        },
         "./zcurve": {
             "import": "./zcurve.js"
         },

diff --git a/packages/grid-iterators/src/utils.ts b/packages/grid-iterators/src/utils.ts
@@ -1,3 +1,4 @@
+// thing:no-export
 /**
  * Swaps XY in-place.
  *

diff --git a/packages/mime/package.json b/packages/mime/package.json
@@ -58,9 +58,6 @@
     "exports": {
         ".": {
             "import": "./index.js"
-        },
-        "./generated": {
-            "import": "./generated.js"
         }
     },
     "thi.ng": {

diff --git a/packages/mime/src/generated.ts b/packages/mime/src/generated.ts
@@ -1,3 +1,4 @@
+// thing:no-export
 /**
  * generated @ 2021-04-10T11:16:38.116Z - DO NOT EDIT!
  *

diff --git a/packages/mime/tools/convert.ts b/packages/mime/tools/convert.ts
@@ -95,7 +95,8 @@ for (let gid of Object.keys(dest).sort()) {
         .reduce((acc, id) => ((acc[id] = group[id]), acc), <any>{});
 }
 
-const body = `/**
+const body = `// thing:no-export
+/**
  * generated @ ${new Date().toISOString()} - DO NOT EDIT!
  *
  * @internal

diff --git a/packages/porter-duff/package.json b/packages/porter-duff/package.json
@@ -72,9 +72,6 @@
         },
         "./premultiply": {
             "import": "./premultiply.js"
-        },
-        "./utils": {
-            "import": "./utils.js"
         }
     },
     "thi.ng": {

diff --git a/packages/porter-duff/src/utils.ts b/packages/porter-duff/src/utils.ts
@@ -1,3 +1,4 @@
+// thing:no-export
 import type { Color, ReadonlyColor } from "./api";
 
 /** @internal */

diff --git a/packages/sax/test/index.ts b/packages/sax/test/index.ts
@@ -1,4 +1,4 @@
-import { defmulti } from "@thi.ng/defmulti";
+import { DEFAULT, defmulti, MultiFn1 } from "@thi.ng/defmulti";
 import { group } from "@thi.ng/testament";
 import {
     comp,
@@ -87,29 +87,31 @@ group("sax", {
             );
 
         // define multiple dispatch function, based on element tag name
-        const parseElement = defmulti<ParseElement, any>((e) => e.tag);
+        const parseElement: MultiFn1<ParseElement, any> = defmulti<
+            ParseElement,
+            any
+        >(
+            (e) => e.tag,
+            {},
+            {
+                circle: (e) => [e.tag, numericAttribs(e, "cx", "cy", "r")],
 
-        // implementations
-        parseElement.add("circle", (e) => [
-            e.tag,
-            numericAttribs(e, "cx", "cy", "r"),
-        ]);
-
-        parseElement.add("rect", (e) => [
-            e.tag,
-            numericAttribs(e, "x", "y", "width", "height"),
-        ]);
+                rect: (e) => [
+                    e.tag,
+                    numericAttribs(e, "x", "y", "width", "height"),
+                ],
 
-        parseElement.add("g", (e) => [e.tag, e.attribs, ...parsedChildren(e)]);
+                g: (e) => [e.tag, e.attribs, ...parsedChildren(e)],
 
-        parseElement.add("svg", (e) => [
-            e.tag,
-            numericAttribs(e, "width", "height"),
-            ...parsedChildren(e),
-        ]);
+                svg: (e) => [
+                    e.tag,
+                    numericAttribs(e, "width", "height"),
+                    ...parsedChildren(e),
+                ],
 
-        // implementation for unhandled elements (just return undefined)
-        parseElement.setDefault(() => undefined);
+                [DEFAULT]: () => undefined,
+            }
+        );
 
         assert.deepStrictEqual(
             parseElement(<ParseElement>transduce(parse(), last(), svg)),

diff --git a/packages/soa/package.json b/packages/soa/package.json
@@ -84,9 +84,6 @@
         },
         "./soa": {
             "import": "./soa.js"
-        },
-        "./utils": {
-            "import": "./utils.js"
         }
     },
     "thi.ng": {

diff --git a/packages/soa/src/utils.ts b/packages/soa/src/utils.ts
@@ -1,3 +1,4 @@
+// thing:no-export
 import type { SOAAttribSpec } from "./api";
 
 export const prepareSpec = (spec: Partial<SOAAttribSpec>) => {

diff --git a/packages/testament/src/exec.ts b/packages/testament/src/exec.ts
@@ -1,5 +1,4 @@
-import type { TestResult } from ".";
-import type { Test } from "./api";
+import type { Test, TestResult } from "./api";
 import { now, timeDiff } from "./utils";
 
 const TESTS: Test[] = [];

diff --git a/packages/transducers-hdom/src/index.ts b/packages/transducers-hdom/src/index.ts
@@ -1,9 +1,6 @@
-import {
-    DEFAULT_IMPL,
-    HDOMImplementation,
-    HDOMOpts,
-    resolveRoot,
-} from "@thi.ng/hdom";
+import type { HDOMImplementation, HDOMOpts } from "@thi.ng/hdom";
+import { DEFAULT_IMPL } from "@thi.ng/hdom/default";
+import { resolveRoot } from "@thi.ng/hdom/resolve";
 import { derefContext } from "@thi.ng/hiccup/deref";
 import type { Transducer } from "@thi.ng/transducers";
 import { scan } from "@thi.ng/transducers/scan";