@vendure/core 1.3.2 → 1.4.0

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

@@ -3,7 +3,7 @@ export declare const orderPercentageDiscount: PromotionOrderAction<{
     discount: {
         type: "int";
         ui: {
-            component: "number-form-input";
+            component: string;
             suffix: string;
         };
     };

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

@@ -4,7 +4,7 @@ export declare const productsPercentageDiscount: PromotionItemAction<{
     discount: {
         type: "int";
         ui: {
-            component: "number-form-input";
+            component: string;
             suffix: string;
         };
     };
@@ -12,7 +12,7 @@ export declare const productsPercentageDiscount: PromotionItemAction<{
         type: "ID";
         list: true;
         ui: {
-            component: "product-selector-form-input";
+            component: string;
         };
         label: {
             languageCode: LanguageCode.en;

package/dist/config/promotion/conditions/buy-x-get-y-free-condition.d.ts

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

package/dist/config/promotion/conditions/contains-products-condition.d.ts

@@ -9,7 +9,7 @@ export declare const containsProducts: PromotionCondition<{
         type: "ID";
         list: true;
         ui: {
-            component: "product-selector-form-input";
+            component: string;
         };
         label: {
             languageCode: LanguageCode.en;

package/dist/config/promotion/conditions/customer-group-condition.d.ts

@@ -4,7 +4,7 @@ export declare const customerGroup: PromotionCondition<{
     customerGroupId: {
         type: "ID";
         ui: {
-            component: "customer-group-form-input";
+            component: string;
         };
         label: {
             languageCode: LanguageCode.en;

package/dist/config/promotion/conditions/has-facet-values-condition.d.ts

@@ -8,7 +8,7 @@ export declare const hasFacetValues: PromotionCondition<{
         type: "ID";
         list: true;
         ui: {
-            component: "facet-value-form-input";
+            component: string;
         };
     };
 }, "at_least_n_with_facets", boolean>;

package/dist/config/promotion/conditions/min-order-amount-condition.d.ts

@@ -4,7 +4,7 @@ export declare const minimumOrderAmount: PromotionCondition<{
         type: "int";
         defaultValue: number;
         ui: {
-            component: "currency-form-input";
+            component: string;
         };
     };
     taxInclusive: {

package/dist/config/promotion/index.d.ts

@@ -17,7 +17,7 @@ export declare const defaultPromotionActions: (import("./promotion-action").Prom
         type: "ID";
         list: true;
         ui: {
-            component: "product-selector-form-input";
+            component: string;
         };
         label: {
             languageCode: import("@vendure/common/lib/generated-types").LanguageCode.en;
@@ -32,7 +32,7 @@ export declare const defaultPromotionActions: (import("./promotion-action").Prom
         type: "ID";
         list: true;
         ui: {
-            component: "product-selector-form-input";
+            component: string;
         };
         label: {
             languageCode: import("@vendure/common/lib/generated-types").LanguageCode.en;
@@ -45,7 +45,7 @@ export declare const defaultPromotionActions: (import("./promotion-action").Prom
     discount: {
         type: "int";
         ui: {
-            component: "number-form-input";
+            component: string;
             suffix: string;
         };
     };
@@ -53,29 +53,21 @@ export declare const defaultPromotionActions: (import("./promotion-action").Prom
         type: "ID";
         list: true;
         ui: {
-            component: "facet-value-form-input";
+            component: string;
         };
     };
 }, []> | import("./promotion-action").PromotionShippingAction<{}, []> | import("./promotion-action").PromotionOrderAction<{
     discount: {
         type: "int";
         ui: {
-            component: "currency-form-input";
-        };
-    };
-}, []> | import("./promotion-action").PromotionOrderAction<{
-    discount: {
-        type: "int";
-        ui: {
-            component: "number-form-input";
-            suffix: string;
+            component: string;
         };
     };
 }, []> | import("./promotion-action").PromotionItemAction<{
     discount: {
         type: "int";
         ui: {
-            component: "number-form-input";
+            component: string;
             suffix: string;
         };
     };
@@ -83,7 +75,7 @@ export declare const defaultPromotionActions: (import("./promotion-action").Prom
         type: "ID";
         list: true;
         ui: {
-            component: "product-selector-form-input";
+            component: string;
         };
         label: {
             languageCode: import("@vendure/common/lib/generated-types").LanguageCode.en;
@@ -100,7 +92,7 @@ export declare const defaultPromotionConditions: (import("./promotion-condition"
         type: "ID";
         list: true;
         ui: {
-            component: "product-selector-form-input";
+            component: string;
         };
         label: {
             languageCode: import("@vendure/common/lib/generated-types").LanguageCode.en;
@@ -115,7 +107,7 @@ export declare const defaultPromotionConditions: (import("./promotion-condition"
         type: "ID";
         list: true;
         ui: {
-            component: "product-selector-form-input";
+            component: string;
         };
         label: {
             languageCode: import("@vendure/common/lib/generated-types").LanguageCode.en;
@@ -133,7 +125,7 @@ export declare const defaultPromotionConditions: (import("./promotion-condition"
         type: "ID";
         list: true;
         ui: {
-            component: "product-selector-form-input";
+            component: string;
         };
         label: {
             languageCode: import("@vendure/common/lib/generated-types").LanguageCode.en;
@@ -144,7 +136,7 @@ export declare const defaultPromotionConditions: (import("./promotion-condition"
     customerGroupId: {
         type: "ID";
         ui: {
-            component: "customer-group-form-input";
+            component: string;
         };
         label: {
             languageCode: import("@vendure/common/lib/generated-types").LanguageCode.en;
@@ -160,7 +152,7 @@ export declare const defaultPromotionConditions: (import("./promotion-condition"
         type: "ID";
         list: true;
         ui: {
-            component: "facet-value-form-input";
+            component: string;
         };
     };
 }, "at_least_n_with_facets", boolean> | import("./promotion-condition").PromotionCondition<{
@@ -168,7 +160,7 @@ export declare const defaultPromotionConditions: (import("./promotion-condition"
         type: "int";
         defaultValue: number;
         ui: {
-            component: "currency-form-input";
+            component: string;
         };
     };
     taxInclusive: {

package/dist/config/shipping-method/default-shipping-calculator.d.ts

@@ -10,7 +10,7 @@ export declare const defaultShippingCalculator: ShippingCalculator<{
         type: "int";
         defaultValue: number;
         ui: {
-            component: "currency-form-input";
+            component: string;
         };
         label: {
             languageCode: LanguageCode.en;
@@ -21,10 +21,10 @@ export declare const defaultShippingCalculator: ShippingCalculator<{
         type: "string";
         defaultValue: TaxSetting;
         ui: {
-            component: "select-form-input";
+            component: string;
             options: {
                 label: {
-                    languageCode: LanguageCode.en;
+                    languageCode: LanguageCode;
                     value: string;
                 }[];
                 value: TaxSetting;
@@ -39,7 +39,7 @@ export declare const defaultShippingCalculator: ShippingCalculator<{
         type: "int";
         defaultValue: number;
         ui: {
-            component: "number-form-input";
+            component: string;
             suffix: string;
         };
         label: {

package/dist/config/shipping-method/default-shipping-eligibility-checker.d.ts

@@ -5,7 +5,7 @@ export declare const defaultShippingEligibilityChecker: ShippingEligibilityCheck
         type: "int";
         defaultValue: number;
         ui: {
-            component: "currency-form-input";
+            component: string;
         };
         label: {
             languageCode: LanguageCode.en;

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"}

package/dist/data-import/providers/import-parser/import-parser.d.ts

@@ -1,57 +1,50 @@
 /// <reference types="node" />
-import { GlobalFlag } from '@vendure/common/lib/generated-types';
+import { GlobalFlag, LanguageCode } from '@vendure/common/lib/generated-types';
 import { Stream } from 'stream';
-export declare type BaseProductRecord = {
-    name?: string;
-    slug?: string;
-    description?: string;
-    assets?: string;
-    facets?: string;
-    optionGroups?: string;
-    optionValues?: string;
-    sku?: string;
-    price?: string;
-    taxCategory?: string;
-    stockOnHand?: string;
-    trackInventory?: string;
-    variantAssets?: string;
-    variantFacets?: string;
-};
-export declare type RawProductRecord = BaseProductRecord & {
-    [customFieldName: string]: string;
-};
+import { ConfigService } from '../../../config/config.service';
+export interface ParsedOptionGroup {
+    translations: Array<{
+        languageCode: LanguageCode;
+        name: string;
+        values: string[];
+    }>;
+}
+export interface ParsedFacet {
+    translations: Array<{
+        languageCode: LanguageCode;
+        facet: string;
+        value: string;
+    }>;
+}
 export interface ParsedProductVariant {
-    optionValues: string[];
     sku: string;
     price: number;
     taxCategory: string;
     stockOnHand: number;
     trackInventory: GlobalFlag;
     assetPaths: string[];
-    facets: Array<{
-        facet: string;
-        value: string;
+    facets: ParsedFacet[];
+    translations: Array<{
+        languageCode: LanguageCode;
+        optionValues: string[];
+        customFields: {
+            [name: string]: string;
+        };
     }>;
-    customFields: {
-        [name: string]: string;
-    };
 }
 export interface ParsedProduct {
-    name: string;
-    slug: string;
-    description: string;
     assetPaths: string[];
-    optionGroups: Array<{
+    optionGroups: ParsedOptionGroup[];
+    facets: ParsedFacet[];
+    translations: Array<{
+        languageCode: LanguageCode;
         name: string;
-        values: string[];
-    }>;
-    facets: Array<{
-        facet: string;
-        value: string;
+        slug: string;
+        description: string;
+        customFields: {
+            [name: string]: string;
+        };
     }>;
-    customFields: {
-        [name: string]: string;
-    };
 }
 export interface ParsedProductWithVariants {
     product: ParsedProduct;
@@ -66,6 +59,13 @@ export interface ParseResult<T> {
  * Validates and parses CSV files into a data structure which can then be used to created new entities.
  */
 export declare class ImportParser {
-    parseProducts(input: string | Stream): Promise<ParseResult<ParsedProductWithVariants>>;
+    private configService;
+    constructor(configService: ConfigService);
+    parseProducts(input: string | Stream, mainLanguage?: LanguageCode): Promise<ParseResult<ParsedProductWithVariants>>;
     private processRawRecords;
+    private validateCustomFields;
+    private isTranslatable;
+    private validateHeaderTranslations;
+    private parseProductFromRecord;
+    private parseVariantFromRecord;
 }