@vendure/core 2.0.0-next.10 → 2.0.0-next.11
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.
- package/dist/api/config/generate-resolvers.js +7 -1
- package/dist/api/config/generate-resolvers.js.map +1 -1
- package/dist/api/schema/admin-api/order.api.graphql +2 -0
- package/dist/bootstrap.js +2 -3
- package/dist/bootstrap.js.map +1 -1
- package/dist/config/asset-naming-strategy/default-asset-naming-strategy.js +1 -1
- package/dist/config/asset-naming-strategy/default-asset-naming-strategy.js.map +1 -1
- package/dist/config/config-helpers.d.ts +4 -0
- package/dist/config/config-helpers.js +8 -1
- package/dist/config/config-helpers.js.map +1 -1
- package/dist/config/config.module.js +9 -0
- package/dist/config/config.module.js.map +1 -1
- package/dist/config/fulfillment/custom-fulfillment-process.d.ts +2 -2
- package/dist/config/logger/vendure-logger.d.ts +1 -0
- package/dist/config/logger/vendure-logger.js.map +1 -1
- package/dist/config/order/custom-order-process.d.ts +2 -2
- package/dist/config/order/order-item-price-calculation-strategy.d.ts +3 -0
- package/dist/config/payment/custom-payment-process.d.ts +2 -2
- package/dist/connection/connection.module.d.ts +1 -1
- package/dist/connection/transactional-connection.d.ts +33 -0
- package/dist/connection/transactional-connection.js +51 -0
- package/dist/connection/transactional-connection.js.map +1 -1
- package/dist/entity/order-line/order-line.entity.js +4 -0
- package/dist/entity/order-line/order-line.entity.js.map +1 -1
- package/dist/plugin/default-search-plugin/search-strategy/mysql-search-strategy.js +3 -3
- package/dist/plugin/default-search-plugin/search-strategy/postgres-search-strategy.js +5 -5
- package/dist/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.js +4 -4
- package/dist/plugin/plugin-metadata.js +2 -1
- package/dist/plugin/plugin-metadata.js.map +1 -1
- package/dist/plugin/vendure-plugin.d.ts +11 -2
- package/dist/plugin/vendure-plugin.js.map +1 -1
- package/dist/service/helpers/fulfillment-state-machine/fulfillment-state.d.ts +9 -1
- package/dist/service/helpers/fulfillment-state-machine/fulfillment-state.js.map +1 -1
- package/dist/service/helpers/list-query-builder/connection-utils.js +7 -1
- package/dist/service/helpers/list-query-builder/connection-utils.js.map +1 -1
- package/dist/service/helpers/list-query-builder/list-query-builder.d.ts +10 -5
- package/dist/service/helpers/list-query-builder/list-query-builder.js +17 -8
- package/dist/service/helpers/list-query-builder/list-query-builder.js.map +1 -1
- package/dist/service/helpers/order-calculator/order-calculator.d.ts +18 -0
- package/dist/service/helpers/order-calculator/order-calculator.js +18 -0
- package/dist/service/helpers/order-calculator/order-calculator.js.map +1 -1
- package/dist/service/helpers/order-modifier/order-modifier.d.ts +16 -0
- package/dist/service/helpers/order-modifier/order-modifier.js +42 -13
- package/dist/service/helpers/order-modifier/order-modifier.js.map +1 -1
- package/dist/service/helpers/order-state-machine/order-state.d.ts +9 -1
- package/dist/service/helpers/order-state-machine/order-state.js.map +1 -1
- package/dist/service/helpers/payment-state-machine/payment-state.d.ts +9 -1
- package/dist/service/helpers/payment-state-machine/payment-state.js.map +1 -1
- package/dist/service/helpers/product-price-applicator/product-price-applicator.d.ts +26 -2
- package/dist/service/helpers/product-price-applicator/product-price-applicator.js +26 -2
- package/dist/service/helpers/product-price-applicator/product-price-applicator.js.map +1 -1
- package/dist/service/helpers/slug-validator/slug-validator.d.ts +16 -0
- package/dist/service/helpers/slug-validator/slug-validator.js +8 -0
- package/dist/service/helpers/slug-validator/slug-validator.js.map +1 -1
- package/dist/service/helpers/translatable-saver/translatable-saver.d.ts +28 -1
- package/dist/service/helpers/translatable-saver/translatable-saver.js +28 -1
- package/dist/service/helpers/translatable-saver/translatable-saver.js.map +1 -1
- package/dist/service/services/order.service.js +10 -1
- package/dist/service/services/order.service.js.map +1 -1
- package/dist/service/services/product.service.js +11 -8
- package/dist/service/services/product.service.js.map +1 -1
- package/dist/service/services/promotion.service.js +4 -1
- package/dist/service/services/promotion.service.js.map +1 -1
- package/dist/service/services/user.service.js +8 -0
- package/dist/service/services/user.service.js.map +1 -1
- package/package.json +3 -3
|
@@ -7,6 +7,7 @@ const graphql_upload_1 = require("graphql-upload");
|
|
|
7
7
|
const constants_1 = require("../../common/constants");
|
|
8
8
|
const generated_graphql_admin_errors_1 = require("../../common/error/generated-graphql-admin-errors");
|
|
9
9
|
const generated_graphql_shop_errors_1 = require("../../common/error/generated-graphql-shop-errors");
|
|
10
|
+
const plugin_metadata_1 = require("../../plugin/plugin-metadata");
|
|
10
11
|
/**
|
|
11
12
|
* @description
|
|
12
13
|
* Generates additional resolvers required for things like resolution of union types,
|
|
@@ -83,7 +84,7 @@ function generateResolvers(configService, customFieldRelationResolverService, ap
|
|
|
83
84
|
const adminResolvers = Object.assign(Object.assign({ StockMovementItem: stockMovementResolveType, StockMovement: stockMovementResolveType }, generated_graphql_admin_errors_1.adminErrorOperationTypeResolvers), customFieldRelationResolvers.adminResolvers);
|
|
84
85
|
const shopResolvers = Object.assign(Object.assign({}, generated_graphql_shop_errors_1.shopErrorOperationTypeResolvers), customFieldRelationResolvers.shopResolvers);
|
|
85
86
|
const resolvers = apiType === 'admin'
|
|
86
|
-
? Object.assign(Object.assign({}, commonResolvers), adminResolvers) : Object.assign(Object.assign({}, commonResolvers), shopResolvers);
|
|
87
|
+
? Object.assign(Object.assign(Object.assign({}, commonResolvers), adminResolvers), getCustomScalars(configService, 'admin')) : Object.assign(Object.assign(Object.assign({}, commonResolvers), shopResolvers), getCustomScalars(configService, 'shop'));
|
|
87
88
|
return resolvers;
|
|
88
89
|
}
|
|
89
90
|
exports.generateResolvers = generateResolvers;
|
|
@@ -150,6 +151,11 @@ function generateCustomFieldRelationResolvers(configService, customFieldRelation
|
|
|
150
151
|
}
|
|
151
152
|
return { adminResolvers, shopResolvers };
|
|
152
153
|
}
|
|
154
|
+
function getCustomScalars(configService, apiType) {
|
|
155
|
+
return (0, plugin_metadata_1.getPluginAPIExtensions)(configService.plugins, apiType)
|
|
156
|
+
.map(e => { var _a; return (typeof e.scalars === 'function' ? e.scalars() : (_a = e.scalars) !== null && _a !== void 0 ? _a : {}); })
|
|
157
|
+
.reduce((all, scalarMap) => (Object.assign(Object.assign({}, all), scalarMap)), {});
|
|
158
|
+
}
|
|
153
159
|
function isRelationalType(input) {
|
|
154
160
|
return input.type === 'relation';
|
|
155
161
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-resolvers.js","sourceRoot":"","sources":["../../../src/api/config/generate-resolvers.ts"],"names":[],"mappings":";;;AACA,yEAAwE;AAExE,qDAA+D;AAC/D,mDAA+C;AAE/C,sDAA6D;AAC7D,sGAG2D;AAC3D,oGAAmG;
|
|
1
|
+
{"version":3,"file":"generate-resolvers.js","sourceRoot":"","sources":["../../../src/api/config/generate-resolvers.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,10 +39,12 @@ type Order {
|
|
|
39
39
|
|
|
40
40
|
input OrderFilterParameter {
|
|
41
41
|
customerLastName: StringOperators
|
|
42
|
+
transactionId: StringOperators
|
|
42
43
|
}
|
|
43
44
|
|
|
44
45
|
input OrderSortParameter {
|
|
45
46
|
customerLastName: SortOrder
|
|
47
|
+
transactionId: SortOrder
|
|
46
48
|
}
|
|
47
49
|
|
|
48
50
|
# generated by generateListOptions function
|
package/dist/bootstrap.js
CHANGED
|
@@ -108,11 +108,10 @@ exports.bootstrap = bootstrap;
|
|
|
108
108
|
* @docsCategory worker
|
|
109
109
|
* */
|
|
110
110
|
async function bootstrapWorker(userConfig) {
|
|
111
|
+
var _a, _b;
|
|
111
112
|
const vendureConfig = await preBootstrapConfig(userConfig);
|
|
112
113
|
const config = disableSynchronize(vendureConfig);
|
|
113
|
-
|
|
114
|
-
config.logger.setDefaultContext('Vendure Worker');
|
|
115
|
-
}
|
|
114
|
+
(_b = (_a = config.logger).setDefaultContext) === null || _b === void 0 ? void 0 : _b.call(_a, 'Vendure Worker');
|
|
116
115
|
vendure_logger_1.Logger.useLogger(config.logger);
|
|
117
116
|
vendure_logger_1.Logger.info(`Bootstrapping Vendure Worker (pid: ${process.pid})...`);
|
|
118
117
|
(0, process_context_1.setProcessContext)('worker');
|
package/dist/bootstrap.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../src/bootstrap.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AACA,uCAA2C;AAC3C,6CAAqD;AAErD,gDAAiD;AAGjD,kDAA4D;AAC5D,4DAA+D;AAC/D,mEAA+D;AAC/D,mEAAwD;AAExD,sFAA4E;AAC5E,gDAAoD;AACpD,0FAAoF;AACpF,0FAAoF;AACpF,4EAAsE;AACtE,0FAAoF;AACpF,8DAA4F;AAC5F,wDAAiE;AACjE,uEAAsE;AACtE,4DAAwD;AAIxD;;;;;;;;;;;;;;KAcK;AACE,KAAK,UAAU,SAAS,CAAC,UAAkC;IAC9D,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,UAAU,CAAC,CAAC;IACpD,uBAAM,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAChC,uBAAM,CAAC,IAAI,CAAC,sCAAsC,OAAO,CAAC,GAAG,MAAM,CAAC,CAAC;IAErE,8EAA8E;IAC9E,gFAAgF;IAChF,sCAAsC;IACtC,MAAM,SAAS,GAAG,wDAAa,cAAc,GAAC,CAAC;IAC/C,IAAA,mCAAiB,EAAC,QAAQ,CAAC,CAAC;IAC5B,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC;IAC/D,8BAAa,CAAC,oBAAoB,EAAE,CAAC;IACrC,MAAM,GAAG,GAAG,MAAM,kBAAW,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE;QACtD,IAAI;QACJ,MAAM,EAAE,IAAI,uBAAM,EAAE;KACvB,CAAC,CAAC;IACH,8BAAa,CAAC,uBAAuB,EAAE,CAAC;IACxC,GAAG,CAAC,SAAS,CAAC,IAAI,uBAAM,EAAE,CAAC,CAAC;IAC5B,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC;IAC3C,MAAM,WAAW,GACb,WAAW,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC/F,IAAI,WAAW,EAAE;QACb,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC;QAC7C,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,CAAC;KACzC;IACD,MAAM,gBAAgB,GAAG,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IACpE,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC3B,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IACH,MAAM,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,IAAI,EAAE,CAAC,CAAC;IACvC,GAAG,CAAC,mBAAmB,EAAE,CAAC;IAC1B,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAC1B,OAAO,GAAG,CAAC;AACf,CAAC;AAjCD,8BAiCC;AAED;;;;;;;;;;;;;;;;;;;;;KAqBK;AACE,KAAK,UAAU,eAAe,CAAC,UAAkC
|
|
1
|
+
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../src/bootstrap.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AACA,uCAA2C;AAC3C,6CAAqD;AAErD,gDAAiD;AAGjD,kDAA4D;AAC5D,4DAA+D;AAC/D,mEAA+D;AAC/D,mEAAwD;AAExD,sFAA4E;AAC5E,gDAAoD;AACpD,0FAAoF;AACpF,0FAAoF;AACpF,4EAAsE;AACtE,0FAAoF;AACpF,8DAA4F;AAC5F,wDAAiE;AACjE,uEAAsE;AACtE,4DAAwD;AAIxD;;;;;;;;;;;;;;KAcK;AACE,KAAK,UAAU,SAAS,CAAC,UAAkC;IAC9D,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,UAAU,CAAC,CAAC;IACpD,uBAAM,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAChC,uBAAM,CAAC,IAAI,CAAC,sCAAsC,OAAO,CAAC,GAAG,MAAM,CAAC,CAAC;IAErE,8EAA8E;IAC9E,gFAAgF;IAChF,sCAAsC;IACtC,MAAM,SAAS,GAAG,wDAAa,cAAc,GAAC,CAAC;IAC/C,IAAA,mCAAiB,EAAC,QAAQ,CAAC,CAAC;IAC5B,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC;IAC/D,8BAAa,CAAC,oBAAoB,EAAE,CAAC;IACrC,MAAM,GAAG,GAAG,MAAM,kBAAW,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE;QACtD,IAAI;QACJ,MAAM,EAAE,IAAI,uBAAM,EAAE;KACvB,CAAC,CAAC;IACH,8BAAa,CAAC,uBAAuB,EAAE,CAAC;IACxC,GAAG,CAAC,SAAS,CAAC,IAAI,uBAAM,EAAE,CAAC,CAAC;IAC5B,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC;IAC3C,MAAM,WAAW,GACb,WAAW,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC/F,IAAI,WAAW,EAAE;QACb,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC;QAC7C,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,CAAC;KACzC;IACD,MAAM,gBAAgB,GAAG,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IACpE,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC3B,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IACH,MAAM,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,IAAI,EAAE,CAAC,CAAC;IACvC,GAAG,CAAC,mBAAmB,EAAE,CAAC;IAC1B,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAC1B,OAAO,GAAG,CAAC;AACf,CAAC;AAjCD,8BAiCC;AAED;;;;;;;;;;;;;;;;;;;;;KAqBK;AACE,KAAK,UAAU,eAAe,CAAC,UAAkC;;IACpE,MAAM,aAAa,GAAG,MAAM,kBAAkB,CAAC,UAAU,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,kBAAkB,CAAC,aAAa,CAAC,CAAC;IACjD,MAAA,MAAA,MAAM,CAAC,MAAM,EAAC,iBAAiB,mDAAG,gBAAgB,CAAC,CAAC;IACpD,uBAAM,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAChC,uBAAM,CAAC,IAAI,CAAC,sCAAsC,OAAO,CAAC,GAAG,MAAM,CAAC,CAAC;IAErE,IAAA,mCAAiB,EAAC,QAAQ,CAAC,CAAC;IAC5B,8BAAa,CAAC,oBAAoB,EAAE,CAAC;IAErC,MAAM,YAAY,GAAG,MAAM,kDAAO,wBAAwB,IAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;IACtF,MAAM,SAAS,GAAG,MAAM,kBAAW,CAAC,wBAAwB,CAAC,YAAY,EAAE;QACvE,MAAM,EAAE,IAAI,uBAAM,EAAE;KACvB,CAAC,CAAC;IACH,8BAAa,CAAC,uBAAuB,EAAE,CAAC;IACxC,SAAS,CAAC,SAAS,CAAC,IAAI,uBAAM,EAAE,CAAC,CAAC;IAClC,SAAS,CAAC,mBAAmB,EAAE,CAAC;IAChC,MAAM,yBAAyB,CAAC,SAAS,CAAC,CAAC;IAC3C,uBAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IACvC,OAAO,IAAI,8BAAa,CAAC,SAAS,CAAC,CAAC;AACxC,CAAC;AApBD,0CAoBC;AAED;;GAEG;AACI,KAAK,UAAU,kBAAkB,CACpC,UAAkC;;IAElC,IAAI,UAAU,EAAE;QACZ,IAAA,0BAAS,EAAC,UAAU,CAAC,CAAC;KACzB;IAED,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,UAAU,CAAC,CAAC;IAClD,MAAM,EAAE,kBAAkB,EAAE,GAAG,wDAAa,sBAAsB,GAAC,CAAC;IACpE,IAAA,0BAAS,EAAC;QACN,mBAAmB,EAAE;YACjB,QAAQ;YACR,WAAW,EAAE;gBACT,GAAG,CAAC,MAAA,MAAA,UAAU,CAAC,mBAAmB,0CAAE,WAAW,mCAAI,EAAE,CAAC;gBACtD,GAAI,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAA4C;aACnF;SACJ;KACJ,CAAC,CAAC;IAEH,IAAI,MAAM,GAAG,IAAA,0BAAS,GAAE,CAAC;IACzB,MAAM,gBAAgB,GAAG,MAAA,MAAM,CAAC,aAAa,CAAC,gBAAgB,mCAAI,MAAM,CAAC,gBAAgB,CAAC;IAC1F,IAAA,4CAAmB,EAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;IAChD,MAAM,2BAA2B,GAAG,IAAA,0DAA0B,EAAC,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;IAC9F,IAAI,CAAC,2BAA2B,CAAC,KAAK,EAAE;QACpC,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,gCAAgC,GAAG,2BAA2B,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;KACvG;IACD,MAAM,GAAG,MAAM,uBAAuB,CAAC,MAAM,CAAC,CAAC;IAC/C,IAAA,0DAA0B,EAAC,MAAM,CAAC,CAAC;IACnC,MAAM,IAAA,0DAA0B,EAAC,MAAM,CAAC,CAAC;IACzC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAC1B,OAAO,MAAM,CAAC;AAClB,CAAC;AAhCD,gDAgCC;AAED;;GAEG;AACH,KAAK,UAAU,uBAAuB,CAAC,MAA4B;IAC/D,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE;QACjC,MAAM,QAAQ,GAAG,IAAA,0CAAwB,EAAC,MAAM,CAAC,CAAC;QAClD,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;YAChC,MAAM,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,CAAC;SACnC;KACJ;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,cAAc,CAAC,UAAkC;IACnE,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,0BAAe,CAAqB,CAAC;IACxE,MAAM,cAAc,GAAG,IAAA,wCAAsB,EAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAElE,MAAM,WAAW,GAAqB,YAAY,CAAC;IAEnD,mEAAmE;IACnE,yCAAyC;IACzC,KAAK,MAAM,YAAY,IAAI,cAAc,EAAE;QACvC,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,CAAC,IAAI,CAAC,EAAE;YACrD,MAAM,IAAI,4BAAmB,CAAC,4BAA4B,EAAE,EAAE,UAAU,EAAE,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;SAClG;aAAM;YACH,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SAClC;KACJ;IACD,OAAO,WAAW,CAAC;AACvB,CAAC;AAhBD,wCAgBC;AAED;;;GAGG;AACH,SAAS,iBAAiB,CAAC,MAAsC;IAC7D,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC;IAC3C,MAAM,kBAAkB,GACpB,WAAW,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC/F,IAAI,kBAAkB,EAAE;QACpB,MAAM,kBAAkB,GAAG,MAAM,CAAC,WAAW,CAAC,kBAAkB,CAAC;QACjE,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC;QAC3C,IAAI,OAAO,WAAW,KAAK,SAAS,EAAE;YAClC,MAAM,EAAE,cAAc,EAAE,GAAG,WAAW,CAAC;YACvC,IAAI,yBAAmC,CAAC;YACxC,IAAI,CAAC,cAAc,EAAE;gBACjB,yBAAyB,GAAG,CAAC,kBAAkB,CAAC,CAAC;aACpD;iBAAM,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;gBAC3C,yBAAyB,GAAG,cAAc;qBACrC,KAAK,CAAC,GAAG,CAAC;qBACV,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;qBAClB,MAAM,CAAC,kBAAkB,CAAC,CAAC;aACnC;iBAAM;gBACH,yBAAyB,GAAG,cAAc,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;aACzE;YACD,WAAW,CAAC,cAAc,GAAG,yBAAyB,CAAC;SAC1D;KACJ;AACL,CAAC;AAED,SAAS,iBAAiB,CAAC,MAA4B;IACnD,IAAI,OAAe,CAAC;IACpB,IAAI;QACA,OAAO,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC;KAChD;IAAC,OAAO,CAAM,EAAE;QACb,OAAO,GAAG,UAAU,CAAC;KACxB;IACD,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC;IACxE,MAAM,eAAe,GAAqC,EAAE,CAAC;IAC7D,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,UAAU,QAAQ,IAAI,WAAW,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;IACxF,eAAe,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAC3D,eAAe,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAC7D,eAAe,CAAC,IAAI,CAChB,GAAG,IAAA,uCAAwB,GAAE,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,CAAC,CAAU,CAAC,CAC5F,CAAC;IACF,MAAM,iBAAiB,GAAG,4BAA4B,CAAC,eAAe,CAAC,CAAC;IACxE,MAAM,KAAK,GAAG,oBAAoB,OAAO,yBAAyB,IAAI,EAAE,CAAC;IACzE,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IACtF,MAAM,cAAc,GAAG,KAAK,CAAC,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,aAAa,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACzG,uBAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC;IACvC,uBAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,GAAG,cAAc,CAAC,CAAC,CAAC;IAC3D,uBAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC;IAChE,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,uBAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACrD,uBAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC;AAC3C,CAAC;AAED,SAAS,4BAA4B,CAAC,KAAuC;IACzE,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC;IACjE,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AACxE,CAAC;AAED;;;GAGG;AACH,SAAS,kBAAkB,CAAC,UAA0C;IAClE,MAAM,MAAM,qBAAQ,UAAU,CAAE,CAAC;IACjC,MAAM,CAAC,mBAAmB,GAAG,gCACtB,UAAU,CAAC,mBAAmB,KACjC,WAAW,EAAE,KAAK,GACA,CAAC;IACvB,OAAO,MAAM,CAAC;AAClB,CAAC;AAED;;;;;;;GAOG;AACH,KAAK,UAAU,yBAAyB,CAAC,MAA+B;IACpE,MAAM,UAAU,GAAe,MAAM,CAAC,GAAG,CAAC,IAAA,4BAAkB,GAAE,CAAC,CAAC;IAChE,MAAM,IAAI,OAAO,CAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QAC9C,MAAM,cAAc,GAAG,KAAK,IAAsB,EAAE;YAChD,IAAI;gBACA,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,aAAa,CAAC,oCAAa,CAAC,CAAC,KAAK,EAAE,CAAC;gBACzE,OAAO,CAAC,GAAG,UAAU,CAAC;aACzB;YAAC,OAAO,CAAM,EAAE;gBACb,OAAO,KAAK,CAAC;aAChB;QACL,CAAC,CAAC;QAEF,MAAM,cAAc,GAAG,IAAI,CAAC;QAC5B,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,MAAM,WAAW,GAAG,EAAE,CAAC;QACvB,IAAI,mBAAmB,GAAG,KAAK,CAAC;QAChC,uBAAM,CAAC,OAAO,CAAC,6CAA6C,CAAC,CAAC;QAC9D,OAAO,CAAC,mBAAmB,IAAI,QAAQ,GAAG,WAAW,EAAE;YACnD,QAAQ,EAAE,CAAC;YACX,mBAAmB,GAAG,MAAM,cAAc,EAAE,CAAC;YAC7C,IAAI,mBAAmB,EAAE;gBACrB,uBAAM,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;gBAC3C,OAAO,EAAE,CAAC;gBACV,OAAO;aACV;YACD,uBAAM,CAAC,OAAO,CACV,6DAA6D,cAAc,eAAe,QAAQ,OAAO,WAAW,GAAG,CAC1H,CAAC;YACF,MAAM,IAAI,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC;SACvE;QACD,MAAM,CAAC,4DAA4D,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -45,7 +45,7 @@ class DefaultAssetNamingStrategy {
|
|
|
45
45
|
* See http://sharp.pixelplumbing.com/en/stable/api-output/#tobuffer
|
|
46
46
|
*/
|
|
47
47
|
isSupportedImageFormat(fileName) {
|
|
48
|
-
const imageExtensions = ['.jpg', '.jpeg', '.png', '.webp', '.tiff'];
|
|
48
|
+
const imageExtensions = ['.jpg', '.jpeg', '.png', '.webp', '.tiff', '.avif', '.gif'];
|
|
49
49
|
const ext = path_1.default.extname(fileName);
|
|
50
50
|
return imageExtensions.includes(ext);
|
|
51
51
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-asset-naming-strategy.js","sourceRoot":"","sources":["../../../src/config/asset-naming-strategy/default-asset-naming-strategy.ts"],"names":[],"mappings":";;;;;;AAAA,2EAAuE;AACvE,gDAAwB;AAMxB;;;;;;GAMG;AACH,MAAa,0BAA0B;IAAvC;QACqB,gBAAW,GAAG,oBAAoB,CAAC;IAoDxD,CAAC;IAlDG,sBAAsB,CAAC,GAAmB,EAAE,gBAAwB,EAAE,gBAAyB;QAC3F,MAAM,UAAU,GAAG,IAAA,kCAAe,EAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;QAC1D,IAAI,CAAC,gBAAgB,EAAE;YACnB,OAAO,UAAU,CAAC;SACrB;aAAM;YACH,OAAO,IAAI,CAAC,sBAAsB,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;SACpE;IACL,CAAC;IAED,uBAAuB,CAAC,GAAmB,EAAE,cAAsB,EAAE,gBAAyB;QAC1F,MAAM,aAAa,GAAG,WAAW,CAAC;QAClC,MAAM,eAAe,GAAG,IAAI,CAAC,sBAAsB,CAAC,cAAc,CAAC;YAC/D,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,aAAa,CAAC;YAC/C,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,aAAa,CAAC,GAAG,MAAM,CAAC;QAE7D,IAAI,CAAC,gBAAgB,EAAE;YACnB,OAAO,eAAe,CAAC;SAC1B;aAAM;YACH,OAAO,IAAI,CAAC,sBAAsB,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;SACzE;IACL,CAAC;IAED;;;;;OAKG;IACK,sBAAsB,CAAC,QAAgB;QAC3C,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"default-asset-naming-strategy.js","sourceRoot":"","sources":["../../../src/config/asset-naming-strategy/default-asset-naming-strategy.ts"],"names":[],"mappings":";;;;;;AAAA,2EAAuE;AACvE,gDAAwB;AAMxB;;;;;;GAMG;AACH,MAAa,0BAA0B;IAAvC;QACqB,gBAAW,GAAG,oBAAoB,CAAC;IAoDxD,CAAC;IAlDG,sBAAsB,CAAC,GAAmB,EAAE,gBAAwB,EAAE,gBAAyB;QAC3F,MAAM,UAAU,GAAG,IAAA,kCAAe,EAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;QAC1D,IAAI,CAAC,gBAAgB,EAAE;YACnB,OAAO,UAAU,CAAC;SACrB;aAAM;YACH,OAAO,IAAI,CAAC,sBAAsB,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;SACpE;IACL,CAAC;IAED,uBAAuB,CAAC,GAAmB,EAAE,cAAsB,EAAE,gBAAyB;QAC1F,MAAM,aAAa,GAAG,WAAW,CAAC;QAClC,MAAM,eAAe,GAAG,IAAI,CAAC,sBAAsB,CAAC,cAAc,CAAC;YAC/D,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,aAAa,CAAC;YAC/C,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,aAAa,CAAC,GAAG,MAAM,CAAC;QAE7D,IAAI,CAAC,gBAAgB,EAAE;YACnB,OAAO,eAAe,CAAC;SAC1B;aAAM;YACH,OAAO,IAAI,CAAC,sBAAsB,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;SACzE;IACL,CAAC;IAED;;;;;OAKG;IACK,sBAAsB,CAAC,QAAgB;QAC3C,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QACrF,MAAM,GAAG,GAAG,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACnC,OAAO,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACzC,CAAC;IAEO,sBAAsB,CAAC,YAAoB,EAAE,gBAAwB;QACzE,MAAM,OAAO,GAAG,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACzD,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC/C,OAAO,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;IACxD,CAAC;IAEO,gBAAgB,CAAC,QAAgB,EAAE,KAAa;QACpD,MAAM,WAAW,GAAG,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,WAAW,EAAE,CAAC,CAAC;IACxD,CAAC;IAEO,SAAS,CAAC,QAAgB,EAAE,MAAc;QAC9C,MAAM,GAAG,GAAG,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACnC,MAAM,QAAQ,GAAG,cAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAC9C,OAAO,GAAG,QAAQ,GAAG,MAAM,GAAG,GAAG,EAAE,CAAC;IACxC,CAAC;CACJ;AArDD,gEAqDC"}
|
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
import { PartialVendureConfig, RuntimeVendureConfig } from './vendure-config';
|
|
2
|
+
/**
|
|
3
|
+
* Reset the activeConfig object back to the initial default state.
|
|
4
|
+
*/
|
|
5
|
+
export declare function resetConfig(): void;
|
|
2
6
|
/**
|
|
3
7
|
* Override the default config by merging in the supplied values. Should only be used prior to
|
|
4
8
|
* bootstrapping the app.
|
|
@@ -1,9 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getConfig = exports.setConfig = void 0;
|
|
3
|
+
exports.getConfig = exports.setConfig = exports.resetConfig = void 0;
|
|
4
4
|
const default_config_1 = require("./default-config");
|
|
5
5
|
const merge_config_1 = require("./merge-config");
|
|
6
6
|
let activeConfig = default_config_1.defaultConfig;
|
|
7
|
+
/**
|
|
8
|
+
* Reset the activeConfig object back to the initial default state.
|
|
9
|
+
*/
|
|
10
|
+
function resetConfig() {
|
|
11
|
+
activeConfig = default_config_1.defaultConfig;
|
|
12
|
+
}
|
|
13
|
+
exports.resetConfig = resetConfig;
|
|
7
14
|
/**
|
|
8
15
|
* Override the default config by merging in the supplied values. Should only be used prior to
|
|
9
16
|
* bootstrapping the app.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-helpers.js","sourceRoot":"","sources":["../../src/config/config-helpers.ts"],"names":[],"mappings":";;;AAAA,qDAAiD;AACjD,iDAA6C;AAG7C,IAAI,YAAY,GAAG,8BAAa,CAAC;AAEjC;;;GAGG;AACH,SAAgB,SAAS,CAAC,UAAgC;IACtD,YAAY,GAAG,IAAA,0BAAW,EAAC,YAAY,EAAE,UAAU,CAAC,CAAC;AACzD,CAAC;AAFD,8BAEC;AAED;;;;GAIG;AACH,SAAgB,SAAS;IACrB,OAAO,YAAY,CAAC;AACxB,CAAC;AAFD,8BAEC"}
|
|
1
|
+
{"version":3,"file":"config-helpers.js","sourceRoot":"","sources":["../../src/config/config-helpers.ts"],"names":[],"mappings":";;;AAAA,qDAAiD;AACjD,iDAA6C;AAG7C,IAAI,YAAY,GAAG,8BAAa,CAAC;AAEjC;;GAEG;AACH,SAAgB,WAAW;IACvB,YAAY,GAAG,8BAAa,CAAC;AACjC,CAAC;AAFD,kCAEC;AAED;;;GAGG;AACH,SAAgB,SAAS,CAAC,UAAgC;IACtD,YAAY,GAAG,IAAA,0BAAW,EAAC,YAAY,EAAE,UAAU,CAAC,CAAC;AACzD,CAAC;AAFD,8BAEC;AAED;;;;GAIG;AACH,SAAgB,SAAS;IACrB,OAAO,YAAY,CAAC;AACxB,CAAC;AAFD,8BAEC"}
|
|
@@ -14,6 +14,7 @@ const common_1 = require("@nestjs/common");
|
|
|
14
14
|
const core_1 = require("@nestjs/core");
|
|
15
15
|
const shared_utils_1 = require("@vendure/common/lib/shared-utils");
|
|
16
16
|
const injector_1 = require("../common/injector");
|
|
17
|
+
const config_helpers_1 = require("./config-helpers");
|
|
17
18
|
const config_service_1 = require("./config.service");
|
|
18
19
|
let ConfigModule = class ConfigModule {
|
|
19
20
|
constructor(configService, moduleRef) {
|
|
@@ -27,6 +28,14 @@ let ConfigModule = class ConfigModule {
|
|
|
27
28
|
async onApplicationShutdown(signal) {
|
|
28
29
|
await this.destroyInjectableStrategies();
|
|
29
30
|
await this.destroyConfigurableOperations();
|
|
31
|
+
/**
|
|
32
|
+
* When the application shuts down, we reset the activeConfig to the default. Usually this is
|
|
33
|
+
* redundant, as the app shutdown would normally coincide with the process ending. However, in some
|
|
34
|
+
* circumstances, such as when running migrations immediately followed by app bootstrap, the activeConfig
|
|
35
|
+
* will persist between these two applications and mutations e.g. to the CustomFields will result in
|
|
36
|
+
* hard-to-debug errors. So resetting is a precaution against this scenario.
|
|
37
|
+
*/
|
|
38
|
+
(0, config_helpers_1.resetConfig)();
|
|
30
39
|
}
|
|
31
40
|
async initInjectableStrategies() {
|
|
32
41
|
const injector = new injector_1.Injector(this.moduleRef);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.module.js","sourceRoot":"","sources":["../../src/config/config.module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAuF;AACvF,uCAAyC;AACzC,mEAAsE;AAGtE,iDAA8C;AAG9C,qDAAiD;AAMjD,IAAa,YAAY,GAAzB,MAAa,YAAY;IACrB,YAAoB,aAA4B,EAAU,SAAoB;QAA1D,kBAAa,GAAb,aAAa,CAAe;QAAU,cAAS,GAAT,SAAS,CAAW;IAAG,CAAC;IAElF,KAAK,CAAC,sBAAsB;QACxB,MAAM,IAAI,CAAC,wBAAwB,EAAE,CAAC;QACtC,MAAM,IAAI,CAAC,0BAA0B,EAAE,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,MAAe;QACvC,MAAM,IAAI,CAAC,2BAA2B,EAAE,CAAC;QACzC,MAAM,IAAI,CAAC,6BAA6B,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"config.module.js","sourceRoot":"","sources":["../../src/config/config.module.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { OnTransitionEndFn, OnTransitionErrorFn, OnTransitionStartFn, Transitions } from '../../common/finite-state-machine/types';
|
|
2
2
|
import { InjectableStrategy } from '../../common/types/injectable-strategy';
|
|
3
|
-
import { FulfillmentState, FulfillmentTransitionData } from '../../service/helpers/fulfillment-state-machine/fulfillment-state';
|
|
3
|
+
import { CustomFulfillmentStates, FulfillmentState, FulfillmentTransitionData } from '../../service/helpers/fulfillment-state-machine/fulfillment-state';
|
|
4
4
|
/**
|
|
5
5
|
* @description
|
|
6
6
|
* Used to define extensions to or modifications of the default fulfillment process.
|
|
@@ -9,7 +9,7 @@ import { FulfillmentState, FulfillmentTransitionData } from '../../service/helpe
|
|
|
9
9
|
*
|
|
10
10
|
* @docsCategory fulfillment
|
|
11
11
|
*/
|
|
12
|
-
export interface CustomFulfillmentProcess<State extends string> extends InjectableStrategy {
|
|
12
|
+
export interface CustomFulfillmentProcess<State extends keyof CustomFulfillmentStates | string> extends InjectableStrategy {
|
|
13
13
|
transitions?: Transitions<State, State | FulfillmentState> & Partial<Transitions<FulfillmentState | State>>;
|
|
14
14
|
onTransitionStart?: OnTransitionStartFn<State | FulfillmentState, FulfillmentTransitionData>;
|
|
15
15
|
onTransitionEnd?: OnTransitionEndFn<State | FulfillmentState, FulfillmentTransitionData>;
|
|
@@ -48,6 +48,7 @@ export interface VendureLogger {
|
|
|
48
48
|
info(message: string, context?: string): void;
|
|
49
49
|
verbose(message: string, context?: string): void;
|
|
50
50
|
debug(message: string, context?: string): void;
|
|
51
|
+
setDefaultContext?(defaultContext: string): void;
|
|
51
52
|
}
|
|
52
53
|
/**
|
|
53
54
|
* @description
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vendure-logger.js","sourceRoot":"","sources":["../../../src/config/logger/vendure-logger.ts"],"names":[],"mappings":";;;AAEA;;;;;GAKG;AACH,IAAY,QA6BX;AA7BD,WAAY,QAAQ;IAChB;;;;OAIG;IACH,yCAAS,CAAA;IACT;;;;OAIG;IACH,uCAAQ,CAAA;IACR;;;OAGG;IACH,uCAAQ,CAAA;IACR;;;OAGG;IACH,6CAAW,CAAA;IACX;;;;OAIG;IACH,yCAAS,CAAA;AACb,CAAC,EA7BW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QA6BnB;
|
|
1
|
+
{"version":3,"file":"vendure-logger.js","sourceRoot":"","sources":["../../../src/config/logger/vendure-logger.ts"],"names":[],"mappings":";;;AAEA;;;;;GAKG;AACH,IAAY,QA6BX;AA7BD,WAAY,QAAQ;IAChB;;;;OAIG;IACH,yCAAS,CAAA;IACT;;;;OAIG;IACH,uCAAQ,CAAA;IACR;;;OAGG;IACH,uCAAQ,CAAA;IACR;;;OAGG;IACH,6CAAW,CAAA;IACX;;;;OAIG;IACH,yCAAS,CAAA;AACb,CAAC,EA7BW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QA6BnB;AAkBD,MAAM,UAAU,GAAkB;IAC9B,KAAK;QACD,KAAK;IACT,CAAC;IACD,IAAI;QACA,KAAK;IACT,CAAC;IACD,IAAI;QACA,KAAK;IACT,CAAC;IACD,OAAO;QACH,KAAK;IACT,CAAC;IACD,KAAK;QACD,KAAK;IACT,CAAC;CACJ,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6DG;AACH,MAAa,MAAM;IAIf,MAAM,KAAK,MAAM;QACb,OAAO,IAAI,CAAC,OAAO,IAAI,UAAU,CAAC;IACtC,CAAC;IAED,IAAY,QAAQ;QAChB,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;QAC7B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,gBAAgB;IAChB,MAAM,CAAC,SAAS,CAAC,MAAqB;QAClC,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC;IAC5B,CAAC;IAED,gBAAgB;IAChB,KAAK,CAAC,OAAY,EAAE,KAAc,EAAE,OAAgB;QAChD,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IACjD,CAAC;IAED,gBAAgB;IAChB,IAAI,CAAC,OAAY,EAAE,OAAgB;QAC/B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,gBAAgB;IAChB,GAAG,CAAC,OAAY,EAAE,OAAgB;QAC9B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,gBAAgB;IAChB,OAAO,CAAC,OAAY,EAAE,OAAgB;QAClC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,gBAAgB;IAChB,KAAK,CAAC,OAAY,EAAE,OAAgB;QAChC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC1C,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,OAAe,EAAE,OAAgB,EAAE,KAAc;QAC1D,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,OAAe,EAAE,OAAgB;QACzC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,OAAe,EAAE,OAAgB;QACzC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,OAAe,EAAE,OAAgB;QAC5C,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,OAAe,EAAE,OAAgB;QAC1C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC1C,CAAC;;AA7DL,wBA8DC;AA7DkB,gBAAS,GAAkB,MAAM,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { OnTransitionEndFn, OnTransitionErrorFn, OnTransitionStartFn, Transitions } from '../../common/finite-state-machine/types';
|
|
2
2
|
import { InjectableStrategy } from '../../common/types/injectable-strategy';
|
|
3
|
-
import { OrderState, OrderTransitionData } from '../../service/helpers/order-state-machine/order-state';
|
|
3
|
+
import { CustomOrderStates, OrderState, OrderTransitionData } from '../../service/helpers/order-state-machine/order-state';
|
|
4
4
|
/**
|
|
5
5
|
* @description
|
|
6
6
|
* Used to define extensions to or modifications of the default order process.
|
|
@@ -9,7 +9,7 @@ import { OrderState, OrderTransitionData } from '../../service/helpers/order-sta
|
|
|
9
9
|
*
|
|
10
10
|
* @docsCategory orders
|
|
11
11
|
*/
|
|
12
|
-
export interface CustomOrderProcess<State extends string> extends InjectableStrategy {
|
|
12
|
+
export interface CustomOrderProcess<State extends keyof CustomOrderStates | string> extends InjectableStrategy {
|
|
13
13
|
transitions?: Transitions<State, State | OrderState> & Partial<Transitions<OrderState | State>>;
|
|
14
14
|
onTransitionStart?: OnTransitionStartFn<State | OrderState, OrderTransitionData>;
|
|
15
15
|
onTransitionEnd?: OnTransitionEndFn<State | OrderState, OrderTransitionData>;
|
|
@@ -47,6 +47,9 @@ export interface OrderItemPriceCalculationStrategy extends InjectableStrategy {
|
|
|
47
47
|
* @description
|
|
48
48
|
* Receives the ProductVariant to be added to the Order as well as any OrderLine custom fields and returns
|
|
49
49
|
* the price for a single unit.
|
|
50
|
+
*
|
|
51
|
+
* Note: if you have any `relation` type custom fields defined on the OrderLine entity, they will only be
|
|
52
|
+
* passed in to this method if they are set to `eager: true`.
|
|
50
53
|
*/
|
|
51
54
|
calculateUnitPrice(ctx: RequestContext, productVariant: ProductVariant, orderLineCustomFields: {
|
|
52
55
|
[key: string]: any;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { OnTransitionEndFn, OnTransitionErrorFn, OnTransitionStartFn, Transitions } from '../../common/finite-state-machine/types';
|
|
2
2
|
import { InjectableStrategy } from '../../common/types/injectable-strategy';
|
|
3
|
-
import { PaymentState, PaymentTransitionData } from '../../service/helpers/payment-state-machine/payment-state';
|
|
3
|
+
import { CustomPaymentStates, PaymentState, PaymentTransitionData } from '../../service/helpers/payment-state-machine/payment-state';
|
|
4
4
|
/**
|
|
5
5
|
* @description
|
|
6
6
|
* Used to define extensions to or modifications of the default payment process.
|
|
@@ -9,7 +9,7 @@ import { PaymentState, PaymentTransitionData } from '../../service/helpers/payme
|
|
|
9
9
|
*
|
|
10
10
|
* @docsCategory fulfillment
|
|
11
11
|
*/
|
|
12
|
-
export interface CustomPaymentProcess<State extends string> extends InjectableStrategy {
|
|
12
|
+
export interface CustomPaymentProcess<State extends keyof CustomPaymentStates | string> extends InjectableStrategy {
|
|
13
13
|
transitions?: Transitions<State, State | PaymentState> & Partial<Transitions<PaymentState | State>>;
|
|
14
14
|
onTransitionStart?: OnTransitionStartFn<State | PaymentState, PaymentTransitionData>;
|
|
15
15
|
onTransitionEnd?: OnTransitionEndFn<State | PaymentState, PaymentTransitionData>;
|
|
@@ -3,5 +3,5 @@ import { ConnectionOptions } from 'typeorm';
|
|
|
3
3
|
export declare class ConnectionModule {
|
|
4
4
|
static forRoot(): DynamicModule;
|
|
5
5
|
static forPlugin(): DynamicModule;
|
|
6
|
-
static getTypeOrmLogger(dbConnectionOptions: ConnectionOptions): import("typeorm").Logger | "
|
|
6
|
+
static getTypeOrmLogger(dbConnectionOptions: ConnectionOptions): "debug" | import("typeorm").Logger | "advanced-console" | "simple-console" | "file";
|
|
7
7
|
}
|
|
@@ -121,6 +121,39 @@ export declare class TransactionalConnection {
|
|
|
121
121
|
* the given Channel.
|
|
122
122
|
*/
|
|
123
123
|
findOneInChannel<T extends ChannelAware & VendureEntity>(ctx: RequestContext, entity: Type<T>, id: ID, channelId: ID, options?: FindOneOptions): Promise<T | undefined>;
|
|
124
|
+
/**
|
|
125
|
+
* This is a work-around for this issue: https://github.com/vendure-ecommerce/vendure/issues/1664
|
|
126
|
+
*
|
|
127
|
+
* Explanation:
|
|
128
|
+
* When calling `FindOptionsUtils.joinEagerRelations()`, there appears to be a bug in TypeORM whereby
|
|
129
|
+
* it will throw the following error *if* the `options.relations` array contains any customField relations
|
|
130
|
+
* where the related entity itself has eagerly-loaded relations.
|
|
131
|
+
*
|
|
132
|
+
* For example, let's say we define a custom field on the Product entity like this:
|
|
133
|
+
* ```
|
|
134
|
+
* Product: [{
|
|
135
|
+
* name: 'featuredFacet',
|
|
136
|
+
* type: 'relation',
|
|
137
|
+
* entity: Facet,
|
|
138
|
+
* }],
|
|
139
|
+
* ```
|
|
140
|
+
* and then we pass into `TransactionalConnection.findOneInChannel()` an options array of:
|
|
141
|
+
*
|
|
142
|
+
* ```
|
|
143
|
+
* { relations: ['customFields.featuredFacet'] }
|
|
144
|
+
* ```
|
|
145
|
+
* it will throw an error because the `Facet` entity itself has eager relations (namely the `translations` property).
|
|
146
|
+
* This will cause TypeORM to throw the error:
|
|
147
|
+
* ```
|
|
148
|
+
* TypeORMError: "entity__customFields" alias was not found. Maybe you forgot to join it?
|
|
149
|
+
* ```
|
|
150
|
+
*
|
|
151
|
+
* So this method introspects the QueryBuilder metadata and checks for any custom field relations which
|
|
152
|
+
* themselves have eager relations. If found, it removes those items from the `options.relations` array.
|
|
153
|
+
*
|
|
154
|
+
* TODO: Ideally create a minimal reproduction case and report in the TypeORM repo for an upstream fix.
|
|
155
|
+
*/
|
|
156
|
+
private removeCustomFieldsWithEagerRelations;
|
|
124
157
|
/**
|
|
125
158
|
* @description
|
|
126
159
|
* Like the TypeOrm `Repository.findByIds()` method, but limits the results to
|
|
@@ -30,6 +30,7 @@ const typeorm_2 = require("typeorm");
|
|
|
30
30
|
const request_context_1 = require("../api/common/request-context");
|
|
31
31
|
const constants_1 = require("../common/constants");
|
|
32
32
|
const errors_1 = require("../common/error/errors");
|
|
33
|
+
const index_1 = require("../config/index");
|
|
33
34
|
const transaction_wrapper_1 = require("./transaction-wrapper");
|
|
34
35
|
/**
|
|
35
36
|
* @description
|
|
@@ -180,6 +181,7 @@ let TransactionalConnection = class TransactionalConnection {
|
|
|
180
181
|
*/
|
|
181
182
|
findOneInChannel(ctx, entity, id, channelId, options = {}) {
|
|
182
183
|
const qb = this.getRepository(ctx, entity).createQueryBuilder('entity');
|
|
184
|
+
options.relations = this.removeCustomFieldsWithEagerRelations(qb, options.relations);
|
|
183
185
|
typeorm_2.FindOptionsUtils.applyFindManyOptionsOrConditionsToQueryBuilder(qb, options);
|
|
184
186
|
if (options.loadEagerRelations !== false) {
|
|
185
187
|
// tslint:disable-next-line:no-non-null-assertion
|
|
@@ -191,6 +193,55 @@ let TransactionalConnection = class TransactionalConnection {
|
|
|
191
193
|
.andWhere('channel.id = :channelId', { channelId })
|
|
192
194
|
.getOne();
|
|
193
195
|
}
|
|
196
|
+
/**
|
|
197
|
+
* This is a work-around for this issue: https://github.com/vendure-ecommerce/vendure/issues/1664
|
|
198
|
+
*
|
|
199
|
+
* Explanation:
|
|
200
|
+
* When calling `FindOptionsUtils.joinEagerRelations()`, there appears to be a bug in TypeORM whereby
|
|
201
|
+
* it will throw the following error *if* the `options.relations` array contains any customField relations
|
|
202
|
+
* where the related entity itself has eagerly-loaded relations.
|
|
203
|
+
*
|
|
204
|
+
* For example, let's say we define a custom field on the Product entity like this:
|
|
205
|
+
* ```
|
|
206
|
+
* Product: [{
|
|
207
|
+
* name: 'featuredFacet',
|
|
208
|
+
* type: 'relation',
|
|
209
|
+
* entity: Facet,
|
|
210
|
+
* }],
|
|
211
|
+
* ```
|
|
212
|
+
* and then we pass into `TransactionalConnection.findOneInChannel()` an options array of:
|
|
213
|
+
*
|
|
214
|
+
* ```
|
|
215
|
+
* { relations: ['customFields.featuredFacet'] }
|
|
216
|
+
* ```
|
|
217
|
+
* it will throw an error because the `Facet` entity itself has eager relations (namely the `translations` property).
|
|
218
|
+
* This will cause TypeORM to throw the error:
|
|
219
|
+
* ```
|
|
220
|
+
* TypeORMError: "entity__customFields" alias was not found. Maybe you forgot to join it?
|
|
221
|
+
* ```
|
|
222
|
+
*
|
|
223
|
+
* So this method introspects the QueryBuilder metadata and checks for any custom field relations which
|
|
224
|
+
* themselves have eager relations. If found, it removes those items from the `options.relations` array.
|
|
225
|
+
*
|
|
226
|
+
* TODO: Ideally create a minimal reproduction case and report in the TypeORM repo for an upstream fix.
|
|
227
|
+
*/
|
|
228
|
+
removeCustomFieldsWithEagerRelations(qb, relations = []) {
|
|
229
|
+
let resultingRelations = relations;
|
|
230
|
+
const mainAlias = qb.expressionMap.mainAlias;
|
|
231
|
+
const customFieldsMetadata = mainAlias === null || mainAlias === void 0 ? void 0 : mainAlias.metadata.embeddeds.find(metadata => metadata.propertyName === 'customFields');
|
|
232
|
+
if (customFieldsMetadata) {
|
|
233
|
+
const customFieldRelationsWithEagerRelations = customFieldsMetadata.relations.filter(relation => !!relation.inverseEntityMetadata.ownRelations.find(or => or.isEager === true));
|
|
234
|
+
for (const relation of customFieldRelationsWithEagerRelations) {
|
|
235
|
+
const propertyName = relation.propertyName;
|
|
236
|
+
const relationsToRemove = relations.filter(r => r.startsWith(`customFields.${propertyName}`));
|
|
237
|
+
if (relationsToRemove.length) {
|
|
238
|
+
index_1.Logger.debug(`TransactionalConnection.findOneInChannel cannot automatically join relation [${mainAlias === null || mainAlias === void 0 ? void 0 : mainAlias.metadata.name}.customFields.${propertyName}]`);
|
|
239
|
+
resultingRelations = relations.filter(r => !r.startsWith(`customFields.${propertyName}`));
|
|
240
|
+
}
|
|
241
|
+
}
|
|
242
|
+
}
|
|
243
|
+
return resultingRelations;
|
|
244
|
+
}
|
|
194
245
|
/**
|
|
195
246
|
* @description
|
|
196
247
|
* Like the TypeOrm `Repository.findByIds()` method, but limits the results to
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transactional-connection.js","sourceRoot":"","sources":["../../src/connection/transactional-connection.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AAEnD,
|
|
1
|
+
{"version":3,"file":"transactional-connection.js","sourceRoot":"","sources":["../../src/connection/transactional-connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ const shared_utils_1 = require("@vendure/common/lib/shared-utils");
|
|
|
14
14
|
const typeorm_1 = require("typeorm");
|
|
15
15
|
const calculated_decorator_1 = require("../../common/calculated-decorator");
|
|
16
16
|
const tax_utils_1 = require("../../common/tax-utils");
|
|
17
|
+
const index_1 = require("../../config/index");
|
|
17
18
|
const asset_entity_1 = require("../asset/asset.entity");
|
|
18
19
|
const base_entity_1 = require("../base/base.entity");
|
|
19
20
|
const custom_entity_fields_1 = require("../custom-entity-fields");
|
|
@@ -203,6 +204,9 @@ let OrderLine = class OrderLine extends base_entity_1.VendureEntity {
|
|
|
203
204
|
* Returns all non-cancelled OrderItems on this line.
|
|
204
205
|
*/
|
|
205
206
|
get activeItems() {
|
|
207
|
+
if (this.items == null) {
|
|
208
|
+
index_1.Logger.warn(`Attempted to access OrderLine.items without first joining the relation: { relations: ['items'] }`);
|
|
209
|
+
}
|
|
206
210
|
return (this.items || []).filter(i => !i.cancelled);
|
|
207
211
|
}
|
|
208
212
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-line.entity.js","sourceRoot":"","sources":["../../../src/entity/order-line/order-line.entity.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"order-line.entity.js","sourceRoot":"","sources":["../../../src/entity/order-line/order-line.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -113,9 +113,9 @@ class MysqlSearchStrategy {
|
|
|
113
113
|
.select('si_inner.productId', 'inner_productId')
|
|
114
114
|
.addSelect('si_inner.productVariantId', 'inner_productVariantId')
|
|
115
115
|
.addSelect(`IF (sku LIKE :like_term, 10, 0)`, 'sku_score')
|
|
116
|
-
.addSelect(`(SELECT sku_score) +
|
|
117
|
-
MATCH (productName) AGAINST (:term IN BOOLEAN MODE) * 2 +
|
|
118
|
-
MATCH (productVariantName) AGAINST (:term IN BOOLEAN MODE) * 1.5 +
|
|
116
|
+
.addSelect(`(SELECT sku_score) +
|
|
117
|
+
MATCH (productName) AGAINST (:term IN BOOLEAN MODE) * 2 +
|
|
118
|
+
MATCH (productVariantName) AGAINST (:term IN BOOLEAN MODE) * 1.5 +
|
|
119
119
|
MATCH (description) AGAINST (:term IN BOOLEAN MODE) * 1`, 'score')
|
|
120
120
|
.where(new typeorm_1.Brackets(qb1 => {
|
|
121
121
|
qb1.where('sku LIKE :like_term')
|
|
@@ -120,11 +120,11 @@ class PostgresSearchStrategy {
|
|
|
120
120
|
qb.where('1 = 1');
|
|
121
121
|
if (term && term.length > this.minTermLength) {
|
|
122
122
|
const minIfGrouped = (colName) => input.groupByProduct || forceGroup ? `MIN(${colName})` : colName;
|
|
123
|
-
qb.addSelect(`
|
|
124
|
-
(ts_rank_cd(to_tsvector(${minIfGrouped('si.sku')}), to_tsquery(:term)) * 10 +
|
|
125
|
-
ts_rank_cd(to_tsvector(${minIfGrouped('si.productName')}), to_tsquery(:term)) * 2 +
|
|
126
|
-
ts_rank_cd(to_tsvector(${minIfGrouped('si.productVariantName')}), to_tsquery(:term)) * 1.5 +
|
|
127
|
-
ts_rank_cd(to_tsvector(${minIfGrouped('si.description')}), to_tsquery(:term)) * 1)
|
|
123
|
+
qb.addSelect(`
|
|
124
|
+
(ts_rank_cd(to_tsvector(${minIfGrouped('si.sku')}), to_tsquery(:term)) * 10 +
|
|
125
|
+
ts_rank_cd(to_tsvector(${minIfGrouped('si.productName')}), to_tsquery(:term)) * 2 +
|
|
126
|
+
ts_rank_cd(to_tsvector(${minIfGrouped('si.productVariantName')}), to_tsquery(:term)) * 1.5 +
|
|
127
|
+
ts_rank_cd(to_tsvector(${minIfGrouped('si.description')}), to_tsquery(:term)) * 1)
|
|
128
128
|
`, 'score')
|
|
129
129
|
.andWhere(new typeorm_1.Brackets(qb1 => {
|
|
130
130
|
qb1.where('to_tsvector(si.sku) @@ to_tsquery(:term)')
|
|
@@ -103,10 +103,10 @@ class SqliteSearchStrategy {
|
|
|
103
103
|
if (term && term.length > this.minTermLength) {
|
|
104
104
|
// Note: SQLite does not natively have fulltext search capabilities,
|
|
105
105
|
// so we just use a weighted LIKE match
|
|
106
|
-
qb.addSelect(`
|
|
107
|
-
CASE WHEN sku LIKE :like_term THEN 10 ELSE 0 END +
|
|
108
|
-
CASE WHEN productName LIKE :like_term THEN 3 ELSE 0 END +
|
|
109
|
-
CASE WHEN productVariantName LIKE :like_term THEN 2 ELSE 0 END +
|
|
106
|
+
qb.addSelect(`
|
|
107
|
+
CASE WHEN sku LIKE :like_term THEN 10 ELSE 0 END +
|
|
108
|
+
CASE WHEN productName LIKE :like_term THEN 3 ELSE 0 END +
|
|
109
|
+
CASE WHEN productVariantName LIKE :like_term THEN 2 ELSE 0 END +
|
|
110
110
|
CASE WHEN description LIKE :like_term THEN 1 ELSE 0 END`, 'score')
|
|
111
111
|
.andWhere(new typeorm_1.Brackets(qb1 => {
|
|
112
112
|
qb1.where('sku LIKE :like_term')
|
|
@@ -46,13 +46,14 @@ function getConfigurationFunction(plugin) {
|
|
|
46
46
|
}
|
|
47
47
|
exports.getConfigurationFunction = getConfigurationFunction;
|
|
48
48
|
function graphQLResolversFor(plugin, apiType) {
|
|
49
|
+
var _a;
|
|
49
50
|
const apiExtensions = apiType === 'shop'
|
|
50
51
|
? reflectMetadata(plugin, exports.PLUGIN_METADATA.SHOP_API_EXTENSIONS)
|
|
51
52
|
: reflectMetadata(plugin, exports.PLUGIN_METADATA.ADMIN_API_EXTENSIONS);
|
|
52
53
|
return apiExtensions
|
|
53
54
|
? typeof apiExtensions.resolvers === 'function'
|
|
54
55
|
? apiExtensions.resolvers()
|
|
55
|
-
: apiExtensions.resolvers
|
|
56
|
+
: (_a = apiExtensions.resolvers) !== null && _a !== void 0 ? _a : []
|
|
56
57
|
: [];
|
|
57
58
|
}
|
|
58
59
|
exports.graphQLResolversFor = graphQLResolversFor;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-metadata.js","sourceRoot":"","sources":["../../src/plugin/plugin-metadata.ts"],"names":[],"mappings":";;;AACA,wDAA2D;AAE3D,mEAAsE;AAIzD,QAAA,eAAe,GAAG;IAC3B,aAAa,EAAE,eAAe;IAC9B,mBAAmB,EAAE,mBAAmB;IACxC,oBAAoB,EAAE,oBAAoB;IAC1C,QAAQ,EAAE,UAAU;CACvB,CAAC;AAEF,SAAgB,sBAAsB,CAAC,OAA0C;IAC7E,IAAI,CAAC,OAAO,EAAE;QACV,OAAO,EAAE,CAAC;KACb;IACD,OAAO,OAAO;SACT,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,EAAE,uBAAe,CAAC,QAAQ,CAAC,CAAC;SACtD,MAAM,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE;QACtB,MAAM,gBAAgB,GAAG,OAAO,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,EAAE,CAAC;QACtF,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,gBAAgB,CAAC,CAAC;IACzC,CAAC,EAAE,EAAE,CAAC,CAAC;AACf,CAAC;AAVD,wDAUC;AAED,SAAgB,iBAAiB,CAAC,MAAiB;IAC/C,OAAO;QACH,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,2BAAe,CAAC,WAAW,EAAE,MAAM,CAAC,IAAI,EAAE;QAC3E,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,2BAAe,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,EAAE;QACvE,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,2BAAe,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE;QACnE,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,2BAAe,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE;KACtE,CAAC;AACN,CAAC;AAPD,8CAOC;AAED,SAAgB,sBAAsB,CAClC,OAAyC,EACzC,OAAyB;IAEzB,MAAM,UAAU,GACZ,OAAO,KAAK,MAAM;QACd,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,EAAE,uBAAe,CAAC,mBAAmB,CAAC,CAAC;QAC3E,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,EAAE,uBAAe,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAErF,OAAO,UAAU,CAAC,MAAM,CAAC,iCAAkB,CAAC,CAAC;AACjD,CAAC;AAVD,wDAUC;AAED,SAAgB,gBAAgB,CAAC,OAAyC;IACtE,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACjE,CAAC;AAFD,4CAEC;AAED,SAAgB,wBAAwB,CACpC,MAAiC;IAEjC,OAAO,eAAe,CAAC,MAAM,EAAE,uBAAe,CAAC,aAAa,CAAC,CAAC;AAClE,CAAC;AAJD,4DAIC;AAED,SAAgB,mBAAmB,CAC/B,MAAiC,EACjC,OAAyB
|
|
1
|
+
{"version":3,"file":"plugin-metadata.js","sourceRoot":"","sources":["../../src/plugin/plugin-metadata.ts"],"names":[],"mappings":"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"}
|