@zenithbuild/language 0.5.0-beta.2.20 → 0.6.1

package/CHANGELOG.md

@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.6.0] - 2026-02-28
+
+### Added
+
+- Grammar: canonical primitives (ref, signal, state, zenOn, zenMount, zenWindow, zenDocument)
+- Grammar: `on:event` with handler expression highlighted as TypeScript
+- Grammar: legacy `@click` / `onclick` scoped as legacy
+- Snippets for canonical primitives (consistent ctx.cleanup style)
+- `zenith.strictDomLints` setting contribution
+
 ## [0.5.0-beta.2.19] - 2026-02-04
 
 ### ✨ Features

package/RELEASE_NOTES_v0.6.0.md

@@ -0,0 +1,26 @@
+# @zenithbuild/language v0.6.0
+
+## Summary
+
+- Grammar highlights canonical primitives (zenMount, zenWindow, zenDocument, zenOn, zenResize, collectRefs, signal, ref)
+- `on:event` canonical; `@click` and `onclick` scoped as legacy
+- Snippets for state, signal, ref, zenMount, zenOn, zenResize, collectRefs, on:click
+- `zenith.strictDomLints` setting added
+
+## Breaking Changes
+
+None.
+
+## Key Changes
+
+- **Grammar:** `on:click={handler}` highlighted as canonical; `{handler}` as TypeScript identifier
+- **Grammar:** Legacy `@click` and `onclick` use `meta.attribute.event.legacy.zenith` scope
+- **Snippets:** state toggle, signal counter, ref dom, zenMount cleanup, zenEffect, zenWindow, zenOn keydown escape, zenResize viewport, collectRefs, on:click
+- **Config:** `zenith.strictDomLints` (boolean, default false)
+- **Embedded:** `source.ts.embedded.zenith` mapped to TypeScript for expression highlighting
+
+## Verification Checklist
+
+- [ ] `on:click={handler}` highlights `handler` as TS identifier
+- [ ] `@click` and `onclick` use legacy scope (different color if theme supports it)
+- [ ] Snippets expand correctly; no querySelector/addEventListener patterns

package/package.json

@@ -1,161 +1,174 @@
 {
-    "name": "@zenithbuild/language",
-    "displayName": "Zenith Language Support",
-    "description": "Syntax highlighting, IntelliSense, and editor support for Zenith Framework (.zen files)",
-    "version": "0.5.0-beta.2.20",
-    "publisher": "ZenithBuild",
-    "engines": {
-        "vscode": "^1.80.0"
-    },
-    "main": "./out/extension.js",
-    "activationEvents": [
-        "onLanguage:zenith",
-        "onCommand:zenith.runContractPack",
-        "onCommand:zenith.runLegacyTests",
-        "onCommand:zenith.build",
-        "onCommand:zenith.restartServer"
+  "name": "@zenithbuild/language",
+  "displayName": "Zenith Language Support",
+  "description": "Syntax highlighting, IntelliSense, and editor support for Zenith Framework (.zen files)",
+  "version": "0.6.1",
+  "publisher": "ZenithBuild",
+  "engines": {
+    "vscode": "^1.80.0"
+  },
+  "main": "./out/extension.js",
+  "activationEvents": [
+    "onLanguage:zenith",
+    "onCommand:zenith.runContractPack",
+    "onCommand:zenith.runLegacyTests",
+    "onCommand:zenith.build",
+    "onCommand:zenith.restartServer"
+  ],
+  "scripts": {
+    "test": "node --test test/grammar-snippets.spec.js",
+    "build:server": "cd ../zenith-language-server && bun run build",
+    "compile": "bun x esbuild src/extension.ts --bundle --outfile=out/extension.js --external:vscode --external:vscode-languageclient/node --format=cjs --platform=node && cp ../zenith-language-server/dist/server.js out/server.js",
+    "watch": "bun run compile -- --watch",
+    "build:markplace": "bun run build:marketplace",
+    "build:marketplace": "bun run build:server && bun run compile && node scripts/build.js marketplace",
+    "build:openvsx": "bun run build:server && bun run compile && node scripts/build.js openvsx",
+    "build:all": "bun run build:server && bun run compile && node scripts/build.js all",
+    "release": "bun run scripts/release.ts",
+    "release:dry": "bun run scripts/release.ts --dry-run",
+    "release:patch": "bun run scripts/release.ts --bump=patch",
+    "release:minor": "bun run scripts/release.ts --bump=minor",
+    "release:major": "bun run scripts/release.ts --bump=major",
+    "build": "tsc"
+  },
+  "devDependencies": {
+    "@types/node": "^20.0.0",
+    "@types/vscode": "^1.80.0",
+    "esbuild": "^0.19.0",
+    "typescript": "^5.0.0"
+  },
+  "categories": [
+    "Programming Languages"
+  ],
+  "icon": "assets/logo.png",
+  "keywords": [
+    "zenith",
+    "zen",
+    "syntax",
+    "highlighting",
+    "intellisense",
+    "framework"
+  ],
+  "contributes": {
+    "languages": [
+      {
+        "id": "zenith",
+        "aliases": [
+          "Zenith",
+          "zenith"
+        ],
+        "extensions": [
+          ".zen",
+          ".zen.html",
+          ".zenx"
+        ],
+        "configuration": "./language-configuration.json"
+      }
     ],
-    "scripts": {
-        "build:server": "cd ../zenith-language-server && bun run build",
-        "compile": "bun x esbuild src/extension.ts --bundle --outfile=out/extension.js --external:vscode --external:vscode-languageclient/node --format=cjs --platform=node && cp ../zenith-language-server/dist/server.js out/server.js",
-        "watch": "bun run compile -- --watch",
-        "build:markplace": "bun run build:marketplace",
-        "build:marketplace": "bun run build:server && bun run compile && node scripts/build.js marketplace",
-        "build:openvsx": "bun run build:server && bun run compile && node scripts/build.js openvsx",
-        "build:all": "bun run build:server && bun run compile && node scripts/build.js all",
-        "release": "bun run scripts/release.ts",
-        "release:dry": "bun run scripts/release.ts --dry-run",
-        "release:patch": "bun run scripts/release.ts --bump=patch",
-        "release:minor": "bun run scripts/release.ts --bump=minor",
-        "release:major": "bun run scripts/release.ts --bump=major",
-        "build": "tsc"
-    },
-    "devDependencies": {
-        "@types/node": "^20.0.0",
-        "@types/vscode": "^1.80.0",
-        "esbuild": "^0.19.0",
-        "typescript": "^5.0.0"
-    },
-    "categories": [
-        "Programming Languages"
+    "snippets": [
+      {
+        "language": "zenith",
+        "path": "./snippets/zenith.code-snippets"
+      }
     ],
-    "icon": "assets/logo.png",
-    "keywords": [
-        "zenith",
-        "zen",
-        "syntax",
-        "highlighting",
-        "intellisense",
-        "framework"
+    "grammars": [
+      {
+        "language": "zenith",
+        "scopeName": "text.html.zenith",
+        "path": "./syntaxes/zenith.tmLanguage.json",
+        "embeddedLanguages": {
+          "source.js": "javascript",
+          "source.ts": "typescript",
+          "source.ts.embedded.zenith": "typescript",
+          "source.css": "css",
+          "text.html.basic": "html",
+          "meta.embedded.block.javascript": "javascript",
+          "meta.embedded.block.typescript": "typescript",
+          "meta.embedded.block.css": "css"
+        }
+      }
     ],
-    "contributes": {
-        "languages": [
-            {
-                "id": "zenith",
-                "aliases": [
-                    "Zenith",
-                    "zenith"
-                ],
-                "extensions": [
-                    ".zen",
-                    ".zen.html",
-                    ".zenx"
-                ],
-                "configuration": "./language-configuration.json"
-            }
-        ],
-        "grammars": [
-            {
-                "language": "zenith",
-                "scopeName": "text.html.zenith",
-                "path": "./syntaxes/zenith.tmLanguage.json",
-                "embeddedLanguages": {
-                    "source.js": "javascript",
-                    "source.ts": "typescript",
-                    "source.css": "css",
-                    "text.html.basic": "html",
-                    "meta.embedded.block.javascript": "javascript",
-                    "meta.embedded.block.typescript": "typescript",
-                    "meta.embedded.block.css": "css"
-                }
-            }
-        ],
-        "configurationDefaults": {
-            "[zenith]": {
-                "editor.formatOnSave": true,
-                "editor.wordBasedSuggestions": "off",
-                "editor.suggest.insertMode": "replace",
-                "editor.semanticHighlighting.enabled": true,
-                "editor.quickSuggestions": {
-                    "other": true,
-                    "comments": false,
-                    "strings": true
-                },
-                "editor.autoClosingBrackets": "always"
-            },
-            "emmet.includeLanguages": {
-                "zenith": "html"
-            },
-            "emmet.syntaxProfiles": {
-                "zenith": "html"
-            }
+    "configurationDefaults": {
+      "[zenith]": {
+        "editor.formatOnSave": true,
+        "editor.wordBasedSuggestions": "off",
+        "editor.suggest.insertMode": "replace",
+        "editor.semanticHighlighting.enabled": true,
+        "editor.quickSuggestions": {
+          "other": true,
+          "comments": false,
+          "strings": true
         },
-        "commands": [
-            {
-                "command": "zenith.runContractPack",
-                "title": "Zenith: Run Contract Pack",
-                "category": "Zenith"
-            },
-            {
-                "command": "zenith.runLegacyTests",
-                "title": "Zenith: Run Legacy Tests",
-                "category": "Zenith"
-            },
-            {
-                "command": "zenith.build",
-                "title": "Zenith: Build",
-                "category": "Zenith"
-            },
-            {
-                "command": "zenith.restartServer",
-                "title": "Zenith: Restart Server",
-                "category": "Zenith"
-            }
-        ],
-        "configuration": {
-            "type": "object",
-            "title": "Zenith",
-            "properties": {
-                "zenith.componentScripts": {
-                    "type": "string",
-                    "enum": [
-                        "forbid",
-                        "allow"
-                    ],
-                    "default": "forbid",
-                    "description": "Component script contract mode. 'forbid' enforces structural-only components; 'allow' disables this diagnostic."
-                },
-                "zenith.languageServer.path": {
-                    "type": "string",
-                    "default": "",
-                    "description": "Optional absolute or workspace-relative path to a custom Zenith language server entry file."
-                }
-            }
-        }
-    },
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/zenithbuild/zenith"
-    },
-    "homepage": "https://github.com/zenithbuild/zenith#readme",
-    "bugs": {
-        "url": "https://github.com/zenithbuild/zenith/issues"
-    },
-    "publishConfig": {
-        "access": "public"
+        "editor.autoClosingBrackets": "always"
+      },
+      "emmet.includeLanguages": {
+        "zenith": "html"
+      },
+      "emmet.syntaxProfiles": {
+        "zenith": "html"
+      }
     },
-    "license": "MIT",
-    "dependencies": {
-        "vscode-languageclient": "^9.0.1"
+    "commands": [
+      {
+        "command": "zenith.runContractPack",
+        "title": "Zenith: Run Contract Pack",
+        "category": "Zenith"
+      },
+      {
+        "command": "zenith.runLegacyTests",
+        "title": "Zenith: Run Legacy Tests",
+        "category": "Zenith"
+      },
+      {
+        "command": "zenith.build",
+        "title": "Zenith: Build",
+        "category": "Zenith"
+      },
+      {
+        "command": "zenith.restartServer",
+        "title": "Zenith: Restart Server",
+        "category": "Zenith"
+      }
+    ],
+    "configuration": {
+      "type": "object",
+      "title": "Zenith",
+      "properties": {
+        "zenith.componentScripts": {
+          "type": "string",
+          "enum": [
+            "forbid",
+            "allow"
+          ],
+          "default": "forbid",
+          "description": "Component script contract mode. 'forbid' enforces structural-only components; 'allow' disables this diagnostic."
+        },
+        "zenith.strictDomLints": {
+          "type": "boolean",
+          "default": false,
+          "description": "When true, ZEN-DOM-* lints (querySelector, addEventListener, etc.) are reported as errors instead of warnings."
+        },
+        "zenith.languageServer.path": {
+          "type": "string",
+          "default": "",
+          "description": "Optional absolute or workspace-relative path to a custom Zenith language server entry file."
+        }
+      }
     }
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/zenithbuild/zenith"
+  },
+  "homepage": "https://github.com/zenithbuild/zenith#readme",
+  "bugs": {
+    "url": "https://github.com/zenithbuild/zenith/issues"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "license": "MIT",
+  "dependencies": {
+    "vscode-languageclient": "^9.0.1"
+  }
 }

package/snippets/zenith.code-snippets

@@ -0,0 +1,94 @@
+{
+  "State Toggle": {
+    "prefix": "state toggle",
+    "body": [
+      "state ${1:open} = false",
+      "function toggle${1/(.*)/${1:/capitalize}/}() { ${1:open} = !${1:open} }",
+      "$0"
+    ],
+    "description": "State variable with toggle function"
+  },
+  "Signal Counter": {
+    "prefix": "signal counter",
+    "body": [
+      "const ${1:count} = signal(${2:0})",
+      "$0"
+    ],
+    "description": "Signal with get/set"
+  },
+  "Ref DOM": {
+    "prefix": "ref dom",
+    "body": [
+      "const ${1:el} = ref<${2:HTMLElement}>()",
+      "$0"
+    ],
+    "description": "Ref for DOM node"
+  },
+  "zenMount Cleanup": {
+    "prefix": "zenMount cleanup",
+    "body": [
+      "zenMount((ctx) => {",
+      "\t$0",
+      "\tctx.cleanup(${1:disposer})",
+      "})"
+    ],
+    "description": "zenMount with ctx.cleanup for disposers"
+  },
+  "zenEffect Pattern": {
+    "prefix": "zenEffect pattern",
+    "body": [
+      "zenEffect(() => {",
+      "\t$0",
+      "})"
+    ],
+    "description": "Reactive effect"
+  },
+  "zenWindow": {
+    "prefix": "zenWindow",
+    "body": [
+      "const win = zenWindow()",
+      "if (!win) return",
+      "$0"
+    ],
+    "description": "SSR-safe window access"
+  },
+  "zenOn Keydown Escape": {
+    "prefix": "zenOn keydown escape",
+    "body": [
+      "const doc = zenDocument()",
+      "if (!doc) return",
+      "const offKey = zenOn(doc, 'keydown', (e) => {",
+      "\tif (e.key === 'Escape') ${1:closeMenu}()",
+      "})",
+      "ctx.cleanup(offKey)",
+      "$0"
+    ],
+    "description": "zenOn keydown with Escape handler (use inside zenMount)"
+  },
+  "zenResize Viewport": {
+    "prefix": "zenResize viewport",
+    "body": [
+      "const off = zenResize(({ w, h }) => {",
+      "\t$0",
+      "})",
+      "ctx.cleanup(off)"
+    ],
+    "description": "zenResize with ctx.cleanup (use inside zenMount)"
+  },
+  "collectRefs Links": {
+    "prefix": "collectRefs links",
+    "body": [
+      "const nodes = collectRefs(${1:refA}, ${2:refB}, ${3:refC})",
+      "$0"
+    ],
+    "description": "Collect multiple refs into node list"
+  },
+  "on:click Handler": {
+    "prefix": "on:click",
+    "body": [
+      "on:click={${1:handler}}",
+      "$0"
+    ],
+    "description": "Canonical event binding"
+  }
+}

package/syntaxes/zenith.tmLanguage.json

@@ -102,6 +102,12 @@
                 {
                     "include": "#lifecycle-hooks"
                 },
+                {
+                    "include": "#platform-primitives"
+                },
+                {
+                    "include": "#support-functions"
+                },
                 {
                     "include": "#zenith-imports"
                 },
@@ -182,9 +188,17 @@
             }
         },
         "lifecycle-hooks": {
-            "match": "\\b(zenOnMount|zenOnDestroy|zenOnUpdate|zenEffect|onMount|onDestroy|onUpdate|useRoute|useRouter)\\b",
+            "match": "\\b(zenMount|zenOnMount|zenOnDestroy|zenOnUpdate|zenEffect|onMount|onDestroy|onUpdate|useRoute|useRouter)\\b",
             "name": "support.function.lifecycle.zenith"
         },
+        "platform-primitives": {
+            "match": "\\b(zenWindow|zenDocument|zenOn|zenResize|collectRefs)\\b",
+            "name": "support.function.platform.zenith"
+        },
+        "support-functions": {
+            "match": "\\b(signal|ref)\\s*(<|\\()",
+            "name": "support.function.zenith"
+        },
         "zenith-imports": {
             "match": "(['\"])(zenith(?:/[a-zA-Z-]+)?|zenith:[a-zA-Z-]+)\\1",
             "captures": {
@@ -342,6 +356,9 @@
                 {
                     "include": "#attribute-directive"
                 },
+                {
+                    "include": "#attribute-on-event"
+                },
                 {
                     "include": "#attribute-at-event"
                 },
@@ -419,6 +436,33 @@
                 }
             ]
         },
+        "attribute-on-event": {
+            "begin": "(on:[a-zA-Z][a-zA-Z0-9_-]*)\\s*(=)\\s*(\\{)",
+            "beginCaptures": {
+                "1": {
+                    "name": "entity.other.attribute-name.event.canonical.zenith"
+                },
+                "2": {
+                    "name": "punctuation.separator.key-value.html.zenith"
+                },
+                "3": {
+                    "name": "punctuation.section.embedded.begin.zenith"
+                }
+            },
+            "end": "(\\})",
+            "endCaptures": {
+                "1": {
+                    "name": "punctuation.section.embedded.end.zenith"
+                }
+            },
+            "name": "meta.attribute.event.canonical.zenith",
+            "contentName": "source.ts.embedded.zenith",
+            "patterns": [
+                {
+                    "include": "source.ts"
+                }
+            ]
+        },
         "attribute-at-event": {
             "begin": "(@)([a-zA-Z][a-zA-Z0-9]*)\\s*(=)\\s*(\\{)",
             "beginCaptures": {
@@ -441,7 +485,7 @@
                     "name": "punctuation.section.embedded.end.zenith"
                 }
             },
-            "name": "meta.attribute.event.zenith",
+            "name": "meta.attribute.event.legacy.zenith",
             "contentName": "source.ts.embedded.zenith",
             "patterns": [
                 {
@@ -575,7 +619,7 @@
                     "name": "punctuation.section.embedded.end.zenith"
                 }
             },
-            "name": "meta.attribute.event-handler.zenith",
+            "name": "meta.attribute.event-handler.legacy.zenith",
             "contentName": "source.ts.embedded.zenith",
             "patterns": [
                 {

package/test/grammar-snippets.spec.js

@@ -0,0 +1,73 @@
+/**
+ * Acceptance tests: grammar and snippets contain expected tokens/prefixes.
+ * No VS Code required. Runs in CI.
+ */
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+const path = require('node:path');
+
+const ROOT = path.resolve(__dirname, '..');
+
+const CANONICAL_PRIMITIVES = [
+  'state',
+  'signal',
+  'ref',
+  'zenMount',
+  'zenWindow',
+  'zenDocument',
+  'zenOn',
+  'zenResize',
+  'collectRefs'
+];
+
+const SNIPPET_PREFIXES = [
+  'zenOn',
+  'zenResize',
+  'zenWindow',
+  'zenMount',
+  'ref',
+  'state',
+  'signal',
+  'on:click',
+  'collectRefs'
+];
+
+test('grammar includes canonical primitives', () => {
+  const grammarPath = path.join(ROOT, 'syntaxes', 'zenith.tmLanguage.json');
+  const grammar = JSON.parse(fs.readFileSync(grammarPath, 'utf8'));
+
+  const repo = grammar.repository || {};
+  const grammarStr = JSON.stringify(grammar);
+
+  for (const prim of CANONICAL_PRIMITIVES) {
+    assert.ok(
+      grammarStr.includes(prim),
+      `Grammar should include "${prim}"`
+    );
+  }
+
+  assert.ok(grammar.scopeName === 'text.html.zenith', 'Scope should be text.html.zenith');
+  assert.ok(grammar.fileTypes?.includes('zen'), 'File types should include .zen');
+});
+
+test('snippets include expected prefixes', () => {
+  const snippetsPath = path.join(ROOT, 'snippets', 'zenith.code-snippets');
+  const snippets = JSON.parse(fs.readFileSync(snippetsPath, 'utf8'));
+  const snippetStr = JSON.stringify(snippets);
+
+  for (const prefix of SNIPPET_PREFIXES) {
+    assert.ok(
+      snippetStr.includes(prefix),
+      `Snippets should include "${prefix}"`
+    );
+  }
+});
+
+test('package.json contributes single grammar for zenith', () => {
+  const pkg = JSON.parse(fs.readFileSync(path.join(ROOT, 'package.json'), 'utf8'));
+  const grammars = pkg.contributes?.grammars || [];
+  const zenithGrammars = grammars.filter((g) => g.language === 'zenith');
+  assert.equal(zenithGrammars.length, 1, 'Exactly one grammar for zenith');
+  assert.equal(zenithGrammars[0]?.scopeName, 'text.html.zenith');
+});