Compare commits
22 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 8a3425e554 | |||
| d2092cc5f3 | |||
| 1a621ca64e | |||
| f6cc07880a | |||
| bf4b11f1f5 | |||
| 181e9da151 | |||
| 3013edb2eb | |||
| 604e4ba265 | |||
| 477f446c34 | |||
| fbb8bb685c | |||
| 4cf62fd91c | |||
| 8ee45c5646 | |||
| 12f1630adf | |||
| 0a349180b2 | |||
| 23aa29a5b8 | |||
| 5bf2aae2b9 | |||
| 5cf9155205 | |||
| ef5491075f | |||
| 3f5101c061 | |||
| 4f1d359752 | |||
| aead721a58 | |||
| c3a8a15225 |
65
changelog.md
65
changelog.md
@@ -1,5 +1,70 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 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
|
||||||
|
|
||||||
|
- Updated @git.zone/tsbuild in devDependencies from ^3.1.1 to ^3.1.2
|
||||||
|
|
||||||
|
## 2025-11-28 - 7.0.2 - fix(collectionfactory)
|
||||||
|
Simplify CollectionFactory.getCollection: remove unnecessary IIFE and instantiate collection only when dbArg is SmartdataDb
|
||||||
|
|
||||||
|
- Remove redundant IIFE wrapper in getCollection for improved readability
|
||||||
|
- Only create and cache a SmartdataCollection when dbArg is an instance of SmartdataDb
|
||||||
|
- Avoid assigning undefined to the collections map by guarding instantiation and returning existing collection
|
||||||
|
|
||||||
|
## 2025-11-27 - 7.0.1 - fix(build)
|
||||||
|
Update build tooling and TypeScript compilation target
|
||||||
|
|
||||||
|
- Bump devDependency @git.zone/tsbuild from ^3.1.0 to ^3.1.1.
|
||||||
|
- Update tsconfig.json compiler target from ES2022 to ES2024 (affects emitted JS language level).
|
||||||
|
|
||||||
|
## 2025-11-27 - 7.0.0 - BREAKING CHANGE(mongodb)
|
||||||
|
Upgrade dependencies: bump mongodb to ^7.0.0 and @git.zone/tstest to ^3.1.3
|
||||||
|
|
||||||
|
- Bump 'mongodb' dependency from ^6.20.0 to ^7.0.0 — major version upgrade; may introduce breaking API changes and require code updates or verification against the new driver.
|
||||||
|
- Update devDependency '@git.zone/tstest' from ^2.8.1 to ^3.1.3 — test tooling updated.
|
||||||
|
|
||||||
## 2025-11-17 - 6.0.0 - BREAKING CHANGE(decorators)
|
## 2025-11-17 - 6.0.0 - BREAKING CHANGE(decorators)
|
||||||
Migrate to TC39 Stage 3 decorators and refactor decorator metadata handling; update class initialization, lucene adapter fixes and docs
|
Migrate to TC39 Stage 3 decorators and refactor decorator metadata handling; update class initialization, lucene adapter fixes and docs
|
||||||
|
|
||||||
|
|||||||
13
package.json
13
package.json
@@ -1,10 +1,11 @@
|
|||||||
{
|
{
|
||||||
"name": "@push.rocks/smartdata",
|
"name": "@push.rocks/smartdata",
|
||||||
"version": "6.0.0",
|
"version": "7.0.10",
|
||||||
"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",
|
||||||
@@ -34,12 +35,12 @@
|
|||||||
"@push.rocks/smartunique": "^3.0.8",
|
"@push.rocks/smartunique": "^3.0.8",
|
||||||
"@push.rocks/taskbuffer": "^3.4.0",
|
"@push.rocks/taskbuffer": "^3.4.0",
|
||||||
"@tsclass/tsclass": "^9.3.0",
|
"@tsclass/tsclass": "^9.3.0",
|
||||||
"mongodb": "^6.20.0"
|
"mongodb": "^7.0.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@git.zone/tsbuild": "^3.1.0",
|
"@git.zone/tsbuild": "^3.1.2",
|
||||||
"@git.zone/tsrun": "^2.0.0",
|
"@git.zone/tsrun": "^2.0.0",
|
||||||
"@git.zone/tstest": "^2.8.1",
|
"@git.zone/tstest": "^3.1.3",
|
||||||
"@push.rocks/qenv": "^6.1.3",
|
"@push.rocks/qenv": "^6.1.3",
|
||||||
"@push.rocks/tapbundle": "^6.0.3",
|
"@push.rocks/tapbundle": "^6.0.3",
|
||||||
"@types/node": "^22.15.2"
|
"@types/node": "^22.15.2"
|
||||||
|
|||||||
1535
pnpm-lock.yaml
generated
1535
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
@@ -3,6 +3,6 @@
|
|||||||
*/
|
*/
|
||||||
export const commitinfo = {
|
export const commitinfo = {
|
||||||
name: '@push.rocks/smartdata',
|
name: '@push.rocks/smartdata',
|
||||||
version: '6.0.0',
|
version: '7.0.9',
|
||||||
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.'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ 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 = decoratedClass;
|
||||||
}
|
}
|
||||||
return coll;
|
return coll;
|
||||||
@@ -64,6 +64,20 @@ export function Collection(dbArg: SmartdataDb | TDelayed<SmartdataDb>) {
|
|||||||
configurable: true
|
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
|
||||||
|
});
|
||||||
|
Object.defineProperty(constructor.prototype, 'collection', {
|
||||||
|
get: getCollection,
|
||||||
|
enumerable: false,
|
||||||
|
configurable: true
|
||||||
|
});
|
||||||
|
|
||||||
// Deno compatibility note: Property decorators set properties on the prototype.
|
// Deno compatibility note: Property decorators set properties on the prototype.
|
||||||
// Since we removed instance property declarations from SmartDataDbDoc,
|
// Since we removed instance property declarations from SmartDataDbDoc,
|
||||||
// the decorator-set prototype properties are now accessible without shadowing.
|
// the decorator-set prototype properties are now accessible without shadowing.
|
||||||
@@ -79,17 +93,22 @@ export function Collection(dbArg: SmartdataDb | TDelayed<SmartdataDb>) {
|
|||||||
// 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: metadata keys = ${metadata ? Object.keys(metadata).join(', ') : 'null'}`);
|
||||||
|
logger.log('debug', `Collection decorator: saveableProperties in metadata = ${metadata?.saveableProperties?.length ?? 0}`);
|
||||||
|
logger.log('debug', `Collection decorator: globalSaveableProperties in metadata = ${metadata?.globalSaveableProperties?.length ?? 0}`);
|
||||||
if (metadata) {
|
if (metadata) {
|
||||||
const proto = decoratedClass.prototype;
|
const proto = decoratedClass.prototype;
|
||||||
|
|
||||||
// Initialize globalSaveableProperties
|
// Initialize globalSaveableProperties
|
||||||
if (metadata.globalSaveableProperties && !proto.globalSaveableProperties) {
|
if (metadata.globalSaveableProperties && !proto.globalSaveableProperties) {
|
||||||
proto.globalSaveableProperties = [...metadata.globalSaveableProperties];
|
proto.globalSaveableProperties = [...metadata.globalSaveableProperties];
|
||||||
|
logger.log('debug', `Collection decorator: initialized globalSaveableProperties with ${proto.globalSaveableProperties.length} properties`);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Initialize saveableProperties
|
// Initialize saveableProperties
|
||||||
if (metadata.saveableProperties && !proto.saveableProperties) {
|
if (metadata.saveableProperties && !proto.saveableProperties) {
|
||||||
proto.saveableProperties = [...metadata.saveableProperties];
|
proto.saveableProperties = [...metadata.saveableProperties];
|
||||||
|
logger.log('debug', `Collection decorator: initialized saveableProperties with ${proto.saveableProperties.length} properties`);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Initialize uniqueIndexes
|
// Initialize uniqueIndexes
|
||||||
@@ -188,6 +207,42 @@ export function managed<TManager extends IManager>(managerArg?: TManager | TDela
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// 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,
|
||||||
|
configurable: true
|
||||||
|
});
|
||||||
|
Object.defineProperty(constructor.prototype, 'collection', {
|
||||||
|
get: getCollectionInstance,
|
||||||
|
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 originalConstructor = value as any;
|
||||||
|
|||||||
@@ -6,13 +6,8 @@ export class CollectionFactory {
|
|||||||
public collections: { [key: string]: SmartdataCollection<any> } = {};
|
public collections: { [key: string]: SmartdataCollection<any> } = {};
|
||||||
|
|
||||||
public getCollection = (nameArg: string, dbArg: SmartdataDb): SmartdataCollection<any> => {
|
public getCollection = (nameArg: string, dbArg: SmartdataDb): SmartdataCollection<any> => {
|
||||||
if (!this.collections[nameArg]) {
|
if (!this.collections[nameArg] && dbArg instanceof SmartdataDb) {
|
||||||
this.collections[nameArg] = (() => {
|
this.collections[nameArg] = new SmartdataCollection(nameArg, dbArg);
|
||||||
if (dbArg instanceof SmartdataDb) {
|
|
||||||
// tslint:disable-next-line: no-string-literal
|
|
||||||
return new SmartdataCollection(nameArg, dbArg);
|
|
||||||
}
|
|
||||||
})();
|
|
||||||
}
|
}
|
||||||
return this.collections[nameArg];
|
return this.collections[nameArg];
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -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.db.js';
|
||||||
export * from './classes.collection.js';
|
export * from './classes.collection.js';
|
||||||
export * from './classes.doc.js';
|
export * from './classes.doc.js';
|
||||||
|
|||||||
6
ts/shim.ts
Normal file
6
ts/shim.ts
Normal file
@@ -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');
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"target": "ES2022",
|
"target": "ES2024",
|
||||||
"module": "NodeNext",
|
"module": "NodeNext",
|
||||||
"moduleResolution": "NodeNext",
|
"moduleResolution": "NodeNext",
|
||||||
"esModuleInterop": true,
|
"esModuleInterop": true,
|
||||||
|
|||||||
Reference in New Issue
Block a user