@bigmistqke/view.gl 0.1.6 → 0.1.8

package/dist/{types-COnZSrXA.d.mts → types-Bp9VAVe3.d.mts}

@@ -1,13 +1,6 @@
-type Merge<A, B> = {
-    [K in keyof A | keyof B]: K extends keyof A ? K extends keyof B ? A[K] | B[K] : A[K] : K extends keyof B ? B[K] : never;
-};
 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 GL = WebGLRenderingContext | WebGL2RenderingContext;
 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;
@@ -25,8 +18,8 @@ type Id<T> = T extends infer U ? {
     [K in keyof U]: U[K];
 } : 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';
 type GLTextureTarget = 'TEXTURE_2D' | 'TEXTURE_CUBE_MAP';
@@ -254,16 +247,16 @@ interface UniformKindMap {
     usamplerCube: [number];
     usampler2DArray: [number];
 }
-interface UniformOptions {
+interface UniformDefinition {
     kind: UniformKind;
     size?: number;
 }
-type UniformSchema = Record<string | symbol, UniformOptions>;
-type UniformSchemaPartial = Record<string | symbol, Partial<UniformOptions>>;
-type UniformMethods<TOptions extends UniformOptions> = TOptions['size'] extends number ? {
+type UniformSchema = Record<string | symbol, UniformDefinition>;
+type UniformSchemaPartial = Record<string | symbol, Partial<UniformDefinition>>;
+type UniformMethods<TDefinition extends UniformDefinition> = TDefinition['size'] extends number ? {
     set(arg: Float32Array): void;
 } : {
-    set(...args: UniformKindMap[TOptions['kind']]): void;
+    set(...args: UniformKindMap[TDefinition['kind']]): void;
 };
 type UniformView<T extends UniformSchema> = {
     [K in keyof T]: UniformMethods<T[K]>;
@@ -272,12 +265,12 @@ type UniformView<T extends UniformSchema> = {
 /**********************************************************************************/
 type AttributeShortHand = '1f' | '2f' | '3f' | '4f' | '1i' | '2i' | '3i' | '4i' | '1ui' | '2ui' | '3ui' | '4ui';
 type AttributeKind = 'float' | 'vec2' | 'vec3' | 'vec4' | 'mat2' | 'mat3' | 'mat4' | 'mat2x3' | 'mat2x4' | 'mat3x2' | 'mat3x4' | 'mat4x2' | 'mat4x3' | 'int' | 'ivec2' | 'ivec3' | 'ivec4' | 'uint' | 'uvec2' | 'uvec3' | 'uvec4';
-interface AttributeOptions {
+interface AttributeDefinition {
     kind: AttributeKind;
     instanced?: boolean;
     buffer?: WebGLBuffer;
 }
-type AttributeSchema = Record<string | symbol, AttributeOptions>;
+type AttributeSchema = Record<string | symbol, AttributeDefinition>;
 interface AttributeMethods<T = AttributeKind> {
     buffer: WebGLBuffer;
     bind(): void;
@@ -295,11 +288,11 @@ interface InterleavedAttributeLayout {
     key: string | symbol;
     kind: AttributeKind;
 }
-interface InterleavedAttributeOptions {
+interface InterleavedAttributeDefinition {
     layout: InterleavedAttributeLayout[];
     instanced?: boolean;
 }
-type InterleavedAttributeSchema = Record<string | symbol, InterleavedAttributeOptions>;
+type InterleavedAttributeSchema = Record<string | symbol, InterleavedAttributeDefinition>;
 interface InterleavedAttributeMethods<T extends InterleavedAttributeLayout[] = InterleavedAttributeLayout[]> {
     bind(): void;
     unbind(): void;
@@ -311,11 +304,11 @@ type InterleavedAttributeView<T extends InterleavedAttributeSchema> = {
 };
 /**********************************************************************************/
 /**********************************************************************************/
-interface BufferOptions {
+interface BufferDefinition {
     target?: GLTarget;
     usage?: GLUsage;
 }
-type BufferSchema = Record<string | symbol, BufferOptions>;
+type BufferSchema = Record<string | symbol, BufferDefinition>;
 interface BufferMethods {
     set(data: Float32Array | Uint16Array | Uint32Array): void;
     bind(): void;
@@ -326,11 +319,11 @@ type BufferView<T extends BufferSchema> = {
 };
 /**********************************************************************************/
 /**********************************************************************************/
-interface FramebufferOptions extends Omit<TextureOptions, 'data'> {
+interface FramebufferDefinition extends Omit<TextureDefinition, 'data'> {
     attachment: 'color' | 'depth' | 'stencil' | 'depthStencil';
     texture?: WebGLTexture;
 }
-interface TextureOptions {
+interface TextureDefinition {
     target?: GLTextureTarget;
     width: number;
     height: number;
@@ -352,7 +345,7 @@ interface Framebuffer {
 /**********************************************************************************/
 /**********************************************************************************/
 type TextureTarget = 'TEXTURE_2D' | 'TEXTURE_CUBE_MAP' | 'TEXTURE_3D' | 'TEXTURE_2D_ARRAY';
-type TextureSchema = Record<string | symbol, TextureOptions>;
+type TextureSchema = Record<string | symbol, TextureDefinition>;
 interface TextureMethods {
     texture: WebGLTexture;
     dispose(): void;
@@ -390,16 +383,16 @@ interface ViewSchema {
     buffers?: BufferSchema;
 }
 interface ViewSchemaPartial {
-    uniforms?: Record<string | symbol, Partial<UniformOptions>>;
-    attributes?: Record<string | symbol, Partial<AttributeOptions>>;
-    interleavedAttributes?: Record<string | symbol, Partial<InterleavedAttributeOptions>>;
-    buffers?: Record<string | symbol, Partial<BufferOptions>>;
+    uniforms?: Record<string | symbol, Partial<UniformDefinition>>;
+    attributes?: Record<string | symbol, Partial<AttributeDefinition>>;
+    interleavedAttributes?: Record<string | symbol, Partial<InterleavedAttributeDefinition>>;
+    buffers?: Record<string | symbol, Partial<BufferDefinition>>;
 }
 type View<T extends ViewSchema = ViewSchema> = {
-    attributes: T['attributes'] extends AttributeSchema ? AttributeView<T['attributes']> : undefined;
-    interleavedAttributes: T['interleavedAttributes'] extends InterleavedAttributeSchema ? InterleavedAttributeView<T['interleavedAttributes']> : undefined;
-    buffers: T['buffers'] extends BufferSchema ? BufferView<T['buffers']> : undefined;
-    uniforms: T['uniforms'] extends UniformSchema ? UniformView<T['uniforms']> : never;
+    attributes: T['attributes'] extends AttributeSchema ? Prettify<AttributeView<T['attributes']>> : never;
+    interleavedAttributes: T['interleavedAttributes'] extends InterleavedAttributeSchema ? Prettify<InterleavedAttributeView<T['interleavedAttributes']>> : never;
+    buffers: T['buffers'] extends BufferSchema ? Prettify<BufferView<T['buffers']>> : never;
+    uniforms: T['uniforms'] extends UniformSchema ? Prettify<UniformView<T['uniforms']>> : never;
 };
 /**********************************************************************************/
 /**********************************************************************************/
@@ -407,14 +400,14 @@ interface GLSLResult {
     program: WebGLProgram;
     schema: ViewSchema;
 }
-type GLSLSlotItem = GLSLTag | UniformTag | AttributeTag | InterleaveTag | string | number | symbol;
+type GLSLSlotItem = GLSL | UniformToken | AttributeToken | InterleaveToken | string | number | symbol;
 type GLSLSlot = GLSLSlotItem | Array<GLSLSlotItem>;
-interface GLSLTag<TSlots extends GLSLSlot[] = GLSLSlot[]> {
+interface GLSL<TSlots extends GLSLSlot[] = GLSLSlot[]> {
     type: 'glsl';
     template: TemplateStringsArray;
     slots: TSlots;
 }
-type UniformTag<TKey extends string | symbol = string | symbol, TKind extends UniformKind = UniformKind, TOptions extends Partial<UniformOptions> = UniformOptions> = TOptions extends {
+type UniformToken<TKey extends string | symbol = string | symbol, TKind extends UniformKind = UniformKind, TDefinition extends Partial<UniformDefinition> = UniformDefinition> = TDefinition extends {
     size: infer TSize;
 } ? {
     type: 'uniform';
@@ -426,26 +419,62 @@ type UniformTag<TKey extends string | symbol = string | symbol, TKind extends Un
     kind: TKind;
     key: TKey;
 };
-interface UniformTagFn<TKind extends UniformKind> {
-    <const TKey extends string | symbol, const TOptions extends Omit<UniformOptions, 'kind'>>(key: TKey, TOptions: TOptions): Prettify<UniformTag<TKey, TKind, TOptions>>;
-    <const TName extends string | symbol>(key: TName): Prettify<UniformTag<TName, TKind>>;
+interface UniformTokenFn<TKind extends UniformKind> {
+    <const TKey extends string | symbol, const TDefinition extends Omit<UniformDefinition, 'kind'>>(key: TKey, TDefinition: TDefinition): Prettify<UniformToken<TKey, TKind, TDefinition>>;
+    <const TName extends string | symbol>(key: TName): Prettify<UniformToken<TName, TKind>>;
 }
-interface AttributeTag<TKey extends string | symbol = string | symbol, TKind extends AttributeKind = AttributeKind, TInstanced extends boolean | undefined = boolean | undefined> {
+interface AttributeToken<TKey extends string | symbol = string | symbol, TKind extends AttributeKind = AttributeKind, TInstanced extends boolean | undefined = boolean | undefined> {
     type: 'attribute';
     kind: TKind;
     instanced: TInstanced;
     key: TKey;
 }
-interface AttributeTagFn<TKey extends AttributeKind> {
-    <TName extends string | symbol, TOptions extends Omit<AttributeOptions, 'kind'>>(key: TName, options: TOptions): Prettify<AttributeTag<TName, TKey, TOptions['instanced']>>;
-    <TName extends string | symbol>(key: TName): Prettify<AttributeTag<TName, TKey, undefined>>;
+interface AttributeTokenFn<TKey extends AttributeKind> {
+    <TName extends string | symbol, TDefinition extends Omit<AttributeDefinition, 'kind'>>(key: TName, options: TDefinition): Prettify<AttributeToken<TName, TKey, TDefinition['instanced']>>;
+    <TName extends string | symbol>(key: TName): Prettify<AttributeToken<TName, TKey, undefined>>;
 }
-type InterleaveTag<TKey extends string | symbol = string | symbol, TLayout extends Array<AttributeTag<string | symbol, AttributeKind, undefined>> = Array<AttributeTag<string | symbol, AttributeKind, undefined>>, TOptions extends Omit<AttributeOptions, 'kind'> = Omit<AttributeOptions, 'kind'>> = TOptions & {
+type InterleaveToken<TKey extends string | symbol = string | symbol, TLayout extends Array<AttributeToken<string | symbol, AttributeKind, undefined>> = Array<AttributeToken<string | symbol, AttributeKind, undefined>>, TDefinition extends Omit<AttributeDefinition, 'kind'> = Omit<AttributeDefinition, 'kind'>> = TDefinition & {
     key: TKey;
     type: 'interleavedAttribute';
     layout: {
         [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 GLSLToView<T extends GLSL> = View<GLSLToSchema<T>>;
+type GLSLSlotsToSchema<TSlots extends Array<GLSLSlot>> = {
+    uniforms: {
+        [K in Extract<TSlots[number], UniformToken> as K['key']]: Prettify<Omit<K, 'name' | 'type'>>;
+    };
+    attributes: {
+        [K in Extract<TSlots[number], AttributeToken> as K['key']]: Prettify<Omit<K, 'name' | 'type'>>;
+    };
+    interleavedAttributes: {
+        [K in Extract<TSlots[number], InterleaveToken> as K['key']]: Prettify<Omit<K, 'name' | '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 MergeGLSLSchema<TVertex extends ViewSchema, TFragment extends ViewSchema, TOverrides extends ViewSchemaPartial = {}> = {
+    uniforms: DeepMerge<[
+        ShallowMerge<[TVertex['uniforms'], TFragment['uniforms']]>,
+        TOverrides['uniforms']
+    ]>;
+    attributes: DeepMerge<[
+        ShallowMerge<[TVertex['attributes'], TFragment['attributes']]>,
+        TOverrides['attributes']
+    ]>;
+    interleavedAttributes: DeepMerge<[
+        ShallowMerge<[TVertex['interleavedAttributes'], TFragment['interleavedAttributes']]>,
+        TOverrides['interleavedAttributes']
+    ]>;
+};
+type CompileResult<TVertex extends GLSL, TFragment extends GLSL, TOverrideSchema extends ViewSchemaPartial> = MergeGLSLSchema<GLSLToSchema<TVertex>, GLSLToSchema<TFragment>, TOverrideSchema> extends infer TSchema extends ViewSchema ? {
+    program: WebGLProgram;
+    schema: TSchema;
+    view: Prettify<View<TSchema>>;
+    vertex: string;
+    fragment: string;
+} : never;
 
-export type { AttributeTag as $, AttributeSchema as A, BufferSchema as B, TextureParameterName as C, DeepMerge as D, TextureParameterValue as E, FramebufferOptions as F, GL as G, TextureParameters as H, InterleavedAttributeSchema as I, InternalFormat as J, KIND_TO_UNIFORM_FN_NAME_MAP as K, Format as L, Merge as M, PixelType as N, TexImage2DOptions as O, Prettify as P, ViewSchemaPartial as Q, RemoveSuffix as R, ShallowMerge as S, TextureOptions as T, UniformSchema as U, ViewSchema as V, GLSLResult as W, GLSLSlot as X, GLSLTag as Y, UniformTag as Z, UniformTagFn as _, ViewOptions as a, AttributeTagFn as a0, InterleaveTag as a1, View as b, UniformView as c, AttributeView as d, InterleavedAttributeView as e, BufferView as f, KIND_TO_SIZE_MAP as g, UniformFnName as h, UniformKind as i, UniformOptions as j, UniformSchemaPartial as k, UniformMethods as l, AttributeShortHand as m, AttributeKind as n, AttributeOptions as o, AttributeMethods as p, InterleavedAttributeLayout as q, InterleavedAttributeOptions as r, InterleavedAttributeMethods as s, BufferOptions as t, BufferMethods as u, Framebuffer as v, TextureTarget as w, TextureSchema as x, TextureMethods as y, TextureView as z };
+export type { UniformToken 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, Format as R, PixelType as S, TextureDefinition as T, UniformSchema as U, ViewSchema as V, TexImage2DOptions as W, ViewSchemaPartial as X, GLSLResult as Y, GLSLSlot as Z, GLSL as _, ViewOptions as a, UniformTokenFn as a0, AttributeToken as a1, AttributeTokenFn as a2, InterleaveToken as a3, GLSLToSchema as a4, GLSLToView as a5, GLSLSlotsToSchema as a6, MergeGLSLSchema as a7, CompileResult as a8, Prettify as a9, 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 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bigmistqke/view.gl",
-  "version": "0.1.6",
-  "description": "🪟 Utilities for managing WebGL resources.",
+  "version": "0.1.8",
+  "description": "👀 Utilities for managing WebGL resources.",
   "exports": {
     ".": {
       "import": "./dist/index.mjs",

package/src/features.ts

@@ -1,4 +1,5 @@
-import type { GL, RemoveSuffix } from './types'
+import { RemoveSuffix } from './type-utils'
+import type { GL } from './types'
 
 const INSTANCED_ARRAYS_WRAPPER_MAP = new WeakMap<
   GL,

package/src/tag.ts

@@ -1,20 +1,18 @@
 import { toID, view } from '.'
+import type { Prettify } from './type-utils'
 import type {
+  AttributeDefinition,
   AttributeKind,
-  AttributeOptions,
-  AttributeTag,
-  AttributeTagFn as AttributeTagMethod,
-  DeepMerge,
+  AttributeTokenFn as AttributeTagMethod,
+  AttributeToken,
+  CompileResult,
+  GLSL,
   GLSLSlot,
-  GLSLTag,
-  InterleaveTag,
-  Prettify,
-  ShallowMerge,
+  GLSLToSchema,
+  InterleaveToken,
+  UniformDefinition,
   UniformKind,
-  UniformOptions,
-  UniformTag,
-  UniformTagFn as UniformTagMethod,
-  View,
+  UniformTokenFn as UniformTagMethod,
   ViewSchema,
   ViewSchemaPartial,
 } from './types'
@@ -23,7 +21,7 @@ import { createProgram } from './utils'
 export function glsl<TSlot extends GLSLSlot, TSlots extends TSlot[]>(
   template: TemplateStringsArray,
   ...slots: [...TSlots]
-): GLSLTag<TSlots> {
+): GLSL<TSlots> {
   return { template, slots, type: 'glsl' }
 }
 
@@ -35,7 +33,7 @@ export const uniform = new Proxy(
     get(target, property) {
       // @ts-expect-error
       if (typeof property === 'symbol') return target[property]
-      return (key: string, options?: Omit<UniformOptions, 'kind'>) => ({
+      return (key: string, options?: Omit<UniformDefinition, 'kind'>) => ({
         type: 'uniform',
         key,
         kind: property,
@@ -53,7 +51,7 @@ export const attribute = new Proxy(
     get(target, property) {
       // @ts-expect-error
       if (typeof property === 'symbol') return target[property]
-      return (key: string, options?: Omit<AttributeOptions, 'kind'>) => ({
+      return (key: string, options?: Omit<AttributeDefinition, 'kind'>) => ({
         type: 'attribute',
         key,
         kind: property,
@@ -65,17 +63,17 @@ export const attribute = new Proxy(
 
 export function interleave<
   const TKey extends string | symbol,
-  const TLayout extends Array<AttributeTag<string | symbol, AttributeKind, undefined>>,
-  const TOptions extends Omit<AttributeOptions, 'kind'>,
->(key: TKey, layout: TLayout, instanced: TOptions): InterleaveTag<TKey, TLayout, TOptions>
+  const TLayout extends Array<AttributeToken<string | symbol, AttributeKind, undefined>>,
+  const TOptions extends Omit<AttributeDefinition, 'kind'>,
+>(key: TKey, layout: TLayout, instanced: TOptions): InterleaveToken<TKey, TLayout, TOptions>
 export function interleave<
   const TKey extends string | symbol,
-  const TLayout extends Array<AttributeTag<string | symbol, AttributeKind, undefined>>,
->(key: TKey, layout: TLayout): InterleaveTag<TKey, TLayout, { instanced: false }>
+  const TLayout extends Array<AttributeToken<string | symbol, AttributeKind, undefined>>,
+>(key: TKey, layout: TLayout): InterleaveToken<TKey, TLayout, { instanced: false }>
 export function interleave<
   const TKey extends string | symbol,
-  const TLayout extends Array<AttributeTag<string | symbol, AttributeKind, undefined>>,
-  const TOptions extends Omit<AttributeOptions, 'kind'>,
+  const TLayout extends Array<AttributeToken<string | symbol, AttributeKind, undefined>>,
+  const TOptions extends Omit<AttributeDefinition, 'kind'>,
 >(key: TKey, layout: TLayout, { instanced, buffer }: Partial<TOptions> = {}) {
   return {
     type: 'interleavedAttribute',
@@ -87,7 +85,7 @@ export function interleave<
     })),
     instanced: !!instanced,
     buffer,
-  } as unknown as InterleaveTag<TKey, TLayout, TOptions>
+  } as unknown as InterleaveToken<TKey, TLayout, TOptions>
 }
 
 /**********************************************************************************/
@@ -96,83 +94,13 @@ export function interleave<
 /*                                                                                */
 /**********************************************************************************/
 
-type glslTagToSchema<TTag extends GLSLTag> =
-  FlattenSlots<TTag> extends infer TSlots
-    ? TSlots extends Array<any>
-      ? GLSLSlotsToSchema<TSlots>
-      : never
-    : never
-
-type GLSLSlotsToSchema<TSlots extends Array<GLSLSlot>> = {
-  uniforms: {
-    [K in Extract<TSlots[number], UniformTag> as K['key']]: Prettify<Omit<K, 'name' | 'type'>>
-  }
-  attributes: {
-    [K in Extract<TSlots[number], AttributeTag> as K['key']]: Prettify<Omit<K, 'name' | 'type'>>
-  }
-  interleavedAttributes: {
-    [K in Extract<TSlots[number], InterleaveTag> as K['key']]: Prettify<Omit<K, 'name' | 'type'>>
-  }
-}
-
-type FlattenSlots<T> =
-  T extends GLSLTag<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 GLSLTag
-    ? [...FlattenSlots<First>, ...FlattenSlots<Rest>]
-    : First extends unknown[]
-      ? [...FlattenSlots<First>, ...FlattenSlots<Rest>]
-      : [First, ...FlattenSlots<Rest>]
-  : []
-
-type MergeGLSLSchema<
-  TVertex extends ViewSchema,
-  TFragment extends ViewSchema,
-  TOverrides extends ViewSchemaPartial,
-> = {
-  uniforms: DeepMerge<
-    [ShallowMerge<[TVertex['uniforms'], TFragment['uniforms']]>, TOverrides['uniforms']]
-  >
-  attributes: DeepMerge<
-    [ShallowMerge<[TVertex['attributes'], TFragment['attributes']]>, TOverrides['attributes']]
-  >
-  interleavedAttributes: DeepMerge<
-    [
-      ShallowMerge<[TVertex['interleavedAttributes'], TFragment['interleavedAttributes']]>,
-      TOverrides['interleavedAttributes'],
-    ]
-  >
-}
-
-type CompileResult<
-  TVertex extends GLSLTag,
-  TFragment extends GLSLTag,
-  TOverrides extends ViewSchemaPartial,
-> =
-  MergeGLSLSchema<
-    glslTagToSchema<TVertex>,
-    glslTagToSchema<TFragment>,
-    TOverrides
-  > extends infer TSchema extends ViewSchema
-    ? {
-        program: WebGLProgram
-        schema: TSchema
-        view: View<TSchema>
-      }
-    : never
-
 export function compile<
-  TVertex extends GLSLTag,
-  TFragment extends GLSLTag,
+  TVertex extends GLSL,
+  TFragment extends GLSL,
   TOverride extends ViewSchemaPartial,
 >(gl: WebGLRenderingContext, vertex: TVertex, fragment: TFragment, overrideSchema?: TOverride) {
-  const _vertex = resolveGLSLTag(vertex)
-  const _fragment = resolveGLSLTag(fragment)
+  const _vertex = resolveGLSLTag(vertex) as { template: string; schema: ViewSchema }
+  const _fragment = resolveGLSLTag(fragment) as { template: string; schema: ViewSchema }
 
   const schema = {
     uniforms: {
@@ -194,9 +122,7 @@ export function compile<
     const overrideSchemaKind = overrideSchema[kind]
 
     for (const key in overrideSchemaKind) {
-      // @ts-expect-error
       schemaKind[key] = {
-        // @ts-expect-error
         ...schemaKind[key],
         ...overrideSchemaKind[key],
       }
@@ -209,17 +135,19 @@ export function compile<
     program,
     schema,
     view: view(gl, program, schema),
-  } as CompileResult<TVertex, TFragment, TOverride>
+    vertex: _vertex.template,
+    fragment: _fragment.template,
+  } as unknown as Prettify<CompileResult<TVertex, TFragment, TOverride>>
 }
 
-function resolveGLSLTag<TTag extends GLSLTag>(tag: TTag) {
+function resolveGLSLTag<TTag extends GLSL>(tag: TTag) {
   return {
-    template: glslTagToString(tag),
-    schema: glslTagToSchema(tag),
+    template: compile.toString(tag),
+    schema: compile.toSchema(tag),
   }
 }
 
-function glslTagToSchema<TTag extends GLSLTag>(tag: TTag) {
+compile.toSchema = function <TTag extends GLSL>(tag: TTag) {
   const result = {
     uniforms: {},
     attributes: {},
@@ -237,7 +165,7 @@ function glslTagToSchema<TTag extends GLSLTag>(tag: TTag) {
     }
 
     if (slot.type === 'glsl') {
-      const { uniforms, attributes, interleavedAttributes } = glslTagToSchema(slot)
+      const { uniforms, attributes, interleavedAttributes } = compile.toSchema(slot)
 
       result.uniforms = {
         ...result.uniforms,
@@ -263,45 +191,10 @@ function glslTagToSchema<TTag extends GLSLTag>(tag: TTag) {
 
   tag.slots.forEach(handleSlot)
 
-  return result
+  return result as unknown as Prettify<GLSLToSchema<TTag>>
 }
 
-// function glslSlotToSchema(slot: GLSLSlot){
-//   if(Array.isArray(slot)){
-
-//     return
-//   }
-
-//   if (typeof slot !== 'object') {
-//       return
-//     }
-
-//   if (slot.type === 'glsl') {
-//       return glslTagToSchema(slot)
-
-//       // result.uniforms = {
-//       //   ...result.uniforms,
-//       //   ...uniforms,
-//       // }
-//       // result.attributes = {
-//       //   ...result.attributes,
-//       //   ...attributes,
-//       // }
-//       // result.interleavedAttributes = {
-//       //   ...result.interleavedAttributes,
-//       //   ...interleavedAttributes,
-//       // }
-
-//       // continue
-//     }
-
-//     const { key: name, type, ...rest } = slot
-
-//     // @ts-expect-error
-//     result[`${type}s`][name] = rest
-// }
-
-function glslTagToString<TTag extends GLSLTag>({ template: [initial, ...rest], slots }: TTag) {
+compile.toString = function <TTag extends GLSL>({ template: [initial, ...rest], slots }: TTag) {
   const v300 = !!initial?.startsWith('#version 300 es')
 
   let template = initial ?? ''
@@ -323,7 +216,7 @@ function glslSlotToString(slot: GLSLSlot, v300: boolean): string {
   }
 
   if (slot.type === 'glsl') {
-    return glslTagToString(slot)
+    return compile.toString(slot)
   }
 
   if (slot.type === 'interleavedAttribute') {

package/src/type-utils.ts

@@ -0,0 +1,43 @@
+export type Prettify<T> = {
+  [K in keyof T]: T[K]
+} & {}
+
+export type RemoveSuffix<T, S extends string> = {
+  [K in keyof T as K extends `${infer Prefix}${S}` ? Prefix : K]: T[K]
+}
+
+export 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
+}
+
+// see https://stackoverflow.com/a/49683575
+export type ShallowMerge<A extends readonly [...any]> = A extends [infer L, ...infer R]
+  ? ShallowMergeTwo<L, ShallowMerge<R>>
+  : unknown
+
+type OptionalPropertyNames<T> = {
+  [K in keyof T]-?: {} extends { [P in K]: T[K] } ? K : never
+}[keyof T]
+
+type SpreadProperties<L, R, K extends keyof L & keyof R> = {
+  [P in K]: L[P] | Exclude<R[P], undefined>
+}
+
+type Id<T> = T extends infer U ? { [K in keyof U]: U[K] } : 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>
+>