Merge pull request #65 from mhawryluk/impr/function-arguments

Make argument and returnType info available for entry function as well

README.md

@@ -139,7 +139,7 @@ class FunctionInfo {
   stage: string | null;
   inputs: Array<InputInfo>;
   outputs: Array<OutputInfo>;
-  arguments: Array<ArgumentInfo>; // only for non-entry functions
+  arguments: Array<ArgumentInfo>;
   returnType: TypeInfo | null;
   resources: Array<VariableInfo>;
   startLine: number;

src/wgsl_reflect.ts

@@ -509,18 +509,20 @@ export class WgslReflect {
           fn.inputs = this._getInputs(node.args);
           fn.outputs = this._getOutputs(node.returnType);
           this.entry[stage.name].push(fn);
-        } else {
-          fn.arguments = node.args.map(
-            (arg) =>
-              new ArgumentInfo(
-                arg.name,
-                this._getTypeInfo(arg.type, arg.attributes)
-              )
-          );
-          fn.returnType = node.returnType
-            ? this._getTypeInfo(node.returnType, node.attributes)
-            : null;
         }
+
+        fn.arguments = node.args.map(
+          (arg) =>
+            new ArgumentInfo(
+              arg.name,
+              this._getTypeInfo(arg.type, arg.attributes)
+            )
+        );
+
+        fn.returnType = node.returnType
+          ? this._getTypeInfo(node.returnType, node.attributes)
+          : null;
+
         continue;
       }
     }

test/tests/struct.js

@@ -1,5 +1,5 @@
 import { test, group } from "../test.js";
-import { WgslParser } from "../../../wgsl_reflect.debug.js";
+import { WgslParser } from "../../../wgsl_reflect.module.js";
 
 group("struct", function () {
   const shader = `

test/tests/struct_layout.js

@@ -1,5 +1,5 @@
 import { test, group } from "../test.js";
-import { WgslReflect } from "../../../wgsl_reflect.debug.js";
+import { WgslReflect } from "../../../wgsl_reflect.module.js";
 
 group("struct_layout", function () {
   const shader = `

test/tests/test_parser.js

@@ -1,5 +1,5 @@
 import { test, group } from "../test.js";
-import { WgslParser } from "../../../wgsl_reflect.debug.js";
+import { WgslParser } from "../../../wgsl_reflect.module.js";
 
 group("Parser", function () {
   test("const2", function (test) {

test/tests/test_reflect.js

@@ -1,5 +1,5 @@
 import { test, group } from "../test.js";
-import { WgslReflect, ResourceType } from "../../../wgsl_reflect.debug.js";
+import { WgslReflect, ResourceType } from "../../../wgsl_reflect.module.js";
 
 group("Reflect", function () {
   test("array_no_format", function (test) {

test/tests/test_scanner.js

@@ -1,5 +1,5 @@
 import { test, group } from "../test.js";
-import { WgslScanner, TokenTypes } from "../../../wgsl_reflect.debug.js";
+import { WgslScanner, TokenTypes } from "../../../wgsl_reflect.module.js";
 
 group("Scanner", function () {
   test("(1+2)-3;", function (test) {