@studiometa/js-toolkit 3.2.0 → 3.3.0

package/decorators/withGroup.d.ts

@@ -13,4 +13,4 @@ export interface WithGroupInterface extends BaseInterface {
  *
  * @link https://js-toolkit.studiometa.dev/api/decorators/withGroup.html
  */
-export declare function withGroup<S extends Base = Base>(BaseClass: typeof Base): BaseDecorator<WithGroupInterface, S, WithGroupProps>;
+export declare function withGroup<S extends Base = Base>(BaseClass: typeof Base, namespace?: string): BaseDecorator<WithGroupInterface, S, WithGroupProps>;

package/decorators/withGroup.js

@@ -1,7 +1,7 @@
 function groups() {
   return globalThis.__JS_TOOLKIT_GROUPS__ ??= /* @__PURE__ */ new Map();
 }
-function withGroup(BaseClass) {
+function withGroup(BaseClass, namespace = "") {
   return class WithGroup extends BaseClass {
     static config = {
       ...BaseClass.config,
@@ -13,8 +13,14 @@ function withGroup(BaseClass) {
      * Get the group set.
      */
     get $group() {
-      const { group } = this.$options;
-      return groups().get(group) ?? groups().set(group, /* @__PURE__ */ new Set()).get(group);
+      const group = `${namespace}${this.$options.group}`;
+      const instances = groups().get(group) ?? groups().set(group, /* @__PURE__ */ new Set()).get(group);
+      for (const instance of instances) {
+        if (!instance.$el.isConnected) {
+          instances.delete(instance);
+        }
+      }
+      return instances;
     }
     constructor(element) {
       super(element);

package/decorators/withGroup.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../packages/js-toolkit/decorators/withGroup.ts"],
-  "sourcesContent": ["import type { BaseDecorator, BaseInterface } from '../Base/types.js';\nimport type { Base, BaseProps, BaseConfig } from '../Base/index.js';\n\nexport interface WithGroupProps extends BaseProps {\n  $options: {\n    group: string;\n  };\n}\n\nexport interface WithGroupInterface extends BaseInterface {\n  get $group(): Set<Base>;\n}\n\n/**\n * Get global groups map.\n */\nfunction groups(): Map<string, Set<Base>> {\n  return (globalThis.__JS_TOOLKIT_GROUPS__ ??= new Map<string, Set<Base>>());\n}\n\n/**\n * Add group features to easily bind multiple components together.\n *\n * @link https://js-toolkit.studiometa.dev/api/decorators/withGroup.html\n */\nexport function withGroup<S extends Base = Base>(\n  BaseClass: typeof Base,\n): BaseDecorator<WithGroupInterface, S, WithGroupProps> {\n  // @ts-expect-error Decorators can not be typed.\n  return class WithGroup<T extends BaseProps = BaseProps> extends BaseClass<T & WithGroupProps> {\n    static config: BaseConfig = {\n      ...BaseClass.config,\n      options: {\n        group: String,\n      },\n    };\n\n    /**\n     * Get the group set.\n     */\n    get $group() {\n      const { group } = this.$options;\n      return groups().get(group) ?? groups().set(group, new Set()).get(group);\n    }\n\n    constructor(element: HTMLElement) {\n      super(element);\n\n      this.$on('mounted', () => {\n        this.$group.add(this);\n      });\n      this.$on('destroyed', () => {\n        this.$group.delete(this);\n      });\n    }\n  };\n}\n"],
-  "mappings": "AAgBA,SAAS,SAAiC;AACxC,SAAQ,WAAW,0BAA0B,oBAAI,IAAuB;AAC1E;AAOO,SAAS,UACd,WACsD;AAEtD,SAAO,MAAM,kBAAmD,UAA8B;AAAA,IAC5F,OAAO,SAAqB;AAAA,MAC1B,GAAG,UAAU;AAAA,MACb,SAAS;AAAA,QACP,OAAO;AAAA,MACT;AAAA,IACF;AAAA;AAAA;AAAA;AAAA,IAKA,IAAI,SAAS;AACX,YAAM,EAAE,MAAM,IAAI,KAAK;AACvB,aAAO,OAAO,EAAE,IAAI,KAAK,KAAK,OAAO,EAAE,IAAI,OAAO,oBAAI,IAAI,CAAC,EAAE,IAAI,KAAK;AAAA,IACxE;AAAA,IAEA,YAAY,SAAsB;AAChC,YAAM,OAAO;AAEb,WAAK,IAAI,WAAW,MAAM;AACxB,aAAK,OAAO,IAAI,IAAI;AAAA,MACtB,CAAC;AACD,WAAK,IAAI,aAAa,MAAM;AAC1B,aAAK,OAAO,OAAO,IAAI;AAAA,MACzB,CAAC;AAAA,IACH;AAAA,EACF;AACF;",
+  "sourcesContent": ["import type { BaseDecorator, BaseInterface } from '../Base/types.js';\nimport type { Base, BaseProps, BaseConfig } from '../Base/index.js';\n\nexport interface WithGroupProps extends BaseProps {\n  $options: {\n    group: string;\n  };\n}\n\nexport interface WithGroupInterface extends BaseInterface {\n  get $group(): Set<Base>;\n}\n\n/**\n * Get global groups map.\n */\nfunction groups<T extends Base = Base>(): Map<string, Set<T>> {\n  return (globalThis.__JS_TOOLKIT_GROUPS__ ??= new Map<string, Set<T>>());\n}\n\n/**\n * Add group features to easily bind multiple components together.\n *\n * @link https://js-toolkit.studiometa.dev/api/decorators/withGroup.html\n */\nexport function withGroup<S extends Base = Base>(\n  BaseClass: typeof Base,\n  namespace = '',\n): BaseDecorator<WithGroupInterface, S, WithGroupProps> {\n  // @ts-expect-error Decorators can not be typed.\n  return class WithGroup<T extends BaseProps = BaseProps> extends BaseClass<T & WithGroupProps> {\n    static config: BaseConfig = {\n      ...BaseClass.config,\n      options: {\n        group: String,\n      },\n    };\n\n    /**\n     * Get the group set.\n     */\n    get $group() {\n      const group = `${namespace}${this.$options.group}`;\n      const instances = groups<this>().get(group) ?? groups<this>().set(group, new Set()).get(group);\n\n      for (const instance of instances) {\n        if (!instance.$el.isConnected) {\n          instances.delete(instance);\n        }\n      }\n\n      return instances;\n    }\n\n    constructor(element: HTMLElement) {\n      super(element);\n\n      this.$on('mounted', () => {\n        this.$group.add(this);\n      });\n      this.$on('destroyed', () => {\n        this.$group.delete(this);\n      });\n    }\n  };\n}\n"],
+  "mappings": "AAgBA,SAAS,SAAqD;AAC5D,SAAQ,WAAW,0BAA0B,oBAAI,IAAoB;AACvE;AAOO,SAAS,UACd,WACA,YAAY,IAC0C;AAEtD,SAAO,MAAM,kBAAmD,UAA8B;AAAA,IAC5F,OAAO,SAAqB;AAAA,MAC1B,GAAG,UAAU;AAAA,MACb,SAAS;AAAA,QACP,OAAO;AAAA,MACT;AAAA,IACF;AAAA;AAAA;AAAA;AAAA,IAKA,IAAI,SAAS;AACX,YAAM,QAAQ,GAAG,SAAS,GAAG,KAAK,SAAS,KAAK;AAChD,YAAM,YAAY,OAAa,EAAE,IAAI,KAAK,KAAK,OAAa,EAAE,IAAI,OAAO,oBAAI,IAAI,CAAC,EAAE,IAAI,KAAK;AAE7F,iBAAW,YAAY,WAAW;AAChC,YAAI,CAAC,SAAS,IAAI,aAAa;AAC7B,oBAAU,OAAO,QAAQ;AAAA,QAC3B;AAAA,MACF;AAEA,aAAO;AAAA,IACT;AAAA,IAEA,YAAY,SAAsB;AAChC,YAAM,OAAO;AAEb,WAAK,IAAI,WAAW,MAAM;AACxB,aAAK,OAAO,IAAI,IAAI;AAAA,MACtB,CAAC;AACD,WAAK,IAAI,aAAa,MAAM;AAC1B,aAAK,OAAO,OAAO,IAAI;AAAA,MACzB,CAAC;AAAA,IACH;AAAA,EACF;AACF;",
   "names": []
 }

package/index.d.ts

@@ -1,4 +1,4 @@
-export declare const version: "3.2.0";
+export declare const version: "3.3.0";
 export * from './Base/index.js';
 export * from './Base/types.js';
 export * from './decorators/index.js';

package/index.js

@@ -1,4 +1,4 @@
-const version = "3.2.0";
+const version = "3.3.0";
 export * from "./Base/index.js";
 export * from "./Base/types.js";
 export * from "./decorators/index.js";

package/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../packages/js-toolkit/index.ts"],
-  "sourcesContent": ["export const version = '3.2.0' as const;\n\nexport * from './Base/index.js';\nexport * from './Base/types.js';\nexport * from './decorators/index.js';\nexport * from './helpers/index.js';\nexport * from './services/index.js';\n"],
+  "sourcesContent": ["export const version = '3.3.0' as const;\n\nexport * from './Base/index.js';\nexport * from './Base/types.js';\nexport * from './decorators/index.js';\nexport * from './helpers/index.js';\nexport * from './services/index.js';\n"],
   "mappings": "AAAO,MAAM,UAAU;AAEvB,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@studiometa/js-toolkit",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "description": "A set of useful little bits of JavaScript to boost your project! 🚀",
   "publishConfig": {
     "access": "public"