@quatrain/core 1.0.0-beta8 → 1.0.0

package/lib/components/ObjectUri.js

@@ -1,18 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObjectUri = void 0;
-const Core_1 = require("../Core");
 class ObjectUri {
     /**
      * create object uri from string:
      * ex: 'xyz', '@backend:xyz', 'collection/xyz', '@backend:collection/xyz'
      * some backends will need a collection or table name, some may deduct it from object
-     * @param str
+     * @param str partial or full resource path
+     * @param label optional label to describe path
      */
     constructor(str = '', label = '') {
         this._pairs = [];
         this._literal = '';
-        this._backend = Core_1.Core.defaultBackend;
         this._path = ObjectUri.DEFAULT;
         this._uid = undefined;
         this._collection = undefined;
@@ -21,40 +20,45 @@ class ObjectUri {
         this._label = label;
         if (str.includes(':')) {
             const [backend, path] = str.split(':');
-            this._backend = backend || Core_1.Core.defaultBackend;
+            this._backend = backend;
             this._path = path;
         }
         else {
             this._path = str;
         }
         const parts = this._path.split(ObjectUri.DEFAULT);
-        if (parts.length === 1) {
+        const isFilePath = parts[parts.length - 1].indexOf('.') !== -1;
+        if (isFilePath) {
+            this._uid = parts[parts.length - 1];
+        }
+        else if (parts.length === 1) {
             // It is allowed to only give the uid part of the uri
-            // provided that collection will be injected by another mean
+            // provided that collection will be injected by another means
             this._uid = parts[0].length > 0 ? parts[0] : undefined;
             this._collection = ObjectUri.MISSING_COLLECTION;
             this._pairs.push(`${ObjectUri.MISSING_COLLECTION}${ObjectUri.DEFAULT}${this._uid}`);
             this._label = label || this._uid;
         }
         else if (parts.length % 2 === 0) {
-            // General case is a path containing pairs of collection/uid
-            let i = 0;
-            while (i < parts.length) {
-                this._collection = parts[i];
-                this._uid = parts[i + 1];
-                this._pairs.push(`${parts[i]}${ObjectUri.DEFAULT}${parts[i + 1]}`);
-                i += 2;
+            this._path = parts.slice(parts.length - 2).join(ObjectUri.DEFAULT);
+            this._uid = parts[parts.length - 1];
+            this._collection = parts[parts.length - 2];
+            if (parts.length > 2) {
+                this._parent = new ObjectUri(parts.slice(0, parts.length - 2).join(ObjectUri.DEFAULT));
             }
             this._label = label || this._uid;
         }
-        else {
+        else if (!isFilePath) {
+            // if the last part is not a filename with extension, throw error
             throw new Error(`Path parts number must be 1 or even, received: '${str}'`);
         }
     }
     set class(objClass) {
         this._objClass = objClass;
         if (objClass) {
-            this._collection = objClass.COLLECTION || objClass.name && objClass.name.toLowerCase();
+            this._collection =
+                objClass.COLLECTION ||
+                    (objClass.name && objClass.name.toLowerCase());
         }
         else {
             this._collection = undefined;
@@ -66,17 +70,42 @@ class ObjectUri {
     get backend() {
         return this._backend;
     }
+    /**
+     * Returns the full path of the resource
+     * including optional parents' path
+     * @returns string
+     */
     get path() {
+        return this._parent
+            ? `${this._parent.path}${ObjectUri.DEFAULT}${this._path}`
+            : this._path;
+    }
+    /**
+     * Returns the own path of the resource
+     * without the optional parents' paths
+     * @returns string
+     */
+    get ownPath() {
         return this._path;
     }
+    get parent() {
+        return this._parent;
+    }
     set label(label) {
         this._label = label;
     }
     get label() {
         return this._label;
     }
+    /**
+     * Return the full path litteral
+     * including the backend alias
+     * @returns string
+     */
     get literal() {
-        return `${this._backend}:${this._pairs.join(ObjectUri.DEFAULT)}`;
+        return this._str.includes(':')
+            ? this._str
+            : `${this._backend}:${this._str}`;
     }
     set path(path) {
         // if (this._path && this._path !== ObjectUri.DEFAULT) {
@@ -108,7 +137,7 @@ class ObjectUri {
      */
     toReference() {
         return {
-            ref: this._path,
+            ref: this.path,
             uri: this._literal,
             label: this._label,
         };
@@ -116,7 +145,7 @@ class ObjectUri {
     toJSON() {
         return {
             backend: this._backend,
-            ref: this._path,
+            ref: this.path,
             label: this._label || '',
         };
     }

package/lib/components/index.d.ts

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

package/lib/components/index.js

@@ -1,21 +1,14 @@
 "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.Entity = exports.User = exports.BaseRepository = exports.BaseObjectCore = exports.AbstractObject = exports.ObjectUri = exports.DataObject = void 0;
+exports.UserProperties = exports.BaseObjectProperties = exports.Entity = exports.User = 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");
 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 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, "User", { enumerable: true, get: function () { return User_1.User; } });
 Object.defineProperty(exports, "UserProperties", { enumerable: true, get: function () { return User_1.UserProperties; } });

package/lib/index.d.ts

@@ -1,14 +1,15 @@
 import { Core } from './Core';
 import * as statuses from './common/statuses';
-import * as utils from './utils';
 import { Property } from './properties/Property';
 import { BaseProperty, BasePropertyType } from './properties/BaseProperty';
 import { StringProperty, StringPropertyType } from './properties/StringProperty';
 import { EnumProperty, EnumPropertyType } from './properties/EnumProperty';
 import { BooleanProperty, BooleanPropertyType } from './properties/BooleanProperty';
-import { ObjectProperty, ObjectPropertyType } from './properties/ObjectProperty';
+import { ObjectProperty, ObjectPropertyType, returnAs } from './properties/ObjectProperty';
 import { DateTimeProperty, DateTimePropertyType } from './properties/DateTimeProperty';
 import { HashProperty, HashPropertyType } from './properties/HashProperty';
+import { CollectionProperty, CollectionPropertyType } from './properties/CollectionProperty';
+import { ArrayProperty, ArrayPropertyType } from './properties/ArrayProperty';
 import { AbstractObject } from './components/AbstractObject';
 import { ObjectUri } from './components/ObjectUri';
 import { DataObjectClass } from './components/types/DataObjectClass';
@@ -16,18 +17,7 @@ import { DataObject } from './components/DataObject';
 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 { UserType, User } from './components/User';
-import UserRepository from './components/UserRepository';
+import { UserType, User, UserProperties } from './components/User';
 import { EntityType, Entity } from './components/Entity';
-import EntityRepository from './components/EntityRepository';
-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, 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, EntityType, EntityRepository, 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, AbstractObject, BaseObject, BaseObjectCore, BaseObjectProperties, User, UserType, UserProperties, Proxy, Entity, EntityType, BadRequestError, UnauthorizedError, ForbiddenError, NotFoundError, GoneError, };

package/lib/index.js

@@ -22,17 +22,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-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.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;
+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;
 const Core_1 = require("./Core");
 Object.defineProperty(exports, "Core", { enumerable: true, get: function () { return Core_1.Core; } });
 const statuses = __importStar(require("./common/statuses"));
 exports.statuses = statuses;
-const utils = __importStar(require("./utils"));
-exports.utils = utils;
 const Property_1 = require("./properties/Property");
 Object.defineProperty(exports, "Property", { enumerable: true, get: function () { return Property_1.Property; } });
 const BaseProperty_1 = require("./properties/BaseProperty");
@@ -45,10 +40,15 @@ const BooleanProperty_1 = require("./properties/BooleanProperty");
 Object.defineProperty(exports, "BooleanProperty", { enumerable: true, get: function () { return BooleanProperty_1.BooleanProperty; } });
 const ObjectProperty_1 = require("./properties/ObjectProperty");
 Object.defineProperty(exports, "ObjectProperty", { enumerable: true, get: function () { return ObjectProperty_1.ObjectProperty; } });
+Object.defineProperty(exports, "returnAs", { enumerable: true, get: function () { return ObjectProperty_1.returnAs; } });
 const DateTimeProperty_1 = require("./properties/DateTimeProperty");
 Object.defineProperty(exports, "DateTimeProperty", { enumerable: true, get: function () { return DateTimeProperty_1.DateTimeProperty; } });
 const HashProperty_1 = require("./properties/HashProperty");
 Object.defineProperty(exports, "HashProperty", { enumerable: true, get: function () { return HashProperty_1.HashProperty; } });
+const CollectionProperty_1 = require("./properties/CollectionProperty");
+Object.defineProperty(exports, "CollectionProperty", { enumerable: true, get: function () { return CollectionProperty_1.CollectionProperty; } });
+const ArrayProperty_1 = require("./properties/ArrayProperty");
+Object.defineProperty(exports, "ArrayProperty", { enumerable: true, get: function () { return ArrayProperty_1.ArrayProperty; } });
 const AbstractObject_1 = require("./components/AbstractObject");
 Object.defineProperty(exports, "AbstractObject", { enumerable: true, get: function () { return AbstractObject_1.AbstractObject; } });
 const ObjectUri_1 = require("./components/ObjectUri");
@@ -59,37 +59,11 @@ 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; } });
-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;
+Object.defineProperty(exports, "UserProperties", { enumerable: true, get: function () { return User_1.UserProperties; } });
 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; } });
-Object.defineProperty(exports, "BackendError", { enumerable: true, get: function () { return backends_1.BackendError; } });
-Object.defineProperty(exports, "Query", { enumerable: true, get: function () { return backends_1.Query; } });
-Object.defineProperty(exports, "Filter", { enumerable: true, get: function () { return backends_1.Filter; } });
-Object.defineProperty(exports, "Filters", { enumerable: true, get: function () { return backends_1.Filters; } });
-Object.defineProperty(exports, "Limits", { enumerable: true, get: function () { return backends_1.Limits; } });
-Object.defineProperty(exports, "Sorting", { enumerable: true, get: function () { return backends_1.Sorting; } });
-Object.defineProperty(exports, "SortAndLimit", { enumerable: true, get: function () { return backends_1.SortAndLimit; } });
 const ResourcesErrors_1 = require("./common/ResourcesErrors");
 Object.defineProperty(exports, "BadRequestError", { enumerable: true, get: function () { return ResourcesErrors_1.BadRequestError; } });
 Object.defineProperty(exports, "UnauthorizedError", { enumerable: true, get: function () { return ResourcesErrors_1.UnauthorizedError; } });

package/lib/properties/ArrayProperty.js

@@ -31,6 +31,9 @@ class ArrayProperty extends BaseProperty_1.BaseProperty {
         return this._maxLength;
     }
     set(value, setChanged = true) {
+        if (value === null) {
+            value = [];
+        }
         if (!Array.isArray(value)) {
             throw new Error(`value ${JSON.stringify(value)} is not an array`);
         }

package/lib/properties/BaseProperty.js

@@ -51,7 +51,7 @@ class BaseProperty {
             throw new Error(`Value '${this._name}' already defined as '${this._value}' and protected from change`);
         }
         if (value !== this._value) {
-            console.log(this.name, value, this._value);
+            // console.log(this.name, value, this._value)
             this._value = value;
             this._hasChanged = setChanged;
         }
@@ -61,7 +61,7 @@ class BaseProperty {
         return this;
     }
     val(transform = undefined) {
-        console.log(transform && transform(this._value), typeof transform);
+        // console.log(transform && transform(this._value), typeof transform);
         return typeof transform === 'function'
             ? transform(this._value)
             : this._value || this._defaultValue;

package/lib/properties/CollectionProperty.d.ts

@@ -1,10 +1,7 @@
 import { BaseProperty, BasePropertyType } from './BaseProperty';
-import { Query, QueryResultType } from '../backends/Query';
-import { Filter } from '../backends/Filter';
 import { ObjectUri } from '../components/ObjectUri';
-import { returnAs } from '../backends/Query';
 import { DataObjectClass } from '../components/types/DataObjectClass';
-import { BaseObjectCore } from '../components';
+import { BaseObjectCore } from '../';
 export interface CollectionPropertyType extends BasePropertyType {
     instanceOf: typeof BaseObjectCore;
     backend?: any;
@@ -14,20 +11,8 @@ export declare class CollectionProperty extends BaseProperty {
     static TYPE: string;
     protected _value: Array<any> | Array<DataObjectClass<any>> | Array<ObjectUri> | undefined;
     protected _instanceOf: typeof BaseObjectCore;
-    protected _backend: any;
     protected _parentKey: string;
-    protected _query: Query<any>;
-    protected _filters: Filter[] | Filter | undefined;
     constructor(config: CollectionPropertyType);
-    protected _setQuery(filters?: Filter[]): Query<typeof BaseObjectCore>;
     set(value: Array<any>, setChanged?: boolean): this;
-    /**
-     * get objects matching collection class and filters
-     * in the requested format
-     * @param filters
-     * @returns
-     */
-    get(filters?: Filter[] | undefined): Query<any>;
-    val(transform?: returnAs): Promise<QueryResultType<any>>;
     toJSON(): any[] | DataObjectClass<any>[] | ObjectUri[] | undefined;
 }

package/lib/properties/CollectionProperty.js

@@ -1,25 +1,13 @@
 "use strict";
-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.CollectionProperty = void 0;
 const BaseProperty_1 = require("./BaseProperty");
 const Core_1 = require("../Core");
-const Query_1 = require("../backends/Query");
 class CollectionProperty extends BaseProperty_1.BaseProperty {
     constructor(config) {
         var _a, _b;
         super(config);
         this._value = undefined;
-        this._filters = undefined;
-        console.log(config);
         if (!config.instanceOf) {
             throw new Error(`Parameter 'instanceOf' is mandatory`);
         }
@@ -27,41 +15,12 @@ class CollectionProperty extends BaseProperty_1.BaseProperty {
             typeof config.instanceOf === 'string'
                 ? Core_1.Core.classRegistry[config.instanceOf]
                 : config.instanceOf;
-        this._backend = config.backend
-            ? Core_1.Core.getBackend(config.backend)
-            : undefined;
         this._parentKey =
             config.parentKey || ((_b = (_a = this._parent) === null || _a === void 0 ? void 0 : _a.uri) === null || _b === void 0 ? void 0 : _b.collection) || 'unknown';
-        this._query = this._setQuery();
-    }
-    _setQuery(filters) {
-        const query = this._instanceOf.query();
-        query.where(this._parentKey, this._parent ? this._parent.uri : 'unknown');
-        if (filters) {
-            query.filters = filters;
-        }
-        return query;
     }
     set(value, setChanged = true) {
         return super.set(value, setChanged);
     }
-    /**
-     * get objects matching collection class and filters
-     * in the requested format
-     * @param filters
-     * @returns
-     */
-    get(filters = undefined) {
-        if (!this._query || this._filters !== filters) {
-            this._query = this._setQuery(filters);
-        }
-        return this._query;
-    }
-    val(transform = Query_1.returnAs.AS_DATAOBJECTS) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.get().execute(transform, this._backend);
-        });
-    }
     toJSON() {
         return this._value;
     }

package/lib/properties/FileProperty.d.ts

@@ -0,0 +1,10 @@
+import { ObjectUri } from '../components/ObjectUri';
+import { BaseProperty, BasePropertyType } from './BaseProperty';
+import { BaseObjectClass } from '../components/types/BaseObjectClass';
+export interface FilePropertyType extends BasePropertyType {
+}
+export declare class FileProperty extends BaseProperty {
+    static TYPE: string;
+    _value: BaseObjectClass | ObjectUri | undefined;
+    constructor(config: FilePropertyType);
+}

package/lib/properties/FileProperty.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FileProperty = void 0;
+const BaseProperty_1 = require("./BaseProperty");
+class FileProperty extends BaseProperty_1.BaseProperty {
+    constructor(config) {
+        super(config);
+        this._value = undefined;
+    }
+}
+exports.FileProperty = FileProperty;
+FileProperty.TYPE = 'file';

package/lib/properties/ObjectProperty.d.ts

@@ -1,6 +1,12 @@
 import { ObjectUri } from '../components/ObjectUri';
 import { BaseProperty, BasePropertyType } from './BaseProperty';
 import { BaseObjectClass } from '../components/types/BaseObjectClass';
+export declare enum returnAs {
+    AS_OBJECTURIS = "objectUris",
+    AS_DATAOBJECTS = "dataObjects",
+    AS_INSTANCES = "classInstances",
+    AS_IS = "asIs"
+}
 export interface ObjectPropertyType extends BasePropertyType {
     instanceOf: any;
 }
@@ -9,6 +15,7 @@ export declare class ObjectProperty extends BaseProperty {
     _value: BaseObjectClass | ObjectUri | undefined;
     _instanceOf: any;
     constructor(config: ObjectPropertyType);
+    get instanceOf(): any;
     val(transform?: string | undefined): any;
     set(value: object, setChanged?: boolean): this;
     toJSON(): any;

package/lib/properties/ObjectProperty.js

@@ -1,28 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ObjectProperty = void 0;
+exports.ObjectProperty = exports.returnAs = 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");
+// TODO move in types
+var returnAs;
+(function (returnAs) {
+    returnAs["AS_OBJECTURIS"] = "objectUris";
+    returnAs["AS_DATAOBJECTS"] = "dataObjects";
+    returnAs["AS_INSTANCES"] = "classInstances";
+    returnAs["AS_IS"] = "asIs";
+})(returnAs || (exports.returnAs = returnAs = {}));
 class ObjectProperty extends BaseProperty_1.BaseProperty {
     constructor(config) {
         super(config);
         this._value = undefined;
         this._instanceOf = config.instanceOf;
     }
+    get instanceOf() {
+        return this._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:
+            case returnAs.AS_DATAOBJECTS:
                 if (this._value instanceof DataObject_1.DataObject) {
                     console.log(`Returning already existing dataObject`);
                     return this._value;
@@ -38,15 +46,15 @@ class ObjectProperty extends BaseProperty_1.BaseProperty {
                     console.log(`Converting instance -> dataObject`);
                     return this._value.dataObject;
                 }
-            case Query_1.returnAs.AS_INSTANCES:
+            case 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('ObjectProperty', this)
                     console.log(`Converting objectUri -> dataObject -> instance`);
-                    console.log(this._instanceOf);
+                    // console.log(this._instanceOf)
                     const dao = DataObject_1.DataObject.factory({
                         properties: Reflect.get(this._instanceOf, 'PROPS_DEFINITION'),
                         uri: this._value,
@@ -57,8 +65,7 @@ class ObjectProperty extends BaseProperty_1.BaseProperty {
                     console.log(`Returning already existing instance`);
                     return this._value;
                 }
-                return this._value;
-            case Query_1.returnAs.AS_OBJECTURIS:
+            case returnAs.AS_OBJECTURIS:
             default:
                 return this._value;
         }

package/lib/properties/Property.d.ts

@@ -7,6 +7,7 @@ import { HashPropertyType } from './HashProperty';
 import { StringPropertyType } from './StringProperty';
 import { NumberPropertyType } from './NumberProperty';
 import { ObjectPropertyType } from './ObjectProperty';
+import { FilePropertyType } from './FileProperty';
 export declare class Property {
     static TYPE_ANY: string;
     static TYPE_NUMBER: string;
@@ -18,5 +19,6 @@ export declare class Property {
     static TYPE_DATETIME: string;
     static TYPE_ARRAY: string;
     static TYPE_MAP: string;
-    static factory(params: ObjectPropertyType & StringPropertyType & NumberPropertyType & EnumPropertyType & BooleanPropertyType & HashPropertyType & DateTimePropertyType, parent: DataObjectClass<any>): BaseProperty;
+    static TYPE_FILE: string;
+    static factory(params: ObjectPropertyType & StringPropertyType & NumberPropertyType & EnumPropertyType & BooleanPropertyType & HashPropertyType & DateTimePropertyType & FilePropertyType, parent: DataObjectClass<any>): BaseProperty;
 }

package/lib/properties/Property.js

@@ -12,6 +12,7 @@ const ObjectProperty_1 = require("./ObjectProperty");
 const CollectionProperty_1 = require("./CollectionProperty");
 const ArrayProperty_1 = require("./ArrayProperty");
 const MapProperty_1 = require("./MapProperty");
+const FileProperty_1 = require("./FileProperty");
 class Property {
     static factory(params, parent) {
         params.parent = parent;
@@ -41,6 +42,8 @@ class Property {
                 return new ArrayProperty_1.ArrayProperty(params);
             case MapProperty_1.MapProperty.TYPE:
                 return new MapProperty_1.MapProperty(params);
+            case FileProperty_1.FileProperty.TYPE:
+                return new FileProperty_1.FileProperty(params);
             default:
                 throw new Error(`Unknown property type ${params.type}`);
         }
@@ -57,3 +60,4 @@ Property.TYPE_HASH = 'hash';
 Property.TYPE_DATETIME = 'datetime';
 Property.TYPE_ARRAY = 'array';
 Property.TYPE_MAP = 'map';
+Property.TYPE_FILE = 'file';

package/lib/properties/index.d.ts

@@ -9,9 +9,10 @@ import { BooleanProperty, BooleanPropertyType } from './BooleanProperty';
 import { DateTimeProperty, DateTimePropertyType } from './DateTimeProperty';
 import { ObjectProperty, ObjectPropertyType } from './ObjectProperty';
 import { MapProperty, MapPropertyType } from './MapProperty';
+import { FileProperty, FilePropertyType } from './FileProperty';
 import { CollectionProperty, CollectionPropertyType } from './CollectionProperty';
 import { PropertyTypes } from './types/PropertyTypes';
-export { Property, BaseProperty, BasePropertyType, ArrayProperty, ArrayPropertyType, NumberProperty, NumberPropertyType, BooleanProperty, BooleanPropertyType, DateTimeProperty, DateTimePropertyType, EnumProperty, EnumPropertyType, ObjectProperty, ObjectPropertyType, StringProperty, StringPropertyType, HashProperty, HashPropertyType, MapProperty, MapPropertyType, CollectionProperty, CollectionPropertyType, };
+export { Property, BaseProperty, BasePropertyType, ArrayProperty, ArrayPropertyType, NumberProperty, NumberPropertyType, BooleanProperty, BooleanPropertyType, DateTimeProperty, DateTimePropertyType, EnumProperty, EnumPropertyType, ObjectProperty, ObjectPropertyType, StringProperty, StringPropertyType, HashProperty, HashPropertyType, MapProperty, MapPropertyType, FileProperty, FilePropertyType, CollectionProperty, CollectionPropertyType, };
 type BaseType = {
     type: PropertyTypes;
 };

package/lib/properties/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CollectionProperty = exports.MapProperty = exports.HashProperty = exports.StringProperty = exports.ObjectProperty = exports.EnumProperty = exports.DateTimeProperty = exports.BooleanProperty = exports.NumberProperty = exports.ArrayProperty = exports.BaseProperty = exports.Property = void 0;
+exports.CollectionProperty = exports.FileProperty = exports.MapProperty = exports.HashProperty = exports.StringProperty = exports.ObjectProperty = exports.EnumProperty = exports.DateTimeProperty = exports.BooleanProperty = exports.NumberProperty = exports.ArrayProperty = exports.BaseProperty = exports.Property = void 0;
 const Property_1 = require("./Property");
 Object.defineProperty(exports, "Property", { enumerable: true, get: function () { return Property_1.Property; } });
 const BaseProperty_1 = require("./BaseProperty");
@@ -23,5 +23,7 @@ const ObjectProperty_1 = require("./ObjectProperty");
 Object.defineProperty(exports, "ObjectProperty", { enumerable: true, get: function () { return ObjectProperty_1.ObjectProperty; } });
 const MapProperty_1 = require("./MapProperty");
 Object.defineProperty(exports, "MapProperty", { enumerable: true, get: function () { return MapProperty_1.MapProperty; } });
+const FileProperty_1 = require("./FileProperty");
+Object.defineProperty(exports, "FileProperty", { enumerable: true, get: function () { return FileProperty_1.FileProperty; } });
 const CollectionProperty_1 = require("./CollectionProperty");
 Object.defineProperty(exports, "CollectionProperty", { enumerable: true, get: function () { return CollectionProperty_1.CollectionProperty; } });

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@quatrain/core",
-   "version": "1.0.0-beta8",
+   "version": "1.0.0",
    "description": "Core objects for business apps",
    "main": "lib/index.js",
    "types": "lib/index.d.ts",
@@ -13,6 +13,7 @@
    "devDependencies": {
       "@tsconfig/recommended": "^1.0.1",
       "@types/jest": "^27.0.3",
+      "@types/node-persist": "^3.1.8",
       "jest": "^27.4.7",
       "jest-node-exports-resolver": "^1.1.6",
       "trace-unhandled": "^2.0.1",
@@ -21,7 +22,8 @@
       "typescript": "^5.1.5"
    },
    "dependencies": {
-      "@faker-js/faker": "^7.6.0"
+      "@faker-js/faker": "^7.6.0",
+      "node-persist": "^4.0.3"
    },
    "scripts": {
       "test": "tsc && jest --verbose",