@fjell/lib-sequelize 4.4.5 → 4.4.10

package/dist/cjs/Coordinate.cjs

@@ -2,30 +2,17 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const Library = require('@fjell/lib');
-
-function _interopNamespaceDefault(e) {
-  const n = Object.create(null, { [Symbol.toStringTag]: { value: 'Module' } });
-  if (e) {
-    for (const k in e) {
-      if (k !== 'default') {
-        const d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: () => e[k]
-        });
-      }
-    }
-  }
-  n.default = e;
-  return Object.freeze(n);
-}
-
-const Library__namespace = /*#__PURE__*/_interopNamespaceDefault(Library);
+const registry = require('@fjell/registry');
+const logger$1 = require('./logger.cjs');
 
+const logger = logger$1.default.get('Coordinate');
 const SCOPE_SEQUELIZE = 'sequelize';
 const createCoordinate = (kta, scopes)=>{
-    const coordinate = Library__namespace.createCoordinate(kta, [
+    logger.debug('createCoordinate', {
+        kta,
+        scopes
+    });
+    const coordinate = registry.createCoordinate(kta, [
         SCOPE_SEQUELIZE,
         ...scopes || []
     ]);
@@ -34,4 +21,4 @@ const createCoordinate = (kta, scopes)=>{
 
 exports.SCOPE_SEQUELIZE = SCOPE_SEQUELIZE;
 exports.createCoordinate = createCoordinate;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29vcmRpbmF0ZS5janMiLCJzb3VyY2VzIjpbXSwic291cmNlc0NvbnRlbnQiOltdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OyJ9
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29vcmRpbmF0ZS5janMiLCJzb3VyY2VzIjpbXSwic291cmNlc0NvbnRlbnQiOltdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7In0=

package/dist/cjs/Definition.cjs

@@ -2,32 +2,12 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const Library = require('@fjell/lib');
-const Coordinate = require('./Coordinate.cjs');
 const Options = require('./Options.cjs');
 const logger$1 = require('./logger.cjs');
-
-function _interopNamespaceDefault(e) {
-  const n = Object.create(null, { [Symbol.toStringTag]: { value: 'Module' } });
-  if (e) {
-    for (const k in e) {
-      if (k !== 'default') {
-        const d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: () => e[k]
-        });
-      }
-    }
-  }
-  n.default = e;
-  return Object.freeze(n);
-}
-
-const Library__namespace = /*#__PURE__*/_interopNamespaceDefault(Library);
+const Coordinate = require('./Coordinate.cjs');
 
 const logger = logger$1.default.get('lib-sequelize', 'Definition');
-function createDefinition(kta, scopes, libOptions) {
+const createDefinition = (kta, scopes, libOptions)=>{
     logger.debug('createDefinition', {
         kta,
         scopes,
@@ -35,12 +15,11 @@ function createDefinition(kta, scopes, libOptions) {
     });
     const coordinate = Coordinate.createCoordinate(kta, scopes);
     const options = Options.createOptions(libOptions);
-    const definition = Library__namespace.createDefinition(coordinate, options);
     return {
-        ...definition,
+        coordinate,
         options
     };
-}
+};
 
 exports.createDefinition = createDefinition;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGVmaW5pdGlvbi5janMiLCJzb3VyY2VzIjpbXSwic291cmNlc0NvbnRlbnQiOltdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OyJ9
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGVmaW5pdGlvbi5janMiLCJzb3VyY2VzIjpbXSwic291cmNlc0NvbnRlbnQiOltdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OyJ9

package/dist/cjs/Instance.cjs

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const Library = require('@fjell/lib');
-const Definition = require('./Definition.cjs');
 const Operations = require('./Operations.cjs');
+const logger$1 = require('./logger.cjs');
 
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: 'Module' } });
@@ -25,16 +25,32 @@ function _interopNamespaceDefault(e) {
 
 const Library__namespace = /*#__PURE__*/_interopNamespaceDefault(Library);
 
-function createInstance(keyTypes, models, libOptions = {}, scopes = [], registry) {
-    const definition = Definition.createDefinition(keyTypes, scopes, libOptions);
-    const operations = Operations.createOperations(models, definition, registry);
-    return {
-        definition,
-        operations: Library__namespace.wrapOperations(operations, definition, registry),
+const logger = logger$1.default.get("Instance");
+/**
+ * Creates a new Sequelize instance that extends the fjell-lib instance
+ * with Sequelize-specific functionality
+ */ const createInstance = (registry, coordinate, models, options)=>{
+    logger.debug("createInstance", {
+        coordinate,
         models,
-        registry
+        registry,
+        options
+    });
+    // Create Sequelize-specific operations
+    const operations = Operations.createOperations(models, coordinate, registry, options);
+    // Create the base fjell-lib instance
+    const libInstance = Library__namespace.createInstance(registry, coordinate, operations, options);
+    return {
+        ...libInstance,
+        models
     };
-}
+};
+/**
+ * Type guard to check if an object is a Sequelize Instance
+ */ const isInstance = (instance)=>{
+    return instance != null && instance.coordinate != null && instance.operations != null && instance.options != null && instance.registry != null && instance.models != null && Array.isArray(instance.models);
+};
 
 exports.createInstance = createInstance;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSW5zdGFuY2UuY2pzIiwic291cmNlcyI6W10sInNvdXJjZXNDb250ZW50IjpbXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OzsifQ==
+exports.isInstance = isInstance;
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSW5zdGFuY2UuY2pzIiwic291cmNlcyI6W10sInNvdXJjZXNDb250ZW50IjpbXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7In0=

package/dist/cjs/InstanceFactory.cjs

@@ -0,0 +1,25 @@
+'use strict';
+
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+
+const Instance = require('./Instance.cjs');
+const logger$1 = require('./logger.cjs');
+
+const logger = logger$1.default.get("InstanceFactory");
+/**
+ * Factory function for creating Sequelize instances
+ * This extends the fjell-lib pattern by adding Sequelize-specific models
+ */ const createInstanceFactory = (models, options)=>{
+    return (coordinate, context)=>{
+        logger.debug("Creating Sequelize instance", {
+            coordinate,
+            registry: context.registry,
+            models: models.map((m)=>m.name),
+            options
+        });
+        return Instance.createInstance(context.registry, coordinate, models, options);
+    };
+};
+
+exports.createInstanceFactory = createInstanceFactory;
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSW5zdGFuY2VGYWN0b3J5LmNqcyIsInNvdXJjZXMiOltdLCJzb3VyY2VzQ29udGVudCI6W10sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7In0=

package/dist/cjs/Operations.cjs

@@ -10,8 +10,13 @@ const one = require('./ops/one.cjs');
 const remove = require('./ops/remove.cjs');
 const update = require('./ops/update.cjs');
 
-const createOperations = (models, definition, registry)=>{
+const createOperations = (models, coordinate, registry, options)=>{
     const operations = {};
+    // Create a definition-like object for backward compatibility with existing operation functions
+    const definition = {
+        coordinate,
+        options
+    };
     operations.all = all.getAllOperation(models, definition, registry);
     operations.one = one.getOneOperation(models, definition, registry);
     operations.create = create.getCreateOperation(models, definition, registry);
@@ -26,4 +31,4 @@ const createOperations = (models, definition, registry)=>{
 };
 
 exports.createOperations = createOperations;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiT3BlcmF0aW9ucy5janMiLCJzb3VyY2VzIjpbXSwic291cmNlc0NvbnRlbnQiOltdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OzsifQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiT3BlcmF0aW9ucy5janMiLCJzb3VyY2VzIjpbXSwic291cmNlc0NvbnRlbnQiOltdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OyJ9

package/dist/cjs/Options.cjs

@@ -3,8 +3,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const Library = require('@fjell/lib');
-const deepmerge = require('deepmerge');
-const general = require('./util/general.cjs');
 
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: 'Module' } });
@@ -25,15 +23,24 @@ function _interopNamespaceDefault(e) {
 
 const Library__namespace = /*#__PURE__*/_interopNamespaceDefault(Library);
 
-const DEFAULT_OPTIONS = {
+const DEFAULT_SEQUELIZE_OPTIONS = {
     deleteOnRemove: false,
     references: [],
     aggregations: []
 };
-const createOptions = (libOptions)=>{
-    const options = Library__namespace.createOptions(libOptions);
-    return deepmerge(DEFAULT_OPTIONS, general.clean(options));
+const createOptions = (sequelizeOptions)=>{
+    // Create the base lib options
+    const baseOptions = Library__namespace.createOptions(sequelizeOptions);
+    var _sequelizeOptions_deleteOnRemove, _sequelizeOptions_references, _sequelizeOptions_aggregations;
+    // Add Sequelize-specific defaults
+    const result = {
+        ...baseOptions,
+        deleteOnRemove: (_sequelizeOptions_deleteOnRemove = sequelizeOptions === null || sequelizeOptions === void 0 ? void 0 : sequelizeOptions.deleteOnRemove) !== null && _sequelizeOptions_deleteOnRemove !== void 0 ? _sequelizeOptions_deleteOnRemove : DEFAULT_SEQUELIZE_OPTIONS.deleteOnRemove,
+        references: (_sequelizeOptions_references = sequelizeOptions === null || sequelizeOptions === void 0 ? void 0 : sequelizeOptions.references) !== null && _sequelizeOptions_references !== void 0 ? _sequelizeOptions_references : DEFAULT_SEQUELIZE_OPTIONS.references,
+        aggregations: (_sequelizeOptions_aggregations = sequelizeOptions === null || sequelizeOptions === void 0 ? void 0 : sequelizeOptions.aggregations) !== null && _sequelizeOptions_aggregations !== void 0 ? _sequelizeOptions_aggregations : DEFAULT_SEQUELIZE_OPTIONS.aggregations
+    };
+    return result;
 };
 
 exports.createOptions = createOptions;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiT3B0aW9ucy5janMiLCJzb3VyY2VzIjpbXSwic291cmNlc0NvbnRlbnQiOltdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7In0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiT3B0aW9ucy5janMiLCJzb3VyY2VzIjpbXSwic291cmNlc0NvbnRlbnQiOltdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OyJ9

package/dist/cjs/QueryBuilder.cjs

@@ -5,12 +5,11 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const core = require('@fjell/core');
 const sequelize = require('sequelize');
 const logger$1 = require('./logger.cjs');
+const general = require('./util/general.cjs');
 
 const logger = logger$1.default.get('sequelize', 'QueryBuilder');
 const addDeleteQuery = (options, model)=>{
-    logger.default('Adding Delete Query', {
-        options
-    });
+    logger.default(`QueryBuilder adding delete query with options: ${general.stringifyJSON(options)}`);
     if (model.getAttributes().deletedAt) {
         options.where['deletedAt'] = {
             [sequelize.Op.eq]: null
@@ -23,10 +22,7 @@ const addDeleteQuery = (options, model)=>{
     return options;
 };
 const addEventQueries = (options, events, model)=>{
-    logger.default('Adding Event Queries', {
-        options,
-        events
-    });
+    logger.default(`QueryBuilder adding event queries with options: ${general.stringifyJSON(options)}, events: ${general.stringifyJSON(events)}`);
     Object.keys(events).forEach((key)=>{
         if (!model.getAttributes()[`${key}At`]) {
             throw new Error(`Event ${key} is not supported on this model, column ${key}At not found`);
@@ -60,20 +56,22 @@ const addEventQueries = (options, events, model)=>{
 };
 // Add the references to the query
 const addReferenceQueries = (options, references, model)=>{
-    logger.default('Adding Reference Queries', {
-        options,
-        references
-    });
+    logger.default(`QueryBuilder adding reference queries with options: ${general.stringifyJSON(options)}, references: ${general.stringifyJSON(references)}`);
     Object.keys(references).forEach((key)=>{
-        logger.default('Adding Reference Query', {
-            key,
-            references
-        });
+        logger.default(`QueryBuilder adding reference query for key: ${key}, references: ${general.stringifyJSON(references)}`);
         if (!model.getAttributes()[`${key}Id`]) {
             throw new Error(`Reference ${key} is not supported on this model, column ${key}Id not found`);
         }
         if (core.isPriKey(references[key])) {
             const priKey = references[key];
+            if (priKey.pk == null || priKey.pk === '' || typeof priKey.pk === 'object' && Object.keys(priKey.pk).length === 0) {
+                logger.error(`Reference key '${key}' has invalid pk value: ${general.stringifyJSON(priKey.pk)}`, {
+                    priKey,
+                    references
+                });
+                throw new Error(`Reference key '${key}' has invalid pk value: ${general.stringifyJSON(priKey.pk)}`);
+            }
+            logger.trace(`[QueryBuilder] Setting reference where clause: ${key}Id = ${general.stringifyJSON(priKey.pk)} (type: ${typeof priKey.pk})`);
             options.where[`${key}Id`] = {
                 [sequelize.Op.eq]: priKey.pk
             };
@@ -150,6 +148,13 @@ const addAssociationCondition = (conditions, condition, model)=>{
     // Use Sequelize's $association.attribute$ syntax for querying associated models
     const sequelizeAssociationColumn = `$${associationName}.${attributeName}$`;
     const conditionOp = getSequelizeOperator(condition.operator);
+    if (condition.value == null && condition.operator !== '==' && condition.operator !== 'in') {
+        logger.error(`Association condition for '${associationName}.${attributeName}' has undefined/null value`, {
+            condition
+        });
+        throw new Error(`Association condition for '${associationName}.${attributeName}' has undefined/null value`);
+    }
+    logger.trace(`[QueryBuilder] Setting association condition: ${sequelizeAssociationColumn} = ${general.stringifyJSON(condition.value)} (type: ${typeof condition.value})`);
     conditions[sequelizeAssociationColumn] = {
         [conditionOp]: condition.value
     };
@@ -161,6 +166,13 @@ const addAttributeCondition = (conditions, condition, model)=>{
         throw new Error(`Condition column ${conditionColumn} not found on model ${model.name}`);
     }
     const conditionOp = getSequelizeOperator(condition.operator);
+    if (condition.value == null && condition.operator !== '==' && condition.operator !== 'in') {
+        logger.error(`Attribute condition for '${conditionColumn}' has undefined/null value`, {
+            condition
+        });
+        throw new Error(`Attribute condition for '${conditionColumn}' has undefined/null value`);
+    }
+    logger.trace(`[QueryBuilder] Setting attribute condition: ${conditionColumn} = ${general.stringifyJSON(condition.value)} (type: ${typeof condition.value})`);
     conditions[conditionColumn] = {
         [conditionOp]: condition.value
     };
@@ -231,16 +243,12 @@ const addAssociationIncludes = (options, model)=>{
     return options;
 };
 const buildQuery = (itemQuery, model)=>{
-    logger.default('build', {
-        itemQuery
-    });
+    logger.default(`QueryBuilder build called with itemQuery: ${general.stringifyJSON(itemQuery)}`);
     let options = {
         where: {}
     };
     if (itemQuery.compoundCondition) {
-        logger.default('Adding Conditions', {
-            compoundCondition: itemQuery.compoundCondition
-        });
+        logger.default(`QueryBuilder adding conditions: ${general.stringifyJSON(itemQuery.compoundCondition)}`);
         options = addCompoundCondition(options, itemQuery.compoundCondition, model);
     }
     // If the model has a deletedAt column, we need to add a delete query
@@ -256,9 +264,7 @@ const buildQuery = (itemQuery, model)=>{
     // TODO: Once we start to support Aggs on the server-side, we'll need to parse agg queries
     // Apply a limit to the result set
     if (itemQuery.limit) {
-        logger.default('Limiting to', {
-            limit: itemQuery.limit
-        });
+        logger.default(`QueryBuilder applying limit: ${itemQuery.limit}`);
         options.limit = itemQuery.limit;
     }
     // Apply an offset to the result set
@@ -287,4 +293,4 @@ const buildQuery = (itemQuery, model)=>{
 exports.addCompoundCondition = addCompoundCondition;
 exports.addCondition = addCondition;
 exports.buildQuery = buildQuery;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUXVlcnlCdWlsZGVyLmNqcyIsInNvdXJjZXMiOltdLCJzb3VyY2VzQ29udGVudCI6W10sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OyJ9
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUXVlcnlCdWlsZGVyLmNqcyIsInNvdXJjZXMiOltdLCJzb3VyY2VzQ29udGVudCI6W10sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OyJ9

package/dist/cjs/contained/Instance.cjs

@@ -3,19 +3,26 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const Library = require('@fjell/lib');
-const Definition = require('../Definition.cjs');
 const Operations = require('../Operations.cjs');
+const Options = require('../Options.cjs');
+const Coordinate = require('../Coordinate.cjs');
 
 function createInstance(keyTypes, models, libOptions = {}, scopes = [], registry) {
-    const definition = Definition.createDefinition(keyTypes, scopes, libOptions);
-    const operations = Operations.createOperations(models, definition, registry);
+    // Create coordinate and options separately following new pattern
+    const coordinate = Coordinate.createCoordinate(keyTypes, scopes);
+    const options = Options.createOptions(libOptions);
+    // Create operations with the new signature
+    const operations = Operations.createOperations(models, coordinate, registry, options);
+    // Wrap operations for contained pattern
+    const wrappedOperations = Library.Contained.wrapOperations(operations, options, coordinate, registry);
     return {
-        definition,
-        operations: Library.Contained.wrapOperations(operations, definition, registry),
-        models,
-        registry
+        coordinate,
+        registry,
+        operations: wrappedOperations,
+        options,
+        models
     };
 }
 
 exports.createInstance = createInstance;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSW5zdGFuY2UuY2pzIiwic291cmNlcyI6W10sInNvdXJjZXNDb250ZW50IjpbXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OyJ9
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSW5zdGFuY2UuY2pzIiwic291cmNlcyI6W10sInNvdXJjZXNDb250ZW50IjpbXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OzsifQ==

package/dist/cjs/index.cjs

@@ -2,22 +2,25 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-const Coordinate = require('./Coordinate.cjs');
 const Definition = require('./Definition.cjs');
 const Instance = require('./Instance.cjs');
+const InstanceFactory = require('./InstanceFactory.cjs');
 const Options = require('./Options.cjs');
 const Operations = require('./Operations.cjs');
 const index = require('./contained/index.cjs');
 const index$1 = require('./primary/index.cjs');
+const Coordinate = require('./Coordinate.cjs');
 
 
 
-exports.SCOPE_SEQUELIZE = Coordinate.SCOPE_SEQUELIZE;
-exports.createCoordinate = Coordinate.createCoordinate;
 exports.createDefinition = Definition.createDefinition;
 exports.createInstance = Instance.createInstance;
+exports.isInstance = Instance.isInstance;
+exports.createInstanceFactory = InstanceFactory.createInstanceFactory;
 exports.createOptions = Options.createOptions;
 exports.createOperations = Operations.createOperations;
 exports.Contained = index;
 exports.Primary = index$1;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguY2pzIiwic291cmNlcyI6W10sInNvdXJjZXNDb250ZW50IjpbXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OyJ9
+exports.SCOPE_SEQUELIZE = Coordinate.SCOPE_SEQUELIZE;
+exports.createCoordinate = Coordinate.createCoordinate;
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguY2pzIiwic291cmNlcyI6W10sInNvdXJjZXNDb250ZW50IjpbXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OyJ9

package/dist/cjs/ops/all.cjs

@@ -9,6 +9,7 @@ const RowProcessor = require('../RowProcessor.cjs');
 const sequelize = require('sequelize');
 const relationshipUtils = require('../util/relationshipUtils.cjs');
 const OperationContext = require('../OperationContext.cjs');
+const general = require('../util/general.cjs');
 
 const logger = logger$1.default.get('sequelize', 'ops', 'all');
 // Helper function to merge includes avoiding duplicates
@@ -35,10 +36,8 @@ const getAllOperation = (models, definition, registry)=>{
     const { coordinate, options: { references, aggregations } } = definition;
     //#region Query
     const all = async (itemQuery, locations)=>{
-        logger.default('All', {
-            itemQuery,
-            locations
-        });
+        var _options_include;
+        logger.debug(`ALL operation called on ${models[0].name} with ${(locations === null || locations === void 0 ? void 0 : locations.length) || 0} location filters: ${(locations === null || locations === void 0 ? void 0 : locations.map((loc)=>`${loc.kt}=${loc.lk}`).join(', ')) || 'none'}`);
         const loc = locations || [];
         // @ts-ignore
         const model = models[0];
@@ -69,24 +68,44 @@ const getAllOperation = (models, definition, registry)=>{
             }
             // Handle direct location keys (simple foreign key constraints)
             for (const locKey of directLocations){
+                if (locKey.lk === undefined || locKey.lk == null || locKey.lk === '' || typeof locKey.lk === 'object' && Object.keys(locKey.lk).length === 0) {
+                    logger.error(`Location key '${locKey.kt}' has invalid lk value: ${general.stringifyJSON(locKey.lk)}`, {
+                        locKey,
+                        locations: loc
+                    });
+                    throw new Error(`Location key '${locKey.kt}' has invalid lk value: ${general.stringifyJSON(locKey.lk)}`);
+                }
                 const foreignKeyField = locKey.kt + 'Id';
-                options.where = {
-                    ...options.where,
-                    [foreignKeyField]: {
-                        [sequelize.Op.eq]: locKey.lk
-                    }
+                // Check if this field already has a condition from the itemQuery
+                if (options.where[foreignKeyField]) {
+                    logger.debug(`[ALL] Field ${foreignKeyField} already constrained by itemQuery, skipping location constraint to avoid conflicts`);
+                    continue; // Skip this location constraint to avoid conflicts
+                }
+                logger.trace(`[ALL] Setting direct location where clause: ${foreignKeyField} = ${general.stringifyJSON(locKey.lk)} (type: ${typeof locKey.lk})`);
+                options.where[foreignKeyField] = {
+                    [sequelize.Op.eq]: locKey.lk
                 };
             }
             // Handle hierarchical location keys (requires relationship traversal)
             for (const locKey of hierarchicalLocations){
+                if (locKey.lk === undefined || locKey.lk == null || locKey.lk === '' || typeof locKey.lk === 'object' && Object.keys(locKey.lk).length === 0) {
+                    logger.error(`Hierarchical location key '${locKey.kt}' has invalid lk value: ${general.stringifyJSON(locKey.lk)}`, {
+                        locKey,
+                        locations: loc
+                    });
+                    throw new Error(`Hierarchical location key '${locKey.kt}' has invalid lk value: ${general.stringifyJSON(locKey.lk)}`);
+                }
                 const relationshipInfo = relationshipUtils.buildRelationshipPath(model, locKey.kt, kta);
                 if (relationshipInfo.found && relationshipInfo.path) {
+                    // Check if this field already has a condition from the itemQuery
+                    if (options.where[relationshipInfo.path]) {
+                        logger.debug(`[ALL] Field ${relationshipInfo.path} already constrained by itemQuery, skipping hierarchical location constraint to avoid conflicts`);
+                        continue; // Skip this location constraint to avoid conflicts
+                    }
                     // Add the relationship constraint using the path
-                    options.where = {
-                        ...options.where,
-                        [relationshipInfo.path]: {
-                            [sequelize.Op.eq]: locKey.lk
-                        }
+                    logger.trace(`[ALL] Setting hierarchical location where clause: ${relationshipInfo.path} = ${general.stringifyJSON(locKey.lk)} (type: ${typeof locKey.lk})`);
+                    options.where[relationshipInfo.path] = {
+                        [sequelize.Op.eq]: locKey.lk
                     };
                     // Add necessary includes for the relationship traversal
                     if (relationshipInfo.includes) {
@@ -100,22 +119,27 @@ const getAllOperation = (models, definition, registry)=>{
                 options.include = mergeIncludes(existingIncludes, additionalIncludes);
             }
         }
-        logger.default('Configured this Item Query', {
-            itemQuery,
-            options
-        });
+        logger.default(`All query configured for ${model.name} with where fields: ${options.where ? Object.keys(options.where).join(', ') : 'none'}, includes: ${((_options_include = options.include) === null || _options_include === void 0 ? void 0 : _options_include.length) || 0}`);
+        try {
+            logger.trace(`[ALL] Executing ${model.name}.findAll() with options: ${JSON.stringify(options, null, 2)}`);
+        } catch  {
+            // Fallback for cases where JSON.stringify fails on Sequelize operators
+            logger.trace(`[ALL] Executing ${model.name}.findAll() with options containing non-serializable operators (${Object.keys(options.where || {}).length} where conditions)`);
+        }
         const matchingItems = await model.findAll(options);
         // this.logger.default('Matching Items', { matchingItems });
         // Get the current context from context manager
         const context = OperationContext.contextManager.getCurrentContext();
         // TODO: Move this Up!
-        return await Promise.all(matchingItems.map(async (row)=>{
+        const results = await Promise.all(matchingItems.map(async (row)=>{
             const processedRow = await RowProcessor.processRow(row, coordinate.kta, references, aggregations, registry, context);
             return core.validateKeys(processedRow, coordinate.kta);
         }));
+        logger.debug(`[ALL] Returning ${results.length} ${model.name} records`);
+        return results;
     };
     return all;
 };
 
 exports.getAllOperation = getAllOperation;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWxsLmNqcyIsInNvdXJjZXMiOltdLCJzb3VyY2VzQ29udGVudCI6W10sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7In0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWxsLmNqcyIsInNvdXJjZXMiOltdLCJzb3VyY2VzQ29udGVudCI6W10sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7In0=