@repokit/core 1.0.3 → 1.0.5

package/Cargo.lock

@@ -265,6 +265,7 @@ dependencies = [
  "serde",
  "serde_json",
  "tokio",
+ "tokio-thread-pool",
 ]
 
 [[package]]
@@ -336,6 +337,15 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "tokio-thread-pool"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d94c3392b98a14acc18fa639cb48e94355ed7aaae4a45164e394d6c4da39c9ec"
+dependencies = [
+ "tokio",
+]
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.22"

package/Cargo.toml

@@ -13,9 +13,10 @@ serde_json = "1.0"
 colored = "3"
 lexopt = "0.3.1"
 normalize-path = "0.2.1"
-tokio = { version = "1.49.0", features = ["rt-multi-thread"] }
 futures = "0.3.31"
 jwalk = "0.8.1"
 alphanumeric-sort = "1.5.5"
+tokio-thread-pool = "1.0.0"
+tokio = "1.49.0"
 
 

package/README.md

@@ -14,7 +14,7 @@ The Repokit CLI exists as a living source of documentation and knowledge - growi
 
 If you do not have node.js setup in your repository, you'll first want to install node.js.
 
-[NVM is a populat posix compliant installer](https://github.com/nvm-sh/nvm)
+[NVM is a popular posix compliant installer](https://github.com/nvm-sh/nvm)
 
 Once installed, you can run the following in the root of your repository
 

package/internals/external_commands/external_commands.rs

@@ -4,11 +4,12 @@ use std::{
     path::Path,
 };
 
+use futures::{TryStreamExt, stream::FuturesUnordered};
 use jwalk::WalkDir;
+use tokio_thread_pool::ThreadPool;
 
 use crate::{
-    concurrency::thread_pool::ThreadPool, internal_commands::typescript_command::TypescriptCommand,
-    repokit::interfaces::RepoKitCommand,
+    internal_commands::typescript_command::TypescriptCommand, repokit::interfaces::RepoKitCommand,
 };
 
 pub struct ExternalCommands {
@@ -21,8 +22,8 @@ impl ExternalCommands {
     }
 
     pub async fn find_all(&self) -> Vec<RepoKitCommand> {
-        let mut paths: Vec<String> = vec![];
-        let mut pool = ThreadPool::new(None, None);
+        let mut futures = FuturesUnordered::new();
+        let mut pool = ThreadPool::new(None, None, None);
         for entry in WalkDir::new(&self.root).into_iter().filter_map(|e| {
             if e.is_err() {
                 return None;
@@ -43,16 +44,23 @@ impl ExternalCommands {
             }
         }) {
             let path = entry.path();
-            let clone = path.clone();
-            let async_task = pool.spawn(move || ExternalCommands::read(&path));
-            if async_task.await.unwrap() {
+            futures.push(pool.spawn(move || {
+                if ExternalCommands::read(&path) {
+                    return Some(path.clone());
+                }
+                None
+            }));
+        }
+        let mut paths: Vec<String> = Vec::new();
+        while let Ok(Some(buffer)) = futures.try_next().await {
+            if let Some(path) = buffer {
                 paths.push(
-                    (clone)
+                    (path)
                         .into_os_string()
                         .into_string()
                         .expect("stringify")
                         .replace(&self.root, ""),
-                );
+                )
             }
         }
         pool.pool.shutdown_background();

package/internals/main.rs

@@ -3,7 +3,6 @@ use crate::{
     repokit::repokit::RepoKit,
 };
 
-mod concurrency;
 mod configuration;
 mod executables;
 mod executor;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@repokit/core",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "A knowledgebase for your repository - wrapped in a CLI",
   "keywords": [
     "cli",
@@ -20,9 +20,9 @@
     "access": "public"
   },
   "scripts": {
-    "build:all": "yarn lint:ts && yarn lint:rust && yarn install:repokit",
+    "build:all": "yarn lint:ts && yarn lint:rust && yarn install:rust",
     "build:rust": "cargo build --release",
-    "install:repokit": "yarn build:rust && cargo install --path .",
+    "install:rust": "yarn build:rust && cargo install --path .",
     "lint:rust": "cargo clippy --fix --allow-dirty",
     "lint:ts": "yarn oxlint --type-aware --type-check --report-unused-disable-directives --fix && yarn oxfmt",
     "postinstall": "chmod +x ./install.sh && ./install.sh",

package/internals/concurrency/mod.rs

@@ -1 +0,0 @@
-pub mod thread_pool;

package/internals/concurrency/thread_pool.rs

@@ -1,32 +0,0 @@
-use tokio::{
-    runtime::{self, Runtime},
-    task::JoinHandle,
-};
-
-pub struct ThreadPool {
-    pub pool: Runtime,
-}
-
-impl ThreadPool {
-    pub fn new(threads_override: Option<usize>, pool_override: Option<Runtime>) -> ThreadPool {
-        let pool = pool_override.unwrap_or(ThreadPool::create_pool(threads_override));
-        ThreadPool { pool }
-    }
-
-    pub fn spawn<T: Send + 'static, F: (Fn() -> T) + 'static + Send>(
-        &mut self,
-        task: F,
-    ) -> JoinHandle<T> {
-        self.pool.spawn(async move { task() })
-    }
-
-    fn create_pool(threads: Option<usize>) -> Runtime {
-        let mut pool = runtime::Builder::new_multi_thread();
-        pool.enable_all();
-        match threads {
-            Some(size) => pool.worker_threads(size),
-            None => &pool,
-        };
-        pool.build().unwrap()
-    }
-}