muya 2.2.5 → 2.2.6

package/esm/sqlite/create-sqlite.js

@@ -1 +1 @@
-import{createScheduler as P}from"../scheduler";import{shallow as O}from"../utils/shallow";import{selectSql as R}from"./select-sql";import{createTable as v,DEFAULT_STEP_SIZE as M}from"./table/table";const f=P();let C=0;function B(){return C++}function L(g){const k=B();function l(e){return`state-${k}-search-${e}`}let m;async function o(){if(!m){const{backend:e,...n}=g,t=e instanceof Promise?await e:e;m=await v({backend:t,...n})}return m}const c=new Map,i=new Map,h=new Map;async function p(e,n){const t=h.get(e),{options:a={}}=n,{stepSize:s=M}=a;if(!t)return!1;const r=[];for(let u=0;u<s;u++){const y=await t.next();if(y.done){h.delete(e);break}r.push(y.value.document),n.keys.add(String(y.value.rowId))}return r.length===0||O(n.items,r)?!1:(n.items=[...n.items,...r],!0)}function b(e){const n=i.get(e);n&&n()}async function x(e){const n=await o(),t=c.get(e);if(!t)return;const{options:a}=t,s=n.search({...a,select:(r,{rowId:u})=>({document:r,rowId:u})});h.set(e,s),t.keys=new Set,t.items=[],await p(e,t)}async function S(e){await x(e),b(e)}function T(e){const{key:n,op:t}=e,a=new Set;for(const[s,{keys:r}]of c)switch(t){case"delete":case"update":{r.has(String(n))&&a.add(s);break}case"insert":{a.add(s);break}}return a}async function d(e){const n=new Set;for(const t of e){const a=T(t);for(const s of a)n.add(s)}for(const t of n){const a=l(t);f.schedule(a,{searchId:t})}}const D=new Set;function w(e,n){c.has(e)||(c.set(e,{items:[],options:n,keys:new Set}),n&&S(e));const t=c.get(e);return n&&(t.options=n),t}const I={async set(e){const t=await(await o()).set(e);return await d([t]),t},async batchSet(e){const t=await(await o()).batchSet(e);return await d(t),t},async delete(e){const t=await(await o()).delete(e);return t&&await d([t]),t},async deleteBy(e){const t=await(await o()).deleteBy(e);return await d(t),t},async get(e,n){return(await o()).get(e,n)},async*search(e={}){const n=await o();for await(const t of n.search(e))yield t},async count(e){return await(await o()).count(e)},updateSearchOptions(e,n){const t=w(e,n);t.options=n;const a=l(e);f.schedule(a,{searchId:e})},subscribe(e,n){const t=l(e),a=f.add(t,{onScheduleDone(){S(e)}});return D.add(a),i.has(e)||i.set(e,n),()=>{i.delete(e),a(),c.delete(e)}},getSnapshot(e){return w(e).items},refresh:S,destroy(){for(const e of D)e();c.clear(),i.clear()},async next(e){const n=c.get(e);if(n){const t=await p(e,n);return t&&b(e),t}return!1},select(e){return R(I,e)}};return I}export{L as createSqliteState};
+import{createScheduler as P}from"../scheduler";import{shallow as O}from"../utils/shallow";import{selectSql as v}from"./select-sql";import{createTable as R,DEFAULT_STEP_SIZE as M}from"./table/table";const f=P();let C=0;function B(){return C++}function L(g){const k=B();function m(e){return`state-${k}-search-${e}`}let h;async function o(){if(!h){const{backend:e,...n}=g,t=e instanceof Promise?await e:e;h=await R({backend:t,...n})}return h}const c=new Map,i=new Map,S=new Map;async function p(e,n){const t=S.get(e),{options:a={}}=n,{stepSize:s=M}=a;if(!t)return!1;const r=[];for(let u=0;u<s;u++){const l=await t.next();if(l.done){S.delete(e);break}n.keys.has(String(l.value.rowId))||(r.push(l.value.document),n.keys.add(String(l.value.rowId)))}return r.length===0||O(n.items,r)?!1:(n.items=[...n.items,...r],!0)}function b(e){const n=i.get(e);n&&n()}async function x(e){const n=await o(),t=c.get(e);if(!t)return;const{options:a}=t,s=n.search({...a,select:(r,{rowId:u})=>({document:r,rowId:u})});S.set(e,s),t.keys=new Set,t.items=[],await p(e,t)}async function y(e){await x(e),b(e)}function T(e){const{key:n,op:t}=e,a=new Set;for(const[s,{keys:r}]of c)switch(t){case"delete":case"update":{r.has(String(n))&&a.add(s);break}case"insert":{a.add(s);break}}return a}async function d(e){const n=new Set;for(const t of e){const a=T(t);for(const s of a)n.add(s)}for(const t of n){const a=m(t);f.schedule(a,{searchId:t})}}const D=new Set;function w(e,n){c.has(e)||(c.set(e,{items:[],options:n,keys:new Set}),n&&y(e));const t=c.get(e);return n&&(t.options=n),t}const I={async set(e){const t=await(await o()).set(e);return await d([t]),t},async batchSet(e){const t=await(await o()).batchSet(e);return await d(t),t},async delete(e){const t=await(await o()).delete(e);return t&&await d([t]),t},async deleteBy(e){const t=await(await o()).deleteBy(e);return await d(t),t},async get(e,n){return(await o()).get(e,n)},async*search(e={}){const n=await o();for await(const t of n.search(e))yield t},async count(e){return await(await o()).count(e)},updateSearchOptions(e,n){const t=w(e,n);t.options=n;const a=m(e);f.schedule(a,{searchId:e})},subscribe(e,n){const t=m(e),a=f.add(t,{onScheduleDone(){y(e)}});return D.add(a),i.has(e)||i.set(e,n),()=>{i.delete(e),a(),c.delete(e)}},getSnapshot(e){return w(e).items},refresh:y,destroy(){for(const e of D)e();c.clear(),i.clear()},async next(e){const n=c.get(e);if(n){const t=await p(e,n);return t&&b(e),t}return!1},select(e){return v(I,e)}};return I}export{L as createSqliteState};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muya",
-  "version": "2.2.5",
+  "version": "2.2.6",
   "author": "samuel.gjabel@gmail.com",
   "repository": "https://github.com/samuelgjabel/muya",
   "main": "cjs/index.js",

package/src/sqlite/__tests__/use-sqlite.test.tsx

@@ -39,32 +39,32 @@ describe('use-sqlite-state', () => {
       expect(reRenders).toBe(3)
     })
 
-    // act(() => {
-    //   sql.set({ id: '1', name: 'Alice2', age: 30 })
-    // })
-    // await waitFor(() => {
-    //   expect(result.current[0]).toEqual([{ id: '1', name: 'Alice2', age: 30 }])
-    //   expect(reRenders).toBe(4)
-    // })
+    act(() => {
+      sql.set({ id: '1', name: 'Alice2', age: 30 })
+    })
+    await waitFor(() => {
+      expect(result.current[0]).toEqual([{ id: '1', name: 'Alice2', age: 30 }])
+      expect(reRenders).toBe(4)
+    })
 
-    // // delete item
-    // act(() => {
-    //   sql.delete('1')
-    // })
-    // await waitFor(() => {
-    //   expect(result.current[0]).toEqual([])
-    //   expect(reRenders).toBe(5)
-    // })
+    // delete item
+    act(() => {
+      sql.delete('1')
+    })
+    await waitFor(() => {
+      expect(result.current[0]).toEqual([])
+      expect(reRenders).toBe(5)
+    })
 
-    // // add two items
-    // act(() => {
-    //   sql.set({ id: '1', name: 'Alice', age: 30 })
-    //   sql.set({ id: '2', name: 'Bob', age: 25 })
-    // })
-    // await waitFor(() => {
-    //   expect(result.current[0].length).toBe(2)
-    //   expect(reRenders).toBe(6)
-    // })
+    // add two items
+    act(() => {
+      sql.set({ id: '1', name: 'Alice', age: 30 })
+      sql.set({ id: '2', name: 'Bob', age: 25 })
+    })
+    await waitFor(() => {
+      expect(result.current[0].length).toBe(2)
+      expect(reRenders).toBe(6)
+    })
   })
 
   it('should use where clause changed via state', async () => {
@@ -277,4 +277,38 @@ describe('use-sqlite-state', () => {
       expect(result.current[0]).toEqual(['Alice', 'Bob', 'Carol'])
     })
   })
+  it('should add 50 documents and then load with another hook', async () => {
+    const sql = createSqliteState<Person>({ backend, tableName: 'State9', key: 'id' })
+    let reRenders = 0
+    const { result: result1 } = renderHook(() => {
+      reRenders++
+      return useSqliteValue(
+        sql,
+        {
+          sorBy: 'age',
+          order: 'desc',
+        },
+        [],
+      )
+    })
+    await waitFor(() => {
+      expect(reRenders).toBe(2)
+      expect(result1.current[0].length).toBe(0)
+    })
+
+    const people: Person[] = []
+    for (let index = 1; index <= 50; index++) {
+      people.push({ id: index.toString(), name: `Person${index}`, age: 20 + (index % 50) })
+    }
+    await sql.batchSet(people)
+    await waitFor(() => {
+      expect(reRenders).toBe(3)
+      expect(result1.current[0].length).toBe(50)
+    })
+
+    const { result: result2 } = renderHook(() => useSqliteValue(sql, {}, []))
+    await waitFor(() => {
+      expect(result2.current[0].length).toBe(50)
+    })
+  })
 })

package/src/sqlite/create-sqlite.ts

@@ -88,8 +88,11 @@ export function createSqliteState<Document extends DocType>(options: CreateSqlit
         iterators.delete(searchId)
         break
       }
-      newItems.push(result.value.document)
-      data.keys.add(String(result.value.rowId))
+
+      if (!data.keys.has(String(result.value.rowId))) {
+        newItems.push(result.value.document)
+        data.keys.add(String(result.value.rowId))
+      }
     }
 
     if (newItems.length === 0) return false