@makano/rew 1.2.81 → 1.2.83

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 } = require('../functions/types');
-const { isEmpty, clone, deepClone, merge, uniqueId, compose, curry } = require('../functions/core');
+const { isEmpty, clone, deepClone, merge, uniqueId, compose, curry, getters, setters } = require('../functions/core');
 const { print, input, clear, printf } = require('../functions/stdout');
 const { curl } = require('../functions/curl');
 const { wait } = require('../functions/wait');
@@ -45,6 +45,8 @@ module.exports = {
 	uniqueId,
 	compose,
 	curry,
+	getters,
+	setters,
 
 	json,
 	jsons,

package/lib/rew/const/usage.js

@@ -34,6 +34,19 @@ module.exports.Usage = class Usage {
     return new Usage.Group(group, {});
   }
 
+  /**
+   * 
+   * @param  {...Usage} usages 
+   * @returns {any[]}
+   */
+  merge(...usages){
+    return new Usage(usages.map(u => u.name).join('-'), (...args) => {
+      return usages.map(u => {
+        return u.trigger(...args)
+      });
+    })
+  }
+
   static Group = class UsageGroup {
     g = []
     constructor(g, props = {}){

package/lib/rew/functions/core.js

@@ -71,6 +71,30 @@ function curry(fn) {
 	return curried;
 }
 
+function getters(object, getters) {
+	for (let prop in getters) {
+		if (getters.hasOwnProperty(prop) && typeof getters[prop] === 'function') {
+			Object.defineProperty(object, prop, {
+				get: getters[prop],
+				enumerable: true,
+				configurable: true
+			});
+		}
+	}
+}
+
+function setters(object, setters) {
+	for (let prop in setters) {
+		if (setters.hasOwnProperty(prop) && typeof setters[prop] === 'function') {
+			Object.defineProperty(object, prop, {
+				set: setters[prop],
+				enumerable: true,
+				configurable: true
+			});
+		}
+	}
+}
+
 module.exports = {
 	isEmpty,
 	clone,
@@ -81,4 +105,6 @@ module.exports = {
 	reduce,
 	compose,
 	curry,
+	getters,
+	setters
 };

package/lib/rew/modules/compiler.js

@@ -419,7 +419,7 @@ const cpl = (module.exports.compile = function (file, options = {}) {
 
 	const babelify = (code, options) => babel.transformSync(code, {
 		presets: [
-			...(doJSX ? [[babelReact, { pragmaFrag: options.jsxPragmaFrag || execOptions.jsxPragmaFrag, pragma: options.jsxPragma || execOptions.jsxPragma }]] : [])
+			...(doJSX ? [[babelReact, { throwIfNamespace: false, pragmaFrag: options.jsxPragmaFrag || execOptions.jsxPragmaFrag, pragma: options.jsxPragma || execOptions.jsxPragma }]] : [])
 		],
 		plugins: [
 			...(doDecorators ? [[require('@babel/plugin-proposal-decorators'), { version: '2023-05' }], [require('@babel/plugin-proposal-class-properties'), { loose: true }], [require('@babel/plugin-transform-class-static-block'), {}]] : [])

package/lib/rew/modules/context.js

@@ -128,10 +128,11 @@ module.exports.prepareContext = function (
       childContext.parentNamespace = context;
       const code = `(${trigger.toString()})()`;
       if(name.onUse) name.onUse();
-      runtime.exec(code, childContext, code, context.module.filepath);
+      return runtime.exec(code, childContext, code, context.module.filepath);
     } else if(name instanceof Usage) {
       const v = name.trigger(...params) || true;
       if(name.save !== false) context.__using__[name.name] = v;
+      return v;
     } else {
       context.__using__[name] = params.length ? params.length > 1 ? [...params] : params : true;
     }

package/package.json

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