@ez4/database 0.19.0 → 0.20.0

package/dist/library.cjs

@@ -1,58 +1,58 @@
 "use strict";var L=Object.defineProperty;var Ve=Object.getOwnPropertyDescriptor;var Fe=Object.getOwnPropertyNames;var Qe=Object.prototype.hasOwnProperty;var $e=(e,r)=>{for(var t in r)L(e,t,{get:r[t],enumerable:!0})},Ge=(e,r,t,n)=>{if(r&&
 typeof r=="object"||typeof r=="function")for(let a of Fe(r))!Qe.call(e,a)&&a!==t&&
-L(e,a,{get:()=>r[a],enumerable:!(n=Ve(r,a))||n.enumerable});return e};var Be=e=>Ge(L({},"__esModule",{value:!0}),e);var mt={};$e(mt,{IncompleteHandlerError:()=>$,IncompleteServiceError:()=>C,IncompleteStreamError:()=>V,
+L(e,a,{get:()=>r[a],enumerable:!(n=Ve(r,a))||n.enumerable});return e};var Be=e=>Ge(L({},"__esModule",{value:!0}),e);var lt={};$e(lt,{IncompleteHandlerError:()=>$,IncompleteServiceError:()=>A,IncompleteStreamError:()=>V,
 IncompleteTableError:()=>x,IncorrectIndexesTypeError:()=>U,IncorrectRelationsTypeError:()=>O,
 IncorrectSchemaTypeError:()=>q,IncorrectStreamTypeError:()=>Q,InvalidIndexReferenceError:()=>N,
-InvalidIndexTypeError:()=>z,InvalidIndexesTypeError:()=>w,InvalidRelationAliasError:()=>A,
+InvalidIndexTypeError:()=>z,InvalidIndexesTypeError:()=>w,InvalidRelationAliasError:()=>C,
 InvalidRelationColumnError:()=>S,InvalidRelationTableError:()=>k,InvalidRelationTargetError:()=>R,
 InvalidRelationsTypeError:()=>j,InvalidSchemaTypeError:()=>H,InvalidStreamTypeError:()=>F,
 ServiceType:()=>G,getDatabaseServices:()=>re,getDatabaseTable:()=>te,getTableSchema:()=>ee,
-isDatabaseService:()=>_e,registerTriggers:()=>pt});module.exports=Be(mt);var ze=require("@ez4/common/library"),Ne=require("@ez4/schema/library"),He=require("@ez4/project/library");var d=require("@ez4/common/library"),Ce=require("@ez4/reflection");var y=require("@ez4/common/library"),j=class extends y.InvalidTypeError{constructor(r){
+isDatabaseService:()=>_e,registerTriggers:()=>pt});module.exports=Be(lt);var ze=require("@ez4/common/library"),Ne=require("@ez4/schema/library"),He=require("@ez4/project/library");var d=require("@ez4/common/library"),Ae=require("@ez4/reflection");var y=require("@ez4/common/library"),j=class extends y.InvalidTypeError{constructor(r){
 super("Invalid table relations type",void 0,"Database.Relations",r)}},O=class extends y.IncorrectTypeError{constructor(t,n){
 super("Incorrect table relations type",t,"Database.Relations",n);this.schemaType=
 t}},R=class extends y.TypeError{constructor(t,n){super(`Target ${t} must follow \
 the pattern 'column@alias'.`,n);this.relationSource=t}},k=class extends y.TypeError{constructor(t,n){
 super(`Relation table ${t} don't exists.`,n);this.relationTable=t}},S=class extends y.TypeError{constructor(t,n){
-super(`Relation column ${t} don't exists.`,n);this.relationColumn=t}},A=class extends y.TypeError{constructor(t,n){
+super(`Relation column ${t} don't exists.`,n);this.relationColumn=t}},C=class extends y.TypeError{constructor(t,n){
 super(`Relation alias ${t} can't override table columns.`,n);this.relationAlias=
-t}};var ae=require("@ez4/common/library"),C=class extends ae.IncompleteTypeError{constructor(r,t){
-super("Incomplete database service",r,t)}};var G="@ez4/database",_e=e=>e.type===G;var M=require("@ez4/reflection"),l=require("@ez4/common/library");var oe=require("@ez4/common/library"),x=class extends oe.IncompleteTypeError{constructor(r,t){
+t}};var ae=require("@ez4/common/library"),A=class extends ae.IncompleteTypeError{constructor(r,t){
+super("Incomplete database service",r,t)}};var G="@ez4/database",_e=e=>e.type===G;var I=require("@ez4/reflection"),m=require("@ez4/common/library");var oe=require("@ez4/common/library"),x=class extends oe.IncompleteTypeError{constructor(r,t){
 super("Incomplete database table",r,t)}};var T=require("@ez4/common/library"),B=require("@ez4/reflection"),_=e=>(0,T.isClassDeclaration)(
 e)&&(0,T.hasHeritageType)(e,"Database.Service"),se=e=>(0,T.isModelDeclaration)(e)&&
 (0,T.hasHeritageType)(e,"Database.Engine"),ie=e=>(0,T.isModelDeclaration)(e)&&(0,T.hasHeritageType)(
-e,"Database.Table"),pe=e=>(0,B.isTypeCallback)(e)||(0,B.isTypeFunction)(e),me=e=>(0,T.hasHeritageType)(
-e,"Database.Relations"),le=e=>(0,T.hasHeritageType)(e,"Database.Indexes"),ce=e=>(0,T.hasHeritageType)(
-e,"Database.Schema"),de=e=>(0,T.hasHeritageType)(e,"Database.Stream");var Te;(e=>{})(Te||={});var fe=(e,r,t,n)=>{if(!(0,M.isTypeReference)(e))return ue(e,r,n);let a=(0,l.getReferenceType)(
+e,"Database.Table"),pe=e=>(0,B.isTypeCallback)(e)||(0,B.isTypeFunction)(e),le=e=>(0,T.hasHeritageType)(
+e,"Database.Relations"),me=e=>(0,T.hasHeritageType)(e,"Database.Indexes"),ce=e=>(0,T.hasHeritageType)(
+e,"Database.Schema"),de=e=>(0,T.hasHeritageType)(e,"Database.Stream");var Te;(e=>{})(Te||={});var fe=(e,r,t,n)=>{if(!(0,I.isTypeReference)(e))return ue(e,r,n);let a=(0,m.getReferenceType)(
 e,t);return a?ue(a,r,n):null},Le=e=>!!e.name&&!!e.parametersMode&&!!e.transactionMode&&
-!!e.orderMode,ue=(e,r,t)=>se(e)?be(e,r,(0,l.getModelMembers)(e),t):(0,M.isTypeObject)(
-e)?be(e,r,(0,l.getObjectMembers)(e),t):null,be=(e,r,t,n)=>{let a={},o=new Set(["\
+!!e.orderMode,ue=(e,r,t)=>se(e)?be(e,r,(0,m.getModelMembers)(e),t):(0,I.isTypeObject)(
+e)?be(e,r,(0,m.getObjectMembers)(e),t):null,be=(e,r,t,n)=>{let a={},o=new Set(["\
 name","parametersMode","transactionMode","insensitiveMode","paginationMode","ord\
-erMode"]);for(let s of t)if(!(!(0,M.isModelProperty)(s)||s.inherited))switch(s.name){default:
-n.push(new l.InvalidServicePropertyError(r.name,s.name,e.file));break;case"name":
-(a.name=(0,l.getPropertyString)(s))&&o.delete(s.name);break;case"parametersMode":
-(a.parametersMode=(0,l.getPropertyStringIn)(s,["index","both"]))&&o.delete(s.name);
-break;case"transactionMode":(a.transactionMode=(0,l.getPropertyStringIn)(s,["sta\
+erMode"]);for(let s of t)if(!(!(0,I.isModelProperty)(s)||s.inherited))switch(s.name){default:
+n.push(new m.InvalidServicePropertyError(r.name,s.name,e.file));break;case"name":
+(a.name=(0,m.getPropertyString)(s))&&o.delete(s.name);break;case"parametersMode":
+(a.parametersMode=(0,m.getPropertyStringIn)(s,["index","both"]))&&o.delete(s.name);
+break;case"transactionMode":(a.transactionMode=(0,m.getPropertyStringIn)(s,["sta\
 tic","interactive"]))&&o.delete(s.name);break;case"insensitiveMode":(a.insensitiveMode=
-(0,l.getPropertyStringIn)(s,["unsupported","enabled"]))&&o.delete(s.name);break;case"\
-paginationMode":(a.paginationMode=(0,l.getPropertyStringIn)(s,["cursor","offset"]))&&
-o.delete(s.name);break;case"orderMode":(a.orderMode=(0,l.getPropertyStringIn)(s,
+(0,m.getPropertyStringIn)(s,["unsupported","enabled"]))&&o.delete(s.name);break;case"\
+paginationMode":(a.paginationMode=(0,m.getPropertyStringIn)(s,["cursor","offset"]))&&
+o.delete(s.name);break;case"orderMode":(a.orderMode=(0,m.getPropertyStringIn)(s,
 ["any","index"]))&&o.delete(s.name);break}return Le(a)?a:(n.push(new x([...o],e.
 file)),null)};var f=require("@ez4/common/library"),E=require("@ez4/reflection");var g=require("@ez4/common/library"),w=class extends g.InvalidTypeError{constructor(r){
 super("Invalid table indexes type",void 0,"Database.Indexes",r)}},U=class extends g.IncorrectTypeError{constructor(t,n){
 super("Incorrect table indexes type",t,"Database.Indexes",n);this.schemaType=t}},
 z=class extends g.TypeError{constructor(t,n){super(`Invalid index type, ${t} mus\
 t follow one of the Index options.`,n);this.indexName=t}},N=class extends g.TypeError{constructor(t,n){
-super(`Invalid index reference, ${t} must be valid column.`,n);this.indexName=t}};var u=require("@ez4/common/library"),I=require("@ez4/reflection");var ge=(e,r,t,n)=>{if(!(0,I.isTypeReference)(e))return ye(e,r,n);let a=(0,u.getReferenceType)(
-e,t);return a?ye(a,r,n):null},ye=(e,r,t)=>(0,I.isTypeObject)(e)?xe(e,(0,u.getObjectMembers)(
-e),t):(0,u.isModelDeclaration)(e)?me(e)?xe(e,(0,u.getModelMembers)(e),t):(t.push(
+super(`Invalid index reference, ${t} must be valid column.`,n);this.indexName=t}};var u=require("@ez4/common/library"),M=require("@ez4/reflection");var ge=(e,r,t,n)=>{if(!(0,M.isTypeReference)(e))return ye(e,r,n);let a=(0,u.getReferenceType)(
+e,t);return a?ye(a,r,n):null},ye=(e,r,t)=>(0,M.isTypeObject)(e)?xe(e,(0,u.getObjectMembers)(
+e),t):(0,u.isModelDeclaration)(e)?le(e)?xe(e,(0,u.getModelMembers)(e),t):(t.push(
 new O(e.name,e.file)),null):(t.push(new j(r.file)),null),xe=(e,r,t)=>{let n=[];for(let a of r){
-if(!(0,I.isModelProperty)(a)||a.inherited)continue;let o=(0,u.getPropertyString)(
-a),s=a.name;if(!o)return t.push(new R(s,e.file)),null;let[i,p]=s.split("@",2),[m,
-P]=o.split(":",2);n.push({sourceTable:m,sourceColumn:P,targetColumn:i,targetAlias:p})}
-return n};var b=require("@ez4/common/library"),h=require("@ez4/reflection");var Ie=(e,r,t,n)=>{if(!(0,h.isTypeReference)(e))return Se(e,r,n);let a=(0,b.getReferenceType)(
-e,t);return a?Se(a,r,n):null},Se=(e,r,t)=>(0,h.isTypeObject)(e)?Me(e,(0,b.getObjectMembers)(
-e),t):(0,b.isModelDeclaration)(e)?le(e)?Me(e,(0,b.getModelMembers)(e),t):(t.push(
-new U(e.name,e.file)),null):(t.push(new w(r.file)),null),Me=(e,r,t)=>{let n=[];for(let a of r){
+if(!(0,M.isModelProperty)(a)||a.inherited)continue;let o=(0,u.getPropertyString)(
+a),s=a.name;if(!o)return t.push(new R(s,e.file)),null;let[i,p]=s.split("@",2),[l,
+P]=o.split(":",2);n.push({sourceTable:l,sourceColumn:P,targetColumn:i,targetAlias:p})}
+return n};var b=require("@ez4/common/library"),h=require("@ez4/reflection");var Me=(e,r,t,n)=>{if(!(0,h.isTypeReference)(e))return Se(e,r,n);let a=(0,b.getReferenceType)(
+e,t);return a?Se(a,r,n):null},Se=(e,r,t)=>(0,h.isTypeObject)(e)?Ie(e,(0,b.getObjectMembers)(
+e),t):(0,b.isModelDeclaration)(e)?me(e)?Ie(e,(0,b.getModelMembers)(e),t):(t.push(
+new U(e.name,e.file)),null):(t.push(new w(r.file)),null),Ie=(e,r,t)=>{let n=[];for(let a of r){
 if(!(0,h.isModelProperty)(a)||a.inherited)continue;let o=a.name,s=(0,b.getPropertyString)(
 a);switch(s){case"primary":case"secondary":case"unique":case"ttl":n.push({name:o,
 columns:o.split(":"),type:s});break;default:return t.push(new z(o,e.file)),null}}
@@ -77,36 +77,36 @@ r.file)),null),je=(e,r,t,n,a)=>{let o={},s=new Set(["handler"]);for(let i of t)i
 i)||i.inherited))switch(i.name){default:a.push(new c.InvalidServicePropertyError(
 r.name,i.name,e.file));break;case"handler":o.handler=Ee(i.value,n,a);break;case"\
 listener":o.listener=(0,c.getServiceListener)(i.value,a);break;case"memory":case"\
-timeout":case"retention":o[i.name]=(0,c.getPropertyNumber)(i);break;case"variabl\
-es":o.variables=(0,c.getLinkedVariableList)(i,a);break}return tt(o)?o:(a.push(new V(
-[...s],e.file)),null)};var te=(e,r,t,n)=>{if(!(0,E.isTypeReference)(e))return Re(e,r,t,n);let a=(0,f.getReferenceType)(
+logRetention":case"timeout":o[i.name]=(0,c.getPropertyNumber)(i);break;case"vari\
+ables":o.variables=(0,c.getLinkedVariableList)(i,a);break}return tt(o)?o:(a.push(
+new V([...s],e.file)),null)};var te=(e,r,t,n)=>{if(!(0,E.isTypeReference)(e))return Re(e,r,t,n);let a=(0,f.getReferenceType)(
 e,t);return a?Re(a,r,t,n):null},rt=e=>!!e.name&&!!e.schema&&!!e.indexes,Re=(e,r,t,n)=>ie(
 e)?ke(e,r,(0,f.getModelMembers)(e),t,n):(0,E.isTypeObject)(e)?ke(e,r,(0,f.getObjectMembers)(
 e),t,n):null,ke=(e,r,t,n,a)=>{let o={},s=new Set(["name","schema","indexes"]);for(let p of t)
 if(!(!(0,E.isModelProperty)(p)||p.inherited))switch(p.name){default:a.push(new f.InvalidServicePropertyError(
 r.name,p.name,e.file));break;case"name":(o.name=(0,f.getPropertyString)(p))&&s.delete(
 p.name);break;case"schema":(o.schema=ee(p.value,e,n,a))&&s.delete(p.name);break;case"\
-indexes":(o.indexes=Ie(p.value,e,n,a))&&s.delete(p.name);break;case"relations":o.
+indexes":(o.indexes=Me(p.value,e,n,a))&&s.delete(p.name);break;case"relations":o.
 relations=ge(p.value,e,n,a);break;case"stream":o.stream=Oe(p.value,r,n,a);break}
 if(!rt(o))return a.push(new x([...s],e.file)),null;let i=nt(e,o.indexes,o.schema);
 return i.length?(a.push(...i),null):o},nt=(e,r,t)=>{let n=t.properties,a=[];for(let{
-name:o,columns:s}of r)s.some(p=>!n[p])&&a.push(new N(o,e.file));return a};var re=e=>{let r={},t=[];for(let n in e){let a=e[n];if(!_(a)||(0,d.isExternalStatement)(
+name:o,columns:s}of r)s.some(p=>!n[p])&&a.push(new N(o,e.file));return a};var re=e=>{let r={},t=[];for(let n in e){let a=e[n];if(!_(a)||(0,d.isExternalDeclaration)(
 a))continue;let o={type:G,extras:{}},s=new Set(["engine","tables"]),i=a.file;o.name=
-a.name;for(let m of(0,d.getModelMembers)(a))if(!(!(0,Ce.isModelProperty)(m)||m.inherited))
-switch(m.name){default:t.push(new d.InvalidServicePropertyError(o.name,m.name,i));
-break;case"engine":(o.engine=fe(m.value,a,e,t))&&s.delete(m.name);break;case"tab\
-les":(o.tables=ot(m,a,e,t))&&s.delete(m.name);break;case"variables":o.variables=
-(0,d.getLinkedVariableList)(m,t);break;case"services":o.services=(0,d.getLinkedServiceList)(
-m,e,t);break}if(!at(o)){t.push(new C([...s],i));continue}let p=st(a,o.tables);if(p.
+a.name;for(let l of(0,d.getModelMembers)(a))if(!(!(0,Ae.isModelProperty)(l)||l.inherited))
+switch(l.name){default:t.push(new d.InvalidServicePropertyError(o.name,l.name,i));
+break;case"client":break;case"engine":(o.engine=fe(l.value,a,e,t))&&s.delete(l.name);
+break;case"tables":(o.tables=ot(l,a,e,t))&&s.delete(l.name);break;case"variables":
+o.variables=(0,d.getLinkedVariableList)(l,t);break;case"services":o.services=(0,d.getLinkedServiceList)(
+l,e,t);break}if(!at(o)){t.push(new A([...s],i));continue}let p=st(a,o.tables);if(p.
 length){t.push(...p);continue}if(r[a.name]){t.push(new d.DuplicateServiceError(a.
 name,i));continue}r[a.name]=o}return{services:r,errors:t}},at=e=>!!e.name&&!!e.tables&&
 !!e.extras,ot=(e,r,t,n)=>{let a=(0,d.getPropertyTuple)(e)??[],o=[];for(let s of a){
 let i=te(s,r,t,n);i&&o.push(i)}return o},st=(e,r)=>{let t=it(r),n=[];for(let{relations:a,
-schema:o,indexes:s}of r){if(!a)continue;let i=o.properties;for(let p of a){let{sourceTable:m,
+schema:o,indexes:s}of r){if(!a)continue;let i=o.properties;for(let p of a){let{sourceTable:l,
 sourceColumn:P,targetColumn:Y,targetAlias:ne}=p;i[Y]||n.push(new S(Y,e.file)),i[ne]&&
-n.push(new A(ne,e.file));let Z=t[m]?.schema.properties;Z||n.push(new k(m,e.file)),
-Z&&!Z[P]&&n.push(new S(P,e.file));let qe=t[m]?.indexes??[];p.sourceIndex=Ae(qe,P),
-p.targetIndex=Ae(s,Y)}}return n},Ae=(e,r)=>e.find(({name:t})=>t===r)?.type,it=e=>e.
+n.push(new C(ne,e.file));let Z=t[l]?.schema.properties;Z||n.push(new k(l,e.file)),
+Z&&!Z[P]&&n.push(new S(P,e.file));let qe=t[l]?.indexes??[];p.sourceIndex=Ce(qe,P),
+p.targetIndex=Ce(s,Y)}}return n},Ce=(e,r)=>e.find(({name:t})=>t===r)?.type,it=e=>e.
 reduce((r,t)=>({...r,[t.name]:t}),{});var we=e=>_(e)?e.name:null;var Ue=!1,pt=()=>{Ue||((0,ze.registerTriggers)(),(0,Ne.registerTriggers)(),(0,He.createTrigger)(
 "@ez4/database",{"metadata:getServices":re,"metadata:getLinkedService":we}),Ue=!0)};0&&(module.exports={IncompleteHandlerError,IncompleteServiceError,IncompleteStreamError,
 IncompleteTableError,IncorrectIndexesTypeError,IncorrectRelationsTypeError,IncorrectSchemaTypeError,

package/dist/library.mjs

@@ -1,5 +1,5 @@
 import{registerTriggers as Xt}from"@ez4/common/library";import{registerTriggers as Yt}from"@ez4/schema/library";
-import{createTrigger as Zt}from"@ez4/project/library";import{DuplicateServiceError as Ht,InvalidServicePropertyError as qt,isExternalStatement as Vt,
+import{createTrigger as Zt}from"@ez4/project/library";import{DuplicateServiceError as Ht,InvalidServicePropertyError as qt,isExternalDeclaration as Vt,
 getLinkedServiceList as Ft,getLinkedVariableList as Qt,getPropertyTuple as $t,getModelMembers as Gt}from"@ez4/common/library";
 import{isModelProperty as Bt}from"@ez4/reflection";import{IncorrectTypeError as ye,InvalidTypeError as xe,TypeError as S}from"@ez4/common/library";
 var b=class extends xe{constructor(r){super("Invalid table relations type",void 0,
@@ -10,20 +10,20 @@ t}},x=class extends S{constructor(t,n){super(`Relation table ${t} don't exists.`
 n);this.relationTable=t}},T=class extends S{constructor(t,n){super(`Relation col\
 umn ${t} don't exists.`,n);this.relationColumn=t}},g=class extends S{constructor(t,n){
 super(`Relation alias ${t} can't override table columns.`,n);this.relationAlias=
-t}};import{IncompleteTypeError as ge}from"@ez4/common/library";var M=class extends ge{constructor(r,t){
-super("Incomplete database service",r,t)}};var U="@ez4/database",nr=e=>e.type===U;import{isModelProperty as Re,isTypeObject as ke,isTypeReference as Ae}from"@ez4/reflection";
-import{InvalidServicePropertyError as Ce,getModelMembers as we,getObjectMembers as Ue,
+t}};import{IncompleteTypeError as ge}from"@ez4/common/library";var I=class extends ge{constructor(r,t){
+super("Incomplete database service",r,t)}};var U="@ez4/database",nr=e=>e.type===U;import{isModelProperty as Re,isTypeObject as ke,isTypeReference as Ce}from"@ez4/reflection";
+import{InvalidServicePropertyError as Ae,getModelMembers as we,getObjectMembers as Ue,
 getPropertyString as ze,getPropertyStringIn as u,getReferenceType as Ne}from"@ez4/common/library";import{IncompleteTypeError as Se}from"@ez4/common/library";var c=class extends Se{constructor(r,t){
-super("Incomplete database table",r,t)}};import{hasHeritageType as l,isClassDeclaration as Me,isModelDeclaration as N}from"@ez4/common/library";
-import{isTypeCallback as Ie,isTypeFunction as he}from"@ez4/reflection";var I=e=>Me(
-e)&&l(e,"Database.Service"),H=e=>N(e)&&l(e,"Database.Engine"),q=e=>N(e)&&l(e,"Da\
-tabase.Table"),V=e=>Ie(e)||he(e),F=e=>l(e,"Database.Relations"),Q=e=>l(e,"Databa\
-se.Indexes"),$=e=>l(e,"Database.Schema"),G=e=>l(e,"Database.Stream");var B;(e=>{})(B||={});var K=(e,r,t,n)=>{if(!Ae(e))return _(e,r,n);let a=Ne(e,t);return a?_(a,r,n):null},
+super("Incomplete database table",r,t)}};import{hasHeritageType as m,isClassDeclaration as Ie,isModelDeclaration as N}from"@ez4/common/library";
+import{isTypeCallback as Me,isTypeFunction as he}from"@ez4/reflection";var M=e=>Ie(
+e)&&m(e,"Database.Service"),H=e=>N(e)&&m(e,"Database.Engine"),q=e=>N(e)&&m(e,"Da\
+tabase.Table"),V=e=>Me(e)||he(e),F=e=>m(e,"Database.Relations"),Q=e=>m(e,"Databa\
+se.Indexes"),$=e=>m(e,"Database.Schema"),G=e=>m(e,"Database.Stream");var B;(e=>{})(B||={});var K=(e,r,t,n)=>{if(!Ce(e))return _(e,r,n);let a=Ne(e,t);return a?_(a,r,n):null},
 He=e=>!!e.name&&!!e.parametersMode&&!!e.transactionMode&&!!e.orderMode,_=(e,r,t)=>H(
 e)?J(e,r,we(e),t):ke(e)?J(e,r,Ue(e),t):null,J=(e,r,t,n)=>{let a={},o=new Set(["n\
 ame","parametersMode","transactionMode","insensitiveMode","paginationMode","orde\
 rMode"]);for(let s of t)if(!(!Re(s)||s.inherited))switch(s.name){default:n.push(
-new Ce(r.name,s.name,e.file));break;case"name":(a.name=ze(s))&&o.delete(s.name);
+new Ae(r.name,s.name,e.file));break;case"name":(a.name=ze(s))&&o.delete(s.name);
 break;case"parametersMode":(a.parametersMode=u(s,["index","both"]))&&o.delete(s.
 name);break;case"transactionMode":(a.transactionMode=u(s,["static","interactive"]))&&
 o.delete(s.name);break;case"insensitiveMode":(a.insensitiveMode=u(s,["unsupporte\
@@ -31,8 +31,8 @@ d","enabled"]))&&o.delete(s.name);break;case"paginationMode":(a.paginationMode=u
 s,["cursor","offset"]))&&o.delete(s.name);break;case"orderMode":(a.orderMode=u(s,
 ["any","index"]))&&o.delete(s.name);break}return He(a)?a:(n.push(new c([...o],e.
 file)),null)};import{InvalidServicePropertyError as jt,getModelMembers as Ot,getObjectMembers as Rt,
-getPropertyString as kt,getReferenceType as At}from"@ez4/common/library";import{
-isModelProperty as Ct,isTypeObject as wt,isTypeReference as Ut}from"@ez4/reflection";import{IncorrectTypeError as qe,InvalidTypeError as Ve,TypeError as W}from"@ez4/common/library";
+getPropertyString as kt,getReferenceType as Ct}from"@ez4/common/library";import{
+isModelProperty as At,isTypeObject as wt,isTypeReference as Ut}from"@ez4/reflection";import{IncorrectTypeError as qe,InvalidTypeError as Ve,TypeError as W}from"@ez4/common/library";
 var h=class extends Ve{constructor(r){super("Invalid table indexes type",void 0,
 "Database.Indexes",r)}},v=class extends qe{constructor(t,n){super("Incorrect tab\
 le indexes type",t,"Database.Indexes",n);this.schemaType=t}},D=class extends W{constructor(t,n){
@@ -44,7 +44,7 @@ isTypeReference as Ke}from"@ez4/reflection";var Z=(e,r,t,n)=>{if(!Ke(e))return X
 X=(e,r,t)=>Je(e)?Y(e,$e(e),t):Fe(e)?F(e)?Y(e,Qe(e),t):(t.push(new f(e.name,e.file)),
 null):(t.push(new b(r.file)),null),Y=(e,r,t)=>{let n=[];for(let a of r){if(!_e(a)||
 a.inherited)continue;let o=Ge(a),s=a.name;if(!o)return t.push(new y(s,e.file)),null;
-let[i,p]=s.split("@",2),[m,d]=o.split(":",2);n.push({sourceTable:m,sourceColumn:d,
+let[i,p]=s.split("@",2),[l,d]=o.split(":",2);n.push({sourceTable:l,sourceColumn:d,
 targetColumn:i,targetAlias:p})}return n};import{isModelDeclaration as We,getModelMembers as Xe,getObjectMembers as Ye,getPropertyString as Ze,
 getReferenceType as Le}from"@ez4/common/library";import{isModelProperty as et,isTypeObject as tt,
 isTypeReference as rt}from"@ez4/reflection";var te=(e,r,t,n)=>{if(!rt(e))return L(e,r,n);let a=Le(e,t);return a?L(a,r,n):null},
@@ -54,55 +54,55 @@ a)||a.inherited)continue;let o=a.name,s=Ze(a);switch(s){case"primary":case"secon
 dary":case"unique":case"ttl":n.push({name:o,columns:o.split(":"),type:s});break;default:
 return t.push(new D(o,e.file)),null}}return n};import{getReferenceType as ot,isModelDeclaration as st}from"@ez4/common/library";
 import{getObjectSchema as it,isObjectSchema as pt}from"@ez4/schema/library";import{
-isTypeObject as mt,isTypeReference as lt}from"@ez4/reflection";import{IncorrectTypeError as nt,InvalidTypeError as at}from"@ez4/common/library";
+isTypeObject as lt,isTypeReference as mt}from"@ez4/reflection";import{IncorrectTypeError as nt,InvalidTypeError as at}from"@ez4/common/library";
 var P=class extends at{constructor(r){super("Invalid table schema type",void 0,"\
 Database.Schema",r)}},j=class extends nt{constructor(t,n){super("Incorrect table\
- schema type",t,"Database.Schema",n);this.schemaType=t}};var ae=(e,r,t,n)=>{if(!lt(e))return re(e,r,t,n);let a=ot(e,t);return a?re(a,r,t,
-n):null},re=(e,r,t,n)=>mt(e)?ne(e,t):st(e)?$(e)?ne(e,t):(n.push(new j(e.name,e.file)),
+ schema type",t,"Database.Schema",n);this.schemaType=t}};var ae=(e,r,t,n)=>{if(!mt(e))return re(e,r,t,n);let a=ot(e,t);return a?re(a,r,t,
+n):null},re=(e,r,t,n)=>lt(e)?ne(e,t):st(e)?$(e)?ne(e,t):(n.push(new j(e.name,e.file)),
 null):(n.push(new P(r.file)),null),ne=(e,r)=>{let t=it(e,r);return t&&pt(t)?t:null};import{InvalidServicePropertyError as ft,isModelDeclaration as yt,getLinkedVariableList as xt,
-getModelMembers as gt,getObjectMembers as St,getPropertyNumber as Mt,getServiceListener as It,
+getModelMembers as gt,getObjectMembers as St,getPropertyNumber as It,getServiceListener as Mt,
 getReferenceType as ht}from"@ez4/common/library";import{isModelProperty as vt,isTypeObject as Dt,
 isTypeReference as Et}from"@ez4/reflection";import{IncompleteTypeError as ct,IncorrectTypeError as dt,InvalidTypeError as Tt}from"@ez4/common/library";
 var O=class extends ct{constructor(r,t){super("Incomplete table stream",r,t)}},R=class extends Tt{constructor(r){
 super("Invalid table stream type",void 0,"Database.Stream",r)}},k=class extends dt{constructor(t,n){
-super("Incorrect table stream type",t,"Database.Stream",n);this.streamType=t}};import{IncompleteTypeError as ut}from"@ez4/common/library";var A=class extends ut{constructor(r,t){
+super("Incorrect table stream type",t,"Database.Stream",n);this.streamType=t}};import{IncompleteTypeError as ut}from"@ez4/common/library";var C=class extends ut{constructor(r,t){
 super("Incomplete stream handler",r,t)}};var oe=(e,r,t)=>{if(!V(e))return null;let n={},a=new Set(["name","file","change"]);
 return e.description&&(n.description=e.description),(n.name=e.name)&&a.delete("n\
 ame"),(n.file=e.file)&&a.delete("file"),e.parameters&&a.delete("change"),a.size===
-0&&bt(n)?n:(t.push(new A([...a],e.file)),null)},bt=e=>!!e.name&&!!e.file;var pe=(e,r,t,n)=>{if(!Et(e))return se(e,r,t,n);let a=ht(e,t);return a?se(a,r,t,
+0&&bt(n)?n:(t.push(new C([...a],e.file)),null)},bt=e=>!!e.name&&!!e.file;var pe=(e,r,t,n)=>{if(!Et(e))return se(e,r,t,n);let a=ht(e,t);return a?se(a,r,t,
 n):null},Pt=e=>!!e.handler,se=(e,r,t,n)=>Dt(e)?ie(e,r,St(e),t,n):yt(e)?G(e)?ie(e,
 r,gt(e),t,n):(n.push(new k(e.name,e.file)),null):(n.push(new R(r.file)),null),ie=(e,r,t,n,a)=>{
 let o={},s=new Set(["handler"]);for(let i of t)if(!(!vt(i)||i.inherited))switch(i.
 name){default:a.push(new ft(r.name,i.name,e.file));break;case"handler":o.handler=
-oe(i.value,n,a);break;case"listener":o.listener=It(i.value,a);break;case"memory":case"\
-timeout":case"retention":o[i.name]=Mt(i);break;case"variables":o.variables=xt(i,
-a);break}return Pt(o)?o:(a.push(new O([...s],e.file)),null)};var ce=(e,r,t,n)=>{if(!Ut(e))return me(e,r,t,n);let a=At(e,t);return a?me(a,r,t,
-n):null},zt=e=>!!e.name&&!!e.schema&&!!e.indexes,me=(e,r,t,n)=>q(e)?le(e,r,Ot(e),
-t,n):wt(e)?le(e,r,Rt(e),t,n):null,le=(e,r,t,n,a)=>{let o={},s=new Set(["name","s\
-chema","indexes"]);for(let p of t)if(!(!Ct(p)||p.inherited))switch(p.name){default:
+oe(i.value,n,a);break;case"listener":o.listener=Mt(i.value,a);break;case"memory":case"\
+logRetention":case"timeout":o[i.name]=It(i);break;case"variables":o.variables=xt(
+i,a);break}return Pt(o)?o:(a.push(new O([...s],e.file)),null)};var ce=(e,r,t,n)=>{if(!Ut(e))return le(e,r,t,n);let a=Ct(e,t);return a?le(a,r,t,
+n):null},zt=e=>!!e.name&&!!e.schema&&!!e.indexes,le=(e,r,t,n)=>q(e)?me(e,r,Ot(e),
+t,n):wt(e)?me(e,r,Rt(e),t,n):null,me=(e,r,t,n,a)=>{let o={},s=new Set(["name","s\
+chema","indexes"]);for(let p of t)if(!(!At(p)||p.inherited))switch(p.name){default:
 a.push(new jt(r.name,p.name,e.file));break;case"name":(o.name=kt(p))&&s.delete(p.
 name);break;case"schema":(o.schema=ae(p.value,e,n,a))&&s.delete(p.name);break;case"\
 indexes":(o.indexes=te(p.value,e,n,a))&&s.delete(p.name);break;case"relations":o.
 relations=Z(p.value,e,n,a);break;case"stream":o.stream=pe(p.value,r,n,a);break}if(!zt(
 o))return a.push(new c([...s],e.file)),null;let i=Nt(e,o.indexes,o.schema);return i.
 length?(a.push(...i),null):o},Nt=(e,r,t)=>{let n=t.properties,a=[];for(let{name:o,
-columns:s}of r)s.some(p=>!n[p])&&a.push(new E(o,e.file));return a};var Te=e=>{let r={},t=[];for(let n in e){let a=e[n];if(!I(a)||Vt(a))continue;let o={
-type:U,extras:{}},s=new Set(["engine","tables"]),i=a.file;o.name=a.name;for(let m of Gt(
-a))if(!(!Bt(m)||m.inherited))switch(m.name){default:t.push(new qt(o.name,m.name,
-i));break;case"engine":(o.engine=K(m.value,a,e,t))&&s.delete(m.name);break;case"\
-tables":(o.tables=Jt(m,a,e,t))&&s.delete(m.name);break;case"variables":o.variables=
-Qt(m,t);break;case"services":o.services=Ft(m,e,t);break}if(!_t(o)){t.push(new M(
-[...s],i));continue}let p=Kt(a,o.tables);if(p.length){t.push(...p);continue}if(r[a.
-name]){t.push(new Ht(a.name,i));continue}r[a.name]=o}return{services:r,errors:t}},
-_t=e=>!!e.name&&!!e.tables&&!!e.extras,Jt=(e,r,t,n)=>{let a=$t(e)??[],o=[];for(let s of a){
-let i=ce(s,r,t,n);i&&o.push(i)}return o},Kt=(e,r)=>{let t=Wt(r),n=[];for(let{relations:a,
-schema:o,indexes:s}of r){if(!a)continue;let i=o.properties;for(let p of a){let{sourceTable:m,
-sourceColumn:d,targetColumn:C,targetAlias:z}=p;i[C]||n.push(new T(C,e.file)),i[z]&&
-n.push(new g(z,e.file));let w=t[m]?.schema.properties;w||n.push(new x(m,e.file)),
-w&&!w[d]&&n.push(new T(d,e.file));let fe=t[m]?.indexes??[];p.sourceIndex=de(fe,d),
-p.targetIndex=de(s,C)}}return n},de=(e,r)=>e.find(({name:t})=>t===r)?.type,Wt=e=>e.
-reduce((r,t)=>({...r,[t.name]:t}),{});var ue=e=>I(e)?e.name:null;var be=!1,Xn=()=>{be||(Xt(),Yt(),Zt("@ez4/database",{"metadata:getServices":Te,"\
-metadata:getLinkedService":ue}),be=!0)};export{A as IncompleteHandlerError,M as IncompleteServiceError,O as IncompleteStreamError,
+columns:s}of r)s.some(p=>!n[p])&&a.push(new E(o,e.file));return a};var Te=e=>{let r={},t=[];for(let n in e){let a=e[n];if(!M(a)||Vt(a))continue;let o={
+type:U,extras:{}},s=new Set(["engine","tables"]),i=a.file;o.name=a.name;for(let l of Gt(
+a))if(!(!Bt(l)||l.inherited))switch(l.name){default:t.push(new qt(o.name,l.name,
+i));break;case"client":break;case"engine":(o.engine=K(l.value,a,e,t))&&s.delete(
+l.name);break;case"tables":(o.tables=Jt(l,a,e,t))&&s.delete(l.name);break;case"v\
+ariables":o.variables=Qt(l,t);break;case"services":o.services=Ft(l,e,t);break}if(!_t(
+o)){t.push(new I([...s],i));continue}let p=Kt(a,o.tables);if(p.length){t.push(...p);
+continue}if(r[a.name]){t.push(new Ht(a.name,i));continue}r[a.name]=o}return{services:r,
+errors:t}},_t=e=>!!e.name&&!!e.tables&&!!e.extras,Jt=(e,r,t,n)=>{let a=$t(e)??[],
+o=[];for(let s of a){let i=ce(s,r,t,n);i&&o.push(i)}return o},Kt=(e,r)=>{let t=Wt(
+r),n=[];for(let{relations:a,schema:o,indexes:s}of r){if(!a)continue;let i=o.properties;
+for(let p of a){let{sourceTable:l,sourceColumn:d,targetColumn:A,targetAlias:z}=p;
+i[A]||n.push(new T(A,e.file)),i[z]&&n.push(new g(z,e.file));let w=t[l]?.schema.properties;
+w||n.push(new x(l,e.file)),w&&!w[d]&&n.push(new T(d,e.file));let fe=t[l]?.indexes??
+[];p.sourceIndex=de(fe,d),p.targetIndex=de(s,A)}}return n},de=(e,r)=>e.find(({name:t})=>t===
+r)?.type,Wt=e=>e.reduce((r,t)=>({...r,[t.name]:t}),{});var ue=e=>M(e)?e.name:null;var be=!1,Xn=()=>{be||(Xt(),Yt(),Zt("@ez4/database",{"metadata:getServices":Te,"\
+metadata:getLinkedService":ue}),be=!0)};export{C as IncompleteHandlerError,I as IncompleteServiceError,O as IncompleteStreamError,
 c as IncompleteTableError,v as IncorrectIndexesTypeError,f as IncorrectRelationsTypeError,
 j as IncorrectSchemaTypeError,k as IncorrectStreamTypeError,E as InvalidIndexReferenceError,
 D as InvalidIndexTypeError,h as InvalidIndexesTypeError,g as InvalidRelationAliasError,

package/dist/main.cjs

@@ -1,8 +1,8 @@
-"use strict";var s=Object.defineProperty;var c=Object.getOwnPropertyDescriptor;var b=Object.getOwnPropertyNames;var I=Object.prototype.hasOwnProperty;var u=(a,n)=>{for(var e in n)s(a,e,{get:n[e],enumerable:!0})},f=(a,n,e,r)=>{if(n&&
+"use strict";var s=Object.defineProperty;var l=Object.getOwnPropertyDescriptor;var b=Object.getOwnPropertyNames;var I=Object.prototype.hasOwnProperty;var u=(a,n)=>{for(var e in n)s(a,e,{get:n[e],enumerable:!0})},g=(a,n,e,r)=>{if(n&&
 typeof n=="object"||typeof n=="function")for(let t of b(n))!I.call(a,t)&&t!==e&&
-s(a,t,{get:()=>n[t],enumerable:!(r=c(n,t))||r.enumerable});return a};var g=a=>f(s({},"__esModule",{value:!0}),a);var S={};u(S,{Database:()=>T,Index:()=>y,InsensitiveMode:()=>p,Order:()=>m,OrderMode:()=>x,
-PaginationMode:()=>d,ParametersMode:()=>o,StreamType:()=>l,TransactionMode:()=>i});
-module.exports=g(S);var l=(r=>(r.Insert="insert",r.Update="update",r.Delete="delete",r))(l||{});var o=(e=>(e.NameAndIndex="both",e.OnlyIndex="index",e))(o||{});var i=(e=>(e.Interactive="interactive",e.Static="static",e))(i||{});var p=(e=>(e.Unsupported="unsupported",e.Enabled="enabled",e))(p||{});var d=(e=>(e.Cursor="cursor",e.Offset="offset",e))(d||{});var m=(e=>(e.Asc="asc",e.Desc="desc",e))(m||{}),x=(e=>(e.IndexColumns="index",e.
+s(a,t,{get:()=>n[t],enumerable:!(r=l(n,t))||r.enumerable});return a};var f=a=>g(s({},"__esModule",{value:!0}),a);var S={};u(S,{Database:()=>T,Index:()=>y,InsensitiveMode:()=>p,Order:()=>m,OrderMode:()=>x,
+PaginationMode:()=>d,ParametersMode:()=>o,StreamType:()=>c,TransactionMode:()=>i});
+module.exports=f(S);var c=(r=>(r.Insert="insert",r.Update="update",r.Delete="delete",r))(c||{});var o=(e=>(e.NameAndIndex="both",e.OnlyIndex="index",e))(o||{});var i=(e=>(e.Interactive="interactive",e.Static="static",e))(i||{});var p=(e=>(e.Unsupported="unsupported",e.Enabled="enabled",e))(p||{});var d=(e=>(e.Cursor="cursor",e.Offset="offset",e))(d||{});var m=(e=>(e.Asc="asc",e.Desc="desc",e))(m||{}),x=(e=>(e.IndexColumns="index",e.
 AnyColumns="any",e))(x||{});var T;(a=>{})(T||={});var y=(t=>(t.Primary="primary",t.Secondary="secondary",t.Unique="unique",t.TTL="\
 ttl",t))(y||{});0&&(module.exports={Database,Index,InsensitiveMode,Order,OrderMode,PaginationMode,
 ParametersMode,StreamType,TransactionMode});

package/dist/services/database.d.ts

@@ -71,7 +71,7 @@ export declare namespace Database {
         /**
          * Log retention (in days) for the handler.
          */
-        retention?: number;
+        logRetention?: number;
         /**
          * Max execution time (in seconds) for the handler.
          */

package/dist/services/engine.d.ts

@@ -3,7 +3,6 @@ import type { TransactionMode } from './transaction.js';
 import type { InsensitiveMode } from './insensitive.js';
 import type { PaginationMode } from './pagination.js';
 import type { OrderMode } from './order.js';
-import type { TableMetadata } from './table.js';
 import type { Database } from './database.js';
 /**
  * Database engine.
@@ -33,15 +32,15 @@ export declare namespace EngineUtils {
         transactionMode: infer M;
     } ? M : never;
     /**
-     * Get the insensitive mode from the given table service.
+     * Get the insensitive mode from the given database engine.
      */
-    type GetInsensitiveMode<T extends TableMetadata> = T['engine'] extends {
+    type GetInsensitiveMode<E extends DatabaseEngine> = E extends {
         insensitiveMode: infer M;
     } ? M : never;
     /**
-     * Get the pagination mode from the given table metadata.
+     * Get the pagination mode from the given database engine.
      */
-    type GetPaginationMode<T extends TableMetadata> = T['engine'] extends {
+    type GetPaginationMode<E extends DatabaseEngine> = E extends {
         paginationMode: infer M;
     } ? M : never;
     /**

package/dist/services/insensitive.d.ts

@@ -1,5 +1,4 @@
-import type { TableMetadata } from './table.js';
-import type { EngineUtils } from './engine.js';
+import type { DatabaseEngine, EngineUtils } from './engine.js';
 /**
  * Insensitive mode.
  */
@@ -12,9 +11,9 @@ export declare const enum InsensitiveMode {
  */
 export declare namespace InsensitiveUtils {
     /**
-     * Get the insensitive input based on the given table metadata.
+     * Get the insensitive input based on the given database engine.
      */
-    type Input<T extends TableMetadata> = EngineUtils.GetInsensitiveMode<T> extends InsensitiveMode.Enabled ? {
+    type Input<E extends DatabaseEngine> = EngineUtils.GetInsensitiveMode<E> extends InsensitiveMode.Enabled ? {
         insensitive?: boolean;
     } : {};
 }

package/dist/services/order.d.ts

@@ -1,6 +1,5 @@
-import type { AnyObject } from '@ez4/utils';
 import type { DecomposeIndexName } from './indexes.js';
-import type { DatabaseEngine } from './engine.js';
+import type { TableMetadata } from './table.js';
 import type { Database } from './database.js';
 /**
  * Query order types.
@@ -33,8 +32,7 @@ export declare namespace OrderUtils {
         [P in keyof T]?: Order;
     };
     /**
-     * Order input type based on the
+     * Order input type based on the table metadata.
      */
-    export type Input<T extends AnyObject, E extends DatabaseEngine> = E['orderMode'] extends OrderMode.AnyColumns ? AnyInput<T['schema']> : IndexInput<T['indexes']>;
-    export {};
+    type Input<T extends TableMetadata> = T['engine']['orderMode'] extends OrderMode.IndexColumns ? IndexInput<T['indexes']> : AnyInput<T['schema']>;
 }

package/dist/services/pagination.d.ts

@@ -1,5 +1,4 @@
-import type { TableMetadata } from './table.js';
-import type { EngineUtils } from './engine.js';
+import type { DatabaseEngine, EngineUtils } from './engine.js';
 /**
  * Pagination mode.
  */
@@ -12,9 +11,9 @@ export declare const enum PaginationMode {
  */
 export declare namespace PaginationUtils {
     /**
-     * Get the pagination range based on the given table metadata.
+     * Get the pagination range based on the given database engine.
      */
-    type Range<T extends TableMetadata> = EngineUtils.GetPaginationMode<T> extends PaginationMode.Cursor ? {
+    type Range<E extends DatabaseEngine> = EngineUtils.GetPaginationMode<E> extends PaginationMode.Cursor ? {
         cursor?: string;
         limit?: number;
     } : {
@@ -24,7 +23,7 @@ export declare namespace PaginationUtils {
     /**
      * Get the pagination begin based on the given table metadata.
      */
-    type Begin<T extends TableMetadata> = EngineUtils.GetPaginationMode<T> extends PaginationMode.Cursor ? {
+    type Begin<E extends DatabaseEngine> = EngineUtils.GetPaginationMode<E> extends PaginationMode.Cursor ? {
         cursor?: string;
     } : {
         skip?: number;
@@ -32,7 +31,7 @@ export declare namespace PaginationUtils {
     /**
      * Get the pagination end based on the given table metadata.
      */
-    type End<T extends TableMetadata> = EngineUtils.GetPaginationMode<T> extends PaginationMode.Cursor ? {
+    type End<E extends DatabaseEngine> = EngineUtils.GetPaginationMode<E> extends PaginationMode.Cursor ? {
         limit?: number;
     } : {
         take?: number;
@@ -40,7 +39,7 @@ export declare namespace PaginationUtils {
     /**
      * Get the pagination result based on the given table metadata.
      */
-    type Result<T extends TableMetadata> = EngineUtils.GetPaginationMode<T> extends PaginationMode.Cursor ? {
+    type Result<E extends DatabaseEngine> = EngineUtils.GetPaginationMode<E> extends PaginationMode.Cursor ? {
         cursor?: string;
     } : {};
 }

package/dist/services/query.d.ts

@@ -1,4 +1,5 @@
 import type { DecomposeIndexName, PrimaryIndexes, UniqueIndexes } from './indexes.js';
+import type { DatabaseEngine } from './engine.js';
 import type { RelationMetadata } from './relations.js';
 import type { InsensitiveUtils } from './insensitive.js';
 import type { PaginationUtils } from './pagination.js';
@@ -16,46 +17,46 @@ export declare namespace Query {
     };
     export type UpdateOneInput<S extends AnyObject, T extends TableMetadata> = {
         select?: StrictSelectInput<S, T>;
-        include?: StrictIncludeInput<T>;
+        include?: StrictIncludeInput<S, T>;
         data: OptionalObject<UpdateDataInput<T>>;
         where: WhereInput<T, true>;
     };
     export type FindOneInput<S extends AnyObject, T extends TableMetadata> = {
         select: StrictSelectInput<S, T>;
-        include?: StrictIncludeInput<T>;
+        include?: StrictIncludeInput<S, T>;
         where: WhereInput<T, true>;
     };
     export type UpsertOneInput<S extends AnyObject, T extends TableMetadata> = {
         select?: StrictSelectInput<S, T>;
-        include?: StrictIncludeInput<T>;
+        include?: StrictIncludeInput<S, T>;
         update: OptionalObject<UpdateDataInput<T>>;
         insert: InsertDataInput<T>;
         where: WhereInput<T, true>;
     };
     export type DeleteOneInput<S extends AnyObject, T extends TableMetadata> = {
         select?: StrictSelectInput<S, T>;
-        include?: StrictIncludeInput<T>;
+        include?: StrictIncludeInput<S, T>;
         where: WhereInput<T, true>;
     };
     export type InsertManyInput<T extends TableMetadata> = {
         data: T['schema'][];
     };
-    export type UpdateManyInput<S extends AnyObject, T extends TableMetadata> = PaginationUtils.End<T> & {
+    export type UpdateManyInput<S extends AnyObject, T extends TableMetadata> = PaginationUtils.End<T['engine']> & {
         select?: StrictSelectInput<S, T>;
-        include?: StrictIncludeInput<T>;
+        include?: StrictIncludeInput<S, T>;
         data: OptionalObject<UpdateDataInput<T>>;
         where?: WhereInput<T>;
     };
-    export type FindManyInput<S extends AnyObject, T extends TableMetadata, C extends boolean> = PaginationUtils.Range<T> & {
+    export type FindManyInput<S extends AnyObject, T extends TableMetadata, C extends boolean> = PaginationUtils.Range<T['engine']> & {
         count?: C;
         select: StrictSelectInput<S, T>;
-        include?: StrictIncludeInput<T>;
+        include?: StrictIncludeInput<S, T>;
         where?: WhereInput<T>;
         order?: OrderInput<T>;
     };
-    export type DeleteManyInput<S extends AnyObject, T extends TableMetadata> = PaginationUtils.End<T> & {
+    export type DeleteManyInput<S extends AnyObject, T extends TableMetadata> = PaginationUtils.End<T['engine']> & {
         select?: StrictSelectInput<S, T>;
-        include?: StrictIncludeInput<T>;
+        include?: StrictIncludeInput<S, T>;
         where?: WhereInput<T>;
     };
     export type CountInput<T extends TableMetadata> = {
@@ -68,7 +69,7 @@ export declare namespace Query {
     export type DeleteOneResult<S extends AnyObject, T extends TableMetadata> = S extends never ? void : Record<S, T> | undefined;
     export type UpdateManyResult<S extends AnyObject, T extends TableMetadata> = S extends never ? void : Record<S, T>[];
     export type InsertManyResult = void;
-    export type FindManyResult<S extends AnyObject, T extends TableMetadata, C extends boolean> = PaginationUtils.Result<T> & (C extends true ? {
+    export type FindManyResult<S extends AnyObject, T extends TableMetadata, C extends boolean> = PaginationUtils.Result<T['engine']> & (C extends true ? {
         records: Record<S, T>[];
         total: number;
     } : {
@@ -78,34 +79,35 @@ export declare namespace Query {
     export type Record<S extends AnyObject, T extends TableMetadata> = S extends never ? undefined : PartialObject<SelectFields<T['schema'], T['relations']>, S, false>;
     export type SelectInput<T extends TableMetadata> = PartialProperties<SelectFields<T['schema'], T['relations']>>;
     export type StrictSelectInput<S extends AnyObject, T extends TableMetadata> = StrictObject<S, FlatObject<SelectFields<T['schema'], T['relations']>>>;
-    export type InsertDataInput<T extends TableMetadata> = Omit<IsObjectEmpty<T['relations']['changes']> extends true ? T['schema'] : T['schema'] & T['relations']['changes'], IndexFields<T['relations']>>;
-    export type UpdateDataInput<T extends TableMetadata> = AtomicDataInput<Omit<IsObjectEmpty<T['relations']['changes']> extends true ? T['schema'] : T['schema'] & FlatObject<T['relations']['changes']>, IndexFields<T['relations']>>>;
-    export type OrderInput<T extends TableMetadata, O extends AnyObject = T['schema']> = OrderUtils.Input<O, T['engine']>;
-    export type StrictIncludeInput<T extends TableMetadata> = IsObjectEmpty<T['relations']['filters']> extends true ? never : {
-        [P in keyof T['relations']['filters']]?: PaginationUtils.Range<T> & {
-            where?: WhereRelationField<T['relations']['filters'][P], T>;
-            order?: OrderInput<T, T['relations']['filters'][P]>;
-        };
+    export type InsertDataInput<T extends TableMetadata> = Omit<IsObjectEmpty<T['relations']['changes']> extends true ? T['schema'] : T['schema'] & T['relations']['changes'], T['relations']['indexes']>;
+    export type UpdateDataInput<T extends TableMetadata> = AtomicDataInput<Omit<IsObjectEmpty<T['relations']['changes']> extends true ? T['schema'] : T['schema'] & FlatObject<T['relations']['changes']>, T['relations']['indexes']>>;
+    export type OrderInput<T extends TableMetadata> = OrderUtils.Input<T>;
+    export type StrictIncludeInput<S extends AnyObject, T extends TableMetadata> = IsObjectEmpty<T['relations']['filters']> extends true ? never : {
+        [P in keyof T['relations']['filters']]?: P extends keyof S ? StrictIncludeRelation<T['relations']['filters'][P], T['engine']> : never;
+    };
+    export type StrictIncludeOrder<V extends AnyObject> = OrderUtils.AnyInput<V>;
+    export type StrictIncludeRelation<V extends AnyObject, E extends DatabaseEngine> = PaginationUtils.Range<E> & {
+        where?: WhereRelationField<V, E>;
+        order?: StrictIncludeOrder<V>;
     };
     export type WhereInput<T extends TableMetadata, I extends boolean = false> = WhereInputFilters<T, I extends true ? T['indexes'] : {}> & {
         NOT?: WhereInput<T>;
         AND?: WhereInput<T>[];
         OR?: WhereInput<T>[];
     };
-    type IndexFields<R extends RelationMetadata> = string extends R['indexes'] ? never : R['indexes'];
     type SelectFields<T extends Database.Schema, R extends RelationMetadata> = IsObjectEmpty<R['selects']> extends true ? T : T & R['selects'];
-    type WhereOperations<V, T extends TableMetadata> = WhereNegate<V, T> | WhereEqual<V> | WhereGreaterThan<V> | WhereGreaterThanOrEqual<V> | WhereLessThan<V> | WhereLessThanOrEqual<V> | WhereIn<V> | WhereBetween<V> | WhereIsMissing | WhereIsNull | WhereStartsWith<T> | WhereContains<V, T>;
-    type WhereField<V, T extends TableMetadata> = IsObject<V> extends false ? V | WhereOperations<V, T> : IsNullable<V> extends true ? null | WhereObjectField<NonNullable<V>, T> : WhereObjectField<NonNullable<V>, T>;
-    type WhereObjectField<V extends AnyObject, T extends TableMetadata> = {
-        [P in keyof V]?: WhereField<V[P], T>;
+    type WhereOperations<V, E extends DatabaseEngine> = WhereNegate<V> | WhereEqual<V> | WhereGreaterThan<V> | WhereGreaterThanOrEqual<V> | WhereLessThan<V> | WhereLessThanOrEqual<V> | WhereIn<V> | WhereBetween<V> | WhereIsMissing | WhereIsNull | WhereStartsWith<E> | WhereContains<V, E>;
+    type WhereField<V, E extends DatabaseEngine> = IsObject<V> extends false ? V | WhereOperations<V, E> : IsNullable<V> extends true ? null | WhereObjectField<NonNullable<V>, E> : WhereObjectField<NonNullable<V>, E>;
+    type WhereObjectField<V extends AnyObject, E extends DatabaseEngine> = {
+        [P in keyof V]?: WhereField<V[P], E>;
     };
-    type WhereRelationField<V extends AnyObject, T extends TableMetadata> = WhereObjectField<V, T> & {
-        NOT?: WhereRelationField<V, T>;
-        AND?: WhereRelationField<V, T>[];
-        OR?: WhereRelationField<V, T>[];
+    type WhereRelationField<V extends AnyObject, E extends DatabaseEngine> = WhereObjectField<V, E> & {
+        NOT?: WhereRelationField<V, E>;
+        AND?: WhereRelationField<V, E>[];
+        OR?: WhereRelationField<V, E>[];
     };
-    type WhereRelationFilters<V extends AnyObject, T extends TableMetadata> = {
-        [P in keyof V]?: IsObject<V[P]> extends true ? IsObjectEmpty<V[P]> extends false ? null | WhereRelationField<V[P], T> : null | {} : never;
+    type WhereRelationFilters<V extends AnyObject, E extends DatabaseEngine> = {
+        [P in keyof V]?: IsObject<V[P]> extends true ? IsObjectEmpty<V[P]> extends false ? null | WhereRelationField<V[P], E> : null | {} : never;
     };
     type WhereIndexFields<I extends Database.Indexes> = PrimaryIndexes<I> & UniqueIndexes<I>;
     type WhereRequiredFilters<V extends AnyObject, I extends Database.Indexes> = {
@@ -114,13 +116,13 @@ export declare namespace Query {
         };
     }[keyof WhereIndexFields<I>];
     type WhereOptionalFilters<V extends AnyObject, T extends TableMetadata, I extends Database.Indexes> = {
-        [P in Exclude<keyof V, keyof WhereIndexFields<I>>]?: WhereField<V[P], T>;
+        [P in Exclude<keyof V, keyof WhereIndexFields<I>>]?: WhereField<V[P], T['engine']>;
     };
-    type WhereCommonFilters<V extends AnyObject, T extends TableMetadata, I extends Database.Indexes> = IsObjectEmpty<I> extends true ? WhereObjectField<V, T> : WhereRequiredFilters<V, I> & WhereOptionalFilters<V, T, I>;
-    type WhereInputFilters<T extends TableMetadata, I extends Database.Indexes> = WhereCommonFilters<T['schema'], T, I> & WhereRelationFilters<T['relations']['filters'], T>;
-    export type WhereOperators = keyof (WhereNegate<any, never> & WhereEqual<any> & WhereGreaterThan<any> & WhereGreaterThanOrEqual<any> & WhereLessThan<any> & WhereLessThanOrEqual<any> & WhereIn<any> & WhereBetween<any> & WhereIsMissing & WhereIsNull & WhereStartsWith<never> & WhereContains<any, never>);
-    type WhereNegate<V, T extends TableMetadata> = {
-        not: V | WhereOperations<V, T>;
+    type WhereCommonFilters<V extends AnyObject, T extends TableMetadata, I extends Database.Indexes> = IsObjectEmpty<I> extends true ? WhereObjectField<V, T['engine']> : WhereRequiredFilters<V, I> & WhereOptionalFilters<V, T, I>;
+    type WhereInputFilters<T extends TableMetadata, I extends Database.Indexes> = WhereCommonFilters<T['schema'], T, I> & WhereRelationFilters<T['relations']['filters'], T['engine']>;
+    export type WhereOperators = keyof (WhereNegate<any> & WhereEqual<any> & WhereGreaterThan<any> & WhereGreaterThanOrEqual<any> & WhereLessThan<any> & WhereLessThanOrEqual<any> & WhereIn<any> & WhereBetween<any> & WhereIsMissing & WhereIsNull & WhereStartsWith<never> & WhereContains<any, never>);
+    type WhereNegate<V> = {
+        not: V;
     };
     type WhereEqual<V> = {
         equal: V;
@@ -149,10 +151,10 @@ export declare namespace Query {
     type WhereIsNull = {
         isNull: boolean;
     };
-    type WhereStartsWith<T extends TableMetadata> = InsensitiveUtils.Input<T> & {
+    type WhereStartsWith<E extends DatabaseEngine> = InsensitiveUtils.Input<E> & {
         startsWith: string;
     };
-    type WhereContains<V, T extends TableMetadata> = (V extends string ? InsensitiveUtils.Input<T> : {}) & {
+    type WhereContains<V, E extends DatabaseEngine> = (V extends string ? InsensitiveUtils.Input<E> : {}) & {
         contains: IsObject<V> extends true ? Partial<V> : V;
     };
     export type AtomicOperators = keyof (AtomicIncrement & AtomicDecrement & AtomicMultiply & AtomicDivide);

package/dist/services/relations.d.ts

@@ -6,10 +6,10 @@ import type { TableSchemas } from './schemas.js';
  * Internal relation type.
  */
 export type RelationMetadata = {
-    indexes: string;
     filters: Record<string, {}>;
     selects: Record<string, {}>;
     changes: Record<string, {}>;
+    indexes: string;
 };
 /**
  * Given a relation source name `T`, it produces the source table name.
@@ -44,23 +44,23 @@ type TableRelation<T, S extends Record<string, Database.Schema>, I extends Recor
     relations: infer R;
 } ? N extends string ? R extends AnyObject ? {
     [P in N]: {
-        indexes: RequiredRelationIndexes<PropertyType<N, S>, I, R>;
+        indexes: RelationIndexes<PropertyType<N, I>, R>;
         filters: FilterableRelationSchemas<S, R>;
         changes: RequiredRelationSchemas<PropertyType<N, S>, S, I, R, true> & OptionalRelationSchemas<PropertyType<N, S>, S, I, R, true>;
         selects: RequiredRelationSchemas<PropertyType<N, S>, S, I, R, false> & OptionalRelationSchemas<PropertyType<N, S>, S, I, R, false>;
     };
 } : {} : {} : {};
 /**
- * Produce an object containing all required relation indexes.
+ * Produce an object containing all relation indexes.
  */
-type RequiredRelationIndexes<T extends Database.Schema, I extends Record<string, Database.Indexes>, R extends AnyObject> = keyof {
-    [C in keyof R as IsOptionalRelation<R[C], C, T, I, true> extends true ? never : RelationTargetColumn<C>]: never;
+type RelationIndexes<I extends Database.Indexes, R extends AnyObject> = keyof {
+    [C in keyof R as RelationTargetColumn<C> extends keyof PrimaryIndexes<I> ? never : RelationTargetColumn<C>]: never;
 };
 /**
  * Produce an object containing all filterable relation schemas.
  */
 type FilterableRelationSchemas<S extends Record<string, Database.Schema>, R extends AnyObject> = {
-    [C in keyof R as RelationTargetAlias<C>]: Omit<PropertyType<RelationSourceTable<R[C]>, S>, RelationTargetColumn<R[C]>>;
+    [C in keyof R as RelationTargetAlias<C>]: Omit<PropertyType<RelationSourceTable<R[C]>, S>, RelationSourceColumn<R[C]>>;
 };
 /**
  * Produce an object containing only required relation schemas.

package/dist/triggers/service.d.ts

@@ -1,2 +1,2 @@
 import type { TypeClass } from '@ez4/reflection';
-export declare const getLinkedService: (statement: TypeClass) => string | null;
+export declare const getLinkedService: (declaration: TypeClass) => string | null;

package/dist/types/stream.d.ts

@@ -5,7 +5,7 @@ export type TableStream = {
     listener?: ServiceListener;
     handler: StreamHandler;
     variables?: LinkedVariables | null;
-    retention?: number;
+    logRetention?: number;
     timeout?: number;
     memory?: number;
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ez4/database",
   "description": "EZ4: Components to build database services",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "author": "Silas B.",
   "license": "MIT",
   "type": "module",
@@ -42,10 +42,10 @@
     "live:publish": "npm run test && npm publish --access public"
   },
   "dependencies": {
-    "@ez4/common": "^0.19.0",
-    "@ez4/project": "^0.19.0",
-    "@ez4/reflection": "^0.19.0",
-    "@ez4/schema": "^0.19.0",
-    "@ez4/utils": "^0.19.0"
+    "@ez4/common": "^0.20.0",
+    "@ez4/project": "^0.20.0",
+    "@ez4/reflection": "^0.20.0",
+    "@ez4/schema": "^0.20.0",
+    "@ez4/utils": "^0.20.0"
   }
 }