From e1190fe3f82d0e1b422acec557f57dac29273d86 Mon Sep 17 00:00:00 2001
From: dragonwocky <thedragonring.bod@gmail.com>
Date: Wed, 8 Dec 2021 22:42:03 +1100
Subject: [PATCH] fs.notionPath, pull submodules

---
 insert/api             |  2 +-
 insert/electronApi.cjs |  3 ++-
 insert/env/env.mjs     |  7 +++++-
 insert/env/fs.mjs      | 11 ++++++++++
 insert/init.cjs        | 48 ++++++++++++++++++------------------------
 insert/repo            |  2 +-
 6 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/insert/api b/insert/api
index be9864f..0357dac 160000
--- a/insert/api
+++ b/insert/api
@@ -1 +1 @@
-Subproject commit be9864f90b60cc48837efb32bb4bc7f0d1a5acae
+Subproject commit 0357dac3b0b23a83b4f33f28a5c44b59496ac599
diff --git a/insert/electronApi.cjs b/insert/electronApi.cjs
index 93f7b17..9cc6b2e 100644
--- a/insert/electronApi.cjs
+++ b/insert/electronApi.cjs
@@ -94,7 +94,7 @@ const ipcRenderer = {
   },
   onMessage: (channel, callback) => {
     const { ipcRenderer } = require('electron');
-    ipcRenderer.addListener(`notion-enhancer:${channel}`, callback);
+    ipcRenderer.on(`notion-enhancer:${channel}`, callback);
   },
 };
 
@@ -106,6 +106,7 @@ globalThis.__enhancerElectronApi = {
   browser: isRenderer ? require('electron').remote.getCurrentWindow() : {},
   webFrame: isRenderer ? require('electron').webFrame : {},
   notionRequire: (path) => require(`../../${path}`),
+  notionPath: (path) => require('path').resolve(`${__dirname}/../../${path}`),
   nodeRequire: (path) => require(path),
 
   focusMenu: () => {
diff --git a/insert/env/env.mjs b/insert/env/env.mjs
index 5a2cfeb..d65abc9 100644
--- a/insert/env/env.mjs
+++ b/insert/env/env.mjs
@@ -45,6 +45,11 @@ export const reload = globalThis.__enhancerElectronApi.reload;
 
 /**
  * require() notion app files
- * @param {string} path - within notion/resources/app e.g. main/createWindow.js
+ * @param {string} path - within notion/resources/app/ e.g. main/createWindow.js
+ *
+ * @env win32
+ * @env linux
+ * @env darwin
+ * @runtime electron
  */
 export const notionRequire = globalThis.__enhancerElectronApi.notionRequire;
diff --git a/insert/env/fs.mjs b/insert/env/fs.mjs
index accf5e4..f5cc57f 100644
--- a/insert/env/fs.mjs
+++ b/insert/env/fs.mjs
@@ -73,3 +73,14 @@ export const isFile = async (path) => {
     return false;
   }
 };
+
+/**
+ * get an absolute path to files within notion
+ * @param {string} path - relative to the root notion/resources/app/ e.g. renderer/search.js
+ *
+ * @env win32
+ * @env linux
+ * @env darwin
+ * @runtime electron
+ */
+export const notionPath = globalThis.__enhancerElectronApi.notionPath;
diff --git a/insert/init.cjs b/insert/init.cjs
index ce79035..3a709b6 100644
--- a/insert/init.cjs
+++ b/insert/init.cjs
@@ -7,36 +7,30 @@
 'use strict';
 
 module.exports = async function (target, __exports, __eval) {
-  try {
-    require('notion-enhancer/electronApi.cjs');
-    const api = require('notion-enhancer/api/index.cjs'),
-      { registry } = api;
+  require('notion-enhancer/electronApi.cjs');
+  const api = require('notion-enhancer/api/index.cjs'),
+    { registry } = api;
 
-    if (target === 'renderer/preload') {
-      document.addEventListener('readystatechange', (event) => {
-        if (document.readyState !== 'complete') return false;
-        const script = document.createElement('script');
-        script.type = 'module';
-        script.src = api.fs.localPath('client.mjs');
-        document.head.appendChild(script);
-      });
-    }
+  if (target === 'renderer/preload') {
+    document.addEventListener('readystatechange', (event) => {
+      if (document.readyState !== 'complete') return false;
+      const script = document.createElement('script');
+      script.type = 'module';
+      script.src = api.fs.localPath('client.mjs');
+      document.head.appendChild(script);
+    });
+  }
 
-    if (target === 'main/main') {
-      const { app } = require('electron');
-      app.whenReady().then(require('notion-enhancer/worker.cjs').listen);
-    }
+  if (target === 'main/main') {
+    const { app } = require('electron');
+    app.whenReady().then(require('notion-enhancer/worker.cjs').listen);
+  }
 
-    for (const mod of await registry.list((mod) => registry.enabled(mod.id))) {
-      for (const { source, target: scriptTarget } of (mod.js ? mod.js.electron : []) || []) {
-        if (`${target}.js` !== scriptTarget) continue;
-        const script = require(`notion-enhancer/repo/${mod._dir}/${source}`);
-        script(api, await registry.db(mod.id), __exports, __eval);
-      }
+  for (const mod of await registry.list((mod) => registry.enabled(mod.id))) {
+    for (const { source, target: scriptTarget } of (mod.js ? mod.js.electron : []) || []) {
+      if (`${target}.js` !== scriptTarget) continue;
+      const script = require(`notion-enhancer/repo/${mod._dir}/${source}`);
+      script(api, await registry.db(mod.id), __exports, __eval);
     }
-  } catch (err) {
-    console.log(err);
-    const { app, Notification } = require('electron');
-    app.whenReady().then(() => new Notification({ title: target, body: err.message }).show());
   }
 };
diff --git a/insert/repo b/insert/repo
index d7b78f4..859e363 160000
--- a/insert/repo
+++ b/insert/repo
@@ -1 +1 @@
-Subproject commit d7b78f4836aea7ea0754c3bf10b49488897d90a0
+Subproject commit 859e3637b763f934d353058317a321327556de81