From c0b3c8496e2470d7bbf1a1a6e972baf72188f77f Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Tue, 16 Jul 2024 21:43:04 +0300 Subject: [PATCH] server: Fix build errors after updating to latest TypeScript --- src/etapi/attachments.ts | 1 + src/etapi/attributes.ts | 1 + src/etapi/etapi-interface.ts | 4 ++-- src/etapi/etapi_utils.ts | 1 + src/etapi/notes.ts | 1 + src/share/shaca/entities/rows.ts | 8 ++++---- src/share/shaca/entities/sattachment.ts | 1 + src/share/shaca/entities/sattribute.ts | 1 + src/share/shaca/entities/sbranch.ts | 1 + src/share/shaca/entities/snote.ts | 1 + src/share/shaca/shaca_loader.ts | 1 + tsconfig.json | 3 ++- 12 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/etapi/attachments.ts b/src/etapi/attachments.ts index 8e76d27e8..802e9975f 100644 --- a/src/etapi/attachments.ts +++ b/src/etapi/attachments.ts @@ -5,6 +5,7 @@ import v = require('./validators'); import utils = require('../services/utils'); import { Router } from 'express'; import { AttachmentRow } from '../becca/entities/rows'; +import { ValidatorMap } from './etapi-interface'; function register(router: Router) { const ALLOWED_PROPERTIES_FOR_CREATE_ATTACHMENT: ValidatorMap = { diff --git a/src/etapi/attributes.ts b/src/etapi/attributes.ts index d5b407fb3..59865da62 100644 --- a/src/etapi/attributes.ts +++ b/src/etapi/attributes.ts @@ -5,6 +5,7 @@ import attributeService = require('../services/attributes'); import v = require('./validators'); import { Router } from 'express'; import { AttributeRow } from '../becca/entities/rows'; +import { ValidatorMap } from './etapi-interface'; function register(router: Router) { eu.route(router, 'get', '/etapi/attributes/:attributeId', (req, res, next) => { diff --git a/src/etapi/etapi-interface.ts b/src/etapi/etapi-interface.ts index c0b6d3f04..c0bfef6d9 100644 --- a/src/etapi/etapi-interface.ts +++ b/src/etapi/etapi-interface.ts @@ -1,3 +1,3 @@ -type ValidatorFunc = (obj: unknown) => (string | undefined); +export type ValidatorFunc = (obj: unknown) => (string | undefined); -type ValidatorMap = Record; \ No newline at end of file +export type ValidatorMap = Record; \ No newline at end of file diff --git a/src/etapi/etapi_utils.ts b/src/etapi/etapi_utils.ts index 3498a8257..9799deef0 100644 --- a/src/etapi/etapi_utils.ts +++ b/src/etapi/etapi_utils.ts @@ -6,6 +6,7 @@ import etapiTokenService = require('../services/etapi_tokens'); import config = require('../services/config'); import { NextFunction, Request, RequestHandler, Response, Router } from 'express'; import { AppRequest, AppRequestHandler } from '../routes/route-interface'; +import { ValidatorMap } from './etapi-interface'; const GENERIC_CODE = "GENERIC"; type HttpMethod = "all" | "get" | "post" | "put" | "delete" | "patch" | "options" | "head"; diff --git a/src/etapi/notes.ts b/src/etapi/notes.ts index 620e9f3d8..62263983f 100644 --- a/src/etapi/notes.ts +++ b/src/etapi/notes.ts @@ -15,6 +15,7 @@ import { ParsedQs } from 'qs'; import { NoteParams } from '../services/note-interface'; import BNote = require('../becca/entities/bnote'); import { SearchParams } from '../services/search/services/types'; +import { ValidatorMap } from './etapi-interface'; function register(router: Router) { eu.route(router, 'get', '/etapi/notes', (req, res, next) => { diff --git a/src/share/shaca/entities/rows.ts b/src/share/shaca/entities/rows.ts index d8b8ec84e..ed20fea1f 100644 --- a/src/share/shaca/entities/rows.ts +++ b/src/share/shaca/entities/rows.ts @@ -1,4 +1,4 @@ -type SNoteRow = [ string, string, string, string, string, string, boolean ]; -type SBranchRow = [ string, string, string, string, string, boolean ]; -type SAttributeRow = [ string, string, string, string, string, boolean, number ]; -type SAttachmentRow = [ string, string, string, string, string, string, string ]; +export type SNoteRow = [ string, string, string, string, string, string, boolean ]; +export type SBranchRow = [ string, string, string, string, string, boolean ]; +export type SAttributeRow = [ string, string, string, string, string, boolean, number ]; +export type SAttachmentRow = [ string, string, string, string, string, string, string ]; diff --git a/src/share/shaca/entities/sattachment.ts b/src/share/shaca/entities/sattachment.ts index 1e9565ce3..7951fe081 100644 --- a/src/share/shaca/entities/sattachment.ts +++ b/src/share/shaca/entities/sattachment.ts @@ -5,6 +5,7 @@ import utils = require('../../../services/utils'); import AbstractShacaEntity = require('./abstract_shaca_entity'); import SNote = require('./snote'); import { Blob } from '../../../services/blob-interface'; +import { SAttachmentRow } from './rows'; class SAttachment extends AbstractShacaEntity { private attachmentId: string; diff --git a/src/share/shaca/entities/sattribute.ts b/src/share/shaca/entities/sattribute.ts index 390a85b8c..6bd8418b1 100644 --- a/src/share/shaca/entities/sattribute.ts +++ b/src/share/shaca/entities/sattribute.ts @@ -1,5 +1,6 @@ "use strict"; +import { SAttributeRow } from "./rows"; import SNote = require("./snote"); const AbstractShacaEntity = require('./abstract_shaca_entity'); diff --git a/src/share/shaca/entities/sbranch.ts b/src/share/shaca/entities/sbranch.ts index 0ff356922..b4ff9a73b 100644 --- a/src/share/shaca/entities/sbranch.ts +++ b/src/share/shaca/entities/sbranch.ts @@ -1,6 +1,7 @@ "use strict"; import AbstractShacaEntity = require('./abstract_shaca_entity'); +import { SBranchRow } from './rows'; import SNote = require('./snote'); class SBranch extends AbstractShacaEntity { diff --git a/src/share/shaca/entities/snote.ts b/src/share/shaca/entities/snote.ts index bae610886..18182f1d4 100644 --- a/src/share/shaca/entities/snote.ts +++ b/src/share/shaca/entities/snote.ts @@ -8,6 +8,7 @@ import { Blob } from '../../../services/blob-interface'; import SAttachment = require('./sattachment'); import SAttribute = require('./sattribute'); import SBranch = require('./sbranch'); +import { SNoteRow } from './rows'; const LABEL = 'label'; const RELATION = 'relation'; diff --git a/src/share/shaca/shaca_loader.ts b/src/share/shaca/shaca_loader.ts index c6a3fc4da..050e5e886 100644 --- a/src/share/shaca/shaca_loader.ts +++ b/src/share/shaca/shaca_loader.ts @@ -9,6 +9,7 @@ import SAttribute = require('./entities/sattribute'); import SAttachment = require('./entities/sattachment'); import shareRoot = require('../share_root'); import eventService = require('../../services/events'); +import { SAttachmentRow, SAttributeRow, SBranchRow, SNoteRow } from './entities/rows'; function load() { const start = Date.now(); diff --git a/tsconfig.json b/tsconfig.json index 335872b51..d9bbf4378 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,6 +1,7 @@ { "compilerOptions": { - "moduleResolution": "Node", + "moduleResolution": "Node16", + "module": "Node16", "target": "ES2018", "declaration": false, "sourceMap": true,