server-ts: Port share/shaca/shaca

src/share/content_renderer.js

@@ -1,5 +1,5 @@
 const { JSDOM } = require("jsdom");
-const shaca = require('./shaca/shaca.js');
+const shaca = require('./shaca/shaca');
 const assetPath = require('../services/asset_path');
 const shareRoot = require('./share_root');
 const escapeHtml = require('escape-html');

src/share/routes.js

@@ -3,7 +3,7 @@ const path = require('path');
 const safeCompare = require('safe-compare');
 const ejs = require("ejs");
 
-const shaca = require('./shaca/shaca.js');
+const shaca = require('./shaca/shaca');
 const shacaLoader = require('./shaca/shaca_loader.js');
 const shareRoot = require('./share_root');
 const contentRenderer = require('./content_renderer.js');

src/share/shaca/entities/abstract_shaca_entity.ts

@@ -1,10 +1,11 @@
-let shaca: any;
+import Shaca from "../shaca-interface";
+
+let shaca: Shaca;
 
 class AbstractShacaEntity {
-    // FIXME: Use right data type once we convert Shaca as well.
+    get shaca(): Shaca {
-    get shaca(): any {
         if (!shaca) {
-            shaca = require('../shaca.js');
+            shaca = require('../shaca');
         }
 
         return shaca;

src/share/shaca/entities/snote.ts

@@ -32,7 +32,7 @@ class SNote extends AbstractShacaEntity {
     private __attributeCache: SAttribute[] | null;
     private __inheritableAttributeCache: SAttribute[] | null;
     targetRelations: SAttribute[];
-    private attachments: SAttachment[];
+    attachments: SAttachment[];
 
     constructor([noteId, title, type, mime, blobId, utcDateModified, isProtected]: NoteRow) {
         super();

src/share/shaca/shaca-interface.ts

@@ -1,45 +1,49 @@
-"use strict";
+import SAttachment = require("./entities/sattachment");
+import SAttribute = require("./entities/sattribute");
+import SBranch = require("./entities/sbranch");
+import SNote = require("./entities/snote");
+
+export default class Shaca {
+
+    notes!: Record<string, SNote>;
+    branches!: Record<string, SBranch>;
+    childParentToBranch!: Record<string, SBranch>;
+    private attributes!: Record<string, SAttribute>;
+    attachments!: Record<string, SAttachment>;
+    private aliasToNote!: Record<string, SNote>;
+    private shareRootNote!: SNote | null;
+    /** true if the index of all shared subtrees is enabled */
+    private shareIndexEnabled!: boolean;
+    private loaded!: boolean;
 
-class Shaca {
     constructor() {
         this.reset();
     }
 
     reset() {
-        /** @type {Object.<String, SNote>} */
         this.notes = {};
-        /** @type {Object.<String, SBranch>} */
         this.branches = {};
-        /** @type {Object.<String, SBranch>} */
         this.childParentToBranch = {};
-        /** @type {Object.<String, SAttribute>} */
         this.attributes = {};
-        /** @type {Object.<String, SAttachment>} */
         this.attachments = {};
-        /** @type {Object.<String, SNote>} */
         this.aliasToNote = {};
 
-        /** @type {SNote|null} */
         this.shareRootNote = null;
 
-        /** @type {boolean} true if the index of all shared subtrees is enabled */
         this.shareIndexEnabled = false;
 
         this.loaded = false;
     }
 
-    /** @returns {SNote|null} */
+    getNote(noteId: string) {
-    getNote(noteId) {
         return this.notes[noteId];
     }
 
-    /** @returns {boolean} */
+    hasNote(noteId: string) {
-    hasNote(noteId) {
         return noteId in this.notes;
     }
 
-    /** @returns {SNote[]} */
+    getNotes(noteIds: string[], ignoreMissing = false) {
-    getNotes(noteIds, ignoreMissing = false) {
         const filteredNotes = [];
 
         for (const noteId of noteIds) {
@@ -59,27 +63,23 @@ class Shaca {
         return filteredNotes;
     }
 
-    /** @returns {SBranch|null} */
+    getBranch(branchId: string) {
-    getBranch(branchId) {
         return this.branches[branchId];
     }
 
-    /** @returns {SBranch|null} */
+    getBranchFromChildAndParent(childNoteId: string, parentNoteId: string) {
-    getBranchFromChildAndParent(childNoteId, parentNoteId) {
         return this.childParentToBranch[`${childNoteId}-${parentNoteId}`];
     }
 
-    /** @returns {SAttribute|null} */
+    getAttribute(attributeId: string) {
-    getAttribute(attributeId) {
         return this.attributes[attributeId];
     }
 
-    /** @returns {SAttachment|null} */
+    getAttachment(attachmentId: string) {
-    getAttachment(attachmentId) {
         return this.attachments[attachmentId];
     }
 
-    getEntity(entityName, entityId) {
+    getEntity(entityName: string, entityId: string) {
         if (!entityName || !entityId) {
             return null;
         }
@@ -91,10 +91,6 @@ class Shaca {
                     .replace('_', '')
         );
 
-        return this[camelCaseEntityName][entityId];
+        return (this as any)[camelCaseEntityName][entityId];
     }
 }
-
-const shaca = new Shaca();
-
-module.exports = shaca;

src/share/shaca/shaca.ts

@@ -0,0 +1,7 @@
+"use strict";
+
+import Shaca from "./shaca-interface";
+
+const shaca = new Shaca();
+
+export = shaca;

src/share/shaca/shaca_loader.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const sql = require('../sql');
-const shaca = require('./shaca.js');
+const shaca = require('./shaca');
 const log = require('../../services/log');
 const SNote = require('./entities/snote');
 const SBranch = require('./entities/sbranch');