fix(soba): relax typings (need revisit)

Chau Tran · Chau Tran · commit 0ee298434322 · 2023-05-18T17:19:59.000-05:00
diff --git a/libs/soba/abstractions/src/catmull-rom-line/catmull-rom-line.ts b/libs/soba/abstractions/src/catmull-rom-line/catmull-rom-line.ts
@@ -21,18 +21,18 @@ declare module '../line/line-input' {
         <ngts-line
             [lineRef]="lineRef"
             [points]="segmentedPoints()"
-            [vertexColors]="interpolatedVertexColors()"
+            [vertexColors]="interpolatedVertexColors()!"
             [color]="lineParameters().color"
-            [resolution]="lineParameters().resolution"
-            [lineWidth]="lineParameters().linewidth"
-            [alphaToCoverage]="lineParameters().alphaToCoverage"
-            [dashed]="lineParameters().dashed"
-            [dashScale]="lineParameters().dashScale"
-            [dashSize]="lineParameters().dashSize"
-            [dashOffset]="lineParameters().dashOffset"
-            [gapSize]="lineParameters().gapSize"
-            [wireframe]="lineParameters().wireframe"
-            [worldUnits]="lineParameters().worldUnits"
+            [resolution]="lineParameters().resolution!"
+            [lineWidth]="lineParameters().linewidth!"
+            [alphaToCoverage]="lineParameters().alphaToCoverage!"
+            [dashed]="lineParameters().dashed!"
+            [dashScale]="lineParameters().dashScale!"
+            [dashSize]="lineParameters().dashSize!"
+            [dashOffset]="lineParameters().dashOffset!"
+            [gapSize]="lineParameters().gapSize!"
+            [wireframe]="lineParameters().wireframe!"
+            [worldUnits]="lineParameters().worldUnits!"
         />
     `,
     imports: [NgtsLine],
diff --git a/libs/soba/abstractions/src/cubic-bezier-line/cubic-bezier-line.ts b/libs/soba/abstractions/src/cubic-bezier-line/cubic-bezier-line.ts
@@ -21,18 +21,18 @@ declare module '../line/line-input' {
         <ngts-line
             [lineRef]="lineRef"
             [points]="points()"
-            [color]="lineParameters().color"
-            [vertexColors]="lineParameters().vertexColors"
-            [resolution]="lineParameters().resolution"
-            [lineWidth]="lineParameters().linewidth"
-            [alphaToCoverage]="lineParameters().alphaToCoverage"
-            [dashed]="lineParameters().dashed"
-            [dashScale]="lineParameters().dashScale"
-            [dashSize]="lineParameters().dashSize"
-            [dashOffset]="lineParameters().dashOffset"
-            [gapSize]="lineParameters().gapSize"
-            [wireframe]="lineParameters().wireframe"
-            [worldUnits]="lineParameters().worldUnits"
+            [color]="lineParameters().color!"
+            [vertexColors]="lineParameters().vertexColors!"
+            [resolution]="lineParameters().resolution!"
+            [lineWidth]="lineParameters().linewidth!"
+            [alphaToCoverage]="lineParameters().alphaToCoverage!"
+            [dashed]="lineParameters().dashed!"
+            [dashScale]="lineParameters().dashScale!"
+            [dashSize]="lineParameters().dashSize!"
+            [dashOffset]="lineParameters().dashOffset!"
+            [gapSize]="lineParameters().gapSize!"
+            [wireframe]="lineParameters().wireframe!"
+            [worldUnits]="lineParameters().worldUnits!"
         />
     `,
     imports: [NgtsLine],
diff --git a/libs/soba/abstractions/src/gizmo-helper/gizmo-viewcube/gizmo-viewcube-face.ts b/libs/soba/abstractions/src/gizmo-helper/gizmo-viewcube/gizmo-viewcube-face.ts
@@ -87,7 +87,11 @@ export class NgtsGizmoViewcubeFaceMaterial extends NgtSignalStore<{
     selector: 'ngts-gizmo-viewcube-face-cube',
     standalone: true,
     template: `
-        <ngt-mesh (pointermove)="onPointerMove($event)" (pointerout)="onPointerOut($event)" (click)="onClick($event)">
+        <ngt-mesh
+            (pointermove)="onPointerMove($any($event))"
+            (pointerout)="onPointerOut($any($event))"
+            (click)="onClick($any($event))"
+        >
             <ngt-box-geometry />
             <ngts-gizmo-viewcube-face-material *ngFor="let i; repeat: 6" [hover]="hover() === i" [index]="i" />
         </ngt-mesh>
diff --git a/libs/soba/abstractions/src/gizmo-helper/gizmo-viewport/gizmo-viewport.ts b/libs/soba/abstractions/src/gizmo-helper/gizmo-viewport/gizmo-viewport.ts
@@ -37,7 +37,7 @@ extend({ Group, AmbientLight, PointLight });
                     [labelColor]="viewportLabelColor()"
                     [clickEmitter]="clicked"
                     [axisHeadScale]="viewportAxisHeadScale()"
-                    (pointerdown)="onPointerDown($event)"
+                    (pointerdown)="onPointerDown($any($event))"
                 ></ngts-gizmo-viewport-axis-head>
                 <ngts-gizmo-viewport-axis-head
                     [arcStyle]="viewportAxisColors()[1]"
@@ -48,7 +48,7 @@ extend({ Group, AmbientLight, PointLight });
                     [labelColor]="viewportLabelColor()"
                     [clickEmitter]="clicked"
                     [axisHeadScale]="viewportAxisHeadScale()"
-                    (pointerdown)="onPointerDown($event)"
+                    (pointerdown)="onPointerDown($any($event))"
                 ></ngts-gizmo-viewport-axis-head>
                 <ngts-gizmo-viewport-axis-head
                     [arcStyle]="viewportAxisColors()[2]"
@@ -59,7 +59,7 @@ extend({ Group, AmbientLight, PointLight });
                     [labelColor]="viewportLabelColor()"
                     [clickEmitter]="clicked"
                     [axisHeadScale]="viewportAxisHeadScale()"
-                    (pointerdown)="onPointerDown($event)"
+                    (pointerdown)="onPointerDown($any($event))"
                 ></ngts-gizmo-viewport-axis-head>
                 <ng-container *ngIf="!viewportHideNegativeAxes()">
                     <ngts-gizmo-viewport-axis-head
@@ -70,7 +70,7 @@ extend({ Group, AmbientLight, PointLight });
                         [labelColor]="viewportLabelColor()"
                         [clickEmitter]="clicked"
                         [axisHeadScale]="viewportAxisHeadScale()"
-                        (pointerdown)="onPointerDown($event)"
+                        (pointerdown)="onPointerDown($any($event))"
                     ></ngts-gizmo-viewport-axis-head>
                     <ngts-gizmo-viewport-axis-head
                         [arcStyle]="viewportAxisColors()[1]"
@@ -80,7 +80,7 @@ extend({ Group, AmbientLight, PointLight });
                         [labelColor]="viewportLabelColor()"
                         [clickEmitter]="clicked"
                         [axisHeadScale]="viewportAxisHeadScale()"
-                        (pointerdown)="onPointerDown($event)"
+                        (pointerdown)="onPointerDown($any($event))"
                     ></ngts-gizmo-viewport-axis-head>
                     <ngts-gizmo-viewport-axis-head
                         [arcStyle]="viewportAxisColors()[2]"
@@ -90,7 +90,7 @@ extend({ Group, AmbientLight, PointLight });
                         [labelColor]="viewportLabelColor()"
                         [clickEmitter]="clicked"
                         [axisHeadScale]="viewportAxisHeadScale()"
-                        (pointerdown)="onPointerDown($event)"
+                        (pointerdown)="onPointerDown($any($event))"
                     ></ngts-gizmo-viewport-axis-head>
                 </ng-container>
             </ng-container>
diff --git a/libs/soba/abstractions/src/quadratic-bezier-line/quadratic-bezier-line.ts b/libs/soba/abstractions/src/quadratic-bezier-line/quadratic-bezier-line.ts
@@ -22,18 +22,18 @@ const v = new THREE.Vector3();
         <ngts-line
             [lineRef]="lineRef"
             [points]="points()"
-            [color]="lineParameters().color"
-            [vertexColors]="lineParameters().vertexColors"
-            [resolution]="lineParameters().resolution"
-            [lineWidth]="lineParameters().linewidth"
-            [alphaToCoverage]="lineParameters().alphaToCoverage"
-            [dashed]="lineParameters().dashed"
-            [dashScale]="lineParameters().dashScale"
-            [dashSize]="lineParameters().dashSize"
-            [dashOffset]="lineParameters().dashOffset"
-            [gapSize]="lineParameters().gapSize"
-            [wireframe]="lineParameters().wireframe"
-            [worldUnits]="lineParameters().worldUnits"
+            [color]="lineParameters().color!"
+            [vertexColors]="lineParameters().vertexColors!"
+            [resolution]="lineParameters().resolution!"
+            [lineWidth]="lineParameters().linewidth!"
+            [alphaToCoverage]="lineParameters().alphaToCoverage!"
+            [dashed]="lineParameters().dashed!"
+            [dashScale]="lineParameters().dashScale!"
+            [dashSize]="lineParameters().dashSize!"
+            [dashOffset]="lineParameters().dashOffset!"
+            [gapSize]="lineParameters().gapSize!"
+            [wireframe]="lineParameters().wireframe!"
+            [worldUnits]="lineParameters().worldUnits!"
         />
     `,
     imports: [NgtsLine],
diff --git a/libs/soba/abstractions/src/text-3d/text-3d.ts b/libs/soba/abstractions/src/text-3d/text-3d.ts
@@ -161,6 +161,6 @@ export class NgtsText3D extends NgtSignalStore<NgtsText3DState> {
                 letterSpacing: this.#letterSpacing(),
                 lineHeight: this.#lineHeight(),
             },
-        ] as const;
+        ];
     });
 }
diff --git a/libs/soba/loaders/src/gltf-loader/gltf-loader.ts b/libs/soba/loaders/src/gltf-loader/gltf-loader.ts
@@ -64,5 +64,5 @@ injectNgtsGLTFLoader['preload'] = <TUrl extends string | string[] | Record<strin
         extensions?: (loader: GLTFLoader) => void;
     } = {}
 ) => {
-    injectNgtLoader.preload(() => GLTFLoader, path, _extensions(useDraco, useMeshOpt, extensions));
+    (injectNgtLoader as any)['preload'](() => GLTFLoader, path, _extensions(useDraco, useMeshOpt, extensions));
 };
diff --git a/libs/soba/loaders/src/texture-loader/texture-loader.ts b/libs/soba/loaders/src/texture-loader/texture-loader.ts
@@ -36,5 +36,5 @@ export function injectNgtsTextureLoader<TInput extends string[] | string | Recor
 injectNgtsTextureLoader['preload'] = <TInput extends string[] | string | Record<string, string>>(
     input: () => TInput
 ) => {
-    injectNgtLoader.preload(() => THREE.TextureLoader, input);
+    (injectNgtLoader as any).preload(() => THREE.TextureLoader, input);
 };
diff --git a/libs/soba/package.json b/libs/soba/package.json
@@ -42,6 +42,5 @@
     },
     "sideEffects": false,
     "generators": "./plugin/generators.json",
-    "schematics": "./plugin/generators.json",
-    "web-types": "./web-types.json"
+    "schematics": "./plugin/generators.json"
 }
diff --git a/libs/soba/staging/src/cloud/cloud.ts b/libs/soba/staging/src/cloud/cloud.ts
@@ -13,7 +13,7 @@ import { injectNgtsTextureLoader } from 'angular-three-soba/loaders';
 import { Group, Mesh, MeshStandardMaterial, PlaneGeometry } from 'three';
 
 const CLOUD_URL = 'https://rawcdn.githack.com/pmndrs/drei-assets/9225a9f1fbd449d9411125c2f419b843d0308c9f/cloud.png';
-injectNgtsTextureLoader.preload(() => CLOUD_URL);
+(injectNgtsTextureLoader as any).preload(() => CLOUD_URL);
 
 extend({ Group, Mesh, PlaneGeometry, MeshStandardMaterial });
 
diff --git a/libs/soba/staging/src/environment/environment-ground.ts b/libs/soba/staging/src/environment/environment-ground.ts
@@ -11,7 +11,7 @@ extend({ GroundProjectedEnv });
     selector: 'ngts-environment-ground',
     standalone: true,
     template: `
-        <ngts-environment-map [map]="texture()" [background]="environmentInput.environmentBackground()" />
+        <ngts-environment-map [map]="texture()" [background]="!!environmentInput.environmentBackground()" />
         <ngt-ground-projected-env *args="groundArgs()" [scale]="scale()" [height]="height()" [radius]="radius()" />
     `,
     imports: [NgtsEnvironmentMap, NgtArgs],
diff --git a/libs/soba/staging/src/environment/environment.ts b/libs/soba/staging/src/environment/environment.ts
@@ -18,14 +18,14 @@ export class NgtsEnvironmentContent {}
             <ngts-environment-map
                 *ngIf="environmentMap(); else noMap"
                 [map]="environmentMap()"
-                [background]="environmentBackground()"
+                [background]="!!environmentBackground()"
             />
             <ng-template #noMap>
                 <ngts-environment-portal *ngIf="content; else noPortal">
                     <ng-container *ngTemplateOutlet="content" />
                 </ngts-environment-portal>
                 <ng-template #noPortal>
-                    <ngts-environment-cube [background]="environmentBackground()" />
+                    <ngts-environment-cube [background]="!!environmentBackground()" />
                 </ng-template>
             </ng-template>
         </ng-template>
diff --git a/libs/soba/staging/src/stage/stage.ts b/libs/soba/staging/src/stage/stage.ts
@@ -95,11 +95,11 @@ extend({ AmbientLight, SpotLight, Vector2, PointLight, Group });
     selector: 'ngts-stage',
     standalone: true,
     template: `
-        <ngt-ambient-light [intensity]="stageIntensity() / 3" />
+        <ngt-ambient-light [intensity]="stageIntensity()! / 3" />
         <ngt-spot-light
             [penumbra]="1"
             [position]="spotLightPosition()"
-            [intensity]="stageIntensity() * 2"
+            [intensity]="stageIntensity()! * 2"
             [castShadow]="!!stageShadows()"
         >
             <ngt-value [rawValue]="shadowsInfo().shadowBias" attach="shadow.bias" />
@@ -175,21 +175,21 @@ extend({ AmbientLight, SpotLight, Vector2, PointLight, Group });
             </ngts-accumulative-shadows>
         </ngt-group>
         <ngts-environment
-            *ngIf="environmentInfo()"
-            [frames]="environmentInfo().frames"
-            [near]="environmentInfo().near"
-            [far]="environmentInfo().far"
-            [resolution]="environmentInfo().resolution"
-            [background]="environmentInfo().background"
-            [blur]="environmentInfo().blur"
-            [map]="environmentInfo().map"
-            [files]="environmentInfo().files"
-            [path]="environmentInfo().path"
-            [preset]="environmentInfo().preset"
-            [scene]="environmentInfo().scene"
-            [extensions]="environmentInfo().extensions"
-            [ground]="environmentInfo().ground"
-            [encoding]="environmentInfo().encoding"
+            *ngIf="environmentInfo() as environmentInfo"
+            [frames]="environmentInfo.frames!"
+            [near]="environmentInfo.near!"
+            [far]="environmentInfo.far!"
+            [resolution]="environmentInfo.resolution!"
+            [background]="environmentInfo.background!"
+            [blur]="environmentInfo.blur!"
+            [map]="environmentInfo.map!"
+            [files]="environmentInfo.files!"
+            [path]="environmentInfo.path!"
+            [preset]="environmentInfo.preset!"
+            [scene]="environmentInfo.scene!"
+            [extensions]="environmentInfo.extensions!"
+            [ground]="environmentInfo.ground!"
+            [encoding]="environmentInfo.encoding!"
         />
     `,
     imports: [
@@ -250,7 +250,7 @@ export class NgtsStage extends NgtSignalStore<NgtsStageProps> {
         return typeof preset === 'string' ? presets[preset] : preset;
     });
 
-    readonly shadowsInfo = computed(() => {
+    readonly shadowsInfo = computed<any>(() => {
         const shadows = this.stageShadows();
         const restProps = typeof shadows === 'string' ? {} : (shadows as NgtsStageShadows) || {};
         return {
@@ -264,7 +264,7 @@ export class NgtsStage extends NgtSignalStore<NgtsStageProps> {
         };
     });
 
-    readonly spotLightPosition = computed(() => {
+    readonly spotLightPosition = computed<[number, number, number]>(() => {
         const config = this.config();
         if (!config) return [0, 0, 0];
         const radius = this.boundingState().radius;

Original file line number	Diff line number	Diff line change
`@@ -161,6 +161,6 @@ export class NgtsText3D extends NgtSignalStore<NgtsText3DState> {`
`161`	`161`	`letterSpacing: this.#letterSpacing(),`
`162`	`162`	`lineHeight: this.#lineHeight(),`
`163`	`163`	`},`
`164`		`- ] as const;`
	`164`	`+ ];`
`165`	`165`	`});`
`166`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,5 @@`
`42`	`42`	`},`
`43`	`43`	`"sideEffects": false,`
`44`	`44`	`"generators": "./plugin/generators.json",`
`45`		`- "schematics": "./plugin/generators.json",`
`46`		`- "web-types": "./web-types.json"`
	`45`	`+ "schematics": "./plugin/generators.json"`
`47`	`46`	`}`