@bigmistqke/view.gl 0.1.7 → 0.1.9

package/src/types.ts

@@ -416,7 +416,7 @@ export interface AttributeMethods<T = AttributeKind> {
 }
 
 export type AttributeView<T extends AttributeSchema> = {
-  [K in keyof T]: AttributeMethods<T[K]['kind']>
+  [K in keyof T]: Prettify<AttributeMethods<T[K]['kind']>>
 }
 
 /**********************************************************************************/
@@ -633,12 +633,14 @@ export interface ViewSchemaPartial {
 }
 
 export type View<T extends ViewSchema = ViewSchema> = {
-  attributes: T['attributes'] extends AttributeSchema ? AttributeView<T['attributes']> : undefined
+  attributes: T['attributes'] extends AttributeSchema
+    ? Prettify<AttributeView<T['attributes']>>
+    : {}
   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
+    ? Prettify<InterleavedAttributeView<T['interleavedAttributes']>>
+    : {}
+  buffers: T['buffers'] extends BufferSchema ? Prettify<BufferView<T['buffers']>> : {}
+  uniforms: T['uniforms'] extends UniformSchema ? Prettify<UniformView<T['uniforms']>> : {}
 }
 
 /**********************************************************************************/
@@ -652,17 +654,24 @@ export interface GLSLResult {
   schema: ViewSchema
 }
 
-type GLSLSlotItem = GLSLTag | UniformTag | AttributeTag | InterleaveTag | string | number | symbol
+type GLSLSlotItem =
+  | GLSL
+  | UniformToken
+  | AttributeToken
+  | InterleaveToken
+  | string
+  | number
+  | symbol
 
 export type GLSLSlot = GLSLSlotItem | Array<GLSLSlotItem>
 
-export interface GLSLTag<TSlots extends GLSLSlot[] = GLSLSlot[]> {
+export interface GLSL<TSlots extends GLSLSlot[] = GLSLSlot[]> {
   type: 'glsl'
   template: TemplateStringsArray
   slots: TSlots
 }
 
-export type UniformTag<
+export type UniformToken<
   TKey extends string | symbol = string | symbol,
   TKind extends UniformKind = UniformKind,
   TDefinition extends Partial<UniformDefinition> = UniformDefinition,
@@ -679,37 +688,37 @@ export type UniformTag<
       key: TKey
     }
 
-export interface UniformTagFn<TKind extends UniformKind> {
+export interface UniformTokenFn<TKind extends UniformKind> {
   <const TKey extends string | symbol, const TDefinition extends Omit<UniformDefinition, 'kind'>>(
     key: TKey,
     TDefinition: TDefinition,
-  ): Prettify<UniformTag<TKey, TKind, TDefinition>>
-  <const TName extends string | symbol>(key: TName): Prettify<UniformTag<TName, TKind>>
+  ): Prettify<UniformToken<TKey, TKind, TDefinition>>
+  <const TName extends string | symbol>(key: TName): Prettify<UniformToken<TName, TKind>>
 }
 
-export interface AttributeTag<
+export interface AttributeToken<
   TKey extends string | symbol = string | symbol,
   TKind extends AttributeKind = AttributeKind,
   TInstanced extends boolean | undefined = boolean | undefined,
 > {
   type: 'attribute'
   kind: TKind
-  instanced: TInstanced
+  instanced: TInstanced extends boolean ? boolean : false
   key: TKey
 }
 
-export interface AttributeTagFn<TKey extends AttributeKind> {
+export interface AttributeTokenFn<TKey extends AttributeKind> {
   <TName extends string | symbol, TDefinition extends Omit<AttributeDefinition, 'kind'>>(
     key: TName,
     options: TDefinition,
-  ): Prettify<AttributeTag<TName, TKey, TDefinition['instanced']>>
-  <TName extends string | symbol>(key: TName): Prettify<AttributeTag<TName, TKey, undefined>>
+  ): Prettify<AttributeToken<TName, TKey, TDefinition['instanced']>>
+  <TName extends string | symbol>(key: TName): Prettify<AttributeToken<TName, TKey, undefined>>
 }
 
-export type InterleaveTag<
+export type InterleaveToken<
   TKey extends string | symbol = string | symbol,
-  TLayout extends Array<AttributeTag<string | symbol, AttributeKind, undefined>> = Array<
-    AttributeTag<string | symbol, AttributeKind, undefined>
+  TLayout extends Array<AttributeToken<string | symbol, AttributeKind, undefined>> = Array<
+    AttributeToken<string | symbol, AttributeKind, undefined>
   >,
   TDefinition extends Omit<AttributeDefinition, 'kind'> = Omit<AttributeDefinition, 'kind'>,
 > = TDefinition & {
@@ -720,34 +729,36 @@ export type InterleaveTag<
   }
 }
 
-export type GLSLTagToSchema<TTag extends GLSLTag> =
-  FlattenSlots<TTag> extends infer TSlots
+export type GLSLToSchema<T extends GLSL> =
+  FlattenSlots<T> extends infer TSlots
     ? TSlots extends Array<any>
       ? GLSLSlotsToSchema<TSlots>
       : never
     : never
 
+export type GLSLToView<T extends GLSL> = View<GLSLToSchema<T>>
+
 export type GLSLSlotsToSchema<TSlots extends Array<GLSLSlot>> = {
   uniforms: {
-    [K in Extract<TSlots[number], UniformTag> as K['key']]: Prettify<Omit<K, 'name' | 'type'>>
+    [K in Extract<TSlots[number], UniformToken> as K['key']]: Prettify<Omit<K, 'name' | 'type'>>
   }
   attributes: {
-    [K in Extract<TSlots[number], AttributeTag> as K['key']]: Prettify<Omit<K, 'name' | 'type'>>
+    [K in Extract<TSlots[number], AttributeToken> as K['key']]: Prettify<Omit<K, 'name' | 'type'>>
   }
   interleavedAttributes: {
-    [K in Extract<TSlots[number], InterleaveTag> as K['key']]: Prettify<Omit<K, 'name' | 'type'>>
+    [K in Extract<TSlots[number], InterleaveToken> as K['key']]: Prettify<Omit<K, 'name' | 'type'>>
   }
 }
 
 type FlattenSlots<T> =
-  T extends GLSLTag<infer TSlots>
+  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 GLSLTag
+  ? First extends GLSL
     ? [...FlattenSlots<First>, ...FlattenSlots<Rest>]
     : First extends unknown[]
       ? [...FlattenSlots<First>, ...FlattenSlots<Rest>]
@@ -757,35 +768,51 @@ type _FlattenSlots<T extends Array<GLSLSlot>> = T extends [infer First, ...infer
 export 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'],
-    ]
-  >
-}
+  TOverrides extends ViewSchemaPartial | undefined = {},
+> = TOverrides extends ViewSchemaPartial
+  ? {
+      uniforms: Prettify<
+        DeepMerge<
+          [ShallowMerge<[TVertex['uniforms'], TFragment['uniforms']]>, TOverrides['uniforms']]
+        >
+      >
+      attributes: Prettify<
+        DeepMerge<
+          [ShallowMerge<[TVertex['attributes'], TFragment['attributes']]>, TOverrides['attributes']]
+        >
+      >
+      interleavedAttributes: Prettify<
+        DeepMerge<
+          [
+            ShallowMerge<[TVertex['interleavedAttributes'], TFragment['interleavedAttributes']]>,
+            TOverrides['interleavedAttributes'],
+          ]
+        >
+      >
+    }
+  : {
+      uniforms: Prettify<ShallowMerge<[TVertex['uniforms'], TFragment['uniforms']]>>
+      attributes: Prettify<ShallowMerge<[TVertex['attributes'], TFragment['attributes']]>>
+      interleavedAttributes: Prettify<
+        ShallowMerge<[TVertex['interleavedAttributes'], TFragment['interleavedAttributes']]>
+      >
+    }
 
 export type CompileResult<
-  TVertex extends GLSLTag,
-  TFragment extends GLSLTag,
-  TOverrides extends ViewSchemaPartial,
+  TVertex extends GLSL,
+  TFragment extends GLSL,
+  TOverrideSchema extends ViewSchemaPartial | undefined,
 > =
   MergeGLSLSchema<
-    GLSLTagToSchema<TVertex>,
-    GLSLTagToSchema<TFragment>,
-    TOverrides
+    GLSLToSchema<TVertex>,
+    GLSLToSchema<TFragment>,
+    TOverrideSchema
   > extends infer TSchema extends ViewSchema
     ? {
         program: WebGLProgram
         schema: TSchema
-        view: View<TSchema>
+        view: Prettify<View<TSchema>>
+        vertex: string
+        fragment: string
       }
     : never