@kubb/core 1.1.10 → 1.1.11

package/dist/index.cjs

@@ -42,13 +42,13 @@ async function write(data, path) {
 }
 
 // src/utils/cache.ts
-function createPluginCache(cache) {
+function createPluginCache(Store) {
   return {
-    delete(id) {
-      return delete cache[id];
+    set(id, value) {
+      Store[id] = [0, value];
     },
     get(id) {
-      const item = cache[id];
+      const item = Store[id];
       if (!item) {
         return null;
       }
@@ -56,15 +56,15 @@ function createPluginCache(cache) {
       return item[1];
     },
     has(id) {
-      const item = cache[id];
+      const item = Store[id];
       if (!item) {
         return false;
       }
       item[0] = 0;
       return true;
     },
-    set(id, value) {
-      cache[id] = [0, value];
+    delete(id) {
+      return delete Store[id];
     }
   };
 }
@@ -413,6 +413,33 @@ function getStackTrace(belowFn) {
 // src/utils/uniqueId.ts
 var uniqueId = ((counter) => (str = "") => `${str}${++counter}`)(0);
 
+// src/utils/throttle.ts
+var throttle = (fn, delay) => {
+  let wait = false;
+  let timeout2;
+  let cancelled = false;
+  return [
+    (...args) => {
+      if (cancelled) {
+        return void 0;
+      }
+      if (wait) {
+        return void 0;
+      }
+      const val = fn(...args);
+      wait = true;
+      timeout2 = setTimeout(() => {
+        wait = false;
+      }, delay);
+      return val;
+    },
+    () => {
+      cancelled = true;
+      clearTimeout(timeout2);
+    }
+  ];
+};
+
 // src/managers/fileManager/FileManager.ts
 var FileManager = class {
   cache = /* @__PURE__ */ new Map();
@@ -559,8 +586,8 @@ function combineFiles(files) {
       const prev = acc[prevIndex];
       acc[prevIndex] = {
         ...curr,
-        source: `${prev.source}
-${curr.source}`,
+        source: prev.source && curr.source ? `${prev.source}
+${curr.source}` : "'",
         imports: [...prev.imports || [], ...curr.imports || []],
         exports: [...prev.exports || [], ...curr.exports || []]
       };
@@ -662,7 +689,7 @@ var definePlugin = createPlugin((options) => {
         }
         return 0;
       });
-      const pluginName = plugins?.[0].name;
+      const pluginName = plugins?.[0]?.name;
       return Promise.all(
         files.map((file) => {
           const fileWithMeta = {
@@ -742,7 +769,7 @@ var PluginManager = class {
   executer;
   executed = [];
   constructor(config, options) {
-    this.onExecute = options.onExecute;
+    this.onExecute = options.onExecute?.bind(this);
     this.queue = new Queue(10);
     this.fileManager = new FileManager({ task: options.task, queue: this.queue });
     this.core = definePlugin({
@@ -899,6 +926,7 @@ var PluginManager = class {
     const results = await Promise.allSettled(parallelPromises);
     const errors = results.filter((result) => result.status === "rejected").map((result) => result.reason);
     if (errors.length) {
+      console.log(errors);
       throw new ParallelPluginError("Error", { errors, pluginManager: this });
     }
     return results.filter((result) => result.status === "fulfilled").map((result) => result.value);
@@ -957,7 +985,7 @@ var PluginManager = class {
     return pluginByPluginName;
   }
   addExecuter(executer) {
-    this.onExecute?.call(this, executer);
+    this.onExecute?.call(this, executer, this);
     if (executer) {
       this.executed.push(executer);
     }
@@ -1127,10 +1155,9 @@ async function build(options) {
     if (!executer) {
       return;
     }
-    const { strategy, hookName, plugin } = executer;
-    if (config.logLevel === "info" && logger?.spinner) {
-      logger.spinner.text = `[${strategy}] ${hookName}: Excecuting task for plugin ${plugin.name} 
-`;
+    const { hookName, plugin } = executer;
+    if (config.logLevel === "info" && logger) {
+      logger.log(null, { logLevel: config.logLevel, params: { hookName, pluginName: plugin.name } });
     }
   };
   const pluginManager = new PluginManager(config, { task: queueTask, onExecute });
@@ -1205,6 +1232,7 @@ exports.nameSorter = nameSorter;
 exports.objectToParameters = objectToParameters;
 exports.read = read;
 exports.renderTemplate = renderTemplate;
+exports.throttle = throttle;
 exports.timeout = timeout;
 exports.transformReservedWord = transformReservedWord;
 exports.uniqueId = uniqueId;

package/dist/index.d.ts

@@ -5,13 +5,13 @@ declare function isPromise<T>(result: MaybePromise<T>): result is Promise<T>;
 
 declare function write(data: string, path: string): Promise<void>;
 
-interface Cache<T extends object = object> {
-    delete(id: keyof T): boolean;
-    get(id: keyof T): T[keyof T] | null;
-    has(id: keyof T): boolean;
-    set(id: keyof T, value: unknown): void;
+interface Cache<TStore extends object = object> {
+    delete(id: keyof TStore): boolean;
+    get(id: keyof TStore): TStore[keyof TStore] | null;
+    has(id: keyof TStore): boolean;
+    set(id: keyof TStore, value: unknown): void;
 }
-declare function createPluginCache<T extends Record<string, [number, unknown]>>(cache: T): Cache<T>;
+declare function createPluginCache<TStore extends Record<string, [number, unknown]>>(Store: TStore): Cache<TStore>;
 
 declare function getRelativePath(rootDir?: string | null, filePath?: string | null, platform?: 'windows' | 'mac' | 'linux'): string;
 type PathMode = 'file' | 'directory';
@@ -43,7 +43,7 @@ declare function getUniqueName(originalName: string, data: Record<string, number
 declare function timeout(ms: number): Promise<unknown>;
 
 type QueueTask<T = unknown> = {
-    (...args: unknown[]): Promise<T>;
+    (...args: unknown[]): Promise<T> | Promise<void>;
 };
 declare class Queue {
     private readonly queue;
@@ -80,6 +80,8 @@ declare function getStackTrace(belowFn?: Function): NodeJS.CallSite[];
 
 declare const uniqueId: (str?: string) => string;
 
+declare const throttle: <R, A extends any[]>(fn: (...args: A) => R, delay: number) => [(...args: A) => R | undefined, () => void];
+
 type Import = {
     name: string | string[];
     path: string;
@@ -126,7 +128,7 @@ declare class FileManager {
     private queue?;
     constructor(options?: {
         queue: Queue;
-        task?: QueueTask<unknown>;
+        task?: QueueTask<File>;
     });
     private getCache;
     getCacheByPath(path: string | undefined): CacheStore | undefined;
@@ -156,7 +158,7 @@ type Executer<H extends PluginLifecycleHooks = PluginLifecycleHooks> = {
     hookName: H;
     plugin: KubbPlugin;
 };
-type OnExecute<H extends PluginLifecycleHooks = PluginLifecycleHooks> = (this: PluginManager, executer: Executer<H> | undefined) => void;
+type OnExecute<H extends PluginLifecycleHooks = PluginLifecycleHooks> = (this: PluginManager, executer: Executer<H> | undefined, pluginManager: PluginManager) => void;
 type ParseResult<H extends PluginLifecycleHooks> = PluginLifecycle[H];
 type SafeParseResult<H extends PluginLifecycleHooks, Result = ReturnType<ParseResult<H>>> = {
     result: Result;
@@ -165,7 +167,7 @@ type SafeParseResult<H extends PluginLifecycleHooks, Result = ReturnType<ParseRe
 
 declare const hooks: [keyof PluginLifecycle<PluginFactoryOptions<unknown, false, any, Record<string, any>>>];
 type Options$1 = {
-    task: QueueTask;
+    task: QueueTask<File>;
     onExecute?: OnExecute<PluginLifecycleHooks>;
 };
 declare class PluginManager {
@@ -507,8 +509,11 @@ type OptionalPath = Path | null | undefined;
 type FileName = string | null | undefined;
 type LogLevel = 'error' | 'info' | 'silent';
 
-type Logger = {
-    log: (message: string, logLevel: LogLevel) => void;
+type Logger<TParams = Record<string, any>> = {
+    log: (message: string | null, options: {
+        logLevel: LogLevel;
+        params?: TParams;
+    }) => void;
     spinner?: Ora;
 };
 type BuildOptions = {
@@ -555,4 +560,4 @@ declare abstract class SchemaGenerator<TOptions extends object, TInput, TOutput>
     abstract build(schema: TInput, name: string, description?: string): TOutput;
 }
 
-export { Argument0, BuildOutput, CLIOptions, Cache, CacheStore, CorePluginOptions, Executer, File, FileManager, FileName, Generator, KubbConfig, KubbJSONPlugin, KubbObjectPlugin, KubbPlugin, KubbPluginKind, KubbUserConfig, LogLevel, Logger, MaybePromise, OnExecute, OptionalPath, ParallelPluginError, ParseResult, Path, PathMode, PluginContext, PluginError, PluginFactoryOptions, PluginLifecycle, PluginLifecycleHooks, PluginManager, Queue, QueueTask, Register, ResolveNameParams, ResolvePathParams, SafeParseResult, SchemaGenerator, Status, Strategy, TransformResult, TreeNode, TreeNodeOptions, UUID, ValidationPluginError, build, clean, combineFiles, createJSDocBlockText, createPlugin, createPluginCache, build as default, defineConfig, getEncodedText, getFileSource, getPathMode, getRelativePath, getStackTrace, getUniqueName, hooks, isPromise, isURL, name, nameSorter, objectToParameters, read, renderTemplate, timeout, transformReservedWord, uniqueId, validatePlugins, write, writeIndexes };
+export { Argument0, BuildOutput, CLIOptions, Cache, CacheStore, CorePluginOptions, Executer, File, FileManager, FileName, Generator, KubbConfig, KubbJSONPlugin, KubbObjectPlugin, KubbPlugin, KubbPluginKind, KubbUserConfig, LogLevel, Logger, MaybePromise, OnExecute, OptionalPath, ParallelPluginError, ParseResult, Path, PathMode, PluginContext, PluginError, PluginFactoryOptions, PluginLifecycle, PluginLifecycleHooks, PluginManager, Queue, QueueTask, Register, ResolveNameParams, ResolvePathParams, SafeParseResult, SchemaGenerator, Status, Strategy, TransformResult, TreeNode, TreeNodeOptions, UUID, ValidationPluginError, build, clean, combineFiles, createJSDocBlockText, createPlugin, createPluginCache, build as default, defineConfig, getEncodedText, getFileSource, getPathMode, getRelativePath, getStackTrace, getUniqueName, hooks, isPromise, isURL, name, nameSorter, objectToParameters, read, renderTemplate, throttle, timeout, transformReservedWord, uniqueId, validatePlugins, write, writeIndexes };

package/dist/index.js

@@ -32,13 +32,13 @@ async function write(data, path) {
 }
 
 // src/utils/cache.ts
-function createPluginCache(cache) {
+function createPluginCache(Store) {
   return {
-    delete(id) {
-      return delete cache[id];
+    set(id, value) {
+      Store[id] = [0, value];
     },
     get(id) {
-      const item = cache[id];
+      const item = Store[id];
       if (!item) {
         return null;
       }
@@ -46,15 +46,15 @@ function createPluginCache(cache) {
       return item[1];
     },
     has(id) {
-      const item = cache[id];
+      const item = Store[id];
       if (!item) {
         return false;
       }
       item[0] = 0;
       return true;
     },
-    set(id, value) {
-      cache[id] = [0, value];
+    delete(id) {
+      return delete Store[id];
     }
   };
 }
@@ -403,6 +403,33 @@ function getStackTrace(belowFn) {
 // src/utils/uniqueId.ts
 var uniqueId = ((counter) => (str = "") => `${str}${++counter}`)(0);
 
+// src/utils/throttle.ts
+var throttle = (fn, delay) => {
+  let wait = false;
+  let timeout2;
+  let cancelled = false;
+  return [
+    (...args) => {
+      if (cancelled) {
+        return void 0;
+      }
+      if (wait) {
+        return void 0;
+      }
+      const val = fn(...args);
+      wait = true;
+      timeout2 = setTimeout(() => {
+        wait = false;
+      }, delay);
+      return val;
+    },
+    () => {
+      cancelled = true;
+      clearTimeout(timeout2);
+    }
+  ];
+};
+
 // src/managers/fileManager/FileManager.ts
 var FileManager = class {
   cache = /* @__PURE__ */ new Map();
@@ -549,8 +576,8 @@ function combineFiles(files) {
       const prev = acc[prevIndex];
       acc[prevIndex] = {
         ...curr,
-        source: `${prev.source}
-${curr.source}`,
+        source: prev.source && curr.source ? `${prev.source}
+${curr.source}` : "'",
         imports: [...prev.imports || [], ...curr.imports || []],
         exports: [...prev.exports || [], ...curr.exports || []]
       };
@@ -652,7 +679,7 @@ var definePlugin = createPlugin((options) => {
         }
         return 0;
       });
-      const pluginName = plugins?.[0].name;
+      const pluginName = plugins?.[0]?.name;
       return Promise.all(
         files.map((file) => {
           const fileWithMeta = {
@@ -732,7 +759,7 @@ var PluginManager = class {
   executer;
   executed = [];
   constructor(config, options) {
-    this.onExecute = options.onExecute;
+    this.onExecute = options.onExecute?.bind(this);
     this.queue = new Queue(10);
     this.fileManager = new FileManager({ task: options.task, queue: this.queue });
     this.core = definePlugin({
@@ -889,6 +916,7 @@ var PluginManager = class {
     const results = await Promise.allSettled(parallelPromises);
     const errors = results.filter((result) => result.status === "rejected").map((result) => result.reason);
     if (errors.length) {
+      console.log(errors);
       throw new ParallelPluginError("Error", { errors, pluginManager: this });
     }
     return results.filter((result) => result.status === "fulfilled").map((result) => result.value);
@@ -947,7 +975,7 @@ var PluginManager = class {
     return pluginByPluginName;
   }
   addExecuter(executer) {
-    this.onExecute?.call(this, executer);
+    this.onExecute?.call(this, executer, this);
     if (executer) {
       this.executed.push(executer);
     }
@@ -1117,10 +1145,9 @@ async function build(options) {
     if (!executer) {
       return;
     }
-    const { strategy, hookName, plugin } = executer;
-    if (config.logLevel === "info" && logger?.spinner) {
-      logger.spinner.text = `[${strategy}] ${hookName}: Excecuting task for plugin ${plugin.name} 
-`;
+    const { hookName, plugin } = executer;
+    if (config.logLevel === "info" && logger) {
+      logger.log(null, { logLevel: config.logLevel, params: { hookName, pluginName: plugin.name } });
     }
   };
   const pluginManager = new PluginManager(config, { task: queueTask, onExecute });
@@ -1164,4 +1191,4 @@ var SchemaGenerator = class extends Generator {
 // src/index.ts
 var src_default = build;
 
-export { FileManager, Generator, ParallelPluginError, PluginError, PluginManager, Queue, SchemaGenerator, TreeNode, ValidationPluginError, build, clean, combineFiles, createJSDocBlockText, createPlugin, createPluginCache, src_default as default, defineConfig, getEncodedText, getFileSource, getPathMode, getRelativePath, getStackTrace, getUniqueName, hooks, isPromise, isURL, name, nameSorter, objectToParameters, read, renderTemplate, timeout, transformReservedWord, uniqueId, validatePlugins, write, writeIndexes };
+export { FileManager, Generator, ParallelPluginError, PluginError, PluginManager, Queue, SchemaGenerator, TreeNode, ValidationPluginError, build, clean, combineFiles, createJSDocBlockText, createPlugin, createPluginCache, src_default as default, defineConfig, getEncodedText, getFileSource, getPathMode, getRelativePath, getStackTrace, getUniqueName, hooks, isPromise, isURL, name, nameSorter, objectToParameters, read, renderTemplate, throttle, timeout, transformReservedWord, uniqueId, validatePlugins, write, writeIndexes };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/core",
-  "version": "1.1.10",
+  "version": "1.1.11",
   "description": "Generator core",
   "keywords": [
     "typescript",
@@ -45,7 +45,7 @@
     "graceful-fs": "^4.2.11",
     "fs-extra": "^11.1.1",
     "rimraf": "^5.0.1",
-    "@kubb/ts-codegen": "1.1.10"
+    "@kubb/ts-codegen": "1.1.11"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.1",

package/src/build.ts

@@ -9,8 +9,8 @@ import type { OnExecute } from './managers/pluginManager/index.ts'
 import type { BuildOutput, KubbPlugin, LogLevel, PluginContext, TransformResult } from './types.ts'
 import type { QueueTask } from './utils/index.ts'
 
-export type Logger = {
-  log: (message: string, logLevel: LogLevel) => void
+export type Logger<TParams = Record<string, any>> = {
+  log: (message: string | null, options: { logLevel: LogLevel; params?: TParams }) => void
   spinner?: Ora
 }
 type BuildOptions = {
@@ -80,14 +80,14 @@ export async function build(options: BuildOptions): Promise<BuildOutput> {
       return
     }
 
-    const { strategy, hookName, plugin } = executer
+    const { hookName, plugin } = executer
 
-    if (config.logLevel === 'info' && logger?.spinner) {
-      logger.spinner.text = `[${strategy}] ${hookName}: Excecuting task for plugin ${plugin.name} \n`
+    if (config.logLevel === 'info' && logger) {
+      logger.log(null, { logLevel: config.logLevel, params: { hookName, pluginName: plugin.name } })
     }
   }
 
-  const pluginManager = new PluginManager(config, { task: queueTask as QueueTask, onExecute })
+  const pluginManager = new PluginManager(config, { task: queueTask as QueueTask<File>, onExecute })
   const { plugins, fileManager } = pluginManager
 
   await pluginManager.hookParallel<'validate', true>({

package/src/managers/fileManager/FileManager.ts

@@ -8,11 +8,11 @@ import type { CacheStore, File, Status, UUID } from './types.ts'
 export class FileManager {
   private cache: Map<CacheStore['id'], CacheStore> = new Map()
 
-  private task?: QueueTask<unknown>
+  private task?: QueueTask<File>
 
   private queue?: Queue
 
-  constructor(options?: { queue: Queue; task?: QueueTask<unknown> }) {
+  constructor(options?: { queue: Queue; task?: QueueTask<File> }) {
     if (options) {
       this.task = options.task
       this.queue = options.queue
@@ -53,7 +53,7 @@ export class FileManager {
   }
 
   async add(file: File) {
-    const cacheItem = { id: crypto.randomUUID(), file, status: 'new' as Status }
+    const cacheItem: CacheStore = { id: crypto.randomUUID(), file, status: 'new' as Status }
 
     this.cache.set(cacheItem.id, cacheItem)
 

package/src/managers/fileManager/utils.ts

@@ -82,7 +82,7 @@ export function combineFiles(files: Array<File | null>): File[] {
       const prev = acc[prevIndex]
       acc[prevIndex] = {
         ...curr,
-        source: `${prev.source}\n${curr.source}`,
+        source: prev.source && curr.source ? `${prev.source}\n${curr.source}` : "'",
         imports: [...(prev.imports || []), ...(curr.imports || [])],
         exports: [...(prev.exports || []), ...(curr.exports || [])],
       }

package/src/managers/pluginManager/PluginManager.ts

@@ -4,6 +4,7 @@ import { definePlugin } from '../../plugin.ts'
 import { isPromise } from '../../utils/isPromise.ts'
 import { Queue } from '../../utils/Queue.ts'
 import { FileManager } from '../fileManager/FileManager.ts'
+import type { File } from '../fileManager/types.ts'
 import { ParallelPluginError } from './ParallelPluginError.ts'
 import { PluginError } from './PluginError.ts'
 
@@ -29,7 +30,7 @@ const hookNames: {
 }
 export const hooks = Object.keys(hookNames) as [PluginLifecycleHooks]
 
-type Options = { task: QueueTask; onExecute?: OnExecute<PluginLifecycleHooks> }
+type Options = { task: QueueTask<File>; onExecute?: OnExecute<PluginLifecycleHooks> }
 
 export class PluginManager {
   public plugins: KubbPlugin[]
@@ -47,7 +48,7 @@ export class PluginManager {
   public executed: Executer[] = []
 
   constructor(config: KubbConfig, options: Options) {
-    this.onExecute = options.onExecute
+    this.onExecute = options.onExecute?.bind(this)
     this.queue = new Queue(10)
 
     this.fileManager = new FileManager({ task: options.task, queue: this.queue })
@@ -257,6 +258,7 @@ export class PluginManager {
     const errors = results.filter((result) => result.status === 'rejected').map((result) => (result as PromiseRejectedResult).reason) as PluginError[]
 
     if (errors.length) {
+      console.log(errors)
       throw new ParallelPluginError('Error', { errors, pluginManager: this })
     }
 
@@ -332,7 +334,7 @@ export class PluginManager {
   }
 
   private addExecuter(executer: Executer | undefined) {
-    this.onExecute?.call(this, executer)
+    this.onExecute?.call(this, executer, this)
 
     if (executer) {
       this.executed.push(executer)

package/src/managers/pluginManager/types.ts

@@ -15,7 +15,11 @@ export type Executer<H extends PluginLifecycleHooks = PluginLifecycleHooks> = {
   plugin: KubbPlugin
 }
 
-export type OnExecute<H extends PluginLifecycleHooks = PluginLifecycleHooks> = (this: PluginManager, executer: Executer<H> | undefined) => void
+export type OnExecute<H extends PluginLifecycleHooks = PluginLifecycleHooks> = (
+  this: PluginManager,
+  executer: Executer<H> | undefined,
+  pluginManager: PluginManager
+) => void
 
 export type ParseResult<H extends PluginLifecycleHooks> = PluginLifecycle[H]
 

package/src/plugin.ts

@@ -64,7 +64,8 @@ export const definePlugin = createPlugin<CorePluginOptions>((options) => {
           }
           return 0
         })
-      const pluginName = plugins?.[0].name
+
+      const pluginName = plugins?.[0]?.name
 
       return Promise.all(
         files.map((file) => {

package/src/utils/Queue.ts

@@ -1,5 +1,5 @@
 export type QueueTask<T = unknown> = {
-  (...args: unknown[]): Promise<T>
+  (...args: unknown[]): Promise<T> | Promise<void>
 }
 
 interface QueueItem {

package/src/utils/cache.ts

@@ -1,33 +1,33 @@
-export interface Cache<T extends object = object> {
-  delete(id: keyof T): boolean
-  get(id: keyof T): T[keyof T] | null
-  has(id: keyof T): boolean
-  set(id: keyof T, value: unknown): void
+export interface Cache<TStore extends object = object> {
+  delete(id: keyof TStore): boolean
+  get(id: keyof TStore): TStore[keyof TStore] | null
+  has(id: keyof TStore): boolean
+  set(id: keyof TStore, value: unknown): void
 }
 
-export function createPluginCache<T extends Record<string, [number, unknown]>>(cache: T): Cache<T> {
+export function createPluginCache<TStore extends Record<string, [number, unknown]>>(Store: TStore): Cache<TStore> {
   return {
-    delete(id: keyof T) {
-      return delete cache[id]
+    set(id, value): void {
+      Store[id] = [0, value] as TStore[keyof TStore]
     },
-    get(id) {
-      const item = cache[id]
+    get(id): TStore[keyof TStore] | null {
+      const item = Store[id]
       if (!item) {
         return null
       }
       item[0] = 0
-      return item[1] as T[keyof T]
+      return item[1] as TStore[keyof TStore]
     },
-    has(id) {
-      const item = cache[id]
+    has(id): boolean {
+      const item = Store[id]
       if (!item) {
         return false
       }
       item[0] = 0
       return true
     },
-    set(id, value) {
-      cache[id] = [0, value] as T[keyof T]
+    delete(id: keyof TStore): boolean {
+      return delete Store[id]
     },
   }
 }

package/src/utils/index.ts

@@ -16,3 +16,4 @@ export * from './TreeNode.ts'
 export * from './transformReservedWord.ts'
 export * from './getStackTrace.ts'
 export * from './uniqueId.ts'
+export * from './throttle.ts'

package/src/utils/throttle.ts

@@ -0,0 +1,30 @@
+export const throttle = <R, A extends any[]>(fn: (...args: A) => R, delay: number): [(...args: A) => R | undefined, () => void] => {
+  let wait = false
+  let timeout: NodeJS.Timeout
+  let cancelled = false
+
+  return [
+    (...args: A) => {
+      if (cancelled) {
+        return undefined
+      }
+      if (wait) {
+        return undefined
+      }
+
+      const val = fn(...args)
+
+      wait = true
+
+      timeout = setTimeout(() => {
+        wait = false
+      }, delay)
+
+      return val
+    },
+    () => {
+      cancelled = true
+      clearTimeout(timeout)
+    },
+  ]
+}