chore: revert #1794 for now until permanent init architecture is established
This commit is contained in:
@@ -5,11 +5,11 @@ import Logger from '../utilities/logger';
|
||||
import loadConfig from '../config/load';
|
||||
import payload from '..';
|
||||
|
||||
export async function generateGraphQLSchema(): Promise<void> {
|
||||
export function generateGraphQLSchema(): void {
|
||||
const logger = Logger();
|
||||
const config = loadConfig();
|
||||
|
||||
await payload.init({
|
||||
payload.init({
|
||||
secret: '--unused--',
|
||||
mongoURL: false,
|
||||
local: true,
|
||||
|
||||
10
src/index.ts
10
src/index.ts
@@ -44,7 +44,7 @@ import { Result as ResetPasswordResult } from './auth/operations/resetPassword';
|
||||
import { Result as LoginResult } from './auth/operations/login';
|
||||
import { Options as FindGlobalOptions } from './globals/operations/local/findOne';
|
||||
import { Options as UpdateGlobalOptions } from './globals/operations/local/update';
|
||||
import { initPayload } from './init';
|
||||
import { initSync, initAsync } from './init';
|
||||
|
||||
require('isomorphic-fetch');
|
||||
|
||||
@@ -121,8 +121,12 @@ export class Payload {
|
||||
* @description Initializes Payload
|
||||
* @param options
|
||||
*/
|
||||
async init(options: InitOptions): Promise<void> {
|
||||
await initPayload(this, options);
|
||||
init(options: InitOptions): void {
|
||||
initSync(this, options);
|
||||
}
|
||||
|
||||
async initAsync(options: InitOptions): Promise<void> {
|
||||
await initAsync(this, options);
|
||||
}
|
||||
|
||||
getAdminURL = (): string => `${this.config.serverURL}${this.config.routes.admin}`;
|
||||
|
||||
37
src/init.ts
37
src/init.ts
@@ -33,15 +33,7 @@ import mountEndpoints from './express/mountEndpoints';
|
||||
import PreferencesModel from './preferences/model';
|
||||
import findConfig from './config/find';
|
||||
|
||||
export const initPayload = async (payload: Payload, options: InitOptions): Promise<void> => {
|
||||
payload.logger = Logger('payload', options.loggerOptions);
|
||||
payload.mongoURL = options.mongoURL;
|
||||
|
||||
if (payload.mongoURL) {
|
||||
mongoose.set('strictQuery', false);
|
||||
payload.mongoMemoryServer = await connectMongoose(payload.mongoURL, options.mongoOptions, payload.logger);
|
||||
}
|
||||
|
||||
export const init = (payload: Payload, options: InitOptions): void => {
|
||||
payload.logger.info('Starting Payload...');
|
||||
if (!options.secret) {
|
||||
throw new Error(
|
||||
@@ -153,7 +145,34 @@ export const initPayload = async (payload: Payload, options: InitOptions): Promi
|
||||
}
|
||||
|
||||
serverInitTelemetry(payload);
|
||||
};
|
||||
|
||||
export const initAsync = async (payload: Payload, options: InitOptions): Promise<void> => {
|
||||
payload.logger = Logger('payload', options.loggerOptions);
|
||||
payload.mongoURL = options.mongoURL;
|
||||
|
||||
if (payload.mongoURL) {
|
||||
mongoose.set('strictQuery', false);
|
||||
payload.mongoMemoryServer = await connectMongoose(payload.mongoURL, options.mongoOptions, payload.logger);
|
||||
}
|
||||
|
||||
init(payload, options);
|
||||
|
||||
if (typeof options.onInit === 'function') await options.onInit(payload);
|
||||
if (typeof payload.config.onInit === 'function') await payload.config.onInit(payload);
|
||||
};
|
||||
|
||||
export const initSync = (payload: Payload, options: InitOptions): void => {
|
||||
payload.logger = Logger('payload', options.loggerOptions);
|
||||
payload.mongoURL = options.mongoURL;
|
||||
|
||||
if (payload.mongoURL) {
|
||||
mongoose.set('strictQuery', false);
|
||||
connectMongoose(payload.mongoURL, options.mongoOptions, payload.logger);
|
||||
}
|
||||
|
||||
init(payload, options);
|
||||
|
||||
if (typeof options.onInit === 'function') options.onInit(payload);
|
||||
if (typeof payload.config.onInit === 'function') payload.config.onInit(payload);
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user