votive 0.4.0 → 0.4.1

package/lib/bundle.js

@@ -10,6 +10,10 @@ import { styleText } from "node:util"
 
 /** @import {Database} from "./createDatabase.js" */
 
+/**
+ * @typedef {Database} Database
+ */
+
 /**
  * @typedef {object} VotivePlugin
  * @property {string} name

package/lib/createDatabase.js

@@ -264,43 +264,43 @@ function prepareStatements(database) {
         ORDER BY d.path ASC;
       `))),
 
-    /*
-        WITH matches AS (
-          SELECT m.destination, COUNT(*) AS match_count
-          FROM metadata m
-          INNER JOIN json_each('{ "breadcrumb": "Hello World" }') j ON j.key = m.label AND (
-            j.value = m.value
-            OR (
-              json_valid(m.value)
-              AND json_type(m.value) = 'array'
-              AND EXISTS (
-                SELECT 1
-                FROM json_each(m.value)
-                WHERE value = j.value
+      /*
+          WITH matches AS (
+            SELECT m.destination, COUNT(*) AS match_count
+            FROM metadata m
+            INNER JOIN json_each('{ "breadcrumb": "Hello World" }') j ON j.key = m.label AND (
+              j.value = m.value
+              OR (
+                json_valid(m.value)
+                AND json_type(m.value) = 'array'
+                AND EXISTS (
+                  SELECT 1
+                  FROM json_each(m.value)
+                  WHERE value = j.value
+                )
               )
             )
+            GROUP BY m.destination
+          ),
+          filter_count AS (
+            SELECT COUNT(*) AS total FROM json_each('{ "breadcrumb": "Hello World" }')
           )
-          GROUP BY m.destination
-        ),
-        filter_count AS (
-          SELECT COUNT(*) AS total FROM json_each('{ "breadcrumb": "Hello World" }')
-        )
-        SELECT d.*, json_group_object(i.label, i.value) AS metadata
-        FROM destinations d
-        INNER JOIN metadata i ON d.path = i.destination
-        LEFT JOIN matches ON matches.destination = d.path
-        CROSS JOIN filter_count f
-        WHERE (
-          f.total = 0
-          OR matches.match_count = f.total
-        )
-        AND (
-          d.dir = '/'
-          OR d.dir LIKE '%'
-        )
-        GROUP BY d.path
-        ORDER BY d.path ASC;
-        */
+          SELECT d.*, json_group_object(i.label, i.value) AS metadata
+          FROM destinations d
+          INNER JOIN metadata i ON d.path = i.destination
+          LEFT JOIN matches ON matches.destination = d.path
+          CROSS JOIN filter_count f
+          WHERE (
+            f.total = 0
+            OR matches.match_count = f.total
+          )
+          AND (
+            d.dir = '/'
+            OR d.dir LIKE '%'
+          )
+          GROUP BY d.path
+          ORDER BY d.path ASC;
+          */
 
       /**
        * @callback SQLiteTargetGetAll
@@ -659,7 +659,9 @@ function createDatabase(databasePath = ".votive.db") {
         const type = typeof value
         const safeValue = type === "object"
           ? JSON.stringify(value)
-          : value
+          : type === "boolean"
+            ? Number(value)
+            : value
 
         const descendents = folder === ""
           ? "%"
@@ -746,7 +748,6 @@ function createDatabase(databasePath = ".votive.db") {
        * @param {string} filePath
        */
       delete(filePath) {
-        console.log("deleting")
         const deleted = prepared.target.delete.get(filePath)
         prepared.metadata.deleteByTarget.all(filePath)
         const deps = queries.dependency.getAllByTarget(filePath)
@@ -817,7 +818,7 @@ function createDatabase(databasePath = ".votive.db") {
       getWithTrackers(filePath, dependent) {
         const target = queries.target.get(filePath)
 
-        if(!target) return
+        if (!target) return
 
         const trackedTarget = { metadata: {} }
 

package/lib/readSources.js

@@ -172,30 +172,34 @@ function readSourceFile(processors, database, config) {
           const stats = await fs.stat(sourceFilePath)
           const data = await fs.readFile(sourceFilePath, { encoding: "utf-8" })
 
-          const { jobs, abstract, metadata } = read(data, sourceFilePath, targetFilePath, database, config)
-
-
-          if (Array.isArray(jobs)) {
-            allJobs.push(...jobs)
-          }
-
-          const target = database.target.create({
-            abstract,
-            path: targetFilePath,
-            metadata,
-          })
-
-          // FIXME this won't work with the refactor
-          allJobs && allJobs.forEach(job => job.syntax = processor.extensions[0])
-          updateSource()
-          return {
-            abstract,
-            metadata,
-            syntax: targetFileExtension,
-            targetFilePath: target.path,
-            dir: target.dir,
-            sourceFilePath,
-            jobs: allJobs
+          const content = read(data, sourceFilePath, targetFilePath, database, config)
+          if (content) {
+
+            const { jobs, abstract, metadata } = read(data, sourceFilePath, targetFilePath, database, config)
+
+
+            if (Array.isArray(jobs)) {
+              allJobs.push(...jobs)
+            }
+
+            const target = database.target.create({
+              abstract,
+              path: targetFilePath,
+              metadata,
+            })
+
+            // FIXME this won't work with the refactor
+            allJobs && allJobs.forEach(job => job.syntax = processor.extensions[0])
+            updateSource()
+            return {
+              abstract,
+              metadata,
+              syntax: targetFileExtension,
+              targetFilePath: target.path,
+              dir: target.dir,
+              sourceFilePath,
+              jobs: allJobs
+            }
           }
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "votive",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "A file processor.",
   "homepage": "https://github.com/samlfair/votive#readme",
   "bugs": {