@makano/rew 1.5.5 → 1.5.8

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, deepMerge } = require('../functions/core');
+const { isEmpty, clone, deepClone, merge, uniqueId, compose, curry, getters, setters, deepMerge, randFrom, pickRandom } = require('../functions/core');
 const { print, input, clear, printf } = require('../functions/stdout');
 const { curl } = require('../functions/curl');
 const { wait } = require('../functions/wait');
@@ -64,4 +64,7 @@ module.exports = {
 	print,
 	printf,
 	input,
+
+	randFrom,
+	pickRandom
 };

package/lib/rew/functions/core.js

@@ -114,7 +114,23 @@ function setters(object, setters) {
 				configurable: true
 			});
 		}
-	}
+	}	
+}
+
+function withOut(object, ...keys){
+	let o = {...object};
+	for(let key of keys) delete o[key];
+	return o;
+}
+
+function randFrom(min,max) {
+  return Math.floor(Math.random()*(max-min+1)+min);
+}
+
+function pickRandom(...stuff){
+	return stuff[
+		randFrom(0, stuff.length - 1)
+	];
 }
 
 module.exports = {
@@ -129,5 +145,8 @@ module.exports = {
 	compose,
 	curry,
 	getters,
-	setters
+	setters,
+	withOut,
+	randFrom,
+	pickRandom
 };

package/lib/rew/functions/curl.js

@@ -10,7 +10,7 @@ module.exports.curl = function curl(options, url){
   if(options.url && !url){
     url = options.url
   }
-  const method = options.x || "GET";
+  const method = options.x || options.method || "GET";
   const f = future.promise(fetch(url, {
     ...options,
     method

package/lib/rew/functions/import.js

@@ -41,7 +41,7 @@ const lookUpInOtherApps = (fullPath) => {
 };
 
 module.exports.imp = function (runPath, context) {
-	return function (filename, options = {}) {
+	return function (filename, options = {}, defaultMode) {
 		if (!options) options = {};
 		if(filename == 'std' || filename == '#std') return {};
 		let type = options.type ? options.type : filename.endsWith('.coffee') ? 'coffee' : (
@@ -168,6 +168,9 @@ module.exports.imp = function (runPath, context) {
 		/**/ if(options.mock === null) return null;
 		//** 
 
+		//**  Return defaults
+		/**/  if(defaultMode !== true && exports?.default) exports = exports.default;
+
 		return exports;
 	};
 };

package/lib/rew/functions/json.js

@@ -1,4 +1,5 @@
 const jsYaml = require("js-yaml");
+const { yamlFile } = require("../modules/yaml");
 
 
 
@@ -11,8 +12,11 @@ function jsons(thing){
 }
 
 
-function yaml(thing){
-  return jsYaml.loadAll(thing)[0];
+function yaml(thing, ...schema){
+  return yamlFile({
+    content: thing,
+    path: ''
+  }, schema);
 }
 
 function yamls(thing){