@opentabs-dev/plugin-sdk 0.0.34 → 0.0.36

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/dom.d.ts CHANGED
@@ -1,6 +1,8 @@
1
1
  export interface WaitForSelectorOptions {
2
2
  /** Timeout in milliseconds (default: 10000) */
3
3
  timeout?: number;
4
+ /** AbortSignal to cancel the wait early */
5
+ signal?: AbortSignal;
4
6
  }
5
7
  export interface ObserveDOMOptions {
6
8
  /** Watch for added/removed child nodes (default: true) */
@@ -23,11 +25,12 @@ export declare const waitForSelector: <T extends Element = Element>(selector: st
23
25
  export declare const waitForSelectorRemoval: (selector: string, opts?: WaitForSelectorOptions) => Promise<void>;
24
26
  /**
25
27
  * Typed wrapper around `document.querySelectorAll` that returns a real array.
28
+ * Returns an empty array if the selector is invalid.
26
29
  */
27
30
  export declare const querySelectorAll: <T extends Element = Element>(selector: string) => T[];
28
31
  /**
29
32
  * Returns the trimmed `textContent` of the first element matching `selector`,
30
- * or `null` if no element is found.
33
+ * or `null` if no element is found or the selector is invalid.
31
34
  */
32
35
  export declare const getTextContent: (selector: string) => string | null;
33
36
  /**
package/dist/dom.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dom.d.ts","sourceRoot":"","sources":["../src/dom.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,sBAAsB;IACrC,+CAA+C;IAC/C,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,iBAAiB;IAChC,0DAA0D;IAC1D,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,mDAAmD;IACnD,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,+CAA+C;IAC/C,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAAI,CAAC,SAAS,OAAO,GAAG,OAAO,EACzD,UAAU,MAAM,EAChB,OAAO,sBAAsB,KAC5B,OAAO,CAAC,CAAC,CA+BX,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,sBAAsB,GAAI,UAAU,MAAM,EAAE,OAAO,sBAAsB,KAAG,OAAO,CAAC,IAAI,CA6BpG,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,OAAO,GAAG,OAAO,EAAE,UAAU,MAAM,KAAG,CAAC,EAC9B,CAAC;AAErD;;;GAGG;AACH,eAAO,MAAM,cAAc,GAAI,UAAU,MAAM,KAAG,MAAM,GAAG,IAK1D,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,UAAU,GACrB,UAAU,MAAM,EAChB,UAAU,CAAC,SAAS,EAAE,cAAc,EAAE,EAAE,QAAQ,EAAE,gBAAgB,KAAK,IAAI,EAC3E,UAAU,iBAAiB,KAC1B,CAAC,MAAM,IAAI,CAcb,CAAC"}
1
+ {"version":3,"file":"dom.d.ts","sourceRoot":"","sources":["../src/dom.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,sBAAsB;IACrC,+CAA+C;IAC/C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,2CAA2C;IAC3C,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,iBAAiB;IAChC,0DAA0D;IAC1D,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,mDAAmD;IACnD,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,+CAA+C;IAC/C,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAAI,CAAC,SAAS,OAAO,GAAG,OAAO,EACzD,UAAU,MAAM,EAChB,OAAO,sBAAsB,KAC5B,OAAO,CAAC,CAAC,CAwFX,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,sBAAsB,GAAI,UAAU,MAAM,EAAE,OAAO,sBAAsB,KAAG,OAAO,CAAC,IAAI,CA2FpG,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,OAAO,GAAG,OAAO,EAAE,UAAU,MAAM,KAAG,CAAC,EAMjF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,cAAc,GAAI,UAAU,MAAM,KAAG,MAAM,GAAG,IAU1D,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,UAAU,GACrB,UAAU,MAAM,EAChB,UAAU,CAAC,SAAS,EAAE,cAAc,EAAE,EAAE,QAAQ,EAAE,gBAAgB,KAAK,IAAI,EAC3E,UAAU,iBAAiB,KAC1B,CAAC,MAAM,IAAI,CAoBb,CAAC"}
package/dist/dom.js CHANGED
@@ -1,6 +1,11 @@
1
1
  // ---------------------------------------------------------------------------
2
2
  // DOM utilities for plugin authors
3
3
  // ---------------------------------------------------------------------------
4
+ /**
5
+ * Returns true if the selector may match via attribute changes (class or attribute selectors),
6
+ * requiring `attributes: true` in MutationObserver options to detect such changes.
7
+ */
8
+ const needsAttributeObservation = (selector) => selector.includes('[') || selector.includes('.');
4
9
  /**
5
10
  * Waits for an element matching `selector` to appear in the DOM.
6
11
  * Uses MutationObserver for efficient detection, falls back to an
@@ -8,32 +13,86 @@
8
13
  */
9
14
  export const waitForSelector = (selector, opts) => {
10
15
  const timeout = opts?.timeout ?? 10_000;
16
+ const signal = opts?.signal;
17
+ const abortReason = () => (signal?.reason instanceof Error ? signal.reason : new Error('waitForSelector: aborted'));
18
+ if (signal?.aborted)
19
+ return Promise.reject(abortReason());
11
20
  return new Promise((resolve, reject) => {
12
- const existing = document.querySelector(selector);
21
+ let existing;
22
+ try {
23
+ existing = document.querySelector(selector);
24
+ }
25
+ catch {
26
+ reject(new Error(`waitForSelector: invalid CSS selector "${selector}"`));
27
+ return;
28
+ }
13
29
  if (existing) {
14
30
  resolve(existing);
15
31
  return;
16
32
  }
17
33
  let settled = false;
34
+ const onAbort = () => {
35
+ if (settled)
36
+ return;
37
+ settled = true;
38
+ clearTimeout(timer);
39
+ observer.disconnect();
40
+ reject(abortReason());
41
+ };
42
+ signal?.addEventListener('abort', onAbort, { once: true });
18
43
  const timer = setTimeout(() => {
19
44
  if (settled)
20
45
  return;
21
46
  settled = true;
47
+ signal?.removeEventListener('abort', onAbort);
22
48
  observer.disconnect();
23
49
  reject(new Error(`waitForSelector: timed out after ${timeout}ms waiting for "${selector}"`));
24
50
  }, timeout);
25
51
  const observer = new MutationObserver(() => {
26
- const el = document.querySelector(selector);
52
+ let el;
53
+ try {
54
+ el = document.querySelector(selector);
55
+ }
56
+ catch (err) {
57
+ if (settled)
58
+ return;
59
+ settled = true;
60
+ clearTimeout(timer);
61
+ signal?.removeEventListener('abort', onAbort);
62
+ observer.disconnect();
63
+ reject(err instanceof Error ? err : new Error(`waitForSelector: querySelector threw for selector "${selector}"`));
64
+ return;
65
+ }
27
66
  if (el) {
28
67
  if (settled)
29
68
  return;
30
69
  settled = true;
31
70
  clearTimeout(timer);
71
+ signal?.removeEventListener('abort', onAbort);
32
72
  observer.disconnect();
33
73
  resolve(el);
34
74
  }
35
75
  });
36
- observer.observe(document.documentElement, { childList: true, subtree: true });
76
+ observer.observe(document.documentElement, {
77
+ childList: true,
78
+ subtree: true,
79
+ attributes: needsAttributeObservation(selector),
80
+ });
81
+ // Re-check after observe to close the TOCTOU race window: element may have
82
+ // been added between the initial querySelector and observer.observe().
83
+ try {
84
+ const el = document.querySelector(selector);
85
+ if (el) {
86
+ settled = true;
87
+ clearTimeout(timer);
88
+ signal?.removeEventListener('abort', onAbort);
89
+ observer.disconnect();
90
+ resolve(el);
91
+ }
92
+ }
93
+ catch {
94
+ // querySelector errors are handled by the observer callback
95
+ }
37
96
  });
38
97
  };
39
98
  /**
@@ -42,42 +101,114 @@ export const waitForSelector = (selector, opts) => {
42
101
  */
43
102
  export const waitForSelectorRemoval = (selector, opts) => {
44
103
  const timeout = opts?.timeout ?? 10_000;
104
+ const signal = opts?.signal;
105
+ const abortReason = () => signal?.reason instanceof Error ? signal.reason : new Error('waitForSelectorRemoval: aborted');
106
+ if (signal?.aborted)
107
+ return Promise.reject(abortReason());
45
108
  return new Promise((resolve, reject) => {
46
- if (!document.querySelector(selector)) {
109
+ let hasElement;
110
+ try {
111
+ hasElement = !!document.querySelector(selector);
112
+ }
113
+ catch {
114
+ reject(new Error(`waitForSelectorRemoval: invalid CSS selector "${selector}"`));
115
+ return;
116
+ }
117
+ if (!hasElement) {
47
118
  resolve();
48
119
  return;
49
120
  }
50
121
  let settled = false;
122
+ const onAbort = () => {
123
+ if (settled)
124
+ return;
125
+ settled = true;
126
+ clearTimeout(timer);
127
+ observer.disconnect();
128
+ reject(abortReason());
129
+ };
130
+ signal?.addEventListener('abort', onAbort, { once: true });
51
131
  const timer = setTimeout(() => {
52
132
  if (settled)
53
133
  return;
54
134
  settled = true;
135
+ signal?.removeEventListener('abort', onAbort);
55
136
  observer.disconnect();
56
137
  reject(new Error(`waitForSelectorRemoval: timed out after ${timeout}ms waiting for "${selector}" to be removed`));
57
138
  }, timeout);
58
139
  const observer = new MutationObserver(() => {
59
- if (!document.querySelector(selector)) {
140
+ let el;
141
+ try {
142
+ el = document.querySelector(selector);
143
+ }
144
+ catch (err) {
60
145
  if (settled)
61
146
  return;
62
147
  settled = true;
63
148
  clearTimeout(timer);
149
+ signal?.removeEventListener('abort', onAbort);
150
+ observer.disconnect();
151
+ reject(err instanceof Error
152
+ ? err
153
+ : new Error(`waitForSelectorRemoval: querySelector threw for selector "${selector}"`));
154
+ return;
155
+ }
156
+ if (!el) {
157
+ if (settled)
158
+ return;
159
+ settled = true;
160
+ clearTimeout(timer);
161
+ signal?.removeEventListener('abort', onAbort);
64
162
  observer.disconnect();
65
163
  resolve();
66
164
  }
67
165
  });
68
- observer.observe(document.documentElement, { childList: true, subtree: true });
166
+ observer.observe(document.documentElement, {
167
+ childList: true,
168
+ subtree: true,
169
+ attributes: needsAttributeObservation(selector),
170
+ });
171
+ // Re-check after observe to close the TOCTOU race window: element may have
172
+ // been removed between the initial querySelector and observer.observe().
173
+ try {
174
+ const el = document.querySelector(selector);
175
+ if (!el) {
176
+ settled = true;
177
+ clearTimeout(timer);
178
+ signal?.removeEventListener('abort', onAbort);
179
+ observer.disconnect();
180
+ resolve();
181
+ }
182
+ }
183
+ catch {
184
+ // querySelector errors are handled by the observer callback
185
+ }
69
186
  });
70
187
  };
71
188
  /**
72
189
  * Typed wrapper around `document.querySelectorAll` that returns a real array.
190
+ * Returns an empty array if the selector is invalid.
73
191
  */
74
- export const querySelectorAll = (selector) => Array.from(document.querySelectorAll(selector));
192
+ export const querySelectorAll = (selector) => {
193
+ try {
194
+ return Array.from(document.querySelectorAll(selector));
195
+ }
196
+ catch {
197
+ return [];
198
+ }
199
+ };
75
200
  /**
76
201
  * Returns the trimmed `textContent` of the first element matching `selector`,
77
- * or `null` if no element is found.
202
+ * or `null` if no element is found or the selector is invalid.
78
203
  */
79
204
  export const getTextContent = (selector) => {
80
- const el = document.querySelector(selector);
205
+ let el;
206
+ try {
207
+ el = document.querySelector(selector);
208
+ }
209
+ catch {
210
+ return null;
211
+ }
81
212
  if (!el)
82
213
  return null;
83
214
  const text = el.textContent;
@@ -88,7 +219,13 @@ export const getTextContent = (selector) => {
88
219
  * Returns a cleanup function that disconnects the observer.
89
220
  */
90
221
  export const observeDOM = (selector, callback, options) => {
91
- const target = document.querySelector(selector);
222
+ let target;
223
+ try {
224
+ target = document.querySelector(selector);
225
+ }
226
+ catch {
227
+ throw new Error(`observeDOM: invalid CSS selector "${selector}"`);
228
+ }
92
229
  if (!target) {
93
230
  throw new Error(`observeDOM: no element found for selector "${selector}"`);
94
231
  }
package/dist/dom.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dom.js","sourceRoot":"","sources":["../src/dom.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dom.js","sourceRoot":"","sources":["../src/dom.ts"],"names":[],"mappings":"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"}
package/dist/fetch.d.ts CHANGED
@@ -23,8 +23,8 @@ export declare const fetchJSONImpl: (url: string, init?: FetchFromPageOptions, s
23
23
  export interface FetchJSON {
24
24
  /** Fetch JSON and validate against a Zod schema. Returns the validated, typed result. */
25
25
  <T extends z.ZodType>(url: string, init: FetchFromPageOptions | undefined, schema: T): Promise<z.infer<T>>;
26
- /** Fetch JSON with an unchecked cast to T (backward compatible). */
27
- <T>(url: string, init?: FetchFromPageOptions): Promise<T>;
26
+ /** Fetch JSON with an unchecked cast to T. Returns undefined for 204 No Content responses. */
27
+ <T>(url: string, init?: FetchFromPageOptions): Promise<T | undefined>;
28
28
  }
29
29
  /**
30
30
  * Fetches a URL and parses the response as JSON. Uses the page's session
@@ -40,8 +40,8 @@ export declare const fetchJSON: FetchJSON;
40
40
  export interface PostJSON {
41
41
  /** POST JSON and validate the response against a Zod schema. Returns the validated, typed result. */
42
42
  <T extends z.ZodType>(url: string, body: unknown, init: FetchFromPageOptions | undefined, schema: T): Promise<z.infer<T>>;
43
- /** POST JSON with an unchecked cast to T (backward compatible). */
44
- <T>(url: string, body: unknown, init?: FetchFromPageOptions): Promise<T>;
43
+ /** POST JSON with an unchecked cast to T. Returns undefined for 204 No Content responses. */
44
+ <T>(url: string, body: unknown, init?: FetchFromPageOptions): Promise<T | undefined>;
45
45
  }
46
46
  /**
47
47
  * Convenience wrapper for POST requests with a JSON body. Sets Content-Type,
@@ -56,8 +56,8 @@ export declare const postJSON: PostJSON;
56
56
  export interface PostForm {
57
57
  /** POST URL-encoded form and validate the response against a Zod schema. Returns the validated, typed result. */
58
58
  <T extends z.ZodType>(url: string, body: Record<string, string>, init: FetchFromPageOptions | undefined, schema: T): Promise<z.infer<T>>;
59
- /** POST URL-encoded form with an unchecked cast to T (backward compatible). */
60
- <T>(url: string, body: Record<string, string>, init?: FetchFromPageOptions): Promise<T>;
59
+ /** POST URL-encoded form with an unchecked cast to T. Returns undefined for 204 No Content responses. */
60
+ <T>(url: string, body: Record<string, string>, init?: FetchFromPageOptions): Promise<T | undefined>;
61
61
  }
62
62
  /**
63
63
  * Convenience wrapper for POST requests with a URL-encoded form body. Sets
@@ -73,8 +73,8 @@ export declare const postForm: PostForm;
73
73
  export interface PostFormData {
74
74
  /** POST multipart form data and validate the response against a Zod schema. Returns the validated, typed result. */
75
75
  <T extends z.ZodType>(url: string, body: FormData, init: FetchFromPageOptions | undefined, schema: T): Promise<z.infer<T>>;
76
- /** POST multipart form data with an unchecked cast to T (backward compatible). */
77
- <T>(url: string, body: FormData, init?: FetchFromPageOptions): Promise<T>;
76
+ /** POST multipart form data with an unchecked cast to T. Returns undefined for 204 No Content responses. */
77
+ <T>(url: string, body: FormData, init?: FetchFromPageOptions): Promise<T | undefined>;
78
78
  }
79
79
  /**
80
80
  * Convenience wrapper for POST requests with a multipart/form-data body.
@@ -90,8 +90,8 @@ export declare const postFormData: PostFormData;
90
90
  export interface PutJSON {
91
91
  /** PUT JSON and validate the response against a Zod schema. Returns the validated, typed result. */
92
92
  <T extends z.ZodType>(url: string, body: unknown, init: FetchFromPageOptions | undefined, schema: T): Promise<z.infer<T>>;
93
- /** PUT JSON with an unchecked cast to T (backward compatible). */
94
- <T>(url: string, body: unknown, init?: FetchFromPageOptions): Promise<T>;
93
+ /** PUT JSON with an unchecked cast to T. Returns undefined for 204 No Content responses. */
94
+ <T>(url: string, body: unknown, init?: FetchFromPageOptions): Promise<T | undefined>;
95
95
  }
96
96
  /**
97
97
  * Convenience wrapper for PUT requests with a JSON body. Sets Content-Type,
@@ -106,8 +106,8 @@ export declare const putJSON: PutJSON;
106
106
  export interface PatchJSON {
107
107
  /** PATCH JSON and validate the response against a Zod schema. Returns the validated, typed result. */
108
108
  <T extends z.ZodType>(url: string, body: unknown, init: FetchFromPageOptions | undefined, schema: T): Promise<z.infer<T>>;
109
- /** PATCH JSON with an unchecked cast to T (backward compatible). */
110
- <T>(url: string, body: unknown, init?: FetchFromPageOptions): Promise<T>;
109
+ /** PATCH JSON with an unchecked cast to T. Returns undefined for 204 No Content responses. */
110
+ <T>(url: string, body: unknown, init?: FetchFromPageOptions): Promise<T | undefined>;
111
111
  }
112
112
  /**
113
113
  * Convenience wrapper for PATCH requests with a JSON body. Sets Content-Type,
@@ -1 +1 @@
1
- {"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":"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"}
package/dist/fetch.js CHANGED
@@ -17,11 +17,20 @@ export const httpStatusToToolError = (response, message) => {
17
17
  const retryAfterMs = retryAfter !== null ? parseRetryAfterMs(retryAfter) : undefined;
18
18
  return ToolError.rateLimited(message, retryAfterMs);
19
19
  }
20
+ if (status === 400 || status === 422) {
21
+ return ToolError.validation(message);
22
+ }
23
+ if (status === 408) {
24
+ return ToolError.timeout(message);
25
+ }
20
26
  if (status >= 500) {
21
27
  const retryAfter = status === 503 ? response.headers.get('Retry-After') : null;
22
28
  const retryAfterMs = retryAfter !== null ? parseRetryAfterMs(retryAfter) : undefined;
23
29
  return new ToolError(message, 'http_error', { category: 'internal', retryable: true, retryAfterMs });
24
30
  }
31
+ if (status >= 400 && status < 500) {
32
+ return new ToolError(message, 'http_error', { retryable: false });
33
+ }
25
34
  return new ToolError(message, 'http_error', { category: 'internal' });
26
35
  };
27
36
  /** Parses a Retry-After header value (seconds or HTTP-date) into milliseconds. */
@@ -58,7 +67,7 @@ export const fetchFromPage = async (url, init) => {
58
67
  if (error instanceof DOMException && error.name === 'TimeoutError') {
59
68
  throw ToolError.timeout(`fetchFromPage: request timed out after ${timeout}ms for ${url}`);
60
69
  }
61
- if (error instanceof DOMException && error.name === 'AbortError') {
70
+ if (combinedSignal.aborted) {
62
71
  throw new ToolError(`fetchFromPage: request aborted for ${url}`, 'aborted');
63
72
  }
64
73
  throw new ToolError(`fetchFromPage: network error for ${url}: ${toErrorMessage(error)}`, 'network_error', {
@@ -76,15 +85,20 @@ export const fetchFromPage = async (url, init) => {
76
85
  /** Shared implementation for fetchJSON and postJSON — fetches, parses JSON, optionally validates. */
77
86
  export const fetchJSONImpl = async (url, init, schema) => {
78
87
  const response = await fetchFromPage(url, init);
79
- if (response.status === 204 || response.headers.get('content-length') === '0') {
80
- return undefined;
81
- }
82
88
  let data;
83
- try {
84
- data = await response.json();
89
+ if (response.status === 204 || response.headers.get('content-length') === '0') {
90
+ if (!schema) {
91
+ return undefined;
92
+ }
93
+ throw ToolError.validation(`fetchJSON: expected JSON response from ${url} but received 204 No Content — the server returned no body to validate`);
85
94
  }
86
- catch {
87
- throw ToolError.validation(`fetchJSON: failed to parse JSON response from ${url}`);
95
+ else {
96
+ try {
97
+ data = await response.json();
98
+ }
99
+ catch {
100
+ throw ToolError.validation(`fetchJSON: failed to parse JSON response from ${url}`);
101
+ }
88
102
  }
89
103
  if (schema) {
90
104
  const result = schema.safeParse(data);
package/dist/fetch.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"fetch.js","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fetch.js","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":"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"}
package/dist/index.d.ts CHANGED
@@ -237,7 +237,7 @@ export type { WaitForSelectorOptions, ObserveDOMOptions } from './dom.js';
237
237
  export { fetchFromPage, fetchJSON, fetchJSONImpl, httpStatusToToolError, parseRetryAfterMs, postJSON, postForm, postFormData, putJSON, patchJSON, deleteJSON, } from './fetch.js';
238
238
  export type { FetchFromPageOptions, FetchJSON, PostJSON, PostForm, PostFormData, PutJSON, PatchJSON, DeleteJSON, } from './fetch.js';
239
239
  export { retry, sleep, waitUntil } from './timing.js';
240
- export type { RetryOptions, WaitUntilOptions } from './timing.js';
240
+ export type { RetryOptions, SleepOptions, WaitUntilOptions } from './timing.js';
241
241
  export { getLocalStorage, setLocalStorage, removeLocalStorage, getSessionStorage, setSessionStorage, removeSessionStorage, getCookie, } from './storage.js';
242
242
  export { getPageGlobal, getCurrentUrl, getPageTitle } from './page-state.js';
243
243
  export { log } from './log.js';
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/dist/log.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../src/log.ts"],"names":[],"mappings":"AAIA,oDAAoD;AACpD,KAAK,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;AAEvD,oCAAoC;AACpC,UAAU,QAAQ;IAChB,KAAK,EAAE,QAAQ,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,uEAAuE;AACvE,KAAK,YAAY,GAAG,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,CAAC;AA0F9C;;;;;GAKG;AACH,QAAA,MAAM,gBAAgB,GAAI,WAAW,YAAY,KAAG,CAAC,MAAM,IAAI,CAM9D,CAAC;AAkBF;;;;;;;;;;;;;GAaG;AACH,QAAA,MAAM,GAAG;qBAxBG,MAAM,WAAW,OAAO,EAAE,KAAG,IAAI;oBAAjC,MAAM,WAAW,OAAO,EAAE,KAAG,IAAI;oBAAjC,MAAM,WAAW,OAAO,EAAE,KAAG,IAAI;qBAAjC,MAAM,WAAW,OAAO,EAAE,KAAG,IAAI;EA6B3C,CAAC;AAiBH,OAAO,EAAE,gBAAgB,EAAE,GAAG,EAAE,CAAC;AACjC,YAAY,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC"}
1
+ {"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../src/log.ts"],"names":[],"mappings":"AAIA,oDAAoD;AACpD,KAAK,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;AAEvD,oCAAoC;AACpC,UAAU,QAAQ;IAChB,KAAK,EAAE,QAAQ,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,uEAAuE;AACvE,KAAK,YAAY,GAAG,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,CAAC;AA+H9C;;;;;GAKG;AACH,QAAA,MAAM,gBAAgB,GAAI,WAAW,YAAY,KAAG,CAAC,MAAM,IAAI,CAM9D,CAAC;AAkBF;;;;;;;;;;;;;GAaG;AACH,QAAA,MAAM,GAAG;qBAxBG,MAAM,WAAW,OAAO,EAAE,KAAG,IAAI;oBAAjC,MAAM,WAAW,OAAO,EAAE,KAAG,IAAI;oBAAjC,MAAM,WAAW,OAAO,EAAE,KAAG,IAAI;qBAAjC,MAAM,WAAW,OAAO,EAAE,KAAG,IAAI;EA6B3C,CAAC;AAiBH,OAAO,EAAE,gBAAgB,EAAE,GAAG,EAAE,CAAC;AACjC,YAAY,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC"}