Better build tools. Easier tests

package.json

@@ -1,6 +1,6 @@
 {
   "name": "scroll-cli",
-  "version": "164.3.0",
+  "version": "164.4.0",
   "description": "A language for scientists of all ages. A curated collection of tools for refining and sharing thoughts.",
   "main": "scroll.js",
   "engines": {

parsers/assertions.parsers

@@ -2,6 +2,7 @@ abstractAssertionParser
  description Test above particle's output.
  extends abstractScrollParser
  string bindTo previous
+ catchAllAtomType codeAtom
  cueFromId
  javascript
   buildHtml() {
@@ -13,13 +14,15 @@ abstractAssertionParser
   }
   get actual() {return this.particleToTest.buildHtml()}
   getErrors() {
-    const {actual} = this
-    const expected = this.subparticlesToString()
+    const {actual, expected} = this
     const errors = super.getErrors()
     if (this.areEqual(actual, expected))
       return errors
     return errors.concat(this.makeError(`'${actual}' did not ${this.kind} '${expected}'`))
   }
+  get expected() {
+    return this.length ? this.subparticlesToString() : (this.content ? this.content : "")
+  }
  catchAllParser htmlLineParser
 
 assertIgnoreBelowErrorsParser

parsers/build.parsers

@@ -51,4 +51,27 @@ abstractBuildTwoCommandParser
  javascript
   async buildTwo() {
     await this._buildFileType(this.extension)
-  }
+  }
+
+scrollFileAddressParser
+ catchAllAtomType filePathAtom
+ catchAllParser scrollFileAddressParser
+
+abstractInlineFileParser
+ extends abstractScrollParser
+ catchAllAtomType filePathAtom
+ catchAllParser scrollFileAddressParser
+ string joinChar ;\n\n
+ string htmlTag script
+ javascript
+  get files() {
+    const inline = this.atoms.slice(1)
+    const children = this.map(particle => particle.cue)
+    return inline.concat(children)
+  }
+  get contents() {
+    return this.files.map(filename => this.root.readFile(filename)).join(this.joinChar)
+  }
+  buildHtml() {
+   return `<${this.htmlTag}>/* ${this.files.join(" ")} */\n${this.contents}</${this.htmlTag}>`
+  }

parsers/css.parsers

@@ -25,25 +25,20 @@ cssParser
   get css() {
     return this.content ?? this.subparticlesToString()
   }
-  buildCs() {
+  buildCss() {
     return this.css
   }
 
-inlineCssParser
+scrollInlineCssParser
  description Inline CSS from files.
  popularity 0.007211
- extends abstractScrollParser
- cueFromId
- catchAllAtomType filePathAtom
+ extends abstractInlineFileParser
+ cue inlineCss
+ string joinChar \n\n
+ string htmlTag style
  javascript
-  buildHtml() {
-   return `<style>/* ${this.content} */\n${this.css}</style>`
-  }
-  get css() {
-    return this.atoms.slice(1).map(filename => this.root.readFile(filename)).join("\n\n")
-  }
-  buildCs() {
-    return this.css
+  buildCss() {
+    return this.contents
   }
 
 scrollBackgroundColorParser

parsers/hakon.parsers

@@ -16,6 +16,6 @@ hakonParser
     const {hakonParser} = this.root
     return new hakonParser(this.subparticlesToString()).compile()
   }
-  buildCs() {
+  buildCss() {
     return this.css
   }

parsers/javascript.parsers

@@ -9,19 +9,12 @@ quickScriptParser
    return `<script src="${this.filename}"></script>`
   }
 
-inlineJsParser
+scrollInlineJsParser
  description Inline JS from files.
  popularity 0.007211
- extends abstractScrollParser
- cueFromId
- catchAllAtomType filePathAtom
+ extends abstractInlineFileParser
+ cue inlineJs
  javascript
-  buildHtml() {
-   return `<script>/* ${this.content} */\n${this.contents}</script>`
-  }
-  get contents() {
-    return this.atoms.slice(1).map(filename => this.root.readFile(filename)).join(";\n\n")
-  }
   buildJs() {
     return this.contents
   }

parsers/root.parsers

@@ -220,10 +220,16 @@ scrollParser
     const {path} = this
     const fs = require("fs")
     const fullPath = path.join(this.folderPath, filename.replace(this.folderPath, ""))
+    try {
     if (fs.existsSync(fullPath))
       return fs.readFileSync(fullPath, "utf8")
     console.error(`File '${filename}' not found`)
     return ""
+    } catch (err) {
+      console.error(`Error in '${this.filePath}' reading file: '${fullPath}'`)
+      console.error(err)
+      return ""
+    }
   }
   alreadyRequired = new Set()
   buildHtmlSnippet(buildSettings) {
@@ -340,7 +346,7 @@ scrollParser
   }
   get scrollVersion() {
     // currently manually updated
-    return "164.3.0"
+    return "164.4.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?)

releaseNotes.scroll

@@ -22,6 +22,11 @@ ciBadges.scroll
 br
 thinColumns
 
+📦 164.4.0 12/17/2024
+🎉 assertions now can also be one liners
+🎉 `inlineJs` and `inlineCss` can now take filenames as subparticles
+🏥 bug fixes in buildCss methods
+
 📦 164.3.0 12/16/2024
 🎉 update ScrollSDK
 

tests/buildDelimited.scroll

@@ -1,6 +1,5 @@
 buildCsv
-assertBuildIncludes
- virginica
+assertBuildIncludes virginica
 buildTsv
 buildJson
 buildTxt

tests/bundling.scroll

@@ -0,0 +1,11 @@
+buildCss
+assertBuildIncludes --scrollFontPrimary
+buildJs
+
+// Bundle any random files:
+inlineCss ../animation.css
+ ../style.css
+
+// Just bundle a couple of random files:
+inlineJs ../scroll.js
+ ../importParsers.js

tests/defs.scroll

@@ -1,6 +1,5 @@
 buildParsers
-assertBuildIncludes
- URL to the creation
+assertBuildIncludes URL to the creation
 
 urlDef URL to the creation being tried?
 

tests/dependencies.scroll

@@ -10,16 +10,11 @@ container
 
 dependencies
  printTable
-assertHtmlIncludes
- header.scroll
-assertHtmlIncludes
- changes.parsers
-assertHtmlIncludes
- contacts.csv
-assertHtmlIncludes
- style.css
-assertHtmlIncludes
- particles.png
+assertHtmlIncludes header.scroll
+assertHtmlIncludes changes.parsers
+assertHtmlIncludes contacts.csv
+assertHtmlIncludes style.css
+assertHtmlIncludes particles.png
 
 ../particles.png
 

tests/feed.scroll

@@ -1,6 +1,5 @@
 buildRss
-assertBuildIncludes
- <?xml
+assertBuildIncludes <?xml
 
 settings.scroll
 

tests/html.scroll

@@ -1,8 +1,7 @@
 buildHtml
 
 <b></b>
-assertHtmlEquals
- <b></b>
+assertHtmlEquals <b></b>
 
 The background should be green
 htmlInclude.html

tests/iris.scroll

@@ -2,5 +2,4 @@ buildHtml
 iris
  shuffle
   printTable
-assertHtmlIncludes
- virginica
+assertHtmlIncludes virginica

tests/keyboardNav.scroll

@@ -1,4 +1,3 @@
 buildHtml
 keyboardNav
-assertHtmlExcludes
- undefined
+assertHtmlExcludes undefined

tests/meta.scroll

@@ -1,7 +1,5 @@
 buildCsv
-assertBuildIncludes
- date,year,title,permalink
-assertBuildIncludes
- Breck
+assertBuildIncludes date,year,title,permalink
+assertBuildIncludes Breck
 postsMeta ../blog/All
  printTable

tests/posts.scroll

@@ -5,8 +5,7 @@ header.scroll
 posts index subfolder/index
  printColumn title
   join ·
-assertHtmlIncludes
- sink
+assertHtmlIncludes sink
 
 ---