@schukai/monster 3.70.0 → 3.71.1

package/source/components/datatable/save-button.mjs

@@ -77,9 +77,6 @@ class SaveButton extends CustomElement {
 	 * @property {Object} classes The classes
 	 * @property {string} classes.bar The bar class
 	 * @property {string} classes.badge The badge class
-	 * @property {object} mapping The mapping
-	 * @property {string} mapping.data The data
-	 * @property {number} mapping.index The index
 	 * @property {Array} ignoreChanges The ignore changes (regex)
 	 * @property {Array} data The data
 	 * @return {Object}
@@ -105,11 +102,6 @@ class SaveButton extends CustomElement {
 
 			changes: "0",
 
-			mapping: {
-				data: "dataset",
-				index: 0,
-			},
-
 			ignoreChanges: [],
 
 			data: {},

package/source/components/form/form.mjs

@@ -164,13 +164,6 @@ class Form extends DataSet {
 }
 
 function initDataSourceHandler() {
-    if (!this[datasourceLinkedElementSymbol]) {
-        return;
-    }
-console.log(this[datasourceLinkedElementSymbol]);
-    this[datasourceLinkedElementSymbol].setOption("write.responseCallback", (response) => {
-        console.log("response!!!", response);
-    })
 
 }
 

package/source/data/datasource/server/restapi.mjs

@@ -13,7 +13,8 @@
  */
 
 import {internalSymbol, instanceSymbol} from "../../../constants.mjs";
-import {isObject, isFunction} from "../../../types/is.mjs";
+import {isObject, isFunction, isArray} from "../../../types/is.mjs";
+import {diff} from "../../diff.mjs";
 import {Server} from "../server.mjs";
 import {WriteError} from "./restapi/writeerror.mjs";
 import {DataFetchError} from "./restapi/data-fetch-error.mjs";
@@ -30,6 +31,7 @@ const rawDataSymbol = Symbol.for(
     "@schukai/monster/data/datasource/server/restapi/rawdata",
 );
 
+
 /**
  * The RestAPI is a class that enables a REST API server.
  *
@@ -75,6 +77,8 @@ class RestAPI extends Server {
      * @property {Monster.Data.Datasource~exampleCallback[]} write.mapping.callback with the help of the callback, the structures can be adjusted before writing.
      * @property {Object} write.report
      * @property {String} write.report.path Path to validations
+     * @property {Object} write.partial
+     * @property {Function} write.partial.callback Callback function to be executed after the request has been completed. (obj, diffResult) => obj
      * @property {Object} write.sheathing
      * @property {Object} write.sheathing.object Object to be wrapped
      * @property {string} write.sheathing.path Path to the data
@@ -107,6 +111,10 @@ class RestAPI extends Server {
                 report: {
                     path: undefined,
                 },
+
+                partial: {
+                    callback: null,
+                }
             },
             read: {
                 init: {
@@ -135,10 +143,11 @@ class RestAPI extends Server {
         if (!init["method"]) init["method"] = "GET";
 
         let callback = this.getOption("read.responseCallback");
-        if (!callback)
+        if (!callback) {
             callback = (obj) => {
                 this.set(this.transformServerPayload.call(this, obj));
             };
+        }
 
         return fetchData.call(this, init, "read", callback);
     }
@@ -189,7 +198,7 @@ function fetchData(init, key, callback) {
         .then((resp) => {
             response = resp;
 
-            const acceptedStatus =  this.getOption(`${key}.acceptedStatus`, [200]).map(Number);
+            const acceptedStatus = this.getOption(`${key}.acceptedStatus`, [200]).map(Number);
 
             if (acceptedStatus.indexOf(resp.status) === -1) {
                 throw new DataFetchError(

package/source/data/datasource/server.mjs

@@ -12,13 +12,21 @@
  * SPDX-License-Identifier: AGPL-3.0
  */
 
-import { internalSymbol, instanceSymbol } from "../../constants.mjs";
-import { isObject } from "../../types/is.mjs";
-import { Datasource } from "../datasource.mjs";
-import { Pathfinder } from "../pathfinder.mjs";
-import { Pipe } from "../pipe.mjs";
+import {instanceSymbol} from "../../constants.mjs";
+import {isArray, isFunction, isObject} from "../../types/is.mjs";
+import {Datasource} from "../datasource.mjs";
+import {diff} from "../diff.mjs";
+import {Pathfinder} from "../pathfinder.mjs";
+import {Pipe} from "../pipe.mjs";
 
-export { Server };
+export {Server};
+
+
+/**
+ * @private
+ * @type {symbol}
+ */
+const serverVersionSymbol = Symbol("serverVersion");
 
 /**
  * Base class for all server data sources
@@ -30,54 +38,82 @@ export { Server };
  * @summary The Server class encapsulates the access to a server datasource
  */
 class Server extends Datasource {
-	/**
-	 * This method is called by the `instanceof` operator.
-	 * @returns {symbol}
-	 */
-	static get [instanceSymbol]() {
-		return Symbol.for("@schukai/monster/data/datasource/server");
-	}
-
-	/**
-	 * This prepares the data that comes from the server.
-	 * Should not be called directly.
-	 *
-	 * @private
-	 * @param {Object} payload
-	 * @returns {Object}
-	 */
-	transformServerPayload(payload) {
-		payload = doTransform.call(this, "read", payload);
-
-		const dataPath = this.getOption("read.path");
-		if (dataPath) {
-			payload = new Pathfinder(payload).getVia(dataPath);
-		}
-
-		return payload;
-	}
-
-	/**
-	 * This prepares the data for writing and should not be called directly.
-	 *
-	 * @private
-	 * @param {Object} payload
-	 * @returns {Object}
-	 */
-	prepareServerPayload(payload) {
-		payload = doTransform.call(this, "write", payload);
-
-		const sheathingObject = this.getOption("write.sheathing.object");
-		const sheathingPath = this.getOption("write.sheathing.path");
-
-		if (sheathingObject && sheathingPath) {
-			const sub = payload;
-			payload = sheathingObject;
-			new Pathfinder(payload).setVia(sheathingPath, sub);
-		}
-
-		return payload;
-	}
+    /**
+     * This method is called by the `instanceof` operator.
+     * @returns {symbol}
+     */
+    static get [instanceSymbol]() {
+        return Symbol.for("@schukai/monster/data/datasource/server");
+    }
+
+    /**
+     * This prepares the data that comes from the server.
+     * Should not be called directly.
+     *
+     * @private
+     * @param {Object} payload
+     * @returns {Object}
+     */
+    transformServerPayload(payload) {
+        payload = doTransform.call(this, "read", payload);
+        this[serverVersionSymbol] = payload;
+
+        const dataPath = this.getOption("read.path");
+        if (dataPath) {
+            payload = new Pathfinder(payload).getVia(dataPath);
+        }
+
+        return payload;
+    }
+
+    /**
+     * This prepares the data for writing and should not be called directly.
+     *
+     * @private
+     * @param {Object} payload
+     * @returns {Object}
+     */
+    prepareServerPayload(payload) {
+        payload = doTransform.call(this, "write", payload);
+        payload = doDiff.call(this, payload);
+
+        const sheathingObject = this.getOption("write.sheathing.object");
+        const sheathingPath = this.getOption("write.sheathing.path");
+
+        if (sheathingObject && sheathingPath) {
+            const sub = payload;
+            payload = sheathingObject;
+            new Pathfinder(payload).setVia(sheathingPath, sub);
+        }
+
+        return payload;
+    }
+}
+
+/**
+ * 
+ * @param obj
+ * @returns {*}
+ */
+function doDiff(obj) {
+    if (this[serverVersionSymbol] === null || this[serverVersionSymbol] === undefined) {
+        return obj;
+    }
+
+    const callback = this.getOption("write.partial.callback");
+    if (!isFunction(callback)) {
+        return obj;
+    }
+
+    const results = diff(this[serverVersionSymbol], obj);
+    if (!results) {
+        return obj;
+    }
+
+    obj = callback(obj, results);
+    this[serverVersionSymbol] = obj;
+
+    return obj;
 }
 
 /**
@@ -87,24 +123,32 @@ class Server extends Datasource {
  * @returns {Object}
  */
 function doTransform(type, obj) {
-	const transformation = this.getOption(`${type}.mapping.transformer`);
-	if (transformation !== undefined && transformation !== null) {
-		const pipe = new Pipe(transformation);
-		const callbacks = this.getOption(`${type}.mapping.callbacks`);
-
-		if (isObject(callbacks)) {
-			for (const key in callbacks) {
-				if (
-					callbacks.hasOwnProperty(key) &&
-					typeof callbacks[key] === "function"
-				) {
-					pipe.setCallback(key, callbacks[key]);
-				}
-			}
-		}
-
-		obj = pipe.run(obj);
-	}
-
-	return obj;
+    const transformation = this.getOption(`${type}.mapping.transformer`);
+    if (transformation !== undefined && transformation !== null) {
+        const pipe = new Pipe(transformation);
+        const callbacks = this.getOption(`${type}.mapping.callbacks`);
+
+        if (isArray(callbacks)) {
+            for (const callback of callbacks) {
+                if (typeof callback === "function") {
+                    pipe.setCallback(callback);
+                }
+            }
+        }
+
+        if (isObject(callbacks)) {
+            for (const key in callbacks) {
+                if (
+                    callbacks.hasOwnProperty(key) &&
+                    typeof callbacks[key] === "function"
+                ) {
+                    pipe.setCallback(key, callbacks[key]);
+                }
+            }
+        }
+
+        obj = pipe.run(obj);
+    }
+
+    return obj;
 }

package/source/data/diff.mjs

@@ -183,4 +183,4 @@ function getOperator(a, b) {
 	}
 
 	return operator;
-}
+}

package/test/cases/data/diff.mjs

@@ -6,6 +6,43 @@ import {Queue} from "../../../source/types/queue.mjs";
 
 describe('Diff', function () {
 
+    describe('test to datasets', function () {
+
+        var obj1, obj2;
+
+        beforeEach(() => {
+            obj1 = [
+                {
+                    "id": 1,
+                    "name": "test"
+                },
+                {
+                    "id": 2,
+                    "name": "test2"
+                }
+            ]
+
+            obj2 = [
+                {
+                    "id": 1,
+                    "name": "test"
+                },
+                {
+                    "id": "3",
+                    "name": "test2"
+                }
+            ]
+
+        });
+
+        it('should return the difference between two datasets', function () {
+            let d = diff(obj1, obj2);
+            expect(JSON.stringify(d)).is.equal('[{"operator":"update","path":["1","id"],"first":{"value":2,"type":"number"},"second":{"value":"3","type":"string"}}]');
+        });
+        
+        
+    })
+    
     describe('Diff special cases', function () {
 
         var obj1, obj2;

package/test/web/test.html

@@ -5,12 +5,6 @@
     <title>Mocha Monster</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <link rel="stylesheet" href="mocha.css"/>
-   <script id="polyfill" src="https://polyfill.io/v3/polyfill.min.js?features=AbortController,Array.prototype.entries,Array.prototype.fill,Array.prototype.find,Array.prototype.includes,Array.prototype.keys,Array.prototype.sort,Array.prototype.values,atob,AudioContext,blissfuljs,Blob,CharacterData.prototype.nextElementSibling,CharacterData.prototype.previousElementSibling,CharacterData.prototype.remove,console,console.error,console.log,CSS.supports,CustomEvent,DocumentFragment,DocumentFragment.prototype.append,DocumentFragment.prototype.prepend,DOMRect,DOMTokenList,DOMTokenList.prototype.forEach,DOMTokenList.prototype.replace,Element.prototype.append,Element.prototype.getAttributeNames,Element.prototype.prepend,Element.prototype.remove,Element.prototype.scroll,Event,EventSource,fetch,Function.prototype.name,globalThis,HTMLDocument,HTMLPictureElement,HTMLTemplateElement,IntersectionObserver,IntersectionObserverEntry,Intl,Intl.DateTimeFormat,Intl.NumberFormat,Intl.PluralRules,Map,Math.log2,MutationObserver,Node.prototype.contains,Node.prototype.getRootNode,Node.prototype.isConnected,Node.prototype.isSameNode,NodeList.prototype.forEach,Number.isFinite,Number.isInteger,Object.assign,Object.entries,Object.freeze,Object.getOwnPropertyNames,Object.prototype.toString,Reflect,Reflect.defineProperty,Reflect.get,Reflect.getOwnPropertyDescriptor,Reflect.setPrototypeOf,requestAnimationFrame,ResizeObserver,Set,String.prototype.includes,String.prototype.matchAll,String.prototype.padStart,Symbol,Symbol.for,Symbol.hasInstance,Symbol.iterator,TextDecoder,TextEncoder,Uint16Array,Uint8Array,URLSearchParams,WeakSet"
-            src="https://polyfill.io/v3/polyfill.min.js?features=Array.from,Array.isArray,Array.prototype.entries,Array.prototype.every,Array.prototype.fill,Array.prototype.filter,Array.prototype.find,Array.prototype.forEach,Array.prototype.includes,Array.prototype.indexOf,Array.prototype.keys,Array.prototype.lastIndexOf,Array.prototype.map,Array.prototype.reduce,Array.prototype.some,Array.prototype.sort,Array.prototype.values,ArrayBuffer,atob,Blob,console,CustomEvent,DataView,Date.prototype.toISOString,document,Document,DocumentFragment,Element,Event,fetch,Function.prototype.bind,getComputedStyle,globalThis,HTMLDocument,HTMLTemplateElement,IntersectionObserver,Intl,JSON,Map,Math.log2,MutationObserver,Number.isFinite,Number.isInteger,Object.assign,Object.defineProperty,Object.entries,Object.freeze,Object.getOwnPropertyDescriptor,Object.getOwnPropertyNames,Object.getPrototypeOf,Object.keys,Promise,Reflect,Reflect.defineProperty,Reflect.get,Reflect.getOwnPropertyDescriptor,Reflect.setPrototypeOf,requestAnimationFrame,ResizeObserver,Set,String.prototype.endsWith,String.prototype.includes,String.prototype.matchAll,String.prototype.padStart,String.prototype.startsWith,String.prototype.trim,Symbol,Symbol.for,Symbol.hasInstance,Symbol.iterator,Uint16Array,Uint8Array,URL,WeakMap,WeakSet"
-            src="https://polyfill.io/v3/polyfill.min.js?features=Array.from,Array.isArray,Array.prototype.entries,Array.prototype.fill,Array.prototype.forEach,Array.prototype.indexOf,Array.prototype.keys,Array.prototype.lastIndexOf,Array.prototype.map,Array.prototype.reduce,Array.prototype.sort,ArrayBuffer,atob,DataView,document,DocumentFragment,Element,Event,globalThis,HTMLDocument,HTMLTemplateElement,JSON,Map,Math.log2,Number.isInteger,Object.assign,Object.defineProperty,Object.entries,Object.getOwnPropertyDescriptor,Object.getPrototypeOf,Object.keys,Promise,Reflect,Reflect.defineProperty,Reflect.get,Reflect.getOwnPropertyDescriptor,Reflect.setPrototypeOf,Set,String.prototype.endsWith,String.prototype.matchAll,String.prototype.padStart,String.prototype.startsWith,String.prototype.trim,Symbol,Symbol.iterator,WeakMap,WeakSet"
-            crossorigin="anonymous"
-            referrerpolicy="no-referrer"></script>
-    <script src="https://cdn.jsdelivr.net/npm/element-internals-polyfill"></script>
 
 </head>
 <body>