votive 0.0.9 → 0.2.0

package/README.md

@@ -11,6 +11,7 @@
 - [ ] Rename jobs and paths
 - [ ] Better dependency tracking
 - [ ] Better query filters
+- [x] File deletion handling
 
 ## Project: Jobs
 

package/lib/bundle.js

@@ -227,6 +227,7 @@ async function bundle(config, cache) {
   // Read folders and source files
   const { folders, sources } = await readSources(config, database, processors)
 
+  console.log(123)
   sourceTime()
 
   if(config.verbose) console.info(`${styleText("dim", "build:")} ${styleText("magenta", `found ${sources.length} stale files`)}`)

package/lib/createDatabase.js

@@ -366,7 +366,7 @@ function prepareStatements(database) {
        * @returns {SQLiteDependency[]}
        */
 
-      getByTarget: /** @type {{all: SQLiteDependencyGetByTarget}} */ (/** @type {unknown} */ (database.prepare(`
+      getAllByTarget: /** @type {{all: SQLiteDependencyGetByTarget}} */ (/** @type {unknown} */ (database.prepare(`
         SELECT * FROM dependencies WHERE destination = ?
       `))),
 
@@ -572,10 +572,11 @@ function createDatabase(databasePath = ".votive.db") {
         prepared.settings.delete.all(filePath)
         prepared.dependency.deleteByTarget.all(deletedSource.destination)
           .forEach(({ dependent }) => {
-            prepared.dependency.markStale.get(dependent)
+            prepared.target.markStale.get(dependent)
           })
         prepared.metadata.deleteByTarget.all(deletedSource.destination)
         prepared.target.delete.get(deletedSource.destination)
+        return deletedSource
       },
 
       getAll() {
@@ -666,6 +667,13 @@ function createDatabase(databasePath = ".votive.db") {
         return prepared.dependency.getAll.all()
       },
 
+      /**
+       * @param {string} target
+       */
+      getAllByTarget(target) {
+        return prepared.dependency.getAllByTarget.all(target)
+      },
+
       /**
        * @param {object} dependencyFile
        * @param {string} dependencyKey
@@ -688,7 +696,7 @@ function createDatabase(databasePath = ".votive.db") {
 
       /**
        * @param {string} filePath
-       * @returns {TargetOutput}
+       * @returns {TargetOutput | undefined}
        */
       get(filePath) {
         const target = prepared.target.get.get(filePath)
@@ -747,6 +755,8 @@ function createDatabase(databasePath = ".votive.db") {
       getWithTrackers(filePath, dependent) {
         const target = queries.target.get(filePath)
 
+        if(!target) return
+
         const trackedTarget = { metadata: {} }
 
         queries.dependency.track(
@@ -906,7 +916,13 @@ function createDatabase(databasePath = ".votive.db") {
       /** @param {string} filePath */
       markFresh(filePath) {
         return prepared.target.markFresh.get(filePath)
+      },
+
+      /** @param {string} filePath */
+      markStale(filePath) {
+        return prepared.target.markStale.get(filePath)
       }
+
     },
 
     url: {

package/lib/readSources.js

@@ -3,7 +3,7 @@ import fs from "node:fs/promises"
 import path from "node:path"
 import pLimit from "p-limit"
 
-/** @import {VotiveConfig, VotivePlugin, VotiveProcessor, FlatProcessors, Abstracts, Abstract, Jobs, ProcessorSyntax} from "./bundle.js" */
+/** @import {VotiveConfig, VotivePlugin, VotiveProcessor, FlatProcessors, Abstracts, Abstract, Jobs, ProcessorSyntax, Router} from "./bundle.js" */
 /** @import {Dirent} from "node:fs" */
 /** @import {Database} from "./createDatabase.js" */
 
@@ -31,28 +31,50 @@ async function readSources(config, database, processors) {
   const loadingFiles = files.map(a => path.normalize(path.format({ name: a.name, dir: a.parentPath })))
   if (!files) return { folders, sources: [] }
   const limit = pLimit(5)
-  const readingSourceFiles = files.flatMap(readSourceFile(processors, database, config, limit))
-  // const sources = readingSourceFiles && readingSourceFiles.map(async file => {
-  //   try {
-  //     const loaded = await file
-  //     // console.log(loaded)
-  //     // const i = loadingFiles.find(a => a === loaded.sourceFilePath)
-  //     // loadingFiles.splice(i,1)
-  //     // console.log(loadingFiles)
-  //     return loaded
-  //   } catch (e) {
-  //     console.error(e)
-  //   }
-  // })
-  const sources = readingSourceFiles && (await Promise.all(readingSourceFiles)).filter(a => a)
+  const readingSourceFiles = files.flatMap(readSourceFile(processors, database, config))
 
+  const reading = [
+    (await Promise.all(readingSourceFiles)).filter(a => a),
+    pruneDeletions(config, database, filteredDirents)
+  ]
+
+  const [sources, deletedSources] = await Promise.all(reading)
+
+  // const sources = readingSourceFiles && (await Promise.all(readingSourceFiles)).filter(a => a)
+
+  console.log({ sources })
+
+  // const deletedSources = await pruneDeletions(config, database, filteredDirents)
+
+  console.log({ deletedSources })
 
   return {
     folders,
-    sources
+    sources: [...sources, ...deletedSources]
   }
 }
 
+/**
+ * @param {VotiveConfig} config
+ * @param {Database} database
+ * @param {Dirent[]} dirents
+ */
+async function pruneDeletions(config, database, dirents) {
+  const sourceFilePaths = new Set(dirents.map(d => d.isFile() && path.join(d.parentPath, d.name)))
+  const sourceRecords = database.source.getAll()
+  const sourceRecordPaths = new Set(sourceRecords.map(r => r.path))
+
+  const deletions = sourceRecordPaths.difference(sourceFilePaths)
+
+  let deletedSources = []
+
+  deletions.forEach(deletion => {
+    deletedSources.push(database.source.delete(deletion))
+  })
+
+  return deletedSources.filter(a => a)
+}
+
 /**
  * @param {VotiveConfig} config
  */
@@ -98,7 +120,7 @@ function fileFilter(config) {
  * @param {Database} database
  * @param {VotiveConfig} config
  */
-function readSourceFile(processors, database, config, limit) {
+function readSourceFile(processors, database, config) {
   /**
    * @param {import("node:fs").Dirent} dirent
    * @returns {Promise<ReadSourceFileResult>[]}
@@ -108,14 +130,14 @@ function readSourceFile(processors, database, config, limit) {
     const sourceFilePath = path.join(parentPath, name)
     const sourceFileInfo = path.parse(sourceFilePath)
 
-    const processing = processors.flatMap(({ plugin, processor }) => process(plugin, processor, config, limit))
+    const processing = processors.flatMap(({ plugin, processor }) => process(plugin, processor, config))
 
     /**
      * @param {VotivePlugin} plugin
      * @param {VotiveProcessor} processor
      * @param {VotiveConfig} config
      */
-    async function process(plugin, processor, config, limit) {
+    async function process(plugin, processor, config) {
       const { readFile: read, extensions: filter, format } = processor
       if (filter.includes(sourceFileInfo.ext) && read) {
 

package/package.json

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

package/tests/index.js

@@ -93,9 +93,9 @@ test("bundle", async () => {
     const dir = fs.readdirSync(tempDest.path, { recursive: true })
     assert(dir.length === 0, "Destination directory is not empty.")
   } catch (error) {
-    console.error(error)
     tempDest.remove()
     tempSource.remove()
+    console.error(error)
 
   }