shelving 1.48.0 → 1.48.1

package/package.json

@@ -11,7 +11,7 @@
 		"state-management",
 		"query-builder"
 	],
-	"version": "1.48.0",
+	"version": "1.48.1",
 	"repository": "https://github.com/dhoulb/shelving",
 	"author": "Dave Houlbrooke <dave@shax.com>",
 	"license": "0BSD",

package/query/Filters.d.ts

@@ -9,8 +9,8 @@ export declare class Filters<T extends Data> extends Rules<T, Filter<T>> impleme
     filter(props: FilterProps<T>): this;
     filter(key: "id" | "!id" | "id>" | "id>=" | "id<" | "id<=", value: string): this;
     filter(key: "id" | "!id", value: ImmutableArray<string>): this;
-    filter<K extends Key<T>>(key: K | `!${K}` | `${K}>` | `${K}>=` | `${K}<` | `${K}<=`, value: T[K]): this;
-    filter<K extends Key<T>>(key: K | `!${K}`, value: ImmutableArray<string>): this;
+    filter<K extends Key<T>>(key: `${K}` | `!${K}` | `${K}>` | `${K}>=` | `${K}<` | `${K}<=`, value: T[K]): this;
+    filter<K extends Key<T>>(key: `${K}` | `!${K}`, value: ImmutableArray<string>): this;
     filter<K extends Key<T>>(key: `${K}[]`, value: T[K] extends ImmutableArray ? ArrayType<T[K]> : never): this;
     match(entry: Entry<T>): boolean;
     transform(iterable: Entries<T>): Entries<T>;

package/query/Query.d.ts

@@ -14,8 +14,8 @@ export declare class Query<T extends Data> extends Rule<T> implements Queryable<
     filter(props: FilterProps<T>): this;
     filter(key: "id" | "!id" | "id>" | "id>=" | "id<" | "id<=", value: string): this;
     filter(key: "id" | "!id", value: ImmutableArray<string>): this;
-    filter<K extends Key<T>>(key: K | `!${K}` | `${K}>` | `${K}>=` | `${K}<` | `${K}<=`, value: T[K]): this;
-    filter<K extends Key<T>>(key: K | `!${K}`, value: ImmutableArray<T[K]>): this;
+    filter<K extends Key<T>>(key: `${K}` | `!${K}` | `${K}>` | `${K}>=` | `${K}<` | `${K}<=`, value: T[K]): this;
+    filter<K extends Key<T>>(key: `${K}` | `!${K}`, value: ImmutableArray<T[K]>): this;
     filter<K extends Key<T>>(key: `${K}[]`, value: T[K] extends ImmutableArray ? ArrayType<T[K]> : never): this;
     get unfilter(): this;
     match(entry: Entry<T>): boolean;

package/query/types.d.ts

@@ -2,7 +2,7 @@ import type { Data, Key, Matchable, Entry, Rankable, ImmutableArray, ArrayType }
 /** Possible operator references. */
 export declare type FilterOperator = "IS" | "NOT" | "IN" | "OUT" | "CONTAINS" | "LT" | "LTE" | "GT" | "GTE";
 /** Format that allows filters to be specified as a string, e.g. `!name` means `name is not` and `age>` means `age is more than` and `tags[]` means `tags array contains` */
-export declare type FilterKey<T extends Data> = "id" | "!id" | "id>" | "id>=" | "id<" | "id<=" | Key<T> | `!${Key<T>}` | `${Key<T>}[]` | `${Key<T>}<` | `${Key<T>}<=` | `${Key<T>}>` | `${Key<T>}>=`;
+export declare type FilterKey<T extends Data> = "id" | "!id" | "id>" | "id>=" | "id<" | "id<=" | Key<T> | `${Key<T>}` | `!${Key<T>}` | `${Key<T>}[]` | `${Key<T>}<` | `${Key<T>}<=` | `${Key<T>}>` | `${Key<T>}>=`;
 /** Format that allows multiple filters to be specified as a plain object. */
 export declare type FilterProps<T extends Data> = {
     "id"?: string | ImmutableArray<string>;
@@ -12,7 +12,7 @@ export declare type FilterProps<T extends Data> = {
     "id<"?: string;
     "id<="?: string;
 } & {
-    [K in Key<T> as K | `!${K}`]?: T[K] | ImmutableArray<T[K]>;
+    [K in Key<T> as `${K}` | `!${K}`]?: T[K] | ImmutableArray<T[K]>;
 } & {
     [K in Key<T> as `${K}[]`]?: T[K] extends ImmutableArray ? ArrayType<T[K]> : never;
 } & {
@@ -27,14 +27,14 @@ export interface Filterable<T extends Data> extends Matchable<Entry<T>, void> {
     filter(props: FilterProps<T>): this;
     filter(key: "id" | "!id" | "id>" | "id>=" | "id<" | "id<=", value: string): this;
     filter(key: "id" | "!id", value: ImmutableArray<string>): this;
-    filter<K extends Key<T>>(key: K | `!${K}` | `${K}>` | `${K}>=` | `${K}<` | `${K}<=`, value: T[K]): this;
-    filter<K extends Key<T>>(key: K | `!${K}`, value: ImmutableArray<string>): this;
+    filter<K extends Key<T>>(key: `${K}` | `!${K}` | `${K}>` | `${K}>=` | `${K}<` | `${K}<=`, value: T[K]): this;
+    filter<K extends Key<T>>(key: `${K}` | `!${K}`, value: ImmutableArray<string>): this;
     filter<K extends Key<T>>(key: `${K}[]`, value: T[K] extends ImmutableArray ? ArrayType<T[K]> : never): this;
     /** Match an entry against the filters specified for this object. */
     match(entry: Entry<T>): boolean;
 }
 /** Format that allows sorts to be set as a plain string, e.g. `name` sorts by name in ascending order and `!date` sorts by date in descending order. */
-export declare type SortKey<T extends Data> = "id" | "!id" | Key<T> | `!${Key<T>}`;
+export declare type SortKey<T extends Data> = "id" | "!id" | Key<T> | `${Key<T>}` | `!${Key<T>}`;
 /** One or more sort keys. */
 export declare type SortKeys<T extends Data> = SortKey<T> | ImmutableArray<SortKey<T>>;
 /** Possible operator references. */