@content-collections/core 0.9.1 → 0.10.0

package/dist/index.js

@@ -519,6 +519,9 @@ function posixToNativePath(pathName) {
   }
   return pathName;
 }
+function toError(error) {
+  return error instanceof Error ? error : new Error(String(error));
+}
 
 // src/collector.ts
 var CollectError = class extends Error {
@@ -636,6 +639,8 @@ function createSynchronizer(readCollectionFile, collections, baseDirectory = "."
       };
     }).filter(({ collection, relativePath }) => {
       return picomatch.isMatch(relativePath, collection.include, {
+        // @see https://github.com/sdorra/content-collections/issues/602
+        windows: process.platform === "win32",
         ignore: collection.exclude
       });
     });
@@ -1113,41 +1118,58 @@ function createEmitter() {
 }
 
 // src/watcher.ts
-import * as watcher from "@parcel/watcher";
+import chokidar from "chokidar";
 import path8, { dirname as dirname3, resolve } from "node:path";
 async function createWatcher(emitter, baseDirectory, configuration, sync) {
-  const onChange = async (error, events) => {
-    if (error) {
+  const paths = removeChildPaths([
+    ...configuration.collections.map((collection) => path8.join(baseDirectory, collection.directory)).map((p) => resolve(p)),
+    ...configuration.inputPaths.map((p) => dirname3(p))
+  ]);
+  const watcher = chokidar.watch(paths, {
+    ignored: [
+      /(^|[\/\\])\../,
+      // ignore dotfiles
+      /(^|[\/\\])node_modules([\/\\]|$)/
+      // ignore node_modules
+    ],
+    persistent: true,
+    ignoreInitial: true
+    // ignore initial add events
+  });
+  const handleEvent = async (modification, filePath) => {
+    try {
+      await sync(modification, filePath);
+    } catch (error) {
       emitter.emit("watcher:subscribe-error", {
         paths,
-        error
+        error: toError(error)
       });
-      return;
-    }
-    for (const event of events) {
-      await sync(event.type, event.path);
     }
   };
-  const paths = removeChildPaths([
-    ...configuration.collections.map((collection) => path8.join(baseDirectory, collection.directory)).map((p) => resolve(p)),
-    ...configuration.inputPaths.map((p) => dirname3(p))
-  ]);
-  const subscriptions = (await Promise.all(paths.map((path10) => watcher.subscribe(path10, onChange)))).filter(isDefined);
-  emitter.emit("watcher:subscribed", {
-    paths
+  watcher.on("add", (filePath) => handleEvent("create", filePath));
+  watcher.on("change", (filePath) => handleEvent("update", filePath));
+  watcher.on("unlink", (filePath) => handleEvent("delete", filePath));
+  watcher.on("error", (error) => {
+    emitter.emit("watcher:subscribe-error", {
+      paths,
+      error: toError(error)
+    });
+  });
+  await new Promise((resolve2, reject) => {
+    watcher.on("ready", () => {
+      emitter.emit("watcher:subscribed", {
+        paths
+      });
+      resolve2();
+    });
+    watcher.on("error", reject);
   });
   return {
     unsubscribe: async () => {
-      if (!subscriptions || subscriptions.length === 0) {
-        return;
-      }
-      await Promise.all(
-        subscriptions.map((subscription) => subscription.unsubscribe())
-      );
+      await watcher.close();
       emitter.emit("watcher:unsubscribed", {
         paths
       });
-      return;
     }
   };
 }
@@ -1176,7 +1198,7 @@ async function createBuilder(configurationPath, options = {
     outputDirectory
   });
   let configuration = await readConfiguration(configurationPath, options);
-  let watcher2 = null;
+  let watcher = null;
   let context2 = await createBuildContext({
     emitter,
     baseDirectory,
@@ -1217,8 +1239,8 @@ async function createBuilder(configurationPath, options = {
       });
       return false;
     }
-    if (watcher2) {
-      await watcher2.unsubscribe();
+    if (watcher) {
+      await watcher.unsubscribe();
     }
     context2 = await createBuildContext({
       emitter,
@@ -1226,8 +1248,8 @@ async function createBuilder(configurationPath, options = {
       outputDirectory,
       configuration
     });
-    if (watcher2) {
-      watcher2 = await createWatcher(
+    if (watcher) {
+      watcher = await createWatcher(
         emitter,
         baseDirectory,
         configuration,
@@ -1245,11 +1267,11 @@ async function createBuilder(configurationPath, options = {
     }
   }
   async function watch() {
-    watcher2 = await createWatcher(emitter, baseDirectory, configuration, sync);
+    watcher = await createWatcher(emitter, baseDirectory, configuration, sync);
     return {
       unsubscribe: async () => {
-        if (watcher2) {
-          await watcher2.unsubscribe();
+        if (watcher) {
+          await watcher.unsubscribe();
         }
       }
     };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@content-collections/core",
   "type": "module",
-  "version": "0.9.1",
+  "version": "0.10.0",
   "description": "Core of Content Collections",
   "author": "Sebastian Sdorra <s.sdorra@gmail.com>",
   "license": "MIT",
@@ -41,9 +41,9 @@
     "vitest": "^3.1.3"
   },
   "dependencies": {
-    "@parcel/watcher": "^2.4.1",
     "@standard-schema/spec": "^1.0.0",
     "camelcase": "^8.0.0",
+    "chokidar": "^4.0.3",
     "esbuild": "^0.25.0",
     "gray-matter": "^4.0.3",
     "p-limit": "^6.1.0",