@rvoh/psychic 0.34.0 → 0.34.2

package/dist/cjs/src/cli/index.js

@@ -6,10 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const dream_1 = require("@rvoh/dream");
 const index_js_1 = __importDefault(require("../bin/index.js"));
 const reduxBindings_js_1 = __importDefault(require("../generate/openapi/reduxBindings.js"));
-const index_js_2 = __importDefault(require("../psychic-app/index.js"));
 const syncEnums_js_1 = __importDefault(require("../generate/initializer/syncEnums.js"));
 class PsychicCLI {
-    static async provide(program, { initializePsychicApp, seedDb, }) {
+    static provide(program, { initializePsychicApp, seedDb, }) {
         dream_1.DreamCLI.generateDreamCli(program, {
             initializeDreamApp: initializePsychicApp,
             seedDb,
@@ -109,18 +108,6 @@ class PsychicCLI {
             await index_js_1.default.syncOpenapiJson();
             process.exit();
         });
-        program
-            .command('sync:client:enums')
-            .argument('<outfile>', 'the path from your backend directory to the location which you want the enums copied. Should end with .ts, i.e. "../client/src/api/enums.ts"')
-            .description('syncs your backend enums to a location of your choosing')
-            .action(async (outfile) => {
-            await initializePsychicApp();
-            await index_js_1.default.syncClientEnums(outfile);
-            process.exit();
-        });
-        for (const hook of index_js_2.default.getOrFail().specialHooks.cliStart) {
-            await hook(program);
-        }
     }
 }
 exports.default = PsychicCLI;

package/dist/cjs/src/generate/initializer/syncEnums.js

@@ -30,7 +30,6 @@ exports.default = generateSyncEnumsInitializer;
 const dream_1 = require("@rvoh/dream");
 const fs = __importStar(require("node:fs/promises"));
 const path = __importStar(require("node:path"));
-const PackageManager_js_1 = __importDefault(require("../../cli/helpers/PackageManager.js"));
 const psychicPath_js_1 = __importDefault(require("../../helpers/path/psychicPath.js"));
 async function generateSyncEnumsInitializer(outfile, initializerFilename = 'sync-enums.ts') {
     const initializerFilenameWithoutExtension = initializerFilename.replace(/\.ts$/, '');
@@ -52,20 +51,14 @@ async function generateSyncEnumsInitializer(outfile, initializerFilename = 'sync
     }
     const contents = `\
 import { DreamCLI } from '@rvoh/dream'
-import { PsychicApp } from '@rvoh/psychic'
+import { PsychicApp, PsychicBin } from "@rvoh/psychic"
 import AppEnv from '../AppEnv.js'
 
 export default function ${camelized}(psy: PsychicApp) {
   psy.on('sync', async () => {
     if (AppEnv.isDevelopmentOrTest) {
       DreamCLI.logger.logStartProgress(\`[${camelized}] syncing enums to ${outfile}...\`)
-      await DreamCLI.spawn('${PackageManager_js_1.default.run(`psy sync:client:enums ${outfile}`)}', {
-        onStdout: message => {
-          DreamCLI.logger.logContinueProgress(\`[${camelized}]\` + ' ' + message, {
-            logPrefixColor: 'green',
-          })
-        },
-      })
+      await PsychicBin.syncClientEnums('${outfile}')
       DreamCLI.logger.logEndProgress()
     }
   })

package/dist/cjs/src/psychic-app/index.js

@@ -71,12 +71,12 @@ class PsychicApp {
                     }
                 }
             });
-            for (const plugin of psychicApp.plugins) {
-                await plugin(psychicApp);
-            }
             for (const initializerCb of Object.values(PsychicApp.getInitializersOrBlank())) {
                 await initializerCb(psychicApp);
             }
+            for (const plugin of psychicApp.plugins) {
+                await plugin(psychicApp);
+            }
             (0, cache_js_1.cachePsychicApp)(psychicApp);
         });
         return psychicApp;
@@ -237,7 +237,6 @@ Try setting it to something valid, like:
         serverStart: [],
         serverError: [],
         serverShutdown: [],
-        cliStart: [],
     };
     get specialHooks() {
         return this._specialHooks;
@@ -333,9 +332,6 @@ Try setting it to something valid, like:
             case 'server:init:after-routes':
                 this._specialHooks.serverInitAfterRoutes.push(cb);
                 break;
-            case 'cli:start':
-                this._specialHooks.cliStart.push(cb);
-                break;
             case 'sync':
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 this._specialHooks['sync'].push(cb);

package/dist/esm/src/cli/index.js

@@ -1,10 +1,9 @@
 import { DreamCLI } from '@rvoh/dream';
 import PsychicBin from '../bin/index.js';
 import generateOpenapiReduxBindings from '../generate/openapi/reduxBindings.js';
-import PsychicApp from '../psychic-app/index.js';
 import generateSyncEnumsInitializer from '../generate/initializer/syncEnums.js';
 export default class PsychicCLI {
-    static async provide(program, { initializePsychicApp, seedDb, }) {
+    static provide(program, { initializePsychicApp, seedDb, }) {
         DreamCLI.generateDreamCli(program, {
             initializeDreamApp: initializePsychicApp,
             seedDb,
@@ -104,17 +103,5 @@ export default class PsychicCLI {
             await PsychicBin.syncOpenapiJson();
             process.exit();
         });
-        program
-            .command('sync:client:enums')
-            .argument('<outfile>', 'the path from your backend directory to the location which you want the enums copied. Should end with .ts, i.e. "../client/src/api/enums.ts"')
-            .description('syncs your backend enums to a location of your choosing')
-            .action(async (outfile) => {
-            await initializePsychicApp();
-            await PsychicBin.syncClientEnums(outfile);
-            process.exit();
-        });
-        for (const hook of PsychicApp.getOrFail().specialHooks.cliStart) {
-            await hook(program);
-        }
     }
 }

package/dist/esm/src/generate/initializer/syncEnums.js

@@ -1,7 +1,6 @@
 import { camelize } from '@rvoh/dream';
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
-import PackageManager from '../../cli/helpers/PackageManager.js';
 import psychicPath from '../../helpers/path/psychicPath.js';
 export default async function generateSyncEnumsInitializer(outfile, initializerFilename = 'sync-enums.ts') {
     const initializerFilenameWithoutExtension = initializerFilename.replace(/\.ts$/, '');
@@ -23,20 +22,14 @@ export default async function generateSyncEnumsInitializer(outfile, initializerF
     }
     const contents = `\
 import { DreamCLI } from '@rvoh/dream'
-import { PsychicApp } from '@rvoh/psychic'
+import { PsychicApp, PsychicBin } from "@rvoh/psychic"
 import AppEnv from '../AppEnv.js'
 
 export default function ${camelized}(psy: PsychicApp) {
   psy.on('sync', async () => {
     if (AppEnv.isDevelopmentOrTest) {
       DreamCLI.logger.logStartProgress(\`[${camelized}] syncing enums to ${outfile}...\`)
-      await DreamCLI.spawn('${PackageManager.run(`psy sync:client:enums ${outfile}`)}', {
-        onStdout: message => {
-          DreamCLI.logger.logContinueProgress(\`[${camelized}]\` + ' ' + message, {
-            logPrefixColor: 'green',
-          })
-        },
-      })
+      await PsychicBin.syncClientEnums('${outfile}')
       DreamCLI.logger.logEndProgress()
     }
   })

package/dist/esm/src/psychic-app/index.js

@@ -42,12 +42,12 @@ export default class PsychicApp {
                     }
                 }
             });
-            for (const plugin of psychicApp.plugins) {
-                await plugin(psychicApp);
-            }
             for (const initializerCb of Object.values(PsychicApp.getInitializersOrBlank())) {
                 await initializerCb(psychicApp);
             }
+            for (const plugin of psychicApp.plugins) {
+                await plugin(psychicApp);
+            }
             cachePsychicApp(psychicApp);
         });
         return psychicApp;
@@ -208,7 +208,6 @@ Try setting it to something valid, like:
         serverStart: [],
         serverError: [],
         serverShutdown: [],
-        cliStart: [],
     };
     get specialHooks() {
         return this._specialHooks;
@@ -304,9 +303,6 @@ Try setting it to something valid, like:
             case 'server:init:after-routes':
                 this._specialHooks.serverInitAfterRoutes.push(cb);
                 break;
-            case 'cli:start':
-                this._specialHooks.cliStart.push(cb);
-                break;
             case 'sync':
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 this._specialHooks['sync'].push(cb);

package/dist/types/src/cli/index.d.ts

@@ -4,5 +4,5 @@ export default class PsychicCLI {
     static provide(program: Command, { initializePsychicApp, seedDb, }: {
         initializePsychicApp: (opts?: PsychicAppInitOptions) => Promise<PsychicApp>;
         seedDb: () => Promise<void> | void;
-    }): Promise<void>;
+    }): void;
 }

package/dist/types/src/psychic-app/index.d.ts

@@ -109,7 +109,6 @@ export interface PsychicAppSpecialHooks {
     serverStart: ((server: PsychicServer) => void | Promise<void>)[];
     serverShutdown: ((server: PsychicServer) => void | Promise<void>)[];
     serverError: ((err: Error, req: Request, res: Response) => void | Promise<void>)[];
-    cliStart: ((program: Command) => void | Promise<void>)[];
 }
 export interface PsychicAppOverrides {
     ['server:start']: ((psychicServer: PsychicServer, opts: PsychicServerStartProviderOptions) => http.Server | Promise<http.Server>) | null;

package/dist/types/src/psychic-app/types.d.ts

@@ -1,7 +1,7 @@
 import PsychicApp from './index.js';
 export type UUID = string;
-export type PsychicHookEventType = 'boot' | 'sync' | 'load' | 'load:dev' | 'load:prod' | 'load:test' | 'server:init' | 'server:init:after-routes' | 'server:start' | 'server:error' | 'server:shutdown' | 'cli:start';
-export type PsychicHookLoadEventTypes = Exclude<PsychicHookEventType, 'server:error' | 'server:init' | 'server:init:after-routes' | 'server:start' | 'server:shutdown' | 'sync' | 'cli:start'>;
+export type PsychicHookEventType = 'boot' | 'sync' | 'load' | 'load:dev' | 'load:prod' | 'load:test' | 'server:init' | 'server:init:after-routes' | 'server:start' | 'server:error' | 'server:shutdown';
+export type PsychicHookLoadEventTypes = Exclude<PsychicHookEventType, 'server:error' | 'server:init' | 'server:init:after-routes' | 'server:start' | 'server:shutdown' | 'sync'>;
 export type PsychicAppInitializerCb = (psychicApp: PsychicApp) => void | Promise<void>;
 type Only<T, U> = T & Partial<Record<Exclude<keyof U, keyof T>, never>>;
 export type Either<T, U> = Only<T, U> | Only<U, T>;

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "name": "@rvoh/psychic",
   "description": "Typescript web framework",
-  "version": "0.34.0",
+  "version": "0.34.2",
   "author": "RVOHealth",
   "repository": {
     "type": "git",