@quatrain/core 1.0.2 → 1.1.0

package/lib/components/AbstractObject.d.ts

@@ -15,7 +15,7 @@ export declare abstract class AbstractObject {
     get(key: string): any;
     set(key: string, val: any): any;
     val(key: string): any;
-    get backend(): any;
+    has(key: string): boolean;
     get path(): string;
     get uid(): any;
     get dataObject(): DataObjectClass<any>;

package/lib/components/AbstractObject.js

@@ -22,11 +22,11 @@ class AbstractObject {
             return prop.val();
         }
         else {
-            throw new Error(`${key} is not a valid property`);
+            return null;
         }
     }
-    get backend() {
-        return this._dataObject.backend;
+    has(key) {
+        return Reflect.has(this._dataObject.properties, key);
     }
     get path() {
         return this._dataObject.path;

package/lib/components/BaseObject.d.ts

@@ -1,13 +1,31 @@
-import { ObjectUri } from './ObjectUri';
-import { User } from './User';
-export interface BaseObject {
-    name: string;
-    status: string;
-    createdBy?: User | ObjectUri;
-    createdAt?: number | string;
-    updatedBy?: User | ObjectUri;
-    updatedAt?: number | string;
-    deletedBy?: User | ObjectUri;
-    deletedAt?: number | string;
+import { ObjectUri, DataObjectClass, DataObject } from '..';
+import { BaseObjectType } from './types/BaseObjectType';
+import { AbstractObject } from './AbstractObject';
+import { DataObjectType } from './types/DataObjectType';
+export declare class BaseObject extends AbstractObject {
+    static PROPS_DEFINITION: any;
+    static getProperty(key: string): any;
+    static fillProperties(child?: any): DataObject;
+    static daoFactory(src?: string | ObjectUri | DataObjectType | undefined, child?: any): Promise<DataObjectType>;
+    /**
+     * Instantiates from an object
+     * @param src
+     * @param child
+     * @returns
+     */
+    static fromObject<T extends BaseObjectType>(src: T, child?: any): any;
+    static factory(src?: string | ObjectUri | BaseObjectType | undefined, child?: any): Promise<any>;
+    /**
+     * Fetches an object from its backend path
+     * @param path
+     * @returns
+     */
+    static fromBackend<T>(path: string): Promise<T>;
+    /**
+     * Instantiates from a DataObject
+     * @param dao
+     * @returns
+     */
+    static fromDataObject<T extends BaseObjectType>(dao: DataObjectClass<any>): any;
+    asReference(): any;
 }
-export declare const BaseObjectProperties: any;

package/lib/components/BaseObject.js

@@ -1,90 +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;
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
 };
 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,
-        fullSearch: true,
-        htmlType: htmlType.NAME,
-    },
-    {
-        name: 'status',
-        mandatory: true,
-        type: EnumProperty_1.EnumProperty.TYPE,
-        values: [
-            statuses.CREATED,
-            statuses.PENDING,
-            statuses.ACTIVE,
-            statuses.DELETED,
-        ],
-        defaultValue: statuses.CREATED,
-    },
-    // the following properties may be optionally
-    // populated with a backend middleware
-    {
-        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,
-    },
-];
+exports.BaseObject = void 0;
+const __1 = require("..");
+const BaseObjectProperties_1 = require("./BaseObjectProperties");
+const AbstractObject_1 = require("./AbstractObject");
+class BaseObject extends AbstractObject_1.AbstractObject {
+    static getProperty(key) {
+        return BaseObject.PROPS_DEFINITION.find((prop) => prop.name === key);
+    }
+    static fillProperties(child = this) {
+        // merge base properties with additional or redefined ones
+        const base = [...BaseObject.PROPS_DEFINITION];
+        child.PROPS_DEFINITION.forEach((property) => {
+            // manage parent properties potential redeclaration
+            const found = base.findIndex((el) => el.name === property.name);
+            if (found !== -1) {
+                base[found] = property;
+            }
+            else {
+                base.push(property);
+            }
+        });
+        const dao = __1.DataObject.factory({
+            properties: base,
+            parentProp: this.PARENT_PROP,
+        });
+        dao.uri.class = child;
+        return dao;
+    }
+    static daoFactory(src = undefined, child = this) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const dao = this.fillProperties(child);
+            return dao;
+        });
+    }
+    /**
+     * Instantiates from an object
+     * @param src
+     * @param child
+     * @returns
+     */
+    static fromObject(src, child = this) {
+        const dao = this.fillProperties(child);
+        dao.uri = new __1.ObjectUri(`${this.COLLECTION}${__1.ObjectUri.DEFAULT}`, Reflect.get(src, 'name'));
+        dao.uri.class = child;
+        dao.populateFromData(src);
+        const obj = new this(dao);
+        return obj;
+    }
+    static factory(src = undefined, child = this) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (typeof src == 'object' && !(src instanceof __1.ObjectUri)) {
+                    return this.fromObject(src);
+                }
+                const dao = yield this.daoFactory(src, child);
+                const constructedObject = Reflect.construct(this, [dao]);
+                return constructedObject;
+            }
+            catch (err) {
+                throw new Error(`Unable to build instance for '${this.name}': ${err.message}`);
+            }
+        });
+    }
+    /**
+     * Fetches an object from its backend path
+     * @param path
+     * @returns
+     */
+    static fromBackend(path) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!path.includes('/')) {
+                return this.factory(`${this.COLLECTION}/${path}`);
+            }
+            return this.factory(path);
+        });
+    }
+    /**
+     * Instantiates from a DataObject
+     * @param dao
+     * @returns
+     */
+    static fromDataObject(dao) {
+        const obj = new this(dao);
+        return obj; //.toProxy()
+    }
+    asReference() {
+        return this._dataObject.toReference();
+    }
+}
+exports.BaseObject = BaseObject;
+// implements BaseObjectClass {
+BaseObject.PROPS_DEFINITION = BaseObjectProperties_1.BaseObjectProperties;

package/lib/components/BaseObjectCore.d.ts

@@ -1,5 +1,5 @@
 import { ObjectUri, DataObjectClass, DataObject } from '../';
-import { BaseObject } from './BaseObject';
+import { BaseObjectType } from './types/BaseObjectType';
 import { AbstractObject } from './AbstractObject';
 export declare class BaseObjectCore extends AbstractObject {
     static PROPS_DEFINITION: any;
@@ -12,8 +12,8 @@ export declare class BaseObjectCore extends AbstractObject {
      * @param child
      * @returns
      */
-    static fromObject<T extends BaseObject>(src: T, child?: any): any;
-    static factory(src?: string | ObjectUri | BaseObject | undefined, child?: any): Promise<any>;
+    static fromObject<T extends BaseObjectType>(src: T, child?: any): any;
+    static factory(src?: string | ObjectUri | BaseObjectType | undefined, child?: any): Promise<any>;
     /**
      * Fetches an object from its backend path
      * @param path
@@ -25,7 +25,7 @@ export declare class BaseObjectCore extends AbstractObject {
      * @param dao
      * @returns
      */
-    static fromDataObject<T extends BaseObject>(dao: DataObjectClass<any>): any;
+    static fromDataObject<T extends BaseObjectType>(dao: DataObjectClass<any>): any;
     /**
      * Wrap instance into proxy to get access to properties
      * @returns Proxy

package/lib/components/BaseObjectCore.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseObjectCore = void 0;
 const __1 = require("../");
-const BaseObject_1 = require("./BaseObject");
+const BaseObjectProperties_1 = require("./BaseObjectProperties");
 const AbstractObject_1 = require("./AbstractObject");
 class BaseObjectCore extends AbstractObject_1.AbstractObject {
     static getProperty(key) {
@@ -149,4 +149,4 @@ class BaseObjectCore extends AbstractObject_1.AbstractObject {
 }
 exports.BaseObjectCore = BaseObjectCore;
 // implements BaseObjectClass {
-BaseObjectCore.PROPS_DEFINITION = BaseObject_1.BaseObjectProperties;
+BaseObjectCore.PROPS_DEFINITION = BaseObjectProperties_1.BaseObjectProperties;

package/lib/components/BaseObjectProperties.d.ts

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

package/lib/components/BaseObjectProperties.js

@@ -0,0 +1,90 @@
+"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,
+        fullSearch: true,
+        htmlType: htmlType.NAME,
+    },
+    {
+        name: 'status',
+        mandatory: true,
+        type: EnumProperty_1.EnumProperty.TYPE,
+        values: [
+            statuses.CREATED,
+            statuses.PENDING,
+            statuses.ACTIVE,
+            statuses.DELETED,
+        ],
+        defaultValue: statuses.CREATED,
+    },
+    // the following properties may be optionally
+    // populated with a backend middleware
+    {
+        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/DataObject.d.ts

@@ -2,8 +2,8 @@ import { DataObjectProperties } from '../properties';
 import { PropertyClassType } from '../properties/types/PropertyClassType';
 import { AbstractObject } from './AbstractObject';
 import { ObjectUri } from './ObjectUri';
-import { DataObjectClass } from './types/DataObjectClass';
 import { toJSONParams } from './types/toJSONParams';
+import { DataObjectType } from './types/DataObjectType';
 export type CoreObject<T extends AbstractObject> = T;
 export type Properties = {
     [x: string]: PropertyClassType;
@@ -22,7 +22,7 @@ export interface DataObjectParams {
  * They handle data and identifiers in a protected registry
  * This is what backends and objects manipulate, oblivious of the other.
  */
-export declare class DataObject implements DataObjectClass<any> {
+export declare class DataObject implements DataObjectType {
     protected _objectUri: ObjectUri;
     protected _uid: string | undefined;
     protected _properties: Properties;
@@ -69,7 +69,6 @@ export declare class DataObject implements DataObjectClass<any> {
     }): this;
     isPopulated(): boolean;
     get properties(): Properties;
-    get backend(): string | undefined;
     get path(): string;
     set uid(uid: string | undefined);
     get uid(): string | undefined;
@@ -102,9 +101,6 @@ export declare class DataObject implements DataObjectClass<any> {
         uri: string;
     };
     protected _dataToJSON(objectsAsReferences?: boolean, ignoreUnchanged?: boolean, converters?: {}): {};
-    read(): Promise<DataObjectClass<any>>;
-    save(): Promise<DataObjectClass<any>>;
-    delete(): Promise<DataObjectClass<any>>;
     /**
      * Data object must be created from factory in order for async-loaded data to be available
      * @param className

package/lib/components/DataObject.js

@@ -154,9 +154,9 @@ class DataObject {
     get properties() {
         return this._properties;
     }
-    get backend() {
-        return this._objectUri ? this._objectUri.backend : undefined;
-    }
+    // get backend() {
+    //    return this._objectUri ? this._objectUri.backend : undefined
+    // }
     get path() {
         return this._objectUri ? this._objectUri.path : '';
     }
@@ -279,19 +279,21 @@ class DataObject {
         });
         return data;
     }
-    read() {
-        return __awaiter(this, void 0, void 0, function* () {
-            throw new Error(`This is just a stub, please use DataObject from @quatrain/backend to persist`);
-        });
-    }
-    save() {
-        throw new Error(`This is just a stub, please use DataObject from @quatrain/backend to persist`);
-    }
-    delete() {
-        return __awaiter(this, void 0, void 0, function* () {
-            throw new Error(`This is just a stub, please use DataObject from @quatrain/backend to persist`);
-        });
-    }
+    // async read(): Promise<DataObjectClass<any>> {
+    //    throw new Error(
+    //       `This is just a stub, please use DataObject from @quatrain/backend to persist`
+    //    )
+    // }
+    // save(): Promise<DataObjectClass<any>> {
+    //    throw new Error(
+    //       `This is just a stub, please use DataObject from @quatrain/backend to persist`
+    //    )
+    // }
+    // async delete(): Promise<DataObjectClass<any>> {
+    //    throw new Error(
+    //       `This is just a stub, please use DataObject from @quatrain/backend to persist`
+    //    )
+    // }
     /**
      * Data object must be created from factory in order for async-loaded data to be available
      * @param className

package/lib/components/Entity.d.ts

@@ -1,8 +1,8 @@
-import { BaseObjectCore } from './BaseObjectCore';
 import { BaseObject } from './BaseObject';
-export interface EntityType extends BaseObject {
+import { BaseObjectType } from './types/BaseObjectType';
+export interface EntityType extends BaseObjectType {
 }
-export declare class Entity extends BaseObjectCore {
+export declare class Entity extends BaseObject {
     static COLLECTION: string;
     static PROPS_DEFINITION: any[];
     static factory(src?: any): Promise<Entity>;

package/lib/components/Entity.js

@@ -33,13 +33,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Entity = void 0;
-const BaseObjectCore_1 = require("./BaseObjectCore");
 const BaseObject_1 = require("./BaseObject");
+const BaseObjectProperties_1 = require("./BaseObjectProperties");
 //import { User } from './User'
 //import { CollectionProperty } from '../properties/CollectionProperty'
 const StringProperty_1 = require("../properties/StringProperty");
 const htmlType = __importStar(require("../properties/types/PropertyHTMLType"));
-class Entity extends BaseObjectCore_1.BaseObjectCore {
+class Entity extends BaseObject_1.BaseObject {
     static factory(src = undefined) {
         const _super = Object.create(null, {
             factory: { get: () => super.factory }
@@ -52,7 +52,7 @@ class Entity extends BaseObjectCore_1.BaseObjectCore {
 exports.Entity = Entity;
 Entity.COLLECTION = 'entities';
 Entity.PROPS_DEFINITION = [
-    ...BaseObject_1.BaseObjectProperties,
+    ...BaseObjectProperties_1.BaseObjectProperties,
     {
         // surcharge property minLength and htmlType
         name: 'name',

package/lib/components/User.d.ts

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

package/lib/components/User.js

@@ -33,12 +33,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.User = exports.UserProperties = void 0;
-const BaseObjectCore_1 = require("./BaseObjectCore");
+const BaseObject_1 = require("./BaseObject");
 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 BaseObjectProperties_1 = require("./BaseObjectProperties");
 const Entity_1 = require("./Entity");
 /**
  * Callback function to populate the 'name' property
@@ -47,7 +47,7 @@ const Entity_1 = require("./Entity");
  */
 const onChange = (dao) => dao.set('name', `${dao.val('firstname')} ${dao.val('lastname')}`);
 exports.UserProperties = [
-    ...BaseObject_1.BaseObjectProperties,
+    ...BaseObjectProperties_1.BaseObjectProperties,
     {
         // change name property minLength
         name: 'name',
@@ -121,7 +121,7 @@ exports.UserProperties = [
         instanceOf: Entity_1.Entity,
     },
 ];
-class User extends BaseObjectCore_1.BaseObjectCore {
+class User extends BaseObject_1.BaseObject {
     static factory(src = undefined) {
         const _super = Object.create(null, {
             factory: { get: () => super.factory }

package/lib/components/index.d.ts

@@ -2,7 +2,7 @@ import { DataObject, DataObjectParams } from './DataObject';
 import { DataObjectClass } from './types/DataObjectClass';
 import { ObjectUri } from './ObjectUri';
 import { AbstractObject } from './AbstractObject';
-import { BaseObjectProperties } from './BaseObject';
+import { BaseObjectProperties } from './BaseObjectProperties';
 import { User, UserProperties } from './User';
 import { Entity } from './Entity';
 export { DataObject, DataObjectParams, DataObjectClass, ObjectUri, AbstractObject, User, Entity, BaseObjectProperties, UserProperties, };

package/lib/components/index.js

@@ -7,8 +7,8 @@ const ObjectUri_1 = require("./ObjectUri");
 Object.defineProperty(exports, "ObjectUri", { enumerable: true, get: function () { return ObjectUri_1.ObjectUri; } });
 const AbstractObject_1 = require("./AbstractObject");
 Object.defineProperty(exports, "AbstractObject", { enumerable: true, get: function () { return AbstractObject_1.AbstractObject; } });
-const BaseObject_1 = require("./BaseObject");
-Object.defineProperty(exports, "BaseObjectProperties", { enumerable: true, get: function () { return BaseObject_1.BaseObjectProperties; } });
+const BaseObjectProperties_1 = require("./BaseObjectProperties");
+Object.defineProperty(exports, "BaseObjectProperties", { enumerable: true, get: function () { return BaseObjectProperties_1.BaseObjectProperties; } });
 const User_1 = require("./User");
 Object.defineProperty(exports, "User", { enumerable: true, get: function () { return User_1.User; } });
 Object.defineProperty(exports, "UserProperties", { enumerable: true, get: function () { return User_1.UserProperties; } });

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

@@ -0,0 +1,10 @@
+export interface BaseObjectType {
+    name: string;
+    status: string;
+    createdBy?: any;
+    createdAt?: number | string;
+    updatedBy?: any;
+    updatedAt?: number | string;
+    deletedBy?: any;
+    deletedAt?: number | string;
+}

package/lib/components/types/BaseObjectType.js

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

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

@@ -0,0 +1,28 @@
+import { PropertyClassType } from '../../properties/types/PropertyClassType';
+import { ObjectUri } from '../ObjectUri';
+import { toJSONParams } from './toJSONParams';
+export interface DataObjectClass<T extends DataObjectClass<any>> {
+    uri: ObjectUri;
+    uid: any;
+    backend: any;
+    path: any;
+    class: any;
+    properties: any;
+    parentProp: string | undefined;
+    setProperties(properties: any): void;
+    getProperties(type: any): any;
+    addProperty(property: PropertyClassType): void;
+    populate(data?: any): Promise<T>;
+    isPopulated(): boolean;
+    has(key: string): boolean;
+    get(key: string): any;
+    set(key: string, val: any): any;
+    val(key: string): any;
+    clone(data?: any): Promise<T>;
+    toReference(): any;
+    toJSON(params?: boolean | toJSONParams): any;
+    populateFromData(data: {
+        [x: string]: unknown;
+    }): this;
+    asProxy(): any;
+}

package/lib/components/types/DataObjectClass copy.js

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

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

@@ -4,7 +4,6 @@ import { toJSONParams } from './toJSONParams';
 export interface DataObjectClass<T extends DataObjectClass<any>> {
     uri: ObjectUri;
     uid: any;
-    backend: any;
     path: any;
     class: any;
     properties: any;

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

@@ -0,0 +1,27 @@
+import { PropertyClassType } from '../../properties/types/PropertyClassType';
+import { ObjectUri } from '../ObjectUri';
+import { toJSONParams } from './toJSONParams';
+export interface DataObjectType {
+    uri: ObjectUri;
+    uid: any;
+    path: any;
+    class: any;
+    properties: any;
+    parentProp: string | undefined;
+    setProperties(properties: any): void;
+    getProperties(type: any): any;
+    addProperty(property: PropertyClassType): void;
+    populate(data?: any): Promise<any>;
+    isPopulated(): boolean;
+    has(key: string): boolean;
+    get(key: string): any;
+    set(key: string, val: any): any;
+    val(key: string): any;
+    clone(data?: any): Promise<any>;
+    toReference(): any;
+    toJSON(params?: boolean | toJSONParams): any;
+    populateFromData(data: {
+        [x: string]: unknown;
+    }): this;
+    asProxy(): any;
+}

package/lib/components/types/DataObjectType.js

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

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

@@ -1,7 +1,6 @@
-import { BaseObject } from '../BaseObject';
-import { Persisted } from './Persisted';
-export default interface Payload<T extends BaseObject> {
-    items: Persisted<T>[];
+import { BaseObjectType } from './BaseObjectType';
+export default interface Payload<T extends BaseObjectType> {
+    items: T[];
     meta: Meta;
 }
 export interface Meta {

package/lib/index.d.ts

@@ -15,10 +15,11 @@ import { ObjectUri } from './components/ObjectUri';
 import { DataObjectClass } from './components/types/DataObjectClass';
 import { DataObject } from './components/DataObject';
 import { DataObjectProperties } from './properties';
-import { BaseObjectCore } from './components/BaseObjectCore';
-import { BaseObject, BaseObjectProperties } from './components/BaseObject';
+import { BaseObject } from './components/BaseObject';
+import { BaseObjectProperties } from './components/BaseObjectProperties';
+import { BaseObjectType } from './components/types/BaseObjectType';
 import { Proxy } from './components/types/ProxyConstructor';
 import { UserType, User, UserProperties } from './components/User';
 import { EntityType, Entity } from './components/Entity';
 import { BadRequestError, UnauthorizedError, ForbiddenError, NotFoundError, GoneError } from './common/ResourcesErrors';
-export { statuses, Core, Property, BaseProperty, BasePropertyType, BooleanProperty, BooleanPropertyType, DateTimeProperty, DateTimePropertyType, EnumProperty, EnumPropertyType, HashProperty, HashPropertyType, CollectionProperty, CollectionPropertyType, ArrayProperty, ArrayPropertyType, ObjectProperty, ObjectPropertyType, returnAs, StringProperty, StringPropertyType, ObjectUri, DataObjectClass, DataObject, DataObjectProperties, AbstractObject, BaseObject, BaseObjectCore, BaseObjectProperties, User, UserType, UserProperties, Proxy, Entity, EntityType, BadRequestError, UnauthorizedError, ForbiddenError, NotFoundError, GoneError, };
+export { statuses, Core, Property, BaseProperty, BasePropertyType, BooleanProperty, BooleanPropertyType, DateTimeProperty, DateTimePropertyType, EnumProperty, EnumPropertyType, HashProperty, HashPropertyType, CollectionProperty, CollectionPropertyType, ArrayProperty, ArrayPropertyType, ObjectProperty, ObjectPropertyType, returnAs, StringProperty, StringPropertyType, ObjectUri, DataObjectClass, DataObject, DataObjectProperties, AbstractObject, BaseObjectType, BaseObject, BaseObjectProperties, User, UserType, UserProperties, Proxy, Entity, EntityType, BadRequestError, UnauthorizedError, ForbiddenError, NotFoundError, GoneError, };

package/lib/index.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GoneError = exports.NotFoundError = exports.ForbiddenError = exports.UnauthorizedError = exports.BadRequestError = exports.Entity = exports.UserProperties = exports.User = exports.BaseObjectProperties = exports.BaseObjectCore = exports.AbstractObject = exports.DataObject = exports.ObjectUri = exports.StringProperty = exports.returnAs = exports.ObjectProperty = exports.ArrayProperty = exports.CollectionProperty = exports.HashProperty = exports.EnumProperty = exports.DateTimeProperty = exports.BooleanProperty = exports.BaseProperty = exports.Property = exports.Core = exports.statuses = void 0;
+exports.GoneError = exports.NotFoundError = exports.ForbiddenError = exports.UnauthorizedError = exports.BadRequestError = exports.Entity = exports.UserProperties = exports.User = exports.BaseObjectProperties = exports.BaseObject = exports.AbstractObject = exports.DataObject = exports.ObjectUri = exports.StringProperty = exports.returnAs = exports.ObjectProperty = exports.ArrayProperty = exports.CollectionProperty = exports.HashProperty = exports.EnumProperty = exports.DateTimeProperty = exports.BooleanProperty = exports.BaseProperty = exports.Property = exports.Core = 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"));
@@ -55,10 +55,10 @@ const ObjectUri_1 = require("./components/ObjectUri");
 Object.defineProperty(exports, "ObjectUri", { enumerable: true, get: function () { return ObjectUri_1.ObjectUri; } });
 const DataObject_1 = require("./components/DataObject");
 Object.defineProperty(exports, "DataObject", { enumerable: true, get: function () { return DataObject_1.DataObject; } });
-const BaseObjectCore_1 = require("./components/BaseObjectCore");
-Object.defineProperty(exports, "BaseObjectCore", { enumerable: true, get: function () { return BaseObjectCore_1.BaseObjectCore; } });
 const BaseObject_1 = require("./components/BaseObject");
-Object.defineProperty(exports, "BaseObjectProperties", { enumerable: true, get: function () { return BaseObject_1.BaseObjectProperties; } });
+Object.defineProperty(exports, "BaseObject", { enumerable: true, get: function () { return BaseObject_1.BaseObject; } });
+const BaseObjectProperties_1 = require("./components/BaseObjectProperties");
+Object.defineProperty(exports, "BaseObjectProperties", { enumerable: true, get: function () { return BaseObjectProperties_1.BaseObjectProperties; } });
 const User_1 = require("./components/User");
 Object.defineProperty(exports, "User", { enumerable: true, get: function () { return User_1.User; } });
 Object.defineProperty(exports, "UserProperties", { enumerable: true, get: function () { return User_1.UserProperties; } });

package/lib/properties/CollectionProperty.d.ts

@@ -1,16 +1,16 @@
 import { BaseProperty, BasePropertyType } from './BaseProperty';
 import { ObjectUri } from '../components/ObjectUri';
 import { DataObjectClass } from '../components/types/DataObjectClass';
-import { BaseObjectCore } from '../';
+import { BaseObject } from '../components/BaseObject';
 export interface CollectionPropertyType extends BasePropertyType {
-    instanceOf: typeof BaseObjectCore;
+    instanceOf: typeof BaseObject;
     backend?: any;
     parentKey?: string;
 }
 export declare class CollectionProperty extends BaseProperty {
     static TYPE: string;
     protected _value: Array<any> | Array<DataObjectClass<any>> | Array<ObjectUri> | undefined;
-    protected _instanceOf: typeof BaseObjectCore;
+    protected _instanceOf: typeof BaseObject;
     protected _parentKey: string;
     constructor(config: CollectionPropertyType);
     set(value: Array<any>, setChanged?: boolean): this;

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@quatrain/core",
-   "version": "1.0.2",
+   "version": "1.1.0",
    "description": "Core objects for business apps",
    "main": "lib/index.js",
    "types": "lib/index.d.ts",