better html gen

breck7 · Jan 14, 2025 · dad5fd9 · dad5fd9
1 parent 343c52f
commit dad5fd9
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 14 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "scroll-cli",
-  "version": "166.2.0",
+  "version": "166.3.0",
   "description": "A language for scientists of all ages. A curated collection of tools for refining and sharing thoughts.",
   "main": "scroll.js",
   "engines": {

diff --git a/parsers/aftertext.parsers b/parsers/aftertext.parsers
@@ -69,16 +69,18 @@ abstractAftertextParser
    this.buildSettings = buildSettings
    const { className, styles } = this
    const classAttr = className ? `class="${this.className}"` : ""
+   const selfClose = this.isSelfClosing ? " /" : ""
    const tag = this.get("tag") || this.tag
    if (tag === "none") // Allow no tag for aftertext in tables
      return this.text
    const id = this.has("id") ? "" : `id="${this.htmlId}" ` // always add an html id
-   return this.getHtmlRequirements(buildSettings) + `<${tag} ${id}${this.htmlAttributes}${classAttr}${styles}>${this.htmlContents}${this.closingTag}`
+   return this.getHtmlRequirements(buildSettings) + `<${tag} ${id}${this.htmlAttributes}${classAttr}${styles}${selfClose}>${this.htmlContents}${this.closingTag}`
   }
   get htmlContents() {
     return this.text
   }
   get closingTag() {
+    if (this.isSelfClosing) return ""
     const tag = this.get("tag") || this.tag
     return `</${tag}>`
   }
@@ -357,6 +359,11 @@ aftertextHrefParser
  extends abstractAftertextAttributeParser
  atoms cueAtom urlAtom
 
+aftertextSrcParser
+ extends aftertextHrefParser
+ cue src
+ description Set HTML src attribute.
+
 aftertextOnclickParser
  popularity 0.000217
  cue onclick

diff --git a/parsers/html.parsers b/parsers/html.parsers
@@ -98,9 +98,14 @@ htmlInlineParser
    return `${this.getLine() ?? ""}${this.subparticlesToString()}`
   }
 
+abstractHtmlElementParser
+ extends abstractIndentableParagraphParser
+ javascript
+  defaultClassName = ""
+
 htmlSectionParser
  description HTML section tag.
- extends abstractIndentableParagraphParser
+ extends abstractHtmlElementParser
  cue section
  example
   section
@@ -113,7 +118,7 @@ htmlSectionParser
 
 htmlHeaderParser
  description HTML header tag.
- extends abstractIndentableParagraphParser
+ extends abstractHtmlElementParser
  cue header
  example
   header
@@ -123,7 +128,7 @@ htmlHeaderParser
 
 htmlFooterParser
  description HTML footer tag.
- extends abstractIndentableParagraphParser
+ extends abstractHtmlElementParser
  cue footer
  example
   footer
@@ -133,7 +138,7 @@ htmlFooterParser
 
 htmlMainParser
  description HTML main tag.
- extends abstractIndentableParagraphParser
+ extends abstractHtmlElementParser
  cue main
  example
   main
@@ -143,7 +148,7 @@ htmlMainParser
 
 htmlNavParser
  description HTML nav tag.
- extends abstractIndentableParagraphParser
+ extends abstractHtmlElementParser
  cue nav
  example
   nav
@@ -154,7 +159,7 @@ htmlNavParser
 
 htmlPreParser
  description HTML pre tag.
- extends abstractIndentableParagraphParser
+ extends abstractHtmlElementParser
  cue pre
  example
   pre
@@ -163,7 +168,7 @@ htmlPreParser
 
 htmlUlParser
  description HTML ul tag.
- extends abstractIndentableParagraphParser
+ extends abstractHtmlElementParser
  cue ul
  example
   ul
@@ -173,7 +178,7 @@ htmlUlParser
 
 htmlOlParser
  description HTML ol tag.
- extends abstractIndentableParagraphParser
+ extends abstractHtmlElementParser
  cue ol
  example
   ol
@@ -183,7 +188,7 @@ htmlOlParser
 
 htmlLiParser
  description HTML li tag.
- extends abstractIndentableParagraphParser
+ extends abstractHtmlElementParser
  cue li
  example
   ol
@@ -193,16 +198,17 @@ htmlLiParser
 
 htmlImgParser
  description HTML img tag.
- extends abstractIndentableParagraphParser
+ extends abstractHtmlElementParser
  cue img
  example
   img foo.png
  javascript
   tag = "img"
+  isSelfClosing = true
 
 htmlAParser
  description HTML a tag.
- extends abstractIndentableParagraphParser
+ extends abstractHtmlElementParser
  cue a
  example
   a Home

diff --git a/parsers/root.parsers b/parsers/root.parsers
@@ -357,7 +357,7 @@ scrollParser
   }
   get scrollVersion() {
     // currently manually updated
-    return "166.2.0"
+    return "166.3.0"
   }
   // Use the first paragraph for the description
   // todo: add a particle method version of get that gets you the first particle. (actulaly make get return array?)

diff --git a/releaseNotes.scroll b/releaseNotes.scroll
@@ -22,6 +22,10 @@ ciBadges.scroll
 br
 thinColumns
 
+📦 166.3.0 1/14/2025
+🎉 added aftertextSrcParser
+🏥 remove defaultClass on htmlElements
+
 📦 166.2.0 1/14/2025
 🎉 added htmlImgParser