fix ignore node_modules

romgerman · May 20, 2024 · 400dfec · 400dfec
1 parent 37479be
commit 400dfec
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/blueprint/nodes/aggregation/file-list.ts b/src/blueprint/nodes/aggregation/file-list.ts
@@ -16,10 +16,14 @@ export class FileListNode extends BlueprintNode<{ ignoreNodeModules: boolean }>
     }
 
     if (isArrayOfType(array, ts.isSourceFile)) {
-      return array;
+      return this.filterNodeModules(array);
     }
 
-    return array.map((n) => n.getSourceFile());
+    return this.filterNodeModules(array.map((n) => n.getSourceFile()));
+  }
+
+  private filterNodeModules(array: ts.SourceFile[]): ts.SourceFile[] {
+    return array.filter((sf) => (this.state?.ignoreNodeModules ? !sf.fileName.includes("/node_modules") : true));
   }
 
   private getFileNames(array: ts.SourceFile[]): string[] {

diff --git a/src/webview/nodes/actions/RenameFileActionNode.vue b/src/webview/nodes/actions/RenameFileActionNode.vue
@@ -18,18 +18,14 @@
 
 <script setup lang="ts">
 import { ref } from "vue";
-import { Handle, Position, useNode } from "@vue-flow/core";
-import { useEventCommandResult } from "@/webview/event-utils";
-import { GraphNodeSendViewData } from "@/shared/events";
+import { Handle, Position } from "@vue-flow/core";
 import NodeWrapper from "../NodeWrapper.vue";
+import { useViewData } from "@/webview/composables/use-view-data";
 
-const { id: nodeId } = useNode();
 const names = ref<string[]>([]);
 
-useEventCommandResult<GraphNodeSendViewData, { id: string; data: string[] }>("graph:node-send-view-data", ({ id, data }) => {
-  if (id === nodeId) {
-    names.value = data;
-  }
+useViewData<string[]>((data) => {
+  names.value = data;
 });
 </script>
 

diff --git a/src/webview/nodes/aggregation/FileListNode.vue b/src/webview/nodes/aggregation/FileListNode.vue
@@ -7,7 +7,7 @@
           {{ file }}
         </div>
         <div class="font-bold" v-if="greaterThanMaxItems">and {{ otherItemsCount }} more</div>
-        <vscode-checkbox :checked="model.ignoreNodeModules" @change="model.ignoreNodeModules = !model.ignoreNodeModules">
+        <vscode-checkbox :checked="model.ignoreNodeModules" @change="event => model.ignoreNodeModules = event.target.checked">
           Ignore
           <pre style="display: inline;">node_modules</pre>
         </vscode-checkbox>