Skip to content
This repository was archived by the owner on Dec 27, 2024. It is now read-only.

Commit 24f91c4

Browse files
etsuoetsuo
committed
#225 final touches -- rename
1 parent 047a83f commit 24f91c4

File tree

9 files changed

+21
-21
lines changed

9 files changed

+21
-21
lines changed

‎src/core/@model/model-operators/create.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export async function create(this: InstanceType<ReturnType<typeof SapiModelMixin
3030
throw new Error(`Database '${(constructor[modelSymbols.dbName] || {} as any).name}' not found`);
3131
}
3232

33-
this.emitOnBeforeCreate(context);
33+
this.emitBeforeCreate(context);
3434

3535
const dbObj = this.toDb();
3636
const result = await col.insertOne(dbObj, options);

src/core/@model/model-operators/emit-on-before-create.spec.ts renamed to src/core/@model/model-operators/emit-before-create.spec.ts

File renamed without changes.

src/core/@model/model-operators/emit-on-before-create.ts renamed to src/core/@model/model-operators/emit-before-create.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { SapiModelMixin } from '../sapi-model-mixin';
66
* Triggers a Model's onBeforeCreate
77
* @param context the save context
88
*/
9-
export async function emitOnBeforeCreate(this: InstanceType<ReturnType<typeof SapiModelMixin>>, context = 'default'): Promise<void> {
9+
export async function emitBeforeCreate(this: InstanceType<ReturnType<typeof SapiModelMixin>>, context = 'default'): Promise<void> {
1010

1111
// call @BeforeCreate for this model
1212
const beforCreateMap: Map<string, OnBeforeCreate[]> = Reflect.getMetadata(beforeCreateSymbols.functionMap, this);
@@ -31,14 +31,14 @@ export async function emitOnBeforeCreate(this: InstanceType<ReturnType<typeof Sa
3131
if (model) {
3232
if (Array.isArray(this[key])) {
3333
for (const childModel of this[key] as Array<InstanceType<ReturnType<typeof SapiModelMixin>>>) {
34-
if (typeof childModel.emitOnBeforeCreate === 'function') {
35-
await childModel.emitOnBeforeCreate(context);
34+
if (typeof childModel.emitBeforeCreate === 'function') {
35+
await childModel.emitBeforeCreate(context);
3636
}
3737
}
3838
} else {
3939
const property = this[key] as InstanceType<ReturnType<typeof SapiModelMixin>>;
40-
if (typeof property.emitOnBeforeCreate === 'function') {
41-
await property.emitOnBeforeCreate(context);
40+
if (typeof property.emitBeforeCreate === 'function') {
41+
await property.emitBeforeCreate(context);
4242
}
4343
}
4444
}

src/core/@model/model-operators/emit-on-before-save.spec.ts renamed to src/core/@model/model-operators/emit-before-save.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { Id } from '../id';
77
import { Model } from '../model';
88
import { SapiModelMixin } from '../sapi-model-mixin';
99

10-
describe('emitOnBeforeSave', () => {
10+
describe('emitBeforeSave', () => {
1111

1212
const dbConfig = {
1313
collection: 'users',

src/core/@model/model-operators/emit-on-before-save.ts renamed to src/core/@model/model-operators/emit-before-save.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { SapiModelMixin } from '../sapi-model-mixin';
66
* Triggers a Model's onBeforeSave
77
* @param context the save context
88
*/
9-
export async function emitOnBeforeSave(this: InstanceType<ReturnType<typeof SapiModelMixin>>, context = 'default'): Promise<void> {
9+
export async function emitBeforeSave(this: InstanceType<ReturnType<typeof SapiModelMixin>>, context = 'default'): Promise<void> {
1010

1111
// call @BeforeSaves for this model
1212
const beforSaveMap: Map<string, OnBeforeSave[]> = Reflect.getMetadata(beforeSaveSymbols.functionMap, this);
@@ -31,14 +31,14 @@ export async function emitOnBeforeSave(this: InstanceType<ReturnType<typeof Sapi
3131
if (model) {
3232
if (Array.isArray(this[key])) {
3333
for (const childModel of this[key] as Array<InstanceType<ReturnType<typeof SapiModelMixin>>>) {
34-
if (typeof childModel.emitOnBeforeSave === 'function') {
35-
await childModel.emitOnBeforeSave(context);
34+
if (typeof childModel.emitBeforeSave === 'function') {
35+
await childModel.emitBeforeSave(context);
3636
}
3737
}
3838
} else {
3939
const property = this[key] as InstanceType<ReturnType<typeof SapiModelMixin>>;
40-
if (typeof property.emitOnBeforeSave === 'function') {
41-
await property.emitOnBeforeSave(context);
40+
if (typeof property.emitBeforeSave === 'function') {
41+
await property.emitBeforeSave(context);
4242
}
4343
}
4444
}

‎src/core/@model/model-operators/index.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export * from './create';
22
export * from './debug';
3-
export * from './emit-on-before-create';
4-
export * from './emit-on-before-save';
3+
export * from './emit-before-create';
4+
export * from './emit-before-save';
55
export * from './from-db';
66
export * from './from-db-array';
77
export * from './from-json';

‎src/core/@model/model-operators/save.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export async function save(this: InstanceType<ReturnType<typeof SapiModelMixin>>
3838
throw new SapiMissingIdErr('Model missing id field, cannot save. Did you mean to use create?', this);
3939
}
4040

41-
this.emitOnBeforeSave(context);
41+
this.emitBeforeSave(context);
4242

4343
const dbObj = changeSet || this.toDb(this);
4444
delete dbObj._id;

‎src/core/@model/model.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import { addDefaultInstanceMethods, addDefaultStaticMethods } from '../lib';
44
import { idSymbols } from './id';
55
import {
66
create,
7-
emitOnBeforeCreate,
8-
emitOnBeforeSave,
7+
emitBeforeCreate,
8+
emitBeforeSave,
99
fromDb,
1010
fromDbArray,
1111
fromJson,
@@ -384,8 +384,8 @@ export function Model(modelOptions?: IModelOptions): (object) => any {
384384

385385
// Inject default instance methods for CRUD if not already defined by integrator
386386
addDefaultInstanceMethods(newConstructor, create, modelOptions);
387-
addDefaultInstanceMethods(newConstructor, emitOnBeforeCreate, modelOptions);
388-
addDefaultInstanceMethods(newConstructor, emitOnBeforeSave, modelOptions);
387+
addDefaultInstanceMethods(newConstructor, emitBeforeCreate, modelOptions);
388+
addDefaultInstanceMethods(newConstructor, emitBeforeSave, modelOptions);
389389
addDefaultInstanceMethods(newConstructor, getCollection, modelOptions);
390390
addDefaultInstanceMethods(newConstructor, getDb, modelOptions);
391391
addDefaultInstanceMethods(newConstructor, remove, modelOptions);

‎src/core/@model/sapi-model-mixin.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ export function SapiModelMixin<C extends Constructor<{}>>(base?: C) {
8484
dbLocale: string;
8585

8686
create: (options?: CollectionInsertOneOptions, context?: string) => Promise<InsertOneWriteOpResult>;
87-
emitOnBeforeCreate: (context?: string) => Promise<void>;
88-
emitOnBeforeSave: (context?: string) => Promise<void>;
87+
emitBeforeCreate: (context?: string) => Promise<void>;
88+
emitBeforeSave: (context?: string) => Promise<void>;
8989
getCollection: () => Collection;
9090
getDb: () => Db;
9191
toJson: (context?: string | IContext) => any;

0 commit comments

Comments
 (0)