@makano/rew 1.5.1 → 1.5.3

package/lib/rew/cli/helpers.js

@@ -10,7 +10,7 @@ const cachepath = path.join(conf({}).create('').root, '.cache');
 const localBinPath = path.join(binpath, '../../../', 'bin');
 
 const FILE_DL_EXTRACT_REGEX = /^file\+sha\(([^)]+)\)\+([a-zA-Z0-9_-]+)(\([^\)]*\))?:(.*)$|^file\+([a-zA-Z0-9_-]+)(\([^\)]*\))?:(.*)$/;
-
+const HTTP_REGEX = /^https?:\/\/(www\.)?[a-zA-Z0-9\-._~:\/?#@!$&'()*+,;=%]+$/
 
 if (!fs.existsSync(CONFIG_PATH) || !fs.existsSync(CONFIG_PATH + '/repos.yaml')) {
 	fs.mkdirSync(CONFIG_PATH, { recursive: true });
@@ -70,5 +70,6 @@ module.exports = {
   npm_package_name,
   getAllPipeInput,
   hashTags,
-  FILE_DL_EXTRACT_REGEX
+  FILE_DL_EXTRACT_REGEX,
+  HTTP_REGEX
 }

package/lib/rew/cli/utils.js

@@ -22,7 +22,8 @@ const {
   cachepath,
   localBinPath,
 	hashTags,
-	FILE_DL_EXTRACT_REGEX
+	FILE_DL_EXTRACT_REGEX,
+	HTTP_REGEX
 } = require('./helpers');
 const { input } = require('../functions/stdout');
 
@@ -203,7 +204,7 @@ module.exports = {
 			}
 		}
 	},
-	installApp(pathname, opts, rmidir, rmidiri) {
+	installApp(pathname, opts, rmidir) {
 		if (!pathname) {
 			return;
 		}
@@ -282,6 +283,9 @@ module.exports = {
 						}
 
 						log(' Installed '.green + pname.cyan.bold, ':end');
+						if(rmidir){
+							fs.rmdirSync(apppath);
+						}
 					}
 					rl.close();
 				} else {
@@ -587,8 +591,10 @@ module.exports = {
 			process.exit(1);
     }
 
+		const isUrl = HTTP_REGEX.test(url);
+
 		const fileName = path.basename(url);
-		const filePath = path.join(pathToDownloadInto, fileName);
+		const filePath = isUrl ? path.join(pathToDownloadInto, fileName) : url;
 
 		const extractPath = path.join(pathToDownloadInto, 'extract');
 		if(opts.c || opts.clean || opts.u){
@@ -604,13 +610,15 @@ module.exports = {
 			);
 		
 		if(opts.verbose){
-			log('Download started for'.cyan, url.yellow, 'at'.cyan, filePath.yellow, shaHash ? 'with sha'.cyan : '', shaHash ? shaHash.yellow : '');
+			if(isUrl) log('Download started for'.cyan, url.yellow, 'at'.cyan, filePath.yellow, shaHash ? 'with sha'.cyan : '', shaHash ? shaHash.yellow : '');
 		} else {
-			log(`Downloading`.cyan, fileName.yellow);
+			if(isUrl) log(`Downloading`.cyan, fileName.yellow);
 		}
-		const downloaded = fs.existsSync(extractPath) ? true : this.downloadFileFromUrl(url, filePath, shaHash, opts);
+		const downloaded = isUrl ? (
+			fs.existsSync(extractPath) ? true : this.downloadFileFromUrl(url, filePath, shaHash, opts)
+		) : true;
 		if(downloaded){
-			log(`Download Complete for`.cyan, fileName.yellow);
+			if(isUrl) log(`Download Complete for`.cyan, fileName.yellow);
 			log('Extracting'.cyan, fileName.yellow);
 			if(opts.verbose){
 				log('Running command:'.cyan, command.green.bold, 'for'.cyan, filePath.yellow, 'at'.cyan, extractPath.yellow);
@@ -631,16 +639,16 @@ module.exports = {
 				return null;
 			}
 
-			return extractPath;
+			return [extractPath, opts, !isUrl];
 		} else {
-			return null;
+			return [null, opts];
 		}
 	},
 	async installAppFrom(path, opts) {
-		if (path.startsWith('github:')) this.installApp(await this.cloneGit(path, opts), opts, true);
-		if (path.match(FILE_DL_EXTRACT_REGEX)) this.installApp(this.downloadFile(path, opts), opts, true);
+		if (path.startsWith('github:')) this.installApp(await this.cloneGit(path, opts), opts);
+		else if (path.match(FILE_DL_EXTRACT_REGEX)) this.installApp(...this.downloadFile(path, opts));
 		else if (path.startsWith('@')) this.fromRepo(path, opts);
-		else this.installApp(path, opts, null, null);
+		else this.installApp(path, opts);
 	},
 	uninstall(packageName, all) {
 		const confPath = path.join(CONFIG_PATH, packageName);

package/lib/rew/const/default.js

@@ -6,7 +6,7 @@ const sleep = require('../functions/sleep');
 const { match } = require('../functions/match');
 const { map } = require('../functions/map');
 const { typex, typeis, typedef, typei, int, float, num, str, bool, typef } = require('../functions/types');
-const { isEmpty, clone, deepClone, merge, uniqueId, compose, curry, getters, setters } = require('../functions/core');
+const { isEmpty, clone, deepClone, merge, uniqueId, compose, curry, getters, setters, deepMerge } = require('../functions/core');
 const { print, input, clear, printf } = require('../functions/stdout');
 const { curl } = require('../functions/curl');
 const { wait } = require('../functions/wait');
@@ -43,6 +43,7 @@ module.exports = {
 	clone,
 	deepClone,
 	merge,
+	deepMerge,
 	uniqueId,
 	compose,
 	curry,

package/lib/rew/const/pre-exec.js

@@ -1,3 +1,10 @@
 Function.prototype.wait = function(...args) {
 	return wait(this, ...args);
-};
+};
+Object.without = function(object, ...keys){
+	let newObject = {...object};
+	for(let i = 0; i < keys.length; i++){
+		delete newObject[keys[i]];
+	}
+	return newObject;
+}

package/lib/rew/functions/core.js

@@ -34,6 +34,28 @@ function deepClone(value) {
 	}
 }
 
+function isObject(item) {
+  return (item && typeof item === 'object' && !Array.isArray(item));
+}
+
+function deepMerge(target, ...sources) {
+  if (!sources.length) return target;
+  const source = sources.shift();
+
+  if (isObject(target) && isObject(source)) {
+    for (const key in source) {
+      if (isObject(source[key])) {
+        if (!target[key]) Object.assign(target, { [key]: {} });
+        deepMerge(target[key], source[key]);
+      } else {
+        Object.assign(target, { [key]: source[key] });
+      }
+    }
+  }
+
+  return deepMerge(target, ...sources);
+}
+
 function merge(obj1, obj2) {
 	return Object.assign({}, obj1, obj2);
 }
@@ -100,6 +122,7 @@ module.exports = {
 	clone,
 	deepClone,
 	merge,
+	deepMerge,
 	uniqueId,
 	filter,
 	reduce,

package/lib/rew/pkgs/rune.js

@@ -410,4 +410,26 @@ module.exports = (context) => ({
 	push: runePush,
 	pop: runePop,
 	createDB,
+	localState(name, options){
+		const map = this.db('_' + name).map('_' + name + '_map');
+		const firstValue = map.get(name);
+		const _set = () => {
+			let item = options.get();
+			if(item.then){
+				item.then((i) => map.set(i));
+			} else {
+				map.set(name, item);
+			}
+		}
+		if(!firstValue) {
+			_set();
+		} else {
+			options.set(firstValue);
+		}
+		if(options.trigger){
+			options.trigger(() => {
+				_set();
+			});
+		}
+	}
 });

package/lib/rew/pkgs/styleway.js

@@ -1,88 +1,170 @@
 
-module.exports = () => ((styles) => {
-  let css = "";
-  const variables = {};
-  const mixins = {};
+function normalizeCamelCase (camelCase) {
+  let all = "";
+  for(let i of camelCase){
+    if(i.match(/[A-Z]/)){
+      all += '-';
+      i = i.toLowerCase();
+    }
+    all += i;
+  }
+  if(all.startsWith('-')) all = all.slice(1);
+  return all;
+}
+const known_states = [
+  'hover',          
+  'active',         
+  'focus',          
+  'focus-within',   
+  'focus-visible',  
+  'visited',        
+  'link',           
+  'disabled',       
+  'checked',        
+  'unchecked',      
+  'first-child',    
+  'last-child',     
+  'nth-child',      
+  'nth-of-type',    
+  'empty',          
+  'not',
+  'before',
+  'after',
+  'first-of-type',  
+  'last-of-type',
+  'only-child',    
+  'only-of-type',   
+  'valid',          
+  'invalid',        
+  'in-range',       
+  'out-of-range',   
+  'required',       
+  'optional',       
+  'disabled',       
+  'enabled',        
+  'enabled',        
+  'default',        
+  'selection',      
+  'target',         
+  'lang',           
+  'dir',            
+];
+
 
-  const parseValue = (v, self, name, vars) => {
-    const vs = {...variables, ...vars, name, ...Object.fromEntries(Object.entries(self).map(i => ['prop_'+i[0], i[1]]))};
-    return v.startsWith('@v') ? vs[v.split('@v')[1].trim()] : v
-  .toString()
-  .replace(/\$([A-Za-z0-9-_]+)/g, (_, name) => (vs)[name])
+const parseValue = (O, v, self, name, vars) => {
+  const vs = {...O.variables, ...vars, name, ...Object.fromEntries(Object.entries(self).map(i => ['prop_'+i[0], i[1]]))};
+  return v.startsWith('@v') ? vs[v.split('@v')[1].trim()] : v
+    .toString()
+    .replace(/\$([A-Za-z0-9-_]+)/g, (_, name) => (vs)[name])
+}
+
+const declectProp = (O, value, name, selector, start, parent, self, vars = {}) => {
+  let prop = "";
+  self.__parent = parent;
+  if (typeof value == 'object') {
+    for (let state in value) {
+      if (state == 'default') {
+        prop += `\n${selector}{ ${name}: ${parseValue(O, value.default || 'unset', self, name, vars) + ';'} }`;
+      } else if (state.startsWith('@media')) {
+        prop += `\n${state} { ${selector}: ${parseValue(O, value[state], self, name, vars)}; }`
+      } else if (state.startsWith(':') || known_states.includes(state)) {
+        prop += `\n${selector}${!state.startsWith(':') ? ':' : ''}${state} { ${name}: ${parseValue(O, value[state], self, name, vars)}; }`
+      }
+    }
+  } else {
+    prop += `\n${selector}{ ${name}: `;
+    let v = parseValue(O, value, self, name, vars);
+    if(typeof v == 'object') return declectProp(v, name, selector, start, parent, self, vars);
+    prop += v + ';';
+    prop += '}\n';
   }
+  return prop;
+}
+
+const declectNames = (O, names, $name, parent, values = {}, free = true) => {
+  const start = $name && free ? $name + ' {' : '';
+  let nameStyles = "";
+  for (let name in names) {
+    let selector = name.replace(/,/g, ', &').replace(/&/g, $name || '');
+    if (name == '@variables') {
+      for (let i in names[name]) {
+        O.variables[i] = names[name][i];
+      }
+    } else if (name.startsWith('@mixin')) {
+      const mame = name.split('@mixin')[1].trim();
+      const mname = mame.split('(')[0];
+      const args = mame.replace(mname, '').slice(1, -1);
+      O.mixins[mname] = {
+        args: args.split(','),
+        value: names[name]
+      }
+    } else if (name.startsWith('@keyframes')) {
+      nameStyles += $name ? '' : name + '{';
 
-  const declectProp = (value, name, selector, start, parent, self, vars = {}) => {
-    let prop = `${name}: `;
-    self.__parent = parent;
-    if (typeof value == 'object') {
-      prop += parseValue(value.default || 'unset', self, name, vars) + ';';
-      prop += '}\n';
-      for (let state in value) {
-        if (state == 'default') continue;
-        else if (state.startsWith('@media')) {
-          prop += `${state} { ${start} ${name}: ${parseValue(value[state], self, name, vars)}; } }\n`
-        } else if (state.startsWith(':')) {
-          prop += `${selector}${state} { ${name}: ${parseValue(value[state], self, name, vars)}; }\n`
+      for(let keyFrame in names[name]){
+        nameStyles += declectNames(O, names[name][keyFrame], keyFrame, names[name], values);
+      }
+
+      if(!$name) nameStyles += '}\n';
+    } else if ($name) {
+      if (name.startsWith('&')) {
+        nameStyles += '}\n';
+        nameStyles += declectNames(O, names[name], selector, names, values);
+        nameStyles += start;
+      } else if(name.startsWith('@include')) {
+        const mame = names[name];
+        const mname = mame.split('(')[0];
+        const args = mame.replace(mname, '').slice(1, -1).split(',');
+        if(O.mixins[mname]){
+          nameStyles += declectNames(O, O.mixins[mname].value, $name, parent, {...values, ...Object.fromEntries(O.mixins[mname].args.map((n, i) => [n, args[i]]))}, false).trim();
         }
+      } else {
+        nameStyles += declectProp(O, names[name], normalizeCamelCase(name), $name, start, parent || styles, names, values);
       }
-      prop += start;
     } else {
-      let v = parseValue(value, self, name, vars);
-      if(typeof v == 'object') return declectProp(v, name, selector, start, parent, self, vars);
-      prop += v + ';';
+      nameStyles += declectNames(O, names[name], selector, names, values);
     }
-    return prop;
   }
+  return nameStyles;
+}
 
-  const declectNames = (names, $name, parent, values = {}) => {
-    const start = $name ? $name + ' {' : '';
-    let nameStyles = start;
-    for (let name in names) {
-      let selector = name.replace(/,/g, ', &').replace(/&/g, $name || '');
-      if (name == '@variables') {
-        for (let i in names[name]) {
-          variables[i] = names[name][i];
-        }
-      } else if (name.startsWith('@mixin')) {
-        const mame = name.split('@mixin')[1].trim();
-        const mname = mame.split('(')[0];
-        const args = mame.replace(mname, '').slice(1, -1);
-        mixins[mname] = {
-          args: args.split(','),
-          value: names[name]
-        }
-      } else if (name.startsWith('@keyframes')) {
-        nameStyles += $name ? '' : name + '{';
+const collectAndCleanUp = (css) => {
+  const selectorMap = {};
+  const cleanedCSS = [];
 
-        for(let keyFrame in names[name]){
-          nameStyles += declectNames(names[name][keyFrame], keyFrame, names[name], values);
-        }
+  const lines = css.split('\n');
 
-        if(!$name) nameStyles += '}\n';
-      } else if ($name) {
-        if (name.startsWith('&')) {
-          nameStyles += '}\n';
-          nameStyles += declectNames(names[name], selector, names, values);
-          nameStyles += start;
-        } else if(name.startsWith('@include')) {
-          const mame = names[name];
-          const mname = mame.split('(')[0];
-          const args = mame.replace(mname, '').slice(1, -1).split(',');
-          if(mixins[mname]){
-            nameStyles += declectNames(mixins[mname].value, selector, names, {...values, ...Object.fromEntries(mixins[mname].args.map((n, i) => [n, args[i]]))}).trim().replace('@include ', '').slice(1, -1);
-          }
-        } else {
-          nameStyles += declectProp(names[name], name, $name, start, parent || styles, names, values);
-        }
-      } else {
-        nameStyles += declectNames(names[name], selector, names, values);
+  lines.forEach(line => {
+    const match = line.match(/([^\{]+){(.+)}/);
+    if (match) {
+      const selector = match[1].trim();
+
+      if (!selectorMap[selector]) {
+        selectorMap[selector] = "";
       }
+
+      selectorMap[selector] += match[2];
     }
-    if ($name) nameStyles += '}\n';
-    return nameStyles;
+  });
+
+  for (const selector in selectorMap) {
+    const selectorBlock = selectorMap[selector];
+    cleanedCSS.push(`${selector} { ${selectorBlock} }`);
   }
 
-  css += declectNames(styles);
+  return cleanedCSS.join('\n');
+};
+
+
+module.exports = () => ((styles) => {
+  let css = "";
+  const variables = {};
+  const mixins = {};
+
+  css += declectNames({
+    variables,
+    mixins
+  }, styles);
 
-  return css.replace(/(.+) \{\}/g, '');
+  return collectAndCleanUp(css);
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@makano/rew",
-  "version": "1.5.1",
+  "version": "1.5.3",
   "description": "A simple coffescript runtime and app manager",
   "main": "main.js",
   "directories": {