Allow loading programUrl in Designer

breck7 · May 13, 2024 · b3d5251 · b3d5251
1 parent 844629f
commit b3d5251
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 10 deletions.
diff --git a/designer/DesignerApp.ts b/designer/DesignerApp.ts
@@ -77,12 +77,16 @@ class DesignerApp extends AbstractTreeComponentParser {
     this._setGrammarAndCode(grammar.text, sample.text)
   }
 
-  async fetchAndLoadGrammarFromUrlCommand(url: string) {
+  async fetchAndLoadGrammarFromUrlCommand(url: string, programUrl: string) {
     const willowBrowser = this.willowBrowser
     const grammar = await willowBrowser.httpGetUrl(url)
     const grammarProgram = new HandGrammarProgram(grammar.text)
     const rootNodeDef = grammarProgram.rootParserDefinition
-    const sample = rootNodeDef.getNode("example").childrenToString()
+    let sample = rootNodeDef.getNode("example").childrenToString()
+    if (programUrl) {
+      sample = await willowBrowser.httpGetUrl(programUrl)
+      sample = sample.text
+    }
 
     this._setGrammarAndCode(grammar.text, sample)
   }
@@ -159,13 +163,14 @@ class DesignerApp extends AbstractTreeComponentParser {
     const deepLink = new TreeNode(decodeURIComponent(hash.substr(1)))
     const standard = deepLink.get("standard")
     const fromUrl = deepLink.get("url")
+    const programUrl = deepLink.get("programUrl")
     if (standard) {
       console.log("Loading standard from deep link....")
       await this.fetchAndLoadJtreeShippedLanguageCommand(standard)
       return true
     } else if (fromUrl) {
       console.log(`Loading grammar from '${fromUrl}'....`)
-      await this.fetchAndLoadGrammarFromUrlCommand(fromUrl)
+      await this.fetchAndLoadGrammarFromUrlCommand(fromUrl, programUrl)
       return true
     } else {
       const grammarCode = deepLink.getNode("grammar")

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jtree",
-  "version": "77.0.0",
+  "version": "77.1.0",
   "description": "Simplify your code with Tree Notation. This jtree package includes a Tree Notation parser, compiler-compiler, and virtual machine for Tree Languages, as well as sample languages, implemented in TypeScript.",
   "types": "./built/jtree.node.d.ts",
   "main": "./products/TreeNode.js",

diff --git a/products/DesignerApp.browser.js b/products/DesignerApp.browser.js
@@ -60,12 +60,16 @@ class DesignerApp extends AbstractTreeComponentParser {
     const sample = await willowBrowser.httpGetUrl(samplePath)
     this._setGrammarAndCode(grammar.text, sample.text)
   }
-  async fetchAndLoadGrammarFromUrlCommand(url) {
+  async fetchAndLoadGrammarFromUrlCommand(url, programUrl) {
     const willowBrowser = this.willowBrowser
     const grammar = await willowBrowser.httpGetUrl(url)
     const grammarProgram = new HandGrammarProgram(grammar.text)
     const rootNodeDef = grammarProgram.rootParserDefinition
-    const sample = rootNodeDef.getNode("example").childrenToString()
+    let sample = rootNodeDef.getNode("example").childrenToString()
+    if (programUrl) {
+      sample = await willowBrowser.httpGetUrl(programUrl)
+      sample = sample.text
+    }
     this._setGrammarAndCode(grammar.text, sample)
   }
   // TODO: ADD TESTS!!!!!
@@ -114,13 +118,14 @@ class DesignerApp extends AbstractTreeComponentParser {
     const deepLink = new TreeNode(decodeURIComponent(hash.substr(1)))
     const standard = deepLink.get("standard")
     const fromUrl = deepLink.get("url")
+    const programUrl = deepLink.get("programUrl")
     if (standard) {
       console.log("Loading standard from deep link....")
       await this.fetchAndLoadJtreeShippedLanguageCommand(standard)
       return true
     } else if (fromUrl) {
       console.log(`Loading grammar from '${fromUrl}'....`)
-      await this.fetchAndLoadGrammarFromUrlCommand(fromUrl)
+      await this.fetchAndLoadGrammarFromUrlCommand(fromUrl, programUrl)
       return true
     } else {
       const grammarCode = deepLink.getNode("grammar")

diff --git a/products/TreeNode.browser.js b/products/TreeNode.browser.js
@@ -2555,7 +2555,7 @@ TreeNode.iris = `sepal_length,sepal_width,petal_length,petal_width,species
 4.9,2.5,4.5,1.7,virginica
 5.1,3.5,1.4,0.2,setosa
 5,3.4,1.5,0.2,setosa`
-TreeNode.getVersion = () => "77.0.0"
+TreeNode.getVersion = () => "77.1.0"
 class AbstractExtendibleTreeNode extends TreeNode {
   _getFromExtended(firstWordPath) {
     const hit = this._getNodeFromExtended(firstWordPath)

diff --git a/products/TreeNode.js b/products/TreeNode.js
@@ -2545,7 +2545,7 @@ TreeNode.iris = `sepal_length,sepal_width,petal_length,petal_width,species
 4.9,2.5,4.5,1.7,virginica
 5.1,3.5,1.4,0.2,setosa
 5,3.4,1.5,0.2,setosa`
-TreeNode.getVersion = () => "77.0.0"
+TreeNode.getVersion = () => "77.1.0"
 class AbstractExtendibleTreeNode extends TreeNode {
   _getFromExtended(firstWordPath) {
     const hit = this._getNodeFromExtended(firstWordPath)

diff --git a/releaseNotes.scroll b/releaseNotes.scroll
@@ -4,6 +4,9 @@ startColumns 4
 
 Here's a list of the notable changes in JTree.
 
+# 77.1.0 2023-5-13
+- 🎉 TL Designer can now take a `programUrl` as well.
+
 # 77.0.0 2023-5-08
 - 🎉 `assembleFile` (formerly `evaluateImports`) is now faster by stripping Parser Definitions from assembled files, using them only in the returned parsers. (There are still many speed improvements to be had here)
 - ⚠️ BREAKING: The `TreeFileSystem.evaluateImports` method is now `TreeFileSystem.assembleFile`, and the interface of the returned object has changed.

diff --git a/treeNode/TreeNode.ts b/treeNode/TreeNode.ts
@@ -3043,7 +3043,7 @@ class TreeNode extends AbstractNode {
     return str ? indent + str.replace(/\n/g, indent) : ""
   }
 
-  static getVersion = () => "77.0.0"
+  static getVersion = () => "77.1.0"
 
   static fromDisk(path: string): TreeNode {
     const format = this._getFileFormat(path)