@nhtio/lucid-resourceful 1.20250718.1 → 1.20250718.2

package/index.cjs

@@ -12,7 +12,7 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
 var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "access private method"), method);
 var _a, _hookHandlers, _cleanupHandlers, _state, _handlersToIgnore, _skipAllHooks, _Runner_instances, filter_fn, exec_fn, _b, _hooks, _c, _d;
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const decorator_utils = require("./decorator_utils-1yWqd_Gg.cjs");
+const decorator_utils = require("./decorator_utils-U_rZo8tv.cjs");
 const index = require("./index-Cv6KC1rC.cjs");
 const liqe = require("liqe");
 const errors = require("./errors-D8jb9VxY.cjs");
@@ -589,46 +589,9 @@ class l {
     ) : this.e[s] = []), this;
   }
 }
-var CRUDOperationsEnum = /* @__PURE__ */ ((CRUDOperationsEnum2) => {
-  CRUDOperationsEnum2["CREATE"] = "create";
-  CRUDOperationsEnum2["READ"] = "read";
-  CRUDOperationsEnum2["LIST"] = "list";
-  CRUDOperationsEnum2["UPDATE"] = "update";
-  CRUDOperationsEnum2["DELETE"] = "delete";
-  return CRUDOperationsEnum2;
-})(CRUDOperationsEnum || {});
-var ACLOperationsEnum = /* @__PURE__ */ ((ACLOperationsEnum2) => {
-  ACLOperationsEnum2["WRITE"] = "write";
-  ACLOperationsEnum2["READ"] = "read";
-  return ACLOperationsEnum2;
-})(ACLOperationsEnum || {});
-const operationCRUDToACL = (operation) => {
-  if (operation === CRUDOperationsEnum.READ || operation === CRUDOperationsEnum.LIST) {
-    return ACLOperationsEnum.READ;
-  }
-  if (operation === CRUDOperationsEnum.CREATE || operation === CRUDOperationsEnum.UPDATE || operation === CRUDOperationsEnum.DELETE) {
-    return ACLOperationsEnum.WRITE;
-  }
-};
-const isString$1 = (value) => {
-  return typeof value === "string";
-};
-const isFunction = (value) => {
-  return typeof value === "function";
-};
-const prepareFields = (fields, primaryKey) => {
-  const defaultValue = [primaryKey];
-  if (Array.isArray(fields)) {
-    return fields.length ? fields : defaultValue;
-  }
-  if (isString$1(fields)) {
-    return fields.length ? [fields] : defaultValue;
-  }
-  return defaultValue;
-};
 const ResourcefulErrorHandlerMethod = ["bubble", "pass", "fail"];
 const getFieldKey = (key, definition) => {
-  if (isString$1(definition.serializeAs)) {
+  if (decorator_utils.isString(definition.serializeAs)) {
     return definition.serializeAs;
   }
   return key;
@@ -1332,11 +1295,11 @@ function withResourceful(options = {}) {
             };
           }
         }
-        if (operation === CRUDOperationsEnum.DELETE) {
+        if (operation === decorator_utils.CRUDOperationsEnum.DELETE) {
           return { isForbidden: false, allowedFieldsMap, allowedColumnsMap };
         }
         const columnsOptions = this.$resourcefulColumns.values();
-        const aclOperation = operationCRUDToACL(operation);
+        const aclOperation = decorator_utils.operationCRUDToACL(operation);
         const addColumnOptionToAllowedFieldsMap = (propertyKey) => {
           const serializedName = this.$keys.attributesToSerialized.resolve(propertyKey);
           const columnName = this.$keys.serializedToColumns.resolve(serializedName);
@@ -1348,7 +1311,7 @@ function withResourceful(options = {}) {
           }
         };
         for (const columnOptions of columnsOptions) {
-          const propertyACLFilters = aclOperation === ACLOperationsEnum.READ ? columnOptions.readAccessControlFilters : columnOptions.writeAccessControlFilters;
+          const propertyACLFilters = aclOperation === decorator_utils.ACLOperationsEnum.READ ? columnOptions.readAccessControlFilters : columnOptions.writeAccessControlFilters;
           if (!propertyACLFilters) {
             addColumnOptionToAllowedFieldsMap(columnOptions.propertyKey);
             continue;
@@ -1451,7 +1414,7 @@ function withResourceful(options = {}) {
           if (!opts) {
             continue;
           }
-          const preparedValue = isFunction(opts.consume) ? opts.consume(value, attribute, this) : value;
+          const preparedValue = decorator_utils.isFunction(opts.consume) ? opts.consume(value, attribute, this) : value;
           result[serializable] = preparedValue;
         }
         return result;
@@ -1486,14 +1449,14 @@ function withResourceful(options = {}) {
         if (!primaryKey) {
           throw new errors.E_MISSING_PRIMARY_KEY_EXCEPTION(this.$resourcefulName);
         }
-        if (!isString$1(filter)) {
+        if (!decorator_utils.isString(filter)) {
           filter = "";
         }
-        fields = prepareFields(fields, primaryKey);
+        fields = decorator_utils.prepareFields(fields, primaryKey);
         const { isForbidden, allowedFieldsMap, message } = await this.$resourcefulCheckAccess({
           ctx,
           app,
-          operation: CRUDOperationsEnum.LIST
+          operation: decorator_utils.CRUDOperationsEnum.LIST
         });
         if (isForbidden) {
           throw new errors.E_FORBIDDEN(message);
@@ -1601,7 +1564,7 @@ function withResourceful(options = {}) {
           ctx,
           app,
           instance: record,
-          operation: CRUDOperationsEnum.READ
+          operation: decorator_utils.CRUDOperationsEnum.READ
         });
         if (isForbidden) {
           throw new errors.E_FORBIDDEN(message);
@@ -1657,7 +1620,7 @@ function withResourceful(options = {}) {
         const { isForbidden, allowedFieldsMap, message } = await this.$resourcefulCheckAccess({
           ctx,
           app,
-          operation: CRUDOperationsEnum.CREATE
+          operation: decorator_utils.CRUDOperationsEnum.CREATE
         });
         if (isForbidden) {
           throw new errors.E_FORBIDDEN(message);
@@ -1734,7 +1697,7 @@ function withResourceful(options = {}) {
           ctx,
           app,
           instance: record,
-          operation: CRUDOperationsEnum.UPDATE
+          operation: decorator_utils.CRUDOperationsEnum.UPDATE
         });
         if (isForbidden) {
           throw new errors.E_FORBIDDEN(message);
@@ -1797,7 +1760,7 @@ function withResourceful(options = {}) {
           ctx,
           app,
           instance: record,
-          operation: CRUDOperationsEnum.DELETE
+          operation: decorator_utils.CRUDOperationsEnum.DELETE
         });
         if (isForbidden) {
           throw new errors.E_FORBIDDEN(message);
@@ -1859,6 +1822,56 @@ function withResourceful(options = {}) {
     return ResourcefulModel;
   };
 }
+class PrepareConsumeChainBuilder {
+  /**
+   * Creates a chained prepare function that calls default first, then custom.
+   *
+   * @param propertyKey - The property name for error context
+   * @param nullable - Whether the field accepts null values
+   * @param defaultPrepare - The default prepare function from decorator
+   * @param customPrepare - The custom prepare function from options
+   * @returns A chained prepare function or undefined if no functions provided
+   */
+  static chainPrepare(propertyKey, nullable, defaultPrepare, customPrepare) {
+    if (!defaultPrepare && !customPrepare) {
+      return void 0;
+    }
+    if (!defaultPrepare && customPrepare) {
+      return customPrepare;
+    }
+    if (defaultPrepare && !customPrepare) {
+      return (value) => defaultPrepare(propertyKey, value, nullable);
+    }
+    return (value) => {
+      const defaultResult = defaultPrepare(propertyKey, value, nullable);
+      return customPrepare(defaultResult);
+    };
+  }
+  /**
+   * Creates a chained consume function that calls custom first, then default.
+   *
+   * @param propertyKey - The property name for error context
+   * @param nullable - Whether the field accepts null values
+   * @param defaultConsume - The default consume function from decorator
+   * @param customConsume - The custom consume function from options
+   * @returns A chained consume function or undefined if no functions provided
+   */
+  static chainConsume(propertyKey, nullable, defaultConsume, customConsume) {
+    if (!defaultConsume && !customConsume) {
+      return void 0;
+    }
+    if (!defaultConsume && customConsume) {
+      return customConsume;
+    }
+    if (defaultConsume && !customConsume) {
+      return (value) => defaultConsume(propertyKey, value, nullable);
+    }
+    return (value) => {
+      const customResult = customConsume(value);
+      return defaultConsume(propertyKey, customResult, nullable);
+    };
+  }
+}
 const E_INVALID_DATE_COLUMN_VALUE = errors.createError('Invalid value for "%s". %s', "E_INVALID_DATE_COLUMN_VALUE", 500);
 const E_MISSING_MODEL_ATTRIBUTE = errors.createError('Relation "%s" expects "%s" to exist on "%s" model, but is missing. Did you forget to define the column?', "E_MISSING_MODEL_ATTRIBUTE", 500);
 const E_MODEL_DELETED = errors.createError("Cannot mutate delete model instance", "E_MODEL_DELETED", 500);
@@ -12261,16 +12274,37 @@ const handleResourcefulColumn = (config) => {
     propertyKey,
     decoratorOption,
     decoratorOptionsValidationSchema,
-    overrides,
-    lucidDecoratorFunction
+    overrides = {},
+    lucidDecoratorFunction,
+    defaultPrepare,
+    defaultConsume
   } = config;
   const opts = validateNormalizeAndCastDecoratorOptions(propertyKey, decoratorName, decoratorOptionsValidationSchema, {
     ...decoratorOption,
     propertyKey
   });
+  const customPrepare = opts.prepare;
+  const customConsume = opts.consume;
+  const nullable = opts.nullable || false;
+  const chainedPrepare = PrepareConsumeChainBuilder.chainPrepare(
+    propertyKey,
+    nullable,
+    defaultPrepare,
+    customPrepare
+  );
+  const chainedConsume = PrepareConsumeChainBuilder.chainConsume(
+    propertyKey,
+    nullable,
+    defaultConsume,
+    customConsume
+  );
   const lucidOptions = extractLucidOptionsForLucidColumnDecorator(
     opts,
-    overrides
+    {
+      ...overrides,
+      ...chainedPrepare && { prepare: chainedPrepare },
+      ...chainedConsume && { consume: chainedConsume }
+    }
   );
   lucidDecoratorFunction(lucidOptions)(target, propertyKey);
   const map = ensureOwnResourcefulMap(target, "$resourcefulColumns");
@@ -12318,10 +12352,8 @@ resourcefulColumn.string = function(options = {}) {
       decoratorOption: options,
       decoratorOptionsValidationSchema,
       lucidDecoratorFunction: column,
-      overrides: {
-        prepare: (value) => decorator_utils.prepareString(propertyKey, value, options.nullable),
-        consume: (value) => decorator_utils.consumeString(propertyKey, value, options.nullable)
-      }
+      defaultPrepare: decorator_utils.prepareString,
+      defaultConsume: decorator_utils.consumeString
     });
   };
 };
@@ -12364,10 +12396,8 @@ resourcefulColumn.binary = function(options = {}) {
       decoratorOption: options,
       decoratorOptionsValidationSchema,
       lucidDecoratorFunction: column,
-      overrides: {
-        prepare: (value) => decorator_utils.prepareBinary(propertyKey, value, options.nullable),
-        consume: (value) => decorator_utils.consumeBinary(propertyKey, value, options.nullable)
-      }
+      defaultPrepare: decorator_utils.prepareBinary,
+      defaultConsume: decorator_utils.consumeBinary
     });
   };
 };
@@ -12382,10 +12412,8 @@ resourcefulColumn.number = function(options = {}) {
       decoratorOption: options,
       decoratorOptionsValidationSchema,
       lucidDecoratorFunction: column,
-      overrides: {
-        prepare: (value) => decorator_utils.prepareNumber(propertyKey, value, options.nullable),
-        consume: (value) => decorator_utils.consumeNumber(propertyKey, value, options.nullable)
-      }
+      defaultPrepare: decorator_utils.prepareNumber,
+      defaultConsume: decorator_utils.consumeNumber
     });
   };
 };
@@ -12400,10 +12428,8 @@ resourcefulColumn.integer = function(options = {}) {
       decoratorOption: options,
       decoratorOptionsValidationSchema,
       lucidDecoratorFunction: column,
-      overrides: {
-        prepare: (value) => decorator_utils.prepareInteger(propertyKey, value, options.nullable),
-        consume: (value) => decorator_utils.consumeInteger(propertyKey, value, options.nullable)
-      }
+      defaultPrepare: decorator_utils.prepareInteger,
+      defaultConsume: decorator_utils.consumeInteger
     });
   };
 };
@@ -12418,10 +12444,8 @@ resourcefulColumn.bigint = function(options = {}) {
       decoratorOption: options,
       decoratorOptionsValidationSchema,
       lucidDecoratorFunction: column,
-      overrides: {
-        prepare: (value) => decorator_utils.prepareBigint(propertyKey, value, options.nullable),
-        consume: (value) => decorator_utils.consumeBigint(propertyKey, value, options.nullable)
-      }
+      defaultPrepare: decorator_utils.prepareBigint,
+      defaultConsume: decorator_utils.consumeBigint
     });
   };
 };
@@ -12436,10 +12460,8 @@ resourcefulColumn.unsignedint = function(options = {}) {
       decoratorOption: options,
       decoratorOptionsValidationSchema,
       lucidDecoratorFunction: column,
-      overrides: {
-        prepare: (value) => decorator_utils.prepareUnsignedint(propertyKey, value, options.nullable),
-        consume: (value) => decorator_utils.consumeUnsignedint(propertyKey, value, options.nullable)
-      }
+      defaultPrepare: decorator_utils.prepareUnsignedint,
+      defaultConsume: decorator_utils.consumeUnsignedint
     });
   };
 };
@@ -12454,10 +12476,8 @@ resourcefulColumn.boolean = function(options = {}) {
       decoratorOption: options,
       decoratorOptionsValidationSchema,
       lucidDecoratorFunction: column,
-      overrides: {
-        prepare: (value) => decorator_utils.prepareBoolean(propertyKey, value, options.nullable),
-        consume: (value) => decorator_utils.consumeBoolean(propertyKey, value, options.nullable)
-      }
+      defaultPrepare: decorator_utils.prepareBoolean,
+      defaultConsume: decorator_utils.consumeBoolean
     });
   };
 };
@@ -12472,10 +12492,8 @@ resourcefulColumn.object = function(options = {}) {
       decoratorOption: options,
       decoratorOptionsValidationSchema,
       lucidDecoratorFunction: column,
-      overrides: {
-        prepare: (value) => decorator_utils.prepareObject(propertyKey, value, options.nullable),
-        consume: (value) => decorator_utils.consumeObject(propertyKey, value, options.nullable)
-      }
+      defaultPrepare: decorator_utils.prepareObject,
+      defaultConsume: decorator_utils.consumeObject
     });
   };
 };
@@ -12490,10 +12508,8 @@ resourcefulColumn.array = function(options = {}) {
       decoratorOption: options,
       decoratorOptionsValidationSchema,
       lucidDecoratorFunction: column,
-      overrides: {
-        prepare: (value) => decorator_utils.prepareArray(propertyKey, value, options.nullable),
-        consume: (value) => decorator_utils.consumeArray(propertyKey, value, options.nullable)
-      }
+      defaultPrepare: decorator_utils.prepareArray,
+      defaultConsume: decorator_utils.consumeArray
     });
   };
 };
@@ -12721,7 +12737,7 @@ function resourcefulHasManyThrough(model, options = {}) {
     map.set(propertyKey, opts);
   };
 }
-const version = "1.20250718.1";
+const version = "1.20250718.2";
 exports.errors = errors.errors;
 exports.definitions = definitions.definitions;
 exports.resourcefulBelongsTo = resourcefulBelongsTo;