@makano/rew 1.2.72 → 1.2.74

package/lib/rew/const/usage.js

@@ -28,6 +28,24 @@ module.exports.Usage = class Usage {
   create(name, trigger, save = true){
     return new Usage(name, trigger, save);
   }
+
+  group(...group){
+    return new Usage.Group(group, {});
+  }
+
+  static Group = class UsageGroup {
+    g = []
+    constructor(g, props = {}){
+      this.g = g;
+      if(props) for(let i in props){
+        this[i] = props[i];
+      }
+    }
+    
+    with(props){
+      return new UsageGroup(this.g, props);
+    }
+  }
 }
 
 class Namespace extends module.exports.Usage {
@@ -43,15 +61,7 @@ class Namespace extends module.exports.Usage {
     this.namespace = ns;
   }
 
-  static Group = class NamespaceGroup {
-    g = [{}, () => {}]
-    constructor(g, props){
-      this.g = g;
-      for(let i in props){
-        this[i] = props[i];
-      }
-    }
-  }
+  static Group = class NamespaceGroup extends module.exports.Usage.Group {}
 }
 module.exports.Namespace = Namespace;
 

package/lib/rew/modules/context.js

@@ -106,6 +106,10 @@ module.exports.prepareContext = function (
   context.exports = exportsFunction(context);
 
   context.using = (name, ...params) => {
+    if(name instanceof Usage.Group){
+      params.unshift(...name.g.slice(1));
+      name = name.g[0];
+    }
     if(USING_DEFAULT[name]){
       if(USING_DEFAULT[name].param) {
         context.__using__[name] = USING_DEFAULT[name].param(...params);

package/package.json

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

package/runtime.d.ts

@@ -944,7 +944,7 @@ declare function clear(): void;
 
 declare function namespace(object: any, callback: () => any): Usage;
 declare namespace namespace {
-  function group<T = any[], U = any>(group: T, props?: U): { g: T }
+  function group<T = any[], U = any>(group: T, props?: U): { g: T, [key: string]: any }
 }
 
 declare class Usage<T = () => void> {
@@ -953,4 +953,5 @@ declare class Usage<T = () => void> {
   save: boolean;
   constructor(name: string, trigger: T, save: boolean);
   create(name: string, trigger: T, save: boolean): Usage;
+  group(...group: any[]): { g: T, with: (props: any) => { g: T, [key: string]: any }, [key: string]: any }
 }