Merge branch 'gh-pages' of https://github.com/LivelyKernel/lively4-core…

… into gh-pages

demos/contextjs/showfocuslayer.md

@@ -0,0 +1,21 @@
+# ShowFocus Layer
+
+And I wrote it again.... Because I did not look for <edit://demos/contextjs/showfocuslayer.js>  first
+
+```js
+import * as cop  from "src/client/ContextJS/src/contextjs.js";
+
+cop.layer(window, "ShowFocus").refineClass(HTMLElement, {
+
+    focus(...args) {
+      lively.showElement(this)
+      console.log("focus " + this, lively.stack())
+      return cop.proceed(...args)
+    }
+
+})
+
+ShowFocus.beGlobal()
+
+ShowFocus.beNotGlobal()
+```

demos/hello.js

@@ -23,4 +23,3 @@ function count(list) {
 }
 
 var result = count([1,2,3,2345,234,234,23,4,23,4])
-

demos/javascript/a.js

@@ -1,3 +1,21 @@
 // a.js
 "disable deepeval"
-export const value = 44;
+export const value = 44;
+
+
+function hello2() {
+  var a = 3 + 4
+}
+
+hello2()
+
+
+
+class Foo {
+
+
+  hello2() {
+    var a = 3 + 4
+  }
+
+}

demos/markdown/test.md

@@ -10,7 +10,20 @@ import {AudioRecorder} from "src/client/audio.js"
 
 <script>
 
-
 var foo = <span>x</span>, b = 3;
 
+const x 
+
+
+class Foo {
+
+  async bla() {
+
+  }
+
+  bar() {
+
+  }
+}
+
 </script>

demos/openai/functions.md

@@ -14,6 +14,7 @@
     getCurrentDateTime: getCurrentDateTime,
   };
 
+
   async function handleFunctionCall(functionName, args) {
     if (functions[functionName]) {
       return functions[functionName](...args);

demos/openai/streaming.md

@@ -8,7 +8,7 @@
     { "role": "user", "content":  [
       {
         "type": "text",
-        "text": "Tell me a funny story about walking and talking trees!"
+        "text": "Tell me a funny story about walking and talking trees based on the disc world!"
       }
     ]}
   ]

demos/typescript/a.js

@@ -0,0 +1,6 @@
+
+
+ function foo() {
+
+  return "hello"
+}

demos/typescript/a.md

@@ -0,0 +1,10 @@
+
+<script>
+
+
+import foo from "./a.ts"
+
+
+foo()
+
+</script>

demos/typescript/a.ts

@@ -0,0 +1,5 @@
+console.log("LOAD a.ts")
+
+function foo() { 
+  return "hello"
+}

demos/typescript/b.js

@@ -0,0 +1,6 @@
+import * as a from "./a.ts"
+
+export default function foo() {
+
+  return a.foo()
+}

demos/typescript/c.ts

@@ -0,0 +1,5 @@
+lively.notify("LOAD c.ts")
+
+export default function foo(s : string) : string { 
+  return "hello " + s
+}

demos/typescript/index.md

@@ -0,0 +1,8 @@
+# TypeScript Support in Lively
+
+- [X] edit modules with syntax highlighting 
+- [X] load modules via SystemJS
+- [X] unload/reload modules while editing
+- [ ] linting / show hints in sidebar
+- [ ] lsb like server support
+  - https://discuss.codemirror.net/t/codemirror-6-and-typescript-lsp/3398

src/client/debug.js

@@ -1,4 +1,4 @@
-import {Logging} from "src/client/morphic/component-loader.js"
+// import {Logging} from "src/client/morphic/component-loader.js"
 
 var debugCounterByClass = new Map()
 var debugPrintMap = new WeakMap() // obj -> string
@@ -9,18 +9,23 @@ var debugPrintReverseMap = new Map() // string -> obj
 
 /*globals WeakRef */
 
-export {Logging}
+// export {Logging}
 
 export function debugPrint(element) {
+  if (!element) return
   var print = debugPrintMap.get(element)
-  if (!print) {
+  if (!print  && element  && element.constructor) {
     var className = element.constructor.name
     var counter = debugCounterByClass.get(className) || 0
     counter++
     debugCounterByClass.set(className, counter)
     print = className + counter
-    debugPrintMap.set(element, print)
-    debugSet(print, element)
+    try {
+      debugPrintMap.set(element, print)
+      debugSet(print, element)
+    } catch(e) {
+      return "" + element
+    }
   }
   return print
 }
@@ -42,15 +47,85 @@ export function debugSet(name, obj) {
 }
 
 
-if (false) {
-  Logging.enable()
+// if (false) {
+//   Logging.enable()
+
+//   Logging.setLog((element, ...args) => {
 
-  Logging.setLog((element, ...args) => {
+//     if (element  && element instanceof HTMLElement ) {
+//       console.log(debugPrint(element), ...args)
+//     }
+//   })  
+// }
+
+export function printStack(offset=2) {
+  return lively.stack().frames.map(ea => ea._desc.replace(lively4url,"")).slice(offset,-1).join("\n")
+}
 
-    if (element  && element instanceof HTMLElement ) {
-      console.log(debugPrint(element), ...args)
+
+export function busyLogFocus(forTime=10, start, lastFocusedElement) {
+  start = start || performance.now()
+  let element = lively.activeElement()
+
+  let delta =  performance.now() - start
+  if (delta < forTime) {
+    let focused = lively.activeElement()
+    if (focused !== lastFocusedElement) {
+      console.log(Math.round(performance.now() - window.timeStart) + " active " + debugPrint(focused))
     }
-  })  
+
+
+    setTimeout(() => busyLogFocus(forTime, start, focused), 0)
+  }
+
 }
 
+/*MD # Some Interesting Debug Scripts... MD*/
+
+/*
+
+// TODO make funcition for it
+
+lively.removeEventListener("devfocus",  document.body)
+                        
+lively.addEventListener("devfocus", document.body, "focusin", (evt) => {
+  console.log(Math.round(performance.now() - window.timeStart)  + "ms focus in " + debugPrint(evt.target) + " active " + debugPrint(lively.activeElement())  + "\n"+ printStack(3) )
+})
+
+
+lively.addEventListener("devfocus", document.body, "focusout", (evt) => {
+  console.log(Math.round(performance.now() - window.timeStart) + "ms focus out " + debugPrint(evt.target) + " active " + debugPrint(lively.activeElement()) + "\n" + printStack(3))
+})
+
+
+*/
+
+/*
+
+import * as cop  from "src/client/ContextJS/src/contextjs.js";
+
+
+cop.layer(window, "ShowFocus").refineClass(HTMLElement, {
+
+    focus(...args) {
+      console.log(( performance.now() - window.timeStart) + " " + lively.debug.debugPrint(this) + ".focus" + lively.stack().frames.map(ea => ea._desc.replace(lively4url,"")).slice(4,-1).join("\n"))
+      return cop.proceed(...args)
+    },
+
+    blur(...args) {
+      console.log(( performance.now() - window.timeStart) +  " " + lively.debug.debugPrint(this) + ".blur" + lively.stack().frames.map(ea => ea._desc.replace(lively4url,"")).slice(4,-1).join("\n"))
+
+      return cop.proceed(...args)
+    }
+
+  
+})
+
+ShowFocus.beGlobal()
+
+ShowFocus.beNotGlobal()
+
+*/
+
+
 

src/client/fileindex.js

@@ -750,7 +750,7 @@ MD*/
       modified: modified
     }
 
-    if (name.match(/\.((css)|(js)|(md)|(txt)|(tex)|(bib)|(x?html)|(note))$/)) {
+    if (name.match(/\.((css)|(js)|(mjs)|(ts)|(md)|(txt)|(tex)|(bib)|(x?html)|(note))$/)) {
       if ((size < MAX_FILESIZE) || name.match(/\.((bib))$/) ) {
         let response = await fetch(url, {
           method: "GET",

src/client/lively.js

@@ -44,6 +44,8 @@ import windows from "src/components/widgets/lively-window.js";
 
 import events from "src/client/morphic/events.js";
 
+import * as debug from "src/client/debug.js"
+
 let $ = window.$; // known global variables.
 
 /*globals that*/
@@ -57,6 +59,7 @@ var debugLogHightlights = new WeakMap();
 // c) This indirection is also needed to let old events listeners signal to code in current modules
 var exportmodules = ["preferences", "files", "keys", "paths", "html", "reflection", "components", "persistence",
 // "color",
+"debug",
 "focalStorage", "authGithub", "authDropbox", "authGoogledrive", "contextmenu", "windows"];
 
 class LivelyNotification {
@@ -2230,7 +2233,7 @@ export default class Lively {
   // same as element.focus({ preventScroll : true}); ?
   static focusWithoutScroll(element) {
     if (!element) return;
-
+    
     //console.log("focusWithoutScroll " + element, lively.stack().toString())
     var scrollTop = document.scrollingElement.scrollTop;
     var scrollLeft = document.scrollingElement.scrollLeft;