@ainias42/typeorm-helper 0.0.7 → 0.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ainias42/typeorm-helper",
-    "version": "0.0.7",
+    "version": "0.0.9",
     "description": "",
     "publishConfig": {
         "access": "public"
@@ -29,10 +29,12 @@
     "dependencies": {
         "@ainias42/config": "*",
         "@ainias42/js-helper": ">=0.8.19",
-        "typeorm": "^0.3.20",
-        "reflect-metadata": "^0.2.2"
+        "mime-types": "^3.0.2",
+        "reflect-metadata": "^0.2.2",
+        "typeorm": "^0.3.20"
     },
     "devDependencies": {
+        "@types/mime-types": "^3.0.1",
         "prettier": "^3.3.3"
     }
 }

package/src/DefaultSubscriber.ts

@@ -10,7 +10,7 @@ import {
 } from 'typeorm';
 import { FileTransformer } from '@/decorators/FileColumn/FileTransformer';
 import { FileType } from '@/decorators/FileColumn/FileType';
-import { FileWriter } from '@/decorators/FileColumn/FileWriter';
+import { fileWriter } from '@/decorators/FileColumn/fileWriter';
 
 @EventSubscriber()
 export class DefaultSubscriber implements EntitySubscriberInterface {
@@ -29,11 +29,11 @@ export class DefaultSubscriber implements EntitySubscriberInterface {
                     promises.push(
                         Promise.all(
                             values.map((value) =>
-                                FileWriter.writeToFile(value.src, transformer.fileOptions.saveDirectory).then(
-                                    (newUrl) => {
-                                        return { ...value, src: newUrl };
-                                    },
-                                ),
+                                fileWriter
+                                    .writeToFile(value, transformer.fileOptions.saveDirectory)
+                                    .then((newFileType) => {
+                                        return newFileType;
+                                    }),
                             ),
                         ).then((newValues) => {
                             if (single) {

package/src/decorators/FileColumn/FileColumn.ts

@@ -23,7 +23,7 @@ export function FileColumn(options: { saveDirectory: string; publicPath: string
                                 single = true;
                             }
                             for (const value of values) {
-                                if (value.src.startsWith(options.publicPath)) {
+                                if ('src' in value && value.src.startsWith(options.publicPath)) {
                                     value.src = value.src.slice(options.publicPath.length);
                                 }
                             }
@@ -41,7 +41,7 @@ export function FileColumn(options: { saveDirectory: string; publicPath: string
                                 single = true;
                             }
                             for (const value of values) {
-                                if (!value.src.startsWith('data:')) {
+                                if ('src' in value && !value.src.startsWith('data:')) {
                                     value.src = options.publicPath + value.src;
                                 }
                             }

package/src/decorators/FileColumn/FileType.ts

@@ -1,5 +1,7 @@
-export type FileType = {
-    name: string;
-    src: string;
-    type: string;
-};
+export type FileType =
+    | {
+          name: string;
+          src: string;
+          type: string;
+      }
+    | File;

package/src/decorators/FileColumn/fileWriter.ts

@@ -0,0 +1,68 @@
+/* eslint-disable class-methods-use-this */
+import { PassThrough, Readable } from 'node:stream';
+import { createWriteStream, existsSync, mkdirSync } from 'fs';
+import { extension } from 'mime-types';
+import crypto from 'crypto';
+import type { FileType } from '@/decorators/FileColumn/FileType';
+
+class FileWriter {
+    private stringSrcToArrayBuffer(src: string) {
+        const base64SearchText = ';base64,';
+        const indexBase64SearchText = src.indexOf(base64SearchText);
+        const indexSlash = src.indexOf('/');
+
+        // file is already a url
+        if (indexBase64SearchText === -1 || indexSlash === -1 || !src.startsWith('data:')) {
+            return false;
+        }
+
+        const data = src.slice(Math.max(0, indexBase64SearchText + base64SearchText.length));
+
+        const dataBuffer = Buffer.from(data, 'base64');
+        return dataBuffer;
+    }
+
+    async writeToFile(file: FileType, saveDirectory: string, name?: string): Promise<FileType> {
+        let dataBuffer: Buffer<ArrayBuffer> | ArrayBuffer | undefined;
+        let dataStream: Readable;
+        if (file instanceof File) {
+            // @ts-expect-error there seems to be an type error inside the native types
+            dataStream = Readable.fromWeb(file.stream());
+        } else {
+            const buffer = this.stringSrcToArrayBuffer(file.src);
+            if (!buffer) {
+                return file;
+            }
+            dataBuffer = buffer;
+            dataStream = new PassThrough();
+            dataStream.push(dataBuffer);
+            // eslint-disable-next-line unicorn/prefer-single-call
+            dataStream.push(null);
+        }
+
+        const fileEnding = extension(file.type);
+
+        const seed = crypto.randomBytes(20) as string | NodeJS.ArrayBufferView;
+        const now = new Date();
+
+        // Month is 0-based. Add 1 to get 1-12
+        const fileName =
+            name ??
+            `${now.getUTCFullYear()}-${now.getUTCMonth() + 1}-${now.getUTCDate()}-${crypto
+                .createHash('sha1')
+                .update(seed)
+                .digest('hex')}.${fileEnding}`;
+
+        if (!existsSync(saveDirectory)) {
+            mkdirSync(saveDirectory, { recursive: true });
+        }
+
+        const writeStream = createWriteStream(saveDirectory + fileName);
+        const resultPromise = new Promise<void>((r) => writeStream.addListener('finish', r));
+        dataStream.pipe(writeStream);
+        await resultPromise;
+        return { type: file.type, name: file.name, src: fileName };
+    }
+}
+
+export const fileWriter = new FileWriter();

package/src/helper/getFileUrl.ts

@@ -0,0 +1,10 @@
+import type { FileType } from '@/decorators/FileColumn/FileType';
+
+export function getFileUrl(file: FileType): string;
+export function getFileUrl(file: FileType | undefined): string | undefined;
+export function getFileUrl(file: FileType | undefined): string | undefined {
+    if (file instanceof File) {
+        return URL.createObjectURL(file);
+    }
+    return file?.src;
+}

package/src/index.ts

@@ -4,9 +4,10 @@ export * from './DbNamingStrategy';
 export * from './DefaultSubscriber';
 export * from './dataSource/dataSource';
 export * from './dataSource/getRepository';
+export * from './helper/getFileUrl';
 export * from './migration/getCreateTableColumns';
 export * from './migration/getCreateTableColumnsV1';
 export * from './decorators/FileColumn/FileColumn';
 export * from './decorators/FileColumn/FileTransformer';
 export * from './decorators/FileColumn/FileType';
-export * from './decorators/FileColumn/FileWriter';
+export * from './decorators/FileColumn/fileWriter';

package/dist/decorators/FileColumn/FileWriter.d.ts

@@ -1,3 +0,0 @@
-export declare const FileWriter: {
-    writeToFile(src: string, saveDirectory: string): Promise<string>;
-};

package/dist/decorators/FileColumn/FileWriter.js

@@ -1,46 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FileWriter = void 0;
-const stream_1 = require("stream");
-const fs_1 = require("fs");
-const crypto_1 = __importDefault(require("crypto"));
-exports.FileWriter = {
-    async writeToFile(src, saveDirectory) {
-        const base64SearchText = ';base64,';
-        const indexBase64SearchText = src.indexOf(base64SearchText);
-        const indexSlash = src.indexOf('/');
-        // file is already a url
-        if (indexBase64SearchText === -1 || indexSlash === -1 || !src.startsWith('data:')) {
-            return src;
-        }
-        const fileType = src.slice('data:'.length, indexSlash);
-        const fileEnding = src.slice(indexSlash + 1, indexBase64SearchText);
-        const data = src.slice(Math.max(0, indexBase64SearchText + base64SearchText.length));
-        const seed = crypto_1.default.randomBytes(20);
-        const now = new Date();
-        // Month is 0-based. Add 1 to get 1-12
-        const name = `${now.getUTCFullYear()}-${now.getUTCMonth() + 1}-${now.getUTCDate()}-${fileType}-${crypto_1.default
-            .createHash('sha1')
-            .update(seed)
-            .digest('hex')}.${fileEnding}`;
-        const dataBuffer = Buffer.from(data, 'base64');
-        const inputStream = new stream_1.Readable();
-        const dataStream = new stream_1.PassThrough();
-        if (!(0, fs_1.existsSync)(saveDirectory)) {
-            (0, fs_1.mkdirSync)(saveDirectory, { recursive: true });
-        }
-        const writeStream = (0, fs_1.createWriteStream)(saveDirectory + name);
-        inputStream.pipe(dataStream);
-        inputStream.push(dataBuffer);
-        // eslint-disable-next-line unicorn/prefer-single-call
-        inputStream.push(null);
-        const resultPromise = new Promise((r) => writeStream.addListener('finish', r));
-        dataStream.pipe(writeStream);
-        await resultPromise;
-        return name;
-    },
-};
-//# sourceMappingURL=FileWriter.js.map

package/dist/decorators/FileColumn/FileWriter.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"FileWriter.js","sourceRoot":"","sources":["../../../src/decorators/FileColumn/FileWriter.ts"],"names":[],"mappings":";;;;;;AAAA,mCAA+C;AAC/C,2BAA8D;AAC9D,oDAA4B;AAEf,QAAA,UAAU,GAAG;IACtB,KAAK,CAAC,WAAW,CAAC,GAAW,EAAE,aAAqB;QAChD,MAAM,gBAAgB,GAAG,UAAU,CAAC;QACpC,MAAM,qBAAqB,GAAG,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAC5D,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAEpC,wBAAwB;QACxB,IAAI,qBAAqB,KAAK,CAAC,CAAC,IAAI,UAAU,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YAChF,OAAO,GAAG,CAAC;QACf,CAAC;QAED,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QACvD,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,EAAE,qBAAqB,CAAC,CAAC;QACpE,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,qBAAqB,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;QAErF,MAAM,IAAI,GAAG,gBAAM,CAAC,WAAW,CAAC,EAAE,CAAoC,CAAC;QACvE,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QAEvB,sCAAsC;QACtC,MAAM,IAAI,GAAG,GAAG,GAAG,CAAC,cAAc,EAAE,IAAI,GAAG,CAAC,WAAW,EAAE,GAAG,CAAC,IAAI,GAAG,CAAC,UAAU,EAAE,IAAI,QAAQ,IAAI,gBAAM;aAClG,UAAU,CAAC,MAAM,CAAC;aAClB,MAAM,CAAC,IAAI,CAAC;aACZ,MAAM,CAAC,KAAK,CAAC,IAAI,UAAU,EAAE,CAAC;QAEnC,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC/C,MAAM,WAAW,GAAG,IAAI,iBAAQ,EAAE,CAAC;QACnC,MAAM,UAAU,GAAG,IAAI,oBAAW,EAAE,CAAC;QAErC,IAAI,CAAC,IAAA,eAAU,EAAC,aAAa,CAAC,EAAE,CAAC;YAC7B,IAAA,cAAS,EAAC,aAAa,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAClD,CAAC;QAED,MAAM,WAAW,GAAG,IAAA,sBAAiB,EAAC,aAAa,GAAG,IAAI,CAAC,CAAC;QAC5D,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAE7B,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC7B,sDAAsD;QACtD,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEvB,MAAM,aAAa,GAAG,IAAI,OAAO,CAAO,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;QACrF,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC7B,MAAM,aAAa,CAAC;QACpB,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ,CAAC"}

package/src/decorators/FileColumn/FileWriter.ts

@@ -1,49 +0,0 @@
-import { PassThrough, Readable } from 'stream';
-import { createWriteStream, existsSync, mkdirSync } from 'fs';
-import crypto from 'crypto';
-
-export const FileWriter = {
-    async writeToFile(src: string, saveDirectory: string) {
-        const base64SearchText = ';base64,';
-        const indexBase64SearchText = src.indexOf(base64SearchText);
-        const indexSlash = src.indexOf('/');
-
-        // file is already a url
-        if (indexBase64SearchText === -1 || indexSlash === -1 || !src.startsWith('data:')) {
-            return src;
-        }
-
-        const fileType = src.slice('data:'.length, indexSlash);
-        const fileEnding = src.slice(indexSlash + 1, indexBase64SearchText);
-        const data = src.slice(Math.max(0, indexBase64SearchText + base64SearchText.length));
-
-        const seed = crypto.randomBytes(20) as string | NodeJS.ArrayBufferView;
-        const now = new Date();
-
-        // Month is 0-based. Add 1 to get 1-12
-        const name = `${now.getUTCFullYear()}-${now.getUTCMonth() + 1}-${now.getUTCDate()}-${fileType}-${crypto
-            .createHash('sha1')
-            .update(seed)
-            .digest('hex')}.${fileEnding}`;
-
-        const dataBuffer = Buffer.from(data, 'base64');
-        const inputStream = new Readable();
-        const dataStream = new PassThrough();
-
-        if (!existsSync(saveDirectory)) {
-            mkdirSync(saveDirectory, { recursive: true });
-        }
-
-        const writeStream = createWriteStream(saveDirectory + name);
-        inputStream.pipe(dataStream);
-
-        inputStream.push(dataBuffer);
-        // eslint-disable-next-line unicorn/prefer-single-call
-        inputStream.push(null);
-
-        const resultPromise = new Promise<void>((r) => writeStream.addListener('finish', r));
-        dataStream.pipe(writeStream);
-        await resultPromise;
-        return name;
-    },
-};