@appsemble/utils 0.32.1-test.17 → 0.32.2-test.0

package/README.md

@@ -1,9 +1,9 @@
-# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.32.1-test.17/config/assets/logo.svg) Appsemble Utilities
+# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.32.2-test.0/config/assets/logo.svg) Appsemble Utilities
 
 > Internal utility functions used across multiple Appsemble projects.
 
 [![npm](https://img.shields.io/npm/v/@appsemble/utils)](https://www.npmjs.com/package/@appsemble/utils)
-[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.32.1-test.17/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.32.1-test.17)
+[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.32.2-test.0/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.32.2-test.0)
 [![Prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://prettier.io)
 
 ## Table of Contents
@@ -26,5 +26,5 @@ not guaranteed.
 
 ## License
 
-[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.32.1-test.17/LICENSE.md) ©
+[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.32.2-test.0/LICENSE.md) ©
 [Appsemble](https://appsemble.com)

package/examples.js

@@ -611,6 +611,9 @@ export const examples = {
                                 zip: 7500,
                             },
                         },
+                        favoriteColors: {
+                            'array.from': ['blue', 'green'],
+                        },
                     },
                 },
                 {
@@ -623,12 +626,19 @@ export const examples = {
                                 country: 'France',
                             },
                         },
+                        favoriteColors: { 'array.from': ['red', 'green', 'blue'] },
                     },
                 },
             ],
         },
         result: [
             { path: ['age'], type: 'changed', from: 25, to: 26 },
+            {
+                path: ['favoriteColors'],
+                type: 'changed',
+                from: ['blue', 'green'],
+                to: ['red', 'green', 'blue'],
+            },
             { path: ['address', 'city'], type: 'changed', from: 'Paris', to: 'Lyon' },
             { path: ['address', 'zip'], type: 'removed', value: 7500 },
             { path: ['address', 'country'], type: 'added', value: 'France' },
@@ -894,6 +904,17 @@ export const examples = {
         },
         result: [true, true, true, false, false],
     },
+    maths: {
+        input: { version: 0 },
+        remapper: {
+            maths: {
+                a: { prop: 'version' },
+                b: { static: 1 },
+                operation: 'add',
+            },
+        },
+        result: 1,
+    },
 };
 /**
  * @param remapper The remapper example to use.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/utils",
-  "version": "0.32.1-test.17",
+  "version": "0.32.2-test.0",
   "description": "Utility functions used in Appsemble internally",
   "keywords": [
     "app",
@@ -39,7 +39,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/types": "0.32.1-test.17",
+    "@appsemble/types": "0.32.2-test.0",
     "@odata/parser": "^0.2.14",
     "axios": "^1.0.0",
     "cron-parser": "^4.0.0",

package/reference-schemas/remappers/unsorted.js

@@ -257,5 +257,20 @@ For example:
 ${schemaExample('xml.parse', { result: 'pretty' })}`,
         $ref: '#/components/schemas/RemapperDefinition',
     },
+    maths: {
+        description: `This can be used to perform a mathematical operation on two numbers
+
+For example:
+
+${schemaExample('maths', { result: 'pretty' })}`,
+        additionalProperties: false,
+        properties: {
+            a: { $ref: '#/components/schemas/RemapperDefinition' },
+            b: { $ref: '#/components/schemas/RemapperDefinition' },
+            operation: {
+                enum: ['add', 'divide', 'mod', 'multiply', 'subtract'],
+            },
+        },
+    },
 };
 //# sourceMappingURL=unsorted.js.map

package/remap.js

@@ -24,6 +24,9 @@ function isEqualArray(a, b) {
     }
     return a.every((val, i) => val === b[i]);
 }
+function isNumber(a) {
+    return a !== undefined && a != null && a !== '' && !Number.isNaN(Number(a));
+}
 export function remap(remapper, input, context) {
     if (typeof remapper === 'string' ||
         typeof remapper === 'number' ||
@@ -227,29 +230,31 @@ const mapperImplementations = {
     'object.compare'([remapper1, remapper2], input, context) {
         const remapped1 = remap(remapper1, input, context);
         const remapped2 = remap(remapper2, input, context);
-        function deepDiff(obj1, obj2, path = []) {
+        function deepDiff(object1, object2) {
+            const stack = [{ obj1: object1, obj2: object2, path: [] }];
             const diffs = [];
-            const keys = new Set([...Object.keys(obj1 || {}), ...Object.keys(obj2 || {})]);
-            for (const key of keys) {
-                const val1 = obj1?.[key];
-                const val2 = obj2?.[key];
-                const currentPath = [...path, key];
-                if (isPlainObject(val1) && isPlainObject(val2)) {
-                    diffs.push(...deepDiff(val1, val2, currentPath));
-                }
-                else if (Array.isArray(val1) && Array.isArray(val2)) {
-                    if (!isEqualArray(val1, val2)) {
+            while (stack.length !== 0) {
+                const { obj1, obj2, path } = stack.pop();
+                const keys = new Set([...Object.keys(obj1 || {}), ...Object.keys(obj2 || {})]);
+                for (const key of keys) {
+                    const val1 = obj1?.[key];
+                    const val2 = obj2?.[key];
+                    const currentPath = [...path, key];
+                    if (isPlainObject(val1) && isPlainObject(val2)) {
+                        stack.push({ obj1: val1, obj2: val2, path: currentPath });
+                    }
+                    else if (Array.isArray(val1) && Array.isArray(val2) && !isEqualArray(val1, val2)) {
+                        diffs.push({ path: currentPath, type: 'changed', from: val1, to: val2 });
+                    }
+                    else if (!(key in obj1)) {
+                        diffs.push({ path: currentPath, type: 'added', value: val2 });
+                    }
+                    else if (!(key in obj2)) {
+                        diffs.push({ path: currentPath, type: 'removed', value: val1 });
+                    }
+                    else if (val1 !== val2) {
                         diffs.push({ path: currentPath, type: 'changed', from: val1, to: val2 });
                     }
-                }
-                else if (!(key in obj1)) {
-                    diffs.push({ path: currentPath, type: 'added', value: val2 });
-                }
-                else if (!(key in obj2)) {
-                    diffs.push({ path: currentPath, type: 'removed', value: val1 });
-                }
-                else if (val1 !== val2) {
-                    diffs.push({ path: currentPath, type: 'changed', from: val1, to: val2 });
                 }
             }
             return diffs;
@@ -625,5 +630,32 @@ const mapperImplementations = {
         const remapped = remap(value, input, context);
         return remapped !== undefined && remapped != null;
     },
+    maths(value, input, context) {
+        const { a, b, operation } = value;
+        const aRemapped = remap(a, input, context);
+        const bRemapped = remap(b, input, context);
+        if (!isNumber(aRemapped) || !isNumber(bRemapped)) {
+            return -1;
+        }
+        const na = Number(aRemapped);
+        const nb = Number(bRemapped);
+        switch (operation) {
+            case 'add':
+                return na + nb;
+            case 'subtract':
+                return na - nb;
+            case 'multiply':
+                return na * nb;
+            case 'divide':
+                if (nb === 0) {
+                    return -1;
+                }
+                return na / nb;
+            case 'mod':
+                return na % nb;
+            default:
+                return -1;
+        }
+    },
 };
 //# sourceMappingURL=remap.js.map