Oak-Team
/
oak-backend-base
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 18 Wiki Activity

适配exception的改动

This commit is contained in:
Xu Chang 2025-01-21 13:56:48 +08:00
parent 52b9a9fbfe
commit 8f8c382d9e
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/AppLoader.js
View File

@ -16,6 +16,7 @@ const dependencyBuilder_1 = require("oak-domain/lib/compiler/dependencyBuilder")
const DataSubscriber_1 = tslib_1.__importDefault(require("./cluster/DataSubscriber")); const DataSubscriber_1 = tslib_1.__importDefault(require("./cluster/DataSubscriber"));
const env_1 = require("./cluster/env"); const env_1 = require("./cluster/env");
const Synchronizer_1 = tslib_1.__importDefault(require("./Synchronizer")); const Synchronizer_1 = tslib_1.__importDefault(require("./Synchronizer"));
const i18n_1 = tslib_1.__importDefault(require("oak-domain/lib/data/i18n"));
class AppLoader extends types_1.AppLoader { class AppLoader extends types_1.AppLoader {
dbStore; dbStore;
aspectDict; aspectDict;
@ -191,6 +192,9 @@ class AppLoader extends types_1.AppLoader {
async initialize() { async initialize() {
await this.dbStore.initialize({ ifExists: 'dropIfNotStatic' }); await this.dbStore.initialize({ ifExists: 'dropIfNotStatic' });
const data = this.requireSth('lib/data/index'); const data = this.requireSth('lib/data/index');
// oak-domain中只有i18n
(0, assert_1.default)(data.i18n);
data.i18n.push(...i18n_1.default);
const context = this.contextBuilder(this.dbStore); const context = this.contextBuilder(this.dbStore);
context.openRootMode(); context.openRootMode();
for (const entity in data) { for (const entity in data) {

6
src/AppLoader.ts
View File

@ -20,7 +20,7 @@ import DataSubscriber from './cluster/DataSubscriber';
import { getClusterInfo } from './cluster/env'; import { getClusterInfo } from './cluster/env';
import Synchronizer from './Synchronizer'; import Synchronizer from './Synchronizer';
import { AsyncContext } from 'oak-domain/lib/store/AsyncRowStore'; import { AsyncContext } from 'oak-domain/lib/store/AsyncRowStore';
import domainI18nData from 'oak-domain/lib/data/i18n';
export class AppLoader<ED extends EntityDict & BaseEntityDict, Cxt extends BackendRuntimeContext<ED>> extends GeneralAppLoader<ED, Cxt> { export class AppLoader<ED extends EntityDict & BaseEntityDict, Cxt extends BackendRuntimeContext<ED>> extends GeneralAppLoader<ED, Cxt> {
protected dbStore: DbStore<ED, Cxt>; protected dbStore: DbStore<ED, Cxt>;
@ -249,6 +249,10 @@ export class AppLoader<ED extends EntityDict & BaseEntityDict, Cxt extends Backe
await this.dbStore.initialize({ ifExists: 'dropIfNotStatic' }); await this.dbStore.initialize({ ifExists: 'dropIfNotStatic' });
const data = this.requireSth('lib/data/index')!; const data = this.requireSth('lib/data/index')!;
// oak-domain中只有i18n
assert(data.i18n);
data.i18n.push(...domainI18nData);
const context = this.contextBuilder(this.dbStore); const context = this.contextBuilder(this.dbStore);
context.openRootMode(); context.openRootMode();
for (const entity in data) { for (const entity in data) {

4
src/ClusterAppLoader.ts
View File

@ -146,7 +146,7 @@ export class ClusterAppLoader<ED extends EntityDict & BaseEntityDict, Cxt extend
const { instanceCount, instanceId } = getClusterInfo()!; const { instanceCount, instanceId } = getClusterInfo()!;
assert(instanceCount && typeof instanceId === 'number'); assert(instanceCount && typeof instanceId === 'number');
const { filter } = operation; const { filter } = operation;
const filter2 = singleton ? filter : combineFilters<ED, T>(entity, this.dbStore.getSchema(), [filter, { const filter2 = singleton ? filter : combineFilters<ED, T>(entity, this.dbStore.getSchema(), [filter!, {
$$seq$$: { $$seq$$: {
$mod: [instanceCount, instanceId] $mod: [instanceCount, instanceId]
} }
@ -161,7 +161,7 @@ export class ClusterAppLoader<ED extends EntityDict & BaseEntityDict, Cxt extend
const { instanceCount, instanceId } = getClusterInfo()!; const { instanceCount, instanceId } = getClusterInfo()!;
assert(instanceCount && typeof instanceId === 'number'); assert(instanceCount && typeof instanceId === 'number');
const { filter } = selection; const { filter } = selection;
const filter2 = singleton ? filter : combineFilters<ED, T>(entity, this.dbStore.getSchema(), [filter, { const filter2 = singleton ? filter : combineFilters<ED, T>(entity, this.dbStore.getSchema(), [filter!, {
$$seq$$: { $$seq$$: {
$mod: [instanceCount, instanceId] $mod: [instanceCount, instanceId]
} }

4
src/Synchronizer.ts
View File

@ -224,7 +224,7 @@ export default class Synchronizer<ED extends EntityDict & BaseEntityDict, Cxt ex
data: { data: {
[TriggerDataAttribute]: null, [TriggerDataAttribute]: null,
[TriggerUuidAttribute]: null, [TriggerUuidAttribute]: null,
}, } as any,
filter: { filter: {
id: { id: {
$in: operIds, $in: operIds,
@ -478,7 +478,7 @@ export default class Synchronizer<ED extends EntityDict & BaseEntityDict, Cxt ex
data: { data: {
[TriggerDataAttribute]: null, [TriggerDataAttribute]: null,
[TriggerUuidAttribute]: null, [TriggerUuidAttribute]: null,
}, } as any,
filter: { filter: {
id: { id: {
$in: unPushedIds, $in: unPushedIds,