@quatrain/core 0.4.3 → 0.4.4

package/lib/components/AbstractObject.d.ts

@@ -20,7 +20,7 @@ export declare abstract class AbstractObject {
         ref: string;
         label: string;
     };
-    save(): Promise<DataObjectClass<any>>;
+    save(): Promise<this>;
     delete(): Promise<DataObjectClass<any>>;
     static query(): Query<typeof AbstractObject>;
 }

package/lib/components/AbstractObject.js

@@ -14,7 +14,6 @@ const Query_1 = require("../backends/Query");
 class AbstractObject {
     constructor(dao) {
         this._dataObject = dao;
-        AbstractObject.COLLECTION = this.constructor.name.toLowerCase();
     }
     get(key) {
         return this._dataObject.get(key);
@@ -52,7 +51,8 @@ class AbstractObject {
     }
     save() {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this._dataObject.save();
+            yield this._dataObject.save();
+            return this;
         });
     }
     delete() {

package/lib/components/DataObject.d.ts

@@ -67,7 +67,7 @@ export declare class DataObject implements DataObjectClass<any> {
      * @returns any
      */
     val(key: string): any;
-    toJSON(): {
+    toJSON(objectsAsReferences?: boolean): {
         [x: string]: any;
     };
     toReference(): {
@@ -75,7 +75,7 @@ export declare class DataObject implements DataObjectClass<any> {
         ref: string;
         uri: string;
     };
-    protected _dataToJSON(): {};
+    protected _dataToJSON(objectsAsReferences?: boolean): {};
     read(): Promise<DataObjectClass<any>>;
     save(): Promise<DataObjectClass<any>>;
     delete(): Promise<DataObjectClass<any>>;

package/lib/components/DataObject.js

@@ -159,26 +159,30 @@ class DataObject {
             throw new Error(`Unknown property '${key}'`);
         }
     }
-    toJSON() {
-        return Object.assign(Object.assign({}, (this._uid && { uid: this._uid })), this._dataToJSON());
+    toJSON(objectsAsReferences = false) {
+        return Object.assign(Object.assign({}, (this._uid && { uid: this._uid })), this._dataToJSON(objectsAsReferences));
     }
     toReference() {
         return Object.assign(Object.assign({}, this._objectUri.toReference()), { label: this.val('name') || '' });
     }
-    _dataToJSON() {
+    _dataToJSON(objectsAsReferences = false) {
         const data = {};
         Object.keys(this._properties).forEach((key) => {
             const prop = Reflect.get(this._properties, key);
-            const value = prop.val();
             switch (prop.constructor.name) {
                 case 'CollectionProperty':
                     // ignore
                     break;
                 case 'ObjectProperty':
-                    Reflect.set(data, key, value ? value.toJSON() : null);
+                    const value = prop.val();
+                    Reflect.set(data, key, value
+                        ? objectsAsReferences
+                            ? value.toReference()
+                            : value.toJSON()
+                        : null);
                     break;
                 default:
-                    Reflect.set(data, key, value || null);
+                    Reflect.set(data, key, prop.val() || null);
             }
         });
         return data;
@@ -195,12 +199,10 @@ class DataObject {
         });
     }
     save() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const backend = Core_1.Core.getBackend(this.backend || Core_1.Core.defaultBackend);
-            this._persisted = true;
-            this._modified = false;
-            return this.uid ? backend.update(this) : backend.create(this);
-        });
+        const backend = Core_1.Core.getBackend(this.backend || Core_1.Core.defaultBackend);
+        this._persisted = true;
+        this._modified = false;
+        return this.uid ? backend.update(this) : backend.create(this);
     }
     delete() {
         return __awaiter(this, void 0, void 0, function* () {

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

@@ -19,5 +19,5 @@ export interface DataObjectClass<T extends DataObjectClass<any>> {
     delete(): Promise<T>;
     clone(data?: any): Promise<T>;
     toReference(): any;
-    toJSON(): any;
+    toJSON(objectsAsReferences?: boolean): any;
 }

package/lib/properties/ObjectProperty.js

@@ -19,9 +19,10 @@ class ObjectProperty extends BaseProperty_1.BaseProperty {
         return super.set(value);
     }
     toJSON() {
-        return this._value && this._value.dataObject
+        return this._value &&
+            (this._value.dataObject || this._value instanceof DataObject_1.DataObject)
             ? this._value.dataObject.toReference()
-            : undefined;
+            : null;
     }
 }
 exports.ObjectProperty = ObjectProperty;

package/lib/utils/DataGenerator.js

@@ -93,8 +93,9 @@ const DataGenerator = (model, qty = 5, forcedValues = {}) => __awaiter(void 0, v
                     break;
             }
         });
-        promises.push(dao.save());
+        yield dao.save();
+        promises.push(dao);
     }
-    return Promise.all(promises);
+    return promises;
 });
 exports.DataGenerator = DataGenerator;

package/package.json

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