@vendure/core 1.5.2 → 1.6.2
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/common/configurable-operation-codec.js +2 -2
- package/dist/api/common/configurable-operation-codec.js.map +1 -1
- package/dist/api/common/id-codec.js +6 -2
- package/dist/api/common/id-codec.js.map +1 -1
- package/dist/api/decorators/relations.decorator.d.ts +116 -0
- package/dist/api/decorators/relations.decorator.js +204 -0
- package/dist/api/decorators/relations.decorator.js.map +1 -0
- package/dist/api/index.d.ts +1 -0
- package/dist/api/index.js +1 -0
- package/dist/api/index.js.map +1 -1
- package/dist/api/resolvers/admin/administrator.resolver.d.ts +3 -2
- package/dist/api/resolvers/admin/administrator.resolver.js +10 -6
- package/dist/api/resolvers/admin/administrator.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/asset.resolver.d.ts +3 -2
- package/dist/api/resolvers/admin/asset.resolver.js +10 -6
- package/dist/api/resolvers/admin/asset.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/collection.resolver.d.ts +5 -3
- package/dist/api/resolvers/admin/collection.resolver.js +24 -7
- package/dist/api/resolvers/admin/collection.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/country.resolver.d.ts +3 -2
- package/dist/api/resolvers/admin/country.resolver.js +10 -6
- package/dist/api/resolvers/admin/country.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/customer-group.resolver.d.ts +3 -2
- package/dist/api/resolvers/admin/customer-group.resolver.js +8 -4
- package/dist/api/resolvers/admin/customer-group.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/customer.resolver.d.ts +3 -2
- package/dist/api/resolvers/admin/customer.resolver.js +10 -6
- package/dist/api/resolvers/admin/customer.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/facet.resolver.d.ts +3 -2
- package/dist/api/resolvers/admin/facet.resolver.js +10 -6
- package/dist/api/resolvers/admin/facet.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/order.resolver.d.ts +6 -5
- package/dist/api/resolvers/admin/order.resolver.js +25 -11
- package/dist/api/resolvers/admin/order.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/payment-method.resolver.d.ts +3 -2
- package/dist/api/resolvers/admin/payment-method.resolver.js +10 -6
- package/dist/api/resolvers/admin/payment-method.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/product-option.resolver.d.ts +3 -2
- package/dist/api/resolvers/admin/product-option.resolver.js +8 -4
- package/dist/api/resolvers/admin/product-option.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/product.resolver.d.ts +4 -3
- package/dist/api/resolvers/admin/product.resolver.js +16 -10
- package/dist/api/resolvers/admin/product.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/promotion.resolver.d.ts +3 -2
- package/dist/api/resolvers/admin/promotion.resolver.js +9 -6
- package/dist/api/resolvers/admin/promotion.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/role.resolver.d.ts +3 -2
- package/dist/api/resolvers/admin/role.resolver.js +10 -6
- package/dist/api/resolvers/admin/role.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/shipping-method.resolver.d.ts +3 -2
- package/dist/api/resolvers/admin/shipping-method.resolver.js +10 -6
- package/dist/api/resolvers/admin/shipping-method.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/tax-rate.resolver.d.ts +3 -2
- package/dist/api/resolvers/admin/tax-rate.resolver.js +10 -6
- package/dist/api/resolvers/admin/tax-rate.resolver.js.map +1 -1
- package/dist/api/resolvers/entity/collection-entity.resolver.d.ts +2 -1
- package/dist/api/resolvers/entity/collection-entity.resolver.js +6 -4
- package/dist/api/resolvers/entity/collection-entity.resolver.js.map +1 -1
- package/dist/api/resolvers/entity/customer-entity.resolver.d.ts +2 -1
- package/dist/api/resolvers/entity/customer-entity.resolver.js +5 -3
- package/dist/api/resolvers/entity/customer-entity.resolver.js.map +1 -1
- package/dist/api/resolvers/entity/order-line-entity.resolver.d.ts +2 -1
- package/dist/api/resolvers/entity/order-line-entity.resolver.js +6 -3
- package/dist/api/resolvers/entity/order-line-entity.resolver.js.map +1 -1
- package/dist/api/resolvers/entity/product-entity.resolver.d.ts +3 -2
- package/dist/api/resolvers/entity/product-entity.resolver.js +10 -6
- package/dist/api/resolvers/entity/product-entity.resolver.js.map +1 -1
- package/dist/api/resolvers/entity/product-option-group-entity.resolver.js +1 -1
- package/dist/api/resolvers/entity/product-option-group-entity.resolver.js.map +1 -1
- package/dist/api/resolvers/shop/shop-order.resolver.d.ts +4 -3
- package/dist/api/resolvers/shop/shop-order.resolver.js +16 -8
- package/dist/api/resolvers/shop/shop-order.resolver.js.map +1 -1
- package/dist/api/resolvers/shop/shop-products.resolver.d.ts +8 -8
- package/dist/api/resolvers/shop/shop-products.resolver.js +32 -21
- package/dist/api/resolvers/shop/shop-products.resolver.js.map +1 -1
- package/dist/api/schema/admin-api/collection.api.graphql +7 -0
- package/dist/bootstrap.js +2 -0
- package/dist/bootstrap.js.map +1 -1
- package/dist/common/calculated-decorator.d.ts +16 -3
- package/dist/common/calculated-decorator.js +3 -0
- package/dist/common/calculated-decorator.js.map +1 -1
- package/dist/common/types/entity-relation-paths.d.ts +1 -1
- package/dist/config/catalog/collection-filter.d.ts +32 -0
- package/dist/config/catalog/collection-filter.js +32 -0
- package/dist/config/catalog/collection-filter.js.map +1 -1
- package/dist/config/catalog/default-collection-filters.d.ts +100 -0
- package/dist/config/catalog/default-collection-filters.js +154 -21
- package/dist/config/catalog/default-collection-filters.js.map +1 -1
- package/dist/config/config.module.js +2 -0
- package/dist/config/config.module.js.map +1 -1
- package/dist/config/config.service.d.ts +2 -1
- package/dist/config/config.service.js +3 -0
- package/dist/config/config.service.js.map +1 -1
- package/dist/config/custom-field/custom-field-types.d.ts +3 -0
- package/dist/config/default-config.js +5 -0
- package/dist/config/default-config.js.map +1 -1
- package/dist/config/entity-metadata/add-foreign-key-indices.d.ts +12 -0
- package/dist/config/entity-metadata/add-foreign-key-indices.js +33 -0
- package/dist/config/entity-metadata/add-foreign-key-indices.js.map +1 -0
- package/dist/config/entity-metadata/entity-metadata-modifier.d.ts +55 -0
- package/dist/config/entity-metadata/entity-metadata-modifier.js +3 -0
- package/dist/config/entity-metadata/entity-metadata-modifier.js.map +1 -0
- package/dist/config/index.d.ts +3 -0
- package/dist/config/index.js +3 -0
- package/dist/config/index.js.map +1 -1
- package/dist/config/payment/dummy-payment-method-handler.js +2 -2
- package/dist/config/payment/dummy-payment-method-handler.js.map +1 -1
- package/dist/config/payment/example-payment-method-handler.js +2 -2
- package/dist/config/payment/example-payment-method-handler.js.map +1 -1
- package/dist/config/payment/payment-method-eligibility-checker.d.ts +3 -3
- package/dist/config/payment/payment-method-eligibility-checker.js +2 -2
- package/dist/config/payment/payment-method-eligibility-checker.js.map +1 -1
- package/dist/config/payment/payment-method-handler.d.ts +7 -8
- package/dist/config/payment/payment-method-handler.js +6 -6
- package/dist/config/payment/payment-method-handler.js.map +1 -1
- package/dist/config/shipping-method/shipping-calculator.d.ts +3 -3
- package/dist/config/shipping-method/shipping-calculator.js +2 -2
- package/dist/config/shipping-method/shipping-calculator.js.map +1 -1
- package/dist/config/shipping-method/shipping-eligibility-checker.d.ts +4 -4
- package/dist/config/shipping-method/shipping-eligibility-checker.js +5 -5
- package/dist/config/shipping-method/shipping-eligibility-checker.js.map +1 -1
- package/dist/config/system/health-check-strategy.d.ts +47 -0
- package/dist/config/system/health-check-strategy.js +3 -0
- package/dist/config/system/health-check-strategy.js.map +1 -0
- package/dist/config/vendure-config.d.ts +39 -0
- package/dist/connection/connection.module.d.ts +1 -1
- package/dist/connection/transactional-connection.js +5 -0
- package/dist/connection/transactional-connection.js.map +1 -1
- package/dist/data-import/providers/importer/importer.d.ts +3 -2
- package/dist/data-import/providers/importer/importer.js +2 -1
- package/dist/data-import/providers/importer/importer.js.map +1 -1
- package/dist/entity/order/order.entity.js +3 -2
- package/dist/entity/order/order.entity.js.map +1 -1
- package/dist/entity/order-line/order-line.entity.js +22 -22
- package/dist/entity/order-line/order-line.entity.js.map +1 -1
- package/dist/entity/register-custom-entity-fields.js +17 -2
- package/dist/entity/register-custom-entity-fields.js.map +1 -1
- package/dist/entity/run-entity-metadata-modifiers.d.ts +2 -0
- package/dist/entity/run-entity-metadata-modifiers.js +15 -0
- package/dist/entity/run-entity-metadata-modifiers.js.map +1 -0
- package/dist/entity/shipping-method/shipping-method.entity.js +2 -2
- package/dist/entity/shipping-method/shipping-method.entity.js.map +1 -1
- package/dist/event-bus/events/role-event.d.ts +1 -1
- package/dist/event-bus/events/role-event.js +1 -1
- package/dist/event-bus/events/search-event.d.ts +20 -0
- package/dist/event-bus/events/search-event.js +21 -0
- package/dist/event-bus/events/search-event.js.map +1 -0
- package/dist/event-bus/index.d.ts +1 -0
- package/dist/event-bus/index.js +1 -0
- package/dist/event-bus/index.js.map +1 -1
- package/dist/health-check/health-check-registry.service.d.ts +7 -1
- package/dist/health-check/health-check-registry.service.js +7 -1
- package/dist/health-check/health-check-registry.service.js.map +1 -1
- package/dist/health-check/health-check.module.d.ts +1 -3
- package/dist/health-check/health-check.module.js +6 -5
- package/dist/health-check/health-check.module.js.map +1 -1
- package/dist/health-check/http-health-check-strategy.d.ts +36 -0
- package/dist/health-check/http-health-check-strategy.js +41 -0
- package/dist/health-check/http-health-check-strategy.js.map +1 -0
- package/dist/health-check/index.d.ts +2 -0
- package/dist/health-check/index.js +2 -0
- package/dist/health-check/index.js.map +1 -1
- package/dist/health-check/typeorm-health-check-strategy.d.ts +36 -0
- package/dist/health-check/typeorm-health-check-strategy.js +44 -0
- package/dist/health-check/typeorm-health-check-strategy.js.map +1 -0
- package/dist/job-queue/subscribable-job.js +1 -1
- package/dist/plugin/default-search-plugin/default-search-plugin.d.ts +9 -3
- package/dist/plugin/default-search-plugin/default-search-plugin.js +25 -2
- package/dist/plugin/default-search-plugin/default-search-plugin.js.map +1 -1
- package/dist/plugin/default-search-plugin/fulltext-search.service.d.ts +3 -1
- package/dist/plugin/default-search-plugin/fulltext-search.service.js +29 -19
- package/dist/plugin/default-search-plugin/fulltext-search.service.js.map +1 -1
- package/dist/plugin/default-search-plugin/indexer/search-index.service.js +1 -1
- package/dist/plugin/default-search-plugin/indexer/search-index.service.js.map +1 -1
- package/dist/plugin/default-search-plugin/search-strategy/mysql-search-strategy.d.ts +4 -4
- package/dist/plugin/default-search-plugin/search-strategy/mysql-search-strategy.js +7 -3
- package/dist/plugin/default-search-plugin/search-strategy/mysql-search-strategy.js.map +1 -1
- package/dist/plugin/default-search-plugin/search-strategy/postgres-search-strategy.d.ts +4 -4
- package/dist/plugin/default-search-plugin/search-strategy/postgres-search-strategy.js +7 -3
- package/dist/plugin/default-search-plugin/search-strategy/postgres-search-strategy.js.map +1 -1
- package/dist/plugin/default-search-plugin/search-strategy/search-strategy.d.ts +2 -1
- package/dist/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.d.ts +4 -4
- package/dist/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.js +7 -3
- package/dist/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.js.map +1 -1
- package/dist/plugin/default-search-plugin/types.d.ts +84 -0
- package/dist/service/helpers/list-query-builder/list-query-builder.d.ts +39 -0
- package/dist/service/helpers/list-query-builder/list-query-builder.js +150 -19
- package/dist/service/helpers/list-query-builder/list-query-builder.js.map +1 -1
- package/dist/service/helpers/list-query-builder/parse-channel-param.d.ts +1 -1
- package/dist/service/helpers/list-query-builder/parse-channel-param.js +2 -2
- package/dist/service/helpers/list-query-builder/parse-channel-param.js.map +1 -1
- package/dist/service/helpers/list-query-builder/parse-filter-params.d.ts +1 -1
- package/dist/service/helpers/list-query-builder/parse-filter-params.js +3 -2
- package/dist/service/helpers/list-query-builder/parse-filter-params.js.map +1 -1
- package/dist/service/helpers/list-query-builder/parse-sort-params.d.ts +2 -1
- package/dist/service/helpers/list-query-builder/parse-sort-params.js +12 -4
- package/dist/service/helpers/list-query-builder/parse-sort-params.js.map +1 -1
- package/dist/service/helpers/order-modifier/order-modifier.js +2 -1
- package/dist/service/helpers/order-modifier/order-modifier.js.map +1 -1
- package/dist/service/helpers/order-state-machine/order-state-machine.js +1 -1
- package/dist/service/helpers/order-state-machine/order-state-machine.js.map +1 -1
- package/dist/service/services/administrator.service.d.ts +4 -3
- package/dist/service/services/administrator.service.js +6 -5
- package/dist/service/services/administrator.service.js.map +1 -1
- package/dist/service/services/asset.service.d.ts +3 -2
- package/dist/service/services/asset.service.js +6 -4
- package/dist/service/services/asset.service.js.map +1 -1
- package/dist/service/services/collection.service.d.ts +8 -5
- package/dist/service/services/collection.service.js +42 -12
- package/dist/service/services/collection.service.js.map +1 -1
- package/dist/service/services/country.service.d.ts +3 -2
- package/dist/service/services/country.service.js +4 -4
- package/dist/service/services/country.service.js.map +1 -1
- package/dist/service/services/customer-group.service.d.ts +3 -2
- package/dist/service/services/customer-group.service.js +4 -4
- package/dist/service/services/customer-group.service.js.map +1 -1
- package/dist/service/services/customer.service.d.ts +3 -2
- package/dist/service/services/customer.service.js +3 -3
- package/dist/service/services/customer.service.js.map +1 -1
- package/dist/service/services/facet.service.d.ts +3 -2
- package/dist/service/services/facet.service.js +10 -6
- package/dist/service/services/facet.service.js.map +1 -1
- package/dist/service/services/order.service.d.ts +15 -8
- package/dist/service/services/order.service.js +57 -40
- package/dist/service/services/order.service.js.map +1 -1
- package/dist/service/services/payment-method.service.d.ts +6 -3
- package/dist/service/services/payment-method.service.js +15 -8
- package/dist/service/services/payment-method.service.js.map +1 -1
- package/dist/service/services/payment.service.js +4 -4
- package/dist/service/services/payment.service.js.map +1 -1
- package/dist/service/services/product-option-group.service.d.ts +3 -2
- package/dist/service/services/product-option-group.service.js +4 -4
- package/dist/service/services/product-option-group.service.js.map +1 -1
- package/dist/service/services/product-variant.service.d.ts +10 -3
- package/dist/service/services/product-variant.service.js +38 -35
- package/dist/service/services/product-variant.service.js.map +1 -1
- package/dist/service/services/product.service.d.ts +5 -4
- package/dist/service/services/product.service.js +18 -8
- package/dist/service/services/product.service.js.map +1 -1
- package/dist/service/services/promotion.service.d.ts +3 -2
- package/dist/service/services/promotion.service.js +4 -3
- package/dist/service/services/promotion.service.js.map +1 -1
- package/dist/service/services/role.service.d.ts +3 -2
- package/dist/service/services/role.service.js +4 -4
- package/dist/service/services/role.service.js.map +1 -1
- package/dist/service/services/shipping-method.service.d.ts +3 -2
- package/dist/service/services/shipping-method.service.js +4 -4
- package/dist/service/services/shipping-method.service.js.map +1 -1
- package/dist/service/services/tax-rate.service.d.ts +3 -2
- package/dist/service/services/tax-rate.service.js +4 -4
- package/dist/service/services/tax-rate.service.js.map +1 -1
- package/dist/service/services/user.service.js +1 -0
- package/dist/service/services/user.service.js.map +1 -1
- package/dist/service/services/zone.service.d.ts +2 -2
- package/dist/service/services/zone.service.js +2 -2
- package/dist/service/services/zone.service.js.map +1 -1
- package/package.json +5 -3
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import { HealthIndicatorFunction } from '@nestjs/terminus';
|
|
2
|
+
import { Injector } from '../common/index';
|
|
3
|
+
import { HealthCheckStrategy } from '../config/system/health-check-strategy';
|
|
4
|
+
export interface TypeORMHealthCheckOptions {
|
|
5
|
+
key?: string;
|
|
6
|
+
timeout?: number;
|
|
7
|
+
}
|
|
8
|
+
/**
|
|
9
|
+
* @description
|
|
10
|
+
* A {@link HealthCheckStrategy} used to check the health of the database. This health
|
|
11
|
+
* check is included by default, but can be customized by explicitly adding it to the
|
|
12
|
+
* `systemOptions.healthChecks` array:
|
|
13
|
+
*
|
|
14
|
+
* @example
|
|
15
|
+
* ```TypeScript
|
|
16
|
+
* import { TypeORMHealthCheckStrategy } from '\@vendure/core';
|
|
17
|
+
*
|
|
18
|
+
* export const config = {
|
|
19
|
+
* // ...
|
|
20
|
+
* systemOptions: [
|
|
21
|
+
* // The default key is "database" and the default timeout is 1000ms
|
|
22
|
+
* // Sometimes this is too short and leads to false negatives in the
|
|
23
|
+
* // /health endpoint.
|
|
24
|
+
* new TypeORMHealthCheckStrategy({ key: 'postgres-db', timeout: 5000 }),
|
|
25
|
+
* ]
|
|
26
|
+
* }
|
|
27
|
+
* ```
|
|
28
|
+
*
|
|
29
|
+
* @docsCategory health-check
|
|
30
|
+
*/
|
|
31
|
+
export declare class TypeORMHealthCheckStrategy implements HealthCheckStrategy {
|
|
32
|
+
private options?;
|
|
33
|
+
constructor(options?: TypeORMHealthCheckOptions | undefined);
|
|
34
|
+
init(injector: Injector): Promise<void>;
|
|
35
|
+
getHealthIndicator(): HealthIndicatorFunction;
|
|
36
|
+
}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TypeORMHealthCheckStrategy = void 0;
|
|
4
|
+
const terminus_1 = require("@nestjs/terminus");
|
|
5
|
+
let indicator;
|
|
6
|
+
/**
|
|
7
|
+
* @description
|
|
8
|
+
* A {@link HealthCheckStrategy} used to check the health of the database. This health
|
|
9
|
+
* check is included by default, but can be customized by explicitly adding it to the
|
|
10
|
+
* `systemOptions.healthChecks` array:
|
|
11
|
+
*
|
|
12
|
+
* @example
|
|
13
|
+
* ```TypeScript
|
|
14
|
+
* import { TypeORMHealthCheckStrategy } from '\@vendure/core';
|
|
15
|
+
*
|
|
16
|
+
* export const config = {
|
|
17
|
+
* // ...
|
|
18
|
+
* systemOptions: [
|
|
19
|
+
* // The default key is "database" and the default timeout is 1000ms
|
|
20
|
+
* // Sometimes this is too short and leads to false negatives in the
|
|
21
|
+
* // /health endpoint.
|
|
22
|
+
* new TypeORMHealthCheckStrategy({ key: 'postgres-db', timeout: 5000 }),
|
|
23
|
+
* ]
|
|
24
|
+
* }
|
|
25
|
+
* ```
|
|
26
|
+
*
|
|
27
|
+
* @docsCategory health-check
|
|
28
|
+
*/
|
|
29
|
+
class TypeORMHealthCheckStrategy {
|
|
30
|
+
constructor(options) {
|
|
31
|
+
this.options = options;
|
|
32
|
+
}
|
|
33
|
+
async init(injector) {
|
|
34
|
+
indicator = await injector.resolve(terminus_1.TypeOrmHealthIndicator);
|
|
35
|
+
}
|
|
36
|
+
getHealthIndicator() {
|
|
37
|
+
var _a, _b, _c;
|
|
38
|
+
const key = ((_a = this.options) === null || _a === void 0 ? void 0 : _a.key) || 'database';
|
|
39
|
+
const timeout = (_c = (_b = this.options) === null || _b === void 0 ? void 0 : _b.timeout) !== null && _c !== void 0 ? _c : 1000;
|
|
40
|
+
return () => indicator.pingCheck(key, { timeout });
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
exports.TypeORMHealthCheckStrategy = TypeORMHealthCheckStrategy;
|
|
44
|
+
//# sourceMappingURL=typeorm-health-check-strategy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"typeorm-health-check-strategy.js","sourceRoot":"","sources":["../../src/health-check/typeorm-health-check-strategy.ts"],"names":[],"mappings":";;;AAAA,+CAAmF;AAKnF,IAAI,SAAiC,CAAC;AAOtC;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAa,0BAA0B;IACnC,YAAoB,OAAmC;QAAnC,YAAO,GAAP,OAAO,CAA4B;IAAG,CAAC;IAE3D,KAAK,CAAC,IAAI,CAAC,QAAkB;QACzB,SAAS,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,iCAAsB,CAAC,CAAC;IAC/D,CAAC;IAED,kBAAkB;;QACd,MAAM,GAAG,GAAG,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,GAAG,KAAI,UAAU,CAAC;QAC5C,MAAM,OAAO,GAAG,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,OAAO,mCAAI,IAAI,CAAC;QAC9C,OAAO,GAAG,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;IACvD,CAAC;CACJ;AAZD,gEAYC"}
|
|
@@ -56,7 +56,7 @@ class SubscribableJob extends job_1.Job {
|
|
|
56
56
|
throw new Error(`Cannot subscribe to update: Job does not have an ID`);
|
|
57
57
|
}
|
|
58
58
|
return strategy.findOne(id);
|
|
59
|
-
}), operators_1.filter(shared_utils_1.notNullOrUndefined), operators_1.distinctUntilChanged((a, b) => (a === null || a === void 0 ? void 0 : a.progress) === (b === null || b === void 0 ? void 0 : b.progress)
|
|
59
|
+
}), operators_1.filter(shared_utils_1.notNullOrUndefined), operators_1.distinctUntilChanged((a, b) => (a === null || a === void 0 ? void 0 : a.progress) === (b === null || b === void 0 ? void 0 : b.progress) && (a === null || a === void 0 ? void 0 : a.state) === (b === null || b === void 0 ? void 0 : b.state)), operators_1.takeWhile(job => (job === null || job === void 0 ? void 0 : job.state) !== generated_types_1.JobState.FAILED &&
|
|
60
60
|
job.state !== generated_types_1.JobState.COMPLETED &&
|
|
61
61
|
job.state !== generated_types_1.JobState.CANCELLED, true), operators_1.tap(job => {
|
|
62
62
|
if (job.state === generated_types_1.JobState.FAILED) {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { OnApplicationBootstrap } from '@nestjs/common';
|
|
1
|
+
import { OnApplicationBootstrap, OnApplicationShutdown } from '@nestjs/common';
|
|
2
|
+
import { ModuleRef } from '@nestjs/core';
|
|
2
3
|
import { SearchReindexResponse } from '@vendure/common/lib/generated-types';
|
|
3
4
|
import { Type } from '@vendure/common/lib/shared-types';
|
|
4
5
|
import { EventBus } from '../../event-bus/event-bus';
|
|
@@ -41,16 +42,21 @@ export interface DefaultSearchReindexResponse extends SearchReindexResponse {
|
|
|
41
42
|
*
|
|
42
43
|
* @docsCategory DefaultSearchPlugin
|
|
43
44
|
*/
|
|
44
|
-
export declare class DefaultSearchPlugin implements OnApplicationBootstrap {
|
|
45
|
+
export declare class DefaultSearchPlugin implements OnApplicationBootstrap, OnApplicationShutdown {
|
|
45
46
|
private eventBus;
|
|
46
47
|
private searchIndexService;
|
|
47
48
|
private jobQueueService;
|
|
49
|
+
private moduleRef;
|
|
48
50
|
static options: DefaultSearchPluginInitOptions;
|
|
49
51
|
/** @internal */
|
|
50
|
-
constructor(eventBus: EventBus, searchIndexService: SearchIndexService, jobQueueService: JobQueueService);
|
|
52
|
+
constructor(eventBus: EventBus, searchIndexService: SearchIndexService, jobQueueService: JobQueueService, moduleRef: ModuleRef);
|
|
51
53
|
static init(options: DefaultSearchPluginInitOptions): Type<DefaultSearchPlugin>;
|
|
52
54
|
/** @internal */
|
|
53
55
|
onApplicationBootstrap(): Promise<void>;
|
|
56
|
+
/** @internal */
|
|
57
|
+
onApplicationShutdown(signal?: string): Promise<void>;
|
|
58
|
+
private initSearchStrategy;
|
|
59
|
+
private destroySearchStrategy;
|
|
54
60
|
/**
|
|
55
61
|
* If the `indexStockStatus` option is set to `true`, we dynamically add a couple of
|
|
56
62
|
* columns to the SearchIndexItem entity. This is done in this way to allow us to add
|
|
@@ -11,8 +11,10 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
var DefaultSearchPlugin_1;
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
exports.DefaultSearchPlugin = void 0;
|
|
14
|
+
const core_1 = require("@nestjs/core");
|
|
14
15
|
const operators_1 = require("rxjs/operators");
|
|
15
16
|
const typeorm_1 = require("typeorm");
|
|
17
|
+
const common_1 = require("../../common");
|
|
16
18
|
const utils_1 = require("../../common/utils");
|
|
17
19
|
const event_bus_1 = require("../../event-bus/event-bus");
|
|
18
20
|
const asset_event_1 = require("../../event-bus/events/asset-event");
|
|
@@ -67,10 +69,11 @@ const search_job_buffer_service_1 = require("./search-job-buffer/search-job-buff
|
|
|
67
69
|
*/
|
|
68
70
|
let DefaultSearchPlugin = DefaultSearchPlugin_1 = class DefaultSearchPlugin {
|
|
69
71
|
/** @internal */
|
|
70
|
-
constructor(eventBus, searchIndexService, jobQueueService) {
|
|
72
|
+
constructor(eventBus, searchIndexService, jobQueueService, moduleRef) {
|
|
71
73
|
this.eventBus = eventBus;
|
|
72
74
|
this.searchIndexService = searchIndexService;
|
|
73
75
|
this.jobQueueService = jobQueueService;
|
|
76
|
+
this.moduleRef = moduleRef;
|
|
74
77
|
}
|
|
75
78
|
static init(options) {
|
|
76
79
|
this.options = options;
|
|
@@ -145,6 +148,25 @@ let DefaultSearchPlugin = DefaultSearchPlugin_1 = class DefaultSearchPlugin {
|
|
|
145
148
|
return this.searchIndexService.reindex(event.ctx);
|
|
146
149
|
}
|
|
147
150
|
});
|
|
151
|
+
await this.initSearchStrategy();
|
|
152
|
+
}
|
|
153
|
+
/** @internal */
|
|
154
|
+
async onApplicationShutdown(signal) {
|
|
155
|
+
await this.destroySearchStrategy();
|
|
156
|
+
}
|
|
157
|
+
async initSearchStrategy() {
|
|
158
|
+
const injector = new common_1.Injector(this.moduleRef);
|
|
159
|
+
const searchService = injector.get(fulltext_search_service_1.FulltextSearchService);
|
|
160
|
+
if (typeof searchService.searchStrategy.init === 'function') {
|
|
161
|
+
await searchService.searchStrategy.init(injector);
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
async destroySearchStrategy() {
|
|
165
|
+
const injector = new common_1.Injector(this.moduleRef);
|
|
166
|
+
const searchService = injector.get(fulltext_search_service_1.FulltextSearchService);
|
|
167
|
+
if (typeof searchService.searchStrategy.destroy === 'function') {
|
|
168
|
+
await searchService.searchStrategy.destroy();
|
|
169
|
+
}
|
|
148
170
|
}
|
|
149
171
|
/**
|
|
150
172
|
* If the `indexStockStatus` option is set to `true`, we dynamically add a couple of
|
|
@@ -185,7 +207,8 @@ DefaultSearchPlugin = DefaultSearchPlugin_1 = __decorate([
|
|
|
185
207
|
}),
|
|
186
208
|
__metadata("design:paramtypes", [event_bus_1.EventBus,
|
|
187
209
|
search_index_service_1.SearchIndexService,
|
|
188
|
-
job_queue_service_1.JobQueueService
|
|
210
|
+
job_queue_service_1.JobQueueService,
|
|
211
|
+
core_1.ModuleRef])
|
|
189
212
|
], DefaultSearchPlugin);
|
|
190
213
|
exports.DefaultSearchPlugin = DefaultSearchPlugin;
|
|
191
214
|
//# sourceMappingURL=default-search-plugin.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-search-plugin.js","sourceRoot":"","sources":["../../../src/plugin/default-search-plugin/default-search-plugin.ts"],"names":[],"mappings":";;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"default-search-plugin.js","sourceRoot":"","sources":["../../../src/plugin/default-search-plugin/default-search-plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ import { FacetValueService } from '../../service/services/facet-value.service';
|
|
|
10
10
|
import { ProductVariantService } from '../../service/services/product-variant.service';
|
|
11
11
|
import { SearchService } from '../../service/services/search.service';
|
|
12
12
|
import { SearchIndexService } from './indexer/search-index.service';
|
|
13
|
+
import { SearchStrategy } from './search-strategy/search-strategy';
|
|
13
14
|
import { DefaultSearchPluginInitOptions } from './types';
|
|
14
15
|
/**
|
|
15
16
|
* Search indexing and full-text search for supported databases. See the various
|
|
@@ -24,7 +25,7 @@ export declare class FulltextSearchService {
|
|
|
24
25
|
private searchIndexService;
|
|
25
26
|
private searchService;
|
|
26
27
|
private options;
|
|
27
|
-
private
|
|
28
|
+
private _searchStrategy;
|
|
28
29
|
private readonly minTermLength;
|
|
29
30
|
constructor(connection: TransactionalConnection, eventBus: EventBus, facetValueService: FacetValueService, collectionService: CollectionService, productVariantService: ProductVariantService, searchIndexService: SearchIndexService, searchService: SearchService, options: DefaultSearchPluginInitOptions);
|
|
30
31
|
/**
|
|
@@ -53,4 +54,5 @@ export declare class FulltextSearchService {
|
|
|
53
54
|
* Sets the SearchStrategy appropriate to th configured database type.
|
|
54
55
|
*/
|
|
55
56
|
private setSearchStrategy;
|
|
57
|
+
get searchStrategy(): SearchStrategy;
|
|
56
58
|
}
|
|
@@ -17,6 +17,7 @@ const common_1 = require("@nestjs/common");
|
|
|
17
17
|
const errors_1 = require("../../common/error/errors");
|
|
18
18
|
const transactional_connection_1 = require("../../connection/transactional-connection");
|
|
19
19
|
const event_bus_1 = require("../../event-bus/event-bus");
|
|
20
|
+
const search_event_1 = require("../../event-bus/events/search-event");
|
|
20
21
|
const collection_service_1 = require("../../service/services/collection.service");
|
|
21
22
|
const facet_value_service_1 = require("../../service/services/facet-value.service");
|
|
22
23
|
const product_variant_service_1 = require("../../service/services/product-variant.service");
|
|
@@ -48,8 +49,9 @@ let FulltextSearchService = class FulltextSearchService {
|
|
|
48
49
|
* Perform a fulltext search according to the provided input arguments.
|
|
49
50
|
*/
|
|
50
51
|
async search(ctx, input, enabledOnly = false) {
|
|
51
|
-
const items = await this.
|
|
52
|
-
const totalItems = await this.
|
|
52
|
+
const items = await this._searchStrategy.getSearchResults(ctx, input, enabledOnly);
|
|
53
|
+
const totalItems = await this._searchStrategy.getTotalCount(ctx, input, enabledOnly);
|
|
54
|
+
this.eventBus.publish(new search_event_1.SearchEvent(ctx, input));
|
|
53
55
|
return {
|
|
54
56
|
items,
|
|
55
57
|
totalItems,
|
|
@@ -59,7 +61,7 @@ let FulltextSearchService = class FulltextSearchService {
|
|
|
59
61
|
* Return a list of all FacetValues which appear in the result set.
|
|
60
62
|
*/
|
|
61
63
|
async facetValues(ctx, input, enabledOnly = false) {
|
|
62
|
-
const facetValueIdsMap = await this.
|
|
64
|
+
const facetValueIdsMap = await this._searchStrategy.getFacetValueIds(ctx, input, enabledOnly);
|
|
63
65
|
const facetValues = await this.facetValueService.findByIds(ctx, Array.from(facetValueIdsMap.keys()));
|
|
64
66
|
return facetValues.map((facetValue, index) => {
|
|
65
67
|
return {
|
|
@@ -72,7 +74,7 @@ let FulltextSearchService = class FulltextSearchService {
|
|
|
72
74
|
* Return a list of all Collections which appear in the result set.
|
|
73
75
|
*/
|
|
74
76
|
async collections(ctx, input, enabledOnly = false) {
|
|
75
|
-
const collectionIdsMap = await this.
|
|
77
|
+
const collectionIdsMap = await this._searchStrategy.getCollectionIds(ctx, input, enabledOnly);
|
|
76
78
|
const collections = await this.collectionService.findByIds(ctx, Array.from(collectionIdsMap.keys()));
|
|
77
79
|
return collections.map((collection, index) => {
|
|
78
80
|
return {
|
|
@@ -92,22 +94,30 @@ let FulltextSearchService = class FulltextSearchService {
|
|
|
92
94
|
* Sets the SearchStrategy appropriate to th configured database type.
|
|
93
95
|
*/
|
|
94
96
|
setSearchStrategy() {
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
case 'mariadb':
|
|
98
|
-
this.searchStrategy = new mysql_search_strategy_1.MysqlSearchStrategy(this.connection, this.options);
|
|
99
|
-
break;
|
|
100
|
-
case 'sqlite':
|
|
101
|
-
case 'sqljs':
|
|
102
|
-
case 'better-sqlite3':
|
|
103
|
-
this.searchStrategy = new sqlite_search_strategy_1.SqliteSearchStrategy(this.connection, this.options);
|
|
104
|
-
break;
|
|
105
|
-
case 'postgres':
|
|
106
|
-
this.searchStrategy = new postgres_search_strategy_1.PostgresSearchStrategy(this.connection, this.options);
|
|
107
|
-
break;
|
|
108
|
-
default:
|
|
109
|
-
throw new errors_1.InternalServerError(`error.database-not-supported-by-default-search-plugin`);
|
|
97
|
+
if (this.options.searchStategy) {
|
|
98
|
+
this._searchStrategy = this.options.searchStategy;
|
|
110
99
|
}
|
|
100
|
+
else {
|
|
101
|
+
switch (this.connection.rawConnection.options.type) {
|
|
102
|
+
case 'mysql':
|
|
103
|
+
case 'mariadb':
|
|
104
|
+
this._searchStrategy = new mysql_search_strategy_1.MysqlSearchStrategy();
|
|
105
|
+
break;
|
|
106
|
+
case 'sqlite':
|
|
107
|
+
case 'sqljs':
|
|
108
|
+
case 'better-sqlite3':
|
|
109
|
+
this._searchStrategy = new sqlite_search_strategy_1.SqliteSearchStrategy();
|
|
110
|
+
break;
|
|
111
|
+
case 'postgres':
|
|
112
|
+
this._searchStrategy = new postgres_search_strategy_1.PostgresSearchStrategy();
|
|
113
|
+
break;
|
|
114
|
+
default:
|
|
115
|
+
throw new errors_1.InternalServerError(`error.database-not-supported-by-default-search-plugin`);
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
get searchStrategy() {
|
|
120
|
+
return this._searchStrategy;
|
|
111
121
|
}
|
|
112
122
|
};
|
|
113
123
|
FulltextSearchService = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fulltext-search.service.js","sourceRoot":"","sources":["../../../src/plugin/default-search-plugin/fulltext-search.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AAKpD,sDAAgE;AAChE,wFAAoF;AAEpF,yDAAqD;
|
|
1
|
+
{"version":3,"file":"fulltext-search.service.js","sourceRoot":"","sources":["../../../src/plugin/default-search-plugin/fulltext-search.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -142,7 +142,7 @@ let SearchIndexService = class SearchIndexService {
|
|
|
142
142
|
});
|
|
143
143
|
},
|
|
144
144
|
error: (err) => {
|
|
145
|
-
vendure_logger_1.Logger.error(JSON.stringify(err));
|
|
145
|
+
vendure_logger_1.Logger.error(err.message || JSON.stringify(err), undefined, err.stack);
|
|
146
146
|
reject(err);
|
|
147
147
|
},
|
|
148
148
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-index.service.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/indexer/search-index.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"search-index.service.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/indexer/search-index.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import { SearchResult } from '@vendure/common/lib/generated-types';
|
|
2
2
|
import { ID } from '@vendure/common/lib/shared-types';
|
|
3
3
|
import { RequestContext } from '../../../api/common/request-context';
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
4
|
+
import { Injector } from '../../../common';
|
|
5
|
+
import { SearchInput } from '../types';
|
|
6
6
|
import { SearchStrategy } from './search-strategy';
|
|
7
7
|
/**
|
|
8
8
|
* A weighted fulltext search for MySQL / MariaDB.
|
|
9
9
|
*/
|
|
10
10
|
export declare class MysqlSearchStrategy implements SearchStrategy {
|
|
11
|
+
private readonly minTermLength;
|
|
11
12
|
private connection;
|
|
12
13
|
private options;
|
|
13
|
-
|
|
14
|
-
constructor(connection: TransactionalConnection, options: DefaultSearchPluginInitOptions);
|
|
14
|
+
init(injector: Injector): Promise<void>;
|
|
15
15
|
getFacetValueIds(ctx: RequestContext, input: SearchInput, enabledOnly: boolean): Promise<Map<ID, number>>;
|
|
16
16
|
getCollectionIds(ctx: RequestContext, input: SearchInput, enabledOnly: boolean): Promise<Map<ID, number>>;
|
|
17
17
|
getSearchResults(ctx: RequestContext, input: SearchInput, enabledOnly: boolean): Promise<SearchResult[]>;
|
|
@@ -4,6 +4,8 @@ exports.MysqlSearchStrategy = void 0;
|
|
|
4
4
|
const generated_types_1 = require("@vendure/common/lib/generated-types");
|
|
5
5
|
const typeorm_1 = require("typeorm");
|
|
6
6
|
const errors_1 = require("../../../common/error/errors");
|
|
7
|
+
const transactional_connection_1 = require("../../../connection/transactional-connection");
|
|
8
|
+
const constants_1 = require("../constants");
|
|
7
9
|
const search_index_item_entity_1 = require("../entities/search-index-item.entity");
|
|
8
10
|
const search_strategy_common_1 = require("./search-strategy-common");
|
|
9
11
|
const search_strategy_utils_1 = require("./search-strategy-utils");
|
|
@@ -11,11 +13,13 @@ const search_strategy_utils_1 = require("./search-strategy-utils");
|
|
|
11
13
|
* A weighted fulltext search for MySQL / MariaDB.
|
|
12
14
|
*/
|
|
13
15
|
class MysqlSearchStrategy {
|
|
14
|
-
constructor(
|
|
15
|
-
this.connection = connection;
|
|
16
|
-
this.options = options;
|
|
16
|
+
constructor() {
|
|
17
17
|
this.minTermLength = 2;
|
|
18
18
|
}
|
|
19
|
+
async init(injector) {
|
|
20
|
+
this.connection = injector.get(transactional_connection_1.TransactionalConnection);
|
|
21
|
+
this.options = injector.get(constants_1.PLUGIN_INIT_OPTIONS);
|
|
22
|
+
}
|
|
19
23
|
async getFacetValueIds(ctx, input, enabledOnly) {
|
|
20
24
|
const facetValuesQb = this.connection
|
|
21
25
|
.getRepository(search_index_item_entity_1.SearchIndexItem)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/mysql-search-strategy.ts"],"names":[],"mappings":";;;AAAA,yEAAoF;AAEpF,qCAAuD;
|
|
1
|
+
{"version":3,"file":"mysql-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/mysql-search-strategy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import { SearchResult } from '@vendure/common/lib/generated-types';
|
|
2
2
|
import { ID } from '@vendure/common/lib/shared-types';
|
|
3
3
|
import { RequestContext } from '../../../api/common/request-context';
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
4
|
+
import { Injector } from '../../../common';
|
|
5
|
+
import { SearchInput } from '../types';
|
|
6
6
|
import { SearchStrategy } from './search-strategy';
|
|
7
7
|
/**
|
|
8
8
|
* A weighted fulltext search for PostgeSQL.
|
|
9
9
|
*/
|
|
10
10
|
export declare class PostgresSearchStrategy implements SearchStrategy {
|
|
11
|
+
private readonly minTermLength;
|
|
11
12
|
private connection;
|
|
12
13
|
private options;
|
|
13
|
-
|
|
14
|
-
constructor(connection: TransactionalConnection, options: DefaultSearchPluginInitOptions);
|
|
14
|
+
init(injector: Injector): Promise<void>;
|
|
15
15
|
getFacetValueIds(ctx: RequestContext, input: SearchInput, enabledOnly: boolean): Promise<Map<ID, number>>;
|
|
16
16
|
getCollectionIds(ctx: RequestContext, input: SearchInput, enabledOnly: boolean): Promise<Map<ID, number>>;
|
|
17
17
|
getSearchResults(ctx: RequestContext, input: SearchInput, enabledOnly: boolean): Promise<SearchResult[]>;
|
|
@@ -4,6 +4,8 @@ exports.PostgresSearchStrategy = void 0;
|
|
|
4
4
|
const generated_types_1 = require("@vendure/common/lib/generated-types");
|
|
5
5
|
const typeorm_1 = require("typeorm");
|
|
6
6
|
const errors_1 = require("../../../common/error/errors");
|
|
7
|
+
const transactional_connection_1 = require("../../../connection/transactional-connection");
|
|
8
|
+
const constants_1 = require("../constants");
|
|
7
9
|
const search_index_item_entity_1 = require("../entities/search-index-item.entity");
|
|
8
10
|
const search_strategy_common_1 = require("./search-strategy-common");
|
|
9
11
|
const search_strategy_utils_1 = require("./search-strategy-utils");
|
|
@@ -11,11 +13,13 @@ const search_strategy_utils_1 = require("./search-strategy-utils");
|
|
|
11
13
|
* A weighted fulltext search for PostgeSQL.
|
|
12
14
|
*/
|
|
13
15
|
class PostgresSearchStrategy {
|
|
14
|
-
constructor(
|
|
15
|
-
this.connection = connection;
|
|
16
|
-
this.options = options;
|
|
16
|
+
constructor() {
|
|
17
17
|
this.minTermLength = 2;
|
|
18
18
|
}
|
|
19
|
+
async init(injector) {
|
|
20
|
+
this.connection = injector.get(transactional_connection_1.TransactionalConnection);
|
|
21
|
+
this.options = injector.get(constants_1.PLUGIN_INIT_OPTIONS);
|
|
22
|
+
}
|
|
19
23
|
async getFacetValueIds(ctx, input, enabledOnly) {
|
|
20
24
|
const facetValuesQb = this.connection
|
|
21
25
|
.getRepository(search_index_item_entity_1.SearchIndexItem)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postgres-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/postgres-search-strategy.ts"],"names":[],"mappings":";;;AAAA,yEAAoF;AAEpF,qCAAuD;
|
|
1
|
+
{"version":3,"file":"postgres-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/postgres-search-strategy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { SearchInput, SearchResult } from '@vendure/common/lib/generated-types';
|
|
2
2
|
import { ID } from '@vendure/common/lib/shared-types';
|
|
3
3
|
import { RequestContext } from '../../../api';
|
|
4
|
+
import { InjectableStrategy } from '../../../common';
|
|
4
5
|
/**
|
|
5
6
|
* This interface defines the contract that any database-specific search implementations
|
|
6
7
|
* should follow.
|
|
7
8
|
*/
|
|
8
|
-
export interface SearchStrategy {
|
|
9
|
+
export interface SearchStrategy extends InjectableStrategy {
|
|
9
10
|
getSearchResults(ctx: RequestContext, input: SearchInput, enabledOnly: boolean): Promise<SearchResult[]>;
|
|
10
11
|
getTotalCount(ctx: RequestContext, input: SearchInput, enabledOnly: boolean): Promise<number>;
|
|
11
12
|
/**
|
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
import { SearchResult } from '@vendure/common/lib/generated-types';
|
|
2
2
|
import { ID } from '@vendure/common/lib/shared-types';
|
|
3
3
|
import { RequestContext } from '../../../api/common/request-context';
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
4
|
+
import { Injector } from '../../../common';
|
|
5
|
+
import { SearchInput } from '../types';
|
|
6
6
|
import { SearchStrategy } from './search-strategy';
|
|
7
7
|
/**
|
|
8
8
|
* A rather naive search for SQLite / SQL.js. Rather than proper
|
|
9
9
|
* full-text searching, it uses a weighted `LIKE "%term%"` operator instead.
|
|
10
10
|
*/
|
|
11
11
|
export declare class SqliteSearchStrategy implements SearchStrategy {
|
|
12
|
+
private readonly minTermLength;
|
|
12
13
|
private connection;
|
|
13
14
|
private options;
|
|
14
|
-
|
|
15
|
-
constructor(connection: TransactionalConnection, options: DefaultSearchPluginInitOptions);
|
|
15
|
+
init(injector: Injector): Promise<void>;
|
|
16
16
|
getFacetValueIds(ctx: RequestContext, input: SearchInput, enabledOnly: boolean): Promise<Map<ID, number>>;
|
|
17
17
|
getCollectionIds(ctx: RequestContext, input: SearchInput, enabledOnly: boolean): Promise<Map<ID, number>>;
|
|
18
18
|
getSearchResults(ctx: RequestContext, input: SearchInput, enabledOnly: boolean): Promise<SearchResult[]>;
|