@tsed/cli-plugin-prisma 6.6.2 → 7.0.0-alpha.1

package/lib/esm/CliPluginPrismaModule.js

@@ -1,12 +1,39 @@
-import { __decorate } from "tslib";
-import { Module } from "@tsed/cli-core";
+import { __decorate, __metadata } from "tslib";
+import { inject, OnAdd, ProjectPackageJson } from "@tsed/cli-core";
+import { injectable } from "@tsed/di";
 import { PrismaCmd } from "./commands/PrismaCmd.js";
 import { PrismaInitHook } from "./hooks/PrismaInitHook.js";
-let CliPluginPrismaModule = class CliPluginPrismaModule {
-};
-CliPluginPrismaModule = __decorate([
-    Module({
-        imports: [PrismaInitHook, PrismaCmd]
-    })
-], CliPluginPrismaModule);
-export { CliPluginPrismaModule };
+export class CliPluginPrismaModule {
+    constructor() {
+        this.packageJson = inject(ProjectPackageJson);
+    }
+    onAdd(ctx) {
+        this.addScripts();
+        this.addDependencies(ctx);
+        this.addDevDependencies(ctx);
+    }
+    addScripts() {
+        this.packageJson.addScripts({
+            "prisma:migrate": "npx prisma migrate dev --name init",
+            "prisma:generate": "npx prisma generate"
+        });
+    }
+    addDependencies(ctx) {
+        this.packageJson.addDependencies({
+            "@tsed/prisma": "latest",
+            "@prisma/client": "latest"
+        }, ctx);
+    }
+    addDevDependencies(ctx) {
+        this.packageJson.addDevDependencies({
+            prisma: "latest"
+        }, ctx);
+    }
+}
+__decorate([
+    OnAdd("@tsed/cli-plugin-prisma"),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", void 0)
+], CliPluginPrismaModule.prototype, "onAdd", null);
+injectable(CliPluginPrismaModule).imports([PrismaInitHook, PrismaCmd]);

package/lib/esm/commands/PrismaCmd.js

@@ -1,7 +1,6 @@
-import { __decorate } from "tslib";
-import { Command, inject } from "@tsed/cli-core";
+import { Command, command, inject } from "@tsed/cli-core";
 import { CliPrisma } from "../services/CliPrisma.js";
-let PrismaCmd = class PrismaCmd {
+export class PrismaCmd {
     constructor() {
         this.cli = inject(CliPrisma);
     }
@@ -13,20 +12,17 @@ let PrismaCmd = class PrismaCmd {
             }
         ];
     }
-};
-PrismaCmd = __decorate([
-    Command({
-        name: "prisma",
-        description: "Run a prisma command",
-        args: {
-            command: {
-                description: "The prisma command",
-                type: String,
-                required: true
-            }
-        },
-        options: {},
-        allowUnknownOption: true
-    })
-], PrismaCmd);
-export { PrismaCmd };
+}
+command(PrismaCmd, {
+    name: "prisma",
+    description: "Run a prisma command",
+    args: {
+        command: {
+            description: "The prisma command",
+            type: String,
+            required: true
+        }
+    },
+    options: {},
+    allowUnknownOption: true
+});

package/lib/esm/hooks/PrismaInitHook.js

@@ -1,47 +1,27 @@
-import { __decorate, __metadata } from "tslib";
-import { inject, OnAdd, OnExec, PackageManagersModule, ProjectPackageJson } from "@tsed/cli-core";
-import { Injectable } from "@tsed/di";
+import { inject, PackageManagersModule, ProjectPackageJson } from "@tsed/cli-core";
+import { injectable } from "@tsed/di";
 import { CliPrisma } from "../services/CliPrisma.js";
-let PrismaInitHook = class PrismaInitHook {
+export class PrismaInitHook {
     constructor() {
         this.cliPrisma = inject(CliPrisma);
         this.packageJson = inject(ProjectPackageJson);
         this.packageManagers = inject(PackageManagersModule);
     }
-    onAdd(ctx) {
-        this.addScripts();
-        this.addDependencies(ctx);
-        this.addDevDependencies(ctx);
-    }
-    onExec() {
+    $alterInitSubTasks(tasks, data) {
         return [
+            ...tasks,
             {
                 title: "Generate Prisma schema",
+                enabled: () => !!data.prisma,
                 task: () => this.cliPrisma.init()
             },
             {
                 title: "Add Ts.ED configuration to Prisma schema",
+                enabled: () => !!data.prisma,
                 task: () => this.cliPrisma.patchPrismaSchema()
             }
         ];
     }
-    addScripts() {
-        this.packageJson.addScripts({
-            "prisma:migrate": "npx prisma migrate dev --name init",
-            "prisma:generate": "npx prisma generate"
-        });
-    }
-    addDependencies(ctx) {
-        this.packageJson.addDependencies({
-            "@tsed/prisma": "latest",
-            "@prisma/client": "latest"
-        }, ctx);
-    }
-    addDevDependencies(ctx) {
-        this.packageJson.addDevDependencies({
-            prisma: "latest"
-        }, ctx);
-    }
     $onFinish() {
         return new Promise((resolve) => {
             this.packageManagers.runScript("prisma:generate").subscribe({
@@ -54,20 +34,5 @@ let PrismaInitHook = class PrismaInitHook {
             });
         });
     }
-};
-__decorate([
-    OnAdd("@tsed/cli-plugin-prisma"),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", void 0)
-], PrismaInitHook.prototype, "onAdd", null);
-__decorate([
-    OnExec("init"),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", void 0)
-], PrismaInitHook.prototype, "onExec", null);
-PrismaInitHook = __decorate([
-    Injectable()
-], PrismaInitHook);
-export { PrismaInitHook };
+}
+injectable(PrismaInitHook);

package/lib/esm/index.js

@@ -1,5 +1,5 @@
 import { CliPluginPrismaModule } from "./CliPluginPrismaModule.js";
+export * from "./commands/PrismaCmd.js";
 export * from "./hooks/PrismaInitHook.js";
 export * from "./services/CliPrisma.js";
-export * from "./utils/templateDir.js";
 export default CliPluginPrismaModule;

package/lib/esm/services/CliPrisma.js

@@ -1,7 +1,12 @@
-import { __decorate, __metadata } from "tslib";
-import { CliExeca, CliFs, Inject, ProjectPackageJson } from "@tsed/cli-core";
-import { Injectable } from "@tsed/di";
-let CliPrisma = class CliPrisma {
+import { join } from "node:path";
+import { CliExeca, CliFs, ProjectPackageJson } from "@tsed/cli-core";
+import { inject, injectable } from "@tsed/di";
+export class CliPrisma {
+    constructor() {
+        this.cliExeca = inject(CliExeca);
+        this.cliFs = inject(CliFs);
+        this.projectPackageJson = inject(ProjectPackageJson);
+    }
     run(command, args = [], options = {}) {
         return this.cliExeca.run("npx", ["prisma", command, ...args], {
             ...options,
@@ -12,8 +17,8 @@ let CliPrisma = class CliPrisma {
         return this.run("init");
     }
     async patchPrismaSchema() {
-        const schemaPath = this.cliFs.join(this.projectPackageJson.dir, "prisma", "schema.prisma");
-        if (this.cliFs.exists(schemaPath)) {
+        const schemaPath = join(this.projectPackageJson.dir, "prisma", "schema.prisma");
+        if (this.cliFs.fileExistsSync(schemaPath)) {
             let content = await this.cliFs.readFile(schemaPath, "utf8");
             if (!content.includes("generator tsed")) {
                 content += "\ngenerator tsed {\n" + '  provider = "tsed-prisma"\n' + "}\n";
@@ -27,20 +32,5 @@ let CliPrisma = class CliPrisma {
             }
         }
     }
-};
-__decorate([
-    Inject(),
-    __metadata("design:type", CliExeca)
-], CliPrisma.prototype, "cliExeca", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", CliFs)
-], CliPrisma.prototype, "cliFs", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", ProjectPackageJson)
-], CliPrisma.prototype, "projectPackageJson", void 0);
-CliPrisma = __decorate([
-    Injectable()
-], CliPrisma);
-export { CliPrisma };
+}
+injectable(CliPrisma);

package/lib/types/CliPluginPrismaModule.d.ts

@@ -1,2 +1,9 @@
+import type { InitCmdContext } from "@tsed/cli";
+import { ProjectPackageJson } from "@tsed/cli-core";
 export declare class CliPluginPrismaModule {
+    protected packageJson: ProjectPackageJson;
+    onAdd(ctx: InitCmdContext): void;
+    addScripts(): void;
+    addDependencies(ctx: InitCmdContext): void;
+    addDevDependencies(ctx: InitCmdContext): void;
 }

package/lib/types/commands/PrismaCmd.d.ts

@@ -1,6 +1,6 @@
-import { type CliDefaultOptions, type CommandProvider } from "@tsed/cli-core";
+import { type CommandData, type CommandProvider } from "@tsed/cli-core";
 import { CliPrisma } from "../services/CliPrisma.js";
-export interface PrismaContext extends CliDefaultOptions {
+export interface PrismaContext extends CommandData {
     command: string;
 }
 export declare class PrismaCmd implements CommandProvider {

package/lib/types/hooks/PrismaInitHook.d.ts

@@ -1,20 +1,10 @@
-import type { InitCmdContext } from "@tsed/cli";
-import { PackageManagersModule, ProjectPackageJson } from "@tsed/cli-core";
+import type { AlterInitSubTasks, InitCmdContext } from "@tsed/cli";
+import { PackageManagersModule, ProjectPackageJson, type Task } from "@tsed/cli-core";
 import { CliPrisma } from "../services/CliPrisma.js";
-export declare class PrismaInitHook {
+export declare class PrismaInitHook implements AlterInitSubTasks {
     protected cliPrisma: CliPrisma;
     protected packageJson: ProjectPackageJson;
     protected packageManagers: PackageManagersModule;
-    onAdd(ctx: InitCmdContext): void;
-    onExec(): ({
-        title: string;
-        task: () => import("rxjs").Observable<any>;
-    } | {
-        title: string;
-        task: () => Promise<void>;
-    })[];
-    addScripts(): void;
-    addDependencies(ctx: InitCmdContext): void;
-    addDevDependencies(ctx: InitCmdContext): void;
+    $alterInitSubTasks(tasks: Task[], data: InitCmdContext): Task[] | Promise<Task[]>;
     $onFinish(): Promise<unknown>;
 }

package/lib/types/index.d.ts

@@ -1,5 +1,5 @@
 import { CliPluginPrismaModule } from "./CliPluginPrismaModule.js";
+export * from "./commands/PrismaCmd.js";
 export * from "./hooks/PrismaInitHook.js";
 export * from "./services/CliPrisma.js";
-export * from "./utils/templateDir.js";
 export default CliPluginPrismaModule;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tsed/cli-plugin-prisma",
   "description": "Ts.ED CLI plugin. Add Prisma project initialisation support.",
-  "version": "6.6.2",
+  "version": "7.0.0-alpha.1",
   "type": "module",
   "main": "./lib/esm/index.js",
   "source": "./src/index.ts",
@@ -26,9 +26,9 @@
     "tslib": "2.7.0"
   },
   "devDependencies": {
-    "@tsed/cli": "6.6.2",
-    "@tsed/cli-core": "6.6.2",
-    "@tsed/typescript": "6.6.2",
+    "@tsed/cli": "7.0.0-alpha.1",
+    "@tsed/cli-core": "7.0.0-alpha.1",
+    "@tsed/typescript": "7.0.0-alpha.1",
     "cross-env": "7.0.3",
     "typescript": "5.6.2",
     "vitest": "3.2.4"
@@ -40,5 +40,8 @@
   },
   "homepage": "https://github.com/tsedio/tsed-cli/tree/master/packages/cli-plugin-prisma",
   "author": "Romain Lenzotti",
-  "license": "MIT"
+  "license": "MIT",
+  "publishConfig": {
+    "tag": "alpha"
+  }
 }

package/tests/init.integration.spec.ts

@@ -0,0 +1,164 @@
+import "../src/index.js";
+
+import {ArchitectureConvention, FeatureType, InitCmd, PlatformType, ProjectConvention, TEMPLATE_DIR} from "@tsed/cli";
+import {CliFs, PackageManager} from "@tsed/cli-core";
+import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing";
+import {FakeCliExeca} from "@tsed/cli-testing";
+import {inject} from "@tsed/di";
+import {$on} from "@tsed/hooks";
+
+describe("Prisma: Init cmd", () => {
+  beforeEach(() => {
+    return CliPlatformTest.bootstrap({
+      templateDir: TEMPLATE_DIR,
+      commands: [InitCmd],
+      argv: ["init"]
+    });
+  });
+  afterEach(() => CliPlatformTest.reset());
+
+  it("should generate a project with the right options", async () => {
+    CliPlatformTest.setPackageJson({
+      name: "",
+      version: "1.0.0",
+      description: "",
+      scripts: {},
+      dependencies: {},
+      devDependencies: {}
+    });
+
+    $on("npx prisma init", () => {
+      inject(CliFs).writeFileSync("project-name/prisma/schema.prisma", ``, {encoding: "utf8"});
+    });
+
+    await CliPlatformTest.exec("init", {
+      verbose: false,
+      root: ".",
+      tsedVersion: "5.58.1",
+      rootDir: "./.tmp/init/default",
+      production: false,
+      rawArgs: [],
+      platform: PlatformType.EXPRESS,
+      architecture: ArchitectureConvention.DEFAULT,
+      convention: ProjectConvention.DEFAULT,
+      packageManager: PackageManager.YARN,
+      projectName: "default",
+      db: true,
+      typeorm: true,
+      mysql: true,
+      features: [FeatureType.DB, FeatureType.PRISMA],
+      srcDir: "src",
+      pnpm: false,
+      npm: false,
+      yarn: true,
+      express: true,
+      koa: false,
+      platformSymbol: "PlatformExpress",
+      route: "/rest",
+      prisma: true
+    });
+
+    expect(FakeCliFs.getKeys()).toMatchInlineSnapshot(`
+      [
+        "project-name",
+        "project-name/.barrels.json",
+        "project-name/.dockerignore",
+        "project-name/.gitignore",
+        "project-name/.swcrc",
+        "project-name/Dockerfile",
+        "project-name/README.md",
+        "project-name/docker-compose.yml",
+        "project-name/nodemon.json",
+        "project-name/package.json",
+        "project-name/prisma/schema.prisma",
+        "project-name/processes.config.cjs",
+        "project-name/src/Server.ts",
+        "project-name/src/config/config.ts",
+        "project-name/src/config/logger/index.ts",
+        "project-name/src/config/utils/index.ts",
+        "project-name/src/controllers/pages/IndexController.ts",
+        "project-name/src/controllers/rest/HelloWorldController.ts",
+        "project-name/src/index.ts",
+        "project-name/tsconfig.base.json",
+        "project-name/tsconfig.json",
+        "project-name/tsconfig.node.json",
+      ]
+    `);
+
+    expect([...FakeCliExeca.entries.keys()]).toMatchInlineSnapshot(`
+      [
+        "yarn install",
+        "yarn add --ignore-engines @tsed/logger @tsed/engines @tsed/barrels ajv cross-env dotenv dotenv-expand dotenv-flow @swc/core @swc/cli @swc/helpers @swc-node/register typescript body-parser cors compression cookie-parser express method-override",
+        "yarn add -D --ignore-engines @types/node @types/multer tslib nodemon @types/cors @types/express @types/compression @types/cookie-parser @types/method-override",
+        "yarn add --ignore-engines @tsed/logger @tsed/engines @tsed/barrels ajv cross-env dotenv dotenv-expand dotenv-flow @swc/core @swc/cli @swc/helpers @swc-node/register typescript body-parser cors compression cookie-parser express method-override @tsed/prisma @prisma/client",
+        "yarn add -D --ignore-engines @types/node @types/multer tslib nodemon @types/cors @types/express @types/compression @types/cookie-parser @types/method-override prisma",
+        "npx prisma init",
+        "yarn run barrels",
+      ]
+    `);
+
+    const content = FakeCliFs.files.get("project-name/prisma/schema.prisma")!;
+
+    expect(content).toMatchInlineSnapshot(`
+      "
+      generator tsed {
+        provider = "tsed-prisma"
+      }
+
+      model User {
+        id    Int     @default(autoincrement()) @id
+        email String  @unique
+        name  String?
+      }
+      "
+    `);
+
+    const pkgJson = FakeCliFs.files.get("project-name/package.json")!;
+
+    expect(pkgJson).toMatchInlineSnapshot(`
+      "{
+        "name": "default",
+        "version": "1.0.0",
+        "description": "",
+        "scripts": {
+          "build": "yarn run barrels && swc src --out-dir dist -s  --strip-leading-paths",
+          "barrels": "barrels",
+          "start": "yarn run barrels && nodemon src/index.ts",
+          "start:prod": "cross-env NODE_ENV=production node --import @swc-node/register/esm-register src/index.js",
+          "prisma:migrate": "npx prisma migrate dev --name init",
+          "prisma:generate": "npx prisma generate"
+        },
+        "dependencies": {
+          "@tsed/ajv": "5.58.1",
+          "@tsed/core": "5.58.1",
+          "@tsed/di": "5.58.1",
+          "@tsed/exceptions": "5.58.1",
+          "@tsed/json-mapper": "5.58.1",
+          "@tsed/openspec": "5.58.1",
+          "@tsed/platform-cache": "5.58.1",
+          "@tsed/platform-exceptions": "5.58.1",
+          "@tsed/platform-express": "5.58.1",
+          "@tsed/platform-http": "5.58.1",
+          "@tsed/platform-log-request": "5.58.1",
+          "@tsed/platform-middlewares": "5.58.1",
+          "@tsed/platform-multer": "5.58.1",
+          "@tsed/platform-params": "5.58.1",
+          "@tsed/platform-response-filter": "5.58.1",
+          "@tsed/platform-views": "5.58.1",
+          "@tsed/schema": "5.58.1"
+        },
+        "devDependencies": {
+          "@tsed/cli-plugin-prisma": "1.0.0"
+        },
+        "tsed": {
+          "runtime": "node",
+          "packageManager": "yarn",
+          "architecture": "arc_default",
+          "convention": "conv_default",
+          "platform": "conv_default"
+        },
+        "type": "module"
+      }"
+    `);
+  });
+});

package/lib/esm/utils/templateDir.js

@@ -1,2 +0,0 @@
-import { getTemplateDirectory } from "@tsed/cli-core";
-export const TEMPLATE_DIR = getTemplateDirectory(import.meta.dirname);

package/lib/types/utils/templateDir.d.ts

@@ -1 +0,0 @@
-export declare const TEMPLATE_DIR: string;

package/scripts/templateDir.esm.js

@@ -1,6 +0,0 @@
-import path from "node:path";
-import {fileURLToPath} from "node:url";
-
-import {getTemplateDirectory} from "@tsed/cli-core";
-
-export const TEMPLATE_DIR = getTemplateDirectory(path.dirname(fileURLToPath(import.meta.url)));