kmore-types
Advanced tools
Comparing version 0.19.0 to 0.20.0
@@ -6,2 +6,10 @@ # Change Log | ||
# [0.20.0](https://github.com/waitingsong/kmore/compare/v0.19.0...v0.20.0) (2020-06-16) | ||
**Note:** Version bump only for package kmore-types | ||
# [0.19.0](https://github.com/waitingsong/kmore/compare/v0.18.0...v0.19.0) (2020-06-16) | ||
@@ -8,0 +16,0 @@ |
@@ -5,3 +5,3 @@ /** | ||
* | ||
* @version 0.18.0 | ||
* @version 0.19.0 | ||
* @author waiting | ||
@@ -8,0 +8,0 @@ * @license MIT |
@@ -147,3 +147,3 @@ import { JsonType, Spread } from '@waiting/shared-types'; | ||
*/ | ||
export declare type Tables<T extends TTables> = T extends void ? EmptyTbList : T extends never ? EmptyTbList : Record<keyof T, string>; | ||
export declare type Tables<T extends TTables> = Record<keyof T, string>; | ||
export interface EmptyTbList { | ||
@@ -155,3 +155,3 @@ readonly [key: string]: never; | ||
*/ | ||
export declare type MultiTableCols<T extends TTables> = T extends void ? EmptyTbList : T extends never ? EmptyTbList : Columns<T>; | ||
export declare type MultiTableCols<T extends TTables> = BaseMultiTableColumns<T> & BaseMultiTableColumnsExtProp<T>; | ||
export declare enum ColumnExtPropKeys { | ||
@@ -163,7 +163,6 @@ tableAlias = "_tableAlias", | ||
} | ||
export declare type Columns<T extends TTables> = BaseMultiTableColumns<T> & BaseMultiTableColumnsExtProp<T>; | ||
export interface BaseMultiTableColumnsExtProp<T extends TTables> { | ||
readonly [ColumnExtPropKeys.tableAlias]: TableAlias; | ||
readonly [ColumnExtPropKeys.tablesRef]: KTablesBase<T>['tables']; | ||
readonly [ColumnExtPropKeys.sColsCacheMap]: Map<TableAlias, ScopedColumns<T>>; | ||
readonly [ColumnExtPropKeys.sColsCacheMap]: Map<TableAlias, MultiTableScopedCols<T>>; | ||
} | ||
@@ -173,5 +172,2 @@ /** | ||
* value with table prefix, eg. `tb_foo.col_name` | ||
*/ | ||
export declare type MultiTableScopedCols<T extends TTables> = T extends void ? EmptyTbList : T extends never ? EmptyTbList : ScopedColumns<T>; | ||
/** | ||
* { | ||
@@ -186,9 +182,7 @@ * tbAlias1: | ||
*/ | ||
export declare type ScopedColumns<T extends TTables> = BaseMultiTableColumns<T>; | ||
export declare type MultiTableScopedCols<T extends TTables> = BaseMultiTableColumns<T>; | ||
export declare type BaseMultiTableColumns<T extends TTables> = { | ||
readonly [tbAlias in keyof T]: TableFields<T, tbAlias>; | ||
readonly [tbAlias in keyof T]: TableFields<T[tbAlias]>; | ||
}; | ||
export declare type TableFields<T, TbAlias extends keyof T = any> = { | ||
readonly [colAlias in keyof T[TbAlias]]: string; | ||
}; | ||
export declare type TableFields<F extends TableModel> = Record<keyof F, string>; | ||
export declare type TableAlias = string; | ||
@@ -195,0 +189,0 @@ export declare type TableColAlias = string; |
{ | ||
"name": "kmore-types", | ||
"author": "waiting", | ||
"version": "0.19.0", | ||
"version": "0.20.0", | ||
"description": "Retrieve types info from ts file", | ||
@@ -87,3 +87,3 @@ "keywords": [ | ||
}, | ||
"gitHead": "6264a50ab2900cb3b03fc1e3376fb49fcc990428" | ||
"gitHead": "45db0b4e0173e19572d1614b87a1961ce8a4b483" | ||
} |
149311
2184