feat: add defaults for frontmatter

waynevanson · Aug 28, 2023 · 99f26b7 · 99f26b7
1 parent 9d3f573
commit 99f26b7
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 36 deletions.
diff --git a/.vault/.obsidian/workspace.json b/.vault/.obsidian/workspace.json
@@ -4,15 +4,19 @@
     "type": "split",
     "children": [
       {
-        "id": "0716682fc1a1b562",
+        "id": "1f83ec277e87be99",
         "type": "tabs",
         "children": [
           {
-            "id": "d5403f62d610686b",
+            "id": "d89bcd3b4839c10b",
             "type": "leaf",
             "state": {
-              "type": "empty",
-              "state": {}
+              "type": "markdown",
+              "state": {
+                "file": "Sample 05.md",
+                "mode": "preview",
+                "source": true
+              }
             }
           }
         ]
@@ -81,6 +85,7 @@
             "state": {
               "type": "backlink",
               "state": {
+                "file": "Sample 05.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -97,6 +102,7 @@
             "state": {
               "type": "outgoing-link",
               "state": {
+                "file": "Sample 05.md",
                 "linksCollapsed": false,
                 "unlinkedCollapsed": true
               }
@@ -118,7 +124,9 @@
             "type": "leaf",
             "state": {
               "type": "outline",
-              "state": {}
+              "state": {
+                "file": "Sample 05.md"
+              }
             }
           }
         ],
@@ -139,8 +147,10 @@
       "command-palette:Open command palette": false
     }
   },
-  "active": "d5403f62d610686b",
+  "active": "d89bcd3b4839c10b",
   "lastOpenFiles": [
+    "Sample 04.md",
+    "Sample 05.md",
     "Sample 03.md",
     "Sample 02.md",
     "data.md",

diff --git a/.vault/Sample 03.md b/.vault/Sample 03.md
@@ -4,7 +4,7 @@ schema:
     name:
       type: string
 data:
-  name: Yellow Black
+  name: Shrek the best
 ---
 
 ```yaml-data-entry

diff --git a/.vault/Sample 04.md b/.vault/Sample 04.md
@@ -0,0 +1,14 @@
+---
+schema:
+  properties:
+    name:
+      type: string
+data: {}
+---
+
+```yaml-data-entry
+datasource:
+  file:
+schema:
+  file:
+```
diff --git a/.vault/Sample 05.md b/.vault/Sample 05.md
@@ -0,0 +1,14 @@
+---
+schema:
+  properties:
+    name:
+      type: string
+data: {}
+---
+
+```yaml-data-entry
+datasource:
+  file:
+schema:
+  file:
+```
diff --git a/README.md b/README.md
@@ -31,20 +31,17 @@ schema:
       type: array
       items:
         type: string
-data:
 ---
 
 ```yaml-data-entry
 datasource:
   file:
-    path: .
-    frontmatter: data
 schema:
   file:
-    path: .
-    frontmatter: schema
 ```
 
+
+
 </code></pre>
 
 ## Please Note

diff --git a/packages/data-entry/src/components/context.tsx b/packages/data-entry/src/components/context.tsx
@@ -1,6 +1,6 @@
 import { App } from 'obsidian';
 import { createContext, useContext } from 'react';
-import { ApplicationConfiguration } from '../common';
+import { ApplicationConfiguration } from '../config';
 
 export interface ApplicationProps {
   app: App;

diff --git a/packages/data-entry/src/common.ts → packages/data-entry/src/config.ts b/packages/data-entry/src/common.ts → packages/data-entry/src/config.ts
@@ -1,20 +1,10 @@
-import { option, readonlyRecord, string } from 'fp-ts';
 import { pipe } from 'fp-ts/lib/function';
 import { decoder } from './lib';
-import { Decoder } from 'io-ts/Decoder';
-import { Sum } from './lib/sum';
-
-export type Datasource = Sum<{
-  file: {
-    path: string;
-    frontmatter: string; // defaults to 'data'
-  };
-}>;
 
 export const configuration = (
   defaults: Record<
     'datasource' | 'uischema' | 'schema',
-    Record<'path', string>
+    Record<'path' | 'frontmatter', string>
   >,
 ) =>
   pipe(
@@ -37,17 +27,12 @@ export const configuration = (
 
 const path = pipe(
   decoder.string,
-  // allows relative paths
+  // todo - allows relative paths
   decoder.map((string) => string.replace(/^\./, '')),
 );
 
-const file = (defaults: Record<'path', string>) =>
-  pipe(
-    decoder.struct({
-      frontmatter: decoder.string,
-    }),
-    decoder.intersect(decoder.configurable({ path }, defaults)),
-  );
+const file = (defaults: Record<'path' | 'frontmatter', string>) =>
+  decoder.configurable({ path, frontmatter: decoder.string }, defaults);
 
 export type ApplicationConfiguration = decoder.TypeOf<
   ReturnType<typeof configuration>

diff --git a/packages/data-entry/src/lib/decoder/index.ts b/packages/data-entry/src/lib/decoder/index.ts
@@ -43,5 +43,6 @@ export const configurable = <A extends Record<string, unknown>>(
         readonlyRecord.filter((a): a is NonNullable<typeof a> => a != null),
       ),
     ),
+    decoder.nullable,
     decoder.map((partials) => ({ ...defaults, ...partials })),
   );
diff --git a/packages/data-entry/src/plugin.tsx b/packages/data-entry/src/plugin.tsx
@@ -16,7 +16,7 @@ import {
 import * as React from 'react';
 import { StrictMode } from 'react';
 import { Root, createRoot } from 'react-dom/client';
-import { configuration } from './common';
+import { configuration } from './config';
 import { Application } from './components';
 import { ApplicationProvider } from './components/context';
 import { useTheme } from './components/material';
@@ -72,9 +72,9 @@ export class MainPlugin extends Plugin {
         either.chainW(
           flow(
             configuration({
-              datasource: { path },
-              schema: { path },
-              uischema: { path },
+              datasource: { path, frontmatter: 'data' }, // todo - change to `datasource`
+              schema: { path, frontmatter: 'schema' },
+              uischema: { path, frontmatter: 'uischema' },
             }).decode,
             either.mapLeft(decoder.draw),
           ),