@studiometa/js-toolkit 2.4.4-alpha.3 → 2.4.4-alpha.4

package/helpers/getDirectChildren.cjs

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// packages/js-toolkit/helpers/getDirectChildren.js
+// packages/js-toolkit/helpers/getDirectChildren.ts
 var getDirectChildren_exports = {};
 __export(getDirectChildren_exports, {
   getDirectChildren: () => getDirectChildren,
@@ -33,12 +33,12 @@ function getDirectChildren(parentInstance, parentName, childrenName) {
   if (!(0, import_utils.isArray)(nestedParents) || nestedParents.length <= 0) {
     return children;
   }
-  return children.filter((child) => {
-    return nestedParents.every((nestedParent) => {
+  return [...children].filter(
+    (child) => [...nestedParents].every((nestedParent) => {
       const nestedChildren = nestedParent.$children[childrenName];
       return (0, import_utils.isArray)(nestedChildren) ? !nestedChildren.includes(child) : true;
-    });
-  });
+    })
+  );
 }
 function isDirectChild(parentInstance, parentName, childrenName, childInstance) {
   return getDirectChildren(parentInstance, parentName, childrenName).includes(childInstance);

package/helpers/getDirectChildren.d.ts

@@ -1,6 +1,4 @@
-/**
- * @typedef {import('../Base/index.js').default} Base
- */
+import { Base } from '../Base/index.js';
 /**
  * Get direct children from a parent when working with nested components.
  *
@@ -10,7 +8,7 @@
  * @param   {string} childrenName
  * @returns {T[]}
  */
-export function getDirectChildren<T extends import("../Base/index.js").default<import("../Base/index.js").BaseTypeParameter>>(parentInstance: Base, parentName: string, childrenName: string): T[];
+export declare function getDirectChildren<T extends Base = Base>(parentInstance: Base, parentName: string, childrenName: string): T[];
 /**
  * Test if a component instance is a direct child from the given component.
  *
@@ -20,5 +18,4 @@ export function getDirectChildren<T extends import("../Base/index.js").default<i
  * @param   {Base}    childInstance
  * @returns {boolean}
  */
-export function isDirectChild(parentInstance: Base, parentName: string, childrenName: string, childInstance: Base): boolean;
-export type Base = import('../Base/index.js').default;
+export declare function isDirectChild(parentInstance: any, parentName: any, childrenName: any, childInstance: any): boolean;

package/helpers/getDirectChildren.js

@@ -8,12 +8,12 @@ function getDirectChildren(parentInstance, parentName, childrenName) {
   if (!isArray(nestedParents) || nestedParents.length <= 0) {
     return children;
   }
-  return children.filter((child) => {
-    return nestedParents.every((nestedParent) => {
+  return [...children].filter(
+    (child) => [...nestedParents].every((nestedParent) => {
       const nestedChildren = nestedParent.$children[childrenName];
       return isArray(nestedChildren) ? !nestedChildren.includes(child) : true;
-    });
-  });
+    })
+  );
 }
 function isDirectChild(parentInstance, parentName, childrenName, childInstance) {
   return getDirectChildren(parentInstance, parentName, childrenName).includes(childInstance);

package/helpers/getInstanceFromElement.cjs

@@ -16,17 +16,16 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// packages/js-toolkit/helpers/getInstanceFromElement.js
+// packages/js-toolkit/helpers/getInstanceFromElement.ts
 var getInstanceFromElement_exports = {};
 __export(getInstanceFromElement_exports, {
   default: () => getInstanceFromElement
 });
 module.exports = __toCommonJS(getInstanceFromElement_exports);
 function getInstanceFromElement(element, Constructor) {
-  var _a;
-  if (!element.__base__) {
+  if (!element.__base__ || !element.__base__.has(Constructor)) {
     return null;
   }
-  return (_a = element.__base__.get(Constructor)) != null ? _a : null;
+  return element.__base__.get(Constructor);
 }
 if (module.exports.default) module.exports = module.exports.default;

package/helpers/getInstanceFromElement.d.ts

@@ -1,14 +1,5 @@
-/**
- * @typedef {import('../Base/index.js').BaseConstructor} BaseConstructor
- */
+import type { BaseConstructor, BaseEl } from '../Base/index.js';
 /**
  * Get a component instance from a DOM element.
- * @template {BaseConstructor} T
- * @param    {HTMLElement & { __base__?: WeakMap<T, InstanceType<T>> }} element
- * @param    {T} Constructor
- * @returns  {null|InstanceType<T>}
  */
-export default function getInstanceFromElement<T extends typeof import("../Base/index.js").default>(element: HTMLElement & {
-    __base__?: WeakMap<T, InstanceType<T>>;
-}, Constructor: T): InstanceType<T>;
-export type BaseConstructor = import('../Base/index.js').BaseConstructor;
+export default function getInstanceFromElement<T extends BaseConstructor>(element: BaseEl, Constructor: T): InstanceType<T> | null;

package/helpers/getInstanceFromElement.js

@@ -1,9 +1,8 @@
 function getInstanceFromElement(element, Constructor) {
-  var _a;
-  if (!element.__base__) {
+  if (!element.__base__ || !element.__base__.has(Constructor)) {
     return null;
   }
-  return (_a = element.__base__.get(Constructor)) != null ? _a : null;
+  return element.__base__.get(Constructor);
 }
 export {
   getInstanceFromElement as default

package/helpers/importOnInteraction.cjs

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// packages/js-toolkit/helpers/importOnInteraction.js
+// packages/js-toolkit/helpers/importOnInteraction.ts
 var importOnInteraction_exports = {};
 __export(importOnInteraction_exports, {
   default: () => importOnInteraction

package/helpers/importOnInteraction.d.ts

@@ -1,11 +1,8 @@
-/**
- * @typedef {import('../Base/index.js').BaseConstructor} BaseConstructor
- * @typedef {import('../Base/index.js').default} Base
- */
+import type { Base, BaseConstructor } from '../Base/index.js';
 /**
  * Import a component on an interaction.
  *
- * @template {BaseConstructor} T
+ * @template {BaseConstructor} [T=BaseConstructor]
  * @param {() => Promise<T|{default:T}>} fn
  *   The import function.
  * @param {string|HTMLElement|HTMLElement[]} nameOrSelectorOrElement
@@ -14,10 +11,8 @@
  *   The events to listen to to trigger the import.
  * @param {Base} [parent]
  *   The parent component.
- * @returns {Promise<T>}
+ * @returns {Promise<InstanceType<T>>}
  */
-export default function importOnInteraction<T extends typeof import("../Base/index.js").default>(fn: () => Promise<T | {
+export default function importOnInteraction<T extends BaseConstructor = BaseConstructor>(fn: () => Promise<T | {
     default: T;
-}>, nameOrSelectorOrElement: string | HTMLElement | HTMLElement[], events: string | string[], parent?: Base): Promise<T>;
-export type BaseConstructor = import('../Base/index.js').BaseConstructor;
-export type Base = import('../Base/index.js').default;
+}>, nameOrSelectorOrElement: string | HTMLElement | HTMLElement[], events: string | string[], parent: Base): Promise<T>;

package/helpers/importWhenIdle.cjs

@@ -16,13 +16,13 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// packages/js-toolkit/helpers/importWhenIdle.js
+// packages/js-toolkit/helpers/importWhenIdle.ts
 var importWhenIdle_exports = {};
 __export(importWhenIdle_exports, {
   default: () => importWhenIdle
 });
 module.exports = __toCommonJS(importWhenIdle_exports);
-function importWhenIdle(fn, options) {
+function importWhenIdle(fn, { timeout = 1 } = {}) {
   let ResolvedClass;
   const resolver = (resolve) => {
     fn().then((module2) => {
@@ -31,8 +31,6 @@ function importWhenIdle(fn, options) {
     });
   };
   return new Promise((resolve) => {
-    var _a;
-    const timeout = (_a = options == null ? void 0 : options.timeout) != null ? _a : 1;
     if (!("requestIdleCallback" in window)) {
       setTimeout(() => {
         resolver(resolve);
@@ -44,7 +42,7 @@ function importWhenIdle(fn, options) {
             resolver(resolve);
           }, 0);
         },
-        { timeout: options == null ? void 0 : options.timeout }
+        { timeout }
       );
     }
   });

package/helpers/importWhenIdle.d.ts

@@ -1,7 +1,7 @@
-/**
- * @typedef {import('../Base/index.js').BaseConstructor} BaseConstructor
- * @typedef {{ timeout?: number }} ImportWhenIdleOptions
- */
+import type { BaseConstructor } from '../Base/index.js';
+declare type ImportWhenIdleOptions = {
+    timeout?: number;
+};
 /**
  * Import a component when user is idle.
  *
@@ -12,10 +12,7 @@
  *   The time to wait before triggering the callback if never idle.
  * @returns {Promise<T>}
  */
-export default function importWhenIdle<T extends typeof import("../Base/index.js").default>(fn: () => Promise<T | {
+export default function importWhenIdle<T extends BaseConstructor = BaseConstructor>(fn: () => Promise<T | {
     default: T;
-}>, options?: ImportWhenIdleOptions): Promise<T>;
-export type BaseConstructor = import('../Base/index.js').BaseConstructor;
-export type ImportWhenIdleOptions = {
-    timeout?: number;
-};
+}>, { timeout }?: ImportWhenIdleOptions): Promise<T>;
+export {};

package/helpers/importWhenIdle.js

@@ -1,4 +1,4 @@
-function importWhenIdle(fn, options) {
+function importWhenIdle(fn, { timeout = 1 } = {}) {
   let ResolvedClass;
   const resolver = (resolve) => {
     fn().then((module) => {
@@ -7,8 +7,6 @@ function importWhenIdle(fn, options) {
     });
   };
   return new Promise((resolve) => {
-    var _a;
-    const timeout = (_a = options == null ? void 0 : options.timeout) != null ? _a : 1;
     if (!("requestIdleCallback" in window)) {
       setTimeout(() => {
         resolver(resolve);
@@ -20,7 +18,7 @@ function importWhenIdle(fn, options) {
             resolver(resolve);
           }, 0);
         },
-        { timeout: options == null ? void 0 : options.timeout }
+        { timeout }
       );
     }
   });

package/helpers/importWhenVisible.cjs

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// packages/js-toolkit/helpers/importWhenVisible.js
+// packages/js-toolkit/helpers/importWhenVisible.ts
 var importWhenVisible_exports = {};
 __export(importWhenVisible_exports, {
   default: () => importWhenVisible

package/helpers/importWhenVisible.d.ts

@@ -1,7 +1,4 @@
-/**
- * @typedef {import('../Base/index.js').default} Base
- * @typedef {import('../Base/index.js').BaseConstructor} BaseConstructor
- */
+import type { Base, BaseConstructor } from '../Base/index.js';
 /**
  * Import a component when it is visible.
  *
@@ -16,8 +13,6 @@
  *   Options for the `IntersectionObserver` instance.
  * @returns {Promise<T>}
  */
-export default function importWhenVisible<T extends typeof import("../Base/index.js").default>(fn: () => Promise<T | {
+export default function importWhenVisible<T extends BaseConstructor = BaseConstructor>(fn: () => Promise<T | {
     default: T;
 }>, nameOrSelectorOrElement: string | HTMLElement | HTMLElement[], parent?: Base, observerOptions?: IntersectionObserverInit): Promise<T>;
-export type Base = import('../Base/index.js').default;
-export type BaseConstructor = import('../Base/index.js').BaseConstructor;

package/helpers/index.cjs

@@ -23,7 +23,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// packages/js-toolkit/helpers/index.js
+// packages/js-toolkit/helpers/index.ts
 var helpers_exports = {};
 __export(helpers_exports, {
   createApp: () => import_createApp.default,

package/helpers/index.d.ts

@@ -1,6 +1,6 @@
-export { default as createApp } from "./createApp.js";
-export * from "./getDirectChildren.js";
-export { default as getInstanceFromElement } from "./getInstanceFromElement.js";
-export { default as importOnInteraction } from "./importOnInteraction.js";
-export { default as importWhenIdle } from "./importWhenIdle.js";
-export { default as importWhenVisible } from "./importWhenVisible.js";
+export { default as createApp } from './createApp.js';
+export * from './getDirectChildren.js';
+export { default as getInstanceFromElement } from './getInstanceFromElement.js';
+export { default as importOnInteraction } from './importOnInteraction.js';
+export { default as importWhenIdle } from './importWhenIdle.js';
+export { default as importWhenVisible } from './importWhenVisible.js';

package/helpers/utils.cjs

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// packages/js-toolkit/helpers/utils.js
+// packages/js-toolkit/helpers/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
   getTargetElements: () => getTargetElements

package/helpers/utils.d.ts

@@ -7,4 +7,4 @@
  *   The optional context to use to query for elements.
  * @returns {HTMLElement[]} A normalized list of elements.
  */
-export function getTargetElements(nameOrSelectorOrElement: string | HTMLElement | HTMLElement[], context?: HTMLElement): HTMLElement[];
+export declare function getTargetElements(nameOrSelectorOrElement: string | HTMLElement | HTMLElement[], context: HTMLElement): HTMLElement[];

package/index.cjs

@@ -1,8 +1,6 @@
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,19 +15,15 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // packages/js-toolkit/index.ts
 var js_toolkit_exports = {};
 __export(js_toolkit_exports, {
-  Base: () => import_Base.default
+  Base: () => import_Base.Base
 });
 module.exports = __toCommonJS(js_toolkit_exports);
-var import_Base = __toESM(require("./Base/index.cjs"), 1);
+var import_Base = require("./Base/index.cjs");
 __reExport(js_toolkit_exports, require("./decorators/index.cjs"), module.exports);
 __reExport(js_toolkit_exports, require("./helpers/index.cjs"), module.exports);
 __reExport(js_toolkit_exports, require("./services/index.cjs"), module.exports);

package/index.d.ts

@@ -1,4 +1,4 @@
-export { default as Base } from './Base/index.js';
+export { Base } from './Base/index.js';
 export * from './decorators/index.js';
 export * from './helpers/index.js';
 export * from './services/index.js';

package/index.js

@@ -1,7 +1,7 @@
-import { default as default2 } from "./Base/index.js";
+import { Base } from "./Base/index.js";
 export * from "./decorators/index.js";
 export * from "./helpers/index.js";
 export * from "./services/index.js";
 export {
-  default2 as Base
+  Base
 };

package/package.json

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