@searchspring/snap-controller 0.29.0 → 0.30.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/cjs/Abstract/AbstractController.d.ts +3 -7
- package/dist/cjs/Abstract/AbstractController.d.ts.map +1 -1
- package/dist/cjs/Abstract/AbstractController.js +0 -29
- package/dist/cjs/Autocomplete/AutocompleteController.d.ts +1 -1
- package/dist/cjs/Recommendation/RecommendationController.d.ts.map +1 -1
- package/dist/cjs/Recommendation/RecommendationController.js +0 -4
- package/dist/cjs/Search/SearchController.d.ts.map +1 -1
- package/dist/cjs/Search/SearchController.js +54 -38
- package/dist/cjs/types.d.ts +2 -2
- package/dist/cjs/types.d.ts.map +1 -1
- package/dist/esm/Abstract/AbstractController.d.ts +3 -7
- package/dist/esm/Abstract/AbstractController.d.ts.map +1 -1
- package/dist/esm/Abstract/AbstractController.js +1 -25
- package/dist/esm/Recommendation/RecommendationController.d.ts.map +1 -1
- package/dist/esm/Recommendation/RecommendationController.js +0 -4
- package/dist/esm/Search/SearchController.d.ts.map +1 -1
- package/dist/esm/Search/SearchController.js +19 -4
- package/dist/esm/types.d.ts +2 -2
- package/dist/esm/types.d.ts.map +1 -1
- package/package.json +10 -10
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { LogMode } from '@searchspring/snap-logger';
|
|
2
1
|
import { DomTargeter } from '@searchspring/snap-toolbox';
|
|
3
2
|
import type { Client } from '@searchspring/snap-client';
|
|
4
3
|
import type { AbstractStore } from '@searchspring/snap-store-mobx';
|
|
@@ -8,7 +7,7 @@ import type { Profiler } from '@searchspring/snap-profiler';
|
|
|
8
7
|
import type { Logger } from '@searchspring/snap-logger';
|
|
9
8
|
import type { Tracker } from '@searchspring/snap-tracker';
|
|
10
9
|
import type { Target, OnTarget } from '@searchspring/snap-toolbox';
|
|
11
|
-
import type { ControllerServices, ControllerConfig, Attachments, ContextVariables } from '../types';
|
|
10
|
+
import type { ControllerServices, ControllerConfig, Attachments, ContextVariables, PluginFunction } from '../types';
|
|
12
11
|
export declare abstract class AbstractController {
|
|
13
12
|
id: string;
|
|
14
13
|
type: string;
|
|
@@ -24,18 +23,15 @@ export declare abstract class AbstractController {
|
|
|
24
23
|
targeters: {
|
|
25
24
|
[key: string]: DomTargeter;
|
|
26
25
|
};
|
|
27
|
-
|
|
28
|
-
private _environment;
|
|
26
|
+
protected _initialized: boolean;
|
|
29
27
|
get initialized(): boolean;
|
|
30
28
|
constructor(config: ControllerConfig, { client, store, urlManager, eventManager, profiler, logger, tracker }: ControllerServices, context?: ContextVariables);
|
|
31
29
|
createTargeter(target: Target, onTarget: OnTarget, document?: Document): DomTargeter | undefined;
|
|
32
30
|
addTargeter(target: DomTargeter): DomTargeter | undefined;
|
|
33
|
-
set environment(env: LogMode);
|
|
34
|
-
get environment(): LogMode;
|
|
35
31
|
init(): Promise<void>;
|
|
36
32
|
retarget(): void;
|
|
37
33
|
abstract search(): Promise<void>;
|
|
38
|
-
plugin(func:
|
|
34
|
+
plugin(func: PluginFunction, ...args: unknown[]): Promise<void>;
|
|
39
35
|
on<T>(event: string, ...func: Middleware<T>[]): void;
|
|
40
36
|
use(attachments: Attachments): void;
|
|
41
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractController.d.ts","sourceRoot":"","sources":["../../../src/Abstract/AbstractController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"AbstractController.d.ts","sourceRoot":"","sources":["../../../src/Abstract/AbstractController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAEzD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAExD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AACjF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAEnE,OAAO,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,WAAW,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAEpH,8BAAsB,kBAAkB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,SAAc;IAClB,MAAM,EAAE,gBAAgB,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,aAAa,CAAC;IACrB,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,YAAY,CAAC;IAC3B,QAAQ,EAAE,QAAQ,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,gBAAgB,CAAC;IAE1B,SAAS,EAAE;QACjB,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAC;KAC3B,CAAM;IAEP,SAAS,CAAC,YAAY,UAAS;IAE/B,IAAI,WAAW,IAAI,OAAO,CAEzB;gBAGA,MAAM,EAAE,gBAAgB,EACxB,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,kBAAkB,EAC1F,OAAO,GAAE,gBAAqB;IA2DxB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,WAAW,GAAG,SAAS;IAIhG,WAAW,CAAC,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,SAAS;IASnD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IA+C3B,QAAQ,IAAI,IAAI;aAMP,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAE1B,MAAM,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI;IAIpD,GAAG,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI;CAoC1C"}
|
|
@@ -46,18 +46,14 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
46
46
|
};
|
|
47
47
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
48
48
|
exports.AbstractController = void 0;
|
|
49
|
-
var snap_logger_1 = require("@searchspring/snap-logger");
|
|
50
49
|
var snap_toolbox_1 = require("@searchspring/snap-toolbox");
|
|
51
|
-
var SS_DEV_COOKIE = 'ssDev';
|
|
52
50
|
var AbstractController = /** @class */ (function () {
|
|
53
51
|
function AbstractController(config, _a, context) {
|
|
54
52
|
var client = _a.client, store = _a.store, urlManager = _a.urlManager, eventManager = _a.eventManager, profiler = _a.profiler, logger = _a.logger, tracker = _a.tracker;
|
|
55
53
|
if (context === void 0) { context = {}; }
|
|
56
|
-
var _b, _c, _d;
|
|
57
54
|
this.type = 'abstract';
|
|
58
55
|
this.targeters = {};
|
|
59
56
|
this._initialized = false;
|
|
60
|
-
this._environment = snap_logger_1.LogMode.PRODUCTION;
|
|
61
57
|
if (typeof config != 'object' || typeof config.id != 'string' || !config.id.match(/^[a-zA-Z0-9_-]*$/)) {
|
|
62
58
|
throw new Error("Invalid config passed to controller. The \"id\" attribute must be an alphanumeric string.");
|
|
63
59
|
}
|
|
@@ -88,12 +84,6 @@ var AbstractController = /** @class */ (function () {
|
|
|
88
84
|
if (typeof tracker != 'object' || typeof tracker.track != 'object') {
|
|
89
85
|
throw new Error("Invalid service 'tracker' passed to controller. Missing \"track\" object.");
|
|
90
86
|
}
|
|
91
|
-
window.searchspring = window.searchspring || {};
|
|
92
|
-
window.searchspring.controller = window.searchspring.controller || {};
|
|
93
|
-
if (window.searchspring.controller[config.id]) {
|
|
94
|
-
throw new Error("Controller with id '".concat(config.id, "' is already defined"));
|
|
95
|
-
}
|
|
96
|
-
window.searchspring.controller[config.id] = this;
|
|
97
87
|
this.id = config.id;
|
|
98
88
|
this.config = config;
|
|
99
89
|
this.client = client;
|
|
@@ -108,12 +98,6 @@ var AbstractController = /** @class */ (function () {
|
|
|
108
98
|
this.log.setNamespace(this.config.id);
|
|
109
99
|
// set namespaces
|
|
110
100
|
this.profiler.setNamespace(this.config.id);
|
|
111
|
-
// set environment
|
|
112
|
-
if ((_d = (_c = (_b = (0, snap_toolbox_1.url)(window.location.href)) === null || _b === void 0 ? void 0 : _b.params) === null || _c === void 0 ? void 0 : _c.query) === null || _d === void 0 ? void 0 : _d.dev) {
|
|
113
|
-
snap_toolbox_1.cookies.set(SS_DEV_COOKIE, '1', 'Lax', 0);
|
|
114
|
-
}
|
|
115
|
-
var dev = snap_toolbox_1.cookies.get(SS_DEV_COOKIE);
|
|
116
|
-
this.environment = (dev === '1' ? 'development' : process.env.NODE_ENV);
|
|
117
101
|
}
|
|
118
102
|
Object.defineProperty(AbstractController.prototype, "initialized", {
|
|
119
103
|
get: function () {
|
|
@@ -134,19 +118,6 @@ var AbstractController = /** @class */ (function () {
|
|
|
134
118
|
return target;
|
|
135
119
|
}
|
|
136
120
|
};
|
|
137
|
-
Object.defineProperty(AbstractController.prototype, "environment", {
|
|
138
|
-
get: function () {
|
|
139
|
-
return this._environment;
|
|
140
|
-
},
|
|
141
|
-
set: function (env) {
|
|
142
|
-
if (Object.values(snap_logger_1.LogMode).includes(env)) {
|
|
143
|
-
this._environment = env;
|
|
144
|
-
this.log.setMode(env);
|
|
145
|
-
}
|
|
146
|
-
},
|
|
147
|
-
enumerable: false,
|
|
148
|
-
configurable: true
|
|
149
|
-
});
|
|
150
121
|
AbstractController.prototype.init = function () {
|
|
151
122
|
return __awaiter(this, void 0, void 0, function () {
|
|
152
123
|
var initProfile, err_1, err_2;
|
|
@@ -28,7 +28,7 @@ export declare class AutocompleteController extends AbstractController {
|
|
|
28
28
|
focus: (e: FocusEvent) => void;
|
|
29
29
|
formSubmit: (e: React.FormEvent<HTMLInputElement>) => Promise<void>;
|
|
30
30
|
keyUp: (e: KeyboardEvent) => void;
|
|
31
|
-
timeoutDelay: NodeJS.Timeout;
|
|
31
|
+
timeoutDelay: NodeJS.Timeout | undefined;
|
|
32
32
|
};
|
|
33
33
|
document: {
|
|
34
34
|
click: (e: MouseEvent) => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RecommendationController.d.ts","sourceRoot":"","sources":["../../../src/Recommendation/RecommendationController.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RecommendationController.d.ts","sourceRoot":"","sources":["../../../src/Recommendation/RecommendationController.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAG3C,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEzE,OAAO,KAAK,EAAE,8BAA8B,EAAkC,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAErI,aAAK,0BAA0B,GAAG;IACjC,OAAO,EAAE;QACR,KAAK,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,KAAK,WAAW,GAAG,SAAS,CAAC;QAC/D,MAAM,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,WAAW,GAAG,SAAS,CAAC;QACjD,UAAU,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,WAAW,GAAG,SAAS,CAAC;KACrD,CAAC;IACF,KAAK,EAAE,CAAC,CAAC,EAAE,UAAU,KAAK,WAAW,GAAG,SAAS,CAAC;IAClD,UAAU,EAAE,MAAM,WAAW,GAAG,SAAS,CAAC;IAC1C,MAAM,EAAE,MAAM,WAAW,GAAG,SAAS,CAAC;CACtC,CAAC;AAEF,aAAK,6BAA6B,GAAG;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAUF,qBAAa,wBAAyB,SAAQ,kBAAkB;IACxD,IAAI,kBAAkC;IACrC,KAAK,EAAE,mBAAmB,CAAC;IAC3B,MAAM,EAAE,8BAA8B,CAAC;IAE/C,MAAM,EAAE;QACP,KAAK,CAAC,EAAE,WAAW,CAAC;QACpB,UAAU,CAAC,EAAE,WAAW,CAAC;QACzB,MAAM,CAAC,EAAE,WAAW,CAAC;QACrB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;YAAE,UAAU,CAAC,EAAE,WAAW,CAAC;YAAC,MAAM,CAAC,EAAE,WAAW,CAAA;SAAE,CAAC,CAAC;KAC7E,CAKC;gBAGD,MAAM,EAAE,8BAA8B,EACtC,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,kBAAkB,EAC1F,OAAO,CAAC,EAAE,gBAAgB;IA8B3B,KAAK,EAAE,0BAA0B,CAqK/B;IAEF,IAAI,MAAM,IAAI,6BAA6B,CAsB1C;IAED,MAAM,QAAa,QAAQ,IAAI,CAAC,CAqG9B;CACF"}
|
|
@@ -68,7 +68,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
68
68
|
exports.RecommendationController = void 0;
|
|
69
69
|
var deepmerge_1 = __importDefault(require("deepmerge"));
|
|
70
70
|
var snap_tracker_1 = require("@searchspring/snap-tracker");
|
|
71
|
-
var snap_logger_1 = require("@searchspring/snap-logger");
|
|
72
71
|
var AbstractController_1 = require("../Abstract/AbstractController");
|
|
73
72
|
var types_1 = require("../types");
|
|
74
73
|
var snap_store_mobx_1 = require("@searchspring/snap-store-mobx");
|
|
@@ -441,9 +440,6 @@ var RecommendationController = /** @class */ (function (_super) {
|
|
|
441
440
|
if (lastViewed === null || lastViewed === void 0 ? void 0 : lastViewed.length) {
|
|
442
441
|
params.lastViewed = lastViewed;
|
|
443
442
|
}
|
|
444
|
-
if (this.environment == snap_logger_1.LogMode.DEVELOPMENT) {
|
|
445
|
-
params.test = true;
|
|
446
|
-
}
|
|
447
443
|
return params;
|
|
448
444
|
},
|
|
449
445
|
enumerable: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SearchController.d.ts","sourceRoot":"","sources":["../../../src/Search/SearchController.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,YAAY,EAA0B,MAAM,+BAA+B,CAAC;AAErF,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,KAAK,EAAE,sBAAsB,EAAkD,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE7I,OAAO,KAAK,EAAE,kBAAkB,
|
|
1
|
+
{"version":3,"file":"SearchController.d.ts","sourceRoot":"","sources":["../../../src/Search/SearchController.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,YAAY,EAA0B,MAAM,+BAA+B,CAAC;AAErF,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,KAAK,EAAE,sBAAsB,EAAkD,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE7I,OAAO,KAAK,EAAE,kBAAkB,EAA2E,MAAM,2BAA2B,CAAC;AAoB7I,aAAK,kBAAkB,GAAG;IACzB,OAAO,EAAE;QACR,KAAK,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,KAAK,WAAW,GAAG,SAAS,CAAC;KAC/D,CAAC;CACF,CAAC;AAEF,qBAAa,gBAAiB,SAAQ,kBAAkB;IAChD,IAAI,kBAA0B;IAC7B,KAAK,EAAE,WAAW,CAAC;IACnB,MAAM,EAAE,sBAAsB,CAAC;IACvC,OAAO,EAAE,YAAY,CAAC;gBAGrB,MAAM,EAAE,sBAAsB,EAC9B,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,kBAAkB,EAC1F,OAAO,CAAC,EAAE,gBAAgB;IA0F3B,KAAK,EAAE,kBAAkB,CAoCvB;IAEF,IAAI,MAAM,IAAI,kBAAkB,CAsC/B;IAED,MAAM,QAAa,QAAQ,IAAI,CAAC,CA0J9B;CACF"}
|
|
@@ -105,18 +105,26 @@ var SearchController = /** @class */ (function (_super) {
|
|
|
105
105
|
_this.track = {
|
|
106
106
|
product: {
|
|
107
107
|
click: function (e, result) {
|
|
108
|
-
var _a, _b;
|
|
108
|
+
var _a, _b, _c, _d;
|
|
109
109
|
// store scroll position
|
|
110
110
|
if ((_a = _this.config.settings) === null || _a === void 0 ? void 0 : _a.infinite) {
|
|
111
111
|
var stringyParams = _this.storage.get('lastStringyParams');
|
|
112
|
+
var paramsObj = JSON.parse(stringyParams);
|
|
113
|
+
if ((_b = paramsObj === null || paramsObj === void 0 ? void 0 : paramsObj.search) === null || _b === void 0 ? void 0 : _b.redirectResponse) {
|
|
114
|
+
(_c = paramsObj === null || paramsObj === void 0 ? void 0 : paramsObj.search) === null || _c === void 0 ? true : delete _c.redirectResponse;
|
|
115
|
+
}
|
|
116
|
+
if (paramsObj === null || paramsObj === void 0 ? void 0 : paramsObj.personalization) {
|
|
117
|
+
paramsObj === null || paramsObj === void 0 ? true : delete paramsObj.personalization;
|
|
118
|
+
}
|
|
119
|
+
stringyParams = JSON.stringify(paramsObj);
|
|
112
120
|
var scrollMap = {};
|
|
113
121
|
scrollMap[stringyParams] = window.scrollY;
|
|
114
122
|
_this.storage.set('scrollMap', scrollMap);
|
|
115
123
|
}
|
|
116
124
|
// track
|
|
117
|
-
var
|
|
125
|
+
var _e = result.attributes, intellisuggestData = _e.intellisuggestData, intellisuggestSignature = _e.intellisuggestSignature;
|
|
118
126
|
var target = e.target;
|
|
119
|
-
var href = (target === null || target === void 0 ? void 0 : target.href) || ((
|
|
127
|
+
var href = (target === null || target === void 0 ? void 0 : target.href) || ((_d = result.mappings.core) === null || _d === void 0 ? void 0 : _d.url) || undefined;
|
|
120
128
|
var event = _this.tracker.track.product.click({
|
|
121
129
|
intellisuggestData: intellisuggestData,
|
|
122
130
|
intellisuggestSignature: intellisuggestSignature,
|
|
@@ -129,32 +137,32 @@ var SearchController = /** @class */ (function (_super) {
|
|
|
129
137
|
};
|
|
130
138
|
_this.search = function () { return __awaiter(_this, void 0, void 0, function () {
|
|
131
139
|
var params, err_1, stringyParams, prevStringyParams, preventBackfill, dontBackfill, searchProfile, _a, meta, response, previousResults_1, backfills, page, backfillParams, backfillResponses, afterSearchProfile, err_2, afterStoreProfile, err_3, err_4;
|
|
132
|
-
var _b, _c, _d, _e, _f, _g, _h, _j, _k
|
|
133
|
-
return __generator(this, function (
|
|
134
|
-
switch (
|
|
140
|
+
var _b, _c, _d, _e, _f, _g, _h, _j, _k;
|
|
141
|
+
return __generator(this, function (_l) {
|
|
142
|
+
switch (_l.label) {
|
|
135
143
|
case 0:
|
|
136
144
|
if (!!this.initialized) return [3 /*break*/, 2];
|
|
137
145
|
return [4 /*yield*/, this.init()];
|
|
138
146
|
case 1:
|
|
139
|
-
|
|
140
|
-
|
|
147
|
+
_l.sent();
|
|
148
|
+
_l.label = 2;
|
|
141
149
|
case 2:
|
|
142
150
|
params = this.params;
|
|
143
|
-
|
|
151
|
+
_l.label = 3;
|
|
144
152
|
case 3:
|
|
145
|
-
|
|
146
|
-
|
|
153
|
+
_l.trys.push([3, 20, , 21]);
|
|
154
|
+
_l.label = 4;
|
|
147
155
|
case 4:
|
|
148
|
-
|
|
156
|
+
_l.trys.push([4, 6, , 7]);
|
|
149
157
|
return [4 /*yield*/, this.eventManager.fire('beforeSearch', {
|
|
150
158
|
controller: this,
|
|
151
159
|
request: params,
|
|
152
160
|
})];
|
|
153
161
|
case 5:
|
|
154
|
-
|
|
162
|
+
_l.sent();
|
|
155
163
|
return [3 /*break*/, 7];
|
|
156
164
|
case 6:
|
|
157
|
-
err_1 =
|
|
165
|
+
err_1 = _l.sent();
|
|
158
166
|
if ((err_1 === null || err_1 === void 0 ? void 0 : err_1.message) == 'cancelled') {
|
|
159
167
|
this.log.warn("'beforeSearch' middleware cancelled");
|
|
160
168
|
return [2 /*return*/];
|
|
@@ -183,7 +191,7 @@ var SearchController = /** @class */ (function (_super) {
|
|
|
183
191
|
searchProfile = this.profiler.create({ type: 'event', name: 'search', context: params }).start();
|
|
184
192
|
return [4 /*yield*/, this.client.search(params)];
|
|
185
193
|
case 8:
|
|
186
|
-
_a =
|
|
194
|
+
_a = _l.sent(), meta = _a[0], response = _a[1];
|
|
187
195
|
// @ts-ignore
|
|
188
196
|
if (!response.meta) {
|
|
189
197
|
/**
|
|
@@ -194,41 +202,41 @@ var SearchController = /** @class */ (function (_super) {
|
|
|
194
202
|
response.meta = meta;
|
|
195
203
|
}
|
|
196
204
|
if (!(((_g = this.config.settings) === null || _g === void 0 ? void 0 : _g.infinite) && ((_h = params.pagination) === null || _h === void 0 ? void 0 : _h.page) > 1)) return [3 /*break*/, 11];
|
|
197
|
-
previousResults_1 = ((
|
|
198
|
-
if (!(((
|
|
205
|
+
previousResults_1 = JSON.parse(JSON.stringify(this.store.results)) || [];
|
|
206
|
+
if (!(((_j = this.config.settings) === null || _j === void 0 ? void 0 : _j.infinite.backfill) && !previousResults_1.length)) return [3 /*break*/, 10];
|
|
199
207
|
backfills = [];
|
|
200
|
-
for (page = 1; page < ((
|
|
208
|
+
for (page = 1; page < ((_k = params.pagination) === null || _k === void 0 ? void 0 : _k.page); page++) {
|
|
201
209
|
backfillParams = (0, deepmerge_1.default)(__assign({}, params), { pagination: { page: page } });
|
|
202
210
|
backfills.push(this.client.search(backfillParams));
|
|
203
211
|
}
|
|
204
212
|
return [4 /*yield*/, Promise.all(backfills)];
|
|
205
213
|
case 9:
|
|
206
|
-
backfillResponses =
|
|
214
|
+
backfillResponses = _l.sent();
|
|
207
215
|
backfillResponses.map(function (_a) {
|
|
208
216
|
var meta = _a[0], data = _a[1];
|
|
209
217
|
previousResults_1 = previousResults_1.concat(data.results);
|
|
210
218
|
});
|
|
211
|
-
|
|
219
|
+
_l.label = 10;
|
|
212
220
|
case 10:
|
|
213
221
|
response.results = __spreadArray(__spreadArray([], previousResults_1, true), (response.results || []), true);
|
|
214
|
-
|
|
222
|
+
_l.label = 11;
|
|
215
223
|
case 11:
|
|
216
224
|
searchProfile.stop();
|
|
217
225
|
this.log.profile(searchProfile);
|
|
218
226
|
afterSearchProfile = this.profiler.create({ type: 'event', name: 'afterSearch', context: params }).start();
|
|
219
|
-
|
|
227
|
+
_l.label = 12;
|
|
220
228
|
case 12:
|
|
221
|
-
|
|
229
|
+
_l.trys.push([12, 14, , 15]);
|
|
222
230
|
return [4 /*yield*/, this.eventManager.fire('afterSearch', {
|
|
223
231
|
controller: this,
|
|
224
232
|
request: params,
|
|
225
233
|
response: response,
|
|
226
234
|
})];
|
|
227
235
|
case 13:
|
|
228
|
-
|
|
236
|
+
_l.sent();
|
|
229
237
|
return [3 /*break*/, 15];
|
|
230
238
|
case 14:
|
|
231
|
-
err_2 =
|
|
239
|
+
err_2 = _l.sent();
|
|
232
240
|
if ((err_2 === null || err_2 === void 0 ? void 0 : err_2.message) == 'cancelled') {
|
|
233
241
|
this.log.warn("'afterSearch' middleware cancelled");
|
|
234
242
|
afterSearchProfile.stop();
|
|
@@ -246,19 +254,19 @@ var SearchController = /** @class */ (function (_super) {
|
|
|
246
254
|
// @ts-ignore
|
|
247
255
|
this.store.update(response);
|
|
248
256
|
afterStoreProfile = this.profiler.create({ type: 'event', name: 'afterStore', context: params }).start();
|
|
249
|
-
|
|
257
|
+
_l.label = 16;
|
|
250
258
|
case 16:
|
|
251
|
-
|
|
259
|
+
_l.trys.push([16, 18, , 19]);
|
|
252
260
|
return [4 /*yield*/, this.eventManager.fire('afterStore', {
|
|
253
261
|
controller: this,
|
|
254
262
|
request: params,
|
|
255
263
|
response: response,
|
|
256
264
|
})];
|
|
257
265
|
case 17:
|
|
258
|
-
|
|
266
|
+
_l.sent();
|
|
259
267
|
return [3 /*break*/, 19];
|
|
260
268
|
case 18:
|
|
261
|
-
err_3 =
|
|
269
|
+
err_3 = _l.sent();
|
|
262
270
|
if ((err_3 === null || err_3 === void 0 ? void 0 : err_3.message) == 'cancelled') {
|
|
263
271
|
this.log.warn("'afterStore' middleware cancelled");
|
|
264
272
|
afterStoreProfile.stop();
|
|
@@ -274,7 +282,7 @@ var SearchController = /** @class */ (function (_super) {
|
|
|
274
282
|
this.log.profile(afterStoreProfile);
|
|
275
283
|
return [3 /*break*/, 21];
|
|
276
284
|
case 20:
|
|
277
|
-
err_4 =
|
|
285
|
+
err_4 = _l.sent();
|
|
278
286
|
if (err_4) {
|
|
279
287
|
switch (err_4) {
|
|
280
288
|
case 429:
|
|
@@ -355,18 +363,26 @@ var SearchController = /** @class */ (function (_super) {
|
|
|
355
363
|
});
|
|
356
364
|
}); });
|
|
357
365
|
_this.eventManager.on('afterStore', function (search, next) { return __awaiter(_this, void 0, void 0, function () {
|
|
358
|
-
var stringyParams, scrollMap_1, scrollToPosition_1, checkCount_1, heightCheck_1;
|
|
366
|
+
var requestParams, stringyParams, scrollMap_1, scrollToPosition_1, checkCount_1, heightCheck_1;
|
|
359
367
|
var _this = this;
|
|
360
|
-
var _a;
|
|
361
|
-
return __generator(this, function (
|
|
362
|
-
switch (
|
|
368
|
+
var _a, _b;
|
|
369
|
+
return __generator(this, function (_c) {
|
|
370
|
+
switch (_c.label) {
|
|
363
371
|
case 0: return [4 /*yield*/, next()];
|
|
364
372
|
case 1:
|
|
365
|
-
|
|
373
|
+
_c.sent();
|
|
366
374
|
search.controller.store.loading = false;
|
|
367
|
-
|
|
368
|
-
this.storage.set('lastStringyParams',
|
|
369
|
-
|
|
375
|
+
// save last params
|
|
376
|
+
this.storage.set('lastStringyParams', JSON.stringify(search.request));
|
|
377
|
+
requestParams = __assign({}, search.request);
|
|
378
|
+
if (requestParams.personalization) {
|
|
379
|
+
delete requestParams.personalization;
|
|
380
|
+
}
|
|
381
|
+
if ((_a = requestParams === null || requestParams === void 0 ? void 0 : requestParams.search) === null || _a === void 0 ? void 0 : _a.redirectResponse) {
|
|
382
|
+
delete requestParams.search.redirectResponse;
|
|
383
|
+
}
|
|
384
|
+
stringyParams = JSON.stringify(requestParams);
|
|
385
|
+
if (((_b = this.config.settings) === null || _b === void 0 ? void 0 : _b.infinite) && window.scrollY === 0) {
|
|
370
386
|
scrollMap_1 = this.storage.get('scrollMap') || {};
|
|
371
387
|
scrollToPosition_1 = scrollMap_1[stringyParams];
|
|
372
388
|
if (scrollToPosition_1) {
|
package/dist/cjs/types.d.ts
CHANGED
|
@@ -6,7 +6,7 @@ import type { Tracker, ProductViewEvent } from '@searchspring/snap-tracker';
|
|
|
6
6
|
import type { Profiler } from '@searchspring/snap-profiler';
|
|
7
7
|
import type { UrlManager } from '@searchspring/snap-url-manager';
|
|
8
8
|
import type { Logger } from '@searchspring/snap-logger';
|
|
9
|
-
export declare type PluginFunction = (cntrlr: AbstractController, ...args: any) => Promise<void
|
|
9
|
+
export declare type PluginFunction = (cntrlr: AbstractController, ...args: any) => Promise<void> | void;
|
|
10
10
|
export declare type PluginGrouping = [func: PluginFunction, ...args: unknown[]];
|
|
11
11
|
export declare type BeforeSearchObj = {
|
|
12
12
|
controller: AbstractController;
|
|
@@ -38,7 +38,7 @@ export declare type ControllerServices = {
|
|
|
38
38
|
};
|
|
39
39
|
export declare type Attachments = {
|
|
40
40
|
middleware?: {
|
|
41
|
-
[eventName: string]: Middleware<
|
|
41
|
+
[eventName: string]: Middleware<any> | Middleware<any>[];
|
|
42
42
|
};
|
|
43
43
|
plugins?: PluginGrouping[];
|
|
44
44
|
[any: string]: unknown;
|
package/dist/cjs/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAEjF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,KAAK,EACX,WAAW,EACX,iBAAiB,EACjB,WAAW,EACX,mBAAmB,EACnB,WAAW,EACX,iBAAiB,EACjB,iBAAiB,EACjB,uBAAuB,EACvB,yBAAyB,EACzB,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC5E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAGxD,oBAAY,cAAc,GAAG,CAAC,MAAM,EAAE,kBAAkB,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { LogMode } from '@searchspring/snap-logger';
|
|
2
1
|
import { DomTargeter } from '@searchspring/snap-toolbox';
|
|
3
2
|
import type { Client } from '@searchspring/snap-client';
|
|
4
3
|
import type { AbstractStore } from '@searchspring/snap-store-mobx';
|
|
@@ -8,7 +7,7 @@ import type { Profiler } from '@searchspring/snap-profiler';
|
|
|
8
7
|
import type { Logger } from '@searchspring/snap-logger';
|
|
9
8
|
import type { Tracker } from '@searchspring/snap-tracker';
|
|
10
9
|
import type { Target, OnTarget } from '@searchspring/snap-toolbox';
|
|
11
|
-
import type { ControllerServices, ControllerConfig, Attachments, ContextVariables } from '../types';
|
|
10
|
+
import type { ControllerServices, ControllerConfig, Attachments, ContextVariables, PluginFunction } from '../types';
|
|
12
11
|
export declare abstract class AbstractController {
|
|
13
12
|
id: string;
|
|
14
13
|
type: string;
|
|
@@ -24,18 +23,15 @@ export declare abstract class AbstractController {
|
|
|
24
23
|
targeters: {
|
|
25
24
|
[key: string]: DomTargeter;
|
|
26
25
|
};
|
|
27
|
-
|
|
28
|
-
private _environment;
|
|
26
|
+
protected _initialized: boolean;
|
|
29
27
|
get initialized(): boolean;
|
|
30
28
|
constructor(config: ControllerConfig, { client, store, urlManager, eventManager, profiler, logger, tracker }: ControllerServices, context?: ContextVariables);
|
|
31
29
|
createTargeter(target: Target, onTarget: OnTarget, document?: Document): DomTargeter | undefined;
|
|
32
30
|
addTargeter(target: DomTargeter): DomTargeter | undefined;
|
|
33
|
-
set environment(env: LogMode);
|
|
34
|
-
get environment(): LogMode;
|
|
35
31
|
init(): Promise<void>;
|
|
36
32
|
retarget(): void;
|
|
37
33
|
abstract search(): Promise<void>;
|
|
38
|
-
plugin(func:
|
|
34
|
+
plugin(func: PluginFunction, ...args: unknown[]): Promise<void>;
|
|
39
35
|
on<T>(event: string, ...func: Middleware<T>[]): void;
|
|
40
36
|
use(attachments: Attachments): void;
|
|
41
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractController.d.ts","sourceRoot":"","sources":["../../../src/Abstract/AbstractController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"AbstractController.d.ts","sourceRoot":"","sources":["../../../src/Abstract/AbstractController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAEzD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAExD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AACjF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAEnE,OAAO,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,WAAW,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAEpH,8BAAsB,kBAAkB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,SAAc;IAClB,MAAM,EAAE,gBAAgB,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,aAAa,CAAC;IACrB,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,YAAY,CAAC;IAC3B,QAAQ,EAAE,QAAQ,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,gBAAgB,CAAC;IAE1B,SAAS,EAAE;QACjB,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAC;KAC3B,CAAM;IAEP,SAAS,CAAC,YAAY,UAAS;IAE/B,IAAI,WAAW,IAAI,OAAO,CAEzB;gBAGA,MAAM,EAAE,gBAAgB,EACxB,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,kBAAkB,EAC1F,OAAO,GAAE,gBAAqB;IA2DxB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,WAAW,GAAG,SAAS;IAIhG,WAAW,CAAC,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,SAAS;IASnD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IA+C3B,QAAQ,IAAI,IAAI;aAMP,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAE1B,MAAM,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI;IAIpD,GAAG,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI;CAoC1C"}
|
|
@@ -1,12 +1,9 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { DomTargeter, cookies, url } from '@searchspring/snap-toolbox';
|
|
3
|
-
const SS_DEV_COOKIE = 'ssDev';
|
|
1
|
+
import { DomTargeter } from '@searchspring/snap-toolbox';
|
|
4
2
|
export class AbstractController {
|
|
5
3
|
constructor(config, { client, store, urlManager, eventManager, profiler, logger, tracker }, context = {}) {
|
|
6
4
|
this.type = 'abstract';
|
|
7
5
|
this.targeters = {};
|
|
8
6
|
this._initialized = false;
|
|
9
|
-
this._environment = LogMode.PRODUCTION;
|
|
10
7
|
if (typeof config != 'object' || typeof config.id != 'string' || !config.id.match(/^[a-zA-Z0-9_-]*$/)) {
|
|
11
8
|
throw new Error(`Invalid config passed to controller. The "id" attribute must be an alphanumeric string.`);
|
|
12
9
|
}
|
|
@@ -37,12 +34,6 @@ export class AbstractController {
|
|
|
37
34
|
if (typeof tracker != 'object' || typeof tracker.track != 'object') {
|
|
38
35
|
throw new Error(`Invalid service 'tracker' passed to controller. Missing "track" object.`);
|
|
39
36
|
}
|
|
40
|
-
window.searchspring = window.searchspring || {};
|
|
41
|
-
window.searchspring.controller = window.searchspring.controller || {};
|
|
42
|
-
if (window.searchspring.controller[config.id]) {
|
|
43
|
-
throw new Error(`Controller with id '${config.id}' is already defined`);
|
|
44
|
-
}
|
|
45
|
-
window.searchspring.controller[config.id] = this;
|
|
46
37
|
this.id = config.id;
|
|
47
38
|
this.config = config;
|
|
48
39
|
this.client = client;
|
|
@@ -57,12 +48,6 @@ export class AbstractController {
|
|
|
57
48
|
this.log.setNamespace(this.config.id);
|
|
58
49
|
// set namespaces
|
|
59
50
|
this.profiler.setNamespace(this.config.id);
|
|
60
|
-
// set environment
|
|
61
|
-
if (url(window.location.href)?.params?.query?.dev) {
|
|
62
|
-
cookies.set(SS_DEV_COOKIE, '1', 'Lax', 0);
|
|
63
|
-
}
|
|
64
|
-
const dev = cookies.get(SS_DEV_COOKIE);
|
|
65
|
-
this.environment = (dev === '1' ? 'development' : process.env.NODE_ENV);
|
|
66
51
|
}
|
|
67
52
|
get initialized() {
|
|
68
53
|
return this._initialized;
|
|
@@ -78,15 +63,6 @@ export class AbstractController {
|
|
|
78
63
|
return target;
|
|
79
64
|
}
|
|
80
65
|
}
|
|
81
|
-
set environment(env) {
|
|
82
|
-
if (Object.values(LogMode).includes(env)) {
|
|
83
|
-
this._environment = env;
|
|
84
|
-
this.log.setMode(env);
|
|
85
|
-
}
|
|
86
|
-
}
|
|
87
|
-
get environment() {
|
|
88
|
-
return this._environment;
|
|
89
|
-
}
|
|
90
66
|
async init() {
|
|
91
67
|
if (this._initialized) {
|
|
92
68
|
this.log.warn(`'init' middleware recalled`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RecommendationController.d.ts","sourceRoot":"","sources":["../../../src/Recommendation/RecommendationController.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RecommendationController.d.ts","sourceRoot":"","sources":["../../../src/Recommendation/RecommendationController.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAG3C,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEzE,OAAO,KAAK,EAAE,8BAA8B,EAAkC,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAErI,aAAK,0BAA0B,GAAG;IACjC,OAAO,EAAE;QACR,KAAK,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,KAAK,WAAW,GAAG,SAAS,CAAC;QAC/D,MAAM,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,WAAW,GAAG,SAAS,CAAC;QACjD,UAAU,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,WAAW,GAAG,SAAS,CAAC;KACrD,CAAC;IACF,KAAK,EAAE,CAAC,CAAC,EAAE,UAAU,KAAK,WAAW,GAAG,SAAS,CAAC;IAClD,UAAU,EAAE,MAAM,WAAW,GAAG,SAAS,CAAC;IAC1C,MAAM,EAAE,MAAM,WAAW,GAAG,SAAS,CAAC;CACtC,CAAC;AAEF,aAAK,6BAA6B,GAAG;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAUF,qBAAa,wBAAyB,SAAQ,kBAAkB;IACxD,IAAI,kBAAkC;IACrC,KAAK,EAAE,mBAAmB,CAAC;IAC3B,MAAM,EAAE,8BAA8B,CAAC;IAE/C,MAAM,EAAE;QACP,KAAK,CAAC,EAAE,WAAW,CAAC;QACpB,UAAU,CAAC,EAAE,WAAW,CAAC;QACzB,MAAM,CAAC,EAAE,WAAW,CAAC;QACrB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;YAAE,UAAU,CAAC,EAAE,WAAW,CAAC;YAAC,MAAM,CAAC,EAAE,WAAW,CAAA;SAAE,CAAC,CAAC;KAC7E,CAKC;gBAGD,MAAM,EAAE,8BAA8B,EACtC,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,kBAAkB,EAC1F,OAAO,CAAC,EAAE,gBAAgB;IA8B3B,KAAK,EAAE,0BAA0B,CAqK/B;IAEF,IAAI,MAAM,IAAI,6BAA6B,CAsB1C;IAED,MAAM,QAAa,QAAQ,IAAI,CAAC,CAqG9B;CACF"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import deepmerge from 'deepmerge';
|
|
2
2
|
import { BeaconType, BeaconCategory } from '@searchspring/snap-tracker';
|
|
3
|
-
import { LogMode } from '@searchspring/snap-logger';
|
|
4
3
|
import { AbstractController } from '../Abstract/AbstractController';
|
|
5
4
|
import { ControllerTypes } from '../types';
|
|
6
5
|
import { ErrorType } from '@searchspring/snap-store-mobx';
|
|
@@ -324,9 +323,6 @@ export class RecommendationController extends AbstractController {
|
|
|
324
323
|
if (lastViewed?.length) {
|
|
325
324
|
params.lastViewed = lastViewed;
|
|
326
325
|
}
|
|
327
|
-
if (this.environment == LogMode.DEVELOPMENT) {
|
|
328
|
-
params.test = true;
|
|
329
|
-
}
|
|
330
326
|
return params;
|
|
331
327
|
}
|
|
332
328
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SearchController.d.ts","sourceRoot":"","sources":["../../../src/Search/SearchController.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,YAAY,EAA0B,MAAM,+BAA+B,CAAC;AAErF,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,KAAK,EAAE,sBAAsB,EAAkD,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE7I,OAAO,KAAK,EAAE,kBAAkB,
|
|
1
|
+
{"version":3,"file":"SearchController.d.ts","sourceRoot":"","sources":["../../../src/Search/SearchController.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,YAAY,EAA0B,MAAM,+BAA+B,CAAC;AAErF,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,KAAK,EAAE,sBAAsB,EAAkD,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE7I,OAAO,KAAK,EAAE,kBAAkB,EAA2E,MAAM,2BAA2B,CAAC;AAoB7I,aAAK,kBAAkB,GAAG;IACzB,OAAO,EAAE;QACR,KAAK,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,KAAK,WAAW,GAAG,SAAS,CAAC;KAC/D,CAAC;CACF,CAAC;AAEF,qBAAa,gBAAiB,SAAQ,kBAAkB;IAChD,IAAI,kBAA0B;IAC7B,KAAK,EAAE,WAAW,CAAC;IACnB,MAAM,EAAE,sBAAsB,CAAC;IACvC,OAAO,EAAE,YAAY,CAAC;gBAGrB,MAAM,EAAE,sBAAsB,EAC9B,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,kBAAkB,EAC1F,OAAO,CAAC,EAAE,gBAAgB;IA0F3B,KAAK,EAAE,kBAAkB,CAoCvB;IAEF,IAAI,MAAM,IAAI,kBAAkB,CAsC/B;IAED,MAAM,QAAa,QAAQ,IAAI,CAAC,CA0J9B;CACF"}
|
|
@@ -28,7 +28,15 @@ export class SearchController extends AbstractController {
|
|
|
28
28
|
click: (e, result) => {
|
|
29
29
|
// store scroll position
|
|
30
30
|
if (this.config.settings?.infinite) {
|
|
31
|
-
|
|
31
|
+
let stringyParams = this.storage.get('lastStringyParams');
|
|
32
|
+
const paramsObj = JSON.parse(stringyParams);
|
|
33
|
+
if (paramsObj?.search?.redirectResponse) {
|
|
34
|
+
delete paramsObj?.search?.redirectResponse;
|
|
35
|
+
}
|
|
36
|
+
if (paramsObj?.personalization) {
|
|
37
|
+
delete paramsObj?.personalization;
|
|
38
|
+
}
|
|
39
|
+
stringyParams = JSON.stringify(paramsObj);
|
|
32
40
|
const scrollMap = {};
|
|
33
41
|
scrollMap[stringyParams] = window.scrollY;
|
|
34
42
|
this.storage.set('scrollMap', scrollMap);
|
|
@@ -100,7 +108,7 @@ export class SearchController extends AbstractController {
|
|
|
100
108
|
// if params.page > 1 and infinite setting exists we should append results
|
|
101
109
|
if (this.config.settings?.infinite && params.pagination?.page > 1) {
|
|
102
110
|
// if no results fetch results...
|
|
103
|
-
let previousResults = this.store.
|
|
111
|
+
let previousResults = JSON.parse(JSON.stringify(this.store.results)) || [];
|
|
104
112
|
if (this.config.settings?.infinite.backfill && !previousResults.length) {
|
|
105
113
|
// figure out how many pages of results to backfill and wait on all responses
|
|
106
114
|
const backfills = [];
|
|
@@ -226,8 +234,15 @@ export class SearchController extends AbstractController {
|
|
|
226
234
|
await next();
|
|
227
235
|
search.controller.store.loading = false;
|
|
228
236
|
// save last params
|
|
229
|
-
|
|
230
|
-
|
|
237
|
+
this.storage.set('lastStringyParams', JSON.stringify(search.request));
|
|
238
|
+
const requestParams = { ...search.request };
|
|
239
|
+
if (requestParams.personalization) {
|
|
240
|
+
delete requestParams.personalization;
|
|
241
|
+
}
|
|
242
|
+
if (requestParams?.search?.redirectResponse) {
|
|
243
|
+
delete requestParams.search.redirectResponse;
|
|
244
|
+
}
|
|
245
|
+
const stringyParams = JSON.stringify(requestParams);
|
|
231
246
|
if (this.config.settings?.infinite && window.scrollY === 0) {
|
|
232
247
|
// browser didn't jump
|
|
233
248
|
const scrollMap = this.storage.get('scrollMap') || {};
|
package/dist/esm/types.d.ts
CHANGED
|
@@ -6,7 +6,7 @@ import type { Tracker, ProductViewEvent } from '@searchspring/snap-tracker';
|
|
|
6
6
|
import type { Profiler } from '@searchspring/snap-profiler';
|
|
7
7
|
import type { UrlManager } from '@searchspring/snap-url-manager';
|
|
8
8
|
import type { Logger } from '@searchspring/snap-logger';
|
|
9
|
-
export declare type PluginFunction = (cntrlr: AbstractController, ...args: any) => Promise<void
|
|
9
|
+
export declare type PluginFunction = (cntrlr: AbstractController, ...args: any) => Promise<void> | void;
|
|
10
10
|
export declare type PluginGrouping = [func: PluginFunction, ...args: unknown[]];
|
|
11
11
|
export declare type BeforeSearchObj = {
|
|
12
12
|
controller: AbstractController;
|
|
@@ -38,7 +38,7 @@ export declare type ControllerServices = {
|
|
|
38
38
|
};
|
|
39
39
|
export declare type Attachments = {
|
|
40
40
|
middleware?: {
|
|
41
|
-
[eventName: string]: Middleware<
|
|
41
|
+
[eventName: string]: Middleware<any> | Middleware<any>[];
|
|
42
42
|
};
|
|
43
43
|
plugins?: PluginGrouping[];
|
|
44
44
|
[any: string]: unknown;
|
package/dist/esm/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAEjF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,KAAK,EACX,WAAW,EACX,iBAAiB,EACjB,WAAW,EACX,mBAAmB,EACnB,WAAW,EACX,iBAAiB,EACjB,iBAAiB,EACjB,uBAAuB,EACvB,yBAAyB,EACzB,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC5E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAGxD,oBAAY,cAAc,GAAG,CAAC,MAAM,EAAE,kBAAkB,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@searchspring/snap-controller",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.30.2",
|
|
4
4
|
"description": "Snap Controllers",
|
|
5
5
|
"main": "dist/cjs/index.js",
|
|
6
6
|
"module": "dist/esm/index.js",
|
|
@@ -20,21 +20,21 @@
|
|
|
20
20
|
"test:watch": "jest --watch"
|
|
21
21
|
},
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@searchspring/snap-toolbox": "^0.
|
|
23
|
+
"@searchspring/snap-toolbox": "^0.30.2",
|
|
24
24
|
"deepmerge": "4.2.2"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
27
|
-
"@searchspring/snap-client": "^0.
|
|
28
|
-
"@searchspring/snap-event-manager": "^0.
|
|
29
|
-
"@searchspring/snap-logger": "^0.
|
|
30
|
-
"@searchspring/snap-profiler": "^0.
|
|
31
|
-
"@searchspring/snap-store-mobx": "^0.
|
|
32
|
-
"@searchspring/snap-tracker": "^0.
|
|
33
|
-
"@searchspring/snap-url-manager": "^0.
|
|
27
|
+
"@searchspring/snap-client": "^0.30.2",
|
|
28
|
+
"@searchspring/snap-event-manager": "^0.30.2",
|
|
29
|
+
"@searchspring/snap-logger": "^0.30.2",
|
|
30
|
+
"@searchspring/snap-profiler": "^0.30.2",
|
|
31
|
+
"@searchspring/snap-store-mobx": "^0.30.2",
|
|
32
|
+
"@searchspring/snap-tracker": "^0.30.2",
|
|
33
|
+
"@searchspring/snap-url-manager": "^0.30.2"
|
|
34
34
|
},
|
|
35
35
|
"sideEffects": false,
|
|
36
36
|
"files": [
|
|
37
37
|
"dist/**/*"
|
|
38
38
|
],
|
|
39
|
-
"gitHead": "
|
|
39
|
+
"gitHead": "0d7dc2c374512e097827aa0f6f724d15a771fd5f"
|
|
40
40
|
}
|