v7.0.14

changelog.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 2025-11-28 - 7.0.14 - fix(classes.collection)
+Centralize TC39 decorator metadata initialization and use context.metadata in class decorators
+
+- Add initializeDecoratorMetadata helper to initialize prototype and constructor properties from TC39 decorator metadata
+- Refactor Collection and managed decorators to call initializeDecoratorMetadata with context.metadata
+- Remove direct reliance on constructor[Symbol.metadata] in class decorators to avoid read-only assignment issues
+- Ensure consistent initialization of saveableProperties, globalSaveableProperties, uniqueIndexes, regularIndexes, searchableFields and _svDbOptions
+
+## 2025-11-28 - 7.0.13 - fix(classes.doc)
+Remove noisy debug logging from decorators and serialization logic
+
+- Removed debug logger calls from globalSvDb decorator initialization
+- Removed debug logger calls from svDb decorator initialization and svDb options handling
+- Removed debug logger calls from unI and index decorator initializers
+- Removed debug logging in createSavableObject to reduce console noise; no functional changes
+
 ## 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
 

package.json

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

@@ -21,6 +21,42 @@ export type TDelayed<TDelayedArg> = () => TDelayedArg;
 
 const collectionFactory = new CollectionFactory();
 
+/**
+ * Initialize prototype and constructor properties from TC39 decorator metadata.
+ * Shared by both Collection and managed decorators.
+ */
+function initializeDecoratorMetadata(
+  constructor: { new (...args: any[]): any; prototype: any },
+  metadata: any
+): void {
+  if (!metadata) return;
+
+  const proto = constructor.prototype;
+  const ctor = constructor as any;
+
+  // Prototype properties (instance-level)
+  if (metadata.globalSaveableProperties && !proto.globalSaveableProperties) {
+    proto.globalSaveableProperties = [...metadata.globalSaveableProperties];
+  }
+  if (metadata.saveableProperties && !proto.saveableProperties) {
+    proto.saveableProperties = [...metadata.saveableProperties];
+  }
+  if (metadata.uniqueIndexes && !proto.uniqueIndexes) {
+    proto.uniqueIndexes = [...metadata.uniqueIndexes];
+  }
+  if (metadata.regularIndexes && !proto.regularIndexes) {
+    proto.regularIndexes = [...metadata.regularIndexes];
+  }
+
+  // Constructor properties (static-level)
+  if (metadata.searchableFields && !Array.isArray(ctor.searchableFields)) {
+    ctor.searchableFields = [...metadata.searchableFields];
+  }
+  if (metadata._svDbOptions && !ctor._svDbOptions) {
+    ctor._svDbOptions = { ...metadata._svDbOptions };
+  }
+}
+
 /**
  * This is a decorator that will tell the decorated class what dbTable to use
  * @param dbArg
@@ -31,9 +67,7 @@ export function Collection(dbArg: SmartdataDb | TDelayed<SmartdataDb>) {
       throw new Error('Collection can only decorate classes');
     }
 
-    // Capture original constructor for _svDbOptions forwarding
+    const constructor = value as { new (...args: any[]): any } & { className?: string };
-    const originalConstructor = value as any;
-    const constructor = value as { new (...args: any[]): any };
 
     const getCollection = () => {
       if (!(dbArg instanceof SmartdataDb)) {
@@ -42,121 +76,30 @@ export function Collection(dbArg: SmartdataDb | TDelayed<SmartdataDb>) {
       const coll = collectionFactory.getCollection(constructor.name, dbArg);
       // Attach document constructor for searchableFields lookup
       if (coll && !(coll as any).docCtor) {
-        (coll as any).docCtor = decoratedClass;
+        (coll as any).docCtor = constructor;
       }
       return coll;
     };
 
-    const decoratedClass = class extends constructor {
+    // Add static className property directly on the constructor
-      public static className = constructor.name;
+    (constructor as any).className = constructor.name;
-      public static get collection() {
-        return getCollection();
-      }
-      public get collection() {
-        return getCollection();
-      }
-    };
 
-    // Ensure instance getter works in Deno by defining it on the prototype
+    // Define collection getter on constructor (static access)
-    Object.defineProperty(decoratedClass.prototype, 'collection', {
-      get: getCollection,
-      enumerable: false,
-      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
     });
+
+    // Define collection getter on prototype (instance access)
     Object.defineProperty(constructor.prototype, 'collection', {
       get: getCollection,
       enumerable: false,
       configurable: true
     });
 
-    // Deno compatibility note: Property decorators set properties on the prototype.
+    initializeDecoratorMetadata(constructor, context.metadata);
-    // Since we removed instance property declarations from SmartDataDbDoc,
+    return constructor as any;
-    // the decorator-set prototype properties are now accessible without shadowing.
-    // No manual forwarding needed - natural prototype inheritance works!
-
-    // Point to original constructor's _svDbOptions
-    Object.defineProperty(decoratedClass, '_svDbOptions', {
-      get() { return originalConstructor._svDbOptions; },
-      set(value) { originalConstructor._svDbOptions = value; },
-      configurable: true
-    });
-
-    // 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 on BOTH prototypes
-      if (metadata.globalSaveableProperties) {
-        if (!proto.globalSaveableProperties) {
-          proto.globalSaveableProperties = [...metadata.globalSaveableProperties];
-        }
-        if (!origProto.globalSaveableProperties) {
-          origProto.globalSaveableProperties = [...metadata.globalSaveableProperties];
-        }
-      }
-
-      // 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 on BOTH prototypes
-      if (metadata.uniqueIndexes) {
-        if (!proto.uniqueIndexes) {
-          proto.uniqueIndexes = [...metadata.uniqueIndexes];
-        }
-        if (!origProto.uniqueIndexes) {
-          origProto.uniqueIndexes = [...metadata.uniqueIndexes];
-        }
-      }
-
-      // 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 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
-      if (metadata._svDbOptions && !originalConstructor._svDbOptions) {
-        originalConstructor._svDbOptions = { ...metadata._svDbOptions };
-      }
-    }
-
-    return decoratedClass as any;
   };
 }
 
@@ -179,159 +122,46 @@ export function managed<TManager extends IManager>(managerArg?: TManager | TDela
       throw new Error('managed can only decorate classes');
     }
 
-    const constructor = value as { new (...args: any[]): any };
+    const constructor = value as { new (...args: any[]): any } & { className?: string };
+    (constructor as any).className = constructor.name;
 
-    const decoratedClass = class extends constructor {
+    // Resolution helpers (capture managerArg via closure)
-      public static className = constructor.name;
+    const getManager = (defaultManagerFn: () => TManager): TManager => {
-      public static get collection() {
+      if (!managerArg) return defaultManagerFn();
-        let dbArg: SmartdataDb;
+      if (managerArg['db']) return managerArg as TManager;
-        if (!managerArg) {
+      return (managerArg as TDelayed<TManager>)();
-          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);
-      }
-      public get collection() {
-        let dbArg: SmartdataDb;
-        if (!managerArg) {
-          //console.log(this.defaultManager.db);
-          //process.exit(0)
-          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);
-      }
-      public static get manager() {
-        let manager: TManager;
-        if (!managerArg) {
-          manager = this.prototype.defaultManager;
-        } else if (managerArg['db']) {
-          manager = managerArg as TManager;
-        } else {
-          manager = (managerArg as TDelayed<TManager>)();
-        }
-        return manager;
-      }
-      public get manager() {
-        let manager: TManager;
-        if (!managerArg) {
-          manager = this.defaultManager;
-        } else if (managerArg['db']) {
-          manager = managerArg as TManager;
-        } else {
-          manager = (managerArg as TDelayed<TManager>)();
-        }
-        return manager;
-      }
     };
 
-    // Closure fix: When class methods reference the class name (e.g., `User.collection`),
+    const getDb = (defaultManagerFn: () => TManager): SmartdataDb => {
-    // they get the original constructor via closure, not the decorated class.
+      return getManager(defaultManagerFn).db;
-    // 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);
     };
+
+    // Static getters
     Object.defineProperty(constructor, 'collection', {
-      get: getCollectionStatic,
+      get(this: any) { return collectionFactory.getCollection(constructor.name, getDb(() => this.prototype.defaultManager)); },
       enumerable: false,
       configurable: true
     });
+    Object.defineProperty(constructor, 'manager', {
+      get(this: any) { return getManager(() => this.prototype.defaultManager); },
+      enumerable: false,
+      configurable: true
+    });
+
+    // Instance getters
     Object.defineProperty(constructor.prototype, 'collection', {
-      get: getCollectionInstance,
+      get(this: any) { return collectionFactory.getCollection(constructor.name, getDb(() => this.defaultManager)); },
+      enumerable: false,
+      configurable: true
+    });
+    Object.defineProperty(constructor.prototype, 'manager', {
+      get(this: any) { return getManager(() => this.defaultManager); },
       enumerable: false,
       configurable: true
     });
 
-    // Initialize prototype properties from context.metadata (TC39 decorator metadata)
+    initializeDecoratorMetadata(constructor, context.metadata);
-    // This ensures prototype properties are available before any instance is created
+    return constructor as any;
-    const originalConstructor = value as any;
-    const metadata = context.metadata as any;
-    if (metadata) {
-      const proto = decoratedClass.prototype;
-      const origProto = constructor.prototype;
-
-      // Initialize globalSaveableProperties on BOTH prototypes
-      if (metadata.globalSaveableProperties) {
-        if (!proto.globalSaveableProperties) {
-          proto.globalSaveableProperties = [...metadata.globalSaveableProperties];
-        }
-        if (!origProto.globalSaveableProperties) {
-          origProto.globalSaveableProperties = [...metadata.globalSaveableProperties];
-        }
-      }
-
-      // 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 on BOTH prototypes
-      if (metadata.uniqueIndexes) {
-        if (!proto.uniqueIndexes) {
-          proto.uniqueIndexes = [...metadata.uniqueIndexes];
-        }
-        if (!origProto.uniqueIndexes) {
-          origProto.uniqueIndexes = [...metadata.uniqueIndexes];
-        }
-      }
-
-      // 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 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
-      if (metadata._svDbOptions && !originalConstructor._svDbOptions) {
-        originalConstructor._svDbOptions = { ...metadata._svDbOptions };
-      }
-    }
-
-    return decoratedClass as any;
   };
 }
 

ts/classes.doc.ts

@@ -51,8 +51,6 @@ export function globalSvDb() {
     }
     metadata.globalSaveableProperties.push(String(context.name));
 
-    logger.log('debug', `called globalSvDb() on metadata for property ${String(context.name)}`);
-
     // Use addInitializer to ensure prototype arrays are set up once
     context.addInitializer(function(this: any) {
       const proto = this.constructor.prototype;
@@ -61,7 +59,6 @@ export function globalSvDb() {
       if (metadata && metadata.globalSaveableProperties && !proto.globalSaveableProperties) {
         // Initialize prototype array from metadata (runs once per class)
         proto.globalSaveableProperties = [...metadata.globalSaveableProperties];
-        logger.log('debug', `initialized globalSaveableProperties with ${proto.globalSaveableProperties.length} properties`);
       }
     });
   };
@@ -103,8 +100,6 @@ export function svDb(options?: SvDbOptions) {
       metadata._svDbOptions[propName] = options;
     }
 
-    logger.log('debug', `called svDb() on metadata for property ${propName}`);
-
     // Use addInitializer to ensure prototype arrays are set up once
     context.addInitializer(function(this: any) {
       const proto = this.constructor.prototype;
@@ -114,7 +109,6 @@ export function svDb(options?: SvDbOptions) {
       if (metadata && metadata.saveableProperties && !proto.saveableProperties) {
         // Initialize prototype array from metadata (runs once per class)
         proto.saveableProperties = [...metadata.saveableProperties];
-        logger.log('debug', `initialized saveableProperties with ${proto.saveableProperties.length} properties`);
       }
 
       // Initialize svDbOptions from metadata
@@ -187,8 +181,6 @@ export function unI() {
       metadata.saveableProperties.push(propName);
     }
 
-    logger.log('debug', `called unI on metadata for property ${propName}`);
-
     // Use addInitializer to ensure prototype arrays are set up once
     context.addInitializer(function(this: any) {
       const proto = this.constructor.prototype;
@@ -196,7 +188,6 @@ export function unI() {
 
       if (metadata && metadata.uniqueIndexes && !proto.uniqueIndexes) {
         proto.uniqueIndexes = [...metadata.uniqueIndexes];
-        logger.log('debug', `initialized uniqueIndexes with ${proto.uniqueIndexes.length} properties`);
       }
 
       if (metadata && metadata.saveableProperties && !proto.saveableProperties) {
@@ -246,8 +237,6 @@ export function index(options?: IIndexOptions) {
       metadata.saveableProperties.push(propName);
     }
 
-    logger.log('debug', `called index() on metadata for property ${propName}`);
-
     // Use addInitializer to ensure prototype arrays are set up once
     context.addInitializer(function(this: any) {
       const proto = this.constructor.prototype;
@@ -255,7 +244,6 @@ export function index(options?: IIndexOptions) {
 
       if (metadata && metadata.regularIndexes && !proto.regularIndexes) {
         proto.regularIndexes = [...metadata.regularIndexes];
-        logger.log('debug', `initialized regularIndexes with ${proto.regularIndexes.length} indexes`);
       }
 
       if (metadata && metadata.saveableProperties && !proto.saveableProperties) {
@@ -951,7 +939,6 @@ 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) {