server-ts: Fix references to js files for converted files

src/services/app_path.js

@@ -1,5 +1,5 @@
 const assetPath = require('./asset_path.js');
-const env = require('./env.js');
+const env = require('./env');
 
 module.exports = env.isDev()
     ? assetPath + "/app"

src/services/attributes.js

@@ -3,7 +3,7 @@
 const searchService = require('./search/services/search.js');
 const sql = require('./sql');
 const becca = require('../becca/becca');
-const BAttribute = require('../becca/entities/battribute.js');
+const BAttribute = require('../becca/entities/battribute');
 const {formatAttrForSearch} = require('./attribute_formatter.js');
 const BUILTIN_ATTRIBUTES = require('./builtin_attributes.js');
 

src/services/auth.js

@@ -4,9 +4,9 @@ const etapiTokenService = require('./etapi_tokens.js');
 const log = require('./log');
 const sqlInit = require('./sql_init.js');
 const utils = require('./utils');
-const passwordEncryptionService = require('./encryption/password_encryption.js');
+const passwordEncryptionService = require('./encryption/password_encryption');
 const config = require('./config');
-const passwordService = require('./encryption/password.js');
+const passwordService = require('./encryption/password');
 
 const noAuthentication = config.General && config.General.noAuthentication === true;
 

src/services/backend_script_api.js

@@ -14,12 +14,12 @@ const appInfo = require('./app_info.js');
 const searchService = require('./search/services/search.js');
 const SearchContext = require('./search/search_context.js');
 const becca = require('../becca/becca');
-const ws = require('./ws.js');
+const ws = require('./ws');
 const SpacedUpdate = require('./spaced_update.js');
 const specialNotesService = require('./special_notes.js');
 const branchService = require('./branches.js');
 const exportService = require('./export/zip.js');
-const syncMutex = require('./sync_mutex.js');
+const syncMutex = require('./sync_mutex');
 const backupService = require('./backup.js');
 const optionsService = require('./options');
 

src/services/backup.js

@@ -5,7 +5,7 @@ const optionService = require('./options');
 const fs = require('fs-extra');
 const dataDir = require('./data_dir');
 const log = require('./log');
-const syncMutexService = require('./sync_mutex.js');
+const syncMutexService = require('./sync_mutex');
 const cls = require('./cls');
 const sql = require('./sql');
 const path = require('path');

src/services/consistency_checks.js

@@ -3,8 +3,8 @@
 const sql = require('./sql');
 const sqlInit = require('./sql_init.js');
 const log = require('./log');
-const ws = require('./ws.js');
-const syncMutexService = require('./sync_mutex.js');
+const ws = require('./ws');
+const syncMutexService = require('./sync_mutex');
 const cls = require('./cls');
 const entityChangesService = require('./entity_changes');
 const optionsService = require('./options');
@@ -13,7 +13,7 @@ const revisionService = require('./revisions.js');
 const becca = require('../becca/becca');
 const utils = require('../services/utils');
 const eraseService = require('../services/erase.js');
-const {sanitizeAttributeName} = require('./sanitize_attribute_name.js');
+const {sanitizeAttributeName} = require('./sanitize_attribute_name');
 const noteTypes = require('../services/note_types.js').getNoteTypeNames();
 
 class ConsistencyChecks {

src/services/encryption/password.ts

@@ -2,9 +2,9 @@
 
 import sql = require('../sql');
 import optionService = require('../options');
-import myScryptService = require('./my_scrypt.js');
+import myScryptService = require('./my_scrypt');
 import utils = require('../utils');
-import passwordEncryptionService = require('./password_encryption.js');
+import passwordEncryptionService = require('./password_encryption');
 
 function isPasswordSet() {
     return !!sql.getValue("SELECT value FROM options WHERE name = 'passwordVerificationHash'");

src/services/encryption/password_encryption.ts

@@ -1,7 +1,7 @@
 import optionService = require('../options');
-import myScryptService = require('./my_scrypt.js');
+import myScryptService = require('./my_scrypt');
 import utils = require('../utils');
-import dataEncryptionService = require('./data_encryption.js');
+import dataEncryptionService = require('./data_encryption');
 
 function verifyPassword(password: string) {
     const givenPasswordHash = utils.toBase64(myScryptService.getVerificationHash(password));

src/services/etapi_tokens.js

@@ -1,6 +1,6 @@
 const becca = require('../becca/becca');
 const utils = require('./utils');
-const BEtapiToken = require('../becca/entities/betapi_token.js');
+const BEtapiToken = require('../becca/entities/betapi_token');
 const crypto = require("crypto");
 
 function getTokens() {

src/services/export/zip.js

@@ -14,7 +14,7 @@ const becca = require('../../becca/becca');
 const RESOURCE_DIR = require('../../services/resource_dir').RESOURCE_DIR;
 const archiver = require('archiver');
 const log = require('../log');
-const TaskContext = require('../task_context.js');
+const TaskContext = require('../task_context');
 const ValidationError = require('../../errors/validation_error');
 const NoteMeta = require('../meta/note_meta.js');
 const AttachmentMeta = require('../meta/attachment_meta.js');

src/services/handlers.js

@@ -3,7 +3,7 @@ const scriptService = require('./script.js');
 const treeService = require('./tree.js');
 const noteService = require('./notes.js');
 const becca = require('../becca/becca');
-const BAttribute = require('../becca/entities/battribute.js');
+const BAttribute = require('../becca/entities/battribute');
 const hiddenSubtreeService = require('./hidden_subtree.js');
 const oneTimeTimer = require('./one_time_timer.js');
 

src/services/hidden_subtree.js

@@ -1,6 +1,6 @@
 const becca = require('../becca/becca');
 const noteService = require('./notes.js');
-const BAttribute = require('../becca/entities/battribute.js');
+const BAttribute = require('../becca/entities/battribute');
 const log = require('./log');
 const migrationService = require('./migration.js');
 

src/services/import/enex.js

@@ -8,7 +8,7 @@ const noteService = require('../notes.js');
 const imageService = require('../image.js');
 const protectedSessionService = require('../protected_session');
 const htmlSanitizer = require('../html_sanitizer.js');
-const {sanitizeAttributeName} = require('../sanitize_attribute_name.js');
+const {sanitizeAttributeName} = require('../sanitize_attribute_name');
 
 /**
  * date format is e.g. 20181121T193703Z or 2013-04-14T16:19:00.000Z (Mac evernote, see #3496)

src/services/import/zip.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const BAttribute = require('../../becca/entities/battribute.js');
+const BAttribute = require('../../becca/entities/battribute');
 const utils = require('../../services/utils');
 const log = require('../../services/log');
 const noteService = require('../../services/notes.js');
@@ -13,7 +13,7 @@ const treeService = require('../tree.js');
 const yauzl = require("yauzl");
 const htmlSanitizer = require('../html_sanitizer.js');
 const becca = require('../../becca/becca');
-const BAttachment = require('../../becca/entities/battachment.js');
+const BAttachment = require('../../becca/entities/battachment');
 const markdownService = require('./markdown.js');
 
 /**

src/services/notes.js

@@ -13,15 +13,15 @@ const path = require('path');
 const url = require('url');
 const becca = require('../becca/becca');
 const BBranch = require('../becca/entities/bbranch');
-const BNote = require('../becca/entities/bnote.js');
-const BAttribute = require('../becca/entities/battribute.js');
-const BAttachment = require('../becca/entities/battachment.js');
+const BNote = require('../becca/entities/bnote');
+const BAttribute = require('../becca/entities/battribute');
+const BAttachment = require('../becca/entities/battachment');
 const dayjs = require("dayjs");
 const htmlSanitizer = require('./html_sanitizer.js');
 const ValidationError = require('../errors/validation_error');
 const noteTypesService = require('./note_types.js');
 const fs = require("fs");
-const ws = require('./ws.js');
+const ws = require('./ws');
 const html2plaintext = require('html2plaintext')
 
 /** @param {BNote} parentNote */

src/services/port.js

@@ -1,6 +1,6 @@
 const config = require('./config');
 const utils = require('./utils');
-const env = require('./env.js');
+const env = require('./env');
 const dataDir = require('./data_dir');
 
 function parseAndValidate(portStr, source) {

src/services/protected_session.ts

@@ -66,7 +66,7 @@ function checkProtectedSessionExpiration() {
 
         log.info("Expiring protected session");
 
-        require('./ws.js').reloadFrontend("leaving protected session");
+        require('./ws').reloadFrontend("leaving protected session");
     }
 }
 

src/services/search/expressions/ancestor.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const Expression = require('./expression.js');
-const NoteSet = require('../note_set.js');
+const NoteSet = require('../note_set');
 const log = require('../../log');
 const becca = require('../../../becca/becca');
 

src/services/search/expressions/attribute_exists.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const NoteSet = require('../note_set.js');
+const NoteSet = require('../note_set');
 const becca = require('../../../becca/becca');
 const Expression = require('./expression.js');
 

src/services/search/expressions/child_of.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const Expression = require('./expression.js');
-const NoteSet = require('../note_set.js');
+const NoteSet = require('../note_set');
 
 class ChildOfExp extends Expression {
     constructor(subExpression) {

src/services/search/expressions/descendant_of.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const Expression = require('./expression.js');
-const NoteSet = require('../note_set.js');
+const NoteSet = require('../note_set');
 const becca = require('../../../becca/becca');
 
 class DescendantOfExp extends Expression {

src/services/search/expressions/is_hidden.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const Expression = require('./expression.js');
-const NoteSet = require('../note_set.js');
+const NoteSet = require('../note_set');
 
 /**
  * Note is hidden when all its note paths start in hidden subtree (i.e., the note is not cloned into visible tree)

src/services/search/expressions/label_comparison.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const Expression = require('./expression.js');
-const NoteSet = require('../note_set.js');
+const NoteSet = require('../note_set');
 const becca = require('../../../becca/becca');
 
 class LabelComparisonExp extends Expression {

src/services/search/expressions/note_content_fulltext.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const Expression = require('./expression.js');
-const NoteSet = require('../note_set.js');
+const NoteSet = require('../note_set');
 const log = require('../../log');
 const becca = require('../../../becca/becca');
 const protectedSessionService = require('../../protected_session');

src/services/search/expressions/note_flat_text.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const Expression = require('./expression.js');
-const NoteSet = require('../note_set.js');
+const NoteSet = require('../note_set');
 const becca = require('../../../becca/becca');
 const utils = require('../../utils');
 

src/services/search/expressions/or.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const Expression = require('./expression.js');
-const NoteSet = require('../note_set.js');
+const NoteSet = require('../note_set');
 const TrueExp = require('./true.js');
 
 class OrExp extends Expression {

src/services/search/expressions/order_by_and_limit.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const Expression = require('./expression.js');
-const NoteSet = require('../note_set.js');
+const NoteSet = require('../note_set');
 
 class OrderByAndLimitExp extends Expression {
     constructor(orderDefinitions, limit) {

src/services/search/expressions/parent_of.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const Expression = require('./expression.js');
-const NoteSet = require('../note_set.js');
+const NoteSet = require('../note_set');
 
 class ParentOfExp extends Expression {
     constructor(subExpression) {

src/services/search/expressions/property_comparison.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const Expression = require('./expression.js');
-const NoteSet = require('../note_set.js');
+const NoteSet = require('../note_set');
 const buildComparator = require('../services/build_comparator.js');
 
 /**

src/services/search/expressions/relation_where.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const Expression = require('./expression.js');
-const NoteSet = require('../note_set.js');
+const NoteSet = require('../note_set');
 const becca = require('../../../becca/becca');
 
 class RelationWhereExp extends Expression {

src/services/sql.ts

@@ -248,7 +248,7 @@ function transactional<T>(func: (statement: Statement) => T) {
         const ret = (dbConnection.transaction(func) as any).deferred();
 
         if (!dbConnection.inTransaction) { // i.e. transaction was really committed (and not just savepoint released)
-            require('./ws.js').sendTransactionEntityChangesToAllClients();
+            require('./ws').sendTransactionEntityChangesToAllClients();
         }
 
         return ret;

src/services/sql_init.js

@@ -5,8 +5,8 @@ const sql = require('./sql');
 const utils = require('./utils');
 const optionService = require('./options');
 const port = require('./port.js');
-const BOption = require('../becca/entities/boption.js');
-const TaskContext = require('./task_context.js');
+const BOption = require('../becca/entities/boption');
+const TaskContext = require('./task_context');
 const migrationService = require('./migration.js');
 const cls = require('./cls');
 const config = require('./config');
@@ -62,7 +62,7 @@ async function createInitialDatabase() {
 
         require('../becca/becca_loader.js').load();
 
-        const BNote = require('../becca/entities/bnote.js');
+        const BNote = require('../becca/entities/bnote');
         const BBranch = require('../becca/entities/bbranch');
 
         log.info("Creating root note ...");
@@ -88,7 +88,7 @@ async function createInitialDatabase() {
         optionsInitService.initDocumentOptions();
         optionsInitService.initNotSyncedOptions(true, {});
         optionsInitService.initStartupOptions();
-        require('./encryption/password.js').resetPassword();
+        require('./encryption/password').resetPassword();
     });
 
     log.info("Importing demo content ...");

src/services/sync.js

@@ -10,10 +10,10 @@ const syncUpdateService = require('./sync_update.js');
 const contentHashService = require('./content_hash.js');
 const appInfo = require('./app_info.js');
 const syncOptions = require('./sync_options.js');
-const syncMutexService = require('./sync_mutex.js');
+const syncMutexService = require('./sync_mutex');
 const cls = require('./cls');
 const request = require('./request.js');
-const ws = require('./ws.js');
+const ws = require('./ws');
 const entityChangesService = require('./entity_changes');
 const entityConstructor = require('../becca/entity_constructor.js');
 const becca = require('../becca/becca');

src/services/sync_update.js

@@ -3,7 +3,7 @@ const log = require('./log');
 const entityChangesService = require('./entity_changes');
 const eventService = require('./events');
 const entityConstructor = require('../becca/entity_constructor.js');
-const ws = require('./ws.js');
+const ws = require('./ws');
 
 function updateEntities(entityChanges, instanceId) {
     if (entityChanges.length === 0) {

src/services/task_context.ts

@@ -1,6 +1,6 @@
 "use strict";
 
-import ws = require('./ws.js');
+import ws = require('./ws');
 
 // taskId => TaskContext
 const taskContexts: Record<string, TaskContext> = {};

src/services/window.js

@@ -2,7 +2,7 @@ const path = require('path');
 const url = require("url");
 const port = require('./port.js');
 const optionService = require('./options');
-const env = require('./env.js');
+const env = require('./env');
 const log = require('./log');
 const sqlInit = require('./sql_init.js');
 const cls = require('./cls');

src/services/ws.ts

@@ -4,10 +4,10 @@ import log = require('./log');
 import sql = require('./sql');
 import cls = require('./cls');
 import config = require('./config');
-import syncMutexService = require('./sync_mutex.js');
+import syncMutexService = require('./sync_mutex');
 import protectedSessionService = require('./protected_session');
 import becca = require('../becca/becca');
-import AbstractBeccaEntity = require('../becca/entities/abstract_becca_entity.js');
+import AbstractBeccaEntity = require('../becca/entities/abstract_becca_entity');
 
 import env = require('./env');
 import { IncomingMessage, Server } from 'http';
@@ -157,7 +157,9 @@ function fillInAdditionalProperties(entityChange: EntityChange) {
 
         if (parentNote) {
             for (const childBranch of parentNote.getChildBranches()) {
-                entityChange.positions[childBranch.branchId] = childBranch.notePosition;
+                if (childBranch && childBranch.branchId) {
+                    entityChange.positions[childBranch.branchId] = childBranch.notePosition;
+                }
             }
         }
     } else if (entityChange.entityName === 'options') {