@gesslar/sassy 1.0.0 → 1.2.0

package/package.json

@@ -5,7 +5,7 @@
     "name": "gesslar",
     "url": "https://gesslar.dev"
   },
-  "version": "1.0.0",
+  "version": "1.2.0",
   "license": "Unlicense",
   "homepage": "https://github.com/gesslar/sassy#readme",
   "repository": {
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@gesslar/colours": "^0.8.0",
-    "@gesslar/toolkit": "^3.21.0",
+    "@gesslar/toolkit": "^3.29.0",
     "chokidar": "^5.0.0",
     "color-support": "^1.1.3",
     "commander": "^14.0.2",
@@ -54,13 +54,14 @@
     "yaml": "^2.8.2"
   },
   "devDependencies": {
-    "@gesslar/uglier": "^1.0.0",
+    "@gesslar/uglier": "^1.2.0",
     "eslint": "^9.39.2",
     "typescript": "^5.9.3"
   },
   "scripts": {
     "clean": "rm -rfv ./dist",
     "build": "mkdir -pv ./dist && pnpm pack --pack-destination ./dist/",
+    "types": "node -e \"require('fs').rmSync('types',{recursive:true,force:true});\" && tsc -p tsconfig.types.json",
     "exec": "node ./src/cli.js",
     "lint": "eslint src/",
     "test": "node --test tests/**/*.test.js",

package/src/BuildCommand.js

@@ -1,7 +1,7 @@
 import {EventEmitter} from "node:events"
 import process from "node:process"
 
-import {Sass, Term, Util} from "@gesslar/toolkit"
+import {Promised, Sass, Term, Util} from "@gesslar/toolkit"
 import Command from "./Command.js"
 import Session from "./Session.js"
 import Theme from "./Theme.js"
@@ -36,6 +36,18 @@ export default class BuildCommand extends Command {
     })
   }
 
+  /**
+   * Emits an event asynchronously using the internal emitter.
+   * This method wraps Util.asyncEmit for convenience.
+   *
+   * @param {string} event - The event name to emit
+   * @param {...any} args - Arguments to pass to the event handlers
+   * @returns {Promise<void>} Resolves when all event handlers have completed
+   */
+  async asyncEmit(event, ...args) {
+    return await Util.asyncEmit(this.emitter, event, ...args)
+  }
+
   /**
    * Executes the build command for the provided theme files.
    * Processes each file in parallel, optionally watching for changes.
@@ -43,13 +55,21 @@ export default class BuildCommand extends Command {
    * @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.output-dir] - Custom output directory path
-   * @param {boolean} [options.dry-run] - Print JSON to stdout without writing files
-   * @param {boolean} [options.silent] - Silent mode, only show errors or dry-run output
+  * @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
    * @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) {
@@ -64,7 +84,7 @@ export default class BuildCommand extends Command {
       this.emitter.on("printPrompt", () => this.#printPrompt())
     }
 
-    const sessionResults = await Promise.allSettled(
+    const sessionResults = await Promised.settle(
       fileNames.map(async fileName => {
         const fileObject = await this.resolveThemeFileName(fileName, cwd)
         const theme = new Theme(fileObject, cwd, options)
@@ -74,24 +94,25 @@ export default class BuildCommand extends Command {
       })
     )
 
-    if(sessionResults.some(theme => theme.status === "rejected")) {
-      const rejected = sessionResults.filter(result => result.status === "rejected")
+    if(Promised.hasRejected(sessionResults))
+      Promised.throw("Creating sessions.", sessionResults)
 
-      rejected.forEach(item => Term.error(item.reason))
-      process.exit(1)
-    }
+    // if(sessionResults.some(theme => theme.status === "rejected")) {
+    //   const rejected = sessionResults.filter(result => result.status === "rejected")
 
-    const sessions = sessionResults.map(result => result.value)
-    const firstRun = await Promise.allSettled(sessions.map(
-      async session => await session.run()))
-    const rejected = firstRun.filter(reject => reject.status === "rejected")
+    //   rejected.forEach(item => {
+    //     const sassError = Sass.new("Creating session for theme file.", item.reason)
+    //     sassError.report(options.nerd)
+    //   })
+    //   process.exit(1)
+    // }
 
-    if(rejected.length > 0) {
-      rejected.forEach(reject => Term.error(reject.reason))
+    const sessions = Promised.values(sessionResults)
+    const firstRun = await Promised.settle(sessions.map(
+      async session => await session.run()))
 
-      if(firstRun.length === rejected.length)
-        await Util.asyncEmit(this.emitter, "quit")
-    }
+    if(Promised.hasRejected(firstRun))
+      Promised.throw("Executing sessions.", firstRun)
   }
 
   /**

package/src/Colour.js

@@ -13,7 +13,12 @@ import {
   parse
 } from "culori"
 
-import {Util, Sass} from "@gesslar/toolkit"
+import {Sass, Util} from "@gesslar/toolkit"
+
+/**
+ * @import {ThemeToken} from "./ThemeToken.js"
+ */
+
 // Cache for parsed colours to improve performance
 const _colourCache = new Map()
 

package/src/Command.js

@@ -1,4 +1,10 @@
-import {Sass, FileObject} from "@gesslar/toolkit"
+import {FileSystem, Sass} from "@gesslar/toolkit"
+
+/**
+ * @import {DirectoryObject} from "@gesslar/toolkit"
+ * @import {FileObject} from "@gesslar/toolkit"
+ * @import {Cache} from "@gesslar/toolkit"
+ */
 
 /**
  * Base class for command-line interface commands.
@@ -17,11 +23,10 @@ export default class Command {
   /**
    * Creates a new Command instance.
    *
-   * @param {object} config - Configuration object
    * @param {DirectoryObject} config.cwd - Current working directory object
    * @param {object} config.packageJson - Package.json data
    */
-  constructor({cwd,packageJson}) {
+  constructor({cwd, packageJson}) {
     this.#cwd = cwd
     this.#packageJson = packageJson
   }
@@ -221,17 +226,18 @@ export default class Command {
    * Resolves a theme file name to a FileObject and validates its existence.
    *
    * @param {string} fileName - The theme file name or path
-   * @param {object} cwd - The current working directory object
+   * @param {DirectoryObject} cwd - The current working directory object
    * @returns {Promise<FileObject>} The resolved and validated FileObject
    * @throws {Sass} If the file does not exist
    */
   async resolveThemeFileName(fileName, cwd) {
-    const fileObject = new FileObject(fileName, cwd)
+    fileName = FileSystem.relativeOrAbsolutePath(cwd.path, fileName)
+
+    const fileObject = cwd.getFile(fileName)
 
     if(!await fileObject.exists)
-      throw Sass.new(`No such file 🤷: ${fileObject.path}`)
+      throw Sass.new(`No such file 🤷: ${fileObject.relativeTo(cwd)}`)
 
     return fileObject
   }
-
 }

package/src/Compiler.js

@@ -11,9 +11,14 @@
  * Supports extension points for custom phases and output formats.
  */
 
-import {Collection, Data, FileObject, Sass, Term, Util} from "@gesslar/toolkit"
+import {Collection, Data, Sass, Term, Util} from "@gesslar/toolkit"
+
 import Evaluator from "./Evaluator.js"
 
+/**
+ * @import {Theme} from "./Theme.js"
+ */
+
 /**
  * Main compiler class for processing theme source files.
  * Handles the complete compilation pipeline from source to VS Code theme output.
@@ -39,6 +44,7 @@ export default class Compiler {
       const config = this.#decomposeObject(sourceConfig)
 
       evaluate(config)
+
       const recompConfig = this.#composeObject(config)
 
       const header = {
@@ -49,12 +55,11 @@ export default class Compiler {
 
       // Let's get all of the imports!
       const imports = recompConfig.import ?? []
-      const {imported,importByFile} =
-        await this.#import(imports, theme)
+      const {imported,importByFile} = await this.#import(imports, theme)
 
-      importByFile.forEach((themeData,file) => {
-        theme.addDependency(file,themeData)
-      })
+      importByFile.forEach(
+        (themeData, file) => theme.addDependency(file,themeData)
+      )
 
       // Handle tokenColors separately - imports first, then main source
       // (append-only)
@@ -149,15 +154,18 @@ export default class Compiler {
       : imports
 
     if(!Collection.isArrayUniform(imports, "string"))
-      throw new Sass(
+      throw Sass.new(
         `All import entries must be strings. Got ${JSON.stringify(imports)}`
       )
 
     const loaded = new Map()
 
+    const themeSource = theme.getSourceFile()
+    const themeDirectory = themeSource.parent
+
     for(const importing of imports) {
       try {
-        const file = new FileObject(importing, theme.getSourceFile().directory)
+        const file = themeDirectory.getFile(importing)
 
         // Get the cached version or a new version. Who knows? I don't know.
         const {result, cost} = await Util.time(async() => {
@@ -165,10 +173,11 @@ export default class Compiler {
         })
 
         if(theme.getOptions().nerd) {
+          const cwd = theme.getCwd()
           Term.status([
             ["muted", Util.rightAlignText(`${cost.toLocaleString()}ms`, 10), ["[","]"]],
             "",
-            ["muted", `${file.toString()}`],
+            ["muted", `${file.relativeTo(cwd)}`],
             ["muted", `${theme.getName()}`,["(",")"]],
           ], theme.getOptions())
         }

package/src/LintCommand.js

@@ -23,6 +23,10 @@ import Evaluator from "./Evaluator.js"
 import Theme from "./Theme.js"
 import {Term} from "@gesslar/toolkit"
 
+/**
+ * @import {ThemePool} from "./ThemePool.js"
+ */
+
 // oops, need to have @gesslar/colours support this, too!
 // ansiColors.enabled = colorSupport.hasBasic
 

package/src/Session.js

@@ -1,6 +1,12 @@
 import chokidar from "chokidar"
+import path from "node:path"
 
-import {Sass, Term, Util} from "@gesslar/toolkit"
+import {Promised, Sass, Term, Util} from "@gesslar/toolkit"
+
+/**
+ * @import {Command} from "./Command.js"
+ * @import {Theme} from "./Theme.js"
+ */
 
 /**
  * @typedef {object} SessionOptions
@@ -19,6 +25,11 @@ import {Sass, Term, Util} from "@gesslar/toolkit"
  * @property {string} [error] - Error message when success is false
  */
 
+/**
+ * @import {Theme} from "./Theme.js"
+ * @import {Command} from "./Command.js"
+ */
+
 export default class Session {
   /**
    * The theme instance managed by this session.
@@ -170,8 +181,9 @@ export default class Session {
   async run() {
 
     this.#building = true
+
     await this.#command.asyncEmit("building")
-    this.#command.asyncEmit("recordBuildStart", this.#theme)
+    await this.#command.asyncEmit("recordBuildStart", this.#theme)
     await this.#buildPipeline()
 
     // This must come after, or you will fuck up the watching!
@@ -224,6 +236,7 @@ export default class Session {
         `${this.#theme.getName()} loaded`,
         ["info", `${bytes.toLocaleString()} bytes`, ["[","]"]]
       ], this.#options)
+
       /**
        * ****************************************************************
        * Have the theme build itself.
@@ -236,31 +249,24 @@ export default class Session {
         .map(d => d.getSourceFile())
         .filter(f => f != null) // Filter out any null/undefined files
 
-      const compileResult = await Promise
-        .allSettled(dependencyFiles.map(async fileObject => {
-          if(!fileObject) {
-            throw new Error("Invalid dependency file object")
-          }
-
-          const fileName = fileObject.toString()
-          const fileSize = await fileObject.size()
+      const cwd = this.#theme.getCwd()
+      const settled = await Promised
+        .settle(dependencyFiles.map(async fileObject => {
+          if(!fileObject)
+            throw Sass.new("Invalid dependency file object")
 
-          return [fileName, fileSize]
+          return [fileObject.relativeTo(cwd), await fileObject.size()]
         }))
 
-      const rejected = compileResult.filter(result => result.status === "rejected")
+      if(Promised.hasRejected(settled))
+        throw Sass.new("Compiling dependencies.", settled)
 
-      if(rejected.length > 0) {
-        rejected.forEach(reject => Term.error(reject.reason))
-        throw new Error("Compilation failed")
-      }
-
-      const dependencies = compileResult
+      const dependencies = Promised.values(settled)
         .slice(1)
         .map(dep => dep?.value)
         .filter(Boolean)
 
-      const totalBytes = compileResult.reduce(
+      const totalBytes = settled.reduce(
         (acc,curr) => acc + (curr?.value[1] ?? 0), 0
       )
 
@@ -271,7 +277,7 @@ export default class Session {
           ["[","]"]
         ],
         `${this.#theme.getName()} compiled`,
-        ["success", `${compileResult[0].value[1].toLocaleString()} bytes`, ["[","]"]],
+        ["success", `${settled[0].value[1].toLocaleString()} bytes`, ["[","]"]],
         ["info", `${totalBytes.toLocaleString()} total bytes`, ["(",")"]],
       ], this.#options)
 
@@ -303,7 +309,7 @@ export default class Session {
         file: outputFile,
         bytes: writeBytes
       } = writeResult.result
-      const outputFilename = outputFile.toString()
+      const outputFilename = outputFile.relativeTo(cwd)
       const status = [
         [
           "success",
@@ -327,7 +333,7 @@ export default class Session {
       Term.status(status, this.#options)
 
       // Track successful build
-      this.#command.asyncEmit("recordBuildSucceed", this.#theme)
+      await this.#command.asyncEmit("recordBuildSucceed", this.#theme)
       this.#history.push({
         timestamp: buildStart,
         loadTime: loadCost,
@@ -348,36 +354,47 @@ export default class Session {
         error: error.message
       })
 
-      Sass.new("Build process failed.", error).report(this.#options.nerd)
+      throw Sass.new("Build process failed.", error)
     } finally {
       this.#building = false
-      this.#command.asyncEmit("finishedBuilding")
+      await this.#command.asyncEmit("finishedBuilding")
     }
   }
 
   /**
    * Handles a file change event and triggers a rebuild for the theme.
    *
-   * @param {string} changed - Path to the changed file
+   * @param {string} changed - Path to the changed file (from chokidar)
    * @param {object} _stats - OS-level file stat information
    * @returns {Promise<void>}
    */
   async #handleFileChange(changed, _stats) {
+    let startedPipeline = false
+
     try {
       if(this.#building)
         return
 
       this.#building = true
-      this.#command.asyncEmit("building")
+      await this.#command.asyncEmit("building")
+
+      // Normalize the changed path from chokidar for comparison
+      const normalizedChanged = path.resolve(changed)
 
       const changedFile = Array.from(this.#theme.getDependencies()).find(
-        dep => dep.getSourceFile().path === changed
+        dep => {
+          const depPath = dep.getSourceFile().path
+          const normalizedDepPath = path.resolve(depPath)
+
+          return normalizedDepPath === normalizedChanged
+        }
       )?.getSourceFile()
 
       if(!changedFile)
         return
 
-      const fileName = changedFile.toString()
+      const cwd = this.#theme.getCwd()
+      const fileName = changedFile.relativeTo(cwd)
 
       const message = [
         ["info", "REBUILDING", ["[","]"]],
@@ -390,17 +407,24 @@ export default class Session {
       Term.status(message)
 
       await this.#resetWatcher()
+      startedPipeline = true
       await this.#buildPipeline()
+    } catch(error) {
+      const sassError = Sass.new("Handling file change.", error)
+      sassError.report(this.#options?.nerd)
+
+      if(!startedPipeline)
+        await this.#command.asyncEmit("finishedBuilding")
     } finally {
       this.#building = false
     }
   }
 
   /**
-   * Displays a formatted summary of the session's build statistics and performance.
-   * Shows total builds, success/failure counts, success rate percentage, and timing
-   * information from the most recent build. Used during session cleanup to provide
-   * final statistics to the user.
+   * Displays a formatted summary of the session's build statistics and
+   * performance. Shows total builds, success/failure counts, success rate
+   * percentage, and timing information from the most recent build. Used during
+   * session cleanup to provide final statistics to the user.
    *
    * @returns {void}
    */
@@ -448,14 +472,16 @@ export default class Session {
       return
 
     try {
-      this.#command.asyncEmit("recordBuildStart", this.#theme)
+      await this.#command.asyncEmit("recordBuildStart", this.#theme)
       this.#building = true
       await this.#resetWatcher()
-      this.#command.asyncEmit("building")
+      await this.#command.asyncEmit("building")
       await this.#buildPipeline(true)
     } catch(error) {
       await this.#command.asyncEmit("recordBuildFail", this.#theme)
-      throw Sass.new("Handling rebuild request.", error)
+      const sassError = Sass.new("Handling rebuild request.", error)
+      sassError.report(this.#options?.nerd)
+      throw sassError
     } finally {
       this.#building = false
     }
@@ -470,9 +496,15 @@ export default class Session {
     if(this.#watcher)
       await this.#watcher.close()
 
+    // Get real paths for chokidar (normalized for consistency)
     const dependencies = Array.from(this.#theme
       .getDependencies())
-      .map(d => d.getSourceFile().path)
+      .map(d => {
+        const filePath = d.getSourceFile().path
+
+        // Normalize to absolute path for chokidar
+        return path.resolve(filePath)
+      })
 
     this.#watcher = chokidar.watch(dependencies, {
       // Prevent watching own output files

package/src/Theme.js

@@ -13,10 +13,16 @@
  * - Write output files, supporting dry-run and hash-based skip
  * - Support watch mode for live theme development
  */
-import {Sass, DirectoryObject, FileObject, Term, Util} from "@gesslar/toolkit"
+import {Sass, Term, Util} from "@gesslar/toolkit"
 import Compiler from "./Compiler.js"
 import ThemePool from "./ThemePool.js"
 
+/**
+ * @import {Cache} from "@gesslar/toolkit"
+ * @import {DirectoryObject} from "@gesslar/toolkit"
+ * @import {FileObject} from "@gesslar/toolkit"
+ */
+
 const outputFileExtension = "color-theme.json"
 const obviouslyASentinelYouCantMissSoShutUpAboutIt = "kakadoodoo"
 
@@ -39,6 +45,7 @@ export default class Theme {
   #sourceFile = null
   #source = null
   #options = null
+
   /**
    * The dependencies of this theme.
    *
@@ -56,6 +63,8 @@ export default class Theme {
   #outputJson = null
   #outputFileName = null
   #outputHash = null
+  #outputFile = null
+  #outputDir = null
 
   #cwd = null
 
@@ -72,6 +81,16 @@ export default class Theme {
     this.#outputFileName = `${this.#name}.${outputFileExtension}`
     this.#options = options
     this.#cwd = cwd
+
+    // Let's create the output directory, since we're gonna needs it.
+    // If outputDir is not provided or is ".", use the cwd itself
+    const outputDir = options.outputDir && options.outputDir !== "."
+      ? cwd.getDirectory(options.outputDir)
+      : cwd
+    const outputFile = outputDir.getFile(this.#outputFileName)
+
+    this.#outputFile = outputFile
+    this.#outputDir = outputDir
   }
 
   /**
@@ -479,7 +498,7 @@ export default class Theme {
 
     if(!source[PropertyKey.CONFIG.description])
       throw Sass.new(
-        `Source file does not contain '${PropertyKey.CONFIG.description}' property: ${this.#sourceFile.path}`
+        `Source file does not contain '${PropertyKey.CONFIG.description}' property: ${this.#sourceFile.relativeTo(this.#cwd)}`
       )
 
     this.#source = source
@@ -497,7 +516,6 @@ export default class Theme {
    */
   async build() {
     const compiler = new Compiler()
-
     await compiler.compile(this)
 
     return this
@@ -512,8 +530,7 @@ export default class Theme {
    */
   async write(force=false) {
     const output = this.#outputJson
-    const outputDir = new DirectoryObject(this.#options.outputDir)
-    const file = new FileObject(this.#outputFileName, outputDir)
+    const file = this.#outputFile
 
     if(this.#options.dryRun) {
       Term.log(this.#outputJson)
@@ -533,8 +550,8 @@ export default class Theme {
     }
 
     // Real write (timed)
-    if(!await outputDir.exists)
-      await outputDir.assureExists()
+    if(!await this.#outputDir.exists)
+      await this.#outputDir.assureExists()
 
     await file.write(output)
 

package/src/cli.js

@@ -36,7 +36,7 @@ import process from "node:process"
 import url from "node:url"
 import c from "@gesslar/colours"
 
-import {Cache, Sass, DirectoryObject, FileObject, Term} from "@gesslar/toolkit"
+import {Cache, DirectoryObject, FileObject, Sass, Term} from "@gesslar/toolkit"
 import BuildCommand from "./BuildCommand.js"
 import LintCommand from "./LintCommand.js"
 import ResolveCommand from "./ResolveCommand.js"
@@ -74,9 +74,11 @@ void (async function main() {
     c.alias.set("modified-bracket", "{F165}")
     c.alias.set("muted", "{F240}")
     c.alias.set("muted-bracket", "{F244}")
+
     // Lint command
     c.alias.set("context", "{F159}")
     c.alias.set("loc", "{F148}")
+
     // Resolve command
     c.alias.set("head", "{F220}")
     c.alias.set("leaf", "{F151}")
@@ -89,11 +91,12 @@ void (async function main() {
     c.alias.set("arrow", "{F033}")
 
     const cache = new Cache()
-    const cr = new DirectoryObject(url.fileURLToPath(new url.URL("..", import.meta.url)))
-    const cwd = new DirectoryObject(process.cwd())
-    const packageJson = new FileObject("package.json", cr)
-    const pkgJsonResult = await cache.loadCachedData(packageJson)
-    const pkgJson = pkgJsonResult
+    const cwd = DirectoryObject.fromCwd()
+    const packageJson = new FileObject(
+      "package.json",
+      url.fileURLToPath(new url.URL("..", import.meta.url))
+    )
+    const pkgJson = await packageJson.loadData()
 
     // These are available to all subcommands in addition to whatever they
     // provide.
@@ -116,36 +119,13 @@ void (async function main() {
       command.addCliOptions(alwaysAvailable, false)
     }
 
-    // // Add the build subcommand
-    // const buildCommand = new BuildCommand({cwd, packageJson: pkgJson})
-
-    // buildCommand.cache = cache
-
-    // void(await buildCommand.buildCli(program))
-    //   .addCliOptions(alwaysAvailable, false)
-
-    // // Add the resolve subcommand
-    // const resolveCommand = new ResolveCommand({cwd, packageJson: pkgJson})
-
-    // resolveCommand.cache = cache
-
-    // void(await resolveCommand.buildCli(program))
-    //   .addCliOptions(alwaysAvailable, false)
-
-    // // Add the lint subcommand
-    // const lintCommand = new LintCommand({cwd, packageJson: pkgJson})
-
-    // lintCommand.cache = cache
-
-    // void(await lintCommand.buildCli(program))
-    //   .addCliOptions(alwaysAvailable, false)
-
     // Let'er rip, bitches! VROOM VROOM, motherfucker!!
     await program.parseAsync()
 
   } catch(error) {
-    Sass.new("Starting Sassy.", error)
-      .report(sassyOptions.nerd || true)
+    Sass
+      .from(error, "Starting Sassy.")
+      .report(sassyOptions.nerd ?? false)
 
     process.exit(1)
   }