@gesslar/sassy 0.21.0 → 0.21.3

package/package.json

@@ -1,13 +1,17 @@
 {
   "name": "@gesslar/sassy",
-  "version": "0.21.0",
+  "version": "0.21.3",
   "displayName": "Sassy",
   "description": "Make gorgeous themes that speak as boldly as you do.",
   "publisher": "gesslar",
   "license": "Unlicense",
   "type": "module",
-  "main": "src/cli.js",
+  "main": "src/index.js",
   "bin": "src/cli.js",
+  "exports": {
+    ".": "./src/index.js",
+    "./cli": "./src/cli.js"
+  },
   "files": [
     "src/",
     "UNLICENSE.txt"
@@ -43,6 +47,7 @@
   ],
   "dependencies": {
     "@gesslar/colours": "^0.0.1",
+    "@gesslar/toolkit": "^0.0.3",
     "chokidar": "^4.0.3",
     "color-support": "^1.1.3",
     "commander": "^14.0.1",
@@ -52,13 +57,13 @@
     "yaml": "^2.8.1"
   },
   "devDependencies": {
-    "@stylistic/eslint-plugin": "^5.3.1",
+    "@stylistic/eslint-plugin": "^5.4.0",
     "@types/vscode": "^1.104.0",
     "@typescript-eslint/eslint-plugin": "^8.44.0",
     "@typescript-eslint/parser": "^8.44.0",
     "esbuild": "^0.25.10",
-    "eslint": "^9.35.0",
-    "eslint-plugin-jsdoc": "^59.0.1",
+    "eslint": "^9.36.0",
+    "eslint-plugin-jsdoc": "^60.1.0",
     "typescript": "^5.9.2"
   }
 }

package/src/BuildCommand.js

@@ -1,10 +1,9 @@
 import {EventEmitter} from "node:events"
 import process from "node:process"
 
+import {Sass, Term} from "@gesslar/toolkit"
 import Command from "./Command.js"
-import Sass from "./Sass.js"
 import Session from "./Session.js"
-import Term from "./Term.js"
 import Theme from "./Theme.js"
 
 /**

package/src/Colour.js

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

package/src/Command.js

@@ -1,6 +1,4 @@
-import Sass from "./Sass.js"
-import FileObject from "./FileObject.js"
-import DirectoryObject from "./DirectoryObject.js"
+import {Sass, FileObject, DirectoryObject, Cache} from "@gesslar/toolkit"
 
 /**
  * Base class for command-line interface commands.

package/src/Compiler.js

@@ -11,14 +11,9 @@
  * Supports extension points for custom phases and output formats.
  */
 
-import Sass from "./Sass.js"
-import Data from "./Data.js"
+import {Sass, Data, File, FileObject, Term, Util} from "@gesslar/toolkit"
 import Evaluator from "./Evaluator.js"
-import File from "./File.js"
-import FileObject from "./FileObject.js"
-import Term from "./Term.js"
 import Theme from "./Theme.js"
-import Util from "./Util.js"
 
 /**
  * Main compiler class for processing theme source files.

package/src/Evaluator.js

@@ -13,7 +13,7 @@
 
 import {parse} from "culori"
 
-import Sass from "./Sass.js"
+import {Sass} from "@gesslar/toolkit"
 import Colour from "./Colour.js"
 import ThemePool from "./ThemePool.js"
 import ThemeToken from "./ThemeToken.js"
@@ -56,6 +56,37 @@ export default class Evaluator {
    */
   static func = /(?<captured>(?<func>\w+)\((?<args>[^()]+)\))/
 
+  /**
+   * Extracts a variable name from a string containing variable syntax.
+   * Supports $(var), $var, and ${var} patterns.
+   *
+   * @param {string} [str] - String that may contain a variable reference
+   * @returns {string|null} The variable name or null if none found
+   */
+  static extractVariableName(str="") {
+    const {none, parens, braces} = Evaluator.sub.exec(str)?.groups ?? {}
+
+    return none || parens || braces || null
+  }
+
+  /**
+   * Extracts function name and arguments from a string containing function syntax.
+   * Supports functionName(args) patterns.
+   *
+   * @param {string} [str] - String that may contain a function call
+   * @returns {{func:string, args:string}|null} Object with {func, args} or null if none found
+   */
+  static extractFunctionCall(str="") {
+    const match = Evaluator.func.exec(str)
+
+    if(!match?.groups)
+      return null
+
+    const {func, args} = match.groups
+
+    return {func, args}
+  }
+
   #pool = new ThemePool()
   get pool() {
     return this.#pool
@@ -81,6 +112,18 @@ export default class Evaluator {
    *  - No return value. Evident by the absence of a return statement.
    *
    * @param {Array<{flatPath:string,value:unknown}>} decomposed - Variable entries to resolve.
+   * @example
+   * // Example decomposed input with variables and theme references
+   * const evaluator = new Evaluator();
+   * const decomposed = [
+   *   { flatPath: 'vars.primary', value: '#3366cc' },
+   *   { flatPath: 'theme.colors.background', value: '$(vars.primary)' },
+   *   { flatPath: 'theme.colors.accent', value: 'lighten($(vars.primary), 20)' }
+   * ];
+   * evaluator.evaluate(decomposed);
+   * // After evaluation, values are resolved:
+   * // decomposed[1].value === '#3366cc'
+   * // decomposed[2].value === '#5588dd' (lightened color)
    */
   evaluate(decomposed) {
     let it = 0
@@ -229,8 +272,8 @@ export default class Evaluator {
    * @returns {ThemeToken|null} The resolved token or null.
    */
   #resolveVariable(value) {
-    const {captured,none,parens,braces} = Evaluator.sub.exec(value).groups
-    const work = none ?? parens ?? braces
+    const {captured} = Evaluator.sub.exec(value).groups
+    const work = Evaluator.extractVariableName(value)
     const existing = this.#pool.findToken(work)
 
     if(!existing)
@@ -253,7 +296,13 @@ export default class Evaluator {
    * @returns {ThemeToken|null} The resolved token or null.
    */
   #resolveFunction(value) {
-    const {captured,func,args} = Evaluator.func.exec(value).groups
+    const {captured} = Evaluator.func.exec(value).groups
+    const result = Evaluator.extractFunctionCall(value)
+
+    if(!result)
+      return null
+
+    const {func, args} = result
     const split = args?.split(",").map(a => a.trim()) ?? []
 
     // Look up source tokens for arguments to preserve color space