@vendure/core 2.0.0-next.0 → 2.0.0-next.1

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.
@@ -85,7 +85,7 @@ let GlobalSettingsResolver = class GlobalSettingsResolver {
85
85
  }
86
86
  getScalarFieldsOfType(info, typeName) {
87
87
  const type = info.schema.getType(typeName);
88
- if (type && (0, graphql_2.isObjectType)(type)) {
88
+ if (type && ((0, graphql_2.isObjectType)(type) || (0, graphql_2.isInterfaceType)(type))) {
89
89
  return Object.values(type.getFields())
90
90
  .filter(field => {
91
91
  const namedType = this.getNamedType(field.type);
@@ -1 +1 @@
1
- {"version":3,"file":"global-settings.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/admin/global-settings.resolver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"global-settings.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/admin/global-settings.resolver.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,4 @@
1
1
  type Collection implements Node {
2
2
  isPrivate: Boolean!
3
+ inheritFilters: Boolean!
3
4
  }
@@ -48,6 +48,7 @@ input CreateCollectionInput {
48
48
  featuredAssetId: ID
49
49
  assetIds: [ID!]
50
50
  parentId: ID
51
+ inheritFilters: Boolean
51
52
  filters: [ConfigurableOperationInput!]!
52
53
  translations: [CreateCollectionTranslationInput!]!
53
54
  }
@@ -58,6 +59,7 @@ input UpdateCollectionInput {
58
59
  featuredAssetId: ID
59
60
  parentId: ID
60
61
  assetIds: [ID!]
62
+ inheritFilters: Boolean
61
63
  filters: [ConfigurableOperationInput!]
62
64
  translations: [UpdateCollectionTranslationInput!]
63
65
  }
@@ -27,6 +27,10 @@ export declare class Collection extends VendureEntity implements Translatable, H
27
27
  featuredAsset: Asset;
28
28
  assets: CollectionAsset[];
29
29
  filters: ConfigurableOperation[];
30
+ /**
31
+ * @since 2.0.0
32
+ */
33
+ inheritFilters: boolean;
30
34
  productVariants: ProductVariant[];
31
35
  customFields: CustomCollectionFields;
32
36
  children: Collection[];
@@ -24,13 +24,7 @@ const collection_translation_entity_1 = require("./collection-translation.entity
24
24
  *
25
25
  * @docsCategory entities
26
26
  */
27
- let Collection =
28
- // TODO: It would be ideal to use the TypeORM built-in tree support, but unfortunately it is incomplete
29
- // at this time - does not support moving or deleting. See https://github.com/typeorm/typeorm/issues/2032
30
- // Therefore we will just use an adjacency list which will have a perf impact when needing to lookup
31
- // decendants or ancestors more than 1 level removed.
32
- // @Tree('closure-table')
33
- class Collection extends base_entity_1.VendureEntity {
27
+ let Collection = class Collection extends base_entity_1.VendureEntity {
34
28
  constructor(input) {
35
29
  super(input);
36
30
  }
@@ -48,15 +42,15 @@ __decorate([
48
42
  __metadata("design:type", Boolean)
49
43
  ], Collection.prototype, "isPrivate", void 0);
50
44
  __decorate([
51
- (0, typeorm_1.OneToMany)((type) => collection_translation_entity_1.CollectionTranslation, (translation) => translation.base, { eager: true }),
45
+ (0, typeorm_1.OneToMany)(type => collection_translation_entity_1.CollectionTranslation, translation => translation.base, { eager: true }),
52
46
  __metadata("design:type", Array)
53
47
  ], Collection.prototype, "translations", void 0);
54
48
  __decorate([
55
- (0, typeorm_1.ManyToOne)((type) => asset_entity_1.Asset, { onDelete: 'SET NULL' }),
49
+ (0, typeorm_1.ManyToOne)(type => asset_entity_1.Asset, { onDelete: 'SET NULL' }),
56
50
  __metadata("design:type", asset_entity_1.Asset)
57
51
  ], Collection.prototype, "featuredAsset", void 0);
58
52
  __decorate([
59
- (0, typeorm_1.OneToMany)((type) => collection_asset_entity_1.CollectionAsset, (collectionAsset) => collectionAsset.collection),
53
+ (0, typeorm_1.OneToMany)(type => collection_asset_entity_1.CollectionAsset, collectionAsset => collectionAsset.collection),
60
54
  __metadata("design:type", Array)
61
55
  ], Collection.prototype, "assets", void 0);
62
56
  __decorate([
@@ -64,12 +58,16 @@ __decorate([
64
58
  __metadata("design:type", Array)
65
59
  ], Collection.prototype, "filters", void 0);
66
60
  __decorate([
67
- (0, typeorm_1.ManyToMany)((type) => product_variant_entity_1.ProductVariant, (productVariant) => productVariant.collections),
61
+ (0, typeorm_1.Column)({ default: true }),
62
+ __metadata("design:type", Boolean)
63
+ ], Collection.prototype, "inheritFilters", void 0);
64
+ __decorate([
65
+ (0, typeorm_1.ManyToMany)(type => product_variant_entity_1.ProductVariant, productVariant => productVariant.collections),
68
66
  (0, typeorm_1.JoinTable)(),
69
67
  __metadata("design:type", Array)
70
68
  ], Collection.prototype, "productVariants", void 0);
71
69
  __decorate([
72
- (0, typeorm_1.Column)((type) => custom_entity_fields_1.CustomCollectionFields),
70
+ (0, typeorm_1.Column)(type => custom_entity_fields_1.CustomCollectionFields),
73
71
  __metadata("design:type", custom_entity_fields_1.CustomCollectionFields)
74
72
  ], Collection.prototype, "customFields", void 0);
75
73
  __decorate([
@@ -81,18 +79,13 @@ __decorate([
81
79
  __metadata("design:type", Collection)
82
80
  ], Collection.prototype, "parent", void 0);
83
81
  __decorate([
84
- (0, typeorm_1.ManyToMany)((type) => channel_entity_1.Channel),
82
+ (0, typeorm_1.ManyToMany)(type => channel_entity_1.Channel),
85
83
  (0, typeorm_1.JoinTable)(),
86
84
  __metadata("design:type", Array)
87
85
  ], Collection.prototype, "channels", void 0);
88
86
  Collection = __decorate([
89
- (0, typeorm_1.Entity)()
90
- // TODO: It would be ideal to use the TypeORM built-in tree support, but unfortunately it is incomplete
91
- // at this time - does not support moving or deleting. See https://github.com/typeorm/typeorm/issues/2032
92
- // Therefore we will just use an adjacency list which will have a perf impact when needing to lookup
93
- // decendants or ancestors more than 1 level removed.
94
- // @Tree('closure-table')
95
- ,
87
+ (0, typeorm_1.Entity)(),
88
+ (0, typeorm_1.Tree)('closure-table'),
96
89
  __metadata("design:paramtypes", [Object])
97
90
  ], Collection);
98
91
  exports.Collection = Collection;
@@ -1 +1 @@
1
- {"version":3,"file":"collection.entity.js","sourceRoot":"","sources":["../../../src/entity/collection/collection.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,qCASiB;AAKjB,wDAA8C;AAC9C,qDAAoD;AACpD,8DAAoD;AACpD,kEAAiE;AACjE,sFAA2E;AAE3E,uEAA4D;AAC5D,mFAAwE;AAExE;;;;;GAKG;AAOH,IAAa,UAAU;AALvB,uGAAuG;AACvG,yGAAyG;AACzG,oGAAoG;AACpG,qDAAqD;AACrD,yBAAyB;AACzB,MAAa,UAAW,SAAQ,2BAAa;IAEzC,YAAY,KAA+B;QACvC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;CA4CJ,CAAA;AAzCG;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;0CACX;AAGhB;IADC,IAAA,gBAAM,GAAE;;4CACQ;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;6CACR;AASnB;IADC,IAAA,mBAAS,EAAC,CAAC,IAAI,EAAE,EAAE,CAAC,qDAAqB,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;8BACjF,KAAK;gDAA0B;AAG7C;IADC,IAAA,mBAAS,EAAC,CAAC,IAAI,EAAE,EAAE,CAAC,oBAAK,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;8BACtC,oBAAK;iDAAC;AAGrB;IADC,IAAA,mBAAS,EAAC,CAAC,IAAI,EAAE,EAAE,CAAC,yCAAe,EAAE,CAAC,eAAe,EAAE,EAAE,CAAC,eAAe,CAAC,UAAU,CAAC;;0CAC5D;AAEH;IAAtB,IAAA,gBAAM,EAAC,aAAa,CAAC;;2CAAkC;AAIxD;IAFC,IAAA,oBAAU,EAAC,CAAC,IAAI,EAAE,EAAE,CAAC,uCAAc,EAAE,CAAC,cAAc,EAAE,EAAE,CAAC,cAAc,CAAC,WAAW,CAAC;IACpF,IAAA,mBAAS,GAAE;;mDACsB;AAGlC;IADC,IAAA,gBAAM,EAAC,CAAC,IAAI,EAAE,EAAE,CAAC,6CAAsB,CAAC;8BAC3B,6CAAsB;gDAAC;AAGrC;IADC,IAAA,sBAAY,GAAE;;4CACQ;AAGvB;IADC,IAAA,oBAAU,GAAE;8BACL,UAAU;0CAAC;AAInB;IAFC,IAAA,oBAAU,EAAC,CAAC,IAAI,EAAE,EAAE,CAAC,wBAAO,CAAC;IAC7B,IAAA,mBAAS,GAAE;;4CACQ;AA/CX,UAAU;IANtB,IAAA,gBAAM,GAAE;IACT,uGAAuG;IACvG,yGAAyG;IACzG,oGAAoG;IACpG,qDAAqD;IACrD,yBAAyB;;;GACZ,UAAU,CAgDtB;AAhDY,gCAAU"}
1
+ {"version":3,"file":"collection.entity.js","sourceRoot":"","sources":["../../../src/entity/collection/collection.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,qCAUiB;AAKjB,wDAA8C;AAC9C,qDAAoD;AACpD,8DAAoD;AACpD,kEAAiE;AACjE,sFAA2E;AAE3E,uEAA4D;AAC5D,mFAAwE;AAExE;;;;;GAKG;AAGH,IAAa,UAAU,GAAvB,MAAa,UACT,SAAQ,2BAAa;IAGrB,YAAY,KAA+B;QACvC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;CAiDJ,CAAA;AA9CG;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;0CACX;AAGhB;IADC,IAAA,gBAAM,GAAE;;4CACQ;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;6CACR;AASnB;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,qDAAqB,EAAE,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;8BAC7E,KAAK;gDAA0B;AAG7C;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,oBAAK,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;8BACpC,oBAAK;iDAAC;AAGrB;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,yCAAe,EAAE,eAAe,CAAC,EAAE,CAAC,eAAe,CAAC,UAAU,CAAC;;0CACxD;AAEH;IAAtB,IAAA,gBAAM,EAAC,aAAa,CAAC;;2CAAkC;AAK7B;IAA1B,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;kDAAyB;AAInD;IAFC,IAAA,oBAAU,EAAC,IAAI,CAAC,EAAE,CAAC,uCAAc,EAAE,cAAc,CAAC,EAAE,CAAC,cAAc,CAAC,WAAW,CAAC;IAChF,IAAA,mBAAS,GAAE;;mDACsB;AAGlC;IADC,IAAA,gBAAM,EAAC,IAAI,CAAC,EAAE,CAAC,6CAAsB,CAAC;8BACzB,6CAAsB;gDAAC;AAGrC;IADC,IAAA,sBAAY,GAAE;;4CACQ;AAGvB;IADC,IAAA,oBAAU,GAAE;8BACL,UAAU;0CAAC;AAInB;IAFC,IAAA,oBAAU,EAAC,IAAI,CAAC,EAAE,CAAC,wBAAO,CAAC;IAC3B,IAAA,mBAAS,GAAE;;4CACQ;AAtDX,UAAU;IAFtB,IAAA,gBAAM,GAAE;IACR,IAAA,cAAI,EAAC,eAAe,CAAC;;GACT,UAAU,CAuDtB;AAvDY,gCAAU"}
@@ -109,6 +109,11 @@ export declare class CollectionService implements OnModuleInit {
109
109
  * variants (because other attributes of collection can be changed https://github.com/vendure-ecommerce/vendure/issues/1015)
110
110
  */
111
111
  private applyCollectionFiltersInternal;
112
+ /**
113
+ * Gets all filters of ancestor Collections while respecting the `inheritFilters` setting of each.
114
+ * As soon as `inheritFilters === false` is encountered, the collected filters are returned.
115
+ */
116
+ private getAncestorFilters;
112
117
  /**
113
118
  * Applies the CollectionFilters and returns an array of ProductVariant entities which match.
114
119
  */
@@ -392,7 +392,7 @@ let CollectionService = class CollectionService {
392
392
  * variants (because other attributes of collection can be changed https://github.com/vendure-ecommerce/vendure/issues/1015)
393
393
  */
394
394
  async applyCollectionFiltersInternal(collection, applyToChangedVariantsOnly = true) {
395
- const ancestorFilters = await this.getAncestors(collection.id).then(ancestors => ancestors.reduce((filters, c) => [...filters, ...(c.filters || [])], []));
395
+ const ancestorFilters = await this.getAncestorFilters(collection);
396
396
  const preIds = await this.getCollectionProductVariantIds(collection);
397
397
  collection.productVariants = await this.getFilteredProductVariants([
398
398
  ...ancestorFilters,
@@ -423,6 +423,23 @@ let CollectionService = class CollectionService {
423
423
  return [...preIds.filter(id => !postIdsSet.has(id)), ...postIds];
424
424
  }
425
425
  }
426
+ /**
427
+ * Gets all filters of ancestor Collections while respecting the `inheritFilters` setting of each.
428
+ * As soon as `inheritFilters === false` is encountered, the collected filters are returned.
429
+ */
430
+ async getAncestorFilters(collection) {
431
+ const ancestorFilters = [];
432
+ if (collection.inheritFilters) {
433
+ const ancestors = await this.getAncestors(collection.id);
434
+ for (const ancestor of ancestors) {
435
+ ancestorFilters.push(...ancestor.filters);
436
+ if (ancestor.inheritFilters === false) {
437
+ return ancestorFilters;
438
+ }
439
+ }
440
+ }
441
+ return ancestorFilters;
442
+ }
426
443
  /**
427
444
  * Applies the CollectionFilters and returns an array of ProductVariant entities which match.
428
445
  */
@@ -1 +1 @@
1
- {"version":3,"file":"collection.service.js","sourceRoot":"","sources":["../../../src/service/services/collection.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"collection.service.js","sourceRoot":"","sources":["../../../src/service/services/collection.service.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vendure/core",
3
- "version": "2.0.0-next.0",
3
+ "version": "2.0.0-next.1",
4
4
  "description": "A modern, headless ecommerce framework",
5
5
  "repository": {
6
6
  "type": "git",
@@ -50,7 +50,7 @@
50
50
  "@nestjs/testing": "8.3.1",
51
51
  "@nestjs/typeorm": "8.0.3",
52
52
  "@types/fs-extra": "^9.0.1",
53
- "@vendure/common": "^2.0.0-next.0",
53
+ "@vendure/common": "^2.0.0-next.1",
54
54
  "apollo-server-express": "3.6.3",
55
55
  "bcrypt": "^5.0.0",
56
56
  "body-parser": "^1.19.0",
@@ -100,5 +100,5 @@
100
100
  "sqlite3": "^5.0.0",
101
101
  "typescript": "4.5.5"
102
102
  },
103
- "gitHead": "1db9e96a8c92b23b4d06c6b83e4ab2b428afab7c"
103
+ "gitHead": "b4c89c2f48b93b2e1ae6ebf43ba5cc12cb7f4588"
104
104
  }