@swiftwc/eslint-plugin 1.1.3 → 1.1.4

package/.prettierignore

@@ -0,0 +1 @@
+generated/

package/generated/emberjs/en.js

@@ -1,4 +1,4 @@
-import { RULES, swiftwc, validate } from '../index.js';
+import { DIRECT_PARENT_RULES, swiftwc, validate } from '../index.js';
 swiftwc.rules['allowed-tags'].meta.docs.description = 'Restrict allowed HTML tags';
 swiftwc.rules['allowed-tags'].meta.messages.disallowedTag = 'Tag <{{tag}}> is only allowed inside any of: {{allowed}}';
 swiftwc.rules['allowed-tags'].create = (context) => {
@@ -8,7 +8,7 @@ swiftwc.rules['allowed-tags'].create = (context) => {
         GlimmerElementNode(node) {
             // @ts-expect-error
             const tag = node.tag;
-            const allowedParents = RULES[tag];
+            const allowedParents = DIRECT_PARENT_RULES[tag];
             if (!allowedParents)
                 return; // 👈 ignore unknown tags completely
             validate(tag, (item) => item.parent, allowedParents, context, node);

package/generated/html/en.js

@@ -1,11 +1,11 @@
-import { RULES, swiftwc, validate } from '../index.js';
+import { DIRECT_PARENT_RULES, swiftwc, validate } from '../index.js';
 swiftwc.rules['allowed-tags'].meta.docs.description = 'Restrict allowed HTML tags';
 swiftwc.rules['allowed-tags'].meta.messages.disallowedTag = 'Tag <{{tag}}> is only allowed inside any of: {{allowed}}';
 swiftwc.rules['allowed-tags'].create = (context) => {
     return {
         Tag(node) {
             const tag = node.name;
-            const allowedParents = RULES[tag];
+            const allowedParents = DIRECT_PARENT_RULES[tag];
             if (!allowedParents)
                 return; // 👈 ignore unknown tags completely
             validate(tag, (item) => item.parent, allowedParents, context, node);

package/generated/index.d.ts

@@ -4,7 +4,7 @@ export type TagNode = {
     type: string;
     parent?: TagNode;
 };
-export declare const RULES: Record<string, string[]>;
+export declare const DIRECT_PARENT_RULES: Record<string, string[]>;
 export declare function validate(tag: string, getParentTag: (node: TagNode) => TagNode | undefined, allowedParents: string[], context: RuleContext<string, readonly unknown[]>, node: TagNode): void;
 export declare const swiftwc: {
     meta: {

package/generated/index.js

@@ -1,22 +1,27 @@
 import { readFileSync } from 'fs';
-export const RULES = {
+export const DIRECT_PARENT_RULES = {
     'v-keyboard': ['template', 'body'],
     'scroll-view': ['template', 'body-view', 'dialog', 'navigation-stack', 'navigation-split-view', 'detail-placeholder'],
     dialog: ['template', 'tab-view', 'navigation-split-view'],
-    'tool-bar': ['template', 'body-view', 'navigation-split-view', 'navigation-stack'],
+    'tool-bar': ['template', 'dialog', 'body-view', 'navigation-split-view', 'navigation-stack'],
     'tool-bar-item': ['template', 'tool-bar', 'tool-bar-item-group', 'sidebar-toggle'],
+    'sidebar-toggle': ['template', 'tab-view', 'form', 'navigation-split-view'],
+    'body-view': ['template', 'dialog', 'body-view', 'navigation-stack', 'navigation-split-view'],
 };
 export function validate(tag, getParentTag, allowedParents, context, node) {
-    let parentTag = getParentTag(node), isValid = false;
-    while (parentTag) {
-        if (parentTag.type === node.type && allowedParents.includes(parentTag.name)) {
-            isValid = true;
-            break;
-        }
-        parentTag = getParentTag(parentTag);
-    }
-    if (isValid)
+    const parentTag = getParentTag(node);
+    if (parentTag?.type === node.type && allowedParents.includes(parentTag.name))
         return;
+    // let parentTag = getParentTag(node),
+    //   isValid = false
+    // while (parentTag) {
+    //   if (parentTag.type === node.type && allowedParents.includes(parentTag.name)) {
+    //     isValid = true
+    //     break
+    //   }
+    //   parentTag = getParentTag(parentTag)
+    // }
+    // if (isValid) return
     context.report({
         // @ts-expect-error
         node,
@@ -84,7 +89,7 @@ export const swiftwc = {
                 return {
                     Tag(node) {
                         const tag = node.name;
-                        const allowedParents = RULES[tag];
+                        const allowedParents = DIRECT_PARENT_RULES[tag];
                         if (!allowedParents)
                             return; // 👈 ignore unknown tags completely
                         validate(tag, (item) => item.parent, allowedParents, context, node);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swiftwc/eslint-plugin",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Rules enforcing best practices while using SwiftWC.",
   "keywords": [
     "eslint",
@@ -31,7 +31,7 @@
   },
   "scripts": {
     "prebuild": "rm -rf generated",
-    "build": "npm run format:write && npm run build:ts",
+    "build": "npm run build:ts",
     "build:ts": "tsc",
     "start": "npm run prebuild && tsc --watch",
     "format:check": "prettier . --check",

package/src/emberjs/en.ts

@@ -1,5 +1,5 @@
 import type { RuleContext, RuleListener } from '@typescript-eslint/utils/ts-eslint'
-import { RULES, swiftwc, validate, type TagNode } from '../index.js'
+import { DIRECT_PARENT_RULES, swiftwc, validate, type TagNode } from '../index.js'
 
 swiftwc.rules['allowed-tags'].meta.docs.description = 'Restrict allowed HTML tags'
 
@@ -13,7 +13,7 @@ swiftwc.rules['allowed-tags'].create = (context: Readonly<RuleContext<string, re
       // @ts-expect-error
       const tag = node.tag
 
-      const allowedParents = RULES[tag]
+      const allowedParents = DIRECT_PARENT_RULES[tag]
       if (!allowedParents) return // 👈 ignore unknown tags completely
 
       validate(tag, (item) => item.parent, allowedParents, context, node)

package/src/html/en.ts

@@ -1,5 +1,5 @@
 import type { RuleContext, RuleListener } from '@typescript-eslint/utils/ts-eslint'
-import { RULES, swiftwc, validate, type TagNode } from '../index.js'
+import { DIRECT_PARENT_RULES, swiftwc, validate, type TagNode } from '../index.js'
 
 swiftwc.rules['allowed-tags'].meta.docs.description = 'Restrict allowed HTML tags'
 
@@ -10,7 +10,7 @@ swiftwc.rules['allowed-tags'].create = (context: Readonly<RuleContext<string, re
     Tag(node: TagNode) {
       const tag = node.name
 
-      const allowedParents = RULES[tag]
+      const allowedParents = DIRECT_PARENT_RULES[tag]
       if (!allowedParents) return // 👈 ignore unknown tags completely
 
       validate(tag, (item) => item.parent, allowedParents, context, node)

package/src/index.ts

@@ -7,16 +7,20 @@ export type TagNode = {
   parent?: TagNode
 }
 
-export const RULES: Record<string, string[]> = {
+export const DIRECT_PARENT_RULES: Record<string, string[]> = {
   'v-keyboard': ['template', 'body'],
 
   'scroll-view': ['template', 'body-view', 'dialog', 'navigation-stack', 'navigation-split-view', 'detail-placeholder'],
 
   dialog: ['template', 'tab-view', 'navigation-split-view'],
 
-  'tool-bar': ['template', 'body-view', 'navigation-split-view', 'navigation-stack'],
+  'tool-bar': ['template', 'dialog', 'body-view', 'navigation-split-view', 'navigation-stack'],
 
   'tool-bar-item': ['template', 'tool-bar', 'tool-bar-item-group', 'sidebar-toggle'],
+
+  'sidebar-toggle': ['template', 'tab-view', 'form', 'navigation-split-view'],
+
+  'body-view': ['template', 'dialog', 'body-view', 'navigation-stack', 'navigation-split-view'],
 }
 
 export function validate(
@@ -26,19 +30,21 @@ export function validate(
   context: RuleContext<string, readonly unknown[]>,
   node: TagNode
 ) {
-  let parentTag = getParentTag(node),
-    isValid = false
+  const parentTag = getParentTag(node)
 
-  while (parentTag) {
-    if (parentTag.type === node.type && allowedParents.includes(parentTag.name)) {
-      isValid = true
-      break
-    }
+  if (parentTag?.type === node.type && allowedParents.includes(parentTag.name)) return
 
-    parentTag = getParentTag(parentTag)
-  }
+  // let parentTag = getParentTag(node),
+  //   isValid = false
+  // while (parentTag) {
+  //   if (parentTag.type === node.type && allowedParents.includes(parentTag.name)) {
+  //     isValid = true
+  //     break
+  //   }
+  //   parentTag = getParentTag(parentTag)
+  // }
 
-  if (isValid) return
+  // if (isValid) return
 
   context.report({
     // @ts-expect-error
@@ -113,7 +119,7 @@ export const swiftwc = {
           Tag(node: TagNode) {
             const tag = node.name
 
-            const allowedParents = RULES[tag]
+            const allowedParents = DIRECT_PARENT_RULES[tag]
             if (!allowedParents) return // 👈 ignore unknown tags completely
 
             validate(tag, (item) => item.parent, allowedParents, context, node)

package/tsconfig.json

@@ -6,7 +6,8 @@
     "skipLibCheck": true,
     "module": "NodeNext",
     "moduleResolution": "NodeNext",
-    "resolveJsonModule": true
+    "resolveJsonModule": true,
+    "types": ["node"]
   },
   "include": ["src"],
   "exclude": ["**/*.test.ts"]