typegpu 0.11.4 → 0.11.5

package/types.d.ts

@@ -70,6 +70,14 @@ type FunctionScopeLayer = {
    * All types used in `return` statements.
    */
   reportedReturnTypes: Set<BaseData>;
+  /**
+   * Maps variables to their modifier placeholders
+   */
+  placeholderForVariable: Map<Snippet, string>;
+  /**
+   * Local variables that need `var` modifier.
+   */
+  modifiedVariables: Set<Snippet>;
 };
 type SlotBindingLayer = {
   type: 'slotBinding';
@@ -77,6 +85,7 @@ type SlotBindingLayer = {
 };
 type BlockScopeLayer = {
   type: 'blockScope';
+  takenLocalIdentifiers: Set<string>;
   declarations: Map<string, Snippet>;
   externals: Map<string, Snippet>;
 };
@@ -84,6 +93,7 @@ type StackLayer = ItemLayer | SlotBindingLayer | FunctionScopeLayer | BlockScope
 interface ItemStateStack {
   readonly itemDepth: number;
   readonly topItem: ItemLayer;
+  readonly topBlockScope: BlockScopeLayer | undefined;
   readonly topFunctionScope: FunctionScopeLayer | undefined;
   pushItem(): void;
   pushSlotBindings(pairs: SlotValuePair[]): void;
@@ -237,8 +247,25 @@ interface ResolutionCtx {
    * @param name the temporary name to assign to the item (if missing, just returns `callback()`)
    */
   withRenamed<T>(item: object, name: string | undefined, callback: () => T): T;
-  getUniqueName(resource: object): string;
-  makeNameValid(name: string): string;
+  /**
+   * @param primer The basis for the unique identifier. Depending on the strategy, or
+   *               the names already taken, this may be modified to ensure uniqueness.
+   * @param scope The scope in which to generate the identifier. 'global' means
+   *              the identifier is meant to be unique across the entire program, while
+   *              'block' means it cannot shadow any existing identifiers visible from
+   *              within the current block. After the block is popped, any identifiers
+   *              defined within it are no longer visible.
+   * @returns an identifier that is unique within the given scope
+   */
+  makeUniqueIdentifier(primer: string | undefined, scope: 'global' | 'block'): string;
+  isIdentifierTaken(name: string): boolean;
+  /**
+   * Makes sure the given identifier cannot be generated by {@link makeUniqueIdentifier}
+   * within the given scope.
+   * @param name The name to reserve
+   * @param scope See {@link makeUniqueIdentifier} for a description of the scope parameter.
+   */
+  reserveIdentifier(name: string, scope: 'global' | 'block'): void;
 }
 /**
  * Houses a method on the symbol '$resolve` that returns a

package/nameRegistry.d.ts

@@ -1,30 +0,0 @@
-//#region src/nameRegistry.d.ts
-interface NameRegistry {
-  /**
-   * Creates a valid WGSL identifier, each guaranteed to be unique
-   * in the lifetime of a single resolution process
-   * (excluding non-global identifiers from popped scopes).
-   * Should append "_" to primer, followed by some id.
-   * @param primer Used in the generation process, makes the identifier more recognizable.
-   * @param global Whether the name should be registered in the global scope (true), or in the current function scope (false)
-   */
-  makeUnique(primer: string | undefined, global: boolean): string;
-  /**
-   * Creates a valid WGSL identifier.
-   * Renames identifiers that are WGSL reserved words.
-   * @param primer Used in the generation process.
-   *
-   * @example
-   * makeValid("notAKeyword"); // "notAKeyword"
-   * makeValid("struct"); // makeUnique("struct")
-   * makeValid("struct_1"); // makeUnique("struct_1") (to avoid potential name collisions)
-   * makeValid("_"); // ERROR (too difficult to make valid to care)
-   */
-  makeValid(primer: string): string;
-  pushFunctionScope(): void;
-  popFunctionScope(): void;
-  pushBlockScope(): void;
-  popBlockScope(): void;
-}
-//#endregion
-export { NameRegistry };