@feathersjs/mongodb 5.0.0-pre.36 → 5.0.0-pre.37

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/CHANGELOG.md +6 -0
  2. package/lib/{resolvers.d.ts → converters.d.ts} +6 -0
  3. package/lib/{resolvers.js → converters.js} +21 -2
  4. package/lib/converters.js.map +1 -0
  5. package/lib/index.d.ts +1 -1
  6. package/lib/index.js +1 -1
  7. package/lib/index.js.map +1 -1
  8. package/package.json +10 -12
  9. package/src/{resolvers.ts → converters.ts} +19 -0
  10. package/src/index.ts +1 -1
  11. package/lib/resolvers.js.map +0 -1
package/CHANGELOG.md CHANGED
@@ -3,6 +3,12 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ # [5.0.0-pre.37](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.36...v5.0.0-pre.37) (2023-02-09)
7
+
8
+ ### Features
9
+
10
+ - **mongodb:** Add Object ID keyword converter and update MongoDB CLI & docs ([#3041](https://github.com/feathersjs/feathers/issues/3041)) ([ca0994e](https://github.com/feathersjs/feathers/commit/ca0994eaecb5a31f310bc980d106834e11f24f41))
11
+
6
12
  # [5.0.0-pre.36](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.35...v5.0.0-pre.36) (2023-01-29)
7
13
 
8
14
  ### Bug Fixes
package/lib/{resolvers.d.ts → converters.d.ts} RENAMED
@@ -8,3 +8,9 @@ export type IdQueryObject<T> = {
8
8
  export declare function resolveObjectId(value: ObjectIdParam): Promise<ObjectId>;
9
9
  export declare function resolveQueryObjectId(value: IdQueryObject<ObjectIdParam>): Promise<IdQueryObject<ObjectId>>;
10
10
  export declare function resolveQueryObjectId(value: ObjectIdParam): Promise<ObjectId>;
11
+ export declare const keywordObjectId: {
12
+ readonly keyword: "objectid";
13
+ readonly type: "string";
14
+ readonly modifying: true;
15
+ readonly compile: (schemaVal: boolean) => (value: string, obj: any) => boolean;
16
+ };
package/lib/{resolvers.js → converters.js} RENAMED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.resolveQueryObjectId = exports.resolveObjectId = void 0;
3
+ exports.keywordObjectId = exports.resolveQueryObjectId = exports.resolveObjectId = void 0;
4
4
  const mongodb_1 = require("mongodb");
5
5
  const toObjectId = (value) => new mongodb_1.ObjectId(value);
6
6
  async function resolveObjectId(value) {
@@ -27,4 +27,23 @@ async function resolveQueryObjectId(value) {
27
27
  return convertedObject;
28
28
  }
29
29
  exports.resolveQueryObjectId = resolveQueryObjectId;
30
- //# sourceMappingURL=resolvers.js.map
30
+ exports.keywordObjectId = {
31
+ keyword: 'objectid',
32
+ type: 'string',
33
+ modifying: true,
34
+ compile(schemaVal) {
35
+ if (!schemaVal)
36
+ return () => true;
37
+ return function (value, obj) {
38
+ const { parentData, parentDataProperty } = obj;
39
+ try {
40
+ parentData[parentDataProperty] = new mongodb_1.ObjectId(value);
41
+ return true;
42
+ }
43
+ catch (error) {
44
+ throw new Error(`invalid objectid for property "${parentDataProperty}"`);
45
+ }
46
+ };
47
+ }
48
+ };
49
+ //# sourceMappingURL=converters.js.map
package/lib/converters.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"converters.js","sourceRoot":"","sources":["../src/converters.ts"],"names":[],"mappings":";;;AAAA,qCAAkC;AAUlC,MAAM,UAAU,GAAG,CAAC,KAAoB,EAAE,EAAE,CAAC,IAAI,kBAAQ,CAAC,KAAK,CAAC,CAAA;AAEzD,KAAK,UAAU,eAAe,CAAC,KAAoB;IACxD,OAAO,UAAU,CAAC,KAAK,CAAC,CAAA;AAC1B,CAAC;AAFD,0CAEC;AAMM,KAAK,UAAU,oBAAoB,CAAC,KAAmD;IAC5F,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,SAAS,CAAA;KACjB;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,YAAY,kBAAQ,EAAE;QACvF,OAAO,UAAU,CAAC,KAAK,CAAC,CAAA;KACzB;IAED,MAAM,eAAe,GAA4B,EAAE,CAAA;IAEnD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;QAC5B,eAAe,CAAC,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;KAChD;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;QAC7B,eAAe,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;KAClD;IAED,IAAI,KAAK,CAAC,GAAG,KAAK,SAAS,EAAE;QAC3B,eAAe,CAAC,GAAG,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;KAC5C;IAED,OAAO,eAAe,CAAA;AACxB,CAAC;AAxBD,oDAwBC;AAEY,QAAA,eAAe,GAAG;IAC7B,OAAO,EAAE,UAAU;IACnB,IAAI,EAAE,QAAQ;IACd,SAAS,EAAE,IAAI;IACf,OAAO,CAAC,SAAkB;QACxB,IAAI,CAAC,SAAS;YAAE,OAAO,GAAG,EAAE,CAAC,IAAI,CAAA;QAEjC,OAAO,UAAU,KAAa,EAAE,GAAQ;YACtC,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,GAAG,GAAG,CAAA;YAC9C,IAAI;gBACF,UAAU,CAAC,kBAAkB,CAAC,GAAG,IAAI,kBAAQ,CAAC,KAAK,CAAC,CAAA;gBACpD,OAAO,IAAI,CAAA;aACZ;YAAC,OAAO,KAAK,EAAE;gBACd,MAAM,IAAI,KAAK,CAAC,kCAAkC,kBAAkB,GAAG,CAAC,CAAA;aACzE;QACH,CAAC,CAAA;IACH,CAAC;CACO,CAAA"}
package/lib/index.d.ts CHANGED
@@ -3,7 +3,7 @@ import { Paginated, Params } from '@feathersjs/feathers';
3
3
  import { AdapterId, MongoDbAdapter, MongoDBAdapterParams, NullableAdapterId } from './adapter';
4
4
  export * from './adapter';
5
5
  export * from './error-handler';
6
- export * from './resolvers';
6
+ export * from './converters';
7
7
  export declare class MongoDBService<Result = any, Data = Partial<Result>, ServiceParams extends Params<any> = MongoDBAdapterParams, PatchData = Partial<Data>> extends MongoDbAdapter<Result, Data, ServiceParams, PatchData> {
8
8
  find(params?: ServiceParams & {
9
9
  paginate?: PaginationOptions;
package/lib/index.js CHANGED
@@ -19,7 +19,7 @@ const lib_1 = require("@feathersjs/errors/lib");
19
19
  const adapter_1 = require("./adapter");
20
20
  __exportStar(require("./adapter"), exports);
21
21
  __exportStar(require("./error-handler"), exports);
22
- __exportStar(require("./resolvers"), exports);
22
+ __exportStar(require("./converters"), exports);
23
23
  class MongoDBService extends adapter_1.MongoDbAdapter {
24
24
  async find(params) {
25
25
  return this._find({
package/lib/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACA,gDAAyD;AAEzD,uCAA8F;AAE9F,4CAAyB;AACzB,kDAA+B;AAC/B,8CAA2B;AAE3B,MAAa,cAKX,SAAQ,wBAAsD;IAI9D,KAAK,CAAC,IAAI,CAAC,MAAsB;QAC/B,OAAO,IAAI,CAAC,KAAK,CAAC;YAChB,GAAG,MAAM;YACT,KAAK,EAAE,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;SACxC,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,EAAa,EAAE,MAAsB;QAC7C,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;YACnB,GAAG,MAAM;YACT,KAAK,EAAE,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;SACxC,CAAC,CAAA;IACJ,CAAC;IAKD,KAAK,CAAC,MAAM,CAAC,IAAmB,EAAE,MAAsB;QACtD,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE;YAC9D,MAAM,IAAI,sBAAgB,CAAC,iCAAiC,CAAC,CAAA;SAC9D;QAED,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IACnC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAa,EAAE,IAAU,EAAE,MAAsB;QAC5D,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE;YAC5B,GAAG,MAAM;YACT,KAAK,EAAE,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;SACxC,CAAC,CAAA;IACJ,CAAC;IAKD,KAAK,CAAC,KAAK,CAAC,EAAqB,EAAE,IAAe,EAAE,MAAsB;QACxE,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;QAE7D,OAAO,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE;YAC3B,GAAG,MAAM;YACT,KAAK;SACN,CAAC,CAAA;IACJ,CAAC;IAKD,KAAK,CAAC,MAAM,CAAC,EAAqB,EAAE,MAAsB;QACxD,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;QAE7D,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE;YACtB,GAAG,MAAM;YACT,KAAK;SACN,CAAC,CAAA;IACJ,CAAC;CACF;AAhED,wCAgEC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACA,gDAAyD;AAEzD,uCAA8F;AAE9F,4CAAyB;AACzB,kDAA+B;AAC/B,+CAA4B;AAE5B,MAAa,cAKX,SAAQ,wBAAsD;IAI9D,KAAK,CAAC,IAAI,CAAC,MAAsB;QAC/B,OAAO,IAAI,CAAC,KAAK,CAAC;YAChB,GAAG,MAAM;YACT,KAAK,EAAE,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;SACxC,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,EAAa,EAAE,MAAsB;QAC7C,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;YACnB,GAAG,MAAM;YACT,KAAK,EAAE,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;SACxC,CAAC,CAAA;IACJ,CAAC;IAKD,KAAK,CAAC,MAAM,CAAC,IAAmB,EAAE,MAAsB;QACtD,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE;YAC9D,MAAM,IAAI,sBAAgB,CAAC,iCAAiC,CAAC,CAAA;SAC9D;QAED,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IACnC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAa,EAAE,IAAU,EAAE,MAAsB;QAC5D,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE;YAC5B,GAAG,MAAM;YACT,KAAK,EAAE,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;SACxC,CAAC,CAAA;IACJ,CAAC;IAKD,KAAK,CAAC,KAAK,CAAC,EAAqB,EAAE,IAAe,EAAE,MAAsB;QACxE,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;QAE7D,OAAO,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE;YAC3B,GAAG,MAAM;YACT,KAAK;SACN,CAAC,CAAA;IACJ,CAAC;IAKD,KAAK,CAAC,MAAM,CAAC,EAAqB,EAAE,MAAsB;QACxD,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;QAE7D,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE;YACtB,GAAG,MAAM;YACT,KAAK;SACN,CAAC,CAAA;IACJ,CAAC;CACF;AAhED,wCAgEC"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@feathersjs/mongodb",
3
3
  "description": "Feathers MongoDB service adapter",
4
- "version": "5.0.0-pre.36",
4
+ "version": "5.0.0-pre.37",
5
5
  "homepage": "https://feathersjs.com",
6
6
  "main": "lib/",
7
7
  "keywords": [
@@ -51,23 +51,21 @@
51
51
  "access": "public"
52
52
  },
53
53
  "dependencies": {
54
- "@feathersjs/adapter-commons": "^5.0.0-pre.36",
55
- "@feathersjs/commons": "^5.0.0-pre.36",
56
- "@feathersjs/errors": "^5.0.0-pre.36",
57
- "@feathersjs/feathers": "^5.0.0-pre.36"
58
- },
59
- "peerDependencies": {
60
- "mongodb": "^4.5.0"
54
+ "@feathersjs/adapter-commons": "^5.0.0-pre.37",
55
+ "@feathersjs/commons": "^5.0.0-pre.37",
56
+ "@feathersjs/errors": "^5.0.0-pre.37",
57
+ "@feathersjs/feathers": "^5.0.0-pre.37"
61
58
  },
62
59
  "devDependencies": {
63
- "@feathersjs/adapter-tests": "^5.0.0-pre.36",
64
- "@feathersjs/schema": "^5.0.0-pre.36",
60
+ "@feathersjs/adapter-tests": "^5.0.0-pre.37",
61
+ "@feathersjs/schema": "^5.0.0-pre.37",
65
62
  "@types/mocha": "^10.0.1",
66
63
  "@types/node": "^18.11.18",
67
64
  "mocha": "^10.2.0",
65
+ "mongodb": "^5.0.1",
68
66
  "mongodb-memory-server": "^8.11.4",
69
67
  "shx": "^0.3.4",
70
- "typescript": "^4.9.4"
68
+ "typescript": "^4.9.5"
71
69
  },
72
- "gitHead": "9a107b463cc80d7f3c28553c908987e05b0b634a"
70
+ "gitHead": "17a8b3b2614876772472d3cab3d96d45c01db6ed"
73
71
  }
package/src/{resolvers.ts → converters.ts} RENAMED
@@ -43,3 +43,22 @@ export async function resolveQueryObjectId(value: ObjectIdParam | IdQueryObject<
43
43
 
44
44
  return convertedObject
45
45
  }
46
+
47
+ export const keywordObjectId = {
48
+ keyword: 'objectid',
49
+ type: 'string',
50
+ modifying: true,
51
+ compile(schemaVal: boolean) {
52
+ if (!schemaVal) return () => true
53
+
54
+ return function (value: string, obj: any) {
55
+ const { parentData, parentDataProperty } = obj
56
+ try {
57
+ parentData[parentDataProperty] = new ObjectId(value)
58
+ return true
59
+ } catch (error) {
60
+ throw new Error(`invalid objectid for property "${parentDataProperty}"`)
61
+ }
62
+ }
63
+ }
64
+ } as const
package/src/index.ts CHANGED
@@ -5,7 +5,7 @@ import { AdapterId, MongoDbAdapter, MongoDBAdapterParams, NullableAdapterId } fr
5
5
 
6
6
  export * from './adapter'
7
7
  export * from './error-handler'
8
- export * from './resolvers'
8
+ export * from './converters'
9
9
 
10
10
  export class MongoDBService<
11
11
  Result = any,
package/lib/resolvers.js.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"resolvers.js","sourceRoot":"","sources":["../src/resolvers.ts"],"names":[],"mappings":";;;AAAA,qCAAkC;AAUlC,MAAM,UAAU,GAAG,CAAC,KAAoB,EAAE,EAAE,CAAC,IAAI,kBAAQ,CAAC,KAAK,CAAC,CAAA;AAEzD,KAAK,UAAU,eAAe,CAAC,KAAoB;IACxD,OAAO,UAAU,CAAC,KAAK,CAAC,CAAA;AAC1B,CAAC;AAFD,0CAEC;AAMM,KAAK,UAAU,oBAAoB,CAAC,KAAmD;IAC5F,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,SAAS,CAAA;KACjB;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,YAAY,kBAAQ,EAAE;QACvF,OAAO,UAAU,CAAC,KAAK,CAAC,CAAA;KACzB;IAED,MAAM,eAAe,GAA4B,EAAE,CAAA;IAEnD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;QAC5B,eAAe,CAAC,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;KAChD;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;QAC7B,eAAe,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;KAClD;IAED,IAAI,KAAK,CAAC,GAAG,KAAK,SAAS,EAAE;QAC3B,eAAe,CAAC,GAAG,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;KAC5C;IAED,OAAO,eAAe,CAAA;AACxB,CAAC;AAxBD,oDAwBC"}