@rvoh/dream 0.32.4 → 0.34.0

package/dist/cjs/src/Dream.js

@@ -411,7 +411,7 @@ class Dream {
      * @internal
      *
      * Used by DreamApplication during the load process
-     * for models, services, and controllers to assign
+     * for models and serializers to assign
      * unique global names to each model based on the file
      * name of that model.
      */

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

@@ -7,12 +7,12 @@ const index_js_1 = require("../../cli/index.js");
 const colorize_js_1 = require("../../cli/logger/loggable/colorize.js");
 const ConnectionConfRetriever_js_1 = require("../../db/ConnectionConfRetriever.js");
 const index_js_2 = require("../../dream-application/index.js");
-const autogeneratedFileMessage_js_1 = require("../../global-cli/helpers/autogeneratedFileMessage.js");
 const compact_js_1 = require("../../helpers/compact.js");
 const EnvInternal_js_1 = require("../../helpers/EnvInternal.js");
 const dreamPath_js_1 = require("../../helpers/path/dreamPath.js");
 const snakeify_js_1 = require("../../helpers/snakeify.js");
 const sspawn_js_1 = require("../../helpers/sspawn.js");
+const autoGeneratedFileDisclaimer_js_1 = require("../../helpers/cli/autoGeneratedFileDisclaimer.js");
 async function writeSyncFile() {
     const dbConf = new ConnectionConfRetriever_js_1.default().getConnectionConf('primary');
     const dreamApp = index_js_2.default.getOrFail();
@@ -66,7 +66,7 @@ function addCustomImports(file) {
     const customImports = EnvInternal_js_1.default.boolean('DREAM_CORE_DEVELOPMENT')
         ? "import type CalendarDate from '../../src/helpers/CalendarDate.js'\nimport { type DateTime } from '../../src/helpers/DateTime.js'"
         : "import { type CalendarDate, type DateTime } from '@rvoh/dream'";
-    return `${(0, autogeneratedFileMessage_js_1.default)()}${customImports}
+    return `${(0, autoGeneratedFileDisclaimer_js_1.default)()}${customImports}
 ${file}`;
 }
 function replaceInt8Type(str) {

package/dist/cjs/src/dream-application/helpers/DreamImporter.js

@@ -37,10 +37,5 @@ class DreamImporter {
         ]))));
         return serializerClasses;
     }
-    static async importServices(pathToServices, importCb) {
-        const servicePaths = await DreamImporter.ls(pathToServices);
-        const serviceClasses = (await Promise.all(servicePaths.map(servicePath => importCb(servicePath).then(serviceClass => [servicePath, serviceClass]))));
-        return serviceClasses;
-    }
 }
 exports.default = DreamImporter;

package/dist/cjs/src/dream-application/helpers/lookupClassByGlobalName.js

@@ -3,13 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = lookupClassByGlobalName;
 const importModels_js_1 = require("./importers/importModels.js");
 const importSerializers_js_1 = require("./importers/importSerializers.js");
-const importServices_js_1 = require("./importers/importServices.js");
 let _globalNameMap;
 function lookupClassByGlobalName(globalName) {
     if (_globalNameMap)
         return _globalNameMap[globalName] || null;
     _globalNameMap = {
-        ...(0, importServices_js_1.getServicesOrFail)(),
         ...(0, importSerializers_js_1.getSerializersOrFail)(),
         ...(0, importModels_js_1.getModelsOrFail)(),
     };

package/dist/cjs/src/dream-application/index.js

@@ -20,7 +20,6 @@ const EnvInternal_js_1 = require("../helpers/EnvInternal.js");
 const cache_js_1 = require("./cache.js");
 const importModels_js_1 = require("./helpers/importers/importModels.js");
 const importSerializers_js_1 = require("./helpers/importers/importSerializers.js");
-const importServices_js_1 = require("./helpers/importers/importServices.js");
 const pgTypes = pg_1.default.types;
 // this needs to be done top-level to ensure proper configuration
 DateTime_js_1.Settings.defaultZone = 'UTC';
@@ -50,8 +49,6 @@ class DreamApplication {
         });
         if (!dreamApp.serializers)
             (0, importSerializers_js_1.setCachedSerializers)({});
-        if (!dreamApp.services)
-            (0, importServices_js_1.setCachedServices)({});
         (0, cache_js_1.cacheDreamApplication)(dreamApp);
         if (!EnvInternal_js_1.default.boolean('BYPASS_DB_CONNECTIONS_DURING_INIT'))
             await this.setDatabaseTypeParsers();
@@ -156,6 +153,7 @@ Try setting it to something valid, like:
     }
     _specialHooks = {
         dbLog: [],
+        replStart: [],
     };
     get specialHooks() {
         return this._specialHooks;
@@ -221,7 +219,6 @@ Try setting it to something valid, like:
             models: opts?.paths?.models || 'src/app/models',
             modelSpecs: opts?.paths?.modelSpecs || 'spec/unit/models',
             serializers: opts?.paths?.serializers || 'src/app/serializers',
-            services: opts?.paths?.services || 'src/app/services',
             types: opts?.paths?.types || 'src/types',
         };
     }
@@ -231,9 +228,6 @@ Try setting it to something valid, like:
     get serializers() {
         return (0, importSerializers_js_1.getSerializersOrFail)();
     }
-    get services() {
-        return (0, importServices_js_1.getServicesOrFail)();
-    }
     async load(resourceType, resourcePath, importCb) {
         switch (resourceType) {
             case 'models':
@@ -243,9 +237,6 @@ Try setting it to something valid, like:
             case 'serializers':
                 await (0, importSerializers_js_1.default)(resourcePath, importCb);
                 break;
-            case 'services':
-                await (0, importServices_js_1.default)(resourcePath, importCb);
-                break;
         }
     }
     plugin(cb) {
@@ -294,6 +285,9 @@ Try setting it to something valid, like:
             case 'db:log':
                 this._specialHooks.dbLog.push(cb);
                 break;
+            case 'repl:start':
+                this._specialHooks.replStart.push(cb);
+                break;
         }
     }
 }

package/dist/cjs/src/helpers/DreamGlam/howyadoins/whaaaaaaaaaaok.js

@@ -47,7 +47,7 @@ function whaaaaaaaaaaok() {
 }
 function whaaaaaaaaaaokBasic() {
     return `
-      ,▄█▄                                               
+                                    ,▄█▄                 
     ]█▄▄                         ╓█████▌                 
     ▐██████▄                   ▄█████▓╣█                 
      ║████████▄,  ,  ,,▄,▄▄▄▓██████╬╬╣╣▌                 
@@ -55,7 +55,7 @@ function whaaaaaaaaaaokBasic() {
        ╙█╬╬╬▓███████████████████████▒▓▌                  
         ╙▓█▓██████████████████████████                   
          ╚██████▀███████████╩█▓▌▐▓████▄                  
-         '║█████\`╣█Γ║████████▄▄φ▓█████▌                  
+         '║█████\`╣█Γ║████████▄▄φ▓█████▌                 
           ║█████████████████████▓█████▌                  
            █████████████▓▓████████████                   
            ║█████████████████████████                    

package/dist/cjs/src/helpers/cli/SchemaBuilder.js

@@ -8,13 +8,13 @@ const index_js_1 = require("../../db/index.js");
 const index_js_2 = require("../../dream-application/index.js");
 const constants_js_1 = require("../../dream/constants.js");
 const FailedToIdentifyAssociation_js_1 = require("../../errors/schema-builder/FailedToIdentifyAssociation.js");
-const autogeneratedFileMessage_js_1 = require("../../global-cli/helpers/autogeneratedFileMessage.js");
 const camelize_js_1 = require("../camelize.js");
 const compact_js_1 = require("../compact.js");
 const EnvInternal_js_1 = require("../EnvInternal.js");
 const pascalize_js_1 = require("../pascalize.js");
 const sortBy_js_1 = require("../sortBy.js");
 const uniq_js_1 = require("../uniq.js");
+const autoGeneratedFileDisclaimer_js_1 = require("./autoGeneratedFileDisclaimer.js");
 class SchemaBuilder {
     async build() {
         const { schemaConstContent, passthroughColumns, allDefaultScopeNames } = await this.buildSchemaContent();
@@ -30,7 +30,7 @@ import {
             : "import { type CalendarDate, type DateTime } from '@rvoh/dream'";
         const dreamApp = index_js_2.default.getOrFail();
         const newSchemaFileContents = `\
-${(0, autogeneratedFileMessage_js_1.default)()}
+${(0, autoGeneratedFileDisclaimer_js_1.default)()}
 ${calendarDateImportStatement}
 ${importStr}
 

package/dist/cjs/src/helpers/cli/autoGeneratedFileDisclaimer.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = autogeneratedFileDisclaimer;
+const DreamGlam_js_1 = require("../DreamGlam/DreamGlam.js");
+function autogeneratedFileDisclaimer(startComment = '\n/*', endComment = '\n*/') {
+    return `\
+${startComment}
+${DreamGlam_js_1.default.whaaaaaaaaaaokBasic()}
+
+This file was automatically generated by my cat, Aster.
+He does not want you mucking about with his files,
+and we are pretty lax on trimming his nails.
+
+I mean, we have him pretty well fenced in but he is an
+escape artist and he still manages to get fleas!
+
+My point is, don't go mucking about with his files!
+
+He actually has a hopefully well-tempered message for
+us humans, he says:
+
+"
+  Dear pathetic humans,
+
+  Here is a haiku to keep you in line
+
+  don't dare go mucking
+  with my files, I lyke them fine
+  prettierignore
+"
+${endComment}
+`;
+}

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

@@ -19,7 +19,7 @@ const sort_js_1 = require("./sort.js");
 const sortBy_js_1 = require("./sortBy.js");
 const uncapitalize_js_1 = require("./uncapitalize.js");
 const uniq_js_1 = require("./uniq.js");
-function loadRepl(context) {
+async function loadRepl(context) {
     const dreamApp = index_js_1.default.getOrFail();
     context.CalendarDate = CalendarDate_js_1.default;
     context.DateTime = DateTime_js_1.DateTime;
@@ -41,9 +41,7 @@ function loadRepl(context) {
     for (const globalName of Object.keys(dreamApp.models)) {
         context[(0, pascalizePath_js_1.default)(globalName)] = dreamApp.models[globalName];
     }
-    for (const globalName of Object.keys(dreamApp.services)) {
-        if (!context[globalName]) {
-            context[(0, pascalizePath_js_1.default)(globalName)] = dreamApp.services[globalName];
-        }
+    for (const hook of dreamApp.specialHooks.replStart) {
+        await hook(context);
     }
 }

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

@@ -19,7 +19,5 @@ function default_1(dreamPathType) {
             return dreamApp.paths.factories;
         case 'types':
             return dreamApp.paths.types;
-        case 'services':
-            return dreamApp.paths.services;
     }
 }

package/dist/cjs/src/index.js

@@ -1,19 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Range = exports.sharedPathPrefix = exports.relativeDreamPath = exports.dreamPath = exports.pascalize = exports.loadRepl = exports.isEmpty = exports.inferSerializerFromDreamOrViewModel = exports.inferSerializerFromDreamClassOrViewModelClass = exports.hyphenize = exports.globalClassNameFromFullyQualifiedModelName = exports.Env = exports.DreamGlam = exports.debug = exports.DateTime = exports.compact = exports.generateDream = exports.capitalize = exports.camelize = exports.CalendarDate = exports.Benchmark = exports.ValidationError = exports.RecordNotFound = exports.GlobalNameNotSet = exports.CreateOrFindByFailedToCreateAndFind = exports.NonLoadedAssociation = exports.Encrypt = exports.Query = exports.DreamTransaction = exports.openapiShorthandPrimitiveTypes = exports.openapiPrimitiveTypes = exports.DreamConst = exports.Dream = exports.DreamApplication = exports.lookupClassByGlobalName = exports.DreamImporter = exports.Decorators = exports.STI = exports.SoftDelete = exports.ReplicaSafe = exports.validateTable = exports.validateColumn = exports.DreamMigrationHelpers = exports.db = exports.pgErrorType = exports.dreamDbConnections = exports.DreamDbConnection = exports.closeAllDbConnections = exports.DreamCLI = exports.DreamBin = void 0;
-exports.DreamSerializer = exports.Attribute = exports.RendersOne = exports.RendersMany = exports.ops = exports.uniq = exports.uncapitalize = exports.standardizeFullyQualifiedModelName = exports.sortBy = exports.sort = exports.snakeify = exports.serializerNameFromFullyQualifiedModelName = exports.round = exports.range = void 0;
+exports.range = exports.Range = exports.sharedPathPrefix = exports.relativeDreamPath = exports.dreamPath = exports.pascalize = exports.loadRepl = exports.isEmpty = exports.inferSerializerFromDreamOrViewModel = exports.inferSerializerFromDreamClassOrViewModelClass = exports.hyphenize = exports.globalClassNameFromFullyQualifiedModelName = exports.Env = exports.DreamGlam = exports.debug = exports.DateTime = exports.compact = exports.generateDream = exports.capitalize = exports.camelize = exports.CalendarDate = exports.Benchmark = exports.ValidationError = exports.RecordNotFound = exports.GlobalNameNotSet = exports.CreateOrFindByFailedToCreateAndFind = exports.NonLoadedAssociation = exports.Encrypt = exports.Query = exports.DreamTransaction = exports.openapiShorthandPrimitiveTypes = exports.openapiPrimitiveTypes = exports.DreamConst = exports.Dream = exports.DreamApplication = exports.lookupClassByGlobalName = exports.DreamImporter = exports.Decorators = exports.STI = exports.SoftDelete = exports.ReplicaSafe = exports.validateTable = exports.validateColumn = exports.DreamMigrationHelpers = exports.untypedDb = exports.pgErrorType = exports.dreamDbConnections = exports.closeAllDbConnections = exports.DreamCLI = exports.DreamBin = void 0;
+exports.DreamSerializer = exports.Attribute = exports.RendersOne = exports.RendersMany = exports.ops = exports.uniq = exports.uncapitalize = exports.standardizeFullyQualifiedModelName = exports.sortBy = exports.sort = exports.snakeify = exports.serializerNameFromFullyQualifiedModelName = exports.round = void 0;
 var index_js_1 = require("./bin/index.js");
 Object.defineProperty(exports, "DreamBin", { enumerable: true, get: function () { return index_js_1.default; } });
 var index_js_2 = require("./cli/index.js");
 Object.defineProperty(exports, "DreamCLI", { enumerable: true, get: function () { return index_js_2.default; } });
 var DreamDbConnection_js_1 = require("./db/DreamDbConnection.js");
 Object.defineProperty(exports, "closeAllDbConnections", { enumerable: true, get: function () { return DreamDbConnection_js_1.closeAllDbConnections; } });
-Object.defineProperty(exports, "DreamDbConnection", { enumerable: true, get: function () { return DreamDbConnection_js_1.default; } });
 Object.defineProperty(exports, "dreamDbConnections", { enumerable: true, get: function () { return DreamDbConnection_js_1.dreamDbConnections; } });
 var errors_js_1 = require("./db/errors.js");
 Object.defineProperty(exports, "pgErrorType", { enumerable: true, get: function () { return errors_js_1.pgErrorType; } });
 var index_js_3 = require("./db/index.js");
-Object.defineProperty(exports, "db", { enumerable: true, get: function () { return index_js_3.default; } });
+Object.defineProperty(exports, "untypedDb", { enumerable: true, get: function () { return index_js_3.default; } });
 var DreamMigrationHelpers_js_1 = require("./db/migration-helpers/DreamMigrationHelpers.js");
 Object.defineProperty(exports, "DreamMigrationHelpers", { enumerable: true, get: function () { return DreamMigrationHelpers_js_1.default; } });
 var validateColumn_js_1 = require("./db/validators/validateColumn.js");

package/dist/esm/src/Dream.js

@@ -409,7 +409,7 @@ export default class Dream {
      * @internal
      *
      * Used by DreamApplication during the load process
-     * for models, services, and controllers to assign
+     * for models and serializers to assign
      * unique global names to each model based on the file
      * name of that model.
      */

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

@@ -4,12 +4,12 @@ import DreamCLI from '../../cli/index.js';
 import colorize from '../../cli/logger/loggable/colorize.js';
 import ConnectionConfRetriever from '../../db/ConnectionConfRetriever.js';
 import DreamApplication from '../../dream-application/index.js';
-import autogeneratedFileDisclaimer from '../../global-cli/helpers/autogeneratedFileMessage.js';
 import compact from '../../helpers/compact.js';
 import EnvInternal from '../../helpers/EnvInternal.js';
 import dreamPath from '../../helpers/path/dreamPath.js';
 import snakeify from '../../helpers/snakeify.js';
 import sspawn from '../../helpers/sspawn.js';
+import autogeneratedFileDisclaimer from '../../helpers/cli/autoGeneratedFileDisclaimer.js';
 export default async function writeSyncFile() {
     const dbConf = new ConnectionConfRetriever().getConnectionConf('primary');
     const dreamApp = DreamApplication.getOrFail();

package/dist/esm/src/dream-application/helpers/DreamImporter.js

@@ -35,9 +35,4 @@ export default class DreamImporter {
         ]))));
         return serializerClasses;
     }
-    static async importServices(pathToServices, importCb) {
-        const servicePaths = await DreamImporter.ls(pathToServices);
-        const serviceClasses = (await Promise.all(servicePaths.map(servicePath => importCb(servicePath).then(serviceClass => [servicePath, serviceClass]))));
-        return serviceClasses;
-    }
 }

package/dist/esm/src/dream-application/helpers/lookupClassByGlobalName.js

@@ -1,12 +1,10 @@
 import { getModelsOrFail } from './importers/importModels.js';
 import { getSerializersOrFail } from './importers/importSerializers.js';
-import { getServicesOrFail } from './importers/importServices.js';
 let _globalNameMap;
 export default function lookupClassByGlobalName(globalName) {
     if (_globalNameMap)
         return _globalNameMap[globalName] || null;
     _globalNameMap = {
-        ...getServicesOrFail(),
         ...getSerializersOrFail(),
         ...getModelsOrFail(),
     };

package/dist/esm/src/dream-application/index.js

@@ -18,7 +18,6 @@ import EnvInternal from '../helpers/EnvInternal.js';
 import { cacheDreamApplication, getCachedDreamApplicationOrFail } from './cache.js';
 import importModels, { getModelsOrFail } from './helpers/importers/importModels.js';
 import importSerializers, { getSerializersOrFail, setCachedSerializers, } from './helpers/importers/importSerializers.js';
-import importServices, { getServicesOrFail, setCachedServices } from './helpers/importers/importServices.js';
 const pgTypes = pg.types;
 // this needs to be done top-level to ensure proper configuration
 Settings.defaultZone = 'UTC';
@@ -48,8 +47,6 @@ export default class DreamApplication {
         });
         if (!dreamApp.serializers)
             setCachedSerializers({});
-        if (!dreamApp.services)
-            setCachedServices({});
         cacheDreamApplication(dreamApp);
         if (!EnvInternal.boolean('BYPASS_DB_CONNECTIONS_DURING_INIT'))
             await this.setDatabaseTypeParsers();
@@ -154,6 +151,7 @@ Try setting it to something valid, like:
     }
     _specialHooks = {
         dbLog: [],
+        replStart: [],
     };
     get specialHooks() {
         return this._specialHooks;
@@ -219,7 +217,6 @@ Try setting it to something valid, like:
             models: opts?.paths?.models || 'src/app/models',
             modelSpecs: opts?.paths?.modelSpecs || 'spec/unit/models',
             serializers: opts?.paths?.serializers || 'src/app/serializers',
-            services: opts?.paths?.services || 'src/app/services',
             types: opts?.paths?.types || 'src/types',
         };
     }
@@ -229,9 +226,6 @@ Try setting it to something valid, like:
     get serializers() {
         return getSerializersOrFail();
     }
-    get services() {
-        return getServicesOrFail();
-    }
     async load(resourceType, resourcePath, importCb) {
         switch (resourceType) {
             case 'models':
@@ -241,9 +235,6 @@ Try setting it to something valid, like:
             case 'serializers':
                 await importSerializers(resourcePath, importCb);
                 break;
-            case 'services':
-                await importServices(resourcePath, importCb);
-                break;
         }
     }
     plugin(cb) {
@@ -292,6 +283,9 @@ Try setting it to something valid, like:
             case 'db:log':
                 this._specialHooks.dbLog.push(cb);
                 break;
+            case 'repl:start':
+                this._specialHooks.replStart.push(cb);
+                break;
         }
     }
 }

package/dist/esm/src/helpers/DreamGlam/howyadoins/whaaaaaaaaaaok.js

@@ -43,7 +43,7 @@ export default function whaaaaaaaaaaok() {
 }
 export function whaaaaaaaaaaokBasic() {
     return `
-      ,▄█▄                                               
+                                    ,▄█▄                 
     ]█▄▄                         ╓█████▌                 
     ▐██████▄                   ▄█████▓╣█                 
      ║████████▄,  ,  ,,▄,▄▄▄▓██████╬╬╣╣▌                 
@@ -51,7 +51,7 @@ export function whaaaaaaaaaaokBasic() {
        ╙█╬╬╬▓███████████████████████▒▓▌                  
         ╙▓█▓██████████████████████████                   
          ╚██████▀███████████╩█▓▌▐▓████▄                  
-         '║█████\`╣█Γ║████████▄▄φ▓█████▌                  
+         '║█████\`╣█Γ║████████▄▄φ▓█████▌                 
           ║█████████████████████▓█████▌                  
            █████████████▓▓████████████                   
            ║█████████████████████████                    

package/dist/esm/src/helpers/cli/SchemaBuilder.js

@@ -6,13 +6,13 @@ import _db from '../../db/index.js';
 import DreamApplication from '../../dream-application/index.js';
 import { DreamConst } from '../../dream/constants.js';
 import FailedToIdentifyAssociation from '../../errors/schema-builder/FailedToIdentifyAssociation.js';
-import autogeneratedFileDisclaimer from '../../global-cli/helpers/autogeneratedFileMessage.js';
 import camelize from '../camelize.js';
 import compact from '../compact.js';
 import EnvInternal from '../EnvInternal.js';
 import pascalize from '../pascalize.js';
 import sortBy from '../sortBy.js';
 import uniq from '../uniq.js';
+import autogeneratedFileDisclaimer from './autoGeneratedFileDisclaimer.js';
 export default class SchemaBuilder {
     async build() {
         const { schemaConstContent, passthroughColumns, allDefaultScopeNames } = await this.buildSchemaContent();

package/dist/esm/src/helpers/cli/autoGeneratedFileDisclaimer.js

@@ -0,0 +1,30 @@
+import DreamGlam from '../DreamGlam/DreamGlam.js';
+export default function autogeneratedFileDisclaimer(startComment = '\n/*', endComment = '\n*/') {
+    return `\
+${startComment}
+${DreamGlam.whaaaaaaaaaaokBasic()}
+
+This file was automatically generated by my cat, Aster.
+He does not want you mucking about with his files,
+and we are pretty lax on trimming his nails.
+
+I mean, we have him pretty well fenced in but he is an
+escape artist and he still manages to get fleas!
+
+My point is, don't go mucking about with his files!
+
+He actually has a hopefully well-tempered message for
+us humans, he says:
+
+"
+  Dear pathetic humans,
+
+  Here is a haiku to keep you in line
+
+  don't dare go mucking
+  with my files, I lyke them fine
+  prettierignore
+"
+${endComment}
+`;
+}

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

@@ -16,7 +16,7 @@ import sort from './sort.js';
 import sortBy from './sortBy.js';
 import uncapitalize from './uncapitalize.js';
 import uniq from './uniq.js';
-export default function loadRepl(context) {
+export default async function loadRepl(context) {
     const dreamApp = DreamApplication.getOrFail();
     context.CalendarDate = CalendarDate;
     context.DateTime = DateTime;
@@ -38,9 +38,7 @@ export default function loadRepl(context) {
     for (const globalName of Object.keys(dreamApp.models)) {
         context[pascalizePath(globalName)] = dreamApp.models[globalName];
     }
-    for (const globalName of Object.keys(dreamApp.services)) {
-        if (!context[globalName]) {
-            context[pascalizePath(globalName)] = dreamApp.services[globalName];
-        }
+    for (const hook of dreamApp.specialHooks.replStart) {
+        await hook(context);
     }
 }

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

@@ -16,7 +16,5 @@ export default function (dreamPathType) {
             return dreamApp.paths.factories;
         case 'types':
             return dreamApp.paths.types;
-        case 'services':
-            return dreamApp.paths.services;
     }
 }

package/dist/esm/src/index.js

@@ -1,8 +1,8 @@
 export { default as DreamBin } from './bin/index.js';
 export { default as DreamCLI } from './cli/index.js';
-export { closeAllDbConnections, default as DreamDbConnection, dreamDbConnections, } from './db/DreamDbConnection.js';
+export { closeAllDbConnections, dreamDbConnections } from './db/DreamDbConnection.js';
 export { pgErrorType } from './db/errors.js';
-export { default as db } from './db/index.js';
+export { default as untypedDb } from './db/index.js';
 export { default as DreamMigrationHelpers } from './db/migration-helpers/DreamMigrationHelpers.js';
 export { default as validateColumn } from './db/validators/validateColumn.js';
 export { default as validateTable } from './db/validators/validateTable.js';

package/dist/types/src/Dream.d.ts

@@ -327,7 +327,7 @@ export default class Dream {
      * @internal
      *
      * Used by DreamApplication during the load process
-     * for models, services, and controllers to assign
+     * for models and serializers to assign
      * unique global names to each model based on the file
      * name of that model.
      */

package/dist/types/src/dream-application/helpers/DreamImporter.d.ts

@@ -4,5 +4,4 @@ export default class DreamImporter {
     static ls(dir: string): Promise<string[]>;
     static importDreams(pathToModels: string, importCb: (path: string) => Promise<any>): Promise<[string, typeof Dream][]>;
     static importSerializers(pathToSerializers: string, importCb: (path: string) => Promise<any>): Promise<[string, Record<string, typeof DreamSerializer>][]>;
-    static importServices(pathToServices: string, importCb: (path: string) => Promise<any>): Promise<[string, any][]>;
 }

package/dist/types/src/dream-application/index.d.ts

@@ -1,4 +1,5 @@
 import { CompiledQuery } from 'kysely';
+import { Context } from 'node:vm';
 import Dream from '../Dream.js';
 import { primaryKeyTypes } from '../dream/constants.js';
 import { EncryptOptions } from '../encrypt/index.js';
@@ -77,13 +78,12 @@ export default class DreamApplication {
     constructor(opts?: Partial<DreamApplicationOpts>);
     get models(): Record<string, typeof Dream>;
     get serializers(): Record<string, typeof DreamSerializer>;
-    get services(): Record<string, any>;
-    load<RT extends 'models' | 'serializers' | 'services'>(resourceType: RT, resourcePath: string, importCb: (path: string) => Promise<any>): Promise<void>;
+    load<RT extends 'models' | 'serializers'>(resourceType: RT, resourcePath: string, importCb: (path: string) => Promise<any>): Promise<void>;
     plugin(cb: (app: DreamApplication) => void | Promise<void>): void;
     set<ApplyOpt extends DreamApplicationSetOption>(applyOption: ApplyOpt, options: ApplyOpt extends 'db' ? DreamDbCredentialOptions : ApplyOpt extends 'encryption' ? DreamApplicationEncryptionOptions : ApplyOpt extends 'primaryKeyType' ? (typeof primaryKeyTypes)[number] : ApplyOpt extends 'logger' ? DreamLogger : ApplyOpt extends 'projectRoot' ? string : ApplyOpt extends 'inflections' ? () => void | Promise<void> : ApplyOpt extends 'paths' ? DreamDirectoryPaths : ApplyOpt extends 'parallelTests' ? number : never): void;
-    on<T extends DreamHookEventType>(hookEventType: T, cb: T extends 'db:log' ? (event: KyselyLogEvent) => void : never): void;
+    on<T extends DreamHookEventType>(hookEventType: T, cb: T extends 'db:log' ? (event: KyselyLogEvent) => void : T extends 'repl:start' ? (context: Context) => void | Promise<void> : never): void;
 }
-export type DreamHookEventType = 'db:log';
+export type DreamHookEventType = 'db:log' | 'repl:start';
 export interface DreamApplicationOpts {
     projectRoot: string;
     primaryKeyType: (typeof primaryKeyTypes)[number];
@@ -97,7 +97,6 @@ export type DreamApplicationSetOption = 'db' | 'encryption' | 'inflections' | 'l
 export interface DreamDirectoryPaths {
     models?: string;
     serializers?: string;
-    services?: string;
     conf?: string;
     db?: string;
     modelSpecs?: string;
@@ -133,6 +132,7 @@ interface SegmentedEncryptionOptions {
 }
 export interface DreamApplicationSpecialHooks {
     dbLog: ((event: KyselyLogEvent) => void)[];
+    replStart: ((context: Context) => void | Promise<void>)[];
 }
 export interface DreamApplicationInitOptions {
     bypassModelIntegrityCheck?: boolean;

package/dist/types/src/helpers/loadRepl.d.ts

@@ -1 +1 @@
-export default function loadRepl(context: Record<string, unknown>): void;
+export default function loadRepl(context: Record<string, unknown>): Promise<void>;

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

@@ -1,8 +1,8 @@
 export { default as DreamBin } from './bin/index.js';
 export { default as DreamCLI } from './cli/index.js';
-export { closeAllDbConnections, default as DreamDbConnection, dreamDbConnections, } from './db/DreamDbConnection.js';
+export { closeAllDbConnections, dreamDbConnections } from './db/DreamDbConnection.js';
 export { pgErrorType } from './db/errors.js';
-export { default as db } from './db/index.js';
+export { default as untypedDb } from './db/index.js';
 export { default as DreamMigrationHelpers } from './db/migration-helpers/DreamMigrationHelpers.js';
 export { default as validateColumn } from './db/validators/validateColumn.js';
 export { default as validateTable } from './db/validators/validateTable.js';
@@ -60,6 +60,7 @@ export { type DreamSerializerAssociationStatement } from './serializer/decorator
 export { default as Attribute, type AttributeStatement, type SerializableTypes, } from './serializer/decorators/attribute.js';
 export { default as DreamSerializer } from './serializer/index.js';
 export { type WhereStatementForDream, type WhereStatementForDreamClass } from './types/associations/shared.js';
+export { type DbConnectionType } from './types/db.js';
 export { type DreamAssociationMetadata, type DreamAttributes, type DreamClassColumn, type DreamColumn, type DreamColumnNames, type DreamOrViewModelSerializerKey, type DreamParamSafeAttributes, type DreamParamSafeColumnNames, type DreamSerializerKey, type DreamSerializers, type DreamTableSchema, type DreamVirtualColumns, type IdType, type PrimaryKeyType, type SerializableClassOrSerializerCallback, type SerializableDreamClassOrViewModelClass, type SerializableDreamOrViewModel, type Timestamp, type UpdateableAssociationProperties, type UpdateableProperties, type ViewModelSerializerKey, } from './types/dream.js';
 export { type CommonOpenapiSchemaObjectFields, type OpenapiAllTypes, type OpenapiFormats, type OpenapiNumberFormats, type OpenapiPrimitiveTypes, type OpenapiSchemaArray, type OpenapiSchemaArrayShorthand, type OpenapiSchemaBase, type OpenapiSchemaBody, type OpenapiSchemaBodyShorthand, type OpenapiSchemaCommonFields, type OpenapiSchemaExpressionAllOf, type OpenapiSchemaExpressionAnyOf, type OpenapiSchemaExpressionOneOf, type OpenapiSchemaExpressionRef, type OpenapiSchemaExpressionRefSchemaShorthand, type OpenapiSchemaInteger, type OpenapiSchemaNull, type OpenapiSchemaNumber, type OpenapiSchemaObject, type OpenapiSchemaObjectAllOf, type OpenapiSchemaObjectAllOfShorthand, type OpenapiSchemaObjectAnyOf, type OpenapiSchemaObjectAnyOfShorthand, type OpenapiSchemaObjectBase, type OpenapiSchemaObjectBaseShorthand, type OpenapiSchemaObjectOneOf, type OpenapiSchemaObjectOneOfShorthand, type OpenapiSchemaObjectShorthand, type OpenapiSchemaPartialSegment, type OpenapiSchemaPrimitiveGeneric, type OpenapiSchemaProperties, type OpenapiSchemaPropertiesShorthand, type OpenapiSchemaShorthandExpressionAllOf, type OpenapiSchemaShorthandExpressionAnyOf, type OpenapiSchemaShorthandExpressionOneOf, type OpenapiSchemaShorthandExpressionSerializableRef, type OpenapiSchemaShorthandExpressionSerializerRef, type OpenapiSchemaShorthandPrimitiveGeneric, type OpenapiSchemaString, type OpenapiShorthandAllTypes, type OpenapiShorthandPrimitiveTypes, type OpenapiTypeField, type OpenapiTypeFieldObject, } from './types/openapi.js';
 export { type ValidationType } from './types/validation.js';