push.rocks/smartdata
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(classes.doc): Remove noisy debug logging from decorators and serialization logic

Browse Source
This commit is contained in:
Jürgen Kunz
2025-11-28 11:40:52 +00:00
parent 2b7316dc46
commit 514d3dbd29
4 changed files with 89 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
changelog.md
View File

@@ -1,5 +1,13 @@
# 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) ## 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 Ensure TC39 decorator metadata is initialized on both original and decorated constructors/prototypes and add debug logging

2
ts/00_commitinfo_data.ts
View File

@@ -3,6 +3,6 @@
*/ */
export const commitinfo = { export const commitinfo = {
name: '@push.rocks/smartdata', name: '@push.rocks/smartdata',
version: '7.0.12', 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.'
} }

273
ts/classes.collection.ts
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)) {
@@ -42,121 +40,61 @@ 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 && !(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', {
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', { Object.defineProperty(constructor, 'collection', {
get: getCollection, get: getCollection,
enumerable: false, enumerable: false,
configurable: true configurable: true
}); });
// Define collection getter on prototype (instance access)
Object.defineProperty(constructor.prototype, 'collection', { Object.defineProperty(constructor.prototype, 'collection', {
get: getCollection, get: getCollection,
enumerable: false, enumerable: false,
configurable: true 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) // 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 metadata = context.metadata as any; const metadata = context.metadata as any;
logger.log('debug', `Collection decorator for ${constructor.name}: metadata.saveableProperties = ${metadata?.saveableProperties?.length ?? 'undefined'}`);
if (metadata) { if (metadata) {
const proto = decoratedClass.prototype; const proto = constructor.prototype;
const origProto = constructor.prototype;
// Initialize globalSaveableProperties on BOTH prototypes if (metadata.globalSaveableProperties && !proto.globalSaveableProperties) {
if (metadata.globalSaveableProperties) { proto.globalSaveableProperties = [...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 && !proto.saveableProperties) {
if (metadata.saveableProperties) { proto.saveableProperties = [...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 && !proto.uniqueIndexes) {
if (metadata.uniqueIndexes) { proto.uniqueIndexes = [...metadata.uniqueIndexes];
if (!proto.uniqueIndexes) {
proto.uniqueIndexes = [...metadata.uniqueIndexes];
}
if (!origProto.uniqueIndexes) {
origProto.uniqueIndexes = [...metadata.uniqueIndexes];
}
} }
// Initialize regularIndexes on BOTH prototypes if (metadata.regularIndexes && !proto.regularIndexes) {
if (metadata.regularIndexes) { proto.regularIndexes = [...metadata.regularIndexes];
if (!proto.regularIndexes) {
proto.regularIndexes = [...metadata.regularIndexes];
}
if (!origProto.regularIndexes) {
origProto.regularIndexes = [...metadata.regularIndexes];
}
} }
// Initialize searchableFields on BOTH constructors if (metadata.searchableFields && !Array.isArray((constructor as any).searchableFields)) {
if (metadata.searchableFields) { (constructor as any).searchableFields = [...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 && !(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;
}; };
} }
@@ -179,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;
@@ -193,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;
@@ -206,132 +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() {
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`),
// 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, enumerable: false,
configurable: true configurable: true
}); });
Object.defineProperty(constructor.prototype, 'collection', {
get: getCollectionInstance, // 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, enumerable: false,
configurable: true 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;
const origProto = constructor.prototype;
// Initialize globalSaveableProperties on BOTH prototypes if (metadata.globalSaveableProperties && !proto.globalSaveableProperties) {
if (metadata.globalSaveableProperties) { proto.globalSaveableProperties = [...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 && !proto.saveableProperties) {
if (metadata.saveableProperties) { proto.saveableProperties = [...metadata.saveableProperties];
if (!proto.saveableProperties) {
proto.saveableProperties = [...metadata.saveableProperties];
}
if (!origProto.saveableProperties) {
origProto.saveableProperties = [...metadata.saveableProperties];
}
} }
// Initialize uniqueIndexes on BOTH prototypes if (metadata.uniqueIndexes && !proto.uniqueIndexes) {
if (metadata.uniqueIndexes) { proto.uniqueIndexes = [...metadata.uniqueIndexes];
if (!proto.uniqueIndexes) {
proto.uniqueIndexes = [...metadata.uniqueIndexes];
}
if (!origProto.uniqueIndexes) {
origProto.uniqueIndexes = [...metadata.uniqueIndexes];
}
} }
// Initialize regularIndexes on BOTH prototypes if (metadata.regularIndexes && !proto.regularIndexes) {
if (metadata.regularIndexes) { proto.regularIndexes = [...metadata.regularIndexes];
if (!proto.regularIndexes) {
proto.regularIndexes = [...metadata.regularIndexes];
}
if (!origProto.regularIndexes) {
origProto.regularIndexes = [...metadata.regularIndexes];
}
} }
// Initialize searchableFields on BOTH constructors if (metadata.searchableFields && !Array.isArray((constructor as any).searchableFields)) {
if (metadata.searchableFields) { (constructor as any).searchableFields = [...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 && !(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;
}; };
} }

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