@slithy/prim-lib 0.7.0 → 0.8.0

package/dist/index.d.ts

@@ -24,9 +24,12 @@ interface ShapeImageData {
 interface ShapeInterface {
     bbox: Bbox;
     tonalRange?: [number, number];
+    invertTonal?: boolean;
     saturationRange?: [number, number];
+    invertSaturation?: boolean;
     hueCenter?: number;
     hueTolerance?: number;
+    invertHue?: boolean;
     /** cfg is rarely used by implementations; accepts Partial to keep call sites flexible. */
     mutate(cfg?: Partial<Cfg>): ShapeInterface;
     toSVG(): SVGElement | undefined;
@@ -310,9 +313,12 @@ interface NGonOptions {
     sizeRange?: [number, number];
     mutationScale?: number;
     tonalRange?: [number, number];
+    invertTonal?: boolean;
     saturationRange?: [number, number];
+    invertSaturation?: boolean;
     hueCenter?: number;
     hueTolerance?: number;
+    invertHue?: boolean;
 }
 declare function makeNGon(opts: NGonOptions): new (w: number, h: number) => ShapeInterface;
 interface RectOptions {
@@ -322,18 +328,24 @@ interface RectOptions {
     rotatable?: boolean;
     mutationScale?: number;
     tonalRange?: [number, number];
+    invertTonal?: boolean;
     saturationRange?: [number, number];
+    invertSaturation?: boolean;
     hueCenter?: number;
     hueTolerance?: number;
+    invertHue?: boolean;
 }
 declare function makeRect(opts?: Partial<RectOptions>): new (w: number, h: number) => ShapeInterface;
 interface CircleOptions {
     sizeRange?: [number, number];
     mutationScale?: number;
     tonalRange?: [number, number];
+    invertTonal?: boolean;
     saturationRange?: [number, number];
+    invertSaturation?: boolean;
     hueCenter?: number;
     hueTolerance?: number;
+    invertHue?: boolean;
 }
 declare function makeCircle(opts?: Partial<CircleOptions>): new (w: number, h: number) => ShapeInterface;
 interface EllipseOptions {
@@ -342,9 +354,12 @@ interface EllipseOptions {
     aspectRatio?: number;
     mutationScale?: number;
     tonalRange?: [number, number];
+    invertTonal?: boolean;
     saturationRange?: [number, number];
+    invertSaturation?: boolean;
     hueCenter?: number;
     hueTolerance?: number;
+    invertHue?: boolean;
 }
 declare function makeEllipse(opts?: Partial<EllipseOptions>): new (w: number, h: number) => ShapeInterface;
 interface GlyphOptions {
@@ -353,9 +368,12 @@ interface GlyphOptions {
     sizeRange?: [number, number];
     mutationScale?: number;
     tonalRange?: [number, number];
+    invertTonal?: boolean;
     saturationRange?: [number, number];
+    invertSaturation?: boolean;
     hueCenter?: number;
     hueTolerance?: number;
+    invertHue?: boolean;
 }
 declare function makeGlyph(opts?: Partial<GlyphOptions>): new (w: number, h: number) => ShapeInterface;
 declare class Debug extends Shape {

package/dist/index.js

@@ -382,7 +382,7 @@ var Step = class _Step {
   compute(state) {
     const pixels = state.canvas.node.width * state.canvas.node.height;
     const offset = this.shape.bbox;
-    const { tonalRange, saturationRange, hueCenter, hueTolerance } = this.shape;
+    const { tonalRange, invertTonal, saturationRange, invertSaturation, hueCenter, hueTolerance, invertHue } = this.shape;
     if (tonalRange || saturationRange || hueCenter !== void 0 && hueTolerance !== void 0) {
       const { left, top, width, height } = offset;
       const targetData = state.target.getImageData();
@@ -405,20 +405,25 @@ var Step = class _Step {
       if (count > 0) {
         if (tonalRange) {
           const luma = (0.299 * rSum + 0.587 * gSum + 0.114 * bSum) / count;
-          if (luma < tonalRange[0] || luma > tonalRange[1]) {
+          const inRange = luma >= tonalRange[0] && luma <= tonalRange[1];
+          if (invertTonal ? inRange : !inRange) {
             this.distance = Infinity;
             return Promise.resolve(this);
           }
         }
         if (saturationRange || hueCenter !== void 0 && hueTolerance !== void 0) {
           const [h, s] = rgbToHsl(rSum / count, gSum / count, bSum / count);
-          if (saturationRange && (s < saturationRange[0] || s > saturationRange[1])) {
-            this.distance = Infinity;
-            return Promise.resolve(this);
+          if (saturationRange) {
+            const inRange = s >= saturationRange[0] && s <= saturationRange[1];
+            if (invertSaturation ? inRange : !inRange) {
+              this.distance = Infinity;
+              return Promise.resolve(this);
+            }
           }
           if (hueCenter !== void 0 && hueTolerance !== void 0) {
             const diff = Math.abs((h - hueCenter + 180 + 360) % 360 - 180);
-            if (diff > hueTolerance) {
+            const inRange = diff <= hueTolerance;
+            if (invertHue ? inRange : !inRange) {
               this.distance = Infinity;
               return Promise.resolve(this);
             }
@@ -1026,12 +1031,15 @@ function makeNGon(opts) {
       static {
         __name(this, "NGonRegular");
       }
-      static _ngonOpts = { sides, regular: true, rotatable, noise, sizeRange, mutationScale, startAngle, tonalRange: opts.tonalRange, saturationRange: opts.saturationRange, hueCenter: opts.hueCenter, hueTolerance: opts.hueTolerance };
+      static _ngonOpts = { sides, regular: true, rotatable, noise, sizeRange, mutationScale, startAngle, tonalRange: opts.tonalRange, invertTonal: opts.invertTonal, saturationRange: opts.saturationRange, invertSaturation: opts.invertSaturation, hueCenter: opts.hueCenter, hueTolerance: opts.hueTolerance, invertHue: opts.invertHue };
       static _shapeSpec = { f: "ngon", o: NGonRegular._ngonOpts };
       tonalRange;
+      invertTonal;
       saturationRange;
+      invertSaturation;
       hueCenter;
       hueTolerance;
+      invertHue;
       center;
       r;
       angle;
@@ -1040,9 +1048,12 @@ function makeNGon(opts) {
       constructor(w, h) {
         super(w, h);
         this.tonalRange = opts.tonalRange;
+        this.invertTonal = opts.invertTonal;
         this.saturationRange = opts.saturationRange;
+        this.invertSaturation = opts.invertSaturation;
         this.hueCenter = opts.hueCenter;
         this.hueTolerance = opts.hueTolerance;
+        this.invertHue = opts.invertHue;
         this.center = Shape.randomPoint(w, h);
         this.r = Math.max(1, sizeRange[0] + ~~(Math.random() * (sizeRange[1] - sizeRange[0])));
         this.angle = rotatable ? Math.random() * (2 * Math.PI / sides) : startAngle;
@@ -1138,19 +1149,25 @@ function makeNGon(opts) {
       static {
         __name(this, "NGonIrregular");
       }
-      static _ngonOpts = { sides, regular: false, convex, sizeRange, mutationScale, tonalRange: opts.tonalRange, saturationRange: opts.saturationRange, hueCenter: opts.hueCenter, hueTolerance: opts.hueTolerance };
+      static _ngonOpts = { sides, regular: false, convex, sizeRange, mutationScale, tonalRange: opts.tonalRange, invertTonal: opts.invertTonal, saturationRange: opts.saturationRange, invertSaturation: opts.invertSaturation, hueCenter: opts.hueCenter, hueTolerance: opts.hueTolerance, invertHue: opts.invertHue };
       static _shapeSpec = { f: "ngon", o: NGonIrregular._ngonOpts };
       tonalRange;
+      invertTonal;
       saturationRange;
+      invertSaturation;
       hueCenter;
       hueTolerance;
+      invertHue;
       points;
       constructor(w, h) {
         super(w, h);
         this.tonalRange = opts.tonalRange;
+        this.invertTonal = opts.invertTonal;
         this.saturationRange = opts.saturationRange;
+        this.invertSaturation = opts.invertSaturation;
         this.hueCenter = opts.hueCenter;
         this.hueTolerance = opts.hueTolerance;
+        this.invertHue = opts.invertHue;
         const first = Shape.randomPoint(w, h);
         this.points = [first];
         for (let i = 1; i < sides; i++) {
@@ -1222,12 +1239,15 @@ function makeRect(opts) {
     static {
       __name(this, "Rect");
     }
-    static _rectOpts = { widthRange, heightRange, aspectRatio, rotatable, mutationScale, tonalRange: opts?.tonalRange, saturationRange: opts?.saturationRange, hueCenter: opts?.hueCenter, hueTolerance: opts?.hueTolerance };
+    static _rectOpts = { widthRange, heightRange, aspectRatio, rotatable, mutationScale, tonalRange: opts?.tonalRange, invertTonal: opts?.invertTonal, saturationRange: opts?.saturationRange, invertSaturation: opts?.invertSaturation, hueCenter: opts?.hueCenter, hueTolerance: opts?.hueTolerance, invertHue: opts?.invertHue };
     static _shapeSpec = { f: "rect", o: Rect._rectOpts };
     tonalRange;
+    invertTonal;
     saturationRange;
+    invertSaturation;
     hueCenter;
     hueTolerance;
+    invertHue;
     center;
     hw;
     hh;
@@ -1235,9 +1255,12 @@ function makeRect(opts) {
     constructor(w, h) {
       super(w, h);
       this.tonalRange = opts?.tonalRange;
+      this.invertTonal = opts?.invertTonal;
       this.saturationRange = opts?.saturationRange;
+      this.invertSaturation = opts?.invertSaturation;
       this.hueCenter = opts?.hueCenter;
       this.hueTolerance = opts?.hueTolerance;
+      this.invertHue = opts?.invertHue;
       this.center = Shape.randomPoint(w, h);
       this.hw = widthRange[0] + ~~(Math.random() * (widthRange[1] - widthRange[0]));
       if (aspectRatio !== void 0) {
@@ -1350,20 +1373,26 @@ function makeCircle(opts) {
     static {
       __name(this, "MadeCircle");
     }
-    static _circleOpts = { sizeRange, mutationScale, tonalRange: opts?.tonalRange, saturationRange: opts?.saturationRange, hueCenter: opts?.hueCenter, hueTolerance: opts?.hueTolerance };
+    static _circleOpts = { sizeRange, mutationScale, tonalRange: opts?.tonalRange, invertTonal: opts?.invertTonal, saturationRange: opts?.saturationRange, invertSaturation: opts?.invertSaturation, hueCenter: opts?.hueCenter, hueTolerance: opts?.hueTolerance, invertHue: opts?.invertHue };
     static _shapeSpec = { f: "circle", o: MadeCircle._circleOpts };
     tonalRange;
+    invertTonal;
     saturationRange;
+    invertSaturation;
     hueCenter;
     hueTolerance;
+    invertHue;
     center;
     r;
     constructor(w, h) {
       super(w, h);
       this.tonalRange = opts?.tonalRange;
+      this.invertTonal = opts?.invertTonal;
       this.saturationRange = opts?.saturationRange;
+      this.invertSaturation = opts?.invertSaturation;
       this.hueCenter = opts?.hueCenter;
       this.hueTolerance = opts?.hueTolerance;
+      this.invertHue = opts?.invertHue;
       this.center = Shape.randomPoint(w, h);
       this.r = Math.max(1, sizeRange[0] + ~~(Math.random() * (sizeRange[1] - sizeRange[0])));
       this.computeBbox();
@@ -1424,21 +1453,27 @@ function makeEllipse(opts) {
     static {
       __name(this, "MadeEllipse");
     }
-    static _ellipseOpts = { rxRange, ryRange, aspectRatio, mutationScale, tonalRange: opts?.tonalRange, saturationRange: opts?.saturationRange, hueCenter: opts?.hueCenter, hueTolerance: opts?.hueTolerance };
+    static _ellipseOpts = { rxRange, ryRange, aspectRatio, mutationScale, tonalRange: opts?.tonalRange, invertTonal: opts?.invertTonal, saturationRange: opts?.saturationRange, invertSaturation: opts?.invertSaturation, hueCenter: opts?.hueCenter, hueTolerance: opts?.hueTolerance, invertHue: opts?.invertHue };
     static _shapeSpec = { f: "ellipse", o: MadeEllipse._ellipseOpts };
     tonalRange;
+    invertTonal;
     saturationRange;
+    invertSaturation;
     hueCenter;
     hueTolerance;
+    invertHue;
     center;
     rx;
     ry;
     constructor(w, h) {
       super(w, h);
       this.tonalRange = opts?.tonalRange;
+      this.invertTonal = opts?.invertTonal;
       this.saturationRange = opts?.saturationRange;
+      this.invertSaturation = opts?.invertSaturation;
       this.hueCenter = opts?.hueCenter;
       this.hueTolerance = opts?.hueTolerance;
+      this.invertHue = opts?.invertHue;
       this.center = Shape.randomPoint(w, h);
       this.rx = Math.max(1, rxRange[0] + ~~(Math.random() * (rxRange[1] - rxRange[0])));
       this.ry = aspectRatio !== void 0 ? Math.max(1, Math.round(this.rx / aspectRatio)) : Math.max(1, ryRange[0] + ~~(Math.random() * (ryRange[1] - ryRange[0])));
@@ -1510,20 +1545,26 @@ function makeGlyph(opts) {
     static {
       __name(this, "MadeGlyph");
     }
-    static _glyphOpts = { char, fontFamily, sizeRange, mutationScale, tonalRange: opts?.tonalRange, saturationRange: opts?.saturationRange, hueCenter: opts?.hueCenter, hueTolerance: opts?.hueTolerance };
+    static _glyphOpts = { char, fontFamily, sizeRange, mutationScale, tonalRange: opts?.tonalRange, invertTonal: opts?.invertTonal, saturationRange: opts?.saturationRange, invertSaturation: opts?.invertSaturation, hueCenter: opts?.hueCenter, hueTolerance: opts?.hueTolerance, invertHue: opts?.invertHue };
     static _shapeSpec = { f: "glyph", o: MadeGlyph._glyphOpts };
     tonalRange;
+    invertTonal;
     saturationRange;
+    invertSaturation;
     hueCenter;
     hueTolerance;
+    invertHue;
     center;
     fontSize;
     constructor(w, h) {
       super(w, h);
       this.tonalRange = opts?.tonalRange;
+      this.invertTonal = opts?.invertTonal;
       this.saturationRange = opts?.saturationRange;
+      this.invertSaturation = opts?.invertSaturation;
       this.hueCenter = opts?.hueCenter;
       this.hueTolerance = opts?.hueTolerance;
+      this.invertHue = opts?.invertHue;
       this.center = Shape.randomPoint(w, h);
       this.fontSize = Math.max(sizeRange[0], sizeRange[0] + ~~(Math.random() * (sizeRange[1] - sizeRange[0])));
       this.computeBbox();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slithy/prim-lib",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Core engine for primitive-based image reconstruction.",
   "type": "module",
   "exports": {
@@ -13,14 +13,24 @@
     "dist"
   ],
   "sideEffects": false,
+  "scripts": {
+    "clean": "rm -rf dist",
+    "prepack": "rm -rf dist && tsup src/index.ts --format esm --dts --keep-names",
+    "build": "rm -rf dist && tsup src/index.ts --format esm --dts --keep-names",
+    "dev": "tsup src/index.ts --format esm --watch --keep-names",
+    "typecheck": "tsc --noEmit",
+    "lint": "eslint .",
+    "test": "vitest run",
+    "test:watch": "vitest"
+  },
   "devDependencies": {
+    "@slithy/eslint-config": "workspace:*",
+    "@slithy/tsconfig": "workspace:*",
     "@vitest/coverage-v8": "^4.1.2",
     "jsdom": "^29.0.1",
     "tsup": "^8",
     "typescript": "^5",
-    "vitest": "^4.1.2",
-    "@slithy/eslint-config": "0.0.0",
-    "@slithy/tsconfig": "0.0.0"
+    "vitest": "^4.1.2"
   },
   "author": {
     "name": "Matthew Campagna",
@@ -41,14 +51,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "scripts": {
-    "clean": "rm -rf dist",
-    "build": "rm -rf dist && tsup src/index.ts --format esm --dts --keep-names",
-    "dev": "tsup src/index.ts --format esm --watch --keep-names",
-    "typecheck": "tsc --noEmit",
-    "lint": "eslint .",
-    "test": "vitest run",
-    "test:watch": "vitest"
   }
-}
+}