fix: Always resolve with strict types (#1880)

Author: iwoplaza

apps/typegpu-docs/src/examples/rendering/jelly-slider/index.ts

@@ -618,7 +618,7 @@ const renderBackground = (
 
   let highlights = d.f32();
 
-  const highlightWidth = 1;
+  const highlightWidth = d.f32(1);
   const highlightHeight = 0.2;
   let offsetX = d.f32();
   let offsetZ = d.f32(0.05);

packages/typegpu/src/core/resolve/stitch.ts

@@ -11,32 +11,12 @@ type ValueOrArray<T> = T | T[];
 export function stitch(
   strings: TemplateStringsArray,
   ...snippets: ValueOrArray<Snippet | string | number | undefined>[]
-) {
-  return internalStitch(strings, snippets, false);
-}
-
-/**
- * "The reverse of snipping"
- * Injects resolved snippets into a template string, ensuring
- * the generated code represents it's type exactly.
- */
-export function stitchWithExactTypes(
-  strings: TemplateStringsArray,
-  ...snippets: ValueOrArray<Snippet | string | number | undefined>[]
-) {
-  return internalStitch(strings, snippets, true);
-}
-
-function internalStitch(
-  strings: TemplateStringsArray,
-  snippets: ValueOrArray<Snippet | string | number | undefined>[],
-  exact: boolean,
 ) {
   const ctx = getResolutionCtx() as ResolutionCtx;
 
   function resolveSnippet(maybeSnippet: Snippet | string | number) {
     return isSnippet(maybeSnippet)
-      ? ctx.resolve(maybeSnippet.value, maybeSnippet.dataType, exact).value
+      ? ctx.resolve(maybeSnippet.value, maybeSnippet.dataType).value
       : maybeSnippet;
   }
 

packages/typegpu/src/data/vector.ts

@@ -317,6 +317,7 @@ function makeVecSchema<TValue, S extends number | boolean>(
       returnType: schema as AnyData,
     }),
     normalImpl: cpuConstruct,
+    ignoreImplicitCastWarning: true,
     codegenImpl: (...args) => stitch`${type}(${args})`,
   });
 

packages/typegpu/src/resolutionCtx.ts

@@ -702,7 +702,6 @@ export class ResolutionCtxImpl implements ResolutionCtx {
   resolve(
     item: unknown,
     schema?: AnyData | UnknownData | undefined,
-    exact = false,
   ): ResolvedSnippet {
     if (isTgpuFn(item) || hasTinyestMetadata(item)) {
       if (
@@ -719,7 +718,7 @@ export class ResolutionCtxImpl implements ResolutionCtx {
     if (isProviding(item)) {
       return this.withSlots(
         item[$providing].pairs,
-        () => this.resolve(item[$providing].inner, schema, exact),
+        () => this.resolve(item[$providing].inner, schema),
       );
     }
 
@@ -743,41 +742,34 @@ export class ResolutionCtxImpl implements ResolutionCtx {
 
     // This is a value that comes from the outside, maybe we can coerce it
     if (typeof item === 'number') {
-      const reinterpretedType = exact
-        ? schema
-        : numericLiteralToSnippet(item).dataType;
       const realSchema = schema ?? numericLiteralToSnippet(item).dataType;
-      invariant(
-        reinterpretedType,
-        'Schema has to be defined for resolving numbers',
-      );
       invariant(
         realSchema.type !== 'unknown',
         'Schema has to be known for resolving numbers',
       );
 
-      if (reinterpretedType.type === 'abstractInt') {
+      if (realSchema.type === 'abstractInt') {
         return snip(`${item}`, realSchema);
       }
-      if (reinterpretedType.type === 'u32') {
+      if (realSchema.type === 'u32') {
         return snip(`${item}u`, realSchema);
       }
-      if (reinterpretedType.type === 'i32') {
+      if (realSchema.type === 'i32') {
         return snip(`${item}i`, realSchema);
       }
 
       const exp = item.toExponential();
       const decimal =
-        reinterpretedType.type === 'abstractFloat' && Number.isInteger(item)
+        realSchema.type === 'abstractFloat' && Number.isInteger(item)
           ? `${item}.`
           : `${item}`;
 
       // Just picking the shorter one
       const base = exp.length < decimal.length ? exp : decimal;
-      if (reinterpretedType.type === 'f32') {
+      if (realSchema.type === 'f32') {
         return snip(`${base}f`, realSchema);
       }
-      if (reinterpretedType.type === 'f16') {
+      if (realSchema.type === 'f16') {
         return snip(`${base}h`, realSchema);
       }
       return snip(base, realSchema);

packages/typegpu/src/std/boolean.ts

@@ -19,6 +19,7 @@ import {
   type v4b,
 } from '../data/wgslTypes.ts';
 import { $internal } from '../shared/symbols.ts';
+import { unify } from '../tgsl/conversion.ts';
 import { sub } from './operators.ts';
 
 function correspondingBooleanVectorSchema(dataType: AnyData) {
@@ -333,7 +334,10 @@ function cpuSelect<T extends number | boolean | AnyVecInstance>(
  */
 export const select = dualImpl({
   name: 'select',
-  signature: (...argTypes) => ({ argTypes, returnType: argTypes[0] }),
+  signature: (f, t, cond) => {
+    const [uf, ut] = unify([f, t]) ?? [f, t] as const;
+    return ({ argTypes: [uf, ut, cond], returnType: uf });
+  },
   normalImpl: cpuSelect,
   codegenImpl: (f, t, cond) => stitch`select(${f}, ${t}, ${cond})`,
 });

packages/typegpu/src/std/operators.ts

@@ -1,5 +1,5 @@
 import { dualImpl } from '../core/function/dualImpl.ts';
-import { stitch, stitchWithExactTypes } from '../core/resolve/stitch.ts';
+import { stitch } from '../core/resolve/stitch.ts';
 import { abstractFloat, f16, f32 } from '../data/numeric.ts';
 import { vecTypeToConstructor } from '../data/vector.ts';
 import { VectorOps } from '../data/vectorOps.ts';
@@ -192,7 +192,7 @@ export const div = dualImpl({
     });
   },
   normalImpl: cpuDiv,
-  codegenImpl: (lhs, rhs) => stitchWithExactTypes`(${lhs} / ${rhs})`,
+  codegenImpl: (lhs, rhs) => stitch`(${lhs} / ${rhs})`,
   ignoreImplicitCastWarning: true,
 });
 

packages/typegpu/src/tgsl/wgslGenerator.ts

@@ -1,5 +1,5 @@
 import * as tinyest from 'tinyest';
-import { stitch, stitchWithExactTypes } from '../core/resolve/stitch.ts';
+import { stitch } from '../core/resolve/stitch.ts';
 import { arrayOf } from '../data/array.ts';
 import {
   type AnyData,
@@ -254,7 +254,7 @@ ${this.ctx.pre}}`;
       // Post-Update Expression
       const [_, op, arg] = expression;
       const argExpr = this.expression(arg);
-      const argStr = this.ctx.resolve(argExpr.value).value;
+      const argStr = this.ctx.resolve(argExpr.value, argExpr.dataType).value;
 
       return snip(`${argStr}${op}`, argExpr.dataType);
     }
@@ -263,7 +263,7 @@ ${this.ctx.pre}}`;
       // Unary Expression
       const [_, op, arg] = expression;
       const argExpr = this.expression(arg);
-      const argStr = this.ctx.resolve(argExpr.value).value;
+      const argStr = this.ctx.resolve(argExpr.value, argExpr.dataType).value;
 
       const type = operatorToType(argExpr.dataType, op);
       return snip(`${op}${argStr}`, type);
@@ -735,7 +735,7 @@ ${this.ctx.pre}else ${alternate}`;
         rawId,
         concretize(eq.dataType as wgsl.AnyWgslData),
       );
-      return stitchWithExactTypes`${this.ctx.pre}var ${snippet
+      return stitch`${this.ctx.pre}var ${snippet
         .value as string} = ${eq};`;
     }
 

packages/typegpu/tests/accessor.test.ts

@@ -56,7 +56,7 @@ describe('tgpu.accessor', () => {
       .with(multiplierAccess, 2);
 
     expect(asWgsl(getColor)).toMatchInlineSnapshot(
-      `"fn getColor() -> vec3f{ return vec3f(1, 0, 0) * 2; }"`,
+      `"fn getColor() -> vec3f{ return vec3f(1, 0, 0) * 2f; }"`,
     );
   });
 

packages/typegpu/tests/array.test.ts

@@ -197,7 +197,7 @@ describe('array', () => {
 
     expect(asWgsl(testFn)).toMatchInlineSnapshot(`
       "fn testFn() {
-        var myArray = array<u32, 1>(10);
+        var myArray = array<u32, 1>(10u);
         var myClone = myArray;
         return;
       }"
@@ -215,7 +215,7 @@ describe('array', () => {
 
     expect(asWgsl(testFn)).toMatchInlineSnapshot(`
       "fn testFn() {
-        var myArrays = array<array<i32, 1>, 1>(array<i32, 1>(10));
+        var myArrays = array<array<i32, 1>, 1>(array<i32, 1>(10i));
         var myClone = myArrays[0];
         return;
       }"
@@ -278,7 +278,7 @@ describe('array', () => {
 
     expect(asWgsl(foo)).toMatchInlineSnapshot(`
       "fn foo() {
-        var result = array<f32, 4>(1, 2, 3, 4);
+        var result = array<f32, 4>(1f, 2f, 3f, 4f);
       }"
     `);
   });
@@ -290,7 +290,7 @@ describe('array', () => {
 
     expect(asWgsl(foo)).toMatchInlineSnapshot(`
       "fn foo() {
-        var result = array<f32, 4>(4, 3, 2, 1);
+        var result = array<f32, 4>(4f, 3f, 2f, 1f);
       }"
     `);
   });
@@ -304,7 +304,7 @@ describe('array', () => {
 
     expect(asWgsl(foo)).toMatchInlineSnapshot(`
       "fn foo() {
-        var result = array<f32, 4>(4, 3, 2, 1);
+        var result = array<f32, 4>(4f, 3f, 2f, 1f);
       }"
     `);
   });
@@ -326,7 +326,7 @@ describe('array', () => {
 
     expect(asWgsl(foo)).toMatchInlineSnapshot(`
       "fn foo() {
-        var result = array<f32, 8>(0, 1, 2, 3, 4, 5, 6, 7);
+        var result = array<f32, 8>(0f, 1f, 2f, 3f, 4f, 5f, 6f, 7f);
       }"
     `);
   });
@@ -356,7 +356,7 @@ describe('array.length', () => {
         var acc = 1f;
         for (var i = 0u; (i < arrayLength(&values)); i++) {
           values[i] = acc;
-          acc *= 2;
+          acc *= 2f;
         }
       }"
     `);
@@ -385,7 +385,7 @@ describe('array.length', () => {
         var acc = 1f;
         for (var i = 0; (i < 128); i++) {
           values[i] = acc;
-          acc *= 2;
+          acc *= 2f;
         }
       }"
     `);

packages/typegpu/tests/computePipeline.test.ts

@@ -551,7 +551,7 @@ describe('TgpuComputePipeline', () => {
           a[0] = f16(_arg_0.gid.x);
         }
         {
-          a[1] = 1;
+          a[1] = 1h;
         }
 
       }"