mostly refactoring parser

davidlee · Aug 30, 2023 · 52f16d4 · 52f16d4
1 parent 703ff84
commit 52f16d4
Show file tree

Hide file tree

Showing 7 changed files with 251 additions and 43 deletions.
diff --git a/graph.svg b/graph.svg
diff --git a/src/dataLayerLoader.ts b/src/dataLayerLoader.ts
@@ -17,6 +17,7 @@ const defaults: Configuration  = {
   adapter: 'file',
   path: `${process.env.HOME}/.config/projector/entries.json`
 }
+
 export function dispatcher(options = {}) {
   const props: Configuration = {...defaults, ...options}
   let adapter: DataStoreAdapter

diff --git a/src/dataStoreAdapter.ts b/src/dataStoreAdapter.ts
@@ -1,8 +1,12 @@
 import * as E from './entry'
+import { Value } from '@sinclair/typebox/value'
 
 export abstract class DataStoreAdapter { // need separate read/write abstract classes
   persistEntry(entry:E.Entry): boolean {
-    this.write(JSON.stringify(entry))
+
+    const str = Value.Encode(E.Entry, entry)
+    console.log(str)
+    this.write(JSON.stringify(str))
     return true
   }
 

diff --git a/src/entry.ts b/src/entry.ts
@@ -61,9 +61,9 @@ export const Default = {
 // EntryUpdate (compose)
 
 export const Entry = Type.Object({
-  id:        Type.Number(), // READ nextID()
-  uid:       Type.String(), // uid()
-  path:      Type.String(), // path(parent?)
+  id:        Type.Number(), // required
+  uid:       Type.String(), // required
+  path:      Type.String(), // required
 
   type:      Type.String({ default: EntryTypes.Transient }),
   status:    Type.String({ default: StatusNames.Capture }),
@@ -82,7 +82,6 @@ export const Entry = Type.Object({
 
   depends:   Type.Array(Type.String(), { default: [] }), // TODO
   parents:   Type.Array(Type.String(), { default: [] }), // TODO
-  // children:  Type.Array(Type.String(), { default: [] }), // TODO
 
   recur:     Type.Array(Type.String(), { default: [] }), // TODO
   repeat:    Type.Array(Type.String(), { default: [] }), // TODO
@@ -99,7 +98,7 @@ export const Entry = Type.Object({
   start:     Type.Optional(Type.Date()),  
   reviewed:  Type.Optional(Type.Date()),  
 
-  created:   Type.Date({ default: new Date() }), // FIXME won't work in a long-lived process
+  created:   Type.Date(),
   modified:  Type.Optional(Type.Date()),  
 })
 export type Entry = Static<typeof Entry>

diff --git a/src/fileStoreAdapter.ts b/src/fileStoreAdapter.ts
@@ -18,7 +18,7 @@ export class FileStoreAdapter extends DataStoreAdapter {
 
     let fd: number
 
-    using cleanup = new DisposableStack();
+    using cleanup = new DisposableStack()
     cleanup.defer(() => {
       if(fd !== undefined)
         fs.closeSync(fd)