@rvoh/dream 0.31.0 → 0.31.1

package/dist/cjs/src/Dream.js

@@ -371,9 +371,8 @@ class Dream {
         return this.constructor.stiBaseClassOrOwnClassName;
     }
     /**
-     * @internal
-     *
-     * Shadows .sanitizedName. Returns a string
+     * this.constructor.name may be prefixed with an underscore during conversion to Javascript.
+     * This method returns the constructor name without a leading underscore.
      *
      * @returns A string
      */

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

@@ -58,8 +58,8 @@ export type Timestamp = ColumnType<DateTime | CalendarDate>`);
 }
 function addCustomImports(file) {
     const customImports = EnvInternal_js_1.default.boolean('DREAM_CORE_DEVELOPMENT')
-        ? "import CalendarDate from '../../src/helpers/CalendarDate.js'\nimport { DateTime } from '../../src/helpers/DateTime.js'"
-        : "import { CalendarDate, DateTime } from '@rvoh/dream'";
+        ? "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}
 ${file}`;
 }

package/dist/cjs/src/cli/logger/loggable/DreamCliLoggableSpinner.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const index_js_1 = require("../../index.js");
 const createSpinner_js_1 = require("../helpers/createSpinner.js");
 const DreamCliLoggable_js_1 = require("./DreamCliLoggable.js");
-const index_js_1 = require("../../index.js");
 class DreamCliLoggableSpinner extends DreamCliLoggable_js_1.default {
     text;
     spinner;

package/dist/cjs/src/decorators/field/association/shared.js

@@ -8,7 +8,7 @@ exports.applyGetterAndSetter = applyGetterAndSetter;
 exports.associationPrimaryKeyAccessors = associationPrimaryKeyAccessors;
 exports.validateHasStatementArgs = validateHasStatementArgs;
 const pluralize_esm_1 = require("pluralize-esm");
-const types_js_1 = require("../../../dream/types.js");
+const constants_js_1 = require("../../../dream/constants.js");
 const InvalidComputedForeignKey_js_1 = require("../../../errors/associations/InvalidComputedForeignKey.js");
 const NonLoadedAssociation_js_1 = require("../../../errors/associations/NonLoadedAssociation.js");
 const CannotDefineAssociationWithBothDependentAndPassthrough_js_1 = require("../../../errors/CannotDefineAssociationWithBothDependentAndPassthrough.js");
@@ -30,6 +30,11 @@ function blankAssociationsFactory(dreamClass, { freeze = false, } = {}) {
         return (0, freezeBaseClassArrayMap_js_1.default)(associationsMap);
     return associationsMap;
 }
+// function hydratedSourceValue(dream: Dream | typeof Dream | undefined, sourceName: string) {
+//   if (!dream) return
+//   if (!sourceName) return
+//   return (dream as any)[sourceName] || (dream as any)[singular(sourceName)]
+// }
 function finalForeignKey(foreignKey, dreamClass, partialAssociation) {
     let computedForeignKey = foreignKey;
     if (!computedForeignKey) {
@@ -118,15 +123,10 @@ association: ${this.as}
     };
 }
 function validateHasStatementArgs({ dreamClass, dependent, methodName, on, }) {
-    const hasPassthroughOn = Object.values(on || {}).find(val => val === types_js_1.DreamConst.passthrough);
-    const hasRequiredOn = Object.values(on || {}).find(val => val === types_js_1.DreamConst.required);
+    const hasPassthroughOn = Object.values(on || {}).find(val => val === constants_js_1.DreamConst.passthrough);
+    const hasRequiredOn = Object.values(on || {}).find(val => val === constants_js_1.DreamConst.required);
     if (dependent && hasPassthroughOn)
         throw new CannotDefineAssociationWithBothDependentAndPassthrough_js_1.default(dreamClass, methodName);
     if (dependent && hasRequiredOn)
         throw new CannotDefineAssociationWithBothDependentAndRequiredOnClause_js_1.default(dreamClass, methodName);
 }
-// function hydratedSourceValue(dream: Dream | typeof Dream | undefined, sourceName: string) {
-//   if (!dream) return
-//   if (!sourceName) return
-//   return (dream as any)[sourceName] || (dream as any)[singular(sourceName)]
-// }

package/dist/cjs/src/dream/Query.js

@@ -37,13 +37,13 @@ const uniq_js_1 = require("../helpers/uniq.js");
 const curried_ops_statement_js_1 = require("../ops/curried-ops-statement.js");
 const index_js_1 = require("../ops/index.js");
 const ops_statement_js_1 = require("../ops/ops-statement.js");
+const constants_js_1 = require("./constants.js");
 const executeDatabaseQuery_js_1 = require("./internal/executeDatabaseQuery.js");
 const extractAssociationMetadataFromAssociationName_js_1 = require("./internal/extractAssociationMetadataFromAssociationName.js");
 const orderByDirection_js_1 = require("./internal/orderByDirection.js");
 const shouldBypassDefaultScope_js_1 = require("./internal/shouldBypassDefaultScope.js");
 const SimilarityBuilder_js_1 = require("./internal/similarity/SimilarityBuilder.js");
 const sqlResultToDreamInstance_js_1 = require("./internal/sqlResultToDreamInstance.js");
-const types_js_1 = require("./types.js");
 class Query extends ConnectedToDB_js_1.default {
     /**
      * @internal
@@ -2229,7 +2229,7 @@ class Query extends ConnectedToDB_js_1.default {
     throwUnlessAllRequiredWhereClausesProvided(association, namespace, joinOnStatements) {
         const whereStatement = association.on;
         const columnsRequiringWhereStatements = Object.keys(whereStatement).reduce((agg, column) => {
-            if (whereStatement[column] === types_js_1.DreamConst.required)
+            if (whereStatement[column] === constants_js_1.DreamConst.required)
                 agg.push(column);
             return agg;
         }, []);
@@ -2280,7 +2280,7 @@ class Query extends ConnectedToDB_js_1.default {
     }
     whereStatementToExpressionWrapper(eb, whereStatement, { negate = false, disallowSimilarityOperator = true, } = {}) {
         const clauses = (0, compact_js_1.default)(Object.keys(whereStatement)
-            .filter(key => whereStatement[key] !== types_js_1.DreamConst.required)
+            .filter(key => whereStatement[key] !== constants_js_1.DreamConst.required)
             .map(attr => {
             const val = whereStatement[attr];
             if (val?.isOpsStatement &&
@@ -2357,10 +2357,10 @@ class Query extends ConnectedToDB_js_1.default {
         let a2 = null;
         let b2 = null;
         let c2 = null;
-        if (val instanceof Function && val !== types_js_1.DreamConst.passthrough) {
+        if (val instanceof Function && val !== constants_js_1.DreamConst.passthrough) {
             val = val();
         }
-        else if (val === types_js_1.DreamConst.passthrough) {
+        else if (val === constants_js_1.DreamConst.passthrough) {
             const column = attr.split('.').pop();
             if (this.passthroughOnStatement[column] === undefined)
                 throw new MissingRequiredPassthroughForAssociationOnClause_js_1.default(column);

package/dist/cjs/src/{openapi/types.js → dream/constants.js}

@@ -1,6 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.openapiShorthandPrimitiveTypes = exports.openapiPrimitiveTypes = void 0;
+exports.openapiShorthandPrimitiveTypes = exports.openapiPrimitiveTypes = exports.DreamConst = exports.TRIGRAM_OPERATORS = exports.primaryKeyTypes = void 0;
+exports.primaryKeyTypes = ['bigserial', 'bigint', 'uuid', 'integer'];
+exports.TRIGRAM_OPERATORS = ['%', '<%', '<<%'];
+class RequiredAttribute {
+    constructor() { }
+}
+class PassthroughAttribute {
+    constructor() { }
+}
+exports.DreamConst = {
+    passthrough: PassthroughAttribute,
+    required: RequiredAttribute,
+};
 exports.openapiPrimitiveTypes = [
     'string',
     'boolean',

package/dist/cjs/src/dream/internal/similarity/SimilarityBuilder.js

@@ -8,7 +8,7 @@ const validateTable_js_1 = require("../../../db/validators/validateTable.js");
 const validateTableAlias_js_1 = require("../../../db/validators/validateTableAlias.js");
 const namespaceColumn_js_1 = require("../../../helpers/namespaceColumn.js");
 const typechecks_js_1 = require("../../../helpers/typechecks.js");
-const types_js_1 = require("../../types.js");
+const constants_js_1 = require("../../constants.js");
 const similaritySelectSql_js_1 = require("./similaritySelectSql.js");
 const similarityWhereSql_js_1 = require("./similarityWhereSql.js");
 class SimilarityBuilder extends ConnectedToDB_js_1.default {
@@ -185,7 +185,7 @@ class SimilarityBuilder extends ConnectedToDB_js_1.default {
             Object.keys(tableValues).forEach(columnOrAssociationName => {
                 const statementOrValueOrNestedObject = tableValues[columnOrAssociationName];
                 if (statementOrValueOrNestedObject?.isOpsStatement &&
-                    types_js_1.TRIGRAM_OPERATORS.includes(statementOrValueOrNestedObject?.operator)) {
+                    constants_js_1.TRIGRAM_OPERATORS.includes(statementOrValueOrNestedObject?.operator)) {
                     similar.push({
                         tableName,
                         tableAlias: associationName,
@@ -292,7 +292,7 @@ class SimilarityBuilder extends ConnectedToDB_js_1.default {
         statements.forEach(statement => {
             Object.keys(statement).forEach(key => {
                 if (statement[key]?.constructor?.name === 'OpsStatement' &&
-                    types_js_1.TRIGRAM_OPERATORS.includes(statement[key].operator)) {
+                    constants_js_1.TRIGRAM_OPERATORS.includes(statement[key].operator)) {
                     similar.push({
                         tableName,
                         tableAlias: tableName,

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

@@ -6,7 +6,7 @@ const path = require("path");
 const dataTypes_js_1 = require("../../db/dataTypes.js");
 const index_js_1 = require("../../db/index.js");
 const index_js_2 = require("../../dream-application/index.js");
-const types_js_1 = require("../../dream/types.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");
@@ -25,8 +25,8 @@ import {
 } from './db.js'`
             : '';
         const calendarDateImportStatement = EnvInternal_js_1.default.boolean('DREAM_CORE_DEVELOPMENT')
-            ? "import CalendarDate from '../../src/helpers/CalendarDate.js'\nimport { DateTime } from '../../src/helpers/DateTime.js'"
-            : "import { CalendarDate, DateTime } from '@rvoh/dream'";
+            ? "import type CalendarDate from '../../src/helpers/CalendarDate.js'\nimport { type DateTime } from '../../src/helpers/DateTime.js'"
+            : "import { type CalendarDate, type DateTime } from '@rvoh/dream'";
         const dreamApp = index_js_2.default.getOrFail();
         const newSchemaFileContents = `\
 ${(0, autogeneratedFileMessage_js_1.default)()}
@@ -109,13 +109,13 @@ ${tableName}: {
                 const whereStatement = associationMetadata.where;
                 const requiredOnClauses = whereStatement === null
                     ? []
-                    : Object.keys(whereStatement).filter(column => whereStatement[column] === types_js_1.DreamConst.required);
+                    : Object.keys(whereStatement).filter(column => whereStatement[column] === constants_js_1.DreamConst.required);
                 passthroughColumns =
                     whereStatement === null
                         ? passthroughColumns
                         : [
                             ...passthroughColumns,
-                            ...Object.keys(whereStatement).filter(column => whereStatement[column] === types_js_1.DreamConst.passthrough),
+                            ...Object.keys(whereStatement).filter(column => whereStatement[column] === constants_js_1.DreamConst.passthrough),
                         ];
                 return `${associationName}: {
         type: '${associationMetadata.type}',

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

@@ -39,7 +39,7 @@ async function generateDream({ fullyQualifiedModelName, columnsWithTypes, option
     const isSTI = !!fullyQualifiedParentName;
     if (columnsWithTypes.length || !isSTI) {
         await (0, generateMigration_js_1.default)({
-            migrationName: fullyQualifiedModelName,
+            migrationName: `Create${fullyQualifiedModelName}`,
             columnsWithTypes,
             fullyQualifiedModelName,
             fullyQualifiedParentName,

package/dist/cjs/src/helpers/db/primaryKeyType.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = primaryKeyType;
 const index_js_1 = require("../../dream-application/index.js");
-const types_js_1 = require("../../dream/types.js");
+const constants_js_1 = require("../../dream/constants.js");
 function primaryKeyType() {
     const dreamconf = index_js_1.default.getOrFail();
     switch (dreamconf.primaryKeyType) {
@@ -17,7 +17,7 @@ ATTENTION!
 
   unrecognized primary key type "${dreamconf.primaryKeyType}" found in .dream.yml.
   please use one of the allowed primary key types:
-    ${types_js_1.primaryKeyTypes.join(', ')}
+    ${constants_js_1.primaryKeyTypes.join(', ')}
       `);
     }
 }

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

@@ -4,5 +4,7 @@ exports.default = isEmpty;
 function isEmpty(value) {
     if (Array.isArray(value))
         return value.length === 0;
+    if (value instanceof Map || value instanceof Set)
+        return value.size === 0;
     return Object.keys(value).length === 0;
 }

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

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = sort;
+const sortBy_js_1 = require("./sortBy.js");
+/**
+ * Returns a copy of array containing strings, numbers, bigints, and/or IdTypes, sorted in ascending order.
+ * To sort other types use {@link sortBy}.
+ *
+ *  ```ts
+ * import { sort } from '@rvoh/dream'
+ *
+ * sort([2, 1, 3])
+ * // [1, 2, 3]
+ *
+ * sort(['world', 'Hello', 'hello', 'World'])
+ * // ['hello', 'Hello', 'world', 'World']
+ * ```
+ */
+function sort(array) {
+    if (typeof array[0] === 'bigint') {
+        return (0, sortBy_js_1.default)(array, a => String(a));
+    }
+    return (0, sortBy_js_1.default)(array, a => a);
+}

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

@@ -2,6 +2,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UnsupportedValueFromComparisonFunction = void 0;
 exports.default = sortBy;
+/**
+ * Returns a copy of the array, sorted by the value returned by calling the function in the second argument on each element in the array
+ * Returns a copy of the array sorted by the return value of the function passed as the second argument.
+ * ```ts
+ * import { sortBy } from '@rvoh/dream'
+ *
+ * sortBy(['aaa', 'a', 'aa'], (str: string) => str.length)
+ * // ['a', 'aa', 'aaa']
+ *
+ * sortBy(['aaa', 'a', 'aa'], (str: string) => -str.length)
+ * // ['aaa', 'aa', 'a']
+ *
+ * sortBy([5, 3, 7], (num: number) => num)
+ * // [3, 5, 7]
+ *
+ * sortBy([5, 3, 7], (num: number) => -num)
+ * // [7, 5, 3]
+ * ```
+ */
 function sortBy(array, valueToCompare) {
     const arrayClone = [...array];
     return arrayClone.sort((a, b) => {
@@ -11,8 +30,6 @@ function sortBy(array, valueToCompare) {
             return aPrime.localeCompare(bPrime);
         if (typeof aPrime === 'number' && typeof bPrime === 'number')
             return aPrime - bPrime;
-        if (typeof aPrime === 'bigint' && typeof bPrime === 'bigint')
-            return aPrime.toString().localeCompare(bPrime.toString());
         throw new UnsupportedValueFromComparisonFunction(aPrime, bPrime);
     });
 }

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

@@ -4,17 +4,18 @@ exports.default = uniq;
 function uniq(arr, toKey = undefined) {
     if (toKey)
         return uniqWith(arr, toKey);
-    else if (arr[0]?.isDreamInstance)
-        return uniqWith(arr, dreamKey);
-    else
-        return Array.from(new Set(arr));
+    return uniqWith(arr, a => String(a));
 }
 function dreamKey(dream) {
     return `${dream.constructor.globalName}:${dream.primaryKeyValue}`;
 }
 function uniqWith(arr, toKey) {
     const map = arr.reduce((acc, val) => {
-        acc[toKey(val)] ||= val;
+        // Prefix with underscore to ensure that the values cannot be interpreted as integers.
+        // If they can be interpreted as integers, then the keys are ordered not by the
+        // order in which they were added, but in ascending numerical order.
+        const key = val?.isDreamInstance ? dreamKey(val) : `_${toKey(val)}`;
+        acc[key] ||= val;
         return acc;
     }, {});
     return Object.values(map);

package/dist/cjs/src/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.round = 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.DreamConst = exports.Query = exports.DreamTransaction = 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.openapiShorthandPrimitiveTypes = exports.openapiPrimitiveTypes = exports.uniq = exports.uncapitalize = exports.standardizeFullyQualifiedModelName = exports.sortBy = exports.snakeify = exports.serializerNameFromFullyQualifiedModelName = void 0;
+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;
 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");
@@ -36,12 +36,14 @@ var index_js_4 = require("./dream-application/index.js");
 Object.defineProperty(exports, "DreamApplication", { enumerable: true, get: function () { return index_js_4.default; } });
 var Dream_js_1 = require("./Dream.js");
 Object.defineProperty(exports, "Dream", { enumerable: true, get: function () { return Dream_js_1.default; } });
+var constants_js_1 = require("./dream/constants.js");
+Object.defineProperty(exports, "DreamConst", { enumerable: true, get: function () { return constants_js_1.DreamConst; } });
+Object.defineProperty(exports, "openapiPrimitiveTypes", { enumerable: true, get: function () { return constants_js_1.openapiPrimitiveTypes; } });
+Object.defineProperty(exports, "openapiShorthandPrimitiveTypes", { enumerable: true, get: function () { return constants_js_1.openapiShorthandPrimitiveTypes; } });
 var DreamTransaction_js_1 = require("./dream/DreamTransaction.js");
 Object.defineProperty(exports, "DreamTransaction", { enumerable: true, get: function () { return DreamTransaction_js_1.default; } });
 var Query_js_1 = require("./dream/Query.js");
 Object.defineProperty(exports, "Query", { enumerable: true, get: function () { return Query_js_1.default; } });
-var types_js_1 = require("./dream/types.js");
-Object.defineProperty(exports, "DreamConst", { enumerable: true, get: function () { return types_js_1.DreamConst; } });
 var index_js_5 = require("./encrypt/index.js");
 Object.defineProperty(exports, "Encrypt", { enumerable: true, get: function () { return index_js_5.default; } });
 var NonLoadedAssociation_js_1 = require("./errors/associations/NonLoadedAssociation.js");
@@ -102,6 +104,8 @@ var serializerNameFromFullyQualifiedModelName_js_1 = require("./helpers/serializ
 Object.defineProperty(exports, "serializerNameFromFullyQualifiedModelName", { enumerable: true, get: function () { return serializerNameFromFullyQualifiedModelName_js_1.default; } });
 var snakeify_js_1 = require("./helpers/snakeify.js");
 Object.defineProperty(exports, "snakeify", { enumerable: true, get: function () { return snakeify_js_1.default; } });
+var sort_js_1 = require("./helpers/sort.js");
+Object.defineProperty(exports, "sort", { enumerable: true, get: function () { return sort_js_1.default; } });
 var sortBy_js_1 = require("./helpers/sortBy.js");
 Object.defineProperty(exports, "sortBy", { enumerable: true, get: function () { return sortBy_js_1.default; } });
 var standardizeFullyQualifiedModelName_js_1 = require("./helpers/standardizeFullyQualifiedModelName.js");
@@ -110,9 +114,6 @@ var uncapitalize_js_1 = require("./helpers/uncapitalize.js");
 Object.defineProperty(exports, "uncapitalize", { enumerable: true, get: function () { return uncapitalize_js_1.default; } });
 var uniq_js_1 = require("./helpers/uniq.js");
 Object.defineProperty(exports, "uniq", { enumerable: true, get: function () { return uniq_js_1.default; } });
-var types_js_2 = require("./openapi/types.js");
-Object.defineProperty(exports, "openapiPrimitiveTypes", { enumerable: true, get: function () { return types_js_2.openapiPrimitiveTypes; } });
-Object.defineProperty(exports, "openapiShorthandPrimitiveTypes", { enumerable: true, get: function () { return types_js_2.openapiShorthandPrimitiveTypes; } });
 var index_js_6 = require("./ops/index.js");
 Object.defineProperty(exports, "ops", { enumerable: true, get: function () { return index_js_6.default; } });
 var RendersMany_js_1 = require("./serializer/decorators/associations/RendersMany.js");

package/dist/cjs/src/ops/ops-statement.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const types_js_1 = require("../dream/types.js");
+const constants_js_1 = require("../dream/constants.js");
 const ScoreMustBeANormalNumber_js_1 = require("../errors/ops/ScoreMustBeANormalNumber.js");
 class OpsStatement {
     operator;
@@ -24,10 +24,10 @@ class OpsStatement {
         return true;
     }
     get shouldBypassWhereStatement() {
-        return types_js_1.TRIGRAM_OPERATORS.includes(this.operator);
+        return constants_js_1.TRIGRAM_OPERATORS.includes(this.operator);
     }
     get minTrigramScore() {
-        if (types_js_1.TRIGRAM_OPERATORS.includes(this.operator)) {
+        if (constants_js_1.TRIGRAM_OPERATORS.includes(this.operator)) {
             return this.extraArgs?.score;
         }
         else {

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const index_js_1 = require("../dream-application/index.js");
-const types_js_1 = require("../dream/types.js");
+const constants_js_1 = require("../dream/constants.js");
 const GlobalNameNotSet_js_1 = require("../errors/dream-application/GlobalNameNotSet.js");
 const MissingSerializersDefinition_js_1 = require("../errors/MissingSerializersDefinition.js");
 const FailedToRenderThroughAssociationForSerializer_js_1 = require("../errors/serializers/FailedToRenderThroughAssociationForSerializer.js");
@@ -213,7 +213,7 @@ class DreamSerializer {
         return new SerializerClass(associatedData).absorbPassthrough(this).render();
     }
     associatedData(associationStatement) {
-        const delegateToPassthroughData = associationStatement.source === types_js_1.DreamConst.passthrough;
+        const delegateToPassthroughData = associationStatement.source === constants_js_1.DreamConst.passthrough;
         let self = (delegateToPassthroughData ? this.$passthroughData : this.$data);
         if (associationStatement.through) {
             const throughField = associationStatement.through;

package/dist/esm/src/Dream.js

@@ -1,7 +1,7 @@
 import { pgErrorType } from './db/errors.js';
 import db from './db/index.js';
 import associationToGetterSetterProp from './decorators/field/association/associationToGetterSetterProp.js';
-import { blankAssociationsFactory, } from './decorators/field/association/shared.js';
+import { blankAssociationsFactory } from './decorators/field/association/shared.js';
 import { blankHooksFactory } from './decorators/field/lifecycle/shared.js';
 import resortAllRecords from './decorators/field/sortable/helpers/resortAllRecords.js';
 import DreamClassTransactionBuilder from './dream/DreamClassTransactionBuilder.js';
@@ -369,9 +369,8 @@ export default class Dream {
         return this.constructor.stiBaseClassOrOwnClassName;
     }
     /**
-     * @internal
-     *
-     * Shadows .sanitizedName. Returns a string
+     * this.constructor.name may be prefixed with an underscore during conversion to Javascript.
+     * This method returns the constructor name without a leading underscore.
      *
      * @returns A string
      */

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

@@ -55,8 +55,8 @@ export type Timestamp = ColumnType<DateTime | CalendarDate>`);
 }
 function addCustomImports(file) {
     const customImports = EnvInternal.boolean('DREAM_CORE_DEVELOPMENT')
-        ? "import CalendarDate from '../../src/helpers/CalendarDate.js'\nimport { DateTime } from '../../src/helpers/DateTime.js'"
-        : "import { CalendarDate, DateTime } from '@rvoh/dream'";
+        ? "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 `${autogeneratedFileDisclaimer()}${customImports}
 ${file}`;
 }

package/dist/esm/src/cli/logger/loggable/DreamCliLoggableSpinner.js

@@ -1,6 +1,6 @@
+import DreamCLI from '../../index.js';
 import createSpinner from '../helpers/createSpinner.js';
 import DreamCliLoggable from './DreamCliLoggable.js';
-import DreamCLI from '../../index.js';
 export default class DreamCliLoggableSpinner extends DreamCliLoggable {
     text;
     spinner;

package/dist/esm/src/decorators/field/association/shared.js

@@ -1,5 +1,5 @@
 import pluralize from 'pluralize-esm';
-import { DreamConst, } from '../../../dream/types.js';
+import { DreamConst } from '../../../dream/constants.js';
 import { checkForeignKey } from '../../../errors/associations/InvalidComputedForeignKey.js';
 import NonLoadedAssociation from '../../../errors/associations/NonLoadedAssociation.js';
 import CannotDefineAssociationWithBothDependentAndPassthrough from '../../../errors/CannotDefineAssociationWithBothDependentAndPassthrough.js';
@@ -21,6 +21,11 @@ export function blankAssociationsFactory(dreamClass, { freeze = false, } = {}) {
         return freezeBaseClassArrayMap(associationsMap);
     return associationsMap;
 }
+// function hydratedSourceValue(dream: Dream | typeof Dream | undefined, sourceName: string) {
+//   if (!dream) return
+//   if (!sourceName) return
+//   return (dream as any)[sourceName] || (dream as any)[singular(sourceName)]
+// }
 export function finalForeignKey(foreignKey, dreamClass, partialAssociation) {
     let computedForeignKey = foreignKey;
     if (!computedForeignKey) {
@@ -116,8 +121,3 @@ export function validateHasStatementArgs({ dreamClass, dependent, methodName, on
     if (dependent && hasRequiredOn)
         throw new CannotDefineAssociationWithBothDependentAndRequiredOnClause(dreamClass, methodName);
 }
-// function hydratedSourceValue(dream: Dream | typeof Dream | undefined, sourceName: string) {
-//   if (!dream) return
-//   if (!sourceName) return
-//   return (dream as any)[sourceName] || (dream as any)[singular(sourceName)]
-// }

package/dist/esm/src/dream/Query.js

@@ -35,13 +35,13 @@ import uniq from '../helpers/uniq.js';
 import CurriedOpsStatement from '../ops/curried-ops-statement.js';
 import ops from '../ops/index.js';
 import OpsStatement from '../ops/ops-statement.js';
+import { DreamConst } from './constants.js';
 import executeDatabaseQuery from './internal/executeDatabaseQuery.js';
 import extractAssociationMetadataFromAssociationName from './internal/extractAssociationMetadataFromAssociationName.js';
 import orderByDirection from './internal/orderByDirection.js';
 import shouldBypassDefaultScope from './internal/shouldBypassDefaultScope.js';
 import SimilarityBuilder from './internal/similarity/SimilarityBuilder.js';
 import sqlResultToDreamInstance from './internal/sqlResultToDreamInstance.js';
-import { DreamConst, } from './types.js';
 export default class Query extends ConnectedToDB {
     /**
      * @internal

package/dist/esm/src/{openapi/types.js → dream/constants.js}

@@ -1,3 +1,15 @@
+export const primaryKeyTypes = ['bigserial', 'bigint', 'uuid', 'integer'];
+export const TRIGRAM_OPERATORS = ['%', '<%', '<<%'];
+class RequiredAttribute {
+    constructor() { }
+}
+class PassthroughAttribute {
+    constructor() { }
+}
+export const DreamConst = {
+    passthrough: PassthroughAttribute,
+    required: RequiredAttribute,
+};
 export const openapiPrimitiveTypes = [
     'string',
     'boolean',

package/dist/esm/src/dream/internal/similarity/SimilarityBuilder.js

@@ -5,7 +5,7 @@ import validateTable from '../../../db/validators/validateTable.js';
 import validateTableAlias from '../../../db/validators/validateTableAlias.js';
 import namespaceColumn from '../../../helpers/namespaceColumn.js';
 import { isObject } from '../../../helpers/typechecks.js';
-import { TRIGRAM_OPERATORS, } from '../../types.js';
+import { TRIGRAM_OPERATORS } from '../../constants.js';
 import similaritySelectSql from './similaritySelectSql.js';
 import similarityWhereSql from './similarityWhereSql.js';
 export default class SimilarityBuilder extends ConnectedToDB {

package/dist/esm/src/errors/associations/InvalidComputedForeignKey.js

@@ -1,4 +1,4 @@
-import { modelCBtoSingleDreamClass, } from '../../decorators/field/association/shared.js';
+import { modelCBtoSingleDreamClass } from '../../decorators/field/association/shared.js';
 export class InvalidComputedForeignKey extends Error {
     dreamClass;
     partialAssociation;

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

@@ -4,7 +4,7 @@ import * as path from 'path';
 import { isPrimitiveDataType } from '../../db/dataTypes.js';
 import _db from '../../db/index.js';
 import DreamApplication from '../../dream-application/index.js';
-import { DreamConst } from '../../dream/types.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';
@@ -23,8 +23,8 @@ import {
 } from './db.js'`
             : '';
         const calendarDateImportStatement = EnvInternal.boolean('DREAM_CORE_DEVELOPMENT')
-            ? "import CalendarDate from '../../src/helpers/CalendarDate.js'\nimport { DateTime } from '../../src/helpers/DateTime.js'"
-            : "import { CalendarDate, DateTime } from '@rvoh/dream'";
+            ? "import type CalendarDate from '../../src/helpers/CalendarDate.js'\nimport { type DateTime } from '../../src/helpers/DateTime.js'"
+            : "import { type CalendarDate, type DateTime } from '@rvoh/dream'";
         const dreamApp = DreamApplication.getOrFail();
         const newSchemaFileContents = `\
 ${autogeneratedFileDisclaimer()}

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

@@ -36,7 +36,7 @@ export default async function generateDream({ fullyQualifiedModelName, columnsWi
     const isSTI = !!fullyQualifiedParentName;
     if (columnsWithTypes.length || !isSTI) {
         await generateMigration({
-            migrationName: fullyQualifiedModelName,
+            migrationName: `Create${fullyQualifiedModelName}`,
             columnsWithTypes,
             fullyQualifiedModelName,
             fullyQualifiedParentName,

package/dist/esm/src/helpers/db/primaryKeyType.js

@@ -1,5 +1,5 @@
 import DreamApplication from '../../dream-application/index.js';
-import { primaryKeyTypes } from '../../dream/types.js';
+import { primaryKeyTypes } from '../../dream/constants.js';
 export default function primaryKeyType() {
     const dreamconf = DreamApplication.getOrFail();
     switch (dreamconf.primaryKeyType) {

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

@@ -1,5 +1,7 @@
 export default function isEmpty(value) {
     if (Array.isArray(value))
         return value.length === 0;
+    if (value instanceof Map || value instanceof Set)
+        return value.size === 0;
     return Object.keys(value).length === 0;
 }

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

@@ -0,0 +1,21 @@
+import sortBy from './sortBy.js';
+/**
+ * Returns a copy of array containing strings, numbers, bigints, and/or IdTypes, sorted in ascending order.
+ * To sort other types use {@link sortBy}.
+ *
+ *  ```ts
+ * import { sort } from '@rvoh/dream'
+ *
+ * sort([2, 1, 3])
+ * // [1, 2, 3]
+ *
+ * sort(['world', 'Hello', 'hello', 'World'])
+ * // ['hello', 'Hello', 'world', 'World']
+ * ```
+ */
+export default function sort(array) {
+    if (typeof array[0] === 'bigint') {
+        return sortBy(array, a => String(a));
+    }
+    return sortBy(array, a => a);
+}