enhance(style-rules): add self-or-* targets

Author: ycnmhd

src/lang/style-rules-lang.ts

@@ -10,9 +10,13 @@ import {
 export const styleRulesLang = {
     targets: {
         self: 'Of card',
-        'direct-parent': 'Of immediate parent',
+        'self-or-direct-parent': 'Of card or direct parent',
+        'self-or-any-parent': 'Of card or any parent',
+        'self-or-direct-children': 'Of card or direct child',
+        'self-or-any-children': 'Of card or any child',
+        'direct-parent': 'Of direct parent',
         'any-parent': 'Of any parent',
-        'direct-children': 'Of immediate child',
+        'direct-children': 'Of direct child',
         'any-children': 'Of any child',
     } satisfies Record<StyleRuleTarget, string>,
     operators: {

src/stores/settings/types/style-rules-types.ts

@@ -27,6 +27,10 @@ export type ComparisonOperator = StringOperator | NumericOperator;
 
 export type StyleRuleTarget =
     | 'self'
+    | 'self-or-any-parent'
+    | 'self-or-direct-parent'
+    | 'self-or-direct-children'
+    | 'self-or-any-children'
     | 'direct-parent'
     | 'any-parent'
     | 'direct-children'

src/stores/view/subscriptions/effects/style-rules/helpers/resolvers/target-node-resolver.ts

@@ -10,13 +10,18 @@ import {
     STRUCTURE_ONLY,
 } from 'src/stores/view/helpers/get-document-event-type';
 
-const defaultCache = () => ({
-    self: {},
-    'direct-parent': {},
-    'any-parent': {},
-    'direct-children': {},
-    'any-children': {},
-});
+const defaultCache = () =>
+    ({
+        self: {},
+        'direct-parent': {},
+        'any-parent': {},
+        'direct-children': {},
+        'any-children': {},
+        'self-or-any-parent': {},
+        'self-or-direct-parent': {},
+        'self-or-any-children': {},
+        'self-or-direct-children': {},
+    }) satisfies Cache;
 
 type Cache = {
     [scope in StyleRuleTarget]: {
@@ -63,22 +68,43 @@ export class TargetNodeResolver {
                 break;
             }
 
-            case 'any-parent':
+            case 'self-or-direct-parent': {
+                const group = findGroupByNodeId(this.columns, nodeId);
+                result = group ? [group.parentId, nodeId] : [nodeId];
+                break;
+            }
+
+            case 'any-parent': {
                 result = traverseUp(this.columns, nodeId);
                 break;
+            }
+
+            case 'self-or-any-parent': {
+                result = [...traverseUp(this.columns, nodeId), nodeId];
+                break;
+            }
 
             case 'direct-children': {
                 const childGroup = findChildGroup(this.columns, nodeId);
-                result = childGroup?.nodes ?? [];
+                result = childGroup ? childGroup.nodes : [];
                 break;
             }
 
-            case 'any-children':
+            case 'self-or-direct-children': {
+                const childGroup = findChildGroup(this.columns, nodeId);
+                result = childGroup ? [nodeId, ...childGroup.nodes] : [nodeId];
+                break;
+            }
+
+            case 'any-children': {
                 result = getAllChildren(this.columns, nodeId);
                 break;
+            }
 
-            default:
-                result = [];
+            case 'self-or-any-children': {
+                result = [nodeId, ...getAllChildren(this.columns, nodeId)];
+                break;
+            }
         }
 
         this.cacheResult(nodeId, scope, result);

src/view/components/container/style-rules/helpers/constants.ts

@@ -9,6 +9,10 @@ import {
 
 export const targets: StyleRuleTarget[] = [
     'self',
+    'self-or-direct-parent',
+    'self-or-any-parent',
+    'self-or-direct-children',
+    'self-or-any-children',
     'direct-parent',
     'any-parent',
     'direct-children',