Merged relevant changes from 0.3

Author: iwoplaza

packages/jit/package.json

@@ -55,13 +55,13 @@
   "devDependencies": {
     "typescript": "^5.3.3",
     "tsup": "^8.0.2",
-    "typegpu": "workspace:*",
     "@typegpu/tgpu-dev-cli": "workspace:*",
     "vitest": "^2.1.5"
   },
   "packageManager": "pnpm@8.15.8+sha256.691fe176eea9a8a80df20e4976f3dfb44a04841ceb885638fe2a26174f81e65e",
   "dependencies": {
     "acorn": "^8.12.1",
+    "tinyest": "workspace:~0.0.0",
     "@typegpu/tgsl-tools": "workspace:~0.0.0"
   }
 }

packages/jit/src/index.ts

@@ -1,6 +1,26 @@
 import { transpileFn } from '@typegpu/tgsl-tools';
 import { parse } from 'acorn';
-import type { JitTranspiler as IJitTranspiler } from 'typegpu/experimental';
+import type { Block } from 'tinyest';
+
+/**
+ * Information extracted from transpiling a JS function.
+ */
+type TranspilationResult = {
+  argNames: string[];
+  body: Block;
+  /**
+   * All identifiers found in the function code that are not declared in the
+   * function itself, or in the block that is accessing that identifier.
+   */
+  externalNames: string[];
+};
+
+/**
+ * Used to transpile JS resources into SMoL on demand.
+ */
+interface IJitTranspiler {
+  transpileFn(rawJs: string): TranspilationResult;
+}
 
 export class JitTranspiler implements IJitTranspiler {
   transpileFn(rawJs: string) {

packages/typegpu/package.json

@@ -67,6 +67,7 @@
   "devDependencies": {
     "@typegpu/tgpu-dev-cli": "workspace:*",
     "@typegpu/wgsl-parser": "workspace:*",
+    "@typegpu/jit": "workspace:*",
     "@types/node": "^20.11.13",
     "@webgpu/types": "^0.1.43",
     "rollup-plugin-typegpu": "workspace:*",

packages/typegpu/src/experimental/index.ts

@@ -16,9 +16,7 @@ import {
 } from '../core/root/init';
 import type { ExperimentalTgpuRoot } from '../core/root/rootTypes';
 import { vertexLayout } from '../core/vertexLayout/vertexLayout';
-import { createBuffer } from '../legacyBufferApi';
 import { bindGroupLayout } from '../tgpuBindGroupLayout';
-import { read, write } from '../tgpuBufferUtils';
 
 export const tgpu = {
   /** @deprecated Use `'uniform'` string literal instead. */
@@ -44,10 +42,6 @@ export const tgpu = {
   ) => ExperimentalTgpuRoot,
 
   resolve,
-
-  createBuffer,
-  read,
-  write,
 };
 
 // Hidden API, used only by tooling (e.g., rollup plugin).
@@ -57,16 +51,28 @@ Object.assign(tgpu, {
 
 export default tgpu;
 
-export * from '../errors';
-export * from '../types';
-export * from '../namable';
-export * from '../core/root/rootTypes';
+export {
+  MissingBindGroupError,
+  MissingLinksError,
+  MissingSlotValueError,
+  NotUniformError,
+  ResolutionError,
+} from '../errors';
+export {
+  TgpuRoot,
+  ExperimentalTgpuRoot,
+  WithBinding,
+  WithCompute,
+  WithFragment,
+  WithVertex,
+} from '../core/root/rootTypes';
 export { StrictNameRegistry, RandomNameRegistry } from '../nameRegistry';
 export * from '../builtin';
 
 export { default as wgsl } from '../wgsl';
 export { std } from '../std';
 export {
+  isBuffer,
   isUsableAsUniform,
   isUsableAsVertex,
 } from '../core/buffer/buffer';
@@ -121,6 +127,10 @@ export type {
   TgpuBindGroupLayout,
   TgpuLayoutEntry,
   TgpuLayoutSampler,
+  TgpuLayoutTexture,
+  TgpuLayoutStorage,
+  TgpuLayoutStorageTexture,
+  TgpuLayoutExternalTexture,
   TgpuLayoutUniform,
   BindLayoutEntry,
   LayoutEntryToInput,

packages/typegpu/tests/asUsage.test.ts

@@ -1,38 +1,41 @@
-import { describe, expect, it } from 'vitest';
+import { describe, expect } from 'vitest';
 import { u32 } from '../src/data';
-import tgpu, { asMutable, asReadonly, asUniform } from '../src/experimental';
+import { asMutable, asReadonly, asUniform } from '../src/experimental';
 import './utils/webgpuGlobals';
+import { it } from './utils/extendedIt';
 
 describe('asUsage', () => {
-  it('allows creating bufferUsages only for buffers allowing them', () => {
-    asReadonly(tgpu.createBuffer(u32, 2).$usage('storage'));
-    asReadonly(tgpu.createBuffer(u32, 2).$usage('storage', 'uniform'));
-    asReadonly(tgpu.createBuffer(u32, 2).$usage('storage', 'vertex'));
+  it('allows creating bufferUsages only for buffers allowing them', ({
+    root,
+  }) => {
+    asReadonly(root.createBuffer(u32, 2).$usage('storage'));
+    asReadonly(root.createBuffer(u32, 2).$usage('storage', 'uniform'));
+    asReadonly(root.createBuffer(u32, 2).$usage('storage', 'vertex'));
     // @ts-expect-error
-    expect(() => asReadonly(tgpu.createBuffer(u32, 2))).toThrow();
+    expect(() => asReadonly(root.createBuffer(u32, 2))).toThrow();
     expect(() =>
       // @ts-expect-error
-      asReadonly(tgpu.createBuffer(u32, 2).$usage('uniform')),
+      asReadonly(root.createBuffer(u32, 2).$usage('uniform')),
     ).toThrow();
 
-    asUniform(tgpu.createBuffer(u32, 2).$usage('uniform'));
-    asUniform(tgpu.createBuffer(u32, 2).$usage('uniform', 'storage'));
-    asUniform(tgpu.createBuffer(u32, 2).$usage('uniform', 'vertex'));
+    asUniform(root.createBuffer(u32, 2).$usage('uniform'));
+    asUniform(root.createBuffer(u32, 2).$usage('uniform', 'storage'));
+    asUniform(root.createBuffer(u32, 2).$usage('uniform', 'vertex'));
     // @ts-expect-error
-    expect(() => asUniform(tgpu.createBuffer(u32, 2))).toThrow();
+    expect(() => asUniform(root.createBuffer(u32, 2))).toThrow();
     expect(() =>
       // @ts-expect-error
-      asUniform(tgpu.createBuffer(u32, 2).$usage('storage')),
+      asUniform(root.createBuffer(u32, 2).$usage('storage')),
     ).toThrow();
 
-    asMutable(tgpu.createBuffer(u32, 2).$usage('storage'));
-    asMutable(tgpu.createBuffer(u32, 2).$usage('storage', 'uniform'));
-    asMutable(tgpu.createBuffer(u32, 2).$usage('vertex', 'storage'));
+    asMutable(root.createBuffer(u32, 2).$usage('storage'));
+    asMutable(root.createBuffer(u32, 2).$usage('storage', 'uniform'));
+    asMutable(root.createBuffer(u32, 2).$usage('vertex', 'storage'));
     // @ts-expect-error
-    expect(() => asMutable(tgpu.createBuffer(u32, 2))).toThrow();
+    expect(() => asMutable(root.createBuffer(u32, 2))).toThrow();
     expect(() =>
       // @ts-expect-error
-      asMutable(tgpu.createBuffer(u32, 2).$usage('uniform')),
+      asMutable(root.createBuffer(u32, 2).$usage('uniform')),
     ).toThrow();
   });
 });

packages/typegpu/tests/resolve.test.ts

@@ -2,7 +2,7 @@ import { parse } from '@typegpu/wgsl-parser';
 import { describe, expect, it } from 'vitest';
 import * as d from '../src/data';
 import tgpu, { type TgpuBufferReadonly } from '../src/experimental';
-import type { ResolutionCtx } from '../src/experimental';
+import type { ResolutionCtx } from '../src/types';
 
 describe('tgpu resolve', () => {
   it('should resolve a string (identity)', () => {