Merge branch 'feature/typescript_backend_2' into feature/typescript_backend_3

src/becca/becca_loader.ts

@@ -183,7 +183,7 @@ function noteUpdated(entityRow: NoteRow) {
     const note = becca.notes[entityRow.noteId];
 
     if (note) {
-        // FIXME, this wouldn't have worked in the original implementation since the variable was named __flatTextCache.
+        // TODO, this wouldn't have worked in the original implementation since the variable was named __flatTextCache.
         // type / mime could have been changed, and they are present in flatTextCache
         note.__flatTextCache = null;
     }

src/becca/entities/abstract_becca_entity.ts

@@ -90,21 +90,21 @@ abstract class AbstractBeccaEntity<T extends AbstractBeccaEntity<T>> {
     }
 
     hasStringContent(): boolean {
-        // FIXME: Not sure why some entities don't implement it.
+        // TODO: Not sure why some entities don't implement it.
         return true;
     }
 
     abstract getPojo(): {};
 
     get isDeleted(): boolean {
-        // FIXME: Not sure why some entities don't implement it.
+        // TODO: Not sure why some entities don't implement it.
         return false;
     }
 
     /**
      * Saves entity - executes SQL, but doesn't commit the transaction on its own
      */
-    // FIXME: opts not used but called a few times, maybe should be used by derived classes or passed to beforeSaving.
+    // TODO: opts not used but called a few times, maybe should be used by derived classes or passed to beforeSaving.
     save(opts?: {}): this {
         const constructorData = (this.constructor as unknown as ConstructorData<T>);
         const entityName = constructorData.entityName;

src/becca/entities/battachment.ts

@@ -15,7 +15,7 @@ const attachmentRoleToNoteTypeMapping = {
 };
 
 interface ContentOpts {
-    // FIXME: Found in bnote.ts, to check if it's actually used and not a typo.
+    // TODO: Found in bnote.ts, to check if it's actually used and not a typo.
     forceSave?: boolean;
 
     /** will also save this BAttachment entity */
@@ -135,7 +135,7 @@ class BAttachment extends AbstractBeccaEntity<BAttachment> {
     }
 
     convertToNote(): { note: BNote, branch: BBranch } {
-        // FIXME: can this ever be "search"?
+        // TODO: can this ever be "search"?
         if (this.type as string === 'search') {
             throw new Error(`Note of type search cannot have child notes`);
         }

src/becca/entities/bblob.ts

@@ -1,6 +1,6 @@
 import { BlobRow } from "./rows";
 
-// FIXME: Why this does not extend the abstract becca?
+// TODO: Why this does not extend the abstract becca?
 class BBlob {
     static get entityName() { return "blobs"; }
     static get primaryKeyName() { return "blobId"; }

src/becca/entities/bnote.ts

@@ -899,7 +899,7 @@ class BNote extends AbstractBeccaEntity<BNote> {
             const {searchResultNoteIds} = searchService.searchFromNote(this);
 
             const becca = this.becca;
-            return (searchResultNoteIds as string[])    // FIXME: remove cast once search is converted
+            return (searchResultNoteIds as string[])    // TODO: remove cast once search is converted
                 .map(resultNoteId => becca.notes[resultNoteId])
                 .filter(note => !!note);
         }

src/becca/entities/brevision.ts

@@ -88,7 +88,7 @@ class BRevision extends AbstractBeccaEntity<BRevision> {
      *
      * This is the same approach as is used for Note's content.
      */
-    // FIXME: initial declaration included Buffer, but everywhere it's treated as a string.
+    // TODO: initial declaration included Buffer, but everywhere it's treated as a string.
     getContent(): string {
         return this._getContent() as string;
     }

src/becca/entities/rows.ts

@@ -1,4 +1,4 @@
-// FIXME: Booleans should probably be numbers instead (as SQLite does not have booleans.);
+// TODO: Booleans should probably be numbers instead (as SQLite does not have booleans.);
 
 export interface AttachmentRow {
     attachmentId?: string;

src/services/auth.ts

@@ -10,7 +10,7 @@ import passwordService = require('./encryption/password');
 
 const noAuthentication = config.General && config.General.noAuthentication === true;
 
-// FIXME: We are using custom types for request & response because couldn't extract those pesky express types.
+// TODO: We are using custom types for request & response because couldn't extract those pesky express types.
 interface Request {
     method: string;
     path: string;

src/services/encryption/password.ts

@@ -31,7 +31,7 @@ function changePassword(currentPassword: string, newPassword: string) {
         const newPasswordVerificationKey = utils.toBase64(myScryptService.getVerificationHash(newPassword));
         
         if (decryptedDataKey) {
-            // FIXME: what should happen if the decrypted data key is null?
+            // TODO: what should happen if the decrypted data key is null?
             passwordEncryptionService.setDataKey(newPassword, decryptedDataKey);
         }
 

src/services/notes.ts

@@ -762,7 +762,7 @@ function updateNoteData(noteId: string, content: string, attachments: BAttachmen
         const existingAttachmentsByTitle = utils.toMap(note.getAttachments({includeContentLength: false}), 'title');
 
         for (const attachment of attachments) {
-            // FIXME: The content property was extracted directly instead of `getContent`. To investigate.
+            // TODO: The content property was extracted directly instead of `getContent`. To investigate.
             const {attachmentId, role, mime, title, position} = attachment;
             const content = attachment.getContent();
 
@@ -835,7 +835,7 @@ function undeleteBranch(branchId: string, deleteId: string, taskContext: TaskCon
 
         for (const attributeRow of attributeRows) {
             // relation might point to a note which hasn't been undeleted yet and would thus throw up
-            // FIXME: skipValidation is not used.
+            // TODO: skipValidation is not used.
             new BAttribute(attributeRow).save({skipValidation: true});
         }
 
@@ -1015,7 +1015,7 @@ function duplicateSubtreeInner(origNote: BNote, origBranch: BBranch, newParentNo
             }
 
             // the relation targets may not be created yet, the mapping is pre-generated
-            // FIXME: This used to be `attr.save({skipValidation: true});`, but skipValidation is in beforeSaving.
+            // TODO: This used to be `attr.save({skipValidation: true});`, but skipValidation is in beforeSaving.
             attr.save();
         }
 

src/services/search/expressions/order_by_and_limit.ts

@@ -39,7 +39,6 @@ class OrderByAndLimitExp extends Expression {
 
     execute(inputNoteSet: NoteSet, executionContext: {}, searchContext: SearchContext) {
         if (!this.subExpression) {
-            // FIXME: who is setting the subexpression?
             throw new Error("Missing subexpression");
         }
 

src/services/sync_mutex.ts

@@ -6,7 +6,7 @@
 const Mutex = require('async-mutex').Mutex;
 const instance = new Mutex();
 
-async function doExclusively<T>(func: () => void) {
+async function doExclusively<T>(func: () => T) {
     const releaseMutex = await instance.acquire();
 
     try {

src/services/utils.ts

@@ -82,7 +82,7 @@ function unescapeHtml(str: string) {
 }
 
 function toObject<T, K extends string | number | symbol, V>(array: T[], fn: (item: T) => [K, V]): Record<K, V> {
-    const obj: Record<K, V> = {} as Record<K, V>; // FIXME: unsafe?
+    const obj: Record<K, V> = {} as Record<K, V>; // TODO: unsafe?
 
     for (const item of array) {
         const ret = fn(item);
@@ -98,7 +98,7 @@ function stripTags(text: string) {
 }
 
 function union<T extends string | number | symbol>(a: T[], b: T[]): T[] {
-    const obj: Record<T, T> = {} as Record<T, T>; // FIXME: unsafe?
+    const obj: Record<T, T> = {} as Record<T, T>; // TODO: unsafe?
 
     for (let i = a.length-1; i >= 0; i--) {
         obj[a[i]] = a[i];