@instantdb/react-common 0.22.75 → 0.22.76

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instantdb/react-common",
-  "version": "0.22.75",
+  "version": "0.22.76",
   "description": "Instant DB shared components for React and React Native",
   "homepage": "https://github.com/instantdb/instant/tree/main/client/packages/react-common",
   "repository": {
@@ -53,11 +53,12 @@
     "react": ">=16"
   },
   "dependencies": {
-    "@instantdb/core": "0.22.75",
-    "@instantdb/version": "0.22.75"
+    "@instantdb/core": "0.22.76",
+    "@instantdb/version": "0.22.76"
   },
   "scripts": {
     "test": "vitest",
+    "check": "tsc --noEmit",
     "check-exports": "attw --pack .",
     "dev:module": "tsc --watch --preserveWatchOutput -p tsconfig.dev.json",
     "dev:main": "tsc --watch --preserveWatchOutput -p tsconfig.cjs.dev.json",

package/src/InstantReactAbstractDatabase.tsx

@@ -42,9 +42,10 @@ const defaultAuthState = {
 export default abstract class InstantReactAbstractDatabase<
   // need to pull this schema out to another generic for query params, not sure why
   Schema extends InstantSchemaDef<any, any, any>,
-  Config extends InstantConfig<Schema, boolean | undefined> = InstantConfig<
+  UseDates extends boolean = false,
+  Config extends InstantConfig<Schema, boolean> = InstantConfig<
     Schema,
-    boolean
+    UseDates
   >,
   Rooms extends RoomSchemaShape = RoomsOf<Schema>,
 > implements IInstantDatabase<Schema>
@@ -53,17 +54,22 @@ export default abstract class InstantReactAbstractDatabase<
 
   public auth: Auth;
   public storage: Storage;
-  public core: InstantCoreDatabase<Schema, Config['useDateObjects']>;
+  public core: InstantCoreDatabase<Schema, UseDates>;
 
   /** @deprecated use `core` instead */
-  public _core: InstantCoreDatabase<Schema, Config['useDateObjects']>;
+  public _core: InstantCoreDatabase<Schema, UseDates>;
 
   static Storage?: any;
   static NetworkListener?: any;
   static EventSourceImpl?: any;
 
-  constructor(config: Config, versions?: { [key: string]: string }) {
-    this.core = core_init<Schema, Config['useDateObjects']>(
+  constructor(
+    config: Omit<InstantConfig<Schema, UseDates>, 'useDateObjects'> & {
+      useDateObjects?: UseDates;
+    },
+    versions?: { [key: string]: string },
+  ) {
+    this.core = core_init<Schema, UseDates>(
       config,
       // @ts-expect-error because TS can't resolve subclass statics
       this.constructor.Storage,
@@ -207,12 +213,8 @@ export default abstract class InstantReactAbstractDatabase<
   useQuery = <Q extends ValidQuery<Q, Schema>>(
     query: null | Q,
     opts?: InstaQLOptions,
-  ): InstaQLLifecycleState<Schema, Q, Config['useDateObjects']> => {
-    return useQueryInternal<Q, Schema, Config['useDateObjects']>(
-      this.core,
-      query,
-      opts,
-    ).state;
+  ): InstaQLLifecycleState<Schema, Q, UseDates> => {
+    return useQueryInternal<Q, Schema, UseDates>(this.core, query, opts).state;
   };
 
   /**
@@ -375,7 +377,7 @@ export default abstract class InstantReactAbstractDatabase<
     query: Q,
     opts?: InstaQLOptions,
   ): Promise<{
-    data: InstaQLResponse<Schema, Q, Config['useDateObjects']>;
+    data: InstaQLResponse<Schema, Q, UseDates>;
     pageInfo: PageInfoResponse<Q>;
   }> => {
     return this.core.queryOnce(query, opts);

package/src/InstantReactRoom.ts

@@ -245,7 +245,7 @@ export function useTypingIndicator<
   const timeout = useTimeout();
 
   const observedPresence = rooms.usePresence(room, {
-    keys: [inputName],
+    keys: [inputName] as (keyof RoomSchema[RoomType]['presence'])[],
   });
 
   const active = useMemo(() => {

package/src/useQuery.ts

@@ -16,7 +16,7 @@ const defaultState = {
   data: undefined,
   pageInfo: undefined,
   error: undefined,
-};
+} as const;
 
 function stateForResult(result: any) {
   return {
@@ -73,8 +73,11 @@ export function useQueryInternal<
       const unsubscribe = _core.subscribeQuery<Q, UseDates>(query, (result) => {
         resultCacheRef.current = {
           isLoading: !Boolean(result),
+          // @ts-expect-error: ts thinks this will always be overwritten
           data: undefined,
+          // @ts-expect-error: ts thinks this will always be overwritten
           pageInfo: undefined,
+          // @ts-expect-error: ts thinks this will always be overwritten
           error: undefined,
           ...result,
         };

package/src/useTimeout.ts

@@ -1,19 +1,21 @@
 import { useEffect, useRef } from 'react';
 
 export function useTimeout() {
-  const timeoutRef = useRef(null);
+  const timeoutRef = useRef<null | ReturnType<typeof setTimeout>>(null);
 
   useEffect(() => {
     clear();
   }, []);
 
   function set(delay: number, fn: () => void) {
-    clearTimeout(timeoutRef.current);
+    clear();
     timeoutRef.current = setTimeout(fn, delay);
   }
 
   function clear() {
-    clearTimeout(timeoutRef.current);
+    if (timeoutRef.current) {
+      clearTimeout(timeoutRef.current);
+    }
   }
 
   return { set, clear };

package/tsconfig.json

@@ -6,6 +6,7 @@
     "outDir": "dist/tsc",
     "rewriteRelativeImportExtensions": true,
     "rootDir": "src",
-    "jsx": "react-jsx"
+    "jsx": "react-jsx",
+    "strictNullChecks": true
   }
 }