typeorm 0.3.21-dev.fdbb013 → 0.3.21

package/commands/InitCommand.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InitCommand = void 0;
 const tslib_1 = require("tslib");
-const CommandUtils_1 = require("./CommandUtils");
-const path = tslib_1.__importStar(require("path"));
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const ansis_1 = tslib_1.__importDefault(require("ansis"));
 const child_process_1 = require("child_process");
+const path_1 = tslib_1.__importDefault(require("path"));
 const error_1 = require("../error");
 const PlatformTools_1 = require("../platform/PlatformTools");
+const CommandUtils_1 = require("./CommandUtils");
 /**
  * Generates a new project with TypeORM.
  */
@@ -54,7 +54,7 @@ class InitCommand {
             const isDocker = args.docker !== undefined ? true : false;
             const basePath = process.cwd() + (args.name ? "/" + args.name : "");
             const projectName = args.name
-                ? path.basename(args.name)
+                ? path_1.default.basename(args.name)
                 : undefined;
             const installNpm = args.pm === "yarn" ? false : true;
             const projectIsEsm = args.ms === "esm";
@@ -76,19 +76,19 @@ class InitCommand {
             const packageJsonContents = await CommandUtils_1.CommandUtils.readFile(basePath + "/package.json");
             await CommandUtils_1.CommandUtils.createFile(basePath + "/package.json", InitCommand.appendPackageJson(packageJsonContents, database, isExpress, projectIsEsm));
             if (args.name) {
-                console.log(chalk_1.default.green(`Project created inside ${chalk_1.default.blue(basePath)} directory.`));
+                console.log(ansis_1.default.green `Project created inside ${ansis_1.default.blue(basePath)} directory.`);
             }
             else {
-                console.log(chalk_1.default.green(`Project created inside current directory.`));
+                console.log(ansis_1.default.green `Project created inside current directory.`);
             }
-            console.log(chalk_1.default.green(`Please wait, installing dependencies...`));
+            console.log(ansis_1.default.green `Please wait, installing dependencies...`);
             if (args.pm && installNpm) {
                 await InitCommand.executeCommand("npm install", basePath);
             }
             else {
                 await InitCommand.executeCommand("yarn install", basePath);
             }
-            console.log(chalk_1.default.green(`Done! Start playing with a new project!`));
+            console.log(ansis_1.default.green `Done! Start playing with a new project!`);
         }
         catch (err) {
             PlatformTools_1.PlatformTools.logCmdErr("Error during project initialization:", err);
@@ -118,83 +118,83 @@ class InitCommand {
         let dbSettings = "";
         switch (database) {
             case "mysql":
-                dbSettings = `type: "mysql",
-    host: "localhost",
-    port: 3306,
-    username: "test",
-    password: "test",
+                dbSettings = `type: "mysql",
+    host: "localhost",
+    port: 3306,
+    username: "test",
+    password: "test",
     database: "test",`;
                 break;
             case "mariadb":
-                dbSettings = `type: "mariadb",
-    host: "localhost",
-    port: 3306,
-    username: "test",
-    password: "test",
+                dbSettings = `type: "mariadb",
+    host: "localhost",
+    port: 3306,
+    username: "test",
+    password: "test",
     database: "test",`;
                 break;
             case "sqlite":
-                dbSettings = `type: "sqlite",
+                dbSettings = `type: "sqlite",
     database: "database.sqlite",`;
                 break;
             case "better-sqlite3":
-                dbSettings = `type: "better-sqlite3",
+                dbSettings = `type: "better-sqlite3",
     database: "database.sqlite",`;
                 break;
             case "postgres":
-                dbSettings = `type: "postgres",
-    host: "localhost",
-    port: 5432,
-    username: "test",
-    password: "test",
+                dbSettings = `type: "postgres",
+    host: "localhost",
+    port: 5432,
+    username: "test",
+    password: "test",
     database: "test",`;
                 break;
             case "cockroachdb":
-                dbSettings = `type: "cockroachdb",
-    host: "localhost",
-    port: 26257,
-    username: "root",
-    password: "",
+                dbSettings = `type: "cockroachdb",
+    host: "localhost",
+    port: 26257,
+    username: "root",
+    password: "",
     database: "defaultdb",`;
                 break;
             case "mssql":
-                dbSettings = `type: "mssql",
-    host: "localhost",
-    username: "sa",
-    password: "Admin12345",
+                dbSettings = `type: "mssql",
+    host: "localhost",
+    username: "sa",
+    password: "Admin12345",
     database: "tempdb",`;
                 break;
             case "oracle":
-                dbSettings = `type: "oracle",
-host: "localhost",
-username: "system",
-password: "oracle",
-port: 1521,
+                dbSettings = `type: "oracle",
+host: "localhost",
+username: "system",
+password: "oracle",
+port: 1521,
 sid: "xe.oracle.docker",`;
                 break;
             case "mongodb":
-                dbSettings = `type: "mongodb",
+                dbSettings = `type: "mongodb",
     database: "test",`;
                 break;
             case "spanner":
-                dbSettings = `type: "spanner",
-    projectId: "test",
-    instanceId: "test",
+                dbSettings = `type: "spanner",
+    projectId: "test",
+    instanceId: "test",
     databaseId: "test",`;
                 break;
         }
-        return `import "reflect-metadata"
-import { DataSource } from "typeorm"
-import { User } from "./entity/User${isEsm ? ".js" : ""}"
-
-export const AppDataSource = new DataSource({
-    ${dbSettings}
-    synchronize: true,
-    logging: false,
-    entities: [User],
-    migrations: [],
-    subscribers: [],
-})
+        return `import "reflect-metadata"
+import { DataSource } from "typeorm"
+import { User } from "./entity/User${isEsm ? ".js" : ""}"
+
+export const AppDataSource = new DataSource({
+    ${dbSettings}
+    synchronize: true,
+    logging: false,
+    entities: [User],
+    migrations: [],
+    subscribers: [],
+})
 `;
     }
     /**
@@ -233,11 +233,11 @@ export const AppDataSource = new DataSource({
      * Gets contents of the .gitignore file.
      */
     static getGitIgnoreFile() {
-        return `.idea/
-.vscode/
-node_modules/
-build/
-tmp/
+        return `.idea/
+.vscode/
+node_modules/
+build/
+tmp/
 temp/`;
     }
     /**
@@ -246,112 +246,112 @@ temp/`;
     static getUserEntityTemplate(database) {
         return `import { Entity, ${database === "mongodb"
             ? "ObjectIdColumn, ObjectId"
-            : "PrimaryGeneratedColumn"}, Column } from "typeorm"
-
-@Entity()
-export class User {
-
+            : "PrimaryGeneratedColumn"}, Column } from "typeorm"
+
+@Entity()
+export class User {
+
     ${database === "mongodb"
             ? "@ObjectIdColumn()"
-            : "@PrimaryGeneratedColumn()"}
-    id: ${database === "mongodb" ? "ObjectId" : "number"}
-
-    @Column()
-    firstName: string
-
-    @Column()
-    lastName: string
-
-    @Column()
-    age: number
-
-}
+            : "@PrimaryGeneratedColumn()"}
+    id: ${database === "mongodb" ? "ObjectId" : "number"}
+
+    @Column()
+    firstName: string
+
+    @Column()
+    lastName: string
+
+    @Column()
+    age: number
+
+}
 `;
     }
     /**
      * Gets contents of the route file (used when express is enabled).
      */
     static getRoutesTemplate(isEsm) {
-        return `import { UserController } from "./controller/UserController${isEsm ? ".js" : ""}"
-
-export const Routes = [{
-    method: "get",
-    route: "/users",
-    controller: UserController,
-    action: "all"
-}, {
-    method: "get",
-    route: "/users/:id",
-    controller: UserController,
-    action: "one"
-}, {
-    method: "post",
-    route: "/users",
-    controller: UserController,
-    action: "save"
-}, {
-    method: "delete",
-    route: "/users/:id",
-    controller: UserController,
-    action: "remove"
+        return `import { UserController } from "./controller/UserController${isEsm ? ".js" : ""}"
+
+export const Routes = [{
+    method: "get",
+    route: "/users",
+    controller: UserController,
+    action: "all"
+}, {
+    method: "get",
+    route: "/users/:id",
+    controller: UserController,
+    action: "one"
+}, {
+    method: "post",
+    route: "/users",
+    controller: UserController,
+    action: "save"
+}, {
+    method: "delete",
+    route: "/users/:id",
+    controller: UserController,
+    action: "remove"
 }]`;
     }
     /**
      * Gets contents of the user controller file (used when express is enabled).
      */
     static getControllerTemplate(isEsm) {
-        return `import { AppDataSource } from "../data-source${isEsm ? ".js" : ""}"
-import { NextFunction, Request, Response } from "express"
-import { User } from "../entity/User${isEsm ? ".js" : ""}"
-
-export class UserController {
-
-    private userRepository = AppDataSource.getRepository(User)
-
-    async all(request: Request, response: Response, next: NextFunction) {
-        return this.userRepository.find()
-    }
-
-    async one(request: Request, response: Response, next: NextFunction) {
-        const id = parseInt(request.params.id)
-
-
-        const user = await this.userRepository.findOne({
-            where: { id }
-        })
-
-        if (!user) {
-            return "unregistered user"
-        }
-        return user
-    }
-
-    async save(request: Request, response: Response, next: NextFunction) {
-        const { firstName, lastName, age } = request.body;
-
-        const user = Object.assign(new User(), {
-            firstName,
-            lastName,
-            age
-        })
-
-        return this.userRepository.save(user)
-    }
-
-    async remove(request: Request, response: Response, next: NextFunction) {
-        const id = parseInt(request.params.id)
-
-        let userToRemove = await this.userRepository.findOneBy({ id })
-
-        if (!userToRemove) {
-            return "this user not exist"
-        }
-
-        await this.userRepository.remove(userToRemove)
-
-        return "user has been removed"
-    }
-
+        return `import { AppDataSource } from "../data-source${isEsm ? ".js" : ""}"
+import { NextFunction, Request, Response } from "express"
+import { User } from "../entity/User${isEsm ? ".js" : ""}"
+
+export class UserController {
+
+    private userRepository = AppDataSource.getRepository(User)
+
+    async all(request: Request, response: Response, next: NextFunction) {
+        return this.userRepository.find()
+    }
+
+    async one(request: Request, response: Response, next: NextFunction) {
+        const id = parseInt(request.params.id)
+
+
+        const user = await this.userRepository.findOne({
+            where: { id }
+        })
+
+        if (!user) {
+            return "unregistered user"
+        }
+        return user
+    }
+
+    async save(request: Request, response: Response, next: NextFunction) {
+        const { firstName, lastName, age } = request.body;
+
+        const user = Object.assign(new User(), {
+            firstName,
+            lastName,
+            age
+        })
+
+        return this.userRepository.save(user)
+    }
+
+    async remove(request: Request, response: Response, next: NextFunction) {
+        const id = parseInt(request.params.id)
+
+        let userToRemove = await this.userRepository.findOneBy({ id })
+
+        if (!userToRemove) {
+            return "this user not exist"
+        }
+
+        await this.userRepository.remove(userToRemove)
+
+        return "user has been removed"
+    }
+
 }`;
     }
     /**
@@ -359,81 +359,81 @@ export class UserController {
      */
     static getAppIndexTemplate(express, isEsm) {
         if (express) {
-            return `import ${!isEsm ? "* as " : ""}express from "express"
-import ${!isEsm ? "* as " : ""}bodyParser from "body-parser"
-import { Request, Response } from "express"
-import { AppDataSource } from "./data-source${isEsm ? ".js" : ""}"
-import { Routes } from "./routes${isEsm ? ".js" : ""}"
-import { User } from "./entity/User${isEsm ? ".js" : ""}"
-
-AppDataSource.initialize().then(async () => {
-
-    // create express app
-    const app = express()
-    app.use(bodyParser.json())
-
-    // register express routes from defined application routes
-    Routes.forEach(route => {
-        (app as any)[route.method](route.route, (req: Request, res: Response, next: Function) => {
-            const result = (new (route.controller as any))[route.action](req, res, next)
-            if (result instanceof Promise) {
-                result.then(result => result !== null && result !== undefined ? res.send(result) : undefined)
-
-            } else if (result !== null && result !== undefined) {
-                res.json(result)
-            }
-        })
-    })
-
-    // setup express app here
-    // ...
-
-    // start express server
-    app.listen(3000)
-
-    // insert new users for test
-    await AppDataSource.manager.save(
-        AppDataSource.manager.create(User, {
-            firstName: "Timber",
-            lastName: "Saw",
-            age: 27
-        })
-    )
-
-    await AppDataSource.manager.save(
-        AppDataSource.manager.create(User, {
-            firstName: "Phantom",
-            lastName: "Assassin",
-            age: 24
-        })
-    )
-
-    console.log("Express server has started on port 3000. Open http://localhost:3000/users to see results")
-
-}).catch(error => console.log(error))
+            return `import ${!isEsm ? "* as " : ""}express from "express"
+import ${!isEsm ? "* as " : ""}bodyParser from "body-parser"
+import { Request, Response } from "express"
+import { AppDataSource } from "./data-source${isEsm ? ".js" : ""}"
+import { Routes } from "./routes${isEsm ? ".js" : ""}"
+import { User } from "./entity/User${isEsm ? ".js" : ""}"
+
+AppDataSource.initialize().then(async () => {
+
+    // create express app
+    const app = express()
+    app.use(bodyParser.json())
+
+    // register express routes from defined application routes
+    Routes.forEach(route => {
+        (app as any)[route.method](route.route, (req: Request, res: Response, next: Function) => {
+            const result = (new (route.controller as any))[route.action](req, res, next)
+            if (result instanceof Promise) {
+                result.then(result => result !== null && result !== undefined ? res.send(result) : undefined)
+
+            } else if (result !== null && result !== undefined) {
+                res.json(result)
+            }
+        })
+    })
+
+    // setup express app here
+    // ...
+
+    // start express server
+    app.listen(3000)
+
+    // insert new users for test
+    await AppDataSource.manager.save(
+        AppDataSource.manager.create(User, {
+            firstName: "Timber",
+            lastName: "Saw",
+            age: 27
+        })
+    )
+
+    await AppDataSource.manager.save(
+        AppDataSource.manager.create(User, {
+            firstName: "Phantom",
+            lastName: "Assassin",
+            age: 24
+        })
+    )
+
+    console.log("Express server has started on port 3000. Open http://localhost:3000/users to see results")
+
+}).catch(error => console.log(error))
 `;
         }
         else {
-            return `import { AppDataSource } from "./data-source${isEsm ? ".js" : ""}"
-import { User } from "./entity/User${isEsm ? ".js" : ""}"
-
-AppDataSource.initialize().then(async () => {
-
-    console.log("Inserting a new user into the database...")
-    const user = new User()
-    user.firstName = "Timber"
-    user.lastName = "Saw"
-    user.age = 25
-    await AppDataSource.manager.save(user)
-    console.log("Saved a new user with id: " + user.id)
-
-    console.log("Loading users from the database...")
-    const users = await AppDataSource.manager.find(User)
-    console.log("Loaded users: ", users)
-
-    console.log("Here you can setup and run express / fastify / any other framework.")
-
-}).catch(error => console.log(error))
+            return `import { AppDataSource } from "./data-source${isEsm ? ".js" : ""}"
+import { User } from "./entity/User${isEsm ? ".js" : ""}"
+
+AppDataSource.initialize().then(async () => {
+
+    console.log("Inserting a new user into the database...")
+    const user = new User()
+    user.firstName = "Timber"
+    user.lastName = "Saw"
+    user.age = 25
+    await AppDataSource.manager.save(user)
+    console.log("Saved a new user with id: " + user.id)
+
+    console.log("Loading users from the database...")
+    const users = await AppDataSource.manager.find(User)
+    console.log("Loaded users: ", users)
+
+    console.log("Here you can setup and run express / fastify / any other framework.")
+
+}).catch(error => console.log(error))
 `;
         }
     }
@@ -457,101 +457,101 @@ AppDataSource.initialize().then(async () => {
     static getDockerComposeTemplate(database) {
         switch (database) {
             case "mysql":
-                return `version: '3'
-services:
-
-  mysql:
-    image: "mysql:8.0.30"
-    ports:
-      - "3306:3306"
-    environment:
-      MYSQL_ROOT_PASSWORD: "admin"
-      MYSQL_USER: "test"
-      MYSQL_PASSWORD: "test"
-      MYSQL_DATABASE: "test"
-
+                return `version: '3'
+services:
+
+  mysql:
+    image: "mysql:8.0.30"
+    ports:
+      - "3306:3306"
+    environment:
+      MYSQL_ROOT_PASSWORD: "admin"
+      MYSQL_USER: "test"
+      MYSQL_PASSWORD: "test"
+      MYSQL_DATABASE: "test"
+
 `;
             case "mariadb":
-                return `version: '3'
-services:
-
-  mariadb:
-    image: "mariadb:10.8.4"
-    ports:
-      - "3306:3306"
-    environment:
-      MYSQL_ROOT_PASSWORD: "admin"
-      MYSQL_USER: "test"
-      MYSQL_PASSWORD: "test"
-      MYSQL_DATABASE: "test"
-
+                return `version: '3'
+services:
+
+  mariadb:
+    image: "mariadb:10.8.4"
+    ports:
+      - "3306:3306"
+    environment:
+      MYSQL_ROOT_PASSWORD: "admin"
+      MYSQL_USER: "test"
+      MYSQL_PASSWORD: "test"
+      MYSQL_DATABASE: "test"
+
 `;
             case "postgres":
-                return `version: '3'
-services:
-
-  postgres:
-    image: "postgres:14.5"
-    ports:
-      - "5432:5432"
-    environment:
-      POSTGRES_USER: "test"
-      POSTGRES_PASSWORD: "test"
-      POSTGRES_DB: "test"
-
+                return `version: '3'
+services:
+
+  postgres:
+    image: "postgres:14.5"
+    ports:
+      - "5432:5432"
+    environment:
+      POSTGRES_USER: "test"
+      POSTGRES_PASSWORD: "test"
+      POSTGRES_DB: "test"
+
 `;
             case "cockroachdb":
-                return `version: '3'
-services:
-
-  cockroachdb:
-    image: "cockroachdb/cockroach:v22.1.6"
-    command: start --insecure
-    ports:
-      - "26257:26257"
-
+                return `version: '3'
+services:
+
+  cockroachdb:
+    image: "cockroachdb/cockroach:v22.1.6"
+    command: start --insecure
+    ports:
+      - "26257:26257"
+
 `;
             case "sqlite":
             case "better-sqlite3":
-                return `version: '3'
-services:
+                return `version: '3'
+services:
 `;
             case "oracle":
                 throw new error_1.TypeORMError(`You cannot initialize a project with docker for Oracle driver yet.`); // todo: implement for oracle as well
             case "mssql":
-                return `version: '3'
-services:
-
-  mssql:
-    image: "microsoft/mssql-server-linux:rc2"
-    ports:
-      - "1433:1433"
-    environment:
-      SA_PASSWORD: "Admin12345"
-      ACCEPT_EULA: "Y"
-
+                return `version: '3'
+services:
+
+  mssql:
+    image: "microsoft/mssql-server-linux:rc2"
+    ports:
+      - "1433:1433"
+    environment:
+      SA_PASSWORD: "Admin12345"
+      ACCEPT_EULA: "Y"
+
 `;
             case "mongodb":
-                return `version: '3'
-services:
-
-  mongodb:
-    image: "mongo:5.0.12"
-    container_name: "typeorm-mongodb"
-    ports:
-      - "27017:27017"
-
+                return `version: '3'
+services:
+
+  mongodb:
+    image: "mongo:5.0.12"
+    container_name: "typeorm-mongodb"
+    ports:
+      - "27017:27017"
+
 `;
             case "spanner":
-                return `version: '3'
-services:
-
-  spanner:
-    image: gcr.io/cloud-spanner-emulator/emulator:1.4.1
-    ports:
-      - "9010:9010"
-      - "9020:9020"
-
+                return `version: '3'
+services:
+
+  spanner:
+    image: gcr.io/cloud-spanner-emulator/emulator:1.4.1
+    ports:
+      - "9010:9010"
+      - "9020:9020"
+
 `;
         }
         return "";
@@ -560,21 +560,21 @@ services:
      * Gets contents of the new readme.md file.
      */
     static getReadmeTemplate(options) {
-        let template = `# Awesome Project Build with TypeORM
-
-Steps to run this project:
-
-1. Run \`npm i\` command
+        let template = `# Awesome Project Build with TypeORM
+
+Steps to run this project:
+
+1. Run \`npm i\` command
 `;
         if (options.docker) {
-            template += `2. Run \`docker-compose up\` command
+            template += `2. Run \`docker-compose up\` command
 `;
         }
         else {
-            template += `2. Setup database settings inside \`data-source.ts\` file
+            template += `2. Setup database settings inside \`data-source.ts\` file
 `;
         }
-        template += `3. Run \`npm start\` command
+        template += `3. Run \`npm start\` command
 `;
         return template;
     }
@@ -611,7 +611,7 @@ Steps to run this project:
                 packageJson.dependencies["sqlite3"] = "^5.0.2";
                 break;
             case "better-sqlite3":
-                packageJson.dependencies["better-sqlite3"] = "^7.0.0";
+                packageJson.dependencies["better-sqlite3"] = "^8.0.0";
                 break;
             case "oracle":
                 packageJson.dependencies["oracledb"] = "^5.1.0";