@nhtio/lucid-resourceful 1.20250718.2 → 1.20250724.1

package/index.mjs

@@ -11,12 +11,12 @@ 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;
 import { I as isObject$1, J as isResourcefulModel, K as CRUDOperationsEnum, L as operationCRUDToACL, M as ACLOperationsEnum, N as isFunction, O as prepareFields, P as isString$1, Q as DateTime, F as consumeString, u as prepareString, y as consumeBinary, m as prepareBinary, D as consumeNumber, s as prepareNumber, C as consumeInteger, r as prepareInteger, x as consumeBigint, l as prepareBigint, G as consumeUnsignedint, v as prepareUnsignedint, z as consumeBoolean, n as prepareBoolean, E as consumeObject, t as prepareObject, w as consumeArray, p as prepareArray } from "./decorator_utils-YSb1EGJ6.js";
-import { j as joi } from "./index-DDaZ2qr2.js";
+import { joi as Q_ } from "./joi.mjs";
 import { parse as parse$2, SyntaxError as SyntaxError$1 } from "liqe";
 import { d as E_LUCENE_SYNTAX_EXCEPTION, e as E_LUCENE_UNEXPECTED_EXCEPTION, f as E_LUCENE_INVALID_TYPE, g as E_INVALID_RESOURCEFUL_MIXIN_OPTIONS, h as E_MISSING_PRIMARY_KEY_EXCEPTION, i as E_FORBIDDEN, j as E_INVALID_COLUMN_ACCESS, k as E_INVALID_RESOUREFUL_INDEX_REQUEST_EXCEPTION, l as E_RECORD_NOT_FOUND_EXCEPTION, m as E_INVALID_PAYLOAD_EXCEPTION, n as E_FORBIDDEN_PAYLOAD_EXCEPTION, o as createError, p as Exception, q as getDefaultExportFromCjs, r as commonjsGlobal, s as index_default, t as defineStaticProperty, u as lodash, v as E_INVALID_RESOURCEFUL_DECORATOR_OPTIONS } from "./errors-B1rr67uM.js";
 import { w } from "./errors-B1rr67uM.js";
-import { R as ResourcefulArrayType, a as ResourcefulObjectType, b as ResourcefulBooleanType, c as ResourcefulUnsignedIntegerType, d as ResourcefulBigintType, e as ResourcefulIntegerType, f as ResourcefulNumberType, g as ResourcefulBinaryType, h as ResourcefulDateTimeType, i as ResourcefulDateType, j as ResourcefulStringType } from "./definitions-B66EPk0H.js";
-import { k } from "./definitions-B66EPk0H.js";
+import { R as ResourcefulArrayType, a as ResourcefulObjectType, b as ResourcefulBooleanType, c as ResourcefulUnsignedIntegerType, d as ResourcefulBigintType, e as ResourcefulIntegerType, f as ResourcefulNumberType, g as ResourcefulBinaryType, h as ResourcefulDateTimeType, i as ResourcefulDateType, j as ResourcefulStringType } from "./definitions-B88XBTUF.js";
+import { k } from "./definitions-B88XBTUF.js";
 import require$$0, { debuglog } from "util";
 import "node:path";
 import "node:url";
@@ -598,31 +598,31 @@ const getFieldKey = (key, definition) => {
 };
 function withResourceful(options = {}) {
   return (superclass) => {
-    const optionsSchema = joi.object({
-      name: joi.string().default(superclass.name),
-      readRequiredForWrite: joi.boolean().default(false),
-      accessControlFilters: joi.object({
-        list: joi.array().items(joi.function()).default([]),
-        create: joi.array().items(joi.function()).default([]),
-        read: joi.array().items(joi.function()).default([]),
-        update: joi.array().items(joi.function()).default([]),
-        delete: joi.array().items(joi.function()).default([])
+    const optionsSchema = Q_.object({
+      name: Q_.string().default(superclass.name),
+      readRequiredForWrite: Q_.boolean().default(false),
+      accessControlFilters: Q_.object({
+        list: Q_.array().items(Q_.function()).default([]),
+        create: Q_.array().items(Q_.function()).default([]),
+        read: Q_.array().items(Q_.function()).default([]),
+        update: Q_.array().items(Q_.function()).default([]),
+        delete: Q_.array().items(Q_.function()).default([])
       }).default({}),
-      onACLError: joi.string().valid(...ResourcefulErrorHandlerMethod).default("throw"),
-      onValidationScopeError: joi.string().valid(...ResourcefulErrorHandlerMethod).default("throw"),
-      queryScopeCallbacks: joi.object({
-        list: joi.array().items(joi.function()).default([]),
-        access: joi.array().items(joi.function()).default([])
+      onACLError: Q_.string().valid(...ResourcefulErrorHandlerMethod).default("throw"),
+      onValidationScopeError: Q_.string().valid(...ResourcefulErrorHandlerMethod).default("throw"),
+      queryScopeCallbacks: Q_.object({
+        list: Q_.array().items(Q_.function()).default([]),
+        access: Q_.array().items(Q_.function()).default([])
       }).default({}),
-      description: joi.string().optional(),
-      externalDocs: joi.object({
-        description: joi.string().optional(),
-        url: joi.string().uri().required()
+      description: Q_.string().optional(),
+      externalDocs: Q_.object({
+        description: Q_.string().optional(),
+        url: Q_.string().uri().required()
       }).optional(),
-      example: joi.string().optional(),
-      advanced: joi.object({
-        propertyEvaluationConcurrency: joi.number().integer().min(1).default(10),
-        aclEvaluationConcurrency: joi.number().integer().min(1).default(2)
+      example: Q_.string().optional(),
+      advanced: Q_.object({
+        propertyEvaluationConcurrency: Q_.number().integer().min(1).default(10),
+        aclEvaluationConcurrency: Q_.number().integer().min(1).default(2)
       }).default({
         propertyEvaluationConcurrency: 10,
         aclEvaluationConcurrency: 2
@@ -763,7 +763,7 @@ function withResourceful(options = {}) {
                 "relationship"
               ),
               kind: "relationship",
-              validator: joi.forbidden(),
+              validator: Q_.forbidden(),
               relatedModel: relationshipDefinition.relatedModel
             };
             if (!resourcefulModelRelationshipMetaSchema.canRead && !resourcefulModelRelationshipMetaSchema.canWrite)
@@ -778,7 +778,7 @@ function withResourceful(options = {}) {
       }
       static $getPropertyValidator(ctx, app, key, datatype, nullable, validationScopes, kind, writable = false) {
         if ("relationship" === kind || "computedAccessor" === kind && !writable) {
-          return joi.any().forbidden();
+          return Q_.any().forbidden();
         }
         const baseValidator = this.$getPropertyBaseValidator(datatype, nullable, kind, writable);
         if (Array.isArray(validationScopes) && validationScopes.length > 0) {
@@ -800,7 +800,7 @@ function withResourceful(options = {}) {
                 case "pass":
                   break;
                 case "fail":
-                  return joi.any().forbidden();
+                  return Q_.any().forbidden();
               }
             }
           });
@@ -809,13 +809,13 @@ function withResourceful(options = {}) {
       }
       static $getPropertyBaseValidator(datatype, nullable, kind, writable = false) {
         if ("relationship" === kind || "computedAccessor" === kind && !writable) {
-          return joi.any().forbidden();
+          return Q_.any().forbidden();
         }
         nullable = nullable || "boolean" === typeof datatype.nullable && datatype.nullable;
         switch (true) {
           case datatype instanceof ResourcefulStringType: {
             const d = datatype;
-            const r = joi.string().min(d.minLength).max(d.maxLength);
+            const r = Q_.string().min(d.minLength).max(d.maxLength);
             if (d.pattern) {
               r.pattern(new RegExp(d.pattern));
             }
@@ -828,14 +828,14 @@ function withResourceful(options = {}) {
             return r;
           }
           case datatype instanceof ResourcefulDateType: {
-            const r = joi.date().iso();
+            const r = Q_.date().iso();
             if (nullable) {
               r.allow(null);
             }
             return r;
           }
           case datatype instanceof ResourcefulDateTimeType: {
-            const r = joi.date().iso();
+            const r = Q_.date().iso();
             if (nullable) {
               r.allow(null);
             }
@@ -843,7 +843,7 @@ function withResourceful(options = {}) {
           }
           case datatype instanceof ResourcefulBinaryType: {
             const d = datatype;
-            const r = joi.string();
+            const r = Q_.string();
             if (nullable) {
               r.allow(null);
             }
@@ -857,7 +857,7 @@ function withResourceful(options = {}) {
           }
           case datatype instanceof ResourcefulNumberType: {
             const d = datatype;
-            const r = joi.number();
+            const r = Q_.number();
             if (nullable) {
               r.allow(null);
             }
@@ -876,7 +876,7 @@ function withResourceful(options = {}) {
           }
           case datatype instanceof ResourcefulIntegerType: {
             const d = datatype;
-            const r = joi.number();
+            const r = Q_.number();
             if (nullable) {
               r.allow(null);
             }
@@ -895,7 +895,7 @@ function withResourceful(options = {}) {
           }
           case datatype instanceof ResourcefulBigintType: {
             const d = datatype;
-            const r = joi.bigint();
+            const r = Q_.bigint();
             if (nullable) {
               r.allow(null);
             }
@@ -914,7 +914,7 @@ function withResourceful(options = {}) {
           }
           case datatype instanceof ResourcefulUnsignedIntegerType: {
             const d = datatype;
-            const r = joi.number().unsafe();
+            const r = Q_.number().unsafe();
             if (nullable) {
               r.allow(null);
             }
@@ -932,7 +932,7 @@ function withResourceful(options = {}) {
             return r;
           }
           case datatype instanceof ResourcefulBooleanType: {
-            const r = joi.boolean();
+            const r = Q_.boolean();
             if (nullable) {
               r.allow(null);
             }
@@ -952,7 +952,7 @@ function withResourceful(options = {}) {
                     !(item.readOnly || false)
                   )
                 );
-                propValidator = joi.alternatives().try(...alternatives);
+                propValidator = Q_.alternatives().try(...alternatives);
               } else if ("allOf" in propDef) {
                 const schemas = propDef.allOf.map(
                   (item) => this.$getPropertyBaseValidator(
@@ -962,7 +962,7 @@ function withResourceful(options = {}) {
                     !(item.readOnly || false)
                   )
                 );
-                propValidator = schemas.reduce((acc, schema) => acc.concat(schema), joi.any());
+                propValidator = schemas.reduce((acc, schema) => acc.concat(schema), Q_.any());
               } else if ("anyOf" in propDef) {
                 const alternatives = propDef.anyOf.map(
                   (item) => this.$getPropertyBaseValidator(
@@ -972,7 +972,7 @@ function withResourceful(options = {}) {
                     !(item.readOnly || false)
                   )
                 );
-                propValidator = joi.alternatives().try(...alternatives);
+                propValidator = Q_.alternatives().try(...alternatives);
               } else if ("not" in propDef) {
                 const notSchemas = propDef.not.map(
                   (item) => this.$getPropertyBaseValidator(
@@ -982,7 +982,7 @@ function withResourceful(options = {}) {
                     !(item.readOnly || false)
                   )
                 );
-                propValidator = joi.any().not(...notSchemas);
+                propValidator = Q_.any().not(...notSchemas);
               } else {
                 propValidator = this.$getPropertyBaseValidator(
                   propDef,
@@ -996,7 +996,7 @@ function withResourceful(options = {}) {
               }
               objectSchema[propKey] = propValidator;
             });
-            const r = joi.object(objectSchema);
+            const r = Q_.object(objectSchema);
             if (nullable) {
               r.allow(null);
             }
@@ -1009,7 +1009,7 @@ function withResourceful(options = {}) {
             if (isObject$1(d.additionalProperties)) {
               const additionalPropertiesType = d.additionalProperties;
               r.pattern(
-                joi.string(),
+                Q_.string(),
                 this.$getPropertyBaseValidator(
                   additionalPropertiesType,
                   additionalPropertiesType.nullable || false,
@@ -1024,7 +1024,7 @@ function withResourceful(options = {}) {
           }
           case datatype instanceof ResourcefulArrayType: {
             const d = datatype;
-            const r = joi.array();
+            const r = Q_.array();
             if (nullable) {
               r.allow(null);
             }
@@ -1038,7 +1038,7 @@ function withResourceful(options = {}) {
                   !(item.readOnly || false)
                 )
               );
-              itemValidator = joi.alternatives().try(...alternatives);
+              itemValidator = Q_.alternatives().try(...alternatives);
             } else if ("allOf" in d.items) {
               const schemas = d.items.allOf.map(
                 (item) => this.$getPropertyBaseValidator(
@@ -1048,7 +1048,7 @@ function withResourceful(options = {}) {
                   !(item.readOnly || false)
                 )
               );
-              itemValidator = schemas.reduce((acc, schema) => acc.concat(schema), joi.any());
+              itemValidator = schemas.reduce((acc, schema) => acc.concat(schema), Q_.any());
             } else if ("anyOf" in d.items) {
               const alternatives = d.items.anyOf.map(
                 (item) => this.$getPropertyBaseValidator(
@@ -1058,7 +1058,7 @@ function withResourceful(options = {}) {
                   !(item.readOnly || false)
                 )
               );
-              itemValidator = joi.alternatives().try(...alternatives);
+              itemValidator = Q_.alternatives().try(...alternatives);
             } else if ("not" in d.items) {
               const notSchemas = d.items.not.map(
                 (item) => this.$getPropertyBaseValidator(
@@ -1068,7 +1068,7 @@ function withResourceful(options = {}) {
                   !(item.readOnly || false)
                 )
               );
-              itemValidator = joi.any().not(...notSchemas);
+              itemValidator = Q_.any().not(...notSchemas);
             } else {
               itemValidator = this.$getPropertyBaseValidator(
                 d.items,
@@ -1090,7 +1090,7 @@ function withResourceful(options = {}) {
             return r;
           }
           default:
-            return joi.any().forbidden();
+            return Q_.any().forbidden();
         }
       }
       static async $getPropertyCanReadWrite(ctx, app, key, lucidDefinition, readAclFilters = [], writeAclFilters = [], kind, writable = false) {
@@ -1147,6 +1147,13 @@ function withResourceful(options = {}) {
         };
         Object.entries(resourcefulModelMetaSchema.properties).forEach(
           ([propertyKey, propertyMeta]) => {
+            const resolvedColumnName = getFieldKey(
+              propertyKey,
+              propertyMeta.lucidDefinitions
+            );
+            if (null === resolvedColumnName) {
+              return;
+            }
             switch (propertyMeta.kind) {
               case "column": {
                 ret.properties[propertyKey] = this.$resourcefulModelColumnMetaToOpenApiSchema(
@@ -1192,7 +1199,6 @@ function withResourceful(options = {}) {
       }
       static $resourcefulModelColumnMetaToOpenApiSchema(propertyKey, propertyMeta) {
         const ret = stripUndefinedValuesFromObject({
-          type: propertyMeta.definition.type,
           items: propertyMeta.definition.items,
           title: getFieldKey(propertyKey, propertyMeta.lucidDefinitions) || propertyKey,
           description: propertyMeta.definition.description,
@@ -1223,13 +1229,13 @@ function withResourceful(options = {}) {
           readOnly: propertyMeta.canRead && !propertyMeta.canWrite,
           writeOnly: !propertyMeta.canRead && propertyMeta.canWrite,
           externalDocs: propertyMeta.definition.externalDocs,
-          example: propertyMeta.definition.example
+          example: propertyMeta.definition.example,
+          ...propertyMeta.definition.type
         });
         return ret;
       }
       static $resourcefulModelComputedAccessorMetaToOpenApiSchema(propertyKey, propertyMeta) {
         const ret = stripUndefinedValuesFromObject({
-          type: propertyMeta.definition.type,
           items: propertyMeta.definition.items,
           title: getFieldKey(propertyKey, propertyMeta.lucidDefinitions) || propertyKey,
           description: propertyMeta.definition.description,
@@ -1260,7 +1266,8 @@ function withResourceful(options = {}) {
           readOnly: propertyMeta.canRead && !propertyMeta.canWrite,
           writeOnly: !propertyMeta.canRead && propertyMeta.canWrite,
           externalDocs: propertyMeta.definition.externalDocs,
-          example: propertyMeta.definition.example
+          example: propertyMeta.definition.example,
+          ...propertyMeta.definition.type
         });
         return ret;
       }
@@ -1443,7 +1450,7 @@ function withResourceful(options = {}) {
       static $resourcefulGetQueryBuilder() {
         return this.$adapter.modelConstructorClient(this).query().from(this.table);
       }
-      static async $onResourcefulIndex(filter, page, perPage, fields, ctx, app, hooks = []) {
+      static async $onResourcefulIndex(filter, page, perPage, fields, sort, ctx, app, hooks = []) {
         var _a2;
         const primaryKey = this.$getPrivateKeyAttribute();
         if (!primaryKey) {
@@ -1465,11 +1472,11 @@ function withResourceful(options = {}) {
         if (possibleFields.length === 0) {
           throw new E_INVALID_COLUMN_ACCESS("No fields available for access");
         }
-        const schema = joi.object({
-          filter: joi.string().allow("").required(),
-          page: joi.number().integer().min(1).required(),
-          perPage: joi.number().integer().min(1).max(100).required(),
-          fields: joi.array().items(joi.string().valid(...possibleFields)).required()
+        const schema = Q_.object({
+          filter: Q_.string().allow("").required(),
+          page: Q_.number().integer().min(1).required(),
+          perPage: Q_.number().integer().min(1).max(100).required(),
+          fields: Q_.array().items(Q_.string().valid(...possibleFields)).required()
         });
         const { error: methodValidationError, value: validatedMethodOptions } = schema.validate(
           {
@@ -1499,11 +1506,18 @@ function withResourceful(options = {}) {
         ]) {
           await scopeCallback(ctx, app, query);
         }
-        const columnsToSelect = validatedMethodOptions.fields.filter((field) => allowedFieldsMap.has(field)).map((field) => this.$keys.serializedToColumns.get(field));
+        const columnsToSelect = validatedMethodOptions.fields.filter((field) => allowedFieldsMap.has(field)).map((field) => this.$keys.serializedToColumns.get(field)).filter((column2) => !!column2);
         const countQuery = query.clone();
         const recordsQuery = query.clone();
         countQuery.count("*", "total");
         recordsQuery.select(columnsToSelect).forPage(validatedMethodOptions.page, validatedMethodOptions.perPage);
+        if (Array.isArray(sort) && sort.length > 0) {
+          sort.forEach(([field, direction]) => {
+            if (allowedFieldsMap.has(field)) {
+              recordsQuery.orderBy(field, direction);
+            }
+          });
+        }
         const countQueryQuery = countQuery.toQuery();
         const recordsQueryQuery = recordsQuery.toQuery();
         const [countResults, rawRecords] = await Promise.all([countQuery, recordsQuery]);
@@ -11800,25 +11814,25 @@ const validateNormalizeAndCastDecoratorOptions = (fieldName, decoratorName, sche
   }
   return value;
 };
-const resourcefulPropertyDefinitionSchema = joi.object({
-  propertyKey: joi.string().default(""),
-  readAccessControlFilters: joi.array().items(joi.function()).default([]),
-  writeAccessControlFilters: joi.array().items(joi.function()).default([]),
-  nullable: joi.boolean().default(false),
-  description: joi.string().optional(),
-  default: joi.any().optional(),
-  externalDocs: joi.object({
-    description: joi.string().optional(),
-    url: joi.string().uri().required()
+const resourcefulPropertyDefinitionSchema = Q_.object({
+  propertyKey: Q_.string().default(""),
+  readAccessControlFilters: Q_.array().items(Q_.function()).default([]),
+  writeAccessControlFilters: Q_.array().items(Q_.function()).default([]),
+  nullable: Q_.boolean().default(false),
+  description: Q_.string().optional(),
+  default: Q_.any().optional(),
+  externalDocs: Q_.object({
+    description: Q_.string().optional(),
+    url: Q_.string().uri().required()
   }).optional(),
-  example: joi.string().optional(),
-  deprecated: joi.boolean().default(false)
+  example: Q_.string().optional(),
+  deprecated: Q_.boolean().default(false)
 });
 const joiInstanceCheckerAlternativesFactory = (Ctor, CtorName) => {
   return [
-    joi.object().instance(Ctor),
-    joi.function().instance(Ctor),
-    joi.custom((value, helpers) => {
+    Q_.object().instance(Ctor),
+    Q_.function().instance(Ctor),
+    Q_.custom((value, helpers) => {
       if (isObject$1(value) && value.constructor.name === CtorName) {
         return value;
       }
@@ -11826,7 +11840,7 @@ const joiInstanceCheckerAlternativesFactory = (Ctor, CtorName) => {
     })
   ];
 };
-const resourcefulDataTypeSchema = joi.alternatives(
+const resourcefulDataTypeSchema = Q_.alternatives(
   ...joiInstanceCheckerAlternativesFactory(ResourcefulStringType, "ResourcefulStringType"),
   ...joiInstanceCheckerAlternativesFactory(ResourcefulDateType, "ResourcefulDateType"),
   ...joiInstanceCheckerAlternativesFactory(ResourcefulDateTimeType, "ResourcefulDateTimeType"),
@@ -11845,95 +11859,95 @@ const resourcefulDataTypeSchema = joi.alternatives(
 const localResourcefulPropertyDefinitionSchema = resourcefulPropertyDefinitionSchema.keys({
   type: resourcefulDataTypeSchema.required()
 });
-const resourcefulColumnOptionsSchema = joi.object({
+const resourcefulColumnOptionsSchema = Q_.object({
   // Lucid ColumnOptions (partial)
-  columnName: joi.string().optional(),
-  serializeAs: joi.alternatives().try(joi.string(), joi.valid(null)).optional(),
-  serialize: joi.function().optional(),
-  consume: joi.function().optional(),
-  prepare: joi.function().optional(),
-  meta: joi.object().optional(),
-  isPrimary: joi.boolean().default(false),
-  hasDefaultValue: joi.boolean().default(false),
+  columnName: Q_.string().optional(),
+  serializeAs: Q_.alternatives().try(Q_.string(), Q_.valid(null)).optional(),
+  serialize: Q_.function().optional(),
+  consume: Q_.function().optional(),
+  prepare: Q_.function().optional(),
+  meta: Q_.object().optional(),
+  isPrimary: Q_.boolean().default(false),
+  hasDefaultValue: Q_.boolean().default(false),
   // Resourceful options
-  propertyKey: joi.string().default(""),
-  readAccessControlFilters: joi.array().items(joi.function()).default([]),
-  writeAccessControlFilters: joi.array().items(joi.function()).default([]),
-  nullable: joi.boolean().default(false),
-  description: joi.string().optional(),
-  default: joi.any().optional(),
-  externalDocs: joi.object({
-    description: joi.string().optional(),
-    url: joi.string().uri().required()
+  propertyKey: Q_.string().default(""),
+  readAccessControlFilters: Q_.array().items(Q_.function()).default([]),
+  writeAccessControlFilters: Q_.array().items(Q_.function()).default([]),
+  nullable: Q_.boolean().default(false),
+  description: Q_.string().optional(),
+  default: Q_.any().optional(),
+  externalDocs: Q_.object({
+    description: Q_.string().optional(),
+    url: Q_.string().uri().required()
   }).optional(),
-  example: joi.string().optional(),
-  deprecated: joi.boolean().default(false),
+  example: Q_.string().optional(),
+  deprecated: Q_.boolean().default(false),
   type: resourcefulDataTypeSchema.required()
 });
-const dataTypeColumnOptionsSchema = joi.object({
+const dataTypeColumnOptionsSchema = Q_.object({
   // Lucid ColumnOptions (partial) - excluding 'prepare' and 'consume'
-  columnName: joi.string().optional(),
-  serializeAs: joi.alternatives().try(joi.string(), joi.valid(null)).optional(),
-  serialize: joi.function().optional(),
-  meta: joi.object().optional(),
-  isPrimary: joi.boolean().default(false),
-  hasDefaultValue: joi.boolean().default(false),
+  columnName: Q_.string().optional(),
+  serializeAs: Q_.alternatives().try(Q_.string(), Q_.valid(null)).optional(),
+  serialize: Q_.function().optional(),
+  meta: Q_.object().optional(),
+  isPrimary: Q_.boolean().default(false),
+  hasDefaultValue: Q_.boolean().default(false),
   // Resourceful options
-  propertyKey: joi.string().default(""),
-  readAccessControlFilters: joi.array().items(joi.function()).default([]),
-  writeAccessControlFilters: joi.array().items(joi.function()).default([]),
-  nullable: joi.boolean().default(false),
-  description: joi.string().optional(),
-  default: joi.any().optional(),
-  externalDocs: joi.object({
-    description: joi.string().optional(),
-    url: joi.string().uri().required()
+  propertyKey: Q_.string().default(""),
+  readAccessControlFilters: Q_.array().items(Q_.function()).default([]),
+  writeAccessControlFilters: Q_.array().items(Q_.function()).default([]),
+  nullable: Q_.boolean().default(false),
+  description: Q_.string().optional(),
+  default: Q_.any().optional(),
+  externalDocs: Q_.object({
+    description: Q_.string().optional(),
+    url: Q_.string().uri().required()
   }).optional(),
-  example: joi.string().optional(),
-  deprecated: joi.boolean().default(false),
+  example: Q_.string().optional(),
+  deprecated: Q_.boolean().default(false),
   type: resourcefulDataTypeSchema.optional()
 });
 const baseDateColumnOptionsSchema = dataTypeColumnOptionsSchema.keys({
-  autoCreate: joi.boolean().default(false),
-  autoUpdate: joi.boolean().default(false)
+  autoCreate: Q_.boolean().default(false),
+  autoUpdate: Q_.boolean().default(false)
 });
 const stringColumnOptionsSchema = dataTypeColumnOptionsSchema.keys({
-  type: joi.alternatives(
+  type: Q_.alternatives(
     ...joiInstanceCheckerAlternativesFactory(ResourcefulStringType, "ResourcefulStringType")
   ).default(() => new ResourcefulStringType())
 });
 const dateColumnOptionsSchema = baseDateColumnOptionsSchema.keys({
-  type: joi.alternatives(
+  type: Q_.alternatives(
     ...joiInstanceCheckerAlternativesFactory(ResourcefulDateType, "ResourcefulDateType")
   ).default(() => new ResourcefulDateType())
 });
 const dateTimeColumnOptionsSchema = baseDateColumnOptionsSchema.keys({
-  type: joi.alternatives(
+  type: Q_.alternatives(
     ...joiInstanceCheckerAlternativesFactory(ResourcefulDateTimeType, "ResourcefulDateTimeType")
   ).default(() => new ResourcefulDateTimeType())
 });
 const binaryColumnOptionsSchema = dataTypeColumnOptionsSchema.keys({
-  type: joi.alternatives(
+  type: Q_.alternatives(
     ...joiInstanceCheckerAlternativesFactory(ResourcefulBinaryType, "ResourcefulBinaryType")
   ).default(() => new ResourcefulBinaryType())
 });
 const numberColumnOptionsSchema = dataTypeColumnOptionsSchema.keys({
-  type: joi.alternatives(
+  type: Q_.alternatives(
     ...joiInstanceCheckerAlternativesFactory(ResourcefulNumberType, "ResourcefulNumberType")
   ).default(() => new ResourcefulNumberType())
 });
 const integerColumnOptionsSchema = dataTypeColumnOptionsSchema.keys({
-  type: joi.alternatives(
+  type: Q_.alternatives(
     ...joiInstanceCheckerAlternativesFactory(ResourcefulIntegerType, "ResourcefulIntegerType")
   ).default(() => new ResourcefulIntegerType())
 });
 const bigintColumnOptionsSchema = dataTypeColumnOptionsSchema.keys({
-  type: joi.alternatives(
+  type: Q_.alternatives(
     ...joiInstanceCheckerAlternativesFactory(ResourcefulBigintType, "ResourcefulBigintType")
   ).default(() => new ResourcefulBigintType())
 });
 const unsignedIntegerColumnOptionsSchema = dataTypeColumnOptionsSchema.keys({
-  type: joi.alternatives(
+  type: Q_.alternatives(
     ...joiInstanceCheckerAlternativesFactory(
       ResourcefulUnsignedIntegerType,
       "ResourcefulUnsignedIntegerType"
@@ -11941,148 +11955,148 @@ const unsignedIntegerColumnOptionsSchema = dataTypeColumnOptionsSchema.keys({
   ).default(() => new ResourcefulUnsignedIntegerType())
 });
 const booleanColumnOptionsSchema = dataTypeColumnOptionsSchema.keys({
-  type: joi.alternatives(
+  type: Q_.alternatives(
     ...joiInstanceCheckerAlternativesFactory(ResourcefulBooleanType, "ResourcefulBooleanType")
   ).default(() => new ResourcefulBooleanType())
 });
-const objectColumnOptionsSchema = joi.object({
+const objectColumnOptionsSchema = Q_.object({
   // Lucid ColumnOptions (full)
-  columnName: joi.string().optional(),
-  serializeAs: joi.alternatives().try(joi.string(), joi.valid(null)).optional(),
-  serialize: joi.function().optional(),
-  consume: joi.function().optional(),
-  prepare: joi.function().optional(),
-  meta: joi.object().optional(),
-  isPrimary: joi.boolean().default(false),
-  hasDefaultValue: joi.boolean().default(false),
+  columnName: Q_.string().optional(),
+  serializeAs: Q_.alternatives().try(Q_.string(), Q_.valid(null)).optional(),
+  serialize: Q_.function().optional(),
+  consume: Q_.function().optional(),
+  prepare: Q_.function().optional(),
+  meta: Q_.object().optional(),
+  isPrimary: Q_.boolean().default(false),
+  hasDefaultValue: Q_.boolean().default(false),
   // Resourceful options
-  propertyKey: joi.string().default(""),
-  readAccessControlFilters: joi.array().items(joi.function()).default([]),
-  writeAccessControlFilters: joi.array().items(joi.function()).default([]),
-  nullable: joi.boolean().default(false),
-  description: joi.string().optional(),
-  default: joi.any().optional(),
-  externalDocs: joi.object({
-    description: joi.string().optional(),
-    url: joi.string().uri().required()
+  propertyKey: Q_.string().default(""),
+  readAccessControlFilters: Q_.array().items(Q_.function()).default([]),
+  writeAccessControlFilters: Q_.array().items(Q_.function()).default([]),
+  nullable: Q_.boolean().default(false),
+  description: Q_.string().optional(),
+  default: Q_.any().optional(),
+  externalDocs: Q_.object({
+    description: Q_.string().optional(),
+    url: Q_.string().uri().required()
   }).optional(),
-  example: joi.string().optional(),
-  deprecated: joi.boolean().default(false),
-  type: joi.alternatives(
+  example: Q_.string().optional(),
+  deprecated: Q_.boolean().default(false),
+  type: Q_.alternatives(
     ...joiInstanceCheckerAlternativesFactory(ResourcefulObjectType, "ResourcefulObjectType")
   ).default(() => new ResourcefulObjectType())
 });
-const arrayColumnOptionsSchema = joi.object({
+const arrayColumnOptionsSchema = Q_.object({
   // Lucid ColumnOptions (full)
-  columnName: joi.string().optional(),
-  serializeAs: joi.alternatives().try(joi.string(), joi.valid(null)).optional(),
-  serialize: joi.function().optional(),
-  consume: joi.function().optional(),
-  prepare: joi.function().optional(),
-  meta: joi.object().optional(),
-  isPrimary: joi.boolean().default(false),
-  hasDefaultValue: joi.boolean().default(false),
+  columnName: Q_.string().optional(),
+  serializeAs: Q_.alternatives().try(Q_.string(), Q_.valid(null)).optional(),
+  serialize: Q_.function().optional(),
+  consume: Q_.function().optional(),
+  prepare: Q_.function().optional(),
+  meta: Q_.object().optional(),
+  isPrimary: Q_.boolean().default(false),
+  hasDefaultValue: Q_.boolean().default(false),
   // Resourceful options
-  propertyKey: joi.string().default(""),
-  readAccessControlFilters: joi.array().items(joi.function()).default([]),
-  writeAccessControlFilters: joi.array().items(joi.function()).default([]),
-  nullable: joi.boolean().default(false),
-  description: joi.string().optional(),
-  default: joi.any().optional(),
-  externalDocs: joi.object({
-    description: joi.string().optional(),
-    url: joi.string().uri().required()
+  propertyKey: Q_.string().default(""),
+  readAccessControlFilters: Q_.array().items(Q_.function()).default([]),
+  writeAccessControlFilters: Q_.array().items(Q_.function()).default([]),
+  nullable: Q_.boolean().default(false),
+  description: Q_.string().optional(),
+  default: Q_.any().optional(),
+  externalDocs: Q_.object({
+    description: Q_.string().optional(),
+    url: Q_.string().uri().required()
   }).optional(),
-  example: joi.string().optional(),
-  deprecated: joi.boolean().default(false),
-  type: joi.alternatives(
+  example: Q_.string().optional(),
+  deprecated: Q_.boolean().default(false),
+  type: Q_.alternatives(
     ...joiInstanceCheckerAlternativesFactory(ResourcefulArrayType, "ResourcefulArrayType")
   ).default(() => new ResourcefulArrayType())
 });
 localResourcefulPropertyDefinitionSchema.append({
-  writable: joi.boolean().default(false)
+  writable: Q_.boolean().default(false)
 });
-const resourcefulComputedOptionsSchema = joi.object({
+const resourcefulComputedOptionsSchema = Q_.object({
   // Lucid ComputedOptions (partial)
-  serializeAs: joi.alternatives().try(joi.string(), joi.valid(null)).optional(),
-  serialize: joi.function().optional(),
-  meta: joi.object().optional(),
+  serializeAs: Q_.alternatives().try(Q_.string(), Q_.valid(null)).optional(),
+  serialize: Q_.function().optional(),
+  meta: Q_.object().optional(),
   // Resourceful options
-  propertyKey: joi.string().default(""),
-  readAccessControlFilters: joi.array().items(joi.function()).default([]),
-  writeAccessControlFilters: joi.array().items(joi.function()).default([]),
-  nullable: joi.boolean().default(false),
-  description: joi.string().optional(),
-  default: joi.any().optional(),
-  externalDocs: joi.object({
-    description: joi.string().optional(),
-    url: joi.string().uri().required()
+  propertyKey: Q_.string().default(""),
+  readAccessControlFilters: Q_.array().items(Q_.function()).default([]),
+  writeAccessControlFilters: Q_.array().items(Q_.function()).default([]),
+  nullable: Q_.boolean().default(false),
+  description: Q_.string().optional(),
+  default: Q_.any().optional(),
+  externalDocs: Q_.object({
+    description: Q_.string().optional(),
+    url: Q_.string().uri().required()
   }).optional(),
-  example: joi.string().optional(),
-  deprecated: joi.boolean().default(false),
+  example: Q_.string().optional(),
+  deprecated: Q_.boolean().default(false),
   type: resourcefulDataTypeSchema.required()
 });
-const dataTypeComputedOptionsSchema = joi.object({
+const dataTypeComputedOptionsSchema = Q_.object({
   // Lucid ComputedOptions (partial) - excluding 'prepare' and 'consume'
-  serializeAs: joi.alternatives().try(joi.string(), joi.valid(null)).optional(),
-  serialize: joi.function().optional(),
-  meta: joi.object().optional(),
+  serializeAs: Q_.alternatives().try(Q_.string(), Q_.valid(null)).optional(),
+  serialize: Q_.function().optional(),
+  meta: Q_.object().optional(),
   // Resourceful options
-  propertyKey: joi.string().default(""),
-  readAccessControlFilters: joi.array().items(joi.function()).default([]),
-  writeAccessControlFilters: joi.array().items(joi.function()).default([]),
-  nullable: joi.boolean().default(false),
-  description: joi.string().optional(),
-  default: joi.any().optional(),
-  externalDocs: joi.object({
-    description: joi.string().optional(),
-    url: joi.string().uri().required()
+  propertyKey: Q_.string().default(""),
+  readAccessControlFilters: Q_.array().items(Q_.function()).default([]),
+  writeAccessControlFilters: Q_.array().items(Q_.function()).default([]),
+  nullable: Q_.boolean().default(false),
+  description: Q_.string().optional(),
+  default: Q_.any().optional(),
+  externalDocs: Q_.object({
+    description: Q_.string().optional(),
+    url: Q_.string().uri().required()
   }).optional(),
-  example: joi.string().optional(),
-  deprecated: joi.boolean().default(false),
+  example: Q_.string().optional(),
+  deprecated: Q_.boolean().default(false),
   type: resourcefulDataTypeSchema.optional()
 });
 const baseDateComputedOptionsSchema = dataTypeComputedOptionsSchema.keys({
-  autoCreate: joi.boolean().default(false),
-  autoUpdate: joi.boolean().default(false)
+  autoCreate: Q_.boolean().default(false),
+  autoUpdate: Q_.boolean().default(false)
 });
 const stringComputedOptionsSchema = dataTypeComputedOptionsSchema.keys({
-  type: joi.alternatives(
+  type: Q_.alternatives(
     ...joiInstanceCheckerAlternativesFactory(ResourcefulStringType, "ResourcefulStringType")
   ).default(() => new ResourcefulStringType())
 });
 const dateComputedOptionsSchema = baseDateComputedOptionsSchema.keys({
-  type: joi.alternatives(
+  type: Q_.alternatives(
     ...joiInstanceCheckerAlternativesFactory(ResourcefulDateType, "ResourcefulDateType")
   ).default(() => new ResourcefulDateType())
 });
 const dateTimeComputedOptionsSchema = baseDateComputedOptionsSchema.keys({
-  type: joi.alternatives(
+  type: Q_.alternatives(
     ...joiInstanceCheckerAlternativesFactory(ResourcefulDateTimeType, "ResourcefulDateTimeType")
   ).default(() => new ResourcefulDateTimeType())
 });
 const binaryComputedOptionsSchema = dataTypeComputedOptionsSchema.keys({
-  type: joi.alternatives(
+  type: Q_.alternatives(
     ...joiInstanceCheckerAlternativesFactory(ResourcefulBinaryType, "ResourcefulBinaryType")
   ).default(() => new ResourcefulBinaryType())
 });
 const numberComputedOptionsSchema = dataTypeComputedOptionsSchema.keys({
-  type: joi.alternatives(
+  type: Q_.alternatives(
     ...joiInstanceCheckerAlternativesFactory(ResourcefulNumberType, "ResourcefulNumberType")
   ).default(() => new ResourcefulNumberType())
 });
 const integerComputedOptionsSchema = dataTypeComputedOptionsSchema.keys({
-  type: joi.alternatives(
+  type: Q_.alternatives(
     ...joiInstanceCheckerAlternativesFactory(ResourcefulIntegerType, "ResourcefulIntegerType")
   ).default(() => new ResourcefulIntegerType())
 });
 const bigintComputedOptionsSchema = dataTypeComputedOptionsSchema.keys({
-  type: joi.alternatives(
+  type: Q_.alternatives(
     ...joiInstanceCheckerAlternativesFactory(ResourcefulBigintType, "ResourcefulBigintType")
   ).default(() => new ResourcefulBigintType())
 });
 const unsignedIntegerComputedOptionsSchema = dataTypeComputedOptionsSchema.keys({
-  type: joi.alternatives(
+  type: Q_.alternatives(
     ...joiInstanceCheckerAlternativesFactory(
       ResourcefulUnsignedIntegerType,
       "ResourcefulUnsignedIntegerType"
@@ -12090,99 +12104,99 @@ const unsignedIntegerComputedOptionsSchema = dataTypeComputedOptionsSchema.keys(
   ).default(() => new ResourcefulUnsignedIntegerType())
 });
 const booleanComputedOptionsSchema = dataTypeComputedOptionsSchema.keys({
-  type: joi.alternatives(
+  type: Q_.alternatives(
     ...joiInstanceCheckerAlternativesFactory(ResourcefulBooleanType, "ResourcefulBooleanType")
   ).default(() => new ResourcefulBooleanType())
 });
-const objectComputedOptionsSchema = joi.object({
+const objectComputedOptionsSchema = Q_.object({
   // Lucid ComputedOptions (full)
-  serializeAs: joi.alternatives().try(joi.string(), joi.valid(null)).optional(),
-  serialize: joi.function().optional(),
-  meta: joi.object().optional(),
+  serializeAs: Q_.alternatives().try(Q_.string(), Q_.valid(null)).optional(),
+  serialize: Q_.function().optional(),
+  meta: Q_.object().optional(),
   // Resourceful options
-  propertyKey: joi.string().default(""),
-  readAccessControlFilters: joi.array().items(joi.function()).default([]),
-  writeAccessControlFilters: joi.array().items(joi.function()).default([]),
-  nullable: joi.boolean().default(false),
-  description: joi.string().optional(),
-  default: joi.any().optional(),
-  externalDocs: joi.object({
-    description: joi.string().optional(),
-    url: joi.string().uri().required()
+  propertyKey: Q_.string().default(""),
+  readAccessControlFilters: Q_.array().items(Q_.function()).default([]),
+  writeAccessControlFilters: Q_.array().items(Q_.function()).default([]),
+  nullable: Q_.boolean().default(false),
+  description: Q_.string().optional(),
+  default: Q_.any().optional(),
+  externalDocs: Q_.object({
+    description: Q_.string().optional(),
+    url: Q_.string().uri().required()
   }).optional(),
-  example: joi.string().optional(),
-  deprecated: joi.boolean().default(false),
-  type: joi.alternatives(
+  example: Q_.string().optional(),
+  deprecated: Q_.boolean().default(false),
+  type: Q_.alternatives(
     ...joiInstanceCheckerAlternativesFactory(ResourcefulObjectType, "ResourcefulObjectType")
   ).default(() => new ResourcefulObjectType())
 });
-const arrayComputedOptionsSchema = joi.object({
+const arrayComputedOptionsSchema = Q_.object({
   // Lucid ComputedOptions (full)
-  serializeAs: joi.alternatives().try(joi.string(), joi.valid(null)).optional(),
-  serialize: joi.function().optional(),
-  meta: joi.object().optional(),
+  serializeAs: Q_.alternatives().try(Q_.string(), Q_.valid(null)).optional(),
+  serialize: Q_.function().optional(),
+  meta: Q_.object().optional(),
   // Resourceful options
-  propertyKey: joi.string().default(""),
-  readAccessControlFilters: joi.array().items(joi.function()).default([]),
-  writeAccessControlFilters: joi.array().items(joi.function()).default([]),
-  nullable: joi.boolean().default(false),
-  description: joi.string().optional(),
-  default: joi.any().optional(),
-  externalDocs: joi.object({
-    description: joi.string().optional(),
-    url: joi.string().uri().required()
+  propertyKey: Q_.string().default(""),
+  readAccessControlFilters: Q_.array().items(Q_.function()).default([]),
+  writeAccessControlFilters: Q_.array().items(Q_.function()).default([]),
+  nullable: Q_.boolean().default(false),
+  description: Q_.string().optional(),
+  default: Q_.any().optional(),
+  externalDocs: Q_.object({
+    description: Q_.string().optional(),
+    url: Q_.string().uri().required()
   }).optional(),
-  example: joi.string().optional(),
-  deprecated: joi.boolean().default(false),
-  type: joi.alternatives(
+  example: Q_.string().optional(),
+  deprecated: Q_.boolean().default(false),
+  type: Q_.alternatives(
     ...joiInstanceCheckerAlternativesFactory(ResourcefulArrayType, "ResourcefulArrayType")
   ).default(() => new ResourcefulArrayType())
 });
-const resourcefulRelationshipOptionsSchema = joi.object({
+const resourcefulRelationshipOptionsSchema = Q_.object({
   // Resourceful options
-  propertyKey: joi.string().default(""),
-  readAccessControlFilters: joi.array().items(joi.function()).default([]),
-  writeAccessControlFilters: joi.array().items(joi.function()).default([]),
-  nullable: joi.boolean().default(false),
-  description: joi.string().optional(),
-  default: joi.any().optional(),
-  externalDocs: joi.object({
-    description: joi.string().optional(),
-    url: joi.string().uri().required()
+  propertyKey: Q_.string().default(""),
+  readAccessControlFilters: Q_.array().items(Q_.function()).default([]),
+  writeAccessControlFilters: Q_.array().items(Q_.function()).default([]),
+  nullable: Q_.boolean().default(false),
+  description: Q_.string().optional(),
+  default: Q_.any().optional(),
+  externalDocs: Q_.object({
+    description: Q_.string().optional(),
+    url: Q_.string().uri().required()
   }).optional(),
-  example: joi.string().optional(),
-  deprecated: joi.boolean().default(false)
+  example: Q_.string().optional(),
+  deprecated: Q_.boolean().default(false)
 });
 const relationOptionsSchema = resourcefulRelationshipOptionsSchema.keys({
   // Lucid RelationOptions
-  localKey: joi.string().optional(),
-  foreignKey: joi.string().optional(),
-  serializeAs: joi.alternatives().try(joi.string(), joi.valid(null)).optional(),
-  onQuery: joi.function().optional(),
-  relatedModel: joi.function()
+  localKey: Q_.string().optional(),
+  foreignKey: Q_.string().optional(),
+  serializeAs: Q_.alternatives().try(Q_.string(), Q_.valid(null)).optional(),
+  onQuery: Q_.function().optional(),
+  relatedModel: Q_.function()
 });
 const manyToManyRelationOptionsSchema = resourcefulRelationshipOptionsSchema.keys({
   // Lucid ManyToManyRelationOptions
-  localKey: joi.string().optional(),
-  relatedKey: joi.string().optional(),
-  pivotForeignKey: joi.string().optional(),
-  pivotRelatedForeignKey: joi.string().optional(),
-  pivotTable: joi.string().optional(),
-  pivotTimestamps: joi.boolean().optional(),
-  pivotColumns: joi.array().items(joi.string()).optional(),
-  serializeAs: joi.alternatives().try(joi.string(), joi.valid(null)).optional(),
-  onQuery: joi.function().optional(),
-  relatedModel: joi.function()
+  localKey: Q_.string().optional(),
+  relatedKey: Q_.string().optional(),
+  pivotForeignKey: Q_.string().optional(),
+  pivotRelatedForeignKey: Q_.string().optional(),
+  pivotTable: Q_.string().optional(),
+  pivotTimestamps: Q_.boolean().optional(),
+  pivotColumns: Q_.array().items(Q_.string()).optional(),
+  serializeAs: Q_.alternatives().try(Q_.string(), Q_.valid(null)).optional(),
+  onQuery: Q_.function().optional(),
+  relatedModel: Q_.function()
 });
 const hasManyThroughRelationOptionsSchema = resourcefulRelationshipOptionsSchema.keys({
   // Lucid HasManyThroughRelationOptions (ThroughRelationOptions without throughModel)
-  localKey: joi.string().optional(),
-  foreignKey: joi.string().optional(),
-  throughLocalKey: joi.string().optional(),
-  throughForeignKey: joi.string().optional(),
-  serializeAs: joi.alternatives().try(joi.string(), joi.valid(null)).optional(),
-  onQuery: joi.function().optional(),
-  relatedModel: joi.function()
+  localKey: Q_.string().optional(),
+  foreignKey: Q_.string().optional(),
+  throughLocalKey: Q_.string().optional(),
+  throughForeignKey: Q_.string().optional(),
+  serializeAs: Q_.alternatives().try(Q_.string(), Q_.valid(null)).optional(),
+  onQuery: Q_.function().optional(),
+  relatedModel: Q_.function()
 });
 const extractLucidOptionsForLucidDecorator = (options, keys, overrides) => {
   const extracted = {};
@@ -12737,7 +12751,7 @@ function resourcefulHasManyThrough(model, options = {}) {
     map.set(propertyKey, opts);
   };
 }
-const version = "1.20250718.2";
+const version = "1.20250724.1";
 export {
   k as definitions,
   w as errors,