@terreno/admin-backend 57.4.0 → 57.6.1

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.
@@ -1,89 +1,25 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
- var __generator = (this && this.__generator) || function (thisArg, body) {
12
- var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
13
- return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
14
- function verb(n) { return function (v) { return step([n, v]); }; }
15
- function step(op) {
16
- if (f) throw new TypeError("Generator is already executing.");
17
- while (g && (g = 0, op[0] && (_ = 0)), _) try {
18
- if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
19
- if (y = 0, t) op = [op[0] & 2, t.value];
20
- switch (op[0]) {
21
- case 0: case 1: t = op; break;
22
- case 4: _.label++; return { value: op[1], done: false };
23
- case 5: _.label++; y = op[1]; op = [0]; continue;
24
- case 7: op = _.ops.pop(); _.trys.pop(); continue;
25
- default:
26
- if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
27
- if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
28
- if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
29
- if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
30
- if (t[2]) _.ops.pop();
31
- _.trys.pop(); continue;
32
- }
33
- op = body.call(thisArg, _);
34
- } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
35
- if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
36
- }
37
- };
38
- var __values = (this && this.__values) || function(o) {
39
- var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
40
- if (m) return m.call(o);
41
- if (o && typeof o.length === "number") return {
42
- next: function () {
43
- if (o && i >= o.length) o = void 0;
44
- return { value: o && o[i++], done: !o };
45
- }
46
- };
47
- throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
48
- };
49
- var __read = (this && this.__read) || function (o, n) {
50
- var m = typeof Symbol === "function" && o[Symbol.iterator];
51
- if (!m) return o;
52
- var i = m.call(o), r, ar = [], e;
53
- try {
54
- while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
55
- }
56
- catch (error) { e = { error: error }; }
57
- finally {
58
- try {
59
- if (r && !r.done && (m = i["return"])) m.call(i);
60
- }
61
- finally { if (e) throw e.error; }
62
- }
63
- return ar;
64
- };
65
2
  Object.defineProperty(exports, "__esModule", { value: true });
66
3
  exports.tryCancelAdminScriptJob = exports.tryEnqueueAdminScriptJob = exports.defineAdminScriptJob = exports.runRegisteredScriptTask = exports.ADMIN_SCRIPT_JOB_NAME = void 0;
67
- var api_1 = require("@terreno/api");
68
- var jobs_1 = require("@terreno/jobs");
69
- var luxon_1 = require("luxon");
4
+ const api_1 = require("@terreno/api");
5
+ const jobs_1 = require("@terreno/jobs");
6
+ const luxon_1 = require("luxon");
70
7
  /** Durable job name for admin panel script runs. */
71
8
  exports.ADMIN_SCRIPT_JOB_NAME = "admin/script";
72
- var isScriptArgValue = function (value) {
9
+ const isScriptArgValue = (value) => {
73
10
  if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
74
11
  return true;
75
12
  }
76
13
  if (!Array.isArray(value)) {
77
14
  return false;
78
15
  }
79
- return value.every(function (entry) { return typeof entry === "string"; });
16
+ return value.every((entry) => typeof entry === "string");
80
17
  };
81
- var parseAdminScriptJobPayload = function (payload) {
82
- var e_1, _a;
18
+ const parseAdminScriptJobPayload = (payload) => {
83
19
  if (!payload || typeof payload !== "object" || Array.isArray(payload)) {
84
20
  return undefined;
85
21
  }
86
- var record = payload;
22
+ const record = payload;
87
23
  if (typeof record.scriptName !== "string" || record.scriptName.length === 0) {
88
24
  return undefined;
89
25
  }
@@ -93,38 +29,28 @@ var parseAdminScriptJobPayload = function (payload) {
93
29
  if (typeof record.wetRun !== "boolean") {
94
30
  return undefined;
95
31
  }
96
- var args = {};
32
+ const args = {};
97
33
  if (record.args !== undefined) {
98
34
  if (!record.args || typeof record.args !== "object" || Array.isArray(record.args)) {
99
35
  return undefined;
100
36
  }
101
- try {
102
- for (var _b = __values(Object.entries(record.args)), _c = _b.next(); !_c.done; _c = _b.next()) {
103
- var _d = __read(_c.value, 2), key = _d[0], value = _d[1];
104
- if (!isScriptArgValue(value)) {
105
- return undefined;
106
- }
107
- args[key] = value;
108
- }
109
- }
110
- catch (e_1_1) { e_1 = { error: e_1_1 }; }
111
- finally {
112
- try {
113
- if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
37
+ for (const [key, value] of Object.entries(record.args)) {
38
+ if (!isScriptArgValue(value)) {
39
+ return undefined;
114
40
  }
115
- finally { if (e_1) throw e_1.error; }
41
+ args[key] = value;
116
42
  }
117
43
  }
118
- var createdByName = typeof record.createdByName === "string" ? record.createdByName : undefined;
44
+ const createdByName = typeof record.createdByName === "string" ? record.createdByName : undefined;
119
45
  return {
120
- args: args,
121
- createdByName: createdByName,
46
+ args,
47
+ createdByName,
122
48
  scriptName: record.scriptName,
123
49
  taskId: record.taskId,
124
50
  wetRun: record.wetRun,
125
51
  };
126
52
  };
127
- var isAbortLike = function (error) {
53
+ const isAbortLike = (error) => {
128
54
  if (error instanceof api_1.TaskCancelledError) {
129
55
  return true;
130
56
  }
@@ -133,228 +59,144 @@ var isAbortLike = function (error) {
133
59
  }
134
60
  return error.name === "AbortError" || error.name === "TaskCancelledError";
135
61
  };
136
- var runRegisteredScriptTask = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
137
- var now, ctx, result, err_1, message;
138
- var args = _b.args, script = _b.script, signal = _b.signal, taskId = _b.taskId, wetRun = _b.wetRun;
139
- return __generator(this, function (_c) {
140
- switch (_c.label) {
141
- case 0:
142
- now = luxon_1.DateTime.now().toJSDate();
143
- return [4 /*yield*/, api_1.BackgroundTask.findOneAndUpdate({ _id: taskId, status: { $in: ["pending", "running"] } }, {
144
- $set: {
145
- progress: { message: "Starting...", percentage: 0, stage: "Running" },
146
- startedAt: now,
147
- status: "running",
148
- },
149
- })];
150
- case 1:
151
- _c.sent();
152
- ctx = {
153
- addLog: function (level, message) { return __awaiter(void 0, void 0, void 0, function () {
154
- var current;
155
- return __generator(this, function (_a) {
156
- switch (_a.label) {
157
- case 0: return [4 /*yield*/, api_1.BackgroundTask.findById(taskId)];
158
- case 1:
159
- current = _a.sent();
160
- if (!current) return [3 /*break*/, 3];
161
- return [4 /*yield*/, current.addLog(level, message)];
162
- case 2:
163
- _a.sent();
164
- _a.label = 3;
165
- case 3: return [2 /*return*/];
166
- }
167
- });
168
- }); },
169
- args: args,
170
- checkCancellation: function () { return __awaiter(void 0, void 0, void 0, function () {
171
- return __generator(this, function (_a) {
172
- switch (_a.label) {
173
- case 0:
174
- if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
175
- throw new api_1.TaskCancelledError(taskId);
176
- }
177
- return [4 /*yield*/, api_1.BackgroundTask.checkCancellation(taskId)];
178
- case 1:
179
- _a.sent();
180
- return [2 /*return*/];
181
- }
182
- });
183
- }); },
184
- updateProgress: function (percentage, stage, message) { return __awaiter(void 0, void 0, void 0, function () {
185
- var current;
186
- return __generator(this, function (_a) {
187
- switch (_a.label) {
188
- case 0: return [4 /*yield*/, api_1.BackgroundTask.findById(taskId)];
189
- case 1:
190
- current = _a.sent();
191
- if (!current) return [3 /*break*/, 3];
192
- return [4 /*yield*/, current.updateProgress(percentage, stage, message)];
193
- case 2:
194
- _a.sent();
195
- _a.label = 3;
196
- case 3: return [2 /*return*/];
197
- }
198
- });
199
- }); },
200
- };
201
- _c.label = 2;
202
- case 2:
203
- _c.trys.push([2, 6, , 10]);
204
- return [4 /*yield*/, ctx.checkCancellation()];
205
- case 3:
206
- _c.sent();
207
- return [4 /*yield*/, script.runner(wetRun, ctx)];
208
- case 4:
209
- result = _c.sent();
210
- return [4 /*yield*/, api_1.BackgroundTask.findOneAndUpdate({ _id: taskId, status: "running" }, {
211
- $set: {
212
- completedAt: luxon_1.DateTime.now().toJSDate(),
213
- progress: { message: "Done", percentage: 100, stage: "Complete" },
214
- result: result.results,
215
- status: result.success ? "completed" : "failed",
216
- },
217
- })];
218
- case 5:
219
- _c.sent();
220
- return [3 /*break*/, 10];
221
- case 6:
222
- err_1 = _c.sent();
223
- if (!isAbortLike(err_1)) return [3 /*break*/, 8];
224
- return [4 /*yield*/, api_1.BackgroundTask.findOneAndUpdate({ _id: taskId, status: { $in: ["pending", "running"] } }, {
225
- $set: {
226
- completedAt: luxon_1.DateTime.now().toJSDate(),
227
- status: "cancelled",
228
- },
229
- })];
230
- case 7:
231
- _c.sent();
232
- return [2 /*return*/];
233
- case 8:
234
- message = err_1 instanceof Error ? err_1.message : String(err_1);
235
- api_1.logger.error("Script ".concat(script.name, " failed: ").concat(message));
236
- return [4 /*yield*/, api_1.BackgroundTask.findOneAndUpdate({ _id: taskId, status: "running" }, {
237
- $set: {
238
- completedAt: luxon_1.DateTime.now().toJSDate(),
239
- error: message,
240
- result: [message],
241
- status: "failed",
242
- },
243
- })];
244
- case 9:
245
- _c.sent();
246
- return [3 /*break*/, 10];
247
- case 10: return [2 /*return*/];
248
- }
62
+ const runRegisteredScriptTask = async ({ args, script, signal, taskId, wetRun, }) => {
63
+ const now = luxon_1.DateTime.now().toJSDate();
64
+ await api_1.BackgroundTask.findOneAndUpdate({ _id: taskId, status: { $in: ["pending", "running"] } }, {
65
+ $set: {
66
+ progress: { message: "Starting...", percentage: 0, stage: "Running" },
67
+ startedAt: now,
68
+ status: "running",
69
+ },
249
70
  });
250
- }); };
251
- exports.runRegisteredScriptTask = runRegisteredScriptTask;
252
- var createAdminScriptHandler = function (getScript) {
253
- return function (payload, ctx) { return __awaiter(void 0, void 0, void 0, function () {
254
- var parsed, script, message, _a, args, errors;
255
- var _b;
256
- return __generator(this, function (_c) {
257
- switch (_c.label) {
258
- case 0:
259
- parsed = parseAdminScriptJobPayload(payload);
260
- if (!parsed) {
261
- throw new api_1.APIError({ status: 400, title: "Invalid admin/script job payload" });
262
- }
263
- script = getScript(parsed.scriptName);
264
- if (!!script) return [3 /*break*/, 2];
265
- message = "Script not found: ".concat(parsed.scriptName);
266
- return [4 /*yield*/, api_1.BackgroundTask.findOneAndUpdate({ _id: parsed.taskId, status: { $in: ["pending", "running"] } }, {
267
- $set: {
268
- completedAt: luxon_1.DateTime.now().toJSDate(),
269
- error: message,
270
- result: [message],
271
- status: "failed",
272
- },
273
- })];
274
- case 1:
275
- _c.sent();
276
- throw new api_1.APIError({ status: 404, title: message });
277
- case 2:
278
- _a = (0, api_1.createScriptArgs)({
279
- defs: (_b = script.args) !== null && _b !== void 0 ? _b : [],
280
- values: parsed.args,
281
- }), args = _a.args, errors = _a.errors;
282
- if (errors.length > 0) {
283
- throw new api_1.APIError({ status: 400, title: errors.join("; ") });
284
- }
285
- return [4 /*yield*/, (0, exports.runRegisteredScriptTask)({
286
- args: args,
287
- script: script,
288
- signal: ctx.signal,
289
- taskId: parsed.taskId,
290
- wetRun: parsed.wetRun,
291
- })];
292
- case 3:
293
- _c.sent();
294
- return [2 /*return*/];
71
+ const ctx = {
72
+ addLog: async (level, message) => {
73
+ const current = await api_1.BackgroundTask.findById(taskId);
74
+ if (current) {
75
+ await current.addLog(level, message);
295
76
  }
77
+ },
78
+ args,
79
+ checkCancellation: async () => {
80
+ if (signal?.aborted) {
81
+ throw new api_1.TaskCancelledError(taskId);
82
+ }
83
+ await api_1.BackgroundTask.checkCancellation(taskId);
84
+ },
85
+ updateProgress: async (percentage, stage, message) => {
86
+ const current = await api_1.BackgroundTask.findById(taskId);
87
+ if (current) {
88
+ await current.updateProgress(percentage, stage, message);
89
+ }
90
+ },
91
+ };
92
+ try {
93
+ await ctx.checkCancellation();
94
+ const result = await script.runner(wetRun, ctx);
95
+ await api_1.BackgroundTask.findOneAndUpdate({ _id: taskId, status: "running" }, {
96
+ $set: {
97
+ completedAt: luxon_1.DateTime.now().toJSDate(),
98
+ progress: { message: "Done", percentage: 100, stage: "Complete" },
99
+ result: result.results,
100
+ status: result.success ? "completed" : "failed",
101
+ },
102
+ });
103
+ }
104
+ catch (err) {
105
+ if (isAbortLike(err)) {
106
+ await api_1.BackgroundTask.findOneAndUpdate({ _id: taskId, status: { $in: ["pending", "running"] } }, {
107
+ $set: {
108
+ completedAt: luxon_1.DateTime.now().toJSDate(),
109
+ status: "cancelled",
110
+ },
111
+ });
112
+ return;
113
+ }
114
+ const message = err instanceof Error ? err.message : String(err);
115
+ api_1.logger.error(`Script ${script.name} failed: ${message}`);
116
+ await api_1.BackgroundTask.findOneAndUpdate({ _id: taskId, status: "running" }, {
117
+ $set: {
118
+ completedAt: luxon_1.DateTime.now().toJSDate(),
119
+ error: message,
120
+ result: [message],
121
+ status: "failed",
122
+ },
296
123
  });
297
- }); };
124
+ }
125
+ };
126
+ exports.runRegisteredScriptTask = runRegisteredScriptTask;
127
+ const createAdminScriptHandler = (getScript) => {
128
+ return async (payload, ctx) => {
129
+ const parsed = parseAdminScriptJobPayload(payload);
130
+ if (!parsed) {
131
+ throw new api_1.APIError({ status: 400, title: "Invalid admin/script job payload" });
132
+ }
133
+ const script = getScript(parsed.scriptName);
134
+ if (!script) {
135
+ const message = `Script not found: ${parsed.scriptName}`;
136
+ await api_1.BackgroundTask.findOneAndUpdate({ _id: parsed.taskId, status: { $in: ["pending", "running"] } }, {
137
+ $set: {
138
+ completedAt: luxon_1.DateTime.now().toJSDate(),
139
+ error: message,
140
+ result: [message],
141
+ status: "failed",
142
+ },
143
+ });
144
+ throw new api_1.APIError({ status: 404, title: message });
145
+ }
146
+ const { args, errors } = (0, api_1.createScriptArgs)({
147
+ defs: script.args ?? [],
148
+ values: parsed.args,
149
+ });
150
+ if (errors.length > 0) {
151
+ throw new api_1.APIError({ status: 400, title: errors.join("; ") });
152
+ }
153
+ await (0, exports.runRegisteredScriptTask)({
154
+ args,
155
+ script,
156
+ signal: ctx.signal,
157
+ taskId: parsed.taskId,
158
+ wetRun: parsed.wetRun,
159
+ });
160
+ };
298
161
  };
299
162
  /** Register the shared `admin/script` handler (maxAttempts 1 — scripts are not assumed idempotent). */
300
- var defineAdminScriptJob = function (jobs, getScript) {
163
+ const defineAdminScriptJob = (jobs, getScript) => {
301
164
  jobs.define(exports.ADMIN_SCRIPT_JOB_NAME, {
302
165
  handler: createAdminScriptHandler(getScript),
303
166
  retry: { maxAttempts: 1 },
304
167
  });
305
168
  };
306
169
  exports.defineAdminScriptJob = defineAdminScriptJob;
307
- var tryEnqueueAdminScriptJob = function (payload) { return __awaiter(void 0, void 0, void 0, function () {
308
- var jobs, job;
309
- return __generator(this, function (_a) {
310
- switch (_a.label) {
311
- case 0:
312
- jobs = (0, jobs_1.tryGetJobsService)();
313
- if (!(jobs === null || jobs === void 0 ? void 0 : jobs.getDefinition(exports.ADMIN_SCRIPT_JOB_NAME))) {
314
- return [2 /*return*/, undefined];
315
- }
316
- return [4 /*yield*/, jobs.enqueue({
317
- idempotencyKey: "admin-script:".concat(payload.taskId),
318
- name: exports.ADMIN_SCRIPT_JOB_NAME,
319
- payload: payload,
320
- })];
321
- case 1:
322
- job = _a.sent();
323
- return [2 /*return*/, { id: String(job._id) }];
324
- }
170
+ const tryEnqueueAdminScriptJob = async (payload) => {
171
+ const jobs = (0, jobs_1.tryGetJobsService)();
172
+ if (!jobs?.getDefinition(exports.ADMIN_SCRIPT_JOB_NAME)) {
173
+ return undefined;
174
+ }
175
+ const job = await jobs.enqueue({
176
+ idempotencyKey: `admin-script:${payload.taskId}`,
177
+ name: exports.ADMIN_SCRIPT_JOB_NAME,
178
+ payload,
325
179
  });
326
- }); };
180
+ return { id: String(job._id) };
181
+ };
327
182
  exports.tryEnqueueAdminScriptJob = tryEnqueueAdminScriptJob;
328
- var tryCancelAdminScriptJob = function (taskId) { return __awaiter(void 0, void 0, void 0, function () {
329
- var jobs, job, _a;
330
- return __generator(this, function (_b) {
331
- switch (_b.label) {
332
- case 0:
333
- jobs = (0, jobs_1.tryGetJobsService)();
334
- if (!jobs) {
335
- return [2 /*return*/];
336
- }
337
- return [4 /*yield*/, jobs_1.Job.findOneOrNone({
338
- name: exports.ADMIN_SCRIPT_JOB_NAME,
339
- "payload.taskId": taskId,
340
- })];
341
- case 1:
342
- job = _b.sent();
343
- if (!job) {
344
- return [2 /*return*/];
345
- }
346
- _b.label = 2;
347
- case 2:
348
- _b.trys.push([2, 4, , 5]);
349
- return [4 /*yield*/, jobs.adminCancelJob(String(job._id))];
350
- case 3:
351
- _b.sent();
352
- return [3 /*break*/, 5];
353
- case 4:
354
- _a = _b.sent();
355
- return [3 /*break*/, 5];
356
- case 5: return [2 /*return*/];
357
- }
183
+ const tryCancelAdminScriptJob = async (taskId) => {
184
+ const jobs = (0, jobs_1.tryGetJobsService)();
185
+ if (!jobs) {
186
+ return;
187
+ }
188
+ const job = await jobs_1.Job.findOneOrNone({
189
+ name: exports.ADMIN_SCRIPT_JOB_NAME,
190
+ "payload.taskId": taskId,
358
191
  });
359
- }); };
192
+ if (!job) {
193
+ return;
194
+ }
195
+ try {
196
+ await jobs.adminCancelJob(String(job._id));
197
+ }
198
+ catch {
199
+ // Job may already be terminal; BackgroundTask cancel is the operator contract.
200
+ }
201
+ };
360
202
  exports.tryCancelAdminScriptJob = tryCancelAdminScriptJob;
@@ -1,50 +1,14 @@
1
1
  "use strict";
2
- var __values = (this && this.__values) || function(o) {
3
- var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
4
- if (m) return m.call(o);
5
- if (o && typeof o.length === "number") return {
6
- next: function () {
7
- if (o && i >= o.length) o = void 0;
8
- return { value: o && o[i++], done: !o };
9
- }
10
- };
11
- throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
12
- };
13
- var __read = (this && this.__read) || function (o, n) {
14
- var m = typeof Symbol === "function" && o[Symbol.iterator];
15
- if (!m) return o;
16
- var i = m.call(o), r, ar = [], e;
17
- try {
18
- while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
19
- }
20
- catch (error) { e = { error: error }; }
21
- finally {
22
- try {
23
- if (r && !r.done && (m = i["return"])) m.call(i);
24
- }
25
- finally { if (e) throw e.error; }
26
- }
27
- return ar;
28
- };
29
- var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
30
- if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
31
- if (ar || !(i in from)) {
32
- if (!ar) ar = Array.prototype.slice.call(from, 0, i);
33
- ar[i] = from[i];
34
- }
35
- }
36
- return to.concat(ar || Array.prototype.slice.call(from));
37
- };
38
2
  var __importDefault = (this && this.__importDefault) || function (mod) {
39
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
40
4
  };
41
5
  Object.defineProperty(exports, "__esModule", { value: true });
42
6
  exports.andMongoFilters = exports.buildAdminPartialSearchFilter = exports.escapeRegexLiteral = exports.ADMIN_LIST_SEARCH_PARAM = void 0;
43
- var mongoose_1 = __importDefault(require("mongoose"));
7
+ const mongoose_1 = __importDefault(require("mongoose"));
44
8
  /** List-query param for the admin table search box. */
45
9
  exports.ADMIN_LIST_SEARCH_PARAM = "q";
46
10
  /** @internal */
47
- var escapeRegexLiteral = function (value) {
11
+ const escapeRegexLiteral = (value) => {
48
12
  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
49
13
  };
50
14
  exports.escapeRegexLiteral = escapeRegexLiteral;
@@ -52,52 +16,31 @@ exports.escapeRegexLiteral = escapeRegexLiteral;
52
16
  * Case-insensitive partial match across string `searchFields`, plus ObjectId equality
53
17
  * when `q` is a valid id.
54
18
  */
55
- var buildAdminPartialSearchFilter = function (_a) {
56
- var e_1, _b, _c, e_2, _d, _e;
57
- var extraObjectIdFields = _a.extraObjectIdFields, model = _a.model, q = _a.q, searchFields = _a.searchFields;
58
- var trimmed = q.trim();
19
+ const buildAdminPartialSearchFilter = ({ extraObjectIdFields, model, q, searchFields, }) => {
20
+ const trimmed = q.trim();
59
21
  if (!trimmed) {
60
22
  return undefined;
61
23
  }
62
- var regex = new RegExp((0, exports.escapeRegexLiteral)(trimmed), "i");
63
- var orConditions = [];
64
- var seenFields = new Set();
65
- try {
66
- for (var searchFields_1 = __values(searchFields), searchFields_1_1 = searchFields_1.next(); !searchFields_1_1.done; searchFields_1_1 = searchFields_1.next()) {
67
- var field = searchFields_1_1.value;
68
- if (seenFields.has(field)) {
69
- continue;
70
- }
71
- seenFields.add(field);
72
- var schemaPath = model.schema.path(field);
73
- if (schemaPath && schemaPath.instance !== "String") {
74
- continue;
75
- }
76
- orConditions.push((_c = {}, _c[field] = { $regex: regex }, _c));
24
+ const regex = new RegExp((0, exports.escapeRegexLiteral)(trimmed), "i");
25
+ const orConditions = [];
26
+ const seenFields = new Set();
27
+ for (const field of searchFields) {
28
+ if (seenFields.has(field)) {
29
+ continue;
77
30
  }
78
- }
79
- catch (e_1_1) { e_1 = { error: e_1_1 }; }
80
- finally {
81
- try {
82
- if (searchFields_1_1 && !searchFields_1_1.done && (_b = searchFields_1.return)) _b.call(searchFields_1);
31
+ seenFields.add(field);
32
+ const schemaPath = model.schema.path(field);
33
+ if (schemaPath && schemaPath.instance !== "String") {
34
+ continue;
83
35
  }
84
- finally { if (e_1) throw e_1.error; }
36
+ orConditions.push({ [field]: { $regex: regex } });
85
37
  }
86
38
  if (mongoose_1.default.isValidObjectId(trimmed)) {
87
- var objectIdFields = extraObjectIdFields
88
- ? __spreadArray([], __read(extraObjectIdFields), false) : Object.keys(model.schema.paths).filter(function (key) { var _a; return ((_a = model.schema.path(key)) === null || _a === void 0 ? void 0 : _a.instance) === "ObjectID"; });
89
- try {
90
- for (var objectIdFields_1 = __values(objectIdFields), objectIdFields_1_1 = objectIdFields_1.next(); !objectIdFields_1_1.done; objectIdFields_1_1 = objectIdFields_1.next()) {
91
- var field = objectIdFields_1_1.value;
92
- orConditions.push((_e = {}, _e[field] = new mongoose_1.default.Types.ObjectId(trimmed), _e));
93
- }
94
- }
95
- catch (e_2_1) { e_2 = { error: e_2_1 }; }
96
- finally {
97
- try {
98
- if (objectIdFields_1_1 && !objectIdFields_1_1.done && (_d = objectIdFields_1.return)) _d.call(objectIdFields_1);
99
- }
100
- finally { if (e_2) throw e_2.error; }
39
+ const objectIdFields = extraObjectIdFields
40
+ ? [...extraObjectIdFields]
41
+ : Object.keys(model.schema.paths).filter((key) => model.schema.path(key)?.instance === "ObjectID");
42
+ for (const field of objectIdFields) {
43
+ orConditions.push({ [field]: new mongoose_1.default.Types.ObjectId(trimmed) });
101
44
  }
102
45
  }
103
46
  if (orConditions.length === 0) {
@@ -106,7 +49,7 @@ var buildAdminPartialSearchFilter = function (_a) {
106
49
  return { $or: orConditions };
107
50
  };
108
51
  exports.buildAdminPartialSearchFilter = buildAdminPartialSearchFilter;
109
- var andMongoFilters = function (base, extra) {
52
+ const andMongoFilters = (base, extra) => {
110
53
  if (!extra) {
111
54
  return base;
112
55
  }