@shaderfrog/core 1.5.1 → 1.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shaderfrog/core",
-  "version": "1.5.1",
+  "version": "1.5.3",
   "description": "Shaderfrog core",
   "type": "module",
   "files": [
@@ -48,7 +48,7 @@
     "lodash.groupby": "^4.6.0"
   },
   "peerDependencies": {
-    "@shaderfrog/glsl-parser": "^3.0.4",
+    "@shaderfrog/glsl-parser": "^4.0.0",
     "babylonjs": ">=4",
     "playcanvas": "^1.65.3",
     "three": ">=0.50"

package/strategy/assignemntTo.js

@@ -16,8 +16,13 @@ export var applyAssignmentToStrategy = function (strategy, ast, graphNode, sibli
                 nodeInput(name, "filler_".concat(name), 'filler', undefined, // Data type for what plugs into this filler
                 ['code', 'data'], false),
                 function (fillerAst) {
-                    assignNode.expression.right =
-                        fillerAst;
+                    if ('expression' in assignNode) {
+                        assignNode.expression.right =
+                            fillerAst;
+                    }
+                    else {
+                        assignNode.initializer = fillerAst;
+                    }
                     return ast;
                 },
             ],

package/util/ast.d.ts

@@ -7,7 +7,7 @@ import { Program } from '@shaderfrog/glsl-parser/ast';
 import { ShaderStage } from '../graph/graph-types';
 import { Scope } from '@shaderfrog/glsl-parser/parser/scope';
 export declare const findVec4Constructor: (ast: AstNode) => AstNode | undefined;
-export declare const findAssignmentTo: (ast: AstNode | Program, assignTo: string) => ExpressionStatementNode | undefined;
+export declare const findAssignmentTo: (ast: AstNode | Program, assignTo: string) => DeclarationNode | ExpressionStatementNode;
 export declare const findDeclarationOf: (ast: AstNode | Program, declarationOf: string) => DeclarationNode | undefined;
 export declare const from2To3: (ast: Program, stage: ShaderStage) => void;
 export declare const outDeclaration: (name: string) => Object;

package/util/ast.js

@@ -61,6 +61,16 @@ export var findAssignmentTo = function (ast, assignTo) {
                 path.skip();
             },
         },
+        declaration_statement: {
+            enter: function (path) {
+                var _a, _b;
+                var foundDecl = (_b = (_a = path.node.declaration) === null || _a === void 0 ? void 0 : _a.declarations) === null || _b === void 0 ? void 0 : _b.find(function (decl) { var _a; return ((_a = decl === null || decl === void 0 ? void 0 : decl.identifier) === null || _a === void 0 ? void 0 : _a.identifier) === assignTo; });
+                if (foundDecl === null || foundDecl === void 0 ? void 0 : foundDecl.initializer) {
+                    assign = foundDecl;
+                }
+                path.skip();
+            },
+        },
     };
     visit(ast, visitors);
     return assign;