cavalion-js 1.0.63 → 1.0.66

package/CHANGELOG.md

@@ -1,3 +1,20 @@
+### 2021/12/17 -  1.0.66
+
+- Enhancing `locale`, now supporting references with the ::-prefix
+
+### 2021/10/09 -  1.0.65
+
+- Now supporting the following patterns: 
+ 
+	>	var locale = require("locale").prefixed(["Onderzoek"], { ... });
+	>	var locale = require("locale").prefixed("Onderzoek");
+
+Not sure what todo with the default yet.
+
+### 2021/09/18 -  1.0.64
+
+- Introducing `String.decamelize = String.decamelcase`
+
 ### 2021/06/21 -  1.0.63
 - Introducing `js.groupBy()`
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cavalion-js",
-  "version": "1.0.63",
+  "version": "1.0.66",
   "description": "Cavalion common JavaScript library",
   "main": "index.js",
   "scripts": {

package/src/js/_js.js

@@ -38,7 +38,9 @@ define(function(require) {
 		nameOf: nameOf,
 		defineClass: defineClass,
 		mixIn: mixIn,
-		groupBy: (arr, key) => arr.reduce((a, o) => ((a[o[key]] || (a[o[key]] = [])).push(o), a), {}),
+		groupBy: (arr, key) => {
+			return arr.reduce((a, o) => ((a[js.get(key, o)] || (a[js.get(key, o)] = [])).push(o), a), {});
+		},
 		ctx: function(obj, defaults) {
 			return obj.hasOwnProperty(js_ctx_key) ? obj[js_ctx_key] : obj[js_ctx_key] = (obj[js_ctx_key] || defaults || {});
 		},

package/src/js/extensions.js

@@ -9,6 +9,7 @@ define(function(require) {
 		var inh = ctx.completeLoad;
 		ctx.modulesLoaded = [];
 		ctx.completeLoad = function(moduleName) {
+			// console.log(moduleName);
 			ctx.modulesLoaded.push(moduleName);
 			//console.log(moduleName);
 			return inh.apply(this, arguments);
@@ -128,6 +129,21 @@ define(function(require) {
 		 */
 		return str.substring(0, 1).toUpperCase() + str.substring(1);
 	};
+	String.decamelize = String.decamelcase = function(s) {
+		var r = s.charAt(0), i = 0, ch = r;
+		while(++i < s.length) {
+			if(ch === undefined || ((ch < 'A' || ch > 'Z') || (ch < '0' && ch > '9'))) {
+				ch = s.charAt(i);
+				if((ch >= 'A' && ch <= 'Z')) {// || (ch >= '0' && ch <= '9')) {
+					r += " ";
+				}
+			} else {
+				ch = s.charAt(i);
+			}
+			r += ch;
+		}
+		return r.toLowerCase();
+	};
 	String.escape = function (s) {
 		/**
 		 *

package/src/locale.js

@@ -86,6 +86,20 @@ try {
 			
 	/*- TODO Still not found, split by / delimiter and replace by star and try again */
 	
+			/* FR: reference other locale with double colon */
+			if(typeof r === "string") {
+				if(r.charAt(0) === "\\") {
+					r = r.substring(1);
+				}
+				if(r.charAt(0) === ":" && r.charAt(1) === ":") {
+					try {
+						r = locale(r.substring(2));
+					} catch(e) {
+						r = "{" + r + "}: " + e.message;
+					}
+				}
+			}
+	
 			return r;
 } finally {
 	if(began) {
@@ -133,7 +147,15 @@ try {
 	    	
 	    return r;
     };
-    locale.prefixed = function(prefix) {
+    locale.prefixed = function(prefix/*, defaults */) {
+    	if(prefix instanceof Array) {
+    		prefix = prefix[0];
+    	}
+
+    	if(arguments.length > 1) {
+    		locale.define(prefix, arguments[1]);
+    	}
+    	
     	return function(id/*, ... */) {
     		if(arguments.length === 0) {
     			return prefix;
@@ -144,6 +166,18 @@ try {
     		return locale.apply(this, args);
     	};
     };
+	locale.define = function(prefix, defaults) {
+		for(var loc in defaults) {
+			var L = {}; L[prefix] = defaults[loc];
+			
+			// console.log(1, locale[loc], L);	
+
+			locale[loc] = locale[loc] || {};
+			js.mixIn(locale[loc], js.obj2kvp(L));
+
+			// console.log(2, locale[loc], L);	
+		}
+    };
     
 	if(typeof window !== "undefined" && typeof window.location !== "undefined") {
 		locale.loc = (location.search.split('locale=')[1]||'').split('&')[0];
@@ -158,7 +192,7 @@ try {
 	}
 	
 	function unwrap(dict, v) {
-		/* unwrap arrays */
+		/* unwrap arrays */ // TODO why?
 		for(var k in dict) {
 			if(((v = dict[k]) instanceof Array)) {
 				dict[k] = v[0];
@@ -169,6 +203,8 @@ try {
 
 	return {
 		locale: locale,
+		
+		prefixed: locale.prefixed,
 		module: function(module) {
 			return function() {
 				var args = js.copy_args(arguments);
@@ -194,8 +230,10 @@ try {
         		dict = unwrap(js.mixIn(js.obj2kvp(proto || {}), js.obj2kvp(dict)));
         		
         		js.mixIn(locale[name], dict);
+        		
         		onLoad(dict);
         	});
-        }
+        },
+        define: locale.define
 	};
 });