@quatrain/core 0.5.6 → 1.0.0-beta1

package/lib/Backend.js

@@ -1,15 +1,6 @@
 "use strict";
-// export const CREATE = 'create'
-// export const READ = 'read'
-// export const UPDATE = 'update'
-// export const DELETE = 'delete'
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BackendAction = void 0;
-// export type BackendActions =
-//    | typeof CREATE
-//    | typeof READ
-//    | typeof UPDATE
-//    | typeof DELETE
 var BackendAction;
 (function (BackendAction) {
     BackendAction["CREATE"] = "create";

package/lib/Core.d.ts

@@ -14,6 +14,7 @@ export declare class Core {
         (...data: any[]): void;
         (message?: any, ...optionalParams: any[]): void;
     };
+    static timestamp: () => string;
     protected static _backends: BackendRegistry<any>;
     static definition(key: string): {
         manifest: {
@@ -23,6 +24,8 @@ export declare class Core {
     };
     static addBackend(backend: AbstractAdapter, alias: string, setDefault?: boolean): void;
     static getBackend<T extends AbstractAdapter>(alias?: string): T;
+    static addClass(name: string, obj: any): void;
+    static getClass(name: string): any;
     /**
      * Returns the class to use for a data object
      * This is currently just a stub that will be implemented from config in the future
@@ -36,4 +39,5 @@ export declare class Core {
      * @param level string
      */
     static log(message: string, src?: string, level?: string): void;
+    static getObject(): void;
 }

package/lib/Core.js

@@ -25,6 +25,12 @@ class Core {
             throw new Error(`Unknown backend alias: '${alias}'`);
         }
     }
+    static addClass(name, obj) {
+        Core.classRegistry[name] = obj;
+    }
+    static getClass(name) {
+        return Core.classRegistry[name];
+    }
     /**
      * Returns the class to use for a data object
      * This is currently just a stub that will be implemented from config in the future
@@ -42,9 +48,12 @@ class Core {
     static log(message, src = 'Core', level = 'NOTICE') {
         Core.logger(`${Date.now()} - [${src}] ${message}`);
     }
+    static getObject() { }
 }
 exports.Core = Core;
 Core.defaultBackend = '@default';
 Core.classRegistry = {};
 Core.logger = console.log;
+// How timestamp are formatted
+Core.timestamp = () => (new Date().toISOString());
 Core._backends = {};

package/lib/backends/AbstractAdapter.d.ts

@@ -52,7 +52,7 @@ export declare abstract class AbstractAdapter implements BackendInterface {
     set alias(alias: string);
     get alias(): string;
     getCollection(dao: DataObjectClass<any>): string | undefined;
-    abstract create(dataObject: DataObjectClass<any>): Promise<DataObjectClass<any>>;
+    abstract create(dataObject: DataObjectClass<any>, desiredUid?: string | undefined): Promise<DataObjectClass<any>>;
     abstract read(dataObject: DataObjectClass<any>): Promise<DataObjectClass<any>>;
     abstract update(dataObject: DataObjectClass<any>): Promise<DataObjectClass<any>>;
     abstract delete(dataObject: DataObjectClass<any>): Promise<DataObjectClass<any>>;

package/lib/backends/Query.d.ts

@@ -13,7 +13,8 @@ export declare const AS_INSTANCES = "classInstances";
 export declare enum returnAs {
     AS_OBJECTURIS = "objectUris",
     AS_DATAOBJECTS = "dataObjects",
-    AS_INSTANCES = "classInstances"
+    AS_INSTANCES = "classInstances",
+    AS_IS = "asIs"
 }
 export declare class Query<T extends typeof BaseObjectCore> {
     protected _obj: T;
@@ -34,5 +35,5 @@ export declare class Query<T extends typeof BaseObjectCore> {
     fetch(backend?: BackendInterface): Promise<DataObjectClass<any>[]>;
     fetchAsUri(backend?: BackendInterface): Promise<ObjectUri[]>;
     fetchAsInstances(backend?: BackendInterface): Promise<Persisted<BaseObject>[]>;
-    execute(as?: returnAs, backend?: BackendInterface): Promise<DataObjectClass<any>[] | ObjectUri[] | Persisted<BaseObject>[]>;
+    execute(as?: returnAs, backend?: BackendInterface): Promise<any[]>;
 }

package/lib/backends/Query.js

@@ -23,6 +23,7 @@ var returnAs;
     returnAs["AS_OBJECTURIS"] = "objectUris";
     returnAs["AS_DATAOBJECTS"] = "dataObjects";
     returnAs["AS_INSTANCES"] = "classInstances";
+    returnAs["AS_IS"] = "asIs";
 })(returnAs || (exports.returnAs = returnAs = {}));
 class Query {
     constructor(obj, params = {}) {
@@ -95,6 +96,7 @@ class Query {
     }
     execute(as = returnAs.AS_DATAOBJECTS, backend = Core_1.Core.getBackend()) {
         return __awaiter(this, void 0, void 0, function* () {
+            //<DataObjectClass<any>[] | ObjectUri[] | Persisted<BaseObject>[]> {
             //</any><Array<T2> | Array<DataObject> | Array<ObjectUri>> {
             try {
                 switch (as) {

package/lib/backends/middlewares/InjectMetaMiddleware.d.ts

@@ -1,13 +1,12 @@
 import { DataObjectClass } from '../../components';
 import { BackendAction } from '../../Backend';
-import { User } from '../../components/User';
+import { UserCore } from '../../components/User';
 import Middleware from './Middleware';
-import { Proxy } from '../../components/types/ProxyConstructor';
 export interface InjectMetaMiddlewareParams {
-    user: Proxy<User>;
+    user: UserCore;
 }
 export declare class InjectMetaMiddleware implements Middleware {
-    protected _user: Proxy<User>;
+    protected _user: UserCore;
     constructor(params: InjectMetaMiddlewareParams);
     execute(dataObject: DataObjectClass<any>, action: BackendAction): void;
 }

package/lib/backends/middlewares/InjectMetaMiddleware.js

@@ -10,15 +10,15 @@ class InjectMetaMiddleware {
         switch (action) {
             // add properties existence validation
             case Backend_1.BackendAction.CREATE:
-                dataObject.set('createdBy', this._user.core.dataObject.uri);
+                dataObject.set('createdBy', this._user);
                 dataObject.set('createdAt', Date.now());
                 break;
             case Backend_1.BackendAction.UPDATE:
-                dataObject.set('updatedBy', this._user.core.dataObject.uri);
+                dataObject.set('updatedBy', this._user);
                 dataObject.set('updatedAt', Date.now());
                 break;
             case Backend_1.BackendAction.DELETE:
-                dataObject.set('deletedBy', this._user.core.dataObject.uri);
+                dataObject.set('deletedBy', this._user);
                 dataObject.set('deletedAt', Date.now());
                 break;
             default:

package/lib/common/statuses.d.ts

@@ -1,5 +1,6 @@
 export declare const CREATED = "created";
 export declare const PENDING = "pending";
+export declare const QUEUED = "queued";
 export declare const ACTIVE = "active";
 export declare const ERROR = "error";
 export declare const TEST = "test";

package/lib/common/statuses.js

@@ -1,8 +1,9 @@
 "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.PENDING = exports.CREATED = void 0;
+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.CREATED = 'created';
 exports.PENDING = 'pending';
+exports.QUEUED = 'queued';
 exports.ACTIVE = 'active';
 exports.ERROR = 'error';
 exports.TEST = 'test';

package/lib/components/AbstractObject.d.ts

@@ -6,6 +6,11 @@ export declare abstract class AbstractObject {
     static LABEL_KEY: string;
     protected _dataObject: DataObjectClass<any>;
     constructor(dao: DataObjectClass<any>);
+    /**
+     * Return property object matching key
+     * @param key string
+     * @returns
+     */
     get(key: string): any;
     set(key: string, val: any): any;
     val(key: string): any;
@@ -13,6 +18,7 @@ export declare abstract class AbstractObject {
     get path(): string;
     get uid(): any;
     get dataObject(): DataObjectClass<any>;
+    get _(): any;
     get uri(): import("./ObjectUri").ObjectUri;
     toJSON(): {
         backend: string;

package/lib/components/AbstractObject.js

@@ -14,6 +14,11 @@ class AbstractObject {
     constructor(dao) {
         this._dataObject = dao;
     }
+    /**
+     * Return property object matching key
+     * @param key string
+     * @returns
+     */
     get(key) {
         return this._dataObject.get(key);
     }
@@ -41,6 +46,9 @@ class AbstractObject {
     get dataObject() {
         return this._dataObject;
     }
+    get _() {
+        return this._dataObject.asProxy();
+    }
     get uri() {
         return this._dataObject.uri;
     }

package/lib/components/BaseObject.js

@@ -51,6 +51,8 @@ exports.BaseObjectProperties = [
         ],
         defaultValue: statuses.CREATED,
     },
+    // the following properties may be optionally
+    // populated with a backend middleware
     {
         name: 'createdBy',
         type: ObjectProperty_1.ObjectProperty.TYPE,

package/lib/components/BaseObjectCore.d.ts

@@ -39,7 +39,7 @@ export declare class BaseObjectCore extends AbstractObject implements BaseObject
      * @param child
      * @returns
      */
-    static fromObject<T extends BaseObject>(src: T, child?: any): Proxy<T>;
+    static fromObject<T extends BaseObject>(src: T, child?: any): any;
     static factory(src?: string | ObjectUri | BaseObject | undefined, child?: any): Promise<any>;
     /**
      * Fetches an object from its backend path
@@ -52,7 +52,11 @@ export declare class BaseObjectCore extends AbstractObject implements BaseObject
      * @param dao
      * @returns
      */
-    static fromDataObject<T extends BaseObject>(dao: DataObjectClass<any>): T;
+    static fromDataObject<T extends BaseObject>(dao: DataObjectClass<any>): any;
+    /**
+     * Wrap instance into proxy to get access to properties
+     * @returns Proxy
+     */
     protected toProxy<T extends BaseObject>(): Proxy<Proxy<T>>;
     asReference(): any;
     query(): Query<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();
+        return obj; //.toProxy() as Proxy<T>
     }
     static factory(src = undefined, child = this) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -100,8 +100,12 @@ class BaseObjectCore extends AbstractObject_1.AbstractObject {
      */
     static fromDataObject(dao) {
         const obj = new this(dao);
-        return obj.toProxy();
+        return obj; //.toProxy()
     }
+    /**
+     * Wrap instance into proxy to get access to properties
+     * @returns Proxy
+     */
     toProxy() {
         return new ProxyConstructor_1.ProxyConstructor(this, {
             get: (target, prop) => {
@@ -140,6 +144,7 @@ class BaseObjectCore extends AbstractObject_1.AbstractObject {
         });
     }
     asReference() {
+        console.log(this._dataObject.toReference());
         return this._dataObject.toReference();
     }
     query() {

package/lib/components/BaseObjectProperties.d.ts

@@ -0,0 +1,13 @@
+import { UserClass } from './types/UserClass';
+import { ObjectUri } from './ObjectUri';
+export interface BaseObjectType {
+    name: string;
+    status: string;
+    createdBy?: UserClass | ObjectUri;
+    createdAt?: number;
+    updatedBy?: UserClass | ObjectUri;
+    updatedAt?: number;
+    deletedBy?: UserClass | ObjectUri;
+    deletedAt?: number;
+}
+export declare const BaseObjectProperties: any;

package/lib/components/BaseObjectProperties.js

@@ -0,0 +1,87 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseObjectProperties = void 0;
+const statuses = __importStar(require("../statuses"));
+const StringProperty_1 = require("../properties/StringProperty");
+const ObjectProperty_1 = require("../properties/ObjectProperty");
+const EnumProperty_1 = require("../properties/EnumProperty");
+const DateTimeProperty_1 = require("../properties/DateTimeProperty");
+const htmlType = __importStar(require("../properties/types/PropertyHTMLType"));
+exports.BaseObjectProperties = [
+    {
+        name: 'name',
+        mandatory: true,
+        type: StringProperty_1.StringProperty.TYPE,
+        minLength: 1,
+        maxLength: 100,
+        htmlType: htmlType.NAME,
+    },
+    {
+        name: 'status',
+        mandatory: true,
+        type: EnumProperty_1.EnumProperty.TYPE,
+        values: [
+            statuses.CREATED,
+            statuses.PENDING,
+            statuses.ACTIVE,
+            statuses.DELETED,
+        ],
+        defaultValue: statuses.CREATED,
+    },
+    {
+        name: 'createdBy',
+        type: ObjectProperty_1.ObjectProperty.TYPE,
+        instanceOf: 'User',
+        mandatory: true,
+        protected: true,
+    },
+    {
+        name: 'createdAt',
+        type: DateTimeProperty_1.DateTimeProperty.TYPE,
+        mandatory: true,
+        protected: true,
+    },
+    {
+        name: 'updatedBy',
+        type: ObjectProperty_1.ObjectProperty.TYPE,
+        instanceOf: 'User',
+    },
+    {
+        name: 'updatedAt',
+        type: DateTimeProperty_1.DateTimeProperty.TYPE,
+    },
+    {
+        name: 'deletedBy',
+        type: ObjectProperty_1.ObjectProperty.TYPE,
+        instanceOf: 'User',
+        protected: true,
+    },
+    {
+        name: 'deletedAt',
+        type: DateTimeProperty_1.DateTimeProperty.TYPE,
+        protected: true,
+    },
+];

package/lib/components/BaseRepository.d.ts

@@ -3,7 +3,6 @@ import { Query } from '../backends/Query';
 import { BaseObjectCore } from './BaseObjectCore';
 import { DataObjectClass } from './types/DataObjectClass';
 import Payload from './types/Payload';
-import RepositoryClass from './types/RepositoryClass';
 import { BaseObject } from './BaseObject';
 import { Persisted } from './types/Persisted';
 import { Proxy } from './types/ProxyConstructor';
@@ -11,13 +10,13 @@ import { Proxy } from './types/ProxyConstructor';
  * CRUD methods for models/entities inheriting from BaseObject
  * Extend this by passing the typeof of the desired class to the constructor
  */
-export default class BaseRepository<T extends BaseObject> implements RepositoryClass<T> {
-    protected model: typeof BaseObjectCore;
+export default class BaseRepository<T extends BaseObject> {
+    protected _model: typeof BaseObjectCore;
     backendAdapter: BackendInterface;
     constructor(model: typeof BaseObjectCore, backendAdapter?: BackendInterface);
     protected getDataObjectFromUid(uid: string): Promise<DataObjectClass<any>>;
-    create(obj: Proxy<T>, uid?: string): Promise<Persisted<T>>;
-    read(uid: string): Promise<Persisted<T>>;
+    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>>>;

package/lib/components/BaseRepository.js

@@ -43,15 +43,15 @@ const RESOURCE_GONE_ERROR = `The resource you are trying to access has been dele
  */
 class BaseRepository {
     constructor(model, backendAdapter = Core_1.Core.getBackend()) {
-        this.model = model;
+        this._model = model;
         this.backendAdapter = backendAdapter;
     }
     getDataObjectFromUid(uid) {
         return __awaiter(this, void 0, void 0, function* () {
-            const collection = this.model.COLLECTION || this.model.name.toLowerCase();
+            const collection = this._model.COLLECTION || this._model.name.toLowerCase();
             const path = `${collection}/${uid}`;
-            const dataObject = yield DataObject_1.DataObject.factory({
-                properties: this.model.PROPS_DEFINITION,
+            const dataObject = DataObject_1.DataObject.factory({
+                properties: this._model.PROPS_DEFINITION,
                 uri: path,
             });
             dataObject.uid = uid;
@@ -60,17 +60,18 @@ class BaseRepository {
     }
     create(obj, uid) {
         return __awaiter(this, void 0, void 0, function* () {
-            const dataObject = obj.core.dataObject;
-            const savedObj = yield this.backendAdapter.create(dataObject, uid);
-            return this.model.fromDataObject(savedObj);
+            const savedObj = yield this.backendAdapter.create(obj.dataObject, uid);
+            return this._model.fromDataObject(savedObj); //as Persisted<T>
         });
     }
-    read(uid) {
+    read(key) {
         return __awaiter(this, void 0, void 0, function* () {
+            const uid = key.indexOf('/') !== -1 ? key.substring(key.lastIndexOf('/') + 1) : key;
             try {
                 const dataObject = yield this.getDataObjectFromUid(uid);
                 const response = yield this.backendAdapter.read(dataObject);
-                const obj = this.model.fromDataObject(response);
+                const obj = this._model.fromDataObject(response);
+                // TODO should be moved to the backend middleware
                 if (obj.status === statuses.DELETED) {
                     throw new ResourcesErrors_1.GoneError(RESOURCE_GONE_ERROR);
                 }
@@ -91,7 +92,7 @@ class BaseRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const dataObject = obj.core.dataObject;
             const savedObj = yield this.backendAdapter.update(dataObject);
-            return this.model.fromDataObject(savedObj);
+            return this._model.fromDataObject(savedObj);
         });
     }
     delete(uid) {

package/lib/components/DataObject.d.ts

@@ -26,6 +26,7 @@ export declare class DataObject implements DataObjectClass<any> {
     protected _properties: Properties;
     protected _persisted: boolean;
     protected _populated: boolean;
+    protected _proxied: any;
     /**
      * Has data been modified since last backend operation?
      */
@@ -36,6 +37,11 @@ export declare class DataObject implements DataObjectClass<any> {
      */
     protected constructor(params: DataObjectParams | undefined);
     protected _init(properties: any[]): void;
+    /**
+     * Wrap instance into proxy to get access to properties
+     * @returns Proxy
+     */
+    asProxy(): this;
     setProperties(properties: Properties): void;
     /**
      * Populate data object from instant data or backend query
@@ -81,7 +87,7 @@ export declare class DataObject implements DataObjectClass<any> {
      * @param key string
      * @returns any
      */
-    val(key: string): any;
+    val(key: string, transform?: string | undefined): any;
     toJSON(objectsAsReferences?: boolean): {
         [x: string]: any;
     };

package/lib/components/DataObject.js

@@ -52,6 +52,24 @@ class DataObject {
             this._properties[prop.name] = Property_1.Property.factory(prop, this);
         });
     }
+    /**
+     * Wrap instance into proxy to get access to properties
+     * @returns Proxy
+     */
+    asProxy() {
+        return new Proxy(this, {
+            get: (target, prop) => {
+                return target.val(prop);
+            },
+            set(target, prop, newValue) {
+                if (prop === 'uid' || prop === 'core') {
+                    throw new Error(`Property '${prop}' is readonly`);
+                }
+                target.set(prop, newValue);
+                return true;
+            },
+        });
+    }
     setProperties(properties) {
         // TODO check if doable
         this._properties = properties;
@@ -195,9 +213,9 @@ class DataObject {
      * @param key string
      * @returns any
      */
-    val(key) {
+    val(key, transform = undefined) {
         if (this.has(key)) {
-            return Reflect.get(this._properties, key).val();
+            return Reflect.get(this._properties, key).val(transform);
         }
         else {
             throw new Error(`Unknown property '${key}'`);
@@ -221,7 +239,7 @@ class DataObject {
                     const value = prop.val();
                     Reflect.set(data, key, value
                         ? objectsAsReferences && !(value instanceof ObjectUri_1.ObjectUri)
-                            ? value.core.asReference()
+                            ? value.asReference()
                             : value.toJSON
                                 ? value.toJSON()
                                 : value

package/lib/components/EntityProperties.d.ts

@@ -0,0 +1 @@
+export declare const EntityProperties: any;

package/lib/components/EntityProperties.js

@@ -0,0 +1,54 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EntityProperties = void 0;
+const CollectionProperty_1 = require("../properties/CollectionProperty");
+const StringProperty_1 = require("../properties/StringProperty");
+const htmlType = __importStar(require("../properties/types/PropertyHTMLType"));
+const User_1 = require("./User");
+exports.EntityProperties = [
+    {
+        // surcharge property minLength and htmlType
+        name: 'name',
+        type: StringProperty_1.StringProperty.TYPE,
+        mandatory: true,
+        minLength: 1,
+        htmlType: htmlType.ORG,
+    },
+    {
+        name: 'bogus',
+        type: StringProperty_1.StringProperty.TYPE,
+        mandatory: true,
+        minLength: 1,
+        htmlType: htmlType.ORG,
+    },
+    {
+        name: 'users',
+        mandatory: true,
+        type: CollectionProperty_1.CollectionProperty.TYPE,
+        instanceOf: User_1.User,
+        parentKey: 'entity',
+    },
+];

package/lib/components/ObjectUri.js

@@ -48,7 +48,7 @@ class ObjectUri {
             this._label = label || this._uid;
         }
         else {
-            throw new Error('Path parts number must be 1 or even');
+            throw new Error(`Path parts number must be 1 or even, received: '${str}'`);
         }
     }
     set class(objClass) {

package/lib/components/UserProperties.d.ts

@@ -0,0 +1 @@
+export declare const UserProperties: any;

package/lib/components/UserProperties.js

@@ -0,0 +1,103 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserProperties = void 0;
+const properties_1 = require("../properties");
+const HashProperty_1 = require("../properties/HashProperty");
+const StringProperty_1 = require("../properties/StringProperty");
+const Entity_1 = require("./Entity");
+const htmlType = __importStar(require("../properties/types/PropertyHTMLType"));
+/**
+ * Callback function to populate the 'name' property
+ * @param dao DataObject
+ * @returns
+ */
+const onChange = (dao) => dao.set('name', `${dao.val('firstname')} ${dao.val('lastname')}`);
+exports.UserProperties = [
+    {
+        // change name property minLength
+        name: 'name',
+        type: StringProperty_1.StringProperty.TYPE,
+        minLength: 0,
+        fullSearch: true,
+        htmlType: htmlType.NAME,
+    },
+    {
+        name: 'firstname',
+        mandatory: true,
+        type: StringProperty_1.StringProperty.TYPE,
+        minLength: 1,
+        maxLength: 100,
+        htmlType: htmlType.GIVEN_NAME,
+        onChange,
+    },
+    {
+        name: 'lastname',
+        mandatory: true,
+        type: StringProperty_1.StringProperty.TYPE,
+        minLength: 1,
+        maxLength: 100,
+        htmlType: htmlType.FAMILY_NAME,
+        onChange,
+    },
+    {
+        name: 'gender',
+        mandatory: false,
+        type: properties_1.EnumProperty.TYPE,
+        values: ['male', 'female', 'nonbinary'],
+        htmlType: htmlType.GENDER,
+    },
+    {
+        name: 'birthday',
+        mandatory: false,
+        type: properties_1.DateTimeProperty.TYPE,
+        htmlType: htmlType.BIRTHDAY,
+    },
+    {
+        name: 'email',
+        mandatory: true,
+        type: StringProperty_1.StringProperty.TYPE,
+        minLength: 1,
+        maxLength: 100,
+        fullSearch: true,
+        htmlType: htmlType.EMAIL,
+    },
+    {
+        name: 'password',
+        mandatory: true,
+        type: HashProperty_1.HashProperty.TYPE,
+        algorithm: HashProperty_1.HashProperty.ALGORITHM_SHA256,
+        salt: '',
+        minLength: 5,
+        maxLength: 20,
+        htmlType: htmlType.PASSWORD,
+    },
+    {
+        name: 'entity',
+        mandatory: false,
+        type: properties_1.ObjectProperty.TYPE,
+        instanceof: Entity_1.Entity,
+    },
+];

package/lib/components/index.d.ts

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

package/lib/components/index.js

@@ -1,6 +1,9 @@
 "use strict";
+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.BaseObjectCore = exports.AbstractObject = exports.ObjectUri = exports.DataObject = void 0;
+exports.UserProperties = exports.BaseObjectProperties = exports.UserCore = 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");
@@ -11,6 +14,8 @@ const BaseObjectCore_1 = require("./BaseObjectCore");
 Object.defineProperty(exports, "BaseObjectCore", { enumerable: true, get: function () { return BaseObjectCore_1.BaseObjectCore; } });
 const BaseObject_1 = require("./BaseObject");
 Object.defineProperty(exports, "BaseObjectProperties", { enumerable: true, get: function () { return BaseObject_1.BaseObjectProperties; } });
+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, "UserProperties", { enumerable: true, get: function () { return User_1.UserProperties; } });

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

@@ -23,4 +23,5 @@ export interface DataObjectClass<T extends DataObjectClass<any>> {
     populateFromData(data: {
         [x: string]: unknown;
     }): this;
+    asProxy(): any;
 }

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

@@ -18,7 +18,7 @@ export default interface RepositoryClass<T extends BaseObject> {
      * @param uid
      * @returns
      */
-    read(uid: string): Promise<Persisted<T>>;
+    read(uid: string): Promise<any>;
     /**
      * Updates a given object in the collction and returns it
      * @param obj

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

@@ -0,0 +1,3 @@
+import { BaseObjectClass } from './BaseObjectClass';
+export interface UserClass extends BaseObjectClass {
+}

package/lib/components/types/UserClass.js

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

package/lib/index.d.ts

@@ -18,7 +18,7 @@ import { BaseObject, BaseObjectProperties } from './components/BaseObject';
 import { Proxy } from './components/types/ProxyConstructor';
 import { InjectMetaMiddleware } from './backends/middlewares/InjectMetaMiddleware';
 import RepositoryClass from './components/types/RepositoryClass';
-import AbstractRepository from './components/BaseRepository';
+import BaseRepository from './components/BaseRepository';
 import Middleware from './backends/middlewares/Middleware';
 import { User } from './components/User';
 import UserRepository from './components/UserRepository';
@@ -26,4 +26,4 @@ import { Entity } from './components/Entity';
 import EntityRepository from './components/EntityRepository';
 import { AbstractAdapter, MockAdapter, BackendError, BackendParameters, Query, 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, AbstractRepository, MockAdapter, ObjectUri, DataObjectClass, DataObject, AbstractObject, BaseObject, BaseObjectCore, BaseObjectProperties, BackendParameters, 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, BackendParameters, BaseRepository, BackendError, Query, Filter, Filters, Limits, Sorting, SortAndLimit, Middleware, InjectMetaMiddleware, User, 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.BaseObjectProperties = exports.BaseObjectCore = exports.AbstractObject = exports.DataObject = exports.ObjectUri = exports.MockAdapter = exports.AbstractRepository = 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.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;
 const Core_1 = require("./Core");
 Object.defineProperty(exports, "Core", { enumerable: true, get: function () { return Core_1.Core; } });
 const statuses = __importStar(require("./common/statuses"));
@@ -62,7 +62,7 @@ Object.defineProperty(exports, "BaseObjectProperties", { enumerable: true, get:
 const InjectMetaMiddleware_1 = require("./backends/middlewares/InjectMetaMiddleware");
 Object.defineProperty(exports, "InjectMetaMiddleware", { enumerable: true, get: function () { return InjectMetaMiddleware_1.InjectMetaMiddleware; } });
 const BaseRepository_1 = __importDefault(require("./components/BaseRepository"));
-exports.AbstractRepository = BaseRepository_1.default;
+exports.BaseRepository = BaseRepository_1.default;
 const UserRepository_1 = __importDefault(require("./components/UserRepository"));
 exports.UserRepository = UserRepository_1.default;
 const EntityRepository_1 = __importDefault(require("./components/EntityRepository"));

package/lib/properties/BaseProperty.js

@@ -52,7 +52,7 @@ class BaseProperty {
         return this;
     }
     val(transform = undefined) {
-        return transform ? transform(this._value) : this._value;
+        return transform ? transform(this._value) : this._value || this._defaultValue;
     }
     _enable(value) {
         return value === undefined || value === true;

package/lib/properties/ObjectProperty.d.ts

@@ -1,15 +1,15 @@
-import { BaseObject } from '../components/BaseObject';
 import { ObjectUri } from '../components/ObjectUri';
 import { BaseProperty, BasePropertyType } from './BaseProperty';
-import { Proxy } from '../components/types/ProxyConstructor';
+import { BaseObjectClass } from '../components/types/BaseObjectClass';
 export interface ObjectPropertyType extends BasePropertyType {
-    instanceOf?: Function | string | Object;
+    instanceOf: any;
 }
 export declare class ObjectProperty extends BaseProperty {
     static TYPE: string;
-    _value: Proxy<BaseObject> | ObjectUri | undefined;
-    _instanceOf: Function | string | Object;
+    _value: BaseObjectClass | ObjectUri | undefined;
+    _instanceOf: any;
     constructor(config: ObjectPropertyType);
+    val(transform?: string | undefined): any;
     set(value: object): this;
     toJSON(): any;
 }

package/lib/properties/ObjectProperty.js

@@ -4,11 +4,64 @@ exports.ObjectProperty = void 0;
 const DataObject_1 = require("../components/DataObject");
 const ObjectUri_1 = require("../components/ObjectUri");
 const BaseProperty_1 = require("./BaseProperty");
+const Query_1 = require("../backends/Query");
+const Core_1 = require("../Core");
 class ObjectProperty extends BaseProperty_1.BaseProperty {
     constructor(config) {
         super(config);
         this._value = undefined;
-        this._instanceOf = config.instanceOf || Object;
+        this._instanceOf = config.instanceOf;
+    }
+    val(transform = undefined) {
+        if (typeof this._instanceOf === 'string') {
+            console.log(`Getting instance from string ${this._instanceOf}`);
+            this._instanceOf = Core_1.Core.getClass(this._instanceOf);
+            //throw new Error(`Parameter 'instanceOf' was not properly setted`)
+        }
+        if (!this._value) {
+            return this._defaultValue;
+        }
+        switch (transform) {
+            case Query_1.returnAs.AS_DATAOBJECTS:
+                if (this._value instanceof DataObject_1.DataObject) {
+                    console.log(`Returning already existing dataObject`);
+                    return this._value;
+                }
+                else if (this._value instanceof ObjectUri_1.ObjectUri) {
+                    console.log(`Converting objectUri -> dataObject`);
+                    return DataObject_1.DataObject.factory({
+                        properties: Reflect.get(this._instanceOf, 'PROPS_DEFINITION'),
+                        uri: this._value,
+                    });
+                }
+                else {
+                    console.log(`Converting instance -> dataObject`);
+                    return this._value.dataObject;
+                }
+            case Query_1.returnAs.AS_INSTANCES:
+                if (this._value instanceof DataObject_1.DataObject) {
+                    console.log(`Converting dataObject -> instance`);
+                    return Reflect.construct(this._instanceOf, [this._value]);
+                }
+                else if (this._value instanceof ObjectUri_1.ObjectUri) {
+                    console.log('ObjectProperty', this);
+                    console.log(`Converting objectUri -> dataObject -> instance`);
+                    console.log(this._instanceOf);
+                    const dao = DataObject_1.DataObject.factory({
+                        properties: Reflect.get(this._instanceOf, 'PROPS_DEFINITION'),
+                        uri: this._value,
+                    });
+                    return Reflect.construct(this._instanceOf, [dao]);
+                }
+                else {
+                    console.log(`Returning already existing instance`);
+                    return this._value;
+                }
+                return this._value;
+            case Query_1.returnAs.AS_OBJECTURIS:
+            default:
+                return this._value;
+        }
     }
     set(value) {
         if (value instanceof ObjectUri_1.ObjectUri &&
@@ -23,8 +76,8 @@ class ObjectProperty extends BaseProperty_1.BaseProperty {
             return this._value.toJSON();
         }
         return this._value &&
-            (this._value.core.dataObject || this._value instanceof DataObject_1.DataObject)
-            ? this._value.core.dataObject.toReference()
+            (this._value.dataObject || this._value instanceof DataObject_1.DataObject)
+            ? this._value.dataObject.toReference()
             : null;
     }
 }

package/lib/properties/Property.d.ts

@@ -1,5 +1,12 @@
 import { DataObjectClass } from '../components/types/DataObjectClass';
-import { BaseProperty, BasePropertyType } from './BaseProperty';
+import { BaseProperty } from './BaseProperty';
+import { BooleanPropertyType } from './BooleanProperty';
+import { DateTimePropertyType } from './DateTimeProperty';
+import { EnumPropertyType } from './EnumProperty';
+import { HashPropertyType } from './HashProperty';
+import { StringPropertyType } from './StringProperty';
+import { NumberPropertyType } from './NumberProperty';
+import { ObjectPropertyType } from './ObjectProperty';
 export declare class Property {
     static TYPE_ANY: string;
     static TYPE_NUMBER: string;
@@ -11,5 +18,5 @@ export declare class Property {
     static TYPE_DATETIME: string;
     static TYPE_ARRAY: string;
     static TYPE_MAP: string;
-    static factory<P extends BasePropertyType>(params: P, parent: DataObjectClass<any>): BaseProperty;
+    static factory(params: ObjectPropertyType & StringPropertyType & NumberPropertyType & EnumPropertyType & BooleanPropertyType & HashPropertyType & DateTimePropertyType, parent: DataObjectClass<any>): BaseProperty;
 }

package/lib/properties/StringProperty.d.ts

@@ -1,6 +1,6 @@
 import { BaseProperty, BasePropertyType } from './BaseProperty';
 export interface StringPropertyType extends BasePropertyType {
-    minLength?: number;
+    minLength: number;
     maxLength?: number;
     allowSpaces?: boolean;
     allowDigits?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@quatrain/core",
-   "version": "0.5.6",
+   "version": "1.0.0-beta1",
    "description": "Core objects for business apps",
    "main": "lib/index.js",
    "types": "lib/index.d.ts",
@@ -26,7 +26,8 @@
    "scripts": {
       "test": "tsc && jest --verbose",
       "build": "tsc --watch",
-      "push": "yarn version --patch --no-git-tag-version ; yarn publish --access public",
+      "patch": "yarn version --patch --no-git-tag-version",
+      "push": "yarn publish --access public",
       "prepublish": "tsc"
    }
-}
+}