Refactor replaceExternalsInWgsl (#793)

software-mansion · Jan 15, 2025 · 0142a4a · 0142a4a
1 parent 5d0718b
commit 0142a4a
Showing 1 changed file with 6 additions and 14 deletions.
diff --git a/packages/typegpu/src/core/resolve/externals.ts b/packages/typegpu/src/core/resolve/externals.ts
@@ -93,20 +93,12 @@ export function replaceExternalsInWgsl(
     }
 
     if (external !== null && typeof external === 'object') {
-      const regExp = new RegExp(
-        `${externalName}\\.(?<prop>.*?)(?![\\w_])`,
-        'g',
-      );
-
-      const foundProperties = [];
-      while (true) {
-        const found = regExp.exec(wgsl);
-        if (found === null) {
-          break;
-        }
-
-        foundProperties.push(found[1]);
-      }
+      const foundProperties =
+        [
+          ...wgsl.matchAll(
+            new RegExp(`${externalName}\\.(?<prop>.*?)(?![\\w_])`, 'g'),
+          ),
+        ].map((found) => found[1]) ?? [];
 
       return foundProperties.reduce(
         (innerAcc: string, prop) =>