@schukai/monster 3.13.1 → 3.14.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schukai/monster",
-  "version": "3.13.1",
+  "version": "3.14.1",
   "description": "Monster is a simple library for creating fast, robust and lightweight websites.",
   "keywords": [
     "framework",

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

@@ -169,6 +169,13 @@ class RestAPI extends Server {
     }
 }
 
+/**
+ * @private
+ * @param init
+ * @param key
+ * @param callback
+ * @returns {Promise<string>}
+ */
 function fetchData(init, key, callback) {
     const self = this;
     let response;

package/source/data/datasource.mjs

@@ -53,6 +53,7 @@ class Datasource extends Base {
      */
     constructor() {
         super();
+
         this[internalSymbol] = new ProxyObserver({
             options: extend({}, this.defaults),
         });

package/source/data/transformer.mjs

@@ -8,7 +8,7 @@
 import {Base} from "../types/base.mjs";
 import {getGlobal, getGlobalObject} from "../types/global.mjs";
 import {ID} from "../types/id.mjs";
-import {isArray, isObject, isString} from "../types/is.mjs";
+import {isArray, isObject, isString, isPrimitive} from "../types/is.mjs";
 import {getDocumentTranslations, Translations} from "../i18n/translations.mjs";
 import {
     validateFunction,
@@ -397,6 +397,34 @@ function transform(value) {
 
             return new Pathfinder(value).exists(key);
 
+        case "concat":
+            let pf2 = new Pathfinder(value);
+            let concat = "";
+            while (args.length > 0) {
+                key = args.shift();
+                if (key === undefined) {
+                    throw new Error("missing key parameter");
+                }
+                
+                // add empty strings
+                if (isString(key)&&key.trim()==="") {
+                    concat += key; 
+                    continue;
+                }
+                
+                if (!pf2.exists(key)) {
+                    concat += key;
+                    continue;
+                }
+                let v = pf2.getVia(key);
+                if(!isPrimitive(v)) {
+                    throw new Error("value is not primitive");
+                }
+
+                concat += v;
+            }
+            
+            return concat;
         case "path":
             key = args.shift();
             if (key === undefined) {
@@ -474,7 +502,7 @@ function transform(value) {
             if (key === undefined) {
                 key = value;
             }
-                        
+
             defaultValue = args.shift() || undefined;
             return translations.getText(key, defaultValue);
 

package/source/types/version.mjs

@@ -142,7 +142,7 @@ function getMonsterVersion() {
     }
 
     /** don't touch, replaced by make with package.json version */
-    monsterVersion = new Version("3.13.1");
+    monsterVersion = new Version("3.14.1");
 
     return monsterVersion;
 }

package/test/cases/data/transformer.mjs

@@ -27,6 +27,10 @@ describe('Transformer', function () {
     describe('Transformer.run()', function () {
 
         [
+            ['concat:a.b.c:test:a.b.d', {a: {b: {c: 4, d: 6}}}, "4test6"],
+            ['concat:a.b.c:\\ \\ :a.b.d', {a: {b: {c: 4, d: 6}}}, "4  6"],
+            ['concat:a.b.c:,:a.b.d', {a: {b: {c: 4, d: 6}}}, "4,6"],
+            ['concat:a.b.c:,:\\ :a.b.d', {a: {b: {c: 4, d: 6}}}, "4, 6"],
             ['??:a', null, 'a'],
             ['??:a', undefined, 'a'],
             ['??:a', 'true', 'true'],
@@ -237,11 +241,11 @@ describe('Transformer', function () {
         });
 
         [
-            [ 'i18n:test1',"", "xyz"],
-            [ 'i18n:',"test1", "xyz"], // key by value
-            [ 'i18n::',"test1", "xyz"], // key by value no default
-            [ 'i18n::eee',"test2", "eee"], // key by value with default
-            [ 'i18n::ddd',"test2", "ddd"], // key by value and default
+            ['i18n:test1', "", "xyz"],
+            ['i18n:', "test1", "xyz"], // key by value
+            ['i18n::', "test1", "xyz"], // key by value no default
+            ['i18n::eee', "test2", "eee"], // key by value with default
+            ['i18n::ddd', "test2", "ddd"], // key by value and default
 
         ].forEach(function (data) {
 
@@ -249,7 +253,7 @@ describe('Transformer', function () {
             let b = data.shift()
             let c = data.shift()
 
-            it('should transform('+a+').run('+b+') return ' + JSON.stringify(c), function () {
+            it('should transform(' + a + ').run(' + b + ') return ' + JSON.stringify(c), function () {
                 const t = new Transformer(a);
                 expect(t.run(b)).to.be.eql(c);
             });

package/test/cases/monster.mjs

@@ -7,7 +7,7 @@ describe('Monster', function () {
         let monsterVersion
 
         /** don´t touch, replaced by make with package.json version */
-        monsterVersion = new Version("3.13.1")
+        monsterVersion = new Version("3.14.1")
 
         let m = getMonsterVersion();