@zenstackhq/cli 3.6.0 → 3.6.1

package/dist/index.mjs

@@ -8,6 +8,7 @@ import path from "node:path";
 import { invariant, lowerCaseFirst, singleDebounce } from "@zenstackhq/common-helpers";
 import { PrismaSchemaGenerator, TsSchemaGenerator } from "@zenstackhq/sdk";
 import { createJiti } from "jiti";
+import crypto, { createHash, randomUUID } from "node:crypto";
 import fs from "node:fs";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import terminalLink from "terminal-link";
@@ -31,7 +32,6 @@ import { ZenStackMiddleware } from "@zenstackhq/server/express";
 import cors from "cors";
 import express from "express";
 import { init } from "mixpanel";
-import { createHash, randomUUID } from "node:crypto";
 import * as os$1 from "os";
 import process$1, { env } from "node:process";
 import os from "node:os";
@@ -95,12 +95,14 @@ function handleSubProcessError$1(err) {
 	if (err instanceof Error && "status" in err && typeof err.status === "number") process.exit(err.status);
 	else process.exit(1);
 }
-async function generateTempPrismaSchema(zmodelPath, folder) {
+async function generateTempPrismaSchema(zmodelPath, opts = {}) {
+	const { folder: folderOpt, randomName = false } = opts;
 	const model = await loadSchemaDocument(zmodelPath);
 	if (!model.declarations.some(isDataSource)) throw new CliError("Schema must define a datasource");
 	const prismaSchema = await new PrismaSchemaGenerator(model).generate();
-	if (!folder) folder = path.dirname(zmodelPath);
-	const prismaSchemaFile = path.resolve(folder, "~schema.prisma");
+	const folder = folderOpt ?? path.dirname(zmodelPath);
+	const fileName = randomName ? `~schema.${crypto.randomUUID()}.prisma` : "~schema.prisma";
+	const prismaSchemaFile = path.resolve(folder, fileName);
 	fs.writeFileSync(prismaSchemaFile, prismaSchema);
 	return prismaSchemaFile;
 }
@@ -2160,7 +2162,7 @@ async function run$7(command, options) {
 async function runPush(options) {
 	const schemaFile = getSchemaFile(options.schema);
 	await requireDataSourceUrl(schemaFile);
-	const prismaSchemaFile = await generateTempPrismaSchema(schemaFile);
+	const prismaSchemaFile = await generateTempPrismaSchema(schemaFile, { randomName: options.randomPrismaSchemaName });
 	try {
 		const cmd = [
 			"db push",
@@ -2893,7 +2895,10 @@ async function run$2(options, args) {
 async function run$1(command, options) {
 	const schemaFile = getSchemaFile(options.schema);
 	await requireDataSourceUrl(schemaFile);
-	const prismaSchemaFile = await generateTempPrismaSchema(schemaFile, options.migrations ? path.dirname(options.migrations) : void 0);
+	const prismaSchemaFile = await generateTempPrismaSchema(schemaFile, {
+		folder: options.migrations ? path.dirname(options.migrations) : void 0,
+		randomName: options.randomPrismaSchemaName
+	});
 	try {
 		switch (command) {
 			case "dev":
@@ -3383,16 +3388,17 @@ function createProgram() {
 	const schemaOption = new Option("--schema <file>", `schema file (with extension ${schemaExtensions}). Defaults to "zenstack/schema.zmodel" unless specified in package.json.`);
 	const noVersionCheckOption = new Option("--no-version-check", "do not check for new version");
 	const noTipsOption = new Option("--no-tips", "do not show usage tips");
+	const randomPrismaSchemaNameOption = new Option("--random-prisma-schema-name", "append a random UUID to the temporary Prisma schema filename (e.g., ~schema.<uuid>.prisma) to avoid collisions between concurrent runs sharing a working directory").default(false);
 	program.command("generate").description("Run code generation plugins").addOption(schemaOption).addOption(noVersionCheckOption).addOption(noTipsOption).addOption(new Option("-o, --output <path>", "default output directory for code generation")).addOption(new Option("-w, --watch", "enable watch mode").default(false)).addOption(triStateBooleanOption("--lite [boolean]", "also generate a lite version of schema without attributes, defaults to false")).addOption(triStateBooleanOption("--lite-only [boolean]", "only generate lite version of schema without attributes, defaults to false")).addOption(triStateBooleanOption("--generate-models [boolean]", "generate models.ts file, defaults to true")).addOption(triStateBooleanOption("--generate-input [boolean]", "generate input.ts file, defaults to true")).addOption(new Option("--silent", "suppress all output except errors").default(false)).action(generateAction);
 	const migrateCommand = program.command("migrate").description("Run database schema migration related tasks.");
 	const migrationsOption = new Option("--migrations <path>", "path that contains the \"migrations\" directory");
-	migrateCommand.command("dev").addOption(schemaOption).addOption(noVersionCheckOption).addOption(new Option("-n, --name <name>", "migration name")).addOption(new Option("--create-only", "only create migration, do not apply")).addOption(migrationsOption).description("Create a migration from changes in schema and apply it to the database").action((options) => migrateAction("dev", options));
-	migrateCommand.command("reset").addOption(schemaOption).addOption(new Option("--force", "skip the confirmation prompt")).addOption(migrationsOption).addOption(new Option("--skip-seed", "skip seeding the database after reset")).addOption(noVersionCheckOption).description("Reset your database and apply all migrations, all data will be lost").addHelpText("after", "\nIf there is a seed script defined in package.json, it will be run after the reset. Use --skip-seed to skip it.").action((options) => migrateAction("reset", options));
-	migrateCommand.command("deploy").addOption(schemaOption).addOption(noVersionCheckOption).addOption(migrationsOption).description("Deploy your pending migrations to your production/staging database").action((options) => migrateAction("deploy", options));
-	migrateCommand.command("status").addOption(schemaOption).addOption(noVersionCheckOption).addOption(migrationsOption).description("Check the status of your database migrations").action((options) => migrateAction("status", options));
-	migrateCommand.command("resolve").addOption(schemaOption).addOption(noVersionCheckOption).addOption(migrationsOption).addOption(new Option("--applied <migration>", "record a specific migration as applied")).addOption(new Option("--rolled-back <migration>", "record a specific migration as rolled back")).description("Resolve issues with database migrations in deployment databases").action((options) => migrateAction("resolve", options));
+	migrateCommand.command("dev").addOption(schemaOption).addOption(noVersionCheckOption).addOption(new Option("-n, --name <name>", "migration name")).addOption(new Option("--create-only", "only create migration, do not apply")).addOption(migrationsOption).addOption(randomPrismaSchemaNameOption).description("Create a migration from changes in schema and apply it to the database").action((options) => migrateAction("dev", options));
+	migrateCommand.command("reset").addOption(schemaOption).addOption(new Option("--force", "skip the confirmation prompt")).addOption(migrationsOption).addOption(new Option("--skip-seed", "skip seeding the database after reset")).addOption(noVersionCheckOption).addOption(randomPrismaSchemaNameOption).description("Reset your database and apply all migrations, all data will be lost").addHelpText("after", "\nIf there is a seed script defined in package.json, it will be run after the reset. Use --skip-seed to skip it.").action((options) => migrateAction("reset", options));
+	migrateCommand.command("deploy").addOption(schemaOption).addOption(noVersionCheckOption).addOption(migrationsOption).addOption(randomPrismaSchemaNameOption).description("Deploy your pending migrations to your production/staging database").action((options) => migrateAction("deploy", options));
+	migrateCommand.command("status").addOption(schemaOption).addOption(noVersionCheckOption).addOption(migrationsOption).addOption(randomPrismaSchemaNameOption).description("Check the status of your database migrations").action((options) => migrateAction("status", options));
+	migrateCommand.command("resolve").addOption(schemaOption).addOption(noVersionCheckOption).addOption(migrationsOption).addOption(randomPrismaSchemaNameOption).addOption(new Option("--applied <migration>", "record a specific migration as applied")).addOption(new Option("--rolled-back <migration>", "record a specific migration as rolled back")).description("Resolve issues with database migrations in deployment databases").action((options) => migrateAction("resolve", options));
 	const dbCommand = program.command("db").description("Manage your database schema during development");
-	dbCommand.command("push").description("Push the state from your schema to your database").addOption(schemaOption).addOption(noVersionCheckOption).addOption(new Option("--accept-data-loss", "ignore data loss warnings")).addOption(new Option("--force-reset", "force a reset of the database before push")).action((options) => dbAction("push", options));
+	dbCommand.command("push").description("Push the state from your schema to your database").addOption(schemaOption).addOption(noVersionCheckOption).addOption(new Option("--accept-data-loss", "ignore data loss warnings")).addOption(new Option("--force-reset", "force a reset of the database before push")).addOption(randomPrismaSchemaNameOption).action((options) => dbAction("push", options));
 	dbCommand.command("pull").description("Introspect your database.").addOption(schemaOption).addOption(noVersionCheckOption).addOption(new Option("-o, --output <path>", "set custom output path for the introspected schema. If a file path is provided, all schemas are merged into that single file. If a directory path is provided, files are written to the directory and imports are kept.")).addOption(new Option("--model-casing <pascal|camel|snake|none>", "set the casing of generated models").default("pascal")).addOption(new Option("--field-casing <pascal|camel|snake|none>", "set the casing of generated fields").default("camel")).addOption(new Option("--always-map", "always add @map and @@map attributes to models and fields").default(false)).addOption(new Option("--quote <double|single>", "set the quote style of generated schema files").default("single")).addOption(new Option("--indent <number>", "set the indentation of the generated schema files").default(4)).action((options) => dbAction("pull", options));
 	dbCommand.command("seed").description("Seed the database").allowExcessArguments(true).addHelpText("after", `
 Seed script is configured under the "zenstack.seed" field in package.json.