@peerbit/indexer-sqlite3 1.0.7 → 1.1.0

package/dist/src/schema.d.ts

@@ -39,7 +39,7 @@ export interface Table {
     isSimpleValue: boolean;
 }
 export declare const getSQLTable: (ctor: AbstractType<any>, path: string[], primary: string | false, inline: boolean, addJoinField: ((fields: SQLField[], constraints: SQLConstraint[]) => void) | undefined, fromOptionalField?: boolean) => Table[];
-export declare const getTableName: (path: string[], clazz: string | Constructor<any>) => string;
+export declare const getTableName: (path: string[] | undefined, clazz: string | Constructor<any>) => string;
 export declare const CHILD_TABLE_ID = "__id";
 export declare const ARRAY_INDEX_COLUMN = "__index";
 export declare const PARENT_TABLE_ID = "__parent_id";
@@ -48,11 +48,11 @@ export declare const getSQLFields: (tableName: string, path: string[], ctor: Con
     constraints: SQLConstraint[];
     dependencies: Table[];
 };
-export declare const resolveTable: <B extends boolean, R = B extends true ? Table : Table>(key: string[], tables: Map<string, Table>, clazz: string | Constructor<any>, throwOnMissing: B) => R;
+export declare const resolveTable: <B extends boolean, R = B extends true ? Table : Table | undefined>(key: string[], tables: Map<string, Table>, clazz: string | Constructor<any>, throwOnMissing: B) => R;
 export declare const insert: (insertFn: (values: any[], table: Table) => Promise<any> | any, obj: Record<string, any>, tables: Map<string, Table>, table: Table, fields: Field[], handleNestedCallback?: (cb: (parentId: any) => Promise<void>) => void, parentId?: any, index?: number) => Promise<void>;
 export declare const getTablePrefixedField: (table: Table, key: string, skipPrefix?: boolean) => string;
 export declare const getTableNameFromPrefixedField: (prefixedField: string) => string;
-export declare const getInlineTableFieldName: (path: string[] | undefined, key?: string) => string;
+export declare const getInlineTableFieldName: (path: string[] | string | undefined, key?: string) => string;
 export declare const selectChildren: (childrenTable: Table) => string;
 export declare const generateSelectQuery: (table: Table, selects: {
     from: string;
@@ -72,15 +72,28 @@ export declare const selectAllFieldsFromTable: (table: Table, shape: types.Shape
     }[];
     join: Map<string, JoinTable>;
 };
-export declare const resolveInstanceFromValue: <T>(fromTablePrefixedValues: Record<string, any>, tables: Map<string, Table>, table: Table, resolveChildren: (parentId: any, table: Table) => Promise<any[]>, tablePrefixed: boolean, shape: types.Shape | undefined) => Promise<T>;
+export declare const resolveInstanceFromValue: <T, S extends types.Shape | undefined>(fromTablePrefixedValues: Record<string, any>, tables: Map<string, Table>, table: Table, resolveChildren: (parentId: any, table: Table) => Promise<any[]>, tablePrefixed: boolean, shape?: S) => Promise<types.ReturnTypeFromShape<T, S>>;
 export declare const fromRowToObj: (row: any, ctor: Constructor<any>) => any;
-export declare const convertDeleteRequestToQuery: (request: types.DeleteRequest, tables: Map<string, Table>, table: Table) => string;
-export declare const convertSumRequestToQuery: (request: types.SumRequest, tables: Map<string, Table>, table: Table) => string;
-export declare const convertCountRequestToQuery: (request: types.CountRequest, tables: Map<string, Table>, table: Table) => string;
-export declare const convertSearchRequestToQuery: (request: types.SearchRequest, tables: Map<string, Table>, rootTables: Table[], shape: types.Shape | undefined) => string;
+export declare const convertDeleteRequestToQuery: (request: types.DeleteOptions, tables: Map<string, Table>, table: Table) => {
+    sql: string;
+    bindable: any[];
+};
+export declare const convertSumRequestToQuery: (request: types.SumOptions, tables: Map<string, Table>, table: Table) => {
+    sql: string;
+    bindable: any[];
+};
+export declare const convertCountRequestToQuery: (request: types.CountOptions | undefined, tables: Map<string, Table>, table: Table) => {
+    sql: string;
+    bindable: any[];
+};
+export declare const convertSearchRequestToQuery: (request: types.IterateOptions | undefined, tables: Map<string, Table>, rootTables: Table[], shape: types.Shape | undefined) => {
+    sql: string;
+    bindable: any[];
+};
 export declare const buildJoin: (joinBuilder: Map<string, JoinTable>, resolveAllColumns: boolean) => string;
 export declare const convertQueryToSQLQuery: (query: types.Query, tables: Map<string, Table>, table: Table, joinBuilder: Map<string, JoinTable>, path?: string[], tableAlias?: string | undefined) => {
     where: string;
+    bindable: any[];
 };
 type JoinTable = {
     table: Table;

package/dist/src/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,YAAY,EACjB,KAAK,WAAW,EAChB,KAAK,KAAK,EACV,KAAK,SAAS,EAWd,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,KAAK,MAAM,4BAA4B,CAAC;AAqBpD,MAAM,MAAM,YAAY,GACrB,MAAM,GACN,MAAM,GACN,IAAI,GACJ,MAAM,GACN,UAAU,GACV,SAAS,GACT,WAAW,CAAC;AAEf,MAAM,MAAM,aAAa,GACtB,MAAM,GACN,MAAM,GACN,MAAM,GACN,UAAU,GACV,SAAS,GACT,WAAW,GACX,IAAI,CAAC;AAER,eAAO,MAAM,gBAAgB,UACrB,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU,SAC/C,SAAS,KACd,aAUF,CAAC;AAGF,eAAO,MAAM,gBAAgB,SAAU,MAAM,WAAgB,CAAC;AAE9D,qBAAa,iBAAkB,SAAQ,KAAK;gBAC/B,OAAO,EAAE,MAAM;CAI3B;AAED,eAAO,MAAM,kBAAkB,UACvB,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU,SAC/C,SAAS,QAyBhB,CAAC;AAEF,eAAO,MAAM,SAAS,SAAU,SAAS,iCAmBxC,CAAC;AAEF,KAAK,QAAQ,GAAG;IACf,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;IACnB,IAAI,EAAE,KAAK,GAAG,SAAS,CAAC;IACxB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,2BAA2B,CAAC,EAAE,MAAM,CAAC;CACrC,CAAC;AACF,KAAK,aAAa,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1D,MAAM,WAAW,KAAK;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC;IACvB,OAAO,EAAE,MAAM,GAAG,KAAK,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,UAAU,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IACjC,MAAM,EAAE,QAAQ,EAAE,CAAC;IACnB,WAAW,EAAE,aAAa,EAAE,CAAC;IAC7B,QAAQ,EAAE,KAAK,EAAE,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,KAAK,GAAG,SAAS,CAAC;IAC1B,iBAAiB,EAAE,OAAO,CAAC;IAC3B,aAAa,EAAE,OAAO,CAAC;CACvB;AAED,eAAO,MAAM,WAAW,SACjB,YAAY,CAAC,GAAG,CAAC,QACjB,MAAM,EAAE,WACL,MAAM,GAAG,KAAK,UACf,OAAO,gBAEZ,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,WAAW,EAAE,aAAa,EAAE,KAAK,IAAI,CAAC,GAC5D,SAAS,sBACO,OAAO,KAGxB,KAAK,EA2CP,CAAC;AA0BF,eAAO,MAAM,YAAY,SAClB,MAAM,EAAE,SACP,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,WAahC,CAAC;AAEF,eAAO,MAAM,cAAc,SAAS,CAAC;AACrC,eAAO,MAAM,kBAAkB,YAAY,CAAC;AAE5C,eAAO,MAAM,eAAe,gBAAgB,CAAC;AAe7C,eAAO,MAAM,YAAY,cACb,MAAM,QACX,MAAM,EAAE,QACR,WAAW,CAAC,GAAG,CAAC,WACb,MAAM,GAAG,KAAK,2BACE,CACxB,MAAM,EAAE,QAAQ,EAAE,EAClB,WAAW,EAAE,aAAa,EAAE,KACxB,IAAI,WACD,KAAK,EAAE,2BAEb;IACF,MAAM,EAAE,QAAQ,EAAE,CAAC;IACnB,WAAW,EAAE,aAAa,EAAE,CAAC;IAC7B,YAAY,EAAE,KAAK,EAAE,CAAC;CA4OtB,CAAC;AAEF,eAAO,MAAM,YAAY,GACxB,CAAC,SAAS,OAAO,EACjB,CAAC,wCAEI,MAAM,EAAE,UACL,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,SACnB,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,kBAChB,CAAC,KACf,CAmBF,CAAC;AA4GF,eAAO,MAAM,MAAM,aACR,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,OACxD,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,UAChB,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,SACnB,KAAK,UACJ,KAAK,EAAE,yBACQ,CAAC,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,aAC3D,GAAG,UACL,MAAM,KACZ,OAAO,CAAC,IAAI,CA+Id,CAAC;AAEF,eAAO,MAAM,qBAAqB,UAC1B,KAAK,OACP,MAAM,eACC,OAAO,WAEwE,CAAC;AAC7F,eAAO,MAAM,6BAA6B,kBAAmB,MAAM,WACvC,CAAC;AAE7B,eAAO,MAAM,uBAAuB,SAC7B,MAAM,EAAE,GAAG,SAAS,QACpB,MAAM,WAYZ,CAAC;AA+BF,eAAO,MAAM,cAAc,kBAAmB,KAAK,WAC0B,CAAC;AAE9E,eAAO,MAAM,mBAAmB,UACxB,KAAK,WACH;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,EAAE,WAGvC,CAAC;AAEF,eAAO,MAAM,yBAAyB,WAC7B,KAAK,EAAE,SACR,KAAK,CAAC,KAAK,GAAG,SAAS;aAGpB;QACR,IAAI,EAAE,MAAM,CAAC;QACb,EAAE,EAAE,MAAM,CAAC;KACX,EAAE;WACI,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC;GA0C9B,CAAC;AAEF,eAAO,MAAM,wBAAwB,UAC7B,KAAK,SACL,KAAK,CAAC,KAAK,GAAG,SAAS;;cAIA,MAAM;YAAM,MAAM;;;CAmDhD,CAAC;AAcF,eAAO,MAAM,wBAAwB,GAAU,CAAC,2BACtB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,UACpC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,SACnB,KAAK,mBACK,CAAC,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,GAAG,EAAE,CAAC,iBACjD,OAAO,SACf,KAAK,CAAC,KAAK,GAAG,SAAS,KAC5B,OAAO,CAAC,CAAC,CAwKX,CAAC;AAEF,eAAO,MAAM,YAAY,QAAS,GAAG,QAAQ,WAAW,CAAC,GAAG,CAAC,QAQ5D,CAAC;AAEF,eAAO,MAAM,2BAA2B,YAC9B,KAAK,CAAC,aAAa,UACpB,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,SACnB,KAAK,WAGZ,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAC3B,KAAK,CAAC,UAAU,UACjB,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,SACnB,KAAK,WAGZ,CAAC;AAEF,eAAO,MAAM,0BAA0B,YAC7B,KAAK,CAAC,YAAY,UACnB,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,SACnB,KAAK,WAGZ,CAAC;AAEF,eAAO,MAAM,2BAA2B,YAC9B,KAAK,CAAC,aAAa,UACpB,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,cACd,KAAK,EAAE,SACZ,KAAK,CAAC,KAAK,GAAG,SAAS,WA0C9B,CAAC;AAwFF,eAAO,MAAM,SAAS,gBACR,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,qBAChB,OAAO,WAmB1B,CAAC;AAQF,eAAO,MAAM,sBAAsB,UAC3B,KAAK,CAAC,KAAK,UACV,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,SACnB,KAAK,eACC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,SAC7B,MAAM,EAAE,eACF,MAAM,GAAG,SAAS,KAC5B;IAAE,KAAK,EAAE,MAAM,CAAA;CAyEjB,CAAC;AAMF,KAAK,SAAS,GAAG;IAChB,KAAK,EAAE,KAAK,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;CACX,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,YAAY,EACjB,KAAK,WAAW,EAChB,KAAK,KAAK,EACV,KAAK,SAAS,EAWd,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,KAAK,MAAM,4BAA4B,CAAC;AAqBpD,MAAM,MAAM,YAAY,GACrB,MAAM,GACN,MAAM,GACN,IAAI,GACJ,MAAM,GACN,UAAU,GACV,SAAS,GACT,WAAW,CAAC;AAEf,MAAM,MAAM,aAAa,GACtB,MAAM,GACN,MAAM,GACN,MAAM,GACN,UAAU,GACV,SAAS,GACT,WAAW,GACX,IAAI,CAAC;AAER,eAAO,MAAM,gBAAgB,UACrB,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU,SAC/C,SAAS,KACd,aAUF,CAAC;AAGF,eAAO,MAAM,gBAAgB,SAAU,MAAM,WAAgB,CAAC;AAE9D,qBAAa,iBAAkB,SAAQ,KAAK;gBAC/B,OAAO,EAAE,MAAM;CAI3B;AAED,eAAO,MAAM,kBAAkB,UACvB,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU,SAC/C,SAAS,QAyBhB,CAAC;AAEF,eAAO,MAAM,SAAS,SAAU,SAAS,iCAmBxC,CAAC;AAEF,KAAK,QAAQ,GAAG;IACf,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;IACnB,IAAI,EAAE,KAAK,GAAG,SAAS,CAAC;IACxB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,2BAA2B,CAAC,EAAE,MAAM,CAAC;CACrC,CAAC;AACF,KAAK,aAAa,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1D,MAAM,WAAW,KAAK;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC;IACvB,OAAO,EAAE,MAAM,GAAG,KAAK,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,UAAU,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IACjC,MAAM,EAAE,QAAQ,EAAE,CAAC;IACnB,WAAW,EAAE,aAAa,EAAE,CAAC;IAC7B,QAAQ,EAAE,KAAK,EAAE,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,KAAK,GAAG,SAAS,CAAC;IAC1B,iBAAiB,EAAE,OAAO,CAAC;IAC3B,aAAa,EAAE,OAAO,CAAC;CACvB;AAED,eAAO,MAAM,WAAW,SACjB,YAAY,CAAC,GAAG,CAAC,QACjB,MAAM,EAAE,WACL,MAAM,GAAG,KAAK,UACf,OAAO,gBAEZ,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,WAAW,EAAE,aAAa,EAAE,KAAK,IAAI,CAAC,GAC5D,SAAS,sBACO,OAAO,KAGxB,KAAK,EA2CP,CAAC;AA0BF,eAAO,MAAM,YAAY,SAClB,MAAM,EAAE,qBACP,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,WAahC,CAAC;AAEF,eAAO,MAAM,cAAc,SAAS,CAAC;AACrC,eAAO,MAAM,kBAAkB,YAAY,CAAC;AAE5C,eAAO,MAAM,eAAe,gBAAgB,CAAC;AAe7C,eAAO,MAAM,YAAY,cACb,MAAM,QACX,MAAM,EAAE,QACR,WAAW,CAAC,GAAG,CAAC,WACb,MAAM,GAAG,KAAK,2BACE,CACxB,MAAM,EAAE,QAAQ,EAAE,EAClB,WAAW,EAAE,aAAa,EAAE,KACxB,IAAI,WACD,KAAK,EAAE,2BAEb;IACF,MAAM,EAAE,QAAQ,EAAE,CAAC;IACnB,WAAW,EAAE,aAAa,EAAE,CAAC;IAC7B,YAAY,EAAE,KAAK,EAAE,CAAC;CA4OtB,CAAC;AAEF,eAAO,MAAM,YAAY,GACxB,CAAC,SAAS,OAAO,EACjB,CAAC,oDAEI,MAAM,EAAE,UACL,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,SACnB,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,kBAChB,CAAC,KACf,CAmBF,CAAC;AA4GF,eAAO,MAAM,MAAM,aACR,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,OACxD,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,UAChB,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,SACnB,KAAK,UACJ,KAAK,EAAE,yBACQ,CAAC,EAAE,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,aAC3D,GAAG,UACL,MAAM,KACZ,OAAO,CAAC,IAAI,CA+Id,CAAC;AAEF,eAAO,MAAM,qBAAqB,UAC1B,KAAK,OACP,MAAM,eACC,OAAO,WAEwE,CAAC;AAC7F,eAAO,MAAM,6BAA6B,kBAAmB,MAAM,WACvC,CAAC;AAE7B,eAAO,MAAM,uBAAuB,SAC7B,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,QAC7B,MAAM,KACV,MAqBF,CAAC;AAmCF,eAAO,MAAM,cAAc,kBAAmB,KAAK,WAC0B,CAAC;AAE9E,eAAO,MAAM,mBAAmB,UACxB,KAAK,WACH;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,EAAE,WAGvC,CAAC;AAEF,eAAO,MAAM,yBAAyB,WAC7B,KAAK,EAAE,SACR,KAAK,CAAC,KAAK,GAAG,SAAS;aAGpB;QACR,IAAI,EAAE,MAAM,CAAC;QACb,EAAE,EAAE,MAAM,CAAC;KACX,EAAE;WACI,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC;GA0C9B,CAAC;AAEF,eAAO,MAAM,wBAAwB,UAC7B,KAAK,SACL,KAAK,CAAC,KAAK,GAAG,SAAS;;cAIA,MAAM;YAAM,MAAM;;;CAwDhD,CAAC;AAcF,eAAO,MAAM,wBAAwB,GACpC,CAAC,EACD,CAAC,SAAS,KAAK,CAAC,KAAK,GAAG,SAAS,2BAER,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,UACpC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,SACnB,KAAK,mBACK,CAAC,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,GAAG,EAAE,CAAC,iBACjD,OAAO,UACd,CAAC,KACP,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,CAwLzC,CAAC;AAEF,eAAO,MAAM,YAAY,QAAS,GAAG,QAAQ,WAAW,CAAC,GAAG,CAAC,QAQ5D,CAAC;AAEF,eAAO,MAAM,2BAA2B,YAC9B,KAAK,CAAC,aAAa,UACpB,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,SACnB,KAAK,KACV;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,GAAG,EAAE,CAAA;CAWhC,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAC3B,KAAK,CAAC,UAAU,UACjB,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,SACnB,KAAK,KACV;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,GAAG,EAAE,CAAA;CAWhC,CAAC;AAEF,eAAO,MAAM,0BAA0B,YAC7B,KAAK,CAAC,YAAY,GAAG,SAAS,UAC/B,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,SACnB,KAAK,KACV;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,GAAG,EAAE,CAAA;CAWhC,CAAC;AAEF,eAAO,MAAM,2BAA2B,YAC9B,KAAK,CAAC,cAAc,GAAG,SAAS,UACjC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,cACd,KAAK,EAAE,SACZ,KAAK,CAAC,KAAK,GAAG,SAAS,KAC5B;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,GAAG,EAAE,CAAA;CA8ChC,CAAC;AA4GF,eAAO,MAAM,SAAS,gBACR,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,qBAChB,OAAO,WAmB1B,CAAC;AAQF,eAAO,MAAM,sBAAsB,UAC3B,KAAK,CAAC,KAAK,UACV,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,SACnB,KAAK,eACC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,SAC7B,MAAM,EAAE,eACF,MAAM,GAAG,SAAS,KAC5B;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,GAAG,EAAE,CAAA;CA+ElC,CAAC;AAMF,KAAK,SAAS,GAAG;IAChB,KAAK,EAAE,KAAK,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;CACX,CAAC"}

package/dist/src/schema.js

@@ -570,11 +570,20 @@ export const getTablePrefixedField = (table, key, skipPrefix = false) => `${skip
 export const getTableNameFromPrefixedField = (prefixedField) => prefixedField.split("#")[0];
 export const getInlineTableFieldName = (path, key) => {
     if (key) {
-        return path && path.length > 0 ? `${path.join("_")}__${key}` : key;
+        if (Array.isArray(path)) {
+            return path && path.length > 0 ? `${path.join("_")}__${key}` : key;
+        }
+        return path + "__" + key;
     }
     else {
         // last element in the path is the key, the rest is the path
         // join key with __ , rest with _
+        if (!Array.isArray(path)) {
+            if (!path) {
+                throw new Error("Unexpected missing path");
+            }
+            return path;
+        }
         return path.length > 2
             ? `${path.slice(0, -1).join("_")}__${path[path.length - 1]}`
             : path.join("__");
@@ -597,7 +606,12 @@ const matchFieldInShape = (shape, path, field) => {
             if (nextShape === true) {
                 return true;
             }
-            currentShape = nextShape;
+            if (Array.isArray(nextShape)) {
+                currentShape = nextShape[0];
+            }
+            else {
+                currentShape = nextShape;
+            }
         }
     }
     throw new Error("Unexpected");
@@ -669,7 +683,12 @@ export const selectAllFieldsFromTable = (table, shape) => {
                 if (!maybeShape) {
                     continue;
                 }
-                childShape = maybeShape === true ? undefined : maybeShape;
+                childShape =
+                    maybeShape === true
+                        ? undefined
+                        : Array.isArray(maybeShape)
+                            ? maybeShape[0]
+                            : maybeShape;
             }
             stack.push({ table: child, shape: childShape });
             if (!child.inline) {
@@ -702,7 +721,18 @@ export const resolveInstanceFromValue = async (fromTablePrefixedValues, tables,
     const handleNested = async (field, isOptional, isArray) => {
         const subTables = getTableFromField(table, tables, field); // TODO fix
         let maybeShape = shape?.[field.key];
-        let subshape = maybeShape === true ? undefined : maybeShape;
+        const subshapeIsArray = Array.isArray(maybeShape);
+        if (isArray && maybeShape && !subshapeIsArray && maybeShape !== true) {
+            throw new Error("Shape is not matching the array field type: " +
+                field.key +
+                ". Shape: " +
+                JSON.stringify(shape));
+        }
+        let subshape = maybeShape === true
+            ? undefined
+            : subshapeIsArray
+                ? maybeShape[0]
+                : maybeShape;
         if (isArray) {
             let once = false;
             let resolvedArr = [];
@@ -815,13 +845,25 @@ export const fromRowToObj = (row, ctor) => {
     return Object.assign(Object.create(ctor.prototype), obj);
 };
 export const convertDeleteRequestToQuery = (request, tables, table) => {
-    return `DELETE FROM ${table.name} WHERE ${table.primary} IN (SELECT ${table.primary} from ${table.name} ${convertRequestToQuery(request, tables, table).query}) returning ${table.primary}`;
+    const { query, bindable } = convertRequestToQuery("delete", request, tables, table);
+    return {
+        sql: `DELETE FROM ${table.name} WHERE ${table.primary} IN (SELECT ${table.primary} from ${table.name} ${query}) returning ${table.primary}`,
+        bindable,
+    };
 };
 export const convertSumRequestToQuery = (request, tables, table) => {
-    return `SELECT SUM(${table.name}.${getInlineTableFieldName(request.key)}) as sum FROM ${table.name} ${convertRequestToQuery(request, tables, table).query}`;
+    const { query, bindable } = convertRequestToQuery("sum", request, tables, table);
+    return {
+        sql: `SELECT SUM(${table.name}.${getInlineTableFieldName(request.key)}) as sum FROM ${table.name} ${query}`,
+        bindable,
+    };
 };
 export const convertCountRequestToQuery = (request, tables, table) => {
-    return `SELECT count(*) as count FROM ${table.name} ${convertRequestToQuery(request, tables, table).query}`;
+    const { query, bindable } = convertRequestToQuery("count", request, tables, table);
+    return {
+        sql: `SELECT count(*) as count FROM ${table.name} ${query}`,
+        bindable,
+    };
 };
 export const convertSearchRequestToQuery = (request, tables, rootTables, shape) => {
     let unionBuilder = "";
@@ -829,11 +871,12 @@ export const convertSearchRequestToQuery = (request, tables, rootTables, shape)
     let matchedOnce = false;
     let lastError = undefined;
     const selectsPerTable = selectAllFieldsFromTables(rootTables, shape);
+    let bindableBuilder = [];
     for (const [i, table] of rootTables.entries()) {
         const { selects, joins: joinFromSelect } = selectsPerTable[i];
         const selectQuery = generateSelectQuery(table, selects);
         try {
-            const { orderBy, query } = convertRequestToQuery(request, tables, table, joinFromSelect);
+            const { orderBy, query, bindable } = convertRequestToQuery("iterate", request, tables, table, joinFromSelect);
             unionBuilder += `${unionBuilder.length > 0 ? " UNION ALL " : ""} ${selectQuery} ${query}`;
             orderByClause =
                 orderBy?.length > 0
@@ -842,6 +885,7 @@ export const convertSearchRequestToQuery = (request, tables, rootTables, shape)
                         : orderBy
                     : orderByClause;
             matchedOnce = true;
+            bindableBuilder.push(...bindable);
         }
         catch (error) {
             if (error instanceof MissingFieldError) {
@@ -854,52 +898,66 @@ export const convertSearchRequestToQuery = (request, tables, rootTables, shape)
     if (!matchedOnce) {
         throw lastError;
     }
-    return `${unionBuilder} ${orderByClause ? "ORDER BY " + orderByClause : ""} limit ? offset ?`;
+    return {
+        sql: `${unionBuilder} ${orderByClause ? "ORDER BY " + orderByClause : ""} limit ? offset ?`,
+        bindable: bindableBuilder,
+    };
 };
-const convertRequestToQuery = (request, tables, table, extraJoin, path = []) => {
+function isIterateRequest(request, type) {
+    return type === "iterate";
+}
+const convertRequestToQuery = (type, request, tables, table, extraJoin, path = []) => {
     let whereBuilder = "";
+    let bindableBuilder = [];
     let orderByBuilder = undefined;
     /* let tablesToSelect: string[] = [table.name]; */
     let joinBuilder = extraJoin || new Map();
-    if (request.query.length === 1) {
-        const { where } = convertQueryToSQLQuery(request.query[0], tables, table, joinBuilder, path);
+    const coercedQuery = types.toQuery(request?.query);
+    if (coercedQuery.length === 1) {
+        const { where, bindable } = convertQueryToSQLQuery(coercedQuery[0], tables, table, joinBuilder, path);
         whereBuilder += where;
+        bindableBuilder.push(...bindable);
     }
-    else if (request.query.length > 1) {
-        const { where } = convertQueryToSQLQuery(new types.And(request.query), tables, table, joinBuilder, path);
+    else if (coercedQuery.length > 1) {
+        const { where, bindable } = convertQueryToSQLQuery(new types.And(coercedQuery), tables, table, joinBuilder, path);
         whereBuilder += where;
-    }
-    if (request instanceof types.SearchRequest) {
-        if (request.sort.length > 0) {
-            orderByBuilder = "";
-            let once = false;
-            for (const sort of request.sort) {
-                const { foreignTables, queryKey } = resolveTableToQuery(table, tables, joinBuilder, [...path, ...sort.key], undefined, true);
-                for (const table of foreignTables) {
-                    if (once) {
-                        orderByBuilder += ", ";
+        bindableBuilder.push(...bindable);
+    }
+    if (isIterateRequest(request, type)) {
+        if (request?.sort) {
+            let sortArr = Array.isArray(request.sort) ? request.sort : [request.sort];
+            if (sortArr.length > 0) {
+                orderByBuilder = "";
+                let once = false;
+                for (const sort of sortArr) {
+                    const { foreignTables, queryKey } = resolveTableToQuery(table, tables, joinBuilder, [...path, ...sort.key], undefined, true);
+                    for (const table of foreignTables) {
+                        if (once) {
+                            orderByBuilder += ", ";
+                        }
+                        once = true;
+                        orderByBuilder += `${table.as}.${queryKey} ${sort.direction === types.SortDirection.ASC ? "ASC" : "DESC"}`;
                     }
-                    once = true;
-                    orderByBuilder += `${table.as}.${queryKey} ${sort.direction === types.SortDirection.ASC ? "ASC" : "DESC"}`;
                 }
+                /* orderByBuilder += request.sort
+                    .map(
+                        (sort) =>
+                            `${table.name}.${sort.key} ${sort.direction === types.SortDirection.ASC ? "ASC" : "DESC"}`
+                    )
+                    .join(", "); */
             }
-            /* orderByBuilder += request.sort
-                .map(
-                    (sort) =>
-                        `${table.name}.${sort.key} ${sort.direction === types.SortDirection.ASC ? "ASC" : "DESC"}`
-                )
-                .join(", "); */
         }
     }
     const where = whereBuilder.length > 0 ? "where " + whereBuilder : undefined;
     if (extraJoin && extraJoin.size > 0) {
         insertMapIntoMap(joinBuilder, extraJoin);
     }
-    let join = buildJoin(joinBuilder, request instanceof types.SearchRequest ? true : false);
+    let join = buildJoin(joinBuilder, type === "iterate" ? true : false);
     const query = `${join ? join : ""} ${where ? where : ""}`;
     return {
         query,
         orderBy: orderByBuilder,
+        bindable: bindableBuilder,
     };
 };
 export const buildJoin = (joinBuilder, resolveAllColumns) => {
@@ -926,17 +984,20 @@ const insertMapIntoMap = (map, insert) => {
 };
 export const convertQueryToSQLQuery = (query, tables, table, joinBuilder, path = [], tableAlias = undefined) => {
     let whereBuilder = "";
+    let bindableBuilder = [];
     /* 	let tablesToSelect: string[] = []; */
     const handleAnd = (queries, path, tableAlias) => {
         for (const query of queries) {
-            const { where } = convertQueryToSQLQuery(query, tables, table, joinBuilder, path, tableAlias);
+            const { where, bindable } = convertQueryToSQLQuery(query, tables, table, joinBuilder, path, tableAlias);
             whereBuilder =
                 whereBuilder.length > 0 ? `(${whereBuilder}) AND (${where})` : where;
+            bindableBuilder.push(...bindable);
         }
     };
     if (query instanceof types.StateFieldQuery) {
-        const { where } = convertStateFieldQuery(query, tables, table, joinBuilder, path, tableAlias);
+        const { where, bindable } = convertStateFieldQuery(query, tables, table, joinBuilder, path, tableAlias);
         whereBuilder += where;
+        bindableBuilder.push(...bindable);
     }
     else if (query instanceof types.Nested) {
         let joinPrefix = "__" + String(tables.size);
@@ -949,14 +1010,16 @@ export const convertQueryToSQLQuery = (query, tables, table, joinBuilder, path =
         }
         else if (query instanceof types.Or) {
             for (const subquery of query.or) {
-                const { where } = convertQueryToSQLQuery(subquery, tables, table, joinBuilder, path, tableAlias);
+                const { where, bindable } = convertQueryToSQLQuery(subquery, tables, table, joinBuilder, path, tableAlias);
                 whereBuilder =
                     whereBuilder.length > 0 ? `(${whereBuilder}) OR (${where})` : where;
+                bindableBuilder.push(...bindable);
             }
         }
         else if (query instanceof types.Not) {
-            const { where } = convertQueryToSQLQuery(query.not, tables, table, joinBuilder, path, tableAlias);
+            const { where, bindable } = convertQueryToSQLQuery(query.not, tables, table, joinBuilder, path, tableAlias);
             whereBuilder = `NOT (${where})`;
+            bindableBuilder.push(...bindable);
         }
         else {
             throw new Error("Unsupported query type: " + query.constructor.name);
@@ -967,6 +1030,7 @@ export const convertQueryToSQLQuery = (query, tables, table, joinBuilder, path =
     }
     return {
         where: whereBuilder,
+        bindable: bindableBuilder,
     };
 };
 const cloneQuery = (query) => {
@@ -1075,27 +1139,36 @@ const convertStateFieldQuery = (query, tables, table, join, path, tableAlias = u
         query = cloneQuery(query);
         query.key = [queryKey];
         let whereBuilder = [];
+        let bindableBuilder = [];
         for (const ftable of foreignTables) {
             if (ftable.table === table) {
                 throw new Error("Unexpected");
             }
-            const { where } = convertQueryToSQLQuery(query, tables, ftable.table, join, path, ftable.as);
+            const { where, bindable } = convertQueryToSQLQuery(query, tables, ftable.table, join, path, ftable.as);
             whereBuilder.push(where);
+            bindableBuilder.push(bindable);
         }
-        return { where: whereBuilder.join(" OR ") };
+        return {
+            where: whereBuilder.join(" OR "),
+            bindable: bindableBuilder.flat(),
+        };
     }
+    let bindable = [];
     const keyWithTable = (tableAlias || table.name) + "." + escapeColumnName(inlinedName);
     let where;
     if (query instanceof types.StringMatch) {
         let statement = "";
         if (query.method === types.StringMatchMethod.contains) {
-            statement = `${keyWithTable} LIKE '%${query.value}%'`;
+            statement = `${keyWithTable} LIKE ?`;
+            bindable.push(`%${query.value}%`);
         }
         else if (query.method === types.StringMatchMethod.prefix) {
-            statement = `${keyWithTable} LIKE '${query.value}%'`;
+            statement = `${keyWithTable} LIKE ?`;
+            bindable.push(`${query.value}%`);
         }
         else if (query.method === types.StringMatchMethod.exact) {
-            statement = `${keyWithTable} = '${query.value}'`;
+            statement = `${keyWithTable} = ?`;
+            bindable.push(`${query.value}`);
         }
         if (query.caseInsensitive) {
             statement += " COLLATE NOCASE";
@@ -1104,42 +1177,48 @@ const convertStateFieldQuery = (query, tables, table, join, path, tableAlias = u
     }
     else if (query instanceof types.ByteMatchQuery) {
         // compare Blob compule with f.value
-        const statement = `${keyWithTable} = x'${toHexString(query.value)}'`;
+        const statement = `${keyWithTable} = ?`;
+        bindable.push(query.value);
         where = statement;
     }
     else if (query instanceof types.IntegerCompare) {
         if (tableField.type === "BLOB") {
             // TODO perf
-            where = `hex(${keyWithTable}) LIKE '%${toHexString(new Uint8Array([Number(query.value.value)]))}%'`;
-        }
-        else if (query.compare === types.Compare.Equal) {
-            where = `${keyWithTable} = ${query.value.value}`;
-        }
-        else if (query.compare === types.Compare.Greater) {
-            where = `${keyWithTable} > ${query.value.value}`;
-        }
-        else if (query.compare === types.Compare.Less) {
-            where = `${keyWithTable} < ${query.value.value}`;
-        }
-        else if (query.compare === types.Compare.GreaterOrEqual) {
-            where = `${keyWithTable} >= ${query.value.value}`;
-        }
-        else if (query.compare === types.Compare.LessOrEqual) {
-            where = `${keyWithTable} <= ${query.value.value}`;
+            where = `hex(${keyWithTable}) LIKE ?`;
+            bindable.push(`%${toHexString(new Uint8Array([Number(query.value.value)]))}%`);
         }
         else {
-            throw new Error(`Unsupported compare type: ${query.compare}`);
+            if (query.compare === types.Compare.Equal) {
+                where = `${keyWithTable} = ?`;
+            }
+            else if (query.compare === types.Compare.Greater) {
+                where = `${keyWithTable} > ?`;
+            }
+            else if (query.compare === types.Compare.Less) {
+                where = `${keyWithTable} < ?`;
+            }
+            else if (query.compare === types.Compare.GreaterOrEqual) {
+                where = `${keyWithTable} >= ?`;
+            }
+            else if (query.compare === types.Compare.LessOrEqual) {
+                where = `${keyWithTable} <= ?`;
+            }
+            else {
+                throw new Error(`Unsupported compare type: ${query.compare}`);
+            }
+            bindable.push(query.value.value);
         }
     }
     else if (query instanceof types.IsNull) {
         where = `${keyWithTable} IS NULL`;
     }
     else if (query instanceof types.BoolQuery) {
-        where = `${keyWithTable} = ${query.value}`;
+        where = `${keyWithTable} = ?`;
+        bindable.push(query.value ? 1 : 0);
     }
     else {
         throw new Error("Unsupported query type: " + query.constructor.name);
     }
-    return { where };
+    return { where, bindable };
 };
 //# sourceMappingURL=schema.js.map