penrose 0.2.44 → 0.2.46

package/.envrc

@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+
+version_gte() {
+    local cmd="$1"
+    local required_version="$2"
+    local installed_version=$($cmd | grep -oE "[0-9]+(\.[0-9]+)+" | head -n 1)
+
+    if [ -z "$installed_version" ]; then
+        return 1
+    fi
+
+    IFS="."
+    set -- $installed_version
+    local installed_parts="$@"
+    set -- $required_version
+    local required_parts="$@"
+    unset IFS
+
+    local i=1
+    for required_part in $required_parts; do
+        installed_part=$(echo "$installed_parts" | cut -d " " -f $i)
+        if [ "${installed_part:-0}" -lt "$required_part" ]; then
+            return 1
+        elif [ "${installed_part:-0}" -gt "$required_part" ]; then
+            return 0
+        fi
+        i=$((i + 1))
+    done
+
+    return 0
+}
+
+if type nix-shell >/dev/null 2>&1; then
+    if ! has devenv; then
+        # Install devenv v1.x. Hash from https://www.nixhub.io/packages/devenv
+        if version_gte "nix --version" "2.30.0"; then
+            nix profile add github:NixOS/nixpkgs/80d901ec0377e19ac3f7bb8c035201e2e098cc97#devenv
+        else
+            nix profile install github:NixOS/nixpkgs/80d901ec0377e19ac3f7bb8c035201e2e098cc97#devenv
+        fi
+    fi
+
+    eval "$(devenv direnvrc)"
+    use devenv
+else
+    echo "nix-shell is not available. Install Nix: https://nixos.org/download"
+fi

package/.eslintrc.cjs

@@ -3,11 +3,14 @@ module.exports = {
   env: {
     browser: true,
     jquery: true,
-    mocha: true,
     node: true
   },
   plugins: ['prettier'],
-  extends: ['eslint:recommended', 'prettier'],
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/recommended',
+    'prettier'
+  ],
   rules: {
     'no-undef': 'error',
     'no-unsafe-finally': 'error',
@@ -15,9 +18,9 @@ module.exports = {
     'no-unsafe-optional-chaining': 'error',
     'no-var': 'error'
   },
-  parser: 'espree',
+  parser: '@typescript-eslint/parser',
   parserOptions: {
-    ecmaVersion: 2015,
+    ecmaVersion: 2017,
     requireConfigFile: true,
     sourceType: 'module'
   }

package/.github/workflows/ci.yaml

@@ -0,0 +1,29 @@
+name: CI
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install system dependencies
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install -y -qq graphicsmagick
+
+      - name: Install Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 24.15.0
+          cache: npm
+
+      - name: Install Node dependencies
+        run: npm ci
+
+      - name: Run Node tests
+        run: npm test

package/.pre-commit-config.yaml

@@ -0,0 +1,22 @@
+default_language_version:
+  node: 24.15.0
+
+default_stages: [pre-commit]
+
+fail_fast: true
+
+repos:
+  - repo: local
+    hooks:
+      - id: nixfmt
+        name: nixfmt
+        entry: nixfmt
+        language: system
+        files: \.nix$
+
+      - id: format-js
+        name: Format JS
+        language: system
+        entry: npx prettier --parser babel --write
+        files: ^(lib)/.*\.(js|jsx|cjs|mjs)$
+        pass_filenames: true

package/.prettierrc.cjs

@@ -1,13 +1,13 @@
 module.exports = {
+  arrowParens: 'always',
+  bracketSameLine: false,
+  bracketSpacing: false,
+  endOfLine: 'lf',
   printWidth: 80,
-  tabWidth: 2,
-  useTabs: false,
   semi: true,
+  singleAttributePerLine: false,
   singleQuote: true,
+  tabWidth: 2,
   trailingComma: 'none',
-  bracketSpacing: false,
-  bracketSameLine: false,
-  arrowParens: 'always',
-  endOfLine: 'lf',
-  parser: 'espree'
+  useTabs: false
 };

package/Makefile

@@ -0,0 +1,38 @@
+ifneq ($(shell which tput),)
+	ifneq ($(TERM),)
+		RED    := $(shell tput setaf 1)
+		GREEN  := $(shell tput setaf 2)
+		YELLOW := $(shell tput setaf 3)
+		CYAN   := $(shell tput setaf 6)
+		RESET  := $(shell tput sgr0)
+	endif
+endif
+
+format:
+	@echo "Formatting code..."
+	pre-commit run format-js --all-files
+
+bump-version:
+	@BUMP=$(word 2,$(MAKECMDGOALS)); \
+	VALID_BUMP="major minor patch premajor preminor prepatch prerelease"; \
+	if [ -z "$$BUMP" ]; then \
+		echo "$(RED)Error: Bump is required.$(RESET)"; \
+		echo "Usage: make bump-version [major|minor|patch|premajor|preminor|prepatch|prerelease]"; \
+		exit 1; \
+	fi; \
+	if ! echo "$$VALID_BUMP" | grep -qw "$$BUMP"; then \
+		echo "$(RED)Error: Invalid bump '$$BUMP'.$(RESET)"; \
+		echo "Must be one of: $(CYAN)$$VALID_BUMP$(RESET)"; \
+		exit 1; \
+	fi; \
+	npm version $$BUMP;
+
+create-release:
+	@VERSION=$$(npm pkg get version --browser=false | tr -d '"'); \
+	gh release create $$VERSION;
+
+# Prevent make from treating arguments to bump-version as targets
+ifeq (bump-version,$(firstword $(MAKECMDGOALS)))
+%:
+	@:
+endif

package/README.md

@@ -1,4 +1,4 @@
-# Penrose [![CircleCI](https://circleci.com/gh/netbek/penrose.svg?style=svg)](https://circleci.com/gh/netbek/penrose)
+# Penrose
 
 Build derivative images.
 

package/devenv.lock

@@ -0,0 +1,123 @@
+{
+  "nodes": {
+    "devenv": {
+      "locked": {
+        "dir": "src/modules",
+        "lastModified": 1770833792,
+        "owner": "cachix",
+        "repo": "devenv",
+        "rev": "1e5f2d43973d3f4a6e7bf3e13fd39e0c4d9af3de",
+        "type": "github"
+      },
+      "original": {
+        "dir": "src/modules",
+        "owner": "cachix",
+        "repo": "devenv",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767039857,
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1770726378,
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "5eaaedde414f6eb1aea8b8525c466dc37bba95ae",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "git-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1762808025,
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "cb5e3fdca1de58ccbc3ef53de65bd372b48f567c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "inputs": {
+        "nixpkgs-src": "nixpkgs-src"
+      },
+      "locked": {
+        "lastModified": 1770434727,
+        "owner": "cachix",
+        "repo": "devenv-nixpkgs",
+        "rev": "8430f16a39c27bdeef236f1eeb56f0b51b33d348",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "ref": "rolling",
+        "repo": "devenv-nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1769922788,
+        "narHash": "sha256-H3AfG4ObMDTkTJYkd8cz1/RbY9LatN5Mk4UF48VuSXc=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "207d15f1a6603226e1e223dc79ac29c7846da32e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "devenv": "devenv",
+        "git-hooks": "git-hooks",
+        "nixpkgs": "nixpkgs",
+        "pre-commit-hooks": [
+          "git-hooks"
+        ]
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

package/devenv.nix

@@ -0,0 +1,39 @@
+{
+  pkgs,
+  lib,
+  config,
+  inputs,
+  ...
+}:
+{
+  env.DEVENV_TASKS_QUIET = 1;
+
+  packages = with pkgs; [
+    graphicsmagick
+    nixfmt
+    pre-commit
+  ];
+
+  languages = {
+    javascript = {
+      enable = true;
+      package = pkgs.nodejs_24;
+      npm = {
+        enable = true;
+        install = {
+          enable = true;
+        };
+      };
+    };
+  };
+
+  dotenv = {
+    disableHint = true;
+  };
+
+  enterShell = ''
+    if [ -d ".git" ]; then
+      pre-commit install --overwrite > /dev/null 2>&1
+    fi
+  '';
+}

package/devenv.yaml

@@ -0,0 +1,4 @@
+# yaml-language-server: $schema=https://devenv.sh/devenv.schema.json
+inputs:
+  nixpkgs:
+    url: github:cachix/devenv-nixpkgs/rolling

package/lib/penrose.js

@@ -1,5 +1,4 @@
 const _ = require('lodash');
-const canonStringify = require('canonical-json/index2');
 const chalk = require('chalk');
 const cheerio = require('cheerio');
 const crypto = require('crypto');
@@ -10,6 +9,7 @@ const pkg = require('../package.json');
 const Promise = require('bluebird');
 const replaceExt = require('replace-ext');
 const sharp = require('sharp');
+const stringify = require('fast-json-stable-stringify');
 
 /**
  * Constants
@@ -497,7 +497,7 @@ Penrose.prototype = {
     );
 
     const data =
-      pkg.version + ';' + canonStringify(config) + ';' + args.input.trim();
+      pkg.version + ';' + stringify(config) + ';' + args.input.trim();
 
     return crypto.createHash('md5').update(data).digest('hex');
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "penrose",
-  "version": "0.2.44",
+  "version": "0.2.46",
   "description": "Build derivative images",
   "main": "lib/penrose.js",
   "repository": {
@@ -20,32 +20,34 @@
     "url": "https://github.com/netbek/penrose/issues"
   },
   "dependencies": {
-    "@babel/core": "7.26.0",
+    "@babel/core": "7.29.0",
     "babel-eslint": "10.1.0",
     "babel-loader": "8.4.1",
     "babel-plugin-lodash": "3.3.4",
     "babel-plugin-transform-class-properties": "6.24.1",
     "bluebird": "3.7.2",
-    "canonical-json": "0.0.4",
     "chalk": "4.1.2",
-    "cheerio": "0.22.0",
-    "eslint": "8.57.1",
-    "eslint-config-prettier": "9.1.0",
-    "eslint-plugin-prettier": "5.2.1",
-    "espree": "10.3.0",
-    "fs-extra": "11.2.0",
-    "glob": "7.2.3",
-    "glob-promise": "4.2.2",
-    "lodash": "4.17.21",
+    "cheerio": "1.2.0",
+    "fast-json-stable-stringify": "2.1.0",
+    "fs-extra": "11.3.5",
+    "glob-promise": "6.0.7",
+    "lodash": "4.18.1",
     "lodash-webpack-plugin": "0.11.6",
     "mathjax": "2.7.9",
     "mathjax-node": "0.5.2",
     "phantomjs-prebuilt": "2.1.16",
-    "prettier": "3.3.3",
+    "prettier": "3.8.3",
     "replace-ext": "2.0.0",
-    "sharp": "0.33.5"
+    "sharp": "0.34.5"
   },
   "devDependencies": {
-    "vitest": "2.1.5"
+    "@typescript-eslint/eslint-plugin": "8.59.2",
+    "@typescript-eslint/parser": "8.59.2",
+    "eslint": "8.57.1",
+    "eslint-config-prettier": "9.1.2",
+    "eslint-plugin-prettier": "5.5.5",
+    "npm-check-updates": "22.1.1",
+    "typescript": "6.0.3",
+    "vitest": "3.2.4"
   }
 }

package/.circleci/config.yml

@@ -1,17 +0,0 @@
-version: 2
-jobs:
-  build:
-    docker:
-      - image: cimg/node:20.10.0-browsers
-    steps:
-      - checkout
-      - run:
-          name: Install dependencies
-          command: |
-            sudo npm install -g bower grunt-cli gulp-cli
-            sudo apt-get update -qq
-            sudo apt-get install -y -qq graphicsmagick
-            npm ci
-      - run:
-          name: Run tests
-          command: npm test