v7.1.2

.gitea/workflows/default_nottags.yaml

@@ -7,7 +7,7 @@ on:
 
 env:
   IMAGE: code.foss.global/host.today/ht-docker-node:npmci
-  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@/${{gitea.repository}}.git
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@code.foss.global/${{gitea.repository}}.git
   NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
   NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
   NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}

.gitea/workflows/default_tags.yaml

@@ -7,7 +7,7 @@ on:
 
 env:
   IMAGE: code.foss.global/host.today/ht-docker-node:npmci
-  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@/${{gitea.repository}}.git
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@code.foss.global/${{gitea.repository}}.git
   NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
   NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
   NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}

.gitignore

@@ -16,4 +16,12 @@ node_modules/
 dist/
 dist_*/
 
-#------# custom
+# rust
+rust/target/
+dist_rust/
+
+# AI
+.claude/
+.serena/
+
+#------# custom

.serena/memories/code_style_conventions.md

@@ -1,44 +0,0 @@
-# Code Style & Conventions
-
-## TypeScript Standards
-- **Target**: ES2022
-- **Module System**: ESM with NodeNext resolution
-- **Decorators**: Experimental decorators enabled
-- **Strict Mode**: Implied through TypeScript configuration
-
-## Naming Conventions
-- **Interfaces**: Prefix with `I` (e.g., `IUserData`, `IConfig`)
-- **Types**: Prefix with `T` (e.g., `TResponseType`, `TQueryResult`)
-- **Classes**: PascalCase (e.g., `SmartdataDb`, `SmartDataDbDoc`)
-- **Files**: All lowercase (e.g., `classes.doc.ts`, `plugins.ts`)
-- **Methods**: camelCase (e.g., `findOne`, `saveToDb`)
-
-## Import Patterns
-- All external dependencies imported in `ts/plugins.ts`
-- Reference as `plugins.moduleName.method()`
-- Use full import paths for internal modules
-- Maintain ESM syntax throughout
-
-## Class Structure
-- Use decorators for MongoDB document definitions
-- Extend base classes (SmartDataDbDoc, SmartDataDbCollection)
-- Static methods for factory patterns
-- Instance methods for document operations
-
-## Async Patterns
-- Preserve Promise-based patterns
-- Use async/await for clarity
-- Handle errors appropriately
-- Return typed Promises
-
-## MongoDB Specifics
-- Use `@unify()` decorator for unique fields
-- Use `@svDb()` decorator for database fields
-- Implement proper serialization/deserialization
-- Type-safe query construction with DeepQuery<T>
-
-## Testing Patterns
-- Import from `@git.zone/tstest/tapbundle`
-- End test files with `export default tap.start()`
-- Use descriptive test names
-- Cover edge cases and error conditions

.serena/memories/project_overview.md

@@ -1,37 +0,0 @@
-# Project Overview: @push.rocks/smartdata
-
-## Purpose
-An advanced TypeScript-first MongoDB wrapper library providing enterprise-grade features for distributed systems, real-time data synchronization, and easy data management.
-
-## Tech Stack
-- **Language**: TypeScript (ES2022 target)
-- **Runtime**: Node.js >= 16.x
-- **Database**: MongoDB >= 4.4
-- **Build System**: tsbuild
-- **Test Framework**: tstest with tapbundle
-- **Package Manager**: pnpm (v10.7.0)
-- **Module System**: ESM (ES Modules)
-
-## Key Features
-- Type-safe MongoDB integration with decorators
-- Document management with automatic timestamps
-- EasyStore for key-value storage
-- Distributed coordination with leader election
-- Real-time data sync with RxJS watchers
-- Deep query type safety
-- Enhanced cursor API
-- Powerful search capabilities
-
-## Project Structure
-- **ts/**: Main TypeScript source code
-  - Core classes for DB, Collections, Documents, Cursors
-  - Distributed coordinator, EasyStore, Watchers
-  - Lucene adapter for search functionality
-- **test/**: Test files using tstest framework
-- **dist_ts/**: Compiled JavaScript output
-
-## Key Dependencies
-- MongoDB driver (v6.18.0)
-- @push.rocks ecosystem packages
-- @tsclass/tsclass for decorators
-- RxJS for reactive programming

.serena/memories/suggested_commands.md

@@ -1,35 +0,0 @@
-# Suggested Commands for @push.rocks/smartdata
-
-## Build & Development
-- `pnpm build` - Build the TypeScript project with web support
-- `pnpm buildDocs` - Generate documentation using tsdoc
-- `tsbuild --web --allowimplicitany` - Direct build command
-
-## Testing
-- `pnpm test` - Run all tests in test/ directory
-- `pnpm testSearch` - Run specific search test
-- `tstest test/test.specific.ts --verbose` - Run specific test with verbose output
-- `tsbuild check test/**/* --skiplibcheck` - Type check test files
-
-## Package Management
-- `pnpm install` - Install dependencies
-- `pnpm install --save-dev <package>` - Add dev dependency
-- `pnpm add <package>` - Add production dependency
-
-## Version Control
-- `git status` - Check current changes
-- `git diff` - View uncommitted changes
-- `git log --oneline -10` - View recent commits
-- `git mv <old> <new>` - Move/rename files preserving history
-
-## System Utilities (Linux)
-- `ls -la` - List all files with details
-- `grep -r "pattern" .` - Search for pattern in files
-- `find . -name "*.ts"` - Find TypeScript files
-- `ps aux | grep node` - Find Node.js processes
-- `lsof -i :80` - Check process on port 80
-
-## Debug & Development
-- `tsx <script.ts>` - Run TypeScript file directly
-- Store debug scripts in `.nogit/debug/`
-- Curl endpoints for API testing

.serena/memories/task_completion_checklist.md

@@ -1,33 +0,0 @@
-# Task Completion Checklist
-
-When completing any coding task in this project, always:
-
-## Before Committing
-1. **Build the project**: Run `pnpm build` to ensure TypeScript compiles
-2. **Run tests**: Execute `pnpm test` to verify nothing is broken
-3. **Type check**: Verify types compile correctly
-4. **Check for lint issues**: Look for any code style violations
-
-## Code Quality Checks
-- Verify all imports are in `ts/plugins.ts` for external dependencies
-- Check that interfaces are prefixed with `I`
-- Check that types are prefixed with `T`
-- Ensure filenames are lowercase
-- Verify async patterns are preserved where needed
-- Check that decorators are properly used for MongoDB documents
-
-## Documentation
-- Update relevant comments if functionality changed
-- Ensure new exports are properly documented
-- Update readme.md if new features added (only if explicitly requested)
-
-## Git Hygiene
-- Make small, focused commits
-- Write clear commit messages
-- Use `git mv` for file operations
-- Never commit sensitive data or keys
-
-## Final Verification
-- Test the specific functionality that was changed
-- Ensure no unintended side effects
-- Verify the change solves the original problem completely

.serena/project.yml

@@ -1,68 +0,0 @@
-# language of the project (csharp, python, rust, java, typescript, go, cpp, or ruby)
-#  * For C, use cpp
-#  * For JavaScript, use typescript
-# Special requirements:
-#  * csharp: Requires the presence of a .sln file in the project folder.
-language: typescript
-
-# whether to use the project's gitignore file to ignore files
-# Added on 2025-04-07
-ignore_all_files_in_gitignore: true
-# list of additional paths to ignore
-# same syntax as gitignore, so you can use * and **
-# Was previously called `ignored_dirs`, please update your config if you are using that.
-# Added (renamed)on 2025-04-07
-ignored_paths: []
-
-# whether the project is in read-only mode
-# If set to true, all editing tools will be disabled and attempts to use them will result in an error
-# Added on 2025-04-18
-read_only: false
-
-
-# list of tool names to exclude. We recommend not excluding any tools, see the readme for more details.
-# Below is the complete list of tools for convenience.
-# To make sure you have the latest list of tools, and to view their descriptions, 
-# execute `uv run scripts/print_tool_overview.py`.
-#
-#  * `activate_project`: Activates a project by name.
-#  * `check_onboarding_performed`: Checks whether project onboarding was already performed.
-#  * `create_text_file`: Creates/overwrites a file in the project directory.
-#  * `delete_lines`: Deletes a range of lines within a file.
-#  * `delete_memory`: Deletes a memory from Serena's project-specific memory store.
-#  * `execute_shell_command`: Executes a shell command.
-#  * `find_referencing_code_snippets`: Finds code snippets in which the symbol at the given location is referenced.
-#  * `find_referencing_symbols`: Finds symbols that reference the symbol at the given location (optionally filtered by type).
-#  * `find_symbol`: Performs a global (or local) search for symbols with/containing a given name/substring (optionally filtered by type).
-#  * `get_current_config`: Prints the current configuration of the agent, including the active and available projects, tools, contexts, and modes.
-#  * `get_symbols_overview`: Gets an overview of the top-level symbols defined in a given file.
-#  * `initial_instructions`: Gets the initial instructions for the current project.
-#     Should only be used in settings where the system prompt cannot be set,
-#     e.g. in clients you have no control over, like Claude Desktop.
-#  * `insert_after_symbol`: Inserts content after the end of the definition of a given symbol.
-#  * `insert_at_line`: Inserts content at a given line in a file.
-#  * `insert_before_symbol`: Inserts content before the beginning of the definition of a given symbol.
-#  * `list_dir`: Lists files and directories in the given directory (optionally with recursion).
-#  * `list_memories`: Lists memories in Serena's project-specific memory store.
-#  * `onboarding`: Performs onboarding (identifying the project structure and essential tasks, e.g. for testing or building).
-#  * `prepare_for_new_conversation`: Provides instructions for preparing for a new conversation (in order to continue with the necessary context).
-#  * `read_file`: Reads a file within the project directory.
-#  * `read_memory`: Reads the memory with the given name from Serena's project-specific memory store.
-#  * `remove_project`: Removes a project from the Serena configuration.
-#  * `replace_lines`: Replaces a range of lines within a file with new content.
-#  * `replace_symbol_body`: Replaces the full definition of a symbol.
-#  * `restart_language_server`: Restarts the language server, may be necessary when edits not through Serena happen.
-#  * `search_for_pattern`: Performs a search for a pattern in the project.
-#  * `summarize_changes`: Provides instructions for summarizing the changes made to the codebase.
-#  * `switch_modes`: Activates modes by providing a list of their names
-#  * `think_about_collected_information`: Thinking tool for pondering the completeness of collected information.
-#  * `think_about_task_adherence`: Thinking tool for determining whether the agent is still on track with the current task.
-#  * `think_about_whether_you_are_done`: Thinking tool for determining whether the task is truly completed.
-#  * `write_memory`: Writes a named memory (for future reference) to Serena's project-specific memory store.
-excluded_tools: []
-
-# initial prompt for the project. It will always be given to the LLM upon activating the project
-# (contrary to the memories, which are loaded on demand).
-initial_prompt: ""
-
-project_name: "smartdata"

.smartconfig.json

@@ -1,15 +1,5 @@
 {
-  "npmdocker": {
-    "baseImage": "hosttoday/ht-docker-node:mongo",
-    "command": "npmci test stable",
-    "dockerSock": false
-  },
-  "npmci": {
-    "npmGlobalTools": [],
-    "npmAccessLevel": "public",
-    "npmRegistryUrl": "registry.npmjs.org"
-  },
-  "gitzone": {
+  "@git.zone/cli": {
     "projectType": "npm",
     "module": {
       "githost": "code.foss.global",
@@ -28,9 +18,25 @@
         "custom data types",
         "ODM"
       ]
+    },
+    "release": {
+      "registries": [
+        "https://verdaccio.lossless.digital",
+        "https://registry.npmjs.org"
+      ],
+      "accessLevel": "public"
     }
   },
-  "tsdoc": {
+  "@git.zone/tsdoc": {
     "legal": "\n## License and Legal Information\n\nThis repository contains open-source code that is licensed under the MIT License. A copy of the MIT License can be found in the [license](license) file within this repository. \n\n**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.\n\n### Trademarks\n\nThis project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH and are not included within the scope of the MIT license granted herein. Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines, and any usage must be approved in writing by Task Venture Capital GmbH.\n\n### Company Information\n\nTask Venture Capital GmbH  \nRegistered at District court Bremen HRB 35230 HB, Germany\n\nFor any legal inquiries or if you require further information, please contact us via email at hello@task.vc.\n\nBy using this repository, you acknowledge that you have read this section, agree to comply with its terms, and understand that the licensing of the code does not imply endorsement by Task Venture Capital GmbH of any derivative works.\n"
+  },
+  "@git.zone/tsdocker": {
+    "baseImage": "hosttoday/ht-docker-node:mongo",
+    "command": "npmci test stable",
+    "dockerSock": false
+  },
+  "@ship.zone/szci": {
+    "npmGlobalTools": [],
+    "npmRegistryUrl": "registry.npmjs.org"
   }
-}
+}

.vscode/settings.json

@@ -1,7 +1,7 @@
 {
   "json.schemas": [
     {
-      "fileMatch": ["/npmextra.json"],
+      "fileMatch": ["/.smartconfig.json"],
       "schema": {
         "type": "object",
         "properties": {

changelog.md

@@ -1,6 +1,202 @@
 # Changelog
 
+## 2026-03-24 - 7.1.2 - fix(docs)
+refresh project guidance for TC39 decorators, build configuration, and dependency compatibility
+
+- streamlines readme hints to focus on current decorator patterns and runtime support
+- adds compatibility notes for the updated build toolchain and dependency APIs
+- includes the project license file in the repository
+
+## 2026-03-24 - 7.1.1 - fix(build)
+update build and test tooling configuration, migrate project config to .smartconfig.json, and align TypeScript typings
+
+- Switch the build script to tsbuild tsfolders and upgrade core build/test dependencies including @git.zone/tsbuild, @git.zone/tstest, and @git.zone/tsrun.
+- Replace npmextra.json with .smartconfig.json and update package packaging to include the new config file.
+- Update test files to import tapbundle from @git.zone/tstest/tapbundle and remove the standalone @push.rocks/tapbundle dependency.
+- Adjust TypeScript configuration and source typings for stricter compatibility, including node types and definite assignment/nullability fixes.
+- Fix Gitea workflow repository URLs for code.foss.global and expand .gitignore for generated Rust and local tooling directories.
+
+## 2026-02-26 - 7.1.0 - feat(config)
+
+normalize npmextra.json to namespaced keys and add CI/release configuration
+
+- Replaced legacy keys (npmdocker, npmci, gitzone, tsdoc) with namespaced package keys (@git.zone/cli, @git.zone/tsdoc, @git.zone/tsdocker, @ship.zone/szci).
+- Moved tsdoc legal text under @git.zone/tsdoc.
+- Added release configuration with registries (https://verdaccio.lossless.digital and https://registry.npmjs.org) and accessLevel public under @git.zone/cli.
+- Added @git.zone/tsdocker CI/docker settings and @ship.zone/szci npm registry/tooling settings.
+- Removed old top-level entries to consolidate tooling configuration under scoped keys.
+
+## 2026-02-26 - 7.0.16 - fix(mongodb)
+
+set default socketTimeoutMS to 30000ms in MongoClient options to prevent hung operations from holding connections
+
+- Adds socketTimeoutMS: 30000 to MongoClient clientOptions in ts/classes.db.ts
+- Helps prevent hung operations from indefinitely holding connections by enforcing a 30s socket timeout
+- Non-breaking change (defaults only)
+
+## 2025-12-01 - 7.0.15 - fix(classes.doc)
+
+Avoid emitting instance fields for collection and manager to preserve decorator-defined prototype getters
+
+- ts/classes.doc.ts: changed instance properties `collection` and `manager` to `declare` so TypeScript does not emit them as own properties — prevents ES2022 class fields from shadowing prototype getters created by @Collection and @managed decorators.
+- readme.hints.md: added documentation explaining the ES2022 class fields issue and recommending use of `declare` for type-only instance properties; marks the fix as v7.0.15.
+
+## 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
+
+- 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)
+
+Migrate to TC39 Stage 3 decorators and refactor decorator metadata handling; update class initialization, lucene adapter fixes and docs
+
+- Switch all decorators to TC39 Stage 3 signatures and metadata usage (use context.metadata and context.addInitializer) — affects svDb, globalSvDb, searchable, unI, index, Collection and managed.
+- Refactor Collection/managed decorators to read and initialize prototype/constructor properties from context.metadata to ensure prototype properties are available before instance creation (ts/classes.collection.ts).
+- Improve search implementation: add a Lucene parser and transformer with safer MongoDB query generation, wildcard/fuzzy handling and properly structured boolean operators (ts/classes.lucene.adapter.ts).
+- Search integration updated to use the new adapter and handle advanced Lucene syntax and edge cases more robustly.
+- Bump dev tooling versions: @git.zone/tsbuild -> ^3.1.0 and @git.zone/tsrun -> ^2.0.0.
+- Documentation: update README and add readme.hints.md describing the TC39 decorator migration, minimum TypeScript (>=5.2) and Deno notes; tests adjusted accordingly.
+- Clean up project memory/config files related to the previous decorator approach and Deno configuration adjustments.
+
+## 2025-11-17 - 5.16.7 - fix(classes.collection)
+
+Improve Deno and TypeScript compatibility: Collection decorator \_svDbOptions forwarding and config cleanup
+
+- Collection decorator: capture original constructor and forward \_svDbOptions to ensure property decorator options (serialize/deserialize) remain accessible in Deno environments.
+- Collection decorator: keep instance getter defined on prototype for Deno compatibility (no behavior change, clarifies forwarding logic).
+- Build/config: removed experimentalDecorators and useDefineForClassFields from deno.json and tsconfig.json to avoid Deno/TS build issues and rely on default compilation settings.
+
+## 2025-11-17 - 5.16.6 - fix(classes)
+
+Add Deno compatibility, prototype-safe decorators and safe collection accessor; bump a few deps
+
+- Add deno.json to enable experimentalDecorators and target ES2022/DOM for Deno builds.
+- Introduce getCollectionSafe() on SmartDataDbDoc and use it for save/update/delete/findOne to avoid runtime errors when instance 'collection' is not present.
+- Change several instance properties (globalSaveableProperties, uniqueIndexes, regularIndexes, saveableProperties) to 'declare' so decorator-set prototype properties are not shadowed (Deno compatibility).
+- Enhance @Collection decorator: capture original constructor/prototype for Deno, define prototype getter for collection on decorated class, attach docCtor for searchableFields, and forward \_svDbOptions to the original constructor to preserve serializer metadata.
+- Improve text/search index handling by relying on docCtor.searchableFields and guarding text index creation.
+- Bump dependencies/devDependencies: @push.rocks/smartmongo -> ^2.0.14, @git.zone/tsbuild -> ^2.7.1, @git.zone/tstest -> ^2.8.1.
+- These are non-breaking runtime compatibility and developer-experience fixes; intended as a patch release.
+
+## 2025-11-16 - 5.16.5 - fix(watcher)
+
+Update dependencies, tooling and watcher import; add .serena cache ignore
+
+- Bump runtime dependencies: @push.rocks/smartlog 3.1.8 → 3.1.10, @push.rocks/smartstring 4.0.15 → 4.1.0, @push.rocks/taskbuffer 3.1.7 → 3.4.0, @tsclass/tsclass 9.2.0 → 9.3.0, mongodb 6.18.0 → 6.20.0
+- Bump devDependencies: @git.zone/tsbuild 2.6.7 → 2.6.8, @git.zone/tsrun 1.2.44 → 1.6.2, @git.zone/tstest 2.3.5 → 2.6.2
+- Switch EventEmitter import to node:events in ts/classes.watcher.ts to use the namespaced Node import
+- Add .serena/.gitignore to ignore /cache
+
+## 2025-08-18 - 5.16.4 - fix(classes.doc (convertFilterForMongoDb))
+
+Improve filter conversion: handle logical operators, merge operator objects, add nested filter tests and docs, and fix test script
+
+- Fix package.json test script: remove stray dot in tstest --verbose argument to ensure tests run correctly
+- Enhance convertFilterForMongoDb in ts/classes.doc.ts to properly handle logical operators ($and, $or, $nor, $not) and return them recursively
+- Merge operator objects for the same field path (e.g. combining $gte and $lte) to avoid overwriting operator clauses when object and dot-notation are mixed
+- Add validation/guards for operator argument types (e.g. $in, $nin, $all must be arrays; $size must be numeric) and preserve existing behavior blocking $where for security
+- Add comprehensive nested filter tests in test/test.filters.ts to cover deep nested object queries, $elemMatch, array size, $all, $in on nested fields and more
+- Expand README filtering section with detailed examples for basic filtering, deep nested filters, comparison operators, array operations, logical and element operators, and advanced patterns
+
 ## 2025-08-18 - 5.16.3 - fix(docs)
+
 Add local Claude settings and remove outdated codex.md
 
 - Added .claude/settings.local.json to store local Claude/assistant permissions and configuration.
@@ -8,6 +204,7 @@ Add local Claude settings and remove outdated codex.md
 - No runtime/library code changes; documentation/configuration-only update, bump patch version.
 
 ## 2025-08-18 - 5.16.2 - fix(readme)
+
 Update README: clarify examples, expand search/cursor/docs and add local Claude settings
 
 - Refined README wording and structure: clearer Quick Start, improved examples and developer-focused phrasing
@@ -16,6 +213,7 @@ Update README: clarify examples, expand search/cursor/docs and add local Claude
 - Added .claude/settings.local.json to provide local assistant/CI permission configuration
 
 ## 2025-08-12 - 5.16.1 - fix(core)
+
 Improve error handling and logging; enhance search query sanitization; update dependency versions and documentation
 
 - Replaced console.log and console.warn with structured logger.log calls throughout the core modules
@@ -26,6 +224,7 @@ Improve error handling and logging; enhance search query sanitization; update de
 - Updated README with improved instructions, feature highlights, and quick start sections
 
 ## 2025-04-25 - 5.16.0 - feat(watcher)
+
 Enhance change stream watchers with buffering and EventEmitter support; update dependency versions
 
 - Bumped smartmongo from ^2.0.11 to ^2.0.12 and smartrx from ^3.0.7 to ^3.0.10
@@ -34,6 +233,7 @@ Enhance change stream watchers with buffering and EventEmitter support; update d
 - Modified SmartdataDbWatcher to extend EventEmitter and support event notifications
 
 ## 2025-04-24 - 5.15.1 - fix(cursor)
+
 Improve cursor usage documentation and refactor getCursor API to support native cursor modifiers
 
 - Updated examples in readme.md to demonstrate manual iteration using cursor.next() and proper cursor closing.
@@ -41,6 +241,7 @@ Improve cursor usage documentation and refactor getCursor API to support native
 - Added new tests in test/test.cursor.ts to verify cursor operations, including limits, sorting, and skipping.
 
 ## 2025-04-24 - 5.15.0 - feat(svDb)
+
 Enhance svDb decorator to support custom serialization and deserialization options
 
 - Added an optional options parameter to the svDb decorator to accept serialize/deserialize functions
@@ -48,6 +249,7 @@ Enhance svDb decorator to support custom serialization and deserialization optio
 - Updated createSavableObject to use custom serialization when available
 
 ## 2025-04-23 - 5.14.1 - fix(db operations)
+
 Update transaction API to consistently pass optional session parameters across database operations
 
 - Revised transaction support in readme to use startSession without await and showcased session usage in getInstance and save calls
@@ -56,14 +258,16 @@ Update transaction API to consistently pass optional session parameters across d
 - Improved overall consistency of transactional APIs across the library
 
 ## 2025-04-23 - 5.14.0 - feat(doc)
+
 Implement support for beforeSave, afterSave, beforeDelete, and afterDelete lifecycle hooks in document save and delete operations to allow custom logic execution during these critical moments.
 
 - Calls beforeSave hook if defined before performing insert or update.
 - Calls afterSave hook after a document is saved.
 - Calls beforeDelete hook before deletion and afterDelete hook afterward.
-- Ensures _updatedAt timestamp is refreshed during save operations.
+- Ensures \_updatedAt timestamp is refreshed during save operations.
 
 ## 2025-04-22 - 5.13.1 - fix(search)
+
 Improve search query parsing for implicit AND queries by preserving quoted substrings and better handling free terms, quoted phrases, and field:value tokens.
 
 - Replace previous implicit AND logic with tokenization that preserves quoted substrings
@@ -71,6 +275,7 @@ Improve search query parsing for implicit AND queries by preserving quoted subst
 - Ensure errors are thrown for non-searchable fields in field-specific queries
 
 ## 2025-04-22 - 5.13.0 - feat(search)
+
 Improve search query handling and update documentation
 
 - Added 'codex.md' providing a high-level project overview and detailed search API documentation.
@@ -79,12 +284,14 @@ Improve search query handling and update documentation
 - Updated tests in test/test.search.ts to cover new combined query scenarios and ensure robust behavior.
 
 ## 2025-04-22 - 5.12.2 - fix(search)
+
 Fix handling of quoted wildcard patterns in field-specific search queries and add tests for location-based wildcard phrase searches
 
 - Strip surrounding quotes from wildcard patterns in field queries to correctly transform them to regex
 - Introduce new tests in test/test.search.ts to validate exact quoted and unquoted wildcard searches on a location field
 
 ## 2025-04-22 - 5.12.1 - fix(search)
+
 Improve implicit AND logic for mixed free term and field queries in search and enhance wildcard field handling.
 
 - Updated regex for field:value parsing to capture full value with wildcards.
@@ -93,6 +300,7 @@ Improve implicit AND logic for mixed free term and field queries in search and e
 - Extended tests to cover combined free term and wildcard field searches, including error cases.
 
 ## 2025-04-22 - 5.12.0 - feat(doc/search)
+
 Enhance search functionality with filter and validate options for advanced query control
 
 - Added 'filter' option to merge additional MongoDB query constraints in search
@@ -101,6 +309,7 @@ Enhance search functionality with filter and validate options for advanced query
 - Updated tests to cover new search scenarios and fallback mechanisms
 
 ## 2025-04-22 - 5.11.4 - fix(search)
+
 Implement implicit AND logic for mixed simple term and field:value queries in search
 
 - Added a new branch to detect and handle search queries that mix field:value pairs with plain terms without explicit operators
@@ -108,6 +317,7 @@ Implement implicit AND logic for mixed simple term and field:value queries in se
 - Ensures proper parsing and improved robustness of search filters
 
 ## 2025-04-22 - 5.11.3 - fix(lucene adapter and search tests)
+
 Improve range query parsing in Lucene adapter and expand search test coverage
 
 - Added a new 'testSearch' script in package.json to run search tests.
@@ -116,12 +326,14 @@ Improve range query parsing in Lucene adapter and expand search test coverage
 - Fixed token validation in the parseRange method of the Lucene adapter to ensure proper error handling.
 
 ## 2025-04-21 - 5.11.2 - fix(readme)
+
 Update readme to clarify usage of searchable fields retrieval
 
 - Replaced getSearchableFields('Product') with Product.getSearchableFields()
 - Updated documentation to reference the static method Class.getSearchableFields()
 
 ## 2025-04-21 - 5.11.1 - fix(doc)
+
 Refactor searchable fields API and improve collection registration.
 
 - Removed the standalone getSearchableFields utility in favor of a static method on document classes.
@@ -130,11 +342,13 @@ Refactor searchable fields API and improve collection registration.
 - Added try/catch in test cleanup to gracefully handle dropDatabase errors.
 
 ## 2025-04-21 - 5.11.0 - feat(ts/classes.lucene.adapter)
+
 Expose luceneWildcardToRegex method to allow external usage and enhance regex transformation capabilities.
 
 - Changed luceneWildcardToRegex from private to public in ts/classes.lucene.adapter.ts.
 
 ## 2025-04-21 - 5.10.0 - feat(search)
+
 Improve search functionality: update documentation, refine Lucene query transformation, and add advanced search tests
 
 - Updated readme.md with detailed Lucene‑style search examples and use cases
@@ -143,6 +357,7 @@ Improve search functionality: update documentation, refine Lucene query transfor
 - Added new advanced search tests covering boolean operators, grouping, quoted phrases, and wildcard queries
 
 ## 2025-04-18 - 5.9.2 - fix(documentation)
+
 Update search API documentation to replace deprecated searchWithLucene examples with the unified search(query) API and clarify its behavior.
 
 - Replaced 'searchWithLucene' examples with 'search(query)' in the README.
@@ -150,24 +365,28 @@ Update search API documentation to replace deprecated searchWithLucene examples
 - Clarified guidelines for creating MongoDB text indexes on searchable fields for optimized search performance.
 
 ## 2025-04-18 - 5.9.1 - fix(search)
+
 Refactor search tests to use unified search API and update text index type casting
 
 - Replaced all calls from searchWithLucene with search in test/search tests
 - Updated text index specification in the collection class to use proper type casting
 
 ## 2025-04-18 - 5.9.0 - feat(collections/search)
+
 Improve text index creation and search fallback mechanisms in collections and document search methods
 
 - Auto-create a compound text index on all searchable fields in SmartdataCollection with a one-time flag to prevent duplicate index creation.
 - Refine the search method in SmartDataDbDoc to support exact field matches and safe regex fallback for non-Lucene queries.
 
 ## 2025-04-17 - 5.8.4 - fix(core)
+
 Update commit metadata with no functional code changes
 
 - Commit info and documentation refreshed
 - No code or test changes detected in the diff
 
 ## 2025-04-17 - 5.8.3 - fix(readme)
+
 Improve readme documentation on data models and connection management
 
 - Clarify that data models use @Collection, @unI, @svDb, @index, and @searchable decorators
@@ -176,12 +395,14 @@ Improve readme documentation on data models and connection management
 - Revise license section to reference the MIT License without including additional legal details
 
 ## 2025-04-14 - 5.8.2 - fix(classes.doc.ts)
+
 Ensure collection initialization before creating a cursor in getCursorExtended
 
 - Added 'await collection.init()' to guarantee that the MongoDB collection is initialized before using the cursor
 - Prevents potential runtime errors when accessing collection.mongoDbCollection
 
 ## 2025-04-14 - 5.8.1 - fix(cursor, doc)
+
 Add explicit return types and casts to SmartdataDbCursor methods and update getCursorExtended signature in SmartDataDbDoc.
 
 - Specify Promise<T> as return type for next() in SmartdataDbCursor and cast return value to T.
@@ -189,12 +410,14 @@ Add explicit return types and casts to SmartdataDbCursor methods and update getC
 - Update getCursorExtended to return Promise<SmartdataDbCursor<T>> for clearer type safety.
 
 ## 2025-04-14 - 5.8.0 - feat(cursor)
+
 Add toArray method to SmartdataDbCursor to convert raw MongoDB documents into initialized class instances
 
 - Introduced asynchronous toArray method in SmartdataDbCursor which retrieves all documents from the MongoDB cursor
 - Maps each native document to a SmartDataDbDoc instance using createInstanceFromMongoDbNativeDoc for consistent API usage
 
 ## 2025-04-14 - 5.7.0 - feat(SmartDataDbDoc)
+
 Add extended cursor method getCursorExtended for flexible cursor modifications
 
 - Introduces getCursorExtended in classes.doc.ts to allow modifier functions for MongoDB cursors
@@ -202,6 +425,7 @@ Add extended cursor method getCursorExtended for flexible cursor modifications
 - Enhances querying capabilities by enabling customized cursor transformations
 
 ## 2025-04-07 - 5.6.0 - feat(indexing)
+
 Add support for regular index creation in documents and collections
 
 - Implement new index decorator in classes.doc.ts to mark properties with regular indexing options
@@ -209,6 +433,7 @@ Add support for regular index creation in documents and collections
 - Enhance document structure to store and utilize regular index configurations
 
 ## 2025-04-06 - 5.5.1 - fix(ci & formatting)
+
 Minor fixes: update CI workflow image and npmci package references, adjust package.json and readme URLs, and apply consistent code formatting.
 
 - Update image and repo URL in Gitea workflows from GitLab to code.foss.global
@@ -218,6 +443,7 @@ Minor fixes: update CI workflow image and npmci package references, adjust packa
 - Minor update to .gitignore custom section label
 
 ## 2025-04-06 - 5.5.0 - feat(search)
+
 Enhance search functionality with robust Lucene query transformation and reliable fallback mechanisms
 
 - Improve Lucene adapter to properly structure $or queries for term, phrase, wildcard, and fuzzy search
@@ -225,15 +451,17 @@ Enhance search functionality with robust Lucene query transformation and reliabl
 - Update readme and tests with extensive examples for @searchable fields and Lucene-based queries
 
 ## 2025-04-06 - 5.4.0 - feat(core)
+
 Refactor file structure and update dependency versions
 
-- Renamed files and modules from 'smartdata.classes.*' to 'classes.*' and adjusted corresponding import paths.
+- Renamed files and modules from 'smartdata.classes._' to 'classes._' and adjusted corresponding import paths.
 - Updated dependency versions: '@push.rocks/smartmongo' to ^2.0.11, '@tsclass/tsclass' to ^8.2.0, and 'mongodb' to ^6.15.0.
 - Renamed dev dependency packages from '@gitzone/...' to '@git.zone/...' and updated '@push.rocks/tapbundle' and '@types/node'.
 - Fixed YAML workflow command: replaced 'pnpm install -g @gitzone/tsdoc' with 'pnpm install -g @git.zone/tsdoc'.
 - Added package manager configuration and pnpm-workspace.yaml for built dependencies.
 
 ## 2025-03-10 - 5.3.0 - feat(docs)
+
 Enhance documentation with updated installation instructions and comprehensive usage examples covering advanced features such as deep queries, automatic indexing, and distributed coordination.
 
 - Added pnpm installation command
@@ -243,11 +471,13 @@ Enhance documentation with updated installation instructions and comprehensive u
 - Included detailed examples for transactions, deep object queries, and document lifecycle hooks
 
 ## 2025-02-03 - 5.2.12 - fix(documentation)
+
 Remove license badge from README
 
 - Removed the license badge from the README file, ensuring compliance with branding guidelines.
 
 ## 2025-02-03 - 5.2.11 - fix(documentation)
+
 Updated project documentation for accuracy and added advanced feature details
 
 - Added details for EasyStore, Distributed Coordination, and Real-time Data Watching features.
@@ -255,158 +485,188 @@ Updated project documentation for accuracy and added advanced feature details
 - Re-organized advanced usage section to showcase additional features separately.
 
 ## 2024-09-05 - 5.2.10 - fix(smartdata.classes.doc)
+
 Fix issue with array handling in convertFilterForMongoDb function
 
 - Corrected the logic to properly handle array filters in the convertFilterForMongoDb function to avoid incorrect assignments.
 
 ## 2024-09-05 - 5.2.9 - fix(smartdata.classes.doc)
+
 Fixed issue with convertFilterForMongoDb to handle array operators.
 
 - Updated the convertFilterForMongoDb function in smartdata.classes.doc.ts to properly handle array operators like $in and $all.
 
 ## 2024-09-05 - 5.2.8 - fix(smartdata.classes.doc)
+
 Fix key handling in convertFilterForMongoDb function
 
 - Fixed an issue in convertFilterForMongoDb that allowed keys with dots which could cause errors.
 
 ## 2024-09-05 - 5.2.7 - fix(core)
+
 Fixed issue with handling filter keys containing dots in smartdata.classes.doc.ts
 
 - Fixed an error in the convertFilterForMongoDb function which previously threw an error when keys contained dots.
 
 ## 2024-06-18 - 5.2.6 - Chore
+
 Maintenance Release
 
 - Release version 5.2.6
 
 ## 2024-05-31 - 5.2.2 - Bug Fixes
+
 Fixes and Maintenance
 
 - Fixed issue where `_createdAt` and `_updatedAt` registered saveableProperties for all document types
 
 ## 2024-04-15 - 5.1.2 - New Feature
+
 Enhancements and Bug Fixes
 
 - Added static `.getCount({})` method to `SmartDataDbDoc`
 - Changed fields `_createdAt` and `_updatedAt` to ISO format
 
 ## 2024-04-14 - 5.0.43 - New Feature
+
 New Feature Addition
 
 - Added default `_createdAt` and `_updatedAt` fields, fixes #1
 
 ## 2024-03-30 - 5.0.41 - Bug Fixes
+
 Improvements and Fixes
 
 - Improved `tsconfig.json` for ES Module use
 
 ## 2023-07-10 - 5.0.20 - Chore
+
 Organizational Changes
 
 - Switched to new org scheme
 
 ## 2023-07-21 - 5.0.21 to 5.0.26 - Fixes
+
 Multiple Fix Releases
 
 - Various core updates and bug fixes
 
 ## 2023-07-21 - 5.0.20 - Chore
+
 Organizational Changes
 
 - Switch to the new org scheme
 
 ## 2023-06-25 - 5.0.14 to 5.0.19 - Fixes
+
 Multiple Fix Releases
 
 - Various core updates and bug fixes
 
 ## 2022-05-17 - 5.0.0 - Major Update
+
 Breaking Changes
 
 - Switched to ESM
 
 ## 2022-05-18 - 5.0.2 - Bug Fixes
+
 Bug Fixes
 
 - The `watcher.changeSubject` now emits the correct type into observer functions
 
 ## 2022-05-17 - 5.0.1 - Chore
+
 Testing Improvements
 
 - Tests now use `@pushrocks/smartmongo` backed by `wiredTiger`
 
 ## 2022-05-17 to 2022-11-08 - 5.0.8 to 5.0.10
+
 Multiple Fix Releases
 
 - Various core updates and bug fixes
 
 ## 2021-11-12 - 4.0.17 to 4.0.20
+
 Multiple Fix Releases
 
 - Various core updates and bug fixes
 
 ## 2021-09-17 - 4.0.10 to 4.0.16
+
 Multiple Fix Releases
 
 - Various core updates and bug fixes
 
 ## 2021-06-09 - 4.0.1 to 4.0.9
+
 Multiple Fix Releases
 
 - Various core updates and bug fixes
 
 ## 2021-06-06 - 4.0.0 - Major Update
+
 Major Release
 
 - Maintenance and core updates
 
 ## 2021-05-17 - 3.1.56 - Chore
+
 Maintenance Release
 
 - Release version 3.1.56
 
 ## 2020-09-09 - 3.1.44 to 3.1.52
+
 Multiple Fix Releases
 
 - Various core updates and bug fixes
 
 ## 2020-06-12 - 3.1.26 to 3.1.28
+
 Multiple Fix Releases
 
 - Various core updates and bug fixes
 
 ## 2020-02-18 - 3.1.23 to 3.1.25
+
 Multiple Fix Releases
 
 - Various core updates and bug fixes
 
 ## 2019-09-11 - 3.1.20 to 3.1.22
+
 Multiple Fix Releases
 
 - Various core updates and bug fixes
 
 ## 2018-07-10 - 3.0.5 - New Feature
+
 Added Feature
 
 - Added custom unique indexes to `SmartdataDoc`
 
 ## 2018-07-08 - 3.0.1 - Chore
+
 Dependencies Update
 
 - Updated mongodb dependencies
 
 ## 2018-07-08 - 3.0.0 - Major Update
+
 Refactor and Cleanup
 
 - Cleaned project structure
 
 ## 2018-01-16 - 2.0.7 - Breaking Change
+
 Big Changes
 
 - Switched to `@pushrocks` scope and moved from `rethinkdb` to `mongodb`
 
 ## 2018-01-12 - 2.0.0 - Major Release
+
 Core Updates
 
 - Updated CI configurations
-

license

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Task Venture Capital GmbH
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package.json

@@ -1,15 +1,16 @@
 {
   "name": "@push.rocks/smartdata",
-  "version": "5.16.3",
+  "version": "7.1.2",
   "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",
+    "test": "tstest test/ --verbose --logfile --timeout 120",
     "testSearch": "tsx test/test.search.ts",
-    "build": "tsbuild --web --allowimplicitany",
+    "build": "tsbuild tsfolders",
     "buildDocs": "tsdoc"
   },
   "repository": {
@@ -23,25 +24,24 @@
   },
   "homepage": "https://code.foss.global/push.rocks/smartdata#readme",
   "dependencies": {
-    "@push.rocks/lik": "^6.2.2",
-    "@push.rocks/smartdelay": "^3.0.1",
-    "@push.rocks/smartlog": "^3.1.8",
-    "@push.rocks/smartmongo": "^2.0.12",
-    "@push.rocks/smartpromise": "^4.0.2",
+    "@push.rocks/lik": "^6.4.0",
+    "@push.rocks/smartdelay": "^3.0.5",
+    "@push.rocks/smartlog": "^3.2.1",
+    "@push.rocks/smartmongo": "^5.1.0",
+    "@push.rocks/smartpromise": "^4.2.3",
     "@push.rocks/smartrx": "^3.0.10",
-    "@push.rocks/smartstring": "^4.0.15",
-    "@push.rocks/smarttime": "^4.0.6",
-    "@push.rocks/smartunique": "^3.0.8",
-    "@push.rocks/taskbuffer": "^3.1.7",
-    "@tsclass/tsclass": "^9.2.0",
-    "mongodb": "^6.18.0"
+    "@push.rocks/smartstring": "^4.1.0",
+    "@push.rocks/smarttime": "^4.2.3",
+    "@push.rocks/smartunique": "^3.0.9",
+    "@push.rocks/taskbuffer": "^8.0.2",
+    "@tsclass/tsclass": "^9.5.0",
+    "mongodb": "^7.1.1"
   },
   "devDependencies": {
-    "@git.zone/tsbuild": "^2.6.7",
-    "@git.zone/tsrun": "^1.2.44",
-    "@git.zone/tstest": "^2.3.5",
+    "@git.zone/tsbuild": "^4.4.0",
+    "@git.zone/tsrun": "^2.0.1",
+    "@git.zone/tstest": "^3.5.1",
     "@push.rocks/qenv": "^6.1.3",
-    "@push.rocks/tapbundle": "^6.0.3",
     "@types/node": "^22.15.2"
   },
   "files": [
@@ -53,7 +53,7 @@
     "dist_ts_web/**/*",
     "assets/**/*",
     "cli.js",
-    "npmextra.json",
+    ".smartconfig.json",
     "readme.md"
   ],
   "browserslist": [

pnpm-workspace.yaml

@@ -1,4 +0,0 @@
-onlyBuiltDependencies:
-  - esbuild
-  - mongodb-memory-server
-  - puppeteer

readme.hints.md

@@ -0,0 +1,29 @@
+# Project Memory - Smartdata
+
+## TC39 Decorator Pattern
+
+- **Field decorators**: Write to `context.metadata`
+- **Class decorators**: Read from `context.metadata` (same shared object)
+- `Symbol.metadata` on constructors is read-only (managed by runtime)
+- Field decorators run before class decorators (guaranteed order)
+- `declare` keyword for instance properties accessed via prototype getters (avoids ES2022 shadowing)
+
+### Runtime Compatibility
+
+- ✅ Node.js v20+ / v25+: Full TC39 support
+- ✅ Deno v2.x: Full TC39 support
+- ❌ Bun: No TC39 support (uses legacy decorators only)
+
+## Build Configuration (v7.1.0+)
+
+- **Build tool**: `@git.zone/tsbuild` v4 with `tsbuild tsfolders`
+- **tsconfig.json**: Includes `"types": ["node"]` since tsbuild v4 defaults to DOM+ESNext lib only
+- **Strict mode**: tsbuild v4 enables strict checks; properties use `!` definite assignment or `declare`
+- **Test imports**: Use `@git.zone/tstest/tapbundle` (NOT `@push.rocks/tapbundle`)
+- **Config file**: `.smartconfig.json` (renamed from `npmextra.json`)
+
+## Dependencies (v7.1.0+)
+
+- `@push.rocks/taskbuffer` v8: distributedCoordination API at `taskbuffer.distributedCoordination.*`
+- `@push.rocks/smartmongo` v5: API compatible (`createAndStart`, `getMongoDescriptor`, `stop`, `stopAndDumpToDir`)
+- `mongodb` v7.1: ChangeStream requires `Document` constraint, use `any` for generic watcher

test/test.cursor.ts

@@ -1,4 +1,4 @@
-import { tap, expect } from '@push.rocks/tapbundle';
+import { tap, expect } from '@git.zone/tstest/tapbundle';
 import * as smartmongo from '@push.rocks/smartmongo';
 import { smartunique } from '../ts/plugins.js';
 import * as smartdata from '../ts/index.js';

test/test.deno.ts

@@ -0,0 +1,255 @@
+// TODO: Decorator support during testing for bun and deno in @git.zone/tstest
+
+import { tap, expect } from '@git.zone/tstest/tapbundle';
+import { Qenv } from '@push.rocks/qenv';
+import * as smartmongo from '@push.rocks/smartmongo';
+import { smartunique } from '../ts/plugins.js';
+
+import * as mongodb from 'mongodb';
+
+const testQenv = new Qenv(process.cwd(), process.cwd() + '/.nogit/');
+
+console.log(process.memoryUsage());
+
+// the tested module
+import * as smartdata from '../ts/index.js';
+
+// =======================================
+// Connecting to the database server
+// =======================================
+
+let smartmongoInstance: smartmongo.SmartMongo;
+let testDb: smartdata.SmartdataDb;
+
+const totalCars = 2000;
+
+tap.test('should create a testinstance as database', async () => {
+  const databaseName = `test-smartdata-deno-${smartunique.shortId()}`;
+  testDb = new smartdata.SmartdataDb({
+    mongoDbUrl: await testQenv.getEnvVarOnDemand('MONGODB_URL'),
+    mongoDbName: databaseName,
+  });
+  await testDb.init();
+});
+
+// =======================================
+// The actual tests
+// =======================================
+
+// ------
+// Collections
+// ------
+
+@smartdata.Collection(() => {
+  return testDb;
+})
+class Car extends smartdata.SmartDataDbDoc<Car, Car> {
+  @smartdata.unI()
+  public index: string = smartunique.shortId();
+
+  @smartdata.svDb()
+  public color: string;
+
+  @smartdata.svDb()
+  public brand: string;
+
+  @smartdata.svDb()
+  public testBuffer = Buffer.from('hello');
+
+  @smartdata.svDb()
+  deepData = {
+    sodeep: 'yes',
+  };
+
+  constructor(colorArg: string, brandArg: string) {
+    super();
+    this.color = colorArg;
+    this.brand = brandArg;
+  }
+}
+
+tap.test('should create a new id', async () => {
+  const newid = await Car.getNewId();
+  console.log(newid);
+});
+
+tap.test('should save the car to the db', async (toolsArg) => {
+  const myCar = new Car('red', 'Volvo');
+  console.log('Car.collection.smartdataDb:', (Car.collection as any).smartdataDb?.mongoDb?.databaseName);
+  console.log('Car.collection.collectionName:', (Car.collection as any).collectionName);
+  console.log('testDb.mongoDb.databaseName:', testDb.mongoDb.databaseName);
+  await myCar.save();
+
+  const myCar2 = new Car('red', 'Volvo');
+  await myCar2.save();
+
+  let counter = 0;
+
+  const gottenCarInstance = await Car.getInstance({});
+  console.log(gottenCarInstance.testBuffer instanceof mongodb.Binary);
+  process.memoryUsage();
+  do {
+    const myCar3 = new Car('red', 'Renault');
+    await myCar3.save();
+    counter++;
+    if (counter % 100 === 0) {
+      console.log(
+        `Filled database with ${counter} of ${totalCars} Cars and memory usage ${
+          process.memoryUsage().rss / 1e6
+        } MB`,
+      );
+    }
+  } while (counter < totalCars);
+  console.log(process.memoryUsage());
+
+  // DEBUG: Check what's actually in the database
+  const savedCount = await Car.getCount({});
+  console.log('Total cars saved in DB:', savedCount);
+  const renaultCount = await Car.getCount({ brand: 'Renault' });
+  console.log('Renault cars in DB:', renaultCount);
+
+  // Check what's actually in the first saved car
+  const firstCar = await Car.getInstance({});
+  console.log('First car data:', JSON.stringify({
+    color: firstCar?.color,
+    brand: firstCar?.brand,
+    index: firstCar?.index
+  }));
+});
+
+tap.test('expect to get instance of Car with shallow match', async () => {
+  console.log('Before query - testDb.mongoDb.databaseName:', testDb.mongoDb.databaseName);
+  console.log('Before query - Car.collection.smartdataDb:', (Car.collection as any).smartdataDb?.mongoDb?.databaseName);
+  console.log('Before query - Car.collection.collectionName:', (Car.collection as any).collectionName);
+
+  const totalQueryCycles = totalCars / 2;
+  let counter = 0;
+  do {
+    const timeStart = Date.now();
+    const myCars = await Car.getInstances({
+      brand: 'Renault',
+    });
+    if (counter % 10 === 0) {
+      console.log(
+        `performed ${counter} of ${totalQueryCycles} total query cycles: took ${
+          Date.now() - timeStart
+        }ms to query a set of 2000 with memory footprint ${process.memoryUsage().rss / 1e6} MB`,
+      );
+      console.log('myCars.length:', myCars.length);
+      console.log('myCars[0]:', myCars[0]);
+    }
+    expect(myCars[0].deepData.sodeep).toEqual('yes');
+    expect(myCars[0].brand).toEqual('Renault');
+    counter++;
+  } while (counter < totalQueryCycles);
+});
+
+tap.test('expect to get instance of Car with deep match', async () => {
+  const totalQueryCycles = totalCars / 6;
+  let counter = 0;
+  do {
+    const timeStart = Date.now();
+    const myCars2 = await Car.getInstances({
+      deepData: {
+        sodeep: 'yes',
+      },
+    });
+    if (counter % 10 === 0) {
+      console.log(
+        `performed ${counter} of ${totalQueryCycles} total query cycles: took ${
+          Date.now() - timeStart
+        }ms to deep query a set of 2000 with memory footprint ${process.memoryUsage().rss / 1e6} MB`,
+      );
+    }
+    expect(myCars2[0].deepData.sodeep).toEqual('yes');
+    expect(myCars2[0].brand).toEqual('Volvo');
+    counter++;
+  } while (counter < totalQueryCycles);
+});
+
+tap.test('expect to get instance of Car and update it', async () => {
+  const myCar = await Car.getInstance<Car>({
+    brand: 'Volvo',
+  });
+  expect(myCar.color).toEqual('red');
+  myCar.color = 'blue';
+  await myCar.save();
+});
+
+tap.test('should be able to delete an instance of car', async () => {
+  const myCars = await Car.getInstances({
+    brand: 'Volvo',
+    color: 'blue',
+  });
+  console.log(myCars);
+  expect(myCars[0].color).toEqual('blue');
+  for (const myCar of myCars) {
+    await myCar.delete();
+  }
+
+  const myCar2 = await Car.getInstance<Car>({
+    brand: 'Volvo',
+  });
+  expect(myCar2.color).toEqual('red');
+});
+
+// tslint:disable-next-line: max-classes-per-file
+@smartdata.Collection(() => {
+  return testDb;
+})
+class Truck extends smartdata.SmartDataDbDoc<Car, Car> {
+  @smartdata.unI()
+  public id: string = smartunique.shortId();
+
+  @smartdata.svDb()
+  public color: string;
+
+  @smartdata.svDb()
+  public brand: string;
+
+  constructor(colorArg: string, brandArg: string) {
+    super();
+    this.color = colorArg;
+    this.brand = brandArg;
+  }
+}
+
+tap.test('should store a new Truck', async () => {
+  const truck = new Truck('blue', 'MAN');
+  await truck.save();
+  const myTruck2 = await Truck.getInstance({ color: 'blue' });
+  expect(myTruck2.color).toEqual('blue');
+  myTruck2.color = 'red';
+  await myTruck2.save();
+  const myTruck3 = await Truck.getInstance({ color: 'blue' });
+  expect(myTruck3).toBeNull();
+});
+
+tap.test('should return a count', async () => {
+  const truckCount = await Truck.getCount();
+  expect(truckCount).toEqual(1);
+});
+
+tap.test('should use a cursor', async () => {
+  const cursor = await Car.getCursor({});
+  let counter = 0;
+  await cursor.forEach(async (carArg) => {
+    counter++;
+    counter % 50 === 0 ? console.log(`50 more of ${carArg.color}`) : null;
+  });
+});
+
+// =======================================
+// close the database connection
+// =======================================
+tap.test('close', async () => {
+  if (smartmongoInstance) {
+    await smartmongoInstance.stopAndDumpToDir('./.nogit/dbdump/test.ts');
+  } else {
+    await testDb.mongoDb.dropDatabase();
+    await testDb.close();
+  }
+  setTimeout(() => process.exit(), 2000);
+});
+
+tap.start({ throwOnError: true });

test/test.distributedcoordinator.ts

@@ -1,4 +1,4 @@
-import { tap, expect } from '@push.rocks/tapbundle';
+import { tap, expect } from '@git.zone/tstest/tapbundle';
 import * as smartmongo from '@push.rocks/smartmongo';
 import type * as taskbuffer from '@push.rocks/taskbuffer';
 

test/test.easystore.ts

@@ -1,4 +1,4 @@
-import { tap, expect } from '@push.rocks/tapbundle';
+import { tap, expect } from '@git.zone/tstest/tapbundle';
 import { Qenv } from '@push.rocks/qenv';
 import * as smartmongo from '@push.rocks/smartmongo';
 import { smartunique } from '../ts/plugins.js';

test/test.filters.ts

@@ -213,6 +213,221 @@ tap.test('should filter by nested object fields', async () => {
   expect(users[0].name).toEqual('John Doe');
 });
 
+// ============= COMPREHENSIVE NESTED FILTER TESTS =============
+tap.test('should filter by nested object with direct object syntax', async () => {
+  // Direct nested object matching (exact match)
+  const users = await TestUser.getInstances({
+    metadata: { 
+      loginCount: 5,
+      lastLogin: (await TestUser.getInstances({}))[0].metadata.lastLogin // Get the exact date
+    }
+  });
+  expect(users.length).toEqual(1);
+  expect(users[0].name).toEqual('John Doe');
+});
+
+tap.test('should filter by partial nested object match', async () => {
+  // When using object syntax, only specified fields must match
+  const users = await TestUser.getInstances({
+    metadata: { loginCount: 5 }  // Only checks loginCount, ignores other fields
+  });
+  expect(users.length).toEqual(1);
+  expect(users[0].name).toEqual('John Doe');
+});
+
+tap.test('should combine nested object and dot notation', async () => {
+  const users = await TestUser.getInstances({
+    metadata: { loginCount: { $gte: 3 } },  // Object syntax with operator
+    'metadata.loginCount': { $lte: 10 }     // Dot notation with operator
+  });
+  expect(users.length).toEqual(3);  // Jane (3), John (5), and Alice (10) have loginCount between 3-10
+});
+
+tap.test('should filter nested fields with operators using dot notation', async () => {
+  const users = await TestUser.getInstances({
+    'metadata.loginCount': { $gte: 5 }
+  });
+  expect(users.length).toEqual(2);  // John (5) and Alice (10)
+  const names = users.map(u => u.name).sort();
+  expect(names).toEqual(['Alice Brown', 'John Doe']);
+});
+
+tap.test('should filter nested fields with multiple operators', async () => {
+  const users = await TestUser.getInstances({
+    'metadata.loginCount': { $gte: 3, $lt: 10 }
+  });
+  expect(users.length).toEqual(2);  // Jane (3) and John (5)
+  const names = users.map(u => u.name).sort();
+  expect(names).toEqual(['Jane Smith', 'John Doe']);
+});
+
+tap.test('should handle deeply nested object structures', async () => {
+  // First, create a user with deep nesting in preferences
+  const deepUser = new TestUser({
+    name: 'Deep Nester',
+    age: 40,
+    email: 'deep@example.com',
+    roles: ['admin'],
+    tags: [],
+    status: 'active',
+    metadata: {
+      loginCount: 1,
+      preferences: {
+        theme: {
+          colors: {
+            primary: '#000000',
+            secondary: '#ffffff'
+          },
+          fonts: {
+            heading: 'Arial',
+            body: 'Helvetica'
+          }
+        },
+        notifications: {
+          email: true,
+          push: false
+        }
+      }
+    },
+    scores: []
+  });
+  await deepUser.save();
+
+  // Test deep nesting with dot notation
+  const deepResults = await TestUser.getInstances({
+    'metadata.preferences.theme.colors.primary': '#000000'
+  });
+  expect(deepResults.length).toEqual(1);
+  expect(deepResults[0].name).toEqual('Deep Nester');
+
+  // Test deep nesting with operators
+  const boolResults = await TestUser.getInstances({
+    'metadata.preferences.notifications.email': { $eq: true }
+  });
+  expect(boolResults.length).toEqual(1);
+  expect(boolResults[0].name).toEqual('Deep Nester');
+
+  // Clean up
+  await deepUser.delete();
+});
+
+tap.test('should filter arrays of nested objects using $elemMatch', async () => {
+  const orders = await TestOrder.getInstances({
+    items: {
+      $elemMatch: {
+        product: 'laptop',
+        price: { $gte: 1000 }
+      }
+    }
+  });
+  expect(orders.length).toEqual(2);  // Both laptop orders have price >= 1000
+});
+
+tap.test('should filter nested arrays with dot notation', async () => {
+  // Query for any order that has an item with specific product
+  const orders = await TestOrder.getInstances({
+    'items.product': 'laptop'
+  });
+  expect(orders.length).toEqual(2);  // Two orders contain laptops
+});
+
+tap.test('should combine nested object filters with logical operators', async () => {
+  const users = await TestUser.getInstances({
+    $or: [
+      { 'metadata.loginCount': { $gte: 10 } },  // Alice has 10
+      { 
+        $and: [
+          { 'metadata.loginCount': { $lt: 5 } },  // Jane has 3, Bob has 0, Charlie has 1
+          { status: 'active' }  // Jane is active, Bob is inactive, Charlie is pending
+        ]
+      }
+    ]
+  });
+  expect(users.length).toEqual(2);  // Alice (loginCount >= 10), Jane (loginCount < 5 AND active)
+  const names = users.map(u => u.name).sort();
+  expect(names).toEqual(['Alice Brown', 'Jane Smith']);
+});
+
+tap.test('should handle null and undefined in nested fields', async () => {
+  // Users without lastLogin
+  const noLastLogin = await TestUser.getInstances({
+    'metadata.lastLogin': { $exists: false }
+  });
+  expect(noLastLogin.length).toEqual(4);  // Everyone except John
+
+  // Users with preferences (none have it set)
+  const withPreferences = await TestUser.getInstances({
+    'metadata.preferences': { $exists: true }
+  });
+  expect(withPreferences.length).toEqual(0);
+});
+
+tap.test('should filter nested arrays by size', async () => {
+  // Create an order with specific number of items
+  const multiItemOrder = new TestOrder({
+    userId: 'test-user',
+    items: [
+      { product: 'item1', quantity: 1, price: 10 },
+      { product: 'item2', quantity: 2, price: 20 },
+      { product: 'item3', quantity: 3, price: 30 },
+      { product: 'item4', quantity: 4, price: 40 }
+    ],
+    totalAmount: 100,
+    status: 'pending',
+    tags: ['test']
+  });
+  await multiItemOrder.save();
+
+  const fourItemOrders = await TestOrder.getInstances({
+    items: { $size: 4 }
+  });
+  expect(fourItemOrders.length).toEqual(1);
+
+  // Clean up
+  await multiItemOrder.delete();
+});
+
+tap.test('should handle nested field comparison between documents', async () => {
+  // Find users where loginCount equals their age divided by 6 (John: 30/6=5)
+  const users = await TestUser.getInstances({
+    $and: [
+      { 'metadata.loginCount': 5 },
+      { age: 30 }
+    ]
+  });
+  expect(users.length).toEqual(1);
+  expect(users[0].name).toEqual('John Doe');
+});
+
+tap.test('should filter using $in on nested fields', async () => {
+  const users = await TestUser.getInstances({
+    'metadata.loginCount': { $in: [0, 1, 5] }
+  });
+  expect(users.length).toEqual(3);  // Bob (0), Charlie (1), John (5)
+  const names = users.map(u => u.name).sort();
+  expect(names).toEqual(['Bob Johnson', 'Charlie Wilson', 'John Doe']);
+});
+
+tap.test('should filter nested arrays with $all', async () => {
+  // Create an order with multiple tags
+  const taggedOrder = new TestOrder({
+    userId: 'test-user',
+    items: [{ product: 'test', quantity: 1, price: 10 }],
+    totalAmount: 10,
+    status: 'completed',
+    tags: ['urgent', 'priority', 'electronics']
+  });
+  await taggedOrder.save();
+
+  const priorityElectronics = await TestOrder.getInstances({
+    tags: { $all: ['priority', 'electronics'] }
+  });
+  expect(priorityElectronics.length).toEqual(2);  // Original order and new one
+
+  // Clean up
+  await taggedOrder.delete();
+});
+
 // ============= COMPARISON OPERATOR TESTS =============
 tap.test('should filter using $gt operator', async () => {
   const users = await TestUser.getInstances({

test/test.node.ts

@@ -1,4 +1,6 @@
-import { tap, expect } from '@push.rocks/tapbundle';
+// TODO: Decorator support during testing for bun and deno in @git.zone/tstest
+
+import { tap, expect } from '@git.zone/tstest/tapbundle';
 import { Qenv } from '@push.rocks/qenv';
 import * as smartmongo from '@push.rocks/smartmongo';
 import { smartunique } from '../ts/plugins.js';

test/test.search.advanced.node.ts

@@ -1,4 +1,4 @@
-import { tap, expect } from '@push.rocks/tapbundle';
+import { tap, expect } from '@git.zone/tstest/tapbundle';
 import * as smartmongo from '@push.rocks/smartmongo';
 import * as smartdata from '../ts/index.js';
 import { searchable } from '../ts/classes.doc.js';

test/test.search.ts

@@ -1,4 +1,4 @@
-import { tap, expect } from '@push.rocks/tapbundle';
+import { tap, expect } from '@git.zone/tstest/tapbundle';
 import * as smartmongo from '@push.rocks/smartmongo';
 import { smartunique } from '../ts/plugins.js';
 

test/test.typescript.ts

@@ -1,4 +1,4 @@
-import { tap, expect } from '@push.rocks/tapbundle';
+import { tap, expect } from '@git.zone/tstest/tapbundle';
 import { Qenv } from '@push.rocks/qenv';
 import * as smartmongo from '@push.rocks/smartmongo';
 import { smartunique } from '../ts/plugins.js';

test/test.watch.ts

@@ -1,4 +1,4 @@
-import { tap, expect } from '@push.rocks/tapbundle';
+import { tap, expect } from '@git.zone/tstest/tapbundle';
 import { Qenv } from '@push.rocks/qenv';
 import * as smartmongo from '@push.rocks/smartmongo';
 import { smartunique } from '../ts/plugins.js';

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@push.rocks/smartdata',
-  version: '5.16.3',
+  version: '7.1.2',
   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,37 +21,85 @@ 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
  */
 export function Collection(dbArg: SmartdataDb | TDelayed<SmartdataDb>) {
-  return function classDecorator<T extends { new (...args: any[]): {} }>(constructor: T) {
-    const decoratedClass = class extends constructor {
-      public static className = constructor.name;
-      public static get collection() {
-        if (!(dbArg instanceof SmartdataDb)) {
-          dbArg = dbArg();
-        }
-        const coll = collectionFactory.getCollection(constructor.name, dbArg);
-        // Attach document constructor for searchableFields lookup
-        if (!(coll as any).docCtor) {
-          (coll as any).docCtor = decoratedClass;
-        }
-        return coll;
+  return function classDecorator(value: Function, context: ClassDecoratorContext) {
+    if (context.kind !== 'class') {
+      throw new Error('Collection can only decorate classes');
+    }
+
+    const constructor = value as { new (...args: any[]): any } & { className?: string };
+
+    const getCollection = () => {
+      if (!(dbArg instanceof SmartdataDb)) {
+        dbArg = dbArg();
       }
-      public get collection() {
-        if (!(dbArg instanceof SmartdataDb)) {
-          dbArg = dbArg();
-        }
-        const coll = collectionFactory.getCollection(constructor.name, dbArg);
-        if (!(coll as any).docCtor) {
-          (coll as any).docCtor = decoratedClass;
-        }
-        return coll;
+      const coll = collectionFactory.getCollection(constructor.name, dbArg);
+      // Attach document constructor for searchableFields lookup
+      if (coll && !(coll as any).docCtor) {
+        (coll as any).docCtor = constructor;
       }
+      return coll;
     };
-    return decoratedClass;
+
+    // Add static className property directly on the constructor
+    (constructor as any).className = constructor.name;
+
+    // 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
+    });
+
+    initializeDecoratorMetadata(constructor, context.metadata);
+    return constructor as any;
   };
 }
 
@@ -69,57 +117,51 @@ export const setDefaultManagerForDoc = <T,>(managerArg: IManager, dbDocArg: T):
  * @param dbArg
  */
 export function managed<TManager extends IManager>(managerArg?: TManager | TDelayed<TManager>) {
-  return function classDecorator<T extends { new (...args: any[]): any }>(constructor: T) {
-    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;
-      }
+  return function classDecorator(value: Function, context: ClassDecoratorContext) {
+    if (context.kind !== 'class') {
+      throw new Error('managed can only decorate classes');
+    }
+
+    const constructor = value as { new (...args: any[]): any } & { className?: string };
+    (constructor as any).className = constructor.name;
+
+    // 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>)();
     };
-    return decoratedClass;
+
+    const getDb = (defaultManagerFn: () => TManager): SmartdataDb => {
+      return getManager(defaultManagerFn).db;
+    };
+
+    // 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
+    });
+
+    // 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
+    });
+
+    initializeDecoratorMetadata(constructor, context.metadata);
+    return constructor as any;
   };
 }
 
@@ -132,8 +174,8 @@ export class SmartdataCollection<T> {
   /**
    * the collection that is used
    */
-  public mongoDbCollection: plugins.mongodb.Collection;
-  public objectValidation: IDocValidationFunc<T> = null;
+  public mongoDbCollection!: plugins.mongodb.Collection;
+  public objectValidation: IDocValidationFunc<T> | null = null;
   public collectionName: string;
   public smartdataDb: SmartdataDb;
   public uniqueIndexes: string[] = [];
@@ -288,7 +330,7 @@ export class SmartdataCollection<T> {
     );
     const smartdataWatcher = new SmartdataDbWatcher(
       changeStream,
-      smartdataDbDocArg,
+      smartdataDbDocArg!,
       { bufferTimeMs },
     );
     await smartdataWatcher.readyDeferred.promise;
@@ -311,7 +353,7 @@ export class SmartdataCollection<T> {
       this.createRegularIndexes(dbDocArg.regularIndexes);
     }
     
-    const saveableObject = await dbDocArg.createSavableObject();
+    const saveableObject = await dbDocArg.createSavableObject() as any;
     const result = await this.mongoDbCollection.insertOne(saveableObject, { session: opts?.session });
     return result;
   }
@@ -326,7 +368,7 @@ export class SmartdataCollection<T> {
     await this.init();
     await this.checkDoc(dbDocArg);
     const identifiableObject = await dbDocArg.createIdentifiableObject();
-    const saveableObject = await dbDocArg.createSavableObject();
+    const saveableObject = await dbDocArg.createSavableObject() as any;
     const updateableObject: any = {};
     for (const key of Object.keys(saveableObject)) {
       if (identifiableObject[key]) {

ts/classes.collectionfactory.ts

@@ -6,13 +6,8 @@ export class CollectionFactory {
   public collections: { [key: string]: SmartdataCollection<any> } = {};
 
   public getCollection = (nameArg: string, dbArg: SmartdataDb): SmartdataCollection<any> => {
-    if (!this.collections[nameArg]) {
-      this.collections[nameArg] = (() => {
-        if (dbArg instanceof SmartdataDb) {
-          // tslint:disable-next-line: no-string-literal
-          return new SmartdataCollection(nameArg, dbArg);
-        }
-      })();
+    if (!this.collections[nameArg] && dbArg instanceof SmartdataDb) {
+      this.collections[nameArg] = new SmartdataCollection(nameArg, dbArg);
     }
     return this.collections[nameArg];
   };

ts/classes.db.ts

@@ -12,8 +12,8 @@ export type TConnectionStatus = 'initial' | 'disconnected' | 'connected' | 'fail
 
 export class SmartdataDb {
   smartdataOptions: plugins.tsclass.database.IMongoDescriptor;
-  mongoDbClient: plugins.mongodb.MongoClient;
-  mongoDb: plugins.mongodb.Db;
+  mongoDbClient!: plugins.mongodb.MongoClient;
+  mongoDb!: plugins.mongodb.Db;
   status: TConnectionStatus;
   statusConnectedDeferred = plugins.smartpromise.defer();
   smartdataCollectionMap = new plugins.lik.ObjectMap<SmartdataCollection<any>>();
@@ -51,13 +51,14 @@ export class SmartdataDb {
         .replace('<user>', encodedUser)
         .replace('<PASSWORD>', encodedPass)
         .replace('<password>', encodedPass)
-        .replace('<DBNAME>', this.smartdataOptions.mongoDbName)
-        .replace('<dbname>', this.smartdataOptions.mongoDbName);
+        .replace('<DBNAME>', this.smartdataOptions.mongoDbName || '')
+        .replace('<dbname>', this.smartdataOptions.mongoDbName || '');
 
       const clientOptions: plugins.mongodb.MongoClientOptions = {
         maxPoolSize: (this.smartdataOptions as any).maxPoolSize ?? 100,
         maxIdleTimeMS: (this.smartdataOptions as any).maxIdleTimeMS ?? 300000, // 5 minutes default
         serverSelectionTimeoutMS: (this.smartdataOptions as any).serverSelectionTimeoutMS ?? 30000,
+        socketTimeoutMS: (this.smartdataOptions as any).socketTimeoutMS ?? 30000, // 30 seconds default — prevents hung operations from holding connections
         retryWrites: true,
       };
 
@@ -69,7 +70,7 @@ export class SmartdataDb {
     } catch (error) {
       this.status = 'disconnected';
       this.statusConnectedDeferred.reject(error);
-      logger.log('error', `Failed to connect to database ${this.smartdataOptions.mongoDbName}: ${error.message}`);
+      logger.log('error', `Failed to connect to database ${this.smartdataOptions.mongoDbName}: ${(error as Error).message}`);
       throw error;
     }
   }

ts/classes.distributedcoordinator.ts

@@ -9,10 +9,10 @@ import { logger } from './logging.js';
 export class DistributedClass extends SmartDataDbDoc<DistributedClass, DistributedClass> {
   // INSTANCE
   @unI()
-  public id: string;
+  public id!: string;
 
   @svDb()
-  public data: {
+  public data!: {
     status: 'initializing' | 'bidding' | 'settled' | 'stopped';
     biddingShortcode?: string;
     biddingStartTime?: number;
@@ -40,8 +40,8 @@ export class SmartdataDistributedCoordinator extends plugins.taskbuffer.distribu
   public readyPromise: Promise<any>;
   public db: SmartdataDb;
   private asyncExecutionStack = new plugins.lik.AsyncExecutionStack();
-  public ownInstance: DistributedClass;
-  public distributedWatcher: SmartdataDbWatcher<DistributedClass>;
+  public ownInstance!: DistributedClass;
+  public distributedWatcher!: SmartdataDbWatcher<DistributedClass>;
 
   constructor(dbArg: SmartdataDb) {
     super();
@@ -163,8 +163,8 @@ export class SmartdataDistributedCoordinator extends plugins.taskbuffer.distribu
     } else if (
       (await DistributedClass.getInstances({})).find((instanceArg) => {
         return instanceArg.data.status === 'bidding' &&
-          instanceArg.data.biddingStartTime <= Date.now() - 4000 &&
-          instanceArg.data.biddingStartTime >= Date.now() - 30000;
+          instanceArg.data.biddingStartTime! <= Date.now() - 4000 &&
+          instanceArg.data.biddingStartTime! >= Date.now() - 30000;
       })
     ) {
       logger.log('info', 'too late to the bidding party... waiting for next round.');
@@ -191,7 +191,7 @@ export class SmartdataDistributedCoordinator extends plugins.taskbuffer.distribu
         logger.log('info', `found ${biddingInstances.length} bidding instances...`);
         this.ownInstance.data.elected = true;
         for (const biddingInstance of biddingInstances) {
-          if (biddingInstance.data.biddingShortcode < this.ownInstance.data.biddingShortcode) {
+          if (biddingInstance.data.biddingShortcode! < this.ownInstance.data.biddingShortcode!) {
             this.ownInstance.data.elected = false;
           }
         }
@@ -270,7 +270,7 @@ export class SmartdataDistributedCoordinator extends plugins.taskbuffer.distribu
     });
     if (!result) {
       logger.log('warn', 'no result found for task request...');
-      return null;
+      return null as any;
     }
     return result;
   }

ts/classes.doc.ts

@@ -28,15 +28,39 @@ export interface SearchOptions<T> {
 
 export type TDocCreation = 'db' | 'new' | 'mixed';
 
-
+// Type for decorator metadata - extends TypeScript's built-in DecoratorMetadataObject
+interface ISmartdataDecoratorMetadata extends DecoratorMetadataObject {
+  globalSaveableProperties?: string[];
+  saveableProperties?: string[];
+  uniqueIndexes?: string[];
+  regularIndexes?: Array<{field: string, options: IIndexOptions}>;
+  searchableFields?: string[];
+  _svDbOptions?: Record<string, SvDbOptions>;
+}
 
 export function globalSvDb() {
-  return (target: SmartDataDbDoc<unknown, unknown>, key: string) => {
-    logger.log('debug', `called svDb() on >${target.constructor.name}.${key}<`);
-    if (!target.globalSaveableProperties) {
-      target.globalSaveableProperties = [];
+  return (value: undefined, context: ClassFieldDecoratorContext) => {
+    if (context.kind !== 'field') {
+      throw new Error('globalSvDb can only decorate fields');
     }
-    target.globalSaveableProperties.push(key);
+
+    // Store metadata at class level using Symbol.metadata
+    const metadata = context.metadata as ISmartdataDecoratorMetadata;
+    if (!metadata.globalSaveableProperties) {
+      metadata.globalSaveableProperties = [];
+    }
+    metadata.globalSaveableProperties.push(String(context.name));
+
+    // Use addInitializer to ensure prototype arrays are set up once
+    context.addInitializer(function(this: any) {
+      const proto = this.constructor.prototype;
+      const metadata = this.constructor[Symbol.metadata];
+
+      if (metadata && metadata.globalSaveableProperties && !proto.globalSaveableProperties) {
+        // Initialize prototype array from metadata (runs once per class)
+        proto.globalSaveableProperties = [...metadata.globalSaveableProperties];
+      }
+    });
   };
 }
 
@@ -54,20 +78,44 @@ export interface SvDbOptions {
  * saveable - saveable decorator to be used on class properties
  */
 export function svDb(options?: SvDbOptions) {
-  return (target: SmartDataDbDoc<unknown, unknown>, key: string) => {
-    logger.log('debug', `called svDb() on >${target.constructor.name}.${key}<`);
-    if (!target.saveableProperties) {
-      target.saveableProperties = [];
+  return (value: undefined, context: ClassFieldDecoratorContext) => {
+    if (context.kind !== 'field') {
+      throw new Error('svDb can only decorate fields');
     }
-    target.saveableProperties.push(key);
-    // attach custom serializer/deserializer options to the class constructor
-    const ctor = target.constructor as any;
-    if (!ctor._svDbOptions) {
-      ctor._svDbOptions = {};
+
+    const propName = String(context.name);
+
+    // Store metadata at class level using Symbol.metadata
+    const metadata = context.metadata as ISmartdataDecoratorMetadata;
+    if (!metadata.saveableProperties) {
+      metadata.saveableProperties = [];
     }
+    metadata.saveableProperties.push(propName);
+
+    // Store options in metadata
     if (options) {
-      ctor._svDbOptions[key] = options;
+      if (!metadata._svDbOptions) {
+        metadata._svDbOptions = {};
+      }
+      metadata._svDbOptions[propName] = options;
     }
+
+    // Use addInitializer to ensure prototype arrays are set up once
+    context.addInitializer(function(this: any) {
+      const proto = this.constructor.prototype;
+      const ctor = this.constructor;
+      const metadata = ctor[Symbol.metadata];
+
+      if (metadata && metadata.saveableProperties && !proto.saveableProperties) {
+        // Initialize prototype array from metadata (runs once per class)
+        proto.saveableProperties = [...metadata.saveableProperties];
+      }
+
+      // Initialize svDbOptions from metadata
+      if (metadata && metadata._svDbOptions && !ctor._svDbOptions) {
+        ctor._svDbOptions = { ...metadata._svDbOptions };
+      }
+    });
   };
 }
 
@@ -75,13 +123,30 @@ export function svDb(options?: SvDbOptions) {
  * searchable - marks a property as searchable with Lucene query syntax
  */
 export function searchable() {
-  return (target: SmartDataDbDoc<unknown, unknown>, key: string) => {
-    // Attach to class constructor for direct access
-    const ctor = target.constructor as any;
-    if (!Array.isArray(ctor.searchableFields)) {
-      ctor.searchableFields = [];
+  return (value: undefined, context: ClassFieldDecoratorContext) => {
+    if (context.kind !== 'field') {
+      throw new Error('searchable can only decorate fields');
     }
-    ctor.searchableFields.push(key);
+
+    const propName = String(context.name);
+
+    // Store metadata at class level
+    const metadata = context.metadata as ISmartdataDecoratorMetadata;
+    if (!metadata.searchableFields) {
+      metadata.searchableFields = [];
+    }
+    metadata.searchableFields.push(propName);
+
+    // Use addInitializer to set up constructor property once
+    context.addInitializer(function(this: any) {
+      const ctor = this.constructor as any;
+      const metadata = ctor[Symbol.metadata];
+
+      if (metadata && metadata.searchableFields && !Array.isArray(ctor.searchableFields)) {
+        // Initialize from metadata (runs once per class)
+        ctor.searchableFields = [...metadata.searchableFields];
+      }
+    });
   };
 }
 
@@ -94,20 +159,41 @@ function escapeForRegex(input: string): string {
  * unique index - decorator to mark a unique index
  */
 export function unI() {
-  return (target: SmartDataDbDoc<unknown, unknown>, key: string) => {
-    logger.log('debug', `called unI on >>${target.constructor.name}.${key}<<`);
-
-    // mark the index as unique
-    if (!target.uniqueIndexes) {
-      target.uniqueIndexes = [];
+  return (value: undefined, context: ClassFieldDecoratorContext) => {
+    if (context.kind !== 'field') {
+      throw new Error('unI can only decorate fields');
     }
-    target.uniqueIndexes.push(key);
 
-    // and also save it
-    if (!target.saveableProperties) {
-      target.saveableProperties = [];
+    const propName = String(context.name);
+
+    // Store metadata at class level
+    const metadata = context.metadata as ISmartdataDecoratorMetadata;
+    if (!metadata.uniqueIndexes) {
+      metadata.uniqueIndexes = [];
     }
-    target.saveableProperties.push(key);
+    metadata.uniqueIndexes.push(propName);
+
+    // Also mark as saveable
+    if (!metadata.saveableProperties) {
+      metadata.saveableProperties = [];
+    }
+    if (!metadata.saveableProperties.includes(propName)) {
+      metadata.saveableProperties.push(propName);
+    }
+
+    // Use addInitializer to ensure prototype arrays are set up once
+    context.addInitializer(function(this: any) {
+      const proto = this.constructor.prototype;
+      const metadata = this.constructor[Symbol.metadata];
+
+      if (metadata && metadata.uniqueIndexes && !proto.uniqueIndexes) {
+        proto.uniqueIndexes = [...metadata.uniqueIndexes];
+      }
+
+      if (metadata && metadata.saveableProperties && !proto.saveableProperties) {
+        proto.saveableProperties = [...metadata.saveableProperties];
+      }
+    });
   };
 }
 
@@ -126,28 +212,44 @@ export interface IIndexOptions {
  * index - decorator to mark a field for regular indexing
  */
 export function index(options?: IIndexOptions) {
-  return (target: SmartDataDbDoc<unknown, unknown>, key: string) => {
-    logger.log('debug', `called index() on >${target.constructor.name}.${key}<`);
-    
-    // Initialize regular indexes array if it doesn't exist
-    if (!target.regularIndexes) {
-      target.regularIndexes = [];
+  return (value: undefined, context: ClassFieldDecoratorContext) => {
+    if (context.kind !== 'field') {
+      throw new Error('index can only decorate fields');
     }
-    
-    // Add this field to regularIndexes with its options
-    target.regularIndexes.push({
-      field: key,
+
+    const propName = String(context.name);
+
+    // Store metadata at class level
+    const metadata = context.metadata as ISmartdataDecoratorMetadata;
+    if (!metadata.regularIndexes) {
+      metadata.regularIndexes = [];
+    }
+    metadata.regularIndexes.push({
+      field: propName,
       options: options || {}
     });
-    
-    // Also ensure it's marked as saveable
-    if (!target.saveableProperties) {
-      target.saveableProperties = [];
+
+    // Also mark as saveable
+    if (!metadata.saveableProperties) {
+      metadata.saveableProperties = [];
     }
-    
-    if (!target.saveableProperties.includes(key)) {
-      target.saveableProperties.push(key);
+    if (!metadata.saveableProperties.includes(propName)) {
+      metadata.saveableProperties.push(propName);
     }
+
+    // Use addInitializer to ensure prototype arrays are set up once
+    context.addInitializer(function(this: any) {
+      const proto = this.constructor.prototype;
+      const metadata = this.constructor[Symbol.metadata];
+
+      if (metadata && metadata.regularIndexes && !proto.regularIndexes) {
+        proto.regularIndexes = [...metadata.regularIndexes];
+      }
+
+      if (metadata && metadata.saveableProperties && !proto.saveableProperties) {
+        proto.saveableProperties = [...metadata.saveableProperties];
+      }
+    });
   };
 }
 
@@ -199,21 +301,51 @@ export const convertFilterForMongoDb = (filterArg: { [key: string]: any }) => {
     throw new Error('$where operator is not allowed for security reasons');
   }
   
-  // Special case: detect MongoDB operators and pass them through directly
-  const topLevelOperators = ['$and', '$or', '$nor', '$not', '$text', '$regex'];
+  // Handle logical operators recursively
+  const logicalOperators = ['$and', '$or', '$nor', '$not'];
+  const processedFilter: { [key: string]: any } = {};
+  
   for (const key of Object.keys(filterArg)) {
-    if (topLevelOperators.includes(key)) {
-      return filterArg; // Return the filter as-is for MongoDB operators
+    if (logicalOperators.includes(key)) {
+      if (key === '$not') {
+        processedFilter[key] = convertFilterForMongoDb(filterArg[key]);
+      } else if (Array.isArray(filterArg[key])) {
+        processedFilter[key] = filterArg[key].map((subFilter: any) => convertFilterForMongoDb(subFilter));
+      }
     }
   }
+  
+  // If only logical operators, return them
+  const hasOnlyLogicalOperators = Object.keys(filterArg).every(key => logicalOperators.includes(key));
+  if (hasOnlyLogicalOperators) {
+    return processedFilter;
+  }
 
   // Original conversion logic for non-MongoDB query objects
   const convertedFilter: { [key: string]: any } = {};
+  
+  // Helper to merge operator objects
+  const mergeIntoConverted = (path: string, value: any) => {
+    const existing = convertedFilter[path];
+    if (!existing) {
+      convertedFilter[path] = value;
+    } else if (
+      typeof existing === 'object' && !Array.isArray(existing) &&
+      typeof value === 'object' && !Array.isArray(value) &&
+      (Object.keys(existing).some(k => k.startsWith('$')) || Object.keys(value).some(k => k.startsWith('$')))
+    ) {
+      // Both have operators, merge them
+      convertedFilter[path] = { ...existing, ...value };
+    } else {
+      // Otherwise later wins
+      convertedFilter[path] = value;
+    }
+  };
 
   const convertFilterArgument = (keyPathArg2: string, filterArg2: any) => {
     if (Array.isArray(filterArg2)) {
       // Arrays are typically used as values for operators like $in or as direct equality matches
-      convertedFilter[keyPathArg2] = filterArg2;
+      mergeIntoConverted(keyPathArg2, filterArg2);
       return;
     } else if (typeof filterArg2 === 'object' && filterArg2 !== null) {
       // Check if this is an object with MongoDB operators
@@ -264,8 +396,8 @@ export const convertFilterForMongoDb = (filterArg: { [key: string]: any }) => {
           throw new Error('$size operator requires a numeric value');
         }
         
-        // Pass the operator object through
-        convertedFilter[keyPathArg2] = filterArg2;
+        // Use merge helper to handle duplicate paths
+        mergeIntoConverted(keyPathArg2, filterArg2);
         return;
       }
       
@@ -282,13 +414,20 @@ export const convertFilterForMongoDb = (filterArg: { [key: string]: any }) => {
       }
     } else {
       // Primitive values
-      convertedFilter[keyPathArg2] = filterArg2;
+      mergeIntoConverted(keyPathArg2, filterArg2);
     }
   };
 
   for (const key of Object.keys(filterArg)) {
-    convertFilterArgument(key, filterArg[key]);
+    // Skip logical operators, they were already processed
+    if (!logicalOperators.includes(key)) {
+      convertFilterArgument(key, filterArg[key]);
+    }
   }
+  
+  // Add back processed logical operators
+  Object.assign(convertedFilter, processedFilter);
+  
   return convertedFilter;
 };
 
@@ -297,10 +436,17 @@ export class SmartDataDbDoc<T extends TImplements, TImplements, TManager extends
    * the collection object an Doc belongs to
    */
   public static collection: SmartdataCollection<any>;
-  public collection: SmartdataCollection<any>;
+  declare public collection: SmartdataCollection<any>;
   public static defaultManager;
   public static manager;
-  public manager: TManager;
+  declare public manager: TManager;
+
+  /**
+   * Helper to get collection with fallback to static for Deno compatibility
+   */
+  private getCollectionSafe(): SmartdataCollection<any> {
+    return this.collection || (this.constructor as any).collection;
+  }
 
   // STATIC
   public static createInstanceFromMongoDbNativeDoc<T>(
@@ -336,7 +482,7 @@ export class SmartDataDbDoc<T extends TImplements, TImplements, TManager extends
       convertFilterForMongoDb(filterArg),
       { session: opts?.session },
     );
-    const returnArray = [];
+    const returnArray: T[] = [];
     for (const foundDoc of foundDocs) {
       const newInstance: T = (this as any).createInstanceFromMongoDbNativeDoc(foundDoc);
       returnArray.push(newInstance);
@@ -364,7 +510,7 @@ export class SmartDataDbDoc<T extends TImplements, TImplements, TManager extends
       const newInstance: T = (this as any).createInstanceFromMongoDbNativeDoc(foundDoc);
       return newInstance;
     } else {
-      return null;
+      return null as any;
     }
   }
 
@@ -661,33 +807,38 @@ export class SmartDataDbDoc<T extends TImplements, TImplements, TManager extends
 
   /**
    * an array of saveable properties of ALL doc
+   * Note: Set by decorators on prototype - NOT declared as instance property to avoid shadowing in Deno
+   * Declared with definite assignment assertion to satisfy TypeScript without creating instance property
    */
-  public globalSaveableProperties: string[];
+  declare globalSaveableProperties: string[];
 
   /**
    * unique indexes
+   * Note: Set by decorators on prototype - NOT declared as instance property to avoid shadowing in Deno
    */
-  public uniqueIndexes: string[];
+  declare uniqueIndexes: string[];
 
   /**
    * regular indexes with their options
+   * Note: Set by decorators on prototype - NOT declared as instance property to avoid shadowing in Deno
    */
-  public regularIndexes: Array<{field: string, options: IIndexOptions}> = [];
+  declare regularIndexes: Array<{field: string, options: IIndexOptions}>;
 
   /**
    * an array of saveable properties of a specific doc
+   * Note: Set by decorators on prototype - NOT declared as instance property to avoid shadowing in Deno
    */
-  public saveableProperties: string[];
+  declare saveableProperties: string[];
 
   /**
    * name
    */
-  public name: string;
+  public name!: string;
 
   /**
    * primary id in the database
    */
-  public dbDocUniqueId: string;
+  public dbDocUniqueId!: string;
 
   /**
    * class constructor
@@ -710,10 +861,10 @@ export class SmartDataDbDoc<T extends TImplements, TImplements, TManager extends
     // perform insert or update
     switch (this.creationStatus) {
       case 'db':
-        dbResult = await this.collection.update(self, { session: opts?.session });
+        dbResult = await this.getCollectionSafe().update(self, { session: opts?.session });
         break;
       case 'new':
-        dbResult = await this.collection.insert(self, { session: opts?.session });
+        dbResult = await this.getCollectionSafe().insert(self, { session: opts?.session });
         this.creationStatus = 'db';
         break;
       default:
@@ -735,7 +886,7 @@ export class SmartDataDbDoc<T extends TImplements, TImplements, TManager extends
       await (this as any).beforeDelete();
     }
     // perform deletion
-    const result = await this.collection.delete(this, { session: opts?.session });
+    const result = await this.getCollectionSafe().delete(this, { session: opts?.session });
     // allow hook after delete
     if (typeof (this as any).afterDelete === 'function') {
       await (this as any).afterDelete();
@@ -747,7 +898,7 @@ export class SmartDataDbDoc<T extends TImplements, TImplements, TManager extends
    * also store any referenced objects to DB
    * better for data consistency
    */
-  public saveDeep(savedMapArg: plugins.lik.ObjectMap<SmartDataDbDoc<any, any>> = null) {
+  public saveDeep(savedMapArg?: plugins.lik.ObjectMap<SmartDataDbDoc<any, any>>) {
     if (!savedMapArg) {
       savedMapArg = new plugins.lik.ObjectMap<SmartDataDbDoc<any, any>>();
     }
@@ -765,7 +916,7 @@ export class SmartDataDbDoc<T extends TImplements, TImplements, TManager extends
    * updates an object from db
    */
   public async updateFromDb(): Promise<boolean> {
-    const mongoDbNativeDoc = await this.collection.findOne(await this.createIdentifiableObject());
+    const mongoDbNativeDoc = await this.getCollectionSafe().findOne(await this.createIdentifiableObject());
     if (!mongoDbNativeDoc) {
       return false; // Document not found in database
     }

ts/classes.easystore.ts

@@ -15,19 +15,19 @@ export class EasyStore<T> {
     @Collection(() => this.smartdataDbRef)
     class SmartdataEasyStore extends SmartDataDbDoc<SmartdataEasyStore, SmartdataEasyStore> {
       @unI()
-      public nameId: string;
+      public nameId!: string;
 
       @svDb()
-      public ephemeral: {
+      public ephemeral!: {
         activated: boolean;
         timeout: number;
       };
 
       @svDb()
-      lastEdit: number;
+      lastEdit!: number;
 
       @svDb()
-      public data: Partial<T>;
+      public data!: Partial<T>;
     }
     return SmartdataEasyStore;
   })();
@@ -37,7 +37,7 @@ export class EasyStore<T> {
     this.nameId = nameIdArg;
   }
 
-  private easyStorePromise: Promise<InstanceType<typeof this.easyStoreClass>>;
+  private easyStorePromise!: Promise<InstanceType<typeof this.easyStoreClass>>;
   private async getEasyStore(): Promise<InstanceType<typeof this.easyStoreClass>> {
     if (this.easyStorePromise) {
       return this.easyStorePromise;

ts/classes.lucene.adapter.ts

@@ -536,7 +536,7 @@ export class LuceneToMongoTransformer {
       const searchTerm = rightQuery.$text.$search.replace(/"/g, '');
 
       // Determine the fields to apply the negation to
-      const notConditions = [];
+      const notConditions: any[] = [];
 
       for (const field in leftQuery) {
         if (field !== '$or' && field !== '$and') {

ts/classes.watcher.ts

@@ -1,6 +1,6 @@
 import { SmartDataDbDoc } from './classes.doc.js';
 import * as plugins from './plugins.js';
-import { EventEmitter } from 'events';
+import { EventEmitter } from 'node:events';
 
 /**
  * a wrapper for the native mongodb cursor. Exposes better
@@ -13,7 +13,7 @@ export class SmartdataDbWatcher<T = any> extends EventEmitter {
   public readyDeferred = plugins.smartpromise.defer();
 
   // INSTANCE
-  private changeStream: plugins.mongodb.ChangeStream<T>;
+  private changeStream: plugins.mongodb.ChangeStream<any>;
   private rawSubject: plugins.smartrx.rxjs.Subject<T>;
   /** Emits change documents (or arrays of documents if buffered) */
   public changeSubject: any;
@@ -23,7 +23,7 @@ export class SmartdataDbWatcher<T = any> extends EventEmitter {
    * @param opts.bufferTimeMs optional milliseconds to buffer events via RxJS
    */
   constructor(
-    changeStreamArg: plugins.mongodb.ChangeStream<T>,
+    changeStreamArg: plugins.mongodb.ChangeStream<any>,
     smartdataDbDocArg: typeof SmartDataDbDoc,
     opts?: { bufferTimeMs?: number },
   ) {
@@ -37,14 +37,14 @@ export class SmartdataDbWatcher<T = any> extends EventEmitter {
     }
     this.changeStream = changeStreamArg;
     this.changeStream.on('change', async (item: any) => {
-      let docInstance: T = null;
+      let docInstance: T | null = null;
       if (item.fullDocument) {
         docInstance = smartdataDbDocArg.createInstanceFromMongoDbNativeDoc(
           item.fullDocument
         ) as any as T;
       }
       // Notify subscribers
-      this.rawSubject.next(docInstance);
+      this.rawSubject.next(docInstance as T);
       this.emit('change', docInstance);
     });
     // Signal readiness after one tick

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');

tsconfig.json

@@ -1,16 +1,13 @@
 {
   "compilerOptions": {
-    "experimentalDecorators": true,
-    "useDefineForClassFields": false,
-    "target": "ES2022",
+    "target": "ES2024",
     "module": "NodeNext",
     "moduleResolution": "NodeNext",
     "esModuleInterop": true,
     "verbatimModuleSyntax": true,
-    "baseUrl": ".",
-    "paths": {}
+    "types": [
+      "node"
+    ]
   },
-  "exclude": [
-    "dist_*/**/*.d.ts"
-  ]
-}
+  "exclude": ["dist_*/**/*.d.ts"]
+}