fix: querySelfOrSelector (#47)

close #47

Author: lisonge

src/utils/selector.ts

@@ -117,7 +117,7 @@ export const transform = Transform.Companion.multiplatformBuild<RawNode>(
   },
   (node) => node.attr.name,
   (node) => node.children,
-  (node) => node.parent,
+  (node) => node.parent || null,
 );
 
 export interface ResolvedSelector {
@@ -129,12 +129,12 @@ export interface ResolvedSelector {
   canQf: boolean;
   canCopy: boolean;
   toString: () => string;
+  findAst: <T>(v: T) => AstNode<T>;
   match: (node: RawNode) => RawNode | undefined;
-  querySelectorAll: (node: RawNode | undefined) => RawNode[];
-  querySelectorAllContext: (
+  querySelfOrSelectorAll: (node: RawNode | undefined) => RawNode[];
+  querySelfOrSelectorAllContext: (
     node: RawNode | undefined,
   ) => QueryResult<RawNode>[];
-  findAst: <T>(v: T) => AstNode<T>;
 }
 
 const typeInfo = initDefaultTypeInfo(true).globalType;
@@ -183,18 +183,23 @@ export const parseSelector = (source: string): ResolvedSelector => {
     toString() {
       return value.toString();
     },
+    findAst,
     match(node) {
       return value.match(node, transform, matchOption) ?? undefined;
     },
-    querySelectorAll(node) {
+    querySelfOrSelectorAll(node) {
       if (!node) return [];
-      return transform.querySelectorAllArray(node, value);
+      return (selector.match(node) ? [node] : []).concat(
+        transform.querySelectorAllArray(node, value),
+      );
     },
-    querySelectorAllContext(node) {
+    querySelfOrSelectorAllContext(node) {
       if (!node) return [];
-      return transform.querySelectorAllContextArray(node, value);
+      const r = value.matchContext(node, transform, matchOption);
+      return (r.matched ? [r] : []).concat(
+        transform.querySelectorAllContextArray(node, value),
+      );
     },
-    findAst,
   };
   for (const exp of binaryExpressionList) {
     if (exp.operator.key == '~=' && !useGlobalStore().wasmSupported) {

src/views/snapshot/RuleCard.vue

@@ -61,7 +61,7 @@ const checkRule = (obj: ResolvedData): string | RawNode => {
     }
   }
   const matchesResult = resolvedMatches.map((s) =>
-    s.querySelectorAll(rootNode.value),
+    s.querySelfOrSelectorAll(rootNode.value),
   );
   if (resolvedMatches.length) {
     const notIndex = matchesResult.findIndex((s) => s.length === 0);
@@ -81,7 +81,7 @@ const checkRule = (obj: ResolvedData): string | RawNode => {
     }
   }
   const anyMatchesResult = resolvedAnyMatches.map((s) =>
-    s.querySelectorAll(rootNode.value),
+    s.querySelfOrSelectorAll(rootNode.value),
   );
   if (resolvedAnyMatches.length) {
     if (anyMatchesResult.every((s) => s.length === 0)) {
@@ -104,7 +104,7 @@ const checkRule = (obj: ResolvedData): string | RawNode => {
     }
   }
   const excludeMatchesResult = resolvedExcludeMatches.map((s) =>
-    s.querySelectorAll(rootNode.value),
+    s.querySelfOrSelectorAll(rootNode.value),
   );
   if (resolvedExcludeMatches.length) {
     const index = excludeMatchesResult.findIndex((s) => s.length !== 0);

src/views/snapshot/SearchCard.vue

@@ -67,7 +67,7 @@ const searchSelector = (text: string) => {
     return;
   }
 
-  const results = selector.querySelectorAllContext(rootNode.value);
+  const results = selector.querySelfOrSelectorAllContext(rootNode.value);
   if (results.length == 0) {
     message.success(`没有选择到节点`);
     return;