@gesslar/toolkit 4.0.0 → 4.1.0

package/src/node/lib/FileObject.js

@@ -4,14 +4,13 @@
  * resolution and existence checks.
  */
 
-import JSON5 from "json5"
+import {Buffer} from "node:buffer"
 import fs from "node:fs/promises"
-import YAML from "yaml"
 import {URL} from "node:url"
-import {Buffer} from "node:buffer"
 import {inspect} from "node:util"
 
-import Data from "../../browser/lib/Data.js"
+import Cache from "./Cache.js"
+import Data from "./Data.js"
 import DirectoryObject from "./DirectoryObject.js"
 import FS from "./FileSystem.js"
 import Sass from "./Sass.js"
@@ -33,19 +32,6 @@ import Valid from "./Valid.js"
  */
 
 export default class FileObject extends FS {
-  /**
-   * Configuration mapping data types to their respective parser modules for loadData method.
-   * Each parser module must have a .parse() method that accepts a string and returns parsed data.
-   *
-   * @type {{[key: string]: Array<typeof JSON5 | typeof YAML>}}
-   */
-  static dataLoaderConfig = Object.freeze({
-    json5: [JSON5],
-    json: [JSON5],
-    yaml: [YAML],
-    any: [JSON5, YAML]
-  })
-
   /**
    * @type {object}
    * @property {string|null} supplied - User-supplied path
@@ -70,6 +56,8 @@ export default class FileObject extends FS {
     real: null,
   })
 
+  #cache = null
+
   /**
    * Constructs a FileObject instance.
    *
@@ -162,6 +150,7 @@ export default class FileObject extends FS {
       extension: this.extension,
       isFile: this.isFile,
       parentPath: this.parentPath,
+      cached: this.cached
     }
   }
 
@@ -377,17 +366,74 @@ export default class FileObject extends FS {
     }
   }
 
+  /**
+   * Whether this FileObject has an active cache attached.
+   *
+   * @returns {boolean} True if a Cache instance is attached
+   */
+  get cached() {
+    return Data.isType(this.#cache, "Cache")
+  }
+
+  /**
+   * Attaches a Cache instance to this FileObject for caching read and
+   * loadData results. If no cache is provided, a new Cache is created.
+   *
+   * @param {Cache} [cache] - The Cache instance to attach
+   * @returns {FileObject} This FileObject for chaining
+   * @throws {Sass} If a cache is already attached
+   */
+  withCache(cache) {
+    Valid.type(cache, "Undefined|Cache")
+    Valid.assert(!this.#cache, "Cache already set. Remove the cache before re-assigning.")
+
+    cache ??= new Cache()
+
+    this.#cache = cache
+
+    return this
+  }
+
+  /**
+   * Removes the attached cache, clearing any cached data for this file first.
+   *
+   * @returns {FileObject} This FileObject for chaining
+   */
+  removeCache() {
+    this.resetCache()
+    this.#cache = null
+
+    return this
+  }
+
+  /**
+   * Clears cached data for this file without removing the cache itself.
+   *
+   * @returns {FileObject} This FileObject for chaining
+   */
+  resetCache() {
+    this.#cache?.resetCache(this)
+
+    return this
+  }
+
   /**
    * Reads the content of a file asynchronously.
    *
-   * @param {string} [encoding] - The encoding to read the file as.
+   * @param {object} [options] - Read options
+   * @param {string} [options.encoding="utf8"] - The encoding to read the file as
+   * @param {boolean} [options.skipCache=false] - If true, bypass the cache
    * @returns {Promise<string>} The file contents
    */
-  async read(encoding="utf8") {
+  async read({encoding="utf8", skipCache=false} = {}) {
     const filePath = this.path
 
+    if(this.#cache && skipCache === false)
+      return await this.#cache.loadFromCache(
+        this, {encoding})
+
     if(!(await this.exists))
-      throw Sass.new(`No such file '${filePath}'`)
+      throw Sass.new(`No such file '${this}'`)
 
     return await fs.readFile(filePath, encoding)
   }
@@ -419,7 +465,7 @@ export default class FileObject extends FS {
    *
    * @param {string} content - The content to write
    * @param {string} [encoding] - The encoding in which to write (default: "utf8")
-   * @returns {Promise<void>}
+   * @returns {Promise<undefined>}
    * @throws {Sass} If the file URL is invalid or the parent directory doesn't exist
    * @example
    * const file = new FileObject('./output/data.json')
@@ -444,7 +490,7 @@ export default class FileObject extends FS {
    * Supports ArrayBuffer, TypedArrays (Uint8Array, etc.), Blob, and Node Buffer types.
    *
    * @param {ArrayBuffer|Blob|Buffer} data - The binary data to write
-   * @returns {Promise<void>}
+   * @returns {Promise<undefined>}
    * @throws {Sass} If the file URL is invalid
    * @throws {Sass} If the parent directory doesn't exist
    * @throws {Sass} If the data is not a valid binary type
@@ -471,44 +517,34 @@ export default class FileObject extends FS {
   }
 
   /**
-   * Loads an object from JSON or YAML file.
-   * Attempts to parse content as JSON5 first, then falls back to YAML if specified.
+   * Loads an object from JSON or YAML file. Attempts to parse content as JSON5
+   * first, then falls back to YAML if specified.
    *
-   * @param {string} [type] - The expected type of data to parse ("json", "json5", "yaml", or "any")
-   * @param {string} [encoding] - The encoding to read the file as (default: "utf8")
+   * @param {object} [options] - Load options
+   * @param {string} [options.type="any"] - The expected type of data to parse ("json", "json5", "yaml", or "any")
+   * @param {string} [options.encoding="utf8"] - The encoding to read the file as
+   * @param {boolean} [options.skipCache=false] - If true, bypass the cache
    * @returns {Promise<unknown>} The parsed data object
    * @throws {Sass} If the content cannot be parsed or type is unsupported
    * @example
    * const configFile = new FileObject('./config.json5')
-   * const config = await configFile.loadData('json5')
+   * const config = await configFile.loadData({type: 'json5'})
    *
    * // Auto-detect format
-   * const data = await configFile.loadData('any')
-   */
-  async loadData(type="any", encoding="utf8") {
-    const content = await this.read(encoding)
-    const normalizedType = type.toLowerCase()
-    const toTry = {
-      json5: [JSON5],
-      json: [JSON5],
-      yaml: [YAML],
-      any: [JSON5,YAML]
-    }[normalizedType]
-
-    if(!toTry)
-      throw Sass.new(`Unsupported data type '${type}'. Supported types: json, json5, yaml.`)
-
-    for(const format of toTry) {
-      try {
-        const result = format.parse(content)
-
-        return result
-      } catch {
-        // nothing to see here
-      }
-    }
+   * const data = await configFile.loadData()
+   */
+  async loadData({type="any", encoding="utf8", skipCache=false} = {}) {
+    if(this.#cache && skipCache === false)
+      return await this.#cache.loadDataFromCache(
+        this, {encoding, type})
+
+    if(!(await this.exists))
+      throw Sass.new(`No such file '${this}'`)
+
+    const content = await this.read({encoding, skipCache})
+    const result = Data.textAsData(content, type)
 
-    throw Sass.new(`Content is neither valid JSON5 nor valid YAML:\n'${this.path}'`)
+    return result
   }
 
   /**
@@ -610,7 +646,7 @@ export default class FileObject extends FS {
   /**
    * Deletes the file from the filesystem.
    *
-   * @returns {Promise<void>} Resolves when file is deleted
+   * @returns {Promise<undefined>} Resolves when file is deleted
    * @throws {Sass} If the file URL is invalid
    * @throws {Sass} If the file does not exist
    * @example

package/src/node/lib/FileSystem.js

@@ -11,12 +11,14 @@
 import path from "node:path"
 import url from "node:url"
 
+import Collection from "../../browser/lib/Collection.js"
 import Data from "../../browser/lib/Data.js"
+import Glog from "./Glog.js"
 import Valid from "./Valid.js"
-import Collection from "../../browser/lib/Collection.js"
+import Watcher from "./Watcher.js"
 
 /**
- * @import {Sass} from "./Sass.js"
+ * @import Sass from "./Sass.js"
  */
 
 const fdTypes = Object.freeze(["file", "directory"])
@@ -33,6 +35,8 @@ export default class FileSystem {
   static upperFdTypes = upperFdTypes
   static fdType = fdType
 
+  #watcher = null
+
   /**
    * Compute the relative path from another file or directory to this instance.
    *
@@ -53,6 +57,47 @@ export default class FileSystem {
     return FileSystem.relativeOrAbsolute(fileOrDirectoryObject, this)
   }
 
+  /**
+   * Watch this file or directory for changes.
+   *
+   * @param {object} [options] - Watch options
+   * @param {Function} [options.onChange] - Callback invoked on change
+   * @param {number} [options.debounceMs] - Debounce interval in milliseconds
+   * @param {boolean} [options.persistent] - Keep the process alive while watching
+   * @returns {Promise<undefined>}
+   */
+  async watch(options={}) {
+    Valid.type(options, "Object")
+
+    const localOptions = Collection.cloneObject(options)
+
+    const {onChange} = localOptions ?? {}
+    Valid.type(onChange, "Undefined|Function")
+
+    delete localOptions.onChange
+
+    this.stopWatching()
+
+    this.#watcher = new Watcher()
+
+    await this.#watcher.watch(this, Object.assign({},
+      localOptions,
+      {
+        onChange: onChange ?? (() => {
+          Glog(`${this} changed somehow.`)
+        })
+      }
+    ))
+  }
+
+  /**
+   * Stop watching this file or directory for changes.
+   */
+  stopWatching() {
+    this.#watcher?.stopWatching()
+    this.#watcher = null
+  }
+
   /**
    * Fix slashes in a path
    *

package/src/node/lib/Font.js

@@ -11,7 +11,7 @@ import DirectoryObject from "./DirectoryObject.js"
 import FS from "./FileSystem.js"
 
 /**
- * @import {FileObject} from "./FileObject.js"
+ * @import FileObject from "./FileObject.js"
  */
 
 const execFile = promisify(child_process.execFile)

package/src/node/lib/Notify.js

@@ -31,7 +31,7 @@ export class Notify {
    *
    * @param {string} type - Event name to dispatch.
    * @param {unknown} [payload] - Data to send with the event.
-   * @returns {void}
+   * @returns {undefined}
    */
   emit(type, payload=undefined) {
     Valid.type(type, "String", {allowEmpty: false})
@@ -46,7 +46,7 @@ export class Notify {
    *
    * @param {string} type - Event name to dispatch.
    * @param {unknown} [payload] - Data to send with the event.
-   * @returns {Promise<void>} Resolves when all listeners have completed.
+   * @returns {Promise<undefined>} Resolves when all listeners have completed.
    */
   async asyncEmit(type, payload) {
     Valid.type(type, "String", {allowEmpty: false})
@@ -74,10 +74,10 @@ export class Notify {
    * Registers a listener for the given event type.
    *
    * @param {string} type - Event name to listen for.
-   * @param {(payload: unknown) => void} handler - Listener callback.
+   * @param {(payload: unknown) => undefined} handler - Listener callback.
    * @param {EventEmitter} [emitter] - The EventEmitter to attach to. Default is internal emitter.
    * @param {NotifyEventOptions} [options] - Options for the listener.
-   * @returns {() => void} Dispose function to unregister the handler.
+   * @returns {() => undefined} Dispose function to unregister the handler.
    */
   on(type, handler, emitter=this.#emitter, options=undefined) {
     Valid.type(type, "String", {allowEmpty: false})
@@ -96,9 +96,9 @@ export class Notify {
    * Removes a previously registered listener for the given event type.
    *
    * @param {string} type - Event name to remove.
-   * @param {(payload: unknown) => void} handler - Listener callback to detach.
+   * @param {(payload: unknown) => undefined} handler - Listener callback to detach.
    * @param {EventEmitter} [emitter] - The EventEmitter from which to remove. Default is internal emitter.
-   * @returns {void}
+   * @returns {undefined}
    */
   off(type, handler, emitter=this.#emitter) {
     Valid.type(type, "String", {allowEmpty: false})

package/src/node/lib/Term.js

@@ -230,7 +230,7 @@ export default class Term {
    * @param {string | Array<string | [string, string]>} args - Message or segments.
    * @param {object} [options] - Behaviour flags.
    * @param {boolean} options.silent - When true, suppress output.
-   * @returns {void}
+   * @returns {undefined}
    */
   static status(args, {silent=false} = {}) {
     if(silent)

package/src/node/lib/Util.js

@@ -65,7 +65,7 @@ export default class Util extends BrowserUtil {
    * @param {object} emitter - The emitter object (already validated)
    * @param {string} event - The event name to emit
    * @param {...unknown} args - Arguments to pass to event listeners
-   * @returns {Promise<void>} Resolves when all listeners have completed
+   * @returns {Promise<undefined>} Resolves when all listeners have completed
    */
   static async #performAsyncEmit(emitter, event, ...args) {
     const listeners = emitter.listeners(event)
@@ -97,7 +97,7 @@ export default class Util extends BrowserUtil {
    * @param {EventEmitter} emitter - The EventEmitter instance to emit on
    * @param {string} event - The event name to emit
    * @param {...unknown} args - Arguments to pass to event listeners
-   * @returns {Promise<void>} Resolves when all listeners have completed
+   * @returns {Promise<undefined>} Resolves when all listeners have completed
    */
   static async asyncEmit(emitter, event, ...args) {
     try {
@@ -124,7 +124,7 @@ export default class Util extends BrowserUtil {
    * @param {object} emitter - Any object with EventEmitter-like interface
    * @param {string} event - The event name to emit
    * @param {...unknown} args - Arguments to pass to event listeners
-   * @returns {Promise<void>} Resolves when all listeners have completed, but no grapes.
+   * @returns {Promise<undefined>} Resolves when all listeners have completed, but no grapes.
    */
   static async asyncEmitQuack(emitter, event, ...args) {
     try {

package/src/node/lib/Watcher.js

@@ -0,0 +1,118 @@
+import {watch} from "node:fs/promises"
+import Valid from "./Valid.js"
+import Data from "./Data.js"
+import Time from "../../browser/lib/Time.js"
+
+/**
+ * @import FileObject from "./FileObject.js"
+ * @import DirectoryObject from "./DirectoryObject.js"
+ */
+
+export const OverFlowBehaviour = Object.freeze({
+  IGNORE: "ignore",
+  THROW: "throw",
+})
+
+export default class Watcher {
+  #abortController
+  #state = new Map()
+
+  /**
+   * Watch one or more file/directory targets for changes, invoking a callback
+   * with debounce protection.
+   *
+   * @param {FileObject|DirectoryObject|Array.<(FileObject|DirectoryObject)>} targets - The target(s) to watch
+   * @param {object} options - Watch options
+   * @param {(target: FileObject|DirectoryObject) => void} options.onChange - Callback invoked on change
+   * @param {number} [options.debounceMs=50] - Debounce interval in milliseconds
+   * @param {boolean} [options.persistent=true] - Keep the process alive while watching
+   * @param {boolean} [options.recursive=false] - Watch subdirectories (directories only)
+   * @param {string} [options.overflow="ignore"] - Overflow behaviour ("ignore" or "throw")
+   * @returns {Promise<undefined>}
+   */
+  async watch(targets, {
+    onChange,
+    debounceMs=50,
+    persistent=true,
+    recursive=false,
+    overflow=OverFlowBehaviour.IGNORE
+  } = {}) {
+    Valid.type(targets, "FileObject|DirectoryObject|(FileObject|DirectoryObject)[]")
+    Valid.type(onChange, "Function")
+    Valid.type(debounceMs, "Number")
+    Valid.type(persistent, "Boolean")
+    Valid.type(recursive, "Undefined|Boolean")
+    Valid.type(overflow, "String")
+    Valid.assert(Object.values(OverFlowBehaviour).includes(overflow), `Overflow must be one of "ignore" or "throw".`)
+
+    if(!Data.isType(targets, "Array")) {
+      targets = [targets]
+    }
+
+    this.#abortController = new AbortController()
+
+    for(const target of targets) {
+      const watcher = watch(target.url, {
+        recursive: target.isDirectory ? recursive : false,
+        persistent,
+        signal: this.#abortController.signal,
+        overflow
+      })
+
+      this.#state.set(target, {busy: false, pending: false})
+
+      ;(async() => {
+        try {
+          for await(const _ of watcher) {
+            const state = this.#state.get(target)
+
+            if(!state) {
+              return
+            }
+
+            if(state.busy) {
+              state.pending = true
+              continue
+            }
+
+            state.pending = false
+            state.busy = true
+
+            while(true) {
+              await Time.after(debounceMs)
+
+              if(state.pending) {
+                state.pending = false
+                continue
+              }
+
+              break
+            }
+
+            try {
+              await onChange(target)
+            } catch(callbackErr) {
+              console.error("Watcher onChange callback error:", callbackErr)
+            }
+            state.busy = false
+          }
+        } catch(err) {
+          if(err.name === "AbortError") {
+            return
+          }
+
+          console.error("Watcher error:", err)
+        }
+      })()
+    }
+  }
+
+  /**
+   * Stop watching all targets.
+   */
+  stopWatching() {
+    this.#state.clear()
+    this.#abortController?.abort()
+    this.#abortController = null
+  }
+}

package/types/browser/lib/Data.d.ts

@@ -106,15 +106,9 @@ export default class Data {
      * defining the type of a value and whether an array is expected.
      *
      * @param {string} string - The string to parse into a type spec.
-     * @param {TypeSpecOptions} [options] - Additional options for parsing.
-     * @returns {Array<object>} An array of type specs.
+     * @returns {TypeSpec} A new TypeSpec instance.
      */
-    static newTypeSpec(string: string, options?: {
-        /**
-         * - The delimiter for union types
-         */
-        delimiter?: string;
-    }): Array<object>;
+    static newTypeSpec(string: string): TypeSpec;
     /**
      * Checks if a value is of a specified type
      *

package/types/browser/lib/Data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Data.d.ts","sourceRoot":"","sources":["../../../src/browser/lib/Data.js"],"names":[],"mappings":"AAUA;IACA;;;;;OAKG;IACD,mBAFQ,KAAK,CAAC,MAAM,CAAC,CAgBnB;IAEF;;;;;OAKG;IACH,qBAFU,KAAK,CAAC,MAAM,CAAC,CAmBrB;IAEF;;;;;;;OAOG;IACH,kBAFU,KAAK,CAAC,MAAM,CAAC,CAKrB;IAEF;;;;;OAKG;IACH,uBAFU,KAAK,CAAC,MAAM,CAAC,CAE2D;IAElF;;;;;;OAMG;IACH,sBAJW,MAAM,UACN,MAAM,GACJ,MAAM,CAMlB;IAED;;;;;;OAMG;IACH,uBAJW,MAAM,WACN,MAAM,GACJ,MAAM,CAMlB;IAED;;;;;;;;;;;OAWG;IACH,yBATW,MAAM,UACN,MAAM,oBACN,OAAO,GACL,MAAM,CAWlB;IAED;;;;;;;;;;;OAWG;IACH,wBATW,MAAM,UACN,MAAM,oBACN,OAAO,GACL,MAAM,CAWlB;IAED;;;;;;;OAOG;IACH,yBALW,MAAM,UACN,MAAM,oBACN,OAAO,GACL,MAAM,CAWlB;IAED;;;;;;;OAOG;IACH,0BALW,MAAM,UACN,MAAM,oBACN,OAAO,GACL,MAAM,CAYlB;IAED;;;;;OAKG;IAEH;;;;;OAKG;IAEH;;;;;;;OAOG;IACH,2BAJW,MAAM;;;;oBAdH,MAAM;QAgBP,KAAK,CAAC,MAAM,CAAC,CAIzB;IAED;;;;;;;OAOG;IACH,qBALW,OAAO,QACP,MAAM,GAAC,QAAQ;;;;qBAnBZ,OAAO;QAqBR,OAAO,CAQnB;IAED;;;;;OAKG;IACH,yBAHW,MAAM,GACJ,OAAO,CASnB;IAED;;;;;;;;OAQG;IACH,yBAJW,OAAO,QACP,MAAM,GACJ,OAAO,CAenB;IAED;;;;;;OAMG;IACH,qBAHW,OAAO,GACL,MAAM,CAoBlB;IAED;;;;;OAKG;IACH,wBAHW,OAAO,GACL,OAAO,CAInB;IAED;;;;;;;;OAQG;IACH,sBALW,OAAO,oBACP,OAAO,GAEL,OAAO,CA8BnB;IAED;;;;;OAKG;IACH,6BAHW,MAAM,GACJ,MAAM,CAmBlB;IAED;;;;;;;OAOG;IACH,6BAJW,MAAM,QACN,KAAK,CAAC,MAAM,CAAC,GACX,MAAM,CAiBlB;IAED;;;;;;;OAOG;IACH,2BAJW,MAAM,QACN,KAAK,CAAC,MAAM,CAAC,SACb,OAAO,QAMjB;IAED;;;;;OAKG;IACH,+BAHc,MAAM,EAAA,GACP,MAAM,CAqBlB;IAED;;;;;;;OAOG;IACH,wBAJW,KAAK,CAAC,OAAO,CAAC,aACd,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,GAClC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAMnC;IAED;;;;;;;OAOG;IACH,kBALW,MAAM,OACN,MAAM,OACN,MAAM,GACJ,MAAM,CAIlB;IAED;;;;;;;OAOG;IACH,oBALW,MAAM,OACN,MAAM,OACN,MAAM,GACJ,OAAO,CAInB;IAED;;;;;;;;;;;;;;;;;;;OAmBG;IACH,4BAbW,OAAO,GACL,OAAO,CA+BnB;IAED;;;;;;;;;;;;;;;OAeG;IACH,uBAXW,OAAO,GACL,OAAO,CAgBnB;CACF;qBA5gBoB,eAAe"}
+{"version":3,"file":"Data.d.ts","sourceRoot":"","sources":["../../../src/browser/lib/Data.js"],"names":[],"mappings":"AAUA;IACA;;;;;OAKG;IACD,mBAFQ,KAAK,CAAC,MAAM,CAAC,CAgBnB;IAEF;;;;;OAKG;IACH,qBAFU,KAAK,CAAC,MAAM,CAAC,CAmBrB;IAEF;;;;;;;OAOG;IACH,kBAFU,KAAK,CAAC,MAAM,CAAC,CAKrB;IAEF;;;;;OAKG;IACH,uBAFU,KAAK,CAAC,MAAM,CAAC,CAE2D;IAElF;;;;;;OAMG;IACH,sBAJW,MAAM,UACN,MAAM,GACJ,MAAM,CAMlB;IAED;;;;;;OAMG;IACH,uBAJW,MAAM,WACN,MAAM,GACJ,MAAM,CAMlB;IAED;;;;;;;;;;;OAWG;IACH,yBATW,MAAM,UACN,MAAM,oBACN,OAAO,GACL,MAAM,CAWlB;IAED;;;;;;;;;;;OAWG;IACH,wBATW,MAAM,UACN,MAAM,oBACN,OAAO,GACL,MAAM,CAWlB;IAED;;;;;;;OAOG;IACH,yBALW,MAAM,UACN,MAAM,oBACN,OAAO,GACL,MAAM,CAWlB;IAED;;;;;;;OAOG;IACH,0BALW,MAAM,UACN,MAAM,oBACN,OAAO,GACL,MAAM,CAYlB;IAED;;;;;OAKG;IAEH;;;;;OAKG;IAEH;;;;;;OAMG;IACH,2BAHW,MAAM,GACJ,QAAQ,CAIpB;IAED;;;;;;;OAOG;IACH,qBALW,OAAO,QACP,MAAM,GAAC,QAAQ;;;;qBAlBZ,OAAO;QAoBR,OAAO,CAQnB;IAED;;;;;OAKG;IACH,yBAHW,MAAM,GACJ,OAAO,CASnB;IAED;;;;;;;;OAQG;IACH,yBAJW,OAAO,QACP,MAAM,GACJ,OAAO,CAenB;IAED;;;;;;OAMG;IACH,qBAHW,OAAO,GACL,MAAM,CAoBlB;IAED;;;;;OAKG;IACH,wBAHW,OAAO,GACL,OAAO,CAInB;IAED;;;;;;;;OAQG;IACH,sBALW,OAAO,oBACP,OAAO,GAEL,OAAO,CA8BnB;IAED;;;;;OAKG;IACH,6BAHW,MAAM,GACJ,MAAM,CAmBlB;IAED;;;;;;;OAOG;IACH,6BAJW,MAAM,QACN,KAAK,CAAC,MAAM,CAAC,GACX,MAAM,CAiBlB;IAED;;;;;;;OAOG;IACH,2BAJW,MAAM,QACN,KAAK,CAAC,MAAM,CAAC,SACb,OAAO,QAMjB;IAED;;;;;OAKG;IACH,+BAHc,MAAM,EAAA,GACP,MAAM,CAqBlB;IAED;;;;;;;OAOG;IACH,wBAJW,KAAK,CAAC,OAAO,CAAC,aACd,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,GAClC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAMnC;IAED;;;;;;;OAOG;IACH,kBALW,MAAM,OACN,MAAM,OACN,MAAM,GACJ,MAAM,CAIlB;IAED;;;;;;;OAOG;IACH,oBALW,MAAM,OACN,MAAM,OACN,MAAM,GACJ,OAAO,CAInB;IAED;;;;;;;;;;;;;;;;;;;OAmBG;IACH,4BAbW,OAAO,GACL,OAAO,CA+BnB;IAED;;;;;;;;;;;;;;;OAeG;IACH,uBAXW,OAAO,GACL,OAAO,CAgBnB;CAEF;qBA5gBoB,eAAe"}

package/types/browser/lib/TypeSpec.d.ts

@@ -1,15 +1,3 @@
-/**
- * Options for creating a new TypeSpec.
- *
- * @typedef {object} TypeSpecOptions
- * @property {string} [delimiter="|"] - The delimiter for union types
- */
-/**
- * Options for type validation methods.
- *
- * @typedef {object} TypeValidationOptions
- * @property {boolean} [allowEmpty=true] - Whether empty values are allowed
- */
 /**
  * Type specification class for parsing and validating complex type definitions.
  * Supports union types, array types, and validation options.
@@ -19,9 +7,8 @@ export default class TypeSpec {
      * Creates a new TypeSpec instance.
      *
      * @param {string} string - The type specification string (e.g., "string|number", "object[]")
-     * @param {TypeSpecOptions} [options] - Additional parsing options
      */
-    constructor(string: string, options?: TypeSpecOptions);
+    constructor(string: string);
     specs: any[];
     length: number;
     stringRepresentation: string;
@@ -91,36 +78,34 @@ export default class TypeSpec {
      * Handles array types, union types, and empty value validation.
      *
      * @param {unknown} value - The value to test against the type specifications
-     * @param {TypeValidationOptions} [options] - Validation options
+     * @param {TypeMatchOptions} [options] - Validation options
      * @returns {boolean} True if the value matches any type specification
      */
-    matches(value: unknown, options?: TypeValidationOptions): boolean;
+    matches(value: unknown, options?: {
+        /**
+         * - Permit a spec of {@link Data.emptyableTypes} to be empty
+         */
+        allowEmpty?: boolean;
+    }): boolean;
+    /**
+     * Options that can be passed to {@link TypeSpec.match}
+     *
+     * @typedef {object} TypeMatchOptions
+     * @property {boolean} [allowEmpty=true] - Permit a spec of {@link Data.emptyableTypes} to be empty
+     */
     /**
      * Returns matching type specifications for a value.
      *
      * @param {unknown} value - The value to test against the type specifications
-     * @param {TypeValidationOptions} [options] - Validation options
+     * @param {TypeMatchOptions} [options] - Validation options
      * @returns {Array<object>} Array of matching type specifications
      */
-    match(value: unknown, options?: TypeValidationOptions): Array<object>;
+    match(value: unknown, { allowEmpty, }?: {
+        /**
+         * - Permit a spec of {@link Data.emptyableTypes} to be empty
+         */
+        allowEmpty?: boolean;
+    }): Array<object>;
     #private;
 }
-/**
- * Options for creating a new TypeSpec.
- */
-export type TypeSpecOptions = {
-    /**
-     * - The delimiter for union types
-     */
-    delimiter?: string;
-};
-/**
- * Options for type validation methods.
- */
-export type TypeValidationOptions = {
-    /**
-     * - Whether empty values are allowed
-     */
-    allowEmpty?: boolean;
-};
 //# sourceMappingURL=TypeSpec.d.ts.map

package/types/browser/lib/TypeSpec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TypeSpec.d.ts","sourceRoot":"","sources":["../../../src/browser/lib/TypeSpec.js"],"names":[],"mappings":"AAWA;;;;;GAKG;AAEH;;;;;GAKG;AAEH;;;GAGG;AACH;IAGE;;;;;OAKG;IACH,oBAHW,MAAM,YACN,eAAe,EAUzB;IAJC,aAAwB;IACxB,eAAgC;IAChC,6BAA2C;IAI7C;;;;OAIG;IACH,YAFa,MAAM,CAQlB;IAED;;;;OAIG;IACH,UAFa,OAAO,CASnB;IAED;;;;OAIG;IACH,kBAFW,CAAS,IAAO,EAAP,OAAO,KAAG,IAAI,QAIjC;IAED;;;;;OAKG;IACH,gBAHW,CAAS,IAAO,EAAP,OAAO,KAAG,OAAO,GACxB,OAAO,CAInB;IAED;;;;;OAKG;IACH,eAHW,CAAS,IAAO,EAAP,OAAO,KAAG,OAAO,GACxB,OAAO,CAInB;IAED;;;;;OAKG;IACH,iBAHW,CAAS,IAAO,EAAP,OAAO,KAAG,OAAO,GACxB,KAAK,CAAC,OAAO,CAAC,CAI1B;IAED;;;;;OAKG;IACH,cAHW,CAAS,IAAO,EAAP,OAAO,KAAG,OAAO,GACxB,KAAK,CAAC,OAAO,CAAC,CAI1B;IAED;;;;;;OAMG;IACH,iBAJW,CAAS,IAAO,EAAP,OAAO,EAAE,IAAO,EAAP,OAAO,KAAG,OAAO,gBACnC,OAAO,GACL,OAAO,CAInB;IAED;;;;;OAKG;IACH,eAHW,CAAS,IAAO,EAAP,OAAO,KAAG,OAAO,GACxB,MAAM,GAAC,SAAS,CAI5B;IAED;;;;;;;OAOG;IACH,eAJW,OAAO,YACP,qBAAqB,GACnB,OAAO,CAInB;IAED;;;;;;OAMG;IACH,aAJW,OAAO,YACP,qBAAqB,GACnB,KAAK,CAAC,MAAM,CAAC,CA+DzB;;CAkDF;;;;;;;;gBApQa,MAAM;;;;;;;;;iBAON,OAAO"}
+{"version":3,"file":"TypeSpec.d.ts","sourceRoot":"","sources":["../../../src/browser/lib/TypeSpec.js"],"names":[],"mappings":"AAWA;;;GAGG;AACH;IAGE;;;;OAIG;IACH,oBAFW,MAAM,EAUhB;IAJC,aAAwB;IACxB,eAAgC;IAChC,6BAA2C;IAI7C;;;;OAIG;IACH,YAFa,MAAM,CAkBlB;IAED;;;;OAIG;IACH,UAFa,OAAO,CASnB;IAED;;;;OAIG;IACH,kBAFW,CAAS,IAAO,EAAP,OAAO,KAAG,IAAI,QAIjC;IAED;;;;;OAKG;IACH,gBAHW,CAAS,IAAO,EAAP,OAAO,KAAG,OAAO,GACxB,OAAO,CAInB;IAED;;;;;OAKG;IACH,eAHW,CAAS,IAAO,EAAP,OAAO,KAAG,OAAO,GACxB,OAAO,CAInB;IAED;;;;;OAKG;IACH,iBAHW,CAAS,IAAO,EAAP,OAAO,KAAG,OAAO,GACxB,KAAK,CAAC,OAAO,CAAC,CAI1B;IAED;;;;;OAKG;IACH,cAHW,CAAS,IAAO,EAAP,OAAO,KAAG,OAAO,GACxB,KAAK,CAAC,OAAO,CAAC,CAI1B;IAED;;;;;;OAMG;IACH,iBAJW,CAAS,IAAO,EAAP,OAAO,EAAE,IAAO,EAAP,OAAO,KAAG,OAAO,gBACnC,OAAO,GACL,OAAO,CAInB;IAED;;;;;OAKG;IACH,eAHW,CAAS,IAAO,EAAP,OAAO,KAAG,OAAO,GACxB,MAAM,GAAC,SAAS,CAI5B;IAED;;;;;;;OAOG;IACH,eAJW,OAAO;;;;qBAYJ,OAAO;QAVR,OAAO,CAInB;IAED;;;;;OAKG;IAEH;;;;;;OAMG;IACH,aAJW,OAAO;;;;qBANJ,OAAO;QAQR,KAAK,CAAC,MAAM,CAAC,CAsGzB;;CAqFF"}

package/types/node/index.d.ts

@@ -1,5 +1,5 @@
 export { default as Collection } from "../browser/lib/Collection.js";
-export { default as Data } from "../browser/lib/Data.js";
+export { default as Data } from "./lib/Data.js";
 export { default as Promised } from "../browser/lib/Promised.js";
 export { default as Time } from "../browser/lib/Time.js";
 export { default as Type } from "../browser/lib/TypeSpec.js";
@@ -16,4 +16,5 @@ export { default as Glog } from "./lib/Glog.js";
 export { default as Term } from "./lib/Term.js";
 export { default as Disposer, Disposer as DisposerClass } from "../browser/lib/Disposer.js";
 export { default as Notify, Notify as NotifyClass } from "./lib/Notify.js";
+export { default as Watcher, OverFlowBehaviour } from "./lib/Watcher.js";
 //# sourceMappingURL=index.d.ts.map