From 45e3632c6eb8349bfa2a2476fbead8ac6a29af61 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Tue, 9 Apr 2024 21:48:15 +0300 Subject: [PATCH] server-ts: Port share/shaca/abstract_shaca_entity --- ...{abstract_shaca_entity.js => abstract_shaca_entity.ts} | 8 ++++---- src/share/shaca/entities/sattachment.js | 2 +- src/share/shaca/entities/sattribute.js | 2 +- src/share/shaca/entities/sbranch.js | 2 +- src/share/shaca/entities/snote.js | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) rename src/share/shaca/entities/{abstract_shaca_entity.js => abstract_shaca_entity.ts} (50%) diff --git a/src/share/shaca/entities/abstract_shaca_entity.js b/src/share/shaca/entities/abstract_shaca_entity.ts similarity index 50% rename from src/share/shaca/entities/abstract_shaca_entity.js rename to src/share/shaca/entities/abstract_shaca_entity.ts index 772eb4d6f..707db9441 100644 --- a/src/share/shaca/entities/abstract_shaca_entity.js +++ b/src/share/shaca/entities/abstract_shaca_entity.ts @@ -1,8 +1,8 @@ -let shaca; +let shaca: any; class AbstractShacaEntity { - /** @return {Shaca} */ - get shaca() { + // FIXME: Use right data type once we convert Shaca as well. + get shaca(): any { if (!shaca) { shaca = require('../shaca.js'); } @@ -11,4 +11,4 @@ class AbstractShacaEntity { } } -module.exports = AbstractShacaEntity; +export = AbstractShacaEntity; diff --git a/src/share/shaca/entities/sattachment.js b/src/share/shaca/entities/sattachment.js index 4b76fea2c..998c5ac95 100644 --- a/src/share/shaca/entities/sattachment.js +++ b/src/share/shaca/entities/sattachment.js @@ -2,7 +2,7 @@ const sql = require('../../sql'); const utils = require('../../../services/utils'); -const AbstractShacaEntity = require('./abstract_shaca_entity.js'); +const AbstractShacaEntity = require('./abstract_shaca_entity'); class SAttachment extends AbstractShacaEntity { constructor([attachmentId, ownerId, role, mime, title, blobId, utcDateModified]) { diff --git a/src/share/shaca/entities/sattribute.js b/src/share/shaca/entities/sattribute.js index bc3b5437a..26b285ce8 100644 --- a/src/share/shaca/entities/sattribute.js +++ b/src/share/shaca/entities/sattribute.js @@ -1,6 +1,6 @@ "use strict"; -const AbstractShacaEntity = require('./abstract_shaca_entity.js'); +const AbstractShacaEntity = require('./abstract_shaca_entity'); class SAttribute extends AbstractShacaEntity { constructor([attributeId, noteId, type, name, value, isInheritable, position]) { diff --git a/src/share/shaca/entities/sbranch.js b/src/share/shaca/entities/sbranch.js index 1be0f424a..a6f2ac13a 100644 --- a/src/share/shaca/entities/sbranch.js +++ b/src/share/shaca/entities/sbranch.js @@ -1,6 +1,6 @@ "use strict"; -const AbstractShacaEntity = require('./abstract_shaca_entity.js'); +const AbstractShacaEntity = require('./abstract_shaca_entity'); class SBranch extends AbstractShacaEntity { constructor([branchId, noteId, parentNoteId, prefix, isExpanded]) { diff --git a/src/share/shaca/entities/snote.js b/src/share/shaca/entities/snote.js index fd889c23f..b639d3829 100644 --- a/src/share/shaca/entities/snote.js +++ b/src/share/shaca/entities/snote.js @@ -2,7 +2,7 @@ const sql = require('../../sql'); const utils = require('../../../services/utils'); -const AbstractShacaEntity = require('./abstract_shaca_entity.js'); +const AbstractShacaEntity = require('./abstract_shaca_entity'); const escape = require('escape-html'); const LABEL = 'label';