@flighthq/effects-gl 0.3.0-next.1220.6982c21 → 0.3.0-next.1248.f867198

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flighthq/effects-gl",
-  "version": "0.3.0-next.1220.6982c21",
+  "version": "0.3.0-next.1248.f867198",
   "repository": {
     "type": "git",
     "url": "https://github.com/flighthq/flight.git",
@@ -36,11 +36,11 @@
     "clean:dist": "tsx ../../scripts/clean-package-dist.ts"
   },
   "dependencies": {
-    "@flighthq/adjustments": "0.3.0-next.1220.6982c21",
-    "@flighthq/effects": "0.3.0-next.1220.6982c21",
-    "@flighthq/geometry": "0.3.0-next.1220.6982c21",
-    "@flighthq/render-gl": "0.3.0-next.1220.6982c21",
-    "@flighthq/types": "0.3.0-next.1220.6982c21"
+    "@flighthq/adjustments": "0.3.0-next.1248.f867198",
+    "@flighthq/effects": "0.3.0-next.1248.f867198",
+    "@flighthq/geometry": "0.3.0-next.1248.f867198",
+    "@flighthq/render-gl": "0.3.0-next.1248.f867198",
+    "@flighthq/types": "0.3.0-next.1248.f867198"
   },
   "devDependencies": {
     "typescript": "^5.3.0"

package/src/glDropShadowEffect.test.ts

@@ -1,37 +1,43 @@
-vi.hoisted(() => {
+import type * as GldropshadoweffectModule from './glDropShadowEffect';
+import type * as GleffectblitshaderModule from './glEffectBlitShader';
+
+// Mocked per file with doMock plus dynamic imports of the subject, not top-level hoisted vi.mock.
+// The suite runs isolate:false over a shared module registry, so a hoisted mock is registered for
+// every file in the worker rather than this one -- see the rule in the root vitest config.
+let applyDropShadowEffectToGl: typeof GldropshadoweffectModule.applyDropShadowEffectToGl;
+let defaultGlDropShadowEffectRunner: typeof GldropshadoweffectModule.defaultGlDropShadowEffectRunner;
+let applyGlEffectBlitPass: typeof GleffectblitshaderModule.applyGlEffectBlitPass;
+let applyGlEffectErasePass: typeof GleffectblitshaderModule.applyGlEffectErasePass;
+
+beforeAll(async () => {
   vi.resetModules();
+  vi.doMock('@flighthq/render-gl/contract', () => {
+    let nextTargetId = 0;
+    return {
+      acquireGlRenderTarget: vi.fn((_state, _pool, descriptor) => ({
+        ...descriptor,
+        id: `scratch-${nextTargetId++}`,
+        texture: {},
+      })),
+      clearGlRenderTarget: vi.fn(),
+      releaseGlRenderTarget: vi.fn(),
+    };
+  });
+  vi.doMock('./glEffectBlitShader', () => ({
+    applyGlEffectBlitOffsetPass: vi.fn(),
+    applyGlEffectBlitPass: vi.fn(),
+    applyGlEffectErasePass: vi.fn(),
+  }));
+  vi.doMock('./glEffectBoxBlur', () => ({
+    applyGlEffectBoxBlur: vi.fn(),
+  }));
+  vi.doMock('./glEffectTintShader', () => ({
+    applyGlEffectTintPass: vi.fn(),
+  }));
+  ({ applyDropShadowEffectToGl, defaultGlDropShadowEffectRunner } = await import('./glDropShadowEffect'));
+  ({ applyGlEffectBlitPass, applyGlEffectErasePass } = await import('./glEffectBlitShader'));
 });
 
-vi.mock('@flighthq/render-gl/contract', () => {
-  let nextTargetId = 0;
-  return {
-    acquireGlRenderTarget: vi.fn((_state, _pool, descriptor) => ({
-      ...descriptor,
-      id: `scratch-${nextTargetId++}`,
-      texture: {},
-    })),
-    clearGlRenderTarget: vi.fn(),
-    releaseGlRenderTarget: vi.fn(),
-  };
-});
-
-vi.mock('./glEffectBlitShader', () => ({
-  applyGlEffectBlitOffsetPass: vi.fn(),
-  applyGlEffectBlitPass: vi.fn(),
-  applyGlEffectErasePass: vi.fn(),
-}));
-
-vi.mock('./glEffectBoxBlur', () => ({
-  applyGlEffectBoxBlur: vi.fn(),
-}));
-
-vi.mock('./glEffectTintShader', () => ({
-  applyGlEffectTintPass: vi.fn(),
-}));
-
-import { applyDropShadowEffectToGl, defaultGlDropShadowEffectRunner } from './glDropShadowEffect';
-import { applyGlEffectBlitPass, applyGlEffectErasePass } from './glEffectBlitShader';
-
 describe('applyDropShadowEffectToGl', () => {
   it('is a function', () => {
     expect(typeof applyDropShadowEffectToGl).toBe('function');
@@ -85,7 +91,7 @@ beforeEach(() => {
 });
 
 afterAll(() => {
-  vi.doUnmock('@flighthq/render-gl');
+  vi.doUnmock('@flighthq/render-gl/contract');
   vi.doUnmock('./glEffectBlitShader');
   vi.doUnmock('./glEffectBoxBlur');
   vi.doUnmock('./glEffectTintShader');

package/src/glEffectBoxBlur.test.ts

@@ -1,25 +1,30 @@
-const glMock = vi.hoisted(() => ({
+import type * as GlEffectBoxBlurModule from './glEffectBoxBlur';
+
+// Mocked per file with doMock plus a dynamic import of the subject, not a top-level hoisted vi.mock.
+// The suite runs isolate:false over a shared module registry, so a hoisted mock is registered for
+// every file in the worker rather than this one -- see the rule in the root vitest config.
+const glMock = {
   ONE: 1,
   ZERO: 0,
   blendFunc: vi.fn(),
   uniform1f: vi.fn(),
   uniform2f: vi.fn(),
   uniform4f: vi.fn(),
-}));
+};
+
+let applyGlEffectBoxBlur: typeof GlEffectBoxBlurModule.applyGlEffectBoxBlur;
 
-vi.hoisted(() => {
+beforeAll(async () => {
   vi.resetModules();
+  vi.doMock('@flighthq/render-gl/contract', () => ({
+    compileGlFullscreenProgram: vi.fn(() => ({ program: {}, vao: {} })),
+    drawGlFullscreenPass: vi.fn((_state, _loc, _textures, _dest, setUniforms) => {
+      setUniforms(glMock as never, {} as never);
+    }),
+  }));
+  ({ applyGlEffectBoxBlur } = await import('./glEffectBoxBlur'));
 });
 
-vi.mock('@flighthq/render-gl/contract', () => ({
-  compileGlFullscreenProgram: vi.fn(() => ({ program: {}, vao: {} })),
-  drawGlFullscreenPass: vi.fn((_state, _loc, _textures, _dest, setUniforms) => {
-    setUniforms(glMock as never, {} as never);
-  }),
-}));
-
-import { applyGlEffectBoxBlur } from './glEffectBoxBlur';
-
 describe('applyGlEffectBoxBlur', () => {
   it('is a function', () => {
     expect(typeof applyGlEffectBoxBlur).toBe('function');
@@ -44,7 +49,7 @@ beforeEach(() => {
 });
 
 afterAll(() => {
-  vi.doUnmock('@flighthq/render-gl');
+  vi.doUnmock('@flighthq/render-gl/contract');
   vi.resetModules();
 });
 

package/src/glInnerGlowEffect.test.ts

@@ -1,40 +1,49 @@
-vi.hoisted(() => {
+import type * as ContractModule from '@flighthq/render-gl/contract';
+
+import type * as GleffectblitshaderModule from './glEffectBlitShader';
+import type * as GleffectboxblurModule from './glEffectBoxBlur';
+import type * as GlinnergloweffectModule from './glInnerGlowEffect';
+
+// Mocked per file with doMock plus dynamic imports of the subject, not top-level hoisted vi.mock.
+// The suite runs isolate:false over a shared module registry, so a hoisted mock is registered for
+// every file in the worker rather than this one -- see the rule in the root vitest config.
+let drawGlFullscreenPass: typeof ContractModule.drawGlFullscreenPass;
+let applyGlEffectBlitPass: typeof GleffectblitshaderModule.applyGlEffectBlitPass;
+let applyGlEffectBoxBlur: typeof GleffectboxblurModule.applyGlEffectBoxBlur;
+let applyInnerGlowEffectToGl: typeof GlinnergloweffectModule.applyInnerGlowEffectToGl;
+let defaultGlInnerGlowEffectRunner: typeof GlinnergloweffectModule.defaultGlInnerGlowEffectRunner;
+
+beforeAll(async () => {
   vi.resetModules();
+  vi.doMock('@flighthq/render-gl/contract', () => {
+    let nextTargetId = 0;
+    return {
+      acquireGlRenderTarget: vi.fn((_state, _pool, descriptor) => ({
+        ...descriptor,
+        id: `scratch-${nextTargetId++}`,
+        texture: {},
+      })),
+      clearGlRenderTarget: vi.fn(),
+      compileGlFullscreenProgram: vi.fn(() => ({ program: {}, vao: {} })),
+      drawGlFullscreenPass: vi.fn(),
+      releaseGlRenderTarget: vi.fn(),
+    };
+  });
+  vi.doMock('./glEffectBlitShader', () => ({
+    applyGlEffectBlitPass: vi.fn(),
+  }));
+  vi.doMock('./glEffectBoxBlur', () => ({
+    applyGlEffectBoxBlur: vi.fn(),
+  }));
+  vi.doMock('./glEffectTintShader', () => ({
+    applyGlEffectInvertTintPass: vi.fn(),
+  }));
+  ({ drawGlFullscreenPass } = await import('@flighthq/render-gl/contract'));
+  ({ applyGlEffectBlitPass } = await import('./glEffectBlitShader'));
+  ({ applyGlEffectBoxBlur } = await import('./glEffectBoxBlur'));
+  ({ applyInnerGlowEffectToGl, defaultGlInnerGlowEffectRunner } = await import('./glInnerGlowEffect'));
 });
 
-vi.mock('@flighthq/render-gl/contract', () => {
-  let nextTargetId = 0;
-  return {
-    acquireGlRenderTarget: vi.fn((_state, _pool, descriptor) => ({
-      ...descriptor,
-      id: `scratch-${nextTargetId++}`,
-      texture: {},
-    })),
-    clearGlRenderTarget: vi.fn(),
-    compileGlFullscreenProgram: vi.fn(() => ({ program: {}, vao: {} })),
-    drawGlFullscreenPass: vi.fn(),
-    releaseGlRenderTarget: vi.fn(),
-  };
-});
-
-vi.mock('./glEffectBlitShader', () => ({
-  applyGlEffectBlitPass: vi.fn(),
-}));
-
-vi.mock('./glEffectBoxBlur', () => ({
-  applyGlEffectBoxBlur: vi.fn(),
-}));
-
-vi.mock('./glEffectTintShader', () => ({
-  applyGlEffectInvertTintPass: vi.fn(),
-}));
-
-import { drawGlFullscreenPass } from '@flighthq/render-gl/contract';
-
-import { applyGlEffectBlitPass } from './glEffectBlitShader';
-import { applyGlEffectBoxBlur } from './glEffectBoxBlur';
-import { applyInnerGlowEffectToGl, defaultGlInnerGlowEffectRunner } from './glInnerGlowEffect';
-
 describe('applyInnerGlowEffectToGl', () => {
   it('is a function', () => {
     expect(typeof applyInnerGlowEffectToGl).toBe('function');
@@ -125,7 +134,7 @@ beforeEach(() => {
 });
 
 afterAll(() => {
-  vi.doUnmock('@flighthq/render-gl');
+  vi.doUnmock('@flighthq/render-gl/contract');
   vi.doUnmock('./glEffectBlitShader');
   vi.doUnmock('./glEffectBoxBlur');
   vi.doUnmock('./glEffectTintShader');

package/src/glInnerShadowEffect.test.ts

@@ -1,41 +1,50 @@
-vi.hoisted(() => {
+import type * as ContractModule from '@flighthq/render-gl/contract';
+
+import type * as GleffectblitshaderModule from './glEffectBlitShader';
+import type * as GleffectboxblurModule from './glEffectBoxBlur';
+import type * as GlinnershadoweffectModule from './glInnerShadowEffect';
+
+// Mocked per file with doMock plus dynamic imports of the subject, not top-level hoisted vi.mock.
+// The suite runs isolate:false over a shared module registry, so a hoisted mock is registered for
+// every file in the worker rather than this one -- see the rule in the root vitest config.
+let drawGlFullscreenPass: typeof ContractModule.drawGlFullscreenPass;
+let applyGlEffectBlitPass: typeof GleffectblitshaderModule.applyGlEffectBlitPass;
+let applyGlEffectBoxBlur: typeof GleffectboxblurModule.applyGlEffectBoxBlur;
+let applyInnerShadowEffectToGl: typeof GlinnershadoweffectModule.applyInnerShadowEffectToGl;
+let defaultGlInnerShadowEffectRunner: typeof GlinnershadoweffectModule.defaultGlInnerShadowEffectRunner;
+
+beforeAll(async () => {
   vi.resetModules();
+  vi.doMock('@flighthq/render-gl/contract', () => {
+    let nextTargetId = 0;
+    return {
+      acquireGlRenderTarget: vi.fn((_state, _pool, descriptor) => ({
+        ...descriptor,
+        id: `scratch-${nextTargetId++}`,
+        texture: {},
+      })),
+      clearGlRenderTarget: vi.fn(),
+      compileGlFullscreenProgram: vi.fn(() => ({ program: {}, vao: {} })),
+      drawGlFullscreenPass: vi.fn(),
+      releaseGlRenderTarget: vi.fn(),
+    };
+  });
+  vi.doMock('./glEffectBlitShader', () => ({
+    applyGlEffectBlitOffsetPass: vi.fn(),
+    applyGlEffectBlitPass: vi.fn(),
+  }));
+  vi.doMock('./glEffectBoxBlur', () => ({
+    applyGlEffectBoxBlur: vi.fn(),
+  }));
+  vi.doMock('./glEffectTintShader', () => ({
+    applyGlEffectInvertTintPass: vi.fn(),
+  }));
+  ({ drawGlFullscreenPass } = await import('@flighthq/render-gl/contract'));
+  ({ applyGlEffectBlitPass } = await import('./glEffectBlitShader'));
+  ({ applyGlEffectBoxBlur } = await import('./glEffectBoxBlur'));
+  ({ applyInnerShadowEffectToGl, defaultGlInnerShadowEffectRunner } = await import('./glInnerShadowEffect'));
 });
 
-vi.mock('@flighthq/render-gl/contract', () => {
-  let nextTargetId = 0;
-  return {
-    acquireGlRenderTarget: vi.fn((_state, _pool, descriptor) => ({
-      ...descriptor,
-      id: `scratch-${nextTargetId++}`,
-      texture: {},
-    })),
-    clearGlRenderTarget: vi.fn(),
-    compileGlFullscreenProgram: vi.fn(() => ({ program: {}, vao: {} })),
-    drawGlFullscreenPass: vi.fn(),
-    releaseGlRenderTarget: vi.fn(),
-  };
-});
-
-vi.mock('./glEffectBlitShader', () => ({
-  applyGlEffectBlitOffsetPass: vi.fn(),
-  applyGlEffectBlitPass: vi.fn(),
-}));
-
-vi.mock('./glEffectBoxBlur', () => ({
-  applyGlEffectBoxBlur: vi.fn(),
-}));
-
-vi.mock('./glEffectTintShader', () => ({
-  applyGlEffectInvertTintPass: vi.fn(),
-}));
-
-import { drawGlFullscreenPass } from '@flighthq/render-gl/contract';
-
-import { applyGlEffectBlitPass } from './glEffectBlitShader';
-import { applyGlEffectBoxBlur } from './glEffectBoxBlur';
-import { applyInnerShadowEffectToGl, defaultGlInnerShadowEffectRunner } from './glInnerShadowEffect';
-
 describe('applyInnerShadowEffectToGl', () => {
   it('is a function', () => {
     expect(typeof applyInnerShadowEffectToGl).toBe('function');
@@ -125,7 +134,7 @@ beforeEach(() => {
 });
 
 afterAll(() => {
-  vi.doUnmock('@flighthq/render-gl');
+  vi.doUnmock('@flighthq/render-gl/contract');
   vi.doUnmock('./glEffectBlitShader');
   vi.doUnmock('./glEffectBoxBlur');
   vi.doUnmock('./glEffectTintShader');

package/src/glOuterGlowEffect.test.ts

@@ -1,36 +1,42 @@
-vi.hoisted(() => {
+import type * as GleffectblitshaderModule from './glEffectBlitShader';
+import type * as GloutergloweffectModule from './glOuterGlowEffect';
+
+// Mocked per file with doMock plus dynamic imports of the subject, not top-level hoisted vi.mock.
+// The suite runs isolate:false over a shared module registry, so a hoisted mock is registered for
+// every file in the worker rather than this one -- see the rule in the root vitest config.
+let applyGlEffectBlitPass: typeof GleffectblitshaderModule.applyGlEffectBlitPass;
+let applyGlEffectErasePass: typeof GleffectblitshaderModule.applyGlEffectErasePass;
+let applyOuterGlowEffectToGl: typeof GloutergloweffectModule.applyOuterGlowEffectToGl;
+let defaultGlOuterGlowEffectRunner: typeof GloutergloweffectModule.defaultGlOuterGlowEffectRunner;
+
+beforeAll(async () => {
   vi.resetModules();
+  vi.doMock('@flighthq/render-gl/contract', () => {
+    let nextTargetId = 0;
+    return {
+      acquireGlRenderTarget: vi.fn((_state, _pool, descriptor) => ({
+        ...descriptor,
+        id: `scratch-${nextTargetId++}`,
+        texture: {},
+      })),
+      clearGlRenderTarget: vi.fn(),
+      releaseGlRenderTarget: vi.fn(),
+    };
+  });
+  vi.doMock('./glEffectBlitShader', () => ({
+    applyGlEffectBlitPass: vi.fn(),
+    applyGlEffectErasePass: vi.fn(),
+  }));
+  vi.doMock('./glEffectBoxBlur', () => ({
+    applyGlEffectBoxBlur: vi.fn(),
+  }));
+  vi.doMock('./glEffectTintShader', () => ({
+    applyGlEffectTintPass: vi.fn(),
+  }));
+  ({ applyGlEffectBlitPass, applyGlEffectErasePass } = await import('./glEffectBlitShader'));
+  ({ applyOuterGlowEffectToGl, defaultGlOuterGlowEffectRunner } = await import('./glOuterGlowEffect'));
 });
 
-vi.mock('@flighthq/render-gl/contract', () => {
-  let nextTargetId = 0;
-  return {
-    acquireGlRenderTarget: vi.fn((_state, _pool, descriptor) => ({
-      ...descriptor,
-      id: `scratch-${nextTargetId++}`,
-      texture: {},
-    })),
-    clearGlRenderTarget: vi.fn(),
-    releaseGlRenderTarget: vi.fn(),
-  };
-});
-
-vi.mock('./glEffectBlitShader', () => ({
-  applyGlEffectBlitPass: vi.fn(),
-  applyGlEffectErasePass: vi.fn(),
-}));
-
-vi.mock('./glEffectBoxBlur', () => ({
-  applyGlEffectBoxBlur: vi.fn(),
-}));
-
-vi.mock('./glEffectTintShader', () => ({
-  applyGlEffectTintPass: vi.fn(),
-}));
-
-import { applyGlEffectBlitPass, applyGlEffectErasePass } from './glEffectBlitShader';
-import { applyOuterGlowEffectToGl, defaultGlOuterGlowEffectRunner } from './glOuterGlowEffect';
-
 describe('applyOuterGlowEffectToGl', () => {
   it('is a function', () => {
     expect(typeof applyOuterGlowEffectToGl).toBe('function');
@@ -84,7 +90,7 @@ beforeEach(() => {
 });
 
 afterAll(() => {
-  vi.doUnmock('@flighthq/render-gl');
+  vi.doUnmock('@flighthq/render-gl/contract');
   vi.doUnmock('./glEffectBlitShader');
   vi.doUnmock('./glEffectBoxBlur');
   vi.doUnmock('./glEffectTintShader');