@grailwind/eslint-plugin 0.1.0-beta.2 → 0.1.0-beta.4

package/README.md

@@ -13,7 +13,7 @@ npm install --save-dev @grailwind/eslint-plugin@beta
 ```
 
 It reads the tinctures, ordinaries and charges from your installed `grailwind`, so it needs
-`grailwind` 0.6.x. For typos and other class errors, see
+`grailwind` 0.8.x. For typos and other class errors, see
 [Linting](https://github.com/pafirmin/grailwind#linting) in the Grailwind README.
 
 ## Setup
@@ -57,7 +57,7 @@ export default [
 No metal (`or`, `argent`) on metal, and no colour on colour.
 
 - An ordinary, chief or bordure is checked against the field on the same element:
-  `escutcheon or fess-argent` is metal on metal. So are engrailed, invected and voided ones
+  `escutcheon or fess-argent` is metal on metal. So are engrailed, invected, wavy, indented, embattled and voided ones
   (`fess-engrailed-argent`, `cross-voided-argent`).
 - A fimbriated ordinary is checked against its fimbriation, and the fimbriation against the
   field: `or chevron-sable fimbriated-argent` is metal on metal (Argent on Or).
@@ -104,7 +104,8 @@ one, other than a chief, they have nowhere to go.
 An element draws one ordinary plus, optionally, a chief. With two, such as
 `fess-azure chevron-gules`, only one shows. Two chiefs are flagged too. A `charges` container
 takes one arrangement: `between`, `on`, `in-pale`, `in-fess`, `in-bend` or `in-bend-sinister`.
-Counterchanged, engrailed, invected, voided and fur ordinaries count as ordinaries.
+Counterchanged, engrailed, invected, wavy, indented, embattled, voided and fur ordinaries count as
+ordinaries.
 
 A charge at a named point (`in-dexter-chief` and so on) is a separate group in the blazon, so it
 goes in its own `charges` container. Among other charges, it still counts towards their number
@@ -119,8 +120,8 @@ Modifiers that would otherwise do nothing:
   element, e.g. `per-pale-argent-gules`.
 - `counterchanged` on `charges`, or on a charge, needs a divided field on the shield that holds
   the container.
-- `fimbriated-*` needs a plain tinctured ordinary. A chief, and an engrailed, invected, voided,
-  fur or counterchanged ordinary, aren't fimbriated.
+- `fimbriated-*` needs a plain tinctured ordinary. A chief, and an engrailed, invected, wavy,
+  indented, embattled, voided, fur or counterchanged ordinary, aren't fimbriated.
 - `counterchanged` doesn't work on a charge with a transform (`rotate-*`, `scale-*`, `skew-*`,
   `translate-*`): the charge shows its own small copy of the field instead.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grailwind/eslint-plugin",
-  "version": "0.1.0-beta.2",
+  "version": "0.1.0-beta.4",
   "description": "ESLint rules for Grailwind heraldry markup: the rule of tincture and charge structure",
   "type": "module",
   "main": "./src/index.js",
@@ -26,7 +26,7 @@
   "peerDependencies": {
     "@html-eslint/parser": "*",
     "eslint": "^9.0.0 || ^10.0.0",
-    "grailwind": "^0.6.0"
+    "grailwind": "^0.8.0"
   },
   "peerDependenciesMeta": {
     "@html-eslint/parser": {

package/src/blazon.js

@@ -9,6 +9,7 @@ import {
   DIVISIONS,
   FURS,
   LINES,
+  lineOrdinaries,
   METALS,
   OF_THE_FIRST,
   ORDINARIES,
@@ -38,7 +39,7 @@ for (const ordinary of ORDINARIES) {
   for (const tincture of PAINT) {
     const fur = FUR.has(tincture);
     ORDINARY_CLASSES.set(`${ordinary}-${tincture}`, { ordinary, tincture, fur });
-    for (const line of LINES) {
+    for (const line of LINES.filter((l) => lineOrdinaries(l).includes(ordinary))) {
       ORDINARY_CLASSES.set(`${ordinary}-${line}-${tincture}`, { ordinary, tincture, fur, line });
     }
   }

package/src/rules/modifier-needs-target.js

@@ -15,7 +15,7 @@ export default {
     messages: {
       noDivision: "`{{cls}}` needs a divided field to swap, e.g. `per-pale-argent-gules`",
       noOrdinary:
-        "`{{cls}}` needs a plain tinctured ordinary to edge: a chief, and an engrailed, invected, fur or counterchanged ordinary, aren't fimbriated",
+        "`{{cls}}` needs a plain tinctured ordinary to edge: a chief, and an engrailed, invected, wavy, indented, embattled, fur or counterchanged ordinary, aren't fimbriated",
       transformed:
         "`{{cls}}` breaks `counterchanged`: a transformed charge shows its own small copy of the field",
     },