From dd07c6a1c627f274996093dbb1f29c19c4aa1422 Mon Sep 17 00:00:00 2001 From: Talon Poole Date: Tue, 29 Dec 2020 23:02:43 +0000 Subject: [PATCH] Gemini.line shorthand API and repo cleanup --- Makefile | 1 - docs/js.gmi | 13 +++++-------- gmi.editor.js | 17 ----------------- gmi.js | 9 +++++---- gmi.min.css | 1 - min/gmi.editor.min.js | 1 - min/gmi.min.js | 2 +- 7 files changed, 11 insertions(+), 33 deletions(-) delete mode 100644 gmi.editor.js delete mode 100644 gmi.min.css delete mode 100644 min/gmi.editor.min.js diff --git a/Makefile b/Makefile index cfe4340..7ff3392 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,3 @@ build: cat gmi.css | minify --css > min/gmi.min.css cat gmi.js | minify --js > min/gmi.min.js - cat gmi.editor.js | minify --js > min/gmi.editor.min.js diff --git a/docs/js.gmi b/docs/js.gmi index fa40b0c..2d8b26e 100644 --- a/docs/js.gmi +++ b/docs/js.gmi @@ -3,16 +3,13 @@ gmi.js is made up of lines! Use ctrl+shift+i to open a console and paste this in: ```js -const line = Gemini.line({ - type: "UL", - content: "manipulate the dom\nbut like in a Gemini way\ntry it!" -}) +const line = Gemini.line("manipulate the dom\nbut like in a Gemini way\ntry it!") document.body.prepend(line.dom) ``` > now try changing the type and content and observing the effects. ```js -line.type = "BLOCKQUOTE" -line.content = "now it's a quote" +line.type = "UL" +line.content = "now\nit's\na\nlist" ``` A document provides a way to handle many lines together: @@ -20,8 +17,8 @@ A document provides a way to handle many lines together: window.gmi = new Gemini(document.body) window.gmi.lines[2].type = "P" window.gmi.lines = [ - Gemini.line({content: "interesting", type: "H1"}), - Gemini.line({content: "that's convienient"}), + Gemini.line("interesting", "H1"), + Gemini.line("that's convienient"), ] ``` > the gemtext source is available via .source diff --git a/gmi.editor.js b/gmi.editor.js deleted file mode 100644 index 3bd7dcb..0000000 --- a/gmi.editor.js +++ /dev/null @@ -1,17 +0,0 @@ -/* gmi.editor.js is licensed under CCO */ -class GeminiEditor { - constructor(gmi) { - this.gmi = gmi - } - - static next(type) { - return function (e) { - e.preventDefault() - const types = Object.values(Gemini.TYPE) - console.log(content) - let next = types.indexOf(type) + 1 - next = next <= types.length - 1 ? types[next] : types[0] - return next - } - } -} diff --git a/gmi.js b/gmi.js index 8378348..c11281f 100644 --- a/gmi.js +++ b/gmi.js @@ -1,7 +1,8 @@ /* gmi.js is licensed under CC0 */ class Gemini { static syntax = { P: "", A: "=>", UL: "*", BLOCKQUOTE: ">", PRE: "```", H1: "#", H2: "##", H3: "###", } - static line(line) { + static line(line, type) { + if (typeof line === "string") line = {content: line, type: type || "P"} let dom = Gemini.render(line).dom return { get dom() { return dom }, @@ -15,7 +16,7 @@ class Gemini { get gmi() { const syntax = Gemini.syntax[this.type] const content = Gemini.contentFrom(this.dom).replace(/\n?$/, "") - switch (this.type) { + switch (this.type.toUpperCase()) { case "PRE": return `${syntax}\n${content}\n${syntax}` break @@ -47,7 +48,7 @@ class Gemini { line.dom = line.dom || document.createElement(line.type || "P") } line.dom.contentEditable = line.editable || "inherit" - switch (line.type) { + switch (line.type.toUpperCase()) { case "A": const {href, content} = Gemini.link(line.content) line.dom.innerHTML = line.editable && href !== content ? `${href} ${content}` : content @@ -72,7 +73,7 @@ class Gemini { return line } static contentFrom(dom) { - switch (dom.nodeName) { + switch (dom.nodeName.toUpperCase()) { case "BLOCKQUOTE": return Array.from(dom.childNodes).map(child => child.textContent diff --git a/gmi.min.css b/gmi.min.css deleted file mode 100644 index 3ed7b9a..0000000 --- a/gmi.min.css +++ /dev/null @@ -1 +0,0 @@ -*{margin:0;padding:0;overflow-wrap:anywhere}:root{--foreground:black;--background:white;--line-height:1.5;--font-size:1.25rem;--mono:Consolas,monaco,monospace;--serif:font-family:georgia,times,serif;--sans-serif:-apple-system,BlinkMacSystemFont,'avenir next',avenir,helvetica,'helvetica neue',ubuntu,roboto,noto,'segoe ui',arial,sans-serif}body{max-width:48rem;background-color:var(--background);padding:.5rem;margin:0 auto}h1,h2,h3{font-family:var(--sans-serif);line-height:1.25}h1{font-size:3rem}h2{font-size:2.25rem}h3{font-size:1.5rem}p{font-size:var(--font-size);font-family:var(--serif);line-height:var(--line-height)}a,blockquote,h1,h2,h3,p,ul{color:var(--foreground);background-color:var(--background)}br{line-height:1}a::before{font-size:var(--font-size);font-family:var(--mono);content:"⇒";padding-right:.25rem;vertical-align:middle}a:hover{color:var(--background);background-color:var(--foreground)}a{font-size:var(--font-size);font-family:var(--serif);text-decoration:none}li::before{font-size:var(--font-size);font-family:var(--mono);content:"*";vertical-align:middle;padding-right:.5rem}ul{font-size:var(--font-size);font-family:var(--serif);line-height:1.25;list-style-type:none}blockquote{font-size:var(--font-size);font-family:var(--serif);line-height:var(--line-height);border-left:.5rem solid var(--foreground);padding-left:.75rem}pre{font-size:1rem;font-family:var(--mono);line-height:1;color:var(--background);background-color:var(--foreground);padding:1.25rem;overflow-y:auto}pre+blockquote{padding-top:.5rem;padding-bottom:.5rem}::-moz-selection,::selection{color:var(--background);background-color:var(--foreground)}pre::-moz-selection,pre::selection{color:var(--foreground);background-color:var(--background)} diff --git a/min/gmi.editor.min.js b/min/gmi.editor.min.js deleted file mode 100644 index 7d22b44..0000000 --- a/min/gmi.editor.min.js +++ /dev/null @@ -1 +0,0 @@ -class GeminiEditor{constructor(t){this.gmi=t}static next(t){return function(e){e.preventDefault();const n=Object.values(Gemini.TYPE);console.log(content);let i=n.indexOf(t)+1;return i=i<=n.length-1?n[i]:n[0],i}}} diff --git a/min/gmi.min.js b/min/gmi.min.js index 5ffa930..c78574f 100644 --- a/min/gmi.min.js +++ b/min/gmi.min.js @@ -1 +1 @@ -class Gemini{static syntax={P:"",A:"=>",UL:"*",BLOCKQUOTE:">",PRE:"```",H1:"#",H2:"##",H3:"###"};static line(e){let t=Gemini.render(e).dom;return{get dom(){return t},get type(){return this.dom.nodeName},set type(e){t=Gemini.render({dom:this.dom,type:e,content:Gemini.contentFrom(this.dom)}).dom},get content(){return Gemini.contentFrom(t)},set content(e){Gemini.render({dom:t,type:t.nodeName,content:e})},get editable(){return"true"===this.dom.contentEditable},set editable(e){Gemini.render({dom:this.dom,type:this.type,content:this.content,editable:e})},delete(){return this.dom.remove()},get gmi(){const e=Gemini.syntax[this.type],t=Gemini.contentFrom(this.dom).replace(/\n?$/,"");switch(this.type){case"PRE":return`${e}\n${t}\n${e}`;default:return t.split("\n").map((t=>`${""!==e?e+" ":""}${t}`)).join("\n")}},get before(){return Gemini.line(this.dom.previousElementSibling)},set before(e){this.before.dom.after(e.dom)},get after(){return Gemini.line(this.dom.nextElementSibling)},set after(e){this.after.dom.before(e.dom)}}}static render(e){if(e.dom&&e.dom.nodeName!==e.type){const t=document.createElement(e.type);e.dom.replaceWith(t),e.dom=t}else e.nodeName?e={dom:e,type:e.nodeName,content:Gemini.contentFrom(e),editable:e.contentEditable}:e.dom=e.dom||document.createElement(e.type||"P");switch(e.dom.contentEditable=e.editable||"inherit",e.type){case"A":const{href:t,content:n}=Gemini.link(e.content);e.dom.innerHTML=e.editable&&t!==n?`${t} ${n}`:n,e.dom.href=t;break;case"UL":e.dom.innerHTML=e.content.split("\n").map((e=>e.length>0?`
  • ${e}
    • `:"")).join("\n");break;case"BLOCKQUOTE":e.dom.innerHTML=e.content.split("\n").map((e=>`
    ${e}
    `)).join("\n");break;case"PRE":e.dom.textContent=e.content;break;default:e.dom.innerHTML=e.content.replace(/\n+/g,"
    ")}return e}static contentFrom(e){switch(e.nodeName){case"BLOCKQUOTE":return Array.from(e.childNodes).map((e=>e.textContent)).join("\n");case"UL":return Array.from(e.children).map((e=>e.textContent)).join("\n");case"A":const{href:t,content:n}=Gemini.link(e.textContent);return`${t||e.href} ${n}`;case"PRE":return e.textContent;default:return e.innerHTML.replace(/
    /g,"\n")}}static link(e=""){return/((?[^\s]+\/\/[^\s]+)\s)?(?.+)/.exec(e).groups}constructor(e){this.root=e}get lines(){return Array.from(this.root.children).filter((e=>["P","BLOCKQUOTE","A","PRE","UL","H1","H2","H3"].includes(e.nodeName))).map(Gemini.line)}set lines(e){this.root.textContent="",this.root.append(...e.map((e=>e.dom)))}get source(){return this.lines.map((e=>e.gmi)).join("\n")}download(){const e=document.createElement("a");e.setAttribute("href","data:text/gemini;charset=utf-8,"+encodeURIComponent(this.source)),e.setAttribute("download",this.lines[0].content.replace(/\s/g,"_")+".gmi"),e.style.display="none",document.body.appendChild(e),e.click(),document.body.removeChild(e)}get foreground(){return getComputedStyle(this.root).getPropertyValue("--foreground")}set foreground(e){return this.root.style.setProperty("--foreground",e)}get background(){return getComputedStyle(this.root).getPropertyValue("--background")}set background(e){return this.root.style.setProperty("--background",e)}get size(){return getComputedStyle(this.root).getPropertyValue("--font-size")}set size(e){return this.root.style.setProperty("--font-size",e)}get lineHeight(){return getComputedStyle(this.root).getPropertyValue("--line-height")}set lineHeight(e){return this.root.style.setProperty("--line-height",e)}get serif(){return getComputedStyle(this.root).getPropertyValue("--serif")}set serif(e){return this.root.style.setProperty("--serif",e)}get sans(){return getComputedStyle(this.root).getPropertyValue("--sans")}set sans(e){return this.root.style.setProperty("--sans",e)}get mono(){return getComputedStyle(this.root).getPropertyValue("--mono")}set mono(e){return this.root.style.setProperty("--mono",e)}} +class Gemini{static syntax={P:"",A:"=>",UL:"*",BLOCKQUOTE:">",PRE:"```",H1:"#",H2:"##",H3:"###"};static line(e,t){"string"==typeof e&&(e={content:e,type:t||"P"});let n=Gemini.render(e).dom;return{get dom(){return n},get type(){return this.dom.nodeName},set type(e){n=Gemini.render({dom:this.dom,type:e,content:Gemini.contentFrom(this.dom)}).dom},get content(){return Gemini.contentFrom(n)},set content(e){Gemini.render({dom:n,type:n.nodeName,content:e})},get editable(){return"true"===this.dom.contentEditable},set editable(e){Gemini.render({dom:this.dom,type:this.type,content:this.content,editable:e})},delete(){return this.dom.remove()},get gmi(){const e=Gemini.syntax[this.type],t=Gemini.contentFrom(this.dom).replace(/\n?$/,"");switch(this.type.toUpperCase()){case"PRE":return`${e}\n${t}\n${e}`;default:return t.split("\n").map((t=>`${""!==e?e+" ":""}${t}`)).join("\n")}},get before(){return Gemini.line(this.dom.previousElementSibling)},set before(e){this.before.dom.after(e.dom)},get after(){return Gemini.line(this.dom.nextElementSibling)},set after(e){this.after.dom.before(e.dom)}}}static render(e){if(e.dom&&e.dom.nodeName!==e.type){const t=document.createElement(e.type);e.dom.replaceWith(t),e.dom=t}else e.nodeName?e={dom:e,type:e.nodeName,content:Gemini.contentFrom(e),editable:e.contentEditable}:e.dom=e.dom||document.createElement(e.type||"P");switch(e.dom.contentEditable=e.editable||"inherit",e.type.toUpperCase()){case"A":const{href:t,content:n}=Gemini.link(e.content);e.dom.innerHTML=e.editable&&t!==n?`${t} ${n}`:n,e.dom.href=t;break;case"UL":e.dom.innerHTML=e.content.split("\n").map((e=>e.length>0?`
  • ${e}
    • `:"")).join("\n");break;case"BLOCKQUOTE":e.dom.innerHTML=e.content.split("\n").map((e=>`
    ${e}
    `)).join("\n");break;case"PRE":e.dom.textContent=e.content;break;default:e.dom.innerHTML=e.content.replace(/\n+/g,"
    ")}return e}static contentFrom(e){switch(e.nodeName.toUpperCase()){case"BLOCKQUOTE":return Array.from(e.childNodes).map((e=>e.textContent)).join("\n");case"UL":return Array.from(e.children).map((e=>e.textContent)).join("\n");case"A":const{href:t,content:n}=Gemini.link(e.textContent);return`${t||e.href} ${n}`;case"PRE":return e.textContent;default:return e.innerHTML.replace(/
    /g,"\n")}}static link(e=""){return/((?[^\s]+\/\/[^\s]+)\s)?(?.+)/.exec(e).groups}constructor(e){this.root=e}get lines(){return Array.from(this.root.children).filter((e=>["P","BLOCKQUOTE","A","PRE","UL","H1","H2","H3"].includes(e.nodeName))).map(Gemini.line)}set lines(e){this.root.textContent="",this.root.append(...e.map((e=>e.dom)))}get source(){return this.lines.map((e=>e.gmi)).join("\n")}download(){const e=document.createElement("a");e.setAttribute("href","data:text/gemini;charset=utf-8,"+encodeURIComponent(this.source)),e.setAttribute("download",this.lines[0].content.replace(/\s/g,"_")+".gmi"),e.style.display="none",document.body.appendChild(e),e.click(),document.body.removeChild(e)}get foreground(){return getComputedStyle(this.root).getPropertyValue("--foreground")}set foreground(e){return this.root.style.setProperty("--foreground",e)}get background(){return getComputedStyle(this.root).getPropertyValue("--background")}set background(e){return this.root.style.setProperty("--background",e)}get size(){return getComputedStyle(this.root).getPropertyValue("--font-size")}set size(e){return this.root.style.setProperty("--font-size",e)}get lineHeight(){return getComputedStyle(this.root).getPropertyValue("--line-height")}set lineHeight(e){return this.root.style.setProperty("--line-height",e)}get serif(){return getComputedStyle(this.root).getPropertyValue("--serif")}set serif(e){return this.root.style.setProperty("--serif",e)}get sans(){return getComputedStyle(this.root).getPropertyValue("--sans")}set sans(e){return this.root.style.setProperty("--sans",e)}get mono(){return getComputedStyle(this.root).getPropertyValue("--mono")}set mono(e){return this.root.style.setProperty("--mono",e)}} -- 2.30.1