@makano/rew 1.2.82 → 1.2.84

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

@@ -1,3 +1,4 @@
 Function.prototype.wait = function(...args) {
 	return wait(this, ...args);
-};
+};
+Function.prototype.globe = () => global

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 = {}){
@@ -51,24 +64,26 @@ module.exports.Usage = class Usage {
 
 class Namespace extends module.exports.Usage {
   namespace = {};
-  constructor(ns, cb){
+  constructor(ns, cb, parent){
     super('namespace');
     if(ns instanceof Namespace.Group){
       if(ns.onUse) this.onUse = ns.onUse;
+      if(ns.parent) parent = ns.parent;
       cb = ns.g[1]
       ns = ns.g[0]
     }
     this.save = false;
     this.trigger = cb;
     this.namespace = ns;
+    this.parent = parent;
   }
 
   static Group = class NamespaceGroup extends module.exports.Usage.Group {}
 }
 module.exports.Namespace = Namespace;
 
-module.exports.namespace = (namespace, cb) => {
-  return new Namespace(namespace, cb);
+module.exports.namespace = (namespace, cb, parent) => {
+  return new Namespace(namespace, cb, parent);
 }
 
 module.exports.namespace.group = (group, props) => new Namespace.Group(group, props);

package/lib/rew/modules/compiler.js

@@ -326,16 +326,17 @@ function compileRewStuff(content, options) {
 			nextToken.value &&
 			nextToken.value !== 'undefined' && !options.keepImports
 		) {
-			let next = {...nextToken};
+			let next = {...nextToken}, isClass = false;
 			if(next.value == 'default'){
 				i += 2;
 			}
 			if(next.value == 'class'){
 				next.value = gnextToken(i, n + 1, tokens)?.token.value || "default";
+				isClass = true;
 			}
 			hooks.push({
 				index: i + 1,
-				value: `"${next.value}", `,
+				value: `"${next.value}", ${isClass ? `${next.value} = ` : ''}`,
 			});
 		}
 
@@ -419,7 +420,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

@@ -123,15 +123,17 @@ module.exports.prepareContext = function (
       }
     } else if(name instanceof Namespace) {
       const trigger = name.trigger;
-      const childContext = {...context, ...name.namespace, trigger};
+      const parentContext = name.parent || context;
+      const childContext = {...parentContext, ...name.namespace, trigger};
       childContext.currentNamespace = name.namespace;
-      childContext.parentNamespace = context;
+      childContext.parentNamespace = parentContext;
       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.82",
+  "version": "1.2.84",
   "description": "A simple coffescript runtime and app manager",
   "main": "main.js",
   "directories": {