@thi.ng/shader-ast-optimize 0.4.14 → 0.4.16

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2024-04-23T07:02:18Z
+- **Last updated**: 2024-06-21T19:34:38Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.
@@ -9,6 +9,12 @@ 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.4.16](https://github.com/thi-ng/umbrella/tree/@thi.ng/shader-ast-optimize@0.4.16) (2024-06-21)
+
+#### ♻️ Refactoring
+
+- enforce uniform naming convention of internal functions ([56992b2](https://github.com/thi-ng/umbrella/commit/56992b2))
+
 ### [0.4.12](https://github.com/thi-ng/umbrella/tree/@thi.ng/shader-ast-optimize@0.4.12) (2024-04-20)
 
 #### ♻️ Refactoring

package/README.md

@@ -7,7 +7,7 @@
 [![Mastodon Follow](https://img.shields.io/mastodon/follow/109331703950160316?domain=https%3A%2F%2Fmastodon.thi.ng&style=social)](https://mastodon.thi.ng/@toxi)
 
 > [!NOTE]
-> This is one of 192 standalone projects, maintained as part
+> This is one of 193 standalone projects, maintained as part
 > of the [@thi.ng/umbrella](https://github.com/thi-ng/umbrella/) monorepo
 > and anti-framework.
 >
@@ -138,7 +138,7 @@ For Node.js REPL:
 const opt = await import("@thi.ng/shader-ast-optimize");
 ```
 
-Package sizes (brotli'd, pre-treeshake): ESM: 1.24 KB
+Package sizes (brotli'd, pre-treeshake): ESM: 1.26 KB
 
 ## Dependencies
 

package/constant-folding.js

@@ -29,7 +29,7 @@ import {
 } from "@thi.ng/shader-ast/ast/lit";
 import { allChildren, walk } from "@thi.ng/shader-ast/ast/scope";
 import { LOGGER } from "@thi.ng/shader-ast/logger";
-const replaceNode = (node, next) => {
+const __replaceNode = (node, next) => {
   if (LOGGER.level <= LogLevel.DEBUG) {
     LOGGER.debug(`replacing AST node:`);
     LOGGER.debug("	old: " + JSON.stringify(node));
@@ -41,15 +41,15 @@ const replaceNode = (node, next) => {
   Object.assign(node, next);
   return true;
 };
-const replaceNumericNode = (node, res) => {
+const __replaceNumericNode = (node, res) => {
   node.type === "int" && (res |= 0);
   node.type === "uint" && (res >>>= 0);
-  return replaceNode(node, lit(node.type, res));
+  return __replaceNode(node, lit(node.type, res));
 };
-const replaceBooleanNode = (node, res) => replaceNode(node, bool(res));
-const replaceWithConst = (node, ref, n) => replaceNode(node, matchingPrimFor(ref, n));
-const maybeFoldMath = (op, l, r) => op === "+" ? l + r : op === "-" ? l - r : op === "*" ? l * r : op === "/" ? r != 0 ? l / r : illegalArgs(`division by zero: ${l}/${r}`) : void 0;
-const maybeFoldCompare = (op, l, r) => op === "==" ? l === r : op === "!=" ? l !== r : op === "<" ? l < r : op === "<=" ? l <= r : op === ">=" ? l >= r : op === ">" ? l > r : void 0;
+const __replaceBooleanNode = (node, res) => __replaceNode(node, bool(res));
+const __replaceWithConst = (node, ref, n) => __replaceNode(node, matchingPrimFor(ref, n));
+const __maybeFoldMath = (op, l, r) => op === "+" ? l + r : op === "-" ? l - r : op === "*" ? l * r : op === "/" ? r != 0 ? l / r : illegalArgs(`division by zero: ${l}/${r}`) : void 0;
+const __maybeFoldCompare = (op, l, r) => op === "==" ? l === r : op === "!=" ? l !== r : op === "<" ? l < r : op === "<=" ? l <= r : op === ">=" ? l >= r : op === ">" ? l > r : void 0;
 const COMPS = { x: 0, y: 1, z: 2, w: 3 };
 const BUILTINS = {
   abs: ([a]) => Math.abs(a),
@@ -86,7 +86,7 @@ const foldNode = defmulti(
       const $node = node;
       if ($node.op == "-" && isLitNumericConst($node.val)) {
         $node.val.val *= -1;
-        return replaceNode(node, $node.val);
+        return __replaceNode(node, $node.val);
       }
     },
     op2: (node) => {
@@ -97,38 +97,28 @@ const foldNode = defmulti(
       const isNumL = isLitNumericConst(l);
       const isNumR = isLitNumericConst(r);
       if (isNumL && isNumR) {
-        const num = maybeFoldMath(op, l.val, r.val);
-        if (num !== void 0)
-          return replaceNumericNode(node, num);
-        const bool2 = maybeFoldCompare(op, l.val, r.val);
-        if (bool2 !== void 0)
-          return replaceBooleanNode(node, bool2);
+        const num = __maybeFoldMath(op, l.val, r.val);
+        if (num !== void 0) return __replaceNumericNode(node, num);
+        const bool2 = __maybeFoldCompare(op, l.val, r.val);
+        if (bool2 !== void 0) return __replaceBooleanNode(node, bool2);
       } else if (op === "*") {
         if (isNumL && l.val === 0)
-          return replaceWithConst(node, r, FLOAT0);
+          return __replaceWithConst(node, r, FLOAT0);
         if (isNumR && r.val === 0)
-          return replaceWithConst(node, l, FLOAT0);
-        if (isNumL && l.val === 1)
-          return replaceNode(node, r);
-        if (isNumR && r.val === 1)
-          return replaceNode(node, l);
+          return __replaceWithConst(node, l, FLOAT0);
+        if (isNumL && l.val === 1) return __replaceNode(node, r);
+        if (isNumR && r.val === 1) return __replaceNode(node, l);
       } else if (op === "/") {
         if (isNumL && l.val === 0)
-          return replaceWithConst(node, r, FLOAT0);
-        if (isNumR && r.val === 0)
-          illegalArgs("division by zero");
-        if (isNumR && r.val === 1)
-          return replaceNode(node, l);
+          return __replaceWithConst(node, r, FLOAT0);
+        if (isNumR && r.val === 0) illegalArgs("division by zero");
+        if (isNumR && r.val === 1) return __replaceNode(node, l);
       } else if (op === "+") {
-        if (isNumL && l.val === 0)
-          return replaceNode(node, r);
-        if (isNumR && r.val === 0)
-          return replaceNode(node, l);
+        if (isNumL && l.val === 0) return __replaceNode(node, r);
+        if (isNumR && r.val === 0) return __replaceNode(node, l);
       } else if (op === "-") {
-        if (isNumL && l.val === 0)
-          return replaceNode(node, neg(r));
-        if (isNumR && r.val === 0)
-          return replaceNode(node, l);
+        if (isNumL && l.val === 0) return __replaceNode(node, neg(r));
+        if (isNumR && r.val === 0) return __replaceNode(node, l);
       }
     },
     call_i: (node) => {
@@ -136,7 +126,7 @@ const foldNode = defmulti(
       if ($node.args.every((x) => isLitNumericConst(x))) {
         const op = BUILTINS[$node.id];
         if (op !== void 0) {
-          return replaceNumericNode(
+          return __replaceNumericNode(
             node,
             op($node.args.map((x) => x.val))
           );
@@ -149,13 +139,13 @@ const foldNode = defmulti(
       const $node = node;
       if (isLitNumericConst($node.val)) {
         if (isFloat($node.val)) {
-          return replaceNode(node, float($node.val.val));
+          return __replaceNode(node, float($node.val.val));
         }
         if (isInt($node.val)) {
-          return replaceNode(node, int($node.val.val));
+          return __replaceNode(node, int($node.val.val));
         }
         if (isUint($node.val)) {
-          return replaceNode(node, uint($node.val.val));
+          return __replaceNode(node, uint($node.val.val));
         }
       }
     },
@@ -164,7 +154,7 @@ const foldNode = defmulti(
       const val = $node.val;
       if (isLitVecConst(val)) {
         if (isFloat(node)) {
-          return replaceNode(
+          return __replaceNode(
             node,
             float(val.val[COMPS[$node.id]])
           );
@@ -181,19 +171,19 @@ const foldBuiltin = defmulti(
     exp2: (node) => {
       const a = node.args[0];
       if (isLitNumOrVecConst(a, 0)) {
-        return replaceWithConst(node, a, FLOAT1);
+        return __replaceWithConst(node, a, FLOAT1);
       }
       if (isLitNumOrVecConst(a, 1)) {
-        return replaceWithConst(node, a, FLOAT2);
+        return __replaceWithConst(node, a, FLOAT2);
       }
     },
     pow: (node) => {
       const [a, b] = node.args;
       if (isLitNumOrVecConst(b, 0)) {
-        return replaceWithConst(node, a, FLOAT1);
+        return __replaceWithConst(node, a, FLOAT1);
       }
       if (isLitNumOrVecConst(b, 1)) {
-        return replaceNode(node, a);
+        return __replaceNode(node, a);
       }
     }
   }

package/defoptimized.d.ts

@@ -1,9 +1,10 @@
 import type { FnBody0 } from "@thi.ng/shader-ast";
+import { defMain } from "@thi.ng/shader-ast/ast/function";
 /**
  * Same as [defMain()](), but applies optimizations (e.g.
  * {@link constantFolding}) to the given function body.
  *
  * @param fn
  */
-export declare const defOptimized: (fn: FnBody0) => import("@thi.ng/shader-ast").TaggedFn0<"void">;
+export declare const defOptimized: (fn: FnBody0) => ReturnType<typeof defMain>;
 //# sourceMappingURL=defoptimized.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/shader-ast-optimize",
-  "version": "0.4.14",
+  "version": "0.4.16",
   "description": "Shader AST code optimization passes/strategies",
   "type": "module",
   "module": "./index.js",
@@ -10,7 +10,7 @@
     "type": "git",
     "url": "https://github.com/thi-ng/umbrella.git"
   },
-  "homepage": "https://github.com/thi-ng/umbrella/tree/develop/packages/shader-ast-optimize#readme",
+  "homepage": "https://thi.ng/shader-ast-optimize",
   "funding": [
     {
       "type": "github",
@@ -36,18 +36,18 @@
     "tool:tangle": "../../node_modules/.bin/tangle src/**/*.ts"
   },
   "dependencies": {
-    "@thi.ng/api": "^8.11.1",
-    "@thi.ng/defmulti": "^3.0.38",
-    "@thi.ng/errors": "^2.5.6",
-    "@thi.ng/logger": "^3.0.11",
-    "@thi.ng/math": "^5.10.12",
-    "@thi.ng/shader-ast": "^0.15.14"
+    "@thi.ng/api": "^8.11.3",
+    "@thi.ng/defmulti": "^3.0.40",
+    "@thi.ng/errors": "^2.5.8",
+    "@thi.ng/logger": "^3.0.13",
+    "@thi.ng/math": "^5.11.0",
+    "@thi.ng/shader-ast": "^0.15.16"
   },
   "devDependencies": {
-    "@microsoft/api-extractor": "^7.43.0",
-    "esbuild": "^0.20.2",
-    "typedoc": "^0.25.12",
-    "typescript": "^5.4.3"
+    "@microsoft/api-extractor": "^7.47.0",
+    "esbuild": "^0.21.5",
+    "typedoc": "^0.25.13",
+    "typescript": "^5.5.2"
   },
   "keywords": [
     "typescript"
@@ -82,5 +82,5 @@
     "parent": "@thi.ng/shader-ast",
     "year": 2019
   },
-  "gitHead": "aed3421c21044c005fbcb7cc37965ccf85a870d2\n"
+  "gitHead": "154c95cf9d6bab32174498ec3b5b5d87e42be7f9\n"
 }