@quatrain/core 1.0.0-beta10 → 1.0.0-beta12

package/lib/components/ObjectUri.d.ts

@@ -10,17 +10,20 @@ export declare class ObjectUri {
     protected _collection: string | undefined;
     protected _label: string | undefined;
     protected _objClass: any;
+    protected _parent: ObjectUri | undefined;
     /**
      * 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?: string, label?: string | undefined);
     set class(objClass: any);
     get class(): any;
     get backend(): string;
     get path(): string;
+    get parent(): ObjectUri | undefined;
     set label(label: string | undefined);
     get label(): string | undefined;
     get literal(): string;

package/lib/components/ObjectUri.js

@@ -7,7 +7,8 @@ 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 = [];
@@ -28,33 +29,38 @@ class ObjectUri {
             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;
@@ -69,6 +75,9 @@ class ObjectUri {
     get path() {
         return this._path;
     }
+    get parent() {
+        return this._parent;
+    }
     set label(label) {
         this._label = label;
     }
@@ -76,7 +85,9 @@ class ObjectUri {
         return this._label;
     }
     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) {

package/package.json

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