chore: add directoryMode flag to enhanceApp for notion-repackaged

scripts/enhance-desktop-app.mjs

@@ -93,27 +93,42 @@ const backupApp = async () => {
     await fsp.rename(archive + ".bak", archive);
     return true;
   },
-  enhanceApp = async (debug = false) => {
+  enhanceApp = async (debug = false, directoryMode = false) => {
     const app = getResourcePath("app"),
       archive = getResourcePath("app.asar");
-    if (!existsSync(archive)) return false;
-    if (existsSync(app)) await fsp.rm(app, { recursive: true, force: true });
-    await fsp.mkdir(app);
-    // extract archive to folder and apply patches
-    for (let file of asar.listPackage(archive)) {
-      file = file.replace(/^\//g, "");
-      const stat = asar.statFile(archive, file),
-        isFolder = !!stat.files,
-        isSymlink = !!stat.link,
-        isExecutable = stat.executable,
-        appPath = resolve(app, file);
-      if (isFolder) {
-        await fsp.mkdir(appPath);
-      } else if (isSymlink) {
-        await fsp.symlink(appPath, resolve(app, link));
-      } else {
-        await fsp.writeFile(appPath, patch(file, extractFile(file)));
-        if (isExecutable) await fsp.chmod(appPath, "755");
+    // directory mode acts on pre-extracted sources
+    // as part of the notion-repackaged build process
+    if (directoryMode) {
+      if (!existsSync(app)) return false;
+      for (let file of await fsp.readdir(app, { recursive: true })) {
+        file = file.replace(/^\//g, "");
+        const appPath = resolve(app, file),
+          stat = await fsp.stat(appPath);
+        if (stat.isFile()) {
+          const content = await fsp.readFile(appPath);
+          await fsp.writeFile(appPath, patch(file, content));
+        }
+      }
+    } else {
+      if (!existsSync(archive)) return false;
+      if (existsSync(app)) await fsp.rm(app, { recursive: true, force: true });
+      await fsp.mkdir(app);
+      // extract archive to folder and apply patches
+      for (let file of asar.listPackage(archive)) {
+        file = file.replace(/^\//g, "");
+        const stat = asar.statFile(archive, file),
+          isFolder = !!stat.files,
+          isSymlink = !!stat.link,
+          isExecutable = stat.executable,
+          appPath = resolve(app, file);
+        if (isFolder) {
+          await fsp.mkdir(appPath);
+        } else if (isSymlink) {
+          await fsp.symlink(appPath, resolve(app, link));
+        } else {
+          await fsp.writeFile(appPath, patch(file, extractFile(file)));
+          if (isExecutable) await fsp.chmod(appPath, "755");
+        }
       }
     }
     // insert the notion-enhancer/src folder into notion's node_modules
@@ -126,10 +141,12 @@ const backupApp = async () => {
       excludes = ["bin", "type", "scripts", "engines", "dependencies"];
     for (const key of excludes) delete manifest[key];
     await fsp.writeFile(insertManifest, JSON.stringify(manifest));
-    // re-package enhanced sources into executable archive
-    await asar.createPackage(app, archive);
-    // cleanup extracted files unless in debug mode
-    if (!debug) await fsp.rm(app, { recursive: true });
+    if (!directoryMode) {
+      // re-package enhanced sources into executable archive
+      await asar.createPackage(app, archive);
+      // cleanup extracted files unless in debug mode
+      if (!debug) await fsp.rm(app, { recursive: true });
+    }
     return true;
   };
 

src/core/client.mjs

@@ -37,9 +37,11 @@ const shouldLoadThemeOverrides = async (api, db) => {
     const { html } = api,
       customStyles = (await db.get("customStyles"))?.content;
     if (!customStyles) return;
-    return document.head.append(html`<style>
-      ${customStyles}
-    </style>`);
+    const $customStyles = html`<style
+      id="__custom"
+      innerHTML=${customStyles}
+    ></style>`;
+    return document.head.append($customStyles);
   };
 
 const insertMenu = async (api, db) => {

src/extensions/indent-guides/client.css

@@ -8,6 +8,7 @@
 body {
   --guide--style: solid;
   --guide--color: var(--theme--fg-border);
+  --guide--opacity: 0;
 }
 
 /* add indent guides to nested blocks */
@@ -28,6 +29,7 @@ body {
     top: var(--guide--offset);
     margin-inline-start: var(--guide--indent);
     border-left: 1px var(--guide--style) var(--guide--color);
+    opacity: var(--guide--opacity);
   }
 }
 
@@ -59,6 +61,7 @@ body {
     height: 100%;
     margin-inline-start: var(--guide--indent);
     border-left: 1px var(--guide--style) var(--guide--color);
+    opacity: var(--guide--opacity);
   }
 }
 

src/extensions/indent-guides/client.mjs

@@ -6,63 +6,61 @@
  */
 
 export default async function (api, db) {
-  const lineType = await db.get("lineType"),
+  const { html } = api,
+    guideStyle = await db.get("guideStyle"),
     rainbowMode = await db.get("rainbowMode");
-  document.body.style.setProperty("--guide--style", lineType.toLowerCase());
+  document.body.style.setProperty("--guide--style", guideStyle.toLowerCase());
 
-  // switch (await db.get(["style"])) {
-  //   case "dashed":
-  //     style = "dashed";
-  //     break;
-  //   case "dotted":
-  //     style = "dotted";
-  //     break;
-  //   case "soft":
-  //     opacity = 0.25;
-  //     break;
-  //   case "rainbow":
-  //     opacity = 0.7;
-  //     rainbow = true;
-  //     break;
-  // }
+  const nestedTargets = [],
+    outlineTargets = [];
+  for (const [listType, selectors] of [
+    ["to-doList", [".notion-to_do-block"]],
+    ["bulletedList", [".notion-bulleted_list-block"]],
+    ["numberedList", [".notion-numbered_list-block"]],
+    ["toggleList", [".notion-toggle-block"]],
+    [
+      "toggleHeadings",
+      [
+        ".notion-header-block",
+        ".notion-sub_header-block",
+        ".notion-sub_sub_header-block",
+      ],
+    ],
+  ]) {
+    if (await db.get(listType)) nestedTargets.push(...selectors);
+  }
+  if (await db.get("tableOfContents"))
+    outlineTargets.push(".notion-table_of_contents-block");
+  if (await db.get("outliner"))
+    outlineTargets.push(".notion-enhancer--outliner-heading");
 
-  // const colors = ['red', 'pink', 'purple', 'blue', 'green', 'yellow'];
-  // colors.push(...colors, ...colors, ...colors, 'gray');
-
-  // for (const listType of ['bulleted_list', 'numbered_list', 'to_do', 'toggle']) {
-  //   if (!(await db.get([listType]))) continue;
-  //   css += `
-  //     .notion-page-content .notion-${listType}-block > div > div:last-child::before {
-  //       border-left: 1px ${style} var(--indentation_lines--color, currentColor);
-  //       opacity: ${opacity};
-  //     }`;
-
-  //   if (rainbow) {
-  //     for (let i = 0; i < colors.length; i++) {
-  //       css += `
-  //         .notion-page-content ${`.notion-${listType}-block `.repeat(i + 1)}
-  //           > div > div:last-child::before {
-  //           --indentation_lines--color: var(--theme--text_${colors[i]});
-  //         }`;
-  //     }
-  //   }
-  // }
-
-  // if (await db.get(['toggle_header'])) {
-  //   css += `
-  //     .notion-page-content [class$=header-block] > div > div > div:last-child::before {
-  //       border-left: 1px ${style} var(--indentation_lines--color, currentColor);
-  //       opacity: ${opacity};
-  //     }`;
-
-  //   if (rainbow) {
-  //     for (let i = 0; i < colors.length; i++) {
-  //       css += `
-  //       .notion-page-content ${`[class$=header-block] `.repeat(i + 1)}
-  //         > div > div > div:last-child::before{
-  //         --indentation_lines--color: var(--theme--text_${colors[i]});
-  //       }`;
-  //     }
-  //   }
-  // }
+  let css = `${[...nestedTargets, ...outlineTargets].join(",")} {
+    --guide--opacity: 1;
+  }`;
+  if (rainbowMode) {
+    const opacity = `--guide--opacity: 0.5;`,
+      selector = `:is(${nestedTargets.join(",")})`,
+      colours = ["green", "blue", "purple", "pink", "red", "orange", "yellow"];
+    colours.push(...colours, ...colours, ...colours, "gray");
+    for (let i = 0; i < colours.length; i++) {
+      css += `${(selector + " ").repeat(i + 1)} {
+        --guide--color: var(--theme--fg-${colours[i]});
+        ${opacity}
+      }`;
+    }
+    css += `
+    .notion-table_of_contents-block [contenteditable="false"] a
+      > div[style*="margin-left: 24px"],
+    .notion-enhancer--outliner-heading.pl-\\[36px\\] {
+      --guide--color: var(--theme--fg-${colours[0]});
+       ${opacity}
+    }
+    .notion-table_of_contents-block [contenteditable="false"] a
+      > div[style*="margin-left: 48px"],
+    .notion-enhancer--outliner-heading.pl-\\[54px\\] {
+      --guide--color: var(--theme--fg-${colours[1]});
+       ${opacity}
+    }`;
+  }
+  document.head.append(html`<style innerHTML=${css}></style>`);
 }

src/extensions/indent-guides/mod.json

@@ -20,8 +20,8 @@
   "options": [
     {
       "type": "select",
-      "key": "lineType",
-      "description": "The line style to use for indent guides.",
+      "key": "guideStyle",
+      "description": "The type of line to use for indent guides.",
       "values": ["Solid", "Dashed", "Dotted"]
     },
     {