f

Author: killagu

core/core-decorator/test/decorators.test.ts

@@ -118,6 +118,7 @@ describe('test/decorator.test.ts', () => {
       };
       assert.deepStrictEqual(PrototypeUtil.getMultiInstanceProperty(FooLogger, {
         unitPath: 'foo',
+        moduleName: '',
       }), expectObjectProperty);
     });
   });

core/dal-decorator/index.ts

@@ -21,3 +21,4 @@ export * from './src/type/DateSource';
 export * from './src/type/Spatial';
 export * from './src/type/SqlMap';
 export * from './src/type/ColumnTsType';
+export * from './src/type/MySql';

core/dal-decorator/src/decorator/Column.ts

@@ -204,19 +204,19 @@ export interface PolygonParams extends BaseSpatialParams {
   type: ColumnType.POLYGON;
 }
 
-export interface MultipointParams extends BaseSpatialParams {
+export interface MultiPointParams extends BaseSpatialParams {
   type: ColumnType.MULTIPOINT;
 }
 
-export interface MultilinestringParams extends BaseSpatialParams {
+export interface MultiLinestringParams extends BaseSpatialParams {
   type: ColumnType.MULTILINESTRING;
 }
 
-export interface MultipolygonParams extends BaseSpatialParams {
+export interface MultiPolygonParams extends BaseSpatialParams {
   type: ColumnType.MULTIPOLYGON;
 }
 
-export interface GeometrycollectionParams extends BaseSpatialParams {
+export interface GeometryCollectionParams extends BaseSpatialParams {
   type: ColumnType.GEOMETRYCOLLECTION;
 }
 
@@ -254,10 +254,10 @@ export type ColumnTypeParams = BitParams
 | PointParams
 | LinestringParams
 | PolygonParams
-| MultipointParams
-| MultilinestringParams
-| MultipolygonParams
-| GeometrycollectionParams;
+| MultiPointParams
+| MultiLinestringParams
+| MultiPolygonParams
+| GeometryCollectionParams;
 
 export function Column(type: ColumnTypeParams, params?: ColumnParams) {
   return function(target: any, propertyKey: PropertyKey) {

core/dal-decorator/src/type/DateSource.ts

@@ -1,17 +1,15 @@
-export interface DalOptions {
-  transaction: object;
+export interface PaginateData<T> {
+  total: number;
+  pageNum: number;
+  rows: Array<T>;
 }
 
-export type TransactionScopeOptions = {
-  transaction: object;
-} | {
-  newTransaction: true;
-};
+
 export interface DataSource<T> {
   execute(sqlName: string, data?: any): Promise<Array<T>>;
   executeScalar(sqlName: string, data?: any): Promise<T | null>;
   executeRaw(sqlName: string, data?: any): Promise<Array<any>>;
   executeRawScalar(sqlName: string, data?: any): Promise<any | null>;
-  paginate(sqlName: string, data: any, currentPage: number, perPageCount: number): Promise<any>;
+  paginate(sqlName: string, data: any, currentPage: number, perPageCount: number): Promise<PaginateData<T>>;
   count(sqlName: string, data?: any): Promise<number>;
 }

core/dal-decorator/src/type/MySql.ts

@@ -0,0 +1 @@
+export { InsertResult, UpdateResult, DeleteResult } from '@eggjs/rds/lib/types';

core/dal-decorator/test/index.test.ts

@@ -52,7 +52,7 @@ describe('test/dal/index.test.ts', () => {
     const table = TableModel.build(Foo);
     assert(table);
     assert(table.name === 'foos');
-    assert.equal(table.columns.length, 1);
+    assert.equal(table.columns.length, 2);
     assert.equal(table.indices.length, 1);
   });
 });

core/dal-runtime/src/DataSource.ts

@@ -1,4 +1,4 @@
-import { DataSource as IDataSource, SqlType, TableModel } from '@eggjs/dal-decorator';
+import { DataSource as IDataSource, PaginateData, SqlType, TableModel } from '@eggjs/dal-decorator';
 import { MysqlDataSource } from './MySqlDataSource';
 import { TableSqlMap } from './TableSqlMap';
 import { TableModelInstanceBuilder } from './TableModelInstanceBuilder';
@@ -65,7 +65,7 @@ export class DataSource<T> implements IDataSource<T> {
     return ret[0] || null;
   }
 
-  async paginate(sqlName: string, data: any, currentPage: number, perPageCount: number): Promise<any> {
+  async paginate(sqlName: string, data: any, currentPage: number, perPageCount: number): Promise<PaginateData<T>> {
     const limit = `LIMIT ${(currentPage - 1) * perPageCount}, ${perPageCount}`;
     const sql = this.generateSql(sqlName, data).sql + ' ' + limit;
     const countSql = this.generateSql(sqlName, Object.assign({ $$count: true }, data)).sql;

core/dal-runtime/src/templates/extension.njk

@@ -1,4 +1,4 @@
-import { SqlMap } from '@eggjs/dal-decorator';
+import { SqlMap } from '@eggjs/tegg/dal';
 // empty-line
 export default {
 // empty-line

core/dal-runtime/test/fixtures/modules/generate_codes/dal/extension/FooExtension.ts

@@ -1,4 +1,4 @@
-import { SqlMap } from '@eggjs/dal-decorator';
+import { SqlMap } from '@eggjs/tegg/dal';
 
 export default {
 

core/dal-runtime/test/fixtures/modules/generate_codes/dal/extension/MultiPrimaryKeyExtension.ts

@@ -1,4 +1,4 @@
-import { SqlMap } from '@eggjs/dal-decorator';
+import { SqlMap } from '@eggjs/tegg/dal';
 
 export default {
 

core/metadata/test/ModuleGraph.test.ts

@@ -7,7 +7,7 @@ describe('test/ModuleGraph.test.ts', () => {
     const modulePath = path.join(__dirname, './fixtures/modules/extends-module');
     const loader = new TestLoader(modulePath);
     const clazzList = loader.load();
-    const graph = new ModuleGraph(clazzList, modulePath);
+    const graph = new ModuleGraph(clazzList, modulePath, 'foo');
     graph.sort();
   });
 });