@rvoh/psychic 0.26.0 → 0.26.2

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

@@ -28,9 +28,7 @@ class PsychicBin {
             await dream_1.DreamBin.sync(() => { });
         await PsychicBin.syncTypes();
         const psychicApp = index_js_1.default.getOrFail();
-        if (!psychicApp.apiOnly) {
-            await PsychicBin.syncOpenapiJson();
-        }
+        await PsychicBin.syncOpenapiJson();
         if (psychicApp.openapi?.syncEnumsToClient) {
             await this.syncClientEnums();
         }
@@ -50,30 +48,30 @@ class PsychicBin {
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     static async syncTypes(customTypes = undefined) {
-        const spinner = dream_1.DreamCLI.logger.log(`syncing types/psychic.ts...`, { spinner: true });
+        dream_1.DreamCLI.logger.logStartProgress(`syncing types/psychic.ts...`);
         await TypesBuilder_js_1.default.sync(customTypes);
-        spinner.stop();
+        dream_1.DreamCLI.logger.logEndProgress();
     }
     static async syncOpenapiJson() {
-        const spinner = dream_1.DreamCLI.logger.log(`syncing openapi...`, { spinner: true });
+        dream_1.DreamCLI.logger.logStartProgress(`syncing openapi...`);
         await app_js_1.default.sync();
-        spinner.stop();
+        dream_1.DreamCLI.logger.logEndProgress();
     }
     static async syncRoutes() {
-        const spinner = dream_1.DreamCLI.logger.log(`syncing routes...`, { spinner: true });
+        dream_1.DreamCLI.logger.logStartProgress(`syncing routes...`);
         const server = new index_js_2.default();
         await server.boot();
         const routes = await server.routes();
         await (0, generateRouteTypes_js_1.default)(routes);
-        spinner.stop();
+        dream_1.DreamCLI.logger.logEndProgress();
     }
     static async syncClientEnums() {
-        const spinner = dream_1.DreamCLI.logger.log(`syncing client enums...`, { spinner: true });
+        dream_1.DreamCLI.logger.logStartProgress(`syncing client enums...`);
         const psychicApp = index_js_1.default.getOrFail();
         const apiPath = path.join(psychicApp.clientRoot, psychicApp.client.apiPath);
         const enumsStr = await (0, enumsFileStr_js_1.default)();
         await fs.writeFile(`${apiPath}/enums.ts`, enumsStr);
-        spinner.stop();
+        dream_1.DreamCLI.logger.logEndProgress();
     }
 }
 exports.default = PsychicBin;

package/dist/cjs/src/generate/controller.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = generateController;
 const dream_1 = require("@rvoh/dream");
-const fs_1 = require("fs");
 const fs = require("fs/promises");
+const node_fs_1 = require("node:fs");
 const EnvInternal_js_1 = require("../helpers/EnvInternal.js");
 const psychicFileAndDirPaths_js_1 = require("../helpers/path/psychicFileAndDirPaths.js");
 const psychicPath_js_1 = require("../helpers/path/psychicPath.js");
@@ -20,13 +20,13 @@ async function generateController({ fullyQualifiedControllerName, fullyQualified
     const isAdmin = allControllerNameParts[0] === 'Admin';
     const controllerNameParts = isAdmin ? [allControllerNameParts.shift()] : [];
     for (let index = 0; index < allControllerNameParts.length; index++) {
-        if (controllerNameParts.length) {
+        if (controllerNameParts.length > (isAdmin ? 1 : 0)) {
             // Write the ancestor controller
             const [baseAncestorName, baseAncestorImportStatement] = baseAncestorNameAndImport(controllerNameParts, isAdmin, { forBaseController: true });
             const baseControllerName = [...controllerNameParts, 'BaseController'].join('/');
             const { absDirPath, absFilePath } = (0, psychicFileAndDirPaths_js_1.default)((0, psychicPath_js_1.default)('controllers'), baseControllerName + `.ts`);
             await fs.mkdir(absDirPath, { recursive: true });
-            if (!(0, fs_1.existsSync)(absFilePath)) {
+            if (!(0, node_fs_1.existsSync)(absFilePath)) {
                 await fs.writeFile(absFilePath, (0, generateControllerContent_js_1.default)({
                     ancestorImportStatement: baseAncestorImportStatement,
                     ancestorName: baseAncestorName,

package/dist/cjs/src/generate/helpers/generateResourceControllerSpecContent.js

@@ -40,7 +40,7 @@ function generateResourceControllerSpecContent({ fullyQualifiedControllerName, r
 import { UpdateableProperties } from '@rvoh/dream'
 import { PsychicServer } from '@rvoh/psychic'
 import { specRequest as request } from '@rvoh/psychic-spec-helpers'${(0, dream_1.uniq)(importStatements).join('')}
-import { addEndUserAuthHeader } from '${specUnitUpdirs}helpers/authentication.js'
+import addEndUserAuthHeader from '${specUnitUpdirs}helpers/authentication.js'
 
 describe('${fullyQualifiedControllerName}', () => {
   let user: User
@@ -51,15 +51,15 @@ describe('${fullyQualifiedControllerName}', () => {
   })
 
   describe('GET index', () => {
-    function subject(expectedStatus: number = 200) {
+    const subject = async (expectedStatus: number = 200) => {
       return request.get('/${route}', expectedStatus, {
-        headers: addEndUserAuthHeader(request, user, {}),
+        headers: await addEndUserAuthHeader(request, user, {}),
       })
     }
 
     it('returns the index of ${fullyQualifiedModelName}s', async () => {
       const ${modelVariableName} = await create${modelClassName}({
-        user${originalStringKeyValues.length ? ',\n        ' + originalStringKeyValues.join(',\n        ') : ''}
+        user${originalStringKeyValues.length ? ',\n        ' + originalStringKeyValues.join('\n        ') : ''}
       })
       const results = (await subject()).body
 
@@ -81,15 +81,15 @@ describe('${fullyQualifiedControllerName}', () => {
   })
 
   describe('GET show', () => {
-    function subject(${modelVariableName}: ${modelClassName}, expectedStatus: number = 200) {
+    const subject = async (${modelVariableName}: ${modelClassName}, expectedStatus: number = 200) => {
       return request.get(\`/${route}/\${${modelVariableName}.id}\`, expectedStatus, {
-        headers: addEndUserAuthHeader(request, user, {}),
+        headers: await addEndUserAuthHeader(request, user, {}),
       })
     }
 
     it('returns the specified ${fullyQualifiedModelName}', async () => {
       const ${modelVariableName} = await create${modelClassName}({
-        user${originalStringKeyValues.length ? ',\n        ' + originalStringKeyValues.join(',\n        ') : ''}
+        user${originalStringKeyValues.length ? ',\n        ' + originalStringKeyValues.join('\n        ') : ''}
       })
       const results = (await subject(${modelVariableName})).body
 
@@ -109,16 +109,16 @@ describe('${fullyQualifiedControllerName}', () => {
   })
 
   describe('POST create', () => {
-    function subject(data: UpdateableProperties<${modelClassName}>, expectedStatus: number = 201) {
+    const subject = async (data: UpdateableProperties<${modelClassName}>, expectedStatus: number = 201) => {
       return request.post('/${route}', expectedStatus, {
         data,
-        headers: addEndUserAuthHeader(request, user, {}),
+        headers: await addEndUserAuthHeader(request, user, {}),
       })
     }
 
     it('creates a ${fullyQualifiedModelName} for this User', async () => {
       const results = (await subject({
-        ${originalStringKeyValues.length ? originalStringKeyValues.join(',\n        ') : ''}
+        ${originalStringKeyValues.length ? originalStringKeyValues.join('\n        ') : ''}
       })).body
       const ${modelVariableName} = await ${modelClassName}.findOrFailBy({ userId: user.id })
 
@@ -131,19 +131,19 @@ describe('${fullyQualifiedControllerName}', () => {
   })
 
   describe('PATCH update', () => {
-    function subject(${modelVariableName}: ${modelClassName}, data: UpdateableProperties<${modelClassName}>, expectedStatus: number = 204) {
+    const subject = async (${modelVariableName}: ${modelClassName}, data: UpdateableProperties<${modelClassName}>, expectedStatus: number = 204) => {
       return request.patch(\`/${route}/\${${modelVariableName}.id}\`, expectedStatus, {
         data,
-        headers: addEndUserAuthHeader(request, user, {}),
+        headers: await addEndUserAuthHeader(request, user, {}),
       })
     }
 
     it('updates the ${fullyQualifiedModelName}', async () => {
       const ${modelVariableName} = await create${modelClassName}({
-        user${originalStringKeyValues.length ? ',\n        ' + originalStringKeyValues.join(',\n        ') : ''}
+        user${originalStringKeyValues.length ? ',\n        ' + originalStringKeyValues.join('\n        ') : ''}
       })
       await subject(${modelVariableName}, {
-        ${updatedStringKeyValues.length ? updatedStringKeyValues.join(',\n        ') : ''}
+        ${updatedStringKeyValues.length ? updatedStringKeyValues.join('\n        ') : ''}
       })
 
       await ${modelVariableName}.reload()
@@ -153,10 +153,10 @@ describe('${fullyQualifiedControllerName}', () => {
     context('a ${fullyQualifiedModelName} created by another User', () => {
       it('is not updated', async () => {
         const ${modelVariableName} = await create${modelClassName}({
-          ${originalStringKeyValues.length ? originalStringKeyValues.join(',\n          ') : ''}
+          ${originalStringKeyValues.length ? originalStringKeyValues.join('\n          ') : ''}
         })
         await subject(${modelVariableName}, {
-          ${updatedStringKeyValues.length ? updatedStringKeyValues.join(',\n          ') : ''}
+          ${updatedStringKeyValues.length ? updatedStringKeyValues.join('\n          ') : ''}
         }, 404)
 
         await ${modelVariableName}.reload()
@@ -166,9 +166,9 @@ describe('${fullyQualifiedControllerName}', () => {
   })
 
   describe('DELETE destroy', () => {
-    function subject(${modelVariableName}: ${modelClassName}, expectedStatus: number = 204) {
+    const subject = async (${modelVariableName}: ${modelClassName}, expectedStatus: number = 204) => {
       return request.delete(\`/${route}/\${${modelVariableName}.id}\`, expectedStatus, {
-        headers: addEndUserAuthHeader(request, user, {}),
+        headers: await addEndUserAuthHeader(request, user, {}),
       })
     }
 

package/dist/cjs/src/helpers/path.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadFile = loadFile;
 exports.writeFile = writeFile;
-const fs_1 = require("fs");
+const node_fs_1 = require("node:fs");
 async function loadFile(filepath) {
-    return await fs_1.promises.readFile(filepath);
+    return await node_fs_1.promises.readFile(filepath);
 }
 async function writeFile(filepath, contents) {
-    return await fs_1.promises.writeFile(filepath, contents);
+    return await node_fs_1.promises.writeFile(filepath, contents);
 }

package/dist/cjs/src/server/helpers/startPsychicServer.js

@@ -30,10 +30,8 @@ function createPsychicHttpInstance(app, sslCredentials) {
 }
 function welcomeMessage({ port }) {
     if (!EnvInternal_js_1.default.isTest) {
-        // const psychicApp = PsychicApplication.getOrFail()
-        const spinner = dream_1.DreamCLI.logger.log('starting psychic server...', { spinner: true });
-        dream_1.DreamCLI.logger.log(index_js_1.default.asciiLogo(), { permanent: true, logPrefix: '' });
-        spinner.stop();
+        dream_1.DreamCLI.logger.log('starting psychic server...');
+        dream_1.DreamCLI.logger.log(index_js_1.default.asciiLogo(), { logPrefix: '' });
         dream_1.DreamCLI.logger.log(`psychic dev server started at port ${port}`);
     }
 }

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

@@ -26,9 +26,7 @@ export default class PsychicBin {
             await DreamBin.sync(() => { });
         await PsychicBin.syncTypes();
         const psychicApp = PsychicApplication.getOrFail();
-        if (!psychicApp.apiOnly) {
-            await PsychicBin.syncOpenapiJson();
-        }
+        await PsychicBin.syncOpenapiJson();
         if (psychicApp.openapi?.syncEnumsToClient) {
             await this.syncClientEnums();
         }
@@ -48,29 +46,29 @@ export default class PsychicBin {
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     static async syncTypes(customTypes = undefined) {
-        const spinner = DreamCLI.logger.log(`syncing types/psychic.ts...`, { spinner: true });
+        DreamCLI.logger.logStartProgress(`syncing types/psychic.ts...`);
         await TypesBuilder.sync(customTypes);
-        spinner.stop();
+        DreamCLI.logger.logEndProgress();
     }
     static async syncOpenapiJson() {
-        const spinner = DreamCLI.logger.log(`syncing openapi...`, { spinner: true });
+        DreamCLI.logger.logStartProgress(`syncing openapi...`);
         await OpenapiAppRenderer.sync();
-        spinner.stop();
+        DreamCLI.logger.logEndProgress();
     }
     static async syncRoutes() {
-        const spinner = DreamCLI.logger.log(`syncing routes...`, { spinner: true });
+        DreamCLI.logger.logStartProgress(`syncing routes...`);
         const server = new PsychicServer();
         await server.boot();
         const routes = await server.routes();
         await generateRouteTypes(routes);
-        spinner.stop();
+        DreamCLI.logger.logEndProgress();
     }
     static async syncClientEnums() {
-        const spinner = DreamCLI.logger.log(`syncing client enums...`, { spinner: true });
+        DreamCLI.logger.logStartProgress(`syncing client enums...`);
         const psychicApp = PsychicApplication.getOrFail();
         const apiPath = path.join(psychicApp.clientRoot, psychicApp.client.apiPath);
         const enumsStr = await enumsFileStr();
         await fs.writeFile(`${apiPath}/enums.ts`, enumsStr);
-        spinner.stop();
+        DreamCLI.logger.logEndProgress();
     }
 }

package/dist/esm/src/generate/controller.js

@@ -1,6 +1,6 @@
 import { hyphenize, standardizeFullyQualifiedModelName } from '@rvoh/dream';
-import { existsSync } from 'fs';
 import * as fs from 'fs/promises';
+import { existsSync } from 'node:fs';
 import EnvInternal from '../helpers/EnvInternal.js';
 import psychicFileAndDirPaths from '../helpers/path/psychicFileAndDirPaths.js';
 import psychicPath from '../helpers/path/psychicPath.js';
@@ -17,7 +17,7 @@ export default async function generateController({ fullyQualifiedControllerName,
     const isAdmin = allControllerNameParts[0] === 'Admin';
     const controllerNameParts = isAdmin ? [allControllerNameParts.shift()] : [];
     for (let index = 0; index < allControllerNameParts.length; index++) {
-        if (controllerNameParts.length) {
+        if (controllerNameParts.length > (isAdmin ? 1 : 0)) {
             // Write the ancestor controller
             const [baseAncestorName, baseAncestorImportStatement] = baseAncestorNameAndImport(controllerNameParts, isAdmin, { forBaseController: true });
             const baseControllerName = [...controllerNameParts, 'BaseController'].join('/');

package/dist/esm/src/generate/helpers/generateResourceControllerSpecContent.js

@@ -37,7 +37,7 @@ export default function generateResourceControllerSpecContent({ fullyQualifiedCo
 import { UpdateableProperties } from '@rvoh/dream'
 import { PsychicServer } from '@rvoh/psychic'
 import { specRequest as request } from '@rvoh/psychic-spec-helpers'${uniq(importStatements).join('')}
-import { addEndUserAuthHeader } from '${specUnitUpdirs}helpers/authentication.js'
+import addEndUserAuthHeader from '${specUnitUpdirs}helpers/authentication.js'
 
 describe('${fullyQualifiedControllerName}', () => {
   let user: User
@@ -48,15 +48,15 @@ describe('${fullyQualifiedControllerName}', () => {
   })
 
   describe('GET index', () => {
-    function subject(expectedStatus: number = 200) {
+    const subject = async (expectedStatus: number = 200) => {
       return request.get('/${route}', expectedStatus, {
-        headers: addEndUserAuthHeader(request, user, {}),
+        headers: await addEndUserAuthHeader(request, user, {}),
       })
     }
 
     it('returns the index of ${fullyQualifiedModelName}s', async () => {
       const ${modelVariableName} = await create${modelClassName}({
-        user${originalStringKeyValues.length ? ',\n        ' + originalStringKeyValues.join(',\n        ') : ''}
+        user${originalStringKeyValues.length ? ',\n        ' + originalStringKeyValues.join('\n        ') : ''}
       })
       const results = (await subject()).body
 
@@ -78,15 +78,15 @@ describe('${fullyQualifiedControllerName}', () => {
   })
 
   describe('GET show', () => {
-    function subject(${modelVariableName}: ${modelClassName}, expectedStatus: number = 200) {
+    const subject = async (${modelVariableName}: ${modelClassName}, expectedStatus: number = 200) => {
       return request.get(\`/${route}/\${${modelVariableName}.id}\`, expectedStatus, {
-        headers: addEndUserAuthHeader(request, user, {}),
+        headers: await addEndUserAuthHeader(request, user, {}),
       })
     }
 
     it('returns the specified ${fullyQualifiedModelName}', async () => {
       const ${modelVariableName} = await create${modelClassName}({
-        user${originalStringKeyValues.length ? ',\n        ' + originalStringKeyValues.join(',\n        ') : ''}
+        user${originalStringKeyValues.length ? ',\n        ' + originalStringKeyValues.join('\n        ') : ''}
       })
       const results = (await subject(${modelVariableName})).body
 
@@ -106,16 +106,16 @@ describe('${fullyQualifiedControllerName}', () => {
   })
 
   describe('POST create', () => {
-    function subject(data: UpdateableProperties<${modelClassName}>, expectedStatus: number = 201) {
+    const subject = async (data: UpdateableProperties<${modelClassName}>, expectedStatus: number = 201) => {
       return request.post('/${route}', expectedStatus, {
         data,
-        headers: addEndUserAuthHeader(request, user, {}),
+        headers: await addEndUserAuthHeader(request, user, {}),
       })
     }
 
     it('creates a ${fullyQualifiedModelName} for this User', async () => {
       const results = (await subject({
-        ${originalStringKeyValues.length ? originalStringKeyValues.join(',\n        ') : ''}
+        ${originalStringKeyValues.length ? originalStringKeyValues.join('\n        ') : ''}
       })).body
       const ${modelVariableName} = await ${modelClassName}.findOrFailBy({ userId: user.id })
 
@@ -128,19 +128,19 @@ describe('${fullyQualifiedControllerName}', () => {
   })
 
   describe('PATCH update', () => {
-    function subject(${modelVariableName}: ${modelClassName}, data: UpdateableProperties<${modelClassName}>, expectedStatus: number = 204) {
+    const subject = async (${modelVariableName}: ${modelClassName}, data: UpdateableProperties<${modelClassName}>, expectedStatus: number = 204) => {
       return request.patch(\`/${route}/\${${modelVariableName}.id}\`, expectedStatus, {
         data,
-        headers: addEndUserAuthHeader(request, user, {}),
+        headers: await addEndUserAuthHeader(request, user, {}),
       })
     }
 
     it('updates the ${fullyQualifiedModelName}', async () => {
       const ${modelVariableName} = await create${modelClassName}({
-        user${originalStringKeyValues.length ? ',\n        ' + originalStringKeyValues.join(',\n        ') : ''}
+        user${originalStringKeyValues.length ? ',\n        ' + originalStringKeyValues.join('\n        ') : ''}
       })
       await subject(${modelVariableName}, {
-        ${updatedStringKeyValues.length ? updatedStringKeyValues.join(',\n        ') : ''}
+        ${updatedStringKeyValues.length ? updatedStringKeyValues.join('\n        ') : ''}
       })
 
       await ${modelVariableName}.reload()
@@ -150,10 +150,10 @@ describe('${fullyQualifiedControllerName}', () => {
     context('a ${fullyQualifiedModelName} created by another User', () => {
       it('is not updated', async () => {
         const ${modelVariableName} = await create${modelClassName}({
-          ${originalStringKeyValues.length ? originalStringKeyValues.join(',\n          ') : ''}
+          ${originalStringKeyValues.length ? originalStringKeyValues.join('\n          ') : ''}
         })
         await subject(${modelVariableName}, {
-          ${updatedStringKeyValues.length ? updatedStringKeyValues.join(',\n          ') : ''}
+          ${updatedStringKeyValues.length ? updatedStringKeyValues.join('\n          ') : ''}
         }, 404)
 
         await ${modelVariableName}.reload()
@@ -163,9 +163,9 @@ describe('${fullyQualifiedControllerName}', () => {
   })
 
   describe('DELETE destroy', () => {
-    function subject(${modelVariableName}: ${modelClassName}, expectedStatus: number = 204) {
+    const subject = async (${modelVariableName}: ${modelClassName}, expectedStatus: number = 204) => {
       return request.delete(\`/${route}/\${${modelVariableName}.id}\`, expectedStatus, {
-        headers: addEndUserAuthHeader(request, user, {}),
+        headers: await addEndUserAuthHeader(request, user, {}),
       })
     }
 

package/dist/esm/src/helpers/path.js

@@ -1,4 +1,4 @@
-import { promises as fs } from 'fs';
+import { promises as fs } from 'node:fs';
 export async function loadFile(filepath) {
     return await fs.readFile(filepath);
 }

package/dist/esm/src/server/helpers/startPsychicServer.js

@@ -26,10 +26,8 @@ export function createPsychicHttpInstance(app, sslCredentials) {
 }
 function welcomeMessage({ port }) {
     if (!EnvInternal.isTest) {
-        // const psychicApp = PsychicApplication.getOrFail()
-        const spinner = DreamCLI.logger.log('starting psychic server...', { spinner: true });
-        DreamCLI.logger.log(PsychicServer.asciiLogo(), { permanent: true, logPrefix: '' });
-        spinner.stop();
+        DreamCLI.logger.log('starting psychic server...');
+        DreamCLI.logger.log(PsychicServer.asciiLogo(), { logPrefix: '' });
         DreamCLI.logger.log(`psychic dev server started at port ${port}`);
     }
 }

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "name": "@rvoh/psychic",
   "description": "Typescript web framework",
-  "version": "0.26.0",
+  "version": "0.26.2",
   "author": "RVOHealth",
   "repository": "https://github.com/rvohealth/psychic.git",
   "license": "MIT",
@@ -21,7 +21,7 @@
   ],
   "scripts": {
     "client": "yarn --cwd=./client start",
-    "psy": "yarn psyts",
+    "psy": "NODE_ENV=${NODE_ENV:-test} yarn psyts",
     "psyjs": "node ./dist/test-app/src/cli/index.js",
     "psyts": "NODE_ENV=${NODE_ENV:-test} tsx ./test-app/src/cli/index.ts",
     "psycore": "PSYCHIC_CORE_DEVELOPMENT=1 yarn psyts",
@@ -60,7 +60,7 @@
   "devDependencies": {
     "@eslint/js": "^9.19.0",
     "@jest-mock/express": "^3.0.0",
-    "@rvoh/dream": "^0.31.0",
+    "@rvoh/dream": "^0.31.3",
     "@rvoh/dream-spec-helpers": "=0.1.0",
     "@rvoh/psychic-spec-helpers": "=0.2.0",
     "@types/express": "^4.17.21",
@@ -89,5 +89,5 @@
     "vitest": "^3.0.8",
     "winston": "^3.14.2"
   },
-  "packageManager": "yarn@4.4.1"
+  "packageManager": "yarn@4.7.0"
 }