@rvoh/psychic 0.37.4 → 0.37.6

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

@@ -20,6 +20,7 @@ function generateResourceControllerSpecContent({ fullyQualifiedControllerName, r
     const importStatements = [
         importStatementForModel(fullyQualifiedControllerName, fullyQualifiedModelName),
         importStatementForModel(fullyQualifiedControllerName, 'User'),
+        importStatementForType('openapi/validation.openapi', 'validationOpenapiPaths'),
         importStatementForModelFactory(fullyQualifiedControllerName, fullyQualifiedModelName),
         importStatementForModelFactory(fullyQualifiedControllerName, 'User'),
     ];
@@ -49,12 +50,13 @@ function generateResourceControllerSpecContent({ fullyQualifiedControllerName, r
         }
     }
     return `\
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 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 { OpenapiSpecRequest } from '@rvoh/psychic-spec-helpers'${(0, dream_1.uniq)(importStatements).join('')}
 import addEndUserAuthHeader from '${specUnitUpdirs}helpers/authentication.js'
 
+const request = new OpenapiSpecRequest<validationOpenapiPaths>()
+
 describe('${fullyQualifiedControllerName}', () => {
   let ${userVariableName}: ${owningModelClassName}${attachedModelVariableName ? `\n  let ${attachedModelVariableName}: ${attachedModelClassName}` : ''}
 
@@ -64,7 +66,7 @@ describe('${fullyQualifiedControllerName}', () => {
   })
 
   describe('GET index', () => {
-    const subject = async (expectedStatus: number = 200) => {
+    const subject = async <StatusCode extends 200 | 400>(expectedStatus: StatusCode) => {
       return request.get('/${route}', expectedStatus, {
         headers: await addEndUserAuthHeader(request, ${userVariableName}, {}),
       })
@@ -74,9 +76,9 @@ describe('${fullyQualifiedControllerName}', () => {
       const ${modelVariableName} = await create${modelClassName}({
         ${attachedModelVariableName || userVariableName}${originalStringKeyValues.length ? ',\n        ' + originalStringKeyValues.join('\n        ') : ''}
       })
-      const results = (await subject()).body
+      const { body } = await subject(200)
 
-      expect(results).toEqual([
+      expect(body).toEqual([
         expect.objectContaining({
           id: ${modelVariableName}.id,
         }),
@@ -86,16 +88,17 @@ describe('${fullyQualifiedControllerName}', () => {
     context('${modelClassName}s created by another ${owningModelClassName}', () => {
       it('are omitted', async () => {
         await create${modelClassName}()
-        const results = (await subject()).body
+        const { body } = await subject(200)
 
-        expect(results).toEqual([])
+        expect(body).toEqual([])
       })
     })
   })
 
   describe('GET show', () => {
-    const subject = async (${modelVariableName}: ${modelClassName}, expectedStatus: number = 200) => {
-      return request.get(\`/${route}/\${${modelVariableName}.id}\`, expectedStatus, {
+    const subject = async <StatusCode extends 200 | 400 | 404>(${modelVariableName}: ${modelClassName}, expectedStatus: StatusCode) => {
+      return request.get('/${route}/{id}', expectedStatus, {
+        id: ${modelVariableName}.id,
         headers: await addEndUserAuthHeader(request, ${userVariableName}, {}),
       })
     }
@@ -104,9 +107,9 @@ describe('${fullyQualifiedControllerName}', () => {
       const ${modelVariableName} = await create${modelClassName}({
         ${attachedModelVariableName || userVariableName}${originalStringKeyValues.length ? ',\n        ' + originalStringKeyValues.join('\n        ') : ''}
       })
-      const results = (await subject(${modelVariableName})).body
+      const { body } = await subject(${modelVariableName}, 200)
 
-      expect(results).toEqual(
+      expect(body).toEqual(
         expect.objectContaining({
           id: ${modelVariableName}.id,${originalStringKeyValues.length ? '\n          ' + originalStringKeyValues.join('\n          ') : ''}
         }),
@@ -122,7 +125,10 @@ describe('${fullyQualifiedControllerName}', () => {
   })
 
   describe('POST create', () => {
-    const subject = async (data: UpdateableProperties<${modelClassName}>, expectedStatus: number = 201) => {
+    const subject = async <StatusCode extends 201 | 400>(
+      data: UpdateableProperties<${modelClassName}>,
+      expectedStatus: StatusCode
+    ) => {
       return request.post('/${route}', expectedStatus, {
         data,
         headers: await addEndUserAuthHeader(request, ${userVariableName}, {}),
@@ -130,12 +136,12 @@ describe('${fullyQualifiedControllerName}', () => {
     }
 
     it('creates a ${fullyQualifiedModelName} for this ${owningModelClassName}', async () => {
-      const results = (await subject({
+      const { body } = await subject({
         ${originalStringKeyValues.length ? originalStringKeyValues.join('\n        ') : ''}
-      })).body
+      }, 201)
       const ${modelVariableName} = await ${modelClassName}.findOrFailBy({ ${userVariableName}Id: ${userVariableName}.id })
 
-      expect(results).toEqual(
+      expect(body).toEqual(
         expect.objectContaining({
           id: ${modelVariableName}.id,${originalStringKeyValues.length ? '\n          ' + originalStringKeyValues.join('\n          ') : ''}
         }),
@@ -144,8 +150,13 @@ describe('${fullyQualifiedControllerName}', () => {
   })
 
   describe('PATCH update', () => {
-    const subject = async (${modelVariableName}: ${modelClassName}, data: UpdateableProperties<${modelClassName}>, expectedStatus: number = 204) => {
-      return request.patch(\`/${route}/\${${modelVariableName}.id}\`, expectedStatus, {
+    const subject = async <StatusCode extends 204 | 400 | 404>(
+      ${modelVariableName}: ${modelClassName},
+      data: UpdateableProperties<${modelClassName}>,
+      expectedStatus: StatusCode
+    ) => {
+      return request.patch('/${route}/{id}', expectedStatus, {
+        id: ${modelVariableName}.id,
         data,
         headers: await addEndUserAuthHeader(request, ${userVariableName}, {}),
       })
@@ -157,7 +168,7 @@ describe('${fullyQualifiedControllerName}', () => {
       })
       await subject(${modelVariableName}, {
         ${updatedStringKeyValues.length ? updatedStringKeyValues.join('\n        ') : ''}
-      })
+      }, 204)
 
       await ${modelVariableName}.reload()
       ${updatedStringAttributeChecks.join('\n      ')}
@@ -177,15 +188,16 @@ describe('${fullyQualifiedControllerName}', () => {
   })
 
   describe('DELETE destroy', () => {
-    const subject = async (${modelVariableName}: ${modelClassName}, expectedStatus: number = 204) => {
-      return request.delete(\`/${route}/\${${modelVariableName}.id}\`, expectedStatus, {
+    const subject = async <StatusCode extends 204 | 400 | 404>(${modelVariableName}: ${modelClassName}, expectedStatus: StatusCode) => {
+      return request.delete('/${route}/{id}', expectedStatus, {
+        id: ${modelVariableName}.id,
         headers: await addEndUserAuthHeader(request, ${userVariableName}, {}),
       })
     }
 
     it('deletes the ${fullyQualifiedModelName}', async () => {
       const ${modelVariableName} = await create${modelClassName}({ ${attachedModelVariableName || userVariableName} })
-      await subject(${modelVariableName})
+      await subject(${modelVariableName}, 204)
 
       expect(await ${modelClassName}.find(${modelVariableName}.id)).toBeNull()
     })
@@ -205,6 +217,10 @@ describe('${fullyQualifiedControllerName}', () => {
 function importStatementForModel(originModelName, destinationModelName = originModelName) {
     return `\nimport ${(0, dream_1.globalClassNameFromFullyQualifiedModelName)(destinationModelName)} from '${(0, relativePsychicPath_js_1.default)('controllerSpecs', 'models', originModelName, destinationModelName)}'`;
 }
+function importStatementForType(typeFilePath, typeExportName) {
+    const importPath = (0, relativePsychicPath_js_1.default)('controllerSpecs', 'types', typeFilePath).toLowerCase();
+    return `\nimport { ${typeExportName} } from '${importPath}'`;
+}
 function importStatementForModelFactory(originModelName, destinationModelName = originModelName) {
     return `\nimport create${(0, dream_1.globalClassNameFromFullyQualifiedModelName)(destinationModelName)} from '${(0, relativePsychicPath_js_1.default)('controllerSpecs', 'factories', originModelName, destinationModelName)}'`;
 }

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

@@ -55,7 +55,7 @@ import { PsychicApp, PsychicBin } from "@rvoh/psychic"
 import AppEnv from '../AppEnv.js'
 
 export default function ${camelized}(psy: PsychicApp) {
-  psy.on('sync', async () => {
+  psy.on('cli:sync', async () => {
     if (AppEnv.isDevelopmentOrTest) {
       DreamCLI.logger.logStartProgress(\`[${camelized}] syncing enums to ${outfile}...\`)
       await PsychicBin.syncClientEnums('${outfile}')

package/dist/cjs/src/openapi-renderer/endpoint.js

@@ -11,12 +11,13 @@ const NonSerializerDerivedInToSchemaObjects_js_1 = __importDefault(require("../e
 const SerializerForEndpointNotAFunction_js_1 = __importDefault(require("../error/openapi/SerializerForEndpointNotAFunction.js"));
 const body_segment_js_1 = __importDefault(require("./body-segment.js"));
 const defaults_js_1 = require("./defaults.js");
+const dreamColumnToOpenapiType_js_1 = __importDefault(require("./helpers/dreamColumnToOpenapiType.js"));
 const openapiOpts_js_1 = __importDefault(require("./helpers/openapiOpts.js"));
 const openapiRoute_js_1 = __importDefault(require("./helpers/openapiRoute.js"));
 const pageParamOpenapiProperty_js_1 = __importDefault(require("./helpers/pageParamOpenapiProperty.js"));
-const primitiveOpenapiStatementToOpenapi_js_1 = __importDefault(require("./helpers/primitiveOpenapiStatementToOpenapi.js"));
 const safelyAttachPaginationParamsToBodySegment_js_1 = __importDefault(require("./helpers/safelyAttachPaginationParamsToBodySegment.js"));
 const SerializerOpenapiRenderer_js_1 = __importDefault(require("./SerializerOpenapiRenderer.js"));
+const paramNamesForDreamClass_js_1 = __importDefault(require("../server/helpers/paramNamesForDreamClass.js"));
 class OpenapiEndpointRenderer {
     dreamsOrSerializers;
     controllerClass;
@@ -411,19 +412,14 @@ class OpenapiEndpointRenderer {
      * the request body.
      */
     generateRequestBodyForModel({ renderOpts, }) {
-        const forDreamClass = this.requestBody?.for;
+        const forDreamClass = this.requestBody
+            ?.for;
         const dreamClass = forDreamClass || this.getSingleDreamModelClass();
         if (!dreamClass)
             return this.defaultRequestBody();
-        let paramSafeColumns = dreamClass.paramSafeColumnsOrFallback();
-        const only = this.requestBody?.only;
-        if (only) {
-            paramSafeColumns = paramSafeColumns.filter(column => only.includes(column));
-        }
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-        const schema = dreamClass.prototype.schema;
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-        const columns = schema[dreamClass.prototype.table]?.columns;
+        const { only, including } = (this.requestBody || {});
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const paramSafeColumns = (0, paramNamesForDreamClass_js_1.default)(dreamClass, { only, including });
         const paramsShape = {
             type: 'object',
             properties: {},
@@ -433,138 +429,10 @@ class OpenapiEndpointRenderer {
             paramsShape.required = required;
         }
         for (const columnName of paramSafeColumns) {
-            const columnMetadata = columns[columnName];
-            const nullableColumn = columnMetadata?.allowNull;
-            switch (columnMetadata?.dbType) {
-                case 'boolean':
-                case 'boolean[]':
-                case 'date':
-                case 'date[]':
-                case 'integer':
-                case 'integer[]':
-                    paramsShape.properties = {
-                        ...paramsShape.properties,
-                        [columnName]: (0, primitiveOpenapiStatementToOpenapi_js_1.default)(columnMetadata.dbType, nullableColumn),
-                    };
-                    break;
-                case 'character varying':
-                case 'citext':
-                case 'text':
-                case 'uuid':
-                case 'bigint':
-                    paramsShape.properties = {
-                        ...paramsShape.properties,
-                        [columnName]: (0, primitiveOpenapiStatementToOpenapi_js_1.default)('string', nullableColumn),
-                    };
-                    break;
-                case 'character varying[]':
-                case 'citext[]':
-                case 'text[]':
-                case 'uuid[]':
-                case 'bigint[]':
-                    paramsShape.properties = {
-                        ...paramsShape.properties,
-                        [columnName]: (0, primitiveOpenapiStatementToOpenapi_js_1.default)('string[]', nullableColumn),
-                    };
-                    break;
-                case 'timestamp':
-                case 'timestamp with time zone':
-                case 'timestamp without time zone':
-                    paramsShape.properties = {
-                        ...paramsShape.properties,
-                        [columnName]: (0, primitiveOpenapiStatementToOpenapi_js_1.default)('date-time', nullableColumn),
-                    };
-                    break;
-                case 'timestamp[]':
-                case 'timestamp with time zone[]':
-                case 'timestamp without time zone[]':
-                    paramsShape.properties = {
-                        ...paramsShape.properties,
-                        [columnName]: (0, primitiveOpenapiStatementToOpenapi_js_1.default)('date-time[]', nullableColumn),
-                    };
-                    break;
-                case 'json':
-                case 'jsonb':
-                    paramsShape.properties = {
-                        ...paramsShape.properties,
-                        [columnName]: {
-                            type: nullableColumn ? ['object', 'null'] : 'object',
-                        },
-                    };
-                    break;
-                case 'json[]':
-                case 'jsonb[]':
-                    paramsShape.properties = {
-                        ...paramsShape.properties,
-                        [columnName]: {
-                            type: nullableColumn ? ['array', 'null'] : 'array',
-                            items: {
-                                type: 'object',
-                            },
-                        },
-                    };
-                    break;
-                case 'numeric':
-                    paramsShape.properties = {
-                        ...paramsShape.properties,
-                        [columnName]: (0, primitiveOpenapiStatementToOpenapi_js_1.default)('number', nullableColumn),
-                    };
-                    break;
-                case 'numeric[]':
-                    paramsShape.properties = {
-                        ...paramsShape.properties,
-                        [columnName]: (0, primitiveOpenapiStatementToOpenapi_js_1.default)('number[]', nullableColumn),
-                    };
-                    break;
-                default:
-                    if (dreamClass.isVirtualColumn(columnName)) {
-                        const metadata = dreamClass['virtualAttributes'].find(statement => statement.property === columnName);
-                        if (metadata?.type) {
-                            paramsShape.properties = {
-                                ...paramsShape.properties,
-                                [columnName]: new body_segment_js_1.default(metadata.type, {
-                                    renderOpts,
-                                    target: 'request',
-                                }).render().openapi,
-                            };
-                        }
-                        else {
-                            paramsShape.properties = {
-                                ...paramsShape.properties,
-                                [columnName]: {
-                                    anyOf: [
-                                        { type: ['string', 'null'] },
-                                        { type: ['number', 'null'] },
-                                        { type: ['object', 'null'] },
-                                    ],
-                                },
-                            };
-                        }
-                    }
-                    else if (columnMetadata?.enumValues) {
-                        if (columnMetadata.isArray) {
-                            paramsShape.properties = {
-                                ...paramsShape.properties,
-                                [columnName]: {
-                                    type: nullableColumn ? ['array', 'null'] : 'array',
-                                    items: {
-                                        type: 'string',
-                                        enum: [...columnMetadata.enumValues, ...(nullableColumn ? [null] : [])],
-                                    },
-                                },
-                            };
-                        }
-                        else {
-                            paramsShape.properties = {
-                                ...paramsShape.properties,
-                                [columnName]: {
-                                    type: nullableColumn ? ['string', 'null'] : 'string',
-                                    enum: [...columnMetadata.enumValues, ...(nullableColumn ? [null] : [])],
-                                },
-                            };
-                        }
-                    }
-            }
+            paramsShape.properties = {
+                ...paramsShape.properties,
+                ...(0, dreamColumnToOpenapiType_js_1.default)(dreamClass, columnName),
+            };
         }
         let processedSchema = new body_segment_js_1.default(paramsShape, {
             renderOpts,

package/dist/cjs/src/openapi-renderer/helpers/dreamColumnToOpenapiType.js

@@ -0,0 +1,128 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = dreamColumnToOpenapiType;
+const primitiveOpenapiStatementToOpenapi_js_1 = __importDefault(require("./primitiveOpenapiStatementToOpenapi.js"));
+const body_segment_js_1 = __importDefault(require("../body-segment.js"));
+function dreamColumnToOpenapiType(dreamClass, columnName) {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const schema = dreamClass.prototype.schema;
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+    const columns = schema[dreamClass.prototype.table]?.columns;
+    const columnMetadata = columns[columnName];
+    const nullableColumn = columnMetadata?.allowNull;
+    switch (columnMetadata?.dbType) {
+        case 'boolean':
+        case 'boolean[]':
+        case 'date':
+        case 'date[]':
+        case 'integer':
+        case 'integer[]':
+            return {
+                [columnName]: (0, primitiveOpenapiStatementToOpenapi_js_1.default)(columnMetadata.dbType, nullableColumn),
+            };
+        case 'character varying':
+        case 'citext':
+        case 'text':
+        case 'uuid':
+        case 'bigint':
+            return {
+                [columnName]: (0, primitiveOpenapiStatementToOpenapi_js_1.default)('string', nullableColumn),
+            };
+        case 'character varying[]':
+        case 'citext[]':
+        case 'text[]':
+        case 'uuid[]':
+        case 'bigint[]':
+            return {
+                [columnName]: (0, primitiveOpenapiStatementToOpenapi_js_1.default)('string[]', nullableColumn),
+            };
+        case 'timestamp':
+        case 'timestamp with time zone':
+        case 'timestamp without time zone':
+            return {
+                [columnName]: (0, primitiveOpenapiStatementToOpenapi_js_1.default)('date-time', nullableColumn),
+            };
+        case 'timestamp[]':
+        case 'timestamp with time zone[]':
+        case 'timestamp without time zone[]':
+            return {
+                [columnName]: (0, primitiveOpenapiStatementToOpenapi_js_1.default)('date-time[]', nullableColumn),
+            };
+        case 'json':
+        case 'jsonb':
+            return {
+                [columnName]: {
+                    type: nullableColumn ? ['object', 'null'] : 'object',
+                },
+            };
+        case 'json[]':
+        case 'jsonb[]':
+            return {
+                [columnName]: {
+                    type: nullableColumn ? ['array', 'null'] : 'array',
+                    items: {
+                        type: 'object',
+                    },
+                },
+            };
+        case 'numeric':
+            return {
+                [columnName]: (0, primitiveOpenapiStatementToOpenapi_js_1.default)('number', nullableColumn),
+            };
+        case 'numeric[]':
+            return {
+                [columnName]: (0, primitiveOpenapiStatementToOpenapi_js_1.default)('number[]', nullableColumn),
+            };
+        default:
+            if (dreamClass.isVirtualColumn(columnName)) {
+                const metadata = dreamClass['virtualAttributes'].find(statement => statement.property === columnName);
+                if (metadata?.type) {
+                    return {
+                        [columnName]: new body_segment_js_1.default(metadata.type, {
+                            renderOpts: {
+                                casing: 'camel',
+                                suppressResponseEnums: false,
+                            },
+                            target: 'request',
+                        }).render().openapi,
+                    };
+                }
+                else {
+                    return {
+                        [columnName]: {
+                            anyOf: [
+                                { type: ['string', 'null'] },
+                                { type: ['number', 'null'] },
+                                { type: ['object', 'null'] },
+                            ],
+                        },
+                    };
+                }
+            }
+            else if (columnMetadata?.enumValues) {
+                if (columnMetadata.isArray) {
+                    return {
+                        [columnName]: {
+                            type: nullableColumn ? ['array', 'null'] : 'array',
+                            items: {
+                                type: 'string',
+                                enum: [...columnMetadata.enumValues, ...(nullableColumn ? [null] : [])],
+                            },
+                        },
+                    };
+                }
+                else {
+                    return {
+                        [columnName]: {
+                            type: nullableColumn ? ['string', 'null'] : 'string',
+                            enum: [...columnMetadata.enumValues, ...(nullableColumn ? [null] : [])],
+                        },
+                    };
+                }
+            }
+            return {};
+    }
+}

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

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = paramNamesForDreamClass;
+function paramNamesForDreamClass(dreamClass, { only, including } = {}) {
+    let paramSafeColumns = Array.isArray(only)
+        ? dreamClass.paramSafeColumnsOrFallback().filter(column => only.includes(column))
+        : dreamClass.paramSafeColumnsOrFallback();
+    if (Array.isArray(including)) {
+        paramSafeColumns = [
+            ...paramSafeColumns,
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-explicit-any
+            ...[...dreamClass.columns()].filter(columnName => including.includes(columnName)),
+        ];
+    }
+    return paramSafeColumns;
+}

package/dist/cjs/src/server/params.js

@@ -10,6 +10,7 @@ const alternateParamName_js_1 = __importDefault(require("../helpers/alternatePar
 const isArrayParamName_js_1 = __importDefault(require("../helpers/isArrayParamName.js"));
 const isObject_js_1 = __importDefault(require("../helpers/isObject.js"));
 const isUuid_js_1 = __importDefault(require("../helpers/isUuid.js"));
+const paramNamesForDreamClass_js_1 = __importDefault(require("./helpers/paramNamesForDreamClass.js"));
 class Params {
     $params;
     /**
@@ -27,13 +28,15 @@ class Params {
      * ```
      */
     static for(params, dreamClass, forOpts = {}) {
-        const { array = false, only } = forOpts;
+        const { array = false } = forOpts;
         if (!dreamClass?.isDream)
             throw new Error(`Params.for must receive a dream class as it's second argument`);
         if (array) {
             if (!Array.isArray(params))
                 throw new Error(`Params.for was expecting a top-level array. got ${typeof params}`);
-            return params.map(param => this.for(param, dreamClass, { ...forOpts, array: undefined }));
+            return params.map(param => 
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            this.for(param, dreamClass, { ...forOpts, array: undefined }));
         }
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         const schema = dreamClass.prototype.schema;
@@ -41,9 +44,7 @@ class Params {
         const columns = schema[dreamClass.prototype.table]?.columns;
         const returnObj = {};
         const errors = {};
-        const paramSafeColumns = only
-            ? dreamClass.paramSafeColumnsOrFallback().filter(column => only.includes(column))
-            : dreamClass.paramSafeColumnsOrFallback();
+        const paramSafeColumns = (0, paramNamesForDreamClass_js_1.default)(dreamClass, forOpts);
         for (const columnName of paramSafeColumns) {
             if (params[columnName] === undefined)
                 continue;

package/dist/cjs/src/watcher/Watcher.js

@@ -47,13 +47,20 @@ class Watcher {
                 // the timeout and restarting it
                 clearTimeout(timer);
                 const seconds = TIMEOUT_INTERVAL / 1000;
-                dream_1.DreamCLI.logger.log(`${filename} changed, douncing sync for ${seconds} seconds...`);
+                dream_1.DreamCLI.logger.log(`${filename} changed`);
+                dream_1.DreamCLI.logger.log(`next sync in ${seconds} seconds...`, { logPrefixColor: 'cyan' });
                 // eslint-disable-next-line @typescript-eslint/no-misused-promises
                 timer = setTimeout(async () => {
-                    dream_1.DreamCLI.logger.log(`executing sync...`);
+                    dream_1.DreamCLI.logger.log(`executing sync...`, { logPrefixColor: 'cyan' });
                     const psy = index_js_1.default.getOrFail();
                     this.syncing = true;
-                    await dream_1.DreamCLI.spawn(psy.psyCmd('sync'));
+                    try {
+                        await dream_1.DreamCLI.spawn(psy.psyCmd('sync'));
+                    }
+                    catch (err) {
+                        dream_1.DreamCLI.logger.log(`ERROR!`, { logPrefixColor: 'red' });
+                        console.error(err);
+                    }
                     // pause for an additional second, so that any file changes
                     // still being regestered from the end of the sync
                     // command don't accidentally trick it into running again,