remove-index-signature (#2352)

Author: cieplypolar

packages/typegpu/src/core/function/autoIO.ts

@@ -7,7 +7,7 @@ import type { BaseData, v4f } from '../../data/wgslTypes.ts';
 import { getName, setName } from '../../shared/meta.ts';
 import type { InferGPU, InferGPURecord, InferRecord } from '../../shared/repr.ts';
 import { $internal, $resolve } from '../../shared/symbols.ts';
-import type { Assume } from '../../shared/utilityTypes.ts';
+import type { Assume, RemoveIndexSignature } from '../../shared/utilityTypes.ts';
 import type { TgpuVertexAttrib } from '../../shared/vertexFormat.ts';
 import type { ResolutionCtx, SelfResolvable } from '../../types.ts';
 import { shaderStageSlot } from '../slot/internalSlots.ts';
@@ -21,7 +21,8 @@ const builtinVertexIn = {
   $instanceIndex: builtin.instanceIndex,
 } as const;
 
-export type AutoVertexIn<T extends AnyAutoCustoms> = T & InferRecord<typeof builtinVertexIn>;
+export type AutoVertexIn<T extends AnyAutoCustoms> = RemoveIndexSignature<T> &
+  InferRecord<typeof builtinVertexIn>;
 
 export type _AutoVertexIn<T> = AutoVertexIn<{
   [Key in keyof T]: T[Key] extends TgpuVertexAttrib
@@ -47,7 +48,8 @@ const builtinFragmentIn = {
   $subgroupSize: builtin.subgroupSize,
 } as const;
 
-export type AutoFragmentIn<T extends AnyAutoCustoms> = T & InferRecord<typeof builtinFragmentIn>;
+export type AutoFragmentIn<T extends AnyAutoCustoms> = RemoveIndexSignature<T> &
+  InferRecord<typeof builtinFragmentIn>;
 
 const builtinFragmentOut = {
   $fragDepth: builtin.fragDepth,

packages/typegpu/src/core/function/tgpuFragmentFn.ts

@@ -122,7 +122,7 @@ export declare namespace TgpuFragmentFn {
   type AutoIn<T extends AnyAutoCustoms> = AutoFragmentIn<T>;
   type AutoOut<T extends AnyAutoCustoms = AnyAutoCustoms> = AutoFragmentOut<T>;
 
-  type AutoInEmpty = AutoFragmentIn<{}>;
+  type AutoInEmpty = AutoFragmentIn<Record<string, never>>;
 }
 
 export function fragmentFn<FragmentOut extends FragmentOutConstrained>(options: {

packages/typegpu/src/core/function/tgpuVertexFn.ts

@@ -87,7 +87,7 @@ export declare namespace TgpuVertexFn {
   type AutoIn<T> = _AutoVertexIn<T>;
   type AutoOut<T extends AnyAutoCustoms = AnyAutoCustoms> = AutoVertexOut<T>;
 
-  type AutoInEmpty = _AutoVertexIn<{}>;
+  type AutoInEmpty = _AutoVertexIn<Record<string, never>>;
 }
 
 export function vertexFn<VertexOut extends VertexOutConstrained>(options: {

packages/typegpu/src/shared/utilityTypes.ts

@@ -56,7 +56,7 @@ export type Mutable<T> = {
 };
 
 /**
- * Source: https://code.lol/post/programming/higher-kinded-types/
+ * Source: https://code.lol/post/programming/higher-kinded-types
  */
 export type Assume<T, U> = T extends U ? T : U;
 
@@ -74,3 +74,16 @@ export type TypedArray =
 export function assertExhaustive(x: never, location: string): never {
   throw new Error(`Failed to handle ${x} at ${location}`);
 }
+
+/**
+ * Source: https://futurestud.io/tutorials/typescript-how-to-remove-index-signature-from-a-type
+ */
+export type RemoveIndexSignature<T> = {
+  [K in keyof T as string extends K
+    ? never
+    : number extends K
+      ? never
+      : symbol extends K
+        ? never
+        : K]: T[K];
+};

packages/typegpu/tests/renderPipeline.test.ts

@@ -1795,7 +1795,7 @@ describe('root.createRenderPipeline', () => {
 
     const fragment = ({ $position }: TgpuFragmentFn.AutoInEmpty) => {
       'use gpu';
-      return d.vec4f($position);
+      return $position;
     };
 
     const pipeline = root.createRenderPipeline({