Compare commits

...

18 Commits

Author SHA1 Message Date
49b121aa5b v7.0.13
Some checks failed
Default (tags) / security (push) Successful in 41s
Default (tags) / test (push) Failing after 49s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2025-11-28 11:40:52 +00:00
514d3dbd29 fix(classes.doc): Remove noisy debug logging from decorators and serialization logic 2025-11-28 11:40:52 +00:00
2b7316dc46 v7.0.12
Some checks failed
Default (tags) / security (push) Successful in 54s
Default (tags) / test (push) Failing after 1m16s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2025-11-28 11:27:36 +00:00
11a1345891 fix(collection): Ensure TC39 decorator metadata is initialized on both original and decorated constructors/prototypes and add debug logging 2025-11-28 11:27:36 +00:00
2fe3a72eaf 7.0.11
Some checks failed
Default (tags) / security (push) Successful in 56s
Default (tags) / test (push) Failing after 1m18s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2025-11-28 11:19:45 +00:00
fb7e82557b chore: Remove debug logging from Collection decorator 2025-11-28 11:19:44 +00:00
8a3425e554 7.0.10
Some checks failed
Default (tags) / security (push) Successful in 58s
Default (tags) / test (push) Failing after 1m20s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2025-11-28 11:17:25 +00:00
d2092cc5f3 chore(debug): Add metadata debug logging to Collection decorator 2025-11-28 11:17:25 +00:00
1a621ca64e v7.0.9
Some checks failed
Default (tags) / security (push) Successful in 38s
Default (tags) / test (push) Failing after 50s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2025-11-28 11:02:39 +00:00
f6cc07880a fix(classes.collection): Fix closure bug in Collection decorator by defining collection getter on original constructor and prototype 2025-11-28 11:02:39 +00:00
bf4b11f1f5 v7.0.8
Some checks failed
Default (tags) / security (push) Successful in 46s
Default (tags) / test (push) Failing after 51s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2025-11-28 10:55:29 +00:00
181e9da151 fix(classes.collection): Fix closure issue in managed decorator so Class.collection/instance.collection resolve correctly 2025-11-28 10:55:29 +00:00
3013edb2eb v7.0.7
Some checks failed
Default (tags) / security (push) Successful in 38s
Default (tags) / test (push) Failing after 49s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2025-11-28 10:17:07 +00:00
604e4ba265 fix(decorators): Fix decorator metadata initialization and Lucene query transformation 2025-11-28 10:17:07 +00:00
477f446c34 v7.0.6
Some checks failed
Default (tags) / security (push) Successful in 49s
Default (tags) / test (push) Failing after 50s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2025-11-28 10:03:23 +00:00
fbb8bb685c fix(classes.collection): Guard against missing collection before attaching document constructor in Collection decorator 2025-11-28 10:03:23 +00:00
4cf62fd91c v7.0.5
Some checks failed
Default (tags) / security (push) Successful in 50s
Default (tags) / test (push) Failing after 50s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2025-11-28 09:37:32 +00:00
8ee45c5646 fix(package): Add package exports entry and remove legacy main/typings fields 2025-11-28 09:37:32 +00:00
5 changed files with 121 additions and 90 deletions

View File

@@ -1,5 +1,55 @@
# Changelog # Changelog
## 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) ## 2025-11-28 - 7.0.4 - fix(decorators)
Add Symbol.metadata polyfill and import it at entry to ensure decorator metadata is available Add Symbol.metadata polyfill and import it at entry to ensure decorator metadata is available

View File

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

View File

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

View File

@@ -31,9 +31,7 @@ export function Collection(dbArg: SmartdataDb | TDelayed<SmartdataDb>) {
throw new Error('Collection can only decorate classes'); 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 = () => { const getCollection = () => {
if (!(dbArg instanceof SmartdataDb)) { if (!(dbArg instanceof SmartdataDb)) {
@@ -41,38 +39,26 @@ export function Collection(dbArg: SmartdataDb | TDelayed<SmartdataDb>) {
} }
const coll = collectionFactory.getCollection(constructor.name, dbArg); const coll = collectionFactory.getCollection(constructor.name, dbArg);
// Attach document constructor for searchableFields lookup // Attach document constructor for searchableFields lookup
if (!(coll as any).docCtor) { if (coll && !(coll as any).docCtor) {
(coll as any).docCtor = decoratedClass; (coll as any).docCtor = constructor;
} }
return coll; 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', { Object.defineProperty(constructor, 'collection', {
get: getCollection, get: getCollection,
enumerable: false, enumerable: false,
configurable: true configurable: true
}); });
// Deno compatibility note: Property decorators set properties on the prototype. // Define collection getter on prototype (instance access)
// Since we removed instance property declarations from SmartDataDbDoc, Object.defineProperty(constructor.prototype, 'collection', {
// the decorator-set prototype properties are now accessible without shadowing. get: getCollection,
// No manual forwarding needed - natural prototype inheritance works! enumerable: false,
// Point to original constructor's _svDbOptions
Object.defineProperty(decoratedClass, '_svDbOptions', {
get() { return originalConstructor._svDbOptions; },
set(value) { originalConstructor._svDbOptions = value; },
configurable: true configurable: true
}); });
@@ -80,40 +66,35 @@ export function Collection(dbArg: SmartdataDb | TDelayed<SmartdataDb>) {
// This ensures prototype properties are available before any instance is created // This ensures prototype properties are available before any instance is created
const metadata = context.metadata as any; const metadata = context.metadata as any;
if (metadata) { if (metadata) {
const proto = decoratedClass.prototype; const proto = constructor.prototype;
// Initialize globalSaveableProperties
if (metadata.globalSaveableProperties && !proto.globalSaveableProperties) { if (metadata.globalSaveableProperties && !proto.globalSaveableProperties) {
proto.globalSaveableProperties = [...metadata.globalSaveableProperties]; proto.globalSaveableProperties = [...metadata.globalSaveableProperties];
} }
// Initialize saveableProperties
if (metadata.saveableProperties && !proto.saveableProperties) { if (metadata.saveableProperties && !proto.saveableProperties) {
proto.saveableProperties = [...metadata.saveableProperties]; proto.saveableProperties = [...metadata.saveableProperties];
} }
// Initialize uniqueIndexes
if (metadata.uniqueIndexes && !proto.uniqueIndexes) { if (metadata.uniqueIndexes && !proto.uniqueIndexes) {
proto.uniqueIndexes = [...metadata.uniqueIndexes]; proto.uniqueIndexes = [...metadata.uniqueIndexes];
} }
// Initialize regularIndexes
if (metadata.regularIndexes && !proto.regularIndexes) { if (metadata.regularIndexes && !proto.regularIndexes) {
proto.regularIndexes = [...metadata.regularIndexes]; proto.regularIndexes = [...metadata.regularIndexes];
} }
// Initialize searchableFields on constructor (not prototype) if (metadata.searchableFields && !Array.isArray((constructor as any).searchableFields)) {
if (metadata.searchableFields && !Array.isArray((decoratedClass as any).searchableFields)) { (constructor as any).searchableFields = [...metadata.searchableFields];
(decoratedClass as any).searchableFields = [...metadata.searchableFields];
} }
// Initialize _svDbOptions from metadata if (metadata._svDbOptions && !(constructor as any)._svDbOptions) {
if (metadata._svDbOptions && !originalConstructor._svDbOptions) { (constructor as any)._svDbOptions = { ...metadata._svDbOptions };
originalConstructor._svDbOptions = { ...metadata._svDbOptions };
} }
} }
return decoratedClass as any; // Return the ORIGINAL constructor (no class replacement)
return constructor as any;
}; };
} }
@@ -136,11 +117,14 @@ export function managed<TManager extends IManager>(managerArg?: TManager | TDela
throw new Error('managed can only decorate classes'); 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 };
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() {
// Define collection getter (static)
Object.defineProperty(constructor, 'collection', {
get: function(this: any) {
let dbArg: SmartdataDb; let dbArg: SmartdataDb;
if (!managerArg) { if (!managerArg) {
dbArg = this.prototype.defaultManager.db; dbArg = this.prototype.defaultManager.db;
@@ -150,12 +134,16 @@ export function managed<TManager extends IManager>(managerArg?: TManager | TDela
dbArg = (managerArg as TDelayed<TManager>)().db; dbArg = (managerArg as TDelayed<TManager>)().db;
} }
return collectionFactory.getCollection(constructor.name, dbArg); return collectionFactory.getCollection(constructor.name, dbArg);
} },
public get collection() { enumerable: false,
configurable: true
});
// Define collection getter (instance)
Object.defineProperty(constructor.prototype, 'collection', {
get: function(this: any) {
let dbArg: SmartdataDb; let dbArg: SmartdataDb;
if (!managerArg) { if (!managerArg) {
//console.log(this.defaultManager.db);
//process.exit(0)
dbArg = this.defaultManager.db; dbArg = this.defaultManager.db;
} else if (managerArg['db']) { } else if (managerArg['db']) {
dbArg = (managerArg as TManager).db; dbArg = (managerArg as TManager).db;
@@ -163,70 +151,74 @@ export function managed<TManager extends IManager>(managerArg?: TManager | TDela
dbArg = (managerArg as TDelayed<TManager>)().db; dbArg = (managerArg as TDelayed<TManager>)().db;
} }
return collectionFactory.getCollection(constructor.name, dbArg); return collectionFactory.getCollection(constructor.name, dbArg);
} },
public static get manager() { enumerable: false,
let manager: TManager; configurable: true
});
// Define manager getter (static)
Object.defineProperty(constructor, 'manager', {
get: function(this: any) {
if (!managerArg) { if (!managerArg) {
manager = this.prototype.defaultManager; return this.prototype.defaultManager;
} else if (managerArg['db']) { } else if (managerArg['db']) {
manager = managerArg as TManager; return managerArg as TManager;
} else { } else {
manager = (managerArg as TDelayed<TManager>)(); return (managerArg as TDelayed<TManager>)();
} }
return manager; },
} enumerable: false,
public get manager() { configurable: true
let manager: TManager; });
// Define manager getter (instance)
Object.defineProperty(constructor.prototype, 'manager', {
get: function(this: any) {
if (!managerArg) { if (!managerArg) {
manager = this.defaultManager; return this.defaultManager;
} else if (managerArg['db']) { } else if (managerArg['db']) {
manager = managerArg as TManager; return managerArg as TManager;
} else { } else {
manager = (managerArg as TDelayed<TManager>)(); return (managerArg as TDelayed<TManager>)();
} }
return manager; },
} enumerable: false,
}; configurable: true
});
// Initialize prototype properties from context.metadata (TC39 decorator metadata) // Initialize prototype properties from context.metadata (TC39 decorator metadata)
// This ensures prototype properties are available before any instance is created // This ensures prototype properties are available before any instance is created
const originalConstructor = value as any;
const metadata = context.metadata as any; const metadata = context.metadata as any;
if (metadata) { if (metadata) {
const proto = decoratedClass.prototype; const proto = constructor.prototype;
// Initialize globalSaveableProperties
if (metadata.globalSaveableProperties && !proto.globalSaveableProperties) { if (metadata.globalSaveableProperties && !proto.globalSaveableProperties) {
proto.globalSaveableProperties = [...metadata.globalSaveableProperties]; proto.globalSaveableProperties = [...metadata.globalSaveableProperties];
} }
// Initialize saveableProperties
if (metadata.saveableProperties && !proto.saveableProperties) { if (metadata.saveableProperties && !proto.saveableProperties) {
proto.saveableProperties = [...metadata.saveableProperties]; proto.saveableProperties = [...metadata.saveableProperties];
} }
// Initialize uniqueIndexes
if (metadata.uniqueIndexes && !proto.uniqueIndexes) { if (metadata.uniqueIndexes && !proto.uniqueIndexes) {
proto.uniqueIndexes = [...metadata.uniqueIndexes]; proto.uniqueIndexes = [...metadata.uniqueIndexes];
} }
// Initialize regularIndexes
if (metadata.regularIndexes && !proto.regularIndexes) { if (metadata.regularIndexes && !proto.regularIndexes) {
proto.regularIndexes = [...metadata.regularIndexes]; proto.regularIndexes = [...metadata.regularIndexes];
} }
// Initialize searchableFields on constructor (not prototype) if (metadata.searchableFields && !Array.isArray((constructor as any).searchableFields)) {
if (metadata.searchableFields && !Array.isArray((decoratedClass as any).searchableFields)) { (constructor as any).searchableFields = [...metadata.searchableFields];
(decoratedClass as any).searchableFields = [...metadata.searchableFields];
} }
// Initialize _svDbOptions from metadata if (metadata._svDbOptions && !(constructor as any)._svDbOptions) {
if (metadata._svDbOptions && !originalConstructor._svDbOptions) { (constructor as any)._svDbOptions = { ...metadata._svDbOptions };
originalConstructor._svDbOptions = { ...metadata._svDbOptions };
} }
} }
return decoratedClass as any; // Return the ORIGINAL constructor (no class replacement)
return constructor as any;
}; };
} }

View File

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