fix: Restrict using slot for strings

apps/typegpu-docs/tests/individual-example-tests/log-test.test.ts

@@ -39,6 +39,8 @@ describe('console log example', () => {
     expect(shaderCodes).toMatchInlineSnapshot(`
       "@group(0) @binding(0) var<uniform> sizeUniform: vec3u;
 
+      var<private> dataBlockIndex: u32;
+
       @group(0) @binding(1) var<storage, read_write> indexBuffer: atomic<u32>;
 
       struct SerializedLogData {
@@ -48,8 +50,6 @@ describe('console log example', () => {
 
       @group(0) @binding(2) var<storage, read_write> dataBuffer: array<SerializedLogData, 40>;
 
-      var<private> dataBlockIndex: u32;
-
       var<private> dataByteIndex: u32;
 
       fn nextByteIndex() -> u32 {
@@ -90,6 +90,8 @@ describe('console log example', () => {
 
       @group(0) @binding(0) var<uniform> sizeUniform: vec3u;
 
+      var<private> dataBlockIndex: u32;
+
       @group(0) @binding(1) var<storage, read_write> indexBuffer: atomic<u32>;
 
       struct SerializedLogData {
@@ -99,8 +101,6 @@ describe('console log example', () => {
 
       @group(0) @binding(2) var<storage, read_write> dataBuffer: array<SerializedLogData, 40>;
 
-      var<private> dataBlockIndex: u32;
-
       var<private> dataByteIndex: u32;
 
       fn nextByteIndex() -> u32 {
@@ -150,6 +150,8 @@ describe('console log example', () => {
 
       @group(0) @binding(0) var<uniform> sizeUniform: vec3u;
 
+      var<private> dataBlockIndex: u32;
+
       @group(0) @binding(1) var<storage, read_write> indexBuffer: atomic<u32>;
 
       struct SerializedLogData {
@@ -159,8 +161,6 @@ describe('console log example', () => {
 
       @group(0) @binding(2) var<storage, read_write> dataBuffer: array<SerializedLogData, 40>;
 
-      var<private> dataBlockIndex: u32;
-
       var<private> dataByteIndex: u32;
 
       fn nextByteIndex() -> u32 {
@@ -203,6 +203,8 @@ describe('console log example', () => {
 
       @group(0) @binding(0) var<uniform> sizeUniform: vec3u;
 
+      var<private> dataBlockIndex: u32;
+
       @group(0) @binding(1) var<storage, read_write> indexBuffer: atomic<u32>;
 
       struct SerializedLogData {
@@ -212,8 +214,6 @@ describe('console log example', () => {
 
       @group(0) @binding(2) var<storage, read_write> dataBuffer: array<SerializedLogData, 40>;
 
-      var<private> dataBlockIndex: u32;
-
       var<private> dataByteIndex: u32;
 
       fn log1serializer() {
@@ -834,6 +834,8 @@ describe('console log example', () => {
         num: u32,
       }
 
+      var<private> dataBlockIndex: u32;
+
       @group(0) @binding(1) var<storage, read_write> indexBuffer: atomic<u32>;
 
       struct SerializedLogData {
@@ -843,8 +845,6 @@ describe('console log example', () => {
 
       @group(0) @binding(2) var<storage, read_write> dataBuffer: array<SerializedLogData, 40>;
 
-      var<private> dataBlockIndex: u32;
-
       var<private> dataByteIndex: u32;
 
       fn nextByteIndex() -> u32 {
@@ -995,6 +995,8 @@ describe('console log example', () => {
 
       @group(0) @binding(0) var<uniform> sizeUniform: vec3u;
 
+      var<private> dataBlockIndex: u32;
+
       @group(0) @binding(1) var<storage, read_write> indexBuffer: atomic<u32>;
 
       struct SerializedLogData {
@@ -1004,8 +1006,6 @@ describe('console log example', () => {
 
       @group(0) @binding(2) var<storage, read_write> dataBuffer: array<SerializedLogData, 40>;
 
-      var<private> dataBlockIndex: u32;
-
       var<private> dataByteIndex: u32;
 
       fn log1serializer() {
@@ -1052,6 +1052,8 @@ describe('console log example', () => {
 
       @group(0) @binding(0) var<uniform> sizeUniform: vec3u;
 
+      var<private> dataBlockIndex: u32;
+
       @group(0) @binding(1) var<storage, read_write> indexBuffer: atomic<u32>;
 
       struct SerializedLogData {
@@ -1061,8 +1063,6 @@ describe('console log example', () => {
 
       @group(0) @binding(2) var<storage, read_write> dataBuffer: array<SerializedLogData, 40>;
 
-      var<private> dataBlockIndex: u32;
-
       var<private> dataByteIndex: u32;
 
       fn nextByteIndex() -> u32 {
@@ -1103,6 +1103,8 @@ describe('console log example', () => {
 
       @group(0) @binding(0) var<uniform> sizeUniform: vec3u;
 
+      var<private> dataBlockIndex: u32;
+
       @group(0) @binding(1) var<storage, read_write> indexBuffer: atomic<u32>;
 
       struct SerializedLogData {
@@ -1112,8 +1114,6 @@ describe('console log example', () => {
 
       @group(0) @binding(2) var<storage, read_write> dataBuffer: array<SerializedLogData, 40>;
 
-      var<private> dataBlockIndex: u32;
-
       var<private> dataByteIndex: u32;
 
       fn nextByteIndex() -> u32 {
@@ -1158,6 +1158,8 @@ describe('console log example', () => {
 
       @group(0) @binding(1) var<uniform> logCountUniform: u32;
 
+      var<private> dataBlockIndex: u32;
+
       @group(0) @binding(2) var<storage, read_write> indexBuffer: atomic<u32>;
 
       struct SerializedLogData {
@@ -1167,8 +1169,6 @@ describe('console log example', () => {
 
       @group(0) @binding(3) var<storage, read_write> dataBuffer: array<SerializedLogData, 40>;
 
-      var<private> dataBlockIndex: u32;
-
       var<private> dataByteIndex: u32;
 
       fn nextByteIndex() -> u32 {
@@ -1212,6 +1212,8 @@ describe('console log example', () => {
 
       @group(0) @binding(0) var<uniform> sizeUniform: vec3u;
 
+      var<private> dataBlockIndex: u32;
+
       @group(0) @binding(1) var<storage, read_write> indexBuffer: atomic<u32>;
 
       struct SerializedLogData {
@@ -1221,8 +1223,6 @@ describe('console log example', () => {
 
       @group(0) @binding(2) var<storage, read_write> dataBuffer: array<SerializedLogData, 40>;
 
-      var<private> dataBlockIndex: u32;
-
       var<private> dataByteIndex: u32;
 
       fn nextByteIndex() -> u32 {
@@ -1299,6 +1299,8 @@ describe('console log example', () => {
 
       @group(0) @binding(0) var<uniform> sizeUniform: vec3u;
 
+      var<private> dataBlockIndex: u32;
+
       @group(0) @binding(1) var<storage, read_write> indexBuffer: atomic<u32>;
 
       struct SerializedLogData {
@@ -1308,8 +1310,6 @@ describe('console log example', () => {
 
       @group(0) @binding(2) var<storage, read_write> dataBuffer: array<SerializedLogData, 40>;
 
-      var<private> dataBlockIndex: u32;
-
       var<private> dataByteIndex: u32;
 
       fn log1serializer() {
@@ -1453,6 +1453,8 @@ describe('console log example', () => {
         return mainVertex_Output(vec4f(positions[vertexIndex], 0f, 1f));
       }
 
+      var<private> dataBlockIndex: u32;
+
       @group(0) @binding(0) var<storage, read_write> indexBuffer: atomic<u32>;
 
       struct SerializedLogData {
@@ -1462,8 +1464,6 @@ describe('console log example', () => {
 
       @group(0) @binding(1) var<storage, read_write> dataBuffer: array<SerializedLogData, 40>;
 
-      var<private> dataBlockIndex: u32;
-
       var<private> dataByteIndex: u32;
 
       fn nextByteIndex() -> u32 {
@@ -1506,6 +1506,8 @@ describe('console log example', () => {
         return mainVertex_Output(vec4f(positions[vertexIndex], 0f, 1f));
       }
 
+      var<private> dataBlockIndex: u32;
+
       @group(0) @binding(0) var<storage, read_write> indexBuffer: atomic<u32>;
 
       struct SerializedLogData {
@@ -1515,8 +1517,6 @@ describe('console log example', () => {
 
       @group(0) @binding(1) var<storage, read_write> dataBuffer: array<SerializedLogData, 40>;
 
-      var<private> dataBlockIndex: u32;
-
       var<private> dataByteIndex: u32;
 
       fn nextByteIndex() -> u32 {
@@ -1552,6 +1552,8 @@ describe('console log example', () => {
 
       @group(0) @binding(0) var<uniform> sizeUniform: vec3u;
 
+      var<private> dataBlockIndex: u32;
+
       @group(0) @binding(1) var<storage, read_write> indexBuffer: atomic<u32>;
 
       struct SerializedLogData {
@@ -1561,8 +1563,6 @@ describe('console log example', () => {
 
       @group(0) @binding(2) var<storage, read_write> dataBuffer: array<SerializedLogData, 40>;
 
-      var<private> dataBlockIndex: u32;
-
       var<private> dataByteIndex: u32;
 
       fn nextByteIndex() -> u32 {

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

@@ -11,6 +11,7 @@ import {
   replaceExternalsInWgsl,
   mergeFunctionExternals,
 } from '../resolve/externals.ts';
+import { ResolvableString } from '../resolve/resolvableString.ts';
 import { extractArgs } from './extractArgs.ts';
 import type { Implementation, SeparatedEntryArgs } from './fnTypes.ts';
 
@@ -127,7 +128,10 @@ export function createFnCore(
 
           this.setExternals('args', {
             in: Object.fromEntries(
-              entryInput.positionalArgs.map((a) => [a.schemaKey, a.schemaKey]),
+              entryInput.positionalArgs.map((a) => [
+                a.schemaKey,
+                new ResolvableString(a.schemaKey),
+              ]),
             ),
           });
         }

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

@@ -66,18 +66,18 @@ export function addReturnTypeToExternals(
   }
 }
 
-function identifierRegex(name: string) {
-  return new RegExp(
-    `(?<![\\w\\$_.])${name.replaceAll('.', '\\.').replaceAll('$', '\\$')}(?![\\w\\$_])`,
-    'g',
-  );
-}
+export const anyIdent = /([$_\p{XID_Start}][$\p{XID_Continue}]*)/u; // WGSL ident, modified to include $
+const anyPropChain = new RegExp(`(${anyIdent.source})(\\.${anyIdent.source})*`, 'ug');
+export const boundedPropChain = new RegExp(
+  `(?<![\\p{XID_Continue}\\$.])${anyPropChain.source}(?![\\p{XID_Continue}\\$])`,
+  'ug',
+);
 
 /**
  * Replaces all occurrences of external names in WGSL code with their resolved values.
  * It adds all necessary definitions to the resolution context.
  * @param ctx - The resolution context.
- * @param externalMap - The external map.
+ * @param externalMap - The external map. Assumes that keys don't contain dots.
  * @param wgsl - The WGSL code.
  *
  * @returns The WGSL code with all external names replaced with their resolved values.
@@ -87,52 +87,50 @@ export function replaceExternalsInWgsl(
   externalMap: ExternalMap,
   wgsl: string,
 ): string {
-  return Object.entries(externalMap).reduce((acc, [externalName, external]) => {
-    const externalRegex = identifierRegex(externalName);
-    if (wgsl && externalName !== 'Out' && externalName !== 'in' && !externalRegex.test(wgsl)) {
-      console.warn(`The external '${externalName}' wasn't used in the resolved template.`);
-      // continue anyway, we still might need to resolve the external
+  const keys = Object.keys(externalMap);
+  if (keys.length === 0) {
+    return wgsl;
+  }
+
+  const maybeInvalidKey = keys.find((key) => key.includes('.'));
+  if (maybeInvalidKey) {
+    throw new Error(`External key '${maybeInvalidKey}' contains invalid character '.'`);
+  }
+
+  return wgsl.replaceAll(boundedPropChain, (match) => {
+    const chain = match.split('.');
+
+    if (!Object.hasOwn(externalMap, chain.at(0) as string)) {
+      // this prop access does not start with an external
+      return match;
     }
 
-    if (isResolvable(external)) {
-      if (isNamable(external) && getName(external) === undefined) {
-        setName(external, externalName.split('.').at(-1) as string);
+    let currentItem: unknown = externalMap;
+    let suffix = '';
+
+    for (const [i, elem] of chain.entries()) {
+      currentItem = (currentItem as ExternalMap)[elem];
+      if (isResolvable(currentItem) || typeof currentItem === 'string') {
+        suffix = chain
+          .slice(i + 1)
+          .map((s) => `.${s}`)
+          .join('');
+
+        if (isNamable(currentItem) && getName(currentItem) === undefined) {
+          setName(currentItem, elem);
+        }
+
+        break;
       }
-      return acc.replaceAll(externalRegex, ctx.resolve(external).value);
-    }
 
-    if (external !== null && typeof external === 'object') {
-      const foundProperties = [
-        ...wgsl.matchAll(
-          new RegExp(
-            `${externalName
-              .replaceAll('.', '\\.')
-              .replaceAll('$', '\\$')}\\.(?<prop>.*?)(?![\\w\\$_])`,
-            'g',
-          ),
-        ),
-      ].map((found) => found[1]);
-      const uniqueProperties = [...new Set(foundProperties)];
-
-      return uniqueProperties.reduce(
-        (innerAcc: string, prop) =>
-          prop && prop in external
-            ? replaceExternalsInWgsl(
-                ctx,
-                {
-                  [`${externalName}.${prop}`]: external[prop as keyof typeof external],
-                },
-                innerAcc,
-              )
-            : innerAcc,
-        acc,
-      );
+      if (typeof currentItem !== 'object' || currentItem === null || i === chain.length - 1) {
+        console.warn(
+          `During resolution, the external '${chain.slice(0, i + 1).join('.')}' has been omitted. Only TGPU resources, 'use gpu' functions, primitives, and plain JS objects can be used as externals.`,
+        );
+        return match;
+      }
     }
 
-    console.warn(
-      `During resolution, the external '${externalName}' has been omitted. Only TGPU resources, 'use gpu' functions, primitives, and plain JS objects can be used as externals.`,
-    );
-
-    return acc;
-  }, wgsl);
+    return ctx.resolve(currentItem).value + suffix;
+  });
 }