Support flat event file

data/23/events/ethprague.toml

@@ -46,11 +46,13 @@ difficulty = "All Welcome"
 # pick 1-4
 tags = ["Solarpunk"]
 
+union = "gm-events"
+
 # a color, to group key events visually. use sparingly
 # color=""
 
 # A small logomark for the corner of the event
-logomark = "/logomarks/coinfeedslm.png"
+logomark = "./logo.png"
 
 # a description of the event.
 # will show up when the user clicks the event card.

utils/engine.js

@@ -85,8 +85,9 @@ class DeConf_Package {
     // load sub-events
     pkg.events = [];
     for await (const ef of Deno.readDir([...specDir, "events"].join("/"))) {
-      if (!ef.name.match(/^[\w\d\-]+$/)) continue;
+      const m = ef.name.match(/^([\w\d\-]+)(\.toml|)$/)
-      const ev = new DeConf_Event(ef.name);
+      if (!m) continue;
+      const ev = new DeConf_Event(m[1]);
       await ev.load([...specDir, "events", ef.name]);
       pkg.events.push(ev);
     }
@@ -112,15 +113,24 @@ class DeConf_Event {
     this.dir = null;
   }
 
-  async load(dir) {
+  async load(path) {
-    this.dir = dir.join("/");
+    let fn;
-    const efIndex = await _tomlLoad([...dir, "index.toml"].join("/"));
+    if (path[path.length-1].match(/^(.+)\.toml$/)) {
+      fn = path
+    } else {
+      this.dir = path.join("/");
+      fn = [...path, "index.toml"]
+    }
+    
+    const efIndex = await _tomlLoad(fn.join("/"));
     const data = {
       index: { id: this.id, ...efIndex },
     };
-    const syncDataFn = [...dir, "data.json"].join("/");
+    if (this.dir) {
-    if (await exists(syncDataFn)) {
+      const syncDataFn = [...this.dir, "data.json"].join("/");
-      data.sync = await _jsonLoad(syncDataFn);
+      if (await exists(syncDataFn)) {
+        data.sync = await _jsonLoad(syncDataFn);
+      }
     }
     this.data = data;
   }

utils/schema/1/event.yaml

@@ -92,6 +92,9 @@ properties:
     type: array
     items:
       type: string
+  union:
+    type: string
+    pattern: "^[a-z0-9-]+$"      
   logomark:
     type: string
   description: