@thi.ng/shader-ast-stdlib 0.13.13 → 0.13.15

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2023-04-08T11:09:50Z
+- **Last updated**: 2023-05-11T12:16:33Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.
@@ -9,6 +9,19 @@ See [Conventional Commits](https://conventionalcommits.org/) for commit guidelin
 **Note:** Unlisted _patch_ versions only involve non-code or otherwise excluded changes
 and/or version bumps of transitive dependencies.
 
+### [0.13.15](https://github.com/thi-ng/umbrella/tree/@thi.ng/shader-ast-stdlib@0.13.15) (2023-05-11)
+
+#### ♻️ Refactoring
+
+- re-use interned type constants ([f6fcbc5](https://github.com/thi-ng/umbrella/commit/f6fcbc5))
+
+### [0.13.14](https://github.com/thi-ng/umbrella/tree/@thi.ng/shader-ast-stdlib@0.13.14) (2023-05-05)
+
+#### 🩹 Bug fixes
+
+- fix [#399](https://github.com/thi-ng/umbrella/issues/399) update HOF function naming ([f4b62d7](https://github.com/thi-ng/umbrella/commit/f4b62d7))
+  - ensure generated HOFs are using unique names to allow multiple instances
+
 ## [0.13.0](https://github.com/thi-ng/umbrella/tree/@thi.ng/shader-ast-stdlib@0.13.0) (2023-01-10)
 
 #### 🚀 Features

package/README.md

@@ -101,7 +101,7 @@ For Node.js REPL:
 const shaderAstStdlib = await import("@thi.ng/shader-ast-stdlib");
 ```
 
-Package sizes (brotli'd, pre-treeshake): ESM: 10.96 KB
+Package sizes (brotli'd, pre-treeshake): ESM: 11.64 KB
 
 ## Dependencies
 

package/color/aces-film.js

@@ -1,3 +1,4 @@
+import { V3 } from "@thi.ng/shader-ast/api/types";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
 import { add, div, mul } from "@thi.ng/shader-ast/ast/ops";
 import { clamp01 } from "../math/clamp.js";
@@ -9,6 +10,6 @@ import { clamp01 } from "../math/clamp.js";
  *
  * @param col -
  */
-export const ACESFilm = defn("vec3", "ACESFilm", ["vec3"], (col) => [
+export const ACESFilm = defn(V3, "ACESFilm", [V3], (col) => [
     ret(clamp01(div(mul(col, add(mul(col, 2.51), 0.03)), add(mul(col, add(mul(col, 2.43), 0.59)), 0.14)))),
 ]);

package/color/levels.js

@@ -1,7 +1,8 @@
+import { F, M3, V2, V3 } from "@thi.ng/shader-ast/api/types";
 import { ternary } from "@thi.ng/shader-ast/ast/controlflow";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
 import { indexMat } from "@thi.ng/shader-ast/ast/indexed";
-import { float, FLOAT0, FLOAT05, FLOAT1, vec3, VEC3_0, VEC3_1, } from "@thi.ng/shader-ast/ast/lit";
+import { FLOAT0, FLOAT05, FLOAT1, VEC3_0, VEC3_1, float, vec3, } from "@thi.ng/shader-ast/ast/lit";
 import { lt, madd, mul, reciprocal, sub } from "@thi.ng/shader-ast/ast/ops";
 import { $x, $y, $z } from "@thi.ng/shader-ast/ast/swizzle";
 import { max, min, pow } from "@thi.ng/shader-ast/builtin/math";
@@ -13,7 +14,7 @@ import { fit01, fitClamped } from "../math/fit.js";
  * @remarks
  * Reference: https://stackoverflow.com/a/48859502/294515
  */
-export const midLevelGamma = defn("float", "midLevelGamma", ["float"], (mid) => [
+export const midLevelGamma = defn(F, "midLevelGamma", [F], (mid) => [
     ret(reciprocal(ternary(lt(mid, FLOAT05), min(float(9.99), madd(float(9), sub(1, mul(mid, 2)), 1)), max(float(0.01), sub(1, sub(mul(mid, 2), 1)))))),
 ]);
 /**
@@ -29,7 +30,7 @@ export const midLevelGammaRGB = (mid) => vec3(midLevelGamma($x(mid)), midLevelGa
  * `vec2(min,max)`) with `gamma` correction. Results will be clamped to [0..1]
  * range.
  */
-export const levelAdjustGamma = defn("float", "levelAdjustGamma", ["float", "float", "vec2", "vec2"], (x, gamma, input, output) => [
+export const levelAdjustGamma = defn(F, "levelAdjustGamma", [F, F, V2, V2], (x, gamma, input, output) => [
     ret(fit01(pow(fitClamped(x, $x(input), $y(input), FLOAT0, FLOAT1), gamma), $x(output), $y(output))),
 ]);
 /**
@@ -43,7 +44,7 @@ export const levelAdjustGamma = defn("float", "levelAdjustGamma", ["float", "flo
  * - 1st column = RGB min values
  * - 2nd column = RGB max values
  */
-export const levelAdjustGammaRGB = defn("vec3", "levelAdjustGammaRGB", ["vec3", "vec3", "mat3", "mat3"], (x, gamma, input, output) => [
+export const levelAdjustGammaRGB = defn(V3, "levelAdjustGammaRGB", [V3, V3, M3, M3], (x, gamma, input, output) => [
     ret(fit01(pow(fitClamped(x, indexMat(input, 0), indexMat(input, 1), VEC3_0, VEC3_1), gamma), indexMat(output, 0), indexMat(output, 1))),
 ]);
 /**

package/color/porter-duff.js

@@ -1,3 +1,4 @@
+import { V4 } from "@thi.ng/shader-ast/api/types";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
 import { FLOAT0, FLOAT1, vec4 } from "@thi.ng/shader-ast/ast/lit";
 import { add, div, mul, sub } from "@thi.ng/shader-ast/ast/ops";
@@ -27,7 +28,7 @@ const __coeff = (col, f) => f === FLOAT0 ? vec4() : f === FLOAT1 ? col : mul(col
  * @param fa - src coeff fn
  * @param fb - dest coeff fn
  */
-export const porterDuff = (name, fa, fb) => defn("vec4", name, ["vec4", "vec4"], (a, b) => {
+export const porterDuff = (name, fa, fb) => defn(V4, name, [V4, V4], (a, b) => {
     const sa = fa($w(a), $w(b));
     const sb = fb($w(a), $w(b));
     const src = __coeff(a, sa);

package/color/rgbe.js

@@ -1,6 +1,7 @@
+import { V3 } from "@thi.ng/shader-ast/api/types";
 import { ternary } from "@thi.ng/shader-ast/ast/controlflow";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
-import { float, INT0, vec3, VEC3_0 } from "@thi.ng/shader-ast/ast/lit";
+import { INT0, VEC3_0, float, vec3 } from "@thi.ng/shader-ast/ast/lit";
 import { gt, mul, sub } from "@thi.ng/shader-ast/ast/ops";
 import { $w, $xyz } from "@thi.ng/shader-ast/ast/swizzle";
 import { exp2 } from "@thi.ng/shader-ast/builtin/math";
@@ -15,7 +16,7 @@ import { exp2 } from "@thi.ng/shader-ast/builtin/math";
  * https://github.com/box/hdrCompressor/blob/master/src/rgbe/rgbe.c
  *
  */
-export const decodeRGBE = defn("vec3", "decodeRGBE", ["ivec4"], (col) => {
+export const decodeRGBE = defn(V3, "decodeRGBE", ["ivec4"], (col) => {
     return [
         ret(ternary(gt($w(col), INT0), mul(vec3($xyz(col)), exp2(float(sub($w(col), 136)))), VEC3_0)),
     ];

package/fog/exp.js

@@ -1,3 +1,4 @@
+import { F } from "@thi.ng/shader-ast/api/types";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
 import { FLOAT1 } from "@thi.ng/shader-ast/ast/lit";
 import { mul, neg, sub } from "@thi.ng/shader-ast/ast/ops";
@@ -10,4 +11,6 @@ import { clamp01 } from "../math/clamp.js";
  * @param dist - float
  * @param density - float
  */
-export const fogExp = defn("float", "fogExp", ["float", "float"], (dist, density) => [ret(sub(FLOAT1, clamp01(exp(mul(neg(density), dist)))))]);
+export const fogExp = defn(F, "fogExp", [F, F], (dist, density) => [
+    ret(sub(FLOAT1, clamp01(exp(mul(neg(density), dist))))),
+]);

package/fog/exp2.js

@@ -1,3 +1,4 @@
+import { F } from "@thi.ng/shader-ast/api/types";
 import { assign } from "@thi.ng/shader-ast/ast/assign";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
 import { FLOAT1 } from "@thi.ng/shader-ast/ast/lit";
@@ -13,7 +14,7 @@ import { clamp01 } from "../math/clamp.js";
  * @param dist - float
  * @param density - float
  */
-export const fogExp2 = defn("float", "fogExp2", ["float", "float"], (dist, density) => [
+export const fogExp2 = defn(F, "fogExp2", [F, F], (dist, density) => [
     assign(density, mul(density, dist)),
     ret(sub(FLOAT1, clamp01(exp2(mul(mul(density, density), -Math.LOG2E))))),
 ]);

package/fog/linear.js

@@ -1,3 +1,4 @@
+import { F } from "@thi.ng/shader-ast/api/types";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
 import { clamp01 } from "../math/clamp.js";
 import { fitNorm1 } from "../math/fit.js";
@@ -10,4 +11,6 @@ import { fitNorm1 } from "../math/fit.js";
  * @param end - float
  *
  */
-export const fogLinear = defn("float", "fogLinear", ["float", "float", "float"], (dist, start, end) => [ret(clamp01(fitNorm1(dist, start, end)))]);
+export const fogLinear = defn(F, "fogLinear", [F, F, F], (dist, start, end) => [
+    ret(clamp01(fitNorm1(dist, start, end))),
+]);

package/light/trilight.js

@@ -1,3 +1,4 @@
+import { V3 } from "@thi.ng/shader-ast/api/types";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
 import { FLOAT0, FLOAT1 } from "@thi.ng/shader-ast/ast/lit";
 import { add, mul, neg, sub } from "@thi.ng/shader-ast/ast/ops";
@@ -14,7 +15,7 @@ import { abs, dot, max } from "@thi.ng/shader-ast/builtin/math";
  * @param col2 - vec3
  * @param col3 - vec3
  */
-export const trilight = defn("vec3", "trilight", ["vec3", "vec3", "vec3", "vec3", "vec3"], (n, l, c1, c2, c3) => {
+export const trilight = defn(V3, "trilight", [V3, V3, V3, V3, V3], (n, l, c1, c2, c3) => {
     let d;
     return [
         (d = sym(dot(n, l))),

package/math/additive.js

@@ -1,7 +1,9 @@
+import { F } from "@thi.ng/shader-ast/api/types";
 import { assign } from "@thi.ng/shader-ast/ast/assign";
 import { forLoop } from "@thi.ng/shader-ast/ast/controlflow";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
-import { float, FLOAT0, FLOAT05 } from "@thi.ng/shader-ast/ast/lit";
+import { gensym } from "@thi.ng/shader-ast/ast/idgen";
+import { FLOAT0, FLOAT05, float } from "@thi.ng/shader-ast/ast/lit";
 import { add, inc, lt, mul } from "@thi.ng/shader-ast/ast/ops";
 import { sym } from "@thi.ng/shader-ast/ast/sym";
 /**
@@ -23,7 +25,7 @@ import { sym } from "@thi.ng/shader-ast/ast/sym";
  * @param oct -
  * @param name -
  */
-export const additive = (type, fn, oct = 4, name = "additive") => defn("float", name, [[type], [type], "float"], (pos, shift, decay) => {
+export const additive = (type, fn, oct = 4, name = gensym("additive_")) => defn(F, name, [[type], [type], F], (pos, shift, decay) => {
     let n;
     let amp;
     return [

package/math/cartesian.js

@@ -1,3 +1,4 @@
+import { V3 } from "@thi.ng/shader-ast/api/types";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
 import { vec3 } from "@thi.ng/shader-ast/ast/lit";
 import { mul } from "@thi.ng/shader-ast/ast/ops";
@@ -18,7 +19,7 @@ export const cartesian2 = (v) => mul(cossin($y(v)), $x(v));
  *
  * @param v -
  */
-export const cartesian3 = defn("vec3", "cartesian3", ["vec3"], (v) => {
+export const cartesian3 = defn(V3, "cartesian3", [V3], (v) => {
     let r;
     let t;
     let p;

package/math/clamp.js

@@ -1,10 +1,11 @@
+import { F, V2, V3 } from "@thi.ng/shader-ast/api/types";
 import { float, vec2, vec3, vec4 } from "@thi.ng/shader-ast/ast/lit";
 import { clamp } from "@thi.ng/shader-ast/builtin/math";
-const __clamp = (min, max) => (x) => x.type === "float"
+const __clamp = (min, max) => (x) => x.type === F
     ? clamp(x, float(min), float(max))
-    : x.type === "vec2"
+    : x.type === V2
         ? clamp(x, vec2(min), vec2(max))
-        : x.type === "vec3"
+        : x.type === V3
             ? clamp(x, vec3(min), vec3(max))
             : clamp(x, vec4(min), vec4(max));
 /**

package/math/cross2.js

@@ -1,3 +1,4 @@
+import { F, V2 } from "@thi.ng/shader-ast/api/types";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
 import { mul, sub } from "@thi.ng/shader-ast/ast/ops";
 import { $x, $y } from "@thi.ng/shader-ast/ast/swizzle";
@@ -8,7 +9,7 @@ import { $x, $y } from "@thi.ng/shader-ast/ast/swizzle";
  * @param a -
  * @param b -
  */
-export const cross2 = defn("float", "cross2", ["vec2", "vec2"], (a, b) => [
+export const cross2 = defn(F, "cross2", [V2, V2], (a, b) => [
     ret(sub(mul($x(a), $y(b)), mul($y(a), $x(b)))),
 ]);
 /**

package/math/fit.js

@@ -1,3 +1,4 @@
+import { F } from "@thi.ng/shader-ast/api/types";
 import { ternary } from "@thi.ng/shader-ast/ast/controlflow";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
 import { FLOAT0, FLOAT05, FLOAT1, FLOAT2 } from "@thi.ng/shader-ast/ast/lit";
@@ -12,7 +13,9 @@ import { clamp01 } from "./clamp.js";
  * @param a -
  * @param b -
  */
-export const fitNorm1 = defn("float", "fitNorm1", ["float", "float", "float"], (x, a, b) => [ret(ternary(neq(a, b), div(sub(x, a), sub(b, a)), FLOAT0))]);
+export const fitNorm1 = defn(F, "fitNorm1", [F, F, F], (x, a, b) => [
+    ret(ternary(neq(a, b), div(sub(x, a), sub(b, a)), FLOAT0)),
+]);
 /**
  * Fits value `x` from closed interval [a,b] to closed interval [c,d]. No
  * clamping performed.

package/math/magsq.js

@@ -1,6 +1,7 @@
+import { F } from "@thi.ng/shader-ast/api/types";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
 import { dot } from "@thi.ng/shader-ast/builtin/math";
-const $ = (n) => defn("float", `magSq${n}`, [`vec${n}`], (v) => [ret(dot(v, v))]);
+const $ = (n) => defn(F, `magSq${n}`, [`vec${n}`], (v) => [ret(dot(v, v))]);
 export const magSq2 = $(2);
 export const magSq3 = $(3);
 export const magSq4 = $(4);

package/math/mix-cubic.js

@@ -1,7 +1,8 @@
+import { F, V2, V3, V4 } from "@thi.ng/shader-ast/api/types";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
 import { add, mul, sub } from "@thi.ng/shader-ast/ast/ops";
 import { sym } from "@thi.ng/shader-ast/ast/sym";
-const $ = (n, type) => defn(type, `mixCubic${n > 1 ? n : ""}`, [type, type, type, type, "float"], (a, b, c, d, t) => {
+const $ = (n, type) => defn(type, `mixCubic${n > 1 ? n : ""}`, [type, type, type, type, F], (a, b, c, d, t) => {
     let s;
     let s2;
     let t2;
@@ -12,7 +13,7 @@ const $ = (n, type) => defn(type, `mixCubic${n > 1 ? n : ""}`, [type, type, type
         ret(add(add(add(mul(a, mul(s, s2)), mul(b, mul(3, mul(s2, t)))), mul(c, mul(3, mul(t2, s)))), mul(d, mul(t, t2)))),
     ];
 });
-export const mixCubic = $(1, "float");
-export const mixCubic2 = $(2, "vec2");
-export const mixCubic3 = $(3, "vec3");
-export const mixCubic4 = $(4, "vec4");
+export const mixCubic = $(1, F);
+export const mixCubic2 = $(2, V2);
+export const mixCubic3 = $(3, V3);
+export const mixCubic4 = $(4, V4);

package/math/mix-quadratic.js

@@ -1,14 +1,15 @@
+import { F, V2, V3, V4 } from "@thi.ng/shader-ast/api/types";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
 import { add, mul, sub } from "@thi.ng/shader-ast/ast/ops";
 import { sym } from "@thi.ng/shader-ast/ast/sym";
-const $ = (n, type) => defn(type, `mixQuadratic${n > 1 ? n : ""}`, [type, type, type, "float"], (a, b, c, t) => {
+const $ = (n, type) => defn(type, `mixQuadratic${n > 1 ? n : ""}`, [type, type, type, F], (a, b, c, t) => {
     let s;
     return [
         (s = sym(sub(1, t))),
         ret(add(add(mul(a, mul(s, s)), mul(b, mul(2, mul(s, t)))), mul(c, mul(t, t)))),
     ];
 });
-export const mixQuadratic = $(1, "float");
-export const mixQuadratic2 = $(2, "vec2");
-export const mixQuadratic3 = $(3, "vec3");
-export const mixQuadratic4 = $(4, "vec4");
+export const mixQuadratic = $(1, F);
+export const mixQuadratic2 = $(2, V2);
+export const mixQuadratic3 = $(3, V3);
+export const mixQuadratic4 = $(4, V4);

package/math/orthogonal.js

@@ -1,3 +1,4 @@
+import { V3 } from "@thi.ng/shader-ast/api/types";
 import { ternary } from "@thi.ng/shader-ast/ast/controlflow";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
 import { vec2, vec3 } from "@thi.ng/shader-ast/ast/lit";
@@ -23,6 +24,6 @@ export const perpendicularCW = (v) => vec2($y(v), neg($x(v)));
  *
  * http://lolengine.net/blog/2013/09/21/picking-orthogonal-vector-combing-coconuts
  */
-export const orthogonal3 = defn("vec3", "orthogonal3", ["vec3"], (v) => [
+export const orthogonal3 = defn(V3, "orthogonal3", [V3], (v) => [
     ret(ternary(gt(abs($x(v)), abs($z(v))), vec3(neg($y(v)), $x(v), 0), vec3(0, neg($z(v)), $y(v)))),
 ]);

package/math/polar.js

@@ -1,3 +1,4 @@
+import { V2, V3 } from "@thi.ng/shader-ast/api/types";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
 import { vec2, vec3 } from "@thi.ng/shader-ast/ast/lit";
 import { div } from "@thi.ng/shader-ast/ast/ops";
@@ -10,7 +11,7 @@ import { asin, atan, length } from "@thi.ng/shader-ast/builtin/math";
  *
  * @param v -
  */
-export const polar2 = defn("vec2", "polar2", ["vec2"], (v) => [
+export const polar2 = defn(V2, "polar2", [V2], (v) => [
     ret(vec2(length(v), atan(div($y(v), $x(v))))),
 ]);
 /**
@@ -20,7 +21,7 @@ export const polar2 = defn("vec2", "polar2", ["vec2"], (v) => [
  *
  * @param v -
  */
-export const polar3 = defn("vec3", "polar3", ["vec3"], (v) => {
+export const polar3 = defn(V3, "polar3", [V3], (v) => {
     let r;
     return [
         (r = sym(length(v))),

package/matrix/convert.js

@@ -1,12 +1,13 @@
+import { M2, M3, M4 } from "@thi.ng/shader-ast/api/types";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
 import { indexMat } from "@thi.ng/shader-ast/ast/indexed";
-import { mat3, mat4, vec3, VEC3_0, vec4 } from "@thi.ng/shader-ast/ast/lit";
-export const m22ToM33 = defn("mat3", "m22ToM33", ["mat2"], (m) => {
+import { VEC3_0, mat3, mat4, vec3, vec4 } from "@thi.ng/shader-ast/ast/lit";
+export const m22ToM33 = defn(M3, "m22ToM33", [M2], (m) => {
     return [
         ret(mat3(vec3(indexMat(m, 0), 0), vec3(indexMat(m, 1), 0), VEC3_0)),
     ];
 });
-export const m33ToM44 = defn("mat4", "m33ToM44", ["mat3"], (m) => {
+export const m33ToM44 = defn(M4, "m33ToM44", [M3], (m) => {
     return [
         ret(mat4(vec4(indexMat(m, 0), 0), vec4(indexMat(m, 1), 0), vec4(indexMat(m, 2), 0), vec4())),
     ];

package/matrix/lookat.js

@@ -1,3 +1,4 @@
+import { M4, V3 } from "@thi.ng/shader-ast/api/types";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
 import { mat4, vec4 } from "@thi.ng/shader-ast/ast/lit";
 import { neg, sub } from "@thi.ng/shader-ast/ast/ops";
@@ -11,7 +12,7 @@ import { cross, dot, normalize } from "@thi.ng/shader-ast/builtin/math";
  * @param target - vec3
  * @param up - vec3
  */
-export const lookat = defn("mat4", "lookat", ["vec3", "vec3", "vec3"], (eye, target, up) => {
+export const lookat = defn(M4, "lookat", [V3, V3, V3], (eye, target, up) => {
     let x;
     let y;
     let z;

package/matrix/rotation.js

@@ -1,3 +1,4 @@
+import { F, M2, M3, M4, V3 } from "@thi.ng/shader-ast/api/types";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
 import { mat2, mat3, mat4, vec3 } from "@thi.ng/shader-ast/ast/lit";
 import { add, mul, neg, sub } from "@thi.ng/shader-ast/ast/ops";
@@ -7,53 +8,53 @@ import { cos, sin } from "@thi.ng/shader-ast/builtin/math";
 import { perpendicularCCW } from "../math/orthogonal.js";
 import { cossin } from "../math/sincos.js";
 import { m33ToM44 } from "./convert.js";
-export const rotation2 = defn("mat2", "rotation2", ["float"], (theta) => {
+export const rotation2 = defn(M2, "rotation2", [F], (theta) => {
     let cs;
     return [(cs = sym(cossin(theta))), ret(mat2(cs, perpendicularCCW(cs)))];
 });
-export const rotationX3 = defn("mat3", "rotationX3", ["float"], (theta) => {
+export const rotationX3 = defn(M3, "rotationX3", [F], (theta) => {
     let cs;
     return [
         (cs = sym(cossin(theta))),
         ret(mat3(1, 0, 0, 0, $x(cs), $y(cs), 0, neg($y(cs)), $x(cs))),
     ];
 });
-export const rotationY3 = defn("mat3", "rotationY3", ["float"], (theta) => {
+export const rotationY3 = defn(M3, "rotationY3", [F], (theta) => {
     let cs;
     return [
         (cs = sym(cossin(theta))),
         ret(mat3($x(cs), 0, neg($y(cs)), 0, 1, 0, $y(cs), 0, $x(cs))),
     ];
 });
-export const rotationZ3 = defn("mat3", "rotationZ3", ["float"], (theta) => {
+export const rotationZ3 = defn(M3, "rotationZ3", [F], (theta) => {
     let cs;
     return [
         (cs = sym(cossin(theta))),
         ret(mat3($x(cs), $y(cs), 0, neg($y(cs)), $x(cs), 0, 0, 0, 1)),
     ];
 });
-export const rotationX4 = defn("mat4", "rotationX4", ["float"], (theta) => {
+export const rotationX4 = defn(M4, "rotationX4", [F], (theta) => {
     let cs;
     return [
         (cs = sym(cossin(theta))),
         ret(mat4(1, 0, 0, 0, 0, $x(cs), $y(cs), 0, 0, neg($y(cs)), $x(cs), 0, 0, 0, 0, 1)),
     ];
 });
-export const rotationY4 = defn("mat4", "rotationY4", ["float"], (theta) => {
+export const rotationY4 = defn(M4, "rotationY4", [F], (theta) => {
     let cs;
     return [
         (cs = sym(cossin(theta))),
         ret(mat4($x(cs), 0, neg($y(cs)), 0, 0, 1, 0, 0, $y(cs), 0, $x(cs), 0, 0, 0, 0, 1)),
     ];
 });
-export const rotationZ4 = defn("mat4", "rotationZ4", ["float"], (theta) => {
+export const rotationZ4 = defn(M4, "rotationZ4", [F], (theta) => {
     let cs;
     return [
         (cs = sym(cossin(theta))),
         ret(mat4($x(cs), $y(cs), 0, 0, neg($y(cs)), $x(cs), 0, 0, 0, 0, 1, 0, 0, 0, 0, 1)),
     ];
 });
-export const rotationAroundAxis3 = defn("mat3", "rotationAroundAxis3", ["vec3", "float"], (axis, theta) => {
+export const rotationAroundAxis3 = defn(M3, "rotationAroundAxis3", [V3, F], (axis, theta) => {
     let s;
     let c;
     let t;
@@ -65,4 +66,4 @@ export const rotationAroundAxis3 = defn("mat3", "rotationAroundAxis3", ["vec3",
         ret(mat3($$($x(axis), 1, $z(axis), neg($y(axis)), c, s, s), $$($y(axis), neg($z(axis)), 1, $x(axis), s, c, s), $$($z(axis), $y(axis), neg($x(axis)), 1, s, s, c))),
     ];
 });
-export const rotationAroundAxis4 = defn("mat4", "rotationAroundAxis4", ["vec3", "float"], (axis, theta) => [ret(m33ToM44(rotationAroundAxis3(axis, theta)))]);
+export const rotationAroundAxis4 = defn(M4, "rotationAroundAxis4", [V3, F], (axis, theta) => [ret(m33ToM44(rotationAroundAxis3(axis, theta)))]);

package/noise/curl3.js

@@ -1,10 +1,11 @@
+import { F, V3 } from "@thi.ng/shader-ast/api/types";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
 import { vec2, vec3 } from "@thi.ng/shader-ast/ast/lit";
 import { add, div, mul, sub } from "@thi.ng/shader-ast/ast/ops";
 import { $, $x, $y, $z } from "@thi.ng/shader-ast/ast/swizzle";
 import { sym } from "@thi.ng/shader-ast/ast/sym";
 import { snoiseVec3 } from "./simplex3.js";
-export const curlNoise3 = defn("vec3", "curlNoise3", ["vec3", "float"], (p, e) => {
+export const curlNoise3 = defn(V3, "curlNoise3", [V3, F], (p, e) => {
     let D;
     let px0;
     let px1;

package/noise/hash.js

@@ -1,3 +1,4 @@
+import { F, V2, V3, V4 } from "@thi.ng/shader-ast/api/types";
 import { assign } from "@thi.ng/shader-ast/ast/assign";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
 import { mat2, vec2, vec3, vec4 } from "@thi.ng/shader-ast/ast/lit";
@@ -10,7 +11,7 @@ import { dot, fract, sin } from "@thi.ng/shader-ast/builtin/math";
  *
  * @param p -
  */
-export const hash2 = defn("vec2", "hash2", ["vec2"], (p) => [
+export const hash2 = defn(V2, "hash2", [V2], (p) => [
     ret(fract(mul(sin(mul(p, mat2(127.1, 311.7, 269.5, 183.3))), 43758.5453))),
 ]);
 /**
@@ -18,7 +19,7 @@ export const hash2 = defn("vec2", "hash2", ["vec2"], (p) => [
  *
  * @param p -
  */
-export const hash3 = defn("vec3", "hash3", ["vec2"], (p) => [
+export const hash3 = defn(V3, "hash3", [V2], (p) => [
     ret(fract(mul(sin(vec3(dot(p, vec2(127.1, 311.7)), dot(p, vec2(269.5, 183.3)), dot(p, vec2(419.2, 371.9)))), 43758.5453))),
 ]);
 const H = vec3(0.1031, 0.103, 0.0973);
@@ -30,7 +31,7 @@ const H4 = vec4(0.1031, 0.103, 0.0973, 0.1099);
  *
  * @param p -
  */
-export const hash11 = defn("float", "hash11", ["float"], (p) => {
+export const hash11 = defn(F, "hash11", [F], (p) => {
     let x;
     return [
         (x = sym(fract(mul(p, 0.1031)))),
@@ -46,7 +47,7 @@ export const hash11 = defn("float", "hash11", ["float"], (p) => {
  *
  * @param p -
  */
-export const hash12 = defn("float", "hash12", ["vec2"], (p) => {
+export const hash12 = defn(F, "hash12", [V2], (p) => {
     let x;
     return [
         (x = sym(fract(mul($(p, "xyx"), 0.1031)))),
@@ -61,7 +62,7 @@ export const hash12 = defn("float", "hash12", ["vec2"], (p) => {
  *
  * @param p -
  */
-export const hash13 = defn("float", "hash13", ["vec3"], (p) => {
+export const hash13 = defn(F, "hash13", [V3], (p) => {
     let x;
     return [
         (x = sym(fract(mul($(p, "xyx"), 0.1031)))),
@@ -76,7 +77,7 @@ export const hash13 = defn("float", "hash13", ["vec3"], (p) => {
  *
  * @param p -
  */
-export const hash21 = defn("vec2", "hash21", ["float"], (p) => {
+export const hash21 = defn(V2, "hash21", [F], (p) => {
     let x;
     return [
         (x = sym(fract(mul(vec3(p), H)))),
@@ -91,7 +92,7 @@ export const hash21 = defn("vec2", "hash21", ["float"], (p) => {
  *
  * @param p -
  */
-export const hash22 = defn("vec2", "hash22", ["vec2"], (p) => {
+export const hash22 = defn(V2, "hash22", [V2], (p) => {
     let x;
     return [
         (x = sym(fract(mul($(p, "xyx"), H)))),
@@ -106,7 +107,7 @@ export const hash22 = defn("vec2", "hash22", ["vec2"], (p) => {
  *
  * @param p -
  */
-export const hash23 = defn("vec2", "hash23", ["vec3"], (p) => {
+export const hash23 = defn(V2, "hash23", [V3], (p) => {
     let x;
     return [
         (x = sym(fract(mul(p, H)))),
@@ -121,7 +122,7 @@ export const hash23 = defn("vec2", "hash23", ["vec3"], (p) => {
  *
  * @param p -
  */
-export const hash31 = defn("vec3", "hash31", ["float"], (p) => {
+export const hash31 = defn(V3, "hash31", [F], (p) => {
     let x;
     return [
         (x = sym(fract(mul(p, H)))),
@@ -136,7 +137,7 @@ export const hash31 = defn("vec3", "hash31", ["float"], (p) => {
  *
  * @param p -
  */
-export const hash32 = defn("vec3", "hash32", ["vec2"], (p) => {
+export const hash32 = defn(V3, "hash32", [V2], (p) => {
     let x;
     return [
         (x = sym(fract(mul($(p, "xyx"), H)))),
@@ -151,7 +152,7 @@ export const hash32 = defn("vec3", "hash32", ["vec2"], (p) => {
  *
  * @param p -
  */
-export const hash33 = defn("vec3", "hash33", ["vec3"], (p) => {
+export const hash33 = defn(V3, "hash33", [V3], (p) => {
     let x;
     return [
         (x = sym(fract(mul(p, H)))),
@@ -166,7 +167,7 @@ export const hash33 = defn("vec3", "hash33", ["vec3"], (p) => {
  *
  * @param p -
  */
-export const hash41 = defn("vec4", "hash41", ["float"], (p) => {
+export const hash41 = defn(V4, "hash41", [F], (p) => {
     let x;
     return [
         (x = sym(fract(mul(p, H4)))),
@@ -181,7 +182,7 @@ export const hash41 = defn("vec4", "hash41", ["float"], (p) => {
  *
  * @param p -
  */
-export const hash42 = defn("vec4", "hash42", ["vec2"], (p) => {
+export const hash42 = defn(V4, "hash42", [V2], (p) => {
     let x;
     return [
         (x = sym(fract(mul($(p, "xyxy"), H4)))),
@@ -196,7 +197,7 @@ export const hash42 = defn("vec4", "hash42", ["vec2"], (p) => {
  *
  * @param p -
  */
-export const hash43 = defn("vec4", "hash43", ["vec3"], (p) => {
+export const hash43 = defn(V4, "hash43", [V3], (p) => {
     let x;
     return [
         (x = sym(fract(mul($(p, "xyzx"), H4)))),
@@ -211,7 +212,7 @@ export const hash43 = defn("vec4", "hash43", ["vec3"], (p) => {
  *
  * @param p -
  */
-export const hash44 = defn("vec4", "hash44", ["vec4"], (p) => {
+export const hash44 = defn(V4, "hash44", [V4], (p) => {
     let x;
     return [
         (x = sym(fract(mul(p, H4)))),

package/noise/permute.js

@@ -1,11 +1,12 @@
+import { F, V2, V3, V4 } from "@thi.ng/shader-ast/api/types";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
-import { float, FLOAT1 } from "@thi.ng/shader-ast/ast/lit";
+import { FLOAT1, float } from "@thi.ng/shader-ast/ast/lit";
 import { add, mul } from "@thi.ng/shader-ast/ast/ops";
 import { mod } from "@thi.ng/shader-ast/builtin/math";
 const __permute = (type, suffix = "") => defn(type, `permute${suffix}`, [type], (v) => [
     ret(mod(mul(v, add(mul(v, float(34)), FLOAT1)), float(289))),
 ]);
-export const permute = __permute("float");
-export const permute2 = __permute("vec2", "2");
-export const permute3 = __permute("vec3", "3");
-export const permute4 = __permute("vec4", "4");
+export const permute = __permute(F);
+export const permute2 = __permute(V2, "2");
+export const permute3 = __permute(V3, "3");
+export const permute4 = __permute(V4, "4");