7.0.10

changelog.md

@@ -1,5 +1,32 @@
 # Changelog
 
+## 2025-11-28 - 7.0.9 - fix(classes.collection)
+Fix closure bug in Collection decorator by defining collection getter on original constructor and prototype
+
+- Define the collection getter on the original constructor so class-level references (e.g. `User.collection`) resolve to the decorated collection instead of the original constructor's closure value.
+- Also define the getter on the original constructor's prototype to ensure instance access works consistently across runtimes (Deno/Node).
+
+## 2025-11-28 - 7.0.8 - fix(classes.collection)
+Fix closure issue in managed decorator so Class.collection/instance.collection resolve correctly
+
+- Resolve closure bug in the managed() decorator where class methods referencing Class.collection (or instance.collection) could receive the original constructor's captured value and thus the wrong collection/manager.
+- Define dynamic getters on the original constructor and its prototype that compute the collection from the proper manager/db at access time (supports direct manager objects, delayed manager factory functions, and fallback to defaultManager).
+- Getters are defined as non-enumerable and configurable to preserve compatibility with existing consumers.
+
+## 2025-11-28 - 7.0.7 - fix(decorators)
+Fix decorator metadata initialization and Lucene query transformation
+
+- Ensure TC39 decorator metadata is used to initialize prototype properties so decorators work reliably across runtimes (context.metadata / Symbol.metadata shim imported early).
+- Field and class decorators now populate and consume metadata for saveable properties, indexes and searchable fields so prototype initialization happens before instance creation.
+- Fix Lucene -> MongoDB transformer to produce correct $or/$and/$not structures and improve wildcard/fuzzy/range handling for search queries.
+- Improve collection initialization to auto-create compound text indexes from searchableFields and ensure index creation is idempotent.
+
+## 2025-11-28 - 7.0.6 - fix(classes.collection)
+Guard against missing collection before attaching document constructor in Collection decorator
+
+- Added a truthy check for `coll` before setting `(coll as any).docCtor` in the Collection decorator (ts/classes.collection.ts).
+- Prevents a potential TypeError when `collectionFactory.getCollection` returns null/undefined during decorator initialization.
+
 ## 2025-11-28 - 7.0.5 - fix(package)
 Add package exports entry and remove legacy main/typings fields
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@push.rocks/smartdata",
-  "version": "7.0.5",
+  "version": "7.0.10",
   "private": false,
   "description": "An advanced library for NoSQL data organization and manipulation using TypeScript with support for MongoDB, data validation, collections, and custom data types.",
   "exports": {

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@push.rocks/smartdata',
-  version: '7.0.5',
+  version: '7.0.9',
   description: 'An advanced library for NoSQL data organization and manipulation using TypeScript with support for MongoDB, data validation, collections, and custom data types.'
 }

ts/classes.collection.ts

@@ -41,7 +41,7 @@ export function Collection(dbArg: SmartdataDb | TDelayed<SmartdataDb>) {
       }
       const coll = collectionFactory.getCollection(constructor.name, dbArg);
       // Attach document constructor for searchableFields lookup
-      if (!(coll as any).docCtor) {
+      if (coll && !(coll as any).docCtor) {
         (coll as any).docCtor = decoratedClass;
       }
       return coll;
@@ -64,6 +64,20 @@ export function Collection(dbArg: SmartdataDb | TDelayed<SmartdataDb>) {
       configurable: true
     });
 
+    // Closure fix: When class methods reference the class name (e.g., `User.collection`),
+    // they get the original constructor via closure, not the decorated class.
+    // Define collection getter on the original constructor.
+    Object.defineProperty(constructor, 'collection', {
+      get: getCollection,
+      enumerable: false,
+      configurable: true
+    });
+    Object.defineProperty(constructor.prototype, 'collection', {
+      get: getCollection,
+      enumerable: false,
+      configurable: true
+    });
+
     // Deno compatibility note: Property decorators set properties on the prototype.
     // Since we removed instance property declarations from SmartDataDbDoc,
     // the decorator-set prototype properties are now accessible without shadowing.
@@ -79,17 +93,22 @@ export function Collection(dbArg: SmartdataDb | TDelayed<SmartdataDb>) {
     // Initialize prototype properties from context.metadata (TC39 decorator metadata)
     // This ensures prototype properties are available before any instance is created
     const metadata = context.metadata as any;
+    logger.log('debug', `Collection decorator: metadata keys = ${metadata ? Object.keys(metadata).join(', ') : 'null'}`);
+    logger.log('debug', `Collection decorator: saveableProperties in metadata = ${metadata?.saveableProperties?.length ?? 0}`);
+    logger.log('debug', `Collection decorator: globalSaveableProperties in metadata = ${metadata?.globalSaveableProperties?.length ?? 0}`);
     if (metadata) {
       const proto = decoratedClass.prototype;
 
       // Initialize globalSaveableProperties
       if (metadata.globalSaveableProperties && !proto.globalSaveableProperties) {
         proto.globalSaveableProperties = [...metadata.globalSaveableProperties];
+        logger.log('debug', `Collection decorator: initialized globalSaveableProperties with ${proto.globalSaveableProperties.length} properties`);
       }
 
       // Initialize saveableProperties
       if (metadata.saveableProperties && !proto.saveableProperties) {
         proto.saveableProperties = [...metadata.saveableProperties];
+        logger.log('debug', `Collection decorator: initialized saveableProperties with ${proto.saveableProperties.length} properties`);
       }
 
       // Initialize uniqueIndexes
@@ -188,6 +207,42 @@ export function managed<TManager extends IManager>(managerArg?: TManager | TDela
       }
     };
 
+    // Closure fix: When class methods reference the class name (e.g., `User.collection`),
+    // they get the original constructor via closure, not the decorated class.
+    // Define collection/manager getters on the original constructor.
+    const getCollectionStatic = function(this: any) {
+      let dbArg: SmartdataDb;
+      if (!managerArg) {
+        dbArg = this.prototype.defaultManager.db;
+      } else if (managerArg['db']) {
+        dbArg = (managerArg as TManager).db;
+      } else {
+        dbArg = (managerArg as TDelayed<TManager>)().db;
+      }
+      return collectionFactory.getCollection(constructor.name, dbArg);
+    };
+    const getCollectionInstance = function(this: any) {
+      let dbArg: SmartdataDb;
+      if (!managerArg) {
+        dbArg = this.defaultManager.db;
+      } else if (managerArg['db']) {
+        dbArg = (managerArg as TManager).db;
+      } else {
+        dbArg = (managerArg as TDelayed<TManager>)().db;
+      }
+      return collectionFactory.getCollection(constructor.name, dbArg);
+    };
+    Object.defineProperty(constructor, 'collection', {
+      get: getCollectionStatic,
+      enumerable: false,
+      configurable: true
+    });
+    Object.defineProperty(constructor.prototype, 'collection', {
+      get: getCollectionInstance,
+      enumerable: false,
+      configurable: true
+    });
+
     // Initialize prototype properties from context.metadata (TC39 decorator metadata)
     // This ensures prototype properties are available before any instance is created
     const originalConstructor = value as any;