@makano/rew 1.2.83 → 1.2.85

package/lib/rew/const/usage.js

@@ -64,24 +64,27 @@ 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;
+      if(ns.onAfterUse) this.onAfterUse = ns.onAfterUse;
       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} = ` : ''}`,
 			});
 		}
 

package/lib/rew/modules/context.js

@@ -123,12 +123,15 @@ 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();
-      return runtime.exec(code, childContext, code, context.module.filepath);
+      if(name.onUse) name.onUse();    
+      const r = runtime.exec(code, childContext, code, context.module.filepath);
+      if(name.onAfterUse) name.onAfterUse();
+      return r;
     } else if(name instanceof Usage) {
       const v = name.trigger(...params) || true;
       if(name.save !== false) context.__using__[name.name] = v;

package/package.json

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