only import G6 types

electron/main/index.ts

@@ -45,8 +45,8 @@ const url = process.env.VITE_DEV_SERVER_URL;
 const indexHtml = join(process.env.DIST, "index.html");
 const windows: Workspace[] = [];
 
-let buildProject: string;
-let buildOutput: string;
+let buildProject: string | undefined;
+let buildOutput: string | undefined;
 let buildHelp: boolean = false;
 
 for (let i = 0; i < argv.length; i++) {
@@ -79,7 +79,41 @@ if (buildOutput || buildProject || buildHelp) {
     printHelp();
     app.exit(0);
   }
-  console.log("todo: build output");
+  // try {
+  //   let hasError = false;
+  //   const project = Path.posixPath(buildProject!);
+  //   const buildDir = Path.posixPath(buildOutput!);
+  //   if (!project.endsWith(".b3-workspace")) {
+  //     throw new Error(`'${project}' is not a workspace`);
+  //   }
+  //   const workdir = Path.dirname(project);
+  //   b3util.initWorkdir(workdir, (msg) => {
+  //     console.error(msg);
+  //   });
+  //   for (const path of Path.ls(Path.dirname(project), true)) {
+  //     if (path.endsWith(".json")) {
+  //       const buildpath = buildDir + "/" + path.substring(workdir.length + 1);
+  //       const treeModel = b3util.createBuildData(path);
+  //       if (treeModel && treeModel.export === false) {
+  //         console.log("skip:", buildpath);
+  //         continue;
+  //       }
+  //       console.log("build:", buildpath);
+  //       if (!b3util.checkNodeData(treeModel?.root)) {
+  //         hasError = true;
+  //       }
+  //       fs.mkdirSync(Path.dirname(buildpath), { recursive: true });
+  //       fs.writeFileSync(buildpath, JSON.stringify(treeModel, null, 2));
+  //     }
+  //   }
+  //   if (hasError) {
+  //     console.error("build failed");
+  //   } else {
+  //     console.log("build completed");
+  //   }
+  // } catch (error) {
+  //   console.error("build failed");
+  // }
   app.exit(0);
 }
 
@@ -200,7 +234,7 @@ ipcMain.handle("open-win", (event, arg: string | undefined) => {
     }
 
     workspace = windows.find((v) => v.window.webContents.id === event.sender.id);
-    if (!workspace.projectPath) {
+    if (workspace && !workspace.projectPath) {
       workspace.projectPath = arg;
       workspace.window.webContents.send("open-project", arg);
       return;

electron/main/update.ts

@@ -1,73 +1,76 @@
-import { app, ipcMain } from 'electron'
-import {
-  type ProgressInfo,
-  type UpdateDownloadedEvent,
-  autoUpdater
-} from 'electron-updater'
+import { app, ipcMain } from "electron";
+import { type ProgressInfo, type UpdateDownloadedEvent, autoUpdater } from "electron-updater";
 
 export function update(win: Electron.BrowserWindow) {
-
   // When set to false, the update download will be triggered through the API
-  autoUpdater.autoDownload = false
-  autoUpdater.disableWebInstaller = false
-  autoUpdater.allowDowngrade = false
+  autoUpdater.autoDownload = false;
+  autoUpdater.disableWebInstaller = false;
+  autoUpdater.allowDowngrade = false;
 
   // start check
-  autoUpdater.on('checking-for-update', function () { })
+  autoUpdater.on("checking-for-update", function () {});
   // update available
-  autoUpdater.on('update-available', (arg) => {
-    win.webContents.send('update-can-available', { update: true, version: app.getVersion(), newVersion: arg?.version })
-  })
+  autoUpdater.on("update-available", (arg) => {
+    win.webContents.send("update-can-available", {
+      update: true,
+      version: app.getVersion(),
+      newVersion: arg?.version,
+    });
+  });
   // update not available
-  autoUpdater.on('update-not-available', (arg) => {
-    win.webContents.send('update-can-available', { update: false, version: app.getVersion(), newVersion: arg?.version })
-  })
+  autoUpdater.on("update-not-available", (arg) => {
+    win.webContents.send("update-can-available", {
+      update: false,
+      version: app.getVersion(),
+      newVersion: arg?.version,
+    });
+  });
 
   // Checking for updates
-  ipcMain.handle('check-update', async () => {
+  ipcMain.handle("check-update", async () => {
     if (!app.isPackaged) {
-      const error = new Error('The update feature is only available after the package.')
-      return { message: error.message, error }
+      const error = new Error("The update feature is only available after the package.");
+      return { message: error.message, error };
     }
 
     try {
-      return await autoUpdater.checkForUpdatesAndNotify()
+      return await autoUpdater.checkForUpdatesAndNotify();
     } catch (error) {
-      return { message: 'Network error', error }
+      return { message: "Network error", error };
     }
-  })
+  });
 
   // Start downloading and feedback on progress
-  ipcMain.handle('start-download', (event) => {
+  ipcMain.handle("start-download", (event) => {
     startDownload(
       (error, progressInfo) => {
         if (error) {
           // feedback download error message
-          event.sender.send('update-error', { message: error.message, error })
+          event.sender.send("update-error", { message: error.message, error });
         } else {
           // feedback update progress message
-          event.sender.send('download-progress', progressInfo)
+          event.sender.send("download-progress", progressInfo);
         }
       },
       () => {
         // feedback update downloaded message
-        event.sender.send('update-downloaded')
+        event.sender.send("update-downloaded");
       }
-    )
-  })
+    );
+  });
 
   // Install now
-  ipcMain.handle('quit-and-install', () => {
-    autoUpdater.quitAndInstall(false, true)
-  })
+  ipcMain.handle("quit-and-install", () => {
+    autoUpdater.quitAndInstall(false, true);
+  });
 }
 
 function startDownload(
   callback: (error: Error | null, info: ProgressInfo) => void,
-  complete: (event: UpdateDownloadedEvent) => void,
+  complete: (event: UpdateDownloadedEvent) => void
 ) {
-  autoUpdater.on('download-progress', info => callback(null, info))
-  autoUpdater.on('error', error => callback(error, null))
-  autoUpdater.on('update-downloaded', complete)
-  autoUpdater.downloadUpdate()
+  autoUpdater.on("download-progress", (info) => callback(null, info));
+  autoUpdater.on("error", (error) => callback(error, null!));
+  autoUpdater.on("update-downloaded", complete);
+  autoUpdater.downloadUpdate();
 }