v7.0.14

changelog.md

@@ -1,5 +1,70 @@
 # 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
+
+- 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
+
+- 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
+
+- Added an "exports" entry in package.json mapping "." to ./dist_ts/index.js to declare the package's ESM entrypoint.
+- Removed legacy "main" and "typings" fields from package.json.
+- Improves Node/module resolution and modern bundler compatibility by using the package exports field.
+
+## 2025-11-28 - 7.0.4 - fix(decorators)
+Add Symbol.metadata polyfill and import it at entry to ensure decorator metadata is available
+
+- Add ts/shim.ts: defines Symbol.metadata when missing (polyfill for TC39 Stage 3 decorator metadata).
+- Import './shim.js' at the very top of ts/index.ts so the polyfill runs before any decorator code or exports are evaluated.
+- Prevents runtime errors when decorators rely on Symbol.metadata and improves compatibility across runtimes/environments.
+
 ## 2025-11-28 - 7.0.3 - fix(build)
 Bump devDependency @git.zone/tsbuild to ^3.1.2
 

deno.lock

@@ -1,7 +1,7 @@
 {
   "version": "5",
   "specifiers": {
-    "npm:@git.zone/tsbuild@^3.1.1": "3.1.1",
+    "npm:@git.zone/tsbuild@^3.1.2": "3.1.2",
     "npm:@git.zone/tsrun@2": "2.0.0",
     "npm:@git.zone/tstest@^3.1.3": "3.1.3",
     "npm:@push.rocks/lik@^6.2.2": "6.2.2",
@@ -1111,8 +1111,8 @@
       ],
       "tarball": "https://verdaccio.lossless.digital/@esm-bundle/chai/-/chai-4.3.4-fix.0.tgz"
     },
-    "@git.zone/tsbuild@3.1.1": {
-      "integrity": "sha512-x2MxBu5vaGabWGLS2Rcu/75VDKRZ0F74x0wEzgWPEqG/z9+vFu+8E70FOHj/TZJdnrw0yLEL78dUartNdGqm3A==",
+    "@git.zone/tsbuild@3.1.2": {
+      "integrity": "sha512-K0u840Qo0WEhvcpAtktvdBX6KEXjelU32o820WzcK7dMA7dd2YV+mPOEYfbmWLcdtFJkrjkigQq5fpLhTN4oKQ==",
       "dependencies": [
         "@git.zone/tspublish",
         "@push.rocks/early",
@@ -1125,7 +1125,7 @@
         "typescript"
       ],
       "bin": true,
-      "tarball": "https://verdaccio.lossless.digital/@git.zone/tsbuild/-/tsbuild-3.1.1.tgz"
+      "tarball": "https://verdaccio.lossless.digital/@git.zone/tsbuild/-/tsbuild-3.1.2.tgz"
     },
     "@git.zone/tsbundle@2.6.1": {
       "integrity": "sha512-P1ER6A859GBY5mmC2hNro06O1w/vYCDt5XaetE4vsyJMlFSvWGXrKTxFpTdookZvntQyoXJglYsCPKEsy+OXWQ==",
@@ -8369,7 +8369,7 @@
   "workspace": {
     "packageJson": {
       "dependencies": [
-        "npm:@git.zone/tsbuild@^3.1.1",
+        "npm:@git.zone/tsbuild@^3.1.2",
         "npm:@git.zone/tsrun@2",
         "npm:@git.zone/tstest@^3.1.3",
         "npm:@push.rocks/lik@^6.2.2",

package.json

@@ -1,10 +1,11 @@
 {
   "name": "@push.rocks/smartdata",
-  "version": "7.0.3",
+  "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.",
-  "main": "dist_ts/index.js",
-  "typings": "dist_ts/index.d.ts",
+  "exports": {
+    ".": "./dist_ts/index.js"
+  },
   "type": "module",
   "scripts": {
     "test": "tstest test/ --verbose --logfile --timeout 120",

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@push.rocks/smartdata',
-  version: '7.0.3',
+  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 originalConstructor = value as any;
-    const constructor = value as { new (...args: any[]): any };
+    const constructor = value as { new (...args: any[]): any } & { className?: string };
 
     const getCollection = () => {
       if (!(dbArg instanceof SmartdataDb)) {
@@ -41,79 +75,31 @@ 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) {
-        (coll as any).docCtor = decoratedClass;
+      if (coll && !(coll as any).docCtor) {
+        (coll as any).docCtor = constructor;
       }
       return coll;
     };
 
-    const decoratedClass = class extends constructor {
-      public static className = constructor.name;
-      public static get collection() {
-        return getCollection();
-      }
-      public get collection() {
-        return getCollection();
-      }
-    };
+    // Add static className property directly on the constructor
+    (constructor as any).className = constructor.name;
 
-    // Ensure instance getter works in Deno by defining it on the prototype
-    Object.defineProperty(decoratedClass.prototype, 'collection', {
+    // Define collection getter on constructor (static access)
+    Object.defineProperty(constructor, '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.
-    // 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; },
+    // Define collection getter on prototype (instance access)
+    Object.defineProperty(constructor.prototype, 'collection', {
+      get: getCollection,
+      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 metadata = context.metadata as any;
-    if (metadata) {
-      const proto = decoratedClass.prototype;
-
-      // Initialize globalSaveableProperties
-      if (metadata.globalSaveableProperties && !proto.globalSaveableProperties) {
-        proto.globalSaveableProperties = [...metadata.globalSaveableProperties];
-      }
-
-      // Initialize saveableProperties
-      if (metadata.saveableProperties && !proto.saveableProperties) {
-        proto.saveableProperties = [...metadata.saveableProperties];
-      }
-
-      // Initialize uniqueIndexes
-      if (metadata.uniqueIndexes && !proto.uniqueIndexes) {
-        proto.uniqueIndexes = [...metadata.uniqueIndexes];
-      }
-
-      // Initialize regularIndexes
-      if (metadata.regularIndexes && !proto.regularIndexes) {
-        proto.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 _svDbOptions from metadata
-      if (metadata._svDbOptions && !originalConstructor._svDbOptions) {
-        originalConstructor._svDbOptions = { ...metadata._svDbOptions };
-      }
-    }
-
-    return decoratedClass as any;
+    initializeDecoratorMetadata(constructor, context.metadata);
+    return constructor as any;
   };
 }
 
@@ -136,97 +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 {
-      public static className = constructor.name;
-      public static get collection() {
-        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);
-      }
-      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;
-      }
+    // Resolution helpers (capture managerArg via closure)
+    const getManager = (defaultManagerFn: () => TManager): TManager => {
+      if (!managerArg) return defaultManagerFn();
+      if (managerArg['db']) return managerArg as TManager;
+      return (managerArg as TDelayed<TManager>)();
     };
 
-    // 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 getDb = (defaultManagerFn: () => TManager): SmartdataDb => {
+      return getManager(defaultManagerFn).db;
+    };
 
-      // Initialize globalSaveableProperties
-      if (metadata.globalSaveableProperties && !proto.globalSaveableProperties) {
-        proto.globalSaveableProperties = [...metadata.globalSaveableProperties];
-      }
+    // Static getters
+    Object.defineProperty(constructor, 'collection', {
+      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
+    });
 
-      // Initialize saveableProperties
-      if (metadata.saveableProperties && !proto.saveableProperties) {
-        proto.saveableProperties = [...metadata.saveableProperties];
-      }
+    // Instance getters
+    Object.defineProperty(constructor.prototype, 'collection', {
+      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 uniqueIndexes
-      if (metadata.uniqueIndexes && !proto.uniqueIndexes) {
-        proto.uniqueIndexes = [...metadata.uniqueIndexes];
-      }
-
-      // Initialize regularIndexes
-      if (metadata.regularIndexes && !proto.regularIndexes) {
-        proto.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 _svDbOptions from metadata
-      if (metadata._svDbOptions && !originalConstructor._svDbOptions) {
-        originalConstructor._svDbOptions = { ...metadata._svDbOptions };
-      }
-    }
-
-    return decoratedClass as any;
+    initializeDecoratorMetadata(constructor, context.metadata);
+    return constructor 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) {

ts/index.ts

@@ -1,3 +1,6 @@
+// Polyfill must be imported first - ES modules hoist exports before code runs
+import './shim.js';
+
 export * from './classes.db.js';
 export * from './classes.collection.js';
 export * from './classes.doc.js';

ts/shim.ts

@@ -0,0 +1,6 @@
+/**
+ * Polyfill for Symbol.metadata required by TC39 Stage 3 decorators.
+ * Must be imported before any decorator code loads.
+ * @see https://github.com/tc39/proposal-decorator-metadata
+ */
+(Symbol as any).metadata ??= Symbol.for('Symbol.metadata');