aeria-populate 0.0.21 → 0.0.23

package/README.md

@@ -4,7 +4,7 @@
 
 - `-c --compileMarkdown`: will compile Markdown to HTML before inserting
 - `-d --dropCollections`: will drop matching collections before inserting
-- `-w --watch`: watch mode (can not be used together with `--dropCollections`)
+- `-w --watch`: watch mode
 
 ```sh
 # when --env-file is applicable
@@ -21,7 +21,7 @@ npx aeria-populate -c "content/**/*.md"
 ---
 collection: person
 unique: slug
-content: description
+content: description # optional
 document:
     slug: john-doe
     sex: male

package/dist/cli.js

@@ -23,16 +23,18 @@ const { positionals, values: opts } = parseArgs({
 });
 const dbPromise = getDatabase();
 const isValidFrontmatterObject = (value) => {
-    return !!(value
-        && typeof value === 'object'
-        && 'collection' in value
+    if (!value || typeof value !== 'object') {
+        return false;
+    }
+    if ('content' in value && typeof value.content !== 'string') {
+        return false;
+    }
+    return !!('collection' in value
         && 'unique' in value
-        && 'content' in value
         && 'document' in value
         && value.document
         && typeof value.collection === 'string'
         && typeof value.unique === 'string'
-        && typeof value.content === 'string'
         && typeof value.document === 'object');
 };
 const parseMarkdown = async (text) => {
@@ -66,24 +68,16 @@ const work = async (text) => {
             _id: 1,
         },
     });
-    let insertion;
+    const payload = {
+        what: frontmatter.document,
+    };
     if (existing) {
-        insertion = await insert({
-            what: {
-                ...frontmatter.document,
-                [frontmatter.content]: content,
-                _id: existing._id,
-            },
-        }, context);
-    }
-    else {
-        insertion = await insert({
-            what: {
-                ...frontmatter.document,
-                [frontmatter.content]: content,
-            },
-        }, context);
+        payload.what._id = existing._id;
+    }
+    if (frontmatter.content) {
+        payload.what[frontmatter.content] = content;
     }
+    const insertion = await insert(payload, context);
     return {
         insertion,
         frontmatter,
@@ -91,33 +85,37 @@ const work = async (text) => {
     };
 };
 const visitFile = async (file) => {
-    let failed = 0, successful = 0;
-    const content = await fs.promises.readFile(file, {
-        encoding: 'utf-8',
-    });
-    const { insertion: { error }, frontmatter, existing } = await work(content);
-    const uniqueName = styleText(['bold'], frontmatter.document[frontmatter.unique]);
-    const collectionName = styleText(['bold'], frontmatter.collection);
-    if (error) {
-        const actionText = existing
-            ? `update ${uniqueName} into collection`
-            : `add ${uniqueName} to collection`;
-        console.log(styleText(['red'], 'x'), "couldn't", actionText, collectionName);
-        console.log(inspect(error, {
-            depth: null,
-        }));
-        failed++;
-    }
-    else {
-        const actionText = existing
-            ? 'updated into collection'
-            : 'added to collection';
-        console.log(styleText(['green'], '✓'), uniqueName, 'successfully', actionText, collectionName);
-        successful++;
+    try {
+        const content = await fs.promises.readFile(file, {
+            encoding: 'utf-8',
+        });
+        const { insertion: { error }, frontmatter, existing } = await work(content);
+        const uniqueName = styleText(['bold'], frontmatter.document[frontmatter.unique]);
+        const collectionName = styleText(['bold'], frontmatter.collection);
+        if (error) {
+            const actionText = existing
+                ? `update ${uniqueName} into collection`
+                : `add ${uniqueName} to collection`;
+            console.log(styleText(['red'], 'x'), "couldn't", actionText, collectionName);
+            console.log(inspect(error, {
+                depth: null,
+            }));
+        }
+        else {
+            const actionText = existing
+                ? 'updated into collection'
+                : 'added to collection';
+            console.log(styleText(['green'], '✓'), uniqueName, 'successfully', actionText, collectionName);
+        }
+        return {
+            success: !error,
+        };
+    }
+    catch (err) {
+        console.trace(err);
     }
     return {
-        failed,
-        successful,
+        success: false,
     };
 };
 export const main = async () => {
@@ -143,7 +141,7 @@ export const main = async () => {
     if (opts.dropCollections) {
         for (const collection of collections) {
             if ((await db.listCollections().toArray()).some((subject) => collection === subject.name)) {
-                await db.collection(collection).drop();
+                await db.collection(collection).deleteMany();
                 console.log(styleText(['green'], '✓'), 'dropped collection', styleText(['bold'], collection));
                 dropped++;
             }
@@ -151,8 +149,12 @@ export const main = async () => {
     }
     for (const file of files) {
         const result = await visitFile(file);
-        failed += result.failed;
-        successful += result.successful;
+        if (result.success) {
+            successful++;
+        }
+        else {
+            failed++;
+        }
     }
     console.log(dropped, 'dropped collections:', collections.map((collection) => styleText(['bold'], collection)).join(', '));
     console.log(successful, 'documents imported successfully');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "aeria-populate",
   "type": "module",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "description": "",
   "license": "ISC",
   "keywords": [],