graze-client 0.6.4 → 0.6.5
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/build/dts/builder.d.ts +2 -6
- package/build/dts/builder.d.ts.map +1 -1
- package/build/esm/builder.js +7 -3
- package/build/esm/builder.js.map +1 -1
- package/package.json +1 -1
- package/src/builder.ts +22 -18
package/build/dts/builder.d.ts
CHANGED
|
@@ -5,12 +5,8 @@ export declare const Algo: {
|
|
|
5
5
|
};
|
|
6
6
|
};
|
|
7
7
|
export declare const F: {
|
|
8
|
-
and: (...filters: Filter[]) =>
|
|
9
|
-
|
|
10
|
-
};
|
|
11
|
-
or: (...filters: Filter[]) => {
|
|
12
|
-
or: Filter[];
|
|
13
|
-
};
|
|
8
|
+
and: (...filters: (Filter | null)[]) => Filter;
|
|
9
|
+
or: (...filters: (Filter | null)[]) => Filter;
|
|
14
10
|
regexMatches: (attribute: RegexMatches["regex_matches"][0], regex: string) => RegexMatches;
|
|
15
11
|
regexNegationMatches: (attribute: RegexNegationMatches["regex_negation_matches"][0], regex: string) => RegexNegationMatches;
|
|
16
12
|
textMatchesAny: ({ attribute, patterns, caseInsensitive, useRegex, }: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../src/builder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,cAAc,EACd,sBAAsB,EACtB,SAAS,EACT,MAAM,EACN,gBAAgB,EAChB,cAAc,EACd,YAAY,EACZ,oBAAoB,EACpB,WAAW,EACX,cAAc,EACd,eAAe,EAChB,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../src/builder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,cAAc,EACd,sBAAsB,EACtB,SAAS,EACT,MAAM,EACN,gBAAgB,EAChB,cAAc,EACd,YAAY,EACZ,oBAAoB,EACpB,WAAW,EACX,cAAc,EACd,eAAe,EAChB,MAAM,mBAAmB,CAAC;AAmI3B,eAAO,MAAM,IAAI;yBACM,MAAM,EAAE,KAAG;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE;CAGnD,CAAC;AAEF,eAAO,MAAM,CAAC;sBAvIW,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,KAAG,MAAM;qBAc3B,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,KAAG,MAAM;8BAerC,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,SACpC,MAAM,KACZ,YAAY;sCAKF,oBAAoB,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC,SACrD,MAAM,KACZ,oBAAoB;0EASpB;QACD,SAAS,EAAE,aAAa,CAAC;QACzB,QAAQ,EAAE,MAAM,EAAE,CAAC;QACnB,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,KAAG,cAAc;2EASf;QACD,SAAS,EAAE,aAAa,CAAC;QACzB,QAAQ,EAAE,MAAM,EAAE,CAAC;QACnB,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,KAAG,eAAe;6BA8CX,aAAa,MACf,mBAAmB,SAChB,cAAc,KACpB,MAAM;wBA7CkB,MAAM,KAAG,gBAAgB;2BAGtB,MAAM,KAAG,gBAAgB;8BAIzC,MAAM,MACd,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,YACxB,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,KACvC,WAAW;qCAG0B,MAAM;;;gCAEX,MAAM;;;wCAEE,MAAM;;;sCAER,MAAM;;;;;;;2BAUjB,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,KAAG,MAAM;8BAGpC,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,KAAG,MAAM;;;;;;8BAuBxC,MAAM,KAAS,sBAAsB;0BAjCxC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,KAAG,MAAM;gCAG7B,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,KAAG,MAAM;CAmErE,CAAC"}
|
package/build/esm/builder.js
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
const and = (...filters) => {
|
|
2
2
|
const flatFilters = [];
|
|
3
|
-
filters
|
|
3
|
+
filters
|
|
4
|
+
.filter((f) => f !== null)
|
|
5
|
+
.forEach((f) => {
|
|
4
6
|
if ("and" in f) {
|
|
5
7
|
// Automatically flatten nested ands.
|
|
6
8
|
flatFilters.push(...f.and);
|
|
@@ -13,7 +15,9 @@ const and = (...filters) => {
|
|
|
13
15
|
};
|
|
14
16
|
const or = (...filters) => {
|
|
15
17
|
const flatFilters = [];
|
|
16
|
-
filters
|
|
18
|
+
filters
|
|
19
|
+
.filter((f) => f !== null)
|
|
20
|
+
.forEach((f) => {
|
|
17
21
|
if ("or" in f) {
|
|
18
22
|
flatFilters.push(...f.or);
|
|
19
23
|
}
|
|
@@ -67,7 +71,7 @@ const hasNoNSFWLabels = {
|
|
|
67
71
|
const attributeCompare = (attr, op, value) => ({
|
|
68
72
|
attribute_compare: [attr, op, value],
|
|
69
73
|
});
|
|
70
|
-
const isPost = postTypeIsNot("reply");
|
|
74
|
+
const isPost = postTypeIsNot("reply", "quote");
|
|
71
75
|
const isReply = postTypeIs("reply");
|
|
72
76
|
const isQuote = postTypeIs("quote");
|
|
73
77
|
const isNotReply = postTypeIsNot("reply");
|
package/build/esm/builder.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/builder.ts"],"names":[],"mappings":"AAgBA,MAAM,GAAG,GAAG,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/builder.ts"],"names":[],"mappings":"AAgBA,MAAM,GAAG,GAAG,CAAC,GAAG,OAA0B,EAAU,EAAE;IACpD,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,OAAO;SACJ,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC;SACzB,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACb,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;YACf,qCAAqC;YACrC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;aAAM,CAAC;YACN,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACtB,CAAC;IACH,CAAC,CAAC,CAAC;IACL,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC;AAC9B,CAAC,CAAC;AACF,MAAM,EAAE,GAAG,CAAC,GAAG,OAA0B,EAAU,EAAE;IACnD,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,OAAO;SACJ,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC;SACzB,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACb,IAAI,IAAI,IAAI,CAAC,EAAE,CAAC;YACd,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;QAC5B,CAAC;aAAM,CAAC;YACN,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACtB,CAAC;IACH,CAAC,CAAC,CAAC;IACL,OAAO,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC;AAC7B,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CACnB,SAA2C,EAC3C,KAAa,EACC,EAAE,CAAC,CAAC;IAClB,aAAa,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC;CACxC,CAAC,CAAC;AAEH,MAAM,oBAAoB,GAAG,CAC3B,SAA4D,EAC5D,KAAa,EACS,EAAE,CAAC,CAAC;IAC1B,sBAAsB,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC;CACjD,CAAC,CAAC;AAEH,MAAM,cAAc,GAAG,CAAC,EACtB,SAAS,EACT,QAAQ,EACR,eAAe,GAAG,IAAI,EACtB,QAAQ,GAAG,KAAK,GAMjB,EAAkB,EAAE,CAAC,CAAC;IACrB,SAAS,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,eAAe,EAAE,QAAQ,CAAC;CAC5D,CAAC,CAAC;AAEH,MAAM,eAAe,GAAG,CAAC,EACvB,SAAS,EACT,QAAQ,EACR,eAAe,GAAG,IAAI,EACtB,QAAQ,GAAG,KAAK,GAMjB,EAAmB,EAAE,CAAC,CAAC;IACtB,UAAU,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,eAAe,EAAE,QAAQ,CAAC;CAC7D,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,CAAC,GAAW,EAAoB,EAAE,CAAC,CAAC;IACvD,WAAW,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC;CACzB,CAAC,CAAC;AACH,MAAM,eAAe,GAAG,CAAC,GAAW,EAAoB,EAAE,CAAC,CAAC;IAC1D,WAAW,EAAE,CAAC,GAAG,EAAE,QAAQ,CAAC;CAC7B,CAAC,CAAC;AACH,MAAM,WAAW,GAAG,CAClB,UAAkB,EAClB,EAAkC,EAClC,QAAwC,EAC3B,EAAE,CAAC,CAAC;IACjB,YAAY,EAAE,CAAC,UAAU,EAAE,EAAE,EAAE,QAAQ,CAAC;CACzC,CAAC,CAAC;AACH,MAAM,kBAAkB,GAAG,CAAC,UAAkB,EAAE,EAAE,CAChD,WAAW,CAAC,UAAU,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;AAC7C,MAAM,aAAa,GAAG,CAAC,UAAkB,EAAE,EAAE,CAC3C,WAAW,CAAC,UAAU,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;AAC3C,MAAM,qBAAqB,GAAG,CAAC,UAAkB,EAAE,EAAE,CACnD,WAAW,CAAC,UAAU,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;AACjD,MAAM,mBAAmB,GAAG,CAAC,UAAkB,EAAE,EAAE,CACjD,WAAW,CAAC,UAAU,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAE/C,MAAM,aAAa,GAAG,CAAC,IAAgC,EAAU,EAAE,CAAC,CAAC;IACnE,UAAU,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;CACzB,CAAC,CAAC;AACH,MAAM,mBAAmB,GAAG,CAAC,IAAgC,EAAU,EAAE,CAAC,CAAC;IACzE,UAAU,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;CACzB,CAAC,CAAC;AAEH,MAAM,UAAU,GAAG,CAAC,GAAG,KAAqC,EAAU,EAAE,CAAC,CAAC;IACxE,SAAS,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;CACzB,CAAC,CAAC;AACH,MAAM,aAAa,GAAG,CAAC,GAAG,KAAqC,EAAU,EAAE,CAAC,CAAC;IAC3E,SAAS,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC;CAC7B,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAW,aAAa,CAAC,OAAO,CAAC,CAAC;AAEhD,MAAM,eAAe,GAAW;IAC9B,eAAe,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;CAC1D,CAAC;AACF,MAAM,gBAAgB,GAAG,CACvB,IAAmB,EACnB,EAAuB,EACvB,KAAqB,EACb,EAAE,CAAC,CAAC;IACZ,iBAAiB,EAAE,CAAC,IAAI,EAAE,EAAE,EAAE,KAAK,CAAC;CACrC,CAAC,CAAC;AAEH,MAAM,MAAM,GAAW,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AACvD,MAAM,OAAO,GAAW,UAAU,CAAC,OAAO,CAAC,CAAC;AAC5C,MAAM,OAAO,GAAW,UAAU,CAAC,OAAO,CAAC,CAAC;AAC5C,MAAM,UAAU,GAAW,aAAa,CAAC,OAAO,CAAC,CAAC;AAClD,MAAM,UAAU,GAAW,aAAa,CAAC,OAAO,CAAC,CAAC;AAElD,MAAM,WAAW,GAAG,CAAC,YAAoB,GAAG,EAA0B,EAAE,CAAC,CAAC;IACxE,kBAAkB,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC;CAC5C,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,IAAI,GAAG;IAClB,MAAM,EAAE,CAAC,GAAG,OAAiB,EAAsB,EAAE,CAAC,CAAC;QACrD,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC;KACxB,CAAC;CACH,CAAC;AAEF,MAAM,CAAC,MAAM,CAAC,GAAG;IACf,GAAG;IACH,EAAE;IACF,YAAY;IACZ,oBAAoB;IACpB,cAAc;IACd,eAAe;IACf,gBAAgB;IAChB,YAAY;IACZ,eAAe;IACf,WAAW;IACX,kBAAkB;IAClB,aAAa;IACb,qBAAqB;IACrB,mBAAmB;IACnB,QAAQ;IACR,eAAe;IACf,UAAU;IACV,aAAa;IACb,MAAM;IACN,OAAO;IACP,OAAO;IACP,UAAU;IACV,UAAU;IACV,WAAW;IACX,aAAa;IACb,mBAAmB;CACpB,CAAC"}
|
package/package.json
CHANGED
package/src/builder.ts
CHANGED
|
@@ -14,27 +14,31 @@ import {
|
|
|
14
14
|
TextMatchesNone,
|
|
15
15
|
} from "./schema/index.js";
|
|
16
16
|
|
|
17
|
-
const and = (...filters: Filter[]) => {
|
|
17
|
+
const and = (...filters: (Filter | null)[]): Filter => {
|
|
18
18
|
const flatFilters: Filter[] = [];
|
|
19
|
-
filters
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
19
|
+
filters
|
|
20
|
+
.filter((f) => f !== null)
|
|
21
|
+
.forEach((f) => {
|
|
22
|
+
if ("and" in f) {
|
|
23
|
+
// Automatically flatten nested ands.
|
|
24
|
+
flatFilters.push(...f.and);
|
|
25
|
+
} else {
|
|
26
|
+
flatFilters.push(f);
|
|
27
|
+
}
|
|
28
|
+
});
|
|
27
29
|
return { and: flatFilters };
|
|
28
30
|
};
|
|
29
|
-
const or = (...filters: Filter[]) => {
|
|
31
|
+
const or = (...filters: (Filter | null)[]): Filter => {
|
|
30
32
|
const flatFilters: Filter[] = [];
|
|
31
|
-
filters
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
33
|
+
filters
|
|
34
|
+
.filter((f) => f !== null)
|
|
35
|
+
.forEach((f) => {
|
|
36
|
+
if ("or" in f) {
|
|
37
|
+
flatFilters.push(...f.or);
|
|
38
|
+
} else {
|
|
39
|
+
flatFilters.push(f);
|
|
40
|
+
}
|
|
41
|
+
});
|
|
38
42
|
return { or: flatFilters };
|
|
39
43
|
};
|
|
40
44
|
|
|
@@ -129,7 +133,7 @@ const attributeCompare = (
|
|
|
129
133
|
attribute_compare: [attr, op, value],
|
|
130
134
|
});
|
|
131
135
|
|
|
132
|
-
const isPost: Filter = postTypeIsNot("reply");
|
|
136
|
+
const isPost: Filter = postTypeIsNot("reply", "quote");
|
|
133
137
|
const isReply: Filter = postTypeIs("reply");
|
|
134
138
|
const isQuote: Filter = postTypeIs("quote");
|
|
135
139
|
const isNotReply: Filter = postTypeIsNot("reply");
|