@domain.js/main 0.3.1 → 0.3.2

package/dist/deps/sequelize/index.d.ts

@@ -18,6 +18,12 @@ export declare function Main(cnf: Cnf, deps: Deps): {
     [propName: string]: Sequelize;
 };
 export declare const Deps: string[];
+/** Model 上的 sort 设定类型 */
+export interface ModelSort<Fields extends string> {
+    default: Fields;
+    allow: Fields[];
+    defaultDirection?: "DESC" | "ASC";
+}
 /**
  * Model 基类
  */
@@ -49,11 +55,7 @@ export declare class ModelBase<Attrs extends {} = any, Attrs4Create extends {} =
         maxResultsLimit: number;
     };
     /** 列表查询时候排序控制参数 */
-    static sort?: {
-        default: string;
-        allow: string[];
-        defaultDirection?: "DESC" | "ASC";
-    };
+    static sort?: ModelSort<string>;
     /** 关联资源设定, 除非要关联过滤，否则不要设置资源之间的关联关系 */
     static includes?: {
         [k: string]: {

package/dist/http/router.d.ts

@@ -25,13 +25,21 @@ export declare function Router(deps: Deps): {
     resource: (res: string, routePath?: string) => void;
 };
 declare type TRouter = ReturnType<typeof Router>;
-declare type normal = Parameters<TRouter["get"]>;
-declare type ReplaceArrayItem<T extends any[], index extends number, R, S extends any[] = [], L extends number = S["length"]> = T extends [infer A, ...infer rest] ? L extends index ? [...S, R, ...rest] : ReplaceArrayItem<rest, index, R, [...S, A]> : never;
+export declare type ReplaceArrayItem<T extends any[], index extends number, R, S extends any[] = [], L extends number = S["length"]> = T extends [infer A, ...infer rest] ? L extends index ? [...S, R, ...rest] : ReplaceArrayItem<rest, index, R, [...S, A]> : never;
+/** 普通 route 方法名称 */
 declare type Keys = "get" | "post" | "put" | "patch" | "del";
+/** 从servers 路径字符串中提取可用作model的名称，目前还不严谨，聊胜于无 */
+declare type PickModelNames<paths extends string> = paths extends string ? paths extends `${infer F}.${string}` ? F : never : never;
+/** 替换函数的某个参数类型定义 */
+export declare type ParameterReplace<T extends (...args: any[]) => any, Index extends number, TR> = (...args: ReplaceArrayItem<Parameters<T>, Index, TR>) => ReturnType<T>;
 /**
  * 利用领域方法路径类型集合，收窄 methodPath, 同时可以自动提示
  */
-export declare type NarrowDomainPaths<Paths extends string> = Omit<TRouter, Keys> & {
-    [k in Keys]: (...args: ReplaceArrayItem<normal, 1, Paths>) => void;
+export declare type NarrowDomainPaths<Paths extends string, ModelNames = PickModelNames<Paths>> = Omit<TRouter, Keys> & {
+    [k in Keys]: ParameterReplace<TRouter["get"], 1, Paths>;
+} & {
+    model: ParameterReplace<TRouter["model"], 0, ModelNames>;
+    collection: ParameterReplace<ParameterReplace<TRouter["collection"], 0, ModelNames>, 2, ModelNames>;
+    resource: ParameterReplace<TRouter["resource"], 0, ModelNames>;
 };
 export {};

package/package.json

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