From f55b437037c284ccf64a8e27123924dbd749e862 Mon Sep 17 00:00:00 2001 From: Yura Dupyn <2153100+omedusyo@users.noreply.github.com> Date: Sat, 25 Apr 2026 01:10:49 +0200 Subject: [PATCH] UI and a Lisp experiment --- index.html | 2 +- libs/source-region | 2 +- package-lock.json | 1331 +++++++++++++++++++++++++++++++++++- package.json | 6 +- src/main.ts | 81 +-- src/main.tsx | 5 + src/parser.experiments.ts | 52 ++ src/parser.ts | 316 +++++++++ src/style.css | 4 + src/styles/base.css | 51 ++ src/styles/layout.css | 99 +++ src/styles/source-grid.css | 118 ++++ src/styles/syntax-pane.css | 66 ++ src/syntax.ts | 59 ++ src/ui/App.tsx | 127 ++++ src/ui/Pane.tsx | 50 ++ src/ui/SourceGrid.tsx | 261 +++++++ src/ui/SyntaxPane.tsx | 126 ++++ src/ui/format.ts | 49 ++ src/ui/types.ts | 6 + src/vite-env.d.ts | 3 + tmp_repl/tmp_repl.md | 16 +- tsconfig.json | 3 + vite.config.ts | 2 + 24 files changed, 2746 insertions(+), 89 deletions(-) create mode 100644 src/main.tsx create mode 100644 src/parser.experiments.ts create mode 100644 src/parser.ts create mode 100644 src/styles/base.css create mode 100644 src/styles/layout.css create mode 100644 src/styles/source-grid.css create mode 100644 src/styles/syntax-pane.css create mode 100644 src/syntax.ts create mode 100644 src/ui/App.tsx create mode 100644 src/ui/Pane.tsx create mode 100644 src/ui/SourceGrid.tsx create mode 100644 src/ui/SyntaxPane.tsx create mode 100644 src/ui/format.ts create mode 100644 src/ui/types.ts create mode 100644 src/vite-env.d.ts diff --git a/index.html b/index.html index 69d8ddc..bf1dba2 100644 --- a/index.html +++ b/index.html @@ -8,6 +8,6 @@
- + diff --git a/libs/source-region b/libs/source-region index 000949f..8471c60 160000 --- a/libs/source-region +++ b/libs/source-region @@ -1 +1 @@ -Subproject commit 000949f3c30c73e645ae91b64f500dd1f02a65d8 +Subproject commit 8471c60967eca6178d25fa3221035286a19856f2 diff --git a/package-lock.json b/package-lock.json index 4b01478..51a4d49 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,8 +8,277 @@ "name": "tokenizer", "version": "0.0.0", "devDependencies": { + "solid-js": "^1.9.12", + "tsx": "^4.21.0", "typescript": "~6.0.2", - "vite": "^8.0.9" + "vite": "^8.0.9", + "vite-plugin-solid": "^2.11.12" + } + }, + "node_modules/@babel/code-frame": { + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz", + "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.28.5", + "js-tokens": "^4.0.0", + "picocolors": "^1.1.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/compat-data": { + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.0.tgz", + "integrity": "sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/core": { + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.0.tgz", + "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.29.0", + "@babel/generator": "^7.29.0", + "@babel/helper-compilation-targets": "^7.28.6", + "@babel/helper-module-transforms": "^7.28.6", + "@babel/helpers": "^7.28.6", + "@babel/parser": "^7.29.0", + "@babel/template": "^7.28.6", + "@babel/traverse": "^7.29.0", + "@babel/types": "^7.29.0", + "@jridgewell/remapping": "^2.3.5", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "node_modules/@babel/generator": { + "version": "7.29.1", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.1.tgz", + "integrity": "sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.29.0", + "@babel/types": "^7.29.0", + "@jridgewell/gen-mapping": "^0.3.12", + "@jridgewell/trace-mapping": "^0.3.28", + "jsesc": "^3.0.2" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-compilation-targets": { + "version": "7.28.6", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.28.6.tgz", + "integrity": "sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/compat-data": "^7.28.6", + "@babel/helper-validator-option": "^7.27.1", + "browserslist": "^4.24.0", + "lru-cache": "^5.1.1", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-globals": { + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz", + "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-imports": { + "version": "7.28.6", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.28.6.tgz", + "integrity": "sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/traverse": "^7.28.6", + "@babel/types": "^7.28.6" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-transforms": { + "version": "7.28.6", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.6.tgz", + "integrity": "sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-module-imports": "^7.28.6", + "@babel/helper-validator-identifier": "^7.28.5", + "@babel/traverse": "^7.28.6" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/helper-plugin-utils": { + "version": "7.28.6", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.28.6.tgz", + "integrity": "sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-string-parser": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz", + "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.28.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz", + "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-option": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz", + "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helpers": { + "version": "7.29.2", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.2.tgz", + "integrity": "sha512-HoGuUs4sCZNezVEKdVcwqmZN8GoHirLUcLaYVNBK2J0DadGtdcqgr3BCbvH8+XUo4NGjNl3VOtSjEKNzqfFgKw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/template": "^7.28.6", + "@babel/types": "^7.29.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/parser": { + "version": "7.29.2", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.2.tgz", + "integrity": "sha512-4GgRzy/+fsBa72/RZVJmGKPmZu9Byn8o4MoLpmNe1m8ZfYnz5emHLQz3U4gLud6Zwl0RZIcgiLD7Uq7ySFuDLA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.29.0" + }, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/plugin-syntax-jsx": { + "version": "7.28.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.28.6.tgz", + "integrity": "sha512-wgEmr06G6sIpqr8YDwA2dSRTE3bJ+V0IfpzfSY3Lfgd7YWOaAdlykvJi13ZKBt8cZHfgH1IXN+CL656W3uUa4w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.28.6" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/template": { + "version": "7.28.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.28.6.tgz", + "integrity": "sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.28.6", + "@babel/parser": "^7.28.6", + "@babel/types": "^7.28.6" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse": { + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.0.tgz", + "integrity": "sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.29.0", + "@babel/generator": "^7.29.0", + "@babel/helper-globals": "^7.28.0", + "@babel/parser": "^7.29.0", + "@babel/template": "^7.28.6", + "@babel/types": "^7.29.0", + "debug": "^4.3.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/types": { + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz", + "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^7.27.1", + "@babel/helper-validator-identifier": "^7.28.5" + }, + "engines": { + "node": ">=6.9.0" } }, "node_modules/@emnapi/core": { @@ -46,6 +315,498 @@ "tslib": "^2.4.0" } }, + "node_modules/@esbuild/aix-ppc64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.7.tgz", + "integrity": "sha512-EKX3Qwmhz1eMdEJokhALr0YiD0lhQNwDqkPYyPhiSwKrh7/4KRjQc04sZ8db+5DVVnZ1LmbNDI1uAMPEUBnQPg==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-arm": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.7.tgz", + "integrity": "sha512-jbPXvB4Yj2yBV7HUfE2KHe4GJX51QplCN1pGbYjvsyCZbQmies29EoJbkEc+vYuU5o45AfQn37vZlyXy4YJ8RQ==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.7.tgz", + "integrity": "sha512-62dPZHpIXzvChfvfLJow3q5dDtiNMkwiRzPylSCfriLvZeq0a1bWChrGx/BbUbPwOrsWKMn8idSllklzBy+dgQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.7.tgz", + "integrity": "sha512-x5VpMODneVDb70PYV2VQOmIUUiBtY3D3mPBG8NxVk5CogneYhkR7MmM3yR/uMdITLrC1ml/NV1rj4bMJuy9MCg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/darwin-arm64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.7.tgz", + "integrity": "sha512-5lckdqeuBPlKUwvoCXIgI2D9/ABmPq3Rdp7IfL70393YgaASt7tbju3Ac+ePVi3KDH6N2RqePfHnXkaDtY9fkw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.7.tgz", + "integrity": "sha512-rYnXrKcXuT7Z+WL5K980jVFdvVKhCHhUwid+dDYQpH+qu+TefcomiMAJpIiC2EM3Rjtq0sO3StMV/+3w3MyyqQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.7.tgz", + "integrity": "sha512-B48PqeCsEgOtzME2GbNM2roU29AMTuOIN91dsMO30t+Ydis3z/3Ngoj5hhnsOSSwNzS+6JppqWsuhTp6E82l2w==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.7.tgz", + "integrity": "sha512-jOBDK5XEjA4m5IJK3bpAQF9/Lelu/Z9ZcdhTRLf4cajlB+8VEhFFRjWgfy3M1O4rO2GQ/b2dLwCUGpiF/eATNQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.7.tgz", + "integrity": "sha512-RkT/YXYBTSULo3+af8Ib0ykH8u2MBh57o7q/DAs3lTJlyVQkgQvlrPTnjIzzRPQyavxtPtfg0EopvDyIt0j1rA==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.7.tgz", + "integrity": "sha512-RZPHBoxXuNnPQO9rvjh5jdkRmVizktkT7TCDkDmQ0W2SwHInKCAV95GRuvdSvA7w4VMwfCjUiPwDi0ZO6Nfe9A==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.7.tgz", + "integrity": "sha512-GA48aKNkyQDbd3KtkplYWT102C5sn/EZTY4XROkxONgruHPU72l+gW+FfF8tf2cFjeHaRbWpOYa/uRBz/Xq1Pg==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.7.tgz", + "integrity": "sha512-a4POruNM2oWsD4WKvBSEKGIiWQF8fZOAsycHOt6JBpZ+JN2n2JH9WAv56SOyu9X5IqAjqSIPTaJkqN8F7XOQ5Q==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.7.tgz", + "integrity": "sha512-KabT5I6StirGfIz0FMgl1I+R1H73Gp0ofL9A3nG3i/cYFJzKHhouBV5VWK1CSgKvVaG4q1RNpCTR2LuTVB3fIw==", + "cpu": [ + "mips64el" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.7.tgz", + "integrity": "sha512-gRsL4x6wsGHGRqhtI+ifpN/vpOFTQtnbsupUF5R5YTAg+y/lKelYR1hXbnBdzDjGbMYjVJLJTd2OFmMewAgwlQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.7.tgz", + "integrity": "sha512-hL25LbxO1QOngGzu2U5xeXtxXcW+/GvMN3ejANqXkxZ/opySAZMrc+9LY/WyjAan41unrR3YrmtTsUpwT66InQ==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.7.tgz", + "integrity": "sha512-2k8go8Ycu1Kb46vEelhu1vqEP+UeRVj2zY1pSuPdgvbd5ykAw82Lrro28vXUrRmzEsUV0NzCf54yARIK8r0fdw==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-x64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.7.tgz", + "integrity": "sha512-hzznmADPt+OmsYzw1EE33ccA+HPdIqiCRq7cQeL1Jlq2gb1+OyWBkMCrYGBJ+sxVzve2ZJEVeePbLM2iEIZSxA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/netbsd-arm64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.7.tgz", + "integrity": "sha512-b6pqtrQdigZBwZxAn1UpazEisvwaIDvdbMbmrly7cDTMFnw/+3lVxxCTGOrkPVnsYIosJJXAsILG9XcQS+Yu6w==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.7.tgz", + "integrity": "sha512-OfatkLojr6U+WN5EDYuoQhtM+1xco+/6FSzJJnuWiUw5eVcicbyK3dq5EeV/QHT1uy6GoDhGbFpprUiHUYggrw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-arm64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.7.tgz", + "integrity": "sha512-AFuojMQTxAz75Fo8idVcqoQWEHIXFRbOc1TrVcFSgCZtQfSdc1RXgB3tjOn/krRHENUB4j00bfGjyl2mJrU37A==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.7.tgz", + "integrity": "sha512-+A1NJmfM8WNDv5CLVQYJ5PshuRm/4cI6WMZRg1by1GwPIQPCTs1GLEUHwiiQGT5zDdyLiRM/l1G0Pv54gvtKIg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openharmony-arm64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.7.tgz", + "integrity": "sha512-+KrvYb/C8zA9CU/g0sR6w2RBw7IGc5J2BPnc3dYc5VJxHCSF1yNMxTV5LQ7GuKteQXZtspjFbiuW5/dOj7H4Yw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openharmony" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.7.tgz", + "integrity": "sha512-ikktIhFBzQNt/QDyOL580ti9+5mL/YZeUPKU2ivGtGjdTYoqz6jObj6nOMfhASpS4GU4Q/Clh1QtxWAvcYKamA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.7.tgz", + "integrity": "sha512-7yRhbHvPqSpRUV7Q20VuDwbjW5kIMwTHpptuUzV+AA46kiPze5Z7qgt6CLCK3pWFrHeNfDd1VKgyP4O+ng17CA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.7.tgz", + "integrity": "sha512-SmwKXe6VHIyZYbBLJrhOoCJRB/Z1tckzmgTLfFYOfpMAx63BJEaL9ExI8x7v0oAO3Zh6D/Oi1gVxEYr5oUCFhw==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.7.tgz", + "integrity": "sha512-56hiAJPhwQ1R4i+21FVF7V8kSD5zZTdHcVuRFMW0hn753vVfQN8xlx4uOPT4xoGH0Z/oVATuR82AiqSTDIpaHg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.13", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", + "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.5.0", + "@jridgewell/trace-mapping": "^0.3.24" + } + }, + "node_modules/@jridgewell/remapping": { + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz", + "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", + "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", + "dev": true, + "license": "MIT" + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.31", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", + "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, "node_modules/@napi-rs/wasm-runtime": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.4.tgz", @@ -350,6 +1111,200 @@ "tslib": "^2.4.0" } }, + "node_modules/@types/babel__core": { + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", + "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" + } + }, + "node_modules/@types/babel__generator": { + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.27.0.tgz", + "integrity": "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__template": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz", + "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__traverse": { + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.28.0.tgz", + "integrity": "sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.28.2" + } + }, + "node_modules/babel-plugin-jsx-dom-expressions": { + "version": "0.40.6", + "resolved": "https://registry.npmjs.org/babel-plugin-jsx-dom-expressions/-/babel-plugin-jsx-dom-expressions-0.40.6.tgz", + "integrity": "sha512-v3P1MW46Lm7VMpAkq0QfyzLWWkC8fh+0aE5Km4msIgDx5kjenHU0pF2s+4/NH8CQn/kla6+Hvws+2AF7bfV5qQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-module-imports": "7.18.6", + "@babel/plugin-syntax-jsx": "^7.18.6", + "@babel/types": "^7.20.7", + "html-entities": "2.3.3", + "parse5": "^7.1.2" + }, + "peerDependencies": { + "@babel/core": "^7.20.12" + } + }, + "node_modules/babel-plugin-jsx-dom-expressions/node_modules/@babel/helper-module-imports": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz", + "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.18.6" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/babel-preset-solid": { + "version": "1.9.12", + "resolved": "https://registry.npmjs.org/babel-preset-solid/-/babel-preset-solid-1.9.12.tgz", + "integrity": "sha512-LLqnuKVDlKpyBlMPcH6qEvs/wmS9a+NczppxJ3ryS/c0O5IiSFOIBQi9GzyiGDSbcJpx4Gr87jyFTos1MyEuWg==", + "dev": true, + "license": "MIT", + "dependencies": { + "babel-plugin-jsx-dom-expressions": "^0.40.6" + }, + "peerDependencies": { + "@babel/core": "^7.0.0", + "solid-js": "^1.9.12" + }, + "peerDependenciesMeta": { + "solid-js": { + "optional": true + } + } + }, + "node_modules/baseline-browser-mapping": { + "version": "2.10.21", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.21.tgz", + "integrity": "sha512-Q+rUQ7Uz8AHM7DEaNdwvfFCTq7a43lNTzuS94eiWqwyxfV/wJv+oUivef51T91mmRY4d4A1u9rcSvkeufCVXlA==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "baseline-browser-mapping": "dist/cli.cjs" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/browserslist": { + "version": "4.28.2", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.2.tgz", + "integrity": "sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "baseline-browser-mapping": "^2.10.12", + "caniuse-lite": "^1.0.30001782", + "electron-to-chromium": "^1.5.328", + "node-releases": "^2.0.36", + "update-browserslist-db": "^1.2.3" + }, + "bin": { + "browserslist": "cli.js" + }, + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + } + }, + "node_modules/caniuse-lite": { + "version": "1.0.30001790", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001790.tgz", + "integrity": "sha512-bOoxfJPyYo+ds6W0YfptaCWbFnJYjh2Y1Eow5lRv+vI2u8ganPZqNm1JwNh0t2ELQCqIWg4B3dWEusgAmsoyOw==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "CC-BY-4.0" + }, + "node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true, + "license": "MIT" + }, + "node_modules/csstype": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz", + "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/debug": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, "node_modules/detect-libc": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz", @@ -360,6 +1315,78 @@ "node": ">=8" } }, + "node_modules/electron-to-chromium": { + "version": "1.5.344", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.344.tgz", + "integrity": "sha512-4MxfbmNDm+KPh066EZy+eUnkcDPcZ35wNmOWzFuh/ijvHsve6kbLTLURy88uCNK5FbpN+yk2nQY6BYh1GEt+wg==", + "dev": true, + "license": "ISC" + }, + "node_modules/entities": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz", + "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/esbuild": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.7.tgz", + "integrity": "sha512-IxpibTjyVnmrIQo5aqNpCgoACA/dTKLTlhMHihVHhdkxKyPO1uBBthumT0rdHmcsk9uMonIWS0m4FljWzILh3w==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=18" + }, + "optionalDependencies": { + "@esbuild/aix-ppc64": "0.27.7", + "@esbuild/android-arm": "0.27.7", + "@esbuild/android-arm64": "0.27.7", + "@esbuild/android-x64": "0.27.7", + "@esbuild/darwin-arm64": "0.27.7", + "@esbuild/darwin-x64": "0.27.7", + "@esbuild/freebsd-arm64": "0.27.7", + "@esbuild/freebsd-x64": "0.27.7", + "@esbuild/linux-arm": "0.27.7", + "@esbuild/linux-arm64": "0.27.7", + "@esbuild/linux-ia32": "0.27.7", + "@esbuild/linux-loong64": "0.27.7", + "@esbuild/linux-mips64el": "0.27.7", + "@esbuild/linux-ppc64": "0.27.7", + "@esbuild/linux-riscv64": "0.27.7", + "@esbuild/linux-s390x": "0.27.7", + "@esbuild/linux-x64": "0.27.7", + "@esbuild/netbsd-arm64": "0.27.7", + "@esbuild/netbsd-x64": "0.27.7", + "@esbuild/openbsd-arm64": "0.27.7", + "@esbuild/openbsd-x64": "0.27.7", + "@esbuild/openharmony-arm64": "0.27.7", + "@esbuild/sunos-x64": "0.27.7", + "@esbuild/win32-arm64": "0.27.7", + "@esbuild/win32-ia32": "0.27.7", + "@esbuild/win32-x64": "0.27.7" + } + }, + "node_modules/escalade": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/fdir": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", @@ -393,6 +1420,82 @@ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, + "node_modules/gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/get-tsconfig": { + "version": "4.14.0", + "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.14.0.tgz", + "integrity": "sha512-yTb+8DXzDREzgvYmh6s9vHsSVCHeC0G3PI5bEXNBHtmshPnO+S5O7qgLEOn0I5QvMy6kpZN8K1NKGyilLb93wA==", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve-pkg-maps": "^1.0.0" + }, + "funding": { + "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1" + } + }, + "node_modules/html-entities": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz", + "integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==", + "dev": true, + "license": "MIT" + }, + "node_modules/is-what": { + "version": "4.1.16", + "resolved": "https://registry.npmjs.org/is-what/-/is-what-4.1.16.tgz", + "integrity": "sha512-ZhMwEosbFJkA0YhFnNDgTM4ZxDRsS6HqTo7qsZM08fehyRYIYa0yHu5R6mgo1n/8MgaPBXiPimPD77baVFYg+A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12.13" + }, + "funding": { + "url": "https://github.com/sponsors/mesqueeb" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/jsesc": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", + "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==", + "dev": true, + "license": "MIT", + "bin": { + "jsesc": "bin/jsesc" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true, + "license": "MIT", + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/lightningcss": { "version": "1.32.0", "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.32.0.tgz", @@ -654,6 +1757,39 @@ "url": "https://opencollective.com/parcel" } }, + "node_modules/lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "license": "ISC", + "dependencies": { + "yallist": "^3.0.2" + } + }, + "node_modules/merge-anything": { + "version": "5.1.7", + "resolved": "https://registry.npmjs.org/merge-anything/-/merge-anything-5.1.7.tgz", + "integrity": "sha512-eRtbOb1N5iyH0tkQDAoQ4Ipsp/5qSR79Dzrz8hEPxRX10RWWR/iQXdoKmBSRCThY1Fh5EhISDtpSc93fpxUniQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-what": "^4.1.8" + }, + "engines": { + "node": ">=12.13" + }, + "funding": { + "url": "https://github.com/sponsors/mesqueeb" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, + "license": "MIT" + }, "node_modules/nanoid": { "version": "3.3.11", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", @@ -673,6 +1809,26 @@ "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" } }, + "node_modules/node-releases": { + "version": "2.0.38", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.38.tgz", + "integrity": "sha512-3qT/88Y3FbH/Kx4szpQQ4HzUbVrHPKTLVpVocKiLfoYvw9XSGOX2FmD2d6DrXbVYyAQTF2HeF6My8jmzx7/CRw==", + "dev": true, + "license": "MIT" + }, + "node_modules/parse5": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.3.0.tgz", + "integrity": "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==", + "dev": true, + "license": "MIT", + "dependencies": { + "entities": "^6.0.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, "node_modules/picocolors": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", @@ -722,6 +1878,16 @@ "node": "^10 || ^12 || >=14" } }, + "node_modules/resolve-pkg-maps": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", + "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" + } + }, "node_modules/rolldown": { "version": "1.0.0-rc.16", "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.0.0-rc.16.tgz", @@ -756,6 +1922,66 @@ "@rolldown/binding-win32-x64-msvc": "1.0.0-rc.16" } }, + "node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/seroval": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/seroval/-/seroval-1.5.2.tgz", + "integrity": "sha512-xcRN39BdsnO9Tf+VzsE7b3JyTJASItIV1FVFewJKCFcW4s4haIKS3e6vj8PGB9qBwC7tnuOywQMdv5N4qkzi7Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + } + }, + "node_modules/seroval-plugins": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/seroval-plugins/-/seroval-plugins-1.5.2.tgz", + "integrity": "sha512-qpY0Cl+fKYFn4GOf3cMiq6l72CpuVaawb6ILjubOQ+diJ54LfOWaSSPsaswN8DRPIPW4Yq+tE1k5aKd7ILyaFg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "seroval": "^1.0" + } + }, + "node_modules/solid-js": { + "version": "1.9.12", + "resolved": "https://registry.npmjs.org/solid-js/-/solid-js-1.9.12.tgz", + "integrity": "sha512-QzKaSJq2/iDrWR1As6MHZQ8fQkdOBf8GReYb7L5iKwMGceg7HxDcaOHk0at66tNgn9U2U7dXo8ZZpLIAmGMzgw==", + "dev": true, + "license": "MIT", + "dependencies": { + "csstype": "^3.1.0", + "seroval": "~1.5.0", + "seroval-plugins": "~1.5.0" + } + }, + "node_modules/solid-refresh": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/solid-refresh/-/solid-refresh-0.6.3.tgz", + "integrity": "sha512-F3aPsX6hVw9ttm5LYlth8Q15x6MlI/J3Dn+o3EQyRTtTxidepSTwAYdozt01/YA+7ObcciagGEyXIopGZzQtbA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/generator": "^7.23.6", + "@babel/helper-module-imports": "^7.22.15", + "@babel/types": "^7.23.6" + }, + "peerDependencies": { + "solid-js": "^1.3" + } + }, "node_modules/source-map-js": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", @@ -791,6 +2017,26 @@ "license": "0BSD", "optional": true }, + "node_modules/tsx": { + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.21.0.tgz", + "integrity": "sha512-5C1sg4USs1lfG0GFb2RLXsdpXqBSEhAaA/0kPL01wxzpMqLILNxIxIOKiILz+cdg/pLnOUxFYOR5yhHU666wbw==", + "dev": true, + "license": "MIT", + "dependencies": { + "esbuild": "~0.27.0", + "get-tsconfig": "^4.7.5" + }, + "bin": { + "tsx": "dist/cli.mjs" + }, + "engines": { + "node": ">=18.0.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.3" + } + }, "node_modules/typescript": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz", @@ -805,6 +2051,37 @@ "node": ">=14.17" } }, + "node_modules/update-browserslist-db": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz", + "integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "escalade": "^3.2.0", + "picocolors": "^1.1.1" + }, + "bin": { + "update-browserslist-db": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" + } + }, "node_modules/vite": { "version": "8.0.9", "resolved": "https://registry.npmjs.org/vite/-/vite-8.0.9.tgz", @@ -882,6 +2159,58 @@ "optional": true } } + }, + "node_modules/vite-plugin-solid": { + "version": "2.11.12", + "resolved": "https://registry.npmjs.org/vite-plugin-solid/-/vite-plugin-solid-2.11.12.tgz", + "integrity": "sha512-FgjPcx2OwX9h6f28jli7A4bG7PP3te8uyakE5iqsmpq3Jqi1TWLgSroC9N6cMfGRU2zXsl4Q6ISvTr2VL0QHpA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/core": "^7.23.3", + "@types/babel__core": "^7.20.4", + "babel-preset-solid": "^1.8.4", + "merge-anything": "^5.1.7", + "solid-refresh": "^0.6.3", + "vitefu": "^1.0.4" + }, + "peerDependencies": { + "@testing-library/jest-dom": "^5.16.6 || ^5.17.0 || ^6.*", + "solid-js": "^1.7.2", + "vite": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "@testing-library/jest-dom": { + "optional": true + } + } + }, + "node_modules/vitefu": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/vitefu/-/vitefu-1.1.3.tgz", + "integrity": "sha512-ub4okH7Z5KLjb6hDyjqrGXqWtWvoYdU3IGm/NorpgHncKoLTCfRIbvlhBm7r0YstIaQRYlp4yEbFqDcKSzXSSg==", + "dev": true, + "license": "MIT", + "workspaces": [ + "tests/deps/*", + "tests/projects/*", + "tests/projects/workspace/packages/*" + ], + "peerDependencies": { + "vite": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "vite": { + "optional": true + } + } + }, + "node_modules/yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true, + "license": "ISC" } } } diff --git a/package.json b/package.json index 80f05d1..9b852d4 100644 --- a/package.json +++ b/package.json @@ -6,10 +6,14 @@ "scripts": { "dev": "vite", "build": "tsc && vite build", + "parser:experiments": "tsx src/parser.experiments.ts", "preview": "vite preview" }, "devDependencies": { + "solid-js": "^1.9.12", + "tsx": "^4.21.0", "typescript": "~6.0.2", - "vite": "^8.0.9" + "vite": "^8.0.9", + "vite-plugin-solid": "^2.11.12" } } diff --git a/src/main.ts b/src/main.ts index 2ac5fc1..c321126 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,77 +1,4 @@ -import './style.css' -import { SourceText, SourceRegion, sourceText } from 'source-region'; -import type { SourceLocation, Span } from 'source-region'; - - -type Expr = -| { tag: "literal", value: Literal } -| { tag: "list", values: Expr[] } - -namespace Expr { - export function number(value: number): Expr { - return { tag: "literal", value: { tag: "number", value } }; - } - export function identifier(value: Identifier): Expr { - return { tag: "literal", value: { tag: "identifier", value } }; - } - export function list(values: Expr[]): Expr { - return { tag: "list", values }; - } - - export function show(e: Expr): string { - switch (e.tag) { - case "literal": - return showLiteral(e.value); - case "list": - return `(${e.values.map(show).join(" ")})`; - } - } - - function showLiteral(e: Literal): string { - switch (e.tag) { - case "number": - return `${e.value}`; - case "identifier": - return `${e.value}`; - } - } -} - -type Literal = -| { tag: "number", value: number } -| { tag: "identifier", value: Identifier } - -type Identifier = string - - -// === Examples === - -function example00() { - const v: Expr = Expr.list([Expr.identifier("f"), Expr.number(123), Expr.number(512)]); - console.log(v); - console.log(Expr.show(v)); -} - -function example01() { - const str = `hello, world! -foo -bar `; - - const source = sourceText(str); - const region = source.fullRegion(); - - console.log(region); - console.log(region.lineCount); - region.forEachLine((span, lineNo) => { - console.log(lineNo, region.stringOf(span)); - }); -} - -[ - example00, - example01, -].forEach((f, i) => { - console.log(`====${i}===`); - f(); -}) - +export { parseDocument } from './parser'; +export type { FoundSyntax, ParseDocumentResult, ParseError } from './parser'; +export { ConcreteSyntax, Expr } from './syntax'; +export type { ConcreteSyntax as ConcreteSyntaxNode, Expr as ExprNode } from './syntax'; diff --git a/src/main.tsx b/src/main.tsx new file mode 100644 index 0000000..108bf1f --- /dev/null +++ b/src/main.tsx @@ -0,0 +1,5 @@ +import { render } from 'solid-js/web'; +import './style.css'; +import { App } from './ui/App'; + +render(() => , document.getElementById('app') as HTMLElement); diff --git a/src/parser.experiments.ts b/src/parser.experiments.ts new file mode 100644 index 0000000..96f283c --- /dev/null +++ b/src/parser.experiments.ts @@ -0,0 +1,52 @@ +import { sourceText } from 'source-region'; +import { parseDocument } from './parser'; +import { Expr } from './syntax'; + +// === Experiments === + +function experiment00_emptyDocument(): void { + logParse("empty document", ""); +} + +function experiment01_topLevelExpressions(): void { + logParse("top-level expressions", "foo 123 (bar baz_1 qux-2)"); +} + +function experiment02_nestedLists(): void { + logParse("nested lists", "(define square (_ x) (* x x))"); +} + +function experiment03_unclosedList(): void { + logParse("unclosed list", "(foo 123\n (bar 456)"); +} + +function experiment04_recoverAtDocumentLevel(): void { + logParse("document recovery", "foo ) @@@ (bar 1) 99"); +} + +function experiment05_recoverInsideList(): void { + logParse("list recovery", "(foo @@@ 1 (bar # 2) baz)"); +} + +function experiment06_unicodeSpans(): void { + logParse("unicode spans", "alpha ๐Ÿ’ฅ (beta 2)"); +} + +function logParse(name: string, input: string): void { + const region = sourceText(input).fullRegion(); + const result = parseDocument(region); + console.log(`==== parser:${name} ====`); + console.log(input); + console.log(result.values.map(Expr.show)); + console.dir(result.errors, { depth: null }); +} + +[ + experiment00_emptyDocument, + experiment01_topLevelExpressions, + experiment02_nestedLists, + experiment03_unclosedList, + experiment04_recoverAtDocumentLevel, + experiment05_recoverInsideList, + experiment06_unicodeSpans, +].forEach((experiment) => experiment()); diff --git a/src/parser.ts b/src/parser.ts new file mode 100644 index 0000000..2673f74 --- /dev/null +++ b/src/parser.ts @@ -0,0 +1,316 @@ +import { + CARRIAGE_RETURN, + NEW_LINE, + SPACE, + TAB, + char, + isDigit, +} from 'source-region'; +import type { + CodePoint, + CodePointIndex, + CodePointSpan, + SourceRegion, +} from 'source-region'; +import { ConcreteSyntax } from './syntax'; + +// Whitespace convention: +// - parseDocument consumes leading whitespace before each top-level expression. +// - parseExpr assumes leading whitespace has already been consumed. +// - Successful expression parsers stop immediately after the expression. +// - parseList owns whitespace between list elements and before the closing paren. +// +// Recovery policy: +// - At document level, invalid input is skipped until EOF or a plausible expression +// start. Unexpected ")" is reported and consumed immediately. +// - Inside lists, invalid input is skipped until EOF, ")", or a plausible +// expression start. Recovery always consumes at least one code point when it +// cannot stop at a synchronization point. +// +// Span convention: +// - Parser internals and diagnostics use CodePointSpan. +// - Rendering can convert these later with SourceText.getSpan. + +const OPEN_PAREN = char('('); +const CLOSE_PAREN = char(')'); +const DASH = char('-'); +const UNDERSCORE = char('_'); +const LOWERCASE_A = char('a'); +const LOWERCASE_Z = char('z'); +const UPPERCASE_A = char('A'); +const UPPERCASE_Z = char('Z'); + +export type ParseDocumentResult = { + values: ConcreteSyntax[]; + errors: ParseError[]; +}; + +export type ParseError = +| { + tag: "expected-expression"; + span: CodePointSpan; + found: FoundSyntax; + } +| { + tag: "expected-close-paren"; + span: CodePointSpan; + openParen: CodePointSpan; + found: FoundSyntax; + } +| { + tag: "unexpected-close-paren"; + span: CodePointSpan; + } +| { + tag: "unexpected-code-point"; + span: CodePointSpan; + found: FoundSyntax; + } +| { + tag: "invalid-number"; + span: CodePointSpan; + text: string; + reason: "unsafe-integer"; + }; + +export type FoundSyntax = +| { tag: "code-point"; value: CodePoint; span: CodePointSpan } +| { tag: "eof"; span: CodePointSpan }; + +export function parseDocument(region: SourceRegion): ParseDocumentResult { + return new Parser(region).parseDocument(); +} + +class Parser { + private index: CodePointIndex; + private readonly errors: ParseError[] = []; + + constructor(private readonly region: SourceRegion) { + this.index = region.span.start.index; + } + + parseDocument(): ParseDocumentResult { + const values: ConcreteSyntax[] = []; + + while (true) { + this.skipWhitespace(); + if (this.isAtEnd()) break; + + const before = this.index; + const value = this.parseExpr(); + if (value) { + values.push(value); + continue; + } + + this.recoverDocument(before); + } + + return { values, errors: this.errors }; + } + + private parseExpr(): ConcreteSyntax | undefined { + const cp = this.peek(); + + if (cp === undefined) { + this.errors.push({ + tag: "expected-expression", + span: this.eofSpan(), + found: this.found(), + }); + return undefined; + } + + if (cp === CLOSE_PAREN) { + this.errors.push({ + tag: "unexpected-close-paren", + span: this.currentSpan(), + }); + return undefined; + } + + if (cp === OPEN_PAREN) return this.parseList(); + if (isDigit(cp)) return this.parseNumber(); + if (isIdentifierStart(cp)) return this.parseIdentifier(); + + this.errors.push({ + tag: "expected-expression", + span: this.currentSpan(), + found: this.found(), + }); + return undefined; + } + + private parseList(): ConcreteSyntax | undefined { + const start = this.index; + const openParen = this.currentSpan(); + this.advance(); + + const values: ConcreteSyntax[] = []; + + // === Body Parsing === + while (true) { + this.skipWhitespace(); + + const cp = this.peek(); + if (cp === CLOSE_PAREN) { + this.advance(); + return ConcreteSyntax.list(values, this.spanFrom(start)); + } + + if (cp === undefined) { + this.errors.push({ + tag: "expected-close-paren", + span: this.eofSpan(), + openParen, + found: this.found(), + }); + return ConcreteSyntax.list(values, this.spanFrom(start)); + } + + const before = this.index; + const value = this.parseExpr(); + if (value) { + values.push(value); + continue; + } + + this.recoverList(before); + } + } + + private parseNumber(): ConcreteSyntax { + const start = this.index; + + while (isDigit(this.peekOrInvalid())) { + this.advance(); + } + + const span = this.spanFrom(start); + const text = this.slice(span); + const value = Number(text); + + if (!Number.isSafeInteger(value)) { + this.errors.push({ + tag: "invalid-number", + span, + text, + reason: "unsafe-integer", + }); + } + + return ConcreteSyntax.number(value, span); + } + + private parseIdentifier(): ConcreteSyntax { + const start = this.index; + this.advance(); + + while (isIdentifierPart(this.peekOrInvalid())) { + this.advance(); + } + + const span = this.spanFrom(start); + return ConcreteSyntax.identifier(this.slice(span), span); + } + + private recoverDocument(failedAt: CodePointIndex): void { + if (this.index === failedAt) this.advance(); + + while (!this.isAtEnd()) { + const cp = this.peek(); + if (cp === CLOSE_PAREN) { + this.errors.push({ + tag: "unexpected-close-paren", + span: this.currentSpan(), + }); + this.advance(); + return; + } + + if (isExpressionStart(cp)) return; + this.advance(); + } + } + + private recoverList(failedAt: CodePointIndex): void { + if (this.index === failedAt) this.advance(); + + while (!this.isAtEnd()) { + const cp = this.peek(); + if (cp === CLOSE_PAREN || isExpressionStart(cp)) return; + this.advance(); + } + } + + private skipWhitespace(): void { + while (isWhitespace(this.peekOrInvalid())) { + this.advance(); + } + } + + private peek(): CodePoint | undefined { + if (this.index >= this.region.span.end.index) return undefined; + return this.region.codePointAt(this.index); + } + + private peekOrInvalid(): CodePoint { + return this.peek() ?? -1; + } + + private advance(): CodePoint | undefined { + const cp = this.peek(); + if (cp === undefined) return undefined; + this.index += 1; + return cp; + } + + private isAtEnd(): boolean { + return this.index >= this.region.span.end.index; + } + + private spanFrom(start: CodePointIndex): CodePointSpan { + return { start, end: this.index }; + } + + private currentSpan(): CodePointSpan { + const start = this.index; + const end = this.isAtEnd() ? start : start + 1; + return { start, end }; + } + + private eofSpan(): CodePointSpan { + return { start: this.region.span.end.index, end: this.region.span.end.index }; + } + + private found(): FoundSyntax { + const cp = this.peek(); + if (cp === undefined) return { tag: "eof", span: this.eofSpan() }; + return { tag: "code-point", value: cp, span: this.currentSpan() }; + } + + private slice(span: CodePointSpan): string { + return this.region.source.sliceByCp(span.start, span.end); + } +} + +function isWhitespace(cp: CodePoint): boolean { + return cp === SPACE || cp === TAB || cp === NEW_LINE || cp === CARRIAGE_RETURN; +} + +function isExpressionStart(cp: CodePoint | undefined): boolean { + return cp !== undefined && (cp === OPEN_PAREN || isDigit(cp) || isIdentifierStart(cp)); +} + +function isIdentifierStart(cp: CodePoint): boolean { + return isAsciiLetter(cp) || cp === DASH || cp === UNDERSCORE; +} + +function isIdentifierPart(cp: CodePoint): boolean { + return isIdentifierStart(cp) || isDigit(cp); +} + +function isAsciiLetter(cp: CodePoint): boolean { + return (LOWERCASE_A <= cp && cp <= LOWERCASE_Z) + || (UPPERCASE_A <= cp && cp <= UPPERCASE_Z); +} diff --git a/src/style.css b/src/style.css index e69de29..4147c1a 100644 --- a/src/style.css +++ b/src/style.css @@ -0,0 +1,4 @@ +@import "/src/styles/base.css"; +@import "/src/styles/layout.css"; +@import "/src/styles/syntax-pane.css"; +@import "/src/styles/source-grid.css"; diff --git a/src/styles/base.css b/src/styles/base.css new file mode 100644 index 0000000..d95c1f1 --- /dev/null +++ b/src/styles/base.css @@ -0,0 +1,51 @@ +:root { + color-scheme: dark; + + --hue: 248; + --bg: oklch(14% 0.018 var(--hue)); + --panel: oklch(18% 0.016 var(--hue)); + --panel-raised: oklch(22% 0.018 var(--hue)); + --border: oklch(33% 0.02 var(--hue)); + --border-strong: oklch(46% 0.035 var(--hue)); + --text: oklch(91% 0.012 var(--hue)); + --text-muted: oklch(68% 0.018 var(--hue)); + --text-faint: oklch(52% 0.018 var(--hue)); + --accent: oklch(76% 0.08 var(--hue)); + --accent-bg: oklch(30% 0.04 var(--hue)); + --error: oklch(73% 0.14 28); + --error-bg: oklch(25% 0.045 28); + --source-highlight: oklch(34% 0.06 var(--hue)); + + --font-ui: Inter, ui-sans-serif, system-ui, sans-serif; + --font-mono: "SFMono-Regular", Consolas, "Liberation Mono", monospace; + --font-codepoint: "SFMono-Regular", Consolas, "Liberation Mono", "Noto Color Emoji", "Apple Color Emoji", "Segoe UI Emoji", monospace; + --text-xs: 0.75rem; + --text-sm: 0.875rem; + --text-md: 1rem; + --text-lg: 1.125rem; + + --gap-1: 0.25rem; + --gap-2: 0.5rem; + --gap-3: 0.75rem; + --gap-4: 1rem; + --gap-5: 1.5rem; +} + +* { + box-sizing: border-box; +} + +body { + margin: 0; + min-width: 1200px; + min-height: 100vh; + color: var(--text); + background: var(--bg); + font-family: var(--font-ui); + font-size: var(--text-md); +} + +button, +textarea { + font: inherit; +} diff --git a/src/styles/layout.css b/src/styles/layout.css new file mode 100644 index 0000000..3763aa0 --- /dev/null +++ b/src/styles/layout.css @@ -0,0 +1,99 @@ +.app-shell { + display: grid; + grid-template-columns: var(--left-width) 0.45rem var(--middle-width) 0.45rem minmax(360px, 1fr); + gap: var(--gap-2); + height: 100vh; + padding: var(--gap-4); +} + +.pane { + min-width: 0; + min-height: 0; + display: flex; + flex-direction: column; + border: 1px solid var(--border); + background: var(--panel); +} + +.pane-splitter { + position: relative; + min-width: 0.45rem; + cursor: col-resize; + touch-action: none; +} + +.pane-splitter::before { + content: ""; + position: absolute; + top: 0; + bottom: 0; + left: calc(50% - 1px); + width: 2px; + background: var(--border); +} + +.pane-splitter:hover::before, +.pane-splitter:active::before { + background: var(--accent); +} + +.is-resizing-pane { + cursor: col-resize; + user-select: none; +} + +.pane-header { + display: flex; + align-items: baseline; + justify-content: space-between; + gap: var(--gap-3); + padding: var(--gap-3) var(--gap-4); + border-bottom: 1px solid var(--border); +} + +.pane-header h1 { + margin: 0; + color: var(--text); + font-size: var(--text-lg); + font-weight: 650; + letter-spacing: 0; +} + +.pane-detail, +.item-meta, +.section-label { + color: var(--text-muted); + font-size: var(--text-xs); +} + +.source-input { + flex: 1; + width: 100%; + min-height: 0; + resize: none; + border: 0; + outline: 0; + padding: var(--gap-4); + color: var(--text); + background: var(--panel); + font-family: var(--font-mono); + font-size: var(--text-sm); + line-height: 1.6; +} + +.scroll-stack, +.expr-list, +.source-grid-shell { + min-height: 0; + overflow: auto; +} + +.scroll-stack, +.expr-list { + padding: var(--gap-3); +} + +.empty-state { + padding: var(--gap-4); + color: var(--text-muted); +} diff --git a/src/styles/source-grid.css b/src/styles/source-grid.css new file mode 100644 index 0000000..2149e25 --- /dev/null +++ b/src/styles/source-grid.css @@ -0,0 +1,118 @@ +.source-grid-shell { + --cell-width: 0.78rem; + --cell-height: 1.42rem; + --gutter-size: 3.25rem; + + padding: var(--gap-3); + font-family: var(--font-mono); + font-size: var(--text-sm); +} + +.grid-status { + position: sticky; + top: 0; + z-index: 4; + display: flex; + justify-content: space-between; + gap: var(--gap-4); + min-width: max-content; + padding: 0 0 var(--gap-3); + color: var(--text-muted); + background: var(--panel); + font-family: var(--font-ui); + font-size: var(--text-xs); +} + +.source-grid { + width: max-content; +} + +.source-grid-row { + display: grid; + grid-template-columns: var(--gutter-size) repeat(var(--max-column), var(--cell-width)); + min-width: max-content; +} + +.row-header, +.grid-cell { + width: var(--cell-width); + height: var(--cell-height); + display: inline-flex; + align-items: center; + justify-content: center; + line-height: var(--cell-height); + user-select: none; +} + +.row-header { + position: sticky; + left: 0; + z-index: 2; + width: var(--gutter-size); + justify-content: flex-end; + padding-right: var(--gap-2); + color: var(--text-faint); + background: var(--panel); + font-size: var(--text-xs); +} + +.grid-cell { + position: relative; + color: var(--text); + border: 1px solid transparent; + font-family: var(--font-codepoint); + font-size: var(--text-sm); + overflow: visible; +} + +.grid-cell-space, +.grid-cell-tab, +.grid-cell-newline, +.grid-cell-carriage-return, +.grid-cell-combining-mark, +.grid-cell-format, +.grid-cell-control { + color: var(--text-faint); +} + +.grid-cell-format, +.grid-cell-control { + font-family: var(--font-ui); + font-size: 0.55rem; +} + +.grid-cell-combining-mark { + font-size: 0.7rem; +} + +.grid-cell.is-annotated { + color: var(--text); + background: var(--source-highlight); +} + +.grid-cell.is-hover-row, +.grid-cell.is-hover-column { + background: oklch(25% 0.026 var(--hue)); +} + +.grid-cell.is-annotated.is-hover-row, +.grid-cell.is-annotated.is-hover-column { + background: oklch(39% 0.064 var(--hue)); +} + +.grid-cell.is-hover-cell { + z-index: 1; + color: var(--bg); + border-color: var(--accent); + background: var(--accent); +} + +.zero-span-marker { + z-index: 2; + align-self: stretch; + justify-self: start; + width: 2px; + margin-left: -1px; + background: var(--accent); + pointer-events: none; +} diff --git a/src/styles/syntax-pane.css b/src/styles/syntax-pane.css new file mode 100644 index 0000000..5596238 --- /dev/null +++ b/src/styles/syntax-pane.css @@ -0,0 +1,66 @@ +.section-label { + margin: var(--gap-2) 0; + text-transform: uppercase; +} + +.error-list, +.expr-list, +.list-children { + display: flex; + flex-direction: column; + gap: var(--gap-2); +} + +.error-card, +.expr-node { + border: 1px solid var(--border); + background: var(--panel-raised); +} + +.error-card { + padding: var(--gap-3); + border-color: oklch(42% 0.05 28); + background: var(--error-bg); +} + +.expr-node { + padding: var(--gap-2); +} + +.error-card:hover, +.expr-node:hover { + border-color: var(--border-strong); + background: var(--accent-bg); +} + +.item-title, +.node-kind { + color: var(--text); + font-size: var(--text-sm); + font-weight: 650; +} + +.node-kind { + display: inline-flex; + min-width: 4.5rem; + color: var(--accent); +} + +.node-value { + color: var(--text); + font-family: var(--font-mono); + font-size: var(--text-sm); +} + +.list-node-header { + display: flex; + align-items: baseline; + justify-content: space-between; + gap: var(--gap-2); +} + +.list-children { + margin-top: var(--gap-2); + padding-left: var(--gap-3); + border-left: 1px solid var(--border); +} diff --git a/src/syntax.ts b/src/syntax.ts new file mode 100644 index 0000000..bdbf4ad --- /dev/null +++ b/src/syntax.ts @@ -0,0 +1,59 @@ +import type { CodePointSpan } from 'source-region'; + +export type ConcreteSyntax = Expr<{ span: CodePointSpan }> + +export type Expr = +| { tag: "literal", value: Literal } & A +| { tag: "list", values: Expr[] } & A + +export namespace ConcreteSyntax { + export function number(value: number, span: CodePointSpan): ConcreteSyntax { + return { tag: "literal", value: { tag: "number", value }, span }; + } + + export function identifier(value: Identifier, span: CodePointSpan): ConcreteSyntax { + return { tag: "literal", value: { tag: "identifier", value }, span }; + } + + export function list(values: ConcreteSyntax[], span: CodePointSpan): ConcreteSyntax { + return { tag: "list", values, span }; + } +} + +export namespace Expr { + export function number(value: number): Expr { + return { tag: "literal", value: { tag: "number", value } }; + } + + export function identifier(value: Identifier): Expr { + return { tag: "literal", value: { tag: "identifier", value } }; + } + + export function list(values: Expr[]): Expr { + return { tag: "list", values }; + } + + export function show(e: Expr): string { + switch (e.tag) { + case "literal": + return showLiteral(e.value); + case "list": + return `(${e.values.map(show).join(" ")})`; + } + } + + function showLiteral(e: Literal): string { + switch (e.tag) { + case "number": + return `${e.value}`; + case "identifier": + return `${e.value}`; + } + } +} + +type Literal = +| { tag: "number", value: number } +| { tag: "identifier", value: Identifier } + +type Identifier = string diff --git a/src/ui/App.tsx b/src/ui/App.tsx new file mode 100644 index 0000000..7255ea8 --- /dev/null +++ b/src/ui/App.tsx @@ -0,0 +1,127 @@ +import { createMemo, createSignal, Show } from 'solid-js'; +import { sourceText } from 'source-region'; +import type { CodePointSpan, SourceRegion, SourceText } from 'source-region'; +import { parseDocument } from '../parser'; +import type { ParseError } from '../parser'; +import type { ConcreteSyntax } from '../syntax'; +import { spanLabel } from './format'; +import { PaneHeader, PaneSplitter } from './Pane'; +import { SourceGrid } from './SourceGrid'; +import type { SourceGridAnnotation } from './SourceGrid'; +import { ErrorList, ExpressionList } from './SyntaxPane'; +import type { HoverTarget } from './types'; + +type ParsedDocument = { + source: SourceText; + region: SourceRegion; + values: ConcreteSyntax[]; + errors: ParseError[]; +}; + +const SAMPLE_INPUT = `(define square (_ x) (mul x x)) + +(add 1 2) + +(define pyth (_ x y) (+ (square x) (square y))) + +foo ) @@@ (bar 1) +(nested (list 123 abc_9 name-with-dash))`; + +export function App() { + const [input, setInput] = createSignal(SAMPLE_INPUT); + const [hovered, setHovered] = createSignal(); + const [leftWidth, setLeftWidth] = createSignal(420); + const [middleWidth, setMiddleWidth] = createSignal(420); + + const parsed = createMemo(() => { + const source = sourceText(input()); + const region = source.fullRegion(); + const result = parseDocument(region); + return { source, region, values: result.values, errors: result.errors }; + }); + + return ( +
+
+ +