@gesslar/sassy 0.23.0 → 1.0.0

package/README.md

@@ -98,7 +98,7 @@ npx @gesslar/sassy lint my-theme.yaml
 ### Build Command Options
 
 | Option | Description |
-|--------|-------------|
+| -------- | ------------- |
 | `-w, --watch` | Watch files and rebuild on changes |
 | `-o, --output-dir <dir>` | Specify output directory |
 | `-n, --dry-run` | Print JSON to stdout instead of writing files |
@@ -132,7 +132,7 @@ output.
 ### Resolve Command Options
 
 | Option | Description |
-|--------|-------------|
+| -------- | ------------- |
 | `-c, --color <key>` | Resolve a specific color property to its final value |
 | `-t, --tokenColor <scope>` | Resolve tokenColors for a specific scope |
 | `-s, --semanticTokenColor <token>` | Resolve semantic token colors for a specific token type |
@@ -222,7 +222,7 @@ to least specific.
 ### Lint Command Options
 
 | Option | Description |
-|--------|-------------|
+| -------- | ------------- |
 | `--nerd` | Show detailed error traces if linting fails |
 
 ## Basic Theme Structure
@@ -297,33 +297,24 @@ functions in the [Culori documentation](https://culorijs.org/).
 Make colours that work together:
 
 | Function | Example | Result |
-|----------|---------|--------|
+| ---------- | --------- | -------- |
 | `lighten(colour, %=0-100)` | `lighten($(bg), 25)` | 25% lighter background |
 | `darken(colour, %=0-100)` | `darken($(accent), 30)` | 30% darker accent |
-| || |
 | `alpha(colour, alpha=0-1)` | `alpha($(brand), 0.5)` | Set exact transparency |
 | `fade(colour, alpha=0-1)` | `fade($(accent), 0.5)` | Reduce opacity by 50% |
 | `solidify(colour, alpha=0-1)` | `solidify($(bg.accent), 0.3)` | Increase opacity by 30% |
-| || |
 | `mix(colour1, colour2, %=0-100)` | `mix($(fg), $(accent), 20)` | Blend 20% accent |
 | `mix(colour1, colour2)` | `mix($(fg), $(accent))` | Blend 50% accent |
-| || |
 | `invert(colour)` | `invert($(fg))` | Perfect opposite |
-| || |
 | `hsv(h=0-255, s=0-255, v=0-255)` | `hsv(50, 200, 180)` | HSV colour (hue 50, saturation 200, value 180) |
 | `hsva(h=0-255, s=0-255, v=0-255, a=0-1)` | `hsva(50, 200, 180, 0.5)` | HSV with 50% opacity |
-| || |
 | `hsl(h=0-360, s=0-100, l=0-100)` | `hsl(200, 50, 40)` | HSL colour (200° hue, 50% saturation, 40% lightness) |
 | `hsla(h=0-360, s=0-100, l=0-100, a=0-1)` | `hsla(200, 50, 40, 0.5)` | HSL with 50% opacity |
-| || |
 | `rgb(r=0-255, g=0-255, b=0-255)` | `rgb(139, 152, 255)` | RGB colour (139 red, 152 green, 255 blue) |
 | `rgba(r=0-255, g=0-255, b=0-255, a=0-1)` | `rgba(139, 152, 255, 0.5)` | RGB with 50% opacity |
-| || |
 | `oklch(l=0-1, c=0-100, h=0-360)` | `oklch(0.7, 25, 180)` | OKLCH colour (70% lightness, 25 chroma, 180° hue) |
 | `oklcha(l=0-1, c=0-100, h=0-360, a=0-1)` | `oklcha(0.5, 30, 45, 0.8)` | OKLCH with 80% opacity |
-| || |
 | `css(name)` | `css(tomato)` | CSS named colour (tomato, skyblue, etc.) |
-| || |
 
 > **Note:** In all of these functions, `colour` can be a raw hex (`#ff66cc`),
 a variable (`$(accent)`), a CSS named colour (`css(tomato)`), or another colour

package/package.json

@@ -5,7 +5,7 @@
     "name": "gesslar",
     "url": "https://gesslar.dev"
   },
-  "version": "0.23.0",
+  "version": "1.0.0",
   "license": "Unlicense",
   "homepage": "https://github.com/gesslar/sassy#readme",
   "repository": {
@@ -43,8 +43,8 @@
     "node": ">=22"
   },
   "dependencies": {
-    "@gesslar/colours": "^0.7.1",
-    "@gesslar/toolkit": "^3.6.3",
+    "@gesslar/colours": "^0.8.0",
+    "@gesslar/toolkit": "^3.21.0",
     "chokidar": "^5.0.0",
     "color-support": "^1.1.3",
     "commander": "^14.0.2",
@@ -54,7 +54,7 @@
     "yaml": "^2.8.2"
   },
   "devDependencies": {
-    "@gesslar/uglier": "^0.5.1",
+    "@gesslar/uglier": "^1.0.0",
     "eslint": "^9.39.2",
     "typescript": "^5.9.3"
   },
@@ -63,10 +63,11 @@
     "build": "mkdir -pv ./dist && pnpm pack --pack-destination ./dist/",
     "exec": "node ./src/cli.js",
     "lint": "eslint src/",
+    "test": "node --test tests/**/*.test.js",
+    "test:coverage": "node --experimental-test-coverage --test tests/**/*.test.js",
     "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",
+    "update": "pnpm self-update && pnpx npm-check-updates -u && pnpm install",
     "pr": "gt submit -p --ai",
     "patch": "pnpm version patch",
     "minor": "pnpm version minor",

package/src/Compiler.js

@@ -11,7 +11,7 @@
  * Supports extension points for custom phases and output formats.
  */
 
-import {Data, FS, FileObject, Sass, Term, Util} from "@gesslar/toolkit"
+import {Collection, Data, FileObject, Sass, Term, Util} from "@gesslar/toolkit"
 import Evaluator from "./Evaluator.js"
 
 /**
@@ -148,7 +148,7 @@ export default class Compiler {
       ? [imports]
       : imports
 
-    if(!Data.isArrayUniform(imports, "string"))
+    if(!Collection.isArrayUniform(imports, "string"))
       throw new Sass(
         `All import entries must be strings. Got ${JSON.stringify(imports)}`
       )
@@ -168,7 +168,7 @@ export default class Compiler {
           Term.status([
             ["muted", Util.rightAlignText(`${cost.toLocaleString()}ms`, 10), ["[","]"]],
             "",
-            ["muted", `${FS.relativeOrAbsolutePath(theme.getCwd(),file)}`],
+            ["muted", `${file.toString()}`],
             ["muted", `${theme.getName()}`,["(",")"]],
           ], theme.getOptions())
         }

package/src/ResolveCommand.js

@@ -2,7 +2,7 @@ import c from "@gesslar/colours"
 // import colorSupport from "color-support"
 
 import Command from "./Command.js"
-import {Sass, Term, Util, Data} from "@gesslar/toolkit"
+import {Collection, Sass, Term, Util} from "@gesslar/toolkit"
 import Colour from "./Colour.js"
 import Evaluator from "./Evaluator.js"
 import Theme from "./Theme.js"
@@ -41,7 +41,7 @@ export default class ResolveCommand extends Command {
   async execute(inputArg, options={}) {
     const cliOptionNames = this.getCliOptionNames()
     const intersection =
-      Data.arrayIntersection(cliOptionNames, Object.keys(options))
+      Collection.intersection(cliOptionNames, Object.keys(options))
 
     if(intersection.length > 1)
       throw Sass.new(

package/src/Session.js

@@ -1,6 +1,6 @@
 import chokidar from "chokidar"
 
-import {Sass, FS, Term, Util} from "@gesslar/toolkit"
+import {Sass, Term, Util} from "@gesslar/toolkit"
 
 /**
  * @typedef {object} SessionOptions
@@ -217,7 +217,7 @@ export default class Session {
        */
 
       loadCost = (await Util.time(() => this.#theme.load())).cost
-      const bytes = await FS.fileSize(this.#theme.getSourceFile())
+      const bytes = await this.#theme.getSourceFile().size()
 
       Term.status([
         ["success", Util.rightAlignText(`${loadCost.toLocaleString()}ms`, 10), ["[","]"]],
@@ -242,10 +242,8 @@ export default class Session {
             throw new Error("Invalid dependency file object")
           }
 
-          const fileName = FS.relativeOrAbsolutePath(
-            this.#command.getCwd(), fileObject
-          )
-          const fileSize = await FS.fileSize(fileObject)
+          const fileName = fileObject.toString()
+          const fileSize = await fileObject.size()
 
           return [fileName, fileSize]
         }))
@@ -305,9 +303,7 @@ export default class Session {
         file: outputFile,
         bytes: writeBytes
       } = writeResult.result
-      const outputFilename = FS.relativeOrAbsolutePath(
-        this.#command.getCwd(), outputFile
-      )
+      const outputFilename = outputFile.toString()
       const status = [
         [
           "success",
@@ -381,9 +377,7 @@ export default class Session {
       if(!changedFile)
         return
 
-      const fileName = FS.relativeOrAbsolutePath(
-        this.#command.getCwd(), changedFile
-      )
+      const fileName = changedFile.toString()
 
       const message = [
         ["info", "REBUILDING", ["[","]"]],

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, FS, FileObject, Term, Util} from "@gesslar/toolkit"
+import {Sass, DirectoryObject, 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 FS.readFile(file))
+        ? Util.hashOf(await file.read())
         : obviouslyASentinelYouCantMissSoShutUpAboutIt
 
       if(lastHash === nextHash)
@@ -534,9 +534,9 @@ export default class Theme {
 
     // Real write (timed)
     if(!await outputDir.exists)
-      await FS.assureDirectory(outputDir, {recursive: true})
+      await outputDir.assureExists()
 
-    await FS.writeFile(file, output)
+    await file.write(output)
 
     return {status: WriteStatus.WRITTEN, bytes: output.length, file}
   }