@quatrain/core 1.0.0-beta1 → 1.0.0-beta3

package/lib/common/statuses.d.ts

@@ -2,11 +2,13 @@ export declare const CREATED = "created";
 export declare const PENDING = "pending";
 export declare const QUEUED = "queued";
 export declare const ACTIVE = "active";
+export declare const COMPLETED = "completed";
 export declare const ERROR = "error";
 export declare const TEST = "test";
 export declare const SUSPENDED = "suspended";
 export declare const DELETABLE = "deletable";
 export declare const DELETED = "deleted";
+export declare const DISABLED = "disabled";
 export declare const DONE = "done";
 export declare const MAINTENANCE = "maintenance";
 export declare const UNKNOWN = "unknown";

package/lib/common/statuses.js

@@ -1,15 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UNKNOWN = exports.MAINTENANCE = exports.DONE = exports.DELETED = exports.DELETABLE = exports.SUSPENDED = exports.TEST = exports.ERROR = exports.ACTIVE = exports.QUEUED = exports.PENDING = exports.CREATED = void 0;
+exports.UNKNOWN = exports.MAINTENANCE = exports.DONE = exports.DISABLED = exports.DELETED = exports.DELETABLE = exports.SUSPENDED = exports.TEST = exports.ERROR = exports.COMPLETED = exports.ACTIVE = exports.QUEUED = exports.PENDING = exports.CREATED = void 0;
 exports.CREATED = 'created';
 exports.PENDING = 'pending';
 exports.QUEUED = 'queued';
 exports.ACTIVE = 'active';
+exports.COMPLETED = 'completed';
 exports.ERROR = 'error';
 exports.TEST = 'test';
 exports.SUSPENDED = 'suspended';
 exports.DELETABLE = 'deletable';
 exports.DELETED = 'deleted';
+exports.DISABLED = 'disabled';
 exports.DONE = 'done';
 exports.MAINTENANCE = 'maintenance';
 exports.UNKNOWN = 'unknown';

package/lib/components/AbstractObject.d.ts

@@ -1,5 +1,5 @@
 import { DataObjectClass } from './types/DataObjectClass';
-import { DataObjectProperties } from '../properties/';
+import { DataObjectProperties } from '../properties';
 export declare abstract class AbstractObject {
     static PROPS_DEFINITION: DataObjectProperties;
     static COLLECTION: string | undefined;

package/lib/components/BaseObject.d.ts

@@ -4,10 +4,10 @@ export interface BaseObject {
     name: string;
     status: string;
     createdBy?: User | ObjectUri;
-    createdAt?: number;
+    createdAt?: number | string;
     updatedBy?: User | ObjectUri;
-    updatedAt?: number;
+    updatedAt?: number | string;
     deletedBy?: User | ObjectUri;
-    deletedAt?: number;
+    deletedAt?: number | string;
 }
 export declare const BaseObjectProperties: any;

package/lib/components/BaseObjectCore.js

@@ -63,7 +63,7 @@ class BaseObjectCore extends AbstractObject_1.AbstractObject {
         dao.uri.class = child;
         dao.populateFromData(src);
         const obj = new this(dao);
-        return obj; //.toProxy() as Proxy<T>
+        return obj;
     }
     static factory(src = undefined, child = this) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -144,7 +144,6 @@ class BaseObjectCore extends AbstractObject_1.AbstractObject {
         });
     }
     asReference() {
-        console.log(this._dataObject.toReference());
         return this._dataObject.toReference();
     }
     query() {

package/lib/components/BaseRepository.d.ts

@@ -1,11 +1,8 @@
-import { BackendInterface } from '../backends/AbstractAdapter';
-import { Query } from '../backends/Query';
+import { Query, QueryResultType } from '../backends/Query';
 import { BaseObjectCore } from './BaseObjectCore';
 import { DataObjectClass } from './types/DataObjectClass';
-import Payload from './types/Payload';
 import { BaseObject } from './BaseObject';
-import { Persisted } from './types/Persisted';
-import { Proxy } from './types/ProxyConstructor';
+import { BackendInterface } from '../backends/types/BackendInterface';
 /**
  * CRUD methods for models/entities inheriting from BaseObject
  * Extend this by passing the typeof of the desired class to the constructor
@@ -17,7 +14,11 @@ export default class BaseRepository<T extends BaseObject> {
     protected getDataObjectFromUid(uid: string): Promise<DataObjectClass<any>>;
     create<B extends BaseObjectCore>(obj: B, uid?: string): Promise<any>;
     read(key: string): Promise<any>;
-    update(obj: Proxy<T>): Promise<Persisted<T>>;
-    delete(uid: string): Promise<void>;
-    query(query: Query<typeof BaseObjectCore>): Promise<Payload<Persisted<T>>>;
+    update(obj: BaseObjectCore): Promise<any>;
+    /**
+     * delete object in its backend
+     * @param uid string
+     */
+    delete(uid: string): Promise<DataObjectClass<any>>;
+    query(query: Query<any>): Promise<QueryResultType<T>>;
 }

package/lib/components/BaseRepository.js

@@ -90,27 +90,24 @@ class BaseRepository {
     }
     update(obj) {
         return __awaiter(this, void 0, void 0, function* () {
-            const dataObject = obj.core.dataObject;
+            const dataObject = obj.dataObject;
             const savedObj = yield this.backendAdapter.update(dataObject);
             return this._model.fromDataObject(savedObj);
         });
     }
+    /**
+     * delete object in its backend
+     * @param uid string
+     */
     delete(uid) {
         return __awaiter(this, void 0, void 0, function* () {
             const dataObject = yield this.getDataObjectFromUid(uid);
-            yield this.backendAdapter.delete(dataObject);
+            return yield this.backendAdapter.delete(dataObject);
         });
     }
     query(query) {
         return __awaiter(this, void 0, void 0, function* () {
-            const items = (yield query.fetchAsInstances(this.backendAdapter));
-            const count = yield this.backendAdapter.count(query);
-            const meta = {
-                count,
-                updatedAt: new Date().getTime(),
-            };
-            const payload = { items, meta };
-            return payload;
+            return yield query.fetchAsInstances(this.backendAdapter);
         });
     }
 }

package/lib/components/DataObject.d.ts

@@ -43,6 +43,7 @@ export declare class DataObject implements DataObjectClass<any> {
      */
     asProxy(): this;
     setProperties(properties: Properties): void;
+    addProperty(property: PropertyClassType): void;
     /**
      * Populate data object from instant data or backend query
      * @param data

package/lib/components/DataObject.js

@@ -13,6 +13,7 @@ exports.DataObject = void 0;
 const Core_1 = require("../Core");
 const Property_1 = require("../properties/Property");
 const ObjectUri_1 = require("./ObjectUri");
+const ResourcesErrors_1 = require("../common/ResourcesErrors");
 /**
  * Data objects constitute the agnostic glue between objects and backends.
  * They handle data and identifiers in a protected registry
@@ -74,6 +75,12 @@ class DataObject {
         // TODO check if doable
         this._properties = properties;
     }
+    addProperty(property) {
+        if (Object.keys(this._properties).includes(property.name)) {
+            throw new Error(`Property ${name} already exists`);
+        }
+        this._properties[property.name] = property;
+    }
     /**
      * Populate data object from instant data or backend query
      * @param data
@@ -192,12 +199,10 @@ class DataObject {
      * @returns BaseProperty
      */
     get(key) {
-        try {
-            return this._properties[key];
-        }
-        catch (err) {
-            throw new Error(err.message);
+        if (!Reflect.has(this._properties, key)) {
+            throw new ResourcesErrors_1.NotFoundError(`No property matching key ${key}`);
         }
+        return Reflect.get(this._properties, key);
     }
     set(key, val) {
         if (!this.has(key)) {
@@ -222,7 +227,7 @@ class DataObject {
         }
     }
     toJSON(objectsAsReferences = false) {
-        return Object.assign(Object.assign({}, (this._uid && { uid: this._uid })), this._dataToJSON(objectsAsReferences));
+        return Object.assign(Object.assign({}, (this.uri && { uid: this.uri.uid, path: this.uri.path })), this._dataToJSON(objectsAsReferences));
     }
     toReference() {
         return Object.assign(Object.assign({}, this._objectUri.toReference()), { label: this.val('name') || '' });
@@ -237,6 +242,7 @@ class DataObject {
                     break;
                 case 'ObjectProperty':
                     const value = prop.val();
+                    console.log(value, typeof value);
                     Reflect.set(data, key, value
                         ? objectsAsReferences && !(value instanceof ObjectUri_1.ObjectUri)
                             ? value.asReference()

package/lib/components/Entity.d.ts

@@ -1,26 +1,12 @@
 import { BaseObjectCore } from './BaseObjectCore';
 import { BaseObject } from './BaseObject';
-import { User, UserCore } from './User';
+import { User } from './User';
 import { EntityClass } from './types/EntityClass';
 export declare const EntityProperties: any;
-export interface Entity extends BaseObject {
-    users: User;
+export interface EntityType extends BaseObject {
+    users?: User[];
 }
-export declare class EntityCore extends BaseObjectCore implements EntityClass {
+export declare class Entity extends BaseObjectCore implements EntityClass {
     static COLLECTION: string;
-    static PROPS_DEFINITION: ({
-        name: string;
-        type: string;
-        mandatory: boolean;
-        minLength: number;
-        instanceOf?: undefined;
-        parentKey?: undefined;
-    } | {
-        name: string;
-        mandatory: boolean;
-        type: string;
-        instanceOf: typeof UserCore;
-        parentKey: string;
-        minLength?: undefined;
-    })[];
+    static PROPS_DEFINITION: any[];
 }

package/lib/components/Entity.js

@@ -23,8 +23,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EntityCore = exports.EntityProperties = void 0;
+exports.Entity = exports.EntityProperties = void 0;
 const BaseObjectCore_1 = require("./BaseObjectCore");
+const BaseObject_1 = require("./BaseObject");
 const User_1 = require("./User");
 const CollectionProperty_1 = require("../properties/CollectionProperty");
 const StringProperty_1 = require("../properties/StringProperty");
@@ -46,24 +47,25 @@ exports.EntityProperties = [
         parentKey: 'entity',
     },
 ];
-class EntityCore extends BaseObjectCore_1.BaseObjectCore {
+class Entity extends BaseObjectCore_1.BaseObjectCore {
 }
-exports.EntityCore = EntityCore;
-EntityCore.COLLECTION = 'entity';
-EntityCore.PROPS_DEFINITION = [
+exports.Entity = Entity;
+Entity.COLLECTION = 'entities';
+Entity.PROPS_DEFINITION = [
+    ...BaseObject_1.BaseObjectProperties,
     {
         // surcharge property minLength and htmlType
         name: 'name',
         type: StringProperty_1.StringProperty.TYPE,
         mandatory: true,
         minLength: 1,
-        //htmlType: htmlType.ORG,
+        htmlType: htmlType.ORG,
     },
     {
         name: 'users',
         mandatory: true,
         type: CollectionProperty_1.CollectionProperty.TYPE,
-        instanceOf: User_1.UserCore,
+        instanceOf: User_1.User,
         parentKey: 'entity',
     },
 ];

package/lib/components/EntityRepository.d.ts

@@ -1,6 +1,6 @@
-import { BackendInterface } from '../backends';
+import { BackendInterface } from '../backends/types/BackendInterface';
 import BaseRepository from './BaseRepository';
-import { Entity } from './Entity';
-export default class EntityRepository extends BaseRepository<Entity> {
+import { EntityType } from './Entity';
+export default class EntityRepository extends BaseRepository<EntityType> {
     constructor(backendAdapter?: BackendInterface);
 }

package/lib/components/EntityRepository.js

@@ -8,7 +8,7 @@ const BaseRepository_1 = __importDefault(require("./BaseRepository"));
 const Entity_1 = require("./Entity");
 class EntityRepository extends BaseRepository_1.default {
     constructor(backendAdapter = Core_1.Core.getBackend()) {
-        super(Entity_1.EntityCore, backendAdapter);
+        super(Entity_1.Entity, backendAdapter);
     }
 }
 exports.default = EntityRepository;

package/lib/components/ObjectUri.js

@@ -52,10 +52,9 @@ class ObjectUri {
         }
     }
     set class(objClass) {
-        var _a;
         this._objClass = objClass;
         if (objClass) {
-            this._collection = objClass.COLLECTION || ((_a = objClass.name) === null || _a === void 0 ? void 0 : _a.toLowerCase());
+            this._collection = objClass.COLLECTION || objClass.name && objClass.name.toLowerCase();
         }
         else {
             this._collection = undefined;

package/lib/components/User.d.ts

@@ -1,8 +1,7 @@
 import { BaseObjectCore } from './BaseObjectCore';
 import { BaseObject } from './BaseObject';
-import { Persisted } from './types/Persisted';
-import { Proxy } from './types/ProxyConstructor';
-export interface User extends BaseObject {
+export interface UserType extends BaseObject {
+    name: string;
     firstname: string;
     lastname: string;
     gender?: 'male' | 'female' | 'nonbinary';
@@ -11,8 +10,8 @@ export interface User extends BaseObject {
     email: string;
 }
 export declare const UserProperties: any;
-export declare class UserCore extends BaseObjectCore {
+export declare class User extends BaseObjectCore {
     static PROPS_DEFINITION: any;
     static COLLECTION: string;
-    static factory(src?: any): Promise<Proxy<User> | Persisted<User>>;
+    static factory(src?: any): Promise<User>;
 }

package/lib/components/User.js

@@ -32,13 +32,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UserCore = exports.UserProperties = void 0;
+exports.User = exports.UserProperties = void 0;
 const BaseObjectCore_1 = require("./BaseObjectCore");
 const properties_1 = require("../properties");
 const HashProperty_1 = require("../properties/HashProperty");
 const StringProperty_1 = require("../properties/StringProperty");
 const htmlType = __importStar(require("../properties/types/PropertyHTMLType"));
 const BaseObject_1 = require("./BaseObject");
+const Entity_1 = require("./Entity");
 /**
  * Callback function to populate the 'name' property
  * @param dao DataObject
@@ -52,7 +53,6 @@ exports.UserProperties = [
         name: 'name',
         type: StringProperty_1.StringProperty.TYPE,
         minLength: 0,
-        fullSearch: true,
         htmlType: htmlType.NAME,
     },
     {
@@ -61,6 +61,7 @@ exports.UserProperties = [
         type: StringProperty_1.StringProperty.TYPE,
         minLength: 1,
         maxLength: 100,
+        fullSearch: true,
         htmlType: htmlType.GIVEN_NAME,
         onChange,
     },
@@ -70,6 +71,7 @@ exports.UserProperties = [
         type: StringProperty_1.StringProperty.TYPE,
         minLength: 1,
         maxLength: 100,
+        fullSearch: true,
         htmlType: htmlType.FAMILY_NAME,
         onChange,
     },
@@ -95,33 +97,40 @@ exports.UserProperties = [
         fullSearch: true,
         htmlType: htmlType.EMAIL,
     },
+    {
+        name: 'phone',
+        type: StringProperty_1.StringProperty.TYPE,
+        minLength: 1,
+        maxLength: 100,
+        htmlType: htmlType.OFF,
+    },
     {
         name: 'password',
         mandatory: true,
         type: HashProperty_1.HashProperty.TYPE,
         algorithm: HashProperty_1.HashProperty.ALGORITHM_SHA256,
-        salt: '',
+        salt: '', // you should override it in your code
         minLength: 5,
-        maxLength: 20,
+        maxLength: 20, // this is for the clear password
         htmlType: htmlType.PASSWORD,
     },
     {
         name: 'entity',
         mandatory: false,
         type: properties_1.ObjectProperty.TYPE,
-        instanceOf: BaseObjectCore_1.BaseObjectCore,
+        instanceOf: Entity_1.Entity,
     },
 ];
-class UserCore extends BaseObjectCore_1.BaseObjectCore {
+class User extends BaseObjectCore_1.BaseObjectCore {
     static factory(src = undefined) {
         const _super = Object.create(null, {
             factory: { get: () => super.factory }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            return _super.factory.call(this, src, UserCore);
+            return _super.factory.call(this, src, User);
         });
     }
 }
-exports.UserCore = UserCore;
-UserCore.PROPS_DEFINITION = exports.UserProperties;
-UserCore.COLLECTION = 'user';
+exports.User = User;
+User.PROPS_DEFINITION = exports.UserProperties;
+User.COLLECTION = 'user';

package/lib/components/UserRepository.d.ts

@@ -1,7 +1,7 @@
-import { BackendInterface } from '../backends';
+import { BackendInterface } from '../backends/types/BackendInterface';
 import BaseRepository from './BaseRepository';
-import { User } from './User';
-export default class UserRepository extends BaseRepository<User> {
+import { UserType } from './User';
+export default class UserRepository extends BaseRepository<UserType> {
     constructor(backendAdapter?: BackendInterface);
-    getFromEmail(email: string): Promise<import("./types/Persisted").Persisted<import("./types/Persisted").Persisted<User>>>;
+    getFromEmail(email: string): Promise<UserType>;
 }

package/lib/components/UserRepository.js

@@ -19,11 +19,11 @@ const User_1 = require("./User");
 const UNAUTHORIZED_ERROR = `Wrong password or email`;
 class UserRepository extends BaseRepository_1.default {
     constructor(backendAdapter) {
-        super(User_1.UserCore, backendAdapter);
+        super(User_1.User, backendAdapter);
     }
     getFromEmail(email) {
         return __awaiter(this, void 0, void 0, function* () {
-            const query = new backends_1.Query(User_1.UserCore);
+            const query = new backends_1.Query(User_1.User);
             query.where('email', email).batch(1);
             const { items } = yield this.query(query);
             if (items.length == 0) {

package/lib/components/index.d.ts

@@ -5,6 +5,6 @@ import { AbstractObject } from './AbstractObject';
 import { BaseObjectCore } from './BaseObjectCore';
 import { BaseObjectProperties } from './BaseObject';
 import BaseRepository from './BaseRepository';
-import { UserCore, UserProperties } from './User';
+import { User, UserProperties } from './User';
 import { Entity } from './Entity';
-export { DataObject, DataObjectParams, DataObjectClass, ObjectUri, AbstractObject, BaseObjectCore, BaseRepository, UserCore, Entity, BaseObjectProperties, UserProperties, };
+export { DataObject, DataObjectParams, DataObjectClass, ObjectUri, AbstractObject, BaseObjectCore, BaseRepository, User, Entity, BaseObjectProperties, UserProperties, };

package/lib/components/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UserProperties = exports.BaseObjectProperties = exports.UserCore = exports.BaseRepository = exports.BaseObjectCore = exports.AbstractObject = exports.ObjectUri = exports.DataObject = void 0;
+exports.UserProperties = exports.BaseObjectProperties = exports.Entity = exports.User = exports.BaseRepository = exports.BaseObjectCore = exports.AbstractObject = exports.ObjectUri = exports.DataObject = void 0;
 const DataObject_1 = require("./DataObject");
 Object.defineProperty(exports, "DataObject", { enumerable: true, get: function () { return DataObject_1.DataObject; } });
 const ObjectUri_1 = require("./ObjectUri");
@@ -17,5 +17,7 @@ Object.defineProperty(exports, "BaseObjectProperties", { enumerable: true, get:
 const BaseRepository_1 = __importDefault(require("./BaseRepository"));
 exports.BaseRepository = BaseRepository_1.default;
 const User_1 = require("./User");
-Object.defineProperty(exports, "UserCore", { enumerable: true, get: function () { return User_1.UserCore; } });
+Object.defineProperty(exports, "User", { enumerable: true, get: function () { return User_1.User; } });
 Object.defineProperty(exports, "UserProperties", { enumerable: true, get: function () { return User_1.UserProperties; } });
+const Entity_1 = require("./Entity");
+Object.defineProperty(exports, "Entity", { enumerable: true, get: function () { return Entity_1.Entity; } });

package/lib/components/types/DataObjectClass.d.ts

@@ -1,3 +1,4 @@
+import { PropertyClassType } from '../../properties/types/PropertyClassType';
 import { ObjectUri } from '../ObjectUri';
 export interface DataObjectClass<T extends DataObjectClass<any>> {
     uri: ObjectUri;
@@ -7,6 +8,7 @@ export interface DataObjectClass<T extends DataObjectClass<any>> {
     class: any;
     properties: any;
     setProperties(properties: any): void;
+    addProperty(property: PropertyClassType): void;
     populate(data?: any): Promise<T>;
     isPopulated(): boolean;
     isPersisted(): boolean;

package/lib/components/types/RepositoryClass.d.ts

@@ -1,4 +1,4 @@
-import { BackendInterface } from '../../backends/AbstractAdapter';
+import { BackendInterface } from '../../backends/types/BackendInterface';
 import { Query } from '../../backends/Query';
 import { BaseObjectCore } from '../BaseObjectCore';
 import { BaseObject } from '../BaseObject';

package/lib/index.d.ts

@@ -17,13 +17,17 @@ import { BaseObjectCore } from './components/BaseObjectCore';
 import { BaseObject, BaseObjectProperties } from './components/BaseObject';
 import { Proxy } from './components/types/ProxyConstructor';
 import { InjectMetaMiddleware } from './backends/middlewares/InjectMetaMiddleware';
+import { InjectKeywordsMiddleware } from './backends/middlewares/InjectKeywordsMiddleware';
 import RepositoryClass from './components/types/RepositoryClass';
 import BaseRepository from './components/BaseRepository';
+import { BackendAction, BackendParameters, BackendParametersKeys, BackendRecordType } from './Backend';
 import Middleware from './backends/middlewares/Middleware';
-import { User } from './components/User';
+import { UserType, User } from './components/User';
 import UserRepository from './components/UserRepository';
 import { Entity } from './components/Entity';
 import EntityRepository from './components/EntityRepository';
-import { AbstractAdapter, MockAdapter, BackendError, BackendParameters, Query, Filter, Filters, Limits, Sorting, SortAndLimit } from './backends';
+import { AuthAction, AuthParameters, AuthParametersKeys } from './Auth';
+import { AuthInterface, AbstractAuthAdapter, AuthenticationError } from './authentication';
+import { AbstractAdapter, MockAdapter, BackendError, Query, QueryMetaType, QueryResultType, Filter, Filters, Limits, Sorting, SortAndLimit } from './backends';
 import { BadRequestError, UnauthorizedError, ForbiddenError, NotFoundError, GoneError } from './common/ResourcesErrors';
-export { statuses, utils, Core, Property, BaseProperty, BasePropertyType, BooleanProperty, BooleanPropertyType, DateTimeProperty, DateTimePropertyType, EnumProperty, EnumPropertyType, HashProperty, HashPropertyType, ObjectProperty, ObjectPropertyType, StringProperty, StringPropertyType, AbstractAdapter, RepositoryClass, MockAdapter, ObjectUri, DataObjectClass, DataObject, AbstractObject, BaseObject, BaseObjectCore, BaseObjectProperties, BackendParameters, BaseRepository, BackendError, Query, Filter, Filters, Limits, Sorting, SortAndLimit, Middleware, InjectMetaMiddleware, User, Proxy, UserRepository, Entity, EntityRepository, BadRequestError, UnauthorizedError, ForbiddenError, NotFoundError, GoneError, };
+export { statuses, utils, Core, Property, BaseProperty, BasePropertyType, BooleanProperty, BooleanPropertyType, DateTimeProperty, DateTimePropertyType, EnumProperty, EnumPropertyType, HashProperty, HashPropertyType, ObjectProperty, ObjectPropertyType, StringProperty, StringPropertyType, AbstractAdapter, RepositoryClass, MockAdapter, ObjectUri, DataObjectClass, DataObject, AbstractObject, BaseObject, BaseObjectCore, BaseObjectProperties, AuthAction, AuthParameters, AuthParametersKeys, AuthInterface, AbstractAuthAdapter, AuthenticationError, BackendParameters, BackendParametersKeys, BackendRecordType, BackendAction, BaseRepository, BackendError, Query, QueryMetaType, QueryResultType, Filter, Filters, Limits, Sorting, SortAndLimit, Middleware, InjectMetaMiddleware, InjectKeywordsMiddleware, User, UserType, Proxy, UserRepository, Entity, EntityRepository, BadRequestError, UnauthorizedError, ForbiddenError, NotFoundError, GoneError, };

package/lib/index.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GoneError = exports.NotFoundError = exports.ForbiddenError = exports.UnauthorizedError = exports.BadRequestError = exports.EntityRepository = exports.UserRepository = exports.InjectMetaMiddleware = exports.SortAndLimit = exports.Sorting = exports.Limits = exports.Filters = exports.Filter = exports.Query = exports.BackendError = exports.BaseRepository = exports.BaseObjectProperties = exports.BaseObjectCore = exports.AbstractObject = exports.DataObject = exports.ObjectUri = exports.MockAdapter = exports.AbstractAdapter = exports.StringProperty = exports.ObjectProperty = exports.HashProperty = exports.EnumProperty = exports.DateTimeProperty = exports.BooleanProperty = exports.BaseProperty = exports.Property = exports.Core = exports.utils = exports.statuses = void 0;
+exports.GoneError = exports.NotFoundError = exports.ForbiddenError = exports.UnauthorizedError = exports.BadRequestError = exports.EntityRepository = exports.Entity = exports.UserRepository = exports.User = exports.InjectKeywordsMiddleware = exports.InjectMetaMiddleware = exports.SortAndLimit = exports.Sorting = exports.Limits = exports.Filters = exports.Filter = exports.Query = exports.BackendError = exports.BaseRepository = exports.BackendAction = exports.AuthenticationError = exports.AbstractAuthAdapter = exports.AuthAction = exports.BaseObjectProperties = exports.BaseObjectCore = exports.AbstractObject = exports.DataObject = exports.ObjectUri = exports.MockAdapter = exports.AbstractAdapter = exports.StringProperty = exports.ObjectProperty = exports.HashProperty = exports.EnumProperty = exports.DateTimeProperty = exports.BooleanProperty = exports.BaseProperty = exports.Property = exports.Core = exports.utils = exports.statuses = void 0;
 const Core_1 = require("./Core");
 Object.defineProperty(exports, "Core", { enumerable: true, get: function () { return Core_1.Core; } });
 const statuses = __importStar(require("./common/statuses"));
@@ -61,12 +61,25 @@ const BaseObject_1 = require("./components/BaseObject");
 Object.defineProperty(exports, "BaseObjectProperties", { enumerable: true, get: function () { return BaseObject_1.BaseObjectProperties; } });
 const InjectMetaMiddleware_1 = require("./backends/middlewares/InjectMetaMiddleware");
 Object.defineProperty(exports, "InjectMetaMiddleware", { enumerable: true, get: function () { return InjectMetaMiddleware_1.InjectMetaMiddleware; } });
+const InjectKeywordsMiddleware_1 = require("./backends/middlewares/InjectKeywordsMiddleware");
+Object.defineProperty(exports, "InjectKeywordsMiddleware", { enumerable: true, get: function () { return InjectKeywordsMiddleware_1.InjectKeywordsMiddleware; } });
 const BaseRepository_1 = __importDefault(require("./components/BaseRepository"));
 exports.BaseRepository = BaseRepository_1.default;
+const Backend_1 = require("./Backend");
+Object.defineProperty(exports, "BackendAction", { enumerable: true, get: function () { return Backend_1.BackendAction; } });
+const User_1 = require("./components/User");
+Object.defineProperty(exports, "User", { enumerable: true, get: function () { return User_1.User; } });
 const UserRepository_1 = __importDefault(require("./components/UserRepository"));
 exports.UserRepository = UserRepository_1.default;
+const Entity_1 = require("./components/Entity");
+Object.defineProperty(exports, "Entity", { enumerable: true, get: function () { return Entity_1.Entity; } });
 const EntityRepository_1 = __importDefault(require("./components/EntityRepository"));
 exports.EntityRepository = EntityRepository_1.default;
+const Auth_1 = require("./Auth");
+Object.defineProperty(exports, "AuthAction", { enumerable: true, get: function () { return Auth_1.AuthAction; } });
+const authentication_1 = require("./authentication");
+Object.defineProperty(exports, "AbstractAuthAdapter", { enumerable: true, get: function () { return authentication_1.AbstractAuthAdapter; } });
+Object.defineProperty(exports, "AuthenticationError", { enumerable: true, get: function () { return authentication_1.AuthenticationError; } });
 const backends_1 = require("./backends");
 Object.defineProperty(exports, "AbstractAdapter", { enumerable: true, get: function () { return backends_1.AbstractAdapter; } });
 Object.defineProperty(exports, "MockAdapter", { enumerable: true, get: function () { return backends_1.MockAdapter; } });

package/lib/properties/CollectionProperty.d.ts

@@ -1,5 +1,5 @@
 import { BaseProperty, BasePropertyType } from './BaseProperty';
-import { Query } from '../backends/Query';
+import { Query, QueryResultType } from '../backends/Query';
 import { Filter } from '../backends/Filter';
 import { ObjectUri } from '../components/ObjectUri';
 import { returnAs } from '../backends/Query';
@@ -28,6 +28,6 @@ export declare class CollectionProperty extends BaseProperty {
      * @returns
      */
     get(filters?: Filter[] | undefined): Query<any>;
-    val(transform?: returnAs): Promise<Array<any> | Array<DataObjectClass<any>> | Array<ObjectUri>>;
+    val(transform?: returnAs): Promise<QueryResultType<any>>;
     toJSON(): any[] | DataObjectClass<any>[] | ObjectUri[] | undefined;
 }

package/lib/properties/HashProperty.d.ts

@@ -16,6 +16,12 @@ export declare class HashProperty extends StringProperty {
     protected _prefixed: boolean;
     constructor(config: HashPropertyType);
     _hash(value: string): string;
+    /**
+     * Never return the password which is hashed anyway
+     * @param transform
+     * @returns
+     */
+    get(transform?: string | undefined): string | undefined;
     set(value: string): this;
     compare(value: string): boolean;
 }

package/lib/properties/HashProperty.js

@@ -34,6 +34,14 @@ class HashProperty extends StringProperty_1.StringProperty {
         this._rawValue = false; // don't test some constraints after hashing
         return hash;
     }
+    /**
+     * Never return the password which is hashed anyway
+     * @param transform
+     * @returns
+     */
+    get(transform) {
+        return;
+    }
     set(value) {
         return super.set(this._hash(value));
     }

package/lib/properties/types/PropertyClassType.d.ts

@@ -1,5 +1,6 @@
 import { AbstractPropertyType } from './AbstractPropertyType';
 export interface PropertyClassType {
+    name: string;
     set(value: any): AbstractPropertyType;
     val(transform?: any): any;
     toJSON(): any;

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@quatrain/core",
-   "version": "1.0.0-beta1",
+   "version": "1.0.0-beta3",
    "description": "Core objects for business apps",
    "main": "lib/index.js",
    "types": "lib/index.d.ts",
@@ -30,4 +30,4 @@
       "push": "yarn publish --access public",
       "prepublish": "tsc"
    }
-}
+}