@bigmistqke/view.gl 0.1.11 → 0.1.12

package/dist/{types-CHXzeNxF.d.mts → types-C0zNqcsE.d.mts}

@@ -1,9 +1,6 @@
 type Prettify<T> = {
     [K in keyof T]: T[K];
 } & {};
-type RemoveSuffix<T, S extends string> = {
-    [K in keyof T as K extends `${infer Prefix}${S}` ? Prefix : K]: T[K];
-};
 type DeepMerge<A extends readonly [...any]> = A extends [infer L, ...infer R] ? DeepMergeTwo<L, DeepMerge<R>> : unknown;
 type DeepMergeTwo<TBase, TOverride> = {
     [K in keyof TBase | keyof TOverride]: K extends keyof TOverride ? K extends keyof TBase ? ShallowMerge<[TBase[K], TOverride[K]]> : TOverride[K] : K extends keyof TBase ? TBase[K] : never;
@@ -22,6 +19,8 @@ type Id<T> = T extends infer U ? {
 } : never;
 type ShallowMergeTwo<L, R> = Id<Pick<L, Exclude<keyof L, keyof R>> & Pick<R, Exclude<keyof R, OptionalPropertyNames<R>>> & Pick<R, Exclude<OptionalPropertyNames<R>, keyof L>> & SpreadProperties<L, R, OptionalPropertyNames<R> & keyof L>>;
 
+/**********************************************************************************/
+/**********************************************************************************/
 type GL = WebGLRenderingContext | WebGL2RenderingContext;
 type GLTarget = 'ARRAY_BUFFER' | 'ELEMENT_ARRAY_BUFFER';
 type GLUsage = 'STATIC_DRAW' | 'DYNAMIC_DRAW' | 'STREAM_DRAW';
@@ -116,8 +115,9 @@ interface KIND_TO_SIZE_MAP {
 }
 /**********************************************************************************/
 /**********************************************************************************/
-type UniformFnName = '1f' | '2f' | '3f' | '4f' | '1i' | '2i' | '3i' | '4i' | '1ui' | '2ui' | '3ui' | '4ui' | 'mat2' | 'mat3' | 'mat4' | 'mat2x3' | 'mat2x4' | 'mat3x2' | 'mat3x4' | 'mat4x2' | 'mat4x3' | 'sampler2D' | 'samplerCube' | 'sampler2DArray' | 'isampler2D' | 'isamplerCube' | 'isampler2DArray' | 'usampler2D' | 'usamplerCube' | 'usampler2DArray';
-type UniformKind = 'float' | 'vec2' | 'vec3' | 'vec4' | 'int' | 'ivec2' | 'ivec3' | 'ivec4' | 'bool' | 'bvec2' | 'bvec3' | 'bvec4' | 'mat2' | 'mat3' | 'mat4' | 'sampler2D' | 'samplerCube' | 'uint' | 'uvec2' | 'uvec3' | 'uvec4' | 'mat2x3' | 'mat2x4' | 'mat3x2' | 'mat3x4' | 'mat4x2' | 'mat4x3' | 'sampler3D' | 'sampler2DArray' | 'sampler2DShadow' | 'samplerCubeShadow' | 'sampler2DArrayShadow' | 'isampler2D' | 'isampler3D' | 'isamplerCube' | 'isampler2DArray' | 'usampler2D' | 'usampler3D' | 'usamplerCube' | 'usampler2DArray';
+type UniformFnName = KIND_TO_UNIFORM_FN_NAME_MAP[keyof KIND_TO_UNIFORM_FN_NAME_MAP];
+type UniformKind = keyof KIND_TO_UNIFORM_FN_NAME_MAP;
+type MatrixArray<Size extends number> = [Float32Array] | number[];
 interface UniformKindMap {
     float: [number];
     vec2: [number, number];
@@ -135,105 +135,15 @@ interface UniformKindMap {
     uvec2: [number, number];
     uvec3: [number, number, number];
     uvec4: [number, number, number, number];
-    mat2: [Float32Array] | [
-        number,
-        number,
-        number,
-        number
-    ];
-    mat3: [Float32Array] | [
-        number,
-        number,
-        number,
-        number,
-        number,
-        number,
-        number,
-        number,
-        number
-    ];
-    mat4: [Float32Array] | [
-        number,
-        number,
-        number,
-        number,
-        number,
-        number,
-        number,
-        number,
-        number,
-        number,
-        number,
-        number,
-        number,
-        number,
-        number,
-        number
-    ];
-    mat2x3: [Float32Array] | [
-        number,
-        number,
-        number,
-        number,
-        number,
-        number
-    ];
-    mat2x4: [Float32Array] | [
-        number,
-        number,
-        number,
-        number,
-        number,
-        number,
-        number,
-        number
-    ];
-    mat3x2: [Float32Array] | [
-        number,
-        number,
-        number,
-        number,
-        number,
-        number
-    ];
-    mat3x4: [Float32Array] | [
-        number,
-        number,
-        number,
-        number,
-        number,
-        number,
-        number,
-        number,
-        number,
-        number,
-        number,
-        number
-    ];
-    mat4x2: [Float32Array] | [
-        number,
-        number,
-        number,
-        number,
-        number,
-        number,
-        number,
-        number
-    ];
-    mat4x3: [Float32Array] | [
-        number,
-        number,
-        number,
-        number,
-        number,
-        number,
-        number,
-        number,
-        number,
-        number,
-        number,
-        number
-    ];
+    mat2: MatrixArray<4>;
+    mat3: MatrixArray<9>;
+    mat4: MatrixArray<16>;
+    mat2x3: MatrixArray<6>;
+    mat2x4: MatrixArray<8>;
+    mat3x2: MatrixArray<6>;
+    mat3x4: MatrixArray<12>;
+    mat4x2: MatrixArray<8>;
+    mat4x3: MatrixArray<12>;
     sampler2D: [number];
     samplerCube: [number];
     sampler3D: [number];
@@ -255,12 +165,16 @@ interface UniformDefinition {
     size?: number;
 }
 type UniformSchema = Record<string | symbol, UniformDefinition>;
-type UniformSchemaPartial = Record<string | symbol, Partial<UniformDefinition>>;
-type UniformMethods<TDefinition extends UniformDefinition> = TDefinition['size'] extends number ? {
+/** Methods for a single uniform element */
+type UniformElementMethods<TKind extends UniformKind> = {
+    set(...args: UniformKindMap[TKind]): void;
+};
+/** Methods for array uniforms - supports both bulk set and indexed access */
+type UniformArrayMethods<TKind extends UniformKind, TSize extends number> = Array<UniformElementMethods<TKind>> & {
+    /** Bulk set all elements at once */
     set(arg: Float32Array): void;
-} : {
-    set(...args: UniformKindMap[TDefinition['kind']]): void;
 };
+type UniformMethods<TDefinition extends UniformDefinition> = TDefinition['size'] extends number ? UniformArrayMethods<TDefinition['kind'], TDefinition['size']> : UniformElementMethods<TDefinition['kind']>;
 type UniformView<T extends UniformSchema> = {
     [K in keyof T]: UniformMethods<T[K]>;
 };
@@ -385,11 +299,12 @@ interface ViewSchema {
     interleavedAttributes?: InterleavedAttributeSchema;
     buffers?: BufferSchema;
 }
+type PartialSchema<T> = T extends Record<string | symbol, infer V> ? Record<string | symbol, Partial<V>> : never;
 interface ViewSchemaPartial {
-    uniforms?: Record<string | symbol, Partial<UniformDefinition>>;
-    attributes?: Record<string | symbol, Partial<AttributeDefinition>>;
-    interleavedAttributes?: Record<string | symbol, Partial<InterleavedAttributeDefinition>>;
-    buffers?: Record<string | symbol, Partial<BufferDefinition>>;
+    uniforms?: PartialSchema<UniformSchema>;
+    attributes?: PartialSchema<AttributeSchema>;
+    interleavedAttributes?: PartialSchema<InterleavedAttributeSchema>;
+    buffers?: PartialSchema<BufferSchema>;
 }
 type View<T extends ViewSchema = ViewSchema> = {
     attributes: T['attributes'] extends AttributeSchema ? Prettify<AttributeView<T['attributes']>> : {};
@@ -403,6 +318,8 @@ interface GLSLResult {
     program: WebGLProgram;
     schema: ViewSchema;
 }
+/**********************************************************************************/
+/**********************************************************************************/
 type GLSLSlotItem = GLSL | UniformToken | AttributeToken | InterleaveToken | string | number | symbol;
 type GLSLSlot = GLSLSlotItem | Array<GLSLSlotItem>;
 interface GLSL<TSlots extends GLSLSlot[] = GLSLSlot[]> {
@@ -443,21 +360,26 @@ type InterleaveToken<TKey extends string | symbol = string | symbol, TLayout ext
         [TKey in keyof TLayout]: Prettify<Pick<TLayout[TKey], 'kind' | 'key'>>;
     };
 };
-type GLSLToSchema<T extends GLSL> = FlattenSlots<T> extends infer TSlots ? TSlots extends Array<any> ? GLSLSlotsToSchema<TSlots> : never : never;
+type GLSLToSchema<T extends GLSL> = T extends GLSL<infer TSlots> ? FlattenSlots<TSlots> extends infer TFlatSlots extends Array<GLSLSlot> ? GLSLSlotsToSchema<TFlatSlots> : never : never;
 type GLSLToView<T extends GLSL> = View<GLSLToSchema<T>>;
+type ExtractTokens<TSlots extends Array<GLSLSlot>, TTokenType> = TSlots[number] extends infer U ? U extends TTokenType ? U : never : never;
 type GLSLSlotsToSchema<TSlots extends Array<GLSLSlot>> = {
     uniforms: {
-        [K in Extract<TSlots[number], UniformToken> as K['key']]: Prettify<Omit<K, 'name' | 'type'>>;
+        [K in ExtractTokens<TSlots, UniformToken> as K['key']]: Omit<K, 'type'>;
     };
     attributes: {
-        [K in Extract<TSlots[number], AttributeToken> as K['key']]: Prettify<Omit<K, 'name' | 'type'>>;
+        [K in ExtractTokens<TSlots, AttributeToken> as K['key']]: Omit<K, 'type'>;
     };
     interleavedAttributes: {
-        [K in Extract<TSlots[number], InterleaveToken> as K['key']]: Prettify<Omit<K, 'name' | 'type'>>;
+        [K in ExtractTokens<TSlots, InterleaveToken> as K['key']]: Omit<K, 'type'>;
     };
 };
-type FlattenSlots<T> = T extends GLSL<infer TSlots> ? _FlattenSlots<TSlots> : T extends Array<GLSLSlot> ? _FlattenSlots<T> : never;
-type _FlattenSlots<T extends Array<GLSLSlot>> = T extends [infer First, ...infer Rest] ? First extends GLSL ? [...FlattenSlots<First>, ...FlattenSlots<Rest>] : First extends unknown[] ? [...FlattenSlots<First>, ...FlattenSlots<Rest>] : [First, ...FlattenSlots<Rest>] : [];
+type FlattenSlots<T, MaxDepth extends Depth = 10> = T extends Array<GLSLSlot> ? _FlattenSlots<T, [], MaxDepth> : T extends GLSL<infer TSlots> ? _FlattenSlots<TSlots, [], MaxDepth> : never;
+type _FlattenSlots<T extends Array<GLSLSlot>, Acc extends Array<any> = [], CurrentDepth extends Depth = 10> = CurrentDepth extends 0 ? [...Acc, ...T] : T extends [infer First, ...infer Rest extends Array<GLSLSlot>] ? First extends GLSL<infer TSlots> ? _FlattenSlots<Rest, [...Acc, ..._FlattenSlots<TSlots, [], Dec<CurrentDepth>>], Dec<CurrentDepth>> : First extends GLSLSlot[] ? _FlattenSlots<Rest, [...Acc, ..._FlattenSlots<First, [], Dec<CurrentDepth>>], Dec<CurrentDepth>> : _FlattenSlots<Rest, [...Acc, First], Dec<CurrentDepth>> : [...Acc, ...T];
+/**********************************************************************************/
+/**********************************************************************************/
+type Depth = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10;
+type Dec<T extends number> = T extends 10 ? 9 : T extends 9 ? 8 : T extends 8 ? 7 : T extends 7 ? 6 : T extends 6 ? 5 : T extends 5 ? 4 : T extends 4 ? 3 : T extends 3 ? 2 : T extends 2 ? 1 : T extends 1 ? 0 : 0;
 type MergeGLSLSchema<TVertex extends ViewSchema, TFragment extends ViewSchema, TOverrides extends ViewSchemaPartial | undefined = {}> = TOverrides extends ViewSchemaPartial ? {
     uniforms: Prettify<DeepMerge<[
         ShallowMerge<[TVertex['uniforms'], TFragment['uniforms']]>,
@@ -484,4 +406,4 @@ type CompileResult<TVertex extends GLSL, TFragment extends GLSL, TOverrideSchema
     fragment: string;
 } : never;
 
-export type { GLSL as $, AttributeSchema as A, BufferSchema as B, BufferDefinition as C, BufferMethods as D, Framebuffer as E, FramebufferDefinition as F, GL as G, TextureTarget as H, InterleavedAttributeSchema as I, TextureSchema as J, KIND_TO_UNIFORM_FN_NAME_MAP as K, TextureMethods as L, TextureView as M, TextureParameterName as N, TextureParameterValue as O, TextureParameters as P, InternalFormat as Q, RemoveSuffix as R, Format as S, TextureDefinition as T, UniformSchema as U, ViewSchema as V, PixelType as W, TexImage2DOptions as X, ViewSchemaPartial as Y, GLSLResult as Z, GLSLSlot as _, ViewOptions as a, UniformToken as a0, UniformTokenFn as a1, AttributeToken as a2, AttributeTokenFn as a3, InterleaveToken as a4, GLSLToSchema as a5, GLSLToView as a6, GLSLSlotsToSchema as a7, MergeGLSLSchema as a8, CompileResult as a9, Prettify as aa, View as b, UniformView as c, AttributeView as d, InterleavedAttributeView as e, BufferView as f, GLTarget as g, GLUsage as h, GLTextureTarget as i, GLTextureFormat as j, GLTextureType as k, GLTextureFilter as l, GLTextureWrap as m, KIND_TO_SIZE_MAP as n, UniformFnName as o, UniformKind as p, UniformDefinition as q, UniformSchemaPartial as r, UniformMethods as s, AttributeShortHand as t, AttributeKind as u, AttributeDefinition as v, AttributeMethods as w, InterleavedAttributeLayout as x, InterleavedAttributeDefinition as y, InterleavedAttributeMethods as z };
+export type { GLSL as $, AttributeSchema as A, BufferSchema as B, InterleavedAttributeMethods as C, BufferDefinition as D, BufferMethods as E, FramebufferDefinition as F, GL as G, Framebuffer as H, InterleavedAttributeSchema as I, TextureTarget as J, KIND_TO_UNIFORM_FN_NAME_MAP as K, TextureSchema as L, TextureMethods as M, TextureView as N, TextureParameterName as O, TextureParameterValue as P, TextureParameters as Q, InternalFormat as R, Format as S, TextureDefinition as T, UniformSchema as U, ViewSchema as V, PixelType as W, TexImage2DOptions as X, ViewSchemaPartial as Y, GLSLResult as Z, GLSLSlot as _, ViewOptions as a, UniformToken as a0, UniformTokenFn as a1, AttributeToken as a2, AttributeTokenFn as a3, InterleaveToken as a4, GLSLToSchema as a5, GLSLToView as a6, GLSLSlotsToSchema as a7, FlattenSlots as a8, MergeGLSLSchema as a9, CompileResult as aa, Prettify as ab, View as b, UniformView as c, AttributeView as d, InterleavedAttributeView as e, BufferView as f, GLTarget as g, GLUsage as h, GLTextureTarget as i, GLTextureFormat as j, GLTextureType as k, GLTextureFilter as l, GLTextureWrap as m, KIND_TO_SIZE_MAP as n, UniformFnName as o, UniformKind as p, UniformDefinition as q, UniformElementMethods as r, UniformArrayMethods as s, UniformMethods as t, AttributeShortHand as u, AttributeKind as v, AttributeDefinition as w, AttributeMethods as x, InterleavedAttributeLayout as y, InterleavedAttributeDefinition as z };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bigmistqke/view.gl",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "description": "👀 Utilities for managing WebGL resources.",
   "exports": {
     ".": {
@@ -10,10 +10,6 @@
     "./tag": {
       "import": "./dist/tag.mjs",
       "types": "./dist/tag.d.mts"
-    },
-    "./gl": {
-      "import": "./dist/gl.mjs",
-      "types": "./dist/gl.d.mts"
     }
   },
   "keywords": [
@@ -23,6 +19,7 @@
   "license": "ISC",
   "devDependencies": {
     "@vitest/ui": "^3.2.4",
+    "bumpp": "^10.4.0",
     "concurrently": "^9.2.1",
     "happy-dom": "^20.0.0",
     "prettier": "^3.6.2",
@@ -30,21 +27,20 @@
     "typescript": "^5.8.3",
     "vite": "^7.0.2",
     "vite-tsconfig-paths": "^5.1.4",
-    "vitest": "^3.2.4",
-    "bumpp": "^10.3.2"
+    "vitest": "^3.2.4"
   },
   "scripts": {
     "build": "tsup",
+    "bump": "bumpp",
     "dev:build": "vite build dev",
     "dev:preview": "vite preview dev",
     "dev:watch": "concurrently \"pnpm dev:preview\" \"vite dev:build --watch\"",
     "dev": "vite serve dev",
     "format": "prettier -w \"src/**/*.{js,ts,json,css,tsx,jsx}\" \"dev/**/*.{js,ts,json,css,tsx,jsx}\"",
-    "prepublish": "pnpm test && pnpm build",
-    "test": "vitest --run",
+    "lint:types": "tsc --noEmit",
+    "prepublish": "pnpm build",
     "test:coverage": "vitest run --coverage",
     "test:ui": "vitest --ui",
-    "lint:types": "tsc --noEmit",
-    "bump": "bumpp"
+    "test": "vitest --run"
   }
 }

package/src/{gl.ts → features.ts}

@@ -1,49 +1,5 @@
 import { RemoveSuffix } from './type-utils'
-import { GL } from './types'
-
-export function createShader(gl: GL, type: number, source: string): WebGLShader {
-  const shader = gl.createShader(type)
-  if (!shader) throw new Error('Failed to create shader')
-
-  gl.shaderSource(shader, source)
-  gl.compileShader(shader)
-
-  if (!gl.getShaderParameter(shader, gl.COMPILE_STATUS)) {
-    const info = gl.getShaderInfoLog(shader)
-    gl.deleteShader(shader)
-    throw new Error(
-      `Failed to compile ${type === gl.VERTEX_SHADER ? 'vertex' : 'fragment'} shader: ${info}`,
-    )
-  }
-
-  return shader
-}
-
-export function createProgram(gl: GL, vertexSource: string, fragmentSource: string): WebGLProgram {
-  const program = gl.createProgram()
-  if (!program) throw new Error('Failed to create WebGL program')
-
-  const vertexShader = createShader(gl, gl.VERTEX_SHADER, vertexSource)
-  const fragmentShader = createShader(gl, gl.FRAGMENT_SHADER, fragmentSource)
-
-  gl.attachShader(program, vertexShader)
-  gl.attachShader(program, fragmentShader)
-  gl.linkProgram(program)
-
-  if (!gl.getProgramParameter(program, gl.LINK_STATUS)) {
-    const info = gl.getProgramInfoLog(program)
-    gl.deleteProgram(program)
-    gl.deleteShader(vertexShader)
-    gl.deleteShader(fragmentShader)
-    throw new Error(`Failed to link program: ${info}`)
-  }
-
-  // Clean up shaders after linking
-  gl.deleteShader(vertexShader)
-  gl.deleteShader(fragmentShader)
-
-  return program
-}
+import type { GL } from './types'
 
 const INSTANCED_ARRAYS_WRAPPER_MAP = new WeakMap<
   GL,

package/src/index.ts

@@ -1,4 +1,4 @@
-import { getInstancedArrays, getVertexArrayObject } from './gl'
+import { getInstancedArrays, getVertexArrayObject } from './features'
 import type {
   AttributeMethods,
   AttributeSchema,
@@ -22,9 +22,9 @@ import {
   isSamplerKind,
   kindToSize,
   kindToUniformFnName,
+  ObjectUtils,
 } from './utils'
 export * from './types'
-import * as ObjectUtils from './utils/object'
 
 /**********************************************************************************/
 /*                                                                                */
@@ -34,12 +34,19 @@ import * as ObjectUtils from './utils/object'
 
 let index = 0
 const PREFIX = 'VIEW_GL_ALIAS'
-const IS_FIREFOX = navigator.userAgent.toLowerCase().indexOf('firefox') >= 0
-
-// NOTE:  using symbol as key for WeakMap is currently broken in firefox
-//        see https://bugzilla.mozilla.org/show_bug.cgi?id=1710433
-//        fallback to Map will currently cause a memory leak.
-const SYMBOL_MAP = createUpsertMap(IS_FIREFOX ? Map<symbol, string> : WeakMap<symbol, string>)
+// Firefox has currently a bug where it can not handle symbol as WeakRef / key for WeakMap
+// see https://bugzilla.mozilla.org/show_bug.cgi?id=1710433
+const HAS_WEAK_SYMBOL = (() => {
+  try {
+    const symbol = Symbol()
+    new WeakMap().set(symbol, '')
+    return true
+  } catch {
+    return false
+  }
+})()
+// NOTE:  fallback to Map will currently cause a minor memory leak.
+const SYMBOL_MAP = createUpsertMap(HAS_WEAK_SYMBOL ? WeakMap<symbol, string> : Map<symbol, string>)
 
 export function toID(key: string | number | symbol) {
   if (typeof key === 'string') {
@@ -86,12 +93,12 @@ export function uniformView<T extends UniformSchema>(
   program: WebGLProgram,
   schema: T,
 ): InferUniformView<T> {
+  // @ts-expect-error - conditional return type based on size is hard to infer
   return ObjectUtils.map(schema, ({ kind, size }, key) => {
     const name = toID(key)
 
-    const location = gl.getUniformLocation(program, name)
-
     if (isSamplerKind(kind)) {
+      const location = gl.getUniformLocation(program, name)
       return {
         set(arg: number) {
           gl.uniform1i(location, arg)
@@ -99,7 +106,39 @@ export function uniformView<T extends UniformSchema>(
       }
     }
 
-    const fnName = `uniform${kindToUniformFnName(kind)}${size ? 'v' : ''}`
+    // Array uniform - support both bulk set and indexed access
+    if (size) {
+      const bulkFnName = `uniform${kindToUniformFnName(kind)}v`
+      // @ts-ignore FIX WEBGL/WEBGL2 TYPES
+      const bulkFn = gl[bulkFnName].bind(gl)
+      const bulkLocation = gl.getUniformLocation(program, name)
+
+      const elementFnName = `uniform${kindToUniformFnName(kind)}`
+      // @ts-ignore FIX WEBGL/WEBGL2 TYPES
+      const elementFn = gl[elementFnName].bind(gl)
+
+      // Build array of element setters
+      const elements: Array<{ set(...args: any[]): void }> = []
+      for (let i = 0; i < size; i++) {
+        const location = gl.getUniformLocation(program, `${name}[${i}]`)
+        elements[i] = {
+          set(...args: any[]) {
+            elementFn(location, ...args)
+          },
+        }
+      }
+
+      // Return array-like object with bulk set
+      return Object.assign(elements, {
+        set(arg: Float32Array) {
+          bulkFn(bulkLocation, arg)
+        },
+      })
+    }
+
+    // Non-array uniform
+    const location = gl.getUniformLocation(program, name)
+    const fnName = `uniform${kindToUniformFnName(kind)}`
 
     // @ts-ignore FIX WEBGL/WEBGL2 TYPES
     const fn = gl[fnName].bind(gl)

package/src/tag.ts

@@ -1,5 +1,4 @@
 import { toID, view } from '.'
-import { createProgram } from './gl'
 import type { Prettify } from './type-utils'
 import type {
   AttributeDefinition,
@@ -18,9 +17,9 @@ import type {
   ViewSchema,
   ViewSchemaPartial,
 } from './types'
-import { createUpsertMap } from './utils'
+import { createProgram, createUpsertMap } from './utils'
 
-export function glsl<TSlot extends GLSLSlot, TSlots extends TSlot[]>(
+export function glsl<TSlot extends GLSLSlot, const TSlots extends TSlot[]>(
   template: TemplateStringsArray,
   ...slots: [...TSlots]
 ): GLSL<TSlots> {