@rvoh/dream 0.43.0-beta.5 → 0.43.0-beta.7

package/dist/cjs/src/Dream.js

@@ -48,7 +48,6 @@ const DateTime_js_1 = require("./helpers/DateTime.js");
 const cachedTypeForAttribute_js_1 = require("./helpers/db/cachedTypeForAttribute.js");
 const isJsonColumn_js_1 = require("./helpers/db/types/isJsonColumn.js");
 const notEqual_js_1 = require("./helpers/notEqual.js");
-const typechecks_js_1 = require("./helpers/typechecks.js");
 class Dream {
     DB;
     /**
@@ -2077,7 +2076,7 @@ class Dream {
                                 ? null
                                 : val === undefined
                                     ? undefined
-                                    : (0, typechecks_js_1.isString)(val)
+                                    : typeof val === 'string'
                                         ? val
                                         : JSON.stringify(val));
                         },
@@ -2480,7 +2479,7 @@ class Dream {
     unknownValueToMillis(currentValue) {
         if (!currentValue)
             return;
-        if ((0, typechecks_js_1.isString)(currentValue))
+        if (typeof currentValue === 'string')
             currentValue = DateTime_js_1.DateTime.fromISO(currentValue);
         if (currentValue instanceof CalendarDate_js_1.default)
             currentValue = currentValue.toDateTime();
@@ -2493,7 +2492,7 @@ class Dream {
     unknownValueToDateString(currentValue) {
         if (!currentValue)
             return;
-        if ((0, typechecks_js_1.isString)(currentValue))
+        if (typeof currentValue === 'string')
             currentValue = CalendarDate_js_1.default.fromISO(currentValue);
         if (currentValue instanceof DateTime_js_1.DateTime)
             currentValue = CalendarDate_js_1.default.fromDateTime(currentValue);

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

@@ -32,13 +32,13 @@ const cloneDeepSafe_js_1 = require("../helpers/cloneDeepSafe.js");
 const compact_js_1 = require("../helpers/compact.js");
 const DateTime_js_1 = require("../helpers/DateTime.js");
 const isEmpty_js_1 = require("../helpers/isEmpty.js");
+const isObject_js_1 = require("../helpers/isObject.js");
 const namespaceColumn_js_1 = require("../helpers/namespaceColumn.js");
 const normalizeString_js_1 = require("../helpers/normalizeString.js");
 const objectPathsToArrays_js_1 = require("../helpers/objectPathsToArrays.js");
 const protectAgainstPollutingAssignment_js_1 = require("../helpers/protectAgainstPollutingAssignment.js");
 const range_js_1 = require("../helpers/range.js");
 const snakeify_js_1 = require("../helpers/snakeify.js");
-const typechecks_js_1 = require("../helpers/typechecks.js");
 const uniq_js_1 = require("../helpers/uniq.js");
 const curried_ops_statement_js_1 = require("../ops/curried-ops-statement.js");
 const index_js_2 = require("../ops/index.js");
@@ -551,7 +551,7 @@ class Query extends ConnectedToDB_js_1.default {
         if (nextAssociationStatement === undefined) {
             // just satisfying typing
         }
-        else if ((0, typechecks_js_1.isString)(nextAssociationStatement)) {
+        else if (typeof nextAssociationStatement === 'string') {
             const nextStatement = nextAssociationStatement;
             if (!joinStatements[nextStatement])
                 joinStatements[(0, protectAgainstPollutingAssignment_js_1.default)(nextStatement)] = {};
@@ -573,7 +573,7 @@ class Query extends ConnectedToDB_js_1.default {
             });
             //
         }
-        else if ((0, typechecks_js_1.isObject)(nextAssociationStatement) && previousAssociationName) {
+        else if ((0, isObject_js_1.default)(nextAssociationStatement) && previousAssociationName) {
             const clonedNextAssociationStatement = (0, cloneDeepSafe_js_1.default)(nextAssociationStatement);
             const keys = Object.keys(clonedNextAssociationStatement);
             keys.forEach((key) => {
@@ -908,7 +908,7 @@ class Query extends ConnectedToDB_js_1.default {
     order(arg) {
         if (arg === null)
             return this.clone({ order: null });
-        if ((0, typechecks_js_1.isString)(arg))
+        if (typeof arg === 'string')
             return this.clone({ order: [{ column: arg, direction: 'asc' }] });
         let query = this.clone();
         Object.keys(arg).forEach(key => {
@@ -1190,7 +1190,7 @@ class Query extends ConnectedToDB_js_1.default {
                     kyselyQuery = kyselyQuery.select(`${this.namespaceColumn(dbColumnName, association.through)} as ${columnAlias}`);
                 };
                 if (association.through && association.preloadThroughColumns) {
-                    if ((0, typechecks_js_1.isObject)(association.preloadThroughColumns)) {
+                    if ((0, isObject_js_1.default)(association.preloadThroughColumns)) {
                         const preloadMap = association.preloadThroughColumns;
                         Object.keys(preloadMap).forEach(columnName => setupPreloadData(columnName));
                     }
@@ -1302,7 +1302,7 @@ class Query extends ConnectedToDB_js_1.default {
             return;
         let columnNames = [];
         const columnNameToPreloadedThroughColumnNameMap = {};
-        if ((0, typechecks_js_1.isObject)(association.preloadThroughColumns)) {
+        if ((0, isObject_js_1.default)(association.preloadThroughColumns)) {
             const preloadMap = association.preloadThroughColumns;
             columnNames = Object.keys(preloadMap).map(columnName => {
                 columnNameToPreloadedThroughColumnNameMap[columnName] = preloadMap[columnName];
@@ -1935,7 +1935,7 @@ class Query extends ConnectedToDB_js_1.default {
         const columnsToPluck = dreamClassToHydrateColumns.map(column => this.namespaceColumn(column.toString(), alias));
         const asHasAssociation = association;
         if (asHasAssociation.through && asHasAssociation.preloadThroughColumns) {
-            if ((0, typechecks_js_1.isObject)(asHasAssociation.preloadThroughColumns)) {
+            if ((0, isObject_js_1.default)(asHasAssociation.preloadThroughColumns)) {
                 const preloadMap = asHasAssociation.preloadThroughColumns;
                 Object.keys(preloadMap).forEach(preloadThroughColumn => {
                     throughColumnsToHydrate.push(preloadMap[preloadThroughColumn]);
@@ -2364,7 +2364,7 @@ class Query extends ConnectedToDB_js_1.default {
             return query;
         let selectQuery = query;
         const orderStatement = association.order;
-        if ((0, typechecks_js_1.isString)(orderStatement)) {
+        if (typeof orderStatement === 'string') {
             selectQuery = selectQuery.orderBy(this.namespaceColumn(orderStatement, tableNameOrAlias), 'asc');
         }
         else {
@@ -2501,7 +2501,11 @@ class Query extends ConnectedToDB_js_1.default {
         else if (Array.isArray(val)) {
             a = attr;
             b = 'in';
-            c = val.map(v => v instanceof DateTime_js_1.DateTime || v instanceof CalendarDate_js_1.default ? v.toSQL() : (0, typechecks_js_1.isString)(v) ? (0, normalizeString_js_1.default)(v) : v);
+            c = val.map(v => v instanceof DateTime_js_1.DateTime || v instanceof CalendarDate_js_1.default
+                ? v.toSQL()
+                : typeof v === 'string'
+                    ? (0, normalizeString_js_1.default)(v)
+                    : v);
         }
         else if (val instanceof curried_ops_statement_js_1.default) {
             val = val.toOpsStatement(this.dreamClass, attr);
@@ -2544,11 +2548,11 @@ class Query extends ConnectedToDB_js_1.default {
         }
         if (c instanceof DateTime_js_1.DateTime || c instanceof CalendarDate_js_1.default)
             c = c.toSQL();
-        else if ((0, typechecks_js_1.isString)(c))
+        else if (typeof c === 'string')
             c = (0, normalizeString_js_1.default)(c);
         if (c2 instanceof DateTime_js_1.DateTime || c2 instanceof CalendarDate_js_1.default)
             c2 = c2.toSQL();
-        else if ((0, typechecks_js_1.isString)(c2))
+        else if (typeof c2 === 'string')
             c2 = (0, normalizeString_js_1.default)(c2);
         if (a && c === undefined)
             throw new CannotPassUndefinedAsAValueToAWhereClause_js_1.default(this.dreamClass, a);

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

@@ -6,8 +6,8 @@ const ConnectedToDB_js_1 = require("../../../db/ConnectedToDB.js");
 const validateColumn_js_1 = require("../../../db/validators/validateColumn.js");
 const validateTable_js_1 = require("../../../db/validators/validateTable.js");
 const validateTableAlias_js_1 = require("../../../db/validators/validateTableAlias.js");
+const isObject_js_1 = require("../../../helpers/isObject.js");
 const namespaceColumn_js_1 = require("../../../helpers/namespaceColumn.js");
-const typechecks_js_1 = require("../../../helpers/typechecks.js");
 const constants_js_1 = require("../../constants.js");
 const similaritySelectSql_js_1 = require("./similaritySelectSql.js");
 const similarityWhereSql_js_1 = require("./similarityWhereSql.js");
@@ -193,7 +193,7 @@ class SimilarityBuilder extends ConnectedToDB_js_1.default {
                         opsStatement: statementOrValueOrNestedObject,
                     });
                 }
-                else if ((0, typechecks_js_1.isObject)(statementOrValueOrNestedObject) &&
+                else if ((0, isObject_js_1.default)(statementOrValueOrNestedObject) &&
                     !statementOrValueOrNestedObject?.isOpsStatement) {
                     // if it is an object, but not an array, it is likely a nested joins statement,
                     // since joinsWhere objects can take a recursive shape, like:
@@ -319,7 +319,7 @@ function removeJoinAndFromObjectHierarchy(obj) {
     const result = {};
     for (const key in obj) {
         if (Object.prototype.hasOwnProperty.call(obj, key)) {
-            if ((0, typechecks_js_1.isObject)(obj[key])) {
+            if ((0, isObject_js_1.default)(obj[key])) {
                 result[key] = removeJoinAndFromObjectHierarchy(obj[key].and || obj[key]);
             }
             else {

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

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = allNestedObjectKeys;
-const typechecks_js_1 = require("./typechecks.js");
+const isObject_js_1 = require("./isObject.js");
 function allNestedObjectKeys(obj) {
     return Object.keys(obj).flatMap(key => {
         const next = obj[key];
-        if ((0, typechecks_js_1.isObject)(next))
+        if ((0, isObject_js_1.default)(next))
             return [key, allNestedObjectKeys(next)].flat();
         return [key];
     });

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

@@ -5,8 +5,8 @@ exports.default = cloneDeepSafe;
 const ops_statement_js_1 = require("../ops/ops-statement.js");
 const CalendarDate_js_1 = require("./CalendarDate.js");
 const DateTime_js_1 = require("./DateTime.js");
+const isObject_js_1 = require("./isObject.js");
 const range_js_1 = require("./range.js");
-const typechecks_js_1 = require("./typechecks.js");
 /**
  * Accepts any value and returns a valid clone of that object.
  * Dream instances, Query instances, and other special types are
@@ -43,7 +43,7 @@ function cloneDeepSafe(original, unsupportedTypeCloneFunction) {
         return original;
     if (Array.isArray(original))
         return original.map(value => cloneDeepSafe(value, unsupportedTypeCloneFunction));
-    if ((0, typechecks_js_1.isObject)(original) && original.constructor.name === 'Object') {
+    if ((0, isObject_js_1.default)(original) && original.constructor.name === 'Object') {
         const clone = { ...original };
         Object.keys(clone).forEach(key => (clone[key] = cloneDeepSafe(clone[key], unsupportedTypeCloneFunction)));
         return clone;

package/dist/cjs/src/helpers/{typechecks.js → isObject.js}

@@ -1,15 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isString = isString;
-exports.isObject = isObject;
-function isString(x) {
-    return typeof x === 'string' || x instanceof String;
-}
+exports.default = isObject;
+// also in Psychic
 function isObject(x) {
     if (x === null)
         return false;
-    if (isString(x))
-        return false;
     if (Array.isArray(x))
         return false;
     return typeof x === 'object';

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

@@ -2,10 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = normalizeString;
 const index_js_1 = require("../dream-app/index.js");
-const typechecks_js_1 = require("./typechecks.js");
 function normalizeString(val) {
     const normalizationForm = index_js_1.default.getOrFail().unicodeNormalization;
     if (normalizationForm === 'none')
         return val;
-    return (0, typechecks_js_1.isString)(val) ? val.normalize(normalizationForm) : val;
+    return typeof val === 'string' ? val.normalize(normalizationForm) : val;
 }

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

@@ -6,7 +6,6 @@ const DateTime_js_1 = require("./DateTime.js");
 const isDatetimeOrDatetimeArrayColumn_js_1 = require("./db/types/isDatetimeOrDatetimeArrayColumn.js");
 const isTextOrTextArrayColumn_js_1 = require("./db/types/isTextOrTextArrayColumn.js");
 const normalizeString_js_1 = require("./normalizeString.js");
-const typechecks_js_1 = require("./typechecks.js");
 function sqlAttributes(dream) {
     const attributes = dream.dirtyAttributes();
     const dreamClass = dream.constructor;
@@ -42,5 +41,5 @@ function sqlAttributes(dream) {
     }, {});
 }
 function valueToDatetime(val) {
-    return (0, typechecks_js_1.isString)(val) ? DateTime_js_1.DateTime.fromISO(val, { zone: 'UTC' }) : val;
+    return typeof val === 'string' ? DateTime_js_1.DateTime.fromISO(val, { zone: 'UTC' }) : val;
 }

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

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = stringCase;
 const CalendarDate_js_1 = require("./CalendarDate.js");
 const DateTime_js_1 = require("./DateTime.js");
-const typechecks_js_1 = require("./typechecks.js");
+const isObject_js_1 = require("./isObject.js");
 function stringCase(target, stringCaser) {
-    if ((0, typechecks_js_1.isString)(target))
+    if (typeof target === 'string')
         return stringCaser(target);
     return recursiveStringCase(target, stringCaser);
 }
@@ -14,11 +14,11 @@ function recursiveStringCase(target, stringCaser) {
         return null;
     if (target === undefined)
         return undefined;
-    if ((0, typechecks_js_1.isString)(target))
+    if (typeof target === 'string')
         return target;
     if (Array.isArray(target))
         return target.map(s => recursiveStringCase(s, stringCaser));
-    if ((0, typechecks_js_1.isObject)(target)) {
+    if ((0, isObject_js_1.default)(target)) {
         if (target instanceof DateTime_js_1.DateTime)
             return target;
         if (target instanceof CalendarDate_js_1.default)

package/dist/cjs/src/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.range = exports.Range = exports.sharedPathPrefix = exports.relativeDreamPath = exports.dreamPath = exports.pascalize = exports.loadRepl = exports.isEmpty = exports.intersection = exports.hyphenize = exports.groupBy = exports.globalClassNameFromFullyQualifiedModelName = exports.Env = exports.DreamLogos = exports.DateTime = exports.compact = exports.cloneDeepSafe = 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.DreamApp = 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.ObjectSerializerBuilder = exports.DreamSerializerBuilder = exports.ObjectSerializer = exports.DreamSerializer = exports.SerializerOpenapiRenderer = exports.serializerNameFromFullyQualifiedModelName = exports.isDreamSerializer = exports.inferSerializersFromDreamClassOrViewModelClass = exports.inferSerializerFromDreamOrViewModel = exports.ops = exports.openapiShorthandToOpenapi = exports.maybeNullOpenapiShorthandToOpenapiShorthand = exports.isOpenapiShorthand = exports.uniq = exports.uncapitalize = exports.standardizeFullyQualifiedModelName = exports.sortObjectByValue = exports.sortObjectByKey = exports.sortBy = exports.sort = exports.snakeify = exports.round = void 0;
+exports.ObjectSerializerBuilder = exports.DreamSerializerBuilder = exports.ObjectSerializer = exports.DreamSerializer = exports.serializerNameFromFullyQualifiedModelName = exports.isDreamSerializer = exports.inferSerializersFromDreamClassOrViewModelClass = exports.inferSerializerFromDreamOrViewModel = exports.ops = exports.uniq = exports.uncapitalize = exports.expandStiClasses = exports.standardizeFullyQualifiedModelName = exports.sortObjectByValue = exports.sortObjectByKey = exports.sortBy = exports.sort = exports.snakeify = 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");
@@ -112,16 +112,12 @@ var sortObjectByValue_js_1 = require("./helpers/sortObjectByValue.js");
 Object.defineProperty(exports, "sortObjectByValue", { enumerable: true, get: function () { return sortObjectByValue_js_1.default; } });
 var standardizeFullyQualifiedModelName_js_1 = require("./helpers/standardizeFullyQualifiedModelName.js");
 Object.defineProperty(exports, "standardizeFullyQualifiedModelName", { enumerable: true, get: function () { return standardizeFullyQualifiedModelName_js_1.default; } });
+var expandStiClasses_js_1 = require("./helpers/sti/expandStiClasses.js");
+Object.defineProperty(exports, "expandStiClasses", { enumerable: true, get: function () { return expandStiClasses_js_1.default; } });
 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 isOpenapiShorthand_js_1 = require("./openapi/isOpenapiShorthand.js");
-Object.defineProperty(exports, "isOpenapiShorthand", { enumerable: true, get: function () { return isOpenapiShorthand_js_1.default; } });
-var maybeNullOpenapiShorthandToOpenapiShorthand_js_1 = require("./openapi/maybeNullOpenapiShorthandToOpenapiShorthand.js");
-Object.defineProperty(exports, "maybeNullOpenapiShorthandToOpenapiShorthand", { enumerable: true, get: function () { return maybeNullOpenapiShorthandToOpenapiShorthand_js_1.default; } });
-var openapiShorthandToOpenapi_js_1 = require("./openapi/openapiShorthandToOpenapi.js");
-Object.defineProperty(exports, "openapiShorthandToOpenapi", { enumerable: true, get: function () { return openapiShorthandToOpenapi_js_1.default; } });
 var index_js_6 = require("./ops/index.js");
 Object.defineProperty(exports, "ops", { enumerable: true, get: function () { return index_js_6.default; } });
 var inferSerializerFromDreamOrViewModel_js_1 = require("./serializer/helpers/inferSerializerFromDreamOrViewModel.js");
@@ -131,8 +127,6 @@ var isDreamSerializer_js_1 = require("./serializer/helpers/isDreamSerializer.js"
 Object.defineProperty(exports, "isDreamSerializer", { enumerable: true, get: function () { return isDreamSerializer_js_1.default; } });
 var serializerNameFromFullyQualifiedModelName_js_1 = require("./serializer/helpers/serializerNameFromFullyQualifiedModelName.js");
 Object.defineProperty(exports, "serializerNameFromFullyQualifiedModelName", { enumerable: true, get: function () { return serializerNameFromFullyQualifiedModelName_js_1.default; } });
-var SerializerOpenapiRenderer_js_1 = require("./serializer/SerializerOpenapiRenderer.js");
-Object.defineProperty(exports, "SerializerOpenapiRenderer", { enumerable: true, get: function () { return SerializerOpenapiRenderer_js_1.default; } });
 var DreamSerializer_js_1 = require("./serializer/DreamSerializer.js");
 Object.defineProperty(exports, "DreamSerializer", { enumerable: true, get: function () { return DreamSerializer_js_1.default; } });
 var ObjectSerializer_js_1 = require("./serializer/ObjectSerializer.js");

package/dist/esm/src/Dream.js

@@ -46,7 +46,6 @@ import { DateTime } from './helpers/DateTime.js';
 import cachedTypeForAttribute from './helpers/db/cachedTypeForAttribute.js';
 import isJsonColumn from './helpers/db/types/isJsonColumn.js';
 import notEqual from './helpers/notEqual.js';
-import { isString } from './helpers/typechecks.js';
 export default class Dream {
     DB;
     /**
@@ -2075,7 +2074,7 @@ export default class Dream {
                                 ? null
                                 : val === undefined
                                     ? undefined
-                                    : isString(val)
+                                    : typeof val === 'string'
                                         ? val
                                         : JSON.stringify(val));
                         },
@@ -2478,7 +2477,7 @@ export default class Dream {
     unknownValueToMillis(currentValue) {
         if (!currentValue)
             return;
-        if (isString(currentValue))
+        if (typeof currentValue === 'string')
             currentValue = DateTime.fromISO(currentValue);
         if (currentValue instanceof CalendarDate)
             currentValue = currentValue.toDateTime();
@@ -2491,7 +2490,7 @@ export default class Dream {
     unknownValueToDateString(currentValue) {
         if (!currentValue)
             return;
-        if (isString(currentValue))
+        if (typeof currentValue === 'string')
             currentValue = CalendarDate.fromISO(currentValue);
         if (currentValue instanceof DateTime)
             currentValue = CalendarDate.fromDateTime(currentValue);

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

@@ -30,13 +30,13 @@ import cloneDeepSafe from '../helpers/cloneDeepSafe.js';
 import compact from '../helpers/compact.js';
 import { DateTime } from '../helpers/DateTime.js';
 import isEmpty from '../helpers/isEmpty.js';
+import isObject from '../helpers/isObject.js';
 import namespaceColumn from '../helpers/namespaceColumn.js';
 import normalizeString from '../helpers/normalizeString.js';
 import objectPathsToArrays from '../helpers/objectPathsToArrays.js';
 import protectAgainstPollutingAssignment from '../helpers/protectAgainstPollutingAssignment.js';
 import { Range } from '../helpers/range.js';
 import snakeify from '../helpers/snakeify.js';
-import { isObject, isString } from '../helpers/typechecks.js';
 import uniq from '../helpers/uniq.js';
 import CurriedOpsStatement from '../ops/curried-ops-statement.js';
 import ops from '../ops/index.js';
@@ -549,7 +549,7 @@ export default class Query extends ConnectedToDB {
         if (nextAssociationStatement === undefined) {
             // just satisfying typing
         }
-        else if (isString(nextAssociationStatement)) {
+        else if (typeof nextAssociationStatement === 'string') {
             const nextStatement = nextAssociationStatement;
             if (!joinStatements[nextStatement])
                 joinStatements[protectAgainstPollutingAssignment(nextStatement)] = {};
@@ -906,7 +906,7 @@ export default class Query extends ConnectedToDB {
     order(arg) {
         if (arg === null)
             return this.clone({ order: null });
-        if (isString(arg))
+        if (typeof arg === 'string')
             return this.clone({ order: [{ column: arg, direction: 'asc' }] });
         let query = this.clone();
         Object.keys(arg).forEach(key => {
@@ -2362,7 +2362,7 @@ export default class Query extends ConnectedToDB {
             return query;
         let selectQuery = query;
         const orderStatement = association.order;
-        if (isString(orderStatement)) {
+        if (typeof orderStatement === 'string') {
             selectQuery = selectQuery.orderBy(this.namespaceColumn(orderStatement, tableNameOrAlias), 'asc');
         }
         else {
@@ -2499,7 +2499,11 @@ export default class Query extends ConnectedToDB {
         else if (Array.isArray(val)) {
             a = attr;
             b = 'in';
-            c = val.map(v => v instanceof DateTime || v instanceof CalendarDate ? v.toSQL() : isString(v) ? normalizeString(v) : v);
+            c = val.map(v => v instanceof DateTime || v instanceof CalendarDate
+                ? v.toSQL()
+                : typeof v === 'string'
+                    ? normalizeString(v)
+                    : v);
         }
         else if (val instanceof CurriedOpsStatement) {
             val = val.toOpsStatement(this.dreamClass, attr);
@@ -2542,11 +2546,11 @@ export default class Query extends ConnectedToDB {
         }
         if (c instanceof DateTime || c instanceof CalendarDate)
             c = c.toSQL();
-        else if (isString(c))
+        else if (typeof c === 'string')
             c = normalizeString(c);
         if (c2 instanceof DateTime || c2 instanceof CalendarDate)
             c2 = c2.toSQL();
-        else if (isString(c2))
+        else if (typeof c2 === 'string')
             c2 = normalizeString(c2);
         if (a && c === undefined)
             throw new CannotPassUndefinedAsAValueToAWhereClause(this.dreamClass, a);

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

@@ -3,8 +3,8 @@ import ConnectedToDB from '../../../db/ConnectedToDB.js';
 import validateColumn from '../../../db/validators/validateColumn.js';
 import validateTable from '../../../db/validators/validateTable.js';
 import validateTableAlias from '../../../db/validators/validateTableAlias.js';
+import isObject from '../../../helpers/isObject.js';
 import namespaceColumn from '../../../helpers/namespaceColumn.js';
-import { isObject } from '../../../helpers/typechecks.js';
 import { TRIGRAM_OPERATORS } from '../../constants.js';
 import similaritySelectSql from './similaritySelectSql.js';
 import similarityWhereSql from './similarityWhereSql.js';

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

@@ -1,4 +1,4 @@
-import { isObject } from './typechecks.js';
+import isObject from './isObject.js';
 export default function allNestedObjectKeys(obj) {
     return Object.keys(obj).flatMap(key => {
         const next = obj[key];

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

@@ -1,8 +1,8 @@
 import OpsStatement from '../ops/ops-statement.js';
 import CalendarDate from './CalendarDate.js';
 import { DateTime } from './DateTime.js';
+import isObject from './isObject.js';
 import { Range } from './range.js';
-import { isObject } from './typechecks.js';
 /**
  * Accepts any value and returns a valid clone of that object.
  * Dream instances, Query instances, and other special types are

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

@@ -0,0 +1,8 @@
+// also in Psychic
+export default function isObject(x) {
+    if (x === null)
+        return false;
+    if (Array.isArray(x))
+        return false;
+    return typeof x === 'object';
+}

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

@@ -1,8 +1,7 @@
 import DreamApp from '../dream-app/index.js';
-import { isString } from './typechecks.js';
 export default function normalizeString(val) {
     const normalizationForm = DreamApp.getOrFail().unicodeNormalization;
     if (normalizationForm === 'none')
         return val;
-    return isString(val) ? val.normalize(normalizationForm) : val;
+    return typeof val === 'string' ? val.normalize(normalizationForm) : val;
 }

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

@@ -3,7 +3,6 @@ import { DateTime } from './DateTime.js';
 import isDatetimeOrDatetimeArrayColumn from './db/types/isDatetimeOrDatetimeArrayColumn.js';
 import isTextOrTextArrayColumn from './db/types/isTextOrTextArrayColumn.js';
 import normalizeString from './normalizeString.js';
-import { isString } from './typechecks.js';
 export default function sqlAttributes(dream) {
     const attributes = dream.dirtyAttributes();
     const dreamClass = dream.constructor;
@@ -39,5 +38,5 @@ export default function sqlAttributes(dream) {
     }, {});
 }
 function valueToDatetime(val) {
-    return isString(val) ? DateTime.fromISO(val, { zone: 'UTC' }) : val;
+    return typeof val === 'string' ? DateTime.fromISO(val, { zone: 'UTC' }) : val;
 }

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

@@ -1,8 +1,8 @@
 import CalendarDate from './CalendarDate.js';
 import { DateTime } from './DateTime.js';
-import { isObject, isString } from './typechecks.js';
+import isObject from './isObject.js';
 export default function stringCase(target, stringCaser) {
-    if (isString(target))
+    if (typeof target === 'string')
         return stringCaser(target);
     return recursiveStringCase(target, stringCaser);
 }
@@ -11,7 +11,7 @@ function recursiveStringCase(target, stringCaser) {
         return null;
     if (target === undefined)
         return undefined;
-    if (isString(target))
+    if (typeof target === 'string')
         return target;
     if (Array.isArray(target))
         return target.map(s => recursiveStringCase(s, stringCaser));

package/dist/esm/src/index.js

@@ -51,16 +51,13 @@ export { default as sortBy } from './helpers/sortBy.js';
 export { default as sortObjectByKey } from './helpers/sortObjectByKey.js';
 export { default as sortObjectByValue } from './helpers/sortObjectByValue.js';
 export { default as standardizeFullyQualifiedModelName } from './helpers/standardizeFullyQualifiedModelName.js';
+export { default as expandStiClasses } from './helpers/sti/expandStiClasses.js';
 export { default as uncapitalize } from './helpers/uncapitalize.js';
 export { default as uniq } from './helpers/uniq.js';
-export { default as isOpenapiShorthand } from './openapi/isOpenapiShorthand.js';
-export { default as maybeNullOpenapiShorthandToOpenapiShorthand } from './openapi/maybeNullOpenapiShorthandToOpenapiShorthand.js';
-export { default as openapiShorthandToOpenapi } from './openapi/openapiShorthandToOpenapi.js';
 export { default as ops } from './ops/index.js';
 export { default as inferSerializerFromDreamOrViewModel, inferSerializersFromDreamClassOrViewModelClass, } from './serializer/helpers/inferSerializerFromDreamOrViewModel.js';
 export { default as isDreamSerializer } from './serializer/helpers/isDreamSerializer.js';
 export { default as serializerNameFromFullyQualifiedModelName } from './serializer/helpers/serializerNameFromFullyQualifiedModelName.js';
-export { default as SerializerOpenapiRenderer } from './serializer/SerializerOpenapiRenderer.js';
 export { default as DreamSerializer } from './serializer/DreamSerializer.js';
 export { default as ObjectSerializer } from './serializer/ObjectSerializer.js';
 export { default as DreamSerializerBuilder } from './serializer/builders/DreamSerializerBuilder.js';

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

@@ -0,0 +1 @@
+export default function isObject(x: any): boolean;

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

@@ -52,25 +52,22 @@ export { default as sortBy } from './helpers/sortBy.js';
 export { default as sortObjectByKey } from './helpers/sortObjectByKey.js';
 export { default as sortObjectByValue } from './helpers/sortObjectByValue.js';
 export { default as standardizeFullyQualifiedModelName } from './helpers/standardizeFullyQualifiedModelName.js';
+export { default as expandStiClasses } from './helpers/sti/expandStiClasses.js';
 export { type Camelized, type Hyphenized, type Pascalized, type Snakeified } from './helpers/stringCasing.js';
 export { default as uncapitalize } from './helpers/uncapitalize.js';
 export { default as uniq } from './helpers/uniq.js';
-export { default as isOpenapiShorthand } from './openapi/isOpenapiShorthand.js';
-export { default as maybeNullOpenapiShorthandToOpenapiShorthand } from './openapi/maybeNullOpenapiShorthandToOpenapiShorthand.js';
-export { default as openapiShorthandToOpenapi } from './openapi/openapiShorthandToOpenapi.js';
 export { default as ops } from './ops/index.js';
 export { default as inferSerializerFromDreamOrViewModel, inferSerializersFromDreamClassOrViewModelClass, } from './serializer/helpers/inferSerializerFromDreamOrViewModel.js';
 export { default as isDreamSerializer } from './serializer/helpers/isDreamSerializer.js';
 export { default as serializerNameFromFullyQualifiedModelName } from './serializer/helpers/serializerNameFromFullyQualifiedModelName.js';
-export { default as SerializerOpenapiRenderer } from './serializer/SerializerOpenapiRenderer.js';
 export { type SerializerRendererOpts } from './serializer/SerializerRenderer.js';
 export { default as DreamSerializer } from './serializer/DreamSerializer.js';
 export { default as ObjectSerializer } from './serializer/ObjectSerializer.js';
 export { default as DreamSerializerBuilder } from './serializer/builders/DreamSerializerBuilder.js';
 export { default as ObjectSerializerBuilder } from './serializer/builders/ObjectSerializerBuilder.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 DreamOrViewModelClassSerializerArrayKeys, type DreamOrViewModelClassSerializerKey, type DreamOrViewModelSerializerKey, type DreamParamSafeAttributes, type DreamParamSafeColumnNames, type DreamSerializable, type DreamSerializableArray, type DreamSerializerKey, type DreamSerializers, type DreamTableSchema, type DreamVirtualColumns, type IdType, type PrimaryKeyType, type Timestamp, type UpdateableAssociationProperties, type UpdateableProperties, type ViewModel, type ViewModelClass, } from './types/dream.js';
-export { type CommonOpenapiSchemaObjectFields, type OpenapiAllTypes, type OpenapiFormats, type OpenapiNumberFormats, type OpenapiPrimitiveBaseTypes, 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 OpenapiSchemaPrimitiveGeneric, type OpenapiSchemaProperties, type OpenapiSchemaPropertiesShorthand, type OpenapiSchemaShorthandExpressionAllOf, type OpenapiSchemaShorthandExpressionAnyOf, type OpenapiSchemaShorthandExpressionOneOf, type OpenapiSchemaShorthandExpressionSerializableRef, type OpenapiSchemaShorthandExpressionSerializerRef, type OpenapiSchemaShorthandPrimitiveGeneric, type OpenapiSchemaString, type OpenapiShorthandAllTypes, type OpenapiShorthandPrimitiveBaseTypes, type OpenapiShorthandPrimitiveTypes, type OpenapiTypeField, type OpenapiTypeFieldObject, } from './types/openapi.js';
-export { type DreamModelSerializerType, type SerializerCasing, type SimpleObjectSerializerType, } from './types/serializer.js';
+export { type DbConnectionType, type DbTypes } from './types/db.js';
+export { type DreamAssociationMetadata, type DreamAttributes, type DreamClassColumn, type DreamColumn, type DreamColumnNames, type DreamOrViewModelClassSerializerKey, type DreamOrViewModelSerializerKey, type DreamParamSafeAttributes, type DreamParamSafeColumnNames, type DreamSerializable, type DreamSerializableArray, type DreamSerializerKey, type DreamSerializers, type DreamTableSchema, type DreamVirtualColumns, type IdType, type PrimaryKeyType, type Timestamp, type UpdateableAssociationProperties, type UpdateableProperties, type ViewModel, type ViewModelClass, } from './types/dream.js';
+export { type CommonOpenapiSchemaObjectFields, type OpenapiAllTypes, type OpenapiDescription, type OpenapiFormats, type OpenapiNumberFormats, type OpenapiPrimitiveBaseTypes, 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 OpenapiSchemaPrimitiveGeneric, type OpenapiSchemaProperties, type OpenapiSchemaPropertiesShorthand, type OpenapiSchemaShorthandExpressionAllOf, type OpenapiSchemaShorthandExpressionAnyOf, type OpenapiSchemaShorthandExpressionOneOf, type OpenapiSchemaShorthandExpressionSerializableRef, type OpenapiSchemaShorthandExpressionSerializerRef, type OpenapiSchemaShorthandPrimitiveGeneric, type OpenapiSchemaString, type OpenapiShorthandAllTypes, type OpenapiShorthandPrimitiveBaseTypes, type OpenapiShorthandPrimitiveTypes, type OpenapiTypeField, type OpenapiTypeFieldObject, } from './types/openapi.js';
+export { type DreamModelSerializerType, type InternalAnyTypedSerializerRendersMany, type InternalAnyTypedSerializerRendersOne, type SerializerCasing, type SimpleObjectSerializerType, } from './types/serializer.js';
 export { type ValidationType } from './types/validation.js';

package/dist/types/src/serializer/ObjectSerializer.d.ts

@@ -1,3 +1,2 @@
-import Dream from '../Dream.js';
 import ObjectSerializerBuilder from './builders/ObjectSerializerBuilder.js';
-export default function ObjectSerializer<DataType extends object | null, PassthroughDataType extends object | undefined = undefined>(data: DataType extends Dream ? never : DataType, passthroughData?: PassthroughDataType): ObjectSerializerBuilder<DataType, PassthroughDataType, Exclude<DataType, null>>;
+export default function ObjectSerializer<DataType extends object | null, PassthroughDataType extends object | undefined = undefined>(data: DataType, passthroughData?: PassthroughDataType): ObjectSerializerBuilder<DataType, PassthroughDataType, Exclude<DataType, null>>;

package/dist/types/src/serializer/builders/ObjectSerializerBuilder.d.ts

@@ -26,12 +26,12 @@ export default class ObjectSerializerBuilder<MaybeNullDataType extends object |
         serializer: SerializerType<AssociatedModelType>;
     } : AssociatedModelType extends object ? {
         serializer: SerializerType<AssociatedModelType>;
-    } : object, Options extends {
+    } : never, Options extends {
         as?: string;
         flatten?: boolean;
         optional?: boolean;
-    } & SerializerOptions>(name: AttributeName, options?: Options): this;
-    rendersMany<AttributeName extends keyof DataType & string, AssociatedModelType extends DataType[AttributeName] extends (Dream | ViewModel)[] ? DataType[AttributeName] extends (infer U)[] ? U : object : object, SerializerOptions extends AssociatedModelType extends Dream ? {
+    } & SerializerOptions>(name: AttributeName, options: Options): this;
+    rendersMany<AttributeName extends keyof DataType & string, AssociatedModelType extends DataType[AttributeName] extends (Dream | ViewModel | object)[] ? DataType[AttributeName] extends (infer U)[] ? U : never : never, SerializerOptions extends AssociatedModelType extends Dream ? {
         dreamClass: typeof Dream;
         serializerKey?: DreamOrViewModelSerializerKey<AssociatedModelType>;
     } | {
@@ -43,8 +43,8 @@ export default class ObjectSerializerBuilder<MaybeNullDataType extends object |
         serializer: SerializerType<AssociatedModelType>;
     } : AssociatedModelType extends object ? {
         serializer: SerializerType<AssociatedModelType>;
-    } : object, Options extends {
+    } : never, Options extends {
         as?: string;
-    } & SerializerOptions>(name: AttributeName, options?: Options): this;
+    } & SerializerOptions>(name: AttributeName, options: Options): this;
     render(passthrough?: any, opts?: SerializerRendererOpts): Record<string, any> | null;
 }