chore: rename Console to ConsoleAPI because it's just a wrapper a…

…nd simplify code

src/lib/components/console/HeadlessConsole.svelte

@@ -13,22 +13,22 @@
 </script>
 
 <script lang="ts">
-  import type { Console } from "$py/app/console";
+  import type { ConsoleAPI } from "$py/app/console";
 
   import { getPy } from "$lib/pyodide";
   import { onMount } from "svelte";
 
   export let ready = false;
   export let status: Status = "complete";
   export let log: Item[] = [];
-  export let pyConsole: Console;
+  export let pyConsole: ConsoleAPI;
   export let complete: AutoComplete | undefined;
 
   let loading = 0;
 
   onMount(async () => {
     const py = await getPy();
-    pyConsole = py.runPython("consoleModule.Console()");
+    pyConsole = py.runPython("consoleModule.ConsoleAPI()");
     complete = pyConsole.complete;
 
     pyConsole.console.stdout_callback = text => pushLog({ type: "out", text });

src/python/app/console.d.ts

@@ -1,19 +1,17 @@
-import type { PyProxy } from "pyodide/ffi";
-
-export class Result extends PyProxy {
+export class Result {
   status: "complete" | "incomplete" | "syntax-error";
   formatted_error?: string;
   async get_repr(): Promise<string | undefined>;
 }
 
-class PyodideConsole extends PyProxy {
+class EnhancedConsole {
   stdout_callback(out: string);
   stderr_callback(err: string);
   pop(): void;
 }
 
-export class Console {
+export class ConsoleAPI {
   complete(source: string): [string[], number];
-  console: PyodideConsole;
+  console: EnhancedConsole;
   async push(line: string): Result;
 }

src/python/app/console.py

@@ -71,7 +71,7 @@ def pop(self):
         self.fake_file.write_text(source[: source.rindex("\n", None, -1) + 1])
 
 
-class Console:
+class ConsoleAPI:
     @cached_property
     def builtins_layer(self):
         return {"__name__": "__main__", "__builtins__": builtins, "__doc__": None}
@@ -102,7 +102,6 @@ def __getitem__(self, key: str):
     def complete(self, source: str):
         return self.console.complete(source)
 
-    @js_api
     def push(self, line: str):
         res = Result(future := self.console.push(line))
 

src/routes/+page.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import type { AutoComplete, Item, Status } from "$lib/components/console/HeadlessConsole.svelte";
-  import type { Console } from "$py/app/console";
+  import type { ConsoleAPI } from "$py/app/console";
   import type { ClipboardEventHandler, KeyboardEventHandler } from "svelte/elements";
 
   import { Err, In, Out, Repr } from "$lib/components/console";
@@ -21,7 +21,7 @@
   let input = "";
   let inputRef: HTMLInputElement;
 
-  let pyConsole: Console;
+  let pyConsole: ConsoleAPI;
   let complete: AutoComplete;
   let status: Status;