v7.0.12

changelog.md

@@ -1,5 +1,34 @@
 # Changelog
 
+## 2025-11-28 - 7.0.12 - fix(collection)
+Ensure TC39 decorator metadata is initialized on both original and decorated constructors/prototypes and add debug logging
+
+- Initialize metadata-driven prototype properties (globalSaveableProperties, saveableProperties, uniqueIndexes, regularIndexes) on both the decorated class prototype and the original constructor prototype to avoid closure/compatibility issues
+- Initialize searchableFields on both the decorated constructor and the original constructor so text-index creation and searches see the fields correctly
+- Forward and initialize _svDbOptions from decorator metadata onto the original constructor to preserve custom serialization options
+- Add debug logging in the Collection decorator and in createSavableObject to surface metadata and saveable-property counts for easier troubleshooting
+
+## 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
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@push.rocks/smartdata",
-  "version": "7.0.6",
+  "version": "7.0.12",
   "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.6',
+  version: '7.0.12',
   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

@@ -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,32 +93,61 @@ 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 for ${constructor.name}: metadata.saveableProperties = ${metadata?.saveableProperties?.length ?? 'undefined'}`);
     if (metadata) {
       const proto = decoratedClass.prototype;
+      const origProto = constructor.prototype;
 
-      // Initialize globalSaveableProperties
-      if (metadata.globalSaveableProperties && !proto.globalSaveableProperties) {
-        proto.globalSaveableProperties = [...metadata.globalSaveableProperties];
+      // Initialize globalSaveableProperties on BOTH prototypes
+      if (metadata.globalSaveableProperties) {
+        if (!proto.globalSaveableProperties) {
+          proto.globalSaveableProperties = [...metadata.globalSaveableProperties];
+        }
+        if (!origProto.globalSaveableProperties) {
+          origProto.globalSaveableProperties = [...metadata.globalSaveableProperties];
+        }
       }
 
-      // Initialize saveableProperties
-      if (metadata.saveableProperties && !proto.saveableProperties) {
-        proto.saveableProperties = [...metadata.saveableProperties];
+      // Initialize saveableProperties on BOTH prototypes (closure fix)
+      if (metadata.saveableProperties) {
+        if (!proto.saveableProperties) {
+          proto.saveableProperties = [...metadata.saveableProperties];
+        }
+        // Also set on original constructor's prototype for closure references
+        if (!origProto.saveableProperties) {
+          origProto.saveableProperties = [...metadata.saveableProperties];
+          logger.log('debug', `Collection decorator: set saveableProperties on original prototype (${origProto.saveableProperties.length} props)`);
+        }
       }
 
-      // Initialize uniqueIndexes
-      if (metadata.uniqueIndexes && !proto.uniqueIndexes) {
-        proto.uniqueIndexes = [...metadata.uniqueIndexes];
+      // Initialize uniqueIndexes on BOTH prototypes
+      if (metadata.uniqueIndexes) {
+        if (!proto.uniqueIndexes) {
+          proto.uniqueIndexes = [...metadata.uniqueIndexes];
+        }
+        if (!origProto.uniqueIndexes) {
+          origProto.uniqueIndexes = [...metadata.uniqueIndexes];
+        }
       }
 
-      // Initialize regularIndexes
-      if (metadata.regularIndexes && !proto.regularIndexes) {
-        proto.regularIndexes = [...metadata.regularIndexes];
+      // Initialize regularIndexes on BOTH prototypes
+      if (metadata.regularIndexes) {
+        if (!proto.regularIndexes) {
+          proto.regularIndexes = [...metadata.regularIndexes];
+        }
+        if (!origProto.regularIndexes) {
+          origProto.regularIndexes = [...metadata.regularIndexes];
+        }
       }
 
-      // Initialize searchableFields on constructor (not prototype)
-      if (metadata.searchableFields && !Array.isArray((decoratedClass as any).searchableFields)) {
-        (decoratedClass as any).searchableFields = [...metadata.searchableFields];
+      // Initialize searchableFields on BOTH constructors
+      if (metadata.searchableFields) {
+        if (!Array.isArray((decoratedClass as any).searchableFields)) {
+          (decoratedClass as any).searchableFields = [...metadata.searchableFields];
+        }
+        if (!Array.isArray((constructor as any).searchableFields)) {
+          (constructor as any).searchableFields = [...metadata.searchableFields];
+        }
       }
 
       // Initialize _svDbOptions from metadata
@@ -188,36 +231,98 @@ 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;
     const metadata = context.metadata as any;
     if (metadata) {
       const proto = decoratedClass.prototype;
+      const origProto = constructor.prototype;
 
-      // Initialize globalSaveableProperties
-      if (metadata.globalSaveableProperties && !proto.globalSaveableProperties) {
-        proto.globalSaveableProperties = [...metadata.globalSaveableProperties];
+      // Initialize globalSaveableProperties on BOTH prototypes
+      if (metadata.globalSaveableProperties) {
+        if (!proto.globalSaveableProperties) {
+          proto.globalSaveableProperties = [...metadata.globalSaveableProperties];
+        }
+        if (!origProto.globalSaveableProperties) {
+          origProto.globalSaveableProperties = [...metadata.globalSaveableProperties];
+        }
       }
 
-      // Initialize saveableProperties
-      if (metadata.saveableProperties && !proto.saveableProperties) {
-        proto.saveableProperties = [...metadata.saveableProperties];
+      // Initialize saveableProperties on BOTH prototypes (closure fix)
+      if (metadata.saveableProperties) {
+        if (!proto.saveableProperties) {
+          proto.saveableProperties = [...metadata.saveableProperties];
+        }
+        if (!origProto.saveableProperties) {
+          origProto.saveableProperties = [...metadata.saveableProperties];
+        }
       }
 
-      // Initialize uniqueIndexes
-      if (metadata.uniqueIndexes && !proto.uniqueIndexes) {
-        proto.uniqueIndexes = [...metadata.uniqueIndexes];
+      // Initialize uniqueIndexes on BOTH prototypes
+      if (metadata.uniqueIndexes) {
+        if (!proto.uniqueIndexes) {
+          proto.uniqueIndexes = [...metadata.uniqueIndexes];
+        }
+        if (!origProto.uniqueIndexes) {
+          origProto.uniqueIndexes = [...metadata.uniqueIndexes];
+        }
       }
 
-      // Initialize regularIndexes
-      if (metadata.regularIndexes && !proto.regularIndexes) {
-        proto.regularIndexes = [...metadata.regularIndexes];
+      // Initialize regularIndexes on BOTH prototypes
+      if (metadata.regularIndexes) {
+        if (!proto.regularIndexes) {
+          proto.regularIndexes = [...metadata.regularIndexes];
+        }
+        if (!origProto.regularIndexes) {
+          origProto.regularIndexes = [...metadata.regularIndexes];
+        }
       }
 
-      // Initialize searchableFields on constructor (not prototype)
-      if (metadata.searchableFields && !Array.isArray((decoratedClass as any).searchableFields)) {
-        (decoratedClass as any).searchableFields = [...metadata.searchableFields];
+      // Initialize searchableFields on BOTH constructors
+      if (metadata.searchableFields) {
+        if (!Array.isArray((decoratedClass as any).searchableFields)) {
+          (decoratedClass as any).searchableFields = [...metadata.searchableFields];
+        }
+        if (!Array.isArray((constructor as any).searchableFields)) {
+          (constructor as any).searchableFields = [...metadata.searchableFields];
+        }
       }
 
       // Initialize _svDbOptions from metadata

ts/classes.doc.ts

@@ -951,6 +951,7 @@ export class SmartDataDbDoc<T extends TImplements, TImplements, TManager extends
     const globalProps = this.globalSaveableProperties || [];
     const specificProps = this.saveableProperties || [];
     const saveableProperties = [...globalProps, ...specificProps];
+    logger.log('debug', `createSavableObject: globalProps=${globalProps.length}, specificProps=${specificProps.length}, total=${saveableProperties.length}`);
     // apply custom serialization if configured
     const optionsMap = (this.constructor as any)._svDbOptions || {};
     for (const propertyNameString of saveableProperties) {