@vendure/core 1.3.2 → 1.4.0

package/dist/common/configurable-operation.js.map

@@ -1 +1 @@
-{"version":3,"file":"configurable-operation.js","sourceRoot":"","sources":["../../src/common/configurable-operation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"configurable-operation.js","sourceRoot":"","sources":["../../src/common/configurable-operation.ts"],"names":[],"mappings":"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"}

package/dist/common/self-refreshing-cache.d.ts

@@ -16,7 +16,7 @@ export interface SelfRefreshingCache<V, RefreshArgs extends any[] = []> {
      * The results cache is cleared along with the rest of the cache according to the configured
      * `ttl` value.
      */
-    memoize<Args extends any[], R>(args: Args, fn: (value: V, ...args: Args) => R): Promise<R>;
+    memoize<Args extends any[], R>(args: Args, refreshArgs: RefreshArgs, fn: (value: V, ...args: Args) => R): Promise<R>;
     /**
      * @description
      * Force a refresh of the value, e.g. when it is known that the value has changed such as after
@@ -31,6 +31,11 @@ export interface SelfRefreshingCacheConfig<V, RefreshArgs extends any[]> {
         fn: (...args: RefreshArgs) => Promise<V>;
         defaultArgs: RefreshArgs;
     };
+    /**
+     * Intended for unit testing the SelfRefreshingCache only.
+     * By default uses `() => new Date().getTime()`
+     */
+    getTimeFn?: () => number;
 }
 /**
  * @description
@@ -38,8 +43,8 @@ export interface SelfRefreshingCacheConfig<V, RefreshArgs extends any[]> {
  * of cache, the function used to populate the value (`refreshFn`) is defined during the creation of the cache, and
  * it is immediately used to populate the initial value.
  *
- * From there, when the `.value` property is accessed, it will _always_ return a value synchronously. If the
- * value has expired, it will still be returned and the `refreshFn` will be triggered to update the value in the
- * background.
+ * From there, when the `.value` property is accessed, it will return a value from the cache, and if the
+ * value has expired, it will automatically run the `refreshFn` to update the value and then return the
+ * fresh value.
  */
 export declare function createSelfRefreshingCache<V, RefreshArgs extends any[]>(config: SelfRefreshingCacheConfig<V, RefreshArgs>): Promise<SelfRefreshingCache<V, RefreshArgs>>;

package/dist/common/self-refreshing-cache.js

@@ -8,25 +8,26 @@ const vendure_logger_1 = require("../config/logger/vendure-logger");
  * of cache, the function used to populate the value (`refreshFn`) is defined during the creation of the cache, and
  * it is immediately used to populate the initial value.
  *
- * From there, when the `.value` property is accessed, it will _always_ return a value synchronously. If the
- * value has expired, it will still be returned and the `refreshFn` will be triggered to update the value in the
- * background.
+ * From there, when the `.value` property is accessed, it will return a value from the cache, and if the
+ * value has expired, it will automatically run the `refreshFn` to update the value and then return the
+ * fresh value.
  */
 async function createSelfRefreshingCache(config) {
-    const { ttl, name, refresh } = config;
+    const { ttl, name, refresh, getTimeFn } = config;
+    const getTimeNow = getTimeFn !== null && getTimeFn !== void 0 ? getTimeFn : (() => new Date().getTime());
     const initialValue = await refresh.fn(...refresh.defaultArgs);
     let value = initialValue;
-    let expires = new Date().getTime() + ttl;
+    let expires = getTimeNow() + ttl;
     const memoCache = new Map();
-    const hashArgs = (...args) => JSON.stringify([args, expires]);
-    const refreshValue = (...args) => {
-        vendure_logger_1.Logger.debug(`Refreshing the SelfRefreshingCache "${name}"`);
+    const refreshValue = (resetMemoCache = true, args) => {
         return refresh
             .fn(...args)
             .then(newValue => {
             value = newValue;
-            expires = new Date().getTime() + ttl;
-            memoCache.clear();
+            expires = getTimeNow() + ttl;
+            if (resetMemoCache) {
+                memoCache.clear();
+            }
             return value;
         })
             .catch(err => {
@@ -34,25 +35,30 @@ async function createSelfRefreshingCache(config) {
             return value;
         });
     };
-    const getValue = async () => {
-        const now = new Date().getTime();
+    const getValue = async (refreshArgs, resetMemoCache = true) => {
+        const now = getTimeNow();
         if (expires < now) {
-            return refreshValue(...refresh.defaultArgs);
+            return refreshValue(resetMemoCache, refreshArgs !== null && refreshArgs !== void 0 ? refreshArgs : refresh.defaultArgs);
         }
         return value;
     };
-    const memoize = async (args, fn) => {
-        const cached = memoCache.get(hashArgs(args));
-        if (cached) {
-            return cached;
+    const memoize = async (args, refreshArgs, fn) => {
+        const key = JSON.stringify(args);
+        const cached = memoCache.get(key);
+        const now = getTimeNow();
+        if (cached && now < cached.expires) {
+            return cached.value;
         }
-        let result;
-        memoCache.set(hashArgs(args), (result = getValue().then(val => fn(val, ...args))));
+        const result = getValue(refreshArgs, false).then(val => fn(val, ...args));
+        memoCache.set(key, {
+            expires: now + ttl,
+            value: result,
+        });
         return result;
     };
     return {
         value: getValue,
-        refresh: refreshValue,
+        refresh: (...args) => refreshValue(true, args),
         memoize,
     };
 }

package/dist/common/self-refreshing-cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"self-refreshing-cache.js","sourceRoot":"","sources":["../../src/common/self-refreshing-cache.ts"],"names":[],"mappings":";;;AAEA,oEAAyD;AAwCzD;;;;;;;;;GASG;AACI,KAAK,UAAU,yBAAyB,CAC3C,MAAiD;IAEjD,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IACtC,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAC9D,IAAI,KAAK,GAAG,YAAY,CAAC;IACzB,IAAI,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,GAAG,CAAC;IACzC,MAAM,SAAS,GAAG,IAAI,GAAG,EAAe,CAAC;IACzC,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IACrE,MAAM,YAAY,GAAG,CAAC,GAAG,IAAiB,EAAc,EAAE;QACtD,uBAAM,CAAC,KAAK,CAAC,uCAAuC,IAAI,GAAG,CAAC,CAAC;QAC7D,OAAO,OAAO;aACT,EAAE,CAAC,GAAG,IAAI,CAAC;aACX,IAAI,CAAC,QAAQ,CAAC,EAAE;YACb,KAAK,GAAG,QAAQ,CAAC;YACjB,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,GAAG,CAAC;YACrC,SAAS,CAAC,KAAK,EAAE,CAAC;YAClB,OAAO,KAAK,CAAC;QACjB,CAAC,CAAC;aACD,KAAK,CAAC,GAAG,CAAC,EAAE;YACT,uBAAM,CAAC,KAAK,CACR,yCAAyC,IAAI,MAAM,GAAG,CAAC,OAAO,EAAE,EAChE,SAAS,EACT,GAAG,CAAC,KAAK,CACZ,CAAC;YACF,OAAO,KAAK,CAAC;QACjB,CAAC,CAAC,CAAC;IACX,CAAC,CAAC;IACF,MAAM,QAAQ,GAAG,KAAK,IAAgB,EAAE;QACpC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QACjC,IAAI,OAAO,GAAG,GAAG,EAAE;YACf,OAAO,YAAY,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;SAC/C;QACD,OAAO,KAAK,CAAC;IACjB,CAAC,CAAC;IACF,MAAM,OAAO,GAAG,KAAK,EACjB,IAAU,EACV,EAAkC,EACxB,EAAE;QACZ,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7C,IAAI,MAAM,EAAE;YACR,OAAO,MAAM,CAAC;SACjB;QACD,IAAI,MAAkB,CAAC;QACvB,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,GAAG,QAAQ,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QACnF,OAAO,MAAM,CAAC;IAClB,CAAC,CAAC;IACF,OAAO;QACH,KAAK,EAAE,QAAQ;QACf,OAAO,EAAE,YAAY;QACrB,OAAO;KACV,CAAC;AACN,CAAC;AApDD,8DAoDC"}
+{"version":3,"file":"self-refreshing-cache.js","sourceRoot":"","sources":["../../src/common/self-refreshing-cache.ts"],"names":[],"mappings":";;;AAEA,oEAAyD;AAiDzD;;;;;;;;;GASG;AACI,KAAK,UAAU,yBAAyB,CAC3C,MAAiD;IAEjD,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;IACjD,MAAM,UAAU,GAAG,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,CAAC,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;IAC7D,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAC9D,IAAI,KAAK,GAAG,YAAY,CAAC;IACzB,IAAI,OAAO,GAAG,UAAU,EAAE,GAAG,GAAG,CAAC;IACjC,MAAM,SAAS,GAAG,IAAI,GAAG,EAA2C,CAAC;IACrE,MAAM,YAAY,GAAG,CAAC,cAAc,GAAG,IAAI,EAAE,IAAiB,EAAc,EAAE;QAC1E,OAAO,OAAO;aACT,EAAE,CAAC,GAAG,IAAI,CAAC;aACX,IAAI,CAAC,QAAQ,CAAC,EAAE;YACb,KAAK,GAAG,QAAQ,CAAC;YACjB,OAAO,GAAG,UAAU,EAAE,GAAG,GAAG,CAAC;YAC7B,IAAI,cAAc,EAAE;gBAChB,SAAS,CAAC,KAAK,EAAE,CAAC;aACrB;YACD,OAAO,KAAK,CAAC;QACjB,CAAC,CAAC;aACD,KAAK,CAAC,GAAG,CAAC,EAAE;YACT,uBAAM,CAAC,KAAK,CACR,yCAAyC,IAAI,MAAM,GAAG,CAAC,OAAO,EAAE,EAChE,SAAS,EACT,GAAG,CAAC,KAAK,CACZ,CAAC;YACF,OAAO,KAAK,CAAC;QACjB,CAAC,CAAC,CAAC;IACX,CAAC,CAAC;IACF,MAAM,QAAQ,GAAG,KAAK,EAAE,WAAyB,EAAE,cAAc,GAAG,IAAI,EAAc,EAAE;QACpF,MAAM,GAAG,GAAG,UAAU,EAAE,CAAC;QACzB,IAAI,OAAO,GAAG,GAAG,EAAE;YACf,OAAO,YAAY,CAAC,cAAc,EAAE,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,OAAO,CAAC,WAAW,CAAC,CAAC;SAC3E;QACD,OAAO,KAAK,CAAC;IACjB,CAAC,CAAC;IACF,MAAM,OAAO,GAAG,KAAK,EACjB,IAAU,EACV,WAAwB,EACxB,EAAkC,EACxB,EAAE;QACZ,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACjC,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAClC,MAAM,GAAG,GAAG,UAAU,EAAE,CAAC;QACzB,IAAI,MAAM,IAAI,GAAG,GAAG,MAAM,CAAC,OAAO,EAAE;YAChC,OAAO,MAAM,CAAC,KAAK,CAAC;SACvB;QACD,MAAM,MAAM,GAAG,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;QAC1E,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE;YACf,OAAO,EAAE,GAAG,GAAG,GAAG;YAClB,KAAK,EAAE,MAAM;SAChB,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAClB,CAAC,CAAC;IACF,OAAO;QACH,KAAK,EAAE,QAAQ;QACf,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC;QAC9C,OAAO;KACV,CAAC;AACN,CAAC;AA3DD,8DA2DC"}

package/dist/common/types/entity-relation-paths.d.ts

@@ -21,7 +21,7 @@ import { VendureEntity } from '../../entity/base/base.entity';
  */
 export declare type EntityRelationPaths<T extends VendureEntity> = PathsToStringProps1<T> | Join<PathsToStringProps2<T>, '.'> | TripleDotPath;
 export declare type EntityRelationKeys<T extends VendureEntity> = {
-    [K in Extract<keyof T, string>]: T[K] extends VendureEntity ? K : T[K] extends VendureEntity[] ? K : never;
+    [K in Extract<keyof T, string>]: Required<T>[K] extends VendureEntity ? K : Required<T>[K] extends VendureEntity[] ? K : never;
 }[Extract<keyof T, string>];
 export declare type EntityRelations<T extends VendureEntity> = {
     [K in EntityRelationKeys<T>]: T[K];

package/dist/config/auth/bcrypt-password-hashing-strategy.d.ts

@@ -8,7 +8,7 @@ import { PasswordHashingStrategy } from './password-hashing-strategy';
  */
 export declare class BcryptPasswordHashingStrategy implements PasswordHashingStrategy {
     private bcrypt;
-    constructor();
     hash(plaintext: string): Promise<string>;
     check(plaintext: string, hash: string): Promise<boolean>;
+    private getBcrypt;
 }

package/dist/config/auth/bcrypt-password-hashing-strategy.js

@@ -10,19 +10,23 @@ const SALT_ROUNDS = 12;
  * @since 1.3.0
  */
 class BcryptPasswordHashingStrategy {
-    constructor() {
-        // The bcrypt lib is lazily loaded so that if we want to run Vendure
-        // in an environment that does not support native Node modules
-        // (such as an online sandbox like Stackblitz) the bcrypt dependency
-        // does not get loaded when linking the source files on startup.
-        this.bcrypt = require('bcrypt');
-    }
     hash(plaintext) {
+        this.getBcrypt();
         return this.bcrypt.hash(plaintext, SALT_ROUNDS);
     }
     check(plaintext, hash) {
+        this.getBcrypt();
         return this.bcrypt.compare(plaintext, hash);
     }
+    getBcrypt() {
+        if (!this.bcrypt) {
+            // The bcrypt lib is lazily loaded so that if we want to run Vendure
+            // in an environment that does not support native Node modules
+            // (such as an online sandbox like Stackblitz) the bcrypt dependency
+            // does not get loaded when linking the source files on startup.
+            this.bcrypt = require('bcrypt');
+        }
+    }
 }
 exports.BcryptPasswordHashingStrategy = BcryptPasswordHashingStrategy;
 //# sourceMappingURL=bcrypt-password-hashing-strategy.js.map

package/dist/config/auth/bcrypt-password-hashing-strategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"bcrypt-password-hashing-strategy.js","sourceRoot":"","sources":["../../../src/config/auth/bcrypt-password-hashing-strategy.ts"],"names":[],"mappings":";;;AAEA,MAAM,WAAW,GAAG,EAAE,CAAC;AAEvB;;;;;;GAMG;AACH,MAAa,6BAA6B;IAGtC;QACI,oEAAoE;QACpE,8DAA8D;QAC9D,oEAAoE;QACpE,gEAAgE;QAChE,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IACpC,CAAC;IAED,IAAI,CAAC,SAAiB;QAClB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,SAAiB,EAAE,IAAY;QACjC,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAChD,CAAC;CACJ;AAlBD,sEAkBC"}
+{"version":3,"file":"bcrypt-password-hashing-strategy.js","sourceRoot":"","sources":["../../../src/config/auth/bcrypt-password-hashing-strategy.ts"],"names":[],"mappings":";;;AAEA,MAAM,WAAW,GAAG,EAAE,CAAC;AAEvB;;;;;;GAMG;AACH,MAAa,6BAA6B;IAGtC,IAAI,CAAC,SAAiB;QAClB,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,SAAiB,EAAE,IAAY;QACjC,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAChD,CAAC;IAEO,SAAS;QACb,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YACd,oEAAoE;YACpE,8DAA8D;YAC9D,oEAAoE;YACpE,gEAAgE;YAChE,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;SACnC;IACL,CAAC;CACJ;AAtBD,sEAsBC"}

package/dist/config/catalog/collection-filter.d.ts

@@ -13,7 +13,7 @@ export interface CollectionFilterConfig<T extends ConfigArgs> extends Configurab
  * [`QueryBuilder`](https://typeorm.io/#/select-query-builder) object to which clauses may be added.
  *
  * Creating a CollectionFilter is considered an advanced Vendure topic. For more insight into how
- * they work, study the [default collection filters](https://github.com/vendure-ecommerce/vendure/blob/master/packages/core/src/config/collection/default-collection-filters.ts)
+ * they work, study the [default collection filters](https://github.com/vendure-ecommerce/vendure/blob/master/packages/core/src/config/catalog/default-collection-filters.ts)
  *
  * @docsCategory configuration
  */

package/dist/config/catalog/collection-filter.js

@@ -10,7 +10,7 @@ const configurable_operation_1 = require("../../common/configurable-operation");
  * [`QueryBuilder`](https://typeorm.io/#/select-query-builder) object to which clauses may be added.
  *
  * Creating a CollectionFilter is considered an advanced Vendure topic. For more insight into how
- * they work, study the [default collection filters](https://github.com/vendure-ecommerce/vendure/blob/master/packages/core/src/config/collection/default-collection-filters.ts)
+ * they work, study the [default collection filters](https://github.com/vendure-ecommerce/vendure/blob/master/packages/core/src/config/catalog/default-collection-filters.ts)
  *
  * @docsCategory configuration
  */

package/dist/config/catalog/default-collection-filters.d.ts

@@ -7,7 +7,7 @@ export declare const facetValueCollectionFilter: CollectionFilter<{
         type: "ID";
         list: true;
         ui: {
-            component: "facet-value-form-input";
+            component: string;
         };
     };
     containsAny: {
@@ -18,7 +18,7 @@ export declare const variantNameCollectionFilter: CollectionFilter<{
     operator: {
         type: "string";
         ui: {
-            component: "select-form-input";
+            component: string;
             options: {
                 value: string;
             }[];
@@ -33,7 +33,7 @@ export declare const defaultCollectionFilters: (CollectionFilter<{
         type: "ID";
         list: true;
         ui: {
-            component: "facet-value-form-input";
+            component: string;
         };
     };
     containsAny: {
@@ -43,7 +43,7 @@ export declare const defaultCollectionFilters: (CollectionFilter<{
     operator: {
         type: "string";
         ui: {
-            component: "select-form-input";
+            component: string;
             options: {
                 value: string;
             }[];

package/dist/config/catalog/default-collection-filters.js

@@ -25,8 +25,10 @@ exports.facetValueCollectionFilter = new collection_filter_1.CollectionFilter({
     apply: (qb, args) => {
         const ids = args.facetValueIds;
         if (ids.length) {
-            const idsName = `ids_${ids.join('_')}`;
-            const countName = `count_${ids.join('_')}`;
+            // uuid IDs can include `-` chars, which we cannot use in a TypeORM key name.
+            const safeIdsConcat = ids.join('_').replace(/-/g, '_');
+            const idsName = `ids_${safeIdsConcat}`;
+            const countName = `count_${safeIdsConcat}`;
             const productFacetValues = qb.connection
                 .createQueryBuilder(product_variant_entity_1.ProductVariant, 'product_variant')
                 .select('product_variant.id', 'variant_id')

package/dist/config/catalog/default-collection-filters.js.map

@@ -1 +1 @@
-{"version":3,"file":"default-collection-filters.js","sourceRoot":"","sources":["../../../src/config/catalog/default-collection-filters.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"default-collection-filters.js","sourceRoot":"","sources":["../../../src/config/catalog/default-collection-filters.ts"],"names":[],"mappings":"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"}

package/dist/config/custom-field/custom-field-types.d.ts

@@ -1,5 +1,5 @@
 import { BooleanCustomFieldConfig as GraphQLBooleanCustomFieldConfig, CustomField, DateTimeCustomFieldConfig as GraphQLDateTimeCustomFieldConfig, FloatCustomFieldConfig as GraphQLFloatCustomFieldConfig, IntCustomFieldConfig as GraphQLIntCustomFieldConfig, LocaleStringCustomFieldConfig as GraphQLLocaleStringCustomFieldConfig, LocalizedString, RelationCustomFieldConfig as GraphQLRelationCustomFieldConfig, StringCustomFieldConfig as GraphQLStringCustomFieldConfig, TextCustomFieldConfig as GraphQLTextCustomFieldConfig } from '@vendure/common/lib/generated-types';
-import { CustomFieldsObject, CustomFieldType, Type } from '@vendure/common/lib/shared-types';
+import { CustomFieldsObject, CustomFieldType, DefaultFormComponentId, Type, UiComponentConfig } from '@vendure/common/lib/shared-types';
 import { Injector } from '../../common/injector';
 import { VendureEntity } from '../../entity/base/base.entity';
 export declare type DefaultValueType<T extends CustomFieldType> = T extends 'string' | 'localeString' ? string : T extends 'int' | 'float' ? number : T extends 'boolean' ? boolean : T extends 'datetime' ? Date : T extends 'relation' ? any : never;
@@ -12,6 +12,7 @@ export declare type BaseTypedCustomFieldConfig<T extends CustomFieldType, C exte
      */
     public?: boolean;
     nullable?: boolean;
+    ui?: UiComponentConfig<DefaultFormComponentId | string>;
 };
 /**
  * @description
@@ -58,14 +59,14 @@ export declare type CustomFieldConfig = StringCustomFieldConfig | LocaleStringCu
  *
  * All custom fields share some common properties:
  *
- * * `name: string`: The name of the field
- * * `type: string`: A string of type {@link CustomFieldType}
- * * `list: boolean`: If set to `true`, then the field will be an array of the specified type
+ * * `name: string`: The name of the field.
+ * * `type: string`: A string of type {@link CustomFieldType}.
+ * * `list: boolean`: If set to `true`, then the field will be an array of the specified type.
  * * `label?: LocalizedString[]`: An array of localized labels for the field.
  * * `description?: LocalizedString[]`: An array of localized descriptions for the field.
- * * `public?: boolean`: Whether or not the custom field is available via the Shop API. Defaults to `true`
- * * `readonly?: boolean`: Whether or not the custom field can be updated via the GraphQL APIs. Defaults to `false`
- * * `internal?: boolean`: Whether or not the custom field is exposed at all via the GraphQL APIs. Defaults to `false`
+ * * `public?: boolean`: Whether or not the custom field is available via the Shop API. Defaults to `true`.
+ * * `readonly?: boolean`: Whether or not the custom field can be updated via the GraphQL APIs. Defaults to `false`.
+ * * `internal?: boolean`: Whether or not the custom field is exposed at all via the GraphQL APIs. Defaults to `false`.
  * * `defaultValue?: any`: The default value when an Entity is created with this field.
  * * `nullable?: boolean`: Whether the field is nullable in the database. If set to `false`, then a `defaultValue` should be provided.
  * * `validate?: (value: any) => string | LocalizedString[] | void`: A custom validation function. If the value is valid, then
@@ -140,19 +141,26 @@ export interface CustomFields {
     Asset?: CustomFieldConfig[];
     Channel?: CustomFieldConfig[];
     Collection?: CustomFieldConfig[];
+    Country?: CustomFieldConfig[];
     Customer?: CustomFieldConfig[];
+    CustomerGroup?: CustomFieldConfig[];
     Facet?: CustomFieldConfig[];
     FacetValue?: CustomFieldConfig[];
     Fulfillment?: CustomFieldConfig[];
     GlobalSettings?: CustomFieldConfig[];
     Order?: CustomFieldConfig[];
     OrderLine?: CustomFieldConfig[];
+    PaymentMethod?: CustomFieldConfig[];
     Product?: CustomFieldConfig[];
     ProductOption?: CustomFieldConfig[];
     ProductOptionGroup?: CustomFieldConfig[];
     ProductVariant?: CustomFieldConfig[];
-    User?: CustomFieldConfig[];
+    Promotion?: CustomFieldConfig[];
     ShippingMethod?: CustomFieldConfig[];
+    TaxCategory?: CustomFieldConfig[];
+    TaxRate?: CustomFieldConfig[];
+    User?: CustomFieldConfig[];
+    Zone?: CustomFieldConfig[];
 }
 /**
  * This interface should be implemented by any entity which can be extended

package/dist/config/default-config.js

@@ -151,19 +151,26 @@ exports.defaultConfig = {
         Asset: [],
         Channel: [],
         Collection: [],
+        Country: [],
         Customer: [],
+        CustomerGroup: [],
         Facet: [],
         FacetValue: [],
         Fulfillment: [],
         GlobalSettings: [],
         Order: [],
         OrderLine: [],
+        PaymentMethod: [],
         Product: [],
         ProductOption: [],
         ProductOptionGroup: [],
         ProductVariant: [],
-        User: [],
+        Promotion: [],
         ShippingMethod: [],
+        TaxCategory: [],
+        TaxRate: [],
+        User: [],
+        Zone: [],
     },
     plugins: [],
 };

package/dist/config/default-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"default-config.js","sourceRoot":"","sources":["../../src/config/default-config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"default-config.js","sourceRoot":"","sources":["../../src/config/default-config.ts"],"names":[],"mappings":"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"}

package/dist/config/index.d.ts

@@ -22,25 +22,25 @@ export * from './logger/default-logger';
 export * from './logger/noop-logger';
 export * from './logger/vendure-logger';
 export * from './merge-config';
-export * from './order/custom-order-process';
 export * from './order/changed-price-handling-strategy';
+export * from './order/custom-order-process';
 export * from './order/default-changed-price-handling-strategy';
 export * from './order/default-order-placed-strategy';
 export * from './order/default-stock-allocation-strategy';
 export * from './order/merge-orders-strategy';
 export * from './order/order-code-strategy';
+export * from './order/order-item-price-calculation-strategy';
 export * from './order/order-merge-strategy';
 export * from './order/order-placed-strategy';
+export * from './order/stock-allocation-strategy';
 export * from './order/use-existing-strategy';
-export * from './order/use-guest-strategy';
 export * from './order/use-guest-if-existing-empty-strategy';
-export * from './order/order-item-price-calculation-strategy';
-export * from './order/stock-allocation-strategy';
+export * from './order/use-guest-strategy';
 export * from './payment/custom-payment-process';
 export * from './payment/dummy-payment-method-handler';
 export * from './payment/example-payment-method-handler';
-export * from './payment/payment-method-handler';
 export * from './payment/payment-method-eligibility-checker';
+export * from './payment/payment-method-handler';
 export * from './promotion';
 export * from './session-cache/in-memory-session-cache-strategy';
 export * from './session-cache/noop-session-cache-strategy';
@@ -49,4 +49,8 @@ export * from './shipping-method/default-shipping-calculator';
 export * from './shipping-method/default-shipping-eligibility-checker';
 export * from './shipping-method/shipping-calculator';
 export * from './shipping-method/shipping-eligibility-checker';
+export * from './tax/default-tax-line-calculation-strategy';
+export * from './tax/default-tax-zone-strategy';
+export * from './tax/tax-line-calculation-strategy';
+export * from './tax/tax-zone-strategy';
 export * from './vendure-config';

package/dist/config/index.js

@@ -34,25 +34,25 @@ __exportStar(require("./logger/default-logger"), exports);
 __exportStar(require("./logger/noop-logger"), exports);
 __exportStar(require("./logger/vendure-logger"), exports);
 __exportStar(require("./merge-config"), exports);
-__exportStar(require("./order/custom-order-process"), exports);
 __exportStar(require("./order/changed-price-handling-strategy"), exports);
+__exportStar(require("./order/custom-order-process"), exports);
 __exportStar(require("./order/default-changed-price-handling-strategy"), exports);
 __exportStar(require("./order/default-order-placed-strategy"), exports);
 __exportStar(require("./order/default-stock-allocation-strategy"), exports);
 __exportStar(require("./order/merge-orders-strategy"), exports);
 __exportStar(require("./order/order-code-strategy"), exports);
+__exportStar(require("./order/order-item-price-calculation-strategy"), exports);
 __exportStar(require("./order/order-merge-strategy"), exports);
 __exportStar(require("./order/order-placed-strategy"), exports);
+__exportStar(require("./order/stock-allocation-strategy"), exports);
 __exportStar(require("./order/use-existing-strategy"), exports);
-__exportStar(require("./order/use-guest-strategy"), exports);
 __exportStar(require("./order/use-guest-if-existing-empty-strategy"), exports);
-__exportStar(require("./order/order-item-price-calculation-strategy"), exports);
-__exportStar(require("./order/stock-allocation-strategy"), exports);
+__exportStar(require("./order/use-guest-strategy"), exports);
 __exportStar(require("./payment/custom-payment-process"), exports);
 __exportStar(require("./payment/dummy-payment-method-handler"), exports);
 __exportStar(require("./payment/example-payment-method-handler"), exports);
-__exportStar(require("./payment/payment-method-handler"), exports);
 __exportStar(require("./payment/payment-method-eligibility-checker"), exports);
+__exportStar(require("./payment/payment-method-handler"), exports);
 __exportStar(require("./promotion"), exports);
 __exportStar(require("./session-cache/in-memory-session-cache-strategy"), exports);
 __exportStar(require("./session-cache/noop-session-cache-strategy"), exports);
@@ -61,5 +61,9 @@ __exportStar(require("./shipping-method/default-shipping-calculator"), exports);
 __exportStar(require("./shipping-method/default-shipping-eligibility-checker"), exports);
 __exportStar(require("./shipping-method/shipping-calculator"), exports);
 __exportStar(require("./shipping-method/shipping-eligibility-checker"), exports);
+__exportStar(require("./tax/default-tax-line-calculation-strategy"), exports);
+__exportStar(require("./tax/default-tax-zone-strategy"), exports);
+__exportStar(require("./tax/tax-line-calculation-strategy"), exports);
+__exportStar(require("./tax/tax-zone-strategy"), exports);
 __exportStar(require("./vendure-config"), exports);
 //# sourceMappingURL=index.js.map

package/dist/config/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gFAA8D;AAC9D,wFAAsE;AACtE,kFAAgE;AAChE,kFAAgE;AAChE,iEAA+C;AAC/C,wEAAsD;AACtD,8DAA4C;AAC5C,uEAAqD;AACrD,kDAAgC;AAChC,mDAAiC;AACjC,oEAAkD;AAClD,mDAAiC;AACjC,kFAAgE;AAChE,0EAAwD;AACxD,wEAAsD;AACtD,2EAAyD;AACzD,oEAAkD;AAClD,2EAAyD;AACzD,6EAA2D;AAC3D,iEAA+C;AAC/C,0DAAwC;AACxC,uDAAqC;AACrC,0DAAwC;AACxC,iDAA+B;AAC/B,+DAA6C;AAC7C,0EAAwD;AACxD,kFAAgE;AAChE,wEAAsD;AACtD,4EAA0D;AAC1D,gEAA8C;AAC9C,8DAA4C;AAC5C,+DAA6C;AAC7C,gEAA8C;AAC9C,gEAA8C;AAC9C,6DAA2C;AAC3C,+EAA6D;AAC7D,gFAA8D;AAC9D,oEAAkD;AAClD,mEAAiD;AACjD,yEAAuD;AACvD,2EAAyD;AACzD,mEAAiD;AACjD,+EAA6D;AAC7D,8CAA4B;AAC5B,mFAAiE;AACjE,8EAA4D;AAC5D,yEAAuD;AACvD,gFAA8D;AAC9D,yFAAuE;AACvE,wEAAsD;AACtD,iFAA+D;AAC/D,mDAAiC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gFAA8D;AAC9D,wFAAsE;AACtE,kFAAgE;AAChE,kFAAgE;AAChE,iEAA+C;AAC/C,wEAAsD;AACtD,8DAA4C;AAC5C,uEAAqD;AACrD,kDAAgC;AAChC,mDAAiC;AACjC,oEAAkD;AAClD,mDAAiC;AACjC,kFAAgE;AAChE,0EAAwD;AACxD,wEAAsD;AACtD,2EAAyD;AACzD,oEAAkD;AAClD,2EAAyD;AACzD,6EAA2D;AAC3D,iEAA+C;AAC/C,0DAAwC;AACxC,uDAAqC;AACrC,0DAAwC;AACxC,iDAA+B;AAC/B,0EAAwD;AACxD,+DAA6C;AAC7C,kFAAgE;AAChE,wEAAsD;AACtD,4EAA0D;AAC1D,gEAA8C;AAC9C,8DAA4C;AAC5C,gFAA8D;AAC9D,+DAA6C;AAC7C,gEAA8C;AAC9C,oEAAkD;AAClD,gEAA8C;AAC9C,+EAA6D;AAC7D,6DAA2C;AAC3C,mEAAiD;AACjD,yEAAuD;AACvD,2EAAyD;AACzD,+EAA6D;AAC7D,mEAAiD;AACjD,8CAA4B;AAC5B,mFAAiE;AACjE,8EAA4D;AAC5D,yEAAuD;AACvD,gFAA8D;AAC9D,yFAAuE;AACvE,wEAAsD;AACtD,iFAA+D;AAC/D,8EAA4D;AAC5D,kEAAgD;AAChD,sEAAoD;AACpD,0DAAwC;AACxC,mDAAiC"}

package/dist/config/merge-config.d.ts

@@ -5,12 +5,19 @@ import { PartialVendureConfig, VendureConfig } from './vendure-config';
  * not mutated, instead the function returns a new object which is the result of deeply merging the
  * values of `source` into `target`.
  *
+ * Arrays do not get merged, they are treated as a single value that will be replaced. So if merging the
+ * `plugins` array, you must explicitly concatenate the array.
+ *
  * @example
  * ```TypeScript
  * const result = mergeConfig(defaultConfig, {
  *   assetOptions: {
  *     uploadMaxFileSize: 5000,
  *   },
+ *   plugins: [
+ *     ...defaultConfig.plugins,
+ *     MyPlugin,
+ *   ]
  * };
  * ```
  *

package/dist/config/merge-config.js

@@ -9,12 +9,19 @@ const simple_deep_clone_1 = require("@vendure/common/lib/simple-deep-clone");
  * not mutated, instead the function returns a new object which is the result of deeply merging the
  * values of `source` into `target`.
  *
+ * Arrays do not get merged, they are treated as a single value that will be replaced. So if merging the
+ * `plugins` array, you must explicitly concatenate the array.
+ *
  * @example
  * ```TypeScript
  * const result = mergeConfig(defaultConfig, {
  *   assetOptions: {
  *     uploadMaxFileSize: 5000,
  *   },
+ *   plugins: [
+ *     ...defaultConfig.plugins,
+ *     MyPlugin,
+ *   ]
  * };
  * ```
  *

package/dist/config/merge-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"merge-config.js","sourceRoot":"","sources":["../../src/config/merge-config.ts"],"names":[],"mappings":";;;AAAA,mEAA6E;AAC7E,6EAAwE;AAIxE;;;;;;;;;;;;;;;;GAgBG;AACH,SAAgB,WAAW,CAA0B,MAAS,EAAE,MAA4B,EAAE,KAAK,GAAG,CAAC;IACnG,IAAI,CAAC,MAAM,EAAE;QACT,OAAO,MAAM,CAAC;KACjB;IAED,IAAI,KAAK,KAAK,CAAC,EAAE;QACb,MAAM,GAAG,mCAAe,CAAC,MAAM,CAAC,CAAC;KACpC;IAED,IAAI,uBAAQ,CAAC,MAAM,CAAC,IAAI,uBAAQ,CAAC,MAAM,CAAC,EAAE;QACtC,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE;YACtB,IAAI,uBAAQ,CAAE,MAAc,CAAC,GAAG,CAAC,CAAC,EAAE;gBAChC,IAAI,CAAE,MAAc,CAAC,GAAG,CAAC,EAAE;oBACvB,MAAM,CAAC,MAAM,CAAC,MAAa,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;iBAC/C;gBACD,IAAI,CAAC,8BAAe,CAAE,MAAc,CAAC,GAAG,CAAC,CAAC,EAAE;oBACxC,WAAW,CAAE,MAAc,CAAC,GAAG,CAAC,EAAG,MAAc,CAAC,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;iBACtE;qBAAM;oBACF,MAAc,CAAC,GAAG,CAAC,GAAI,MAAc,CAAC,GAAG,CAAC,CAAC;iBAC/C;aACJ;iBAAM;gBACH,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,CAAC,EAAG,MAAc,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;aAC1D;SACJ;KACJ;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AA1BD,kCA0BC"}
+{"version":3,"file":"merge-config.js","sourceRoot":"","sources":["../../src/config/merge-config.ts"],"names":[],"mappings":";;;AAAA,mEAA6E;AAC7E,6EAAwE;AAIxE;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,SAAgB,WAAW,CAA0B,MAAS,EAAE,MAA4B,EAAE,KAAK,GAAG,CAAC;IACnG,IAAI,CAAC,MAAM,EAAE;QACT,OAAO,MAAM,CAAC;KACjB;IAED,IAAI,KAAK,KAAK,CAAC,EAAE;QACb,MAAM,GAAG,mCAAe,CAAC,MAAM,CAAC,CAAC;KACpC;IAED,IAAI,uBAAQ,CAAC,MAAM,CAAC,IAAI,uBAAQ,CAAC,MAAM,CAAC,EAAE;QACtC,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE;YACtB,IAAI,uBAAQ,CAAE,MAAc,CAAC,GAAG,CAAC,CAAC,EAAE;gBAChC,IAAI,CAAE,MAAc,CAAC,GAAG,CAAC,EAAE;oBACvB,MAAM,CAAC,MAAM,CAAC,MAAa,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;iBAC/C;gBACD,IAAI,CAAC,8BAAe,CAAE,MAAc,CAAC,GAAG,CAAC,CAAC,EAAE;oBACxC,WAAW,CAAE,MAAc,CAAC,GAAG,CAAC,EAAG,MAAc,CAAC,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;iBACtE;qBAAM;oBACF,MAAc,CAAC,GAAG,CAAC,GAAI,MAAc,CAAC,GAAG,CAAC,CAAC;iBAC/C;aACJ;iBAAM;gBACH,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,CAAC,EAAG,MAAc,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;aAC1D;SACJ;KACJ;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AA1BD,kCA0BC"}

package/dist/config/payment/payment-method-handler.d.ts

@@ -30,7 +30,7 @@ export interface CreatePaymentResult {
      * In a single-step payment flow, this should be set to `'Settled'`.
      * In a two-step flow, this should be set to `'Authorized'`.
      *
-     * If using a {@link CustomOrderProcess}, may be something else
+     * If using a {@link CustomPaymentProcess}, may be something else
      * entirely according to your business logic.
      */
     state: Exclude<PaymentState, 'Error'>;
@@ -271,7 +271,7 @@ export declare class PaymentMethodHandler<T extends ConfigArgs = ConfigArgs> ext
          * In a single-step payment flow, this should be set to `'Settled'`.
          * In a two-step flow, this should be set to `'Authorized'`.
          *
-         * If using a {@link CustomOrderProcess}, may be something else
+         * If using a {@link CustomPaymentProcess}, may be something else
          * entirely according to your business logic.
          */
         state: "Created" | "Cancelled" | "Authorized" | "Settled" | "Declined";

package/dist/config/promotion/actions/buy-x-get-y-free-action.d.ts

@@ -10,7 +10,7 @@ export declare const buyXGetYFreeAction: PromotionItemAction<{}, import("..").Pr
         type: "ID";
         list: true;
         ui: {
-            component: "product-selector-form-input";
+            component: string;
         };
         label: {
             languageCode: LanguageCode.en;
@@ -25,7 +25,7 @@ export declare const buyXGetYFreeAction: PromotionItemAction<{}, import("..").Pr
         type: "ID";
         list: true;
         ui: {
-            component: "product-selector-form-input";
+            component: string;
         };
         label: {
             languageCode: LanguageCode.en;

package/dist/config/promotion/actions/facet-values-percentage-discount-action.d.ts

@@ -3,7 +3,7 @@ export declare const discountOnItemWithFacets: PromotionItemAction<{
     discount: {
         type: "int";
         ui: {
-            component: "number-form-input";
+            component: string;
             suffix: string;
         };
     };
@@ -11,7 +11,7 @@ export declare const discountOnItemWithFacets: PromotionItemAction<{
         type: "ID";
         list: true;
         ui: {
-            component: "facet-value-form-input";
+            component: string;
         };
     };
 }, []>;

package/dist/config/promotion/actions/order-fixed-discount-action.d.ts

@@ -3,7 +3,7 @@ export declare const orderFixedDiscount: PromotionOrderAction<{
     discount: {
         type: "int";
         ui: {
-            component: "currency-form-input";
+            component: string;
         };
     };
 }, []>;