more descriptive error

Author: cieplypolar

packages/typegpu/src/resolutionCtx.ts

@@ -246,10 +246,6 @@ class ItemStateStackImpl implements ItemStateStack {
   }
 
   defineBlockVariable(id: string, snippet: Snippet): void {
-    if (snippet.dataType.type === 'unknown') {
-      throw Error(`Tried to define variable '${id}' of unknown type`);
-    }
-
     for (let i = this._stack.length - 1; i >= 0; --i) {
       const layer = this._stack[i];
 

packages/typegpu/src/tgsl/wgslGenerator.ts

@@ -218,6 +218,11 @@ ${this.ctx.pre}}`;
       ptrType,
       'function',
     );
+
+    if (snippet.dataType.type === 'unknown') {
+      throw Error(`Tried to define variable '${id}' of unknown type.`);
+    }
+
     this.ctx.defineVariable(id, snippet);
     return varName;
   }
@@ -257,6 +262,7 @@ ${this.ctx.pre}}`;
       dataType,
       /* origin */ varOrigin,
     );
+
     this.ctx.defineVariable(id, snippet);
     return snippet;
   }
@@ -1018,31 +1024,27 @@ ${this.ctx.pre}else ${alternate}`;
         }
       }
 
-      if (eq.dataType.type === 'unknown') {
-        if (Array.isArray(eq.value)) {
-          // for arrays we can give more specific suggestion
-          console.warn(
-            `You are likely trying to define variable \`${rawId}\` with a value \`[${eq.value}]\` of an unknown type.
------
-- Try to wrap right-hand side with a schema \`d.arrayOf(...)(...)\`.
------`,
-          );
-        } else {
-          console.warn(
-            `You are likely trying to define variable \`${rawId}\` with a value of an unknown type.
------
-- Try to wrap right-hand side with a schema \`YourStructSchema(...)\`.
------`,
-          );
-        }
-      }
-
       const snippet = this.blockVariable(
         varType,
         rawId,
         concretize(dataType),
         eq.origin,
       );
+
+      const id = snippet.value;
+      if (snippet.dataType.type === 'unknown') {
+        const schema = Array.isArray(eq.value)
+          ? `d.arrayOf(...)(${id})`
+          : `YourStructSchema(${id})`;
+
+        throw Error(
+          `Tried to define variable '${id}' of unknown type.
+-----
+- Try to wrap right-hand side with a schema \`${schema}\`.
+-----`,
+        );
+      }
+
       return stitch`${this.ctx.pre}${varType} ${snippet
         .value as string} = ${tryConvertSnippet(eq, dataType, false)};`;
     }

packages/typegpu/tests/tgsl/typeInference.test.ts

@@ -578,7 +578,10 @@ describe('wgsl generator js type inference', () => {
     expect(() => tgpu.resolve([myFn])).toThrowErrorMatchingInlineSnapshot(`
       [Error: Resolution of the following tree failed:
       - <root>
-      - fn:myFn: Tried to define variable 'unrelated' of unknown type]
+      - fn:myFn: Tried to define variable 'unrelated' of unknown type.
+      -----
+      - Try to wrap right-hand side with a schema \`YourStructSchema(unrelated)\`.
+      -----]
     `);
   });
 
@@ -591,7 +594,10 @@ describe('wgsl generator js type inference', () => {
     expect(() => tgpu.resolve([myFn])).toThrowErrorMatchingInlineSnapshot(`
       [Error: Resolution of the following tree failed:
       - <root>
-      - fn:myFn: Tried to define variable 'myArr' of unknown type]
+      - fn:myFn: Tried to define variable 'myArr' of unknown type.
+      -----
+      - Try to wrap right-hand side with a schema \`d.arrayOf(...)(myArr)\`.
+      -----]
     `);
   });
 

packages/typegpu/tests/tgsl/wgslGenerator.test.ts

@@ -1,5 +1,5 @@
 import * as tinyest from 'tinyest';
-import { beforeEach, describe, expect, vi } from 'vitest';
+import { beforeEach, describe, expect } from 'vitest';
 import { namespace } from '../../src/core/resolve/namespace.ts';
 import * as d from '../../src/data/index.ts';
 import { abstractFloat, abstractInt } from '../../src/data/numeric.ts';
@@ -1169,66 +1169,6 @@ describe('wgslGenerator', () => {
     `);
   });
 
-  it('console.warns the suggestion when snippet value is array', () => {
-    using consoleWarnSpy = vi.spyOn(console, 'warn').mockImplementation(
-      () => {},
-    );
-
-    const getArr = tgpu['~unstable'].comptime(() =>
-      d.arrayOf(d.f32, 2)([1, 2])
-    );
-    const f = () => {
-      'use gpu';
-      const arr = getArr();
-    };
-
-    expect(() => tgpu.resolve([f])).toThrowErrorMatchingInlineSnapshot(`
-      [Error: Resolution of the following tree failed:
-      - <root>
-      - fn*:f
-      - fn*:f(): Tried to define variable 'arr' of unknown type]
-    `);
-
-    expect(consoleWarnSpy).toHaveBeenCalledWith(
-      `You are likely trying to define variable \`arr\` with a value \`[1,2]\` of an unknown type.
------
-- Try to wrap right-hand side with a schema \`d.arrayOf(...)(...)\`.
------`,
-    );
-  });
-
-  it('console.warns the suggestion when snippet value is object', () => {
-    using consoleWarnSpy = vi.spyOn(console, 'warn').mockImplementation(
-      () => {},
-    );
-
-    const MyStruct = d.struct({
-      x: d.vec2f,
-    });
-
-    const getMyStruct = tgpu['~unstable'].comptime(() =>
-      MyStruct({ x: d.vec2f(1, 2) })
-    );
-    const f = () => {
-      'use gpu';
-      const s = getMyStruct();
-    };
-
-    expect(() => tgpu.resolve([f])).toThrowErrorMatchingInlineSnapshot(`
-      [Error: Resolution of the following tree failed:
-      - <root>
-      - fn*:f
-      - fn*:f(): Tried to define variable 's' of unknown type]
-    `);
-
-    expect(consoleWarnSpy).toHaveBeenCalledWith(
-      `You are likely trying to define variable \`s\` with a value of an unknown type.
------
-- Try to wrap right-hand side with a schema \`YourStructSchema(...)\`.
------`,
-    );
-  });
-
   it('generates correct indentation for nested blocks', () => {
     const main = tgpu.fn([], d.i32)(() => {
       let res = 0;