From b770eb64f0079aeacae7bc411f76bc0b30e94e5d Mon Sep 17 00:00:00 2001 From: dragonwocky Date: Tue, 7 Dec 2021 22:12:46 +1100 Subject: [PATCH] use esbuild to compile .mjs to .cjs --- api/client/fmt.mjs | 185 --- api/{client => }/components/corner-action.css | 4 +- api/{client => }/components/corner-action.mjs | 15 +- api/{client => }/components/feather.mjs | 6 +- api/{client => }/components/index.mjs | 6 +- api/{client => }/components/panel.css | 4 +- api/{client => }/components/panel.mjs | 65 +- api/{client => }/components/tooltip.css | 4 +- api/{client => }/components/tooltip.mjs | 23 +- api/{client => }/electron.mjs | 45 +- api/{client => }/env.mjs | 17 +- api/{node/fmt.cjs => fmt.mjs} | 23 +- api/{client => }/fs.mjs | 6 +- api/index.cjs | 1062 ++++++++++++++++- api/index.mjs | 25 +- api/node/env.cjs | 53 - api/node/fs.cjs | 49 - api/node/registry-validation.cjs | 223 ---- api/node/registry.cjs | 166 --- api/node/storage.cjs | 66 - api/{client => }/notion.mjs | 6 +- api/{client => }/registry-validation.mjs | 6 +- api/{client => }/registry.mjs | 6 +- api/{client => }/storage.mjs | 6 +- api/{client => }/web.mjs | 51 +- 25 files changed, 1233 insertions(+), 889 deletions(-) delete mode 100644 api/client/fmt.mjs rename api/{client => }/components/corner-action.css (97%) rename api/{client => }/components/corner-action.mjs (81%) rename api/{client => }/components/feather.mjs (92%) rename api/{client => }/components/index.mjs (96%) rename api/{client => }/components/panel.css (99%) rename api/{client => }/components/panel.mjs (88%) rename api/{client => }/components/tooltip.css (95%) rename api/{client => }/components/tooltip.mjs (87%) rename api/{client => }/electron.mjs (58%) rename api/{client => }/env.mjs (73%) rename api/{node/fmt.cjs => fmt.mjs} (89%) rename api/{client => }/fs.mjs (94%) delete mode 100644 api/node/env.cjs delete mode 100644 api/node/fs.cjs delete mode 100644 api/node/registry-validation.cjs delete mode 100644 api/node/registry.cjs delete mode 100644 api/node/storage.cjs rename api/{client => }/notion.mjs (99%) rename api/{client => }/registry-validation.mjs (98%) rename api/{client => }/registry.mjs (98%) rename api/{client => }/storage.mjs (95%) rename api/{client => }/web.mjs (91%) diff --git a/api/client/fmt.mjs b/api/client/fmt.mjs deleted file mode 100644 index a1f94d7..0000000 --- a/api/client/fmt.mjs +++ /dev/null @@ -1,185 +0,0 @@ -/* - * notion-enhancer core: api - * (c) 2021 dragonwocky (https://dragonwocky.me/) - * (https://notion-enhancer.github.io/) under the MIT license - */ - -'use strict'; - -/** - * helpers for formatting or parsing text - * @module notion-enhancer/api/fmt - */ - -import { web, fs, components } from '../index.mjs'; -import '../../dep/prism.min.js'; -import '../../dep/markdown-it.min.js'; - -/** syntax highlighting using https://prismjs.com/ */ -export const prism = Prism; -Prism.manual = true; -Prism.hooks.add('complete', async (event) => { - event.element.parentElement.removeAttribute('tabindex'); - event.element.parentElement.parentElement - .querySelector('.copy-to-clipboard-button') - .prepend(web.html`${await components.feather('clipboard')}`); -}); - -/** markdown -> html using https://github.com/markdown-it/markdown-it/ */ -export const md = new markdownit({ - linkify: true, - highlight: (str, lang) => - web.html`
${web.escape(
-      str
-    )}
`, -}); -md.renderer.rules.code_block = (tokens, idx, options, env, slf) => { - const attrIdx = tokens[idx].attrIndex('class'); - if (attrIdx === -1) { - tokens[idx].attrPush(['class', 'match-braces language-plaintext']); - } else tokens[idx].attrs[attrIdx][1] = 'match-braces language-plaintext'; - return web.html`${web.escape( - tokens[idx].content - )}\n`; -}; -md.core.ruler.push( - 'heading_ids', - function (md, state) { - const slugs = new Set(); - state.tokens.forEach(function (token, i) { - if (token.type === 'heading_open') { - const text = md.renderer.render(state.tokens[i + 1].children, md.options), - slug = slugger(text, slugs); - slugs.add(slug); - const attrIdx = token.attrIndex('id'); - if (attrIdx === -1) { - token.attrPush(['id', slug]); - } else token.attrs[attrIdx][1] = slug; - } - }); - }.bind(null, md) -); - -/** - * transform a heading into a slug (a lowercase alphanumeric string separated by dashes), - * e.g. for use as an anchor id - * @param {string} heading - the original heading to be slugified - * @param {Set} [slugs] - a list of pre-generated slugs to avoid duplicates - * @returns {string} the generated slug - */ -export const slugger = (heading, slugs = new Set()) => { - heading = heading - .replace(/\s/g, '-') - .replace(/[^A-Za-z0-9-_]/g, '') - .toLowerCase(); - let i = 0, - slug = heading; - while (slugs.has(slug)) { - i++; - slug = `${heading}-${i}`; - } - return slug; -}; - -/** - * generate a reasonably random uuidv4 string. uses crypto implementation if available - * (from https://stackoverflow.com/questions/105034/how-to-create-a-guid-uuid) - * @returns {string} a uuidv4 - */ -export const uuidv4 = () => { - if (crypto?.randomUUID) return crypto.randomUUID(); - return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, (c) => - (c ^ (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (c / 4)))).toString(16) - ); -}; - -/** - * log-based shading of an rgb color, from - * https://stackoverflow.com/questions/5560248/programmatically-lighten-or-darken-a-hex-color-or-rgb-and-blend-colors - * @param {number} p - a decimal amount to shade the color. - * 1 = white, 0 = the original color, -1 = black - * @param {string} c - the rgb color - * @returns {string} the shaded color - */ -export const rgbLogShade = (p, c) => { - var i = parseInt, - r = Math.round, - [a, b, c, d] = c.split(','), - P = p < 0, - t = P ? 0 : p * 255 ** 2, - P = P ? 1 + p : 1 - p; - return ( - 'rgb' + - (d ? 'a(' : '(') + - r((P * i(a[3] == 'a' ? a.slice(5) : a.slice(4)) ** 2 + t) ** 0.5) + - ',' + - r((P * i(b) ** 2 + t) ** 0.5) + - ',' + - r((P * i(c) ** 2 + t) ** 0.5) + - (d ? ',' + d : ')') - ); -}; - -/** - * pick a contrasting color e.g. for text on a variable color background - * using the hsp (perceived brightness) constants from http://alienryderflex.com/hsp.html - * @param {number} r - red (0-255) - * @param {number} g - green (0-255) - * @param {number} b - blue (0-255) - * @returns {string} the contrasting rgb color, white or black - */ -export const rgbContrast = (r, g, b) => { - return Math.sqrt(0.299 * (r * r) + 0.587 * (g * g) + 0.114 * (b * b)) > 165.75 - ? 'rgb(0,0,0)' - : 'rgb(255,255,255)'; -}; - -const patterns = { - alphanumeric: /^[\w\.-]+$/, - uuid: /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i, - semver: - /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/i, - email: - /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/i, - url: /^[(http(s)?):\/\/(www\.)?a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,64}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)$/i, - color: /^(?:#|0x)(?:[a-f0-9]{3}|[a-f0-9]{6})\b|(?:rgb|hsl)a?\([^\)]*\)$/i, -}; -function test(str, pattern) { - const match = str.match(pattern); - return !!(match && match.length); -} - -/** - * test the type of a value. unifies builtin, regex, and environment/api checks - * @param {*} value - the value to check - * @param {string|array} type - the type the value should be or a list of allowed values - * @returns {boolean} whether or not the value matches the type - */ -export const is = async (value, type, { extension = '' } = {}) => { - extension = !value || !value.endsWith || value.endsWith(extension); - if (Array.isArray(type)) { - return type.includes(value); - } - switch (type) { - case 'array': - return Array.isArray(value); - case 'object': - return value && typeof value === 'object' && !Array.isArray(value); - case 'undefined': - case 'boolean': - case 'number': - return typeof value === type && extension; - case 'string': - return typeof value === type && extension; - case 'alphanumeric': - case 'uuid': - case 'semver': - case 'email': - case 'url': - case 'color': - return typeof value === 'string' && test(value, patterns[type]) && extension; - case 'file': - return typeof value === 'string' && value && (await fs.isFile(value)) && extension; - } - return false; -}; diff --git a/api/client/components/corner-action.css b/api/components/corner-action.css similarity index 97% rename from api/client/components/corner-action.css rename to api/components/corner-action.css index 5479dbc..fdff4ac 100644 --- a/api/client/components/corner-action.css +++ b/api/components/corner-action.css @@ -1,5 +1,5 @@ -/* - * notion-enhancer core: components +/** + * notion-enhancer: components * (c) 2021 dragonwocky (https://dragonwocky.me/) * (c) 2021 CloudHill (https://github.com/CloudHill) * (https://notion-enhancer.github.io/) under the MIT license diff --git a/api/client/components/corner-action.mjs b/api/components/corner-action.mjs similarity index 81% rename from api/client/components/corner-action.mjs rename to api/components/corner-action.mjs index 9f05c39..2ebf808 100644 --- a/api/client/components/corner-action.mjs +++ b/api/components/corner-action.mjs @@ -1,5 +1,5 @@ -/* - * notion-enhancer core: components +/** + * notion-enhancer: components * (c) 2021 dragonwocky (https://dragonwocky.me/) * (c) 2021 CloudHill (https://github.com/CloudHill) * (https://notion-enhancer.github.io/) under the MIT license @@ -12,11 +12,9 @@ * @module notion-enhancer/api/components/corner-action */ -import { web } from '../../index.mjs'; +import { web } from '../index.mjs'; -web.loadStylesheet('api/client/components/corner-action.css'); - -const $cornerButtonsContainer = web.html`
`; +let $stylesheet, $cornerButtonsContainer; /** * adds a button to notion's bottom right corner @@ -25,6 +23,11 @@ const $cornerButtonsContainer = web.html`
{ + if (!$stylesheet) { + $stylesheet = web.loadStylesheet('api/components/corner-action.css'); + $cornerButtonsContainer = web.html`
`; + } + await web.whenReady(['.notion-help-button']); const $helpButton = document.querySelector('.notion-help-button'), $onboardingButton = document.querySelector('.onboarding-checklist-button'); diff --git a/api/client/components/feather.mjs b/api/components/feather.mjs similarity index 92% rename from api/client/components/feather.mjs rename to api/components/feather.mjs index 97381f5..6e2350f 100644 --- a/api/client/components/feather.mjs +++ b/api/components/feather.mjs @@ -1,5 +1,5 @@ -/* - * notion-enhancer core: components +/** + * notion-enhancer: components * (c) 2021 dragonwocky (https://dragonwocky.me/) * (https://notion-enhancer.github.io/) under the MIT license */ @@ -11,7 +11,7 @@ * @module notion-enhancer/api/components/feather */ -import { fs, web } from '../../index.mjs'; +import { fs, web } from '../index.mjs'; let _$iconSheet; diff --git a/api/client/components/index.mjs b/api/components/index.mjs similarity index 96% rename from api/client/components/index.mjs rename to api/components/index.mjs index 203a359..ab690bd 100644 --- a/api/client/components/index.mjs +++ b/api/components/index.mjs @@ -1,5 +1,5 @@ -/* - * notion-enhancer core: components +/** + * notion-enhancer: components * (c) 2021 dragonwocky (https://dragonwocky.me/) * (https://notion-enhancer.github.io/) under the MIT license */ @@ -23,7 +23,7 @@ * @param {number} [options.maxLines] - the max number of lines that the content may be wrapped * to, used to position and size the tooltip correctly (default: 1) */ -export { tooltip } from './tooltip.mjs'; +export { addTooltip } from './tooltip.mjs'; /** * generate an icon from the feather icons set diff --git a/api/client/components/panel.css b/api/components/panel.css similarity index 99% rename from api/client/components/panel.css rename to api/components/panel.css index ef72b8d..547d484 100644 --- a/api/client/components/panel.css +++ b/api/components/panel.css @@ -1,5 +1,5 @@ -/* - * notion-enhancer core: components +/** + * notion-enhancer: components * (c) 2021 dragonwocky (https://dragonwocky.me/) * (c) 2021 CloudHill (https://github.com/CloudHill) * (https://notion-enhancer.github.io/) under the MIT license diff --git a/api/client/components/panel.mjs b/api/components/panel.mjs similarity index 88% rename from api/client/components/panel.mjs rename to api/components/panel.mjs index d9b5914..73225d6 100644 --- a/api/client/components/panel.mjs +++ b/api/components/panel.mjs @@ -1,5 +1,5 @@ -/* - * notion-enhancer core: components +/** + * notion-enhancer: components * (c) 2021 dragonwocky (https://dragonwocky.me/) * (c) 2021 CloudHill (https://github.com/CloudHill) * (https://notion-enhancer.github.io/) under the MIT license @@ -12,37 +12,43 @@ * @module notion-enhancer/api/components/side-panel */ -import { fmt, web, components, registry } from '../../index.mjs'; - -web.loadStylesheet('api/client/components/panel.css'); +import { web, components, registry } from '../index.mjs'; const _views = [], svgExpand = web.raw` - -`; + + `; -let db, +let $stylesheet, + db, // open + close $notionFrame, $notionRightSidebar, + $panel, + $hoverTrigger, // resize + $resizeHandle, dragStartX, dragStartWidth, dragEventsFired, panelWidth, // render content $notionApp, - $pinnedToggle; + $pinnedToggle, + $panelTitle, + $header, + $panelContent, + $switcher, + $switcherTrigger, + $switcherOverlayContainer; // open + close -const $panel = web.html`
`, - $hoverTrigger = web.html`
`, - panelPinnedAttr = 'data-enhancer-panel-pinned', +const panelPinnedAttr = 'data-enhancer-panel-pinned', isPinned = () => $panel.hasAttribute(panelPinnedAttr), togglePanel = () => { const $elems = [$notionFrame, $notionRightSidebar, $hoverTrigger, $panel].filter( @@ -57,7 +63,6 @@ const $panel = web.html`
`, db.set(['panel.pinned'], isPinned()); }, // resize - $resizeHandle = web.html`
`, updateWidth = async () => { document.documentElement.style.setProperty('--component--panel-width', panelWidth + 'px'); db.set(['panel.width'], panelWidth); @@ -91,14 +96,6 @@ const $panel = web.html`
`, document.body.addEventListener('mouseup', resizeEnd); }, // render content - $panelTitle = web.html`
`, - $header = web.render(web.html`
`, $panelTitle), - $panelContent = web.html`
`, - $switcher = web.html`
`, - $switcherTrigger = web.html`
- ${svgExpand} -
`, - $switcherOverlayContainer = web.html`
`, isSwitcherOpen = () => document.body.contains($switcher), openSwitcher = () => { if (!isPinned()) return togglePanel(); @@ -186,6 +183,18 @@ async function createPanel() { await web.whenReady(['.notion-frame']); $notionFrame = document.querySelector('.notion-frame'); + $panel = web.html`
`; + $hoverTrigger = web.html`
`; + $resizeHandle = web.html`
`; + $panelTitle = web.html`
`; + $header = web.render(web.html`
`, $panelTitle); + $panelContent = web.html`
`; + $switcher = web.html`
`; + $switcherTrigger = web.html`
+ ${svgExpand} +
`; + $switcherOverlayContainer = web.html`
`; + const notionRightSidebarSelector = '.notion-cursor-listener > div[style*="flex-end"]', detectRightSidebar = () => { if (!document.contains($notionRightSidebar)) { @@ -256,6 +265,10 @@ export const addPanelView = async ({ onFocus = () => {}, onBlur = () => {}, }) => { + if (!$stylesheet) { + $stylesheet = web.loadStylesheet('api/components/panel.css'); + } + if (!db) db = await registry.db('36a2ffc9-27ff-480e-84a7-c7700a7d232d'); if (!$pinnedToggle) { $pinnedToggle = web.html`
diff --git a/api/client/components/tooltip.css b/api/components/tooltip.css similarity index 95% rename from api/client/components/tooltip.css rename to api/components/tooltip.css index c05c1d2..35c3f62 100644 --- a/api/client/components/tooltip.css +++ b/api/components/tooltip.css @@ -1,5 +1,5 @@ -/* - * notion-enhancer core: components +/** + * notion-enhancer: components * (c) 2021 dragonwocky (https://dragonwocky.me/) * (https://notion-enhancer.github.io/) under the MIT license */ diff --git a/api/client/components/tooltip.mjs b/api/components/tooltip.mjs similarity index 87% rename from api/client/components/tooltip.mjs rename to api/components/tooltip.mjs index 643ffb8..8e996b2 100644 --- a/api/client/components/tooltip.mjs +++ b/api/components/tooltip.mjs @@ -1,5 +1,5 @@ -/* - * notion-enhancer core: components +/** + * notion-enhancer: components * (c) 2021 dragonwocky (https://dragonwocky.me/) * (https://notion-enhancer.github.io/) under the MIT license */ @@ -11,11 +11,9 @@ * @module notion-enhancer/api/components/tooltip */ -import { fmt, web } from '../../index.mjs'; +import { fs, web } from '../index.mjs'; -const _$tooltip = web.html`
`; -web.loadStylesheet('api/client/components/tooltip.css'); -web.render(document.body, _$tooltip); +let $stylesheet, _$tooltip; const countLines = ($el) => [...$el.getClientRects()].reduce( @@ -71,16 +69,25 @@ const countLines = ($el) => * @param {number} [options.maxLines] - the max number of lines that the content may be wrapped * to, used to position and size the tooltip correctly (default: 1) */ -export const tooltip = ( +export const addTooltip = async ( $ref, $content, { delay = 100, offsetDirection = 'bottom', maxLines = 1 } = {} ) => { + if (!$stylesheet) { + $stylesheet = web.loadStylesheet('api/components/tooltip.css'); + _$tooltip = web.html`
`; + web.render(document.body, _$tooltip); + } + + if (!globalThis.markdownit) await import(fs.localPath('dep/markdown-it.min.js')); + const md = markdownit({ linkify: true }); + if (!($content instanceof Element)) $content = web.html`
${$content .split('\n') - .map((text) => fmt.md.renderInline(text)) + .map((text) => md.renderInline(text)) .join('
')}
`; diff --git a/api/client/electron.mjs b/api/electron.mjs similarity index 58% rename from api/client/electron.mjs rename to api/electron.mjs index bff73ce..9fa95df 100644 --- a/api/client/electron.mjs +++ b/api/electron.mjs @@ -1,5 +1,5 @@ -/* - * notion-enhancer core: api +/** + * notion-enhancer: api * (c) 2021 dragonwocky (https://dragonwocky.me/) * (https://notion-enhancer.github.io/) under the MIT license */ @@ -15,34 +15,65 @@ * access to the electron BrowserWindow instance for the current window * see https://www.electronjs.org/docs/latest/api/browser-window * @type {BrowserWindow} + * + * @env win32 + * @env linux + * @env darwin + * @runtime client + * @runtime menu */ -export const browser = window.__enhancerElectronApi?.browser; +export const browser = globalThis.__enhancerElectronApi?.browser; /** * access to the electron webFrame instance for the current page * see https://www.electronjs.org/docs/latest/api/web-frame * @type {webFrame} + * + * @env win32 + * @env linux + * @env darwin + * @runtime client + * @runtime menu */ -export const webFrame = window.__enhancerElectronApi?.webFrame; +export const webFrame = globalThis.__enhancerElectronApi?.webFrame; /** * send a message to the main electron process * @param {string} channel - the message identifier * @param {any} data - the data to pass along with the message + * + * @env win32 + * @env linux + * @env darwin + * @runtime client + * @runtime menu */ -export const sendMessage = window.__enhancerElectronApi?.sendMessage; +export const sendMessage = globalThis.__enhancerElectronApi?.ipcRenderer?.sendMessage; /** * send a message to the webview's parent renderer process * @param {string} channel - the message identifier * @param {any} data - the data to pass along with the message + * + * @env win32 + * @env linux + * @env darwin + * @runtime client + * @runtime menu */ -export const sendMessageToHost = window.__enhancerElectronApi?.sendMessageToHost; +export const sendMessageToHost = + globalThis.__enhancerElectronApi?.ipcRenderer?.sendMessageToHost; /** * receive a message from either the main process or * the webview's parent renderer process * @param {string} channel - the message identifier to listen for * @param {function} listener - the message handler, passed the args (event, data) + * + * @env win32 + * @env linux + * @env darwin + * @runtime client + * @runtime menu */ -export const onMessage = window.__enhancerElectronApi?.onMessage; +export const onMessage = globalThis.__enhancerElectronApi?.ipcRenderer?.onMessage; diff --git a/api/client/env.mjs b/api/env.mjs similarity index 73% rename from api/client/env.mjs rename to api/env.mjs index 91142cf..d8a1c06 100644 --- a/api/client/env.mjs +++ b/api/env.mjs @@ -1,5 +1,5 @@ -/* - * notion-enhancer core: api +/** + * notion-enhancer: api * (c) 2021 dragonwocky (https://dragonwocky.me/) * (https://notion-enhancer.github.io/) under the MIT license */ @@ -11,7 +11,7 @@ * @module notion-enhancer/api/env */ -import * as env from '../../env/env.mjs'; +import * as env from '../env/env.mjs'; /** * the environment/platform name code is currently being executed in @@ -44,3 +44,14 @@ export const focusNotion = env.focusNotion; * @type {function} */ export const reload = env.reload; + +/** + * require() notion app files + * @param {string} path - within notion/resources/app/ e.g. main/createWindow.js + * + * @env win32 + * @env linux + * @env darwin + * @runtime electron + */ +export const notionRequire = env.notionRequire; diff --git a/api/node/fmt.cjs b/api/fmt.mjs similarity index 89% rename from api/node/fmt.cjs rename to api/fmt.mjs index e82716e..1f10578 100644 --- a/api/node/fmt.cjs +++ b/api/fmt.mjs @@ -1,17 +1,18 @@ -/* - * notion-enhancer core: api +/** + * notion-enhancer: api * (c) 2021 dragonwocky (https://dragonwocky.me/) * (https://notion-enhancer.github.io/) under the MIT license */ 'use strict'; -module.exports = {}; /** * helpers for formatting or parsing text * @module notion-enhancer/api/fmt */ +import { fs } from './index.mjs'; + /** * transform a heading into a slug (a lowercase alphanumeric string separated by dashes), * e.g. for use as an anchor id @@ -19,7 +20,7 @@ module.exports = {}; * @param {Set} [slugs] - a list of pre-generated slugs to avoid duplicates * @returns {string} the generated slug */ -module.exports.slugger = (heading, slugs = new Set()) => { +export const slugger = (heading, slugs = new Set()) => { heading = heading .replace(/\s/g, '-') .replace(/[^A-Za-z0-9-_]/g, '') @@ -38,7 +39,7 @@ module.exports.slugger = (heading, slugs = new Set()) => { * (from https://stackoverflow.com/questions/105034/how-to-create-a-guid-uuid) * @returns {string} a uuidv4 */ -module.exports.uuidv4 = () => { +export const uuidv4 = () => { if (crypto?.randomUUID) return crypto.randomUUID(); return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, (c) => (c ^ (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (c / 4)))).toString(16) @@ -53,7 +54,7 @@ module.exports.uuidv4 = () => { * @param {string} c - the rgb color * @returns {string} the shaded color */ -module.exports.rgbLogShade = (p, c) => { +export const rgbLogShade = (p, c) => { var i = parseInt, r = Math.round, [a, b, c, d] = c.split(','), @@ -80,7 +81,7 @@ module.exports.rgbLogShade = (p, c) => { * @param {number} b - blue (0-255) * @returns {string} the contrasting rgb color, white or black */ -module.exports.rgbContrast = (r, g, b) => { +export const rgbContrast = (r, g, b) => { return Math.sqrt(0.299 * (r * r) + 0.587 * (g * g) + 0.114 * (b * b)) > 165.75 ? 'rgb(0,0,0)' : 'rgb(255,255,255)'; @@ -107,7 +108,7 @@ function test(str, pattern) { * @param {string|array} type - the type the value should be or a list of allowed values * @returns {boolean} whether or not the value matches the type */ -module.exports.is = async (value, type, { extension = '' } = {}) => { +export const is = async (value, type, { extension = '' } = {}) => { extension = !value || !value.endsWith || value.endsWith(extension); if (Array.isArray(type)) { return type.includes(value); @@ -130,10 +131,8 @@ module.exports.is = async (value, type, { extension = '' } = {}) => { case 'url': case 'color': return typeof value === 'string' && test(value, patterns[type]) && extension; - case 'file': { - const { isFile } = require('notion-enhancer/api/node/fs.cjs'); - return typeof value === 'string' && value && (await isFile(value)) && extension; - } + case 'file': + return typeof value === 'string' && value && (await fs.isFile(value)) && extension; } return false; }; diff --git a/api/client/fs.mjs b/api/fs.mjs similarity index 94% rename from api/client/fs.mjs rename to api/fs.mjs index 4484085..659517f 100644 --- a/api/client/fs.mjs +++ b/api/fs.mjs @@ -1,5 +1,5 @@ -/* - * notion-enhancer core: api +/** + * notion-enhancer: api * (c) 2021 dragonwocky (https://dragonwocky.me/) * (https://notion-enhancer.github.io/) under the MIT license */ @@ -11,7 +11,7 @@ * @module notion-enhancer/api/fs */ -import * as fs from '../../env/fs.mjs'; +import * as fs from '../env/fs.mjs'; /** * transform a path relative to the enhancer root directory into an absolute path diff --git a/api/index.cjs b/api/index.cjs index 92d255d..f3a32ce 100644 --- a/api/index.cjs +++ b/api/index.cjs @@ -1,22 +1,1042 @@ -/* - * notion-enhancer core: api - * (c) 2021 dragonwocky (https://dragonwocky.me/) - * (https://notion-enhancer.github.io/) under the MIT license - */ - -'use strict'; - -/** @module notion-enhancer/api */ - -module.exports = { - /** environment-specific methods and constants */ - env: require('notion-enhancer/api/node/env.cjs'), - /** environment-specific file reading */ - fs: require('notion-enhancer/api/node/fs.cjs'), - /** environment-specific data persistence */ - storage: require('notion-enhancer/api/node/storage.cjs'), - /** helpers for formatting, validating and parsing values */ - fmt: require('notion-enhancer/api/node/fmt.cjs'), - /** interactions with the enhancer's repository of mods */ - registry: require('notion-enhancer/api/node/registry.cjs'), +var __defProp = Object.defineProperty; +var __markAsModule = (target) => __defProp(target, "__esModule", { value: true }); +var __export = (target, all) => { + __markAsModule(target); + for (var name3 in all) + __defProp(target, name3, { get: all[name3], enumerable: true }); }; + +// insert/api/index.mjs +__export(exports, { + components: () => components_exports, + electron: () => electron_exports, + env: () => env_exports, + fmt: () => fmt_exports, + fs: () => fs_exports, + registry: () => registry_exports, + storage: () => storage_exports, + web: () => web_exports +}); + +// insert/api/env.mjs +var env_exports = {}; +__export(env_exports, { + focusMenu: () => focusMenu2, + focusNotion: () => focusNotion2, + name: () => name2, + notionRequire: () => notionRequire2, + reload: () => reload2, + version: () => version2 +}); + +// insert/env/env.mjs +"use strict"; +var name = globalThis.__enhancerElectronApi.platform; +var version = globalThis.__enhancerElectronApi.version; +var focusMenu = globalThis.__enhancerElectronApi.focusMenu; +var focusNotion = globalThis.__enhancerElectronApi.focusNotion; +var reload = globalThis.__enhancerElectronApi.reload; +var notionRequire = globalThis.__enhancerElectronApi.notionRequire; + +// insert/api/env.mjs +"use strict"; +var name2 = name; +var version2 = version; +var focusMenu2 = focusMenu; +var focusNotion2 = focusNotion; +var reload2 = reload; +var notionRequire2 = notionRequire; + +// insert/api/fs.mjs +var fs_exports = {}; +__export(fs_exports, { + getJSON: () => getJSON2, + getText: () => getText2, + isFile: () => isFile2, + localPath: () => localPath2 +}); + +// insert/env/fs.mjs +"use strict"; +var localPath = (path) => `notion://www.notion.so/__notion-enhancer/${path}`; +var getJSON = (path, opts = {}) => { + if (path.startsWith("http")) + return fetch(path, opts).then((res) => res.json()); + try { + return globalThis.__enhancerElectronApi.nodeRequire(`notion-enhancer/${path}`); + } catch (err) { + return fetch(localPath(path), opts).then((res) => res.json()); + } +}; +var getText = (path, opts = {}) => { + if (path.startsWith("http")) + return fetch(path, opts).then((res) => res.text()); + try { + const fs2 = globalThis.__enhancerElectronApi.nodeRequire("fs"), { resolve: resolvePath } = globalThis.__enhancerElectronApi.nodeRequire("path"); + return fs2.readFileSync(resolvePath(`${__dirname}/../../${path}`)); + } catch (err) { + return fetch(localPath(path), opts).then((res) => res.text()); + } +}; +var isFile = async (path) => { + try { + const fs2 = globalThis.__enhancerElectronApi.nodeRequire("fs"), { resolve: resolvePath } = globalThis.__enhancerElectronApi.nodeRequire("path"); + if (path.startsWith("http")) { + await fetch(path); + } else { + try { + fs2.existsSync(resolvePath(`${__dirname}/../../${path}`)); + } catch (err) { + await fetch(localPath(path)); + } + } + return true; + } catch { + return false; + } +}; + +// insert/api/fs.mjs +"use strict"; +var localPath2 = localPath; +var getJSON2 = getJSON; +var getText2 = getText; +var isFile2 = isFile; + +// insert/api/storage.mjs +var storage_exports = {}; +__export(storage_exports, { + addChangeListener: () => addChangeListener2, + db: () => db2, + get: () => get2, + removeChangeListener: () => removeChangeListener2, + set: () => set2 +}); + +// insert/env/storage.mjs +"use strict"; +var get = (path, fallback = void 0) => { + return globalThis.__enhancerElectronApi.db.get(path, fallback); +}; +var set = (path, value) => { + return globalThis.__enhancerElectronApi.db.set(path, value); +}; +var db = (namespace, getFunc = get, setFunc = set) => { + if (typeof namespace === "string") + namespace = [namespace]; + return { + get: (path = [], fallback = void 0) => getFunc([...namespace, ...path], fallback), + set: (path, value) => setFunc([...namespace, ...path], value) + }; +}; +var addChangeListener = (callback) => { + return globalThis.__enhancerElectronApi.db.addChangeListener(callback); +}; +var removeChangeListener = (callback) => { + return globalThis.__enhancerElectronApi.db.removeChangeListener(callback); +}; + +// insert/api/storage.mjs +"use strict"; +var get2 = get; +var set2 = set; +var db2 = db; +var addChangeListener2 = addChangeListener; +var removeChangeListener2 = removeChangeListener; + +// insert/api/electron.mjs +var electron_exports = {}; +__export(electron_exports, { + browser: () => browser, + onMessage: () => onMessage, + sendMessage: () => sendMessage, + sendMessageToHost: () => sendMessageToHost, + webFrame: () => webFrame +}); +"use strict"; +var browser = globalThis.__enhancerElectronApi?.browser; +var webFrame = globalThis.__enhancerElectronApi?.webFrame; +var sendMessage = globalThis.__enhancerElectronApi?.ipcRenderer?.sendMessage; +var sendMessageToHost = globalThis.__enhancerElectronApi?.ipcRenderer?.sendMessageToHost; +var onMessage = globalThis.__enhancerElectronApi?.ipcRenderer?.onMessage; + +// insert/api/fmt.mjs +var fmt_exports = {}; +__export(fmt_exports, { + is: () => is, + rgbContrast: () => rgbContrast, + rgbLogShade: () => rgbLogShade, + slugger: () => slugger, + uuidv4: () => uuidv4 +}); +"use strict"; +var slugger = (heading, slugs = new Set()) => { + heading = heading.replace(/\s/g, "-").replace(/[^A-Za-z0-9-_]/g, "").toLowerCase(); + let i = 0, slug = heading; + while (slugs.has(slug)) { + i++; + slug = `${heading}-${i}`; + } + return slug; +}; +var uuidv4 = () => { + if (crypto?.randomUUID) + return crypto.randomUUID(); + return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, (c) => (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16)); +}; +var rgbLogShade = (p, c) => { + var i = parseInt, r = Math.round, [a, b, c, d] = c.split(","), P = p < 0, t = P ? 0 : p * 255 ** 2, P = P ? 1 + p : 1 - p; + return "rgb" + (d ? "a(" : "(") + r((P * i(a[3] == "a" ? a.slice(5) : a.slice(4)) ** 2 + t) ** 0.5) + "," + r((P * i(b) ** 2 + t) ** 0.5) + "," + r((P * i(c) ** 2 + t) ** 0.5) + (d ? "," + d : ")"); +}; +var rgbContrast = (r, g, b) => { + return Math.sqrt(0.299 * (r * r) + 0.587 * (g * g) + 0.114 * (b * b)) > 165.75 ? "rgb(0,0,0)" : "rgb(255,255,255)"; +}; +var patterns = { + alphanumeric: /^[\w\.-]+$/, + uuid: /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i, + semver: /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/i, + email: /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/i, + url: /^[(http(s)?):\/\/(www\.)?a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,64}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)$/i, + color: /^(?:#|0x)(?:[a-f0-9]{3}|[a-f0-9]{6})\b|(?:rgb|hsl)a?\([^\)]*\)$/i +}; +function test(str, pattern) { + const match = str.match(pattern); + return !!(match && match.length); +} +var is = async (value, type, { extension = "" } = {}) => { + extension = !value || !value.endsWith || value.endsWith(extension); + if (Array.isArray(type)) { + return type.includes(value); + } + switch (type) { + case "array": + return Array.isArray(value); + case "object": + return value && typeof value === "object" && !Array.isArray(value); + case "undefined": + case "boolean": + case "number": + return typeof value === type && extension; + case "string": + return typeof value === type && extension; + case "alphanumeric": + case "uuid": + case "semver": + case "email": + case "url": + case "color": + return typeof value === "string" && test(value, patterns[type]) && extension; + case "file": + return typeof value === "string" && value && await fs_exports.isFile(value) && extension; + } + return false; +}; + +// insert/api/registry.mjs +var registry_exports = {}; +__export(registry_exports, { + core: () => core, + db: () => db3, + enabled: () => enabled, + errors: () => errors, + get: () => get3, + list: () => list, + optionDefault: () => optionDefault, + optionTypes: () => optionTypes, + profileDB: () => profileDB, + profileName: () => profileName, + supportedEnvs: () => supportedEnvs +}); + +// insert/api/registry-validation.mjs +"use strict"; +var check = async (mod, key, value, types, { + extension = "", + error = `invalid ${key} (${extension ? `${extension} ` : ""}${types}): ${JSON.stringify(value)}`, + optional = false +} = {}) => { + let test2; + for (const type of Array.isArray(types) ? [types] : types.split("|")) { + if (type === "file") { + test2 = value && !value.startsWith("http") ? await fmt_exports.is(`repo/${mod._dir}/${value}`, type, { extension }) : false; + } else + test2 = await fmt_exports.is(value, type, { extension }); + if (test2) + break; + } + if (!test2) { + if (optional && await fmt_exports.is(value, "undefined")) + return true; + if (error) + mod._err(error); + return false; + } + return true; +}; +var validateEnvironments = async (mod) => { + mod.environments = mod.environments ?? registry_exports.supportedEnvs; + const isArray = await check(mod, "environments", mod.environments, "array"); + if (!isArray) + return false; + return mod.environments.map((tag) => check(mod, "environments.env", tag, registry_exports.supportedEnvs)); +}; +var validateTags = async (mod) => { + const isArray = await check(mod, "tags", mod.tags, "array"); + if (!isArray) + return false; + const categoryTags = ["core", "extension", "theme", "integration"], containsCategory = mod.tags.filter((tag) => categoryTags.includes(tag)).length; + if (!containsCategory) { + mod._err(`invalid tags (must contain at least one of 'core', 'extension', 'theme' or 'integration'): + ${JSON.stringify(mod.tags)}`); + return false; + } + const isTheme = mod.tags.includes("theme"), hasThemeMode = mod.tags.includes("light") || mod.tags.includes("dark"), isBothThemeModes = mod.tags.includes("light") && mod.tags.includes("dark"); + if (isTheme && (!hasThemeMode || isBothThemeModes)) { + mod._err(`invalid tags (themes must be either 'light' or 'dark', not neither or both): + ${JSON.stringify(mod.tags)}`); + return false; + } + return mod.tags.map((tag) => check(mod, "tags.tag", tag, "string")); +}; +var validateAuthors = async (mod) => { + const isArray = await check(mod, "authors", mod.authors, "array"); + if (!isArray) + return false; + return mod.authors.map((author) => [ + check(mod, "authors.author.name", author.name, "string"), + check(mod, "authors.author.email", author.email, "email", { optional: true }), + check(mod, "authors.author.homepage", author.homepage, "url"), + check(mod, "authors.author.avatar", author.avatar, "url") + ]); +}; +var validateCSS = async (mod) => { + const isArray = await check(mod, "css", mod.css, "object"); + if (!isArray) + return false; + const tests = []; + for (let dest of ["frame", "client", "menu"]) { + if (!mod.css[dest]) + continue; + let test2 = await check(mod, `css.${dest}`, mod.css[dest], "array"); + if (test2) { + test2 = mod.css[dest].map((file) => check(mod, `css.${dest}.file`, file, "file", { extension: ".css" })); + } + tests.push(test2); + } + return tests; +}; +var validateJS = async (mod) => { + const isArray = await check(mod, "js", mod.js, "object"); + if (!isArray) + return false; + const tests = []; + for (let dest of ["frame", "client", "menu"]) { + if (!mod.js[dest]) + continue; + let test2 = await check(mod, `js.${dest}`, mod.js[dest], "array"); + if (test2) { + test2 = mod.js[dest].map((file) => check(mod, `js.${dest}.file`, file, "file", { extension: ".mjs" })); + } + tests.push(test2); + } + if (mod.js.electron) { + const isArray2 = await check(mod, "js.electron", mod.js.electron, "array"); + if (isArray2) { + for (const file of mod.js.electron) { + const isObject = await check(mod, "js.electron.file", file, "object"); + if (!isObject) { + tests.push(false); + continue; + } + tests.push([ + check(mod, "js.electron.file.source", file.source, "file", { + extension: ".cjs" + }), + check(mod, "js.electron.file.target", file.target, "string", { + extension: ".js" + }) + ]); + } + } else + tests.push(false); + } + return tests; +}; +var validateOptions = async (mod) => { + const isArray = await check(mod, "options", mod.options, "array"); + if (!isArray) + return false; + const tests = []; + for (const option of mod.options) { + const key = "options.option", optTypeValid = await check(mod, `${key}.type`, option.type, registry_exports.optionTypes); + if (!optTypeValid) { + tests.push(false); + continue; + } + option.environments = option.environments ?? registry_exports.supportedEnvs; + tests.push([ + check(mod, `${key}.key`, option.key, "alphanumeric"), + check(mod, `${key}.label`, option.label, "string"), + check(mod, `${key}.tooltip`, option.tooltip, "string", { + optional: true + }), + check(mod, `${key}.environments`, option.environments, "array").then((isArray2) => { + if (!isArray2) + return false; + return option.environments.map((environment) => check(mod, `${key}.environments.env`, environment, registry_exports.supportedEnvs)); + }) + ]); + switch (option.type) { + case "toggle": + tests.push(check(mod, `${key}.value`, option.value, "boolean")); + break; + case "select": { + let test2 = await check(mod, `${key}.values`, option.values, "array"); + if (test2) { + test2 = option.values.map((value) => check(mod, `${key}.values.value`, value, "string")); + } + tests.push(test2); + break; + } + case "text": + case "hotkey": + tests.push(check(mod, `${key}.value`, option.value, "string")); + break; + case "number": + case "color": + tests.push(check(mod, `${key}.value`, option.value, option.type)); + break; + case "file": { + let test2 = await check(mod, `${key}.extensions`, option.extensions, "array"); + if (test2) { + test2 = option.extensions.map((ext) => check(mod, `${key}.extensions.extension`, ext, "string")); + } + tests.push(test2); + break; + } + } + } + return tests; +}; +async function validate(mod) { + let conditions = [ + check(mod, "name", mod.name, "string"), + check(mod, "id", mod.id, "uuid"), + check(mod, "version", mod.version, "semver"), + validateEnvironments(mod), + check(mod, "description", mod.description, "string"), + check(mod, "preview", mod.preview, "file|url", { optional: true }), + validateTags(mod), + validateAuthors(mod), + validateCSS(mod), + validateJS(mod), + validateOptions(mod) + ]; + do { + conditions = await Promise.all(conditions.flat(Infinity)); + } while (conditions.some((condition) => Array.isArray(condition))); + return conditions.every((passed) => passed); +} + +// insert/api/registry.mjs +"use strict"; +var core = [ + "a6621988-551d-495a-97d8-3c568bca2e9e", + "0f0bf8b6-eae6-4273-b307-8fc43f2ee082", + "36a2ffc9-27ff-480e-84a7-c7700a7d232d" +]; +var supportedEnvs = ["linux", "win32", "darwin", "extension"]; +var optionTypes = ["toggle", "select", "text", "number", "color", "file", "hotkey"]; +var profileName = async () => storage_exports.get(["currentprofile"], "default"); +var profileDB = async () => storage_exports.db(["profiles", await profileName()]); +var _list; +var _errors = []; +var list = async (filter = (mod) => true) => { + if (!_list) { + _list = new Promise(async (res, rej) => { + const passed = []; + for (const dir of await fs_exports.getJSON("repo/registry.json")) { + try { + const mod = { + ...await fs_exports.getJSON(`repo/${dir}/mod.json`), + _dir: dir, + _err: (message) => _errors.push({ source: dir, message }) + }; + if (await validate(mod)) + passed.push(mod); + } catch { + _errors.push({ source: dir, message: "invalid mod.json" }); + } + } + res(passed); + }); + } + const filtered = []; + for (const mod of await _list) + if (await filter(mod)) + filtered.push(mod); + return filtered; +}; +var errors = async () => { + await list(); + return _errors; +}; +var get3 = async (id) => { + return (await list((mod) => mod.id === id))[0]; +}; +var enabled = async (id) => { + const mod = await get3(id); + if (!mod.environments.includes(env_exports.name)) + return false; + if (core.includes(id)) + return true; + return (await profileDB()).get(["_mods", id], false); +}; +var optionDefault = async (id, key) => { + const mod = await get3(id), opt = mod.options.find((opt2) => opt2.key === key); + if (!opt) + return void 0; + switch (opt.type) { + case "toggle": + case "text": + case "number": + case "color": + case "hotkey": + return opt.value; + case "select": + return opt.values[0]; + case "file": + return void 0; + } +}; +var db3 = async (id) => { + const db5 = await profileDB(); + return storage_exports.db([id], async (path, fallback = void 0) => { + if (typeof path === "string") + path = [path]; + if (path.length === 2) { + fallback = await optionDefault(id, path[1]) ?? fallback; + } + return db5.get(path, fallback); + }, db5.set); +}; + +// insert/api/web.mjs +var web_exports = {}; +__export(web_exports, { + addDocumentObserver: () => addDocumentObserver, + addHotkeyListener: () => addHotkeyListener, + copyToClipboard: () => copyToClipboard, + empty: () => empty, + escape: () => escape, + html: () => html, + loadStylesheet: () => loadStylesheet, + queryParams: () => queryParams, + raw: () => raw, + readFromClipboard: () => readFromClipboard, + removeDocumentObserver: () => removeDocumentObserver, + removeHotkeyListener: () => removeHotkeyListener, + render: () => render, + whenReady: () => whenReady +}); +"use strict"; +var _hotkeyListenersActivated = false; +var _hotkeyEventListeners = []; +var _documentObserver; +var _documentObserverListeners = []; +var _documentObserverEvents = []; +var whenReady = (selectors = []) => { + return new Promise((res, rej) => { + function onLoad() { + let isReadyInt; + isReadyInt = setInterval(isReadyTest, 100); + function isReadyTest() { + if (selectors.every((selector) => document.querySelector(selector))) { + clearInterval(isReadyInt); + res(true); + } + } + isReadyTest(); + } + if (document.readyState !== "complete") { + document.addEventListener("readystatechange", (event) => { + if (document.readyState === "complete") + onLoad(); + }); + } else + onLoad(); + }); +}; +var queryParams = () => new URLSearchParams(window.location.search); +var escape = (str) => str.replace(/&/g, "&").replace(//g, ">").replace(/'/g, "'").replace(/"/g, """).replace(/\\/g, "\"); +var raw = (str, ...templates) => { + const html2 = str.map((chunk) => chunk + (["string", "number"].includes(typeof templates[0]) ? templates.shift() : escape(JSON.stringify(templates.shift(), null, 2) ?? ""))).join(""); + return html2.includes(" line.trim()).filter((line) => line.length).join(" "); +}; +var html = (str, ...templates) => { + const $fragment = document.createRange().createContextualFragment(raw(str, ...templates)); + return $fragment.children.length === 1 ? $fragment.children[0] : $fragment.children; +}; +var render = ($container, ...$elems) => { + $elems = $elems.map(($elem) => $elem instanceof HTMLCollection ? [...$elem] : $elem).flat(Infinity).filter(($elem) => $elem); + $container.append(...$elems); + return $container; +}; +var empty = ($container) => { + while ($container.firstChild && $container.removeChild($container.firstChild)) + ; + return $container; +}; +var loadStylesheet = (path) => { + const $stylesheet4 = html``; + render(document.head, $stylesheet4); + return $stylesheet4; +}; +var copyToClipboard = async (str) => { + try { + await navigator.clipboard.writeText(str); + } catch { + const $el = document.createElement("textarea"); + $el.value = str; + $el.setAttribute("readonly", ""); + $el.style.position = "absolute"; + $el.style.left = "-9999px"; + document.body.appendChild($el); + $el.select(); + document.execCommand("copy"); + document.body.removeChild($el); + } +}; +var readFromClipboard = () => { + return navigator.clipboard.readText(); +}; +var triggerHotkeyListener = (event, hotkey) => { + const inInput = document.activeElement.nodeName === "INPUT" && !hotkey.listenInInput; + if (inInput) + return; + const pressed = hotkey.keys.every((key) => { + key = key.toLowerCase(); + const modifiers = { + metaKey: ["meta", "os", "win", "cmd", "command"], + ctrlKey: ["ctrl", "control"], + shiftKey: ["shift"], + altKey: ["alt"] + }; + for (const modifier in modifiers) { + const pressed2 = modifiers[modifier].includes(key) && event[modifier]; + if (pressed2) + return true; + } + if (key === "space") + key = " "; + if (key === "plus") + key = "+"; + if (key === event.key.toLowerCase()) + return true; + }); + if (pressed) + hotkey.callback(event); +}; +var addHotkeyListener = (keys, callback, { listenInInput = false, keydown = false } = {}) => { + if (typeof keys === "string") + keys = keys.split("+"); + _hotkeyEventListeners.push({ keys, callback, listenInInput, keydown }); + if (!_hotkeyListenersActivated) { + _hotkeyListenersActivated = true; + document.addEventListener("keyup", (event) => { + for (const hotkey of _hotkeyEventListeners.filter(({ keydown: keydown2 }) => !keydown2)) { + triggerHotkeyListener(event, hotkey); + } + }); + document.addEventListener("keydown", (event) => { + for (const hotkey of _hotkeyEventListeners.filter(({ keydown: keydown2 }) => keydown2)) { + triggerHotkeyListener(event, hotkey); + } + }); + } +}; +var removeHotkeyListener = (callback) => { + _hotkeyEventListeners = _hotkeyEventListeners.filter((listener) => listener.callback !== callback); +}; +var addDocumentObserver = (callback, selectors = []) => { + if (!_documentObserver) { + const handle = (queue) => { + while (queue.length) { + const event = queue.shift(), matchesAddedNode = ($node, selector) => $node instanceof Element && ($node.matches(selector) || $node.matches(`${selector} *`) || $node.querySelector(selector)), matchesTarget = (selector) => event.target.matches(selector) || event.target.matches(`${selector} *`) || [...event.addedNodes].some(($node) => matchesAddedNode($node, selector)); + for (const listener of _documentObserverListeners) { + if (!listener.selectors.length || listener.selectors.some(matchesTarget)) { + listener.callback(event); + } + } + } + }; + _documentObserver = new MutationObserver((list2, observer) => { + if (!_documentObserverEvents.length) + requestIdleCallback(() => handle(_documentObserverEvents)); + _documentObserverEvents.push(...list2); + }); + _documentObserver.observe(document.body, { + childList: true, + subtree: true, + attributes: true + }); + } + _documentObserverListeners.push({ callback, selectors }); +}; +var removeDocumentObserver = (callback) => { + _documentObserverListeners = _documentObserverListeners.filter((listener) => listener.callback !== callback); +}; + +// insert/api/components/index.mjs +var components_exports = {}; +__export(components_exports, { + addCornerAction: () => addCornerAction, + addPanelView: () => addPanelView, + addTooltip: () => addTooltip, + feather: () => feather +}); + +// insert/api/components/tooltip.mjs +"use strict"; +var $stylesheet; +var _$tooltip; +var countLines = ($el) => [...$el.getClientRects()].reduce((prev, val) => prev.some((p) => p.y === val.y) ? prev : [...prev, val], []).length; +var position = async ($ref, offsetDirection, maxLines) => { + _$tooltip.style.top = `0px`; + _$tooltip.style.left = `0px`; + const rect = $ref.getBoundingClientRect(), { offsetWidth, offsetHeight } = _$tooltip, pad = 6; + let x = rect.x, y = Math.floor(rect.y); + if (["top", "bottom"].includes(offsetDirection)) { + if (offsetDirection === "top") + y -= offsetHeight + pad; + if (offsetDirection === "bottom") + y += rect.height + pad; + x -= offsetWidth / 2 - rect.width / 2; + _$tooltip.style.left = `${x}px`; + _$tooltip.style.top = `${y}px`; + const testLines = () => countLines(_$tooltip.firstElementChild) > maxLines, padEdgesX = testLines(); + while (testLines()) { + _$tooltip.style.left = `${window.innerWidth - x > x ? x++ : x--}px`; + } + if (padEdgesX) { + x += window.innerWidth - x > x ? pad : -pad; + _$tooltip.style.left = `${x}px`; + } + } + if (["left", "right"].includes(offsetDirection)) { + y -= offsetHeight / 2 - rect.height / 2; + if (offsetDirection === "left") + x -= offsetWidth + pad; + if (offsetDirection === "right") + x += rect.width + pad; + _$tooltip.style.left = `${x}px`; + _$tooltip.style.top = `${y}px`; + } + return true; +}; +var addTooltip = async ($ref, $content, { delay = 100, offsetDirection = "bottom", maxLines = 1 } = {}) => { + if (!$stylesheet) { + $stylesheet = web_exports.loadStylesheet("api/components/tooltip.css"); + _$tooltip = web_exports.html`
`; + web_exports.render(document.body, _$tooltip); + } + if (!globalThis.markdownit) + await import(fs_exports.localPath("dep/markdown-it.min.js")); + const md = markdownit({ linkify: true }); + if (!($content instanceof Element)) + $content = web_exports.html`
+ ${$content.split("\n").map((text) => md.renderInline(text)).join("
")} +
`; + let displayDelay; + $ref.addEventListener("mouseover", async (event) => { + if (!displayDelay) { + displayDelay = setTimeout(async () => { + if ($ref.matches(":hover")) { + if (_$tooltip.style.display !== "block") { + _$tooltip.style.display = "block"; + web_exports.render(web_exports.empty(_$tooltip), $content); + position($ref, offsetDirection, maxLines); + await _$tooltip.animate([{ opacity: 0 }, { opacity: 1 }], { duration: 65 }).finished; + } + } + displayDelay = void 0; + }, delay); + } + }); + $ref.addEventListener("mouseout", async (event) => { + displayDelay = void 0; + if (_$tooltip.style.display === "block" && !$ref.matches(":hover")) { + await _$tooltip.animate([{ opacity: 1 }, { opacity: 0 }], { duration: 65 }).finished; + _$tooltip.style.display = ""; + } + }); +}; + +// insert/api/components/feather.mjs +"use strict"; +var _$iconSheet; +var feather = async (name3, attrs = {}) => { + if (!_$iconSheet) { + _$iconSheet = web_exports.html`${await fs_exports.getText("dep/feather-sprite.svg")}`; + } + attrs.style = ((attrs.style ? attrs.style + ";" : "") + "stroke:currentColor;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;fill:none;").trim(); + attrs.viewBox = "0 0 24 24"; + return ` `${web_exports.escape(key)}="${web_exports.escape(val)}"`).join(" ")}>${_$iconSheet.getElementById(name3)?.innerHTML}`; +}; + +// insert/api/components/panel.mjs +"use strict"; +var _views = []; +var svgExpand = web_exports.raw` + + `; +var $stylesheet2; +var db4; +var $notionFrame; +var $notionRightSidebar; +var $panel; +var $hoverTrigger; +var $resizeHandle; +var dragStartX; +var dragStartWidth; +var dragEventsFired; +var panelWidth; +var $notionApp; +var $pinnedToggle; +var $panelTitle; +var $header; +var $panelContent; +var $switcher; +var $switcherTrigger; +var $switcherOverlayContainer; +var panelPinnedAttr = "data-enhancer-panel-pinned"; +var isPinned = () => $panel.hasAttribute(panelPinnedAttr); +var togglePanel = () => { + const $elems = [$notionFrame, $notionRightSidebar, $hoverTrigger, $panel].filter(($el) => $el); + if (isPinned()) { + closeSwitcher(); + for (const $elem of $elems) + $elem.removeAttribute(panelPinnedAttr); + } else { + for (const $elem of $elems) + $elem.setAttribute(panelPinnedAttr, "true"); + } + db4.set(["panel.pinned"], isPinned()); +}; +var updateWidth = async () => { + document.documentElement.style.setProperty("--component--panel-width", panelWidth + "px"); + db4.set(["panel.width"], panelWidth); +}; +var resizeDrag = (event) => { + event.preventDefault(); + dragEventsFired = true; + panelWidth = dragStartWidth + (dragStartX - event.clientX); + if (panelWidth < 190) + panelWidth = 190; + if (panelWidth > 480) + panelWidth = 480; + $panel.style.width = panelWidth + "px"; + $hoverTrigger.style.width = panelWidth + "px"; + $notionFrame.style.paddingRight = panelWidth + "px"; + if ($notionRightSidebar) + $notionRightSidebar.style.right = panelWidth + "px"; +}; +var resizeEnd = (event) => { + $panel.style.width = ""; + $hoverTrigger.style.width = ""; + $notionFrame.style.paddingRight = ""; + if ($notionRightSidebar) + $notionRightSidebar.style.right = ""; + updateWidth(); + $resizeHandle.style.cursor = ""; + document.body.removeEventListener("mousemove", resizeDrag); + document.body.removeEventListener("mouseup", resizeEnd); +}; +var resizeStart = (event) => { + dragStartX = event.clientX; + dragStartWidth = panelWidth; + $resizeHandle.style.cursor = "auto"; + document.body.addEventListener("mousemove", resizeDrag); + document.body.addEventListener("mouseup", resizeEnd); +}; +var isSwitcherOpen = () => document.body.contains($switcher); +var openSwitcher = () => { + if (!isPinned()) + return togglePanel(); + web_exports.render($notionApp, $switcherOverlayContainer); + web_exports.empty($switcher); + for (const view of _views) { + const open = $panelTitle.contains(view.$title), $item = web_exports.render(web_exports.html`
`, web_exports.render(web_exports.html``, view.$icon.cloneNode(true), view.$title.cloneNode(true))); + $item.addEventListener("click", () => { + renderView(view); + db4.set(["panel.open"], view.id); + }); + web_exports.render($switcher, $item); + } + const rect = $header.getBoundingClientRect(); + web_exports.render(web_exports.empty($switcherOverlayContainer), web_exports.render(web_exports.html`
`, web_exports.render(web_exports.html`
`, $switcher))); + $switcher.querySelector("[data-open]").focus(); + $switcher.animate([{ opacity: 0 }, { opacity: 1 }], { duration: 200 }); + document.addEventListener("keydown", switcherKeyListeners); +}; +var closeSwitcher = () => { + document.removeEventListener("keydown", switcherKeyListeners); + $switcher.animate([{ opacity: 1 }, { opacity: 0 }], { duration: 200 }).onfinish = () => $switcherOverlayContainer.remove(); +}; +var switcherKeyListeners = (event) => { + if (isSwitcherOpen()) { + switch (event.key) { + case "Escape": + closeSwitcher(); + event.stopPropagation(); + break; + case "Enter": + document.activeElement.click(); + event.stopPropagation(); + break; + case "ArrowUp": + const $prev = event.target.previousElementSibling; + ($prev || event.target.parentElement.lastElementChild).focus(); + event.stopPropagation(); + break; + case "ArrowDown": + const $next = event.target.nextElementSibling; + ($next || event.target.parentElement.firstElementChild).focus(); + event.stopPropagation(); + break; + } + } +}; +var renderView = (view) => { + const prevView = _views.find(({ $content }) => document.contains($content)); + web_exports.render(web_exports.empty($panelTitle), web_exports.render(web_exports.html``, view.$icon, view.$title)); + view.onFocus(); + web_exports.render(web_exports.empty($panelContent), view.$content); + if (prevView) + prevView.onBlur(); +}; +async function createPanel() { + await web_exports.whenReady([".notion-frame"]); + $notionFrame = document.querySelector(".notion-frame"); + $panel = web_exports.html`
`; + $hoverTrigger = web_exports.html`
`; + $resizeHandle = web_exports.html`
`; + $panelTitle = web_exports.html`
`; + $header = web_exports.render(web_exports.html`
`, $panelTitle); + $panelContent = web_exports.html`
`; + $switcher = web_exports.html`
`; + $switcherTrigger = web_exports.html`
+ ${svgExpand} +
`; + $switcherOverlayContainer = web_exports.html`
`; + const notionRightSidebarSelector = '.notion-cursor-listener > div[style*="flex-end"]', detectRightSidebar = () => { + if (!document.contains($notionRightSidebar)) { + $notionRightSidebar = document.querySelector(notionRightSidebarSelector); + if (isPinned() && $notionRightSidebar) { + $notionRightSidebar.setAttribute(panelPinnedAttr, "true"); + } + } + }; + $notionRightSidebar = document.querySelector(notionRightSidebarSelector); + web_exports.addDocumentObserver(detectRightSidebar, [notionRightSidebarSelector]); + if (await db4.get(["panel.pinned"])) + togglePanel(); + web_exports.addHotkeyListener(await db4.get(["panel.hotkey"]), togglePanel); + $pinnedToggle.addEventListener("click", (event) => { + event.stopPropagation(); + togglePanel(); + }); + web_exports.render($panel, web_exports.render($header, $panelTitle, $switcherTrigger, $pinnedToggle), $panelContent, $resizeHandle); + await enablePanelResize(); + await createViews(); + const cursorListenerSelector = '.notion-cursor-listener > .notion-sidebar-container ~ [style^="position: absolute"]'; + await web_exports.whenReady([cursorListenerSelector]); + document.querySelector(cursorListenerSelector).before($hoverTrigger, $panel); +} +async function enablePanelResize() { + panelWidth = await db4.get(["panel.width"], 240); + updateWidth(); + $resizeHandle.addEventListener("mousedown", resizeStart); + $resizeHandle.addEventListener("click", () => { + if (dragEventsFired) { + dragEventsFired = false; + } else + togglePanel(); + }); +} +async function createViews() { + $notionApp = document.querySelector(".notion-app-inner"); + $header.addEventListener("click", openSwitcher); + $switcherTrigger.addEventListener("click", openSwitcher); + $switcherOverlayContainer.addEventListener("click", closeSwitcher); +} +var addPanelView = async ({ + id, + icon, + title, + $content, + onFocus = () => { + }, + onBlur = () => { + } +}) => { + if (!$stylesheet2) { + $stylesheet2 = web_exports.loadStylesheet("api/components/panel.css"); + } + if (!db4) + db4 = await registry_exports.db("36a2ffc9-27ff-480e-84a7-c7700a7d232d"); + if (!$pinnedToggle) { + $pinnedToggle = web_exports.html`
+ ${await components_exports.feather("chevrons-right")} +
`; + } + const view = { + id, + $icon: web_exports.render(web_exports.html``, icon instanceof Element ? icon : web_exports.html`${icon}`), + $title: web_exports.render(web_exports.html``, title), + $content, + onFocus, + onBlur + }; + _views.push(view); + if (_views.length === 1) + await createPanel(); + if (_views.length === 1 || await db4.get(["panel.open"]) === id) + renderView(view); +}; + +// insert/api/components/corner-action.mjs +"use strict"; +var $stylesheet3; +var $cornerButtonsContainer; +var addCornerAction = async (icon, listener) => { + if (!$stylesheet3) { + $stylesheet3 = web_exports.loadStylesheet("api/components/corner-action.css"); + $cornerButtonsContainer = web_exports.html`
`; + } + await web_exports.whenReady([".notion-help-button"]); + const $helpButton = document.querySelector(".notion-help-button"), $onboardingButton = document.querySelector(".onboarding-checklist-button"); + if ($onboardingButton) + $cornerButtonsContainer.prepend($onboardingButton); + $cornerButtonsContainer.prepend($helpButton); + web_exports.render(document.querySelector(".notion-app-inner > .notion-cursor-listener"), $cornerButtonsContainer); + const $actionButton = web_exports.html`
${icon}
`; + $actionButton.addEventListener("click", listener); + web_exports.render($cornerButtonsContainer, $actionButton); + return $actionButton; +}; + +// insert/api/components/index.mjs +"use strict"; + +// insert/api/index.mjs +"use strict"; diff --git a/api/index.mjs b/api/index.mjs index a53a104..e90bf3e 100644 --- a/api/index.mjs +++ b/api/index.mjs @@ -1,5 +1,5 @@ -/* - * notion-enhancer core: api +/** + * notion-enhancer: api * (c) 2021 dragonwocky (https://dragonwocky.me/) * (https://notion-enhancer.github.io/) under the MIT license */ @@ -8,23 +8,26 @@ /** @module notion-enhancer/api */ +// compiles to .cjs for use in electron: +// npx -y esbuild insert/api/index.mjs --bundle --format=cjs --outfile=insert/api/index.cjs + /** environment-specific methods and constants */ -export * as env from './client/env.mjs'; +export * as env from './env.mjs'; /** environment-specific file reading */ -export * as fs from './client/fs.mjs'; +export * as fs from './fs.mjs'; /** environment-specific data persistence */ -export * as storage from './client/storage.mjs'; +export * as storage from './storage.mjs'; /** access to electron renderer apis */ -export * as electron from './client/electron.mjs'; +export * as electron from './electron.mjs'; /** a basic wrapper around notion's unofficial api */ -export * as notion from './client/notion.mjs'; +// export * as notion from './notion.mjs'; /** helpers for formatting, validating and parsing values */ -export * as fmt from './client/fmt.mjs'; +export * as fmt from './fmt.mjs'; /** interactions with the enhancer's repository of mods */ -export * as registry from './client/registry.mjs'; +export * as registry from './registry.mjs'; /** helpers for manipulation of a webpage */ -export * as web from './client/web.mjs'; +export * as web from './web.mjs'; /** shared notion-style elements */ -export * as components from './client/components/index.mjs'; +export * as components from './components/index.mjs'; diff --git a/api/node/env.cjs b/api/node/env.cjs deleted file mode 100644 index 536e442..0000000 --- a/api/node/env.cjs +++ /dev/null @@ -1,53 +0,0 @@ -/* - * notion-enhancer core: api - * (c) 2021 dragonwocky (https://dragonwocky.me/) - * (https://notion-enhancer.github.io/) under the MIT license - */ - -'use strict'; -module.exports = {}; - -/** - * environment-specific methods and constants - * @module notion-enhancer/api/env - */ - -const env = require('notion-enhancer/env/env.cjs'); - -/** - * the environment/platform name code is currently being executed in - * @constant - * @type {string} - */ -module.exports.name = env.name; - -/** - * the current version of the enhancer - * @constant - * @type {string} - */ -module.exports.version = env.version; - -/** - * open the enhancer's menu - * @type {function} - */ -module.exports.focusMenu = env.focusMenu; - -/** - * focus an active notion tab - * @type {function} - */ -module.exports.focusNotion = env.focusNotion; - -/** - * reload all notion and enhancer menu tabs to apply changes - * @type {function} - */ -module.exports.reload = env.reload; - -/** - * require() notion app files - * @param {string} path - path from the root of notion/resources/app/ e.g. main/createWindow.js - */ -module.exports.notionRequire = env.notionRequire; diff --git a/api/node/fs.cjs b/api/node/fs.cjs deleted file mode 100644 index d189dcd..0000000 --- a/api/node/fs.cjs +++ /dev/null @@ -1,49 +0,0 @@ -/* - * notion-enhancer core: api - * (c) 2021 dragonwocky (https://dragonwocky.me/) - * (https://notion-enhancer.github.io/) under the MIT license - */ - -'use strict'; -module.exports = {}; - -/** - * environment-specific file reading - * @module notion-enhancer/api/fs - */ - -const fs = require('notion-enhancer/env/fs.cjs'); - -/** - * transform a path relative to the enhancer root directory into an absolute path - * @type {function} - * @param {string} path - a url or within-the-enhancer filepath - * @returns {string} an absolute filepath - */ -module.exports.localPath = fs.localPath; - -/** - * fetch and parse a json file's contents - * @type {function} - * @param {string} path - a url or within-the-enhancer filepath - * @param {object} [opts] - the second argument of a fetch() request - * @returns {object} the json value of the requested file as a js object - */ -module.exports.getJSON = fs.getJSON; - -/** - * fetch a text file's contents - * @type {function} - * @param {string} path - a url or within-the-enhancer filepath - * @param {object} [opts] - the second argument of a fetch() request - * @returns {string} the text content of the requested file - */ -module.exports.getText = fs.getText; - -/** - * check if a file exists - * @type {function} - * @param {string} path - a url or within-the-enhancer filepath - * @returns {boolean} whether or not the file exists - */ -module.exports.isFile = fs.isFile; diff --git a/api/node/registry-validation.cjs b/api/node/registry-validation.cjs deleted file mode 100644 index 9e385c4..0000000 --- a/api/node/registry-validation.cjs +++ /dev/null @@ -1,223 +0,0 @@ -/* - * notion-enhancer core: api - * (c) 2021 dragonwocky (https://dragonwocky.me/) - * (https://notion-enhancer.github.io/) under the MIT license - */ - -'use strict'; - -const check = async ( - mod, - key, - value, - types, - { - extension = '', - error = `invalid ${key} (${extension ? `${extension} ` : ''}${types}): ${JSON.stringify( - value - )}`, - optional = false, - } = {} -) => { - const { is } = require('notion-enhancer/api/node/fmt.cjs'); - let test; - for (const type of Array.isArray(types) ? [types] : types.split('|')) { - if (type === 'file') { - test = - value && !value.startsWith('http') - ? await is(`repo/${mod._dir}/${value}`, type, { extension }) - : false; - } else test = await is(value, type, { extension }); - if (test) break; - } - if (!test) { - if (optional && (await is(value, 'undefined'))) return true; - if (error) mod._err(error); - return false; - } - return true; -}; - -const validateEnvironments = async (mod) => { - const { supportedEnvs } = require('notion-enhancer/api/node/registry.cjs'); - mod.environments = mod.environments ?? supportedEnvs; - const isArray = await check(mod, 'environments', mod.environments, 'array'); - if (!isArray) return false; - return mod.environments.map((tag) => check(mod, 'environments.env', tag, supportedEnvs)); - }, - validateTags = async (mod) => { - const isArray = await check(mod, 'tags', mod.tags, 'array'); - if (!isArray) return false; - const categoryTags = ['core', 'extension', 'theme', 'integration'], - containsCategory = mod.tags.filter((tag) => categoryTags.includes(tag)).length; - if (!containsCategory) { - mod._err( - `invalid tags (must contain at least one of 'core', 'extension', 'theme' or 'integration'): - ${JSON.stringify(mod.tags)}` - ); - return false; - } - const isTheme = mod.tags.includes('theme'), - hasThemeMode = mod.tags.includes('light') || mod.tags.includes('dark'), - isBothThemeModes = mod.tags.includes('light') && mod.tags.includes('dark'); - if (isTheme && (!hasThemeMode || isBothThemeModes)) { - mod._err( - `invalid tags (themes must be either 'light' or 'dark', not neither or both): - ${JSON.stringify(mod.tags)}` - ); - return false; - } - return mod.tags.map((tag) => check(mod, 'tags.tag', tag, 'string')); - }, - validateAuthors = async (mod) => { - const isArray = await check(mod, 'authors', mod.authors, 'array'); - if (!isArray) return false; - return mod.authors.map((author) => [ - check(mod, 'authors.author.name', author.name, 'string'), - check(mod, 'authors.author.email', author.email, 'email', { optional: true }), - check(mod, 'authors.author.homepage', author.homepage, 'url'), - check(mod, 'authors.author.avatar', author.avatar, 'url'), - ]); - }, - validateCSS = async (mod) => { - const isArray = await check(mod, 'css', mod.css, 'object'); - if (!isArray) return false; - const tests = []; - for (let dest of ['frame', 'client', 'menu']) { - if (!mod.css[dest]) continue; - let test = await check(mod, `css.${dest}`, mod.css[dest], 'array'); - if (test) { - test = mod.css[dest].map((file) => - check(mod, `css.${dest}.file`, file, 'file', { extension: '.css' }) - ); - } - tests.push(test); - } - return tests; - }, - validateJS = async (mod) => { - const isArray = await check(mod, 'js', mod.js, 'object'); - if (!isArray) return false; - const tests = []; - for (let dest of ['frame', 'client', 'menu']) { - if (!mod.js[dest]) continue; - let test = await check(mod, `js.${dest}`, mod.js[dest], 'array'); - if (test) { - test = mod.js[dest].map((file) => - check(mod, `js.${dest}.file`, file, 'file', { extension: '.mjs' }) - ); - } - tests.push(test); - } - if (mod.js.electron) { - const isArray = await check(mod, 'js.electron', mod.js.electron, 'array'); - if (isArray) { - for (const file of mod.js.electron) { - const isObject = await check(mod, 'js.electron.file', file, 'object'); - if (!isObject) { - tests.push(false); - continue; - } - tests.push([ - check(mod, 'js.electron.file.source', file.source, 'file', { - extension: '.cjs', - }), - // referencing the file within the electron app - // existence can't be validated, so only format is - check(mod, 'js.electron.file.target', file.target, 'string', { - extension: '.js', - }), - ]); - } - } else tests.push(false); - } - return tests; - }, - validateOptions = async (mod) => { - const { supportedEnvs, optionTypes } = require('notion-enhancer/api/node/registry.cjs'), - isArray = await check(mod, 'options', mod.options, 'array'); - if (!isArray) return false; - const tests = []; - for (const option of mod.options) { - const key = 'options.option', - optTypeValid = await check(mod, `${key}.type`, option.type, optionTypes); - if (!optTypeValid) { - tests.push(false); - continue; - } - option.environments = option.environments ?? supportedEnvs; - tests.push([ - check(mod, `${key}.key`, option.key, 'alphanumeric'), - check(mod, `${key}.label`, option.label, 'string'), - check(mod, `${key}.tooltip`, option.tooltip, 'string', { - optional: true, - }), - check(mod, `${key}.environments`, option.environments, 'array').then((isArray) => { - if (!isArray) return false; - return option.environments.map((environment) => - check(mod, `${key}.environments.env`, environment, supportedEnvs) - ); - }), - ]); - switch (option.type) { - case 'toggle': - tests.push(check(mod, `${key}.value`, option.value, 'boolean')); - break; - case 'select': { - let test = await check(mod, `${key}.values`, option.values, 'array'); - if (test) { - test = option.values.map((value) => - check(mod, `${key}.values.value`, value, 'string') - ); - } - tests.push(test); - break; - } - case 'text': - case 'hotkey': - tests.push(check(mod, `${key}.value`, option.value, 'string')); - break; - case 'number': - case 'color': - tests.push(check(mod, `${key}.value`, option.value, option.type)); - break; - case 'file': { - let test = await check(mod, `${key}.extensions`, option.extensions, 'array'); - if (test) { - test = option.extensions.map((ext) => - check(mod, `${key}.extensions.extension`, ext, 'string') - ); - } - tests.push(test); - break; - } - } - } - return tests; - }; - -/** - * internally used to validate mod.json files and provide helpful errors - * @private - * @param {object} mod - a mod's mod.json in object form - * @returns {boolean} whether or not the mod has passed validation - */ -module.exports.validate = async function (mod) { - let conditions = [ - check(mod, 'name', mod.name, 'string'), - check(mod, 'id', mod.id, 'uuid'), - check(mod, 'version', mod.version, 'semver'), - validateEnvironments(mod), - check(mod, 'description', mod.description, 'string'), - check(mod, 'preview', mod.preview, 'file|url', { optional: true }), - validateTags(mod), - validateAuthors(mod), - validateCSS(mod), - validateJS(mod), - validateOptions(mod), - ]; - do { - conditions = await Promise.all(conditions.flat(Infinity)); - } while (conditions.some((condition) => Array.isArray(condition))); - return conditions.every((passed) => passed); -}; diff --git a/api/node/registry.cjs b/api/node/registry.cjs deleted file mode 100644 index 532705a..0000000 --- a/api/node/registry.cjs +++ /dev/null @@ -1,166 +0,0 @@ -/* - * notion-enhancer core: api - * (c) 2021 dragonwocky (https://dragonwocky.me/) - * (https://notion-enhancer.github.io/) under the MIT license - */ - -'use strict'; - -/** - * interactions with the enhancer's repository of mods - * @module notion-enhancer/api/registry - */ - -/** - * mod ids whitelisted as part of the enhancer's core, permanently enabled - * @constant - * @type {array} - */ -module.exports.core = [ - 'a6621988-551d-495a-97d8-3c568bca2e9e', - '0f0bf8b6-eae6-4273-b307-8fc43f2ee082', - '36a2ffc9-27ff-480e-84a7-c7700a7d232d', -]; - -/** - * all environments/platforms currently supported by the enhancer - * @constant - * @type {array} - */ -module.exports.supportedEnvs = ['linux', 'win32', 'darwin', 'extension']; - -/** - * all available configuration types - * @constant - * @type {array} - */ -module.exports.optionTypes = ['toggle', 'select', 'text', 'number', 'color', 'file', 'hotkey']; - -/** - * the name of the active configuration profile - * @returns {string} - */ -module.exports.profileName = async () => { - const storage = require('notion-enhancer/api/node/storage.cjs'); - return storage.get(['currentprofile'], 'default'); -}; - -/** - * the root database for the current profile - * @returns {object} the get/set functions for the profile's storage - */ -module.exports.profileDB = async () => { - const storage = require('notion-enhancer/api/node/storage.cjs'); - return storage.db(['profiles', await module.exports.profileName()]); -}; - -let _list, - _errors = []; -/** - * list all available mods in the repo - * @param {function} filter - a function to filter out mods - * @returns {array} a validated list of mod.json objects - */ -module.exports.list = async (filter = (mod) => true) => { - if (!_list) { - const { validate } = require('notion-enhancer/api/node/registry-validation.cjs'), - { getJSON } = require('notion-enhancer/api/node/fs.cjs'); - _list = new Promise(async (res, rej) => { - const passed = []; - for (const dir of await getJSON('repo/registry.json')) { - try { - const mod = { - ...(await getJSON(`repo/${dir}/mod.json`)), - _dir: dir, - _err: (message) => _errors.push({ source: dir, message }), - }; - if (await validate(mod)) passed.push(mod); - } catch { - _errors.push({ source: dir, message: 'invalid mod.json' }); - } - } - res(passed); - }); - } - const filtered = []; - for (const mod of await _list) if (await filter(mod)) filtered.push(mod); - return filtered; -}; - -/** - * list validation errors encountered when loading the repo - * @returns {array} error objects with an error message and a source directory - */ -module.exports.errors = async () => { - await module.exports.list(); - return _errors; -}; - -/** - * get a single mod from the repo - * @param {string} id - the uuid of the mod - * @returns {object} the mod's mod.json - */ -module.exports.get = async (id) => { - return (await module.exports.list((mod) => mod.id === id))[0]; -}; - -/** - * checks if a mod is enabled: affected by the core whitelist, - * environment and menu configuration - * @param {string} id - the uuid of the mod - * @returns {boolean} whether or not the mod is enabled - */ -module.exports.enabled = async (id) => { - const env = require('notion-enhancer/api/node/env.cjs'), - mod = await module.exports.get(id); - if (!mod.environments.includes(env.name)) return false; - if (module.exports.core.includes(id)) return true; - return (await module.exports.profileDB()).get(['_mods', id], false); -}; - -/** - * get a default value of a mod's option according to its mod.json - * @param {string} id - the uuid of the mod - * @param {string} key - the key of the option - * @returns {string|number|boolean|undefined} the option's default value - */ -module.exports.optionDefault = async (id, key) => { - const mod = await module.exports.get(id), - opt = mod.options.find((opt) => opt.key === key); - if (!opt) return undefined; - switch (opt.type) { - case 'toggle': - case 'text': - case 'number': - case 'color': - case 'hotkey': - return opt.value; - case 'select': - return opt.values[0]; - case 'file': - return undefined; - } -}; - -/** - * access the storage partition of a mod in the current profile - * @param {string} id - the uuid of the mod - * @returns {object} an object with the wrapped get/set functions - */ -module.exports.db = async (id) => { - const storage = require('notion-enhancer/api/node/storage.cjs'), - db = await module.exports.profileDB(); - return storage.db( - [id], - async (path, fallback = undefined) => { - if (typeof path === 'string') path = [path]; - if (path.length === 2) { - // profiles -> profile -> mod -> option - fallback = (await module.exports.optionDefault(id, path[1])) ?? fallback; - } - return db.get(path, fallback); - }, - db.set - ); -}; diff --git a/api/node/storage.cjs b/api/node/storage.cjs deleted file mode 100644 index db30e53..0000000 --- a/api/node/storage.cjs +++ /dev/null @@ -1,66 +0,0 @@ -/* - * notion-enhancer core: api - * (c) 2021 dragonwocky (https://dragonwocky.me/) - * (https://notion-enhancer.github.io/) under the MIT license - */ - -'use strict'; -module.exports = {}; - -/** - * environment-specific data persistence - * @module notion-enhancer/api/storage - */ - -const storage = require('notion-enhancer/env/storage.cjs'); - -/** - * get persisted data - * @type {function} - * @param {array} path - the path of keys to the value being fetched - * @param {*} [fallback] - a default value if the path is not matched - * @returns {Promise} value ?? fallback - */ -module.exports.get = storage.get; - -/** - * persist data - * @type {function} - * @param {array} path - the path of keys to the value being set - * @param {*} value - the data to save - * @returns {Promise} resolves when data has been saved - */ -module.exports.set = storage.set; - -/** - * create a wrapper for accessing a partition of the storage - * @type {function} - * @param {array} namespace - the path of keys to prefix all storage requests with - * @param {function} [get] - the storage get function to be wrapped - * @param {function} [set] - the storage set function to be wrapped - * @returns {object} an object with the wrapped get/set functions - */ -module.exports.db = storage.db; - -/** - * add an event listener for changes in storage - * @type {function} - * @param {onStorageChangeCallback} callback - called whenever a change in - * storage is initiated from the current process - */ -module.exports.addChangeListener = storage.addChangeListener; - -/** - * remove a listener added with storage.addChangeListener - * @type {function} - * @param {onStorageChangeCallback} callback - */ -module.exports.removeChangeListener = storage.removeChangeListener; - -/** - * @callback onStorageChangeCallback - * @param {object} event - * @param {string} event.path- the path of keys to the changed value - * @param {string} [event.new] - the new value being persisted to the store - * @param {string} [event.old] - the previous value associated with the key - */ diff --git a/api/client/notion.mjs b/api/notion.mjs similarity index 99% rename from api/client/notion.mjs rename to api/notion.mjs index 9834f90..8c2ba8d 100644 --- a/api/client/notion.mjs +++ b/api/notion.mjs @@ -1,5 +1,5 @@ -/* - * notion-enhancer core: api +/** + * notion-enhancer: api * (c) 2021 dragonwocky (https://dragonwocky.me/) * (https://notion-enhancer.github.io/) under the MIT license */ @@ -11,7 +11,7 @@ * @module notion-enhancer/api/notion */ -import { web, fs, fmt } from '../index.mjs'; +import { web, fs, fmt } from './index.mjs'; const standardiseUUID = (uuid) => { if (uuid?.length === 32 && !uuid.includes('-')) { diff --git a/api/client/registry-validation.mjs b/api/registry-validation.mjs similarity index 98% rename from api/client/registry-validation.mjs rename to api/registry-validation.mjs index e75e34e..d467e8a 100644 --- a/api/client/registry-validation.mjs +++ b/api/registry-validation.mjs @@ -1,12 +1,12 @@ -/* - * notion-enhancer core: api +/** + * notion-enhancer: api * (c) 2021 dragonwocky (https://dragonwocky.me/) * (https://notion-enhancer.github.io/) under the MIT license */ 'use strict'; -import { fmt, registry } from '../index.mjs'; +import { fmt, registry } from './index.mjs'; const check = async ( mod, diff --git a/api/client/registry.mjs b/api/registry.mjs similarity index 98% rename from api/client/registry.mjs rename to api/registry.mjs index eafd41c..cc667e6 100644 --- a/api/client/registry.mjs +++ b/api/registry.mjs @@ -1,5 +1,5 @@ -/* - * notion-enhancer core: api +/** + * notion-enhancer: api * (c) 2021 dragonwocky (https://dragonwocky.me/) * (https://notion-enhancer.github.io/) under the MIT license */ @@ -11,7 +11,7 @@ * @module notion-enhancer/api/registry */ -import { env, fs, storage } from '../index.mjs'; +import { env, fs, storage } from './index.mjs'; import { validate } from './registry-validation.mjs'; /** diff --git a/api/client/storage.mjs b/api/storage.mjs similarity index 95% rename from api/client/storage.mjs rename to api/storage.mjs index a1d9c66..9d62c5b 100644 --- a/api/client/storage.mjs +++ b/api/storage.mjs @@ -1,5 +1,5 @@ -/* - * notion-enhancer core: api +/** + * notion-enhancer: api * (c) 2021 dragonwocky (https://dragonwocky.me/) * (https://notion-enhancer.github.io/) under the MIT license */ @@ -11,7 +11,7 @@ * @module notion-enhancer/api/storage */ -import * as storage from '../../env/storage.mjs'; +import * as storage from '../env/storage.mjs'; /** * get persisted data diff --git a/api/client/web.mjs b/api/web.mjs similarity index 91% rename from api/client/web.mjs rename to api/web.mjs index 342824c..b547e77 100644 --- a/api/client/web.mjs +++ b/api/web.mjs @@ -1,5 +1,5 @@ -/* - * notion-enhancer core: api +/** + * notion-enhancer: api * (c) 2021 dragonwocky (https://dragonwocky.me/) * (https://notion-enhancer.github.io/) under the MIT license */ @@ -11,17 +11,14 @@ * @module notion-enhancer/api/web */ -import { fs } from '../index.mjs'; -import '../../dep/jscolor.min.js'; +import { fs } from './index.mjs'; -let _hotkeyEventListeners = [], +let _hotkeyListenersActivated = false, + _hotkeyEventListeners = [], _documentObserver, _documentObserverListeners = [], _documentObserverEvents = []; -/** color picker with alpha channel using https://jscolor.com/ */ -export const jscolor = JSColor; - /** * wait until a page is loaded and ready for modification * @param {array} [selectors] - wait for the existence of elements that match these css selectors @@ -133,14 +130,12 @@ export const empty = ($container) => { * @param {string} path - a url or within-the-enhancer filepath */ export const loadStylesheet = (path) => { - render( - document.head, - html`` - ); - return true; + const $stylesheet = html``; + render(document.head, $stylesheet); + return $stylesheet; }; /** @@ -193,16 +188,6 @@ const triggerHotkeyListener = (event, hotkey) => { }); if (pressed) hotkey.callback(event); }; -document.addEventListener('keyup', (event) => { - for (const hotkey of _hotkeyEventListeners.filter(({ keydown }) => !keydown)) { - triggerHotkeyListener(event, hotkey); - } -}); -document.addEventListener('keydown', (event) => { - for (const hotkey of _hotkeyEventListeners.filter(({ keydown }) => keydown)) { - triggerHotkeyListener(event, hotkey); - } -}); /** * register a hotkey listener to the page @@ -224,6 +209,20 @@ export const addHotkeyListener = ( ) => { if (typeof keys === 'string') keys = keys.split('+'); _hotkeyEventListeners.push({ keys, callback, listenInInput, keydown }); + + if (!_hotkeyListenersActivated) { + _hotkeyListenersActivated = true; + document.addEventListener('keyup', (event) => { + for (const hotkey of _hotkeyEventListeners.filter(({ keydown }) => !keydown)) { + triggerHotkeyListener(event, hotkey); + } + }); + document.addEventListener('keydown', (event) => { + for (const hotkey of _hotkeyEventListeners.filter(({ keydown }) => keydown)) { + triggerHotkeyListener(event, hotkey); + } + }); + } }; /** * remove a listener added with web.addHotkeyListener