chore: fixed importEtherpad

Author: SamTV12345

src/node/db/Pad.ts

@@ -39,7 +39,7 @@ export const cleanText = (txt:string): string => txt.replace(/\r\n/g, '\n')
     .replace(/\xa0/g, ' ');
 
 class Pad {
-  db: DBFunctionsPromisified;
+  db: DBFunctionsPromisified|Database;
   atext: AText;
   pool: AttributePool;
   head: number;
@@ -55,7 +55,7 @@ class Pad {
    *     can be used to shard pad storage across multiple database backends, to put each pad in its
    *     own database table, or to validate imported pad data before it is written to the database.
    */
-  constructor(id:string, database = db) {
+  constructor(id:string, database: DBFunctionsPromisified|Database = db) {
     this.db = database;
     this.atext = makeAText('\n');
     this.pool = new AttributePool();
@@ -382,7 +382,7 @@ class Pad {
     });
   }
 
-  async init(text:string, authorId = '') {
+  async init(text:string | null, authorId = '') {
     // try to load the pad
     const value = await this.db.get(`pad:${this.id}`);
 

src/node/utils/ImportEtherpad.ts

@@ -1,7 +1,3 @@
-'use strict';
-
-import {APool} from "../types/PadType";
-
 /**
  * 2014 John McLear (Etherpad Foundation / McLear Ltd)
  *
@@ -19,18 +15,18 @@ import {APool} from "../types/PadType";
  */
 
 import AttributePool from '../../static/js/AttributePool';
-const {Pad} = require('../db/Pad');
+import Pad from '../db/Pad';
 import Stream from './Stream';
-const authorManager = require('../db/AuthorManager');
-const db = require('../db/DB');
+import authorManager from '../db/AuthorManager';
+import db from '../db/DB';
 const hooks = require('../../static/js/pluginfw/hooks');
 import log4js from 'log4js';
 const supportedElems = require('../../static/js/contentcollector').supportedElems;
 import {Database} from 'ueberdb2';
 
 const logger = log4js.getLogger('ImportEtherpad');
 
-exports.setPadRaw = async (padId: string, r: string, authorId = '') => {
+export const setPadRaw = async (padId: string, r: string, authorId = '') => {
   const records = JSON.parse(r);
 
   // get supported block Elements from plugins, we will use this later.
@@ -55,7 +51,7 @@ exports.setPadRaw = async (padId: string, r: string, authorId = '') => {
   // there is a problem with the data.
 
   const data = new Map();
-  const existingAuthors = new Set();
+  const existingAuthors: Set<string> = new Set();
   const padDb = new Database('memory', {data});
   await padDb.init();
   try {
@@ -126,3 +122,7 @@ exports.setPadRaw = async (padId: string, r: string, authorId = '') => {
   })();
   for (const op of new Stream(writeOps).batch(100).buffer(99)) await op;
 };
+
+export default {
+  setPadRaw
+}

src/tests/backend/specs/ImportEtherpad.ts

@@ -2,7 +2,7 @@
 
 import {MapArrayType} from "../../../node/types/MapType";
 
-const assert = require('assert').strict;
+import {strict as assert} from 'node:assert';
 import authorManager from '../../../node/db/AuthorManager';
 import db from '../../../node/db/DB';
 const importEtherpad = require('../../../node/utils/ImportEtherpad');
@@ -70,7 +70,7 @@ describe(__filename, function () {
     const data:MapArrayType<any> = makeExport(authorId);
     data['pad:differentPadId:revs:0'] = data['pad:testing:revs:0'];
     delete data['pad:testing:revs:0'];
-    assert.rejects(importEtherpad.setPadRaw(padId, JSON.stringify(data)), /unexpected pad ID/);
+    await assert.rejects(importEtherpad.setPadRaw(padId, JSON.stringify(data)), /unexpected pad ID/);
     assert(!await authorManager.doesAuthorExist(authorId));
     assert(!await padManager.doesPadExist(padId));
   });