@vendure/core 1.3.4 → 1.4.0-beta.0

package/dist/api/common/validate-custom-field-value.d.ts

@@ -5,4 +5,4 @@ import { CustomFieldConfig } from '../../config/custom-field/custom-field-types'
  * Validates the value of a custom field input against any configured constraints.
  * If validation fails, an error is thrown.
  */
-export declare function validateCustomFieldValue(config: CustomFieldConfig, value: any, injector: Injector, languageCode?: LanguageCode): Promise<void>;
+export declare function validateCustomFieldValue(config: CustomFieldConfig, value: any | any[], injector: Injector, languageCode?: LanguageCode): Promise<void>;

package/dist/api/common/validate-custom-field-value.js

@@ -18,6 +18,18 @@ async function validateCustomFieldValue(config, value, injector, languageCode) {
             });
         }
     }
+    if (config.list === true && Array.isArray(value)) {
+        for (const singleValue of value) {
+            validateSingleValue(config, singleValue);
+        }
+    }
+    else {
+        validateSingleValue(config, value);
+    }
+    await validateCustomFunction(config, value, injector, languageCode);
+}
+exports.validateCustomFieldValue = validateCustomFieldValue;
+function validateSingleValue(config, value) {
     switch (config.type) {
         case 'string':
         case 'localeString':
@@ -37,9 +49,7 @@ async function validateCustomFieldValue(config, value, injector, languageCode) {
         default:
             shared_utils_1.assertNever(config);
     }
-    await validateCustomFunction(config, value, injector, languageCode);
 }
-exports.validateCustomFieldValue = validateCustomFieldValue;
 async function validateCustomFunction(config, value, injector, languageCode) {
     if (typeof config.validate === 'function') {
         const error = await config.validate(value, injector);

package/dist/api/common/validate-custom-field-value.js.map

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

package/dist/api/resolvers/admin/search.resolver.js

@@ -62,7 +62,7 @@ __decorate([
 ], SearchResolver.prototype, "reindex", null);
 __decorate([
     graphql_1.Query(),
-    allow_decorator_1.Allow(generated_types_1.Permission.UpdateCatalog, generated_types_1.Permission.UpdateProduct),
+    allow_decorator_1.Allow(generated_types_1.Permission.ReadCatalog, generated_types_1.Permission.ReadProduct),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Promise)

package/dist/api/resolvers/admin/search.resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"search.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/admin/search.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA0E;AAC1E,yEAAiF;AAGjF,yDAAmE;AAGnE,sEAAyD;AAGzD,IAAa,cAAc,GAA3B,MAAa,cAAc;IAGvB,KAAK,CAAC,MAAM,CAAC,GAAG,IAAS;QACrB,MAAM,IAAI,4BAAmB,CAAC,mCAAmC,CAAC,CAAC;IACvE,CAAC;IAGD,KAAK,CAAC,WAAW,CAAC,GAAG,IAAW;QAC5B,MAAM,IAAI,4BAAmB,CAAC,mCAAmC,CAAC,CAAC;IACvE,CAAC;IAGD,KAAK,CAAC,WAAW,CAAC,GAAG,IAAW;QAC5B,MAAM,IAAI,4BAAmB,CAAC,mCAAmC,CAAC,CAAC;IACvE,CAAC;IAID,KAAK,CAAC,OAAO,CAAC,GAAG,IAAW;QACxB,MAAM,IAAI,4BAAmB,CAAC,mCAAmC,CAAC,CAAC;IACvE,CAAC;IAID,KAAK,CAAC,yBAAyB,CAAC,GAAG,IAAW;QAC1C,MAAM,IAAI,4BAAmB,CAAC,mCAAmC,CAAC,CAAC;IACvE,CAAC;IAID,KAAK,CAAC,4BAA4B,CAAC,GAAG,IAAW;QAC7C,MAAM,IAAI,4BAAmB,CAAC,mCAAmC,CAAC,CAAC;IACvE,CAAC;CACJ,CAAA;AA/BG;IAFC,eAAK,EAAE;IACP,uBAAK,CAAC,4BAAU,CAAC,WAAW,EAAE,4BAAU,CAAC,WAAW,CAAC;;;;4CAGrD;AAGD;IADC,sBAAY,EAAE;;;;iDAGd;AAGD;IADC,sBAAY,EAAE;;;;iDAGd;AAID;IAFC,kBAAQ,EAAE;IACV,uBAAK,CAAC,4BAAU,CAAC,aAAa,EAAE,4BAAU,CAAC,aAAa,CAAC;;;;6CAGzD;AAID;IAFC,eAAK,EAAE;IACP,uBAAK,CAAC,4BAAU,CAAC,aAAa,EAAE,4BAAU,CAAC,aAAa,CAAC;;;;+DAGzD;AAID;IAFC,kBAAQ,EAAE;IACV,uBAAK,CAAC,4BAAU,CAAC,aAAa,EAAE,4BAAU,CAAC,aAAa,CAAC;;;;kEAGzD;AAjCQ,cAAc;IAD1B,kBAAQ,EAAE;GACE,cAAc,CAkC1B;AAlCY,wCAAc"}
+{"version":3,"file":"search.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/admin/search.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA0E;AAC1E,yEAAiF;AAGjF,yDAAmE;AAGnE,sEAAyD;AAGzD,IAAa,cAAc,GAA3B,MAAa,cAAc;IAGvB,KAAK,CAAC,MAAM,CAAC,GAAG,IAAS;QACrB,MAAM,IAAI,4BAAmB,CAAC,mCAAmC,CAAC,CAAC;IACvE,CAAC;IAGD,KAAK,CAAC,WAAW,CAAC,GAAG,IAAW;QAC5B,MAAM,IAAI,4BAAmB,CAAC,mCAAmC,CAAC,CAAC;IACvE,CAAC;IAGD,KAAK,CAAC,WAAW,CAAC,GAAG,IAAW;QAC5B,MAAM,IAAI,4BAAmB,CAAC,mCAAmC,CAAC,CAAC;IACvE,CAAC;IAID,KAAK,CAAC,OAAO,CAAC,GAAG,IAAW;QACxB,MAAM,IAAI,4BAAmB,CAAC,mCAAmC,CAAC,CAAC;IACvE,CAAC;IAID,KAAK,CAAC,yBAAyB,CAAC,GAAG,IAAW;QAC1C,MAAM,IAAI,4BAAmB,CAAC,mCAAmC,CAAC,CAAC;IACvE,CAAC;IAID,KAAK,CAAC,4BAA4B,CAAC,GAAG,IAAW;QAC7C,MAAM,IAAI,4BAAmB,CAAC,mCAAmC,CAAC,CAAC;IACvE,CAAC;CACJ,CAAA;AA/BG;IAFC,eAAK,EAAE;IACP,uBAAK,CAAC,4BAAU,CAAC,WAAW,EAAE,4BAAU,CAAC,WAAW,CAAC;;;;4CAGrD;AAGD;IADC,sBAAY,EAAE;;;;iDAGd;AAGD;IADC,sBAAY,EAAE;;;;iDAGd;AAID;IAFC,kBAAQ,EAAE;IACV,uBAAK,CAAC,4BAAU,CAAC,aAAa,EAAE,4BAAU,CAAC,aAAa,CAAC;;;;6CAGzD;AAID;IAFC,eAAK,EAAE;IACP,uBAAK,CAAC,4BAAU,CAAC,WAAW,EAAE,4BAAU,CAAC,WAAW,CAAC;;;;+DAGrD;AAID;IAFC,kBAAQ,EAAE;IACV,uBAAK,CAAC,4BAAU,CAAC,aAAa,EAAE,4BAAU,CAAC,aAAa,CAAC;;;;kEAGzD;AAjCQ,cAAc;IAD1B,kBAAQ,EAAE;GACE,cAAc,CAkC1B;AAlCY,wCAAc"}

package/dist/api/schema/admin-api/order.api.graphql

@@ -22,7 +22,10 @@ type Mutation {
     """
     modifyOrder(input: ModifyOrderInput!): ModifyOrderResult!
     """
-    Used to manually create a new Payment against an Order. This is used when a completed Order
+    Used to manually create a new Payment against an Order.
+    This can be used by an Administrator when an Order is in the ArrangingPayment state.
+
+    It is also used when a completed Order
     has been modified (using `modifyOrder`) and the price has increased. The extra payment
     can then be manually arranged by the administrator, and the details used to create a new
     Payment.

package/dist/api/schema/common/custom-field-types.graphql

@@ -7,6 +7,7 @@ interface CustomField {
     readonly: Boolean
     internal: Boolean
     nullable: Boolean
+    ui: JSON
 }
 
 type StringCustomFieldConfig implements CustomField {
@@ -21,6 +22,7 @@ type StringCustomFieldConfig implements CustomField {
     nullable: Boolean
     pattern: String
     options: [StringFieldOption!]
+    ui: JSON
 }
 
 type StringFieldOption {
@@ -39,6 +41,7 @@ type LocaleStringCustomFieldConfig implements CustomField {
     internal: Boolean
     nullable: Boolean
     pattern: String
+    ui: JSON
 }
 type IntCustomFieldConfig implements CustomField {
     name: String!
@@ -52,6 +55,7 @@ type IntCustomFieldConfig implements CustomField {
     min: Int
     max: Int
     step: Int
+    ui: JSON
 }
 type FloatCustomFieldConfig implements CustomField {
     name: String!
@@ -65,6 +69,7 @@ type FloatCustomFieldConfig implements CustomField {
     min: Float
     max: Float
     step: Float
+    ui: JSON
 }
 type BooleanCustomFieldConfig implements CustomField {
     name: String!
@@ -75,6 +80,7 @@ type BooleanCustomFieldConfig implements CustomField {
     readonly: Boolean
     internal: Boolean
     nullable: Boolean
+    ui: JSON
 }
 """
 Expects the same validation formats as the `<input type="datetime-local">` HTML element.
@@ -92,6 +98,7 @@ type DateTimeCustomFieldConfig implements CustomField {
     min: String
     max: String
     step: Int
+    ui: JSON
 }
 
 type RelationCustomFieldConfig implements CustomField {
@@ -105,6 +112,7 @@ type RelationCustomFieldConfig implements CustomField {
     nullable: Boolean
     entity: String!
     scalarFields: [String!]!
+    ui: JSON
 }
 
 type TextCustomFieldConfig implements CustomField {
@@ -116,6 +124,7 @@ type TextCustomFieldConfig implements CustomField {
     readonly: Boolean
     internal: Boolean
     nullable: Boolean
+    ui: JSON
 }
 
 type LocalizedString {

package/dist/api/schema/shop-api/shop.api.graphql

@@ -164,7 +164,7 @@ Passed as input to the `addPaymentToOrder` mutation.
 """
 input PaymentInput {
     """
-    This field should correspond to the `code` property of a PaymentMethodHandler.
+    This field should correspond to the `code` property of a PaymentMethod.
     """
     method: String!
     """

package/dist/common/configurable-operation.d.ts

@@ -1,5 +1,5 @@
 import { ConfigArg, ConfigurableOperationDefinition, LocalizedString, Maybe, StringFieldOption } from '@vendure/common/lib/generated-types';
-import { ConfigArgType, DefaultFormComponentConfig, ID } from '@vendure/common/lib/shared-types';
+import { ConfigArgType, ID, UiComponentConfig } from '@vendure/common/lib/shared-types';
 import { RequestContext } from '../api/common/request-context';
 import { Injector } from './injector';
 import { InjectableStrategy } from './types/injectable-strategy';
@@ -21,28 +21,6 @@ import { InjectableStrategy } from './types/injectable-strategy';
  * @docsCategory ConfigurableOperationDef
  */
 export declare type LocalizedStringArray = Array<Omit<LocalizedString, '__typename'>>;
-export declare type UiComponentConfig = ({
-    component: 'number-form-input';
-} & DefaultFormComponentConfig<'number-form-input'>) | ({
-    component: 'date-form-input';
-} & DefaultFormComponentConfig<'date-form-input'>) | ({
-    component: 'select-form-input';
-} & DefaultFormComponentConfig<'select-form-input'>) | ({
-    component: 'text-form-input';
-} & DefaultFormComponentConfig<'text-form-input'>) | ({
-    component: 'boolean-form-input';
-} & DefaultFormComponentConfig<'boolean-form-input'>) | ({
-    component: 'currency-form-input';
-} & DefaultFormComponentConfig<'currency-form-input'>) | ({
-    component: 'facet-value-form-input';
-} & DefaultFormComponentConfig<'facet-value-form-input'>) | ({
-    component: 'product-selector-form-input';
-} & DefaultFormComponentConfig<'product-selector-form-input'>) | ({
-    component: 'customer-group-form-input';
-} & DefaultFormComponentConfig<'customer-group-form-input'>) | {
-    component: string;
-    [prop: string]: any;
-};
 export interface ConfigArgCommonDef<T extends ConfigArgType> {
     type: T;
     required?: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"configurable-operation.js","sourceRoot":"","sources":["../../src/common/configurable-operation.ts"],"names":[],"mappings":";;;AAWA,mEAA+D;AAI/D,2CAAoD;AACpD,2CAAqD;AA2PrD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2EG;AACH,MAAa,wBAAwB;IAUjC,YAAsB,OAA2C;QAA3C,YAAO,GAAP,OAAO,CAAoC;IAAG,CAAC;IATrE,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;IAC7B,CAAC;IACD,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;IAC7B,CAAC;IACD,IAAI,WAAW;QACX,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;IACpC,CAAC;IAGD,KAAK,CAAC,IAAI,CAAC,QAAkB;QACzB,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,UAAU,EAAE;YACzC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACrC;IACL,CAAC;IACD,KAAK,CAAC,OAAO;QACT,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,KAAK,UAAU,EAAE;YAC5C,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;SAChC;IACL,CAAC;IAED;;;;OAIG;IACH,aAAa,CAAC,GAAmB;QAC7B,OAAO;YACH,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,cAAc,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,YAAY,CAAC;YAC/D,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAC/B,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE;;gBACZ,OAAA,CAAC;oBACG,IAAI;oBACJ,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,IAAI,EAAE,MAAA,GAAG,CAAC,IAAI,mCAAI,KAAK;oBACvB,QAAQ,EAAE,MAAA,GAAG,CAAC,QAAQ,mCAAI,IAAI;oBAC9B,YAAY,EAAE,GAAG,CAAC,YAAY;oBAC9B,EAAE,EAAE,GAAG,CAAC,EAAE;oBACV,KAAK,EAAE,GAAG,CAAC,KAAK,IAAI,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,YAAY,CAAC;oBAC/D,WAAW,EAAE,GAAG,CAAC,WAAW,IAAI,cAAc,CAAC,GAAG,CAAC,WAAW,EAAE,GAAG,CAAC,YAAY,CAAC;iBAClD,CAAA,CAAA;aAAA,CAC1C;SACJ,CAAC;IACN,CAAC;IAED;;;;;;;;;QASI;IACM,eAAe,CAAC,IAAiB;QACvC,MAAM,MAAM,GAAuB,EAAS,CAAC;QAC7C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACpB,IAAI,GAAG,IAAI,GAAG,CAAC,KAAK,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE;gBACzD,MAAM,CAAC,GAAG,CAAC,IAAgC,CAAC,GAAG,iBAAiB,CAC5D,GAAG,CAAC,KAAK,EACT,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,EACxB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,KAAK,CACpC,CAAC;aACL;SACJ;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AAvED,4DAuEC;AAED,SAAS,cAAc,CAAC,WAAiC,EAAE,YAA0B;IACjF,IAAI,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,YAAY,CAAC,CAAC;IACnE,IAAI,CAAC,KAAK,EAAE;QACR,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,iCAAqB,CAAC,CAAC;KAC3E;IACD,IAAI,CAAC,KAAK,EAAE;QACR,KAAK,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;KAC1B;IACD,OAAO,KAAK,CAAC,KAAK,CAAC;AACvB,CAAC;AAED,SAAS,iBAAiB,CACtB,KAAa,EACb,IAAmB,EACnB,MAAe;IAEf,IAAI,MAAM,EAAE;QACR,IAAI;YACA,OAAQ,IAAI,CAAC,KAAK,CAAC,KAAK,CAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAQ,CAAC;SAC7F;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,IAAI,4BAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;SAC9C;KACJ;IACD,QAAQ,IAAI,EAAE;QACV,KAAK,QAAQ;YACT,OAAO,KAAY,CAAC;QACxB,KAAK,KAAK;YACN,OAAO,MAAM,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE,EAAE,EAAE,CAAQ,CAAC;QACnD,KAAK,OAAO;YACR,OAAO,MAAM,CAAC,UAAU,CAAC,KAAK,IAAI,EAAE,CAAQ,CAAC;QACjD,KAAK,UAAU;YACX,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAQ,CAAC;QAC1C,KAAK,SAAS;YACV,OAAO,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,MAAM,IAAI,KAAK,KAAK,GAAG,CAAC,CAAQ,CAAC;QACjF,KAAK,IAAI;YACL,OAAO,KAAY,CAAC;QACxB;YACI,0BAAW,CAAC,IAAI,CAAC,CAAC;KACzB;AACL,CAAC"}
+{"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

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

@@ -13,20 +13,21 @@ const vendure_logger_1 = require("../config/logger/vendure-logger");
  * 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/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, 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;
 };
 /**
  * @description
@@ -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/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/connection/connection.module.d.ts

@@ -3,5 +3,5 @@ import { ConnectionOptions } from 'typeorm';
 export declare class ConnectionModule {
     static forRoot(): DynamicModule;
     static forPlugin(): DynamicModule;
-    static getTypeOrmLogger(dbConnectionOptions: ConnectionOptions): "debug" | "advanced-console" | "simple-console" | "file" | import("typeorm").Logger;
+    static getTypeOrmLogger(dbConnectionOptions: ConnectionOptions): "debug" | import("typeorm").Logger | "advanced-console" | "simple-console" | "file";
 }

package/dist/connection/transaction-subscriber.js

@@ -44,7 +44,14 @@ let TransactionSubscriber = TransactionSubscriber_1 = class TransactionSubscribe
     awaitRelease(queryRunner) {
         if (queryRunner.isTransactionActive) {
             return rxjs_1.merge(this.commit$, this.rollback$)
-                .pipe(operators_1.filter(event => event.queryRunner === queryRunner), operators_1.take(1), operators_1.map(event => event.queryRunner))
+                .pipe(operators_1.filter(event => event.queryRunner === queryRunner), operators_1.take(1), operators_1.map(event => event.queryRunner), 
+            // This `delay(0)` call appears to be necessary with the upgrade to TypeORM
+            // v0.2.41, otherwise an active queryRunner can still get picked up in an event
+            // subscriber function. This is manifested by the e2e test
+            // "Transaction infrastructure › passing transaction via EventBus" failing
+            // in the database-transactions.e2e-spec.ts suite, and a bunch of errors
+            // in the default-search-plugin.e2e-spec.ts suite when using sqljs.
+            operators_1.delay(0))
                 .toPromise();
         }
         else {

package/dist/connection/transaction-subscriber.js.map

@@ -1 +1 @@
-{"version":3,"file":"transaction-subscriber.js","sourceRoot":"","sources":["../../src/connection/transaction-subscriber.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,+BAAsC;AACtC,8CAAmD;AACnD,qCAAgE;AAuBhE;;;;;;GAMG;AAEH,IAAa,qBAAqB,6BAAlC,MAAa,qBAAqB;IAI9B,YAAwC,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;QAHtD,YAAO,GAAG,IAAI,cAAO,EAA8B,CAAC;QACpD,cAAS,GAAG,IAAI,cAAO,EAA8B,CAAC;QAG1D,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,KAAK,uBAAqB,CAAC,EAAE;YAC9F,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACrC;IACL,CAAC;IAED,sBAAsB,CAAC,KAA6B;QAChD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;IAED,wBAAwB,CAAC,KAA+B;QACpD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED,YAAY,CAAC,WAAwB;QACjC,IAAI,WAAW,CAAC,mBAAmB,EAAE;YACjC,OAAO,YAAK,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC;iBACrC,IAAI,CACD,kBAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,KAAK,WAAW,CAAC,EAClD,gBAAI,CAAC,CAAC,CAAC,EACP,eAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAClC;iBACA,SAAS,EAAE,CAAC;SACpB;aAAM;YACH,OAAO,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;SACvC;IACL,CAAC;CACJ,CAAA;AA/BY,qBAAqB;IADjC,mBAAU,EAAE;IAKI,WAAA,0BAAgB,EAAE,CAAA;qCAAqB,oBAAU;GAJrD,qBAAqB,CA+BjC;AA/BY,sDAAqB"}
+{"version":3,"file":"transaction-subscriber.js","sourceRoot":"","sources":["../../src/connection/transaction-subscriber.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,+BAAsC;AACtC,8CAA0D;AAC1D,qCAAgE;AAuBhE;;;;;;GAMG;AAEH,IAAa,qBAAqB,6BAAlC,MAAa,qBAAqB;IAI9B,YAAwC,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;QAHtD,YAAO,GAAG,IAAI,cAAO,EAA8B,CAAC;QACpD,cAAS,GAAG,IAAI,cAAO,EAA8B,CAAC;QAG1D,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,KAAK,uBAAqB,CAAC,EAAE;YAC9F,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACrC;IACL,CAAC;IAED,sBAAsB,CAAC,KAA6B;QAChD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;IAED,wBAAwB,CAAC,KAA+B;QACpD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED,YAAY,CAAC,WAAwB;QACjC,IAAI,WAAW,CAAC,mBAAmB,EAAE;YACjC,OAAO,YAAK,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC;iBACrC,IAAI,CACD,kBAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,KAAK,WAAW,CAAC,EAClD,gBAAI,CAAC,CAAC,CAAC,EACP,eAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC;YAC/B,2EAA2E;YAC3E,+EAA+E;YAC/E,0DAA0D;YAC1D,0EAA0E;YAC1E,wEAAwE;YACxE,mEAAmE;YACnE,iBAAK,CAAC,CAAC,CAAC,CACX;iBACA,SAAS,EAAE,CAAC;SACpB;aAAM;YACH,OAAO,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;SACvC;IACL,CAAC;CACJ,CAAA;AAtCY,qBAAqB;IADjC,mBAAU,EAAE;IAKI,WAAA,0BAAgB,EAAE,CAAA;qCAAqB,oBAAU;GAJrD,qBAAqB,CAsCjC;AAtCY,sDAAqB"}