merge branch 'main' into sylvie/preview-dir

frontend/app/store/global.ts

@@ -8,7 +8,7 @@ import * as rxjs from "rxjs";
 import type { WailsEvent } from "@wailsio/runtime/types/events";
 import { Events } from "@wailsio/runtime";
 import { produce } from "immer";
-import * as BlockService from "@/bindings/pkg/service/blockservice/BlockService";
+import { BlockService } from "@/bindings/blockservice";
 
 const globalStore = jotai.createStore();
 

frontend/app/view/preview.tsx

@@ -5,7 +5,7 @@ import * as React from "react";
 import * as jotai from "jotai";
 import { atoms, blockDataMap, useBlockAtom } from "@/store/global";
 import { Markdown } from "@/element/markdown";
-import * as FileService from "@/bindings/pkg/service/fileservice/FileService";
+import { FileService, FileInfo, FullFile } from "@/bindings/fileservice";
 import * as util from "@/util/util";
 import { CenteredDiv } from "../element/quickelems";
 import { DirectoryTable } from "@/element/directorytable";

frontend/app/view/term.tsx

@@ -7,7 +7,7 @@ import { Terminal } from "@xterm/xterm";
 import type { ITheme } from "@xterm/xterm";
 import { FitAddon } from "@xterm/addon-fit";
 import { Button } from "@/element/button";
-import * as BlockService from "@/bindings/pkg/service/blockservice/BlockService";
+import { BlockService } from "@/bindings/blockservice";
 import { getBlockSubject } from "@/store/global";
 import { base64ToArray } from "@/util/util";
 

frontend/app/workspace/workspace.tsx

@@ -7,7 +7,7 @@ import { TabContent } from "@/app/tab/tab";
 import { clsx } from "clsx";
 import { atoms, addBlockIdToTab, blockDataMap } from "@/store/global";
 import { v4 as uuidv4 } from "uuid";
-import * as BlockService from "@/bindings/pkg/service/blockservice/BlockService";
+import { BlockService } from "@/bindings/blockservice";
 
 import "./workspace.less";
 
@@ -49,7 +49,7 @@ function Widgets() {
 
     async function createBlock(blockDef: BlockDef) {
         const rtOpts = { termsize: { rows: 25, cols: 80 } };
-        const rtnBlock: BlockData = await BlockService.CreateBlock(blockDef, rtOpts);
+        const rtnBlock: BlockData = (await BlockService.CreateBlock(blockDef, rtOpts)) as BlockData;
         const newBlockAtom = jotai.atom(rtnBlock);
         blockDataMap.set(rtnBlock.blockid, newBlockAtom);
         addBlockIdToTab(activeTabId, rtnBlock.blockid);

frontend/types/custom.d.ts

@@ -33,21 +33,6 @@ declare global {
         files?: FileDef[];
         meta?: MetaDataType;
     };
-
-    type FileInfo = {
-        path: string;
-        notfound: boolean;
-        size: number;
-        mode: number;
-        modtime: number;
-        isdir: boolean;
-        mimetype: string;
-    };
-
-    type FullFile = {
-        info: FileInfo;
-        data64: string;
-    };
 }
 
 export {};