@domain.js/main 0.3.3 → 0.3.4

package/dist/http/router.d.ts

@@ -20,7 +20,7 @@ export declare function Router(deps: Deps): {
     put: (routePath: string, ctlAct: string, code?: number, isList?: boolean, handler?: Handler | undefined, resHandler?: ResHandler | undefined) => void;
     del: (routePath: string, ctlAct: string, code?: number, isList?: boolean, handler?: Handler | undefined, resHandler?: ResHandler | undefined) => void;
 } & {
-    collection: (res: string, _routePath?: string | undefined, controller?: string | undefined) => void;
+    collection: (res: string, _routePath?: string | undefined) => void;
     model: (res: string, routePath?: string) => void;
     resource: (res: string, routePath?: string) => void;
 };
@@ -43,8 +43,8 @@ declare type PickResources<paths extends string, Keys extends string = PickFirst
  * type t2 = PickCollection<"user", "user.addFile" | "user.Files"> // File
  */
 declare type PickCollect<Keys extends string, paths extends string> = paths extends `${Keys}.add${infer A}` ? A : never;
-declare type PickCollection<Keys extends string, paths extends string, Collects extends string = PickCollect<Keys, paths>> = Collects extends any ? `${Keys}.add${Collects}` | `${Keys}.${Lowercase<Collects>}s` extends paths ? [Lowercase<Collects>, Keys] : never : never;
-export declare type PickCollections<paths extends string, Keys extends string = PickFirst<paths>> = Keys extends any ? PickCollection<Keys, paths> : never;
+declare type PickCollection<Keys extends string, paths extends string, Collects extends string = PickCollect<Keys, paths>> = Collects extends any ? `${Keys}.add${Collects}` | `${Keys}.${Lowercase<Collects>}s` extends paths ? `${Keys}::${Lowercase<Collects>}` : never : never;
+export declare type PickCollections<paths extends string, Keys extends string = PickFirst<paths>> = Keys extends any ? PickCollection<Keys, paths> | (`${Keys}.add` | `${Keys}.list` extends paths ? Keys : never) : never;
 /**
  * 利用领域方法路径类型集合，收窄 methodPath, 同时可以自动提示
  */
@@ -52,7 +52,7 @@ export declare type NarrowDomainPaths<Paths extends string> = {
     [k in normalVerb]: (routePath: NoramVerbArguments[0], ctlAct: Paths, code?: NoramVerbArguments[2], isList?: NoramVerbArguments[3], handler?: NoramVerbArguments[4], resHandler?: NoramVerbArguments[5]) => ReturnType<TRouter["get"]>;
 } & {
     model: (res: PickModels<Paths>, routePath?: string) => ReturnType<TRouter["model"]>;
-    collection: PickCollections<Paths> extends [infer R, infer C] ? (res: R, _routePath?: string, controller?: C) => ReturnType<TRouter["collection"]> : never;
+    collection: (res: PickCollections<Paths>, routePath?: string) => ReturnType<TRouter["collection"]>;
     resource: (res: PickResources<Paths>, routePath?: string) => ReturnType<TRouter["resource"]>;
 };
 export {};

package/dist/http/router.js

@@ -153,29 +153,33 @@ function Router(deps) {
         del: RouterVerbFn("del"),
     };
     /**
-     * controller 为可选参数，如果不填写则控制器名称直接就是 res ，方法为 list,add
-     * 如果设置了controller 则控制器为 controller，方法为 #{res}s, add{Res}
+     * 集合方法，集合方法包含了向集合添加元素，以及查看集合(列表)
+     * @param res 资源名称，如果有父级资源用双分号隔开 eg user, user::file
+     * @param _routePath 路径地址，可选，默认按照既定规则拼接
      */
-    const collection = (res, _routePath, controller) => {
+    const collection = (res, _routePath) => {
+        const arr = res.split("::");
+        const name = arr[1] ? arr[1] : arr[0];
+        const controller = arr[1] ? arr[0] : null;
         let routePath;
         if (typeof _routePath !== "string") {
             if (controller) {
-                routePath = `/${controller}s/:${controller}Id/${res}s`;
+                routePath = `/${controller}s/:${controller}Id/${name}s`;
             }
             else {
-                routePath = `/${res}s`;
+                routePath = `/${name}s`;
             }
         }
         else {
             routePath = _routePath;
         }
         if (controller) {
-            register("get", routePath, `${controller}.${res}s`, 200, true);
-            register("post", routePath, `${controller}.add${ucwords(res)}`, 201);
+            register("get", routePath, `${controller}.${name}s`, 200, true);
+            register("post", routePath, `${controller}.add${ucwords(name)}`, 201);
         }
         else {
-            register("get", routePath, `${res}.list`, 200, true);
-            register("post", routePath, `${res}.add`, 201);
+            register("get", routePath, `${name}.list`, 200, true);
+            register("post", routePath, `${name}.add`, 201);
         }
     };
     const model = (res, routePath = `/${res}s/:id`) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domain.js/main",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "DDD framework",
   "main": "dist/index.js",
   "bin": {