@gesslar/sassy 1.1.0 → 1.3.0

package/package.json

@@ -5,7 +5,7 @@
     "name": "gesslar",
     "url": "https://gesslar.dev"
   },
-  "version": "1.1.0",
+  "version": "1.3.0",
   "license": "Unlicense",
   "homepage": "https://github.com/gesslar/sassy#readme",
   "repository": {
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@gesslar/colours": "^0.8.0",
-    "@gesslar/toolkit": "^3.29.0",
+    "@gesslar/toolkit": "^3.30.0",
     "chokidar": "^5.0.0",
     "color-support": "^1.1.3",
     "commander": "^14.0.2",

package/src/BuildCommand.js

@@ -48,39 +48,33 @@ export default class BuildCommand extends Command {
     return await Util.asyncEmit(this.emitter, event, ...args)
   }
 
+  /**
+   * @typedef {object} BuildCommandOptions
+   * @property {boolean} [watch] - Enable watch mode for file changes
+   * @property {string} [outputDir] - Custom output directory path
+   * @property {boolean} [dryRun] - Print JSON to stdout without writing files
+   * @property {boolean} [silent] - Silent mode, only show errors or dry-run output
+   */
+
   /**
    * Executes the build command for the provided theme files.
    * Processes each file in parallel, optionally watching for changes.
    *
-   * @param {string[]} fileNames - Array of theme file paths to process
-   * @param {object} options - Build options
-   * @param {boolean} [options.watch] - Enable watch mode for file changes
-  * @param {string} [options.outputDir] - Custom output directory path
-  * @param {boolean} [options.dryRun] - Print JSON to stdout without writing files
-  * @param {boolean} [options.silent] - Silent mode, only show errors or dry-run output
+   * @param {Array<string>} fileNames - Array of theme file paths to process
+   * @param {BuildCommandOptions} options - {@link BuildCommandOptions}
    * @returns {Promise<void>} Resolves when all files are processed
    * @throws {Error} When theme compilation fails
    */
   async execute(fileNames, options) {
-
-    /**
- * @typedef {object} BuildCommandOptions
- * @property {boolean} [watch] Enable watch mode for file changes
- * @property {string} [outputDir] Custom output directory path
- * @property {boolean} [dryRun] Print JSON to stdout without writing files
- * @property {boolean} [silent] Silent mode, only show errors or dry-run output
- */
     const cwd = this.getCwd()
 
     if(options.watch) {
       options.watch && this.#initialiseInputHandler()
 
-      this.emitter.on("quit", async() =>
-        await this.#handleQuit())
-
-      this.emitter.on("building", async() => await this.#startBuilding())
+      this.emitter.on("quit", async() => await this.#handleQuit())
+      this.emitter.on("building", () => this.#startBuilding())
       this.emitter.on("finishedBuilding", () => this.#finishBuilding())
-      this.emitter.on("erasePrompt", async() => await this.#erasePrompt())
+      this.emitter.on("erasePrompt", () => this.#erasePrompt())
       this.emitter.on("printPrompt", () => this.#printPrompt())
     }
 
@@ -97,16 +91,6 @@ export default class BuildCommand extends Command {
     if(Promised.hasRejected(sessionResults))
       Promised.throw("Creating sessions.", sessionResults)
 
-    // if(sessionResults.some(theme => theme.status === "rejected")) {
-    //   const rejected = sessionResults.filter(result => result.status === "rejected")
-
-    //   rejected.forEach(item => {
-    //     const sassError = Sass.new("Creating session for theme file.", item.reason)
-    //     sassError.report(options.nerd)
-    //   })
-    //   process.exit(1)
-    // }
-
     const sessions = Promised.values(sessionResults)
     const firstRun = await Promised.settle(sessions.map(
       async session => await session.run()))
@@ -123,7 +107,7 @@ export default class BuildCommand extends Command {
   async #handleQuit() {
     await this.asyncEmit("closeSession")
 
-    await Term.directWrite("\x1b[?25h")
+    Term.write("\x1b[?25h")
 
     Term.info()
     Term.info("Exiting.")
@@ -160,16 +144,16 @@ export default class BuildCommand extends Command {
       }
     })
 
-    await Term.directWrite("\x1b[?25l")
+    Term.write("\x1b[?25l")
   }
 
-  async #printPrompt() {
+  #printPrompt() {
     if(this.#hasPrompt && this.#building > 0)
       return
 
-    await Term.directWrite("\n")
+    Term.write("\n")
 
-    await Term.directWrite(Term.terminalMessage([
+    Term.write(Term.terminalMessage([
       ["info", "F5", ["<",">"]],
       "rebuild all,",
       ["info", "Ctrl-C", ["<",">"]],
@@ -179,17 +163,18 @@ export default class BuildCommand extends Command {
     this.#hasPrompt = true
   }
 
-  async #erasePrompt() {
+  #erasePrompt() {
     if(!this.#hasPrompt)
       return
 
     this.#hasPrompt = false
 
-    await Term.clearLines(1)
+    Term.clearLine().moveStart()
   }
 
-  async #startBuilding() {
-    await this.#erasePrompt()
+  #startBuilding() {
+    this.#erasePrompt()
+
     this.#building++
   }
 

package/src/Command.js

@@ -115,7 +115,7 @@ export default class Command {
   /**
    * Gets the array of CLI option names.
    *
-   * @returns {string[]} Array of option names
+   * @returns {Array<string>} Array of option names
    */
   getCliOptionNames() {
     return this.#optionNames
@@ -192,7 +192,7 @@ export default class Command {
    * Adds a single CLI option to the command.
    *
    * @param {string} name - The option name
-   * @param {string[]} options - Array containing option flag and description
+   * @param {Array<string>} options - Array containing option flag and description
    * @param {boolean} preserve - Whether to preserve this option name in the list
    * @returns {Promise<this>} Returns this instance for method chaining
    */

package/src/Compiler.js

@@ -222,7 +222,7 @@ export default class Compiler {
    * evaluation.
    *
    * @param {object} work - The object to decompose
-   * @param {string[]} path - Current path array for nested properties
+   * @param {Array<string>} path - Current path array for nested properties
    * @returns {Array<object>} Array of decomposed object entries with path information
    */
   #decomposeObject(work, path = []) {

package/src/Session.js

@@ -6,6 +6,7 @@ import {Promised, Sass, Term, Util} from "@gesslar/toolkit"
 /**
  * @import {Command} from "./Command.js"
  * @import {Theme} from "./Theme.js"
+ * @import {FSWatcher} from "chokidar"
  */
 
 /**
@@ -58,7 +59,7 @@ export default class Session {
   /**
    * Active file system watcher for theme dependencies.
    *
-   * @type {import("chokidar").FSWatcher|null}
+   * @type {FSWatcher}
    * @private
    */
   #watcher = null
@@ -383,7 +384,7 @@ export default class Session {
 
       const changedFile = Array.from(this.#theme.getDependencies()).find(
         dep => {
-          const depPath = dep.getSourceFile().real.path
+          const depPath = dep.getSourceFile().path
           const normalizedDepPath = path.resolve(depPath)
 
           return normalizedDepPath === normalizedChanged
@@ -500,7 +501,7 @@ export default class Session {
     const dependencies = Array.from(this.#theme
       .getDependencies())
       .map(d => {
-        const filePath = d.getSourceFile().real.path
+        const filePath = d.getSourceFile().path
 
         // Normalize to absolute path for chokidar
         return path.resolve(filePath)

package/src/cli.js

@@ -16,7 +16,7 @@
  *    sourceFile: FileObject          // entry theme file
  *    source: object                  // raw parsed data (must contain `config`)
  *    output: object                  // final theme JSON object
- *    dependencies: FileObject[]      // secondary sources discovered during compile
+ *    dependencies: Array<FileObject> // secondary sources discovered during compile
  *    lookup: object                  // variable lookup data for compilation
  *    breadcrumbs: Map                // variable resolution tracking
  *  }