From e96b56e061c21b4e560ece58b4fe6549b04051ef Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 3 Apr 2024 00:02:51 +0300 Subject: [PATCH] server-ts: Fix build errors --- src/services/import/markdown.ts | 2 +- src/services/task_context.ts | 9 +-------- src/services/task_context_interface.ts | 7 +++++++ src/services/ws.ts | 5 +++-- 4 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 src/services/task_context_interface.ts diff --git a/src/services/import/markdown.ts b/src/services/import/markdown.ts index ab3391153..47e37df13 100644 --- a/src/services/import/markdown.ts +++ b/src/services/import/markdown.ts @@ -7,7 +7,7 @@ import importUtils = require('./utils'); function renderToHtml(content: string, title: string) { const html = marked.parse(content, { async: false - }); // FIXME: mangle and headerIds does not seem to exist in marked + }) as string; // FIXME: mangle and headerIds does not seem to exist in marked const h1Handled = importUtils.handleH1(html, title); // h1 handling needs to come before sanitization return htmlSanitizer.sanitize(h1Handled); } diff --git a/src/services/task_context.ts b/src/services/task_context.ts index 1cf736b33..bacf3e8f8 100644 --- a/src/services/task_context.ts +++ b/src/services/task_context.ts @@ -1,18 +1,11 @@ "use strict"; +import { TaskData } from './task_context_interface'; import ws = require('./ws'); // taskId => TaskContext const taskContexts: Record = {}; -interface TaskData { - safeImport?: boolean; - textImportedAsText?: boolean; - codeImportedAsCode?: boolean; - shrinkImages?: boolean; - replaceUnderscoresWithSpaces?: boolean; -} - class TaskContext { private taskId: string; diff --git a/src/services/task_context_interface.ts b/src/services/task_context_interface.ts new file mode 100644 index 000000000..3c359d742 --- /dev/null +++ b/src/services/task_context_interface.ts @@ -0,0 +1,7 @@ +export interface TaskData { + safeImport?: boolean; + textImportedAsText?: boolean; + codeImportedAsCode?: boolean; + shrinkImages?: boolean; + replaceUnderscoresWithSpaces?: boolean; +} diff --git a/src/services/ws.ts b/src/services/ws.ts index e4cca2309..fe5ad4dfd 100644 --- a/src/services/ws.ts +++ b/src/services/ws.ts @@ -12,6 +12,8 @@ import AbstractBeccaEntity = require('../becca/entities/abstract_becca_entity'); import env = require('./env'); import { IncomingMessage, Server } from 'http'; import { EntityChange } from './entity_changes_interface'; +import { TaskData } from './task_context_interface'; + if (env.isDev()) { const chokidar = require('chokidar'); const debounce = require('debounce'); @@ -28,10 +30,9 @@ let lastSyncedPush: number | null = null; interface Message { type: string; - data?: { + data?: TaskData | null | { lastSyncedPush?: number | null, entityChanges?: any[], - safeImport?: boolean }, lastSyncedPush?: number | null,