[hygiene] New deps and React optimization

Author: jamesgpearce

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "tinybase",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "author": "jamesgpearce",
   "repository": "github:tinyplex/tinybase",
   "license": "MIT",
@@ -84,7 +84,7 @@
     "@types/jest": "^29.4.0",
     "@types/jest-environment-puppeteer": "^5.0.3",
     "@types/less": "^3.0.3",
-    "@types/node": "^18.14.0",
+    "@types/node": "^18.14.1",
     "@types/puppeteer": "^5.4.7",
     "@types/react": "^18.0.28",
     "@types/react-dom": "^18.0.11",

package.json

@@ -54,11 +54,13 @@ const useThing = <
   id: Id | undefined,
   offset: number,
 ): Thing | undefined => {
-  const thingsAndThingsById = useContext(Context);
+  const contextValue = useContext(Context);
   return (
     isUndefined(id)
-      ? thingsAndThingsById[offset]
-      : objGet(thingsAndThingsById[offset + 1] as IdObj<Thing>, id)
+      ? contextValue[offset]
+      : isString(id)
+      ? objGet(contextValue[offset + 1] as IdObj<Thing>, id)
+      : id
   ) as Thing;
 };
 
@@ -75,10 +77,9 @@ const useThingOrThingId = <
   offset: number,
 ): Thing | undefined => {
   const thing = useThing(thingOrThingId as Id, offset);
-  if (isUndefined(thingOrThingId) || isString(thingOrThingId)) {
-    return thing as Thing | undefined;
-  }
-  return thingOrThingId as Thing;
+  return isUndefined(thingOrThingId) || isString(thingOrThingId)
+    ? (thing as Thing | undefined)
+    : (thingOrThingId as Thing);
 };
 
 export const useStore: typeof useStoreDecl = (id?: Id): Store | undefined =>

src/ui-react/common.ts

@@ -241,23 +241,23 @@ export const Provider: typeof ProviderDecl = ({
   checkpointsById,
   children,
 }: ProviderProps & {children: React.ReactNode}): any => {
-  const thingsOrThingsId = useContext(Context);
+  const parentValue = useContext(Context);
   return (
     <Context.Provider
       value={useMemo(
         () => [
-          store ?? thingsOrThingsId[0],
-          {...thingsOrThingsId[1], ...storesById},
-          metrics ?? thingsOrThingsId[2],
-          {...thingsOrThingsId[3], ...metricsById},
-          indexes ?? thingsOrThingsId[4],
-          {...thingsOrThingsId[5], ...indexesById},
-          relationships ?? thingsOrThingsId[6],
-          {...thingsOrThingsId[7], ...relationshipsById},
-          queries ?? thingsOrThingsId[8],
-          {...thingsOrThingsId[9], ...queriesById},
-          checkpoints ?? thingsOrThingsId[10],
-          {...thingsOrThingsId[11], ...checkpointsById},
+          store ?? parentValue[0],
+          {...parentValue[1], ...storesById},
+          metrics ?? parentValue[2],
+          {...parentValue[3], ...metricsById},
+          indexes ?? parentValue[4],
+          {...parentValue[5], ...indexesById},
+          relationships ?? parentValue[6],
+          {...parentValue[7], ...relationshipsById},
+          queries ?? parentValue[8],
+          {...parentValue[9], ...queriesById},
+          checkpoints ?? parentValue[10],
+          {...parentValue[11], ...checkpointsById},
         ],
         [
           store,
@@ -272,7 +272,7 @@ export const Provider: typeof ProviderDecl = ({
           queriesById,
           checkpoints,
           checkpointsById,
-          thingsOrThingsId,
+          parentValue,
         ],
       )}
     >