@gesslar/sassy 0.22.0 → 0.23.0

package/README.md

@@ -452,7 +452,7 @@ Sassy supports importing different types of theme components:
 config:
   import:
     - "./shared/colours.yaml"        # Variables and base config
-    - "./shared/ui-colours.yaml"     # VS Code color definitions  
+    - "./shared/ui-colours.yaml"     # VS Code color definitions
     - "./shared/syntax.yaml"         # Syntax highlighting rules
     - "./shared/semantic.yaml"       # Semantic token colours
 ```

package/package.json

@@ -1,10 +1,29 @@
 {
   "name": "@gesslar/sassy",
-  "version": "0.22.0",
-  "displayName": "Sassy",
   "description": "Make gorgeous themes that speak as boldly as you do.",
-  "publisher": "gesslar",
+  "author": {
+    "name": "gesslar",
+    "url": "https://gesslar.dev"
+  },
+  "version": "0.23.0",
   "license": "Unlicense",
+  "homepage": "https://github.com/gesslar/sassy#readme",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/gesslar/sassy.git"
+  },
+  "keywords": [
+    "asmr",
+    "generator",
+    "huffing",
+    "json5",
+    "sniffsniffsniff",
+    "taylorswift",
+    "theme",
+    "vs code",
+    "vscode",
+    "yaml"
+  ],
   "type": "module",
   "main": "src/index.js",
   "types": "types/index.d.ts",
@@ -20,56 +39,37 @@
     "types/",
     "UNLICENSE.txt"
   ],
-  "scripts": {
-    "clean": "rm -rfv ./dist",
-    "clean-types": "rm -rfv ./types",
-    "types": "npx tsc src/*.js types-helper.d.ts --allowJs --declaration --emitDeclarationOnly --outDir types --target ES2022 --module ESNext --moduleResolution Node --esModuleInterop --skipLibCheck --resolveJsonModule && node fix-types.js",
-    "build": "npm run clean && npm run types && mkdir -pv ./dist && npm pack --pack-destination ./dist/",
-    "exec": "node ./src/cli.js",
-    "lint": "eslint src/",
-    "submit": "npm run build && npm publish --access public",
-    "examples": "node ./examples/validator.js",
-    "test": "node -p \"require('fs').readFileSync('TESTING.txt', 'utf8')\"",
-    "update": "npx npm-check-updates -u && npm install"
-  },
   "engines": {
-    "node": ">=20.0.0"
+    "node": ">=22"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/gesslar/sassy"
-  },
-  "keywords": [
-    "asmr",
-    "generator",
-    "huffing",
-    "json5",
-    "sniffsniffsniff",
-    "taylorswift",
-    "theme",
-    "vs code",
-    "vscode",
-    "yaml"
-  ],
   "dependencies": {
-    "@gesslar/colours": "^0.0.1",
-    "@gesslar/toolkit": "^0.0.3",
-    "chokidar": "^4.0.3",
+    "@gesslar/colours": "^0.7.1",
+    "@gesslar/toolkit": "^3.6.3",
+    "chokidar": "^5.0.0",
     "color-support": "^1.1.3",
-    "commander": "^14.0.1",
+    "commander": "^14.0.2",
     "culori": "^4.0.2",
-    "globby": "^14.1.0",
+    "globby": "^16.1.0",
     "json5": "^2.2.3",
-    "yaml": "^2.8.1"
+    "yaml": "^2.8.2"
   },
   "devDependencies": {
-    "@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.36.0",
-    "eslint-plugin-jsdoc": "^60.1.0",
-    "typescript": "^5.9.2"
+    "@gesslar/uglier": "^0.5.1",
+    "eslint": "^9.39.2",
+    "typescript": "^5.9.3"
+  },
+  "scripts": {
+    "clean": "rm -rfv ./dist",
+    "build": "mkdir -pv ./dist && pnpm pack --pack-destination ./dist/",
+    "exec": "node ./src/cli.js",
+    "lint": "eslint src/",
+    "submit": "pnpm publish --access public --//registry.npmjs.org/:_authToken=\"${NPM_ACCESS_TOKEN}\"",
+    "examples": "node ./examples/validator.js",
+    "test": "node -p \"require('fs').readFileSync('TESTING.txt', 'utf8')\"",
+    "update": "pnpm up --latest --recursive",
+    "pr": "gt submit -p --ai",
+    "patch": "pnpm version patch",
+    "minor": "pnpm version minor",
+    "major": "pnpm version major"
   }
-}
+}

package/src/BuildCommand.js

@@ -1,7 +1,7 @@
 import {EventEmitter} from "node:events"
 import process from "node:process"
 
-import {Sass, Term} from "@gesslar/toolkit"
+import {Sass, Term, Util} from "@gesslar/toolkit"
 import Command from "./Command.js"
 import Session from "./Session.js"
 import Theme from "./Theme.js"
@@ -90,7 +90,7 @@ export default class BuildCommand extends Command {
       rejected.forEach(reject => Term.error(reject.reason))
 
       if(firstRun.length === rejected.length)
-        await this.asyncEmit("quit")
+        await Util.asyncEmit(this.emitter, "quit")
     }
   }
 

package/src/Colour.js

@@ -14,7 +14,6 @@ import {
 } from "culori"
 
 import {Util, Sass} from "@gesslar/toolkit"
-import ThemeToken from "./ThemeToken.js"
 // Cache for parsed colours to improve performance
 const _colourCache = new Map()
 
@@ -264,7 +263,7 @@ export default class Colour {
 
     const [_,hex] = matches
 
-    return hex.split("").reduce((acc,curr) => acc + curr.repeat(2)).toLowerCase()
+    return hex.split("").reduce((acc,curr) => acc + curr.repeat(2), "").toLowerCase()
   }
 
   /**

package/src/Command.js

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

package/src/Compiler.js

@@ -11,9 +11,8 @@
  * Supports extension points for custom phases and output formats.
  */
 
-import {Sass, Data, File, FileObject, Term, Util} from "@gesslar/toolkit"
+import {Data, FS, FileObject, Sass, Term, Util} from "@gesslar/toolkit"
 import Evaluator from "./Evaluator.js"
-import Theme from "./Theme.js"
 
 /**
  * Main compiler class for processing theme source files.
@@ -169,7 +168,7 @@ export default class Compiler {
           Term.status([
             ["muted", Util.rightAlignText(`${cost.toLocaleString()}ms`, 10), ["[","]"]],
             "",
-            ["muted", `${File.relativeOrAbsolutePath(theme.getCwd(),file)}`],
+            ["muted", `${FS.relativeOrAbsolutePath(theme.getCwd(),file)}`],
             ["muted", `${theme.getName()}`,["(",")"]],
           ], theme.getOptions())
         }

package/src/LintCommand.js

@@ -22,7 +22,6 @@ import Command from "./Command.js"
 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,8 +1,6 @@
 import chokidar from "chokidar"
 
-import Command from "./Command.js"
-import {Sass, File, Term, Util} from "@gesslar/toolkit"
-import Theme from "./Theme.js"
+import {Sass, FS, Term, Util} from "@gesslar/toolkit"
 
 /**
  * @typedef {object} SessionOptions
@@ -219,7 +217,7 @@ export default class Session {
        */
 
       loadCost = (await Util.time(() => this.#theme.load())).cost
-      const bytes = await File.fileSize(this.#theme.getSourceFile())
+      const bytes = await FS.fileSize(this.#theme.getSourceFile())
 
       Term.status([
         ["success", Util.rightAlignText(`${loadCost.toLocaleString()}ms`, 10), ["[","]"]],
@@ -244,10 +242,10 @@ export default class Session {
             throw new Error("Invalid dependency file object")
           }
 
-          const fileName = File.relativeOrAbsolutePath(
+          const fileName = FS.relativeOrAbsolutePath(
             this.#command.getCwd(), fileObject
           )
-          const fileSize = await File.fileSize(fileObject)
+          const fileSize = await FS.fileSize(fileObject)
 
           return [fileName, fileSize]
         }))
@@ -307,7 +305,7 @@ export default class Session {
         file: outputFile,
         bytes: writeBytes
       } = writeResult.result
-      const outputFilename = File.relativeOrAbsolutePath(
+      const outputFilename = FS.relativeOrAbsolutePath(
         this.#command.getCwd(), outputFile
       )
       const status = [
@@ -383,7 +381,7 @@ export default class Session {
       if(!changedFile)
         return
 
-      const fileName = File.relativeOrAbsolutePath(
+      const fileName = FS.relativeOrAbsolutePath(
         this.#command.getCwd(), changedFile
       )
 

package/src/Theme.js

@@ -13,7 +13,7 @@
  * - Write output files, supporting dry-run and hash-based skip
  * - Support watch mode for live theme development
  */
-import {Sass, DirectoryObject, File, FileObject, Term, Util, Cache} from "@gesslar/toolkit"
+import {Sass, DirectoryObject, FS, FileObject, Term, Util} from "@gesslar/toolkit"
 import Compiler from "./Compiler.js"
 import ThemePool from "./ThemePool.js"
 
@@ -525,7 +525,7 @@ export default class Theme {
     if(!force) {
       const nextHash = this.#outputHash
       const lastHash = await file.exists
-        ? Util.hashOf(await File.readFile(file))
+        ? Util.hashOf(await FS.readFile(file))
         : obviouslyASentinelYouCantMissSoShutUpAboutIt
 
       if(lastHash === nextHash)
@@ -534,9 +534,9 @@ export default class Theme {
 
     // Real write (timed)
     if(!await outputDir.exists)
-      await File.assureDirectory(outputDir, {recursive: true})
+      await FS.assureDirectory(outputDir, {recursive: true})
 
-    await File.writeFile(file, output)
+    await FS.writeFile(file, output)
 
     return {status: WriteStatus.WRITTEN, bytes: output.length, file}
   }

package/types/BuildCommand.d.ts

@@ -1,40 +0,0 @@
-/**
- * Command handler for building VS Code themes from source files.
- * Handles compilation, watching for changes, and output generation.
- */
-export default class BuildCommand extends Command {
-    /**
-     * Creates a new BuildCommand instance.
-     *
-     * @param {object} base - Base configuration object
-     * @param {string} base.cwd - Current working directory path
-     * @param {object} base.packageJson - Package.json configuration data
-     */
-    constructor(base: {
-        cwd: string;
-        packageJson: object;
-    });
-    /** @type {EventEmitter} Internal event emitter for watch mode coordination */
-    emitter: EventEmitter;
-    /**
-     * 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.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
-     * @returns {Promise<void>} Resolves when all files are processed
-     * @throws {Error} When theme compilation fails
-     */
-    execute(fileNames: string[], options: {
-        watch?: boolean;
-        output?: string;
-        dry?: boolean;
-        silent?: boolean;
-    }): Promise<void>;
-    #private;
-}
-import Command from "./Command.js";

package/types/Colour.d.ts

@@ -1,126 +0,0 @@
-/**
- * Colour manipulation utility class providing static methods for colour operations.
- * Handles hex colour parsing, alpha manipulation, mixing, and format conversions.
- */
-export default class Colour {
-    /**
-     * Regular expression for matching long hex colour codes with optional alpha.
-     * Matches patterns like #ff0000 or #ff0000ff
-     *
-     * @type {RegExp}
-     */
-    static longHex: RegExp;
-    /**
-     * Regular expression for matching short hex colour codes with optional alpha.
-     * Matches patterns like #f00 or #f00f
-     *
-     * @type {RegExp}
-     */
-    static shortHex: RegExp;
-    /**
-     * Lightens or darkens a hex colour by a specified amount.
-     * Always uses OKLCH as the working color space for consistent perceptual results.
-     *
-     * @param {string} hex - The hex colour code (e.g., "#ff0000" or "#f00")
-     * @param {number} amount - The amount to lighten (+) or darken (-) as a percentage
-     * @returns {string} The modified hex colour with preserved alpha
-     */
-    static lightenOrDarken(hex: string, amount?: number): string;
-    /**
-     * Lightens or darkens a color using OKLCH as working space for consistent results.
-     * Preserves original color information from tokens when available.
-     *
-     * @param {ThemeToken|object|string} tokenOrColor - ThemeToken, Culori color object, or hex string
-     * @param {number} amount - The amount to lighten (+) or darken (-) as a percentage
-     * @returns {string} The modified hex colour
-     */
-    static lightenOrDarkenWithToken(tokenOrColor: ThemeToken | object | string, amount?: number): string;
-    /**
-     * Inverts a hex colour by flipping its lightness value.
-     * Preserves hue and saturation while inverting the lightness component.
-     *
-     * @param {string} hex - The hex colour code to invert
-     * @returns {string} The inverted hex colour with preserved alpha
-     */
-    static invert(hex: string): string;
-    /**
-     * Converts a hex alpha value to a decimal percentage.
-     * Takes a 2-digit hex alpha value and converts it to a percentage (0-100).
-     *
-     * @param {string} hex - The hex alpha value (e.g., "ff", "80")
-     * @returns {number} The alpha as a percentage rounded to 2 decimal places
-     */
-    static hexAlphaToDecimal(hex: string): number;
-    /**
-     * Converts a decimal percentage to a hex alpha value.
-     * Takes a percentage (0-100) and converts it to a 2-digit hex alpha value.
-     *
-     * @param {number} dec - The alpha percentage (0-100)
-     * @returns {string} The hex alpha value (e.g., "ff", "80")
-     */
-    static decimalAlphaToHex(dec: number): string;
-    static isHex(value: any): boolean;
-    /**
-     * Normalises a short hex colour code to a full 6-character format.
-     * Converts 3-character hex codes like "#f00" to "#ff0000".
-     *
-     * @param {string} code - The short hex colour code
-     * @returns {string} The normalized 6-character hex colour code
-     */
-    static normaliseHex(code: string): string;
-    /**
-     * Parses a hex colour string and extracts colour and alpha components.
-     * Supports both short (#f00) and long (#ff0000) formats with optional alpha.
-     *
-     * @param {string} hex - The hex colour string to parse
-     * @returns {object} Object containing colour and optional alpha information
-     * @throws {Sass} If the hex value is invalid or missing
-     */
-    static parseHexColour(hex: string): object;
-    /**
-     * Sets the alpha transparency of a hex colour to a specific value.
-     * Replaces any existing alpha with the new value.
-     *
-     * @param {string} hex - The hex colour code
-     * @param {number} amount - The alpha value (0-1, where 0 is transparent and 1 is opaque)
-     * @returns {string} The hex colour with the new alpha value
-     */
-    static setAlpha(hex: string, amount: number): string;
-    /**
-     * Adjusts the alpha transparency of a hex colour by a relative amount.
-     * Multiplies the current alpha by (1 + amount) and clamps the result.
-     *
-     * @param {string} hex - The hex colour code
-     * @param {number} amount - The relative amount to adjust alpha (-1 to make transparent, positive to increase)
-     * @returns {string} The hex colour with adjusted alpha
-     */
-    static addAlpha(hex: string, amount: number): string;
-    /**
-     * Removes alpha channel from a hex colour, returning only the solid colour.
-     *
-     * @param {string} hex - The hex colour code with or without alpha
-     * @returns {string} The solid hex colour without alpha
-     */
-    static solid(hex: string): string;
-    /**
-     * Mixes two hex colours together in a specified ratio.
-     * Blends both the colours and their alpha channels if present.
-     *
-     * @param {string} colourA - The first hex colour
-     * @param {string} colourB - The second hex colour
-     * @param {number} ratio - The mixing ratio as percentage (0-100, where 50 is equal mix)
-     * @returns {string} The mixed hex colour with blended alpha
-     */
-    static mix(colourA: string, colourB: string, ratio?: number): string;
-    static getColourParser(name: any): Promise<any>;
-    /**
-     * Converts colour values from various formats to hex.
-     * Supports RGB, RGBA, HSL, HSLA, OKLCH, and OKLCHA colour modes, and MORE!
-     *
-     * @param {string} input - The colour expression
-     * @returns {string} The resulting hex colour
-     * @throws {Sass} If the wrong function or value is provided
-     */
-    static toHex(input: string): string;
-}
-import ThemeToken from "./ThemeToken.js";

package/types/Command.d.ts

@@ -1,135 +0,0 @@
-import type { FileObject, DirectoryObject, Cache } from '@gesslar/toolkit';
-/**
- * Base class for command-line interface commands.
- * Provides common functionality for CLI option handling and file resolution.
- */
-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 }: {
-        cwd: DirectoryObject;
-        packageJson: object;
-    });
-    /**
-     * Gets the current working directory object.
-     *
-     * @returns {DirectoryObject} The current working directory
-     */
-    getCwd(): DirectoryObject;
-    /**
-     * Gets the package.json data.
-     *
-     * @returns {object} The package.json object
-     */
-    getPackageJson(): object;
-    /**
-     * Sets the cache instance for the command.
-     *
-     * @param {Cache} cache - The cache instance to set
-     * @returns {this} Returns this instance for method chaining
-     */
-    setCache(cache: Cache): this;
-    /**
-     * Gets the cache instance.
-     *
-     * @returns {Cache|null} The cache instance or null if not set
-     */
-    getCache(): Cache | null;
-    /**
-     * Sets the CLI command string.
-     *
-     * @param {string} data - The CLI command string
-     * @returns {this} Returns this instance for method chaining
-     */
-    setCliCommand(data: string): this;
-    /**
-     * Gets the CLI command string.
-     *
-     * @returns {string|null} The CLI command string
-     */
-    getCliCommand(): string | null;
-    /**
-     * Sets the CLI options object.
-     *
-     * @param {object} data - The CLI options configuration
-     * @returns {this} Returns this instance for method chaining
-     */
-    setCliOptions(data: object): this;
-    /**
-     * Gets the CLI options object.
-     *
-     * @returns {object|null} The CLI options configuration
-     */
-    getCliOptions(): object | null;
-    /**
-     * Gets the array of CLI option names.
-     *
-     * @returns {string[]} Array of option names
-     */
-    getCliOptionNames(): string[];
-    /**
-     * Checks if the command has a cache instance.
-     *
-     * @returns {boolean} True if cache is available
-     */
-    hasCache(): boolean;
-    /**
-     * Checks if the command has a CLI command string configured.
-     *
-     * @returns {boolean} True if CLI command is set
-     */
-    hasCliCommand(): boolean;
-    /**
-     * Checks if the command has CLI options configured.
-     *
-     * @returns {boolean} True if CLI options are set
-     */
-    hasCliOptions(): boolean;
-    /**
-     * Checks if the command is ready to be built.
-     * Requires both CLI command and options to be set.
-     *
-     * @returns {boolean} True if command can be built
-     */
-    canBuild(): boolean;
-    /**
-     * Builds the CLI command interface using the commander.js program instance.
-     * Initializes the command with its options and action handler.
-     *
-     * @param {object} program - The commander.js program instance
-     * @returns {Promise<this>} Returns this instance for method chaining
-     */
-    buildCli(program: object): Promise<this>;
-    /**
-     * Adds a single CLI option to the command.
-     *
-     * @param {string} name - The option name
-     * @param {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
-     */
-    addCliOption(name: string, options: string[], preserve: boolean): Promise<this>;
-    /**
-     * Adds multiple CLI options to the command.
-     *
-     * @param {object} options - Object mapping option names to [flag, description] arrays
-     * @param {boolean} preserve - Whether to preserve option names in the list
-     * @returns {this} Returns this instance for method chaining
-     */
-    addCliOptions(options: object, preserve: boolean): this;
-    /**
-     * 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
-     * @returns {Promise<FileObject>} The resolved and validated FileObject
-     * @throws {Sass} If the file does not exist
-     */
-    resolveThemeFileName(fileName: string, cwd: object): Promise<FileObject>;
-    #private;
-}

package/types/Compiler.d.ts

@@ -1,16 +0,0 @@
-/**
- * Main compiler class for processing theme source files.
- * Handles the complete compilation pipeline from source to VS Code theme output.
- */
-export default class Compiler {
-    /**
-     * Compiles a theme source file into a VS Code colour theme.
-     * Processes configuration, variables, imports, and theme definitions.
-     *
-     * @param {Theme} theme - The file object containing source data and metadata
-     * @returns {Promise<void>} Resolves when compilation is complete
-     */
-    compile(theme: Theme): Promise<void>;
-    #private;
-}
-import Theme from "./Theme.js";