@opra/mongodb 1.0.0-alpha.38 → 1.0.0-alpha.39

package/cjs/mongo-collection-service.js

@@ -41,6 +41,7 @@ class MongoCollectionService extends mongo_entity_service_js_1.MongoEntityServic
             input,
             options,
         };
+        command.input._id = command.input._id ?? this._generateId(command);
         return this._executeCommand(command, () => this._create(command));
     }
     /**

package/cjs/mongo-nested-service.js

@@ -64,13 +64,13 @@ class MongoNestedService extends mongo_service_js_1.MongoService {
             input,
             options,
         };
+        command.input._id = command.input._id ?? this._generateId(command);
         return this._executeCommand(command, () => this._create(command));
     }
     async _create(command) {
         const inputCodec = this.getInputCodec('create');
         const { documentId, options } = command;
         const doc = inputCodec(command.input);
-        doc._id = doc._id || this._generateId(command);
         const docFilter = mongo_adapter_js_1.MongoAdapter.prepareKeyValues(documentId, ['_id']);
         const r = await this._dbUpdateOne(docFilter, {
             $push: { [this.fieldName]: doc },
@@ -625,7 +625,7 @@ class MongoNestedService extends mongo_service_js_1.MongoService {
      * This method is mostly used for security issues like securing multi-tenant applications.
      *
      * @protected
-     * @returns {FilterInput | Promise<FilterInput> | undefined} The common filter or a Promise
+     * @returns {MongoAdapter.FilterInput | Promise<MongoAdapter.FilterInput> | undefined} The common filter or a Promise
      * that resolves to the common filter, or undefined if not available.
      */
     _getNestedFilter(args) {

package/cjs/mongo-service.js

@@ -26,8 +26,9 @@ class MongoService extends core_1.ServiceBase {
         this.db = options?.db;
         this.documentFilter = options?.documentFilter;
         this.interceptor = options?.interceptor;
-        this.collectionName = options?.collectionName;
-        if (!this.collectionName) {
+        if (options?.collectionName)
+            this.collectionName = options?.collectionName;
+        else {
             if (typeof dataType === 'string')
                 this.collectionName = dataType;
             if (typeof dataType === 'function') {

package/esm/mongo-collection-service.js

@@ -38,6 +38,7 @@ export class MongoCollectionService extends MongoEntityService {
             input,
             options,
         };
+        command.input._id = command.input._id ?? this._generateId(command);
         return this._executeCommand(command, () => this._create(command));
     }
     /**

package/esm/mongo-nested-service.js

@@ -60,13 +60,13 @@ export class MongoNestedService extends MongoService {
             input,
             options,
         };
+        command.input._id = command.input._id ?? this._generateId(command);
         return this._executeCommand(command, () => this._create(command));
     }
     async _create(command) {
         const inputCodec = this.getInputCodec('create');
         const { documentId, options } = command;
         const doc = inputCodec(command.input);
-        doc._id = doc._id || this._generateId(command);
         const docFilter = MongoAdapter.prepareKeyValues(documentId, ['_id']);
         const r = await this._dbUpdateOne(docFilter, {
             $push: { [this.fieldName]: doc },
@@ -621,7 +621,7 @@ export class MongoNestedService extends MongoService {
      * This method is mostly used for security issues like securing multi-tenant applications.
      *
      * @protected
-     * @returns {FilterInput | Promise<FilterInput> | undefined} The common filter or a Promise
+     * @returns {MongoAdapter.FilterInput | Promise<MongoAdapter.FilterInput> | undefined} The common filter or a Promise
      * that resolves to the common filter, or undefined if not available.
      */
     _getNestedFilter(args) {

package/esm/mongo-service.js

@@ -23,8 +23,9 @@ export class MongoService extends ServiceBase {
         this.db = options?.db;
         this.documentFilter = options?.documentFilter;
         this.interceptor = options?.interceptor;
-        this.collectionName = options?.collectionName;
-        if (!this.collectionName) {
+        if (options?.collectionName)
+            this.collectionName = options?.collectionName;
+        else {
             if (typeof dataType === 'string')
                 this.collectionName = dataType;
             if (typeof dataType === 'function') {

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@opra/mongodb",
-  "version": "1.0.0-alpha.38",
+  "version": "1.0.0-alpha.39",
   "description": "Opra MongoDB adapter package",
   "author": "Panates",
   "license": "MIT",
   "dependencies": {
     "lodash.omit": "^4.5.0",
     "putil-isplainobject": "^1.1.5",
-    "tslib": "^2.6.3",
+    "tslib": "^2.7.0",
     "valgen": "^5.9.0"
   },
   "peerDependencies": {
-    "@opra/common": "^1.0.0-alpha.38",
-    "@opra/core": "^1.0.0-alpha.38",
+    "@opra/common": "^1.0.0-alpha.39",
+    "@opra/core": "^1.0.0-alpha.39",
     "mongodb": ">= 6.0.0"
   },
   "type": "module",

package/types/adapter-utils/prepare-projection.d.ts

@@ -1,4 +1,4 @@
 import { ComplexType, FieldsProjection } from '@opra/common';
-import mongodb, { Document } from 'mongodb';
+import mongodb, { type Document } from 'mongodb';
 export default function prepareProjection(dataType: ComplexType, projection?: string | string[] | Document): mongodb.Document | undefined;
 export declare function prepare(dataType: ComplexType, target: mongodb.Document, projection?: FieldsProjection): void;

package/types/mongo-collection-service.d.ts

@@ -1,5 +1,5 @@
-import mongodb, { UpdateFilter } from 'mongodb';
-import { PartialDTO, PatchDTO, RequiredSome, Type } from 'ts-gems';
+import mongodb, { type UpdateFilter } from 'mongodb';
+import type { PartialDTO, PatchDTO, RequiredSome, Type } from 'ts-gems';
 import { MongoAdapter } from './mongo-adapter.js';
 import { MongoEntityService } from './mongo-entity-service.js';
 /**

package/types/mongo-entity-service.d.ts

@@ -1,5 +1,5 @@
 import mongodb from 'mongodb';
-import { PartialDTO, PatchDTO, RequiredSome, StrictOmit, Type } from 'ts-gems';
+import type { PartialDTO, PatchDTO, RequiredSome, StrictOmit, Type } from 'ts-gems';
 import { MongoService } from './mongo-service.js';
 /**
  *

package/types/mongo-nested-service.d.ts

@@ -1,9 +1,8 @@
 import { ComplexType } from '@opra/common';
 import mongodb from 'mongodb';
-import { PartialDTO, PatchDTO, RequiredSome, StrictOmit, Type } from 'ts-gems';
+import type { PartialDTO, PatchDTO, RequiredSome, StrictOmit, Type } from 'ts-gems';
 import { MongoAdapter } from './mongo-adapter.js';
 import { MongoService } from './mongo-service.js';
-import FilterInput = MongoAdapter.FilterInput;
 /**
  *
  * @namespace MongoNestedService
@@ -15,37 +14,37 @@ export declare namespace MongoNestedService {
     interface Options extends MongoService.Options {
         defaultLimit?: number;
         nestedKey?: string;
-        nestedFilter?: FilterInput | ((args: MongoService.CommandInfo, _this: this) => FilterInput | Promise<FilterInput> | undefined);
+        nestedFilter?: MongoAdapter.FilterInput | ((args: MongoService.CommandInfo, _this: this) => MongoAdapter.FilterInput | Promise<MongoAdapter.FilterInput> | undefined);
     }
     interface CommandInfo extends MongoService.CommandInfo {
     }
     interface CreateOptions extends MongoService.CreateOptions {
     }
     interface CountOptions<T> extends MongoService.CountOptions<T> {
-        documentFilter?: FilterInput;
+        documentFilter?: MongoAdapter.FilterInput;
     }
     interface DeleteOptions<T> extends MongoService.DeleteOptions<T> {
-        documentFilter?: FilterInput;
+        documentFilter?: MongoAdapter.FilterInput;
     }
     interface DeleteManyOptions<T> extends MongoService.DeleteManyOptions<T> {
-        documentFilter?: FilterInput;
+        documentFilter?: MongoAdapter.FilterInput;
     }
     interface ExistsOptions<T> extends MongoService.ExistsOptions<T> {
     }
     interface ExistsOneOptions<T> extends MongoService.ExistsOneOptions<T> {
     }
     interface FindOneOptions<T> extends MongoService.FindOneOptions<T> {
-        documentFilter?: FilterInput;
+        documentFilter?: MongoAdapter.FilterInput;
     }
     interface FindManyOptions<T> extends MongoService.FindManyOptions<T> {
-        documentFilter?: FilterInput;
-        nestedFilter?: FilterInput;
+        documentFilter?: MongoAdapter.FilterInput;
+        nestedFilter?: MongoAdapter.FilterInput;
     }
     interface UpdateOneOptions<T> extends MongoService.UpdateOneOptions<T> {
-        documentFilter?: FilterInput;
+        documentFilter?: MongoAdapter.FilterInput;
     }
     interface UpdateManyOptions<T> extends MongoService.UpdateManyOptions<T> {
-        documentFilter?: FilterInput;
+        documentFilter?: MongoAdapter.FilterInput;
         count?: boolean;
     }
     interface CreateCommand extends RequiredSome<CommandInfo, 'documentId' | 'input'> {
@@ -112,7 +111,7 @@ export declare class MongoNestedService<T extends mongodb.Document> extends Mong
      *
      * @type {FilterInput | Function}
      */
-    nestedFilter?: FilterInput | ((args: MongoService.CommandInfo, _this: this) => FilterInput | Promise<FilterInput> | undefined);
+    nestedFilter?: MongoAdapter.FilterInput | ((args: MongoService.CommandInfo, _this: this) => MongoAdapter.FilterInput | Promise<MongoAdapter.FilterInput> | undefined);
     /**
      * Constructs a new instance
      *
@@ -296,8 +295,8 @@ export declare class MongoNestedService<T extends mongodb.Document> extends Mong
      * This method is mostly used for security issues like securing multi-tenant applications.
      *
      * @protected
-     * @returns {FilterInput | Promise<FilterInput> | undefined} The common filter or a Promise
+     * @returns {MongoAdapter.FilterInput | Promise<MongoAdapter.FilterInput> | undefined} The common filter or a Promise
      * that resolves to the common filter, or undefined if not available.
      */
-    protected _getNestedFilter(args: MongoService.CommandInfo): FilterInput | Promise<FilterInput> | undefined;
+    protected _getNestedFilter(args: MongoService.CommandInfo): MongoAdapter.FilterInput | Promise<MongoAdapter.FilterInput> | undefined;
 }

package/types/mongo-service.d.ts

@@ -1,9 +1,8 @@
-import * as OpraCommon from '@opra/common';
-import { ComplexType } from '@opra/common';
+import { ComplexType, type OpraFilter } from '@opra/common';
 import { HttpContext, ServiceBase } from '@opra/core';
-import mongodb, { Document, TransactionOptions } from 'mongodb';
-import { Nullish, PartialDTO, StrictOmit, Type } from 'ts-gems';
-import { IsObject } from 'valgen';
+import mongodb, { type Document, type TransactionOptions } from 'mongodb';
+import type { Nullish, PartialDTO, StrictOmit, Type } from 'ts-gems';
+import type { IsObject } from 'valgen';
 import { MongoAdapter } from './mongo-adapter.js';
 /**
  * The namespace for the MongoService.
@@ -31,7 +30,7 @@ export declare namespace MongoService {
         input?: any;
         options?: any;
     }
-    type CommonFilter = MongoAdapter.FilterInput | ((args: MongoService.CommandInfo, _this: MongoService<any>) => MongoAdapter.FilterInput | Promise<MongoAdapter.FilterInput> | undefined);
+    type DocumentFilter = MongoAdapter.FilterInput | ((args: CommandInfo, _this: MongoService<any>) => MongoAdapter.FilterInput | Promise<MongoAdapter.FilterInput> | undefined);
     /**
      * Represents options for "create" operation
      *
@@ -47,7 +46,7 @@ export declare namespace MongoService {
      * @template T - The type of the document.
      */
     interface CountOptions<T> extends mongodb.CountOptions {
-        filter?: mongodb.Filter<T> | OpraCommon.OpraFilter.Ast | string;
+        filter?: mongodb.Filter<T> | OpraFilter.Ast | string;
     }
     /**
      * Represents options for "delete" operation
@@ -56,7 +55,7 @@ export declare namespace MongoService {
      * @template T - The type of the document.
      */
     interface DeleteOptions<T> extends mongodb.DeleteOptions {
-        filter?: mongodb.Filter<T> | OpraCommon.OpraFilter.Ast | string;
+        filter?: mongodb.Filter<T> | OpraFilter.Ast | string;
     }
     /**
      * Represents options for "deleteMany" operation
@@ -65,7 +64,7 @@ export declare namespace MongoService {
      * @template T - The type of the document.
      */
     interface DeleteManyOptions<T> extends mongodb.DeleteOptions {
-        filter?: mongodb.Filter<T> | OpraCommon.OpraFilter.Ast | string;
+        filter?: mongodb.Filter<T> | OpraFilter.Ast | string;
     }
     /**
      * Represents options for "distinct" operation
@@ -74,7 +73,7 @@ export declare namespace MongoService {
      * @template T - The type of the document.
      */
     interface DistinctOptions<T> extends mongodb.DistinctOptions {
-        filter?: mongodb.Filter<T> | OpraCommon.OpraFilter.Ast | string;
+        filter?: mongodb.Filter<T> | OpraFilter.Ast | string;
     }
     /**
      * Represents options for "exists" operation
@@ -82,7 +81,7 @@ export declare namespace MongoService {
      * @interface
      */
     interface ExistsOptions<T> extends Omit<mongodb.CommandOperationOptions, 'writeConcern'> {
-        filter?: mongodb.Filter<T> | OpraCommon.OpraFilter.Ast | string;
+        filter?: mongodb.Filter<T> | OpraFilter.Ast | string;
     }
     /**
      * Represents options for checking the document exists
@@ -90,7 +89,7 @@ export declare namespace MongoService {
      * @interface
      */
     interface ExistsOneOptions<T> extends Omit<mongodb.CommandOperationOptions, 'writeConcern'> {
-        filter?: mongodb.Filter<T> | OpraCommon.OpraFilter.Ast | string;
+        filter?: mongodb.Filter<T> | OpraFilter.Ast | string;
     }
     /**
      * Represents options for "findOne" operation
@@ -107,7 +106,7 @@ export declare namespace MongoService {
      * @template T - The type of the document.
      */
     interface FindManyOptions<T> extends mongodb.AggregateOptions {
-        filter?: mongodb.Filter<T> | OpraCommon.OpraFilter.Ast | string;
+        filter?: mongodb.Filter<T> | OpraFilter.Ast | string;
         projection?: string | string[] | Document;
         sort?: string[];
         limit?: number;
@@ -121,7 +120,7 @@ export declare namespace MongoService {
      */
     interface UpdateOneOptions<T> extends StrictOmit<mongodb.FindOneAndUpdateOptions, 'projection' | 'returnDocument' | 'includeResultMetadata'> {
         projection?: string | string[] | Document;
-        filter?: mongodb.Filter<T> | OpraCommon.OpraFilter.Ast | string;
+        filter?: mongodb.Filter<T> | OpraFilter.Ast | string;
     }
     /**
      * Represents options for "updateMany" operation
@@ -130,7 +129,7 @@ export declare namespace MongoService {
      * @template T - The type of the document.
      */
     interface UpdateManyOptions<T> extends StrictOmit<mongodb.UpdateOptions, 'upsert'> {
-        filter?: mongodb.Filter<T> | OpraCommon.OpraFilter.Ast | string;
+        filter?: mongodb.Filter<T> | OpraFilter.Ast | string;
     }
 }
 export interface MongoService {
@@ -188,7 +187,7 @@ export declare class MongoService<T extends mongodb.Document = mongodb.Document>
      *
      * @type {FilterInput | Function}
      */
-    documentFilter?: MongoService.CommonFilter | MongoService.CommonFilter[];
+    documentFilter?: MongoService.DocumentFilter | MongoService.DocumentFilter[];
     /**
      * Constructs a new instance
      *

package/types/mongo-singleton-service.d.ts

@@ -1,5 +1,5 @@
-import mongodb, { UpdateFilter } from 'mongodb';
-import { PartialDTO, PatchDTO, RequiredSome, Type } from 'ts-gems';
+import mongodb, { type UpdateFilter } from 'mongodb';
+import type { PartialDTO, PatchDTO, RequiredSome, Type } from 'ts-gems';
 import { MongoAdapter } from './mongo-adapter.js';
 import { MongoEntityService } from './mongo-entity-service.js';
 /**