@chocbite/ts-lib-state 1.1.3 → 1.1.5

package/dist/index.d.ts

@@ -262,14 +262,12 @@ type EnumHelperEntry = {
 type StateEnumHelperList<K extends PropertyKey> = {
     [P in K]: EnumHelperEntry;
 };
-interface StateEnumRelated<L extends StateEnumHelperList<any> = StateEnumHelperList<any>> extends StateRelatedBase {
+interface StateEnumRelated<L extends StateEnumHelperList<PropertyKey> = StateEnumHelperList<PropertyKey>> extends StateRelatedBase {
     list: State<L>;
-    map<K extends keyof L, R>(func: (key: K, val: EnumHelperEntry) => R): Promise<R[]>;
 }
-declare class StateEnumHelper<L extends StateEnumHelperList<any>, K extends PropertyKey = keyof L, R extends StateRelatedBase = StateEnumRelated<L>> extends StateHelper<K, OptionSome<R>> implements StateEnumRelated<L> {
+declare class StateEnumHelper<L extends StateEnumHelperList<PropertyKey> = StateEnumHelperList<PropertyKey>, K extends PropertyKey = keyof L, R extends StateRelatedBase = StateEnumRelated<L>> extends StateHelper<K, OptionSome<R>> implements StateEnumRelated<L> {
     readonly list: State<L>;
     constructor(list: State<L>, writable?: State<boolean>);
-    map<K extends keyof L, R>(func: (key: K, val: EnumHelperEntry) => R): Promise<R[]>;
     limit(value: K): Promise<Result<K, string>>;
     check(value: K): Promise<Result<K, string>>;
     related(): OptionSome<R>;
@@ -1152,12 +1150,31 @@ declare const state: {
                     description?: string;
                     icon?: _chocbite_ts_lib_svg.SVGFunc;
                 };
+                [x: number]: {
+                    name: string;
+                    description?: string;
+                    icon?: _chocbite_ts_lib_svg.SVGFunc;
+                };
+                [x: symbol]: {
+                    name: string;
+                    description?: string;
+                    icon?: _chocbite_ts_lib_svg.SVGFunc;
+                };
             }, K extends PropertyKey = keyof L, R extends StateRelatedBase = StateEnumRelated<L>>(list: State<L>, writable?: State<boolean>): StateEnumHelper<L, K, R>;
             list<K extends PropertyKey>(list: { [P in K]: {
                 name: string;
                 description?: string;
                 icon?: _chocbite_ts_lib_svg.SVGFunc;
             }; }): typeof list;
+            map<K extends PropertyKey, R>(list: { [P in K]: {
+                name: string;
+                description?: string;
+                icon?: _chocbite_ts_lib_svg.SVGFunc;
+            }; }, func: (key: K, val: {
+                name: string;
+                description?: string;
+                icon?: _chocbite_ts_lib_svg.SVGFunc;
+            }) => R): R[];
         };
         await_value: <T>(value: T, state: State<T>, timeout?: number) => Promise<boolean>;
         compare: (state1: State<any>, state2: State<any>) => Promise<boolean>;

package/dist/index.js

@@ -1576,13 +1576,6 @@ var StateEnumHelper = class extends StateHelper {
     super(writable);
     this.list = list;
   }
-  async map(func) {
-    const list = await this.list;
-    if (list.err) return [];
-    return Object.keys(list.value).map(
-      (key) => func(key, list.value[key])
-    );
-  }
   async limit(value) {
     return ok5(value);
   }
@@ -1604,6 +1597,13 @@ var enums = {
   /**Creates an enum description list, passing the enum as a generic type to this function makes things look a bit nicer */
   list(list) {
     return list;
+  },
+  /**Maps over an enum description list
+   * @param list enum description list
+   * @param func function to apply to each entry
+   * @returns array of results*/
+  map(list, func) {
+    return Object.keys(list).map((key) => func(key, list[key]));
   }
 };
 async function await_value(value, state2, timeout = 500) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chocbite/ts-lib-state",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "State management library for TypeScript",
   "author": "chocolateandmilkwin",
   "license": "MIT",