Export types

Author: svey-xyz

README.md

@@ -41,7 +41,7 @@ const hook = {
 }
 
 Shader.addHook(hook) // use addHook method
-<SimpleShaderCanvas args={{ hooks:[hook] }} /> // or pass on init
+<SimpleShaderCanvas args={{ hooks:[hook] }} /> // or pass on construction
 ```
 
 ### Basic Usage

src/core/index.ts

@@ -1,6 +1,4 @@
 import { Shader } from './shader'
-import { MethodName } from './domHandler'
-import ShaderTypes from '../types'
 
-
-export { Shader, MethodName, ShaderTypes }
+export { Shader }
+export * from '../types/index.d'

src/core/shader.ts

@@ -1,6 +1,6 @@
-import { ShaderArgs, UniformValue, ShaderHook } from "../types";
+// import { ShaderArgs, UniformValue, ShaderHook } from "../types";
 import { domHandler, MethodName } from "./domHandler";
-
+import ShaderTypes from "../types"
 
 /** Shader Class
  * @export
@@ -9,14 +9,14 @@ import { domHandler, MethodName } from "./domHandler";
  *
  */
 export class Shader extends domHandler {
-	private hooks: Record<string, ShaderHook[]> = {};
+	private hooks: Record<string, ShaderTypes.ShaderHook[]> = {};
 	private gl: WebGLRenderingContext;
 	private shaderProgram: WebGLProgram;
 	private vertexBuffer: WebGLBuffer;
-	private uniforms: Array<UniformValue> | undefined
+	private uniforms: Array<ShaderTypes.UniformValue> | undefined
 	private loadedClass: string = 'loaded'
 
-	constructor(container: HTMLCanvasElement, args: ShaderArgs) {
+	constructor(container: HTMLCanvasElement, args: ShaderTypes.ShaderArgs) {
 		super(container);
 		this.gl = container.getContext('webgl') as WebGLRenderingContext;
 		this.shaderProgram = this.initializeShader(args.vertShader, args.fragShader);
@@ -42,7 +42,7 @@ export class Shader extends domHandler {
 		this.container.classList.add(this.loadedClass)
 	}
 
-	public addHook(methodName: MethodName, hook: ShaderHook): void {
+	public addHook(methodName: MethodName, hook: ShaderTypes.ShaderHook): void {
 		if (!this.hooks[methodName]) this.hooks[methodName] = [];
 		this.hooks[methodName].push(hook);
 	}
@@ -133,7 +133,7 @@ export class Shader extends domHandler {
 	}
 
 	/**  Gets a uniform value from the shader */
-	public getUniform(name: string): UniformValue | undefined {
+	public getUniform(name: string): ShaderTypes.UniformValue | undefined {
 		const uLoc = this.gl.getUniformLocation(this.shaderProgram, name);
 		if (!uLoc) {
 			console.error(`Uniform ${name} not found.`);
@@ -144,7 +144,7 @@ export class Shader extends domHandler {
 	}
 
 	/**  Sets a uniform value for the shader */
-	public setUniform(uniform: UniformValue): void {
+	public setUniform(uniform: ShaderTypes.UniformValue): void {
 		const { name, type, value } = uniform
 		const uLoc = this.gl.getUniformLocation(this.shaderProgram, name);
 

src/types/index.d.ts

@@ -1,41 +1,40 @@
-import { Shader } from "../core"
-import { MethodName } from "../core/domHandler";
+import { Shader as _Shader } from "../core"
+import { MethodName as _MethodName } from "../core/domHandler";
 
-declare namespace simpleShaderComponent {
 
-	type ShaderHook = (shader: Shader, ...args: any[]) => void;
+export type Shader = _Shader;
+export type MethodName = _MethodName;
 
-	/** 
-	 * @param logic Logic should be functions passed as strings that take the form (shader: Shader) => void
-	 * */
-	type ShaderArgs = {
-		vertShader?: string,
-		fragShader?: string,
-		uniforms?: Array<UniformValue>,
-		hooks?: Array<{ methodName: MethodName, hook: ShaderHook }>
-		/** Default 'loaded' */
-		loadedClass?: string
-	}
+export type ShaderHook = (shader: Shader, ...args: any[]) => void;
 
-	type UniformValue = {
-		name: string,
-		type: UniformType,
-		value: any
-	}
+/** 
+ * @param logic Logic should be functions passed as strings that take the form (shader: Shader) => void
+ * */
+export type ShaderArgs = {
+	vertShader?: string,
+	fragShader?: string,
+	uniforms?: Array<UniformValue>,
+	hooks?: Array<{ methodName: MethodName, hook: ShaderHook }>
+	/** Default 'loaded' */
+	loadedClass?: string
+}
 
-	type UniformType =
-		| "float"
-		| "vec2"
-		| "vec3"
-		| "vec4"
-		| "int"
-		| "ivec2"
-		| "ivec3"
-		| "ivec4"
-		| "mat2"
-		| "mat3"
-		| "mat4";
+export type UniformValue = {
+	name: string,
+	type: UniformType,
+	value: any
 }
 
-export = simpleShaderComponent;
-export as namespace simpleShaderComponent;
+export type UniformType =
+	| "float"
+	| "vec2"
+	| "vec3"
+	| "vec4"
+	| "int"
+	| "ivec2"
+	| "ivec3"
+	| "ivec4"
+	| "mat2"
+	| "mat3"
+	| "mat4";
+