kmore-types - npm Package Compare versions

Comparing version 0.14.0 to 0.15.0

CHANGELOG.md

@@ -6,2 +6,14 @@ # Change Log
 
+# [0.15.0](https://github.com/waitingsong/kmore/compare/v0.14.0...v0.15.0) (2020-03-20)
+
+
+### Features
+
+* **kmore:** rb.tb_foo() support generics parameters ([58f8e32](https://github.com/waitingsong/kmore/commit/58f8e3216131a76e069b4d08e258a3dec9e5b7cf))
+* types, parameters, scopedColumns ([46ef95d](https://github.com/waitingsong/kmore/commit/46ef95d11fd50b8313034f3e395f3c337c15b561))
+
+
+
+
+
 # [0.14.0](https://github.com/waitingsong/kmore/compare/v0.13.1...v0.14.0) (2020-01-16)
@@ -8,0 +20,0 @@

dist/index.cjs.js

@@ -5,3 +5,3 @@ /**
  *
- * @version 0.13.1
+ * @version 0.14.0
  * @author waiting
@@ -28,3 +28,4 @@ * @license MIT
     ...initGenTbListFromTypeOpts,
-    exportVarPrefix: 'tbs',
+    exportVarPrefix: 'tbs_',
+    exportVarColsSuffix: '_cols',
     forceLoadTbListJs: false,
@@ -50,6 +51,8 @@ forceLoadTbListJsPathReplaceRules: null,
     DbPropKeys["tables"] = "tables";
+    DbPropKeys["columns"] = "columns";
+    DbPropKeys["scopedColumns"] = "scopedColumns";
     DbPropKeys["refTables"] = "rb";
 })(exports.DbPropKeys || (exports.DbPropKeys = {}));
 const defaultPropDescriptor = {
-    configurable: false,
+    configurable: true,
     enumerable: true,
@@ -61,2 +64,3 @@ writable: false,
     tbListMap: new Map(),
+    tbColListMap: new Map(),
     /** CallerId -> LocalTypeId */
@@ -68,2 +72,8 @@ callerIdToLocalTypeIdMap: new Map(),
 
+(function (ColumnExtPropKeys) {
+    ColumnExtPropKeys["tableAlias"] = "_tableAlias";
+    ColumnExtPropKeys["tablesRef"] = "_tablesRef";
+    ColumnExtPropKeys["sColsCacheMap"] = "_scopedColsCacheMap";
+})(exports.ColumnExtPropKeys || (exports.ColumnExtPropKeys = {}));
+
 /** Allow empty Object */
@@ -199,2 +209,59 @@ function validateParamTables(tbs) {
 }
+/** Build DbTableCols from TableColListTagMap */
+function buildTbColListParam(tagMap) {
+    const ret = createNullObject();
+    if (tagMap && tagMap.size) {
+        tagMap.forEach((colListTagMap, tb) => {
+            const cols = createNullObject();
+            colListTagMap.forEach((_tags, col) => {
+                Object.defineProperty(cols, col, {
+                    ...defaultPropDescriptor,
+                    value: col,
+                });
+            });
+            Object.defineProperty(ret, tb, {
+                ...defaultPropDescriptor,
+                value: cols,
+            });
+        });
+    }
+    else {
+        throw new TypeError('Value of tagMap invalid.');
+    }
+    return ret;
+}
+/** Build DbTableScopedCols from TableColListTagMap */
+// export function buildTbScopedColListParam<T extends TTables>(
+//   tagMap: TbColListTagMap,
+//   tables: DbTables<T>,
+// ): DbTableScopedCols<T> {
+//   const ret = createNullObject()
+//   if (! tables || ! Object.keys(tables).length) {
+//     return ret
+//   }
+//   if (tagMap && tagMap.size) {
+//     tagMap.forEach((colListTagMap, tbAlias) => {
+//       const tb = tbAlias as keyof DbTables<T>
+//       if (typeof tables[tb] !== 'string') {
+//         return
+//       }
+//       const tbName = tables[tb]
+//       const cols = createNullObject()
+//       colListTagMap.forEach((_tags, colAlias) => {
+//         Object.defineProperty(cols, colAlias, {
+//           ...defaultPropDescriptor,
+//           value: `${tbName}.${colAlias}`,
+//         })
+//       })
+//       Object.defineProperty(ret, tbAlias, {
+//         ...defaultPropDescriptor,
+//         value: cols,
+//       })
+//     })
+//   }
+//   else {
+//     throw new TypeError('Value of tagMap invalid.')
+//   }
+//   return ret
+// }
 function isCallerNameMatched(name, matchFuncNameSet) {
@@ -225,3 +292,3 @@ if (!name) {
 function genVarName(exportVarPrefix, line, column) {
-    const varName = `${exportVarPrefix}_${line}_${column}`;
+    const varName = `${exportVarPrefix}${line}_${column}`;
     return varName;
@@ -239,7 +306,24 @@ }
 }
-function loadVarFromFile(path, caller, options) {
-    const varName = genVarName(options.exportVarPrefix, caller.line, caller.column);
+function loadTableVarFromFile(loadOpts) {
+    const kTables = loadVarFromFile(loadOpts);
+    return kTables.tables;
+}
+function loadColumnVarFromFile(loadOpts) {
+    const kTables = loadVarFromFile(loadOpts);
+    return kTables.columns;
+}
+/**
+ * Load kTables var from a js file
+ */
+function loadVarFromFile(loadOpts) {
+    const { path, caller, options } = loadOpts;
+    const tbVarName = genVarName(options.exportVarPrefix, caller.line, caller.column);
+    const colVarName = `${tbVarName}${options.exportVarColsSuffix}`;
     const mods = loadFile(path);
-    if (mods && typeof mods[varName] === 'object') {
-        return mods[varName];
+    if (mods && typeof mods[tbVarName] === 'object') {
+        const tables = mods[tbVarName];
+        const columns = typeof mods[colVarName] === 'object'
+            ? mods[colVarName]
+            : {};
+        return { tables, columns };
     }
@@ -361,10 +445,15 @@ throw new TypeError(`Load tables failed, path: "${path}"`);
 }
-function genCallerTypeMapFromNodeSet(nodes, checker, sourceFile, path) {
+function genCallerTypeMapFromNodeSet(nodes, checker, sourceFile, // sourceFileObject
+path) {
     const retMap = new Map();
     nodes.forEach((node) => {
         const obj = genInfoFromNode({
-            node, checker, sourceFile, retMap, path,
+            checker,
+            node,
+            path,
+            sourceFile,
         });
         if (obj) {
-            retMap.set(obj.id, obj.tagMap);
+            const { callerTypeId, tbTagMap, tbColTagMap } = obj;
+            retMap.set(callerTypeId, [tbTagMap, tbColTagMap]);
         }
@@ -375,25 +464,31 @@ });
 function genInfoFromNode(options) {
-    const { node, checker, sourceFile, retMap, path, } = options;
+    const { node, checker, sourceFile, path, } = options;
+    const typeName = retrieveGenericsIdentifierFromTypeArguments(node);
     /* istanbul ignore else */
-    if (node) {
-        const typeName = retrieveGenericsIdentifierFromTypeArguments(node);
+    if (typeName && typeName.getText()) {
+        const gType = checker.getTypeAtLocation(typeName);
         /* istanbul ignore else */
-        if (typeName && typeName.getText()) {
-            const gType = checker.getTypeAtLocation(typeName);
+        if (gType && gType.symbol) {
+            const sym = gType.getSymbol();
+            if (!sym) {
+                return;
+            }
+            const { line, character } = sourceFile.getLineAndCharacterOfPosition(node.getStart());
+            const inputTypeName = sym.getName();
+            // "/kmore-mono/packages/kmore-types/test/config/test.config2.ts:4:1:typeid-TbListModel"
+            const callerTypeId = `${path}:${line + 1}:${character + 1}:typeid-${inputTypeName}`;
+            // @ts-ignore
+            // const gTypeId: number = typeof gType.id === 'number' ? gType.id : Math.random()
+            // "/kmore-mono/packages/kmore-types/test/config/test.config2.ts:typeid-76"
+            // "/kmore-mono/packages/kmore-types/test/config/test.config2.ts:typeid-TbListModel"
+            const localTypeId = `${path}:typeid-${inputTypeName}`;
+            const { tbTagMap, tbColTagMap } = genTbListTagMapFromSymbol(gType.symbol, checker);
             /* istanbul ignore else */
-            if (gType && gType.symbol) {
-                // @ts-ignore
-                const typeid = typeof gType.id === 'number' ? gType.id : Math.random();
-                const { line, character } = sourceFile.getLineAndCharacterOfPosition(node.getStart());
-                const localTypeId = `${path}:${line + 1}:${character + 1}:typeid-${typeid}`;
-                if (retMap.has(localTypeId)) {
-                    return;
-                }
-                else {
-                    const tagMap = genTbListTagMapFromSymbol(gType.symbol);
-                    /* istanbul ignore else */
-                    if (tagMap.size) {
-                        return { id: localTypeId, tagMap };
-                    }
-                }
+            if (tbTagMap.size) {
+                return {
+                    callerTypeId,
+                    localTypeId,
+                    tbTagMap,
+                    tbColTagMap,
+                };
             }
@@ -404,17 +499,57 @@ }
 // ---- compiler ---
-function genTbListTagMapFromSymbol(symbol) {
+function genTbListTagMapFromSymbol(symbol, checker) {
     const { members } = symbol;
     // Map<TableAlias, Map<TagName, TagComment> >
-    const symbolTagMap = new Map();
+    const tbTagMap = new Map();
+    const tbColTagMap = new Map();
+    // const tbScopedColTagMap: TbScopedColListTagMap = new Map()
     /* istanbul ignore else */
     if (members) {
-        members.forEach((member) => {
-            const name = member.getName();
-            const tags = member.getJsDocTags();
+        members.forEach((tbSym) => {
+            const { name: tbName, tags } = retrieveInfoFromSymbolObject(tbSym);
             // tags can be empty array
-            symbolTagMap.set(name, tags);
+            tbTagMap.set(tbName, tags);
+            const nodes = tbSym.getDeclarations();
+            if (nodes && nodes.length) {
+                const colTagMap = genColListTagMapFromTbSymbol(nodes, checker);
+                tbColTagMap.set(tbName, colTagMap);
+            }
         });
     }
-    return symbolTagMap;
+    return { tbTagMap, tbColTagMap };
 }
+function genColListTagMapFromTbSymbol(nodes, checker) {
+    const ret = new Map();
+    const [node] = nodes; // use only one
+    const { type: typeRef } = node;
+    if (typeRef && typeRef.getText()) {
+        return retrieveMembersFromTypeRef(typeRef, checker);
+    }
+    return ret;
+}
+function retrieveMembersFromTypeRef(typeRef, // TypeReference
+checker) {
+    const ret = new Map();
+    const gType = checker.getTypeAtLocation(typeRef);
+    /* istanbul ignore else */
+    if (gType && gType.symbol) {
+        const sym = gType.getSymbol();
+        if (sym) {
+            const { members } = sym;
+            if (members) {
+                members.forEach((member) => {
+                    const { name: colName, tags } = retrieveInfoFromSymbolObject(member);
+                    ret.set(colName, tags);
+                });
+            }
+        }
+    }
+    return ret;
+}
+function retrieveInfoFromSymbolObject(symbol) {
+    return {
+        name: symbol.getName(),
+        tags: symbol.getJsDocTags(),
+    };
+}
 function retrieveGenericsIdentifierFromTypeArguments(node) {
@@ -530,3 +665,3 @@ /* istanbul ignore else */
 /**
- * Build tables in ts from generics type for specified file
+ * Build tables in ts from generics type for specified ts file
  *
@@ -540,3 +675,3 @@ * @returns file path if src file need parsed
     };
-    const ret = retrieveTypeFromFile(file);
+    const ret = retrieveTypeFromTsFile(file);
     if (ret && ret.size) {
@@ -550,3 +685,3 @@ const path = await saveFile(ret, opts);
 }
-function retrieveTypeFromFile(file) {
+function retrieveTypeFromTsFile(file) {
     const path = sharedCore.pathResolve(file).replace(/\\/gu, '/');
@@ -561,5 +696,6 @@ const { checker, sourceFile } = matchSourceFileWithFilePath(path);
         const callerTypeMap = genCallerTypeMapFromNodeSet(nodeSet, checker, sourceFile, path);
-        callerTypeMap.forEach((tagMap, callerTypeId) => {
-            const tbs = buildTbListParam(tagMap);
-            ret.set(callerTypeId, tbs);
+        callerTypeMap.forEach(([tbListTagMap, tbColListTagMap], callerTypeId) => {
+            const tbs = buildTbListParam(tbListTagMap);
+            const tbCols = buildTbColListParam(tbColListTagMap);
+            ret.set(callerTypeId, [tbs, tbCols]);
         });
@@ -570,6 +706,6 @@ }
 function genTsCodeFromTypes(inputMap, options) {
-    const { exportVarPrefix, outputFileNameSuffix } = options;
+    const { exportVarPrefix, exportVarColsSuffix, outputFileNameSuffix, } = options;
     let targetPath = '';
     const sourceArr = [];
-    inputMap.forEach((arr, key) => {
+    inputMap.forEach(([tbs, tbCols], key) => {
         const { path, line, column } = pickInfoFromCallerTypeId(key);
@@ -580,4 +716,6 @@ if (!targetPath) {
         }
-        const varName = genVarName(exportVarPrefix, line, column);
-        sourceArr.push(`export const ${varName} = ${JSON.stringify(arr, null, 2)} as const`);
+        const tbVarName = genVarName(exportVarPrefix, line, column);
+        const tbColVarName = `${tbVarName}${exportVarColsSuffix}`;
+        sourceArr.push(`export const ${tbVarName} = ${JSON.stringify(tbs, null, 2)} as const`);
+        sourceArr.push(`export const ${tbColVarName} = ${JSON.stringify(tbCols, null, 2)} as const`);
     });
@@ -598,3 +736,3 @@ return [targetPath, sourceArr.join('\n\n')];
 /**
- * Generate DbTables from generics type T
+ * Generate KTables from generics type T
  */
@@ -624,59 +762,55 @@ function genTbListFromType(options) {
     };
+    // "/kmore-mono/packages/kmore-types/test/test.config.ts:13:23"
     const callerId = `${caller.path}:${caller.line}:${caller.column}`;
     const localTypeId = opts.cacheMap.callerIdToLocalTypeIdMap.get(callerId);
-    let ret = {};
-    if (localTypeId) {
-        const tbListTagMap = opts.cacheMap.localTypeMap.get(localTypeId);
-        if (!tbListTagMap) {
+    if (localTypeId) { // from cache
+        const tagsMapArr = opts.cacheMap.localTypeMap.get(localTypeId);
+        if (tagsMapArr && tagsMapArr.length) {
+            return buildKTablesBaseFromTagsMapArr(tagsMapArr);
+        }
+        else {
             throw new Error(`cacheMap.localTypeMap not contains key: "${localTypeId}".`);
         }
-        else if (!tbListTagMap.size) {
-            throw new Error(`cacheMap.localTypeMap key: "${localTypeId}" value empty.`);
-        }
-        ret = buildTbListParam(tbListTagMap);
     }
     else {
-        const localTypeMap = retrieveLocalTypeMapFromType(opts);
+        const localTypeItem = retrieveLocalTypeItemFromType(opts);
+        if (!localTypeItem) {
+            throw new Error(`retrieveLocalTypeMapFromType() return empty with key: "${localTypeId}".`);
+        }
         // id is localTypeId
-        // map maybe empty
-        localTypeMap.forEach((map, id) => {
-            opts.cacheMap.callerIdToLocalTypeIdMap.set(callerId, id);
-            // map can be empty as cached result
-            if (map.size) {
-                opts.cacheMap.localTypeMap.set(id, map);
-                ret = buildTbListParam(map);
+        // map maybe empty, so try from cache
+        const { localTypeId: id, tagsMapArr } = localTypeItem;
+        opts.cacheMap.callerIdToLocalTypeIdMap.set(callerId, id);
+        if (tagsMapArr && tagsMapArr[0] && tagsMapArr[0].size) {
+            opts.cacheMap.localTypeMap.set(id, tagsMapArr);
+            return buildKTablesBaseFromTagsMapArr(tagsMapArr);
+        }
+        else { // retrieved only localTypeId, then try from cache
+            const tagsMapArr2 = opts.cacheMap.localTypeMap.get(id);
+            if (!tagsMapArr2) {
+                throw new Error(`cacheMap.localTypeMap not contains key: "${id}" or value empty.`);
             }
-            else {
-                const cMap = opts.cacheMap.localTypeMap.get(id);
-                if (!cMap) {
-                    throw new Error(`cacheMap.localTypeMap not contains key: "${id}" or value empty.`);
-                }
-                else if (!cMap.size) {
-                    throw new Error(`cacheMap.localTypeMap key: "${id}" value empty.`);
-                }
-                ret = buildTbListParam(cMap);
+            else if (!tagsMapArr2[0].size) {
+                throw new Error(`cacheMap.localTypeMap key: "${id}" value empty.`);
             }
-        });
+            return buildKTablesBaseFromTagsMapArr(tagsMapArr2);
+        }
     }
+}
+function buildKTablesBaseFromTagsMapArr(tagsMapArr) {
+    const [tbListTagMap, tbColListTagMap] = tagsMapArr;
+    const ret = {
+        tables: buildTbListParam(tbListTagMap),
+        columns: buildTbColListParam(tbColListTagMap),
+    };
     return ret;
 }
-function retrieveLocalTypeMapFromType(options) {
-    const { checker, sourceFile } = matchSourceFileWithFilePath(options.caller.path);
-    if (sourceFile) {
-        const localTypeMap = genGenericsArgMap({
-            ...options,
-            sourceFile,
-            checker,
-        });
-        /* istanbul ignore else */
-        if (localTypeMap.size) {
-            return localTypeMap; // retrieve succeed
-        }
+function retrieveLocalTypeItemFromType(options) {
+    const { caller } = options;
+    const { checker, sourceFile } = matchSourceFileWithFilePath(caller.path);
+    /* istanbul ignore else */
+    if (!sourceFile) {
+        // throw new Error(`Can not retrieve generics type info from file: "${caller.path}"`)
+        return;
     }
-    // throw new Error(`Can not retrieve generics type info from file: "${caller.path}"`)
-    return new Map();
-}
-function genGenericsArgMap(options) {
-    const retMap = new Map();
-    const { cacheMap, sourceFile, checker, caller, } = options;
     const node = walkNodeWithPosition({
@@ -690,32 +824,24 @@ sourceFile,
     if (node) {
-        const typeName = retrieveGenericsIdentifierFromTypeArguments(node);
-        /* istanbul ignore else */
-        if (typeName && typeName.getText()) {
-            const gType = checker.getTypeAtLocation(typeName);
-            // const symbol = checker.getSymbolAtLocation(typeName)
-            /* istanbul ignore else */
-            if (gType && gType.symbol) {
-                const sym = gType.getSymbol();
-                if (sym) {
-                    const inputTypeName = sym.getName();
-                    // might be type alias name so we use typdid
-                    // const genericsArgName: GenericsArgName = typeName.text
-                    // @ts-ignore
-                    // const typeid: number = typeof gType.id === 'number' ? gType.id : Math.random()
-                    const localTypeId = `${caller.path}:typeid-${inputTypeName}`;
-                    if (retMap.has(localTypeId)) {
-                        return retMap;
-                    }
-                    else if (cacheMap.localTypeMap.has(localTypeId)) {
-                        retMap.set(localTypeId, new Map()); // empty map, pick from resolved data later.
-                    }
-                    else {
-                        const tagMap = genTbListTagMapFromSymbol(gType.symbol);
-                        tagMap.size && retMap.set(localTypeId, tagMap);
-                    }
-                }
+        const nodeInfo = genInfoFromNode({
+            checker,
+            node,
+            path: caller.path,
+            sourceFile,
+        });
+        if (nodeInfo) {
+            const { localTypeId, tbTagMap, tbColTagMap } = nodeInfo;
+            if (tbTagMap.size) {
+                // localTypeId: "/kmore-mono/packages/kmore-types/test/test.config.ts:typeid-TbListModel"
+                return {
+                    localTypeId,
+                    tagsMapArr: [tbTagMap, tbColTagMap],
+                };
             }
+            else {
+                return {
+                    localTypeId,
+                };
+            }
         }
     }
-    return retMap;
 }
@@ -735,2 +861,3 @@ // function transformerFactory<T extends ts.Node>(ctx: ts.TransformationContext): ts.Transformer<T> {
 exports.buildSrcTablesFile = buildSrcTablesFile;
+exports.buildTbColListParam = buildTbColListParam;
 exports.buildTbListParam = buildTbListParam;
@@ -741,6 +868,5 @@ exports.cacheMap = cacheMap;
 exports.genCallerTypeMapFromNodeSet = genCallerTypeMapFromNodeSet;
-exports.genGenericsArgMap = genGenericsArgMap;
+exports.genInfoFromNode = genInfoFromNode;
 exports.genTbListFromCaller = genTbListFromCaller;
 exports.genTbListFromType = genTbListFromType;
-exports.genTbListTagMapFromSymbol = genTbListTagMapFromSymbol;
 exports.genTbListTsFilePath = genTbListTsFilePath;
@@ -757,3 +883,5 @@ exports.genVarName = genVarName;
 exports.isTsFile = isTsFile;
+exports.loadColumnVarFromFile = loadColumnVarFromFile;
 exports.loadFile = loadFile;
+exports.loadTableVarFromFile = loadTableVarFromFile;
 exports.loadVarFromFile = loadVarFromFile;
@@ -765,4 +893,3 @@ exports.matchSourceFileWithFilePath = matchSourceFileWithFilePath;
 exports.reservedTbListKeys = reservedTbListKeys;
-exports.retrieveGenericsIdentifierFromTypeArguments = retrieveGenericsIdentifierFromTypeArguments;
-exports.retrieveLocalTypeMapFromType = retrieveLocalTypeMapFromType;
+exports.retrieveLocalTypeItemFromType = retrieveLocalTypeItemFromType;
 exports.validateDuplicateProp = validateDuplicateProp;
@@ -769,0 +896,0 @@ exports.validateParamTables = validateParamTables;

dist/index.js

 export * from './lib/config';
+export * from './lib/model';
 export * from './lib/build';
@@ -6,2 +7,1 @@ export * from './lib/compiler';
 export * from './lib/util';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsY0FBYyxjQUFjLENBQUE7QUFFNUIsY0FBYyxhQUFhLENBQUE7QUFDM0IsY0FBYyxnQkFBZ0IsQ0FBQTtBQUM5QixjQUFjLGVBQWUsQ0FBQTtBQUM3QixjQUFjLFlBQVksQ0FBQSJ9

dist/lib/build.d.ts

 import { Observable } from 'rxjs';
-import { TTableListModel, FilePath, BuildSrcOpts } from './model';
+import { TTables, FilePath, BuildSrcOpts } from './model';
 /**
@@ -9,6 +9,6 @@ * Generate tables .ts files,
 /**
- * Build tables in ts from generics type for specified file
+ * Build tables in ts from generics type for specified ts file
  *
  * @returns file path if src file need parsed
  */
-export declare function buildSrcTablesFile<T extends TTableListModel>(file: string, options: BuildSrcOpts): Promise<FilePath>;
+export declare function buildSrcTablesFile<T extends TTables>(file: string, options: BuildSrcOpts): Promise<FilePath>;

dist/lib/build.js

 import { pathResolve, writeFileAsync } from '@waiting/shared-core';
 import { mergeMap } from 'rxjs/operators';
 import { defer } from 'rxjs';
-import { buildTbListParam, genTbListTsFilePath, genVarName, walkDirForCallerFuncTsFiles, } from './util';
+import { buildTbListParam, genTbListTsFilePath, genVarName, walkDirForCallerFuncTsFiles, buildTbColListParam, } from './util';
 import { initBuildSrcOpts, globalCallerFuncNameSet } from './config';
@@ -23,3 +23,3 @@ import { pickInfoFromCallerTypeId, genCallerTypeMapFromNodeSet, matchSourceFileWithFilePath, walkNode, } from './ts-util';
 /**
- * Build tables in ts from generics type for specified file
+ * Build tables in ts from generics type for specified ts file
  *
@@ -33,3 +33,3 @@ * @returns file path if src file need parsed
     };
-    const ret = retrieveTypeFromFile(file);
+    const ret = retrieveTypeFromTsFile(file);
     if (ret && ret.size) {
@@ -43,3 +43,3 @@ const path = await saveFile(ret, opts);
 }
-function retrieveTypeFromFile(file) {
+function retrieveTypeFromTsFile(file) {
     const path = pathResolve(file).replace(/\\/gu, '/');
@@ -54,5 +54,6 @@ const { checker, sourceFile } = matchSourceFileWithFilePath(path);
         const callerTypeMap = genCallerTypeMapFromNodeSet(nodeSet, checker, sourceFile, path);
-        callerTypeMap.forEach((tagMap, callerTypeId) => {
-            const tbs = buildTbListParam(tagMap);
-            ret.set(callerTypeId, tbs);
+        callerTypeMap.forEach(([tbListTagMap, tbColListTagMap], callerTypeId) => {
+            const tbs = buildTbListParam(tbListTagMap);
+            const tbCols = buildTbColListParam(tbColListTagMap);
+            ret.set(callerTypeId, [tbs, tbCols]);
         });
@@ -63,6 +64,6 @@ }
 function genTsCodeFromTypes(inputMap, options) {
-    const { exportVarPrefix, outputFileNameSuffix } = options;
+    const { exportVarPrefix, exportVarColsSuffix, outputFileNameSuffix, } = options;
     let targetPath = '';
     const sourceArr = [];
-    inputMap.forEach((arr, key) => {
+    inputMap.forEach(([tbs, tbCols], key) => {
         const { path, line, column } = pickInfoFromCallerTypeId(key);
@@ -73,4 +74,6 @@ if (!targetPath) {
         }
-        const varName = genVarName(exportVarPrefix, line, column);
-        sourceArr.push(`export const ${varName} = ${JSON.stringify(arr, null, 2)} as const`);
+        const tbVarName = genVarName(exportVarPrefix, line, column);
+        const tbColVarName = `${tbVarName}${exportVarColsSuffix}`;
+        sourceArr.push(`export const ${tbVarName} = ${JSON.stringify(tbs, null, 2)} as const`);
+        sourceArr.push(`export const ${tbColVarName} = ${JSON.stringify(tbCols, null, 2)} as const`);
     });
@@ -89,2 +92,1 @@ return [targetPath, sourceArr.join('\n\n')];
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL2J1aWxkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFDbEUsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGdCQUFnQixDQUFBO0FBQ3pDLE9BQU8sRUFBYyxLQUFLLEVBQUUsTUFBTSxNQUFNLENBQUE7QUFTeEMsT0FBTyxFQUNMLGdCQUFnQixFQUNoQixtQkFBbUIsRUFDbkIsVUFBVSxFQUNWLDJCQUEyQixHQUM1QixNQUFNLFFBQVEsQ0FBQTtBQUNmLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSx1QkFBdUIsRUFBRSxNQUFNLFVBQVUsQ0FBQTtBQUNwRSxPQUFPLEVBQ0wsd0JBQXdCLEVBQ3hCLDJCQUEyQixFQUMzQiwyQkFBMkIsRUFDM0IsUUFBUSxHQUNULE1BQU0sV0FBVyxDQUFBO0FBR2xCOzs7R0FHRztBQUNILE1BQU0sVUFBVSxXQUFXLENBQUMsT0FBcUI7SUFDL0MsTUFBTSxJQUFJLEdBQTJCO1FBQ25DLEdBQUcsZ0JBQWdCO1FBQ25CLEdBQUcsT0FBTztLQUNYLENBQUE7SUFFRCxNQUFNLEtBQUssR0FBRywyQkFBMkIsQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUMvQyxNQUFNLE1BQU0sR0FBRyxLQUFLLENBQUMsSUFBSSxDQUN2QixRQUFRLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRTtRQUNoQixPQUFPLEtBQUssQ0FBQyxHQUFHLEVBQUUsQ0FBQyxrQkFBa0IsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQTtJQUNwRCxDQUFDLEVBQUUsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUVwQixDQUFBO0lBRUQsT0FBTyxNQUFNLENBQUE7QUFDZixDQUFDO0FBR0Q7Ozs7R0FJRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsa0JBQWtCLENBQ3RDLElBQVksRUFD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

dist/lib/compiler.d.ts

@@ -1,8 +0,7 @@
-import { GenGenericsArgMapOpts, LocalTypeMap, RetrieveInfoFromTypeOpts, CallerInfo, GenTbListFromTypeOpts, DbTables, TTableListModel } from './model';
+import { RetrieveInfoFromTypeOpts, CallerInfo, GenTbListFromTypeOpts, TTables, KTablesBase, LocalTypeItem } from './model';
 /**
- * Generate DbTables from generics type T
+ * Generate KTables from generics type T
  */
-export declare function genTbListFromType<T extends TTableListModel>(options?: Partial<GenTbListFromTypeOpts>): DbTables<T>;
-export declare function genTbListFromCaller<T extends TTableListModel>(caller: CallerInfo, options: GenTbListFromTypeOpts): DbTables<T>;
-export declare function retrieveLocalTypeMapFromType(options: RetrieveInfoFromTypeOpts): LocalTypeMap;
-export declare function genGenericsArgMap(options: GenGenericsArgMapOpts): LocalTypeMap;
+export declare function genTbListFromType<T extends TTables>(options?: Partial<GenTbListFromTypeOpts>): KTablesBase<T>;
+export declare function genTbListFromCaller<T extends TTables>(caller: CallerInfo, options: GenTbListFromTypeOpts): KTablesBase<T>;
+export declare function retrieveLocalTypeItemFromType(options: RetrieveInfoFromTypeOpts): LocalTypeItem | void;

dist/lib/compiler.js

@@ -1,8 +0,6 @@
-import { buildTbListParam, isTsFile, getCallerStack } from './util';
-import { genTbListTagMapFromSymbol, retrieveGenericsIdentifierFromTypeArguments, matchSourceFileWithFilePath, walkNodeWithPosition, } from './ts-util';
-import { cacheMap as cacheMapTop, 
-// initOptions,
-initGenTbListFromTypeOpts, globalCallerFuncNameSet, } from './config';
+import { buildTbListParam, buildTbColListParam, getCallerStack, isTsFile, } from './util';
+import { genInfoFromNode, matchSourceFileWithFilePath, walkNodeWithPosition, } from './ts-util';
+import { cacheMap as cacheMapTop, initGenTbListFromTypeOpts, globalCallerFuncNameSet, } from './config';
 /**
- * Generate DbTables from generics type T
+ * Generate KTables from generics type T
  */
@@ -32,59 +30,55 @@ export function genTbListFromType(options) {
     };
+    // "/kmore-mono/packages/kmore-types/test/test.config.ts:13:23"
     const callerId = `${caller.path}:${caller.line}:${caller.column}`;
     const localTypeId = opts.cacheMap.callerIdToLocalTypeIdMap.get(callerId);
-    let ret = {};
-    if (localTypeId) {
-        const tbListTagMap = opts.cacheMap.localTypeMap.get(localTypeId);
-        if (!tbListTagMap) {
+    if (localTypeId) { // from cache
+        const tagsMapArr = opts.cacheMap.localTypeMap.get(localTypeId);
+        if (tagsMapArr && tagsMapArr.length) {
+            return buildKTablesBaseFromTagsMapArr(tagsMapArr);
+        }
+        else {
             throw new Error(`cacheMap.localTypeMap not contains key: "${localTypeId}".`);
         }
-        else if (!tbListTagMap.size) {
-            throw new Error(`cacheMap.localTypeMap key: "${localTypeId}" value empty.`);
-        }
-        ret = buildTbListParam(tbListTagMap);
     }
     else {
-        const localTypeMap = retrieveLocalTypeMapFromType(opts);
+        const localTypeItem = retrieveLocalTypeItemFromType(opts);
+        if (!localTypeItem) {
+            throw new Error(`retrieveLocalTypeMapFromType() return empty with key: "${localTypeId}".`);
+        }
         // id is localTypeId
-        // map maybe empty
-        localTypeMap.forEach((map, id) => {
-            opts.cacheMap.callerIdToLocalTypeIdMap.set(callerId, id);
-            // map can be empty as cached result
-            if (map.size) {
-                opts.cacheMap.localTypeMap.set(id, map);
-                ret = buildTbListParam(map);
+        // map maybe empty, so try from cache
+        const { localTypeId: id, tagsMapArr } = localTypeItem;
+        opts.cacheMap.callerIdToLocalTypeIdMap.set(callerId, id);
+        if (tagsMapArr && tagsMapArr[0] && tagsMapArr[0].size) {
+            opts.cacheMap.localTypeMap.set(id, tagsMapArr);
+            return buildKTablesBaseFromTagsMapArr(tagsMapArr);
+        }
+        else { // retrieved only localTypeId, then try from cache
+            const tagsMapArr2 = opts.cacheMap.localTypeMap.get(id);
+            if (!tagsMapArr2) {
+                throw new Error(`cacheMap.localTypeMap not contains key: "${id}" or value empty.`);
             }
-            else {
-                const cMap = opts.cacheMap.localTypeMap.get(id);
-                if (!cMap) {
-                    throw new Error(`cacheMap.localTypeMap not contains key: "${id}" or value empty.`);
-                }
-                else if (!cMap.size) {
-                    throw new Error(`cacheMap.localTypeMap key: "${id}" value empty.`);
-                }
-                ret = buildTbListParam(cMap);
+            else if (!tagsMapArr2[0].size) {
+                throw new Error(`cacheMap.localTypeMap key: "${id}" value empty.`);
             }
-        });
+            return buildKTablesBaseFromTagsMapArr(tagsMapArr2);
+        }
     }
+}
+function buildKTablesBaseFromTagsMapArr(tagsMapArr) {
+    const [tbListTagMap, tbColListTagMap] = tagsMapArr;
+    const ret = {
+        tables: buildTbListParam(tbListTagMap),
+        columns: buildTbColListParam(tbColListTagMap),
+    };
     return ret;
 }
-export function retrieveLocalTypeMapFromType(options) {
-    const { checker, sourceFile } = matchSourceFileWithFilePath(options.caller.path);
-    if (sourceFile) {
-        const localTypeMap = genGenericsArgMap({
-            ...options,
-            sourceFile,
-            checker,
-        });
-        /* istanbul ignore else */
-        if (localTypeMap.size) {
-            return localTypeMap; // retrieve succeed
-        }
+export function retrieveLocalTypeItemFromType(options) {
+    const { caller } = options;
+    const { checker, sourceFile } = matchSourceFileWithFilePath(caller.path);
+    /* istanbul ignore else */
+    if (!sourceFile) {
+        // throw new Error(`Can not retrieve generics type info from file: "${caller.path}"`)
+        return;
     }
-    // throw new Error(`Can not retrieve generics type info from file: "${caller.path}"`)
-    return new Map();
-}
-export function genGenericsArgMap(options) {
-    const retMap = new Map();
-    const { cacheMap, sourceFile, checker, caller, } = options;
     const node = walkNodeWithPosition({
@@ -98,32 +92,24 @@ sourceFile,
     if (node) {
-        const typeName = retrieveGenericsIdentifierFromTypeArguments(node);
-        /* istanbul ignore else */
-        if (typeName && typeName.getText()) {
-            const gType = checker.getTypeAtLocation(typeName);
-            // const symbol = checker.getSymbolAtLocation(typeName)
-            /* istanbul ignore else */
-            if (gType && gType.symbol) {
-                const sym = gType.getSymbol();
-                if (sym) {
-                    const inputTypeName = sym.getName();
-                    // might be type alias name so we use typdid
-                    // const genericsArgName: GenericsArgName = typeName.text
-                    // @ts-ignore
-                    // const typeid: number = typeof gType.id === 'number' ? gType.id : Math.random()
-                    const localTypeId = `${caller.path}:typeid-${inputTypeName}`;
-                    if (retMap.has(localTypeId)) {
-                        return retMap;
-                    }
-                    else if (cacheMap.localTypeMap.has(localTypeId)) {
-                        retMap.set(localTypeId, new Map()); // empty map, pick from resolved data later.
-                    }
-                    else {
-                        const tagMap = genTbListTagMapFromSymbol(gType.symbol);
-                        tagMap.size && retMap.set(localTypeId, tagMap);
-                    }
-                }
+        const nodeInfo = genInfoFromNode({
+            checker,
+            node,
+            path: caller.path,
+            sourceFile,
+        });
+        if (nodeInfo) {
+            const { localTypeId, tbTagMap, tbColTagMap } = nodeInfo;
+            if (tbTagMap.size) {
+                // localTypeId: "/kmore-mono/packages/kmore-types/test/test.config.ts:typeid-TbListModel"
+                return {
+                    localTypeId,
+                    tagsMapArr: [tbTagMap, tbColTagMap],
+                };
             }
+            else {
+                return {
+                    localTypeId,
+                };
+            }
         }
     }
-    return retMap;
 }
@@ -140,2 +126,1 @@ // function transformerFactory<T extends ts.Node>(ctx: ts.TransformationContext): ts.Transformer<T> {
 // }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcGlsZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL2NvbXBpbGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQWFBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxRQUFRLEVBQUUsY0FBYyxFQUFFLE1BQU0sUUFBUSxDQUFBO0FBQ25FLE9BQU8sRUFDTCx5QkFBeUIsRUFDekIsMkNBQTJDLEVBQzNDLDJCQUEyQixFQUMzQixvQkFBb0IsR0FDckIsTUFBTSxXQUFXLENBQUE7QUFDbEIsT0FBTyxFQUNMLFFBQVEsSUFBSSxXQUFXO0FBQ3ZCLGVBQWU7QUFDZix5QkFBeUIsRUFDekIsdUJBQXVCLEdBQ3hCLE1BQU0sVUFBVSxDQUFBO0FBR2pCOztHQUVHO0FBQ0gsTUFBTSxVQUFVLGlCQUFpQixDQUMvQixPQUF3QztJQUd4QyxNQUFNLElBQUksR0FBMEIsT0FBTztRQUN6QyxDQUFDLENBQUMsRUFBRSxHQUFHLHlCQUF5QixFQUFFLEdBQUcsT0FBTyxFQUFFO1FBQzlDLENBQUMsQ0FBQyxFQUFFLEdBQUcseUJBQXlCLEVBQUUsQ0FBQTtJQUVwQyxNQUFNLEtBQUssR0FBRyxPQUFPLElBQUksQ0FBQyxjQUFjLEtBQUssUUFBUSxJQUFJLElBQUksQ0FBQyxjQUFjLEdBQUcsQ0FBQztRQUM5RSxDQUFDLENBQUMsSUFBSSxDQUFDLGNBQWM7UUFDckIsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUNMLE1BQU0sTUFBTSxHQUFHLGNBQWMsQ0FBQyxLQUFLLENBQUMsQ0FBQTtJQUVwQyxJQUFJLFFBQVEsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEVBQUU7UUFDekIsT0FBTyxtQkFBbUIsQ0FBSSxNQUFNLEVBQUUsSUFBSSxDQUFDLENBQUE7S0FDNUM7U0FDSTtRQUNILE1BQU0sU0FBUyxDQUFDLGNBQWMsQ0FBQyxDQUFBO0tBQ2hDO0FBQ0gsQ0FBQztBQUdELE1BQU0sVUFBVSxtQkFBbUIsQ0FDakMsTUFBa0IsRUFDbEIsT0FBOEI7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

dist/lib/config.d.ts

@@ -10,2 +10,4 @@ import { BuildSrcOpts, CacheMap, CallerFuncNameSet, GenTbListFromTypeOpts, Options } from './model';
     'tables' = "tables",
+    'columns' = "columns",
+    'scopedColumns' = "scopedColumns",
     'refTables' = "rb"
@@ -12,0 +14,0 @@ }

dist/lib/config.js

@@ -7,3 +7,4 @@ export const globalCallerFuncNameSet = new Set(['genTbListFromType', 'kmore']);
     ...initGenTbListFromTypeOpts,
-    exportVarPrefix: 'tbs',
+    exportVarPrefix: 'tbs_',
+    exportVarColsSuffix: '_cols',
     forceLoadTbListJs: false,
@@ -30,6 +31,8 @@ forceLoadTbListJsPathReplaceRules: null,
     DbPropKeys["tables"] = "tables";
+    DbPropKeys["columns"] = "columns";
+    DbPropKeys["scopedColumns"] = "scopedColumns";
     DbPropKeys["refTables"] = "rb";
 })(DbPropKeys || (DbPropKeys = {}));
 export const defaultPropDescriptor = {
-    configurable: false,
+    configurable: true,
     enumerable: true,
@@ -41,2 +44,3 @@ writable: false,
     tbListMap: new Map(),
+    tbColListMap: new Map(),
     /** CallerId -> LocalTypeId */
@@ -47,2 +51,1 @@ callerIdToLocalTypeIdMap: new Map(),
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xpYi9jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBU0EsTUFBTSxDQUFDLE1BQU0sdUJBQXVCLEdBQXNCLElBQUksR0FBRyxDQUFDLENBQUMsbUJBQW1CLEVBQUUsT0FBTyxDQUFDLENBQUMsQ0FBQTtBQUVqRyxNQUFNLENBQUMsTUFBTSx5QkFBeUIsR0FBMEI7SUFDOUQsY0FBYyxFQUFFLENBQUM7Q0FDbEIsQ0FBQTtBQUVELE1BQU0sQ0FBQyxNQUFNLFdBQVcsR0FBWTtJQUNsQyxHQUFHLHlCQUF5QjtJQUM1QixlQUFlLEVBQUUsS0FBSztJQUN0QixpQkFBaUIsRUFBRSxLQUFLO0lBQ3hCLGlDQUFpQyxFQUFFLElBQUk7SUFDdkMsWUFBWSxFQUFFLHNCQUFzQjtJQUNwQyxvQkFBb0IsRUFBRSxnQkFBZ0I7SUFDdEMsZUFBZSxFQUFFLFFBQVE7Q0FDMUIsQ0FBQTtBQUVELE1BQU0sQ0FBQyxNQUFNLGdCQUFnQixHQUEyQjtJQUN0RCxHQUFHLFdBQVc7SUFDZCxJQUFJLEVBQUUsRUFBRTtJQUNSLFVBQVUsRUFBRSxDQUFDO0lBQ2IsZUFBZSxFQUFFLENBQUMsY0FBYyxDQUFDO0lBQ2pDLFlBQVksRUFBRSxHQUFHO0NBQ2xCLENBQUE7QUFFRCxNQUFNLENBQUMsTUFBTSxrQkFBa0IsR0FBYTtJQUMxQyxhQUFhO0lBQ2IsV0FBVztDQUNaLENBQUE7QUFDRCxNQUFNLENBQU4sSUFBWSxVQUlYO0FBSkQsV0FBWSxVQUFVO0lBQ3BCLHlCQUFhLENBQUE7SUFDYiwrQkFBbUIsQ0FBQTtJQUNuQiw4QkFBa0IsQ0FBQTtBQUNwQixDQUFDLEVBSlcsVUFBVSxLQUFWLFVBQVUsUUFJckI7QUFFRCxNQUFNLENBQUMsTUFBTSxxQkFBcUIsR0FBdUI7SUFDdkQsWUFBWSxFQUFFLEtBQUs7SUFDbkIsVUFBVSxFQUFFLElBQUk7SUFDaEIsUUFBUSxFQUFFLEtBQUs7Q0FDUCxDQUFBO0FBR1YsTUFBTSxDQUFDLE1BQU0sUUFBUSxHQUFhO0lBQ2hDLDhCQUE4QjtJQUM5QixTQUFTLEVBQUUsSUFBSSxHQUFHLEVBQUU7SUFDcEIsOEJBQThCO0lBQzlCLHdCQUF3QixFQUFFLElBQUksR0FBRyxFQUFFO0lBQ25DLHFDQUFxQztJQUNyQyxZQUFZLEVBQUUsSUFBSSxHQUFHLEVBQUU7Q0FDeEIsQ0FBQSJ9

dist/lib/index.js

 "use strict";
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIifQ==

dist/lib/model.d.ts

 import { CallExpression, JSDocTagInfo, SourceFile, TypeChecker } from 'typescript';
+import { JsonType, Spread } from '@waiting/shared-types';
 export interface Options extends GenTbListFromTypeOpts {
-    /** Exported vaiable name preifx. Default is "tbs", result will be "tbs_m_n" */
+    /** Exported table vaiable name prefix. Default is "tbs_", result will be "tbs_m_n" */
     exportVarPrefix: string;
+    /** Exported column vaiable name suffix. Default is "_cols", result will be "tbs_m_n_cols" */
+    exportVarColsSuffix: string;
     /**
@@ -46,7 +49,8 @@ * Load js under ts env for debug,
 export declare type CallerFuncName = string;
-export declare type TTableListModel = object;
+export declare type TTables = object;
 /**
  * Database Tables Tag Map generated by generics type passing to genTbListFromGenerics<T>()
  */
-export declare type TbListMap = Map<CallerId, DbTables<object>>;
+export declare type TbListMap = Map<CallerId, Tables<object>>;
+export declare type TbColListMap = Map<CallerId, TableCols<object>>;
 /** Define what's genericsTypeId at the callexpression position */
@@ -60,7 +64,28 @@ export declare type CallerIdToLocalTypeIdMap = Map<CallerId, LocalTypeId>;
 export declare type CallerTypeId = string;
-export declare type CallerTbListMap<T extends TTableListModel> = Map<CallerTypeId, DbTables<T>>;
+export declare type CallerTbListMap<T extends TTables> = Map<CallerTypeId, TablesMapArr<T>>;
+export interface TablesMapArr<T extends TTables> extends Array<Tables<T> | TableCols<T> | TableScopedCols<T>> {
+    0: Tables<T>;
+    1: TableCols<T>;
+    length: 2;
+}
 /** GenericsTypeId scope in the file */
-export declare type LocalTypeMap = Map<LocalTypeId, TbListTagMap>;
-export declare type CallerTypeMap = Map<CallerTypeId, TbListTagMap>;
+export declare type LocalTypeMap = Map<LocalTypeId, TagsMapArr>;
+export declare type CallerTypeMap = Map<CallerTypeId, TagsMapArr>;
 export declare type TbListTagMap = Map<TableAlias, JSDocTagInfo[]>;
+export declare type TbColListTagMap = Map<TableAlias, ColListTagMap>;
+export declare type TbScopedColListTagMap = Map<TableAlias, ColListTagMap>;
+export declare type ColListTagMap = Map<TableColAlias, JSDocTagInfo[]>;
+export interface TbTagsMap {
+    tbTagMap: TbListTagMap;
+    tbColTagMap: TbColListTagMap;
+}
+export interface LocalTypeItem {
+    localTypeId: string;
+    tagsMapArr?: TagsMapArr;
+}
+export interface TagsMapArr extends Array<TbListTagMap | TbColListTagMap> {
+    0: TbListTagMap;
+    1: TbColListTagMap;
+    length: 2;
+}
 export declare type GenericsArgName = string;
@@ -77,28 +102,65 @@ export interface CallerInfo {
 /**
+ * K(more)Tables array contains:
+ *  tables: tables name
+ *  columns: columns name of the tables
+ */
+export interface KTablesBase<T extends TTables> {
+    /**
+     * Tables alias/name pairs
+     * { tb_alias: "tb_name" }
+     */
+    tables: Tables<T>;
+    /**
+     * Columns mapping object, tb_name w/o table prefix
+     * ```json
+     * {
+     *    tb_alias: { col_alias: "col_name", ..., }
+     * }
+     * ```
+     */
+    columns: TableCols<T>;
+}
+/**
  * Type of db.tables
  */
-export declare type DbTables<T extends TTableListModel> = T extends void ? EmptyTbList : T extends never ? EmptyTbList : Record<keyof T, string>;
+export declare type Tables<T extends TTables> = T extends void ? EmptyTbList : T extends never ? EmptyTbList : Record<keyof T, string>;
 export interface EmptyTbList {
     readonly [key: string]: never;
 }
+/**
+ * Type of db.tableCols.tb_foo.col_bar
+ */
+export declare type TableCols<T extends TTables> = T extends void ? EmptyTbList : T extends never ? EmptyTbList : Columns<T>;
+export declare enum ColumnExtPropKeys {
+    tableAlias = "_tableAlias",
+    tablesRef = "_tablesRef",
+    sColsCacheMap = "_scopedColsCacheMap"
+}
+export declare type Columns<T extends TTables> = ScopedColumns<T> & {
+    readonly [ColumnExtPropKeys.tableAlias]: TableAlias;
+    readonly [ColumnExtPropKeys.tablesRef]: KTablesBase<T>['tables'];
+    readonly [ColumnExtPropKeys.sColsCacheMap]: Map<TableAlias, ScopedColumns<T>>;
+};
+/**
+ * Type of db.tableCols.tb_foo.col_bar,
+ * value wiht table prefix, eg. `tb_foo.col_name`
+ */
+export declare type TableScopedCols<T extends TTables> = T extends void ? EmptyTbList : T extends never ? EmptyTbList : ScopedColumns<T>;
+export declare type ScopedColumns<T extends TTables> = {
+    readonly [tbAlias in keyof T]: {
+        readonly [colAlias in keyof T[tbAlias]]: string;
+    };
+};
 export declare type TableAlias = string;
+export declare type TableColAlias = string;
 export declare type TableName = string;
 export declare type FilePath = string;
 export declare type FileName = string;
-export declare type ColumnType = boolean | number | string | null | JsonType | Date;
-export interface BaseTbType {
-    [colName: string]: ColumnType | ColumnType[];
-}
 export interface BaseTbListType {
     [tbAlias: string]: BaseTbType;
 }
-/** Value of key-value pairs object */
-export declare type PlainJsonValueType = boolean | number | string | null | undefined;
-/**
- * Typeof JSON object parsed from Response data
- * simple key-value pairs object.
- */
-export interface JsonType {
-    [key: string]: PlainJsonValueType | PlainJsonValueType[] | JsonType | JsonType[];
+export interface BaseTbType {
+    [colName: string]: ColumnType | ColumnType[];
 }
+export declare type ColumnType = boolean | number | string | null | JsonType | Date | bigint;
 export interface GenTbListFromTypeOpts {
@@ -115,8 +177,5 @@ /**
 }
-export interface GenGenericsArgMapOpts extends RetrieveInfoFromTypeOpts {
-    checker: TypeChecker;
-    sourceFile: SourceFile;
-}
 export interface CacheMap {
     readonly tbListMap: TbListMap;
+    readonly tbColListMap: TbColListMap;
     readonly callerIdToLocalTypeIdMap: CallerIdToLocalTypeIdMap;
@@ -147,3 +206,2 @@ readonly localTypeMap: LocalTypeMap;
     path: string;
-    retMap: LocalTypeMap;
 }
@@ -154,1 +212,7 @@ export interface MatchedSourceFile {
 }
+export interface LoadVarFromFileOpts {
+    path: string;
+    caller: CallerInfo;
+    options: Options;
+}
+export declare type JointTable<L, R, KeyExcludeOptional = void> = Spread<L, R, KeyExcludeOptional>;

dist/lib/model.js

@@ -1,1 +0,6 @@
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kZWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL21vZGVsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIifQ==
+export var ColumnExtPropKeys;
+(function (ColumnExtPropKeys) {
+    ColumnExtPropKeys["tableAlias"] = "_tableAlias";
+    ColumnExtPropKeys["tablesRef"] = "_tablesRef";
+    ColumnExtPropKeys["sColsCacheMap"] = "_scopedColsCacheMap";
+})(ColumnExtPropKeys || (ColumnExtPropKeys = {}));

dist/lib/ts-util.d.ts

@@ -1,3 +0,3 @@
-import { CallExpression, Identifier, SourceFile, Symbol as TsSymbol, TypeChecker } from 'typescript';
-import { CallerTypeIdInfo, CallerTypeId, CallerTypeMap, TbListTagMap, MatchedSourceFile, WalkNodeWithPositionOps, WalkNodeOps } from './model';
+import { CallExpression, SourceFile, TypeChecker } from 'typescript';
+import { CallerTypeIdInfo, CallerTypeId, CallerTypeMap, GenInfoFromNodeOps, LocalTypeId, MatchedSourceFile, WalkNodeWithPositionOps, WalkNodeOps, TbTagsMap } from './model';
 /**
@@ -8,5 +8,9 @@ *
 export declare function pickInfoFromCallerTypeId(id: CallerTypeId): CallerTypeIdInfo;
-export declare function genCallerTypeMapFromNodeSet(nodes: Set<CallExpression>, checker: TypeChecker, sourceFile: SourceFile, path: string): CallerTypeMap;
-export declare function genTbListTagMapFromSymbol(symbol: TsSymbol): TbListTagMap;
-export declare function retrieveGenericsIdentifierFromTypeArguments(node: CallExpression): Identifier | void;
+export declare function genCallerTypeMapFromNodeSet(nodes: Set<CallExpression>, checker: TypeChecker, sourceFile: SourceFile, // sourceFileObject
+path: string): CallerTypeMap;
+interface GenInfoFromNodeRet extends Omit<TbTagsMap, 'tbScopedColTagMap'> {
+    callerTypeId: CallerTypeId;
+    localTypeId: LocalTypeId;
+}
+export declare function genInfoFromNode(options: GenInfoFromNodeOps): GenInfoFromNodeRet | void;
 export declare function matchSourceFileWithFilePath(path: string): MatchedSourceFile;
@@ -17,1 +21,2 @@ /** Retrieve node with specified position from caller */
 export declare function walkNode(options: WalkNodeOps): Set<CallExpression>;
+export {};

dist/lib/ts-util.js

@@ -20,10 +20,15 @@ import { pathResolve } from '@waiting/shared-core';
 }
-export function genCallerTypeMapFromNodeSet(nodes, checker, sourceFile, path) {
+export function genCallerTypeMapFromNodeSet(nodes, checker, sourceFile, // sourceFileObject
+path) {
     const retMap = new Map();
     nodes.forEach((node) => {
         const obj = genInfoFromNode({
-            node, checker, sourceFile, retMap, path,
+            checker,
+            node,
+            path,
+            sourceFile,
         });
         if (obj) {
-            retMap.set(obj.id, obj.tagMap);
+            const { callerTypeId, tbTagMap, tbColTagMap } = obj;
+            retMap.set(callerTypeId, [tbTagMap, tbColTagMap]);
         }
@@ -33,26 +38,32 @@ });
 }
-function genInfoFromNode(options) {
-    const { node, checker, sourceFile, retMap, path, } = options;
+export function genInfoFromNode(options) {
+    const { node, checker, sourceFile, path, } = options;
+    const typeName = retrieveGenericsIdentifierFromTypeArguments(node);
     /* istanbul ignore else */
-    if (node) {
-        const typeName = retrieveGenericsIdentifierFromTypeArguments(node);
+    if (typeName && typeName.getText()) {
+        const gType = checker.getTypeAtLocation(typeName);
         /* istanbul ignore else */
-        if (typeName && typeName.getText()) {
-            const gType = checker.getTypeAtLocation(typeName);
+        if (gType && gType.symbol) {
+            const sym = gType.getSymbol();
+            if (!sym) {
+                return;
+            }
+            const { line, character } = sourceFile.getLineAndCharacterOfPosition(node.getStart());
+            const inputTypeName = sym.getName();
+            // "/kmore-mono/packages/kmore-types/test/config/test.config2.ts:4:1:typeid-TbListModel"
+            const callerTypeId = `${path}:${line + 1}:${character + 1}:typeid-${inputTypeName}`;
+            // @ts-ignore
+            // const gTypeId: number = typeof gType.id === 'number' ? gType.id : Math.random()
+            // "/kmore-mono/packages/kmore-types/test/config/test.config2.ts:typeid-76"
+            // "/kmore-mono/packages/kmore-types/test/config/test.config2.ts:typeid-TbListModel"
+            const localTypeId = `${path}:typeid-${inputTypeName}`;
+            const { tbTagMap, tbColTagMap } = genTbListTagMapFromSymbol(gType.symbol, checker);
             /* istanbul ignore else */
-            if (gType && gType.symbol) {
-                // @ts-ignore
-                const typeid = typeof gType.id === 'number' ? gType.id : Math.random();
-                const { line, character } = sourceFile.getLineAndCharacterOfPosition(node.getStart());
-                const localTypeId = `${path}:${line + 1}:${character + 1}:typeid-${typeid}`;
-                if (retMap.has(localTypeId)) {
-                    return;
-                }
-                else {
-                    const tagMap = genTbListTagMapFromSymbol(gType.symbol);
-                    /* istanbul ignore else */
-                    if (tagMap.size) {
-                        return { id: localTypeId, tagMap };
-                    }
-                }
+            if (tbTagMap.size) {
+                return {
+                    callerTypeId,
+                    localTypeId,
+                    tbTagMap,
+                    tbColTagMap,
+                };
             }
@@ -63,19 +74,59 @@ }
 // ---- compiler ---
-export function genTbListTagMapFromSymbol(symbol) {
+function genTbListTagMapFromSymbol(symbol, checker) {
     const { members } = symbol;
     // Map<TableAlias, Map<TagName, TagComment> >
-    const symbolTagMap = new Map();
+    const tbTagMap = new Map();
+    const tbColTagMap = new Map();
+    // const tbScopedColTagMap: TbScopedColListTagMap = new Map()
     /* istanbul ignore else */
     if (members) {
-        members.forEach((member) => {
-            const name = member.getName();
-            const tags = member.getJsDocTags();
+        members.forEach((tbSym) => {
+            const { name: tbName, tags } = retrieveInfoFromSymbolObject(tbSym);
             // tags can be empty array
-            symbolTagMap.set(name, tags);
+            tbTagMap.set(tbName, tags);
+            const nodes = tbSym.getDeclarations();
+            if (nodes && nodes.length) {
+                const colTagMap = genColListTagMapFromTbSymbol(nodes, checker);
+                tbColTagMap.set(tbName, colTagMap);
+            }
         });
     }
-    return symbolTagMap;
+    return { tbTagMap, tbColTagMap };
 }
-export function retrieveGenericsIdentifierFromTypeArguments(node) {
+function genColListTagMapFromTbSymbol(nodes, checker) {
+    const ret = new Map();
+    const [node] = nodes; // use only one
+    const { type: typeRef } = node;
+    if (typeRef && typeRef.getText()) {
+        return retrieveMembersFromTypeRef(typeRef, checker);
+    }
+    return ret;
+}
+function retrieveMembersFromTypeRef(typeRef, // TypeReference
+checker) {
+    const ret = new Map();
+    const gType = checker.getTypeAtLocation(typeRef);
     /* istanbul ignore else */
+    if (gType && gType.symbol) {
+        const sym = gType.getSymbol();
+        if (sym) {
+            const { members } = sym;
+            if (members) {
+                members.forEach((member) => {
+                    const { name: colName, tags } = retrieveInfoFromSymbolObject(member);
+                    ret.set(colName, tags);
+                });
+            }
+        }
+    }
+    return ret;
+}
+function retrieveInfoFromSymbolObject(symbol) {
+    return {
+        name: symbol.getName(),
+        tags: symbol.getJsDocTags(),
+    };
+}
+function retrieveGenericsIdentifierFromTypeArguments(node) {
+    /* istanbul ignore else */
     if (!node.typeArguments || node.typeArguments.length !== 1) {
@@ -172,2 +223,1 @@ return;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHMtdXRpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9saWIvdHMtdXRpbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFjQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFFbEQsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sUUFBUSxDQUFBO0FBYzVDOzs7R0FHRztBQUNILE1BQU0sVUFBVSx3QkFBd0IsQ0FBQyxFQUFnQjtJQUN2RCxNQUFNLE9BQU8sR0FBRyxFQUFFLENBQUMsS0FBSyxDQUFDLHNDQUFzQyxDQUFDLENBQUE7SUFFaEUsSUFBSSxPQUFPLElBQUksT0FBTyxDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUU7UUFDbkMsTUFBTSxHQUFHLEdBQXFCO1lBQzVCLElBQUksRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFDO1lBQ2hCLElBQUksRUFBRSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUM7WUFDakIsTUFBTSxFQUFFLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztZQUNuQixNQUFNLEVBQUUsT0FBTyxDQUFDLENBQUMsQ0FBQztTQUNuQixDQUFBO1FBQ0QsT0FBTyxHQUFHLENBQUE7S0FDWDtJQUVELE1BQU0sSUFBSSxTQUFTLENBQUMsNEJBQTRCLENBQUMsQ0FBQTtBQUNuRCxDQUFDO0FBR0QsTUFBTSxVQUFVLDJCQUEyQixDQUN6QyxLQUEwQixFQUMxQixPQUFvQixFQUNwQixVQUFzQixFQUN0QixJQUFZO0lBR1osTUFBTSxNQUFNLEdBQWtCLElBQUksR0FBRyxFQUFFLENBQUE7SUFFdkMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFO1FBQ3JCLE1BQU0sR0FBRyxHQUFHLGVBQWUsQ0FBQztZQUMxQixJQUFJLEVBQUUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUsSUFBSTtTQUN4QyxDQUFDLENBQUE7UUFDRixJQUFJLEdBQUcsRUFBRTtZQUNQLE1BQU0s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

dist/lib/util.d.ts

 import { Observable } from 'rxjs';
-import { BuildSrcOpts, CallerInfo, CallerFuncName, DbTables, FilePath, Options, TbListTagMap, TTableListModel, CallerFuncNameSet } from './model';
+import { BuildSrcOpts, CallerInfo, CallerFuncName, CallerFuncNameSet, Tables, TableCols, FilePath, KTablesBase, LoadVarFromFileOpts, Options, TbListTagMap, TbColListTagMap, TTables } from './model';
 /** Allow empty Object */
@@ -14,3 +14,6 @@ export declare function validateParamTables(tbs: unknown): void;
 /** Build DbTables from TableListTagMap */
-export declare function buildTbListParam<T extends TTableListModel>(tagMap: TbListTagMap): DbTables<T>;
+export declare function buildTbListParam<T extends TTables>(tagMap: TbListTagMap): Tables<T>;
+/** Build DbTableCols from TableColListTagMap */
+export declare function buildTbColListParam<T extends TTables>(tagMap: TbColListTagMap): TableCols<T>;
+/** Build DbTableScopedCols from TableColListTagMap */
 export declare function isCallerNameMatched(name: string, matchFuncNameSet: CallerFuncNameSet): boolean;
@@ -21,3 +24,8 @@ export declare function createNullObject(): any;
 export declare function reWriteLoadingPath(path: FilePath, rules: Options['forceLoadTbListJsPathReplaceRules']): FilePath;
-export declare function loadVarFromFile<T extends TTableListModel>(path: string, caller: CallerInfo, options: Options): DbTables<T>;
+export declare function loadTableVarFromFile<T extends TTables>(loadOpts: LoadVarFromFileOpts): Tables<T>;
+export declare function loadColumnVarFromFile<T extends TTables>(loadOpts: LoadVarFromFileOpts): TableCols<T>;
+/**
+ * Load kTables var from a js file
+ */
+export declare function loadVarFromFile<T extends TTables>(loadOpts: LoadVarFromFileOpts): KTablesBase<T>;
 export declare function loadFile(path: string): any;
@@ -24,0 +32,0 @@ /**

dist/lib/util.js

@@ -137,2 +137,59 @@ import * as sourceMapSupport from 'source-map-support';
 }
+/** Build DbTableCols from TableColListTagMap */
+export function buildTbColListParam(tagMap) {
+    const ret = createNullObject();
+    if (tagMap && tagMap.size) {
+        tagMap.forEach((colListTagMap, tb) => {
+            const cols = createNullObject();
+            colListTagMap.forEach((_tags, col) => {
+                Object.defineProperty(cols, col, {
+                    ...defaultPropDescriptor,
+                    value: col,
+                });
+            });
+            Object.defineProperty(ret, tb, {
+                ...defaultPropDescriptor,
+                value: cols,
+            });
+        });
+    }
+    else {
+        throw new TypeError('Value of tagMap invalid.');
+    }
+    return ret;
+}
+/** Build DbTableScopedCols from TableColListTagMap */
+// export function buildTbScopedColListParam<T extends TTables>(
+//   tagMap: TbColListTagMap,
+//   tables: DbTables<T>,
+// ): DbTableScopedCols<T> {
+//   const ret = createNullObject()
+//   if (! tables || ! Object.keys(tables).length) {
+//     return ret
+//   }
+//   if (tagMap && tagMap.size) {
+//     tagMap.forEach((colListTagMap, tbAlias) => {
+//       const tb = tbAlias as keyof DbTables<T>
+//       if (typeof tables[tb] !== 'string') {
+//         return
+//       }
+//       const tbName = tables[tb]
+//       const cols = createNullObject()
+//       colListTagMap.forEach((_tags, colAlias) => {
+//         Object.defineProperty(cols, colAlias, {
+//           ...defaultPropDescriptor,
+//           value: `${tbName}.${colAlias}`,
+//         })
+//       })
+//       Object.defineProperty(ret, tbAlias, {
+//         ...defaultPropDescriptor,
+//         value: cols,
+//       })
+//     })
+//   }
+//   else {
+//     throw new TypeError('Value of tagMap invalid.')
+//   }
+//   return ret
+// }
 export function isCallerNameMatched(name, matchFuncNameSet) {
@@ -163,3 +220,3 @@ if (!name) {
 export function genVarName(exportVarPrefix, line, column) {
-    const varName = `${exportVarPrefix}_${line}_${column}`;
+    const varName = `${exportVarPrefix}${line}_${column}`;
     return varName;
@@ -177,7 +234,24 @@ }
 }
-export function loadVarFromFile(path, caller, options) {
-    const varName = genVarName(options.exportVarPrefix, caller.line, caller.column);
+export function loadTableVarFromFile(loadOpts) {
+    const kTables = loadVarFromFile(loadOpts);
+    return kTables.tables;
+}
+export function loadColumnVarFromFile(loadOpts) {
+    const kTables = loadVarFromFile(loadOpts);
+    return kTables.columns;
+}
+/**
+ * Load kTables var from a js file
+ */
+export function loadVarFromFile(loadOpts) {
+    const { path, caller, options } = loadOpts;
+    const tbVarName = genVarName(options.exportVarPrefix, caller.line, caller.column);
+    const colVarName = `${tbVarName}${options.exportVarColsSuffix}`;
     const mods = loadFile(path);
-    if (mods && typeof mods[varName] === 'object') {
-        return mods[varName];
+    if (mods && typeof mods[tbVarName] === 'object') {
+        const tables = mods[tbVarName];
+        const columns = typeof mods[colVarName] === 'object'
+            ? mods[colVarName]
+            : {};
+        return { tables, columns };
     }
@@ -281,2 +355,1 @@ throw new TypeError(`Load tables failed, path: "${path}"`);
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/lib/util.ts"],"names":[],"mappings":"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"}

package.json

 {
   "name": "kmore-types",
   "author": "waiting",
-  "version": "0.14.0",
+  "version": "0.15.0",
   "description": "Retrieve types info from ts file",
@@ -36,3 +36,4 @@ "keywords": [
     "@types/source-map-support": "*",
-    "cross-env": "6"
+    "cross-env": "7",
+    "typescript": "3"
   },
@@ -56,3 +57,3 @@ "peerDependencies": {
     "rp:w": "npm run tsc:w | rollup -wc rollup.config.js",
-    "test": "cross-env TS_NODE_PROJECT=test/tsconfig.json mocha --opts test/mocha.opts",
+    "test": "cross-env TS_NODE_PROJECT=test/tsconfig.json mocha",
     "test:browser": "cd .config && npm run browser && cd ..",
@@ -88,3 +89,3 @@ "tsc": "tsc -p tsconfig.json",
   },
-  "gitHead": "3a48cf8a1438b9c06135e16540c42af50dbd1912"
+  "gitHead": "c67e60f8b5d6c1feed58816c2890eb54ed00347a"
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Lines of code

2013

increased by19.54%

Worsened metrics

Total package byte prevSize

135988

decreased by-23.45%

Dev dependency count

3

increased by50%

No dependency changes