@kaspernj/api-maker 1.0.324 → 1.0.325

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.324",
+  "version": "1.0.325",
   "type": "module",
   "description": "",
   "main": "index.js",

package/src/use-collection.mjs

@@ -46,21 +46,23 @@ const useCollection = (
 
   if (!queryName) queryName = digg(modelClass.modelClassData(), "collectionKey")
 
-  const setModels = s.useState("models")
-  const setOverallCount = s.useState("overallCount")
-  const setQuery = s.useState("query")
-  const setQueryName = s.useState("queryName", queryName)
-  const setQueryPerKey = s.useState("queryPerKey", `${s.s.queryName}_per`)
-  const setQueryQName = s.useState("queryQName", `${s.s.queryName}_q`)
-  const setQuerySName = s.useState("querySName", `${s.s.queryName}_s`)
-  const setQueryPageName = s.useState("queryPageName", `${s.s.queryName}_page`)
-  const setQParams = s.useState("qParams")
-  const setResult = s.useState("result")
-  const setSearchParams = s.useState("searchParams")
-  const setShowNoRecordsAvailableContent = s.useState("showNoRecordsAvailableContent", false)
-  const setShowNoRecordsFoundContent = s.useState("showNoRecordsFoundContent", false)
+  s.useStates({
+    models: undefined,
+    overallCount: undefined,
+    query: undefined,
+    queryName,
+    queryPerKey: `${queryName}_per`,
+    queryQName: `${queryName}_q`,
+    querySName: `${queryName}_s`,
+    queryPageName: `${queryName}_page`,
+    qParams: undefined,
+    result: undefined,
+    searchParams: undefined,
+    showNoRecordsAvailableContent: false,
+    showNoRecordsFoundContent: false
+  })
+
   const queryParams = useQueryParams()
-  const modelIds = s.s.models?.map((model) => model.id())
 
   let modelIdsCacheString
 
@@ -69,7 +71,7 @@ const useCollection = (
   } else if (s.s.models.length === 0) {
     modelIdsCacheString = "no-models"
   } else {
-    modelIdsCacheString = modelIds?.join("---")
+    modelIdsCacheString = s.s.models.map((model) => model.cacheKey())?.join("---")
   }
 
   s.updateMeta({queryParams})
@@ -78,9 +80,11 @@ const useCollection = (
     const baseQuery = s.p.collection || s.p.modelClass.all()
     const overallCount = await baseQuery.count()
 
-    setOverallCount(overallCount)
-    setShowNoRecordsAvailableContent(showNoRecordsAvailableContent({overallCount}))
-    setShowNoRecordsFoundContent(showNoRecordsFoundContent({overallCount}))
+    s.set({
+      overallCount,
+      showNoRecordsAvailableContent: showNoRecordsAvailableContent({overallCount}),
+      showNoRecordsFoundContent: showNoRecordsFoundContent({overallCount})
+    })
   }, [])
 
   const hasQParams = useCallback(() => {
@@ -107,8 +111,10 @@ const useCollection = (
       }
     }
 
-    setQParams(qParamsToSet)
-    setSearchParams(searchParams)
+    s.set({
+      qParams: qParamsToSet,
+      searchParams
+    })
   }, [])
 
   const loadModels = useCallback(async () => {
@@ -160,16 +166,20 @@ const useCollection = (
       })
     }
 
-    setQuery(query)
-    setResult(result)
-    setModels(result.models())
-    setShowNoRecordsAvailableContent(showNoRecordsAvailableContent({models}))
-    setShowNoRecordsFoundContent(showNoRecordsFoundContent({models}))
+    s.set({
+      models: result.models(),
+      query,
+      result,
+      showNoRecordsAvailableContent: showNoRecordsAvailableContent({models}),
+      showNoRecordsFoundContent: showNoRecordsFoundContent({models})
+    })
   }, [])
 
   const loadModelsDebounce = useCallback(debounce(loadModels), [])
   const onModelDestroyed = useCallback((args) => {
-    setModels(s.s.models.filter((model) => model.id() != args.model.id()))
+    s.set({
+      models: s.s.models.filter((model) => model.id() != args.model.id())
+    })
   }, [])
 
   const onModelUpdated = useCallback((args) => {