@ainias42/typeorm-helper 0.0.3 → 0.0.5

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@ainias42/typeorm-helper",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "",
   "publishConfig": {
     "access": "public"
   },
-  "main": "dist/src/index.js",
+  "main": "dist/index.js",
   "exports": {
-    ".": "./dist/src/index.js"
+    ".": "./dist/index.js"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -17,7 +17,6 @@
     "lint:fix": "npm run lint -- --fix",
     "typecheck": "tsc --noEmit"
   },
-  "type": "module",
   "author": "",
   "repository": {
     "type": "git",

package/src/BaseModel.ts

@@ -1,14 +1,8 @@
-import {
-    CreateDateColumn,
-    DeleteDateColumn,
-    PrimaryGeneratedColumn,
-    UpdateDateColumn,
-    VersionColumn
-} from "typeorm";
+import { CreateDateColumn, DeleteDateColumn, PrimaryGeneratedColumn, UpdateDateColumn, VersionColumn } from "typeorm";
 
 export class BaseModel {
     @PrimaryGeneratedColumn()
-    id?: number;
+    id: number = -1;
 
     @CreateDateColumn()
     createdAt?: Date;

package/src/{ServerSubscriber.ts → DefaultSubscriber.ts}

@@ -2,15 +2,18 @@
 import { ColumnMetadata } from "typeorm/metadata/ColumnMetadata";
 import {
     EntitySubscriberInterface,
-    EventSubscriber, InsertEvent,
-    ObjectLiteral, OptimisticLockVersionMismatchError, UpdateEvent
+    EventSubscriber,
+    InsertEvent,
+    ObjectLiteral,
+    OptimisticLockVersionMismatchError,
+    UpdateEvent
 } from "typeorm";
 import { FileTransformer } from "./decorators/FileColumn/FileTransformer";
 import { FileType } from "./decorators/FileColumn/FileType";
 import { FileWriter } from "./decorators/FileColumn/FileWriter";
 
 @EventSubscriber()
-export class ServerSubscriber implements EntitySubscriberInterface {
+export class DefaultSubscriber implements EntitySubscriberInterface {
 
     async saveFiles(entity: ObjectLiteral, columns: ColumnMetadata[]) {
         const promises = [];
@@ -44,9 +47,11 @@ export class ServerSubscriber implements EntitySubscriberInterface {
      */
     async beforeInsert({entity, metadata: {columns}}: InsertEvent<any>) {
         if (entity) {
-            // TODO check if this is necessary
-            // Reflect.set(entity, "updatedAt", new Date());
-            // Reflect.set(entity, "createdAt", new Date());
+            Reflect.set(entity, "updatedAt", new Date());
+            Reflect.set(entity, "createdAt", new Date());
+            if (Reflect.get(entity, "id") <= 0) {
+                Reflect.set(entity, "id", undefined);
+            }
 
             await this.saveFiles(entity, columns);
         }
@@ -90,6 +95,6 @@ export class ServerSubscriber implements EntitySubscriberInterface {
     }
 
     // beforeRemove({metadata, entity, ...other}: RemoveEvent<any>): Promise<any> | void {
-        // TODO Remove files from server (?)
+    // TODO Remove files from server (?)
     // }
 }

package/src/dataSource/getRepository.ts

@@ -1,7 +1,8 @@
 import { getDataSource } from "@/dataSource/dataSource";
-import { ObjectLiteral } from "typeorm/common/ObjectLiteral";
-import { EntityTarget } from "typeorm/common/EntityTarget";
+import type { EntityTarget } from "typeorm/common/EntityTarget";
+import type { ObjectLiteral } from "typeorm/common/ObjectLiteral";
+import type { Repository } from "typeorm";
 
-export function getRepository<Entity extends ObjectLiteral>(entity: EntityTarget<Entity>){
-    return getDataSource().getRepository(entity);
+export function getRepository<Entity extends ObjectLiteral>(entity: EntityTarget<Entity>): Repository<Entity> {
+    return getDataSource().getRepository<Entity>(entity);
 }

package/src/decorators/FileColumn/FileWriter.ts

@@ -1,6 +1,6 @@
 import { PassThrough, Readable } from 'stream';
-import { createHash, randomBytes } from 'crypto';
 import { createWriteStream, existsSync, mkdirSync } from 'fs';
+import crypto from 'crypto';
 
 
 export const FileWriter = {
@@ -18,17 +18,17 @@ export const FileWriter = {
         const fileEnding = src.slice(indexSlash + 1, indexBase64SearchText);
         const data = src.slice(Math.max(0, indexBase64SearchText + base64SearchText.length));
 
-        const seed = randomBytes(20);
+        const seed = crypto.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}-${createHash('sha1').update(seed).digest('hex')}.${fileEnding}`;
+        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)) {
+        if (!existsSync(saveDirectory)) {
             mkdirSync(saveDirectory, {recursive: true});
         }
 

package/src/index.ts

@@ -1,9 +1,10 @@
 export * from './BaseModel';
 export * from './DbNamingStrategy';
-export * from './ServerSubscriber';
+export * from './DefaultSubscriber';
 export * from './dataSource/dataSource';
 export * from './dataSource/getRepository';
 export * from './migration/getCreateTableColumns';
+export * from './migration/getCreateTableColumnsV1';
 export * from './decorators/FileColumn/FileColumn';
 export * from './decorators/FileColumn/FileTransformer';
 export * from './decorators/FileColumn/FileType';

package/src/migration/getCreateTableColumns.ts

@@ -9,12 +9,15 @@ export function getCreateTableColumns() {
         isNullable: false,
     }, {
         name: 'createdAt',
-        type: 'datetime',
+        type: 'datetime(6)',
         isNullable: false,
+        default: "CURRENT_TIMESTAMP(6)",
     }, {
         name: 'updatedAt',
-        type: 'datetime',
+        type: 'datetime(6)',
         isNullable: false,
+        default: "CURRENT_TIMESTAMP(6)",
+        onUpdate: "CURRENT_TIMESTAMP(6)",
     }, {
         name: 'deletedAt',
         type: 'datetime(6)',

package/src/migration/getCreateTableColumnsV1.ts

@@ -0,0 +1,27 @@
+// Do not change the columns here. It is needed for migration, aka creation of the database
+export function getCreateTableColumnsV1() {
+    return [{
+        name: 'id',
+        type: 'int',
+        isPrimary: true,
+        isGenerated: true,
+        generationStrategy: 'increment',
+        isNullable: false,
+    }, {
+        name: 'createdAt',
+        type: 'datetime',
+        isNullable: false,
+    }, {
+        name: 'updatedAt',
+        type: 'datetime',
+        isNullable: false,
+    }, {
+        name: 'deletedAt',
+        type: 'datetime(6)',
+        isNullable: true,
+    }, {
+        name: 'version',
+        type: 'int',
+        isNullable: false,
+    }] as const;
+}

package/tsconfig.json

@@ -2,6 +2,7 @@
   "extends": "@ainias42/typescript-config",
   "compilerOptions": {
     "jsx": "react",
+    "module": "commonjs",
     "outDir": "./dist",
     "declaration": true,
     "baseUrl": "./",
@@ -21,7 +22,7 @@
   ],
   "include": [
     "src/**/*.tsx",
-    "src/**/*.ts",
+    "src/**/*.ts"
   ],
   "tsc-alias": {
     "resolveFullPaths": true,

package/dist/ServerSubscriber.js.map

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