bunki 0.7.0 → 0.7.1

package/dist/cli.js

@@ -1596,7 +1596,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
         return arg.length > 1 && arg[0] === "-";
       }
       const negativeNumberArg = (arg) => {
-        if (!/^-\d*\.?\d+(e[+-]?\d+)?$/.test(arg))
+        if (!/^-(\d+|\d*\.\d+)(e[+-]?\d+)?$/.test(arg))
           return false;
         return !this._getCommandAndAncestors().some((cmd) => cmd.options.map((opt) => opt.short).some((short) => /^-\d$/.test(short)));
       };
@@ -33602,6 +33602,28 @@ class S3Uploader {
       }
     }
   }
+  async executeWithConcurrency(tasks, concurrency) {
+    const results = [];
+    const executing = [];
+    for (const task of tasks) {
+      const promise = task().then((result) => {
+        results.push(result);
+        const index = executing.indexOf(promise);
+        if (index > -1)
+          executing.splice(index, 1);
+      }).catch((error) => {
+        const index = executing.indexOf(promise);
+        if (index > -1)
+          executing.splice(index, 1);
+      });
+      executing.push(promise);
+      if (executing.length >= concurrency) {
+        await Promise.race(executing);
+      }
+    }
+    await Promise.all(executing);
+    return results;
+  }
   async uploadImages(imagesDir, minYear) {
     console.log(`[S3] Uploading all images from ${imagesDir} to bucket ${this.s3Config.bucket}...`);
     if (minYear) {
@@ -33609,59 +33631,30 @@ class S3Uploader {
     }
     const imageUrls = {};
     try {
-      console.log(`[S3] Checking if directory exists: ${imagesDir}`);
-      try {
-        const glob2 = new Bun.Glob("**/*");
-        let hasContent = false;
-        for await (const file of glob2.scan({
-          cwd: imagesDir,
-          absolute: false
-        })) {
-          hasContent = true;
-          break;
-        }
-        if (!hasContent) {
-          console.warn(`Directory exists but is empty: ${imagesDir}`);
-        }
-        console.log(`[S3] Directory exists and is accessible`);
-      } catch (err) {
-        const errorMessage = err instanceof Error ? err.message : String(err);
-        console.warn(`No images directory found at ${imagesDir}, skipping image upload. Error: ${errorMessage}`);
-        return imageUrls;
-      }
       const glob = new Bun.Glob("**/*.{jpg,jpeg,png,gif,webp,svg}");
       const files = [];
       console.log(`[S3] Scanning directory ${imagesDir} for image files...`);
       try {
-        const dirGlob = new Bun.Glob("**/*");
-        const allFiles = [];
-        for await (const file of dirGlob.scan({
+        for await (const file of glob.scan({
           cwd: imagesDir,
           absolute: false
         })) {
-          allFiles.push(file);
-        }
-        console.log(`[S3] Files in directory (including subdirs): ${allFiles.length > 0 ? allFiles.slice(0, 10).join(", ") + (allFiles.length > 10 ? "..." : "") : "none"}`);
-      } catch (err) {
-        console.error(`[S3] Error reading directory:`, err);
-      }
-      for await (const file of glob.scan({
-        cwd: imagesDir,
-        absolute: false
-      })) {
-        if (minYear) {
-          const yearMatch = file.match(/^(\d{4})\//);
-          if (yearMatch) {
-            const fileYear = parseInt(yearMatch[1], 10);
-            if (fileYear >= minYear) {
-              console.log(`[S3] Found image file: ${file}`);
-              files.push(file);
+          if (minYear) {
+            const yearMatch = file.match(/^(\d{4})\//);
+            if (yearMatch) {
+              const fileYear = parseInt(yearMatch[1], 10);
+              if (fileYear >= minYear) {
+                files.push(file);
+              }
             }
+          } else {
+            files.push(file);
           }
-        } else {
-          console.log(`[S3] Found image file: ${file}`);
-          files.push(file);
         }
+      } catch (err) {
+        const errorMessage = err instanceof Error ? err.message : String(err);
+        console.warn(`Error scanning images directory: ${errorMessage}`);
+        return imageUrls;
       }
       const imageFiles = files;
       if (imageFiles.length === 0) {
@@ -33669,27 +33662,35 @@ class S3Uploader {
         return imageUrls;
       }
       console.log(`Found ${imageFiles.length} images to upload`);
-      for (const imageFile of imageFiles) {
+      console.log(`[S3] Processing with 10 concurrent uploads...`);
+      const concurrencyLimit = 10;
+      let uploadedCount = 0;
+      let failedCount = 0;
+      const uploadTasks = imageFiles.map((imageFile) => async () => {
         try {
           const imagePath = path7.join(imagesDir, imageFile);
           const filename = path7.basename(imagePath);
-          console.log(`[S3] Uploading image ${imagePath} to S3 bucket ${this.s3Config.bucket}/${imageFile}...`);
           const file = Bun.file(imagePath);
           const contentType = file.type;
-          if (process.env.BUNKI_DRY_RUN === "true") {
-            console.log(`[S3] Dry run: would upload ${imageFile} with content type ${contentType}`);
-          } else {
+          if (process.env.BUNKI_DRY_RUN === "true") {} else {
             const s3File = this.client.file(imageFile);
             await s3File.write(file);
           }
           const imageUrl = this.getPublicUrl(imageFile);
-          console.log(`[S3] Image uploaded to ${imageUrl}`);
           imageUrls[imageFile] = imageUrl;
+          uploadedCount++;
+          if (uploadedCount % 10 === 0) {
+            console.log(`[S3] Progress: ${uploadedCount}/${imageFiles.length} images uploaded`);
+          }
+          return { success: true, file: imageFile };
         } catch (error) {
-          console.error(`Error uploading ${imageFile}:`, error);
+          failedCount++;
+          console.error(`[S3] Error uploading ${imageFile}:`, error);
+          return { success: false, file: imageFile };
         }
-      }
-      console.log(`[S3] Successfully uploaded ${Object.keys(imageUrls).length} of ${imageFiles.length} images`);
+      });
+      await this.executeWithConcurrency(uploadTasks, concurrencyLimit);
+      console.log(`[S3] Upload complete: ${uploadedCount} succeeded, ${failedCount} failed out of ${imageFiles.length} images`);
       return imageUrls;
     } catch (error) {
       console.error(`Error uploading images:`, error);

package/dist/index.js

@@ -31509,6 +31509,28 @@ class S3Uploader {
       }
     }
   }
+  async executeWithConcurrency(tasks, concurrency) {
+    const results = [];
+    const executing = [];
+    for (const task of tasks) {
+      const promise = task().then((result) => {
+        results.push(result);
+        const index = executing.indexOf(promise);
+        if (index > -1)
+          executing.splice(index, 1);
+      }).catch((error) => {
+        const index = executing.indexOf(promise);
+        if (index > -1)
+          executing.splice(index, 1);
+      });
+      executing.push(promise);
+      if (executing.length >= concurrency) {
+        await Promise.race(executing);
+      }
+    }
+    await Promise.all(executing);
+    return results;
+  }
   async uploadImages(imagesDir, minYear) {
     console.log(`[S3] Uploading all images from ${imagesDir} to bucket ${this.s3Config.bucket}...`);
     if (minYear) {
@@ -31516,59 +31538,30 @@ class S3Uploader {
     }
     const imageUrls = {};
     try {
-      console.log(`[S3] Checking if directory exists: ${imagesDir}`);
-      try {
-        const glob2 = new Bun.Glob("**/*");
-        let hasContent = false;
-        for await (const file of glob2.scan({
-          cwd: imagesDir,
-          absolute: false
-        })) {
-          hasContent = true;
-          break;
-        }
-        if (!hasContent) {
-          console.warn(`Directory exists but is empty: ${imagesDir}`);
-        }
-        console.log(`[S3] Directory exists and is accessible`);
-      } catch (err) {
-        const errorMessage = err instanceof Error ? err.message : String(err);
-        console.warn(`No images directory found at ${imagesDir}, skipping image upload. Error: ${errorMessage}`);
-        return imageUrls;
-      }
       const glob = new Bun.Glob("**/*.{jpg,jpeg,png,gif,webp,svg}");
       const files = [];
       console.log(`[S3] Scanning directory ${imagesDir} for image files...`);
       try {
-        const dirGlob = new Bun.Glob("**/*");
-        const allFiles = [];
-        for await (const file of dirGlob.scan({
+        for await (const file of glob.scan({
           cwd: imagesDir,
           absolute: false
         })) {
-          allFiles.push(file);
-        }
-        console.log(`[S3] Files in directory (including subdirs): ${allFiles.length > 0 ? allFiles.slice(0, 10).join(", ") + (allFiles.length > 10 ? "..." : "") : "none"}`);
-      } catch (err) {
-        console.error(`[S3] Error reading directory:`, err);
-      }
-      for await (const file of glob.scan({
-        cwd: imagesDir,
-        absolute: false
-      })) {
-        if (minYear) {
-          const yearMatch = file.match(/^(\d{4})\//);
-          if (yearMatch) {
-            const fileYear = parseInt(yearMatch[1], 10);
-            if (fileYear >= minYear) {
-              console.log(`[S3] Found image file: ${file}`);
-              files.push(file);
+          if (minYear) {
+            const yearMatch = file.match(/^(\d{4})\//);
+            if (yearMatch) {
+              const fileYear = parseInt(yearMatch[1], 10);
+              if (fileYear >= minYear) {
+                files.push(file);
+              }
             }
+          } else {
+            files.push(file);
           }
-        } else {
-          console.log(`[S3] Found image file: ${file}`);
-          files.push(file);
         }
+      } catch (err) {
+        const errorMessage = err instanceof Error ? err.message : String(err);
+        console.warn(`Error scanning images directory: ${errorMessage}`);
+        return imageUrls;
       }
       const imageFiles = files;
       if (imageFiles.length === 0) {
@@ -31576,27 +31569,35 @@ class S3Uploader {
         return imageUrls;
       }
       console.log(`Found ${imageFiles.length} images to upload`);
-      for (const imageFile of imageFiles) {
+      console.log(`[S3] Processing with 10 concurrent uploads...`);
+      const concurrencyLimit = 10;
+      let uploadedCount = 0;
+      let failedCount = 0;
+      const uploadTasks = imageFiles.map((imageFile) => async () => {
         try {
           const imagePath = path6.join(imagesDir, imageFile);
           const filename = path6.basename(imagePath);
-          console.log(`[S3] Uploading image ${imagePath} to S3 bucket ${this.s3Config.bucket}/${imageFile}...`);
           const file = Bun.file(imagePath);
           const contentType = file.type;
-          if (process.env.BUNKI_DRY_RUN === "true") {
-            console.log(`[S3] Dry run: would upload ${imageFile} with content type ${contentType}`);
-          } else {
+          if (process.env.BUNKI_DRY_RUN === "true") {} else {
             const s3File = this.client.file(imageFile);
             await s3File.write(file);
           }
           const imageUrl = this.getPublicUrl(imageFile);
-          console.log(`[S3] Image uploaded to ${imageUrl}`);
           imageUrls[imageFile] = imageUrl;
+          uploadedCount++;
+          if (uploadedCount % 10 === 0) {
+            console.log(`[S3] Progress: ${uploadedCount}/${imageFiles.length} images uploaded`);
+          }
+          return { success: true, file: imageFile };
         } catch (error) {
-          console.error(`Error uploading ${imageFile}:`, error);
+          failedCount++;
+          console.error(`[S3] Error uploading ${imageFile}:`, error);
+          return { success: false, file: imageFile };
         }
-      }
-      console.log(`[S3] Successfully uploaded ${Object.keys(imageUrls).length} of ${imageFiles.length} images`);
+      });
+      await this.executeWithConcurrency(uploadTasks, concurrencyLimit);
+      console.log(`[S3] Upload complete: ${uploadedCount} succeeded, ${failedCount} failed out of ${imageFiles.length} images`);
       return imageUrls;
     } catch (error) {
       console.error(`Error uploading images:`, error);

package/dist/utils/s3-uploader.d.ts

@@ -13,6 +13,12 @@ export declare class S3Uploader implements Uploader, ImageUploader {
      * @returns The public URL for the file
      */
     private getPublicUrl;
+    /**
+     * Execute async tasks with concurrency limit
+     * @param tasks Array of task functions that return promises
+     * @param concurrency Maximum number of concurrent tasks
+     */
+    private executeWithConcurrency;
     uploadImages(imagesDir: string, minYear?: number): Promise<Record<string, string>>;
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bunki",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "An opinionated static site generator built with Bun featuring PostCSS integration and modern web development workflows",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -47,7 +47,7 @@
   },
   "homepage": "https://github.com/kahwee/bunki#readme",
   "dependencies": {
-    "commander": "^14.0.1",
+    "commander": "^14.0.2",
     "gray-matter": "^4.0.3",
     "highlight.js": "^11.11.1",
     "marked": "^16.4.1",
@@ -59,15 +59,15 @@
     "slugify": "^1.6.6"
   },
   "devDependencies": {
-    "@tailwindcss/postcss": "^4.1.15",
+    "@tailwindcss/postcss": "^4.1.16",
     "@types/nunjucks": "^3.2.6",
     "@types/sanitize-html": "^2.16.0",
-    "autoprefixer": "^10.4.20",
-    "bun-types": "^1.3.0",
+    "autoprefixer": "^10.4.21",
+    "bun-types": "^1.3.1",
     "husky": "^9.1.7",
-    "lint-staged": "^16.2.5",
+    "lint-staged": "^16.2.6",
     "prettier": "^3.6.2",
-    "tailwindcss": "^4.1.15",
+    "tailwindcss": "^4.1.16",
     "typescript": "^5.9.3"
   },
   "peerDependencies": {