Skip to content

Commit 78af86f

Browse files
committed
chore: simplifies init code
1 parent 8296176 commit 78af86f

File tree

2 files changed

+11
-15
lines changed

2 files changed

+11
-15
lines changed

src/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import { Result as ResetPasswordResult } from './auth/operations/resetPassword';
4444
import { Result as LoginResult } from './auth/operations/login';
4545
import { Options as FindGlobalOptions } from './globals/operations/local/findOne';
4646
import { Options as UpdateGlobalOptions } from './globals/operations/local/update';
47-
import { initAsync } from './init';
47+
import { initPayload } from './init';
4848

4949
require('isomorphic-fetch');
5050

@@ -122,7 +122,7 @@ export class Payload {
122122
* @param options
123123
*/
124124
async init(options: InitOptions): Promise<void> {
125-
await initAsync(this, options);
125+
await initPayload(this, options);
126126
}
127127

128128
getAdminURL = (): string => `${this.config.serverURL}${this.config.routes.admin}`;

src/init.ts

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,15 @@ import mountEndpoints from './express/mountEndpoints';
3333
import PreferencesModel from './preferences/model';
3434
import findConfig from './config/find';
3535

36-
export const init = (payload: Payload, options: InitOptions): void => {
36+
export const initPayload = async (payload: Payload, options: InitOptions): Promise<void> => {
37+
payload.logger = Logger('payload', options.loggerOptions);
38+
payload.mongoURL = options.mongoURL;
39+
40+
if (payload.mongoURL) {
41+
mongoose.set('strictQuery', false);
42+
payload.mongoMemoryServer = await connectMongoose(payload.mongoURL, options.mongoOptions, payload.logger);
43+
}
44+
3745
payload.logger.info('Starting Payload...');
3846
if (!options.secret) {
3947
throw new Error(
@@ -145,18 +153,6 @@ export const init = (payload: Payload, options: InitOptions): void => {
145153
}
146154

147155
serverInitTelemetry(payload);
148-
};
149-
150-
export const initAsync = async (payload: Payload, options: InitOptions): Promise<void> => {
151-
payload.logger = Logger('payload', options.loggerOptions);
152-
payload.mongoURL = options.mongoURL;
153-
154-
if (payload.mongoURL) {
155-
mongoose.set('strictQuery', false);
156-
payload.mongoMemoryServer = await connectMongoose(payload.mongoURL, options.mongoOptions, payload.logger);
157-
}
158-
159-
init(payload, options);
160156

161157
if (typeof options.onInit === 'function') await options.onInit(payload);
162158
if (typeof payload.config.onInit === 'function') await payload.config.onInit(payload);

0 commit comments

Comments
 (0)