refactor(hiccup-canvas): rename internals

thi-ng · Oct 12, 2021 · 043e3eb · 043e3eb
1 parent 94622fe
commit 043e3eb
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 19 deletions.
diff --git a/packages/hiccup-canvas/src/arc.ts b/packages/hiccup-canvas/src/arc.ts
@@ -1,7 +1,7 @@
 import type { IObjectOf } from "@thi.ng/api";
 import { TAU } from "@thi.ng/math/api";
 import type { ReadonlyVec } from "@thi.ng/vectors";
-import { endShape } from "./internal/end-shape";
+import { __endShape } from "./internal/end-shape";
 
 export const circularArc = (
     ctx: CanvasRenderingContext2D,
@@ -14,7 +14,7 @@ export const circularArc = (
 ) => {
     ctx.beginPath();
     ctx.arc(pos[0], pos[1], r, start, end, antiCCW);
-    endShape(ctx, attribs);
+    __endShape(ctx, attribs);
 };
 
 export const ellipticArc = (
@@ -29,5 +29,5 @@ export const ellipticArc = (
 ) => {
     ctx.beginPath();
     ctx.ellipse(pos[0], pos[1], r[0], r[1], axis, start, end, ccw);
-    endShape(ctx, attribs);
+    __endShape(ctx, attribs);
 };
diff --git a/packages/hiccup-canvas/src/draw.ts b/packages/hiccup-canvas/src/draw.ts
@@ -4,7 +4,11 @@ import type { DrawState } from "./api";
 import { circularArc, ellipticArc } from "./arc";
 import { defLinearGradient, defRadialGradient } from "./color";
 import { image } from "./image";
-import { mergeState, registerGradient, restoreState } from "./internal/state";
+import {
+    __mergeState,
+    __registerGradient,
+    __restoreState,
+} from "./internal/state";
 import { line, lines } from "./line";
 import { packedPoints } from "./packed-points";
 import { path } from "./path";
@@ -30,7 +34,7 @@ export const draw = (
         }
         return;
     }
-    const state = mergeState(ctx, pstate, shape[1]);
+    const state = __mergeState(ctx, pstate, shape[1]);
     const attribs = state ? state.attribs : pstate.attribs;
     if (attribs.__skip) return;
     switch (shape[0]) {
@@ -39,14 +43,14 @@ export const draw = (
             defs(ctx, state, pstate, shape);
             break;
         case "linearGradient":
-            registerGradient(
+            __registerGradient(
                 pstate,
                 shape[1].id,
                 defLinearGradient(ctx, shape[1], shape[2])
             );
             break;
         case "radialGradient":
-            registerGradient(
+            __registerGradient(
                 pstate,
                 shape[1].id,
                 defRadialGradient(ctx, shape[1], shape[2])
@@ -114,7 +118,7 @@ export const draw = (
             );
         default:
     }
-    state && restoreState(ctx, pstate, state);
+    state && __restoreState(ctx, pstate, state);
 };
 
 const defs = (

diff --git a/packages/hiccup-canvas/src/internal/end-shape.ts b/packages/hiccup-canvas/src/internal/end-shape.ts
@@ -1,7 +1,7 @@
 import type { IObjectOf } from "@thi.ng/api";
 
 /** @internal */
-export const endShape = (
+export const __endShape = (
     ctx: CanvasRenderingContext2D,
     attribs: IObjectOf<any>
 ) => {

diff --git a/packages/hiccup-canvas/src/internal/state.ts b/packages/hiccup-canvas/src/internal/state.ts
@@ -50,30 +50,31 @@ const CTX_ATTRIBS: IObjectOf<string> = {
     weight: "lineWidth",
 };
 
-const newState = (state: DrawState, restore = false) => ({
+/** @internal */
+const __newState = (state: DrawState, restore = false) => ({
     attribs: { ...state.attribs },
     grads: { ...state.grads },
     edits: [],
     restore,
 });
 
 /** @internal */
-export const mergeState = (
+export const __mergeState = (
     ctx: CanvasRenderingContext2D,
     state: DrawState,
     attribs: IObjectOf<any>
 ) => {
     let res: DrawState | undefined;
     if (!attribs) return;
     if (applyTransform(ctx, attribs)) {
-        res = newState(state, true);
+        res = __newState(state, true);
     }
     for (let id in attribs) {
         const k = CTX_ATTRIBS[id];
         if (k) {
             const v = attribs[id];
             if (v != null && state.attribs[id] !== v) {
-                !res && (res = newState(state));
+                !res && (res = __newState(state));
                 res.attribs[id] = v;
                 res.edits!.push(id);
                 setAttrib(ctx, state, id, k, v);
@@ -84,7 +85,7 @@ export const mergeState = (
 };
 
 /** @internal */
-export const restoreState = (
+export const __restoreState = (
     ctx: CanvasRenderingContext2D,
     prev: DrawState,
     curr: DrawState
@@ -103,7 +104,7 @@ export const restoreState = (
 };
 
 /** @internal */
-export const registerGradient = (
+export const __registerGradient = (
     state: DrawState,
     id: string,
     g: CanvasGradient

diff --git a/packages/hiccup-canvas/src/path.ts b/packages/hiccup-canvas/src/path.ts
@@ -1,6 +1,6 @@
 import type { IObjectOf } from "@thi.ng/api";
 import type { ReadonlyVec } from "@thi.ng/vectors";
-import { endShape } from "./internal/end-shape";
+import { __endShape } from "./internal/end-shape";
 
 export const path = (
     ctx: CanvasRenderingContext2D,
@@ -109,5 +109,5 @@ export const path = (
                 ctx.closePath();
         }
     }
-    endShape(ctx, attribs);
+    __endShape(ctx, attribs);
 };
diff --git a/packages/hiccup-canvas/src/polygon.ts b/packages/hiccup-canvas/src/polygon.ts
@@ -1,6 +1,6 @@
 import type { IObjectOf } from "@thi.ng/api";
 import type { ReadonlyVec } from "@thi.ng/vectors";
-import { endShape } from "./internal/end-shape";
+import { __endShape } from "./internal/end-shape";
 
 export const polygon = (
     ctx: CanvasRenderingContext2D,
@@ -10,7 +10,7 @@ export const polygon = (
     if (pts.length < 2) return;
     __drawPoly(ctx, pts);
     ctx.closePath();
-    endShape(ctx, attribs);
+    __endShape(ctx, attribs);
 };
 
 /**