@pnp/queryable 3.5.1 → 3.6.0
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/behaviors/cancelable.d.ts.map +1 -1
- package/behaviors/cancelable.js +27 -23
- package/behaviors/cancelable.js.map +1 -1
- package/behaviors/parsers.d.ts +1 -0
- package/behaviors/parsers.d.ts.map +1 -1
- package/behaviors/parsers.js +13 -0
- package/behaviors/parsers.js.map +1 -1
- package/package.json +2 -2
- package/queryable.d.ts +2 -2
- package/queryable.d.ts.map +1 -1
- package/queryable.js +11 -7
- package/queryable.js.map +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cancelable.d.ts","sourceRoot":"","sources":["../../../../packages/queryable/behaviors/cancelable.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,YAAY,EAAiC,MAAM,WAAW,CAAC;AACjG,OAAO,EAAE,SAAS,EAAiB,MAAM,iBAAiB,CAAC;AAgC3D,oBAAY,iBAAiB,CAAC,CAAC,GAAG,GAAG,IAAI,OAAO,CAAC,CAAC,CAAC,GAAG;IAAE,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"cancelable.d.ts","sourceRoot":"","sources":["../../../../packages/queryable/behaviors/cancelable.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,YAAY,EAAiC,MAAM,WAAW,CAAC;AACjG,OAAO,EAAE,SAAS,EAAiB,MAAM,iBAAiB,CAAC;AAgC3D,oBAAY,iBAAiB,CAAC,CAAC,GAAG,GAAG,IAAI,OAAO,CAAC,CAAC,CAAC,GAAG;IAAE,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC;AA4DlF;;GAEG;AACH,oBAAY,kBAAkB,GAAG,CAAC,IAAI,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAEpE;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,oEAuB7B,CAAC;AAEF;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,kBAAkB,QAGjG;AAED;;;;GAIG;AACH,wBAAgB,UAAU,IAAI,YAAY,CAAC,SAAS,CAAC,CAwFpD;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,kBAAkB,GAAG,YAAY,CAAC,SAAS,CAAC,CAyBhF"}
|
package/behaviors/cancelable.js
CHANGED
|
@@ -42,7 +42,12 @@ async function cancelPrimitive(scopeId) {
|
|
|
42
42
|
if (isArray(scope === null || scope === void 0 ? void 0 : scope.actions)) {
|
|
43
43
|
scope.actions.map(action => scope.currentSelf.on[MomentName](action));
|
|
44
44
|
}
|
|
45
|
-
|
|
45
|
+
try {
|
|
46
|
+
await scope.currentSelf.emit[MomentName]();
|
|
47
|
+
}
|
|
48
|
+
catch (e) {
|
|
49
|
+
scope.currentSelf.log(`Error in cancel: ${e}`, 3);
|
|
50
|
+
}
|
|
46
51
|
}
|
|
47
52
|
/**
|
|
48
53
|
* Creates a new scope id, sets it on the instance's ScopeId property, and adds the info to the map
|
|
@@ -75,17 +80,13 @@ export const asCancelableScope = (func) => {
|
|
|
75
80
|
createScope(this);
|
|
76
81
|
}
|
|
77
82
|
// execute the original function, but don't await it
|
|
78
|
-
const result = func.apply(this, args)
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
cancelScopes.delete(this[ScopeId]);
|
|
86
|
-
delete this[ScopeId];
|
|
87
|
-
});
|
|
88
|
-
}
|
|
83
|
+
const result = func.apply(this, args).finally(() => {
|
|
84
|
+
// remove any cancel scope values tied to this instance
|
|
85
|
+
cancelScopes.delete(this[ScopeId]);
|
|
86
|
+
delete this[ScopeId];
|
|
87
|
+
});
|
|
88
|
+
// ensure the synthetic promise from a complex method has a cancel method
|
|
89
|
+
result.cancel = cancelScopes.get(this[ScopeId]).cancel;
|
|
89
90
|
return result;
|
|
90
91
|
};
|
|
91
92
|
};
|
|
@@ -138,19 +139,22 @@ export function Cancelable() {
|
|
|
138
139
|
});
|
|
139
140
|
});
|
|
140
141
|
instance.on.pre(async function (url, init, result) {
|
|
141
|
-
const controller = new AbortController();
|
|
142
142
|
// grab the current scope, update the controller and currentSelf
|
|
143
143
|
const existingScope = cancelScopes.get(this[ScopeId]);
|
|
144
|
-
|
|
145
|
-
existingScope
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
144
|
+
// if we are here without a scope we are likely running a CancelAction request so we just ignore canceling
|
|
145
|
+
if (objectDefinedNotNull(existingScope)) {
|
|
146
|
+
const controller = new AbortController();
|
|
147
|
+
existingScope.controller = controller;
|
|
148
|
+
existingScope.currentSelf = this;
|
|
149
|
+
if (init.signal) {
|
|
150
|
+
// we do our best to hook our logic to the existing signal
|
|
151
|
+
init.signal.addEventListener("abort", () => {
|
|
152
|
+
existingScope.cancel();
|
|
153
|
+
});
|
|
154
|
+
}
|
|
155
|
+
else {
|
|
156
|
+
init.signal = controller.signal;
|
|
157
|
+
}
|
|
154
158
|
}
|
|
155
159
|
return [url, init, result];
|
|
156
160
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cancelable.js","sourceRoot":"","sources":["../../../../packages/queryable/behaviors/cancelable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,OAAO,EAAgB,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAGjG;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,wEAAwE;AACxE,MAAM,UAAU,GAAG,kBAAkB,CAAC;AAKtC,wFAAwF;AACxF,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AAY5C,oDAAoD;AACpD,MAAM,YAAY,GAAG,IAAI,GAAG,EAAsB,CAAC;AAEnD;;;;;GAKG;AACH,KAAK,UAAU,eAAe,CAAC,OAAe;IAE1C,MAAM,KAAK,GAAG,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAExC,KAAK,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IAEzB,IAAI,OAAO,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAC,EAAE;QACzB,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;KACzE;IAED,
|
|
1
|
+
{"version":3,"file":"cancelable.js","sourceRoot":"","sources":["../../../../packages/queryable/behaviors/cancelable.ts"],"names":[],"mappings":"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"}
|
package/behaviors/parsers.d.ts
CHANGED
|
@@ -6,6 +6,7 @@ export declare function BlobParse(): TimelinePipe;
|
|
|
6
6
|
export declare function JSONParse(): TimelinePipe;
|
|
7
7
|
export declare function BufferParse(): TimelinePipe;
|
|
8
8
|
export declare function HeaderParse(): TimelinePipe;
|
|
9
|
+
export declare function JSONHeaderParse(): TimelinePipe;
|
|
9
10
|
export declare function errorCheck(url: URL, response: Response, result: any): Promise<[URL, Response, any]>;
|
|
10
11
|
export declare function parseODataJSON(json: any): any;
|
|
11
12
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parsers.d.ts","sourceRoot":"","sources":["../../../../packages/queryable/behaviors/parsers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAO,YAAY,EAAE,MAAM,WAAW,CAAC;AAG9C,wBAAgB,YAAY,IAAI,YAAY,CAc3C;AAED,wBAAgB,SAAS,IAAI,YAAY,CAGxC;AAED,wBAAgB,SAAS,IAAI,YAAY,CAGxC;AAED,wBAAgB,SAAS,IAAI,YAAY,CAGxC;AAED,wBAAgB,WAAW,IAAI,YAAY,CAG1C;AAED,wBAAgB,WAAW,IAAI,YAAY,CAG1C;AAED,wBAAsB,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC,CAOzG;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,GAAG,GAAG,GAAG,CAoB7C;AAED;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,QAAQ,KAAK,OAAO,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,SAAS,CAAC,CAmBtG;AAED,qBAAa,gBAAiB,SAAQ,KAAK;IAIH,QAAQ,EAAE,QAAQ;IAAS,MAAM;IAA2B,UAAU;IAFnG,kBAAkB,UAAQ;gBAErB,OAAO,EAAE,MAAM,EAAS,QAAQ,EAAE,QAAQ,EAAS,MAAM,SAAkB,EAAS,UAAU,SAAsB;WAI5G,IAAI,CAAC,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAInE"}
|
|
1
|
+
{"version":3,"file":"parsers.d.ts","sourceRoot":"","sources":["../../../../packages/queryable/behaviors/parsers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAO,YAAY,EAAE,MAAM,WAAW,CAAC;AAG9C,wBAAgB,YAAY,IAAI,YAAY,CAc3C;AAED,wBAAgB,SAAS,IAAI,YAAY,CAGxC;AAED,wBAAgB,SAAS,IAAI,YAAY,CAGxC;AAED,wBAAgB,SAAS,IAAI,YAAY,CAGxC;AAED,wBAAgB,WAAW,IAAI,YAAY,CAG1C;AAED,wBAAgB,WAAW,IAAI,YAAY,CAG1C;AAED,wBAAgB,eAAe,IAAI,YAAY,CAe9C;AAED,wBAAsB,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC,CAOzG;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,GAAG,GAAG,GAAG,CAoB7C;AAED;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,QAAQ,KAAK,OAAO,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,SAAS,CAAC,CAmBtG;AAED,qBAAa,gBAAiB,SAAQ,KAAK;IAIH,QAAQ,EAAE,QAAQ;IAAS,MAAM;IAA2B,UAAU;IAFnG,kBAAkB,UAAQ;gBAErB,OAAO,EAAE,MAAM,EAAS,QAAQ,EAAE,QAAQ,EAAS,MAAM,SAAkB,EAAS,UAAU,SAAsB;WAI5G,IAAI,CAAC,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAInE"}
|
package/behaviors/parsers.js
CHANGED
|
@@ -27,6 +27,19 @@ export function BufferParse() {
|
|
|
27
27
|
export function HeaderParse() {
|
|
28
28
|
return parseBinderWithErrorCheck(async (r) => r.headers);
|
|
29
29
|
}
|
|
30
|
+
export function JSONHeaderParse() {
|
|
31
|
+
return parseBinderWithErrorCheck(async (response) => {
|
|
32
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
33
|
+
if ((response.headers.has("Content-Length") && parseFloat(response.headers.get("Content-Length")) === 0) || response.status === 204) {
|
|
34
|
+
return {};
|
|
35
|
+
}
|
|
36
|
+
// patch to handle cases of 200 response with no or whitespace only bodies (#487 & #545)
|
|
37
|
+
const txt = await response.text();
|
|
38
|
+
const json = txt.replace(/\s/ig, "").length > 0 ? JSON.parse(txt) : {};
|
|
39
|
+
const all = { data: { ...parseODataJSON(json) }, headers: { ...response.headers } };
|
|
40
|
+
return all;
|
|
41
|
+
});
|
|
42
|
+
}
|
|
30
43
|
export async function errorCheck(url, response, result) {
|
|
31
44
|
if (!response.ok) {
|
|
32
45
|
throw await HttpRequestError.init(response);
|
package/behaviors/parsers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parsers.js","sourceRoot":"","sources":["../../../../packages/queryable/behaviors/parsers.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"parsers.js","sourceRoot":"","sources":["../../../../packages/queryable/behaviors/parsers.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnp/queryable",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.6.0",
|
|
4
4
|
"description": "pnp - provides shared odata functionality and base classes",
|
|
5
5
|
"main": "./index.js",
|
|
6
6
|
"typings": "./index",
|
|
7
7
|
"dependencies": {
|
|
8
8
|
"tslib": "2.4.0",
|
|
9
|
-
"@pnp/core": "3.
|
|
9
|
+
"@pnp/core": "3.6.0"
|
|
10
10
|
},
|
|
11
11
|
"funding": {
|
|
12
12
|
"type": "individual",
|
package/queryable.d.ts
CHANGED
|
@@ -38,7 +38,7 @@ export declare class Queryable<R> extends Timeline<typeof DefaultMoments> implem
|
|
|
38
38
|
/**
|
|
39
39
|
* Querystring key, value pairs which will be included in the request
|
|
40
40
|
*/
|
|
41
|
-
get query():
|
|
41
|
+
get query(): URLSearchParams;
|
|
42
42
|
/**
|
|
43
43
|
* Gets the current url
|
|
44
44
|
*
|
|
@@ -53,7 +53,7 @@ export declare class Queryable<R> extends Timeline<typeof DefaultMoments> implem
|
|
|
53
53
|
export interface Queryable<R = any> extends IInvokable<R> {
|
|
54
54
|
}
|
|
55
55
|
export interface IQueryableInternal<R = any> extends Timeline<any>, IInvokable {
|
|
56
|
-
readonly query:
|
|
56
|
+
readonly query: URLSearchParams;
|
|
57
57
|
<T = R>(this: IQueryableInternal, init?: RequestInit): Promise<T>;
|
|
58
58
|
using(...behaviors: TimelinePipe[]): this;
|
|
59
59
|
toRequestUrl(): string;
|
package/queryable.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queryable.d.ts","sourceRoot":"","sources":["../../../packages/queryable/queryable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,QAAQ,EAAgE,YAAY,EAAa,MAAM,WAAW,CAAC;AAC9I,OAAO,EAAE,UAAU,EAAa,MAAM,gBAAgB,CAAC;AAEvD,oBAAY,0BAA0B,GAAG,CAAC,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;AAEhH,oBAAY,oBAAoB,GAAG,CAAC,IAAI,EAAE,kBAAkB,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,KAAK,OAAO,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC;AAElJ,oBAAY,qBAAqB,GAAG,CAAC,IAAI,EAAE,kBAAkB,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC;AAE3H,oBAAY,qBAAqB,GAAG,CAAC,IAAI,EAAE,kBAAkB,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;AAEjH,oBAAY,sBAAsB,GAAG,CAAC,IAAI,EAAE,kBAAkB,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,GAAG,SAAS,KAAK,OAAO,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;AAExJ,oBAAY,qBAAqB,GAAG,CAAC,IAAI,EAAE,kBAAkB,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,GAAG,SAAS,KAAK,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;AAEzH,oBAAY,qBAAqB,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,kBAAkB,EAAE,MAAM,EAAE,CAAC,KAAK,IAAI,CAAC;AAI3F,QAAA,MAAM,cAAc;;;;;;;;CAQV,CAAC;AAEX,oBAAY,aAAa,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;AAE/E,qBAEa,SAAS,CAAC,CAAC,CAAE,SAAQ,QAAQ,CAAC,OAAO,cAAc,CAAE,YAAW,kBAAkB,CAAC,CAAC,CAAC;IAG9F,OAAO,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"queryable.d.ts","sourceRoot":"","sources":["../../../packages/queryable/queryable.ts"],"names":[],"mappings":"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"}
|
package/queryable.js
CHANGED
|
@@ -19,7 +19,7 @@ let Queryable = class Queryable extends Timeline {
|
|
|
19
19
|
this.InternalResolve = Symbol.for("Queryable_Resolve");
|
|
20
20
|
this.InternalReject = Symbol.for("Queryable_Reject");
|
|
21
21
|
this.InternalPromise = Symbol.for("Queryable_Promise");
|
|
22
|
-
this._query = new
|
|
22
|
+
this._query = new URLSearchParams();
|
|
23
23
|
// add an intneral moment with specific implementaion for promise creation
|
|
24
24
|
this.moments[this.InternalPromise] = reduce();
|
|
25
25
|
let parent;
|
|
@@ -59,11 +59,10 @@ let Queryable = class Queryable extends Timeline {
|
|
|
59
59
|
*
|
|
60
60
|
*/
|
|
61
61
|
toRequestUrl() {
|
|
62
|
-
let
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
return u;
|
|
62
|
+
let url = this.toUrl();
|
|
63
|
+
const char = url.indexOf("?") > -1 ? "&" : "?";
|
|
64
|
+
url += char + this.query.toString();
|
|
65
|
+
return url;
|
|
67
66
|
}
|
|
68
67
|
/**
|
|
69
68
|
* Querystring key, value pairs which will be included in the request
|
|
@@ -93,8 +92,13 @@ let Queryable = class Queryable extends Timeline {
|
|
|
93
92
|
};
|
|
94
93
|
try {
|
|
95
94
|
log("Beginning request", 1);
|
|
95
|
+
// include the request id in the headers to assist with debugging against logs
|
|
96
|
+
const initSeed = {
|
|
97
|
+
...userInit,
|
|
98
|
+
headers: { ...userInit.headers, "X-PnPjs-RequestId": requestId },
|
|
99
|
+
};
|
|
96
100
|
// eslint-disable-next-line prefer-const
|
|
97
|
-
let [url, init, result] = await this.emit.pre(this.toRequestUrl(),
|
|
101
|
+
let [url, init, result] = await this.emit.pre(this.toRequestUrl(), initSeed, undefined);
|
|
98
102
|
log(`Url: ${url}`, 1);
|
|
99
103
|
if (typeof result !== "undefined") {
|
|
100
104
|
log("Result returned from pre, Emitting data");
|
package/queryable.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queryable.js","sourceRoot":"","sources":["../../../packages/queryable/queryable.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAgB,SAAS,EAAE,MAAM,WAAW,CAAC;AAC9I,OAAO,EAAc,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAkBvD,MAAM,cAAc,GAAG;IACnB,SAAS,EAAE,SAAS,EAA8B;IAClD,GAAG,EAAE,WAAW,EAAwB;IACxC,IAAI,EAAE,WAAW,EAAyB;IAC1C,IAAI,EAAE,OAAO,EAAyB;IACtC,KAAK,EAAE,WAAW,EAA0B;IAC5C,IAAI,EAAE,WAAW,EAAyB;IAC1C,IAAI,EAAE,SAAS,EAAyB;CAClC,CAAC;AAMX,IAAa,SAAS,GAAtB,MAAa,SAAa,SAAQ,QAA+B;IAe7D,YAAY,IAAmB,EAAE,IAAa;QAE1C,KAAK,CAAC,cAAc,CAAC,CAAC;QAT1B,gFAAgF;QAChF,iFAAiF;QACjF,6GAA6G;QACnG,oBAAe,GAAG,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QAClD,mBAAc,GAAG,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;QAChD,oBAAe,GAAG,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QAMxD,IAAI,CAAC,MAAM,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"queryable.js","sourceRoot":"","sources":["../../../packages/queryable/queryable.ts"],"names":[],"mappings":"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"}
|