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

package/dist/cjs/src/errors/serializers/AttemptedToDeriveDescendentSerializersFromNonSerializer.js

@@ -9,7 +9,7 @@ class AttemptedToDeriveDescendentSerializersFromNonSerializer extends Error {
     }
     get message() {
         return `
-Attempted to derive descendent serializers from non serializer:
+Attempted to derive descendant serializers from non serializer:
 ${(0, node_util_1.inspect)(this.serializer)}`;
     }
 }

package/dist/cjs/src/errors/serializers/ExpectedSerializerForRendersOneOrManyOption.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class ExpectedSerializerForRendersOneOrManyOption extends Error {
+    rendersOneOrMany;
+    referencingSerializerName;
+    attribute;
+    constructor(rendersOneOrMany, referencingSerializerName, attribute) {
+        super();
+        this.rendersOneOrMany = rendersOneOrMany;
+        this.referencingSerializerName = referencingSerializerName;
+        this.attribute = attribute;
+    }
+    get message() {
+        const baseString = `
+The \`serializer\` option on the \`${this.attribute.name}\` \`${this.rendersOneOrMany}\`
+on serializer \`${this.referencingSerializerName}\``;
+        if (this.attribute.options?.serializer) {
+            return `${baseString}
+specifies something other than a serializer.
+It should look something like the following:
+
+\`\`\`
+.${this.rendersOneOrMany}('${this.attribute.name}', {
+  serializer: MySerializer
+})
+\`\`\`
+`;
+        }
+        else {
+            return `${baseString}
+is throwing an error.
+`;
+        }
+    }
+}
+exports.default = ExpectedSerializerForRendersOneOrManyOption;

package/dist/cjs/src/errors/serializers/ObjectSerializerRendersOneAndManyRequireClassType.js

@@ -10,7 +10,7 @@ class ObjectSerializerRendersOneAndManyRequireClassType extends Error {
         return `
 ObjectSerializer \`rendersOne\` and \`rendersMany\`
 options must include \`dreamClass\`, \`viewModelClass\`, or
-\`serializerCallback\`.
+\`serializer\`.
 
 rendersOne/Many name: ${this.associationName}
 `;

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

@@ -8,18 +8,17 @@ const DateTime_js_1 = require("./DateTime.js");
 const range_js_1 = require("./range.js");
 const typechecks_js_1 = require("./typechecks.js");
 /**
- * @internal
+ * Accepts any value and returns a valid clone of that object.
+ * Dream instances, Query instances, and other special types are
+ * automatically cloned using their specialized cloning methods.
  *
- * accepts any value, and will return a valid clone of
- * that object. Any dream or query instances passed
- * will automatically be cloned using special cloning
- * methods.
- *
- * @param original - the value to clone
- * @param includePrimaryKey - Whether or not to copy the primary key when cloning a dream instance
- * @returns Either a clone, or else the original value
+ * @param original - The value to clone
+ * @param unsupportedTypeCloneFunction - Optional function to handle cloning of unsupported types.
+ *   If not provided, an error will be thrown for unsupported types.
+ * @returns Either a clone of the original value, or the original value itself for immutable types
+ * @throws {TypeUnsupportedByClone} When an unsupported type is encountered and no unsupportedTypeCloneFunction is provided
  */
-function cloneDeepSafe(original) {
+function cloneDeepSafe(original, unsupportedTypeCloneFunction) {
     if (original === undefined)
         return original;
     if (original === null)
@@ -43,12 +42,14 @@ function cloneDeepSafe(original) {
     if (original?.isSelectQueryBuilder)
         return original;
     if (Array.isArray(original))
-        return original.map(value => cloneDeepSafe(value));
+        return original.map(value => cloneDeepSafe(value, unsupportedTypeCloneFunction));
     if ((0, typechecks_js_1.isObject)(original) && original.constructor.name === 'Object') {
         const clone = { ...original };
-        Object.keys(clone).forEach(key => (clone[key] = cloneDeepSafe(clone[key])));
+        Object.keys(clone).forEach(key => (clone[key] = cloneDeepSafe(clone[key], unsupportedTypeCloneFunction)));
         return clone;
     }
+    if (unsupportedTypeCloneFunction)
+        return unsupportedTypeCloneFunction(original);
     throw new TypeUnsupportedByClone(original);
 }
 class TypeUnsupportedByClone extends Error {

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

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = groupBy;
+function groupBy(arr, toKey) {
+    return arr.reduce((acc, val) => {
+        const key = toKey(val);
+        acc[key] ||= [];
+        acc[key].push(val);
+        return acc;
+    }, {});
+}

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

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = sortObjectByValue;
+const sortBy_js_1 = require("./sortBy.js");
+function sortObjectByValue(obj, valueToCompare = x => x) {
+    const tuples = Object.entries(obj);
+    const sortedTuples = (0, sortBy_js_1.default)(tuples, (tuple) => {
+        const t = tuple[1];
+        return valueToCompare(t);
+    });
+    return sortedTuples.reduce((accumulator, tuple) => {
+        ;
+        accumulator[tuple[0]] = tuple[1];
+        return accumulator;
+    }, {});
+}

package/dist/cjs/src/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.snakeify = exports.round = exports.range = exports.Range = exports.sharedPathPrefix = exports.relativeDreamPath = exports.dreamPath = exports.pascalize = exports.loadRepl = exports.isEmpty = exports.intersection = exports.hyphenize = exports.globalClassNameFromFullyQualifiedModelName = exports.Env = exports.DreamLogos = 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.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.sortObjectByKey = exports.sortBy = exports.sort = void 0;
+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;
 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");
@@ -65,6 +65,8 @@ var capitalize_js_1 = require("./helpers/capitalize.js");
 Object.defineProperty(exports, "capitalize", { enumerable: true, get: function () { return capitalize_js_1.default; } });
 var generateDream_js_1 = require("./helpers/cli/generateDream.js");
 Object.defineProperty(exports, "generateDream", { enumerable: true, get: function () { return generateDream_js_1.default; } });
+var cloneDeepSafe_js_1 = require("./helpers/cloneDeepSafe.js");
+Object.defineProperty(exports, "cloneDeepSafe", { enumerable: true, get: function () { return cloneDeepSafe_js_1.default; } });
 var compact_js_1 = require("./helpers/compact.js");
 Object.defineProperty(exports, "compact", { enumerable: true, get: function () { return compact_js_1.default; } });
 var DateTime_js_1 = require("./helpers/DateTime.js");
@@ -75,6 +77,8 @@ var Env_js_1 = require("./helpers/Env.js");
 Object.defineProperty(exports, "Env", { enumerable: true, get: function () { return Env_js_1.default; } });
 var globalClassNameFromFullyQualifiedModelName_js_1 = require("./helpers/globalClassNameFromFullyQualifiedModelName.js");
 Object.defineProperty(exports, "globalClassNameFromFullyQualifiedModelName", { enumerable: true, get: function () { return globalClassNameFromFullyQualifiedModelName_js_1.default; } });
+var groupBy_js_1 = require("./helpers/groupBy.js");
+Object.defineProperty(exports, "groupBy", { enumerable: true, get: function () { return groupBy_js_1.default; } });
 var hyphenize_js_1 = require("./helpers/hyphenize.js");
 Object.defineProperty(exports, "hyphenize", { enumerable: true, get: function () { return hyphenize_js_1.default; } });
 var intersection_js_1 = require("./helpers/intersection.js");
@@ -104,6 +108,8 @@ var sortBy_js_1 = require("./helpers/sortBy.js");
 Object.defineProperty(exports, "sortBy", { enumerable: true, get: function () { return sortBy_js_1.default; } });
 var sortObjectByKey_js_1 = require("./helpers/sortObjectByKey.js");
 Object.defineProperty(exports, "sortObjectByKey", { enumerable: true, get: function () { return sortObjectByKey_js_1.default; } });
+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 uncapitalize_js_1 = require("./helpers/uncapitalize.js");

package/dist/cjs/src/openapi/allSerializersToRefsInOpenapi.js

@@ -3,18 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = allSerializersToRefsInOpenapi;
 const typechecks_js_1 = require("../helpers/typechecks.js");
 const SerializerOpenapiRenderer_js_1 = require("../serializer/SerializerOpenapiRenderer.js");
-function allSerializersToRefsInOpenapi(openapi, schemaDelimiter) {
+function allSerializersToRefsInOpenapi(openapi) {
     if (!openapi)
         return {};
-    return transformValue(openapi, schemaDelimiter);
+    return transformValue(openapi);
 }
-function transformValue(value, schemaDelimiter) {
+function transformValue(value) {
     if (!value)
         return value;
     // If this is an object with a $serializer property, replace it with $ref
     if (value.$serializer) {
         const { $serializer, ...rest } = value;
-        const openapiRenderer = new SerializerOpenapiRenderer_js_1.default($serializer, { schemaDelimiter }).serializerRef;
+        const openapiRenderer = new SerializerOpenapiRenderer_js_1.default($serializer).serializerRef;
         return {
             ...rest,
             ...openapiRenderer,
@@ -24,14 +24,14 @@ function transformValue(value, schemaDelimiter) {
         // Recurse into objects
         const transformed = {};
         for (const [key, val] of Object.entries(value)) {
-            transformed[key] = transformValue(val, schemaDelimiter);
+            transformed[key] = transformValue(val);
         }
         return transformed;
         //
     }
     else if (Array.isArray(value)) {
         // Recurse into arrays
-        return value.map(val => transformValue(val, schemaDelimiter));
+        return value.map(val => transformValue(val));
         //
     }
     else {