Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 49b121aa5b | |||
| 514d3dbd29 | |||
| 2b7316dc46 | |||
| 11a1345891 | |||
| 2fe3a72eaf | |||
| fb7e82557b | |||
| 8a3425e554 | |||
| d2092cc5f3 |
16
changelog.md
16
changelog.md
@@ -1,5 +1,21 @@
|
||||
# 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
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@push.rocks/smartdata",
|
||||
"version": "7.0.9",
|
||||
"version": "7.0.13",
|
||||
"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": {
|
||||
|
||||
@@ -3,6 +3,6 @@
|
||||
*/
|
||||
export const commitinfo = {
|
||||
name: '@push.rocks/smartdata',
|
||||
version: '7.0.9',
|
||||
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.'
|
||||
}
|
||||
|
||||
@@ -31,9 +31,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)) {
|
||||
@@ -42,92 +40,61 @@ 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 {
|
||||
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', {
|
||||
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.
|
||||
// Define collection getter on constructor (static access)
|
||||
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.
|
||||
// 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; },
|
||||
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;
|
||||
const proto = constructor.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];
|
||||
if (metadata.searchableFields && !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 };
|
||||
if (metadata._svDbOptions && !(constructor as any)._svDbOptions) {
|
||||
(constructor as any)._svDbOptions = { ...metadata._svDbOptions };
|
||||
}
|
||||
}
|
||||
|
||||
return decoratedClass as any;
|
||||
// Return the ORIGINAL constructor (no class replacement)
|
||||
return constructor as any;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -150,133 +117,108 @@ 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 };
|
||||
|
||||
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;
|
||||
}
|
||||
};
|
||||
// Add static className property directly on the constructor
|
||||
(constructor as any).className = constructor.name;
|
||||
|
||||
// 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);
|
||||
};
|
||||
// Define collection getter (static)
|
||||
Object.defineProperty(constructor, 'collection', {
|
||||
get: getCollectionStatic,
|
||||
get: 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);
|
||||
},
|
||||
enumerable: false,
|
||||
configurable: true
|
||||
});
|
||||
|
||||
// Define collection getter (instance)
|
||||
Object.defineProperty(constructor.prototype, 'collection', {
|
||||
get: getCollectionInstance,
|
||||
get: 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);
|
||||
},
|
||||
enumerable: false,
|
||||
configurable: true
|
||||
});
|
||||
|
||||
// Define manager getter (static)
|
||||
Object.defineProperty(constructor, 'manager', {
|
||||
get: function(this: any) {
|
||||
if (!managerArg) {
|
||||
return this.prototype.defaultManager;
|
||||
} else if (managerArg['db']) {
|
||||
return managerArg as TManager;
|
||||
} else {
|
||||
return (managerArg as TDelayed<TManager>)();
|
||||
}
|
||||
},
|
||||
enumerable: false,
|
||||
configurable: true
|
||||
});
|
||||
|
||||
// Define manager getter (instance)
|
||||
Object.defineProperty(constructor.prototype, 'manager', {
|
||||
get: function(this: any) {
|
||||
if (!managerArg) {
|
||||
return this.defaultManager;
|
||||
} else if (managerArg['db']) {
|
||||
return managerArg as TManager;
|
||||
} else {
|
||||
return (managerArg as TDelayed<TManager>)();
|
||||
}
|
||||
},
|
||||
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 proto = constructor.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];
|
||||
if (metadata.searchableFields && !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 };
|
||||
if (metadata._svDbOptions && !(constructor as any)._svDbOptions) {
|
||||
(constructor as any)._svDbOptions = { ...metadata._svDbOptions };
|
||||
}
|
||||
}
|
||||
|
||||
return decoratedClass as any;
|
||||
// Return the ORIGINAL constructor (no class replacement)
|
||||
return constructor as any;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user