ScrollSDK 107. Change Scroll to be single pass parser. #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

breck7 merged 30 commits into main from sfs3

Apr 8, 2025

designer/DesignerApp.ts

-Original file line number
+Diff line change
@@ Expand Up / @@ -9,8 +9,6 @@ declare var parsersParser: any @@
     // todo: get typings in here.
     declare var CodeMirror: any
     declare var saveAs: any
-    declare var JSZip: any
-    declare var dumbdownParser: any
     declare type html = string
     class DesignerApp extends AbstractParticleComponentParser {
@@ Expand Down Expand Up / @@ -91,26 +89,6 @@ class DesignerApp extends AbstractParticleComponentParser { @@
         this._setParsersAndCode(parsers.text, sample)
       }
-      // TODO: ADD TESTS!!!!!
-      async downloadBundleCommand() {
-        const parsersProgram = new HandParsersProgram(this.getParsersCode())
-        const bundle = parsersProgram.toBundle()
-        const languageName = parsersProgram.extensionName
-        return this._makeZipBundle(languageName + ".zip", bundle)
-      }
-      private async _makeZipBundle(fileName: string, bundle: any) {
-        const zip = new JSZip()
-        Object.keys(bundle).forEach(key => {
-          zip.file(key, bundle[key])
-        })
-        zip.generateAsync({ type: "blob" }).then((content: any) => {
-          // see FileSaver.js
-          saveAs(content, fileName)
-        })
-      }
       private _toIceTray(program: any) {
         const columns = program.programWidth
@@ Expand Down Expand Up / @@ -284,7 +262,7 @@ class DesignerApp extends AbstractParticleComponentParser { @@
         const errs = this.parsersProgram.getAllErrors().map((err: any) => err.toObject())
         this.willowBrowser.setHtmlOfElementWithIdHack("parsersErrorsConsole", errs.length ? new Particle(errs).toFormattedTable(200) : "0 errors")
         const parsersProgram = new HandParsersProgram(this.parsersInstance.getValue())
-        const readme = new dumbdownParser(parsersProgram.toReadMe()).compile()
+        const readme = parsersProgram.toReadMe()
         this.willowBrowser.setHtmlOfElementWithIdHack("readmeComponent", readme)
       }
@@ Expand Down @@

designer/index.html

-Original file line number
+Diff line change
@@ Expand Up / @@ -11,15 +11,13 @@ @@
         <script type="text/javascript" src="../sandbox/lib/placeholder.js"></script>
         <script type="text/javascript" src="../sandbox/lib/javascript.js"></script>
         <script type="text/javascript" src="../sandbox/lib/FileSaver.min.js"></script>
-        <script type="text/javascript" src="../sandbox/lib/jszip.min.js"></script>
         <script src="../products/Utils.browser.js"></script>
         <script src="../products/Particle.browser.js"></script>
         <script src="../products/Parsers.ts.browser.js"></script>
         <script src="../products/ParsersCodeMirrorMode.browser.js"></script>
         <script src="../products/stump.browser.js"></script>
         <script src="../products/hakon.browser.js"></script>
         <script src="../products/parsers.browser.js"></script>
-        <script src="../products/dumbdown.browser.js"></script>
         <script src="../products/ParticleComponentFramework.browser.js"></script>
         <script type="text/javascript" src="../products/DesignerApp.browser.js"></script>
         <link rel="shortcut icon" type="image/x-icon" href="../images/favicon.ico" />
@@ Expand Down @@

package.json

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,6 +1,6 @@
  
    {

      "name": "scrollsdk",

      "version": "106.0.1",

      "version": "107.0.0",

      "description": "This npm package includes the Particles class, the Parsers compiler-compiler, a Parsers IDE, and more, all implemented in Particles, Parsers, and TypeScript.",

      "types": "./built/scrollsdk.node.d.ts",

      "main": "./products/Particle.js",

parsers/Parsers.test.ts

-Original file line number
+Diff line change
@@ Expand Up / @@ -66,34 +66,6 @@ const makeProgram = (parsersCode: string, code: string) => { @@
       return new rootParser(code)
     }
-    testParticles.trainAndPredict = equal => {
-      // Arrange/Act
-      const parsersProgram = new HandParsersProgram(hakonParsers)
-      const hakonParser = parsersProgram.compileAndReturnRootParser()
-      const testBlankProgram = new hakonParser()
-      const handParsersProgram = testBlankProgram.handParsersProgram
-      const examples = handParsersProgram.getParticlesByGlobPath("* example").map((particle: any) => particle.subparticlesToString())
-      const model = parsersProgram.trainModel(examples)
-      // Assert
-      const predictions = handParsersProgram.predictSubparticles(model, testBlankProgram)
-      equal(predictions[0].id, "selectorParser")
-      // Act
-      const bodyParticle = testBlankProgram.appendLine("body")
-      // Assert
-      const predictions2 = handParsersProgram.predictSubparticles(model, bodyParticle)
-      equal(predictions2[0].id, "propertyParser")
-      // Act
-      const fontSizeParticle = testBlankProgram.appendLine("font-size")
-      // Assert
-      const predictions3 = handParsersProgram.predictParents(model, fontSizeParticle)
-      equal(predictions3[0].id, "selectorParser")
-    }
     testParticles.jibberish = equal => {
       // Arrange
       const sampleJibberishCode = Disk.read(path.join(jibberishRootDir, "sample.jibberish"))
@@ Expand Down Expand Up / @@ -514,49 +486,6 @@ testParticles.blobParsers = equal => { @@
       equal(anyProgram.topDownArray.map((particle: any) => particle.parserId).length > 0, true, "passed blob regression")
     }
-    testParticles.sublimeSyntaxFile = equal => {
-      // Arrange/Act
-      const parsersProgram = new HandParsersProgram(jibberishParsersCode)
-      const code = parsersProgram.toSublimeSyntaxFile()
-      // Assert
-      equal(code.includes("scope:"), true)
-    }
-    testParticles.toStumpString = equal => {
-      // Arrange/Act
-      const parsersProgram = new HandParsersProgram(arrowParsers).compileAndReturnRootParser()
-      const code = new parsersProgram().definition.getParserDefinitionByParserId("chargeParser").toStumpString()
-      const expected = `div
-     label amount
-     input
-      name amount
-      type number
-      placeholder 9.99
-      min 0
-      max 99999
-    div
-     label currency
-     select
-      name currency
-      option usd
-      option cad
-      option jpy
-    div
-     label cardNumber
-     input
-      name cardNumber
-      placeholder 1111222233334444
-    div
-     label token
-     input
-      name token
-      placeholder sk_test_4eC39H`
-      // Assert
-      equal(code, expected, "form correct")
-    }
     // todo: reenable once we have the requirement of at least 1 root particle
     // testParticles.requiredParsers = equal => {
     //   // Arrange/Act
@@ Expand Down Expand Up / @@ -749,15 +678,64 @@ testParticles.invalidParsersRegression = equal => { @@
       equal(typeof compiledParser, "string")
     }
-    testParticles.bundler = equal => {
+    testParticles.addRunTimeParser = equal => {
+      const parsers = `// Atom Parsers
+    nameAtom
+     description A person's name
+     paint string
+    cueAtom
+     paint keyword
+    // Line Parsers
+    newlangParser
+     root
+     description A basic root parser.
+     catchAllParser catchAllErrorParser
+     inScope helloParser
+    helloParser
+     int luckyNumber 7
+     catchAllAtomType nameAtom
+     atoms cueAtom
+     cue hello
+    catchAllErrorParser
+     baseParser errorParser`
       // Arrange
-      const jibberishParsersProgram = new HandParsersProgram(jibberishParsersCode)
+      const parsersProgram = new HandParsersProgram(parsers)
+      const rootParser = parsersProgram.compileAndReturnRootParser()
+      // Act/Assert
+      const basicProgram = new rootParser(`hello Mom`)
+      equal(basicProgram.particleAt(0).luckyNumber, 7, "Basics work")
+      const byeParser = `byeParser
+     int luckyNumber 42
+     atoms cueAtom
+     extends helloParser
+     cue bye`
+      // Act
+      // Now we need to add a Parser.
+      basicProgram.registerParsers(byeParser)
+      basicProgram.appendLine("bye")
+      // Assert
+      equal(basicProgram.particleAt(1).luckyNumber, 42, "registerParsers work")
+      const adiosParser = `adiosParser
+     int luckyNumber 15
+     atoms cueAtom
+     extends helloParser
+     cueFromId`
       // Act
-      const bundle = jibberishParsersProgram.toBundle()
+      basicProgram.registerParsers(adiosParser)
+      basicProgram.appendLine("adios")
+      basicProgram.appendLine("bye")
       // Assert
-      equal(bundle["readme.md"].includes("stats"), true)
+      equal(basicProgram.particleAt(2).luckyNumber, 15, "adding multiple parsers works")
+      equal(basicProgram.particleAt(3).luckyNumber, 42, "earlier additions work")
     }
     const jibberishParsersProgram = new HandParsersProgram(jibberishParsersCode)
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ScrollSDK 107. Change Scroll to be single pass parser. #198

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!