adjust three types

nartc · nartc · commit 3878557556d0 · 2024-07-26T08:45:24.000-05:00
diff --git a/apps/astro-docs/astro.config.mjs b/apps/astro-docs/astro.config.mjs
@@ -129,10 +129,12 @@ export default defineConfig({
 				},
 				{
 					label: 'Soba',
+					collapsed: true,
 					items: [
 						{ label: 'Introduction', slug: 'soba/introduction' },
 						{
 							label: 'Abstractions',
+							collapsed: true,
 							items: [
 								{ label: 'Introduction', slug: 'soba/abstractions/introduction' },
 								{ label: 'NgtsGradientTexture', slug: 'soba/abstractions/gradient-texture' },
diff --git a/apps/astro-docs/package.json b/apps/astro-docs/package.json
@@ -11,16 +11,6 @@
   },
   "dependencies": {
     "@analogjs/astro-angular": "^1.6.4-beta.1",
-    "@angular-devkit/build-angular": "^18.1.1",
-    "@angular/animations": "^18.1.1",
-    "@angular/common": "^18.1.1",
-    "@angular/compiler": "^18.1.1",
-    "@angular/compiler-cli": "^18.1.1",
-    "@angular/core": "^18.1.1",
-    "@angular/language-service": "^18.1.1",
-    "@angular/platform-browser": "^18.1.1",
-    "@angular/platform-browser-dynamic": "^18.1.1",
-    "@angular/platform-server": "^18.1.1",
     "@astrojs/check": "^0.8.2",
     "@astrojs/mdx": "^3.1.3",
     "@astrojs/starlight": "^0.25.1",
@@ -30,12 +20,8 @@
     "angular-three-postprocessing": "^2.0.0-beta.270",
     "angular-three-soba": "^2.0.0-beta.270",
     "astro": "^4.10.2",
-    "rxjs": "^7.8.1",
     "sharp": "^0.32.5",
-    "tailwindcss": "^3.4.6",
-    "tslib": "^2.6.3",
-    "typescript": "^5.5.3",
-    "zone.js": "^0.14.8"
+    "tailwindcss": "^3.4.6"
   },
   "nx": {},
   "devDependencies": {
diff --git a/apps/kitchen-sink/src/app/soba/basic/basic.ts b/apps/kitchen-sink/src/app/soba/basic/basic.ts
@@ -26,7 +26,6 @@ import { Experience, bloom, glitch, selectedAction } from './experience';
 	`,
 	changeDetection: ChangeDetectionStrategy.OnPush,
 	imports: [NgtCanvas],
-	providers: [{ provide: 'MyTest' as any, useValue: 'test' }],
 	host: { class: 'basic-soba' },
 })
 export default class Basic {
diff --git a/apps/kitchen-sink/src/app/soba/basic/experience.ts b/apps/kitchen-sink/src/app/soba/basic/experience.ts
@@ -113,10 +113,4 @@ export class Experience {
 	Math = Math;
 	bloom = bloom;
 	glitch = glitch;
-
-	test = inject('MyTest' as any, { optional: true });
-
-	constructor() {
-		console.log(this.test);
-	}
 }
diff --git a/libs/core/src/lib/three-types.ts b/libs/core/src/lib/three-types.ts
@@ -178,7 +178,6 @@ export interface NgtNodeEventMap<TOriginal> {
 
 export type NgtNodeElement<TOriginal, TConstructor> = {
 	attach: string | string[] | NgtAttachFunction;
-	// ref: NgtInjectedRef<TOriginal>;
 	addEventListener<TEventKey extends keyof NgtNodeEventMap<TOriginal>>(
 		type: TEventKey,
 		listener: (this: NgtNodeElement<TOriginal, TConstructor>, ev: NgtNodeEventMap<TOriginal>[TEventKey]) => any,
@@ -196,7 +195,7 @@ export type NgtNode<TOriginal, TConstructor, TNoEvent = NoEvent<TOriginal>> = Ex
 
 export type NgtObject3DEventsMap = {
 	[TEvent in keyof NgtEventHandlers]-?: Parameters<NonNullable<NgtEventHandlers[TEvent]>>[0];
-};
+} & NgtNodeEventMap<NgtInstanceNode>;
 
 export type NgtObject3DNode<TOriginal, TConstructor, TNoEvent = NoEvent<TOriginal>> = Expand<
 	NgtOverwrite<
@@ -499,4 +498,5 @@ export interface ThreeElements {
 
 declare global {
 	interface HTMLElementTagNameMap extends ThreeElements {}
+	interface HTMLElementEventMap extends NgtNodeEventMap<NgtInstanceNode> {}
 }
diff --git a/libs/core/src/lib/utils/make.ts b/libs/core/src/lib/utils/make.ts
@@ -23,7 +23,7 @@ export function makeId(event?: NgtIntersection): string {
 export function makeDpr(dpr: NgtDpr, window?: Window) {
 	// Err on the side of progress by assuming 2x dpr if we can't detect it
 	// This will happen in workers where window is defined but dpr isn't.
-	const target = typeof window !== 'undefined' ? window.devicePixelRatio ?? 2 : 1;
+	const target = typeof window !== 'undefined' ? (window.devicePixelRatio ?? 2) : 1;
 	return Array.isArray(dpr) ? Math.min(Math.max(dpr[0], target), dpr[1]) : dpr;
 }
 
@@ -48,8 +48,8 @@ export function makeCameraInstance(isOrthographic: boolean, size: NgtSize) {
 }
 
 export type NgtObjectMap = {
-	nodes: { [name: string]: Object3D };
-	materials: { [name: string]: Material };
+	nodes: Record<string, Object3D<any>>;
+	materials: Record<string, Material>;
 	[key: string]: any;
 };
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -129,10 +129,12 @@ export default defineConfig({`
`129`	`129`	`},`
`130`	`130`	`{`
`131`	`131`	`label: 'Soba',`
	`132`	`+ collapsed: true,`
`132`	`133`	`items: [`
`133`	`134`	`{ label: 'Introduction', slug: 'soba/introduction' },`
`134`	`135`	`{`
`135`	`136`	`label: 'Abstractions',`
	`137`	`+ collapsed: true,`
`136`	`138`	`items: [`
`137`	`139`	`{ label: 'Introduction', slug: 'soba/abstractions/introduction' },`
`138`	`140`	`{ label: 'NgtsGradientTexture', slug: 'soba/abstractions/gradient-texture' },`