@fdm-monster/server 2.0.0-rc1 → 2.0.1

package/dist/services/file-analysis.service.js

@@ -0,0 +1,146 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "FileAnalysisService", {
+    enumerable: true,
+    get: function() {
+        return FileAnalysisService;
+    }
+});
+const _gcodeparser = require("../utils/parsers/gcode.parser");
+const _3mfparser = require("../utils/parsers/3mf.parser");
+const _bgcodeparser = require("../utils/parsers/bgcode.parser");
+const _nodepath = require("node:path");
+const _promises = require("node:fs/promises");
+class FileAnalysisService {
+    logger;
+    FILE_FORMATS = {
+        GCODE: "gcode",
+        THREE_MF: "3mf",
+        BGCODE: "bgcode"
+    };
+    EXTENSIONS = {
+        THREE_MF: ".3mf",
+        BGCODE: ".bgcode",
+        GCODE: ".gcode",
+        GCODE_SHORT: ".g",
+        GCODE_ALT: ".gco",
+        GCODE_THREE_MF: ".gcode.3mf"
+    };
+    gcodeParser;
+    threemfParser;
+    bgcodeParser;
+    constructor(loggerFactory){
+        this.logger = loggerFactory(FileAnalysisService.name);
+        this.gcodeParser = new _gcodeparser.GCodeParser();
+        this.threemfParser = new _3mfparser.ThreeMFParser();
+        this.bgcodeParser = new _bgcodeparser.BGCodeParser();
+        this.logger.log("File analysis service initialized with all parsers");
+    }
+    async analyzeFile(filePath) {
+        const ext = (0, _nodepath.extname)(filePath).toLowerCase();
+        const fileFormat = this.getFileFormat(ext, filePath);
+        this.logger.log(`Analyzing file: ${(0, _nodepath.basename)(filePath)} (format: ${fileFormat}, ext: ${ext})`);
+        let result;
+        try {
+            switch(fileFormat){
+                case this.FILE_FORMATS.GCODE:
+                    result = await this.analyzeGCode(filePath);
+                    break;
+                case this.FILE_FORMATS.THREE_MF:
+                    result = await this.analyze3MF(filePath);
+                    break;
+                case this.FILE_FORMATS.BGCODE:
+                    result = await this.analyzeBGCode(filePath);
+                    break;
+                default:
+                    throw new Error(`Unsupported file format: ${fileFormat}`);
+            }
+            const thumbnails = this.extractThumbnails(result);
+            return {
+                metadata: result.normalized,
+                thumbnails
+            };
+        } catch (error) {
+            this.logger.error(`Failed to analyze file ${filePath} (ext: "${ext}"): ${error}`);
+            throw error;
+        }
+    }
+    async analyzeMultiPlate3MF(filePath) {
+        const result = await this.analyze3MF(filePath);
+        if (!result.normalized.isMultiPlate || !result.plates) {
+            return [
+                {
+                    metadata: result.normalized,
+                    thumbnails: this.extractThumbnails(result)
+                }
+            ];
+        }
+        return result.plates.map((plate)=>({
+                metadata: {
+                    ...result.normalized,
+                    plateNumber: plate.plateNumber,
+                    gcodePrintTimeSeconds: plate.gcodePrintTimeSeconds,
+                    filamentUsedGrams: plate.filamentUsedGrams,
+                    totalLayers: plate.totalLayers
+                },
+                thumbnails: plate.thumbnails?.map((t)=>({
+                        width: t.width || 0,
+                        height: t.height || 0,
+                        format: t.type || t.format || "PNG"
+                    })) || []
+            }));
+    }
+    async analyzeGCode(filePath) {
+        return await this.gcodeParser.parse(filePath);
+    }
+    async analyze3MF(filePath) {
+        return await this.threemfParser.parse(filePath);
+    }
+    async analyzeBGCode(filePath) {
+        return await this.bgcodeParser.parse(filePath);
+    }
+    extractThumbnails(result) {
+        const thumbnails = [];
+        if (result.raw._thumbnails) {
+            for (const thumb of result.raw._thumbnails){
+                thumbnails.push({
+                    width: thumb.width,
+                    height: thumb.height,
+                    format: thumb.format,
+                    data: thumb.data
+                });
+            }
+        }
+        return thumbnails;
+    }
+    getFileFormat(ext, filePath) {
+        const lowerPath = filePath.toLowerCase();
+        if (lowerPath.endsWith(this.EXTENSIONS.GCODE_THREE_MF) || lowerPath.endsWith(this.EXTENSIONS.THREE_MF)) {
+            return this.FILE_FORMATS.THREE_MF;
+        }
+        if (lowerPath.endsWith(this.EXTENSIONS.BGCODE)) {
+            return this.FILE_FORMATS.BGCODE;
+        }
+        if (lowerPath.endsWith(this.EXTENSIONS.GCODE) || lowerPath.endsWith(this.EXTENSIONS.GCODE_SHORT) || lowerPath.endsWith(this.EXTENSIONS.GCODE_ALT)) {
+            return this.FILE_FORMATS.GCODE;
+        }
+        if (ext === this.EXTENSIONS.THREE_MF) return this.FILE_FORMATS.THREE_MF;
+        if (ext === this.EXTENSIONS.BGCODE) return this.FILE_FORMATS.BGCODE;
+        if (ext === this.EXTENSIONS.GCODE || ext === this.EXTENSIONS.GCODE_SHORT || ext === this.EXTENSIONS.GCODE_ALT) {
+            return this.FILE_FORMATS.GCODE;
+        }
+        throw new Error(`Unknown file extension: "${ext}" (path: "${filePath}")`);
+    }
+    async needsAnalysis(filePath) {
+        try {
+            await (0, _promises.access)(filePath);
+            return true;
+        } catch  {
+            return false;
+        }
+    }
+}
+
+//# sourceMappingURL=file-analysis.service.js.map

package/dist/services/file-analysis.service.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/services/file-analysis.service.ts"],"names":["FileAnalysisService","logger","FILE_FORMATS","GCODE","THREE_MF","BGCODE","EXTENSIONS","GCODE_SHORT","GCODE_ALT","GCODE_THREE_MF","gcodeParser","threemfParser","bgcodeParser","loggerFactory","name","GCodeParser","ThreeMFParser","BGCodeParser","log","analyzeFile","filePath","ext","extname","toLowerCase","fileFormat","getFileFormat","basename","result","analyzeGCode","analyze3MF","analyzeBGCode","Error","thumbnails","extractThumbnails","metadata","normalized","error","analyzeMultiPlate3MF","isMultiPlate","plates","map","plate","plateNumber","gcodePrintTimeSeconds","filamentUsedGrams","totalLayers","t","width","height","format","type","parse","raw","_thumbnails","thumb","push","data","lowerPath","endsWith","needsAnalysis","access"],"mappings":"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"}

package/dist/services/file-storage.service.js

@@ -0,0 +1,387 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "FileStorageService", {
+    enumerable: true,
+    get: function() {
+        return FileStorageService;
+    }
+});
+const _printjobentity = require("../entities/print-job.entity");
+const _serverconstants = require("../server.constants");
+const _fsutils = require("../utils/fs.utils");
+const _nodepath = /*#__PURE__*/ _interop_require_wildcard(require("node:path"));
+const _promises = require("node:fs/promises");
+const _nodecrypto = require("node:crypto");
+const _nodefs = require("node:fs");
+function _getRequireWildcardCache(nodeInterop) {
+    if (typeof WeakMap !== "function") return null;
+    var cacheBabelInterop = new WeakMap();
+    var cacheNodeInterop = new WeakMap();
+    return (_getRequireWildcardCache = function(nodeInterop) {
+        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
+    })(nodeInterop);
+}
+function _interop_require_wildcard(obj, nodeInterop) {
+    if (!nodeInterop && obj && obj.__esModule) {
+        return obj;
+    }
+    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
+        return {
+            default: obj
+        };
+    }
+    var cache = _getRequireWildcardCache(nodeInterop);
+    if (cache && cache.has(obj)) {
+        return cache.get(obj);
+    }
+    var newObj = {
+        __proto__: null
+    };
+    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
+    for(var key in obj){
+        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
+            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
+            if (desc && (desc.get || desc.set)) {
+                Object.defineProperty(newObj, key, desc);
+            } else {
+                newObj[key] = obj[key];
+            }
+        }
+    }
+    newObj.default = obj;
+    if (cache) {
+        cache.set(obj, newObj);
+    }
+    return newObj;
+}
+class FileStorageService {
+    printJobRepository;
+    logger;
+    storageBasePath;
+    STORAGE_SUBDIRS = [
+        "gcode",
+        "3mf",
+        "bgcode"
+    ];
+    constructor(loggerFactory, typeormService){
+        this.printJobRepository = typeormService.getDataSource().getRepository(_printjobentity.PrintJob);
+        this.logger = loggerFactory(FileStorageService.name);
+        this.storageBasePath = (0, _nodepath.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultPrintFilesStorage);
+    }
+    async ensureStorageDirectories() {
+        try {
+            await (0, _promises.mkdir)(this.storageBasePath, {
+                recursive: true
+            });
+            for (const subdir of this.STORAGE_SUBDIRS){
+                await (0, _promises.mkdir)((0, _nodepath.join)(this.storageBasePath, subdir), {
+                    recursive: true
+                });
+            }
+        } catch (error) {
+            this.logger.error("Failed to create storage directories", error);
+        }
+    }
+    readFile(fileStorageId) {
+        const filePath = this.getFilePath(fileStorageId);
+        return (0, _nodefs.readFileSync)(filePath);
+    }
+    async saveFile(file, fileHash) {
+        const fileExt = (0, _nodepath.extname)(file.originalname).toLowerCase();
+        let fileId;
+        if (fileHash) {
+            const nameHash = (0, _nodecrypto.createHash)('sha256').update(fileHash + file.originalname).digest('hex').substring(0, 32);
+            fileId = `${nameHash.substring(0, 8)}-${nameHash.substring(8, 12)}-${nameHash.substring(12, 16)}-${nameHash.substring(16, 20)}-${nameHash.substring(20, 32)}`;
+        } else {
+            fileId = crypto.randomUUID();
+        }
+        let subdir = "gcode";
+        if (fileExt === ".3mf" || file.originalname.includes(".gcode.3mf")) {
+            subdir = "3mf";
+        } else if (fileExt === ".bgcode") {
+            subdir = "bgcode";
+        }
+        const targetDir = (0, _nodepath.join)(this.storageBasePath, subdir);
+        const targetPath = (0, _nodepath.join)(targetDir, `${fileId}${fileExt}`);
+        if (file.path) {
+            await (0, _promises.rename)(file.path, targetPath);
+        } else if (file.buffer) {
+            await (0, _promises.writeFile)(targetPath, file.buffer);
+        } else {
+            throw new Error("File has no path or buffer");
+        }
+        this.logger.log(`Saved file ${file.originalname} as ${fileId}`);
+        return fileId;
+    }
+    async getFile(fileStorageId) {
+        const filePath = await this.findFilePath(fileStorageId);
+        if (!filePath) {
+            throw new Error(`File ${fileStorageId} not found in storage`);
+        }
+        return (0, _promises.readFile)(filePath);
+    }
+    async deleteFile(fileStorageId) {
+        const filePath = await this.findFilePath(fileStorageId);
+        if (!filePath) {
+            this.logger.warn(`File ${fileStorageId} not found, cannot delete`);
+            return;
+        }
+        await (0, _promises.unlink)(filePath);
+        const metadataPath = filePath + ".json";
+        try {
+            await (0, _promises.unlink)(metadataPath);
+            this.logger.debug(`Deleted metadata JSON for ${fileStorageId}`);
+        } catch  {}
+        const thumbnailDir = filePath.replace(/\.(gcode|3mf|bgcode)$/i, '_thumbnails');
+        try {
+            await (0, _promises.rm)(thumbnailDir, {
+                recursive: true,
+                force: true
+            });
+            this.logger.debug(`Deleted thumbnails for ${fileStorageId}`);
+        } catch  {}
+        this.logger.log(`Deleted file ${fileStorageId}`);
+    }
+    getFilePath(fileStorageId) {
+        for (const subdir of this.STORAGE_SUBDIRS){
+            for (const ext of [
+                ".gcode",
+                ".3mf",
+                ".bgcode",
+                ""
+            ]){
+                const fullPath = (0, _nodepath.join)(this.storageBasePath, subdir, fileStorageId + ext);
+                if ((0, _nodefs.existsSync)(fullPath)) {
+                    return fullPath;
+                }
+            }
+        }
+        return (0, _nodepath.join)(this.storageBasePath, "gcode", fileStorageId);
+    }
+    async calculateFileHash(filePath) {
+        const fileBuffer = await (0, _promises.readFile)(filePath);
+        const hashSum = (0, _nodecrypto.createHash)("sha256");
+        hashSum.update(fileBuffer);
+        return hashSum.digest("hex");
+    }
+    getDeterministicId(fileHash, fileName) {
+        const nameHash = (0, _nodecrypto.createHash)('sha256').update(fileHash + fileName).digest('hex').substring(0, 32);
+        return `${nameHash.substring(0, 8)}-${nameHash.substring(8, 12)}-${nameHash.substring(12, 16)}-${nameHash.substring(16, 20)}-${nameHash.substring(20, 32)}`;
+    }
+    async findFilePath(fileStorageId) {
+        for (const subdir of this.STORAGE_SUBDIRS){
+            const dirPath = (0, _nodepath.join)(this.storageBasePath, subdir);
+            try {
+                const files = await (0, _promises.readdir)(dirPath);
+                const matchingFile = files.find((f)=>f.startsWith(fileStorageId));
+                if (matchingFile) {
+                    return (0, _nodepath.join)(dirPath, matchingFile);
+                }
+            } catch  {}
+        }
+        return null;
+    }
+    async fileExists(fileStorageId) {
+        const filePath = await this.findFilePath(fileStorageId);
+        return filePath !== null;
+    }
+    async findDuplicateByHash(fileHash) {
+        return this.printJobRepository.findOne({
+            where: {
+                fileHash
+            },
+            order: {
+                createdAt: "DESC"
+            }
+        });
+    }
+    async saveMetadata(fileStorageId, metadata, fileHash, originalFileName, thumbnailMetadata) {
+        const filePath = await this.findFilePath(fileStorageId);
+        if (!filePath) {
+            this.logger.warn(`Cannot save metadata - file ${fileStorageId} not found`);
+            return;
+        }
+        const metadataPath = filePath + ".json";
+        let existingOriginalFileName = originalFileName;
+        let existingThumbnails = thumbnailMetadata;
+        try {
+            const existingContent = await (0, _promises.readFile)(metadataPath, "utf8");
+            const existing = JSON.parse(existingContent);
+            if (existing._originalFileName && !originalFileName) {
+                existingOriginalFileName = existing._originalFileName;
+            }
+            if (existing._thumbnails && !thumbnailMetadata) {
+                existingThumbnails = existing._thumbnails;
+            }
+        } catch  {}
+        const metadataWithMeta = {
+            ...metadata,
+            _fileHash: fileHash || null,
+            _analyzedAt: new Date().toISOString(),
+            _fileStorageId: fileStorageId,
+            _originalFileName: existingOriginalFileName || metadata.fileName || null,
+            _thumbnails: existingThumbnails || []
+        };
+        await (0, _promises.writeFile)(metadataPath, JSON.stringify(metadataWithMeta, null, 2), "utf8");
+        const thumbnailMeta = thumbnailMetadata ? ` with ${thumbnailMetadata.length} thumbnail(s)` : '';
+        this.logger.debug(`Saved metadata for ${fileStorageId}${thumbnailMeta}`);
+    }
+    async loadMetadata(fileStorageId) {
+        const filePath = await this.findFilePath(fileStorageId);
+        if (!filePath) {
+            return null;
+        }
+        const metadataPath = filePath + ".json";
+        try {
+            const content = await (0, _promises.readFile)(metadataPath, "utf8");
+            return JSON.parse(content);
+        } catch (error) {
+            return null;
+        }
+    }
+    async hasMetadata(fileStorageId) {
+        const filePath = await this.findFilePath(fileStorageId);
+        if (!filePath) {
+            return false;
+        }
+        const metadataPath = filePath + ".json";
+        try {
+            await (0, _promises.access)(metadataPath);
+            return true;
+        } catch  {
+            return false;
+        }
+    }
+    async saveThumbnails(fileStorageId, thumbnails) {
+        const savedThumbnails = [];
+        if (!thumbnails || thumbnails.length === 0) {
+            return savedThumbnails;
+        }
+        const filePath = await this.findFilePath(fileStorageId);
+        if (!filePath) {
+            this.logger.warn(`Cannot save thumbnails - file ${fileStorageId} not found`);
+            return savedThumbnails;
+        }
+        const thumbnailDir = filePath.replace(/\.(gcode|3mf|bgcode)$/i, '_thumbnails');
+        try {
+            await (0, _promises.rm)(thumbnailDir, {
+                recursive: true,
+                force: true
+            });
+            this.logger.debug(`Cleared old thumbnails for ${fileStorageId}`);
+        } catch  {}
+        await (0, _promises.mkdir)(thumbnailDir, {
+            recursive: true
+        });
+        for(let i = 0; i < thumbnails.length; i++){
+            const thumb = thumbnails[i];
+            if (!thumb.data) continue;
+            const ext = thumb.format?.toLowerCase() || 'png';
+            const filename = `thumb_${i}.${ext}`;
+            const thumbPath = (0, _nodepath.join)(thumbnailDir, filename);
+            try {
+                const buffer = Buffer.from(thumb.data, 'base64');
+                await (0, _promises.writeFile)(thumbPath, buffer);
+                const relativePath = _nodepath.default.relative(this.storageBasePath, thumbPath);
+                savedThumbnails.push({
+                    index: i,
+                    path: relativePath,
+                    filename,
+                    width: thumb.width || 0,
+                    height: thumb.height || 0,
+                    format: ext,
+                    size: buffer.length
+                });
+                this.logger.debug(`Saved thumbnail ${i} for ${fileStorageId} (${thumb.width}x${thumb.height}, ${buffer.length} bytes)`);
+            } catch (error) {
+                this.logger.warn(`Failed to save thumbnail ${i} for ${fileStorageId}: ${error}`);
+            }
+        }
+        return savedThumbnails;
+    }
+    async getThumbnail(fileStorageId, index) {
+        const filePath = await this.findFilePath(fileStorageId);
+        if (!filePath) return null;
+        const thumbnailDir = filePath.replace(/\.(gcode|3mf|bgcode)$/i, '_thumbnails');
+        for (const ext of [
+            'png',
+            'jpg',
+            'jpeg',
+            'qoi'
+        ]){
+            const thumbPath = (0, _nodepath.join)(thumbnailDir, `thumb_${index}.${ext}`);
+            try {
+                return await (0, _promises.readFile)(thumbPath);
+            } catch  {}
+        }
+        return null;
+    }
+    async listThumbnails(fileStorageId) {
+        const filePath = await this.findFilePath(fileStorageId);
+        if (!filePath) return [];
+        const thumbnailDir = filePath.replace(/\.(gcode|3mf|bgcode)$/i, '_thumbnails');
+        try {
+            const files = await (0, _promises.readdir)(thumbnailDir);
+            return files.filter((f)=>f.startsWith('thumb_')).sort((a, b)=>a.localeCompare(b));
+        } catch  {
+            return [];
+        }
+    }
+    async listAllFiles() {
+        const files = [];
+        for (const subdir of this.STORAGE_SUBDIRS){
+            const dirPath = (0, _nodepath.join)(this.storageBasePath, subdir);
+            try {
+                const dirFiles = await (0, _promises.readdir)(dirPath);
+                for (const file of dirFiles){
+                    if (file.endsWith('_thumbnails') || file.endsWith('.json')) continue;
+                    const fileId = _nodepath.default.parse(file).name;
+                    const filePath = (0, _nodepath.join)(dirPath, file);
+                    const stats = await (0, _promises.stat)(filePath);
+                    const metadata = await this.loadMetadata(fileId);
+                    const thumbnails = await this.listThumbnails(fileId);
+                    files.push({
+                        fileStorageId: fileId,
+                        fileName: metadata?._fileName || file,
+                        fileFormat: subdir,
+                        fileSize: stats.size,
+                        fileHash: metadata?._fileHash || '',
+                        createdAt: stats.birthtime,
+                        thumbnailCount: thumbnails.length,
+                        metadata: metadata
+                    });
+                }
+            } catch (error) {
+                this.logger.error(`Error listing files in ${subdir}`, error);
+            }
+        }
+        return files.sort((a, b)=>b.createdAt.getTime() - a.createdAt.getTime());
+    }
+    async getFileInfo(fileStorageId) {
+        const filePath = await this.findFilePath(fileStorageId);
+        if (!filePath) return null;
+        try {
+            const stats = await (0, _promises.stat)(filePath);
+            const metadata = await this.loadMetadata(fileStorageId);
+            const thumbnails = await this.listThumbnails(fileStorageId);
+            const ext = (0, _nodepath.extname)(filePath).substring(1);
+            return {
+                fileStorageId,
+                fileName: metadata?._originalFileName || (0, _nodepath.basename)(filePath),
+                fileFormat: ext,
+                fileSize: stats.size,
+                fileHash: metadata?._fileHash || '',
+                createdAt: stats.birthtime,
+                thumbnailCount: thumbnails.length,
+                metadata: metadata
+            };
+        } catch (error) {
+            this.logger.error(`Error getting file info for ${fileStorageId}`, error);
+            return null;
+        }
+    }
+}
+
+//# sourceMappingURL=file-storage.service.js.map

package/dist/services/file-storage.service.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/services/file-storage.service.ts"],"names":["FileStorageService","printJobRepository","logger","storageBasePath","STORAGE_SUBDIRS","loggerFactory","typeormService","getDataSource","getRepository","PrintJob","name","join","superRootPath","AppConstants","defaultPrintFilesStorage","ensureStorageDirectories","mkdir","recursive","subdir","error","readFile","fileStorageId","filePath","getFilePath","readFileSync","saveFile","file","fileHash","fileExt","extname","originalname","toLowerCase","fileId","nameHash","createHash","update","digest","substring","crypto","randomUUID","includes","targetDir","targetPath","path","rename","buffer","writeFile","Error","log","getFile","findFilePath","deleteFile","warn","unlink","metadataPath","debug","thumbnailDir","replace","rm","force","ext","fullPath","existsSync","calculateFileHash","fileBuffer","hashSum","getDeterministicId","fileName","dirPath","files","readdir","matchingFile","find","f","startsWith","fileExists","findDuplicateByHash","findOne","where","order","createdAt","saveMetadata","metadata","originalFileName","thumbnailMetadata","existingOriginalFileName","existingThumbnails","existingContent","existing","JSON","parse","_originalFileName","_thumbnails","metadataWithMeta","_fileHash","_analyzedAt","Date","toISOString","_fileStorageId","stringify","thumbnailMeta","length","loadMetadata","content","hasMetadata","access","saveThumbnails","thumbnails","savedThumbnails","i","thumb","data","format","filename","thumbPath","Buffer","from","relativePath","relative","push","index","width","height","size","getThumbnail","listThumbnails","filter","sort","a","b","localeCompare","listAllFiles","dirFiles","endsWith","stats","stat","_fileName","fileFormat","fileSize","birthtime","thumbnailCount","getTime","getFileInfo","basename"],"mappings":";;;;+BA6BaA;;;eAAAA;;;gCA5BY;iCAGI;yBACC;kEACgB;0BACwC;4BAC3D;wBACc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAoBlC,MAAMA;IACXC,mBAAyC;IACxBC,OAAO;IACPC,gBAAwB;IACxBC,kBAAkB;QAAC;QAAS;QAAO;KAAS,CAAU;IAEvE,YAAYC,aAA6B,EAAEC,cAA8B,CAAE;QACzE,IAAI,CAACL,kBAAkB,GAAGK,eAAeC,aAAa,GAAGC,aAAa,CAACC,wBAAQ;QAC/E,IAAI,CAACP,MAAM,GAAGG,cAAcL,mBAAmBU,IAAI;QAEnD,IAAI,CAACP,eAAe,GAAGQ,IAAAA,cAAI,EAACC,IAAAA,sBAAa,KAAIC,6BAAY,CAACC,wBAAwB;IACpF;IAEA,MAAMC,2BAA2B;QAC/B,IAAI;YACF,MAAMC,IAAAA,eAAK,EAAC,IAAI,CAACb,eAAe,EAAE;gBAAEc,WAAW;YAAK;YACpD,KAAK,MAAMC,UAAU,IAAI,CAACd,eAAe,CAAE;gBACzC,MAAMY,IAAAA,eAAK,EAACL,IAAAA,cAAI,EAAC,IAAI,CAACR,eAAe,EAAEe,SAAS;oBAAED,WAAW;gBAAK;YACpE;QACF,EAAE,OAAOE,OAAO;YACd,IAAI,CAACjB,MAAM,CAACiB,KAAK,CAAC,wCAAwCA;QAC5D;IACF;IAKAC,SAASC,aAAqB,EAAU;QACtC,MAAMC,WAAW,IAAI,CAACC,WAAW,CAACF;QAClC,OAAOG,IAAAA,oBAAY,EAACF;IACtB;IAMA,MAAMG,SAASC,IAAyB,EAAEC,QAAiB,EAAmB;QAC5E,MAAMC,UAAUC,IAAAA,iBAAO,EAACH,KAAKI,YAAY,EAAEC,WAAW;QAGtD,IAAIC;QACJ,IAAIL,UAAU;YAEZ,MAAMM,WAAWC,IAAAA,sBAAU,EAAC,UACzBC,MAAM,CAACR,WAAWD,KAAKI,YAAY,EACnCM,MAAM,CAAC,OACPC,SAAS,CAAC,GAAG;YAChBL,SAAS,GAAGC,SAASI,SAAS,CAAC,GAAG,GAAG,CAAC,EAAEJ,SAASI,SAAS,CAAC,GAAG,IAAI,CAAC,EAAEJ,SAASI,SAAS,CAAC,IAAI,IAAI,CAAC,EAAEJ,SAASI,SAAS,CAAC,IAAI,IAAI,CAAC,EAAEJ,SAASI,SAAS,CAAC,IAAI,KAAK;QAC/J,OAAO;YAELL,SAASM,OAAOC,UAAU;QAC5B;QAGA,IAAIrB,SAAS;QACb,IAAIU,YAAY,UAAUF,KAAKI,YAAY,CAACU,QAAQ,CAAC,eAAe;YAClEtB,SAAS;QACX,OAAO,IAAIU,YAAY,WAAW;YAChCV,SAAS;QACX;QAEA,MAAMuB,YAAY9B,IAAAA,cAAI,EAAC,IAAI,CAACR,eAAe,EAAEe;QAC7C,MAAMwB,aAAa/B,IAAAA,cAAI,EAAC8B,WAAW,GAAGT,SAASJ,SAAS;QAGxD,IAAIF,KAAKiB,IAAI,EAAE;YAEb,MAAMC,IAAAA,gBAAM,EAAClB,KAAKiB,IAAI,EAAED;QAC1B,OAAO,IAAIhB,KAAKmB,MAAM,EAAE;YAEtB,MAAMC,IAAAA,mBAAS,EAACJ,YAAYhB,KAAKmB,MAAM;QACzC,OAAO;YACL,MAAM,IAAIE,MAAM;QAClB;QAEA,IAAI,CAAC7C,MAAM,CAAC8C,GAAG,CAAC,CAAC,WAAW,EAAEtB,KAAKI,YAAY,CAAC,IAAI,EAAEE,QAAQ;QAC9D,OAAOA;IACT;IAKA,MAAMiB,QAAQ5B,aAAqB,EAAmB;QACpD,MAAMC,WAAW,MAAM,IAAI,CAAC4B,YAAY,CAAC7B;QACzC,IAAI,CAACC,UAAU;YACb,MAAM,IAAIyB,MAAM,CAAC,KAAK,EAAE1B,cAAc,qBAAqB,CAAC;QAC9D;QAEA,OAAOD,IAAAA,kBAAQ,EAACE;IAClB;IAKA,MAAM6B,WAAW9B,aAAqB,EAAiB;QACrD,MAAMC,WAAW,MAAM,IAAI,CAAC4B,YAAY,CAAC7B;QACzC,IAAI,CAACC,UAAU;YACb,IAAI,CAACpB,MAAM,CAACkD,IAAI,CAAC,CAAC,KAAK,EAAE/B,cAAc,yBAAyB,CAAC;YACjE;QACF;QAGA,MAAMgC,IAAAA,gBAAM,EAAC/B;QAGb,MAAMgC,eAAehC,WAAW;QAChC,IAAI;YACF,MAAM+B,IAAAA,gBAAM,EAACC;YACb,IAAI,CAACpD,MAAM,CAACqD,KAAK,CAAC,CAAC,0BAA0B,EAAElC,eAAe;QAChE,EAAE,OAAM,CAER;QAGA,MAAMmC,eAAelC,SAASmC,OAAO,CAAC,0BAA0B;QAChE,IAAI;YACF,MAAMC,IAAAA,YAAE,EAACF,cAAc;gBAAEvC,WAAW;gBAAM0C,OAAO;YAAK;YACtD,IAAI,CAACzD,MAAM,CAACqD,KAAK,CAAC,CAAC,uBAAuB,EAAElC,eAAe;QAC7D,EAAE,OAAM,CAER;QAEA,IAAI,CAACnB,MAAM,CAAC8C,GAAG,CAAC,CAAC,aAAa,EAAE3B,eAAe;IACjD;IAKAE,YAAYF,aAAqB,EAAW;QAK1C,KAAK,MAAMH,UAAU,IAAI,CAACd,eAAe,CAAE;YACzC,KAAK,MAAMwD,OAAO;gBAAC;gBAAU;gBAAQ;gBAAW;aAAG,CAAE;gBACnD,MAAMC,WAAWlD,IAAAA,cAAI,EAAC,IAAI,CAACR,eAAe,EAAEe,QAAQG,gBAAgBuC;gBACpE,IAAIE,IAAAA,kBAAU,EAACD,WAAW;oBACxB,OAAOA;gBACT;YACF;QACF;QAGA,OAAOlD,IAAAA,cAAI,EAAC,IAAI,CAACR,eAAe,EAAE,SAASkB;IAC7C;IAKA,MAAM0C,kBAAkBzC,QAAgB,EAAmB;QACzD,MAAM0C,aAAa,MAAM5C,IAAAA,kBAAQ,EAACE;QAClC,MAAM2C,UAAU/B,IAAAA,sBAAU,EAAC;QAC3B+B,QAAQ9B,MAAM,CAAC6B;QACf,OAAOC,QAAQ7B,MAAM,CAAC;IACxB;IAMA8B,mBAAmBvC,QAAgB,EAAEwC,QAAgB,EAAU;QAC7D,MAAMlC,WAAWC,IAAAA,sBAAU,EAAC,UACzBC,MAAM,CAACR,WAAWwC,UAClB/B,MAAM,CAAC,OACPC,SAAS,CAAC,GAAG;QAChB,OAAO,GAAGJ,SAASI,SAAS,CAAC,GAAG,GAAG,CAAC,EAAEJ,SAASI,SAAS,CAAC,GAAG,IAAI,CAAC,EAAEJ,SAASI,SAAS,CAAC,IAAI,IAAI,CAAC,EAAEJ,SAASI,SAAS,CAAC,IAAI,IAAI,CAAC,EAAEJ,SAASI,SAAS,CAAC,IAAI,KAAK;IAC7J;IAKA,MAAca,aAAa7B,aAAqB,EAA0B;QACxE,KAAK,MAAMH,UAAU,IAAI,CAACd,eAAe,CAAE;YACzC,MAAMgE,UAAUzD,IAAAA,cAAI,EAAC,IAAI,CAACR,eAAe,EAAEe;YAC3C,IAAI;gBACF,MAAMmD,QAAQ,MAAMC,IAAAA,iBAAO,EAACF;gBAC5B,MAAMG,eAAeF,MAAMG,IAAI,CAACC,CAAAA,IAAKA,EAAEC,UAAU,CAACrD;gBAClD,IAAIkD,cAAc;oBAChB,OAAO5D,IAAAA,cAAI,EAACyD,SAASG;gBACvB;YACF,EAAE,OAAM,CAER;QACF;QAEA,OAAO;IACT;IAKA,MAAMI,WAAWtD,aAAqB,EAAoB;QACxD,MAAMC,WAAW,MAAM,IAAI,CAAC4B,YAAY,CAAC7B;QACzC,OAAOC,aAAa;IACtB;IAKA,MAAMsD,oBAAoBjD,QAAgB,EAA4B;QACpE,OAAO,IAAI,CAAC1B,kBAAkB,CAAC4E,OAAO,CAAC;YACrCC,OAAO;gBAAEnD;YAAS;YAClBoD,OAAO;gBAAEC,WAAW;YAAO;QAC7B;IACF;IAMA,MAAMC,aAAa5D,aAAqB,EAAE6D,QAAa,EAAEvD,QAAiB,EAAEwD,gBAAyB,EAAEC,iBAAyB,EAAiB;QAC/I,MAAM9D,WAAW,MAAM,IAAI,CAAC4B,YAAY,CAAC7B;QACzC,IAAI,CAACC,UAAU;YACb,IAAI,CAACpB,MAAM,CAACkD,IAAI,CAAC,CAAC,4BAA4B,EAAE/B,cAAc,UAAU,CAAC;YACzE;QACF;QAEA,MAAMiC,eAAehC,WAAW;QAGhC,IAAI+D,2BAA2BF;QAC/B,IAAIG,qBAAqBF;QACzB,IAAI;YACF,MAAMG,kBAAkB,MAAMnE,IAAAA,kBAAQ,EAACkC,cAAc;YACrD,MAAMkC,WAAWC,KAAKC,KAAK,CAACH;YAE5B,IAAIC,SAASG,iBAAiB,IAAI,CAACR,kBAAkB;gBACnDE,2BAA2BG,SAASG,iBAAiB;YACvD;YAEA,IAAIH,SAASI,WAAW,IAAI,CAACR,mBAAmB;gBAC9CE,qBAAqBE,SAASI,WAAW;YAC3C;QACF,EAAE,OAAM,CAER;QAEA,MAAMC,mBAAmB;YACvB,GAAGX,QAAQ;YACXY,WAAWnE,YAAY;YACvBoE,aAAa,IAAIC,OAAOC,WAAW;YACnCC,gBAAgB7E;YAChBsE,mBAAmBN,4BAA4BH,SAASf,QAAQ,IAAI;YACpEyB,aAAaN,sBAAsB,EAAE;QACvC;QAEA,MAAMxC,IAAAA,mBAAS,EAACQ,cAAcmC,KAAKU,SAAS,CAACN,kBAAkB,MAAM,IAAI;QACzE,MAAMO,gBAAgBhB,oBAAoB,CAAC,MAAM,EAAEA,kBAAkBiB,MAAM,CAAC,aAAa,CAAC,GAAG;QAC7F,IAAI,CAACnG,MAAM,CAACqD,KAAK,CAAC,CAAC,mBAAmB,EAAElC,gBAAgB+E,eAAe;IACzE;IAKA,MAAME,aAAajF,aAAqB,EAAuB;QAC7D,MAAMC,WAAW,MAAM,IAAI,CAAC4B,YAAY,CAAC7B;QACzC,IAAI,CAACC,UAAU;YACb,OAAO;QACT;QAEA,MAAMgC,eAAehC,WAAW;QAChC,IAAI;YACF,MAAMiF,UAAU,MAAMnF,IAAAA,kBAAQ,EAACkC,cAAc;YAC7C,OAAOmC,KAAKC,KAAK,CAACa;QACpB,EAAE,OAAOpF,OAAO;YAEd,OAAO;QACT;IACF;IAKA,MAAMqF,YAAYnF,aAAqB,EAAoB;QACzD,MAAMC,WAAW,MAAM,IAAI,CAAC4B,YAAY,CAAC7B;QACzC,IAAI,CAACC,UAAU;YACb,OAAO;QACT;QAEA,MAAMgC,eAAehC,WAAW;QAChC,IAAI;YACF,MAAMmF,IAAAA,gBAAM,EAACnD;YACb,OAAO;QACT,EAAE,OAAM;YACN,OAAO;QACT;IACF;IAOA,MAAMoD,eAAerF,aAAqB,EAAEsF,UAAoF,EAQ5H;QACF,MAAMC,kBAA8B,EAAE;QAEtC,IAAI,CAACD,cAAcA,WAAWN,MAAM,KAAK,GAAG;YAC1C,OAAOO;QACT;QAEA,MAAMtF,WAAW,MAAM,IAAI,CAAC4B,YAAY,CAAC7B;QACzC,IAAI,CAACC,UAAU;YACb,IAAI,CAACpB,MAAM,CAACkD,IAAI,CAAC,CAAC,8BAA8B,EAAE/B,cAAc,UAAU,CAAC;YAC3E,OAAOuF;QACT;QAEA,MAAMpD,eAAelC,SAASmC,OAAO,CAAC,0BAA0B;QAGhE,IAAI;YACF,MAAMC,IAAAA,YAAE,EAACF,cAAc;gBAAEvC,WAAW;gBAAM0C,OAAO;YAAK;YACtD,IAAI,CAACzD,MAAM,CAACqD,KAAK,CAAC,CAAC,2BAA2B,EAAElC,eAAe;QACjE,EAAE,OAAM,CAER;QAGA,MAAML,IAAAA,eAAK,EAACwC,cAAc;YAAEvC,WAAW;QAAK;QAE5C,IAAK,IAAI4F,IAAI,GAAGA,IAAIF,WAAWN,MAAM,EAAEQ,IAAK;YAC1C,MAAMC,QAAQH,UAAU,CAACE,EAAE;YAC3B,IAAI,CAACC,MAAMC,IAAI,EAAE;YAEjB,MAAMnD,MAAMkD,MAAME,MAAM,EAAEjF,iBAAiB;YAC3C,MAAMkF,WAAW,CAAC,MAAM,EAAEJ,EAAE,CAAC,EAAEjD,KAAK;YACpC,MAAMsD,YAAYvG,IAAAA,cAAI,EAAC6C,cAAcyD;YAErC,IAAI;gBACF,MAAMpE,SAASsE,OAAOC,IAAI,CAACN,MAAMC,IAAI,EAAE;gBACvC,MAAMjE,IAAAA,mBAAS,EAACoE,WAAWrE;gBAE3B,MAAMwE,eAAe1E,iBAAI,CAAC2E,QAAQ,CAAC,IAAI,CAACnH,eAAe,EAAE+G;gBAEzDN,gBAAgBW,IAAI,CAAC;oBACnBC,OAAOX;oBACPlE,MAAM0E;oBACNJ;oBACAQ,OAAOX,MAAMW,KAAK,IAAI;oBACtBC,QAAQZ,MAAMY,MAAM,IAAI;oBACxBV,QAAQpD;oBACR+D,MAAM9E,OAAOwD,MAAM;gBACrB;gBAEA,IAAI,CAACnG,MAAM,CAACqD,KAAK,CAAC,CAAC,gBAAgB,EAAEsD,EAAE,KAAK,EAAExF,cAAc,EAAE,EAAEyF,MAAMW,KAAK,CAAC,CAAC,EAAEX,MAAMY,MAAM,CAAC,EAAE,EAAE7E,OAAOwD,MAAM,CAAC,OAAO,CAAC;YACxH,EAAE,OAAOlF,OAAO;gBACd,IAAI,CAACjB,MAAM,CAACkD,IAAI,CAAC,CAAC,yBAAyB,EAAEyD,EAAE,KAAK,EAAExF,cAAc,EAAE,EAAEF,OAAO;YACjF;QACF;QAEA,OAAOyF;IACT;IAKA,MAAMgB,aAAavG,aAAqB,EAAEmG,KAAa,EAA0B;QAC/E,MAAMlG,WAAW,MAAM,IAAI,CAAC4B,YAAY,CAAC7B;QACzC,IAAI,CAACC,UAAU,OAAO;QAEtB,MAAMkC,eAAelC,SAASmC,OAAO,CAAC,0BAA0B;QAGhE,KAAK,MAAMG,OAAO;YAAC;YAAO;YAAO;YAAQ;SAAM,CAAE;YAC/C,MAAMsD,YAAYvG,IAAAA,cAAI,EAAC6C,cAAc,CAAC,MAAM,EAAEgE,MAAM,CAAC,EAAE5D,KAAK;YAC5D,IAAI;gBACF,OAAO,MAAMxC,IAAAA,kBAAQ,EAAC8F;YACxB,EAAE,OAAM,CAER;QACF;QAEA,OAAO;IACT;IAKA,MAAMW,eAAexG,aAAqB,EAAqB;QAC7D,MAAMC,WAAW,MAAM,IAAI,CAAC4B,YAAY,CAAC7B;QACzC,IAAI,CAACC,UAAU,OAAO,EAAE;QAExB,MAAMkC,eAAelC,SAASmC,OAAO,CAAC,0BAA0B;QAEhE,IAAI;YACF,MAAMY,QAAQ,MAAMC,IAAAA,iBAAO,EAACd;YAC5B,OAAOa,MAAMyD,MAAM,CAACrD,CAAAA,IAAKA,EAAEC,UAAU,CAAC,WAAWqD,IAAI,CAAC,CAACC,GAAGC,IAAMD,EAAEE,aAAa,CAACD;QAClF,EAAE,OAAM;YACN,OAAO,EAAE;QACX;IACF;IAKA,MAAME,eASF;QACF,MAAM9D,QAAe,EAAE;QAEvB,KAAK,MAAMnD,UAAU,IAAI,CAACd,eAAe,CAAE;YACzC,MAAMgE,UAAUzD,IAAAA,cAAI,EAAC,IAAI,CAACR,eAAe,EAAEe;YAC3C,IAAI;gBACF,MAAMkH,WAAW,MAAM9D,IAAAA,iBAAO,EAACF;gBAE/B,KAAK,MAAM1C,QAAQ0G,SAAU;oBAE3B,IAAI1G,KAAK2G,QAAQ,CAAC,kBAAkB3G,KAAK2G,QAAQ,CAAC,UAAU;oBAE5D,MAAMrG,SAASW,iBAAI,CAAC+C,KAAK,CAAChE,MAAMhB,IAAI;oBACpC,MAAMY,WAAWX,IAAAA,cAAI,EAACyD,SAAS1C;oBAC/B,MAAM4G,QAAQ,MAAMC,IAAAA,cAAI,EAACjH;oBAGzB,MAAM4D,WAAW,MAAM,IAAI,CAACoB,YAAY,CAACtE;oBAGzC,MAAM2E,aAAa,MAAM,IAAI,CAACkB,cAAc,CAAC7F;oBAE7CqC,MAAMkD,IAAI,CAAC;wBACTlG,eAAeW;wBACfmC,UAAUe,UAAUsD,aAAa9G;wBACjC+G,YAAYvH;wBACZwH,UAAUJ,MAAMX,IAAI;wBACpBhG,UAAUuD,UAAUY,aAAa;wBACjCd,WAAWsD,MAAMK,SAAS;wBAC1BC,gBAAgBjC,WAAWN,MAAM;wBACjCnB,UAAUA;oBACZ;gBACF;YACF,EAAE,OAAO/D,OAAO;gBACd,IAAI,CAACjB,MAAM,CAACiB,KAAK,CAAC,CAAC,uBAAuB,EAAED,QAAQ,EAAEC;YACxD;QACF;QAGA,OAAOkD,MAAM0D,IAAI,CAAC,CAACC,GAAGC,IAAMA,EAAEjD,SAAS,CAAC6D,OAAO,KAAKb,EAAEhD,SAAS,CAAC6D,OAAO;IACzE;IAKA,MAAMC,YAAYzH,aAAqB,EAS7B;QACR,MAAMC,WAAW,MAAM,IAAI,CAAC4B,YAAY,CAAC7B;QACzC,IAAI,CAACC,UAAU,OAAO;QAEtB,IAAI;YACF,MAAMgH,QAAQ,MAAMC,IAAAA,cAAI,EAACjH;YACzB,MAAM4D,WAAW,MAAM,IAAI,CAACoB,YAAY,CAACjF;YACzC,MAAMsF,aAAa,MAAM,IAAI,CAACkB,cAAc,CAACxG;YAC7C,MAAMuC,MAAM/B,IAAAA,iBAAO,EAACP,UAAUe,SAAS,CAAC;YAExC,OAAO;gBACLhB;gBACA8C,UAAUe,UAAUS,qBAAqBoD,IAAAA,kBAAQ,EAACzH;gBAClDmH,YAAY7E;gBACZ8E,UAAUJ,MAAMX,IAAI;gBACpBhG,UAAUuD,UAAUY,aAAa;gBACjCd,WAAWsD,MAAMK,SAAS;gBAC1BC,gBAAgBjC,WAAWN,MAAM;gBACjCnB,UAAUA;YACZ;QACF,EAAE,OAAO/D,OAAO;YACd,IAAI,CAACjB,MAAM,CAACiB,KAAK,CAAC,CAAC,4BAA4B,EAAEE,eAAe,EAAEF;YAClE,OAAO;QACT;IACF;AACF"}

package/dist/services/interfaces/floor.dto.js

@@ -40,18 +40,18 @@ class CreatePositionDto {
 class FloorDto {
     id;
     name;
-    floor;
+    order;
     printers;
 }
 class CreateFloorDto {
     printers;
     name;
-    floor;
+    order;
 }
 class UpdateFloorDto {
     printers;
     name;
-    floor;
+    order;
 }
 
 //# sourceMappingURL=floor.dto.js.map

package/dist/services/interfaces/floor.dto.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/interfaces/floor.dto.ts"],"names":["CreateFloorDto","CreatePositionDto","FloorDto","PositionDto","UpdateFloorDto","x","y","printerId","floorId","id","name","floor","printers"],"mappings":";;;;;;;;;;;QAqBaA;eAAAA;;QAdAC;eAAAA;;QAOAC;eAAAA;;QAdAC;eAAAA;;QA2BAC;eAAAA;;;AA3BN,MAAMD;IACXE,EAAU;IACVC,EAAU;IACVC,UAAkB;IAClBC,QAAgB;AAClB;AAEO,MAAMP;IACXI,EAAU;IACVC,EAAU;IACVC,UAAkB;IAClBC,QAAiB;AACnB;AAEO,MAAMN;IACXO,GAAW;IACXC,KAAa;IACbC,MAAc;IACdC,SAAwB;AAC1B;AAEO,MAAMZ;IACXY,SAA+B;IAC/BF,KAAa;IACbC,MAAc;AAChB;AAEO,MAAMP;IACXQ,SAAyB;IACzBF,KAAc;IACdC,MAAe;AACjB"}
+{"version":3,"sources":["../../../src/services/interfaces/floor.dto.ts"],"names":["CreateFloorDto","CreatePositionDto","FloorDto","PositionDto","UpdateFloorDto","x","y","printerId","floorId","id","name","order","printers"],"mappings":";;;;;;;;;;;QAqBaA;eAAAA;;QAdAC;eAAAA;;QAOAC;eAAAA;;QAdAC;eAAAA;;QA2BAC;eAAAA;;;AA3BN,MAAMD;IACXE,EAAU;IACVC,EAAU;IACVC,UAAkB;IAClBC,QAAgB;AAClB;AAEO,MAAMP;IACXI,EAAU;IACVC,EAAU;IACVC,UAAkB;IAClBC,QAAiB;AACnB;AAEO,MAAMN;IACXO,GAAW;IACXC,KAAa;IACbC,MAAc;IACdC,SAAwB;AAC1B;AAEO,MAAMZ;IACXY,SAA+B;IAC/BF,KAAa;IACbC,MAAc;AAChB;AAEO,MAAMP;IACXQ,SAAyB;IACzBF,KAAc;IACdC,MAAe;AACjB"}

package/dist/services/interfaces/{printer-group.dto.js → printer-tag.dto.js}

@@ -9,19 +9,20 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    get CreateGroupDto () {
-        return CreateGroupDto;
+    get CreateTagDto () {
+        return CreateTagDto;
     },
-    get PrinterGroupDto () {
-        return PrinterGroupDto;
+    get PrinterTagDto () {
+        return PrinterTagDto;
     }
 });
-class PrinterGroupDto {
+class PrinterTagDto {
     printerId;
-    groupId;
+    tagId;
 }
-class CreateGroupDto {
+class CreateTagDto {
     name;
+    color;
 }
 
-//# sourceMappingURL=printer-group.dto.js.map
+//# sourceMappingURL=printer-tag.dto.js.map

package/dist/services/interfaces/printer-tag.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/services/interfaces/printer-tag.dto.ts"],"names":["CreateTagDto","PrinterTagDto","printerId","tagId","name","color"],"mappings":";;;;;;;;;;;QAKaA;eAAAA;;QALAC;eAAAA;;;AAAN,MAAMA;IACXC,UAAkB;IAClBC,MAAc;AAChB;AAEO,MAAMH;IACXI,KAAa;IACbC,MAAe;AACjB"}

package/dist/services/interfaces/{print-completion.interface.js → printer-tag.service.interface.js}

@@ -3,4 +3,4 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 
-//# sourceMappingURL=print-completion.interface.js.map
+//# sourceMappingURL=printer-tag.service.interface.js.map

package/dist/services/interfaces/{printer-group.service.interface.js.map → printer-tag.service.interface.js.map}

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/interfaces/printer-group.service.interface.ts"],"names":[],"mappings":""}
+{"version":3,"sources":["../../../src/services/interfaces/printer-tag.service.interface.ts"],"names":[],"mappings":""}

package/dist/services/interfaces/settings.dto.js

@@ -13,7 +13,6 @@ class SettingsDto {
     [_serversettingsconstants.serverSettingsKey];
     [_serversettingsconstants.wizardSettingKey];
     [_serversettingsconstants.frontendSettingKey];
-    [_serversettingsconstants.printerFileCleanSettingKey];
     [_serversettingsconstants.timeoutSettingKey];
 }
 

package/dist/services/interfaces/settings.dto.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/interfaces/settings.dto.ts"],"names":["SettingsDto","serverSettingsKey","wizardSettingKey","frontendSettingKey","printerFileCleanSettingKey","timeoutSettingKey"],"mappings":";;;;+BAqCaA;;;eAAAA;;;yCA/BN;AA+BA,MAAMA;IACX,CAACC,0CAAiB,CAAC,CAAoB;IACvC,CAACC,yCAAgB,CAAC,CAAoB;IACtC,CAACC,2CAAkB,CAAC,CAAsB;IAE1C,CAACC,mDAA0B,CAAC,CAAuB;IACnD,CAACC,0CAAiB,CAAC,CAAqB;AAC1C"}
+{"version":3,"sources":["../../../src/services/interfaces/settings.dto.ts"],"names":["SettingsDto","serverSettingsKey","wizardSettingKey","frontendSettingKey","timeoutSettingKey"],"mappings":";;;;+BA+BaA;;;eAAAA;;;yCA1BN;AA0BA,MAAMA;IACX,CAACC,0CAAiB,CAAC,CAAoB;IACvC,CAACC,yCAAgB,CAAC,CAAoB;IACtC,CAACC,2CAAkB,CAAC,CAAsB;IAE1C,CAACC,0CAAiB,CAAC,CAAqB;AAC1C"}

package/dist/services/interfaces/{group.dto.js → tag.dto.js}

@@ -3,4 +3,4 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 
-//# sourceMappingURL=group.dto.js.map
+//# sourceMappingURL=tag.dto.js.map