@gesslar/sassy 0.21.0 → 0.21.3

package/src/ResolveCommand.js

@@ -2,13 +2,10 @@ import c from "@gesslar/colours"
 // import colorSupport from "color-support"
 
 import Command from "./Command.js"
-import Sass from "./Sass.js"
+import {Sass, Term, Util, Data} from "@gesslar/toolkit"
 import Colour from "./Colour.js"
 import Evaluator from "./Evaluator.js"
-import Term from "./Term.js"
 import Theme from "./Theme.js"
-import Util from "./Util.js"
-import Data from "./Data.js"
 
 // ansiColors.enabled = colorSupport.hasBasic
 
@@ -87,6 +84,14 @@ export default class ResolveCommand extends Command {
    * @param {object} theme - The compiled theme object with pool
    * @param {string} colorName - The color key to resolve
    * @returns {void}
+   * @example
+   * // Resolve a color variable from a compiled theme
+   * await resolveCommand.resolveColor(theme, 'colors.primary');
+   * // Output:
+   * // colors.primary:
+   * //   $(vars.accent)
+   * //     → #3366cc
+   * // Resolution: #3366cc
    */
   async resolveColor(theme, colorName) {
     const pool = theme.getPool()
@@ -243,6 +248,7 @@ export default class ResolveCommand extends Command {
 
     // Temporarily replace tokenColors with semanticTokenColors for resolution
     const themeOutput = theme.getOutput()
+
     if(themeOutput?.semanticTokenColors) {
       themeOutput.tokenColors = themeOutput.semanticTokenColors
     }
@@ -426,7 +432,12 @@ export default class ResolveCommand extends Command {
     }
 
     if(this.#func.test(value)) {
-      const {func,args} = this.#func.exec(value).groups
+      const result = Evaluator.extractFunctionCall(value)
+
+      if(!result)
+        return [c`{leaf}${value}{/}`, "literal"]
+
+      const {func, args} = result
 
       return [
         c`{func}${func}{/}{parens}${"("}{/}{leaf}${args}{/}{parens}${")"}{/}`,
@@ -435,9 +446,9 @@ export default class ResolveCommand extends Command {
     }
 
     if(this.#sub.test(value)) {
+      const varValue = Evaluator.extractVariableName(value) || value
       const {parens,none,braces} = Evaluator.sub.exec(value)?.groups || {}
       const style = (braces && ["{","}"]) || (parens && ["(",")"]) || (none && ["",""])
-      const varValue = braces || parens || none || value
 
       return [
         c`{func}{/}{parens}${style[0]}{/}{leaf}${varValue}{/}{parens}${style[1]}{/}`,

package/src/Session.js

@@ -1,11 +1,8 @@
 import chokidar from "chokidar"
 
 import Command from "./Command.js"
-import Sass from "./Sass.js"
-import File from "./File.js"
-import Term from "./Term.js"
+import {Sass, File, Term, Util} from "@gesslar/toolkit"
 import Theme from "./Theme.js"
-import Util from "./Util.js"
 
 /**
  * @typedef {object} SessionOptions
@@ -481,7 +478,9 @@ export default class Session {
     if(this.#watcher)
       await this.#watcher.close()
 
-    const dependencies = Array.from(this.#theme.getDependencies()).map(d => d.getSourceFile().path)
+    const dependencies = Array.from(this.#theme
+      .getDependencies())
+      .map(d => d.getSourceFile().path)
 
     this.#watcher = chokidar.watch(dependencies, {
       // Prevent watching own output files

package/src/Theme.js

@@ -13,14 +13,9 @@
  * - Write output files, supporting dry-run and hash-based skip
  * - Support watch mode for live theme development
  */
-import Sass from "./Sass.js"
+import {Sass, DirectoryObject, File, FileObject, Term, Util, Cache} from "@gesslar/toolkit"
 import Compiler from "./Compiler.js"
-import DirectoryObject from "./DirectoryObject.js"
-import File from "./File.js"
-import FileObject from "./FileObject.js"
-import Term from "./Term.js"
 import ThemePool from "./ThemePool.js"
-import Util from "./Util.js"
 
 const outputFileExtension = "color-theme.json"
 const obviouslyASentinelYouCantMissSoShutUpAboutIt = "kakadoodoo"
@@ -113,7 +108,7 @@ export default class Theme {
    * Gets a specific compilation option.
    *
    * @param {string} option - The option name to retrieve
-   * @returns {*} The option value or undefined if not set
+   * @returns {unknown} The option value or undefined if not set
    */
   getOption(option) {
     return this.#options?.[option] ?? undefined
@@ -282,9 +277,9 @@ export default class Theme {
   }
 
   /**
-   * Gets the array of file dependencies.
+   * Gets the set of file dependencies.
    *
-   * @returns {Set<Dependency>} Array of dependency files
+   * @returns {Set<Dependency>} Set of dependency files
    */
   getDependencies() {
     return this.#dependencies
@@ -306,6 +301,11 @@ export default class Theme {
     return this
   }
 
+  /**
+   * Checks if the theme has any dependencies.
+   *
+   * @returns {boolean} True if theme has dependencies
+   */
   hasDependencies() {
     return this.#dependencies.size > 0
   }
@@ -484,7 +484,7 @@ export default class Theme {
 
     this.#source = source
 
-    this.addDependency(this.#sourceFile, this.#source)
+    this.addDependency(this.#sourceFile, new Map(Object.entries(this.#source)))
 
     return this
   }
@@ -542,6 +542,10 @@ export default class Theme {
   }
 }
 
+/**
+ * Dependency class represents a theme file dependency.
+ * Manages the relationship between a file reference and its parsed source data.
+ */
 export class Dependency {
   #sourceFile = null
   #source = null
@@ -581,6 +585,11 @@ export class Dependency {
     return this
   }
 
+  /**
+   * Gets the parsed source data for this dependency.
+   *
+   * @returns {object|null} The parsed source data
+   */
   getSource() {
     return this.#source
   }

package/src/ThemePool.js

@@ -6,7 +6,7 @@
  * Manages resolved values, raw resolutions, and token relationships during theme compilation.
  */
 
-import Sass from "./Sass.js"
+import {Sass} from "@gesslar/toolkit"
 import ThemeToken from "./ThemeToken.js"
 
 /**

package/src/ThemeToken.js

@@ -7,7 +7,7 @@
  * management, pool integration, and serialization during theme compilation.
  */
 
-import Sass from "./Sass.js"
+import {Sass} from "@gesslar/toolkit"
 import ThemePool from "./ThemePool.js"
 
 /**

package/src/cli.js

@@ -36,14 +36,10 @@ import process from "node:process"
 import url from "node:url"
 import c from "@gesslar/colours"
 
-import Cache from "./Cache.js"
-import Sass from "./Sass.js"
+import {Cache, Sass, DirectoryObject, FileObject, Term} from "@gesslar/toolkit"
 import BuildCommand from "./BuildCommand.js"
-import DirectoryObject from "./DirectoryObject.js"
-import FileObject from "./FileObject.js"
 import LintCommand from "./LintCommand.js"
 import ResolveCommand from "./ResolveCommand.js"
-import Term from "./Term.js"
 
 /**
  * Main application entry point.
@@ -111,9 +107,10 @@ void (async function main() {
       .version(pkgJson.version)
 
     const commands = [BuildCommand, ResolveCommand, LintCommand]
-    
+
     for(const CommandClass of commands) {
       const command = new CommandClass({cwd, packageJson: pkgJson})
+
       command.setCache(cache)
       await command.buildCli(program)
       command.addCliOptions(alwaysAvailable, false)

package/src/index.js

@@ -0,0 +1,40 @@
+/**
+ * @file API entry point for @gesslar/sassy
+ *
+ * Exports classes and utilities for programmatic use by other npm packages.
+ *
+ * This allows other projects to import and use Sassy's functionality
+ * programmatically.
+ *
+ * @example
+ * // Import specific classes
+ * import { Theme, LintCommand, Compiler } from '@gesslar/sassy'
+ *
+ * // Import everything
+ * import * as Sassy from '@gesslar/sassy'
+ *
+ * // Create and use a Theme programmatically
+ * const theme = new Theme(fileObject)
+ * await theme.load('./my-theme.json5')
+ * await theme.build()
+ */
+
+// Core theme functionality
+export {default as Theme} from "./Theme.js"
+export {default as Compiler} from "./Compiler.js"
+export {default as Evaluator} from "./Evaluator.js"
+
+// Command classes for programmatic access
+export {default as Command} from "./Command.js"
+export {default as BuildCommand} from "./BuildCommand.js"
+export {default as LintCommand} from "./LintCommand.js"
+export {default as ResolveCommand} from "./ResolveCommand.js"
+
+// Data handling and utilities
+export {default as Session} from "./Session.js"
+
+// Color utilities
+export {default as Colour} from "./Colour.js"
+
+// Note: CLI functionality remains in cli.js and is accessible via the 'sassy'
+// command when installed globally or via npx

package/src/Cache.js

@@ -1,74 +0,0 @@
-import Sass from "./Sass.js"
-import File from "./File.js"
-import FileObject from "./FileObject.js"
-
-/**
- * File system cache for theme compilation data with automatic invalidation.
- * Provides intelligent caching of parsed JSON5/YAML files with mtime-based
- * cache invalidation to optimize parallel theme compilation performance.
- *
- * The cache eliminates redundant file reads and parsing when multiple themes
- * import the same dependency files, while ensuring data freshness through
- * modification time checking.
- */
-export default class Cache {
-  /** @type {Map<string, Date>} Map of file paths to last modification times */
-  #modifiedTimes = new Map()
-  /** @type {Map<string, object>} Map of file paths to parsed file data */
-  #dataCache = new Map()
-
-  /**
-   * Removes cached data for a specific file from both time and data maps.
-   * Used when files are modified or when cache consistency needs to be
-   * maintained.
-   *
-   * @private
-   * @param {FileObject} file - The file object to remove from cache
-   * @returns {void}
-   */
-  #cleanup(file) {
-    this.#modifiedTimes.delete(file.path)
-    this.#dataCache.delete(file.path)
-  }
-
-  /**
-   * Loads and caches parsed file data with automatic invalidation based on
-   * modification time.
-   *
-   * Implements a sophisticated caching strategy that checks file modification
-   * times to determine whether cached data is still valid, ensuring data
-   * freshness while optimizing performance for repeated file access during
-   * parallel theme compilation.
-   *
-   * @param {FileObject} fileObject - The file object to load and cache
-   * @returns {Promise<object>} The parsed file data (JSON5 or YAML)
-   * @throws {Sass} If the file cannot be found or accessed
-   */
-  async loadCachedData(fileObject) {
-    const lastModified = await File.fileModified(fileObject)
-
-    if(lastModified === null)
-      throw Sass.new(`Unable to find file '${fileObject.path}'`)
-
-    if(this.#modifiedTimes.has(fileObject.path)) {
-      const lastCached = this.#modifiedTimes.get(fileObject.path)
-
-      if(lastModified > lastCached) {
-        this.#cleanup(fileObject)
-      } else {
-        if(!(this.#dataCache.has(fileObject.path)))
-          this.#cleanup(fileObject)
-        else {
-          return this.#dataCache.get(fileObject.path)
-        }
-      }
-    }
-
-    const data = await File.loadDataFile(fileObject)
-
-    this.#modifiedTimes.set(fileObject.path, lastModified)
-    this.#dataCache.set(fileObject.path, data)
-
-    return data
-  }
-}