chore: update solid-js and babel-preset-solid to beta.9; fix Loader<object> constraints

Author: bigmistqke

package.json

@@ -84,7 +84,7 @@
     "@typescript-eslint/parser": "^8.38.0",
     "dpdm": "^3.14.0",
     "esbuild": "^0.21.4",
-    "babel-preset-solid": "^2.0.0-beta.5",
+    "babel-preset-solid": "2.0.0-beta.9",
     "@babel/core": "^7.20.12",
     "@babel/preset-typescript": "^7.18.6",
     "esbuild-register": "^3.5.0",
@@ -100,7 +100,7 @@
     "rollup": "^4.18.0",
     "rollup-plugin-dts": "^6.1.1",
     "solid-app-router": "^0.1.14",
-    "solid-js": "^2.0.0-beta.5",
+    "solid-js": "2.0.0-beta.9",
     "three": "^0.164.1",
     "three-stdlib": "^2.36.0",
     "tsm": "^2.3.0",

pnpm-lock.yaml

@@ -23,7 +23,7 @@ export interface LoaderRegistry {
    * @param url The URL or path to the resource
    * @param data The resource promise or resolved data
    */
-  set<TLoader extends Loader<object, any>>(
+  set<TLoader extends Loader<any, any>>(
     loader: TLoader,
     url: LoaderUrl<TLoader>,
     data: PromiseMaybe<LoaderData<TLoader>>,
@@ -35,7 +35,7 @@ export interface LoaderRegistry {
    * @param url The URL or path to the resource
    * @returns The resource promise, resolved data, or undefined if not found
    */
-  get<TLoader extends Loader<object, any>>(
+  get<TLoader extends Loader<any, any>>(
     loader: TLoader,
     url: LoaderUrl<TLoader>,
     warn?: boolean,
@@ -49,11 +49,11 @@ export interface LoaderRegistry {
 /**********************************************************************************/
 
 interface LoaderTreeRegistryMap extends Map<Loader<any, any>, any> {
-  get<TLoader extends Loader<object, any>>(loader: TLoader): LoaderTreeRegistry<TLoader> | undefined
-  set<TLoader extends Loader<object, any>>(loader: TLoader, data: LoaderTreeRegistry<TLoader>): this
+  get<TLoader extends Loader<any, any>>(loader: TLoader): LoaderTreeRegistry<TLoader> | undefined
+  set<TLoader extends Loader<any, any>>(loader: TLoader, data: LoaderTreeRegistry<TLoader>): this
 }
 
-interface LoaderTreeRegistry<TLoader extends Loader<object, any>> extends TreeRegistry<object> {
+interface LoaderTreeRegistry<TLoader extends Loader<any, any>> extends TreeRegistry<object> {
   get(paths: LoaderUrl<TLoader>, warn?: boolean): CacheNode<TLoader> | undefined
   set(paths: LoaderUrl<TLoader>, data: CacheNode<TLoader>): void
 }
@@ -73,7 +73,7 @@ export class LoaderCache implements LoaderRegistry {
    * @returns The tree registry for this loader
    * @private
    */
-  #registry<TLoader extends Loader<object, any>>(loader: TLoader) {
+  #registry<TLoader extends Loader<any, any>>(loader: TLoader) {
     let registry = this.#treeRegistryMap.get(loader)
     if (!registry) {
       this.#treeRegistryMap.set(
@@ -135,7 +135,7 @@ export class LoaderCache implements LoaderRegistry {
    * @param url The URL or path to the resource
    * @param options.force Force deletion even if resource has active references
    */
-  delete<TLoader extends Loader<object, any>>(
+  delete<TLoader extends Loader<any, any>>(
     loader: TLoader,
     url: LoaderUrl<TLoader>,
     options?: { force?: boolean },
@@ -158,7 +158,7 @@ export class LoaderCache implements LoaderRegistry {
    * @param url The URL or path to the resource
    * @returns The resource promise, resolved data, or undefined if not found
    */
-  get<TLoader extends Loader<object, any>>(
+  get<TLoader extends Loader<any, any>>(
     loader: TLoader,
     url: LoaderUrl<TLoader>,
     warn?: boolean,
@@ -182,7 +182,7 @@ export class LoaderCache implements LoaderRegistry {
    * @param options.force Force update even if resource already exists
    * @returns The stored promise
    */
-  set<TLoader extends Loader<object, any>>(
+  set<TLoader extends Loader<any, any>>(
     loader: TLoader,
     path: LoaderUrl<TLoader>,
     data: PromiseMaybe<LoaderData<TLoader>>,

src/data-structure/loader-cache.ts

@@ -104,8 +104,8 @@ export function useThree(callback?: (value: Context) => any) {
 
 /** Global cache of loader instances to prevent duplicates */
 const LOADER_CACHE = new Map<
-  Constructor<Loader<object, string | string[]>>,
-  Loader<object, string | string[]>
+  Constructor<Loader<any, string | string[]>>,
+  Loader<any, string | string[]>
 >()
 
 /**

src/hooks.ts

@@ -120,11 +120,11 @@ export type ConstructorOverloadParameters<T extends Constructor> = T extends {
               ? U
               : never
 
-export type LoaderData<T extends Loader<object, any>> =
+export type LoaderData<T extends Loader<any, any>> =
   T extends Loader<infer TData, any> ? TData : never
 
-export type LoaderUrl<T extends Loader<object, any>> =
-  T extends Loader<object, infer TUrl> ? TUrl : never
+export type LoaderUrl<T extends Loader<any, any>> =
+  T extends Loader<any, infer TUrl> ? TUrl : never
 
 /**********************************************************************************/
 /*                                                s                                */