@beignet/cli 0.0.9 → 0.0.11

package/dist/make.js

@@ -4,6 +4,41 @@ import path from "node:path";
 import { directoryPath, loadBeignetConfig, normalizePath, resolveConfig, } from "./config.js";
 import { appendToArrayExpression, appendToNamedArray, appendToOutboxRegistryArray, arrayInitializerInfo, identifiersFromArrayExpression, insertAfterImports, matchingDelimiterIndex, } from "./registry-edits.js";
 export { makeFeatureAddonChoices } from "./choices.js";
+const drizzleDialects = {
+    sqlite: {
+        subpath: "sqlite",
+        dbTypeName: "DrizzleSqliteDatabase",
+        columnModule: "drizzle-orm/sqlite-core",
+        tableFunction: "sqliteTable",
+        schemaImports: ["integer", "sqliteTable", "text"],
+        supportsReturning: true,
+        idColumn: (columnName) => `text("${columnName}")`,
+        timestampColumn: (columnName) => `text("${columnName}")`,
+        integerColumn: (columnName) => `integer("${columnName}")`,
+    },
+    postgres: {
+        subpath: "postgres",
+        dbTypeName: "DrizzlePostgresDatabase",
+        columnModule: "drizzle-orm/pg-core",
+        tableFunction: "pgTable",
+        schemaImports: ["integer", "pgTable", "text"],
+        supportsReturning: true,
+        idColumn: (columnName) => `text("${columnName}")`,
+        timestampColumn: (columnName) => `text("${columnName}")`,
+        integerColumn: (columnName) => `integer("${columnName}")`,
+    },
+    mysql: {
+        subpath: "mysql",
+        dbTypeName: "DrizzleMysqlDatabase",
+        columnModule: "drizzle-orm/mysql-core",
+        tableFunction: "mysqlTable",
+        schemaImports: ["int", "mysqlTable", "text", "varchar"],
+        supportsReturning: false,
+        idColumn: (columnName) => `varchar("${columnName}", { length: 36 })`,
+        timestampColumn: (columnName) => `varchar("${columnName}", { length: 32 })`,
+        integerColumn: (columnName) => `int("${columnName}")`,
+    },
+};
 export async function makeResource(options) {
     return makeResourceSlice(options, "resource");
 }
@@ -41,8 +76,11 @@ async function makeResourceSlice(options, mode) {
         throw new Error(`beignet make resource expects an app error catalog. Missing ${resourceSharedErrorsPath(config)}.`);
     }
     const persistence = await detectResourcePersistence(targetDir, config);
+    const database = persistence === "drizzle"
+        ? await detectResourceDatabase(targetDir, config)
+        : "sqlite";
     const generationOptions = resourceGenerationOptions(options, mode);
-    const generatedFiles = resourceFiles(names, config, persistence, mode, generationOptions);
+    const generatedFiles = resourceFiles(names, config, persistence, mode, generationOptions, database);
     const plannedFiles = await planGeneratedFiles(targetDir, generatedFiles, {
         force: Boolean(options.force),
     });
@@ -2590,7 +2628,7 @@ function resourceFiles(names, config, persistence = "memory", mode = "feature",
     tenant: false,
     events: false,
     softDelete: false,
-}) {
+}, database = "sqlite") {
     const useCaseDir = resourceUseCaseDir(names, config);
     const infraDir = infrastructureDir(config);
     const featureDir = resourceFeatureDir(names, config);
@@ -2669,12 +2707,13 @@ function resourceFiles(names, config, persistence = "memory", mode = "feature",
         },
     ];
     if (persistence === "drizzle") {
+        const dialect = drizzleDialects[database];
         files.push({
             path: drizzleResourceSchemaFilePath(names, config),
-            content: drizzleSchemaFile(names, options),
+            content: drizzleSchemaFile(names, options, dialect),
         }, {
             path: drizzleResourceRepositoryFilePath(names, config),
-            content: drizzleRepositoryFile(names, config, mode, options),
+            content: drizzleRepositoryFile(names, config, mode, options, dialect),
         });
     }
     return files;
@@ -2862,6 +2901,37 @@ async function detectResourcePersistence(targetDir, config) {
         ? "drizzle"
         : "memory";
 }
+const databaseNames = ["sqlite", "postgres", "mysql"];
+/**
+ * Detect the SQL dialect of a Drizzle app from its generated wiring.
+ *
+ * Precedence:
+ * 1. The provider import in the Drizzle repositories file
+ *    (`@beignet/provider-db-drizzle/<dialect>`), resolved through the
+ *    configured infrastructure paths so custom layouts keep working.
+ * 2. The provider registration tokens in `server/providers.ts`
+ *    (`drizzle<Dialect>Provider` / `createDrizzle<Dialect>Provider`).
+ * 3. `"sqlite"`, the starter default.
+ *
+ * Self-healing by design: there is no config field to drift, the detector
+ * reads the same files the app boots from.
+ */
+export async function detectResourceDatabase(targetDir, config) {
+    const repositories = await readOptionalFile(path.join(targetDir, drizzleRepositoriesPath(config)));
+    const providerImport = repositories?.match(/from\s+["']@beignet\/provider-db-drizzle\/(sqlite|postgres|mysql)["']/);
+    if (providerImport)
+        return providerImport[1];
+    const providers = await readOptionalFile(path.join(targetDir, providersFilePath(config)));
+    if (providers !== undefined) {
+        for (const database of databaseNames) {
+            const dialectPascal = database.charAt(0).toUpperCase() + database.slice(1);
+            const tokens = new RegExp(`\\b(?:drizzle${dialectPascal}Provider|createDrizzle${dialectPascal}Provider)\\b`);
+            if (tokens.test(providers))
+                return database;
+        }
+    }
+    return "sqlite";
+}
 function resourceFeatureDir(names, config) {
     return path.join(config.paths.features, names.pluralKebab);
 }
@@ -3804,16 +3874,16 @@ ${mode === "resource" ? `		async findById(id: string${options.tenant ? ", filter
 }
 `;
 }
-function drizzleSchemaFile(names, options) {
-    return `import { integer, sqliteTable, text } from "drizzle-orm/sqlite-core";
+function drizzleSchemaFile(names, options, dialect) {
+    return `import { ${dialect.schemaImports.join(", ")} } from "${dialect.columnModule}";
 
-export const ${names.pluralCamel} = sqliteTable("${names.pluralKebab.replaceAll("-", "_")}", {
-	id: text("id").primaryKey(),
-${options.tenant ? `\ttenantId: text("tenant_id").notNull(),\n` : ""}	name: text("name").notNull(),
-	version: integer("version").notNull(),
-	createdAt: text("created_at").notNull(),
-	updatedAt: text("updated_at").notNull(),
-${options.softDelete ? `\tdeletedAt: text("deleted_at"),\n` : ""}});
+export const ${names.pluralCamel} = ${dialect.tableFunction}("${names.pluralKebab.replaceAll("-", "_")}", {
+	id: ${dialect.idColumn("id")}.primaryKey(),
+${options.tenant ? `\ttenantId: ${dialect.idColumn("tenant_id")}.notNull(),\n` : ""}	name: text("name").notNull(),
+	version: ${dialect.integerColumn("version")}.notNull(),
+	createdAt: ${dialect.timestampColumn("created_at")}.notNull(),
+	updatedAt: ${dialect.timestampColumn("updated_at")}.notNull(),
+${options.softDelete ? `\tdeletedAt: ${dialect.timestampColumn("deleted_at")},\n` : ""}});
 `;
 }
 function drizzleResourceWhere(names, options, predicates) {
@@ -3829,7 +3899,7 @@ function drizzleResourceWhere(names, options, predicates) {
         return allPredicates[0] ?? "";
     return `and(${allPredicates.join(", ")})`;
 }
-function drizzleRepositoryFile(names, config, mode, options) {
+function drizzleRepositoryFile(names, config, mode, options, dialect) {
     const repositoryPortPath = resourcePortFilePath(names, config);
     const schemaPath = drizzleSchemaIndexPath(config);
     const findWhere = drizzleResourceWhere(names, options, [
@@ -3863,9 +3933,131 @@ function drizzleRepositoryFile(names, config, mode, options) {
         "sql",
         "type SQL",
     ].filter((name) => Boolean(name));
+    // After a version-guarded update succeeds, re-select by identity only —
+    // matching what `.returning()` yields on the dialects that support it.
+    const updateReselectWhere = options.tenant
+        ? `and(eq(schema.${names.pluralCamel}.id, input.id), eq(schema.${names.pluralCamel}.tenantId, input.tenantId))`
+        : `eq(schema.${names.pluralCamel}.id, input.id)`;
+    // drizzle-orm/mysql2 has no `.returning(...)`; mutations resolve to a
+    // `[ResultSetHeader, FieldPacket[]]` tuple typed as `unknown` through the
+    // generic database seam, so generated MySQL code reads affectedRows
+    // defensively and re-selects rows it needs back.
+    const affectedRowsHelper = mode === "resource" && !dialect.supportsReturning
+        ? `
+// drizzle-orm/mysql2 mutations resolve to [ResultSetHeader, FieldPacket[]],
+// typed as unknown through the generic database seam, so read affectedRows
+// defensively.
+function affectedRows(result: unknown): number {
+	const head: unknown = Array.isArray(result) ? result[0] : undefined;
+	if (head === null || typeof head !== "object") return 0;
+	return "affectedRows" in head && typeof head.affectedRows === "number"
+		? head.affectedRows
+		: 0;
+}
+`
+        : "";
+    const createMethod = dialect.supportsReturning
+        ? `		async create(input) {
+			const now = new Date().toISOString();
+			const [row] = await db
+				.insert(schema.${names.pluralCamel})
+				.values({
+					id: crypto.randomUUID(),
+${options.tenant ? `\t\t\t\t\ttenantId: input.tenantId,\n` : ""}					name: input.name,
+					version: 1,
+					createdAt: now,
+					updatedAt: now,
+				})
+				.returning();
+
+			if (!row) {
+				throw new Error("Failed to create ${names.singularKebab}.");
+			}
+
+			return to${names.singularPascal}(row);
+		},
+`
+        : `		async create(input) {
+			const now = new Date().toISOString();
+			const ${names.singularCamel}: ${names.singularPascal} = {
+				id: crypto.randomUUID(),
+${options.tenant ? `\t\t\t\ttenantId: input.tenantId,\n` : ""}				name: input.name,
+				version: 1,
+				createdAt: now,
+				updatedAt: now,
+			};
+			await db.insert(schema.${names.pluralCamel}).values(${names.singularCamel});
+
+			return ${names.singularCamel};
+		},
+`;
+    const resourceMethods = mode !== "resource"
+        ? ""
+        : dialect.supportsReturning
+            ? `		async findById(id: string${options.tenant ? ", filter" : ""}) {
+			const [row] = await db
+				.select()
+				.from(schema.${names.pluralCamel})
+				.where(${findWhere})
+				.limit(1);
+
+			return row ? to${names.singularPascal}(row) : null;
+		},
+		async update(input) {
+			const [row] = await db
+				.update(schema.${names.pluralCamel})
+				.set({
+					name: input.name,
+					version: input.version + 1,
+					updatedAt: new Date().toISOString(),
+				})
+				.where(${updateWhere})
+				.returning();
+
+			return row ? to${names.singularPascal}(row) : null;
+		},
+		async delete(id: string${options.tenant ? ", filter" : ""}) {
+${options.softDelete ? `\t\t\tconst now = new Date().toISOString();\n\t\t\tconst rows = await db\n\t\t\t\t.update(schema.${names.pluralCamel})\n\t\t\t\t.set({ deletedAt: now, updatedAt: now })\n\t\t\t\t.where(${deleteWhere})\n\t\t\t\t.returning({ id: schema.${names.pluralCamel}.id });\n` : `\t\t\tconst rows = await db\n\t\t\t\t.delete(schema.${names.pluralCamel})\n\t\t\t\t.where(${deleteWhere})\n\t\t\t\t.returning({ id: schema.${names.pluralCamel}.id });\n`}
+			return rows.length > 0;
+		},
+`
+            : `		async findById(id: string${options.tenant ? ", filter" : ""}) {
+			const [row] = await db
+				.select()
+				.from(schema.${names.pluralCamel})
+				.where(${findWhere})
+				.limit(1);
+
+			return row ? to${names.singularPascal}(row) : null;
+		},
+		async update(input) {
+			const result = await db
+				.update(schema.${names.pluralCamel})
+				.set({
+					name: input.name,
+					version: input.version + 1,
+					updatedAt: new Date().toISOString(),
+				})
+				.where(${updateWhere});
+
+			if (affectedRows(result) === 0) return null;
+
+			const [row] = await db
+				.select()
+				.from(schema.${names.pluralCamel})
+				.where(${updateReselectWhere})
+				.limit(1);
+
+			return row ? to${names.singularPascal}(row) : null;
+		},
+		async delete(id: string${options.tenant ? ", filter" : ""}) {
+${options.softDelete ? `\t\t\tconst now = new Date().toISOString();\n\t\t\tconst result = await db\n\t\t\t\t.update(schema.${names.pluralCamel})\n\t\t\t\t.set({ deletedAt: now, updatedAt: now })\n\t\t\t\t.where(${deleteWhere});\n` : `\t\t\tconst result = await db\n\t\t\t\t.delete(schema.${names.pluralCamel})\n\t\t\t\t.where(${deleteWhere});\n`}
+			return affectedRows(result) > 0;
+		},
+`;
     return `import type { beignetServerOnly } from "@beignet/core/server-only";
 import { cursorPageResult } from "@beignet/core/pagination";
-import type { DrizzleSqliteDatabase } from "@beignet/provider-db-drizzle/sqlite";
+import type { ${dialect.dbTypeName} } from "@beignet/provider-db-drizzle/${dialect.subpath}";
 import { ${drizzleImports.join(", ")} } from "drizzle-orm";
 import type { ${names.singularPascal}Repository } from "${aliasModule(repositoryPortPath)}";
 import { encode${names.singularPascal}Cursor } from "${aliasModule(resourceSchemaFilePath(names, config))}";
@@ -3886,7 +4078,7 @@ ${options.tenant ? `\t\ttenantId: row.tenantId,\n` : ""}		name: row.name,
 		updatedAt: row.updatedAt,
 	};
 }
-
+${affectedRowsHelper}
 type List${names.pluralPascal}Query = Parameters<${names.singularPascal}Repository["list"]>[0];
 
 function ${names.singularCamel}SortColumn(query: List${names.pluralPascal}Query) {
@@ -3945,7 +4137,7 @@ function cursorFor${names.singularPascal}(
 }
 
 export function createDrizzle${names.singularPascal}Repository(
-	db: DrizzleSqliteDatabase<typeof schema>,
+	db: ${dialect.dbTypeName}<typeof schema>,
 ): ${names.singularPascal}Repository {
 	return {
 		async list(query) {
@@ -3968,26 +4160,7 @@ export function createDrizzle${names.singularPascal}Repository(
 				nextCursor,
 			);
 		},
-		async create(input) {
-			const now = new Date().toISOString();
-			const [row] = await db
-				.insert(schema.${names.pluralCamel})
-				.values({
-					id: crypto.randomUUID(),
-${options.tenant ? `\t\t\t\t\ttenantId: input.tenantId,\n` : ""}					name: input.name,
-					version: 1,
-					createdAt: now,
-					updatedAt: now,
-				})
-				.returning();
-
-			if (!row) {
-				throw new Error("Failed to create ${names.singularKebab}.");
-			}
-
-			return to${names.singularPascal}(row);
-		},
-${mode === "resource" ? `		async findById(id: string${options.tenant ? ", filter" : ""}) {\n			const [row] = await db\n				.select()\n				.from(schema.${names.pluralCamel})\n				.where(${findWhere})\n				.limit(1);\n\n			return row ? to${names.singularPascal}(row) : null;\n		},\n		async update(input) {\n			const [row] = await db\n				.update(schema.${names.pluralCamel})\n				.set({\n					name: input.name,\n					version: input.version + 1,\n					updatedAt: new Date().toISOString(),\n				})\n				.where(${updateWhere})\n				.returning();\n\n			return row ? to${names.singularPascal}(row) : null;\n		},\n		async delete(id: string${options.tenant ? ", filter" : ""}) {\n${options.softDelete ? `\t\t\tconst now = new Date().toISOString();\n\t\t\tconst rows = await db\n\t\t\t\t.update(schema.${names.pluralCamel})\n\t\t\t\t.set({ deletedAt: now, updatedAt: now })\n\t\t\t\t.where(${deleteWhere})\n\t\t\t\t.returning({ id: schema.${names.pluralCamel}.id });\n` : `\t\t\tconst rows = await db\n\t\t\t\t.delete(schema.${names.pluralCamel})\n\t\t\t\t.where(${deleteWhere})\n\t\t\t\t.returning({ id: schema.${names.pluralCamel}.id });\n`}\n			return rows.length > 0;\n		},\n` : ""}
+${createMethod}${resourceMethods}
 	};
 }
 `;