@quatrain/core 1.0.0-beta1 → 1.0.0-beta10

package/lib/Auth.d.ts

@@ -0,0 +1,25 @@
+import Middleware from './authentication/middlewares/AuthMiddleware';
+export declare enum AuthAction {
+    SIGNIN = "signin",
+    SIGNUP = "signup",
+    SIGNOUT = "signout"
+}
+/**
+ * Authentication Parameters acceptable keys
+ */
+export type AuthParametersKeys = 'host' | 'alias' | 'mapping' | 'middlewares' | 'config' | 'fixtures' | 'debug';
+/**
+ * Backend parameters interface
+ */
+export interface AuthParameters {
+    host?: string;
+    alias?: string;
+    mapping?: {
+        [x: string]: any;
+    };
+    middlewares?: Middleware[];
+    config?: any;
+    fixtures?: any;
+    softDelete?: boolean;
+    debug?: boolean;
+}

package/lib/Auth.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AuthAction = void 0;
+var AuthAction;
+(function (AuthAction) {
+    AuthAction["SIGNIN"] = "signin";
+    AuthAction["SIGNUP"] = "signup";
+    AuthAction["SIGNOUT"] = "signout";
+})(AuthAction || (exports.AuthAction = AuthAction = {}));

package/lib/Backend.d.ts

@@ -1,6 +1,39 @@
+import Middleware from './backends/middlewares/Middleware';
 export declare enum BackendAction {
     CREATE = "create",
     READ = "read",
     UPDATE = "update",
-    DELETE = "delete"
+    DELETE = "delete",
+    WRITE = "write"
+}
+/**
+ * Default interface for a backend record
+ */
+export interface BackendRecordType {
+    uid: string | undefined;
+    path: string | undefined;
+    [key: string]: any;
+}
+/**
+ * Backend Parameters acceptable keys
+ */
+export type BackendParametersKeys = 'host' | 'alias' | 'mapping' | 'middlewares' | 'config' | 'fixtures' | 'softDelete' | 'debug';
+/**
+ * Backend parameters interface
+ */
+export interface BackendParameters {
+    host?: string;
+    alias?: string;
+    hierarchy?: {
+        [collection: string]: any;
+    };
+    mapping?: {
+        [x: string]: any;
+    };
+    middlewares?: Middleware[];
+    config?: any;
+    fixtures?: any;
+    softDelete?: boolean;
+    useNativeForeignKeys?: boolean;
+    debug?: boolean;
 }

package/lib/Backend.js

@@ -7,4 +7,5 @@ var BackendAction;
     BackendAction["READ"] = "read";
     BackendAction["UPDATE"] = "update";
     BackendAction["DELETE"] = "delete";
+    BackendAction["WRITE"] = "write";
 })(BackendAction || (exports.BackendAction = BackendAction = {}));

package/lib/Core.d.ts

@@ -1,19 +1,20 @@
+import { AbstractAuthAdapter } from './authentication';
 import { AbstractAdapter } from './backends/AbstractAdapter';
 import { User } from './components/User';
 import { DataObjectClass } from './components/types/DataObjectClass';
 export type BackendRegistry<T extends AbstractAdapter> = {
     [x: string]: T;
 };
+export interface AuthAdapter extends AbstractAuthAdapter {
+}
 export declare class Core {
     static defaultBackend: string;
-    static currentUser: User;
+    static userClass: typeof User;
     static classRegistry: {
         [key: string]: any;
     };
-    static logger: {
-        (...data: any[]): void;
-        (message?: any, ...optionalParams: any[]): void;
-    };
+    static logger: Console;
+    static auth: AuthAdapter | AbstractAuthAdapter;
     static timestamp: () => string;
     protected static _backends: BackendRegistry<any>;
     static definition(key: string): {
@@ -35,9 +36,8 @@ export declare class Core {
     /**
      * Log message using defined logger
      * This is currently just a stub that will be implemented from config in the future
-     * @param message string
+     * @param message string | object
      * @param level string
      */
-    static log(message: string, src?: string, level?: string): void;
-    static getObject(): void;
+    static log(message: any, src?: string, level?: string): void;
 }

package/lib/Core.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Core = void 0;
 const DataObject_1 = require("./components/DataObject");
+const User_1 = require("./components/User");
 class Core {
     static definition(key) {
         return {
@@ -42,18 +43,18 @@ class Core {
     /**
      * Log message using defined logger
      * This is currently just a stub that will be implemented from config in the future
-     * @param message string
+     * @param message string | object
      * @param level string
      */
     static log(message, src = 'Core', level = 'NOTICE') {
-        Core.logger(`${Date.now()} - [${src}] ${message}`);
+        Core.logger.log(`${Date.now()} - [${src}] ${typeof message === 'string' ? message : JSON.stringify(message)}`);
     }
-    static getObject() { }
 }
 exports.Core = Core;
 Core.defaultBackend = '@default';
+Core.userClass = User_1.User;
 Core.classRegistry = {};
-Core.logger = console.log;
+Core.logger = console;
 // How timestamp are formatted
-Core.timestamp = () => (new Date().toISOString());
+Core.timestamp = () => new Date().toISOString();
 Core._backends = {};

package/lib/authentication/AbstractAuthAdapter.d.ts

@@ -0,0 +1,18 @@
+import { AuthParameters, AuthParametersKeys } from '../Auth';
+import { User } from '../components/User';
+import { AuthInterface } from './types/AuthInterface';
+export declare abstract class AbstractAuthAdapter implements AuthInterface {
+    protected _alias: string;
+    protected _params: AuthParameters;
+    constructor(params?: AuthParameters);
+    setParam(key: AuthParametersKeys, value: any): void;
+    getParam(key: AuthParametersKeys): any;
+    set alias(alias: string);
+    get alias(): string;
+    abstract register(user: User): Promise<any>;
+    abstract signup(login: string, password: string): Promise<any>;
+    abstract signout(user: User): Promise<any>;
+    abstract update(user: User, updatable: any): Promise<any>;
+    abstract delete(user: User): Promise<any>;
+    abstract getAuthToken(token: string): any;
+}

package/lib/authentication/AbstractAuthAdapter.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AbstractAuthAdapter = void 0;
+class AbstractAuthAdapter {
+    constructor(params = {}) {
+        this._alias = '';
+        this._params = {};
+        this._alias = params.alias || '';
+    }
+    setParam(key, value) {
+        this._params[key] = value;
+    }
+    getParam(key) {
+        return this._params[key];
+    }
+    set alias(alias) {
+        this._alias = alias;
+    }
+    get alias() {
+        return this._alias;
+    }
+}
+exports.AbstractAuthAdapter = AbstractAuthAdapter;

package/lib/authentication/AuthenticationError.d.ts

@@ -0,0 +1,2 @@
+export declare class AuthenticationError extends Error {
+}

package/lib/authentication/AuthenticationError.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AuthenticationError = void 0;
+class AuthenticationError extends Error {
+}
+exports.AuthenticationError = AuthenticationError;

package/lib/authentication/index.d.ts

@@ -0,0 +1,4 @@
+import { AbstractAuthAdapter } from './AbstractAuthAdapter';
+import { AuthInterface } from './types/AuthInterface';
+import { AuthenticationError } from './AuthenticationError';
+export { AuthInterface, AbstractAuthAdapter, AuthenticationError };

package/lib/authentication/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AuthenticationError = exports.AbstractAuthAdapter = void 0;
+const AbstractAuthAdapter_1 = require("./AbstractAuthAdapter");
+Object.defineProperty(exports, "AbstractAuthAdapter", { enumerable: true, get: function () { return AbstractAuthAdapter_1.AbstractAuthAdapter; } });
+const AuthenticationError_1 = require("./AuthenticationError");
+Object.defineProperty(exports, "AuthenticationError", { enumerable: true, get: function () { return AuthenticationError_1.AuthenticationError; } });

package/lib/authentication/middlewares/AbstractAuthMiddleware.js

@@ -0,0 +1 @@
+"use strict";

package/lib/authentication/middlewares/AuthMiddleware.d.ts

@@ -0,0 +1,5 @@
+import { AuthAction } from '../../Auth';
+import { User } from '../../components/User';
+export default interface AuthMiddleware {
+    execute: (user: User, action: AuthAction) => void;
+}

package/lib/authentication/middlewares/Middleware.d.ts

@@ -0,0 +1,5 @@
+import { AuthAction } from '../../Auth';
+import { User } from '../../components/User';
+export default interface Middleware {
+    execute: (user: User, action: AuthAction) => void;
+}

package/lib/authentication/middlewares/Middleware.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/authentication/types/AuthInterface.d.ts

@@ -0,0 +1,9 @@
+import { User } from '../../components/User';
+export interface AuthInterface {
+    register(user: User): Promise<any>;
+    signup(login: string, password: string): Promise<any>;
+    signout(user: User): Promise<any>;
+    update(user: User, updatable: any): Promise<any>;
+    delete(user: User): Promise<any>;
+    getAuthToken(token: string): any;
+}

package/lib/authentication/types/AuthInterface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/backends/AbstractAdapter.d.ts

@@ -1,54 +1,29 @@
-import { BackendAction } from '../Backend';
+import { BackendAction, BackendParameters, BackendParametersKeys } from '../Backend';
 import { DataObjectClass } from '../components/types/DataObjectClass';
+import { BackendInterface } from './types/BackendInterface';
 import { Filter } from './Filter';
 import { Filters } from './Filters';
-import { Query } from './Query';
+import { Query, QueryResultType } from './Query';
 import { SortAndLimit } from './SortAndLimit';
-import Middleware from './middlewares/Middleware';
-/**
- * Default interface for a backend record
- */
-export interface BackendRecordType {
-    uid: string | undefined;
-    path: string | undefined;
-    [key: string]: any;
-}
-/**
- * Backend Parameters acceptable keys
- */
-export type BackendParametersKeys = 'host' | 'alias' | 'mapping' | 'middlewares' | 'config' | 'fixtures' | 'softDelete' | 'debug';
-/**
- * Backend parameters interface
- */
-export interface BackendParameters {
-    host?: string;
-    alias?: string;
-    mapping?: {
-        [x: string]: any;
-    };
-    middlewares?: Middleware[];
-    config?: any;
-    fixtures?: any;
-    softDelete?: boolean;
-    debug?: boolean;
-}
-export interface BackendInterface {
-    create(dataObject: DataObjectClass<any>, desiredUid: string | undefined): Promise<DataObjectClass<any>>;
-    read(param: string | DataObjectClass<any>): Promise<DataObjectClass<any>>;
-    update(dataObject: DataObjectClass<any>): Promise<DataObjectClass<any>>;
-    delete(dataObject: DataObjectClass<any>): Promise<DataObjectClass<any>>;
-    query(query: Query<any>): Promise<DataObjectClass<any>[]>;
-    find(dataObject: DataObjectClass<any>, filters: Filters | Filter[] | undefined, pagination: SortAndLimit | undefined): Promise<DataObjectClass<any>[]>;
-    count(query: Query<any>): Promise<number>;
+import BackendMiddleware from './middlewares/Middleware';
+import { MiddlewareParams } from './middlewares/types/MiddlewareParams';
+interface BM extends BackendMiddleware {
 }
 export declare abstract class AbstractAdapter implements BackendInterface {
+    static PKEY_IDENTIFIER: any;
     protected _alias: string;
     protected _params: BackendParameters;
-    protected _middlewares: Middleware[];
+    protected _middlewares: BM[];
     constructor(params?: BackendParameters);
     setParam(key: BackendParametersKeys, value: any): void;
     getParam(key: BackendParametersKeys): any;
-    addMiddleware(middleware: Middleware): void;
+    addMiddleware(middleware: BM): void;
+    /**
+     * Returns true if a given middleware is attached
+     * @param className
+     * @returns boolean
+     */
+    hasMiddleware(className: string): boolean;
     set alias(alias: string);
     get alias(): string;
     getCollection(dao: DataObjectClass<any>): string | undefined;
@@ -62,9 +37,9 @@ export declare abstract class AbstractAdapter implements BackendInterface {
      * @param query
      * @returns Array
      */
-    query(query: Query<any>): Promise<DataObjectClass<any>[]>;
-    count(query: Query<any>): Promise<number>;
-    abstract find(dataObject: DataObjectClass<any>, filters: Filters | Filter[] | undefined, pagination: SortAndLimit | undefined): Promise<DataObjectClass<any>[]>;
+    query(query: Query<any>): Promise<QueryResultType<DataObjectClass<any>>>;
+    abstract find(dataObject: DataObjectClass<any>, filters: Filters | Filter[] | undefined, pagination: SortAndLimit | undefined, parent: any): Promise<QueryResultType<any>>;
     log(message: string): void;
-    executeMiddlewares(dataObject: DataObjectClass<any>, action: BackendAction): Promise<DataObjectClass<any>>;
+    executeMiddlewares(dataObject: DataObjectClass<any>, action: BackendAction, params?: MiddlewareParams): Promise<DataObjectClass<any>>;
 }
+export {};

package/lib/backends/AbstractAdapter.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractAdapter = void 0;
+const BackendError_1 = require("./BackendError");
 class AbstractAdapter {
     constructor(params = {}) {
         this._alias = '';
@@ -17,6 +18,7 @@ class AbstractAdapter {
         this._middlewares = [];
         this._alias = params.alias || '';
         this._middlewares = params.middlewares || [];
+        this._params = params;
     }
     setParam(key, value) {
         this._params[key] = value;
@@ -25,8 +27,25 @@ class AbstractAdapter {
         return this._params[key];
     }
     addMiddleware(middleware) {
+        if (this.hasMiddleware(middleware.constructor.name)) {
+            throw new BackendError_1.BackendError(`Middleware '${middleware.constructor.name}' is already attached`);
+        }
         this._middlewares.push(middleware);
     }
+    /**
+     * Returns true if a given middleware is attached
+     * @param className
+     * @returns boolean
+     */
+    hasMiddleware(className) {
+        let has = false;
+        this._middlewares.forEach((middleware) => {
+            if (middleware.constructor.name === className) {
+                has = true;
+            }
+        });
+        return has;
+    }
     set alias(alias) {
         this._alias = alias;
     }
@@ -34,7 +53,7 @@ class AbstractAdapter {
         return this._alias;
     }
     getCollection(dao) {
-        return dao.uri.collection; //|| dao.uri.class.name.toLowerCase() //class.COLLECTION
+        return dao.uri.collection;
     }
     /**
      * Process Query instance and return result
@@ -43,12 +62,10 @@ class AbstractAdapter {
      */
     query(query) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.find(yield query.obj.daoFactory(), query.filters, query.sortAndLimit);
-        });
-    }
-    count(query) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return (yield this.find(yield query.obj.daoFactory(), query.filters, undefined)).length;
+            const dao = yield query.obj.daoFactory();
+            if (query.parent) {
+            }
+            return yield this.find(dao, query.filters, query.sortAndLimit, query.parent);
         });
     }
     log(message) {
@@ -56,13 +73,14 @@ class AbstractAdapter {
             console.log(message);
         }
     }
-    executeMiddlewares(dataObject, action) {
+    executeMiddlewares(dataObject, action, params) {
         return __awaiter(this, void 0, void 0, function* () {
             for (const middleware of this._middlewares) {
-                yield middleware.execute(dataObject, action);
+                yield middleware.execute(dataObject, action, params);
             }
             return dataObject;
         });
     }
 }
 exports.AbstractAdapter = AbstractAdapter;
+AbstractAdapter.PKEY_IDENTIFIER = 'id';

package/lib/backends/Filters.d.ts

@@ -2,9 +2,10 @@ import { Filter } from './Filter';
 export interface FiltersType {
     or?: Filter[];
     and?: Filter[];
+    base?: string;
 }
 export declare class Filters implements FiltersType {
     or?: Filter[];
     and?: Filter[];
-    constructor(or: Filter[] | undefined, and: Filter[] | undefined);
+    constructor(or?: Filter[], and?: Filter[]);
 }

package/lib/backends/MockAdapter.d.ts

@@ -1,9 +1,11 @@
-import { AbstractAdapter, BackendInterface } from './AbstractAdapter';
-import { BackendRecordType } from './AbstractAdapter';
+import { DataObjectClass } from '../components/types/DataObjectClass';
+import { QueryResultType } from './Query';
 import { Filter } from './Filter';
 import { Filters } from './Filters';
 import { SortAndLimit } from './SortAndLimit';
-import { DataObjectClass } from '../components/types/DataObjectClass';
+import { AbstractAdapter } from './AbstractAdapter';
+import { BackendInterface } from './types/BackendInterface';
+import { BackendRecordType } from '../Backend';
 export declare class MockAdapter extends AbstractAdapter implements BackendInterface {
     protected static _fixtures: any;
     /**
@@ -19,5 +21,5 @@ export declare class MockAdapter extends AbstractAdapter implements BackendInter
     update(dataObject: DataObjectClass<any>): Promise<DataObjectClass<any>>;
     delete(dataObject: DataObjectClass<any>): Promise<DataObjectClass<any>>;
     deleteCollection(collection: string, batchSize?: number | undefined): Promise<void>;
-    find(dataObject: DataObjectClass<any>, filters?: Filters | Filter[] | undefined, pagination?: SortAndLimit | undefined): Promise<DataObjectClass<any>[]>;
+    find(dataObject: DataObjectClass<any>, filters?: Filters | Filter[] | undefined, pagination?: SortAndLimit | undefined): Promise<QueryResultType<DataObjectClass<any>>>;
 }

package/lib/backends/MockAdapter.js

@@ -10,11 +10,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MockAdapter = void 0;
-const AbstractAdapter_1 = require("./AbstractAdapter");
+const Core_1 = require("../Core");
 const ObjectUri_1 = require("../components/ObjectUri");
 const faker_1 = require("@faker-js/faker");
 const BackendError_1 = require("./BackendError");
 const ResourcesErrors_1 = require("../common/ResourcesErrors");
+const AbstractAdapter_1 = require("./AbstractAdapter");
 class MockAdapter extends AbstractAdapter_1.AbstractAdapter {
     /**
      * Inject fixtures data to backend adapter
@@ -116,12 +117,12 @@ class MockAdapter extends AbstractAdapter_1.AbstractAdapter {
     find(dataObject, filters = undefined, pagination = undefined) {
         return __awaiter(this, void 0, void 0, function* () {
             const limit = (pagination === null || pagination === void 0 ? void 0 : pagination.limits.batch) || 1e10;
-            let result = [];
+            let items = [];
             const collection = this.getCollection(dataObject);
             // TODO filter only records matchinf collection
             for (let key in MockAdapter.getFixtures()) {
                 let keep = true;
-                if (key.startsWith(`${collection}/`) && result.length <= limit) {
+                if (key.startsWith(`${collection}/`) && items.length <= limit) {
                     const dao = yield dataObject.clone(MockAdapter.getFixture(key));
                     if (filters) {
                         if (Array.isArray(filters)) {
@@ -164,15 +165,23 @@ class MockAdapter extends AbstractAdapter_1.AbstractAdapter {
                     }
                     if (keep) {
                         dao.uri = new ObjectUri_1.ObjectUri(key);
-                        result.push(dao);
+                        items.push(dao);
                     }
                 }
             }
             if (pagination && pagination.sortings.length > 0) {
-                result = result.sort((a, b) => Number(a.val(pagination.sortings[0].prop) >
+                items = items.sort((a, b) => Number(a.val(pagination.sortings[0].prop) >
                     b.val(pagination.sortings[0].prop)));
             }
-            return result;
+            return {
+                items,
+                meta: {
+                    count: 100,
+                    offset: (pagination === null || pagination === void 0 ? void 0 : pagination.limits.offset) || 0,
+                    batch: (pagination === null || pagination === void 0 ? void 0 : pagination.limits.batch) || 10,
+                    executionTime: Core_1.Core.timestamp(),
+                },
+            };
         });
     }
 }

package/lib/backends/Query.d.ts

@@ -2,14 +2,24 @@ import { Filter } from './Filter';
 import { Limits } from './Limits';
 import { Sorting } from './Sorting';
 import { SortAndLimit } from './SortAndLimit';
-import { BackendInterface } from './AbstractAdapter';
+import { BackendInterface } from './types/BackendInterface';
 import { DataObjectClass, ObjectUri } from '../components';
-import { Persisted } from '../components/types/Persisted';
-import { BaseObject } from '../components/BaseObject';
 import { BaseObjectCore } from '../components/BaseObjectCore';
 export declare const AS_OBJECTURIS = "objectUris";
 export declare const AS_DATAOBJECTS = "dataObjects";
 export declare const AS_INSTANCES = "classInstances";
+export type QueryMetaType = {
+    count: number;
+    offset: number;
+    batch: number;
+    executionTime: string | number;
+    sortField?: string;
+    sortOrder?: 'asc' | 'desc';
+};
+export type QueryResultType<T> = {
+    items: Array<T>;
+    meta: QueryMetaType;
+};
 export declare enum returnAs {
     AS_OBJECTURIS = "objectUris",
     AS_DATAOBJECTS = "dataObjects",
@@ -18,22 +28,27 @@ export declare enum returnAs {
 }
 export declare class Query<T extends typeof BaseObjectCore> {
     protected _obj: T;
-    protected _params: any;
+    protected _parent: T | undefined;
     filters: Filter[];
     sortings: Sorting[];
     limits: Limits;
-    constructor(obj: T, params?: {
-        [x: string]: any;
-    });
+    meta: any;
+    constructor(obj: T, parent?: T);
     get obj(): T;
-    where(param: Filter | string, value?: any, operator?: any): this;
+    get parent(): T | undefined;
+    /**
+     * Declare query parent record
+     * This may be need in some NoSQL backend to query subcollections
+     */
+    set parent(parent: T | undefined);
+    where(param: Filter | string | any, value?: any, operator?: any): this;
     sortBy(param: Sorting | string, order?: any): this;
     setLimits(limits: Limits): this;
     offset(offset?: number): this;
     batch(batch?: number): this;
     get sortAndLimit(): SortAndLimit;
-    fetch(backend?: BackendInterface): Promise<DataObjectClass<any>[]>;
-    fetchAsUri(backend?: BackendInterface): Promise<ObjectUri[]>;
-    fetchAsInstances(backend?: BackendInterface): Promise<Persisted<BaseObject>[]>;
-    execute(as?: returnAs, backend?: BackendInterface): Promise<any[]>;
+    fetch(backend?: BackendInterface): Promise<QueryResultType<DataObjectClass<any>>>;
+    fetchAsUri(backend?: BackendInterface): Promise<QueryResultType<ObjectUri>>;
+    fetchAsInstances(backend?: BackendInterface): Promise<QueryResultType<T>>;
+    execute(as?: returnAs, backend?: BackendInterface): Promise<QueryResultType<any>>;
 }

package/lib/backends/Query.js

@@ -26,16 +26,27 @@ var returnAs;
     returnAs["AS_IS"] = "asIs";
 })(returnAs || (exports.returnAs = returnAs = {}));
 class Query {
-    constructor(obj, params = {}) {
+    constructor(obj, parent) {
         this._obj = obj;
-        this._params = params; // just in case
+        this._parent = parent;
         this.filters = [];
         this.sortings = [];
         this.limits = new Limits_1.Limits();
+        this.meta = {};
     }
     get obj() {
         return this._obj;
     }
+    get parent() {
+        return this._parent;
+    }
+    /**
+     * Declare query parent record
+     * This may be need in some NoSQL backend to query subcollections
+     */
+    set parent(parent) {
+        this._parent = parent;
+    }
     where(param, value = null, operator = 'equals') {
         if (typeof param == 'object') {
             this.filters.push(param);
@@ -43,7 +54,7 @@ class Query {
         else {
             if (operator === 'equals' && Array.isArray(value)) {
                 // auto-convert operator if value is an array
-                operator = 'containsAny';
+                operator = 'contains'; // Any'
             }
             this.filters.push(new Filter_1.Filter(param, value, operator));
         }
@@ -80,21 +91,21 @@ class Query {
     }
     fetchAsUri(backend = Core_1.Core.getBackend()) {
         return __awaiter(this, void 0, void 0, function* () {
-            const result = yield this.fetch(backend);
-            return yield Promise.all(result.map((dao) => dao.uri));
+            const { items, meta } = yield this.fetch(backend);
+            return { items: yield Promise.all(items.map((dao) => dao.uri)), meta };
         });
     }
     fetchAsInstances(backend = Core_1.Core.getBackend()) {
         return __awaiter(this, void 0, void 0, function* () {
-            const result = yield this.fetch(backend);
+            const { items, meta } = yield this.fetch(backend);
             const instances = [];
-            for (const item of result) {
+            for (const item of items) {
                 instances.push(this._obj.fromDataObject(item));
             }
-            return instances;
+            return { items: instances, meta };
         });
     }
-    execute(as = returnAs.AS_DATAOBJECTS, backend = Core_1.Core.getBackend()) {
+    execute(as = returnAs.AS_DATAOBJECTS, backend = Core_1.Core.getBackend(this._obj.DEFAULT_BACKEND)) {
         return __awaiter(this, void 0, void 0, function* () {
             //<DataObjectClass<any>[] | ObjectUri[] | Persisted<BaseObject>[]> {
             //</any><Array<T2> | Array<DataObject> | Array<ObjectUri>> {