Merge pull request #268 from TriliumNext/feature/server_esm_part4

Server ESM port: Fix Electron build

Author: eliandoran

electron.ts

@@ -9,7 +9,7 @@ import windowService from "./src/services/window.js";
 import tray from "./src/services/tray.js";
 
 // Prevent Trilium starting twice on first install and on uninstall for the Windows installer.
-if (await import('electron-squirrel-startup')) {
+if ((await import('electron-squirrel-startup')).default) {
   process.exit(0);
 }
 

spec-es6/attribute_parser.spec.ts

@@ -1,6 +1,6 @@
 import * as attributeParser from '../src/public/app/services/attribute_parser.js';
 
-import {describe, it, expect, execute} from './mini_test';
+import {describe, it, expect, execute} from './mini_test.js';
 
 describe("Lexing", () => {
     it("simple label", () => {

spec/etapi/notes.ts

@@ -1,5 +1,5 @@
 import crypto from "crypto";
-import etapi from "../support/etapi";
+import etapi from "../support/etapi.js";
 
 etapi.describeEtapi("notes", () => {
   it("create", async () => {

spec/search/becca_mocking.ts

@@ -4,7 +4,7 @@ import BAttribute from "../../src/becca/entities/battribute.js";
 import becca from "../../src/becca/becca.js";
 import randtoken from "rand-token";
 import SearchResult from "../../src/services/search/search_result.js";
-import { NoteType } from "../../src/becca/entities/rows";
+import { NoteType } from "../../src/becca/entities/rows.js";
 randtoken.generator({ source: "crypto" });
 
 function findNoteByTitle(

spec/search/parens.spec.ts

@@ -1,5 +1,5 @@
-import handleParens from "../../src/services/search/services/handle_parens";
-import { TokenStructure } from "../../src/services/search/services/types";
+import handleParens from "../../src/services/search/services/handle_parens.js";
+import { TokenStructure } from "../../src/services/search/services/types.js";
 
 describe("Parens handler", () => {
     it("handles parens", () => {

src/anonymize.ts

@@ -1,6 +1,6 @@
 import anonymizationService from "./services/anonymization.js";
 import sqlInit from "./services/sql_init.js";
-await import("./becca/entity_constructor");
+await import("./becca/entity_constructor.js");
 
 sqlInit.dbReady.then(async () => {
     try {

src/app.ts

@@ -15,8 +15,8 @@ import error_handlers from "./routes/error_handlers.js";
 import { startScheduledCleanup } from "./services/erase.js";
 import sql_init from "./services/sql_init.js";
 
-await import('./services/handlers');
-await import('./becca/becca_loader');
+await import('./services/handlers.js');
+await import('./becca/becca_loader.js');
 
 const app = express();
 
@@ -56,20 +56,20 @@ custom.register(app);
 error_handlers.register(app);
 
 // triggers sync timer
-await import("./services/sync");
+await import("./services/sync.js");
 
 // triggers backup timer
-await import('./services/backup');
+await import('./services/backup.js');
 
 // trigger consistency checks timer
-await import('./services/consistency_checks');
+await import('./services/consistency_checks.js');
 
-await import('./services/scheduler');
+await import('./services/scheduler.js');
 
 startScheduledCleanup();
 
 if (utils.isElectron()) {
-    (await import('@electron/remote/main')).initialize();
+    (await import('@electron/remote/main/index.js')).initialize();
 }
 
 export default app;

src/becca/becca-interface.ts

@@ -8,7 +8,7 @@ import BAttribute from "./entities/battribute.js";
 import BBranch from "./entities/bbranch.js";
 import BRevision from "./entities/brevision.js";
 import BAttachment from "./entities/battachment.js";
-import { AttachmentRow, RevisionRow } from './entities/rows';
+import { AttachmentRow, BlobRow, RevisionRow } from './entities/rows.js';
 import BBlob from "./entities/bblob.js";
 import BRecentNote from "./entities/brecent_note.js";
 import AbstractBeccaEntity from "./entities/abstract_becca_entity.js";
@@ -199,7 +199,7 @@ export default class Becca {
             return null;
         }
 
-        const row = sql.getRow<BBlob | null>("SELECT *, LENGTH(content) AS contentLength FROM blobs WHERE blobId = ?", [entity.blobId]);
+        const row = sql.getRow<BlobRow | null>("SELECT *, LENGTH(content) AS contentLength FROM blobs WHERE blobId = ?", [entity.blobId]);
         return row ? new BBlob(row) : null;
     }
 

src/becca/becca.ts

@@ -1,6 +1,6 @@
 "use strict";
 
-import Becca from "./becca-interface";
+import Becca from "./becca-interface.js";
 
 const becca = new Becca();
 

src/becca/becca_loader.ts

@@ -12,7 +12,7 @@ import BOption from "./entities/boption.js";
 import BEtapiToken from "./entities/betapi_token.js";
 import cls from "../services/cls.js";
 import entityConstructor from "../becca/entity_constructor.js";
-import { AttributeRow, BranchRow, EtapiTokenRow, NoteRow, OptionRow } from './entities/rows';
+import { AttributeRow, BranchRow, EtapiTokenRow, NoteRow, OptionRow } from './entities/rows.js';
 import AbstractBeccaEntity from "./entities/abstract_becca_entity.js";
 import options_init from "../services/options_init.js";
 import ws from "../services/ws.js";