cavalion-js 1.0.70 → 1.0.71

package/.md

@@ -2,44 +2,17 @@
 
 # cavalion-js
 
-# `0725`
-
-Enhancing `js.groupBy` to accept multiple keys for grouping.
-
-
-# `0429`
-
-I want to be able to activate these source files with [an overlay]([!prototypes/Hover]{}) of Markdown. Or... no, I want to overlay the source I guess. 😇🤨🤔
-
-* [defineClass](src/js/:.js)
-	* [JsObject](src/js/:.js)
-		* [Method](src/js/:.js)
-	* [Class](src/js/:.js)
-		* [extensions](src/js/:.js)
-			* [mixIn](src/js/:.js)
-		* [nameOf](src/js/:.js)
-		* [Method](src/js/:.js)
-		* [Type](src/js/:.js)
-
-Still, it would be nice to just
-
-* Press (**⇧⌘.**) and overlay _the current context_ (whatever that might be anyways, probably a JavaScript module, rapportage-script) with _whatever_, starting with a _context-local_-[.md]()-file, sprouting in to whatever, but _mas-que-nada_ a starting point in order to...
-* ...overlay notes, bookmarks, links, scripts, photos, ...
-
-# `0424`
-
-* `js.args(arr)` - concats and filters `arr` for non-undefined values
-
->>	var v = (a, b, c, d) => control.vars.apply(control, js.args(a, b, c, d));
-
-# cavalion-js
-
 * [src](:/)
-	* [console](src/:/)
-	* [data](src/:/) - [design](src/:/)
-	* [entities](src/:/) - [entities.js](src/) - [features](src/:/)
+	* **[console](src/:/)**
+	* **[data](src/:/)** - [design](src/:/)
+	* **[entities](src/:/)** - [entities.js](src/) - [features](src/:/)
 	* [js](src/:/) / [\_js.js](src/js/:) - [extensions.js](src/js/:) - _[global.js](src/js/:)_? - _[define.js](src/js/:)?_ 
 		- [defineClass.js](src/js/:) - [referenceClass.js](src/js/:) 
+		- [json.js](src/:) - [locale.js](src/:) - [text.js](src/:)
+		- [script.js](src/:) - [relscript.js](src/:) 
+		- [stylesheet.js](src/:) 
+		- [persistence](src/:/) - [persistence2](src/:/) 
+		- [test](src/:/) - [yell.js](src/:) - [unrequire.js](src/:)
 		- [js.js](src/:)
 			- [on.js](src/:) 
 			- [nameOf.js](src/js/:) 
@@ -55,13 +28,8 @@ Still, it would be nice to just
 			- [Rest.js](src/util/:)
 			- [Stylesheet.js](src/util/:)
 			- [Xml.js](src/util/:)
-		- [json.js](src/:) - [locale.js](src/:) - [text.js](src/:)
-		- [script.js](src/:) - [relscript.js](src/:) 
-		- [stylesheet.js](src/:) 
-		- [persistence](src/:/) - [persistence2](src/:/) 
-		- [test](src/:/) - [yell.js](src/:) - [unrequire.js](src/:)
 
-#	
+# 
 
 - []()
 	- [ArrayFactory.js](src/js/:)
@@ -77,8 +45,40 @@ Still, it would be nice to just
 	- [Scaffold.js](src/js/:)
 	- [Type.js](src/js/:)
 
-# js.nameOf for Array in console
+# `0913`
+
+Working on [README.md]().
+
+# `0725`
+
+Enhancing `js.groupBy` to accept multiple keys for grouping.
+
+# `0429`
+
+I want to be able to activate these source files with [an overlay]([!prototypes/Hover]{}) of Markdown. Or... no, I want to overlay the source I guess. 😇🤨🤔
+
+* [defineClass](src/js/:.js)
+	* [JsObject](src/js/:.js)
+		* [Method](src/js/:.js)
+	* [Class](src/js/:.js)
+		* [extensions](src/js/:.js)
+			* [mixIn](src/js/:.js)
+		* [nameOf](src/js/:.js)
+		* [Method](src/js/:.js)
+		* [Type](src/js/:.js)
+
+Still, it would be nice to just:
+
+* Press (**⇧⌘.**) and overlay _the current context_ (whatever that might be anyways, probably a JavaScript module, rapportage-script) with _whatever_, starting with a _context-local_-[.md]()-file, sprouting in to whatever, but _mas-que-nada_ a starting point in order to...
+* ...overlay notes, bookmarks, links, scripts, photos, ...
 
+# `0424`
+
+* `js.args(arr)` - concats and filters `arr` for non-undefined values
+
+>>	var v = (a, b, c, d) => control.vars.apply(control, js.args(a, b, c, d));
+
+# js.nameOf for Array in console
 
 # sort
 

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 2022/07/28 10/29 -  1.0.71
+
+* Adjusts/enhances `js.groupBy()` to use js.get(key,obj) in case obj doesn't have key
+* !!!???? Implements the support for falling back automatically ([CVLN-20220901-2-](/Dropbox-cavalion/Issues/:/))
+fixes a bug where falling back on wildcarded terms was not working correctly
+
 ### 2022/07/28 -  1.0.70
 
 * 2bb8d17 - updates/commits code that has been shipped for months now

package/README.md

@@ -1,13 +1,46 @@
 # cavalion-js
 
-## TL;DR:
+Cavalion common JavaScript library. It consist of:
 
-Cavalion common JavaScript library.
+* Constructor class registration
+* Console
+* Data interfaces
+* Design(er) package (in development)
+* Utility Classes
+* RequireJS plugins
 
-## src/js.js
+# Installation
 
-* Entry point for RequireJS
+## Node
+
+	$ npm install cavalion-js
+
+## RequireJS
+
+	require.config({ paths: { js: `${path-to-cavalion-js}/src/js`}})
+
+	require("js");
+
+# Class System
+
+* [defineClass](src/js/:.js) - _basically a shortcut to Class.define with some sugar_
+	* [JsObject](src/js/:.js) - _kind of super class_
+		* [Method](src/js/:.js) - _hacking with functions_
+	* [Class](src/js/:.js) - _Class.make() is where the meat is_
+		* [extensions](src/js/:.js)
+			* [mixIn](src/js/:.js)
+		* [nameOf](src/js/:.js)
+		* [Method](src/js/:.js)
+		* [Type](src/js/:.js)
+
+![20220915-014041-tAzlRV](https://raw.githubusercontent.com/relluf/screenshots/master/20220915-014041-tAzlRV.png)
+
+# RequireJS plugins
+
+* [json](src/:.js)
+* [stylesheet](src/:.js)
+* [script](src/:.js)
+* [relscript](src/:.js)
+* [text](src/:.js)
 
-		require.config({ paths: { js: "`${npm("cavalion-js")}`/src/js"}})
 
-		require("js");

package/package.json

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

package/src/js/Class.js

@@ -20,9 +20,6 @@ define(function(require) {
 		}
 	});
 
-	/**
-	 *
-	 */
 	function getDefaultInherits() {
 		if(classMap["js/JsObject"] === undefined) {
 			console.log("JsObject not defined!");
@@ -33,21 +30,21 @@ define(function(require) {
 		return classMap["js/JsObject"];
 	}
 
-	/**
-	 * toString implementation for constructors
-	 */
 	function classConstructorToString() {
+		/**
+		 * toString implementation for constructors
+		 */
 		if(this.hasOwnProperty(classObjKeyName)) {
 			return String.format("function %s() { [constructor code] }", this[classObjKeyName].name);
 		}
 		return Function.prototype.toString.apply(this, arguments);
 	}
 
-	/**
-	 * This is Chrome specific (as far as I know). It will show fancy names for
-	 * object instances in the console.
-	 */
 	function namedFunction(name, f) {
+		/**
+		 * This is Chrome specific (as far as I know). It will show fancy names for
+		 * object instances in the console.
+		 */
 		var symbol;
 		var g = f, fname = f.name;
 		
@@ -80,12 +77,12 @@ define(function(require) {
 		return f;
 	}
 
-	/**
-	 * Create a constructor function used for instances of Class.defin(e)itions
-	 *
-	 * @returns {Function}
-	 */
 	function createConstructor(name) {
+		/**
+		 * Create a constructor function used for instances of Class.defin(e)itions
+		 *
+		 * @returns {Function}
+		 */
 		return namedFunction(name || "AnonymousClass", function() {
 			/**
 			 * js/Class.constructor: This constructor inspects it's classObj in

package/src/js/_js.js

@@ -59,13 +59,14 @@ define(function(require) {
 
 			var obj = groupBy(arr, keys.shift());
 			
-			for(var k in obj) {
-				if(keys.length) {
-					obj[k] = js.groupBy(obj[k], [].concat(keys), mth);
-				} else if(mth) {
-					obj[k] = mth(obj[k]);
-				}
-			}
+		    for (var k in obj) {
+		    	var v = obj.hasOwnProperty(k) ? obj[k] : js.get(k, obj);
+		        if (keys.length) {
+		            obj[k] = js.groupBy(v, [].concat(keys), mth);
+		        } else if (mth) {
+		            obj[k] = mth(v);
+		        }
+		    }
 			
 			return obj;
 		},

package/src/locale.js

@@ -15,35 +15,7 @@ define(function(require) {
 	function locale(id) {
     	var loc = locale.loc;//arguments.callee.loc;
     	
-    	if(id === undefined || locale[loc] === undefined) {
-    		return "{{" + id + "}}";
-    	}
-    	
-    	if(id instanceof RegExp) {
-    		var m = [], match;
-    		for(var k in locale[loc]) {
-    			if((match = id.exec(k)) !== null && match.length > 0) {
-    				if(m.indexOf(match[0]) === -1) {
-    					m.push(match[0]);
-    				}
-    			}
-    		}
-    		return m;
-    	}
-    	
-    	if(locale.slashDotRepl === true) {
-    		id = id.replace(/\/\./g, "#");
-    	}
-
     	function resolve(id) {
-    		if(id === undefined) debugger;
-
-var began;    		
-if((began = locale.debug)) {
-	console.group("locale-resolve", id);
-}
-try {
-	
 			/*- Find in the dictionary */
 	    	var r = window.locale[loc][id], i, nid, dash = id.indexOf("-"), dot = id.indexOf(".");
 	    	var preferdash = (dot === -1 || dot > dash);
@@ -101,14 +73,43 @@ try {
 			}
 	
 			return r;
-} finally {
-	if(began) {
-		console.groupEnd();
-	}
-}
     	}
     	
-    	var r = resolve(id);
+    	if(id === undefined || locale[loc] === undefined) {
+    		return "{{" + id + "}}";
+    	}
+    	
+    	if(id instanceof RegExp) {
+    		var m = [], match;
+    		for(var k in locale[loc]) {
+    			if((match = id.exec(k)) !== null && match.length > 0) {
+    				// if(m.indexOf(match[0]) === -1) {
+    					m.push([k, locale[loc][k]]);
+    				// }
+    			}
+    		}
+    		return m.sort((i1, i2) => i1[0] < i2[0] ? -1 : i1[0] === i2[0] ? 0 : 1);
+    	}
+    	
+    	var r;
+    	if(id instanceof Array) { // #CVLN-202209091-1
+    		// r = resolve(id.join(""));
+    		var id_ = id.join("");
+    		r = locale[loc][id.join("")];
+    		while(r === undefined && id.length > 1) {
+    			while(id.shift() === "*") ;
+    			id.unshift("*");
+    			
+	    		r = resolve(id.join(""));
+    		}
+			if(r == undefined) r = locale(id_);
+    	} else {
+    		if(locale.slashDotRepl === true) {
+	    		id = id.replace(/\/\./g, "#");
+    		}
+    		r = resolve(id);
+    	}
+
 		if(r === undefined) {
     		var arr = (window.locale.missing = (window.locale.missing || []));
     		arr.push(id);
@@ -162,7 +163,12 @@ try {
     		}
     		
     		var args = js.copy_args(arguments);
-    		args[0] = prefix + id;
+    		if(args[0] instanceof Array) {
+    			args[0].unshift(prefix);
+    			args[0] = [args[0].pop(), args[0].join("")].reverse();
+    		} else {
+    			args[0] = [prefix, id];
+    		}
     		return locale.apply(this, args);
     	};
     };