muya 2.4.93 → 2.4.95

package/esm/sqlite/__tests__/where.test.js

@@ -0,0 +1 @@
+import{createTable as n}from"../table";import{bunMemoryBackend as c}from"../table/bun-backend";describe("where clauses",()=>{const a=c();it("should handle where where array of conditions",async()=>{const e=await n({backend:a,tableName:"TestTableNestedOptional",key:"id",indexes:["content"]});await e.set({id:"1",content:"The quick brown fox"}),await e.set({id:"2",content:"The jumps over the lazy dog"}),await e.set({id:"3"});const t=[];for await(const i of e.search({where:{content:{like:["The%"]}}}))t.push(i);expect(t.length).toBe(2),expect(t[0].id).toBe("1")}),it("should create nested index for optional nested fields",async()=>{const e=await n({backend:a,tableName:"TestTableNestedOptional",key:"id",indexes:["fts:info.content"]});await e.set({id:"1",info:{content:"The quick brown fox"}}),await e.set({id:"2",info:{content:"jumps over the lazy dog"}}),await e.set({id:"3"});const t=[];for await(const s of e.search({where:{info:{content:{like:["The%"]}}}}))t.push(s);expect(t.length).toBe(1),expect(t[0].id).toBe("1");const i=[];for await(const s of e.search({where:{OR:[{info:{content:{like:["The%"]}}},{info:{content:{like:["jumps%"]}}}]}}))i.push(s);expect(i.length).toBe(2);const o=[];for await(const s of e.search({where:{info:{content:"nonexistent"}}}))o.push(s);expect(o.length).toBe(0)}),it("should handle FTS queries",async()=>{const e=await n({backend:a,tableName:"TestTableFts",key:"id",indexes:["fts:content"]});await e.set({id:"1",content:"The quick brown fox"}),await e.set({id:"2",content:"Jumps over the lazy dog"}),await e.set({id:"3",content:"Another document"});const t=[];for await(const i of e.search({where:{content:{fts:"quick"}}}))t.push(i);expect(t.length).toBe(1),expect(t[0].id).toBe("1")}),it("should handle nested where conditions",async()=>{const e=await n({backend:a,tableName:"TestTableNested",key:"id",indexes:["info.content"]});await e.set({id:"1",info:{content:"Nested quick brown fox"}}),await e.set({id:"2",info:{content:"Nested jumps over the lazy dog"}});const t=[];for await(const i of e.search({where:{info:{content:{like:"Nested%"}}}}))t.push(i);expect(t.length).toBe(2)}),it("should handle complex operators",async()=>{const e=await n({backend:a,tableName:"TestTableComplex",key:"id",indexes:["value"]});await e.set({id:"1",value:10}),await e.set({id:"2",value:20}),await e.set({id:"3",value:30});const t=[];for await(const i of e.search({where:{value:{gt:15,lt:25}},sortBy:"value"}))t.push(i);expect(t.length).toBe(1),expect(t[0].id).toBe("2")}),it("should handle NOT conditions",async()=>{const e=await n({backend:a,tableName:"TestTableNot",key:"id",indexes:["value"]});await e.set({id:"1",value:"apple"}),await e.set({id:"2",value:"banana"}),await e.set({id:"3",value:"cherry"});const t=[];for await(const i of e.search({where:{NOT:{value:"banana"}}}))t.push(i);expect(t.length).toBe(2),expect(t.map(i=>i.value)).toEqual(["apple","cherry"])}),it("should handle AND conditions",async()=>{const e=await n({backend:a,tableName:"TestTableAnd",key:"id",indexes:["category","price"]});await e.set({id:"1",category:"fruit",price:10}),await e.set({id:"2",category:"fruit",price:20}),await e.set({id:"3",category:"vegetable",price:15});const t=[];for await(const i of e.search({where:{AND:[{category:"fruit"},{price:{lt:15}}]}}))t.push(i);expect(t.length).toBe(1),expect(t[0].id).toBe("1")}),it("should handle OR conditions",async()=>{const e=await n({backend:a,tableName:"TestTableOr",key:"id",indexes:["type"]});await e.set({id:"1",type:"A"}),await e.set({id:"2",type:"B"}),await e.set({id:"3",type:"C"});const t=[];for await(const i of e.search({where:{OR:[{type:"A"},{type:"C"}]}}))t.push(i);expect(t.length).toBe(2),expect(t.map(i=>i.type)).toEqual(["A","C"])}),it("should handle nested AND/OR/NOT conditions",async()=>{const e=await n({backend:a,tableName:"TestTableNestedLogic",key:"id",indexes:["category","price"]});await e.set({id:"1",category:"fruit",price:10}),await e.set({id:"2",category:"fruit",price:20}),await e.set({id:"3",category:"fruit",price:15});const t={AND:[{category:{is:"fruit"}},{OR:[{price:{lt:15}},{price:{is:15}}]}]},i=[];for await(const s of e.search({}))i.push(s);expect(i.length).toBe(3);const o=[];for await(const s of e.search({where:t}))o.push(s);expect(o.length).toBe(2)})});

package/esm/sqlite/create-sqlite.js

@@ -1 +1 @@
-import{STATE_SCHEDULER as l}from"../create";import{getId as m}from"../utils/id";import{createTable as d}from"./table/table";function D(u){let s;async function a(){if(!s){const{backend:e,...n}=u,t=e instanceof Promise?await e:e;s=await d({backend:t,...n})}return s}const i=m();l.add(i,{onScheduleDone(e){if(!e)return;const n=e,t={};for(const c of n)c.removedAll&&(t.removedAll=!0),c.mutations&&(t.mutations||(t.mutations=[]),t.mutations.push(...c.mutations));for(const c of r)c(t)}});function o(e){l.schedule(i,e)}const r=new Set;return{subscribe(e){return r.add(e),()=>r.delete(e)},async clear(){const e=await a();return o({removedAll:!0}),e.clear()},async set(e){const t=await(await a()).set(e);return o({mutations:[t]}),t},async batchSet(e){const t=await(await a()).batchSet(e);return o({mutations:t}),t},async delete(e){const t=await(await a()).delete(e);return t&&o({mutations:[t]}),t},async deleteBy(e){const t=await(await a()).deleteBy(e);return o({mutations:t}),t},async get(e,n){return(await a()).get(e,n)},async*search(e={}){const n=await a();for await(const t of n.search(e))yield t},async count(e){return await(await a()).count(e)}}}export{D as createSqliteState};
+import{STATE_SCHEDULER as u}from"../create";import{getId as m}from"../utils/id";import{createTable as d}from"./table/table";function p(l){let s;async function o(){if(!s){const{backend:e,...n}=l,t=e instanceof Promise?await e:e;s=await d({backend:t,...n})}return s}const i=m();u.add(i,{onScheduleDone(e){if(!e)return;const n=e,t={};for(const c of n)c.removedAll&&(t.removedAll=!0),c.mutations&&(t.mutations||(t.mutations=[]),t.mutations.push(...c.mutations));for(const c of r)c(t)}});function a(e){u.schedule(i,e)}const r=new Set;return{subscribe(e){return r.add(e),()=>r.delete(e)},async clear(){const e=await o();return a({removedAll:!0}),e.clear()},async set(e){const t=await(await o()).set(e);return a({mutations:[t]}),t},async batchSet(e){const t=await(await o()).batchSet(e);return a({mutations:t}),t},async delete(e){const t=await(await o()).delete(e);return t&&a({mutations:[t]}),t},async deleteBy(e){const t=await(await o()).deleteBy(e);return a({mutations: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)}}}export{p as createSqliteState};

package/esm/sqlite/table/table.js

@@ -35,4 +35,4 @@ import{unicodeTokenizer as _}from"./tokenizer";import{getWhereQuery as g}from"./
         SET ${T.map(r=>`${f[r]}=json_extract(new.data, '${m(r)}')`).join(", ")}
         WHERE rowid = old.rowid;
       END;
-    `)}function A(e){if(u)return M(e,String($))}const k={backend:s,async set(e,n){const o=n??s,r=JSON.stringify(e);if(u){const a=A(e);if(a==null)throw new Error(`Document is missing the configured key "${String($)}".`);return(await o.select(`SELECT key FROM ${t} WHERE key = ?`,[a])).length>0?(await o.execute(`UPDATE ${t} SET data = ? WHERE key = ?`,[r,a]),{key:a,op:"update"}):(await o.execute(`INSERT INTO ${t} (key, data) VALUES (?, ?)`,[a,r]),{key:a,op:"insert"})}await o.execute(`INSERT INTO ${t} (data) VALUES (?)`,[r]);const c=(await o.select("SELECT last_insert_rowid() AS id"))[0]?.id;if(typeof c!="number")throw new Error("Failed to retrieve last_insert_rowid()");return{key:c,op:"insert"}},async get(e,n=o=>o){const o=u?"key = ?":"rowid = ?",r=await s.select(`SELECT rowid, data FROM ${t} WHERE ${o}`,[e]);if(r.length===0)return;const{data:E,rowid:c}=r[0],a=JSON.parse(E),i=u?A(a)??c:c;return n(a,{rowId:c,key:i})},async delete(e){const n=u?"key = ?":"rowid = ?";if(await s.execute(`DELETE FROM ${t} WHERE ${n}`,[e]),((await s.select("SELECT changes() AS c"))[0]?.c??0)>0)return{key:e,op:"delete"}},async*search(e={}){const{sortBy:n,order:o="asc",limit:r,offset:E=0,where:c,select:a=w=>w,pageSize:i=C}=e,S=g(c,t),h=`SELECT rowid, data FROM ${t} ${S}`;let p=0,I=E;for(;;){let w=h;n?w+=` ORDER BY json_extract(data, '${m(String(n))}') COLLATE NOCASE ${o.toUpperCase()}`:w+=u?` ORDER BY key COLLATE NOCASE ${o.toUpperCase()}`:` ORDER BY rowid ${o.toUpperCase()}`;const N=r?Math.min(i,r-p):i;w+=` LIMIT ${N} OFFSET ${I}`;const R=await s.select(w);if(R.length===0)break;for(const{rowid:O,data:F}of R){if(r&&p>=r)return;const D=JSON.parse(F),b=u?A(D)??O:O;yield a(D,{rowId:O,key:b}),p++}if(R.length<N||r&&p>=r)break;I+=R.length}},async count(e={}){const n=g(e.where,t),o=`SELECT COUNT(*) as count FROM ${t} ${n}`;return(await s.select(o))[0]?.count??0},async deleteBy(e){const n=g(e,t),o=u?"key":"rowid",r=[];return await s.transaction(async E=>{const c=await E.select(`SELECT ${o} AS k FROM ${t} ${n}`);if(c.length===0)return;const a=c.map(i=>i.k);for(let i=0;i<a.length;i+=x){const S=a.slice(i,i+x),h=S.map(()=>"?").join(",");await E.execute(`DELETE FROM ${t} WHERE ${o} IN (${h})`,S)}for(const i of a)r.push({key:i,op:"delete"})}),r},async clear(){await s.execute(`DELETE FROM ${t}`)},async batchSet(e){const n=[];return await s.transaction(async o=>{for(const r of e){const E=await k.set(r,o);n.push(E)}}),n}};return k}export{C as DEFAULT_PAGE_SIZE,G as createTable,M as getByPath,m as toJsonPath};
+    `)}function A(e){if(u)return M(e,String($))}const k={backend:s,async set(e,n){const o=n??s,r=JSON.stringify(e);if(u){const i=A(e);if(i==null)throw new Error(`Document is missing the configured key "${String($)}".`);return(await o.select(`SELECT key FROM ${t} WHERE key = ?`,[i])).length>0?(await o.execute(`UPDATE ${t} SET data = ? WHERE key = ?`,[r,i]),{key:i,op:"update",document:e}):(await o.execute(`INSERT INTO ${t} (key, data) VALUES (?, ?)`,[i,r]),{key:i,op:"insert",document:e})}await o.execute(`INSERT INTO ${t} (data) VALUES (?)`,[r]);const c=(await o.select("SELECT last_insert_rowid() AS id"))[0]?.id;if(typeof c!="number")throw new Error("Failed to retrieve last_insert_rowid()");return{key:c,op:"insert",document:e}},async get(e,n=o=>o){const o=u?"key = ?":"rowid = ?",r=await s.select(`SELECT rowid, data FROM ${t} WHERE ${o}`,[e]);if(r.length===0)return;const{data:E,rowid:c}=r[0],i=JSON.parse(E),a=u?A(i)??c:c;return n(i,{rowId:c,key:a})},async delete(e){const n=u?"key = ?":"rowid = ?";if(await s.execute(`DELETE FROM ${t} WHERE ${n}`,[e]),((await s.select("SELECT changes() AS c"))[0]?.c??0)>0)return{key:e,op:"delete"}},async*search(e={}){const{sortBy:n,order:o="asc",limit:r,offset:E=0,where:c,select:i=w=>w,pageSize:a=C}=e,S=g(c,t),h=`SELECT rowid, data FROM ${t} ${S}`;let p=0,D=E;for(;;){let w=h;n?w+=` ORDER BY json_extract(data, '${m(String(n))}') COLLATE NOCASE ${o.toUpperCase()}`:w+=u?` ORDER BY key COLLATE NOCASE ${o.toUpperCase()}`:` ORDER BY rowid ${o.toUpperCase()}`;const I=r?Math.min(a,r-p):a;w+=` LIMIT ${I} OFFSET ${D}`;const R=await s.select(w);if(R.length===0)break;for(const{rowid:O,data:F}of R){if(r&&p>=r)return;const N=JSON.parse(F),b=u?A(N)??O:O;yield i(N,{rowId:O,key:b}),p++}if(R.length<I||r&&p>=r)break;D+=R.length}},async count(e={}){const n=g(e.where,t),o=`SELECT COUNT(*) as count FROM ${t} ${n}`;return(await s.select(o))[0]?.count??0},async deleteBy(e){const n=g(e,t),o=u?"key":"rowid",r=[];return await s.transaction(async E=>{const c=await E.select(`SELECT ${o} AS k FROM ${t} ${n}`);if(c.length===0)return;const i=c.map(a=>a.k);for(let a=0;a<i.length;a+=x){const S=i.slice(a,a+x),h=S.map(()=>"?").join(",");await E.execute(`DELETE FROM ${t} WHERE ${o} IN (${h})`,S)}for(const a of i)r.push({key:a,op:"delete",document:void 0})}),r},async clear(){await s.execute(`DELETE FROM ${t}`)},async batchSet(e){const n=[];return await s.transaction(async o=>{for(const r of e){const E=await k.set(r,o);n.push(E)}}),n}};return k}export{C as DEFAULT_PAGE_SIZE,G as createTable,M as getByPath,m as toJsonPath};

package/esm/sqlite/table/where.js

@@ -1 +1 @@
-function a(n){return typeof n=="string"?`'${n.replaceAll("'","''")}'`:typeof n=="number"?n.toString():typeof n=="boolean"?n?"1":"0":`'${String(n).replaceAll("'","''")}'`}function A(n,r,t){const e=t?`${t}.`:"";return n==="KEY"?`"${e}key"`:typeof r=="string"?`CAST(json_extract(${e}data, '$.${n}') AS TEXT)`:typeof r=="number"?`CAST(json_extract(${e}data, '$.${n}') AS NUMERIC)`:typeof r=="boolean"?`CAST(json_extract(${e}data, '$.${n}') AS INTEGER)`:`json_extract(${e}data, '$.${n}')`}const N=new Set(["is","isNot","gt","gte","lt","lte","in","notIn","like","fts"]);function p(n,r=""){const t={};for(const[e,c]of Object.entries(n)){if(e==="AND"||e==="OR"||e==="NOT"){t[e]=c;continue}const $=r?`${r}.${e}`:e;c&&typeof c=="object"&&!Array.isArray(c)&&!Object.keys(c).some(i=>N.has(i))?Object.assign(t,p(c,$)):t[$]=c}return t}function l(n,r,t){if(!n||typeof n!="object")return"";if(n.AND){const i=Array.isArray(n.AND)?n.AND.map(u=>l(u,r,t)).filter(Boolean):[];return i.length>0?`(${i.join(" AND ")})`:""}if(n.OR){const i=Array.isArray(n.OR)?n.OR.map(u=>l(u,r,t)).filter(Boolean):[];return i.length>0?`(${i.join(" OR ")})`:""}if(n.NOT){const i=l(n.NOT,r,t);return i?`(NOT ${i})`:""}const e=p(n);let c="",$=!1;for(const[i,u]of Object.entries(e)){if(u==null)continue;let T;typeof u!="object"||Array.isArray(u)?T=Array.isArray(u)?{in:u}:{is:u}:T=u;for(const s of Object.keys(T)){const d=T[s];if(d==null)continue;const y=Array.isArray(d)?d:[d];if(y.length!==0){if(s==="fts"){if(!t)throw new Error("FTS requires tableName for JOIN reference");const o=y.map(f=>`EXISTS (SELECT 1 FROM ${t}_fts f WHERE f.rowid = ${r??t}.rowid AND ${t}_fts MATCH ${a(f)})`).join(" AND ");c+=($?" AND ":"")+o,$=!0;continue}if(s==="is"||s==="isNot"||s==="in"||s==="notIn"){const o=A(i,y[0],r),f=y.map(a).join(","),g=s==="is"?y.length>1?`${o} IN (${f})`:`${o} = ${a(y[0])}`:s==="isNot"?y.length>1?`${o} NOT IN (${f})`:`${o} <> ${a(y[0])}`:s==="in"?`${o} IN (${f})`:`${o} NOT IN (${f})`;c+=($?" AND ":"")+g,$=!0;continue}for(const o of y){const f=A(i,o,r),g=s==="gt"?`${f} > ${a(o)}`:s==="gte"?`${f} >= ${a(o)}`:s==="lt"?`${f} < ${a(o)}`:s==="lte"?`${f} <= ${a(o)}`:`${f} LIKE ${a(o)}`;c+=($?" AND ":"")+g,$=!0}}}}return $?`(${c})`:""}function k(n,r){if(!n)return"";const t=l(n,void 0,r);return t?`WHERE ${t}`:""}export{l as getWhere,k as getWhereQuery};
+function $(n){return typeof n=="string"?`'${n.replaceAll("'","''")}'`:typeof n=="number"?n.toString():typeof n=="boolean"?n?"1":"0":`'${String(n).replaceAll("'","''")}'`}function A(n,r,t){const o=t?`${t}.`:"";return n==="KEY"?`"${o}key"`:typeof r=="string"?`CAST(json_extract(${o}data, '$.${n}') AS TEXT)`:typeof r=="number"?`CAST(json_extract(${o}data, '$.${n}') AS NUMERIC)`:typeof r=="boolean"?`CAST(json_extract(${o}data, '$.${n}') AS INTEGER)`:`json_extract(${o}data, '$.${n}')`}const p=new Set(["is","isNot","gt","gte","lt","lte","in","notIn","like","fts"]);function R(n,r=""){const t={};for(const[o,c]of Object.entries(n)){if(o==="AND"||o==="OR"||o==="NOT"){t[o]=c;continue}const a=r?`${r}.${o}`:o;c&&typeof c=="object"&&!Array.isArray(c)&&!Object.keys(c).some(i=>p.has(i))?Object.assign(t,R(c,a)):t[a]=c}return t}function T(n,r,t){if(!n||typeof n!="object")return"";if(n.AND){const i=Array.isArray(n.AND)?n.AND.map(u=>T(u,r,t)).filter(Boolean):[];return i.length>0?`(${i.join(" AND ")})`:""}if(n.OR){const i=Array.isArray(n.OR)?n.OR.map(u=>T(u,r,t)).filter(Boolean):[];return i.length>0?`(${i.join(" OR ")})`:""}if(n.NOT){const i=T(n.NOT,r,t);return i?`(NOT ${i})`:""}const o=R(n);let c="",a=!1;for(const[i,u]of Object.entries(o)){if(u==null)continue;let d;typeof u!="object"||Array.isArray(u)?d=Array.isArray(u)?{in:u}:{is:u}:d=u;for(const s of Object.keys(d)){const l=d[s];if(l==null)continue;const y=Array.isArray(l)?l:[l];if(y.length!==0){if(s==="fts"){if(!t)throw new Error("FTS requires tableName for JOIN reference");const e=y.map(f=>`EXISTS (SELECT 1 FROM ${t}_fts f WHERE f.rowid = ${r??t}.rowid AND ${t}_fts MATCH ${$(f)})`).join(" AND ");c+=(a?" AND ":"")+e,a=!0;continue}if(s==="is"||s==="isNot"||s==="in"||s==="notIn"){const e=A(i,y[0],r),f=y.map($).join(","),g=s==="is"?y.length>1?`${e} IN (${f})`:`${e} = ${$(y[0])}`:s==="isNot"?y.length>1?`${e} NOT IN (${f})`:`${e} <> ${$(y[0])}`:s==="in"?`${e} IN (${f})`:`${e} NOT IN (${f})`;c+=(a?" AND ":"")+g,a=!0;continue}for(const e of y){const f=A(i,e,r),g=s==="gt"?`${f} > ${$(e)}`:s==="gte"?`${f} >= ${$(e)}`:s==="lt"?`${f} < ${$(e)}`:s==="lte"?`${f} <= ${$(e)}`:`${f} LIKE ${$(e)}`;c+=(a?" AND ":"")+g,a=!0}}}}return a?`(${c})`:""}function k(n,r){if(!n)return"";const t=T(n,void 0,r);return t?`WHERE ${t}`:""}export{T as getWhere,k as getWhereQuery};

package/esm/sqlite/use-sqlite.js

@@ -1 +1 @@
-import{useCallback as f,useLayoutEffect as P,useReducer as _,useRef as D}from"react";import{DEFAULT_PAGE_SIZE as C}from"./table";import{shallow as E}from"../utils/shallow";const T=1e4;function z(a,w={},I=[]){const{select:m,pageSize:q=C}=w,e=D(null),[,k]=_(c=>c+1,0),n=D(new Map),x=D(null),A=f(()=>{const{select:c,...i}=w;x.current=a.search({select:(u,l)=>({doc:u,meta:l}),...i})},[a,...I]),d=f(()=>{e.current=[],n.current.clear(),A()},[A]),y=f(async c=>{e.current===null&&(e.current=[]),c===!0&&d();const{current:i}=x;if(!i)return!0;let u=!1;for(let l=0;l<q;l++){const o=await i.next();if(o.done){x.current=null,u=!0;break}n.current.has(o.value.meta.key)||(e.current.push(m?m(o.value.doc):o.value.doc),n.current.set(o.value.meta.key,e.current.length-1))}return e.current=[...e.current],u},[]),p=f(async()=>{const c=await y(!1);return k(),c},[y]);P(()=>{const c=a.subscribe(async i=>{const{mutations:u,removedAll:l}=i;if(l&&d(),!u)return;const o=e.current?.length??0;let g=o,h=!1;const S=new Set;for(const s of u){const{key:r,op:b}=s;switch(b){case"insert":{g+=1;break}case"delete":{if(e.current&&e.current.length>0&&n.current.has(r)){const t=n.current.get(r);if(t===void 0)break;S.add(t),h=!0}break}case"update":{if(n.current.has(r)){const t=n.current.get(r);if(t!==void 0&&e.current){const v=await a.get(r,m),O=e.current[t];E(O,v)||(e.current[t]=v,e.current=[...e.current],h=!0)}}else{const t=await a.get(r,m);t&&(e.current=[...e.current??[],t],n.current.set(r,e.current.length-1),h=!0)}break}}}if(S.size>0&&e.current&&e.current.length>0){const s=new Map;e.current=e.current?.filter((b,t)=>!S.has(t));let r=0;for(const[b,t]of n.current)S.has(t)||(s.set(b,r),r++);n.current=s}const L=o!==g;if(L||h){if(L){await y(!0);let s=0;for(;(e.current?.length??0)<g&&s<T;)await y(!1),s++;s===T&&console.warn("Reached maximum iterations in fillNextPage loop. Possible duplicate or data issue.")}k()}});return()=>{c()}},[a]),P(()=>{d(),p()},I);const R=f(async()=>{d(),await p()},[p,d]);return[e.current,{nextPage:p,reset:R,keysIndex:n.current}]}export{z as useSqliteValue};
+import{useCallback as y,useLayoutEffect as T,useReducer as C,useRef as w}from"react";import{DEFAULT_PAGE_SIZE as E}from"./table";import{shallow as K}from"../utils/shallow";const q=1e4;function F(d,k={},I=[]){const{select:f,pageSize:R=E}=k,e=w(null),[,A]=C(c=>c+1,0),t=w(new Map),g=w(null),L=y(()=>{const{select:c,...a}=k;g.current=d.search({select:(u,i)=>({doc:u,meta:i}),...a})},[d,...I]),m=y(()=>{e.current=[],t.current.clear(),L()},[L]),p=y(async c=>{e.current===null&&(e.current=[]),c===!0&&m();const{current:a}=g;if(!a)return!0;let u=!1;for(let i=0;i<R;i++){const o=await a.next();if(o.done){g.current=null,u=!0;break}t.current.has(o.value.meta.key)||(e.current.push(f?f(o.value.doc):o.value.doc),t.current.set(o.value.meta.key,e.current.length-1))}return e.current=[...e.current],u},[]),h=y(async()=>{const c=await p(!1);return A(),c},[p]);T(()=>{const c=d.subscribe(async a=>{const{mutations:u,removedAll:i}=a;if(i&&m(),!u)return;const o=e.current?.length??0;let D=o,S=!1;const b=new Set;for(const s of u){const{key:n,op:x,document:l}=s;switch(x){case"insert":{D+=1;break}case"delete":{if(e.current&&e.current.length>0&&t.current.has(n)){const r=t.current.get(n);if(r===void 0)break;b.add(r),S=!0}break}case"update":{if(t.current.has(n)){const r=t.current.get(n);if(r!==void 0&&e.current){const P=f?f(l):l,_=e.current[r];K(_,P)||(e.current[r]=P,e.current=[...e.current],S=!0)}}else{const r=await d.get(n,f);r&&(e.current=[...e.current??[],r],t.current.set(n,e.current.length-1),S=!0)}break}}}if(b.size>0&&e.current&&e.current.length>0){const s=new Map;e.current=e.current?.filter((x,l)=>!b.has(l));let n=0;for(const[x,l]of t.current)b.has(l)||(s.set(x,n),n++);t.current=s}const v=o!==D;if(v||S){if(v){await p(!0);let s=0;for(;(e.current?.length??0)<D&&s<q;)await p(!1),s++;s===q&&console.warn("Reached maximum iterations in fillNextPage loop. Possible duplicate or data issue.")}A()}});return()=>{c()}},[d]),T(()=>{m(),h()},I);const O=y(async()=>{m(),await h()},[h,m]);return[e.current,{nextPage:h,reset:O,keysIndex:t.current}]}export{F as useSqliteValue};

package/package.json

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

package/src/sqlite/__tests__/where.test.ts

@@ -0,0 +1,234 @@
+import { createTable } from '../table'
+import { bunMemoryBackend } from '../table/bun-backend'
+import { type Where } from '../table/where'
+
+describe('where clauses', () => {
+  const backend = bunMemoryBackend()
+
+  it('should handle where where array of conditions', async () => {
+    const tableNestedOptional = await createTable<{ id: string; content?: string }>({
+      backend,
+      tableName: 'TestTableNestedOptional',
+      key: 'id',
+      indexes: ['content'],
+    })
+
+    await tableNestedOptional.set({ id: '1', content: 'The quick brown fox' })
+    await tableNestedOptional.set({ id: '2', content: 'The jumps over the lazy dog' })
+    await tableNestedOptional.set({ id: '3' }) // No `content` field
+
+    const results: { id: string; content?: string }[] = []
+    for await (const doc of tableNestedOptional.search({
+      where: { content: { like: ['The%'] } },
+    })) {
+      results.push(doc)
+    }
+    expect(results.length).toBe(2)
+    expect(results[0].id).toBe('1')
+  })
+  it('should create nested index for optional nested fields', async () => {
+    type TestDoc = { id: string; info?: { content?: string } }
+    const tableNestedOptional = await createTable<TestDoc>({
+      backend,
+      tableName: 'TestTableNestedOptional',
+      key: 'id',
+      indexes: ['fts:info.content'],
+    })
+
+    await tableNestedOptional.set({ id: '1', info: { content: 'The quick brown fox' } })
+    await tableNestedOptional.set({ id: '2', info: { content: 'jumps over the lazy dog' } })
+    await tableNestedOptional.set({ id: '3' }) // No `info` field
+
+    const results: TestDoc[] = []
+    for await (const doc of tableNestedOptional.search({
+      where: { info: { content: { like: ['The%'] } } },
+    })) {
+      results.push(doc)
+    }
+    expect(results.length).toBe(1)
+    expect(results[0].id).toBe('1')
+
+    const results2: TestDoc[] = []
+    for await (const doc of tableNestedOptional.search({
+      where: { OR: [{ info: { content: { like: ['The%'] } } }, { info: { content: { like: ['jumps%'] } } }] },
+    })) {
+      results2.push(doc)
+    }
+    expect(results2.length).toBe(2)
+
+    const results3: TestDoc[] = []
+    for await (const doc of tableNestedOptional.search({
+      where: { info: { content: 'nonexistent' } },
+    })) {
+      results3.push(doc)
+    }
+    expect(results3.length).toBe(0)
+  })
+  it('should handle FTS queries', async () => {
+    const tableFts = await createTable<{ id: string; content: string }>({
+      backend,
+      tableName: 'TestTableFts',
+      key: 'id',
+      indexes: ['fts:content'],
+    })
+
+    await tableFts.set({ id: '1', content: 'The quick brown fox' })
+    await tableFts.set({ id: '2', content: 'Jumps over the lazy dog' })
+    await tableFts.set({ id: '3', content: 'Another document' })
+
+    const results: { id: string; content: string }[] = []
+    for await (const doc of tableFts.search({
+      where: { content: { fts: 'quick' } },
+    })) {
+      results.push(doc)
+    }
+    expect(results.length).toBe(1)
+    expect(results[0].id).toBe('1')
+  })
+
+  it('should handle nested where conditions', async () => {
+    const tableNested = await createTable<{ id: string; info: { content: string } }>({
+      backend,
+      tableName: 'TestTableNested',
+      key: 'id',
+      indexes: ['info.content'],
+    })
+
+    await tableNested.set({ id: '1', info: { content: 'Nested quick brown fox' } })
+    await tableNested.set({ id: '2', info: { content: 'Nested jumps over the lazy dog' } })
+
+    const results: { id: string; info: { content: string } }[] = []
+    for await (const doc of tableNested.search({
+      where: { info: { content: { like: 'Nested%' } } },
+    })) {
+      results.push(doc)
+    }
+    expect(results.length).toBe(2)
+  })
+
+  it('should handle complex operators', async () => {
+    const tableComplex = await createTable<{ id: string; value: number }>({
+      backend,
+      tableName: 'TestTableComplex',
+      key: 'id',
+      indexes: ['value'],
+    })
+
+    await tableComplex.set({ id: '1', value: 10 })
+    await tableComplex.set({ id: '2', value: 20 })
+    await tableComplex.set({ id: '3', value: 30 })
+
+    const results: { id: string; value: number }[] = []
+    for await (const doc of tableComplex.search({
+      where: { value: { gt: 15, lt: 25 } },
+      sortBy: 'value',
+    })) {
+      results.push(doc)
+    }
+    expect(results.length).toBe(1)
+    expect(results[0].id).toBe('2')
+  })
+
+  it('should handle NOT conditions', async () => {
+    const tableNot = await createTable<{ id: string; value: string }>({
+      backend,
+      tableName: 'TestTableNot',
+      key: 'id',
+      indexes: ['value'],
+    })
+
+    await tableNot.set({ id: '1', value: 'apple' })
+    await tableNot.set({ id: '2', value: 'banana' })
+    await tableNot.set({ id: '3', value: 'cherry' })
+
+    const results: { id: string; value: string }[] = []
+    for await (const doc of tableNot.search({
+      where: { NOT: { value: 'banana' } },
+    })) {
+      results.push(doc)
+    }
+    expect(results.length).toBe(2)
+    expect(results.map((doc) => doc.value)).toEqual(['apple', 'cherry'])
+  })
+
+  it('should handle AND conditions', async () => {
+    const tableAnd = await createTable<{ id: string; category: string; price: number }>({
+      backend,
+      tableName: 'TestTableAnd',
+      key: 'id',
+      indexes: ['category', 'price'],
+    })
+
+    await tableAnd.set({ id: '1', category: 'fruit', price: 10 })
+    await tableAnd.set({ id: '2', category: 'fruit', price: 20 })
+    await tableAnd.set({ id: '3', category: 'vegetable', price: 15 })
+
+    const results: { id: string; category: string; price: number }[] = []
+    for await (const doc of tableAnd.search({
+      where: { AND: [{ category: 'fruit' }, { price: { lt: 15 } }] },
+    })) {
+      results.push(doc)
+    }
+    expect(results.length).toBe(1)
+    expect(results[0].id).toBe('1')
+  })
+
+  it('should handle OR conditions', async () => {
+    const tableOr = await createTable<{ id: string; type: string }>({
+      backend,
+      tableName: 'TestTableOr',
+      key: 'id',
+      indexes: ['type'],
+    })
+
+    await tableOr.set({ id: '1', type: 'A' })
+    await tableOr.set({ id: '2', type: 'B' })
+    await tableOr.set({ id: '3', type: 'C' })
+
+    const results: { id: string; type: string }[] = []
+    for await (const doc of tableOr.search({
+      where: { OR: [{ type: 'A' }, { type: 'C' }] },
+    })) {
+      results.push(doc)
+    }
+    expect(results.length).toBe(2)
+    expect(results.map((doc) => doc.type)).toEqual(['A', 'C'])
+  })
+
+  it('should handle nested AND/OR/NOT conditions', async () => {
+    const tableNestedLogic = await createTable<{ id: string; category: string; price: number }>({
+      backend,
+      tableName: 'TestTableNestedLogic',
+      key: 'id',
+      indexes: ['category', 'price'],
+    })
+
+    await tableNestedLogic.set({ id: '1', category: 'fruit', price: 10 })
+    await tableNestedLogic.set({ id: '2', category: 'fruit', price: 20 })
+    await tableNestedLogic.set({ id: '3', category: 'fruit', price: 15 })
+
+    const whereClause: Where<{ category: string; price: number }> = {
+      AND: [
+        { category: { is: 'fruit' } },
+        {
+          OR: [{ price: { lt: 15 } }, { price: { is: 15 } }],
+        },
+      ],
+    }
+
+    const allData: { id: string; category: string; price: number }[] = []
+    for await (const doc of tableNestedLogic.search({})) {
+      allData.push(doc)
+    }
+    expect(allData.length).toBe(3)
+
+    const results: { id: string; category: string; price: number }[] = []
+    for await (const doc of tableNestedLogic.search({
+      where: whereClause,
+    })) {
+      results.push(doc)
+    }
+
+    expect(results.length).toBe(2)
+  })
+})

package/src/sqlite/create-sqlite.ts

@@ -9,21 +9,21 @@ export interface CreateSqliteOptions<Document extends DocType> extends Omit<DbOp
   readonly backend: Backend | Promise<Backend>
 }
 
-export interface MutationItems {
-  mutations?: MutationResult[]
+export interface MutationItems<Doc> {
+  mutations?: MutationResult<Doc>[]
   removedAll?: boolean
 }
 
 export interface SyncTable<Document extends DocType> {
-  readonly subscribe: (listener: (mutation: MutationItems) => void) => () => void
-  readonly set: (document: Document) => Promise<MutationResult>
-  readonly batchSet: (documents: Document[]) => Promise<MutationResult[]>
+  readonly subscribe: (listener: (mutation: MutationItems<Document>) => void) => () => void
+  readonly set: (document: Document) => Promise<MutationResult<Document>>
+  readonly batchSet: (documents: Document[]) => Promise<MutationResult<Document>[]>
   readonly get: <Selected = Document>(key: Key, selector?: (document: Document) => Selected) => Promise<Selected | undefined>
 
-  readonly delete: (key: Key) => Promise<MutationResult | undefined>
+  readonly delete: (key: Key) => Promise<MutationResult<Document> | undefined>
   readonly search: <Selected = Document>(options?: SearchOptions<Document, Selected>) => AsyncIterableIterator<Selected>
   readonly count: (options?: { where?: Where<Document> }) => Promise<number>
-  readonly deleteBy: (where: Where<Document>) => Promise<MutationResult[]>
+  readonly deleteBy: (where: Where<Document>) => Promise<MutationResult<Document>[]>
   readonly clear: () => Promise<void>
 }
 
@@ -53,8 +53,8 @@ export function createSqliteState<Document extends DocType>(options: CreateSqlit
       if (!unknownItems) {
         return
       }
-      const items = unknownItems as MutationItems[]
-      const merged: MutationItems = {}
+      const items = unknownItems as MutationItems<Document>[]
+      const merged: MutationItems<Document> = {}
       for (const item of items) {
         if (item.removedAll) {
           merged.removedAll = true
@@ -76,11 +76,11 @@ export function createSqliteState<Document extends DocType>(options: CreateSqlit
    * Notify all subscribers of changes
    * @param item The mutation items to notify subscribers about
    */
-  function handleChanges(item: MutationItems) {
+  function handleChanges(item: MutationItems<Document>) {
     STATE_SCHEDULER.schedule(id, item)
   }
 
-  const listeners = new Set<(mutation: MutationItems) => void>()
+  const listeners = new Set<(mutation: MutationItems<Document>) => void>()
 
   const state: SyncTable<Document> = {
     subscribe(listener) {

package/src/sqlite/table/table.ts

@@ -181,10 +181,10 @@ export async function createTable<Document extends DocType>(options: DbOptions<D
 
         if (existing.length > 0) {
           await db.execute(`UPDATE ${tableName} SET data = ? WHERE key = ?`, [json, id])
-          return { key: id, op: 'update' }
+          return { key: id, op: 'update', document }
         } else {
           await db.execute(`INSERT INTO ${tableName} (key, data) VALUES (?, ?)`, [id, json])
-          return { key: id, op: 'insert' }
+          return { key: id, op: 'insert', document }
         }
       }
 
@@ -192,7 +192,7 @@ export async function createTable<Document extends DocType>(options: DbOptions<D
       const rows = await db.select<Array<{ id: number }>>(`SELECT last_insert_rowid() AS id`)
       const rowid = rows[0]?.id
       if (typeof rowid !== 'number') throw new Error('Failed to retrieve last_insert_rowid()')
-      return { key: rowid, op: 'insert' }
+      return { key: rowid, op: 'insert', document }
     },
 
     async get<Selected = Document>(
@@ -274,7 +274,7 @@ export async function createTable<Document extends DocType>(options: DbOptions<D
     async deleteBy(where: Where<Document>) {
       const whereSql = getWhereQuery<Document>(where, tableName)
       const keyCol = hasUserKey ? 'key' : 'rowid'
-      const results: MutationResult[] = []
+      const results: MutationResult<Document>[] = []
 
       await backend.transaction(async (tx) => {
         const rows = await tx.select<Array<{ k: Key }>>(`SELECT ${keyCol} AS k FROM ${tableName} ${whereSql}`)
@@ -287,7 +287,7 @@ export async function createTable<Document extends DocType>(options: DbOptions<D
           await tx.execute(`DELETE FROM ${tableName} WHERE ${keyCol} IN (${placeholders})`, chunk as unknown[])
         }
 
-        for (const k of allKeys) results.push({ key: k, op: 'delete' })
+        for (const k of allKeys) results.push({ key: k, op: 'delete', document: undefined })
       })
 
       return results
@@ -298,7 +298,7 @@ export async function createTable<Document extends DocType>(options: DbOptions<D
     },
 
     async batchSet(documents: Document[]) {
-      const mutations: MutationResult[] = []
+      const mutations: MutationResult<Document>[] = []
       await backend.transaction(async (tx) => {
         for (const document of documents) {
           const m = await table.set(document, tx)

package/src/sqlite/table/table.types.ts

@@ -20,14 +20,16 @@ export type DotPrefix<T extends string> = T extends '' ? '' : `.${T}`
 
 type Previous = [never, 0, 1, 2, 3, 4, 5]
 
-export type DotPath<T, D extends number = 5> = [D] extends [never]
+type DotPathRaw<T, D extends number = 5> = [D] extends [never]
   ? never
   : T extends object
     ? {
-        [K in Extract<keyof T, string>]: T[K] extends object ? K | `${K}.${DotPath<T[K], Previous[D]>}` : K
+        [K in Extract<keyof T, string>]: T[K] extends object ? K | `${K}.${DotPathRaw<T[K], Previous[D]>}` : K
       }[Extract<keyof T, string>]
     : never
 
+export type DotPath<T> = DotPathRaw<MakeAllFieldAsRequired<T>>
+
 // Built-in FTS5 tokenizers
 export type FtsTokenizer =
   | 'porter' // English stemming
@@ -65,19 +67,37 @@ interface DbNotGeneric {
 export type Key = string | number
 
 export type MutationOp = 'insert' | 'update' | 'delete'
-export interface MutationResult {
+
+interface MutationResultBase<T> {
   key: Key
   op: MutationOp
+  document?: T
+}
+interface MutationResultDelete<T> extends MutationResultBase<T> {
+  key: Key
+  op: 'delete'
+}
+
+interface MutationResultUpdateInsert<T> extends MutationResultBase<T> {
+  key: Key
+  op: 'update' | 'insert'
+  document: T
 }
 
+export type MutationResult<T> = MutationResultDelete<T> | MutationResultUpdateInsert<T>
+
 export interface Table<Document extends DocType> extends DbNotGeneric {
-  readonly set: (document: Document, backendOverride?: Backend) => Promise<MutationResult>
-  readonly batchSet: (documents: Document[]) => Promise<MutationResult[]>
+  readonly set: (document: Document, backendOverride?: Backend) => Promise<MutationResult<Document>>
+  readonly batchSet: (documents: Document[]) => Promise<MutationResult<Document>[]>
   readonly get: <Selected = Document>(key: Key, selector?: (document: Document) => Selected) => Promise<Selected | undefined>
 
-  readonly delete: (key: Key) => Promise<MutationResult | undefined>
+  readonly delete: (key: Key) => Promise<MutationResult<Document> | undefined>
   readonly search: <Selected = Document>(options?: SearchOptions<Document, Selected>) => AsyncIterableIterator<Selected>
   readonly count: (options?: { where?: Where<Document> }) => Promise<number>
-  readonly deleteBy: (where: Where<Document>) => Promise<MutationResult[]>
+  readonly deleteBy: (where: Where<Document>) => Promise<MutationResult<Document>[]>
   readonly clear: () => Promise<void>
 }
+
+export type MakeAllFieldAsRequired<T> = {
+  [K in keyof T]-?: T[K] extends object ? MakeAllFieldAsRequired<T[K]> : T[K]
+}

package/src/sqlite/table/where.ts

@@ -4,6 +4,8 @@
 /* eslint-disable sonarjs/no-nested-conditional */
 /* eslint-disable sonarjs/cognitive-complexity */
 
+import type { MakeAllFieldAsRequired } from './table.types'
+
 // -------------------------------------------------------------
 // Condition operators for each field
 // -------------------------------------------------------------
@@ -20,21 +22,22 @@ interface Condition<T> {
   readonly fts?: string | string[] // 🔥 NEW
 }
 
-// -------------------------------------------------------------
-// Where type: recursive object with operators or nested fields
-// -------------------------------------------------------------
-export type Where<T extends Record<string, unknown>> =
+type WhereRaw<T extends Record<string, unknown>> =
   | {
       [K in keyof T]?: T[K] extends Record<string, unknown>
-        ? Where<T[K]> // nested object
+        ? WhereRaw<T[K]> // nested object
         : Condition<T[K]> | T[K] | T[K][]
     }
   | {
-      readonly AND?: Array<Where<T>>
-      readonly OR?: Array<Where<T>>
-      readonly NOT?: Where<T>
+      readonly AND?: Array<WhereRaw<T>>
+      readonly OR?: Array<WhereRaw<T>>
+      readonly NOT?: WhereRaw<T>
     }
 
+// -------------------------------------------------------------
+// Where type: recursive object with operators or nested fields
+// -------------------------------------------------------------
+export type Where<T extends Record<string, unknown>> = WhereRaw<MakeAllFieldAsRequired<T>>
 /**
  * Inline a value for SQL query, with proper escaping for strings
  * @param value The value to inline

package/src/sqlite/use-sqlite.ts

@@ -114,7 +114,7 @@ export function useSqliteValue<Document extends DocType, Selected = Document>(
       let hasUpdate = false
       const removeIndexes = new Set<number>()
       for (const mutation of mutations) {
-        const { key, op } = mutation
+        const { key, op, document } = mutation
         switch (op) {
           case 'insert': {
             newLength += 1
@@ -133,7 +133,7 @@ export function useSqliteValue<Document extends DocType, Selected = Document>(
             if (keysIndex.current.has(key)) {
               const index = keysIndex.current.get(key)
               if (index !== undefined && itemsRef.current) {
-                const newItem = (await state.get(key, select)) as Selected
+                const newItem = select ? select(document as Document) : (document as unknown as Selected)
                 const previousItem = itemsRef.current[index]
 
                 // 🆕 Only update & rerender if shallow comparison fails

package/types/sqlite/create-sqlite.d.ts

@@ -4,21 +4,21 @@ import type { Where } from './table/where';
 export interface CreateSqliteOptions<Document extends DocType> extends Omit<DbOptions<Document>, 'backend'> {
     readonly backend: Backend | Promise<Backend>;
 }
-export interface MutationItems {
-    mutations?: MutationResult[];
+export interface MutationItems<Doc> {
+    mutations?: MutationResult<Doc>[];
     removedAll?: boolean;
 }
 export interface SyncTable<Document extends DocType> {
-    readonly subscribe: (listener: (mutation: MutationItems) => void) => () => void;
-    readonly set: (document: Document) => Promise<MutationResult>;
-    readonly batchSet: (documents: Document[]) => Promise<MutationResult[]>;
+    readonly subscribe: (listener: (mutation: MutationItems<Document>) => void) => () => void;
+    readonly set: (document: Document) => Promise<MutationResult<Document>>;
+    readonly batchSet: (documents: Document[]) => Promise<MutationResult<Document>[]>;
     readonly get: <Selected = Document>(key: Key, selector?: (document: Document) => Selected) => Promise<Selected | undefined>;
-    readonly delete: (key: Key) => Promise<MutationResult | undefined>;
+    readonly delete: (key: Key) => Promise<MutationResult<Document> | undefined>;
     readonly search: <Selected = Document>(options?: SearchOptions<Document, Selected>) => AsyncIterableIterator<Selected>;
     readonly count: (options?: {
         where?: Where<Document>;
     }) => Promise<number>;
-    readonly deleteBy: (where: Where<Document>) => Promise<MutationResult[]>;
+    readonly deleteBy: (where: Where<Document>) => Promise<MutationResult<Document>[]>;
     readonly clear: () => Promise<void>;
 }
 /**

package/types/sqlite/table/table.types.d.ts

@@ -15,9 +15,10 @@ export interface SqlSeachOptions<Document extends DocType> {
 }
 export type DotPrefix<T extends string> = T extends '' ? '' : `.${T}`;
 type Previous = [never, 0, 1, 2, 3, 4, 5];
-export type DotPath<T, D extends number = 5> = [D] extends [never] ? never : T extends object ? {
-    [K in Extract<keyof T, string>]: T[K] extends object ? K | `${K}.${DotPath<T[K], Previous[D]>}` : K;
+type DotPathRaw<T, D extends number = 5> = [D] extends [never] ? never : T extends object ? {
+    [K in Extract<keyof T, string>]: T[K] extends object ? K | `${K}.${DotPathRaw<T[K], Previous[D]>}` : K;
 }[Extract<keyof T, string>] : never;
+export type DotPath<T> = DotPathRaw<MakeAllFieldAsRequired<T>>;
 export type FtsTokenizer = 'porter' | 'simple' | 'icu' | 'unicode61' | FtsTokenizerOptions;
 export interface FtsType<Document extends DocType> {
     readonly type: 'fts';
@@ -43,20 +44,34 @@ interface DbNotGeneric {
 }
 export type Key = string | number;
 export type MutationOp = 'insert' | 'update' | 'delete';
-export interface MutationResult {
+interface MutationResultBase<T> {
     key: Key;
     op: MutationOp;
+    document?: T;
 }
+interface MutationResultDelete<T> extends MutationResultBase<T> {
+    key: Key;
+    op: 'delete';
+}
+interface MutationResultUpdateInsert<T> extends MutationResultBase<T> {
+    key: Key;
+    op: 'update' | 'insert';
+    document: T;
+}
+export type MutationResult<T> = MutationResultDelete<T> | MutationResultUpdateInsert<T>;
 export interface Table<Document extends DocType> extends DbNotGeneric {
-    readonly set: (document: Document, backendOverride?: Backend) => Promise<MutationResult>;
-    readonly batchSet: (documents: Document[]) => Promise<MutationResult[]>;
+    readonly set: (document: Document, backendOverride?: Backend) => Promise<MutationResult<Document>>;
+    readonly batchSet: (documents: Document[]) => Promise<MutationResult<Document>[]>;
     readonly get: <Selected = Document>(key: Key, selector?: (document: Document) => Selected) => Promise<Selected | undefined>;
-    readonly delete: (key: Key) => Promise<MutationResult | undefined>;
+    readonly delete: (key: Key) => Promise<MutationResult<Document> | undefined>;
     readonly search: <Selected = Document>(options?: SearchOptions<Document, Selected>) => AsyncIterableIterator<Selected>;
     readonly count: (options?: {
         where?: Where<Document>;
     }) => Promise<number>;
-    readonly deleteBy: (where: Where<Document>) => Promise<MutationResult[]>;
+    readonly deleteBy: (where: Where<Document>) => Promise<MutationResult<Document>[]>;
     readonly clear: () => Promise<void>;
 }
+export type MakeAllFieldAsRequired<T> = {
+    [K in keyof T]-?: T[K] extends object ? MakeAllFieldAsRequired<T[K]> : T[K];
+};
 export {};

package/types/sqlite/table/where.d.ts

@@ -1,3 +1,4 @@
+import type { MakeAllFieldAsRequired } from './table.types';
 interface Condition<T> {
     readonly is?: T | T[];
     readonly isNot?: T | T[];
@@ -10,13 +11,14 @@ interface Condition<T> {
     readonly like?: T | T[];
     readonly fts?: string | string[];
 }
-export type Where<T extends Record<string, unknown>> = {
-    [K in keyof T]?: T[K] extends Record<string, unknown> ? Where<T[K]> : Condition<T[K]> | T[K] | T[K][];
+type WhereRaw<T extends Record<string, unknown>> = {
+    [K in keyof T]?: T[K] extends Record<string, unknown> ? WhereRaw<T[K]> : Condition<T[K]> | T[K] | T[K][];
 } | {
-    readonly AND?: Array<Where<T>>;
-    readonly OR?: Array<Where<T>>;
-    readonly NOT?: Where<T>;
+    readonly AND?: Array<WhereRaw<T>>;
+    readonly OR?: Array<WhereRaw<T>>;
+    readonly NOT?: WhereRaw<T>;
 };
+export type Where<T extends Record<string, unknown>> = WhereRaw<MakeAllFieldAsRequired<T>>;
 /**
  * Write SQL WHERE clause from a Where object
  * @param where The Where object defining the conditions