refactor(geom-splines): update deps, imports, use new Fn types

thi-ng · Sep 5, 2020 · 7921929 · 7921929
1 parent 780a7b7
commit 7921929
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 15 deletions.
diff --git a/packages/imgui/package.json b/packages/imgui/package.json
@@ -40,6 +40,7 @@
     "devDependencies": {
         "@istanbuljs/nyc-config-typescript": "^1.0.1",
         "@microsoft/api-extractor": "^7.9.11",
+        "@thi.ng/api": "^6.12.3",
         "@types/mocha": "^8.0.3",
         "@types/node": "^14.6.1",
         "mocha": "^8.1.2",
@@ -49,7 +50,6 @@
         "typescript": "^4.0.2"
     },
     "dependencies": {
-        "@thi.ng/api": "^6.12.3",
         "@thi.ng/checks": "^2.7.7",
         "@thi.ng/geom": "^1.11.7",
         "@thi.ng/geom-api": "^1.0.33",

diff --git a/packages/imgui/src/behaviors/button.ts b/packages/imgui/src/behaviors/button.ts
@@ -1,7 +1,7 @@
 import { pointInside } from "@thi.ng/geom";
+import type { IShape } from "@thi.ng/geom-api";
 import { Key } from "../api";
 import { IMGUI } from "../gui";
-import type { IShape } from "@thi.ng/geom-api";
 
 export const isHoverButton = (gui: IMGUI, id: string, shape: IShape) => {
     if (gui.disabled) return false;

diff --git a/packages/imgui/src/behaviors/slider.ts b/packages/imgui/src/behaviors/slider.ts
@@ -1,9 +1,10 @@
+import type { FnN4 } from "@thi.ng/api";
 import { pointInside } from "@thi.ng/geom";
+import type { IShape } from "@thi.ng/geom-api";
 import { clamp, roundTo } from "@thi.ng/math";
 import { add2, clamp2, round2, Vec } from "@thi.ng/vectors";
 import { Key } from "../api";
 import { IMGUI } from "../gui";
-import type { IShape } from "@thi.ng/geom-api";
 
 export const isHoverSlider = (
     gui: IMGUI,
@@ -21,7 +22,7 @@ export const isHoverSlider = (
     return hover;
 };
 
-export const slider1Val = (x: number, min: number, max: number, prec: number) =>
+export const slider1Val: FnN4 = (x, min, max, prec) =>
     clamp(roundTo(x, prec), min, max);
 
 export const slider2Val = (v: Vec, min: Vec, max: Vec, prec: number) =>

diff --git a/packages/imgui/src/components/button.ts b/packages/imgui/src/components/button.ts
@@ -1,13 +1,13 @@
 import { rect } from "@thi.ng/geom";
+import type { IShape } from "@thi.ng/geom-api";
 import { IGridLayout, isLayout, LayoutBox } from "@thi.ng/layout";
 import { hash, ZERO2 } from "@thi.ng/vectors";
+import type { Color, Hash } from "../api";
 import { handleButtonKeys, isHoverButton } from "../behaviors/button";
 import { IMGUI } from "../gui";
 import { labelHash } from "../hash";
 import { textLabelRaw, textTransformH, textTransformV } from "./textlabel";
 import { tooltipRaw } from "./tooltip";
-import type { IShape } from "@thi.ng/geom-api";
-import type { Color, Hash } from "../api";
 
 const mkLabel = (transform: number[], fill: Color, label: string) =>
     textLabelRaw(ZERO2, { transform, fill }, label);

diff --git a/packages/imgui/src/components/dial.ts b/packages/imgui/src/components/dial.ts
@@ -1,3 +1,4 @@
+import type { Fn } from "@thi.ng/api";
 import { circle, line } from "@thi.ng/geom";
 import { IGridLayout, isLayout, LayoutBox } from "@thi.ng/layout";
 import { HALF_PI, norm, PI, TAU } from "@thi.ng/math";
@@ -8,7 +9,6 @@ import { IMGUI } from "../gui";
 import { valHash } from "../hash";
 import { textLabelRaw } from "./textlabel";
 import { tooltipRaw } from "./tooltip";
-import type { Fn } from "@thi.ng/api";
 
 export const dial = (
     gui: IMGUI,

diff --git a/packages/imgui/src/components/ring.ts b/packages/imgui/src/components/ring.ts
@@ -1,3 +1,4 @@
+import type { Fn, FnN2 } from "@thi.ng/api";
 import { polygon } from "@thi.ng/geom";
 import { pointInRect } from "@thi.ng/geom-isec";
 import { IGridLayout, isLayout, LayoutBox } from "@thi.ng/layout";
@@ -10,9 +11,8 @@ import { IMGUI } from "../gui";
 import { valHash } from "../hash";
 import { textLabelRaw } from "./textlabel";
 import { tooltipRaw } from "./tooltip";
-import type { Fn } from "@thi.ng/api";
 
-const ringHeight = (w: number, thetaGap: number) =>
+const ringHeight: FnN2 = (w, thetaGap) =>
     (w / 2) * (1 + Math.sin(HALF_PI + thetaGap / 2));
 
 const arcVerts = (

diff --git a/packages/imgui/src/components/sliderh.ts b/packages/imgui/src/components/sliderh.ts
@@ -1,3 +1,4 @@
+import type { Fn } from "@thi.ng/api";
 import { rect } from "@thi.ng/geom";
 import { IGridLayout, isLayout, LayoutBox } from "@thi.ng/layout";
 import { fit, norm } from "@thi.ng/math";
@@ -11,7 +12,6 @@ import { IMGUI } from "../gui";
 import { valHash } from "../hash";
 import { textLabelRaw } from "./textlabel";
 import { tooltipRaw } from "./tooltip";
-import type { Fn } from "@thi.ng/api";
 
 export const sliderH = (
     gui: IMGUI,

diff --git a/packages/imgui/src/components/sliderv.ts b/packages/imgui/src/components/sliderv.ts
@@ -1,3 +1,4 @@
+import type { Fn } from "@thi.ng/api";
 import { rect } from "@thi.ng/geom";
 import { IGridLayout, isLayout, LayoutBox } from "@thi.ng/layout";
 import { fit, norm } from "@thi.ng/math";
@@ -11,7 +12,6 @@ import { IMGUI } from "../gui";
 import { valHash } from "../hash";
 import { textLabelRaw, textTransformV } from "./textlabel";
 import { tooltipRaw } from "./tooltip";
-import type { Fn } from "@thi.ng/api";
 
 export const sliderV = (
     gui: IMGUI,

diff --git a/packages/imgui/src/components/textfield.ts b/packages/imgui/src/components/textfield.ts
@@ -1,3 +1,4 @@
+import type { Predicate } from "@thi.ng/api";
 import { rect } from "@thi.ng/geom";
 import { IGridLayout, isLayout, LayoutBox } from "@thi.ng/layout";
 import { fitClamped } from "@thi.ng/math";
@@ -7,7 +8,6 @@ import { isHoverSlider } from "../behaviors/slider";
 import { IMGUI } from "../gui";
 import { textLabelRaw } from "./textlabel";
 import { tooltipRaw } from "./tooltip";
-import type { Predicate } from "@thi.ng/api";
 
 interface TextfieldState {
     cursor: number;

diff --git a/packages/imgui/src/components/textlabel.ts b/packages/imgui/src/components/textlabel.ts
@@ -1,8 +1,8 @@
 import { isPlainObject } from "@thi.ng/checks";
 import { IGridLayout, isLayout, LayoutBox } from "@thi.ng/layout";
-import { IMGUI } from "../gui";
 import type { ReadonlyVec } from "@thi.ng/vectors";
 import type { Color, GUITheme } from "../api";
+import { IMGUI } from "../gui";
 
 export const textLabel = (
     gui: IMGUI,

diff --git a/packages/imgui/src/components/xypad.ts b/packages/imgui/src/components/xypad.ts
@@ -1,3 +1,4 @@
+import type { Fn } from "@thi.ng/api";
 import { line, rect } from "@thi.ng/geom";
 import { IGridLayout, LayoutBox } from "@thi.ng/layout";
 import { fit2, hash, Vec } from "@thi.ng/vectors";
@@ -9,7 +10,6 @@ import {
 import { IMGUI } from "../gui";
 import { textLabelRaw } from "./textlabel";
 import { tooltipRaw } from "./tooltip";
-import type { Fn } from "@thi.ng/api";
 
 /**
  * `mode` interpretation:

diff --git a/packages/imgui/src/gui.ts b/packages/imgui/src/gui.ts
@@ -1,3 +1,4 @@
+import type { Fn0, IClear, IToHiccup } from "@thi.ng/api";
 import { set2, Vec } from "@thi.ng/vectors";
 import {
     DEFAULT_THEME,
@@ -9,7 +10,6 @@ import {
     MouseButton,
     NONE,
 } from "./api";
-import type { Fn0, IClear, IToHiccup } from "@thi.ng/api";
 
 export class IMGUI implements IClear, IToHiccup {
     attribs!: any;