@rvoh/dream 0.31.0 → 0.31.2

package/dist/esm/src/decorators/Decorators.js

@@ -27,13 +27,13 @@ export default class Decorators {
      *
      * ```ts
      * class UserSettings extends ApplicationModel {
-     *   @Deco.BelongsTo('User')
+     *   @deco.BelongsTo('User')
      *   public user: User
      *   public userId: DreamColumn<UserSettings, 'userId'>
      * }
      *
      * class User extends ApplicationModel {
-     *   @Deco.HasOne('UserSettings')
+     *   @deco.HasOne('UserSettings')
      *   public userSettings: UserSettings
      * }
      * ```
@@ -55,12 +55,12 @@ export default class Decorators {
      *
      * ```ts
      * class User extends ApplicationModel {
-     *   @Deco.HasMany('Post')
+     *   @deco.HasMany('Post')
      *   public posts: Post[]
      * }
      *
      * class Post extends ApplicationModel {
-     *   @Deco.BelongsTo('User')
+     *   @deco.BelongsTo('User')
      *   public user: User
      *   public userId: DreamColumn<Post, 'userId'>
      * }
@@ -80,12 +80,12 @@ export default class Decorators {
      *
      * ```ts
      * class User extends ApplicationModel {
-     *   @Deco.HasOne('UserSettings')
+     *   @deco.HasOne('UserSettings')
      *   public userSettings: UserSettings
      * }
      *
      * class UserSettings extends ApplicationModel {
-     *   @Deco.BelongsTo('User')
+     *   @deco.BelongsTo('User')
      *   public user: User
      *   public userId: DreamColumn<UserSettings, 'userId'>
      * }
@@ -108,14 +108,14 @@ export default class Decorators {
      *
      * ```ts
      * class User {
-     *   @Deco.Encrypted()
+     *   @deco.Encrypted()
      *   // automatically sets `encryptedSsn` to the encrypted value that
      *   // `ssn` is set to in new/create/update, e.g., `await user.update({ ssn })`
      *   public ssn: string
      *
      *   // automatically sets `myEncryptedPhone` to the encrypted value that
      *   // `phone` is set to new/create/update, e.g., `await user.update({ phone })`
-     *   @Deco.Encrypted('myEncryptedPhone)
+     *   @deco.Encrypted('myEncryptedPhone)
      *   public phone: string
      * }
      * ```
@@ -132,7 +132,7 @@ export default class Decorators {
      *
      * ```ts
      * class Collar {
-     *   @Deco.Scope({ default: true })
+     *   @deco.Scope({ default: true })
      *   public static hideHiddenCollars(query: Query<Collar>) {
      *     return query.where({ hidden: false })
      *   }
@@ -154,7 +154,7 @@ export default class Decorators {
      *
      * ```ts
      * class Balloon {
-     *   @Deco.Sortable({ scope: 'user' })
+     *   @deco.Sortable({ scope: 'user' })
      *   public position: DreamColumn<Balloon, 'position'>
      * }
      * ```
@@ -172,7 +172,7 @@ export default class Decorators {
      *
      * ```ts
      * class Sandbag {
-     *   @Deco.Validate()
+     *   @deco.Validate()
      *   public validateWeight(this: Sandbag) {
      *     if (!this.weight) return
      *
@@ -197,7 +197,7 @@ export default class Decorators {
      *
      * ```ts
      * class Balloon {
-     *   @Deco.Validates('numericality', { min: 0, max: 100 })
+     *   @deco.Validates('numericality', { min: 0, max: 100 })
      *   public volume: DreamColumn<Balloon, 'volume'>
      * }
      * ```
@@ -231,7 +231,7 @@ export default class Decorators {
      *
      * ```ts
      * class BodyMeasurement {
-     *   @Deco.Virtual()
+     *   @deco.Virtual()
      *   public get lbs() {
      *     const self: User = this
      *     return gramsToLbs(self.getAttribute('grams') ?? 0)
@@ -242,7 +242,7 @@ export default class Decorators {
      *     self.setAttribute('grams', lbsToGrams(lbs))
      *   }
      *
-     *   @Deco.Virtual()
+     *   @deco.Virtual()
      *   public get kilograms() {
      *     const self: User = this
      *     return gramsToKilograms(self.getAttribute('grams') ?? 0)
@@ -258,10 +258,10 @@ export default class Decorators {
      *
      * ```ts
      * class User {
-     *   @Deco.Virtual()
+     *   @deco.Virtual()
      *   public password: string
      *
-     *   @Deco.BeforeSave()
+     *   @deco.BeforeSave()
      *   public hasPassword() {
      *     this.setAttribute('hashedPassword', preferredHashingAlgorithm(this.password))
      *   }
@@ -278,7 +278,7 @@ export default class Decorators {
      *
      * ```ts
      * class User {
-     *   @Deco.BeforeCreate()
+     *   @deco.BeforeCreate()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -296,7 +296,7 @@ export default class Decorators {
      *
      * ```ts
      * class User {
-     *   @Deco.BeforeSave()
+     *   @deco.BeforeSave()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -314,7 +314,7 @@ export default class Decorators {
      *
      * ```ts
      * class User {
-     *   @Deco.BeforeUpdate()
+     *   @deco.BeforeUpdate()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -332,7 +332,7 @@ export default class Decorators {
      *
      * ```ts
      * class User {
-     *   @Deco.BeforeDestroy()
+     *   @deco.BeforeDestroy()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -349,7 +349,7 @@ export default class Decorators {
      *
      * ```ts
      * class User {
-     *   @Deco.AfterCreate()
+     *   @deco.AfterCreate()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -367,7 +367,7 @@ export default class Decorators {
      *
      * ```ts
      * class User {
-     *   @Deco.AfterCreateCommit()
+     *   @deco.AfterCreateCommit()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -384,7 +384,7 @@ export default class Decorators {
      *
      * ```ts
      * class User {
-     *   @Deco.AfterSave()
+     *   @deco.AfterSave()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -402,7 +402,7 @@ export default class Decorators {
      *
      * ```ts
      * class User {
-     *   @Deco.AfterSaveCommit()
+     *   @deco.AfterSaveCommit()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -420,7 +420,7 @@ export default class Decorators {
      *
      * ```ts
      * class User {
-     *   @Deco.AfterUpdate()
+     *   @deco.AfterUpdate()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -438,7 +438,7 @@ export default class Decorators {
      *
      * ```ts
      * class User {
-     *   @Deco.AfterUpdateCommit()
+     *   @deco.AfterUpdateCommit()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -456,7 +456,7 @@ export default class Decorators {
      *
      * ```ts
      * class User {
-     *   @Deco.AfterDestroy()
+     *   @deco.AfterDestroy()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -474,7 +474,7 @@ export default class Decorators {
      *
      * ```ts
      * class User {
-     *   @Deco.AfterDestroyCommit()
+     *   @deco.AfterDestroyCommit()
      *   public doSomething() {
      *     console.log('hi!')
      *   }

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

@@ -8,13 +8,13 @@ import { applyGetterAndSetter, associationPrimaryKeyAccessors, blankAssociations
  *
  * ```ts
  * class UserSettings extends ApplicationModel {
- *   @Deco.BelongsTo('User')
+ *   @deco.BelongsTo('User')
  *   public user: User
  *   public userId: DreamColumn<UserSettings, 'userId'>
  * }
  *
  * class User extends ApplicationModel {
- *   @Deco.HasOne('UserSettings')
+ *   @deco.HasOne('UserSettings')
  *   public userSettings: UserSettings
  * }
  * ```

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

@@ -7,12 +7,12 @@ import { applyGetterAndSetter, associationPrimaryKeyAccessors, blankAssociations
  *
  * ```ts
  * class User extends ApplicationModel {
- *   @Deco.HasMany('Post')
+ *   @deco.HasMany('Post')
  *   public posts: Post[]
  * }
  *
  * class Post extends ApplicationModel {
- *   @Deco.BelongsTo('User')
+ *   @deco.BelongsTo('User')
  *   public user: User
  *   public userId: DreamColumn<Post, 'userId'>
  * }

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

@@ -7,12 +7,12 @@ import { applyGetterAndSetter, associationPrimaryKeyAccessors, blankAssociations
  *
  * ```ts
  * class User extends ApplicationModel {
- *   @Deco.HasOne('UserSettings')
+ *   @deco.HasOne('UserSettings')
  *   public userSettings: UserSettings
  * }
  *
  * class UserSettings extends ApplicationModel {
- *   @Deco.BelongsTo('User')
+ *   @deco.BelongsTo('User')
  *   public user: User
  *   public userId: DreamColumn<UserSettings, 'userId'>
  * }

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/decorators/field/lifecycle/AfterCreateCommit.js

@@ -8,7 +8,7 @@ import { blankHooksFactory } from './shared.js';
  * is complete.
  *
  * class User extends ApplicationModel {
- *   @Deco.AfterCreateCommit()
+ *   @deco.AfterCreateCommit()
  *   public doSomething() {
  *     ...
  *   }

package/dist/esm/src/decorators/field/lifecycle/AfterDestroyCommit.js

@@ -8,7 +8,7 @@ import { blankHooksFactory } from './shared.js';
  * is complete.
  *
  * class User extends ApplicationModel {
- *   @Deco.AfterDestroyCommit()
+ *   @deco.AfterDestroyCommit()
  *   public doSomething() {
  *     ...
  *   }

package/dist/esm/src/decorators/field/lifecycle/AfterSaveCommit.js

@@ -8,7 +8,7 @@ import { blankHooksFactory } from './shared.js';
  * is complete.
  *
  * class User extends ApplicationModel {
- *   @Deco.AfterSaveCommit()
+ *   @deco.AfterSaveCommit()
  *   public doSomething() {
  *     ...
  *   }

package/dist/esm/src/decorators/field/lifecycle/AfterUpdateCommit.js

@@ -8,7 +8,7 @@ import { blankHooksFactory } from './shared.js';
  * is complete.
  *
  * class User extends ApplicationModel {
- *   @Deco.AfterUpdateCommit()
+ *   @deco.AfterUpdateCommit()
  *   public doSomething() {
  *     ...
  *   }

package/dist/esm/src/decorators/field/validation/Validates.js

@@ -51,7 +51,7 @@ function extractValidationOptionsFromArgs(type, args) {
           When validating using "length", the second argument must be a number representing
           the min length, or else an object expressing both min and max length, like so:
 
-          @Deco.Validates('length', { min: 4, max: 32 })
+          @deco.Validates('length', { min: 4, max: 32 })
         `);
             }
         case 'requiredBelongsTo':

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

@@ -513,10 +513,10 @@ export default class DreamClassTransactionBuilder {
      *
      * ```ts
      * class Post {
-     *   @Deco.HasMany('LocalizedText')
+     *   @deco.HasMany('LocalizedText')
      *   public localizedTexts: LocalizedText[]
      *
-     *   @Deco.HasOne('LocalizedText', {
+     *   @deco.HasOne('LocalizedText', {
      *     where: { locale: DreamConst.passthrough },
      *   })
      *   public currentLocalizedText: LocalizedText

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
@@ -761,10 +761,10 @@ export default class Query extends ConnectedToDB {
      *
      * ```ts
      * class Post {
-     *   @Deco.HasMany('LocalizedText')
+     *   @deco.HasMany('LocalizedText')
      *   public localizedTexts: LocalizedText[]
      *
-     *   @Deco.HasOne('LocalizedText', {
+     *   @deco.HasOne('LocalizedText', {
      *     on: { locale: DreamConst.passthrough },
      *   })
      *   public currentLocalizedText: LocalizedText

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/cli/generateDreamContent.js

@@ -35,7 +35,7 @@ export default function generateDreamContent({ fullyQualifiedModelName, columnsW
             case 'belongs_to':
                 modelImportStatements.push(associationImportStatement);
                 return `
-@Deco.BelongsTo('${fullyQualifiedAssociatedModelName}'${descriptors.includes('optional') ? ', { optional: true }' : ''})
+@deco.BelongsTo('${fullyQualifiedAssociatedModelName}'${descriptors.includes('optional') ? ', { optional: true }' : ''})
 public ${associationName}: ${associationModelName}${descriptors.includes('optional') ? ' | null' : ''}
 public ${associationName}Id: DreamColumn<${modelClassName}, '${associationName}Id'>
 `;
@@ -73,7 +73,7 @@ public ${camelize(attributeName)}: ${getAttributeType(attribute, modelClassName)
     return `\
 import { ${uniq(dreamImports).join(', ')} } from '@rvoh/dream'${uniq(modelImportStatements).join('')}
 
-const Deco = new Decorators<InstanceType<typeof ${modelClassName}>>()
+const deco = new Decorators<InstanceType<typeof ${modelClassName}>>()
 
 ${isSTI ? `\n@STI(${parentModelClassName})` : ''}
 export default class ${modelClassName} extends ${isSTI ? parentModelClassName : 'ApplicationModel'} {

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/db/runMigration.js

@@ -86,14 +86,14 @@ function migratedActionPastTense(mode) {
 function logResults(results, mode) {
     results?.forEach(it => {
         if (it.status === 'Success') {
-            DreamCLI.logger.log(colorize(`[db]`, { color: 'cyan' }) +
-                ` migration "${it.migrationName}" was ${migratedActionPastTense(mode)} successfully`, { permanent: true, logPrefix: '├', logPrefixColor: 'cyan' });
+            DreamCLI.logger.logContinueProgress(colorize(`[db]`, { color: 'cyan' }) +
+                ` migration "${it.migrationName}" was ${migratedActionPastTense(mode)} successfully`, { logPrefixColor: 'cyan' });
         }
         else if (it.status === 'Error') {
-            DreamCLI.logger.log(JSON.stringify(it, null, 2), { permanent: true });
-            DreamCLI.logger.log(colorize(`failed to ${migratedActionCurrentTense(mode)} migration "${it.migrationName}"`, {
+            DreamCLI.logger.logContinueProgress(JSON.stringify(it, null, 2));
+            DreamCLI.logger.logContinueProgress(colorize(`failed to ${migratedActionCurrentTense(mode)} migration "${it.migrationName}"`, {
                 color: 'redBright',
-            }), { permanent: true });
+            }));
         }
     });
 }

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);
+}

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

@@ -1,3 +1,22 @@
+/**
+ * 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]
+ * ```
+ */
 export default function sortBy(array, valueToCompare) {
     const arrayClone = [...array];
     return arrayClone.sort((a, b) => {
@@ -7,8 +26,6 @@ export default 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/esm/src/helpers/sspawn.js

@@ -3,15 +3,41 @@ export default function sspawn(command, opts = {}) {
     return new Promise((accept, reject) => {
         ssspawn(command, opts).on('close', code => {
             if (code !== 0)
-                reject(new Error(code?.toString()));
+                reject(code);
             accept({});
         });
     });
 }
 export function ssspawn(command, opts = {}) {
-    return spawn(command, {
-        stdio: 'inherit',
+    const proc = spawn(command, {
+        // even though github security scans want to remove this,
+        // it is necessary to allow the cli util to run as the current
+        // user. This is only done to provision a new psychic application,
+        // so it is safe from unknown execution contexts.
         shell: true,
         ...opts,
     });
+    // NOTE: adding this stdout spy so that
+    // when this cli utility runs node commands,
+    // it can properly hijack the stdout from the command
+    proc.stdout.on('data', chunk => {
+        const txt = chunk?.toString()?.trim();
+        if (typeof txt !== 'string' || !txt)
+            return;
+        if (opts?.onStdout) {
+            opts?.onStdout?.(txt);
+        }
+        else {
+            console.log(txt);
+        }
+    });
+    proc.stdout.on('error', err => {
+        console.log('sspawn error!');
+        console.error(err);
+    });
+    proc.on('error', err => {
+        console.log('sspawn error!');
+        console.error(err);
+    });
+    return proc;
 }

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

@@ -1,17 +1,18 @@
 export default 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);