@rvoh/psychic 0.37.2 → 0.37.4

package/dist/cjs/src/bin/helpers/syncTypescriptOpenapiFiles.js

@@ -41,11 +41,17 @@ async function syncTypescriptOpenapiFiles() {
         const outpath = path.join((0, psychicPath_js_1.default)('types'), `${jsonPath.replace(/\.json$/, '')}.d.ts`);
         return dream_1.DreamCLI.spawn(`npx openapi-typescript ${jsonPath} -o ${outpath}`).then(async () => {
             const file = (await fs.readFile(outpath)).toString();
-            const exportName = (0, dream_1.camelize)(jsonPath
+            const exportName = dotToCamelCase((0, dream_1.camelize)(jsonPath
                 .split('/')
                 .at(-1)
-                ?.replace(/\.json/, '')) + 'Paths';
+                ?.replace(/\.json/, ''))) + 'Paths';
             await fs.writeFile(outpath, file.replace(/export interface paths/, `export interface ${exportName}`));
         });
     }));
 }
+function dotToCamelCase(inputString) {
+    return inputString
+        .split('.')
+        .map((word, index) => (index === 0 ? word : (0, dream_1.capitalize)(word)))
+        .join('');
+}

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

@@ -8,6 +8,7 @@ const index_js_1 = __importDefault(require("../bin/index.js"));
 const syncEnums_js_1 = __importDefault(require("../generate/initializer/syncEnums.js"));
 const syncOpenapiTypescript_js_1 = __importDefault(require("../generate/initializer/syncOpenapiTypescript.js"));
 const reduxBindings_js_1 = __importDefault(require("../generate/openapi/reduxBindings.js"));
+const Watcher_js_1 = __importDefault(require("../watcher/Watcher.js"));
 class PsychicCLI {
     static provide(program, { initializePsychicApp, seedDb, }) {
         dream_1.DreamCLI.generateDreamCli(program, {
@@ -98,6 +99,14 @@ class PsychicCLI {
             await index_js_1.default.sync();
             process.exit();
         });
+        program
+            .command('watch')
+            .description('watches your app for changes, and re-syncs any time they happen')
+            .argument('[dir]', 'the folder you want to watch, defaults to ./src')
+            .action(async (dir) => {
+            await initializePsychicApp();
+            Watcher_js_1.default.watch(dir);
+        });
         program
             .command('post-sync')
             .description('an internal command that runs as the second stage of the `sync` command, since after types are rebuit, the application needs to be reloaded before autogenerating certain files, since those files will need to leverage the updated types')

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

@@ -1,9 +1,33 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
+const path = __importStar(require("path"));
 const dream_1 = require("@rvoh/dream");
 const index_js_1 = __importDefault(require("../../psychic-app/index.js"));
 function default_1(dreamPathType) {
@@ -17,6 +41,9 @@ function default_1(dreamPathType) {
             return psychicApp.paths.controllerSpecs;
         case 'services':
             return psychicApp.paths.services;
+        case 'src':
+            // TODO: make this customizable, but maybe not.
+            return path.join((0, dream_1.dreamPath)('db'), '..');
         default:
             return (0, dream_1.dreamPath)(dreamPathType);
     }

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

@@ -0,0 +1,71 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const dream_1 = require("@rvoh/dream");
+const fs = __importStar(require("fs"));
+const psychicPath_js_1 = __importDefault(require("../helpers/path/psychicPath.js"));
+const index_js_1 = __importDefault(require("../psychic-app/index.js"));
+// should we make this customizable?
+const TIMEOUT_INTERVAL = 3_000;
+class Watcher {
+    static syncing = false;
+    static watch(
+    // the path to the src folder in your psychic app
+    srcDir = (0, psychicPath_js_1.default)('src')) {
+        let timer;
+        fs.watch(srcDir, { recursive: true }, (_, filename) => {
+            // do not want to sync if we are already syncing.
+            if (this.syncing)
+                return;
+            if (filename && /\.ts$/.test(filename)) {
+                // create a manual debounce pattern by clearing
+                // the timeout and restarting it
+                clearTimeout(timer);
+                const seconds = TIMEOUT_INTERVAL / 1000;
+                dream_1.DreamCLI.logger.log(`${filename} changed, douncing sync for ${seconds} seconds...`);
+                // eslint-disable-next-line @typescript-eslint/no-misused-promises
+                timer = setTimeout(async () => {
+                    dream_1.DreamCLI.logger.log(`executing sync...`);
+                    const psy = index_js_1.default.getOrFail();
+                    this.syncing = true;
+                    await dream_1.DreamCLI.spawn(psy.psyCmd('sync'));
+                    // 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,
+                    // which could cause an infinite loop of reloading
+                    setTimeout(() => {
+                        this.syncing = false;
+                        dream_1.DreamCLI.logger.log(`resuming watch...`);
+                    }, 1000);
+                }, TIMEOUT_INTERVAL);
+            }
+        });
+        dream_1.DreamCLI.logger.log(`watching ${srcDir}...`);
+    }
+}
+exports.default = Watcher;

package/dist/esm/src/bin/helpers/syncTypescriptOpenapiFiles.js

@@ -1,4 +1,4 @@
-import { camelize, DreamCLI } from '@rvoh/dream';
+import { camelize, capitalize, DreamCLI } from '@rvoh/dream';
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
 import PsychicApp from '../../psychic-app/index.js';
@@ -12,11 +12,17 @@ export default async function syncTypescriptOpenapiFiles() {
         const outpath = path.join(psychicPath('types'), `${jsonPath.replace(/\.json$/, '')}.d.ts`);
         return DreamCLI.spawn(`npx openapi-typescript ${jsonPath} -o ${outpath}`).then(async () => {
             const file = (await fs.readFile(outpath)).toString();
-            const exportName = camelize(jsonPath
+            const exportName = dotToCamelCase(camelize(jsonPath
                 .split('/')
                 .at(-1)
-                ?.replace(/\.json/, '')) + 'Paths';
+                ?.replace(/\.json/, ''))) + 'Paths';
             await fs.writeFile(outpath, file.replace(/export interface paths/, `export interface ${exportName}`));
         });
     }));
 }
+function dotToCamelCase(inputString) {
+    return inputString
+        .split('.')
+        .map((word, index) => (index === 0 ? word : capitalize(word)))
+        .join('');
+}

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

@@ -3,6 +3,7 @@ import PsychicBin from '../bin/index.js';
 import generateSyncEnumsInitializer from '../generate/initializer/syncEnums.js';
 import generateSyncOpenapiTypescriptInitializer from '../generate/initializer/syncOpenapiTypescript.js';
 import generateOpenapiReduxBindings from '../generate/openapi/reduxBindings.js';
+import Watcher from '../watcher/Watcher.js';
 export default class PsychicCLI {
     static provide(program, { initializePsychicApp, seedDb, }) {
         DreamCLI.generateDreamCli(program, {
@@ -93,6 +94,14 @@ export default class PsychicCLI {
             await PsychicBin.sync();
             process.exit();
         });
+        program
+            .command('watch')
+            .description('watches your app for changes, and re-syncs any time they happen')
+            .argument('[dir]', 'the folder you want to watch, defaults to ./src')
+            .action(async (dir) => {
+            await initializePsychicApp();
+            Watcher.watch(dir);
+        });
         program
             .command('post-sync')
             .description('an internal command that runs as the second stage of the `sync` command, since after types are rebuit, the application needs to be reloaded before autogenerating certain files, since those files will need to leverage the updated types')

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

@@ -1,3 +1,4 @@
+import * as path from 'path';
 import { dreamPath } from '@rvoh/dream';
 import PsychicApp from '../../psychic-app/index.js';
 export default function (dreamPathType) {
@@ -11,6 +12,9 @@ export default function (dreamPathType) {
             return psychicApp.paths.controllerSpecs;
         case 'services':
             return psychicApp.paths.services;
+        case 'src':
+            // TODO: make this customizable, but maybe not.
+            return path.join(dreamPath('db'), '..');
         default:
             return dreamPath(dreamPathType);
     }

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

@@ -0,0 +1,42 @@
+import { DreamCLI } from '@rvoh/dream';
+import * as fs from 'fs';
+import psychicPath from '../helpers/path/psychicPath.js';
+import PsychicApp from '../psychic-app/index.js';
+// should we make this customizable?
+const TIMEOUT_INTERVAL = 3_000;
+export default class Watcher {
+    static syncing = false;
+    static watch(
+    // the path to the src folder in your psychic app
+    srcDir = psychicPath('src')) {
+        let timer;
+        fs.watch(srcDir, { recursive: true }, (_, filename) => {
+            // do not want to sync if we are already syncing.
+            if (this.syncing)
+                return;
+            if (filename && /\.ts$/.test(filename)) {
+                // create a manual debounce pattern by clearing
+                // the timeout and restarting it
+                clearTimeout(timer);
+                const seconds = TIMEOUT_INTERVAL / 1000;
+                DreamCLI.logger.log(`${filename} changed, douncing sync for ${seconds} seconds...`);
+                // eslint-disable-next-line @typescript-eslint/no-misused-promises
+                timer = setTimeout(async () => {
+                    DreamCLI.logger.log(`executing sync...`);
+                    const psy = PsychicApp.getOrFail();
+                    this.syncing = true;
+                    await DreamCLI.spawn(psy.psyCmd('sync'));
+                    // 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,
+                    // which could cause an infinite loop of reloading
+                    setTimeout(() => {
+                        this.syncing = false;
+                        DreamCLI.logger.log(`resuming watch...`);
+                    }, 1000);
+                }, TIMEOUT_INTERVAL);
+            }
+        });
+        DreamCLI.logger.log(`watching ${srcDir}...`);
+    }
+}

package/dist/types/src/helpers/path/psychicPath.d.ts

@@ -1,4 +1,4 @@
-export default function (dreamPathType: PsychicPaths): string;
+export default function (dreamPathType: PsychicPaths | 'src'): string;
 type DreamPaths = 'models' | 'modelSpecs' | 'serializers' | 'db' | 'conf' | 'factories' | 'types';
 export type PsychicPaths = DreamPaths | 'apiRoutes' | 'controllers' | 'controllerSpecs' | 'services';
 export {};

package/dist/types/src/watcher/Watcher.d.ts

@@ -0,0 +1,4 @@
+export default class Watcher {
+    private static syncing;
+    static watch(srcDir?: string): void;
+}

package/package.json

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