@decaf-ts/core 0.5.0 → 0.5.1

package/lib/esm/persistence/Sequence.js

@@ -1,10 +1,31 @@
 import { sequenceNameForModel } from "../identity/utils";
+import { InternalError } from "@decaf-ts/db-decorators";
+import { Logging } from "@decaf-ts/logging";
 export class Sequence {
+    get log() {
+        if (!this.logger)
+            this.logger = Logging.for(this);
+        return this.logger;
+    }
     constructor(options) {
         this.options = options;
     }
     static pk(model) {
         return sequenceNameForModel(model, "pk");
     }
+    static parseValue(type, value) {
+        switch (type) {
+            case "Number":
+                return typeof value === "string"
+                    ? parseInt(value)
+                    : typeof value === "number"
+                        ? value
+                        : BigInt(value);
+            case "BigInt":
+                return BigInt(value);
+            default:
+                throw new InternalError("Should never happen");
+        }
+    }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2VxdWVuY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcGVyc2lzdGVuY2UvU2VxdWVuY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBUUEsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFHekQsTUFBTSxPQUFnQixRQUFRO0lBQzVCLFlBQXlDLE9BQXdCO1FBQXhCLFlBQU8sR0FBUCxPQUFPLENBQWlCO0lBQUcsQ0FBQztJQVdyRSxNQUFNLENBQUMsRUFBRSxDQUFrQixLQUF5QjtRQUNsRCxPQUFPLG9CQUFvQixDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsQ0FBQztJQUMzQyxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBzdW1tYXJ5IFNlcXVlbmNlXG4gKlxuICogQGludGVyZmFjZSBTZXF1ZW5jZVxuICpcbiAqIEBjYXRlZ29yeSBTZXF1ZW5jZXNcbiAqL1xuaW1wb3J0IHsgQ29uc3RydWN0b3IsIE1vZGVsIH0gZnJvbSBcIkBkZWNhZi10cy9kZWNvcmF0b3ItdmFsaWRhdGlvblwiO1xuaW1wb3J0IHsgc2VxdWVuY2VOYW1lRm9yTW9kZWwgfSBmcm9tIFwiLi4vaWRlbnRpdHkvdXRpbHNcIjtcbmltcG9ydCB7IFNlcXVlbmNlT3B0aW9ucyB9IGZyb20gXCIuLi9pbnRlcmZhY2VzL1NlcXVlbmNlT3B0aW9uc1wiO1xuXG5leHBvcnQgYWJzdHJhY3QgY2xhc3MgU2VxdWVuY2Uge1xuICBwcm90ZWN0ZWQgY29uc3RydWN0b3IocHJvdGVjdGVkIHJlYWRvbmx5IG9wdGlvbnM6IFNlcXVlbmNlT3B0aW9ucykge31cblxuICAvKipcbiAgICogQHN1bW1hcnkgZ2VuZXJhdGVzIHRoZSBuZXh0IHZhbHVlIGluIHRoZSBzZXF1ZW5jZVxuICAgKlxuICAgKiBAbWV0aG9kXG4gICAqL1xuICBhYnN0cmFjdCBuZXh0KCk6IFByb21pc2U8c3RyaW5nIHwgbnVtYmVyIHwgYmlnaW50PjtcbiAgYWJzdHJhY3QgY3VycmVudCgpOiBQcm9taXNlPHN0cmluZyB8IG51bWJlciB8IGJpZ2ludD47XG4gIGFic3RyYWN0IHJhbmdlKGNvdW50OiBudW1iZXIpOiBQcm9taXNlPChudW1iZXIgfCBzdHJpbmcgfCBiaWdpbnQpW10+O1xuXG4gIHN0YXRpYyBwazxNIGV4dGVuZHMgTW9kZWw+KG1vZGVsOiBNIHwgQ29uc3RydWN0b3I8TT4pIHtcbiAgICByZXR1cm4gc2VxdWVuY2VOYW1lRm9yTW9kZWwobW9kZWwsIFwicGtcIik7XG4gIH1cbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2VxdWVuY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcGVyc2lzdGVuY2UvU2VxdWVuY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFekQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3hELE9BQU8sRUFBVSxPQUFPLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUVwRCxNQUFNLE9BQWdCLFFBQVE7SUFHNUIsSUFBYyxHQUFHO1FBQ2YsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNO1lBQUUsSUFBSSxDQUFDLE1BQU0sR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQVcsQ0FBQyxDQUFDO1FBQ3pELE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQztJQUNyQixDQUFDO0lBRUQsWUFBeUMsT0FBd0I7UUFBeEIsWUFBTyxHQUFQLE9BQU8sQ0FBaUI7SUFBRyxDQUFDO0lBTXJFLE1BQU0sQ0FBQyxFQUFFLENBQWtCLEtBQXlCO1FBQ2xELE9BQU8sb0JBQW9CLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQzNDLENBQUM7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUNmLElBQXFDLEVBQ3JDLEtBQStCO1FBRS9CLFFBQVEsSUFBSSxFQUFFLENBQUM7WUFDYixLQUFLLFFBQVE7Z0JBQ1gsT0FBTyxPQUFPLEtBQUssS0FBSyxRQUFRO29CQUM5QixDQUFDLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQztvQkFDakIsQ0FBQyxDQUFDLE9BQU8sS0FBSyxLQUFLLFFBQVE7d0JBQ3pCLENBQUMsQ0FBQyxLQUFLO3dCQUNQLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDdEIsS0FBSyxRQUFRO2dCQUNYLE9BQU8sTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQ3ZCO2dCQUNFLE1BQU0sSUFBSSxhQUFhLENBQUMscUJBQXFCLENBQUMsQ0FBQztRQUNuRCxDQUFDO0lBQ0gsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29uc3RydWN0b3IsIE1vZGVsIH0gZnJvbSBcIkBkZWNhZi10cy9kZWNvcmF0b3ItdmFsaWRhdGlvblwiO1xuaW1wb3J0IHsgc2VxdWVuY2VOYW1lRm9yTW9kZWwgfSBmcm9tIFwiLi4vaWRlbnRpdHkvdXRpbHNcIjtcbmltcG9ydCB7IFNlcXVlbmNlT3B0aW9ucyB9IGZyb20gXCIuLi9pbnRlcmZhY2VzL1NlcXVlbmNlT3B0aW9uc1wiO1xuaW1wb3J0IHsgSW50ZXJuYWxFcnJvciB9IGZyb20gXCJAZGVjYWYtdHMvZGItZGVjb3JhdG9yc1wiO1xuaW1wb3J0IHsgTG9nZ2VyLCBMb2dnaW5nIH0gZnJvbSBcIkBkZWNhZi10cy9sb2dnaW5nXCI7XG5cbmV4cG9ydCBhYnN0cmFjdCBjbGFzcyBTZXF1ZW5jZSB7XG4gIHByaXZhdGUgbG9nZ2VyITogTG9nZ2VyO1xuXG4gIHByb3RlY3RlZCBnZXQgbG9nKCkge1xuICAgIGlmICghdGhpcy5sb2dnZXIpIHRoaXMubG9nZ2VyID0gTG9nZ2luZy5mb3IodGhpcyBhcyBhbnkpO1xuICAgIHJldHVybiB0aGlzLmxvZ2dlcjtcbiAgfVxuXG4gIHByb3RlY3RlZCBjb25zdHJ1Y3Rvcihwcm90ZWN0ZWQgcmVhZG9ubHkgb3B0aW9uczogU2VxdWVuY2VPcHRpb25zKSB7fVxuXG4gIGFic3RyYWN0IG5leHQoKTogUHJvbWlzZTxzdHJpbmcgfCBudW1iZXIgfCBiaWdpbnQ+O1xuICBhYnN0cmFjdCBjdXJyZW50KCk6IFByb21pc2U8c3RyaW5nIHwgbnVtYmVyIHwgYmlnaW50PjtcbiAgYWJzdHJhY3QgcmFuZ2UoY291bnQ6IG51bWJlcik6IFByb21pc2U8KG51bWJlciB8IHN0cmluZyB8IGJpZ2ludClbXT47XG5cbiAgc3RhdGljIHBrPE0gZXh0ZW5kcyBNb2RlbD4obW9kZWw6IE0gfCBDb25zdHJ1Y3RvcjxNPikge1xuICAgIHJldHVybiBzZXF1ZW5jZU5hbWVGb3JNb2RlbChtb2RlbCwgXCJwa1wiKTtcbiAgfVxuXG4gIHN0YXRpYyBwYXJzZVZhbHVlKFxuICAgIHR5cGU6IFwiTnVtYmVyXCIgfCBcIkJpZ0ludFwiIHwgdW5kZWZpbmVkLFxuICAgIHZhbHVlOiBzdHJpbmcgfCBudW1iZXIgfCBiaWdpbnRcbiAgKTogc3RyaW5nIHwgbnVtYmVyIHwgYmlnaW50IHtcbiAgICBzd2l0Y2ggKHR5cGUpIHtcbiAgICAgIGNhc2UgXCJOdW1iZXJcIjpcbiAgICAgICAgcmV0dXJuIHR5cGVvZiB2YWx1ZSA9PT0gXCJzdHJpbmdcIlxuICAgICAgICAgID8gcGFyc2VJbnQodmFsdWUpXG4gICAgICAgICAgOiB0eXBlb2YgdmFsdWUgPT09IFwibnVtYmVyXCJcbiAgICAgICAgICAgID8gdmFsdWVcbiAgICAgICAgICAgIDogQmlnSW50KHZhbHVlKTtcbiAgICAgIGNhc2UgXCJCaWdJbnRcIjpcbiAgICAgICAgcmV0dXJuIEJpZ0ludCh2YWx1ZSk7XG4gICAgICBkZWZhdWx0OlxuICAgICAgICB0aHJvdyBuZXcgSW50ZXJuYWxFcnJvcihcIlNob3VsZCBuZXZlciBoYXBwZW5cIik7XG4gICAgfVxuICB9XG59XG4iXX0=

package/lib/esm/persistence/constants.d.ts

@@ -15,8 +15,3 @@ export declare enum PersistenceKeys {
     MANY_TO_ONE = "relations.many-to-one",
     POPULATE = "populate"
 }
-export declare enum Roles {
-    ADMIN = "admin",
-    WRITER = "writer",
-    READER = "reader"
-}

package/lib/esm/persistence/constants.js

@@ -18,10 +18,4 @@ export var PersistenceKeys;
     PersistenceKeys["MANY_TO_ONE"] = "relations.many-to-one";
     PersistenceKeys["POPULATE"] = "populate";
 })(PersistenceKeys || (PersistenceKeys = {}));
-export var Roles;
-(function (Roles) {
-    Roles["ADMIN"] = "admin";
-    Roles["WRITER"] = "writer";
-    Roles["READER"] = "reader";
-})(Roles || (Roles = {}));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3BlcnNpc3RlbmNlL2NvbnN0YW50cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxNQUFNLENBQU4sSUFBWSxlQWtCWDtBQWxCRCxXQUFZLGVBQWU7SUFDekIsa0NBQWUsQ0FBQTtJQUNmLG9DQUFpQixDQUFBO0lBQ2pCLHNDQUFtQixDQUFBO0lBQ25CLDJEQUF3QyxDQUFBO0lBQ3hDLGtDQUFlLENBQUE7SUFDZixvQ0FBaUIsQ0FBQTtJQUNqQiwwQ0FBdUIsQ0FBQTtJQUN2Qiw0Q0FBeUIsQ0FBQTtJQUN6QixzREFBbUMsQ0FBQTtJQUNuQyxZQUFZO0lBQ1osc0RBQW1DLENBQUE7SUFDbkMsc0RBQW1DLENBQUE7SUFDbkMsWUFBWTtJQUNaLHNEQUFtQyxDQUFBO0lBQ25DLHdEQUFxQyxDQUFBO0lBQ3JDLHdEQUFxQyxDQUFBO0lBQ3JDLHdDQUFxQixDQUFBO0FBQ3ZCLENBQUMsRUFsQlcsZUFBZSxLQUFmLGVBQWUsUUFrQjFCO0FBRUQsTUFBTSxDQUFOLElBQVksS0FJWDtBQUpELFdBQVksS0FBSztJQUNmLHdCQUFlLENBQUE7SUFDZiwwQkFBaUIsQ0FBQTtJQUNqQiwwQkFBaUIsQ0FBQTtBQUNuQixDQUFDLEVBSlcsS0FBSyxLQUFMLEtBQUssUUFJaEIiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgZW51bSBQZXJzaXN0ZW5jZUtleXMge1xuICBJTkRFWCA9IFwiaW5kZXhcIixcbiAgVU5JUVVFID0gXCJ1bmlxdWVcIixcbiAgQURBUFRFUiA9IFwiYWRhcHRlclwiLFxuICBJTkpFQ1RBQkxFID0gXCJkZWNhZl97MH1fYWRhcHRlcl9mb3JfezF9XCIsXG4gIFRBQkxFID0gXCJ0YWJsZVwiLFxuICBDT0xVTU4gPSBcImNvbHVtblwiLFxuICBNRVRBREFUQSA9IFwiX19tZXRhZGF0YVwiLFxuICBSRUxBVElPTlMgPSBcIl9fcmVsYXRpb25zXCIsXG4gIENMQVVTRV9TRVFVRU5DRSA9IFwiY2xhdXNlLXNlcXVlbmNlXCIsXG4gIC8vIE93bmVyc2hpcFxuICBDUkVBVEVEX0JZID0gXCJvd25lcnNoaXAuY3JlYXRlZC1ieVwiLFxuICBVUERBVEVEX0JZID0gXCJvd25lcnNoaXAudXBkYXRlZC1ieVwiLFxuICAvLyBSZWxhdGlvbnNcbiAgT05FX1RPX09ORSA9IFwicmVsYXRpb25zLm9uZS10by1vbmVcIixcbiAgT05FX1RPX01BTlkgPSBcInJlbGF0aW9ucy5vbmUtdG8tbWFueVwiLFxuICBNQU5ZX1RPX09ORSA9IFwicmVsYXRpb25zLm1hbnktdG8tb25lXCIsXG4gIFBPUFVMQVRFID0gXCJwb3B1bGF0ZVwiLFxufVxuXG5leHBvcnQgZW51bSBSb2xlcyB7XG4gIEFETUlOID0gXCJhZG1pblwiLFxuICBXUklURVIgPSBcIndyaXRlclwiLFxuICBSRUFERVIgPSBcInJlYWRlclwiLFxufVxuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3BlcnNpc3RlbmNlL2NvbnN0YW50cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxNQUFNLENBQU4sSUFBWSxlQWtCWDtBQWxCRCxXQUFZLGVBQWU7SUFDekIsa0NBQWUsQ0FBQTtJQUNmLG9DQUFpQixDQUFBO0lBQ2pCLHNDQUFtQixDQUFBO0lBQ25CLDJEQUF3QyxDQUFBO0lBQ3hDLGtDQUFlLENBQUE7SUFDZixvQ0FBaUIsQ0FBQTtJQUNqQiwwQ0FBdUIsQ0FBQTtJQUN2Qiw0Q0FBeUIsQ0FBQTtJQUN6QixzREFBbUMsQ0FBQTtJQUNuQyxZQUFZO0lBQ1osc0RBQW1DLENBQUE7SUFDbkMsc0RBQW1DLENBQUE7SUFDbkMsWUFBWTtJQUNaLHNEQUFtQyxDQUFBO0lBQ25DLHdEQUFxQyxDQUFBO0lBQ3JDLHdEQUFxQyxDQUFBO0lBQ3JDLHdDQUFxQixDQUFBO0FBQ3ZCLENBQUMsRUFsQlcsZUFBZSxLQUFmLGVBQWUsUUFrQjFCIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGVudW0gUGVyc2lzdGVuY2VLZXlzIHtcbiAgSU5ERVggPSBcImluZGV4XCIsXG4gIFVOSVFVRSA9IFwidW5pcXVlXCIsXG4gIEFEQVBURVIgPSBcImFkYXB0ZXJcIixcbiAgSU5KRUNUQUJMRSA9IFwiZGVjYWZfezB9X2FkYXB0ZXJfZm9yX3sxfVwiLFxuICBUQUJMRSA9IFwidGFibGVcIixcbiAgQ09MVU1OID0gXCJjb2x1bW5cIixcbiAgTUVUQURBVEEgPSBcIl9fbWV0YWRhdGFcIixcbiAgUkVMQVRJT05TID0gXCJfX3JlbGF0aW9uc1wiLFxuICBDTEFVU0VfU0VRVUVOQ0UgPSBcImNsYXVzZS1zZXF1ZW5jZVwiLFxuICAvLyBPd25lcnNoaXBcbiAgQ1JFQVRFRF9CWSA9IFwib3duZXJzaGlwLmNyZWF0ZWQtYnlcIixcbiAgVVBEQVRFRF9CWSA9IFwib3duZXJzaGlwLnVwZGF0ZWQtYnlcIixcbiAgLy8gUmVsYXRpb25zXG4gIE9ORV9UT19PTkUgPSBcInJlbGF0aW9ucy5vbmUtdG8tb25lXCIsXG4gIE9ORV9UT19NQU5ZID0gXCJyZWxhdGlvbnMub25lLXRvLW1hbnlcIixcbiAgTUFOWV9UT19PTkUgPSBcInJlbGF0aW9ucy5tYW55LXRvLW9uZVwiLFxuICBQT1BVTEFURSA9IFwicG9wdWxhdGVcIixcbn1cbiJdfQ==

package/lib/esm/persistence/errors.d.ts

@@ -1,7 +1,4 @@
 import { BaseError } from "@decaf-ts/db-decorators";
-export declare class ConnectionError extends BaseError {
-    constructor(msg: string | Error);
-}
 export declare class UnsupportedError extends BaseError {
     constructor(msg: string | Error);
 }

package/lib/esm/persistence/errors.js

@@ -1,12 +1,7 @@
 import { BaseError } from "@decaf-ts/db-decorators";
-export class ConnectionError extends BaseError {
-    constructor(msg) {
-        super(ConnectionError.name, msg);
-    }
-}
 export class UnsupportedError extends BaseError {
     constructor(msg) {
-        super(UnsupportedError.name, msg);
+        super(UnsupportedError.name, msg, 500);
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3BlcnNpc3RlbmNlL2Vycm9ycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFcEQsTUFBTSxPQUFPLGVBQWdCLFNBQVEsU0FBUztJQUM1QyxZQUFZLEdBQW1CO1FBQzdCLEtBQUssQ0FBQyxlQUFlLENBQUMsSUFBSSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQ25DLENBQUM7Q0FDRjtBQUVELE1BQU0sT0FBTyxnQkFBaUIsU0FBUSxTQUFTO0lBQzdDLFlBQVksR0FBbUI7UUFDN0IsS0FBSyxDQUFDLGdCQUFnQixDQUFDLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQztJQUNwQyxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBCYXNlRXJyb3IgfSBmcm9tIFwiQGRlY2FmLXRzL2RiLWRlY29yYXRvcnNcIjtcblxuZXhwb3J0IGNsYXNzIENvbm5lY3Rpb25FcnJvciBleHRlbmRzIEJhc2VFcnJvciB7XG4gIGNvbnN0cnVjdG9yKG1zZzogc3RyaW5nIHwgRXJyb3IpIHtcbiAgICBzdXBlcihDb25uZWN0aW9uRXJyb3IubmFtZSwgbXNnKTtcbiAgfVxufVxuXG5leHBvcnQgY2xhc3MgVW5zdXBwb3J0ZWRFcnJvciBleHRlbmRzIEJhc2VFcnJvciB7XG4gIGNvbnN0cnVjdG9yKG1zZzogc3RyaW5nIHwgRXJyb3IpIHtcbiAgICBzdXBlcihVbnN1cHBvcnRlZEVycm9yLm5hbWUsIG1zZyk7XG4gIH1cbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3BlcnNpc3RlbmNlL2Vycm9ycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFcEQsTUFBTSxPQUFPLGdCQUFpQixTQUFRLFNBQVM7SUFDN0MsWUFBWSxHQUFtQjtRQUM3QixLQUFLLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxHQUFHLENBQUMsQ0FBQztJQUN6QyxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBCYXNlRXJyb3IgfSBmcm9tIFwiQGRlY2FmLXRzL2RiLWRlY29yYXRvcnNcIjtcblxuZXhwb3J0IGNsYXNzIFVuc3VwcG9ydGVkRXJyb3IgZXh0ZW5kcyBCYXNlRXJyb3Ige1xuICBjb25zdHJ1Y3Rvcihtc2c6IHN0cmluZyB8IEVycm9yKSB7XG4gICAgc3VwZXIoVW5zdXBwb3J0ZWRFcnJvci5uYW1lLCBtc2csIDUwMCk7XG4gIH1cbn1cbiJdfQ==

package/lib/esm/persistence/index.d.ts

@@ -1,5 +1,8 @@
 export * from "./Adapter";
 export * from "./constants";
 export * from "./decorators";
+export * from "./Dispatch";
 export * from "./errors";
+export * from "./ObserverHandler";
 export * from "./Sequence";
+export * from "./types";

package/lib/esm/persistence/index.js

@@ -1,6 +1,9 @@
 export * from "./Adapter";
 export * from "./constants";
 export * from "./decorators";
+export * from "./Dispatch";
 export * from "./errors";
+export * from "./ObserverHandler";
 export * from "./Sequence";
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcGVyc2lzdGVuY2UvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxXQUFXLENBQUM7QUFDMUIsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxVQUFVLENBQUM7QUFDekIsY0FBYyxZQUFZLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgKiBmcm9tIFwiLi9BZGFwdGVyXCI7XG5leHBvcnQgKiBmcm9tIFwiLi9jb25zdGFudHNcIjtcbmV4cG9ydCAqIGZyb20gXCIuL2RlY29yYXRvcnNcIjtcbmV4cG9ydCAqIGZyb20gXCIuL2Vycm9yc1wiO1xuZXhwb3J0ICogZnJvbSBcIi4vU2VxdWVuY2VcIjtcbiJdfQ==
+export * from "./types";
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcGVyc2lzdGVuY2UvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxXQUFXLENBQUM7QUFDMUIsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxZQUFZLENBQUM7QUFDM0IsY0FBYyxVQUFVLENBQUM7QUFDekIsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLFlBQVksQ0FBQztBQUMzQixjQUFjLFNBQVMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCAqIGZyb20gXCIuL0FkYXB0ZXJcIjtcbmV4cG9ydCAqIGZyb20gXCIuL2NvbnN0YW50c1wiO1xuZXhwb3J0ICogZnJvbSBcIi4vZGVjb3JhdG9yc1wiO1xuZXhwb3J0ICogZnJvbSBcIi4vRGlzcGF0Y2hcIjtcbmV4cG9ydCAqIGZyb20gXCIuL2Vycm9yc1wiO1xuZXhwb3J0ICogZnJvbSBcIi4vT2JzZXJ2ZXJIYW5kbGVyXCI7XG5leHBvcnQgKiBmcm9tIFwiLi9TZXF1ZW5jZVwiO1xuZXhwb3J0ICogZnJvbSBcIi4vdHlwZXNcIjtcbiJdfQ==

package/lib/esm/persistence/types.d.ts

@@ -0,0 +1,3 @@
+import { BulkCrudOperationKeys, OperationKeys } from "@decaf-ts/db-decorators";
+export type EventIds = string | number | bigint | string[] | number[] | bigint[];
+export type ObserverFilter = (table: string, event: OperationKeys | BulkCrudOperationKeys | string, id: EventIds) => boolean;

package/lib/esm/persistence/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcGVyc2lzdGVuY2UvdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEJ1bGtDcnVkT3BlcmF0aW9uS2V5cywgT3BlcmF0aW9uS2V5cyB9IGZyb20gXCJAZGVjYWYtdHMvZGItZGVjb3JhdG9yc1wiO1xuXG5leHBvcnQgdHlwZSBFdmVudElkcyA9XG4gIHwgc3RyaW5nXG4gIHwgbnVtYmVyXG4gIHwgYmlnaW50XG4gIHwgc3RyaW5nW11cbiAgfCBudW1iZXJbXVxuICB8IGJpZ2ludFtdO1xuXG5leHBvcnQgdHlwZSBPYnNlcnZlckZpbHRlciA9IChcbiAgdGFibGU6IHN0cmluZyxcbiAgZXZlbnQ6IE9wZXJhdGlvbktleXMgfCBCdWxrQ3J1ZE9wZXJhdGlvbktleXMgfCBzdHJpbmcsXG4gIGlkOiBFdmVudElkc1xuKSA9PiBib29sZWFuO1xuIl19

package/lib/esm/query/Condition.d.ts

@@ -10,13 +10,9 @@ import { GroupOperator, Operator } from "./constants";
  * @param {string | Condition} comparison
  *
  * @class Condition
- * @implements Executor
- *
- * @category Query
- * @subcategory Conditions
  */
-export declare class Condition extends Model {
-    protected attr1?: string | Condition;
+export declare class Condition<M extends Model> extends Model {
+    protected attr1?: string | Condition<M>;
     protected operator?: Operator | GroupOperator;
     protected comparison?: any;
     private constructor();
@@ -24,17 +20,17 @@ export declare class Condition extends Model {
      * @summary Joins 2 {@link Condition}s on an {@link Operator#AND} operation
      * @param {Condition} condition
      */
-    and(condition: Condition): Condition;
+    and(condition: Condition<M>): Condition<M>;
     /**
      * @summary Joins 2 {@link Condition}s on an {@link Operator#OR} operation
      * @param {Condition} condition
      */
-    or(condition: Condition): Condition;
+    or(condition: Condition<M>): Condition<M>;
     /**
      * @summary excludes a valut from the result
      * @param val
      */
-    not(val: any): Condition;
+    not(val: any): Condition<M>;
     /**
      * @inheritDoc
      */
@@ -44,13 +40,13 @@ export declare class Condition extends Model {
      * @param {Condition} condition1
      * @param {Condition} condition2
      */
-    static and(condition1: Condition, condition2: Condition): Condition;
+    static and<M extends Model>(condition1: Condition<M>, condition2: Condition<M>): Condition<M>;
     /**
      * @summary Joins 2 {@link Condition}s on an {@link Operator#OR} operation
      * @param {Condition} condition1
      * @param {Condition} condition2
      */
-    static or(condition1: Condition, condition2: Condition): Condition;
+    static or<M extends Model>(condition1: Condition<M>, condition2: Condition<M>): Condition<M>;
     /**
      * @summary Groups 2 {@link Condition}s by the specified {@link GroupOperator}
      * @param {Condition} condition1
@@ -58,7 +54,8 @@ export declare class Condition extends Model {
      * @param {Condition} condition2
      */
     private static group;
-    static attribute(attr: string): AttributeOption;
+    static attribute<M extends Model>(attr: keyof M): AttributeOption<M>;
+    static attr<M extends Model>(attr: keyof M): AttributeOption<M>;
     /**
      * @summary Condition Builder Class
      * @description provides a simple API to build {@link Condition}s
@@ -71,5 +68,5 @@ export declare class Condition extends Model {
      * @subcategory Conditions
      */
     private static Builder;
-    static get builder(): ConditionBuilderOption;
+    static builder<M extends Model>(): ConditionBuilderOption<M>;
 }

package/lib/esm/query/Condition.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { Model, required, sf, } from "@decaf-ts/decorator-validation";
+import { Model, required, } from "@decaf-ts/decorator-validation";
 import { GroupOperator, Operator } from "./constants";
 import { QueryError } from "./errors";
 /**
@@ -19,10 +19,6 @@ import { QueryError } from "./errors";
  * @param {string | Condition} comparison
  *
  * @class Condition
- * @implements Executor
- *
- * @category Query
- * @subcategory Conditions
  */
 export class Condition extends Model {
     constructor(attr1, operator, comparison) {
@@ -62,6 +58,7 @@ export class Condition extends Model {
         const errors = super.hasErrors(...exceptions);
         if (errors)
             return errors;
+        const invalidOpMessage = `Invalid operator ${this.operator}}`;
         if (typeof this.attr1 === "string") {
             if (this.comparison instanceof Condition)
                 return {
@@ -72,7 +69,7 @@ export class Condition extends Model {
             if (Object.values(Operator).indexOf(this.operator) === -1)
                 return {
                     operator: {
-                        condition: sf("Invalid operator {0}", this.operator),
+                        condition: invalidOpMessage,
                     },
                 };
         }
@@ -81,7 +78,7 @@ export class Condition extends Model {
                 this.operator !== Operator.NOT)
                 return {
                     comparison: {
-                        condition: sf("Invalid operator {0}", this.operator),
+                        condition: invalidOpMessage,
                     },
                 };
             if (Object.values(GroupOperator).indexOf(this.operator) ===
@@ -89,7 +86,7 @@ export class Condition extends Model {
                 this.operator !== Operator.NOT)
                 return {
                     operator: {
-                        condition: sf("Invalid operator {0}", this.operator),
+                        condition: invalidOpMessage,
                     },
                 };
             // if (this.operator !== Operator.NOT && typeof this.attr1.attr1 !== "string")
@@ -128,6 +125,9 @@ export class Condition extends Model {
     static attribute(attr) {
         return new Condition.Builder().attribute(attr);
     }
+    static attr(attr) {
+        return this.attribute(attr);
+    }
     /**
      * @summary Condition Builder Class
      * @description provides a simple API to build {@link Condition}s
@@ -152,6 +152,9 @@ export class Condition extends Model {
             this.attr1 = attr;
             return this;
         }
+        attr(attr) {
+            return this.attribute(attr);
+        }
         /**
          * @summary Creates an Equality Comparison
          * @param {any} val
@@ -228,7 +231,7 @@ export class Condition extends Model {
             }
         }
     }; }
-    static get builder() {
+    static builder() {
         return new Condition.Builder();
     }
 }
@@ -244,4 +247,4 @@ __decorate([
     required(),
     __metadata("design:type", Object)
 ], Condition.prototype, "comparison", void 0);
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Condition.js","sourceRoot":"","sources":["../../../src/query/Condition.ts"],"names":[],"mappings":"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","sourcesContent":["import { AttributeOption, ConditionBuilderOption } from \"./options\";\nimport {\n  Model,\n  ModelErrorDefinition,\n  required,\n  sf,\n} from \"@decaf-ts/decorator-validation\";\nimport { GroupOperator, Operator } from \"./constants\";\nimport { QueryError } from \"./errors\";\n\n/**\n * @summary Condition Class\n * @description Represents a logical condition\n *\n * @param {string | Condition} attr1\n * @param {Operator | GroupOperator} operator\n * @param {string | Condition} comparison\n *\n * @class Condition\n * @implements Executor\n *\n * @category Query\n * @subcategory Conditions\n */\n\nexport class Condition extends Model {\n  @required()\n  protected attr1?: string | Condition = undefined;\n  @required()\n  protected operator?: Operator | GroupOperator = undefined;\n  @required()\n  protected comparison?: any = undefined;\n\n  private constructor(\n    attr1: string | Condition,\n    operator: Operator | GroupOperator,\n    comparison: any\n  ) {\n    super();\n    this.attr1 = attr1;\n    this.operator = operator;\n    this.comparison = comparison;\n  }\n\n  /**\n   * @summary Joins 2 {@link Condition}s on an {@link Operator#AND} operation\n   * @param {Condition} condition\n   */\n  and(condition: Condition): Condition {\n    return Condition.and(this, condition);\n  }\n\n  /**\n   * @summary Joins 2 {@link Condition}s on an {@link Operator#OR} operation\n   * @param {Condition} condition\n   */\n  or(condition: Condition): Condition {\n    return Condition.or(this, condition);\n  }\n\n  /**\n   * @summary excludes a valut from the result\n   * @param val\n   */\n  not(val: any): Condition {\n    return new Condition(this, Operator.NOT, val);\n  }\n\n  /**\n   * @inheritDoc\n   */\n  hasErrors(...exceptions: string[]): ModelErrorDefinition | undefined {\n    const errors = super.hasErrors(...exceptions);\n    if (errors) return errors;\n\n    if (typeof this.attr1 === \"string\") {\n      if (this.comparison instanceof Condition)\n        return {\n          comparison: {\n            condition: \"Both sides of the comparison must be of the same type\",\n          },\n        } as ModelErrorDefinition;\n      if (Object.values(Operator).indexOf(this.operator as Operator) === -1)\n        return {\n          operator: {\n            condition: sf(\"Invalid operator {0}\", this.operator as string),\n          },\n        } as ModelErrorDefinition;\n    }\n\n    if (this.attr1 instanceof Condition) {\n      if (\n        !(this.comparison instanceof Condition) &&\n        this.operator !== Operator.NOT\n      )\n        return {\n          comparison: {\n            condition: sf(\"Invalid operator {0}\", this.operator as string),\n          },\n        } as ModelErrorDefinition;\n      if (\n        Object.values(GroupOperator).indexOf(this.operator as GroupOperator) ===\n          -1 &&\n        this.operator !== Operator.NOT\n      )\n        return {\n          operator: {\n            condition: sf(\"Invalid operator {0}\", this.operator as string),\n          },\n        } as ModelErrorDefinition;\n      // if (this.operator !== Operator.NOT && typeof this.attr1.attr1 !== \"string\")\n      //     return {\n      //         attr1: {\n      //             condition: stringFormat(\"Parent condition attribute must be a string\")\n      //         }\n      //     } as ModelErrorDefinition\n    }\n  }\n\n  /**\n   * @summary Joins 2 {@link Condition}s on an {@link Operator#AND} operation\n   * @param {Condition} condition1\n   * @param {Condition} condition2\n   */\n  static and(condition1: Condition, condition2: Condition): Condition {\n    return Condition.group(condition1, GroupOperator.AND, condition2);\n  }\n\n  /**\n   * @summary Joins 2 {@link Condition}s on an {@link Operator#OR} operation\n   * @param {Condition} condition1\n   * @param {Condition} condition2\n   */\n  static or(condition1: Condition, condition2: Condition): Condition {\n    return Condition.group(condition1, GroupOperator.OR, condition2);\n  }\n\n  /**\n   * @summary Groups 2 {@link Condition}s by the specified {@link GroupOperator}\n   * @param {Condition} condition1\n   * @param {GroupOperator} operator\n   * @param {Condition} condition2\n   */\n  private static group(\n    condition1: Condition,\n    operator: GroupOperator,\n    condition2: Condition\n  ): Condition {\n    return new Condition(condition1, operator, condition2);\n  }\n\n  static attribute(attr: string) {\n    return new Condition.Builder().attribute(attr);\n  }\n\n  /**\n   * @summary Condition Builder Class\n   * @description provides a simple API to build {@link Condition}s\n   *\n   * @class ConditionBuilder\n   * @implements Builder\n   * @implements AttributeOption\n   *\n   * @category Query\n   * @subcategory Conditions\n   */\n  private static Builder = class ConditionBuilder\n    implements ConditionBuilderOption, AttributeOption\n  {\n    attr1?: string | Condition = undefined;\n    operator?: Operator | GroupOperator = undefined;\n    comparison?: any = undefined;\n\n    /**\n     * @inheritDoc\n     */\n    attribute(attr: string): AttributeOption {\n      this.attr1 = attr;\n      return this;\n    }\n\n    /**\n     * @summary Creates an Equality Comparison\n     * @param {any} val\n     */\n    eq(val: any) {\n      return this.setOp(Operator.EQUAL, val);\n    }\n\n    /**\n     * @summary Creates a Different Comparison\n     * @param {any} val\n     */\n    dif(val: any) {\n      return this.setOp(Operator.DIFFERENT, val);\n    }\n\n    /**\n     * @summary Creates a Greater Than Comparison\n     * @param {any} val\n     */\n    gt(val: any) {\n      return this.setOp(Operator.BIGGER, val);\n    }\n\n    /**\n     * @summary Creates a Lower Than Comparison\n     * @param {any} val\n     */\n    lt(val: any) {\n      return this.setOp(Operator.SMALLER, val);\n    }\n\n    /**\n     * @summary Creates a Greater or Equal to Comparison\n     * @param {any} val\n     */\n    gte(val: any) {\n      return this.setOp(Operator.BIGGER_EQ, val);\n    }\n\n    /**\n     * @summary Creates a Lower or Equal to Comparison\n     * @param {any} val\n     */\n    lte(val: any) {\n      return this.setOp(Operator.SMALLER_EQ, val);\n    }\n\n    in(arr: any[]) {\n      return this.setOp(Operator.IN, arr);\n    }\n\n    /**\n     * @summary Creates a Regexpo Comparison\n     * @param {any} val\n     */\n    regexp(val: any) {\n      return this.setOp(Operator.REGEXP, new RegExp(val).source);\n    }\n\n    /**\n     * @summary Creates an {@link Operator} based Comparison\n     * @param {Operator} op\n     * @param {any} val\n     */\n    private setOp(op: Operator, val: any) {\n      this.operator = op;\n      this.comparison = val;\n      return this.build();\n    }\n\n    /**\n     * @summary Builds the Database Object\n     * @throws {QueryError} if it fails to build the {@link Condition}\n     * @private\n     */\n    private build(): Condition {\n      try {\n        return new Condition(\n          this.attr1 as string | Condition,\n          this.operator as Operator,\n          this.comparison as any\n        );\n      } catch (e: any) {\n        throw new QueryError(e);\n      }\n    }\n  };\n\n  static get builder(): ConditionBuilderOption {\n    return new Condition.Builder();\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Condition.js","sourceRoot":"","sources":["../../../src/query/Condition.ts"],"names":[],"mappings":"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","sourcesContent":["import { AttributeOption, ConditionBuilderOption } from \"./options\";\nimport {\n  Model,\n  ModelErrorDefinition,\n  required,\n} from \"@decaf-ts/decorator-validation\";\nimport { GroupOperator, Operator } from \"./constants\";\nimport { QueryError } from \"./errors\";\n\n/**\n * @summary Condition Class\n * @description Represents a logical condition\n *\n * @param {string | Condition} attr1\n * @param {Operator | GroupOperator} operator\n * @param {string | Condition} comparison\n *\n * @class Condition\n */\nexport class Condition<M extends Model> extends Model {\n  @required()\n  protected attr1?: string | Condition<M> = undefined;\n  @required()\n  protected operator?: Operator | GroupOperator = undefined;\n  @required()\n  protected comparison?: any = undefined;\n\n  private constructor(\n    attr1: string | Condition<M>,\n    operator: Operator | GroupOperator,\n    comparison: any\n  ) {\n    super();\n    this.attr1 = attr1;\n    this.operator = operator;\n    this.comparison = comparison;\n  }\n\n  /**\n   * @summary Joins 2 {@link Condition}s on an {@link Operator#AND} operation\n   * @param {Condition} condition\n   */\n  and(condition: Condition<M>): Condition<M> {\n    return Condition.and(this, condition);\n  }\n\n  /**\n   * @summary Joins 2 {@link Condition}s on an {@link Operator#OR} operation\n   * @param {Condition} condition\n   */\n  or(condition: Condition<M>): Condition<M> {\n    return Condition.or(this, condition);\n  }\n\n  /**\n   * @summary excludes a valut from the result\n   * @param val\n   */\n  not(val: any): Condition<M> {\n    return new Condition(this, Operator.NOT, val);\n  }\n\n  /**\n   * @inheritDoc\n   */\n  override hasErrors(\n    ...exceptions: string[]\n  ): ModelErrorDefinition | undefined {\n    const errors = super.hasErrors(...exceptions);\n    if (errors) return errors;\n\n    const invalidOpMessage = `Invalid operator ${this.operator}}`;\n\n    if (typeof this.attr1 === \"string\") {\n      if (this.comparison instanceof Condition)\n        return {\n          comparison: {\n            condition: \"Both sides of the comparison must be of the same type\",\n          },\n        } as ModelErrorDefinition;\n      if (Object.values(Operator).indexOf(this.operator as Operator) === -1)\n        return {\n          operator: {\n            condition: invalidOpMessage,\n          },\n        } as ModelErrorDefinition;\n    }\n\n    if (this.attr1 instanceof Condition) {\n      if (\n        !(this.comparison instanceof Condition) &&\n        this.operator !== Operator.NOT\n      )\n        return {\n          comparison: {\n            condition: invalidOpMessage,\n          },\n        } as ModelErrorDefinition;\n      if (\n        Object.values(GroupOperator).indexOf(this.operator as GroupOperator) ===\n          -1 &&\n        this.operator !== Operator.NOT\n      )\n        return {\n          operator: {\n            condition: invalidOpMessage,\n          },\n        } as ModelErrorDefinition;\n      // if (this.operator !== Operator.NOT && typeof this.attr1.attr1 !== \"string\")\n      //     return {\n      //         attr1: {\n      //             condition: stringFormat(\"Parent condition attribute must be a string\")\n      //         }\n      //     } as ModelErrorDefinition\n    }\n  }\n\n  /**\n   * @summary Joins 2 {@link Condition}s on an {@link Operator#AND} operation\n   * @param {Condition} condition1\n   * @param {Condition} condition2\n   */\n  static and<M extends Model>(\n    condition1: Condition<M>,\n    condition2: Condition<M>\n  ): Condition<M> {\n    return Condition.group(condition1, GroupOperator.AND, condition2);\n  }\n\n  /**\n   * @summary Joins 2 {@link Condition}s on an {@link Operator#OR} operation\n   * @param {Condition} condition1\n   * @param {Condition} condition2\n   */\n  static or<M extends Model>(\n    condition1: Condition<M>,\n    condition2: Condition<M>\n  ): Condition<M> {\n    return Condition.group(condition1, GroupOperator.OR, condition2);\n  }\n\n  /**\n   * @summary Groups 2 {@link Condition}s by the specified {@link GroupOperator}\n   * @param {Condition} condition1\n   * @param {GroupOperator} operator\n   * @param {Condition} condition2\n   */\n  private static group<M extends Model>(\n    condition1: Condition<M>,\n    operator: GroupOperator,\n    condition2: Condition<M>\n  ): Condition<M> {\n    return new Condition(condition1, operator, condition2);\n  }\n\n  static attribute<M extends Model>(attr: keyof M) {\n    return new Condition.Builder<M>().attribute(attr);\n  }\n\n  static attr<M extends Model>(attr: keyof M) {\n    return this.attribute(attr);\n  }\n\n  /**\n   * @summary Condition Builder Class\n   * @description provides a simple API to build {@link Condition}s\n   *\n   * @class ConditionBuilder\n   * @implements Builder\n   * @implements AttributeOption\n   *\n   * @category Query\n   * @subcategory Conditions\n   */\n  private static Builder = class ConditionBuilder<M extends Model>\n    implements ConditionBuilderOption<M>, AttributeOption<M>\n  {\n    attr1?: keyof M | Condition<M> = undefined;\n    operator?: Operator | GroupOperator = undefined;\n    comparison?: any = undefined;\n\n    /**\n     * @inheritDoc\n     */\n    attribute(attr: keyof M): AttributeOption<M> {\n      this.attr1 = attr;\n      return this;\n    }\n\n    attr(attr: keyof M) {\n      return this.attribute(attr);\n    }\n\n    /**\n     * @summary Creates an Equality Comparison\n     * @param {any} val\n     */\n    eq(val: any) {\n      return this.setOp(Operator.EQUAL, val);\n    }\n\n    /**\n     * @summary Creates a Different Comparison\n     * @param {any} val\n     */\n    dif(val: any) {\n      return this.setOp(Operator.DIFFERENT, val);\n    }\n\n    /**\n     * @summary Creates a Greater Than Comparison\n     * @param {any} val\n     */\n    gt(val: any) {\n      return this.setOp(Operator.BIGGER, val);\n    }\n\n    /**\n     * @summary Creates a Lower Than Comparison\n     * @param {any} val\n     */\n    lt(val: any) {\n      return this.setOp(Operator.SMALLER, val);\n    }\n\n    /**\n     * @summary Creates a Greater or Equal to Comparison\n     * @param {any} val\n     */\n    gte(val: any) {\n      return this.setOp(Operator.BIGGER_EQ, val);\n    }\n\n    /**\n     * @summary Creates a Lower or Equal to Comparison\n     * @param {any} val\n     */\n    lte(val: any) {\n      return this.setOp(Operator.SMALLER_EQ, val);\n    }\n\n    in(arr: any[]) {\n      return this.setOp(Operator.IN, arr);\n    }\n\n    /**\n     * @summary Creates a Regexpo Comparison\n     * @param {any} val\n     */\n    regexp(val: any) {\n      return this.setOp(Operator.REGEXP, new RegExp(val).source);\n    }\n\n    /**\n     * @summary Creates an {@link Operator} based Comparison\n     * @param {Operator} op\n     * @param {any} val\n     */\n    private setOp(op: Operator, val: any) {\n      this.operator = op;\n      this.comparison = val;\n      return this.build();\n    }\n\n    /**\n     * @summary Builds the Database Object\n     * @throws {QueryError} if it fails to build the {@link Condition}\n     * @private\n     */\n    private build(): Condition<M> {\n      try {\n        return new Condition(\n          this.attr1 as string | Condition<M>,\n          this.operator as Operator,\n          this.comparison as any\n        );\n      } catch (e: any) {\n        throw new QueryError(e);\n      }\n    }\n  };\n\n  static builder<M extends Model>(): ConditionBuilderOption<M> {\n    return new Condition.Builder<M>();\n  }\n}\n"]}

package/lib/esm/query/Paginator.d.ts

@@ -1,8 +1,10 @@
-import { Statement } from "./Statement";
-export declare abstract class Paginator<V, Q> {
-    protected stat: Statement<Q>;
+import { Adapter } from "../persistence";
+import { Constructor, Model } from "@decaf-ts/decorator-validation";
+export declare abstract class Paginator<M extends Model, R = M[], Q = any> {
+    protected readonly adapter: Adapter<any, Q, any, any>;
+    protected readonly query: Q;
     readonly size: number;
-    protected readonly _rawStatement: Q;
+    protected readonly clazz: Constructor<M>;
     protected _currentPage: number;
     protected _totalPages: number;
     protected _recordCount: number;
@@ -11,12 +13,11 @@ export declare abstract class Paginator<V, Q> {
     get current(): number;
     get total(): number;
     get count(): number;
-    get statement(): Q;
-    protected get adapter(): import("..").Adapter<any, Q, any, any>;
-    protected constructor(stat: Statement<Q>, size: number, _rawStatement: Q);
+    protected get statement(): Q;
+    protected constructor(adapter: Adapter<any, Q, any, any>, query: Q, size: number, clazz: Constructor<M>);
     protected abstract prepare(rawStatement: Q): Q;
-    next(): Promise<V[]>;
-    previous(): Promise<V[]>;
+    next(): Promise<R[]>;
+    previous(): Promise<R[]>;
     protected validatePage(page: number): number;
-    abstract page(page?: number, ...args: any[]): Promise<V[]>;
+    abstract page(page?: number): Promise<R[]>;
 }

package/lib/esm/query/Paginator.js

@@ -11,16 +11,14 @@ export class Paginator {
     }
     get statement() {
         if (!this._statement)
-            this._statement = this.prepare(this._rawStatement);
+            this._statement = this.prepare(this.query);
         return this._statement;
     }
-    get adapter() {
-        return this.stat.getAdapter();
-    }
-    constructor(stat, size, _rawStatement) {
-        this.stat = stat;
+    constructor(adapter, query, size, clazz) {
+        this.adapter = adapter;
+        this.query = query;
         this.size = size;
-        this._rawStatement = _rawStatement;
+        this.clazz = clazz;
     }
     async next() {
         return this.page(this.current + 1);
@@ -30,10 +28,10 @@ export class Paginator {
     }
     validatePage(page) {
         if (page < 1 || !Number.isInteger(page))
-            throw new PagingError("page number cannot be under 1 and must be an integer");
+            throw new PagingError("Page number cannot be under 1 and must be an integer");
         if (typeof this._totalPages !== "undefined" && page > this._totalPages)
-            throw new PagingError(`Requested more pages than available. Total pages: ${this._totalPages}`);
+            throw new PagingError(`Only ${this._totalPages} are available. Cannot go to page ${page}`);
         return page;
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGFnaW5hdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3F1ZXJ5L1BhZ2luYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBR3ZDLE1BQU0sT0FBZ0IsU0FBUztJQVE3QixJQUFJLE9BQU87UUFDVCxPQUFPLElBQUksQ0FBQyxZQUFZLENBQUM7SUFDM0IsQ0FBQztJQUVELElBQUksS0FBSztRQUNQLE9BQU8sSUFBSSxDQUFDLFdBQVcsQ0FBQztJQUMxQixDQUFDO0lBRUQsSUFBSSxLQUFLO1FBQ1AsT0FBTyxJQUFJLENBQUMsWUFBWSxDQUFDO0lBQzNCLENBQUM7SUFFRCxJQUFJLFNBQVM7UUFDWCxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVU7WUFBRSxJQUFJLENBQUMsVUFBVSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQ3pFLE9BQU8sSUFBSSxDQUFDLFVBQVUsQ0FBQztJQUN6QixDQUFDO0lBRUQsSUFBYyxPQUFPO1FBQ25CLE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztJQUNoQyxDQUFDO0lBRUQsWUFDWSxJQUFrQixFQUNuQixJQUFZLEVBQ0YsYUFBZ0I7UUFGekIsU0FBSSxHQUFKLElBQUksQ0FBYztRQUNuQixTQUFJLEdBQUosSUFBSSxDQUFRO1FBQ0Ysa0JBQWEsR0FBYixhQUFhLENBQUc7SUFDbEMsQ0FBQztJQUlKLEtBQUssQ0FBQyxJQUFJO1FBQ1IsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLEdBQUcsQ0FBQyxDQUFDLENBQUM7SUFDckMsQ0FBQztJQUVELEtBQUssQ0FBQyxRQUFRO1FBQ1osT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLEdBQUcsQ0FBQyxDQUFDLENBQUM7SUFDckMsQ0FBQztJQUVTLFlBQVksQ0FBQyxJQUFZO1FBQ2pDLElBQUksSUFBSSxHQUFHLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDO1lBQ3JDLE1BQU0sSUFBSSxXQUFXLENBQ25CLHNEQUFzRCxDQUN2RCxDQUFDO1FBQ0osSUFBSSxPQUFPLElBQUksQ0FBQyxXQUFXLEtBQUssV0FBVyxJQUFJLElBQUksR0FBRyxJQUFJLENBQUMsV0FBVztZQUNwRSxNQUFNLElBQUksV0FBVyxDQUNuQixxREFBcUQsSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUN4RSxDQUFDO1FBQ0osT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0NBR0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBQYWdpbmdFcnJvciB9IGZyb20gXCIuL2Vycm9yc1wiO1xuaW1wb3J0IHsgU3RhdGVtZW50IH0gZnJvbSBcIi4vU3RhdGVtZW50XCI7XG5cbmV4cG9ydCBhYnN0cmFjdCBjbGFzcyBQYWdpbmF0b3I8ViwgUT4ge1xuICBwcm90ZWN0ZWQgX2N1cnJlbnRQYWdlITogbnVtYmVyO1xuICBwcm90ZWN0ZWQgX3RvdGFsUGFnZXMhOiBudW1iZXI7XG4gIHByb3RlY3RlZCBfcmVjb3JkQ291bnQhOiBudW1iZXI7XG4gIHByb3RlY3RlZCBsaW1pdCE6IG51bWJlcjtcblxuICBwcml2YXRlIF9zdGF0ZW1lbnQ/OiBRO1xuXG4gIGdldCBjdXJyZW50KCkge1xuICAgIHJldHVybiB0aGlzLl9jdXJyZW50UGFnZTtcbiAgfVxuXG4gIGdldCB0b3RhbCgpIHtcbiAgICByZXR1cm4gdGhpcy5fdG90YWxQYWdlcztcbiAgfVxuXG4gIGdldCBjb3VudCgpOiBudW1iZXIge1xuICAgIHJldHVybiB0aGlzLl9yZWNvcmRDb3VudDtcbiAgfVxuXG4gIGdldCBzdGF0ZW1lbnQoKSB7XG4gICAgaWYgKCF0aGlzLl9zdGF0ZW1lbnQpIHRoaXMuX3N0YXRlbWVudCA9IHRoaXMucHJlcGFyZSh0aGlzLl9yYXdTdGF0ZW1lbnQpO1xuICAgIHJldHVybiB0aGlzLl9zdGF0ZW1lbnQ7XG4gIH1cblxuICBwcm90ZWN0ZWQgZ2V0IGFkYXB0ZXIoKSB7XG4gICAgcmV0dXJuIHRoaXMuc3RhdC5nZXRBZGFwdGVyKCk7XG4gIH1cblxuICBwcm90ZWN0ZWQgY29uc3RydWN0b3IoXG4gICAgcHJvdGVjdGVkIHN0YXQ6IFN0YXRlbWVudDxRPixcbiAgICByZWFkb25seSBzaXplOiBudW1iZXIsXG4gICAgcHJvdGVjdGVkIHJlYWRvbmx5IF9yYXdTdGF0ZW1lbnQ6IFFcbiAgKSB7fVxuXG4gIHByb3RlY3RlZCBhYnN0cmFjdCBwcmVwYXJlKHJhd1N0YXRlbWVudDogUSk6IFE7XG5cbiAgYXN5bmMgbmV4dCgpIHtcbiAgICByZXR1cm4gdGhpcy5wYWdlKHRoaXMuY3VycmVudCArIDEpO1xuICB9XG5cbiAgYXN5bmMgcHJldmlvdXMoKSB7XG4gICAgcmV0dXJuIHRoaXMucGFnZSh0aGlzLmN1cnJlbnQgLSAxKTtcbiAgfVxuXG4gIHByb3RlY3RlZCB2YWxpZGF0ZVBhZ2UocGFnZTogbnVtYmVyKSB7XG4gICAgaWYgKHBhZ2UgPCAxIHx8ICFOdW1iZXIuaXNJbnRlZ2VyKHBhZ2UpKVxuICAgICAgdGhyb3cgbmV3IFBhZ2luZ0Vycm9yKFxuICAgICAgICBcInBhZ2UgbnVtYmVyIGNhbm5vdCBiZSB1bmRlciAxIGFuZCBtdXN0IGJlIGFuIGludGVnZXJcIlxuICAgICAgKTtcbiAgICBpZiAodHlwZW9mIHRoaXMuX3RvdGFsUGFnZXMgIT09IFwidW5kZWZpbmVkXCIgJiYgcGFnZSA+IHRoaXMuX3RvdGFsUGFnZXMpXG4gICAgICB0aHJvdyBuZXcgUGFnaW5nRXJyb3IoXG4gICAgICAgIGBSZXF1ZXN0ZWQgbW9yZSBwYWdlcyB0aGFuIGF2YWlsYWJsZS4gVG90YWwgcGFnZXM6ICR7dGhpcy5fdG90YWxQYWdlc31gXG4gICAgICApO1xuICAgIHJldHVybiBwYWdlO1xuICB9XG5cbiAgYWJzdHJhY3QgcGFnZShwYWdlPzogbnVtYmVyLCAuLi5hcmdzOiBhbnlbXSk6IFByb21pc2U8VltdPjtcbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGFnaW5hdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3F1ZXJ5L1BhZ2luYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBSXZDLE1BQU0sT0FBZ0IsU0FBUztJQVE3QixJQUFJLE9BQU87UUFDVCxPQUFPLElBQUksQ0FBQyxZQUFZLENBQUM7SUFDM0IsQ0FBQztJQUVELElBQUksS0FBSztRQUNQLE9BQU8sSUFBSSxDQUFDLFdBQVcsQ0FBQztJQUMxQixDQUFDO0lBRUQsSUFBSSxLQUFLO1FBQ1AsT0FBTyxJQUFJLENBQUMsWUFBWSxDQUFDO0lBQzNCLENBQUM7SUFFRCxJQUFjLFNBQVM7UUFDckIsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVO1lBQUUsSUFBSSxDQUFDLFVBQVUsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUNqRSxPQUFPLElBQUksQ0FBQyxVQUFVLENBQUM7SUFDekIsQ0FBQztJQUVELFlBQ3FCLE9BQWtDLEVBQ2xDLEtBQVEsRUFDbEIsSUFBWSxFQUNGLEtBQXFCO1FBSHJCLFlBQU8sR0FBUCxPQUFPLENBQTJCO1FBQ2xDLFVBQUssR0FBTCxLQUFLLENBQUc7UUFDbEIsU0FBSSxHQUFKLElBQUksQ0FBUTtRQUNGLFVBQUssR0FBTCxLQUFLLENBQWdCO0lBQ3ZDLENBQUM7SUFJSixLQUFLLENBQUMsSUFBSTtRQUNSLE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxHQUFHLENBQUMsQ0FBQyxDQUFDO0lBQ3JDLENBQUM7SUFFRCxLQUFLLENBQUMsUUFBUTtRQUNaLE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxHQUFHLENBQUMsQ0FBQyxDQUFDO0lBQ3JDLENBQUM7SUFFUyxZQUFZLENBQUMsSUFBWTtRQUNqQyxJQUFJLElBQUksR0FBRyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQztZQUNyQyxNQUFNLElBQUksV0FBVyxDQUNuQixzREFBc0QsQ0FDdkQsQ0FBQztRQUNKLElBQUksT0FBTyxJQUFJLENBQUMsV0FBVyxLQUFLLFdBQVcsSUFBSSxJQUFJLEdBQUcsSUFBSSxDQUFDLFdBQVc7WUFDcEUsTUFBTSxJQUFJLFdBQVcsQ0FDbkIsUUFBUSxJQUFJLENBQUMsV0FBVyxxQ0FBcUMsSUFBSSxFQUFFLENBQ3BFLENBQUM7UUFDSixPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7Q0FHRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFBhZ2luZ0Vycm9yIH0gZnJvbSBcIi4vZXJyb3JzXCI7XG5pbXBvcnQgeyBBZGFwdGVyIH0gZnJvbSBcIi4uL3BlcnNpc3RlbmNlXCI7XG5pbXBvcnQgeyBDb25zdHJ1Y3RvciwgTW9kZWwgfSBmcm9tIFwiQGRlY2FmLXRzL2RlY29yYXRvci12YWxpZGF0aW9uXCI7XG5cbmV4cG9ydCBhYnN0cmFjdCBjbGFzcyBQYWdpbmF0b3I8TSBleHRlbmRzIE1vZGVsLCBSID0gTVtdLCBRID0gYW55PiB7XG4gIHByb3RlY3RlZCBfY3VycmVudFBhZ2UhOiBudW1iZXI7XG4gIHByb3RlY3RlZCBfdG90YWxQYWdlcyE6IG51bWJlcjtcbiAgcHJvdGVjdGVkIF9yZWNvcmRDb3VudCE6IG51bWJlcjtcbiAgcHJvdGVjdGVkIGxpbWl0ITogbnVtYmVyO1xuXG4gIHByaXZhdGUgX3N0YXRlbWVudD86IFE7XG5cbiAgZ2V0IGN1cnJlbnQoKSB7XG4gICAgcmV0dXJuIHRoaXMuX2N1cnJlbnRQYWdlO1xuICB9XG5cbiAgZ2V0IHRvdGFsKCkge1xuICAgIHJldHVybiB0aGlzLl90b3RhbFBhZ2VzO1xuICB9XG5cbiAgZ2V0IGNvdW50KCk6IG51bWJlciB7XG4gICAgcmV0dXJuIHRoaXMuX3JlY29yZENvdW50O1xuICB9XG5cbiAgcHJvdGVjdGVkIGdldCBzdGF0ZW1lbnQoKSB7XG4gICAgaWYgKCF0aGlzLl9zdGF0ZW1lbnQpIHRoaXMuX3N0YXRlbWVudCA9IHRoaXMucHJlcGFyZSh0aGlzLnF1ZXJ5KTtcbiAgICByZXR1cm4gdGhpcy5fc3RhdGVtZW50O1xuICB9XG5cbiAgcHJvdGVjdGVkIGNvbnN0cnVjdG9yKFxuICAgIHByb3RlY3RlZCByZWFkb25seSBhZGFwdGVyOiBBZGFwdGVyPGFueSwgUSwgYW55LCBhbnk+LFxuICAgIHByb3RlY3RlZCByZWFkb25seSBxdWVyeTogUSxcbiAgICByZWFkb25seSBzaXplOiBudW1iZXIsXG4gICAgcHJvdGVjdGVkIHJlYWRvbmx5IGNsYXp6OiBDb25zdHJ1Y3RvcjxNPlxuICApIHt9XG5cbiAgcHJvdGVjdGVkIGFic3RyYWN0IHByZXBhcmUocmF3U3RhdGVtZW50OiBRKTogUTtcblxuICBhc3luYyBuZXh0KCkge1xuICAgIHJldHVybiB0aGlzLnBhZ2UodGhpcy5jdXJyZW50ICsgMSk7XG4gIH1cblxuICBhc3luYyBwcmV2aW91cygpIHtcbiAgICByZXR1cm4gdGhpcy5wYWdlKHRoaXMuY3VycmVudCAtIDEpO1xuICB9XG5cbiAgcHJvdGVjdGVkIHZhbGlkYXRlUGFnZShwYWdlOiBudW1iZXIpIHtcbiAgICBpZiAocGFnZSA8IDEgfHwgIU51bWJlci5pc0ludGVnZXIocGFnZSkpXG4gICAgICB0aHJvdyBuZXcgUGFnaW5nRXJyb3IoXG4gICAgICAgIFwiUGFnZSBudW1iZXIgY2Fubm90IGJlIHVuZGVyIDEgYW5kIG11c3QgYmUgYW4gaW50ZWdlclwiXG4gICAgICApO1xuICAgIGlmICh0eXBlb2YgdGhpcy5fdG90YWxQYWdlcyAhPT0gXCJ1bmRlZmluZWRcIiAmJiBwYWdlID4gdGhpcy5fdG90YWxQYWdlcylcbiAgICAgIHRocm93IG5ldyBQYWdpbmdFcnJvcihcbiAgICAgICAgYE9ubHkgJHt0aGlzLl90b3RhbFBhZ2VzfSBhcmUgYXZhaWxhYmxlLiBDYW5ub3QgZ28gdG8gcGFnZSAke3BhZ2V9YFxuICAgICAgKTtcbiAgICByZXR1cm4gcGFnZTtcbiAgfVxuXG4gIGFic3RyYWN0IHBhZ2UocGFnZT86IG51bWJlcik6IFByb21pc2U8UltdPjtcbn1cbiJdfQ==

package/lib/esm/query/Statement.d.ts

@@ -1,56 +1,40 @@
-import type { Constructor } from "@decaf-ts/decorator-validation";
-import { Model, ModelErrorDefinition } from "@decaf-ts/decorator-validation";
-import { Executor, RawExecutor } from "../interfaces";
-import { StatementType } from "./constants";
-import { Clause } from "./Clause";
-import { Adapter } from "../persistence";
+import { type Constructor, Model } from "@decaf-ts/decorator-validation";
+import type { Executor, RawExecutor } from "../interfaces";
+import type { FromSelector, GroupBySelector, OrderBySelector, SelectSelector } from "./selectors";
+import { Condition } from "./Condition";
+import type { CountOption, DistinctOption, LimitOption, MaxOption, MinOption, OffsetOption, OrderAndGroupOption, SelectOption, WhereOption } from "./options";
+import { Paginatable } from "../interfaces/Paginatable";
 import { Paginator } from "./Paginator";
-/**
- * @summary Statement Class
- * @description holds all the clauses until they can be processed
- *
- * @param {ModelArg} [statement]
- *
- * @class Statement
- * @extends Model
- * @implements Executor
- * @implements RawExecutor
- *
- * @category Query
- */
-export declare abstract class Statement<Q> extends Model implements Executor, RawExecutor<Q> {
-    protected clauses?: Clause<any>[];
+import { Adapter } from "../persistence";
+export declare abstract class Statement<Q, M extends Model, R> implements Executor<R>, RawExecutor<Q>, Paginatable<M, R, Q> {
     protected adapter: Adapter<any, Q, any, any>;
-    protected target?: Constructor<any>;
-    protected fullRecord: boolean;
-    protected type?: string;
-    protected constructor(db: Adapter<any, Q, any, any>);
-    protected build(): Q;
-    /**
-     * @inheritDoc
-     */
-    execute<Y>(): Promise<Y>;
-    /**
-     * @inheritDoc
-     */
-    abstract paginate<Y>(size: number): Promise<Paginator<Y, Q>>;
-    raw<R>(rawInput: Q, ...args: any[]): Promise<R>;
-    /**
-     * @inheritDoc
-     */
-    hasErrors(...exceptions: string[]): ModelErrorDefinition | undefined;
-    /**
-     * @summary Adds a clause to the Statement
-     * @param {Clause} clause
-     */
-    addClause(clause: Clause<Q>): void;
-    getAdapter(): Adapter<any, Q, any, any>;
-    /**
-     * @summary Defines the output class (when existing)
-     * @param {Constructor} clazz
-     */
-    setTarget(clazz: Constructor<any>): void;
-    getTarget(): Constructor<any>;
-    setFullRecord(): void;
-    setMode(type: StatementType): void;
+    protected readonly selectSelector?: SelectSelector<M>[];
+    protected distinctSelector?: SelectSelector<M>;
+    protected maxSelector?: SelectSelector<M>;
+    protected minSelector?: SelectSelector<M>;
+    protected countSelector?: SelectSelector<M>;
+    protected fromSelector: Constructor<M>;
+    protected whereCondition?: Condition<M>;
+    protected orderBySelector?: OrderBySelector<M>;
+    protected groupBySelector?: GroupBySelector<M>;
+    protected limitSelector?: number;
+    protected offsetSelector?: number;
+    protected constructor(adapter: Adapter<any, Q, any, any>);
+    select<S extends readonly SelectSelector<M>[]>(): SelectOption<M, M[]>;
+    select<S extends readonly SelectSelector<M>[]>(selector: readonly [...S]): SelectOption<M, Pick<M, S[number]>[]>;
+    distinct<S extends SelectSelector<M>>(selector: S): DistinctOption<M, M[S][]>;
+    max<S extends SelectSelector<M>>(selector: S): MaxOption<M, M[S]>;
+    min<S extends SelectSelector<M>>(selector: S): MinOption<M, M[S]>;
+    count<S extends SelectSelector<M>>(selector?: S): CountOption<M, number>;
+    from(selector: FromSelector<M>): WhereOption<M, R>;
+    where(condition: Condition<M>): OrderAndGroupOption<M, R>;
+    orderBy(selector: OrderBySelector<M>): LimitOption<M, R> & OffsetOption<R>;
+    groupBy(selector: GroupBySelector<M>): LimitOption<M, R>;
+    limit(value: number): OffsetOption<R>;
+    offset(value: number): Executor<R>;
+    execute(): Promise<R>;
+    raw<R>(rawInput: Q): Promise<R>;
+    protected abstract build(): Q;
+    protected abstract parseCondition(condition: Condition<M>): Q;
+    abstract paginate(size: number): Promise<Paginator<M, R, Q>>;
 }