@tsed/adapters 7.0.0-rc.2 → 7.0.0-rc.3

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.
@@ -47,6 +47,7 @@ let Adapter = class Adapter {
47
47
  async validate(value) {
48
48
  if (this.getModel()) {
49
49
  await this.ajvService.validate(this.serialize(value), {
50
+ useAlias: false,
50
51
  type: this.model
51
52
  });
52
53
  }
@@ -62,15 +63,18 @@ let Adapter = class Adapter {
62
63
  item.expires_at = item.expires_at ? new Date(item.expires_at) : item.expires_at;
63
64
  return item;
64
65
  }
65
- deserialize(obj) {
66
+ deserialize(obj, opts) {
66
67
  return (0, json_mapper_1.deserialize)(obj, {
67
- type: this.getModel(),
68
- useAlias: false
68
+ useAlias: false,
69
+ ...opts,
70
+ type: this.getModel()
69
71
  });
70
72
  }
71
- serialize(obj) {
73
+ serialize(obj, opts) {
72
74
  return (0, json_mapper_1.serialize)(obj, {
73
- useAlias: false
75
+ useAlias: false,
76
+ ...opts,
77
+ type: this.getModel()
74
78
  });
75
79
  }
76
80
  };
@@ -1 +1 @@
1
- {"version":3,"file":"Adapter.js","sourceRoot":"","sources":["../../../src/domain/Adapter.ts"],"names":[],"mappings":"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","sourcesContent":["import {AjvService} from \"@tsed/ajv\";\nimport {isArray, isObject, nameOf, Type} from \"@tsed/core\";\nimport {Configuration, Inject, Opts} from \"@tsed/di\";\nimport {deserialize, serialize} from \"@tsed/json-mapper\";\nimport {getPropertiesStores} from \"@tsed/schema\";\n\nexport interface AdapterConstructorOptions<T = any> {\n model: Type<T> | Object;\n collectionName?: string;\n indexes?: {\n [propertyKey: string]: Record<string, any>;\n };\n}\n\nfunction getIndexes(model: any) {\n return [...getPropertiesStores(model).entries()]\n .filter(([, entity]) => entity.store.has(\"adapter:indexed\"))\n .map(([propertyKey, entity]) => {\n return {\n propertyKey: String(propertyKey),\n options: entity.store.get(\"adapter:indexed\")\n };\n });\n}\n\nfunction mapIndexes(indexes: {[p: string]: Record<string, any>} | {propertyKey: string; options: any}[]) {\n return Object.entries(indexes).reduce((indexes: any[], [propertyKey, options]) => {\n return indexes.concat({\n propertyKey,\n options\n });\n }, []);\n}\n\nfunction pluralize(name: string) {\n return name.slice(-1) === \"y\" ? `${name.slice(0, name.length - 1)}ies` : name + \"s\";\n}\n\nexport abstract class Adapter<Model = any> {\n readonly model: Type<Model> | Object;\n readonly collectionName: string;\n readonly indexes: {propertyKey: string; options: any}[];\n\n @Inject()\n private ajvService: AjvService;\n\n constructor(@Opts options: AdapterConstructorOptions, @Configuration() protected configuration: Configuration) {\n this.model = options.model;\n this.collectionName = options.collectionName || pluralize(nameOf(options.model));\n\n let indexes = options.indexes || configuration.get(`adapters.${this.collectionName}.indexes`) || getIndexes(this.model);\n\n if (!isArray(indexes)) {\n indexes = mapIndexes(indexes);\n }\n\n this.indexes = indexes;\n }\n\n async validate(value: Model): Promise<void> {\n if (this.getModel()) {\n await this.ajvService.validate(this.serialize(value), {\n type: this.model\n });\n }\n }\n\n abstract create(value: Partial<Omit<Model, \"_id\">>, expiresAt?: Date): Promise<Model>;\n\n abstract update(id: string, value: Model, expiresAt?: Date): Promise<Model | undefined>;\n\n abstract updateOne(predicate: Partial<Model>, value: Partial<Model>, expiresAt?: Date): Promise<Model | undefined>;\n\n abstract upsert(id: string, value: Model, expiresAt?: Date): Promise<Model>;\n\n abstract findOne(predicate: Partial<Model>): Promise<Model | undefined>;\n\n abstract findById(id: string): Promise<Model | undefined>;\n\n abstract findAll(predicate?: Partial<Model>): Promise<Model[]>;\n\n abstract deleteOne(predicate: Partial<Model>): Promise<Model | undefined>;\n\n abstract deleteMany(predicate: Partial<Model>): Promise<Model[]>;\n\n abstract deleteById(id: string): Promise<Model | undefined>;\n\n getModel() {\n return (this.model as unknown) !== Object ? this.model : undefined;\n }\n\n protected updateInstance(src: any, payload: any) {\n const item = Object.assign({\n ...this.serialize(src),\n ...this.serialize(payload)\n });\n\n item.expires_at = item.expires_at ? new Date(item.expires_at) : item.expires_at;\n\n return item;\n }\n\n protected deserialize(obj: any) {\n return deserialize(obj, {\n type: this.getModel(),\n useAlias: false\n });\n }\n\n protected serialize(obj: any) {\n return serialize(obj, {\n useAlias: false\n });\n }\n}\n"]}
1
+ {"version":3,"file":"Adapter.js","sourceRoot":"","sources":["../../../src/domain/Adapter.ts"],"names":[],"mappings":";;;;AAAA,mCAAqC;AACrC,qCAAiD;AACjD,iCAAqD;AACrD,mDAAyG;AACzG,yCAAiD;AAWjD,SAAS,UAAU,CAAC,KAAU;IAC5B,OAAO,CAAC,GAAG,IAAA,4BAAmB,EAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;SAC7C,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;SAC3D,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE,EAAE;QAC7B,OAAO;YACL,WAAW,EAAE,MAAM,CAAC,WAAW,CAAC;YAChC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC;SAC7C,CAAC;IACJ,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,UAAU,CAAC,OAAmF;IACrG,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,OAAc,EAAE,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,EAAE;QAC/E,OAAO,OAAO,CAAC,MAAM,CAAC;YACpB,WAAW;YACX,OAAO;SACR,CAAC,CAAC;IACL,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC;AAED,SAAS,SAAS,CAAC,IAAY;IAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC;AACtF,CAAC;AAED,IAAsB,OAAO,GAA7B,MAAsB,OAAO;IAQsD;IAPxE,KAAK,CAAuB;IAC5B,cAAc,CAAS;IACvB,OAAO,CAAwC;IAG9C,UAAU,CAAa;IAEjC,YAAkB,OAAkC,EAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;QAC3G,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC3B,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,IAAI,SAAS,CAAC,IAAA,aAAM,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QAEjF,IAAI,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,aAAa,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,cAAc,UAAU,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAExH,IAAI,CAAC,IAAA,cAAO,EAAC,OAAO,CAAC,EAAE;YACrB,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;SAC/B;QAED,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,KAAY;QACzB,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE;YACnB,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;gBACpD,QAAQ,EAAE,KAAK;gBACf,IAAI,EAAE,IAAI,CAAC,KAAK;aACjB,CAAC,CAAC;SACJ;IACH,CAAC;IAsBD,QAAQ;QACN,OAAQ,IAAI,CAAC,KAAiB,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IACrE,CAAC;IAES,cAAc,CAAC,GAAQ,EAAE,OAAY;QAC7C,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC;YACzB,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC;YACtB,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;SAC3B,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC;QAEhF,OAAO,IAAI,CAAC;IACd,CAAC;IAES,WAAW,CAAC,GAAQ,EAAE,IAA8B;QAC5D,OAAO,IAAA,yBAAW,EAAC,GAAG,EAAE;YACtB,QAAQ,EAAE,KAAK;YACf,GAAG,IAAI;YACP,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE;SACtB,CAAC,CAAC;IACL,CAAC;IAES,SAAS,CAAC,GAAQ,EAAE,IAA4B;QACxD,OAAO,IAAA,uBAAS,EAAC,GAAG,EAAE;YACpB,QAAQ,EAAE,KAAK;YACf,GAAG,IAAI;YACP,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE;SACtB,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AA1EC;IADC,IAAA,WAAM,GAAE;sCACa,gBAAU;2CAAC;AANb,OAAO;IAQd,mBAAA,SAAI,CAAA;IAAsC,mBAAA,IAAA,kBAAa,GAAE,CAAA;;GARlD,OAAO,CAgF5B;AAhFqB,0BAAO","sourcesContent":["import {AjvService} from \"@tsed/ajv\";\nimport {isArray, nameOf, Type} from \"@tsed/core\";\nimport {Configuration, Inject, Opts} from \"@tsed/di\";\nimport {deserialize, JsonDeserializerOptions, JsonSerializerOptions, serialize} from \"@tsed/json-mapper\";\nimport {getPropertiesStores} from \"@tsed/schema\";\n\nexport interface AdapterConstructorOptions<T = any> {\n model: Type<T> | Object;\n collectionName?: string;\n useAlias?: string;\n indexes?: {\n [propertyKey: string]: Record<string, any>;\n };\n}\n\nfunction getIndexes(model: any) {\n return [...getPropertiesStores(model).entries()]\n .filter(([, entity]) => entity.store.has(\"adapter:indexed\"))\n .map(([propertyKey, entity]) => {\n return {\n propertyKey: String(propertyKey),\n options: entity.store.get(\"adapter:indexed\")\n };\n });\n}\n\nfunction mapIndexes(indexes: {[p: string]: Record<string, any>} | {propertyKey: string; options: any}[]) {\n return Object.entries(indexes).reduce((indexes: any[], [propertyKey, options]) => {\n return indexes.concat({\n propertyKey,\n options\n });\n }, []);\n}\n\nfunction pluralize(name: string) {\n return name.slice(-1) === \"y\" ? `${name.slice(0, name.length - 1)}ies` : name + \"s\";\n}\n\nexport abstract class Adapter<Model = any> {\n readonly model: Type<Model> | Object;\n readonly collectionName: string;\n readonly indexes: {propertyKey: string; options: any}[];\n\n @Inject()\n protected ajvService: AjvService;\n\n constructor(@Opts options: AdapterConstructorOptions, @Configuration() protected configuration: Configuration) {\n this.model = options.model;\n this.collectionName = options.collectionName || pluralize(nameOf(options.model));\n\n let indexes = options.indexes || configuration.get(`adapters.${this.collectionName}.indexes`) || getIndexes(this.model);\n\n if (!isArray(indexes)) {\n indexes = mapIndexes(indexes);\n }\n\n this.indexes = indexes;\n }\n\n async validate(value: Model): Promise<void> {\n if (this.getModel()) {\n await this.ajvService.validate(this.serialize(value), {\n useAlias: false,\n type: this.model\n });\n }\n }\n\n abstract create(value: Partial<Omit<Model, \"_id\">>, expiresAt?: Date): Promise<Model>;\n\n abstract update(id: string, value: Model, expiresAt?: Date): Promise<Model | undefined>;\n\n abstract updateOne(predicate: Partial<Model>, value: Partial<Model>, expiresAt?: Date): Promise<Model | undefined>;\n\n abstract upsert(id: string, value: Model, expiresAt?: Date): Promise<Model>;\n\n abstract findOne(predicate: Partial<Model>): Promise<Model | undefined>;\n\n abstract findById(id: string): Promise<Model | undefined>;\n\n abstract findAll(predicate?: Partial<Model>): Promise<Model[]>;\n\n abstract deleteOne(predicate: Partial<Model>): Promise<Model | undefined>;\n\n abstract deleteMany(predicate: Partial<Model>): Promise<Model[]>;\n\n abstract deleteById(id: string): Promise<Model | undefined>;\n\n getModel() {\n return (this.model as unknown) !== Object ? this.model : undefined;\n }\n\n protected updateInstance(src: any, payload: any) {\n const item = Object.assign({\n ...this.serialize(src),\n ...this.serialize(payload)\n });\n\n item.expires_at = item.expires_at ? new Date(item.expires_at) : item.expires_at;\n\n return item;\n }\n\n protected deserialize(obj: any, opts?: JsonDeserializerOptions) {\n return deserialize(obj, {\n useAlias: false,\n ...opts,\n type: this.getModel()\n });\n }\n\n protected serialize(obj: any, opts?: JsonSerializerOptions) {\n return serialize(obj, {\n useAlias: false,\n ...opts,\n type: this.getModel()\n });\n }\n}\n"]}
@@ -44,6 +44,7 @@ let Adapter = class Adapter {
44
44
  async validate(value) {
45
45
  if (this.getModel()) {
46
46
  await this.ajvService.validate(this.serialize(value), {
47
+ useAlias: false,
47
48
  type: this.model
48
49
  });
49
50
  }
@@ -59,15 +60,18 @@ let Adapter = class Adapter {
59
60
  item.expires_at = item.expires_at ? new Date(item.expires_at) : item.expires_at;
60
61
  return item;
61
62
  }
62
- deserialize(obj) {
63
+ deserialize(obj, opts) {
63
64
  return deserialize(obj, {
64
- type: this.getModel(),
65
- useAlias: false
65
+ useAlias: false,
66
+ ...opts,
67
+ type: this.getModel()
66
68
  });
67
69
  }
68
- serialize(obj) {
70
+ serialize(obj, opts) {
69
71
  return serialize(obj, {
70
- useAlias: false
72
+ useAlias: false,
73
+ ...opts,
74
+ type: this.getModel()
71
75
  });
72
76
  }
73
77
  };
@@ -1 +1 @@
1
- {"version":3,"file":"Adapter.js","sourceRoot":"","sources":["../../../src/domain/Adapter.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,WAAW,CAAC;AACrC,OAAO,EAAC,OAAO,EAAY,MAAM,EAAO,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAC,aAAa,EAAE,MAAM,EAAE,IAAI,EAAC,MAAM,UAAU,CAAC;AACrD,OAAO,EAAC,WAAW,EAAE,SAAS,EAAC,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAC,mBAAmB,EAAC,MAAM,cAAc,CAAC;AAUjD,SAAS,UAAU,CAAC,KAAU;IAC5B,OAAO,CAAC,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;SAC7C,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;SAC3D,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE,EAAE;QAC7B,OAAO;YACL,WAAW,EAAE,MAAM,CAAC,WAAW,CAAC;YAChC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC;SAC7C,CAAC;IACJ,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,UAAU,CAAC,OAAmF;IACrG,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,OAAc,EAAE,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,EAAE;QAC/E,OAAO,OAAO,CAAC,MAAM,CAAC;YACpB,WAAW;YACX,OAAO;SACR,CAAC,CAAC;IACL,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC;AAED,SAAS,SAAS,CAAC,IAAY;IAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC;AACtF,CAAC;AAED,IAAsB,OAAO,GAA7B,MAAsB,OAAO;IAQsD;IAPxE,KAAK,CAAuB;IAC5B,cAAc,CAAS;IACvB,OAAO,CAAwC;IAGhD,UAAU,CAAa;IAE/B,YAAkB,OAAkC,EAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;QAC3G,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC3B,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,IAAI,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QAEjF,IAAI,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,aAAa,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,cAAc,UAAU,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAExH,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACrB,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;SAC/B;QAED,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,KAAY;QACzB,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE;YACnB,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;gBACpD,IAAI,EAAE,IAAI,CAAC,KAAK;aACjB,CAAC,CAAC;SACJ;IACH,CAAC;IAsBD,QAAQ;QACN,OAAQ,IAAI,CAAC,KAAiB,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IACrE,CAAC;IAES,cAAc,CAAC,GAAQ,EAAE,OAAY;QAC7C,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC;YACzB,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC;YACtB,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;SAC3B,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC;QAEhF,OAAO,IAAI,CAAC;IACd,CAAC;IAES,WAAW,CAAC,GAAQ;QAC5B,OAAO,WAAW,CAAC,GAAG,EAAE;YACtB,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE;YACrB,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;IACL,CAAC;IAES,SAAS,CAAC,GAAQ;QAC1B,OAAO,SAAS,CAAC,GAAG,EAAE;YACpB,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAtEC;IADC,MAAM,EAAE;8BACW,UAAU;2CAAC;AANX,OAAO;IAQd,WAAA,IAAI,CAAA;IAAsC,WAAA,aAAa,EAAE,CAAA;;GARlD,OAAO,CA4E5B;SA5EqB,OAAO","sourcesContent":["import {AjvService} from \"@tsed/ajv\";\nimport {isArray, isObject, nameOf, Type} from \"@tsed/core\";\nimport {Configuration, Inject, Opts} from \"@tsed/di\";\nimport {deserialize, serialize} from \"@tsed/json-mapper\";\nimport {getPropertiesStores} from \"@tsed/schema\";\n\nexport interface AdapterConstructorOptions<T = any> {\n model: Type<T> | Object;\n collectionName?: string;\n indexes?: {\n [propertyKey: string]: Record<string, any>;\n };\n}\n\nfunction getIndexes(model: any) {\n return [...getPropertiesStores(model).entries()]\n .filter(([, entity]) => entity.store.has(\"adapter:indexed\"))\n .map(([propertyKey, entity]) => {\n return {\n propertyKey: String(propertyKey),\n options: entity.store.get(\"adapter:indexed\")\n };\n });\n}\n\nfunction mapIndexes(indexes: {[p: string]: Record<string, any>} | {propertyKey: string; options: any}[]) {\n return Object.entries(indexes).reduce((indexes: any[], [propertyKey, options]) => {\n return indexes.concat({\n propertyKey,\n options\n });\n }, []);\n}\n\nfunction pluralize(name: string) {\n return name.slice(-1) === \"y\" ? `${name.slice(0, name.length - 1)}ies` : name + \"s\";\n}\n\nexport abstract class Adapter<Model = any> {\n readonly model: Type<Model> | Object;\n readonly collectionName: string;\n readonly indexes: {propertyKey: string; options: any}[];\n\n @Inject()\n private ajvService: AjvService;\n\n constructor(@Opts options: AdapterConstructorOptions, @Configuration() protected configuration: Configuration) {\n this.model = options.model;\n this.collectionName = options.collectionName || pluralize(nameOf(options.model));\n\n let indexes = options.indexes || configuration.get(`adapters.${this.collectionName}.indexes`) || getIndexes(this.model);\n\n if (!isArray(indexes)) {\n indexes = mapIndexes(indexes);\n }\n\n this.indexes = indexes;\n }\n\n async validate(value: Model): Promise<void> {\n if (this.getModel()) {\n await this.ajvService.validate(this.serialize(value), {\n type: this.model\n });\n }\n }\n\n abstract create(value: Partial<Omit<Model, \"_id\">>, expiresAt?: Date): Promise<Model>;\n\n abstract update(id: string, value: Model, expiresAt?: Date): Promise<Model | undefined>;\n\n abstract updateOne(predicate: Partial<Model>, value: Partial<Model>, expiresAt?: Date): Promise<Model | undefined>;\n\n abstract upsert(id: string, value: Model, expiresAt?: Date): Promise<Model>;\n\n abstract findOne(predicate: Partial<Model>): Promise<Model | undefined>;\n\n abstract findById(id: string): Promise<Model | undefined>;\n\n abstract findAll(predicate?: Partial<Model>): Promise<Model[]>;\n\n abstract deleteOne(predicate: Partial<Model>): Promise<Model | undefined>;\n\n abstract deleteMany(predicate: Partial<Model>): Promise<Model[]>;\n\n abstract deleteById(id: string): Promise<Model | undefined>;\n\n getModel() {\n return (this.model as unknown) !== Object ? this.model : undefined;\n }\n\n protected updateInstance(src: any, payload: any) {\n const item = Object.assign({\n ...this.serialize(src),\n ...this.serialize(payload)\n });\n\n item.expires_at = item.expires_at ? new Date(item.expires_at) : item.expires_at;\n\n return item;\n }\n\n protected deserialize(obj: any) {\n return deserialize(obj, {\n type: this.getModel(),\n useAlias: false\n });\n }\n\n protected serialize(obj: any) {\n return serialize(obj, {\n useAlias: false\n });\n }\n}\n"]}
1
+ {"version":3,"file":"Adapter.js","sourceRoot":"","sources":["../../../src/domain/Adapter.ts"],"names":[],"mappings":"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","sourcesContent":["import {AjvService} from \"@tsed/ajv\";\nimport {isArray, nameOf, Type} from \"@tsed/core\";\nimport {Configuration, Inject, Opts} from \"@tsed/di\";\nimport {deserialize, JsonDeserializerOptions, JsonSerializerOptions, serialize} from \"@tsed/json-mapper\";\nimport {getPropertiesStores} from \"@tsed/schema\";\n\nexport interface AdapterConstructorOptions<T = any> {\n model: Type<T> | Object;\n collectionName?: string;\n useAlias?: string;\n indexes?: {\n [propertyKey: string]: Record<string, any>;\n };\n}\n\nfunction getIndexes(model: any) {\n return [...getPropertiesStores(model).entries()]\n .filter(([, entity]) => entity.store.has(\"adapter:indexed\"))\n .map(([propertyKey, entity]) => {\n return {\n propertyKey: String(propertyKey),\n options: entity.store.get(\"adapter:indexed\")\n };\n });\n}\n\nfunction mapIndexes(indexes: {[p: string]: Record<string, any>} | {propertyKey: string; options: any}[]) {\n return Object.entries(indexes).reduce((indexes: any[], [propertyKey, options]) => {\n return indexes.concat({\n propertyKey,\n options\n });\n }, []);\n}\n\nfunction pluralize(name: string) {\n return name.slice(-1) === \"y\" ? `${name.slice(0, name.length - 1)}ies` : name + \"s\";\n}\n\nexport abstract class Adapter<Model = any> {\n readonly model: Type<Model> | Object;\n readonly collectionName: string;\n readonly indexes: {propertyKey: string; options: any}[];\n\n @Inject()\n protected ajvService: AjvService;\n\n constructor(@Opts options: AdapterConstructorOptions, @Configuration() protected configuration: Configuration) {\n this.model = options.model;\n this.collectionName = options.collectionName || pluralize(nameOf(options.model));\n\n let indexes = options.indexes || configuration.get(`adapters.${this.collectionName}.indexes`) || getIndexes(this.model);\n\n if (!isArray(indexes)) {\n indexes = mapIndexes(indexes);\n }\n\n this.indexes = indexes;\n }\n\n async validate(value: Model): Promise<void> {\n if (this.getModel()) {\n await this.ajvService.validate(this.serialize(value), {\n useAlias: false,\n type: this.model\n });\n }\n }\n\n abstract create(value: Partial<Omit<Model, \"_id\">>, expiresAt?: Date): Promise<Model>;\n\n abstract update(id: string, value: Model, expiresAt?: Date): Promise<Model | undefined>;\n\n abstract updateOne(predicate: Partial<Model>, value: Partial<Model>, expiresAt?: Date): Promise<Model | undefined>;\n\n abstract upsert(id: string, value: Model, expiresAt?: Date): Promise<Model>;\n\n abstract findOne(predicate: Partial<Model>): Promise<Model | undefined>;\n\n abstract findById(id: string): Promise<Model | undefined>;\n\n abstract findAll(predicate?: Partial<Model>): Promise<Model[]>;\n\n abstract deleteOne(predicate: Partial<Model>): Promise<Model | undefined>;\n\n abstract deleteMany(predicate: Partial<Model>): Promise<Model[]>;\n\n abstract deleteById(id: string): Promise<Model | undefined>;\n\n getModel() {\n return (this.model as unknown) !== Object ? this.model : undefined;\n }\n\n protected updateInstance(src: any, payload: any) {\n const item = Object.assign({\n ...this.serialize(src),\n ...this.serialize(payload)\n });\n\n item.expires_at = item.expires_at ? new Date(item.expires_at) : item.expires_at;\n\n return item;\n }\n\n protected deserialize(obj: any, opts?: JsonDeserializerOptions) {\n return deserialize(obj, {\n useAlias: false,\n ...opts,\n type: this.getModel()\n });\n }\n\n protected serialize(obj: any, opts?: JsonSerializerOptions) {\n return serialize(obj, {\n useAlias: false,\n ...opts,\n type: this.getModel()\n });\n }\n}\n"]}
@@ -1,8 +1,11 @@
1
+ import { AjvService } from "@tsed/ajv";
1
2
  import { Type } from "@tsed/core";
2
3
  import { Configuration } from "@tsed/di";
4
+ import { JsonDeserializerOptions, JsonSerializerOptions } from "@tsed/json-mapper";
3
5
  export interface AdapterConstructorOptions<T = any> {
4
6
  model: Type<T> | Object;
5
7
  collectionName?: string;
8
+ useAlias?: string;
6
9
  indexes?: {
7
10
  [propertyKey: string]: Record<string, any>;
8
11
  };
@@ -15,7 +18,7 @@ export declare abstract class Adapter<Model = any> {
15
18
  propertyKey: string;
16
19
  options: any;
17
20
  }[];
18
- private ajvService;
21
+ protected ajvService: AjvService;
19
22
  constructor(options: AdapterConstructorOptions, configuration: Configuration);
20
23
  validate(value: Model): Promise<void>;
21
24
  abstract create(value: Partial<Omit<Model, "_id">>, expiresAt?: Date): Promise<Model>;
@@ -30,6 +33,6 @@ export declare abstract class Adapter<Model = any> {
30
33
  abstract deleteById(id: string): Promise<Model | undefined>;
31
34
  getModel(): Object | undefined;
32
35
  protected updateInstance(src: any, payload: any): any;
33
- protected deserialize(obj: any): any;
34
- protected serialize(obj: any): any;
36
+ protected deserialize(obj: any, opts?: JsonDeserializerOptions): any;
37
+ protected serialize(obj: any, opts?: JsonSerializerOptions): any;
35
38
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tsed/adapters",
3
- "version": "7.0.0-rc.2",
3
+ "version": "7.0.0-rc.3",
4
4
  "description": "Database adapters for Ts.ED",
5
5
  "private": false,
6
6
  "source": "./src/index.ts",
@@ -29,21 +29,21 @@
29
29
  "uuid": "8.3.2"
30
30
  },
31
31
  "devDependencies": {
32
- "@tsed/ajv": "7.0.0-rc.2",
33
- "@tsed/common": "7.0.0-rc.2",
34
- "@tsed/core": "7.0.0-rc.2",
35
- "@tsed/di": "7.0.0-rc.2",
36
- "@tsed/json-mapper": "7.0.0-rc.2",
37
- "@tsed/schema": "7.0.0-rc.2",
32
+ "@tsed/ajv": "7.0.0-rc.3",
33
+ "@tsed/common": "7.0.0-rc.3",
34
+ "@tsed/core": "7.0.0-rc.3",
35
+ "@tsed/di": "7.0.0-rc.3",
36
+ "@tsed/json-mapper": "7.0.0-rc.3",
37
+ "@tsed/schema": "7.0.0-rc.3",
38
38
  "@types/fs-extra": "9.0.13"
39
39
  },
40
40
  "peerDependencies": {
41
- "@tsed/ajv": "^7.0.0-rc.2",
42
- "@tsed/common": "^7.0.0-rc.2",
43
- "@tsed/core": "^7.0.0-rc.2",
44
- "@tsed/di": "^7.0.0-rc.2",
45
- "@tsed/json-mapper": "^7.0.0-rc.2",
46
- "@tsed/schema": "^7.0.0-rc.2",
41
+ "@tsed/ajv": "^7.0.0-rc.3",
42
+ "@tsed/common": "^7.0.0-rc.3",
43
+ "@tsed/core": "^7.0.0-rc.3",
44
+ "@tsed/di": "^7.0.0-rc.3",
45
+ "@tsed/json-mapper": "^7.0.0-rc.3",
46
+ "@tsed/schema": "^7.0.0-rc.3",
47
47
  "change-case": "^4.1.2",
48
48
  "lodash": "^4.17.21"
49
49
  },