moved treesitter loading into own module

SQUASHED: AUTO-COMMIT-demos-tree-sitter-index.md,AUTO-COMMIT-src-client-domain-code.js,AUTO-COMMIT-src-client-tree-sitter.js,AUTO-COMMIT-src-components-tools-domain-code-explorer.js,AUTO-COMMIT-src-components-tools-lively-ast-domain-object-inspector.js,AUTO-COMMIT-src-components-tools-lively-ast-inspector.js,AUTO-COMMIT-src-components-tools-lively-ast-treesitter-inspector.js,
LivelyKernel · Sep 14, 2023 · 0d20467 · 0d20467
1 parent d7de01d
commit 0d20467
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 31 deletions.
diff --git a/demos/tree-sitter/index.md b/demos/tree-sitter/index.md
@@ -4,17 +4,7 @@
 &#128522;
 
 <script>
-await lively.loadJavaScriptThroughDOM("treeSitter", lively4url + "/src/external/tree-sitter/tree-sitter.js")
-
-
-const Parser = window.TreeSitter;
-await Parser.init()
-
-const parser = new Parser;
-
-
-const JavaScript = await Parser.Language.load(lively4url + "/src/external/tree-sitter/tree-sitter-javascript.wasm");
-
+import {Parser, JavaScript} from "src/client/tree-sitter.js"
 
 parser.setLanguage(JavaScript);
 

diff --git a/src/client/domain-code.js b/src/client/domain-code.js
@@ -12,13 +12,7 @@ MD*/
 import tinycolor from 'src/external/tinycolor.js';
 
 
-// #Copy from /src/components/tools/lively-ast-treesitter-inspector.js
-// #TODO extract... ?
-await lively.loadJavaScriptThroughDOM("treeSitter", lively4url + "/src/external/tree-sitter/tree-sitter.js")
-const Parser = window.TreeSitter;
-await Parser.init()
-const JavaScript = await Parser.Language.load(lively4url + "/src/external/tree-sitter/tree-sitter-javascript.wasm");
-
+import {Parser, JavaScript} from "src/client/tree-sitter.js"
 
 import {loc} from "utils"
 

diff --git a/src/client/tree-sitter.js b/src/client/tree-sitter.js
@@ -0,0 +1,13 @@
+
+// #Copy from /src/components/tools/lively-ast-treesitter-inspector.js
+// #TODO extract... ?
+await lively.loadJavaScriptThroughDOM("treeSitter", lively4url + "/src/external/tree-sitter/tree-sitter.js")
+
+export const Parser = window.TreeSitter;
+
+await Parser.init()
+export const JavaScript = await Parser.Language.load(lively4url + "/src/external/tree-sitter/tree-sitter-javascript.wasm");
+
+
+
+
diff --git a/src/components/tools/lively-ast-domain-object-inspector.js b/src/components/tools/lively-ast-domain-object-inspector.js
@@ -2,13 +2,8 @@ import AstInspector from "./lively-ast-inspector.js"
 
 import {TreeSitterDomainObject, LetSmilyReplacementDomainObject, ConstSmilyReplacementDomainObject} from "src/client/domain-code.js"
 
-await lively.loadJavaScriptThroughDOM("treeSitter", lively4url + "/src/external/tree-sitter/tree-sitter.js")
-
-const Parser = window.TreeSitter;
-await Parser.init()
-
-const JavaScript = await Parser.Language.load(lively4url + "/src/external/tree-sitter/tree-sitter-javascript.wasm");
 
+import {Parser, JavaScript} from "src/client/tree-sitter.js"
 
 import LivelyCodeMirrorCodeProvider from 'src/components/widgets/lively-code-mirror-code-provider.js';
 

diff --git a/src/components/tools/lively-ast-inspector.js b/src/components/tools/lively-ast-inspector.js
@@ -467,6 +467,7 @@ export default class AstInspector extends Morph {
   }
 
   setViewState(state) {
+    if (!state) return
     return this.applyViewState(this.container.childNodes[0], state)
   }
 
@@ -493,6 +494,7 @@ export default class AstInspector extends Morph {
   }
 
   captureViewState(node) {
+    if (!node) return
     const result = {
       pattern: node.pattern,
       children: [],

diff --git a/src/components/tools/lively-ast-treesitter-inspector.js b/src/components/tools/lively-ast-treesitter-inspector.js
@@ -1,12 +1,6 @@
 import AstInspector from "./lively-ast-inspector.js"
 
-await lively.loadJavaScriptThroughDOM("treeSitter", lively4url + "/src/external/tree-sitter/tree-sitter.js")
-
-const Parser = window.TreeSitter;
-await Parser.init()
-
-const JavaScript = await Parser.Language.load(lively4url + "/src/external/tree-sitter/tree-sitter-javascript.wasm");
-
+import {Parser, JavaScript} from "src/client/tree-sitter.js"
 
 import LivelyCodeMirrorCodeProvider from 'src/components/widgets/lively-code-mirror-code-provider.js';