@content-collections/core 0.1.1 → 0.2.0

package/dist/index.d.ts

@@ -25,7 +25,7 @@ type CollectionRequest<TName extends string, TShape extends ZodRawShape, TSchema
     typeName?: string;
     schema: (z: Z) => TShape;
     transform?: (context: Context, data: TSchema) => TTransformResult;
-    directory: string;
+    directory: string | string[];
     include: string | string[];
     onSuccess?: (documents: Array<TDocument>) => void | Promise<void>;
 };

package/dist/index.js

@@ -11,6 +11,9 @@ function generateTypeName(name) {
 function isDefined(value) {
   return value !== void 0 && value !== null;
 }
+function orderByPath(a, b) {
+  return a.path.localeCompare(b.path);
+}
 
 // src/config.ts
 function defineCollection(collection) {
@@ -36,7 +39,7 @@ import path from "path";
 // package.json
 var package_default = {
   name: "@content-collections/core",
-  version: "0.1.0",
+  version: "0.1.2",
   type: "module",
   main: "dist/index.cjs",
   types: "./dist/index.d.ts",
@@ -199,8 +202,8 @@ function createCollector(emitter, baseDirectory = ".") {
       return null;
     }
   }
-  async function resolveCollection(collection) {
-    const collectionDirectory = path2.join(baseDirectory, collection.directory);
+  async function resolveDirectory(collection, directory) {
+    const collectionDirectory = path2.join(baseDirectory, directory);
     const filePaths = await fg(collection.include, {
       cwd: collectionDirectory,
       onlyFiles: true,
@@ -209,10 +212,22 @@ function createCollector(emitter, baseDirectory = ".") {
     const promises = filePaths.map(
       (filePath) => collectFile(collectionDirectory, filePath)
     );
-    const files = await Promise.all(promises);
+    return Promise.all(promises);
+  }
+  async function resolveCollection(collection) {
+    let files = [];
+    if (typeof collection.directory === "string") {
+      files = await resolveDirectory(collection, collection.directory);
+    } else {
+      const promises = collection.directory.map(
+        (directory) => resolveDirectory(collection, directory)
+      );
+      const resolved = await Promise.all(promises);
+      files = resolved.flat();
+    }
     return {
       ...collection,
-      files: files.filter(isDefined)
+      files: files.filter(isDefined).sort(orderByPath)
     };
   }
   async function collect(unresolvedCollections) {
@@ -423,13 +438,26 @@ function createTransformer(emitter) {
 import micromatch from "micromatch";
 import path4 from "path";
 function createSynchronizer(readCollectionFile, collections, baseDirectory = ".") {
-  function findCollection(filePath) {
+  function findCollectionAndDirectory(filePath) {
     const resolvedFilePath = path4.resolve(filePath);
-    return collections.find((collection) => {
-      return resolvedFilePath.startsWith(
-        path4.resolve(baseDirectory, collection.directory)
-      );
-    });
+    for (const collection of collections) {
+      const directories = [];
+      if (typeof collection.directory === "string") {
+        directories.push(collection.directory);
+      } else {
+        directories.push(...collection.directory);
+      }
+      for (const directory of directories) {
+        const resolvedDirectory = path4.resolve(baseDirectory, directory);
+        if (resolvedFilePath.startsWith(resolvedDirectory)) {
+          return {
+            collection,
+            directory
+          };
+        }
+      }
+    }
+    return null;
   }
   function createRelativePath(collectionPath, filePath) {
     const resolvedCollectionPath = path4.resolve(baseDirectory, collectionPath);
@@ -441,11 +469,12 @@ function createSynchronizer(readCollectionFile, collections, baseDirectory = "."
     return relativePath;
   }
   function resolve(filePath) {
-    const collection = findCollection(filePath);
-    if (!collection) {
+    const collectionAndDirectory = findCollectionAndDirectory(filePath);
+    if (!collectionAndDirectory) {
       return null;
     }
-    const relativePath = createRelativePath(collection.directory, filePath);
+    const { collection, directory } = collectionAndDirectory;
+    const relativePath = createRelativePath(directory, filePath);
     if (!micromatch.isMatch(relativePath, collection.include)) {
       return null;
     }
@@ -475,15 +504,28 @@ function createSynchronizer(readCollectionFile, collections, baseDirectory = "."
     const index = collection.files.findIndex(
       (file2) => file2.path === relativePath
     );
-    const file = await readCollectionFile(
-      path4.join(baseDirectory, collection.directory),
-      relativePath
-    );
+    const directories = [];
+    if (typeof collection.directory === "string") {
+      directories.push(collection.directory);
+    } else {
+      directories.push(...collection.directory);
+    }
+    let file = null;
+    for (const directory of directories) {
+      file = await readCollectionFile(
+        path4.join(baseDirectory, directory),
+        relativePath
+      );
+      if (file) {
+        break;
+      }
+    }
     if (!file) {
       return false;
     }
     if (index === -1) {
       collection.files.push(file);
+      collection.files.sort(orderByPath);
     } else {
       collection.files[index] = file;
     }
@@ -499,7 +541,7 @@ function createSynchronizer(readCollectionFile, collections, baseDirectory = "."
 import path5 from "path";
 
 // src/watcher.ts
-import watcher from "@parcel/watcher";
+import * as watcher from "@parcel/watcher";
 async function createWatcher(emitter, paths, sync, build2) {
   const onChange = async (error, events) => {
     if (error) {
@@ -613,9 +655,16 @@ async function createBuilder(configurationPath, options = {
     });
   }
   async function watch() {
-    const paths = resolved.map(
-      (collection) => path5.join(baseDirectory, collection.directory)
-    );
+    const paths = [];
+    for (const collection of resolved) {
+      if (typeof collection.directory === "string") {
+        paths.push(path5.join(baseDirectory, collection.directory));
+      } else {
+        paths.push(
+          ...collection.directory.map((dir) => path5.join(baseDirectory, dir))
+        );
+      }
+    }
     const watcher2 = await createWatcher(emitter, paths, sync, build2);
     return watcher2;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@content-collections/core",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "type": "module",
   "main": "dist/index.cjs",
   "types": "./dist/index.d.ts",