@lilaquadrat/studio 10.0.0-beta.2 → 10.0.0-beta.3

package/lib/{cjs/src → src}/services/storage.service.js

@@ -1,20 +1,14 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.StorageService = void 0;
-const fs_1 = __importDefault(require("fs"));
-const promises_1 = require("stream/promises");
-const crypto_1 = require("crypto");
-const promises_2 = require("fs/promises");
-const child_process_1 = require("child_process");
-const Immutable_class_1 = __importDefault(require("../Immutable.class"));
-const storage_model_1 = __importDefault(require("../models/storage.model"));
-const jetstream_service_1 = __importDefault(require("./jetstream.service"));
-const upload_service_1 = __importDefault(require("./upload.service"));
-const filenameHelper_1 = __importDefault(require("../helpers/filenameHelper"));
-class StorageService extends Immutable_class_1.default {
+import fs from 'fs';
+import { pipeline } from 'stream/promises';
+import { createHash, createHmac } from 'crypto';
+import { mkdir } from 'fs/promises';
+import { spawn } from 'child_process';
+import Immutable from '../Immutable.class';
+import StorageModel from '../models/storage.model';
+import JetStreamService from './jetstream.service';
+import UploadService from './upload.service';
+import filenameHelper from '../helpers/filenameHelper';
+export class StorageService extends Immutable {
     constructor(options) {
         super();
         this.buckets = {
@@ -39,7 +33,7 @@ class StorageService extends Immutable_class_1.default {
                 cache: 31536000,
             },
         };
-        this.model = storage_model_1.default;
+        this.model = StorageModel;
         this.options = options;
     }
     /**
@@ -89,7 +83,7 @@ class StorageService extends Immutable_class_1.default {
             payload += `:${limitsBase64}`;
         }
         // Sign the payload with HMAC-SHA256
-        const signature = (0, crypto_1.createHmac)('sha256', secret).update(payload).digest('hex');
+        const signature = createHmac('sha256', secret).update(payload).digest('hex');
         const combined = `${payload}:${signature}`;
         // Encode as base64url for URL-safe, non-human readable format
         const token = Buffer.from(combined).toString('base64url');
@@ -146,7 +140,7 @@ class StorageService extends Immutable_class_1.default {
         const payload = decoded.substring(0, lastColonIndex);
         const signature = decoded.substring(lastColonIndex + 1);
         // Verify signature matches expected HMAC
-        const expectedSignature = (0, crypto_1.createHmac)('sha256', secret).update(payload).digest('hex');
+        const expectedSignature = createHmac('sha256', secret).update(payload).digest('hex');
         if (signature !== expectedSignature)
             return false;
         // Parse payload structure: fileId:expires[:base64(limits)]
@@ -240,7 +234,7 @@ class StorageService extends Immutable_class_1.default {
         /**
          * each uploads needs to be registered with createUpload before uploading an actual file
          */
-        const uploadFile = await upload_service_1.default.single(uploadInternalId);
+        const uploadFile = await UploadService.single(uploadInternalId);
         if (!uploadFile)
             throw new Error('UPLOAD_NOT_FOUND');
         /**
@@ -249,16 +243,16 @@ class StorageService extends Immutable_class_1.default {
          */
         const path = await this.writeFile(file.file, index, uploadInternalId, 'upload');
         if (file.file.truncated) {
-            await fs_1.default.promises.unlink(path.file);
+            await fs.promises.unlink(path.file);
             throw new Error('FILE_SIZE');
         }
-        const updloadState = await upload_service_1.default.addPathToUpload(uploadInternalId, index, path.file);
+        const updloadState = await UploadService.addPathToUpload(uploadInternalId, index, path.file);
         /**
         * if all chunks are there, complete the file and the upload
         */
         if (updloadState.chunks === updloadState.paths?.length) {
-            await upload_service_1.default.setState(updloadState._id, 'waiting');
-            await jetstream_service_1.default.publish('actions.files.uploaded', updloadState);
+            await UploadService.setState(updloadState._id, 'waiting');
+            await JetStreamService.publish('actions.files.uploaded', updloadState);
         }
         return updloadState;
     }
@@ -269,7 +263,7 @@ class StorageService extends Immutable_class_1.default {
         const pathAndFile = type === 'upload' && index || index === 0
             ? this.uploadPath(internalId.toString(), index)
             : this.fanoutPath(internalId.toString());
-        await (0, promises_2.mkdir)(`${pathAndFile.dir}`, { recursive: true });
+        await mkdir(`${pathAndFile.dir}`, { recursive: true });
         if (Array.isArray(data)) {
             if (options?.useNode) {
                 await this.concatenateFiles(data, pathAndFile.file);
@@ -279,23 +273,23 @@ class StorageService extends Immutable_class_1.default {
             }
         }
         else {
-            const writeStream = fs_1.default.createWriteStream(pathAndFile.file);
-            await (0, promises_1.pipeline)(data, writeStream);
+            const writeStream = fs.createWriteStream(pathAndFile.file);
+            await pipeline(data, writeStream);
         }
         return pathAndFile;
     }
     async writeFileVersion(data, internalId, version) {
         const pathAndFile = this.fanoutPath(internalId.toString(), version);
-        await (0, promises_2.mkdir)(`${pathAndFile.dir}`, { recursive: true });
-        await fs_1.default.promises.writeFile(pathAndFile.file, Uint8Array.from(data));
+        await mkdir(`${pathAndFile.dir}`, { recursive: true });
+        await fs.promises.writeFile(pathAndFile.file, Uint8Array.from(data));
         return pathAndFile;
     }
     async concatenateFiles(paths, outputPath) {
-        const writeStream = fs_1.default.createWriteStream(outputPath);
+        const writeStream = fs.createWriteStream(outputPath);
         const sortedPaths = paths.sort((a, b) => a.index - b.index);
         for (const single of sortedPaths) {
-            const readStream = fs_1.default.createReadStream(single.path);
-            await (0, promises_1.pipeline)(readStream, writeStream, { end: false });
+            const readStream = fs.createReadStream(single.path);
+            await pipeline(readStream, writeStream, { end: false });
         }
         writeStream.end();
         await new Promise((resolve, reject) => {
@@ -307,8 +301,8 @@ class StorageService extends Immutable_class_1.default {
         const sortedPaths = paths.sort((a, b) => a.index - b.index);
         const filePaths = sortedPaths.map(single => single.path);
         return new Promise((resolve, reject) => {
-            const outputStream = fs_1.default.createWriteStream(outputPath);
-            const cat = (0, child_process_1.spawn)('cat', filePaths);
+            const outputStream = fs.createWriteStream(outputPath);
+            const cat = spawn('cat', filePaths);
             cat.stdout.pipe(outputStream);
             cat.on('error', (error) => {
                 reject(new Error(`cat process error: ${error.message}`));
@@ -328,7 +322,7 @@ class StorageService extends Immutable_class_1.default {
     async removeUploadFiles(upload) {
         const promises = upload.paths?.map(async (single) => {
             try {
-                await fs_1.default.promises.unlink(single.path);
+                await fs.promises.unlink(single.path);
             }
             catch (error) {
                 console.error(`failed to remove ${single.path}:`, error);
@@ -336,14 +330,14 @@ class StorageService extends Immutable_class_1.default {
         });
         if (promises) {
             await Promise.all(promises);
-            await fs_1.default.promises.rmdir(`${this.options.uploadFolder}/${upload._id}`);
+            await fs.promises.rmdir(`${this.options.uploadFolder}/${upload._id}`);
         }
     }
     async removeLocalFile(relativePath) {
         const fullPath = `${this.options.dataFolder}/${relativePath}`;
         try {
-            await fs_1.default.promises.access(fullPath);
-            return await fs_1.default.promises.unlink(fullPath);
+            await fs.promises.access(fullPath);
+            return await fs.promises.unlink(fullPath);
         }
         catch (error) {
             if (error.code === 'ENOENT') {
@@ -364,7 +358,7 @@ class StorageService extends Immutable_class_1.default {
          */
         const filename = uploadId;
         // Stable, uniform fan-out from the id (or use sha256 of expected filename+size)
-        const hash = (0, crypto_1.createHash)('sha256').update(`${version || ''}${uploadId}`).digest('hex');
+        const hash = createHash('sha256').update(`${version || ''}${uploadId}`).digest('hex');
         const lvl1 = hash.slice(0, 2);
         const lvl2 = hash.slice(2, 4);
         const dir = [baseFolder, lvl1, lvl2].join('/');
@@ -422,7 +416,7 @@ class StorageService extends Immutable_class_1.default {
         }
         // If ignorePrefix is given, return all matching files without prefix filtering
         if (query.ignorePrefix) {
-            return storage_model_1.default.db.aggregate([
+            return StorageModel.db.aggregate([
                 {
                     $match: realQuery,
                 },
@@ -464,7 +458,7 @@ class StorageService extends Immutable_class_1.default {
                 // Non-root: only files with exact prefix match
                 realQuery.prefix = query.prefix;
             }
-            return storage_model_1.default.db.aggregate([
+            return StorageModel.db.aggregate([
                 {
                     $match: realQuery,
                 },
@@ -495,7 +489,7 @@ class StorageService extends Immutable_class_1.default {
         const isRootLevel = query.prefix === undefined || query.prefix === '';
         if (isRootLevel) {
             // Root level: show files without prefix and extract virtual folders
-            return storage_model_1.default.db.aggregate([
+            return StorageModel.db.aggregate([
                 {
                     $match: realQuery,
                 },
@@ -571,7 +565,7 @@ class StorageService extends Immutable_class_1.default {
                 { prefix: { $regex: `^${escapedPrefix}` } }, // Deeper files for folder extraction
             ],
         };
-        return storage_model_1.default.db.aggregate([
+        return StorageModel.db.aggregate([
             {
                 $match: nonRootQuery,
             },
@@ -645,12 +639,12 @@ class StorageService extends Immutable_class_1.default {
         else {
             cleanSearch = new RegExp(`^(?!([a-z]+):).*(${cleanSearch}).*`);
         }
-        return storage_model_1.default.db.find({ company, project, tags: { $regex: cleanSearch, $options: 'i' } }, { projection: { tags: 1 } })
+        return StorageModel.db.find({ company, project, tags: { $regex: cleanSearch, $options: 'i' } }, { projection: { tags: 1 } })
             .toArray()
             .then((matchedDocuments) => this.matchSortTags(matchedDocuments, cleanSearch, sortString));
     }
     single(company, project, filename) {
-        return storage_model_1.default.db.aggregate([
+        return StorageModel.db.aggregate([
             {
                 $match: {
                     company,
@@ -713,7 +707,7 @@ class StorageService extends Immutable_class_1.default {
             .then((data) => (data.length ? data[0] : null));
     }
     content(company, project, id) {
-        return storage_model_1.default.db.aggregate([
+        return StorageModel.db.aggregate([
             {
                 $match: {
                     company,
@@ -750,7 +744,7 @@ class StorageService extends Immutable_class_1.default {
      * checks if the file was already successfully uploaded
      */
     exists(filename, prefix, app, options) {
-        return storage_model_1.default.db.countDocuments({
+        return StorageModel.db.countDocuments({
             company: options.company,
             project: options.project,
             filename,
@@ -808,15 +802,15 @@ class StorageService extends Immutable_class_1.default {
                 },
             },
         ];
-        return storage_model_1.default.db.aggregate(aggregation).toArray()
+        return StorageModel.db.aggregate(aggregation).toArray()
             .then((value) => value[0] || { files: 0, size: 0 });
     }
     getByInternalId(internalId, options) {
-        return storage_model_1.default.db.findOne({ _id: internalId, company: options.company, project: options.project });
+        return StorageModel.db.findOne({ _id: internalId, company: options.company, project: options.project });
     }
     getPathByFilename(filename, app, options) {
-        const filenameObject = (0, filenameHelper_1.default)(filename);
-        return storage_model_1.default.db.findOne({
+        const filenameObject = filenameHelper(filename);
+        return StorageModel.db.findOne({
             filename: filenameObject.filename,
             prefix: filenameObject.directory,
             company: options.company,
@@ -827,7 +821,7 @@ class StorageService extends Immutable_class_1.default {
         });
     }
     getByFilename(filename, prefix, bucket, options) {
-        return storage_model_1.default.db.findOne({
+        return StorageModel.db.findOne({
             filename,
             prefix,
             company: options.company,
@@ -839,7 +833,7 @@ class StorageService extends Immutable_class_1.default {
         const storage = await this.model.db.findOne({ _id: internalId, company: options.company, project: options.project });
         if (!storage)
             throw new Error('BLOB_NOT_FOUND');
-        await fs_1.default.promises.unlink(`${this.options.dataFolder}/${storage.path}`);
+        await fs.promises.unlink(`${this.options.dataFolder}/${storage.path}`);
         await this.removeBlobVersion(internalId, options);
         return this.delete(internalId, options.user, options.app);
     }
@@ -847,14 +841,13 @@ class StorageService extends Immutable_class_1.default {
         const versions = await this.model.db.find({ parent: parentId, company: options.company, project: options.project }).toArray();
         if (versions.length) {
             await Promise.allSettled(versions.map(async (single) => {
-                await fs_1.default.promises.unlink(`${this.options.dataFolder}/${single.path}`);
+                await fs.promises.unlink(`${this.options.dataFolder}/${single.path}`);
                 return this.delete(single._id, options.user, options.app);
             }));
         }
     }
 }
-exports.StorageService = StorageService;
-exports.default = new StorageService({
+export default new StorageService({
     dataFolder: process.env.MEDIA_FOLDERS_DATA,
     uploadFolder: process.env.MEDIA_FOLDERS_UPLOAD,
 });

package/lib/src/services/storage.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage.service.js","sourceRoot":"","sources":["../../../src/services/storage.service.ts"],"names":[],"mappings":"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"}

package/lib/{cjs/src → src}/services/structures.service.d.ts

@@ -2,9 +2,8 @@ import { ObjectId } from 'mongodb';
 import Immutable from '../Immutable.class';
 import { BasicData, HistoryReason, ObjectIdString, Options, SkipLimitSort, Structure, UserAppWithOptions } from '@lilaquadrat/interfaces';
 import Ajv, { SchemaObject, ValidateFunction } from 'ajv';
-import Model from '../classes/modelv2.class';
 export declare class StructureService extends Immutable<Structure> {
-    model: Model<Structure, string>;
+    model: import("../classes/modelv2.class").default<Structure, string>;
     ajv: Ajv;
     injectAjv(ajv: Ajv): void;
     getByModel(model: Structure['model'], options: Options): Promise<import("mongodb").WithId<Structure>[]>;

package/lib/{cjs/src → src}/services/structures.service.js

@@ -1,17 +1,11 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.StructureService = void 0;
-const mongodb_1 = require("mongodb");
-const Immutable_class_1 = __importDefault(require("../Immutable.class"));
-const structure_model_1 = __importDefault(require("../models/structure.model"));
-const safeObjectId_1 = __importDefault(require("../helpers/safeObjectId"));
-class StructureService extends Immutable_class_1.default {
+import { ObjectId } from 'mongodb';
+import Immutable from '../Immutable.class';
+import StructureModel from '../models/structure.model';
+import safeObjectId from '../helpers/safeObjectId';
+export class StructureService extends Immutable {
     constructor() {
         super(...arguments);
-        this.model = structure_model_1.default;
+        this.model = StructureModel;
         // createWithUniqueId(
         //   data: BasicData<Structure> | Structure,
         //   user: string,
@@ -131,12 +125,12 @@ class StructureService extends Immutable_class_1.default {
          */
         const query = { $or: [
                 {
-                    _id: (0, safeObjectId_1.default)(id),
+                    _id: safeObjectId(id),
                     company: options.company,
                     model: 'customers',
                 },
                 {
-                    _id: (0, safeObjectId_1.default)(id),
+                    _id: safeObjectId(id),
                     company: options.company,
                     project: options.project,
                 },
@@ -144,7 +138,7 @@ class StructureService extends Immutable_class_1.default {
         return this.model.db.findOne(query);
     }
     async byMultipleInternalIds(ids, options) {
-        const objectIds = ids.map(id => new mongodb_1.ObjectId(id));
+        const objectIds = ids.map(id => new ObjectId(id));
         const query = { $or: [
                 {
                     _id: { $in: objectIds },
@@ -262,6 +256,5 @@ class StructureService extends Immutable_class_1.default {
         return this.immutable(internalId, body, userId, reason, app, undefined, undefined, `change-${dbStrucure.type}`);
     }
 }
-exports.StructureService = StructureService;
-exports.default = new StructureService();
+export default new StructureService();
 //# sourceMappingURL=structures.service.js.map

package/lib/src/services/structures.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"structures.service.js","sourceRoot":"","sources":["../../../src/services/structures.service.ts"],"names":[],"mappings":"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"}

package/lib/{cjs/src → src}/services/universal.service.js

@@ -1,7 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const main_1 = require("../../main");
-class UniversalService extends main_1.Immutable {
+import { Immutable, ControllerBase } from '../../main';
+export default class UniversalService extends Immutable {
     constructor(model) {
         super();
         this.limit = 30;
@@ -52,7 +50,7 @@ class UniversalService extends main_1.Immutable {
          */
         if (site)
             realSite = site - 1;
-        const skipLimit = main_1.ControllerBase.getLimit(realSite, limit, this.limit);
+        const skipLimit = ControllerBase.getLimit(realSite, limit, this.limit);
         if (select) {
             realSelect = { ...select };
         }
@@ -141,5 +139,4 @@ class UniversalService extends main_1.Immutable {
         return realQuery;
     }
 }
-exports.default = UniversalService;
 //# sourceMappingURL=universal.service.js.map

package/lib/src/services/universal.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"universal.service.js","sourceRoot":"","sources":["../../../src/services/universal.service.ts"],"names":[],"mappings":"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"}

package/lib/src/services/upload.service.js

@@ -0,0 +1,65 @@
+import UploadModel from '../models/upload.model';
+import ImmutableError from '../classes/errors/Immutable.error';
+import filenameHelper from '../helpers/filenameHelper';
+import cleanObject from '../helpers/cleanObject';
+import StorageService from './storage.service';
+export class UploadService {
+    async single(uploadInternalId) {
+        return UploadModel.db.findOne({ _id: uploadInternalId, state: { $ne: 'finished' } });
+    }
+    async create(filename, size, chunks, mimetype, app, customer, list, options) {
+        const filenameObject = filenameHelper(filename);
+        if (options.overwrite !== true && await StorageService.exists(filenameObject.filename, filenameObject.directory, app, options)) {
+            throw new Error('FILE_EXISTS');
+        }
+        const content = cleanObject({
+            filename: filenameObject.filename,
+            prefix: filenameObject.directory,
+            size,
+            chunks,
+            mimetype,
+            state: 'uploading',
+            updated: new Date(),
+            app,
+            list,
+            customer,
+            company: options.company,
+            project: options.project,
+            user: options.user,
+            options: {
+                thumbnails: options.thumbnails,
+                overwrite: options.overwrite,
+            },
+        });
+        const selectQuery = cleanObject({
+            filename: filenameObject.filename,
+            prefix: filenameObject.directory,
+            company: options.company,
+            project: options.project,
+            list,
+            customer,
+            app,
+        });
+        const validation = UploadModel.validate(content, 'create');
+        if (!validation) {
+            console.error(UploadModel.compiledTypes.create.errors);
+            throw new ImmutableError('VALIDATION_FAILED', UploadModel.compiledTypes.create.errors);
+        }
+        const insert = await UploadModel.db.findOneAndUpdate(selectQuery, { $set: content }, { upsert: true, returnDocument: 'after' });
+        return insert?._id;
+    }
+    async addPathToUpload(internalId, index, path) {
+        return UploadModel.db.findOneAndUpdate({ _id: internalId }, { $addToSet: { paths: { path, index } }, $set: { updated: new Date() } }, { returnDocument: 'after' });
+    }
+    async setState(internalId, state) {
+        return UploadModel.db.updateOne({ _id: internalId }, { $set: { state } });
+    }
+    async exists(company, project, filename) {
+        return UploadModel.db.countDocuments({
+            company, project, filename,
+        })
+            .then((exists) => exists >= 1);
+    }
+}
+export default new UploadService();
+//# sourceMappingURL=upload.service.js.map

package/lib/src/services/upload.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"upload.service.js","sourceRoot":"","sources":["../../../src/services/upload.service.ts"],"names":[],"mappings":"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"}

package/lib/{cjs/src → src}/services/webhooks-calls.service.js

@@ -1,16 +1,10 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebhooksCallsService = void 0;
-const webhook_call_model_1 = __importDefault(require("../models/webhook-call.model"));
-const Immutable_class_1 = __importDefault(require("../Immutable.class"));
-const mongodb_1 = require("mongodb");
-class WebhooksCallsService extends Immutable_class_1.default {
+import WebhookCallModel from '../models/webhook-call.model';
+import Immutable from '../Immutable.class';
+import { ObjectId } from 'mongodb';
+export class WebhooksCallsService extends Immutable {
     constructor() {
         super(...arguments);
-        this.model = webhook_call_model_1.default;
+        this.model = WebhookCallModel;
     }
     updateImportIds(importData, options) {
         const idMapping = {};
@@ -19,7 +13,7 @@ class WebhooksCallsService extends Immutable_class_1.default {
                */
         importData.map((single) => {
             const originalId = single._id?.toString();
-            const newId = new mongodb_1.ObjectId();
+            const newId = new ObjectId();
             single._id = newId;
             single.company = options.company;
             single.project = options.project;
@@ -34,7 +28,7 @@ class WebhooksCallsService extends Immutable_class_1.default {
         const bulk = this.model.db.initializeUnorderedBulkOp();
         importHistoryData.map((single) => {
             const newParentId = idMapping[single.history.parent?.toString()];
-            single._id = new mongodb_1.ObjectId();
+            single._id = new ObjectId();
             /**
                      * update the parent id
                      */
@@ -54,6 +48,5 @@ class WebhooksCallsService extends Immutable_class_1.default {
         return { bulk };
     }
 }
-exports.WebhooksCallsService = WebhooksCallsService;
-exports.default = new WebhooksCallsService();
+export default new WebhooksCallsService();
 //# sourceMappingURL=webhooks-calls.service.js.map

package/lib/src/services/webhooks-calls.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"webhooks-calls.service.js","sourceRoot":"","sources":["../../../src/services/webhooks-calls.service.ts"],"names":[],"mappings":"AACA,OAAO,gBAAgB,MAAM,8BAA8B,CAAC;AAC5D,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAA0B,MAAM,SAAS,CAAC;AAE3D,MAAM,OAAO,oBAAqB,SAAQ,SAAsB;IAAhE;;QAEE,UAAK,GAAG,gBAAgB,CAAC;IAkE3B,CAAC;IAhEC,eAAe,CAAC,UAAoC,EAAE,OAA0B;QAE9E,MAAM,SAAS,GAA6B,EAAE,CAAC;QAC/C;;iBAES;QACT,UAAU,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YAExB,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,EAAE,QAAQ,EAAY,CAAC;YACpD,MAAM,KAAK,GAAG,IAAI,QAAQ,EAAE,CAAC;YAC7B,MAAM,CAAC,GAAG,GAAG,KAAK,CAAC;YACnB,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;YACjC,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;YAEjC,SAAS,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC;QAEhC,CAAC,CAAC,CAAC;QAEH,OAAO,SAAS,CAAC;IAEnB,CAAC;IAED,MAAM,CAAC,OAAgB;QAErB,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;IAE9F,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,UAAoC,EAAE,iBAAqD,EAAE,SAAmC,EAAE,WAAmC,EAAE,OAA0B;QAE5M,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,yBAAyB,EAAE,CAAC;QAEvD,iBAAiB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YAE/B,MAAM,WAAW,GAAG,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;YACjE,MAAM,CAAC,GAAG,GAAG,IAAI,QAAQ,EAAE,CAAC;YAC5B;;uBAEW;YACX,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,WAAW,CAAC;YACpC;;uBAEW;YACX,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;YACjC,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAEnC,CAAC,CAAC,CAAC;QAEH,UAAU,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YAExB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAEtB,CAAC,CAAC,CAAC;QAEH,iBAAiB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YAE/B,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAE7B,CAAC,CAAC,CAAC;QAEH,OAAO,EAAE,IAAI,EAAE,CAAC;IAElB,CAAC;CAEF;AAED,eAAe,IAAI,oBAAoB,EAAE,CAAC"}

package/lib/{cjs/tests → tests}/editorService.spec.js

@@ -1,12 +1,7 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const mongo_mock_1 = __importDefault(require("mongo-mock"));
-const models_class_1 = __importDefault(require("../src/classes/models.class"));
-const editor_model_1 = __importDefault(require("../src/models/editor.model"));
-const mongoClient = mongo_mock_1.default.MongoClient;
+import mongodb from 'mongo-mock';
+import Models from '../src/classes/models.class';
+import EditorModel from '../src/models/editor.model';
+const mongoClient = mongodb.MongoClient;
 const json = {
     "settings": { "title": "Einfach", "filename": ["performance", "einfach", "einfachheit", "simplicity"], "mode": "presentation" },
     "modules": [],
@@ -27,8 +22,8 @@ describe('editorService', () => {
         if (client)
             await client.close(true);
         client = await mongoClient.connect('mongodb://localhost:27017/myproject');
-        models = new models_class_1.default();
-        model = editor_model_1.default;
+        models = new Models();
+        model = EditorModel;
         await model.setMongoConnection(client, undefined, true);
         models.register('editor', model);
         await models.injectDatabaseConnection(client, undefined, true);