Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: use loader to load TableClazzList #219

Merged
merged 1 commit into from
Apr 28, 2024
Merged

fix: use loader to load TableClazzList #219

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 15 additions & 22 deletions plugin/dal/lib/DataSource.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
import assert from 'node:assert';
import path from 'node:path';
import fs from 'node:fs';
import {
AccessLevel,
LifecycleInit,
MultiInstanceProto,
MultiInstancePrototypeGetObjectsContext,
ObjectInfo,
ObjectInitType,
LifecycleInit,
} from '@eggjs/tegg';
import { ModuleConfigUtil, LoaderUtil, EggObject, EggObjectLifeCycleContext } from '@eggjs/tegg/helper';
import {
EggLoadUnitType,
EggObject,
EggObjectLifeCycleContext,
LoaderFactory,
ModuleConfigUtil,
} from '@eggjs/tegg/helper';
import {
DataSource as IDataSource,
DataSourceInjectName,
DataSourceQualifierAttribute,
PaginateData,
TableInfoUtil,
DataSource as IDataSource, TableModel, PaginateData,
TableModel,
} from '@eggjs/tegg/dal';
import { DataSource } from '@eggjs/dal-runtime';
import { TableModelManager } from './TableModelManager';
Expand All @@ -28,25 +34,12 @@ import { SqlMapManager } from './SqlMapManager';
const config = ModuleConfigUtil.loadModuleConfigSync(ctx.unitPath) as any | undefined;
const dataSources = Object.keys(config?.dataSource || {});
const result: ObjectInfo[] = [];
const daoDir = path.join(ctx.unitPath, 'dal/dao');
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

不应该 hard code 路径。

let dirents: string[];
try {
dirents = fs.readdirSync(daoDir);
} catch {
return [];
}
const daos = dirents.filter(t => t.endsWith(`DAO${LoaderUtil.extension}`));
// eslint-disable-next-line @typescript-eslint/no-var-requires
const daoClazzList = daos.map(t => {
// eslint-disable-next-line @typescript-eslint/no-var-requires
return require(path.join(daoDir, t)).default;
});
const tableClazzList = daoClazzList.map(t => {
// eslint-disable-next-line no-proto
return Object.getPrototypeOf(t).clazzModel;
const loader = LoaderFactory.createLoader(ctx.unitPath, EggLoadUnitType.MODULE);
const clazzList = loader.load();
const tableClazzList = clazzList.filter(t => {
return TableInfoUtil.getIsTable(t);
});
const dataSourceLength = dataSources.length;

for (const dataSource of dataSources) {
const moduleClazzList = tableClazzList.filter(clazz => {
const tableParams = TableInfoUtil.getTableParams(clazz);
Expand Down
Loading