@ogygie/generate 0.33.0 → 0.34.1

package/dist/{chunk-MI725PT3.js → chunk-VPJEACPK.js}

@@ -3182,10 +3182,6 @@ function orderPlanOf(operation, schemas, resourceFields) {
   const tuples = typeof operation.orderBy[0] === "string" ? [operation.orderBy] : operation.orderBy;
   return { enumOrder: null, tuples: tuples.map(([field, direction]) => ({ field, direction })) };
 }
-function tenantOf(plan) {
-  if (plan.tenant === null) throw new Error("generation plan: this emitter needs a tenant column (target.tenancy column) \u2014 a target without tenant is emitted by the mssql emitters");
-  return plan.tenant;
-}
 function schemaNameOfModel(model, schemas, except) {
   const wanted = JSON.stringify({ ...model, optional: false, nullable: model.nullable, examples: [] });
   for (const [name, entry] of Object.entries(schemas)) {
@@ -4051,7 +4047,7 @@ function drizzleTableLines(table, builders, tablesByName) {
 function drizzleViewLines(view, builders) {
   for (const column of view.columns) builders.add(builderOf(column));
   return [
-    `/** READ-ONLY mapping of the view ${view.name} (hole ${view.id}, D32): the SQL lives in the migration, this table shape is what tenantDb reads; nothing is ever written through it. */`,
+    `/** READ-ONLY mapping of the view ${view.name} (hole ${view.id}, D32): the SQL lives in the migration, this table shape is what the repository's facade reads; nothing is ever written through it. */`,
     `export const ${view.tsName} = pgTable(${quote(view.name)}, {`,
     ...view.columns.map((column) => `  ${column.key}: ${column.drizzle},`),
     "});",
@@ -4061,7 +4057,7 @@ function drizzleViewLines(view, builders) {
 function drizzleSharedLines(table, builders) {
   for (const column of table.columns) builders.add(builderOf(column));
   return [
-    `/** READ-ONLY mapping of the shared table ${table.sqlName} (D60): a table of the product outside this feature, read by its aggregate holes through tenantDb; never created nor written here. */`,
+    `/** READ-ONLY mapping of the shared table ${table.sqlName} (D60): a table of the product outside this feature, read by its aggregate holes through the repository's facade; never created nor written here. */`,
     `export const ${table.tsName} = pgTable(${quote(table.sqlName)}, {`,
     ...table.columns.map((column) => `  ${column.key}: ${column.drizzle},`),
     "});",
@@ -4114,7 +4110,7 @@ function emitDbSchema(plan) {
   for (const table of plan.sharedTables) sections.push("", ...drizzleSharedLines(table, builders));
   const needsSql = tables.some((table) => table.uniques.some((unique) => unique.where !== null));
   const intent = wrap(
-    `Drizzle tables owned by the ${plan.featureId} feature, derived from ${plan.resource.schemaName} (${plan.specPath}, section G\xE9n\xE9ration): tenant-scoped by ${tenantOf(plan).column} (TS key \`${tenantOf(plan).columnKey}\`, the column tenantDb injects and filters).${plan.key === null ? "" : ` The business key ${plan.key.field} is unique per tenant (${plan.key.uniqueName}), the target of every slot and reference foreign key.`}${plan.slots.length === 0 ? "" : ` Slot tables: ${plan.slots.map((slot) => slot.table.sqlName).join(", ")} (cascade with the resource row).`}${plan.references.some((reference) => reference.table !== null) ? ` Reference tables: ${plan.references.flatMap((reference) => reference.table === null ? [] : [reference.table.sqlName]).join(", ")} (a referenced row cannot be deleted).` : ""}${views.length === 0 ? "" : ` Views ${views.map((view) => view.name).join(", ")} are read-only mappings: their SQL is in the migration.`}${plan.appendOnly === null ? "" : ` The append-only key (${plan.appendOnly.key.join(", ")}) is unique among CURRENT rows (superseded_by is null).`} SQL migration: ${plan.migrationPath}.`
+    `Drizzle tables owned by the ${plan.featureId} feature, derived from ${plan.resource.schemaName} (${plan.specPath}, section G\xE9n\xE9ration): ${plan.tenant === null ? "without tenant column (target.tenancy none, D33: the product is single-tenant, the repository reads whole tables through plainDb)" : `tenant-scoped by ${plan.tenant.column} (TS key \`${plan.tenant.columnKey}\`, the column tenantDb injects and filters)`}.${plan.key === null ? "" : ` The business key ${plan.key.field} is unique per tenant (${plan.key.uniqueName}), the target of every slot and reference foreign key.`}${plan.slots.length === 0 ? "" : ` Slot tables: ${plan.slots.map((slot) => slot.table.sqlName).join(", ")} (cascade with the resource row).`}${plan.references.some((reference) => reference.table !== null) ? ` Reference tables: ${plan.references.flatMap((reference) => reference.table === null ? [] : [reference.table.sqlName]).join(", ")} (a referenced row cannot be deleted).` : ""}${views.length === 0 ? "" : ` Views ${views.map((view) => view.name).join(", ")} are read-only mappings: their SQL is in the migration.`}${plan.appendOnly === null ? "" : ` The append-only key (${plan.appendOnly.key.join(", ")}) is unique among CURRENT rows (superseded_by is null).`} SQL migration: ${plan.migrationPath}.`
   );
   return fileOf(
     tsGeneratedHeader(plan.generatorVersion),
@@ -4142,6 +4138,8 @@ function createTableStatements(table) {
   for (const unique of table.uniques.filter((candidate) => candidate.where !== null)) {
     statements.push(`create unique index ${quote(unique.name)} on ${quote(table.sqlName)} (${unique.columns.map(quote).join(", ")}) where ${unique.where ?? ""};`);
   }
+  const tenantColumn = table.columns.find((column) => column.model === null && column.key !== "id");
+  if (tenantColumn === void 0) return statements;
   statements.push(
     "",
     `alter table ${quote(table.sqlName)} enable row level security;`,
@@ -4160,7 +4158,7 @@ function emitMigration(plan, existingMigration = null) {
   const bodies = viewBodiesOf(existingMigration);
   const adopted = tablesOf(plan).filter((candidate) => candidate.mode === "adopted");
   const intent = wrap(
-    `${plan.featureId} feature: the ${plan.table.sqlName} table${tables.length > 1 ? ` and ${tables.slice(1).map((table) => table.sqlName).join(", ")}` : ""}, tenant-scoped by ${tenantOf(plan).column} (derived from ${plan.resource.schemaName}, ${plan.specPath}).${adopted.length === 0 ? "" : ` ${adopted.map((table) => table.sqlName).join(", ")} ${adopted.length > 1 ? "are ADOPTED tables" : "is an ADOPTED table"} (D36): declared in the block, created by the product, altered here within the closed list only.`} Same rails as the socle: foreign key to ${tenantOf(plan).table}, Row-Level Security on every table (AGENTS.md \xA7Multi-tenant 3 \u2014 second rampart, tenantDb remains the first)${plan.appendOnly === null ? "" : ", plus the append-only motif: a partial unique index on the current rows and a DEFERRABLE superseded_by foreign key, so the old row is marked before the new one is inserted"}${views.length === 0 ? "." : `. The views ${views.map((view) => view.name).join(", ")} are HOLES (D32): their SQL stands between the @hole markers below, written by a human, kept at every regeneration; everything else in this file is generated.`}`
+    `${plan.featureId} feature: the ${plan.table.sqlName} table${tables.length > 1 ? ` and ${tables.slice(1).map((table) => table.sqlName).join(", ")}` : ""}, ${plan.tenant === null ? "without tenant column (target.tenancy none, D33)" : `tenant-scoped by ${plan.tenant.column}`} (derived from ${plan.resource.schemaName}, ${plan.specPath}).${adopted.length === 0 ? "" : ` ${adopted.map((table) => table.sqlName).join(", ")} ${adopted.length > 1 ? "are ADOPTED tables" : "is an ADOPTED table"} (D36): declared in the block, created by the product, altered here within the closed list only.`} ${plan.tenant === null ? "No tenant column, no row-level security: the product is single-tenant (D33)" : `Same rails as the socle: foreign key to ${plan.tenant.table}, Row-Level Security on every table (AGENTS.md \xA7Multi-tenant 3 \u2014 second rampart, tenantDb remains the first)`}${plan.appendOnly === null ? "" : ", plus the append-only motif: a partial unique index on the current rows and a DEFERRABLE superseded_by foreign key, so the old row is marked before the new one is inserted"}${views.length === 0 ? "." : `. The views ${views.map((view) => view.name).join(", ")} are HOLES (D32): their SQL stands between the @hole markers below, written by a human, kept at every regeneration; everything else in this file is generated.`}`
   ).map((line, index) => `-- ${index === 0 ? "@intent " : ""}${line}`);
   const statements = [];
   for (const table of tables) statements.push(...statements.length === 0 ? [] : [""], ...createTableStatements(table));
@@ -6898,6 +6896,9 @@ function emitBehaviorTests(plan) {
 }
 
 // src/emit/repository.ts
+function writtenTypeOf(plan, newType) {
+  return plan.tenant === null ? newType : `Omit<${newType}, ${quote(plan.tenant.columnKey)}>`;
+}
 function comparatorLines(plan, operation) {
   const order = operation.order;
   if (order === null) return ["    return 0;"];
@@ -7036,7 +7037,7 @@ function insertFunctionLines2(plan, operation) {
   const signature = signatureParts(plan);
   const derivedParameter = derived.length === 0 ? "" : `, derived: Pick<${plan.resource.typeName}, ${derived.map(quote).join(" | ")}>`;
   const valuesLines = [
-    `  const values: Omit<${plan.table.newType}, ${quote(tenantOf(plan).columnKey)}> = {`,
+    `  const values: ${writtenTypeOf(plan, plan.table.newType)} = {`,
     "    id,",
     ...inputFieldsPresent.map((field) => `    ${field}: input.${field},`),
     ...derived.map((field) => `    ${field}: derived.${field},`),
@@ -7146,7 +7147,7 @@ function insertFunctionLines2(plan, operation) {
     "          409,",
     "        );",
     "      }",
-    `      const marking: Partial<Omit<${plan.table.newType}, ${quote(tenantOf(plan).columnKey)}>> = { supersededBy: id };`,
+    `      const marking: Partial<${writtenTypeOf(plan, plan.table.newType)}> = { supersededBy: id };`,
     `      await db.update(${table}).set(marking).where(eq(${table}.id, old.id));`,
     "    } else {",
     `      const [existing] = await db`,
@@ -7238,7 +7239,7 @@ function importFunctionLines(plan, operation) {
   }
   lines.push(
     "    for (const { row } of rows) {",
-    `      const values: Omit<${plan.table.newType}, ${quote(tenantOf(plan).columnKey)}> = {`,
+    `      const values: ${writtenTypeOf(plan, plan.table.newType)} = {`,
     "        id: crypto.randomUUID(),",
     ...valueFields.map((field) => `        ${field}: row.${field},`),
     ...appendOnly === null ? [] : ["        supersedes: null,", "        supersededBy: null,"],
@@ -7275,7 +7276,7 @@ function updateFunctionLines2(plan, operation) {
     `/** ${operation.id} \u2014 update by key (D28): the fields sent are written, the key never changes${plan.signed === null ? "" : ", the signature is renewed (D31)"}. */`,
     `export async function update${plan.resource.typeName}ByKey(ctx: ${plan.context.typeName}, key: ${plan.resource.typeName}[${quote(plan.key.field)}], input: ${operation.inputType}${signature.parameter}): Promise<${plan.table.rowType}> {`,
     `  const row = await load${plan.resource.typeName}ByKey(ctx, key, ${quote(operation.notFound ?? "")});`,
-    `  const patch: Partial<Omit<${plan.table.newType}, ${quote(tenantOf(plan).columnKey)}>> = {`,
+    `  const patch: Partial<${writtenTypeOf(plan, plan.table.newType)}> = {`,
     ...fields.map((field) => `    ...(input.${field} === undefined ? {} : { ${field}: input.${field} }),`),
     ...signature.values,
     "  };",
@@ -7312,11 +7313,11 @@ function setOrClearFunctionLines2(plan, operation) {
     "    }",
     ...idempotent ? [`    if (existing !== undefined && existing.${slot.value} === value) return "unchanged";`] : [],
     "    if (existing !== undefined) {",
-    `      const patch: Partial<Omit<${slot.table.newType}, ${quote(tenantOf(plan).columnKey)}>> = { ${slot.value}: value${signature.values.length === 0 ? "" : `, ${plan.signed?.by ?? ""}: signature.by, ${plan.signed?.at ?? ""}: signature.at`} };`,
+    `      const patch: Partial<${writtenTypeOf(plan, slot.table.newType)}> = { ${slot.value}: value${signature.values.length === 0 ? "" : `, ${plan.signed?.by ?? ""}: signature.by, ${plan.signed?.at ?? ""}: signature.at`} };`,
     `      await db.update(${table}).set(patch).where(${whereExisting});`,
     `      return "set";`,
     "    }",
-    `    const values: Omit<${slot.table.newType}, ${quote(tenantOf(plan).columnKey)}> = {`,
+    `    const values: ${writtenTypeOf(plan, slot.table.newType)} = {`,
     ...slot.table.hasId ? ["      id: crypto.randomUUID(),"] : [],
     `      ${slot.parentKey}: parent.${plan.key.field},`,
     `      ${slot.key}: slotKey,`,
@@ -7383,7 +7384,7 @@ function referenceLines2(plan, reference) {
     "",
     `/** One ${reference.name} row pointing at a resource key \u2014 what a test arranges to prove \xAB ligne r\xE9f\xE9renc\xE9e \xBB. */`,
     `export async function insert${typeName}(ctx: ${plan.context.typeName}, values: Pick<${reference.table.newType}, ${writtenColumns2.map(quote).join(" | ")}>): Promise<${reference.table.rowType}> {`,
-    `  const inserted: Omit<${reference.table.newType}, ${quote(tenantOf(plan).columnKey)}> = { ...values };`,
+    `  const inserted: ${writtenTypeOf(plan, reference.table.newType)} = { ...values };`,
     `  const [row] = await tenantDb(ctx).insert(${reference.table.tsName}).values(inserted).returning();`,
     "  if (row === undefined) throwOgygieError(insertReturnedNothing());",
     "  return row;",
@@ -7411,7 +7412,7 @@ function arrangeLines2(plan, target) {
     `export async function arrange${target.typeName}Rows(ctx: ${plan.context.typeName}, rows: readonly ${target.withId ? `Omit<${target.typeName}, "id">` : target.typeName}[]): Promise<${target.rowType}[]> {`,
     `  const inserted: ${target.rowType}[] = [];`,
     "  for (const row of rows) {",
-    `    const values: Omit<${valuesType}, ${quote(tenantOf(plan).columnKey)}> = {`,
+    `    const values: ${writtenTypeOf(plan, valuesType)} = {`,
     ...target.withId ? ["      id: crypto.randomUUID(),"] : [],
     ...target.fields.filter((field) => !(target.withId && field.name === "id")).map((field) => `      ${field.name}: ${insertExpressionOf(field)},`),
     "    };",
@@ -7476,18 +7477,21 @@ function emitRepository(plan) {
   if (setOrClear !== void 0) sections.push("", ...setOrClearFunctionLines2(plan, setOrClear));
   if (deleteOperation !== void 0) sections.push("", ...deleteFunctionLines2(plan, deleteOperation));
   if (importOperation !== void 0) sections.push("", ...importFunctionLines(plan, importOperation));
+  const noTenant = plan.tenant === null;
+  const handleType = noTenant ? plan.databasePort?.typeName ?? "Database" : plan.context.typeName;
+  const finalSections = noTenant ? sections.map((line) => line.replace(/\btenantDb\(ctx\)/gu, "plainDb(db)").replace(/\bctx\b/gu, "db").replaceAll(`db: ${plan.context.typeName}`, `db: ${handleType}`)) : sections;
   return fileOf(
     tsGeneratedHeader(plan.generatorVersion),
     intentBlock(
       wrap(
-        `Persistence of the ${plan.featureId} feature \u2014 the only file of the feature allowed to touch the database, always through tenantDb: the tenant column is injected on insert and filtered on every read, never written by hand (AGENTS.md \xA7Multi-tenant).${plan.appendOnly === null ? "" : ` The append-only motif appendOnlySupersedes on (${plan.appendOnly.key.join(", ")}): current rows per key, supersede by marking the old row BEFORE inserting the new one.`}${plan.importMotif === null ? "" : " The all-or-nothing import: one transaction or nothing."}${plan.key === null ? "" : ` The keyed writes of D28 address a row by ${plan.key.field} and answer the operation's 404 otherwise.`}${plan.unique === null ? "" : ` uniqueKey: 409 ${plan.unique.error} on a taken key.`}${plan.referenced === null ? "" : ` refuseWhenReferenced: 409 ${plan.referenced.error} while a ${plan.referenced.reference.name} row points at the row.`}${plan.signed === null ? "" : ` signedWrite: ${plan.signed.by} and ${plan.signed.at} on every write.`}${views.length === 0 ? "" : ` The views ${views.map((view) => view.name).join(", ")} are read through their read-only mappings (D32).`} Derived from ${plan.specPath}.`
+        `Persistence of the ${plan.featureId} feature \u2014 the only file of the feature allowed to touch the database, ${noTenant ? "always through plainDb: the product is single-tenant (target.tenancy none, D33), the whole table is read and written through the one facade, never a raw query builder" : "always through tenantDb: the tenant column is injected on insert and filtered on every read, never written by hand (AGENTS.md \xA7Multi-tenant)"}.${plan.appendOnly === null ? "" : ` The append-only motif appendOnlySupersedes on (${plan.appendOnly.key.join(", ")}): current rows per key, supersede by marking the old row BEFORE inserting the new one.`}${plan.importMotif === null ? "" : " The all-or-nothing import: one transaction or nothing."}${plan.key === null ? "" : ` The keyed writes of D28 address a row by ${plan.key.field} and answer the operation's 404 otherwise.`}${plan.unique === null ? "" : ` uniqueKey: 409 ${plan.unique.error} on a taken key.`}${plan.referenced === null ? "" : ` refuseWhenReferenced: 409 ${plan.referenced.error} while a ${plan.referenced.reference.name} row points at the row.`}${plan.signed === null ? "" : ` signedWrite: ${plan.signed.by} and ${plan.signed.at} on every write.`}${views.length === 0 ? "" : ` The views ${views.map((view) => view.name).join(", ")} are read through their read-only mappings (D32).`} Derived from ${plan.specPath}.`
       )
     ),
     drizzleImports.size === 0 ? null : `import { ${[...drizzleImports].sort().join(", ")} } from "drizzle-orm";`,
     'import type { Clock } from "@ogygie/core/clock";',
     'import { throwOgygieError } from "@ogygie/core/errors";',
-    'import { tenantDb } from "@ogygie/core/tenant";',
-    `import type { ${plan.context.typeName} } from ${quote(plan.context.importPath)};`,
+    noTenant ? 'import { plainDb } from "@ogygie/core/tenant";' : 'import { tenantDb } from "@ogygie/core/tenant";',
+    noTenant ? `import type { ${handleType} } from ${quote(plan.databasePort?.importPath ?? "../../db.js")};` : `import type { ${plan.context.typeName} } from ${quote(plan.context.importPath)};`,
     "import {",
     ...tableImports.map((line) => `  ${line},`),
     '} from "./db.schema.gen.js";',
@@ -7522,7 +7526,7 @@ function emitRepository(plan) {
     `    suggestedFix: "Check the migration ${plan.migrationFileName} was applied to this database.",`,
     "  };",
     "}",
-    ...sections
+    ...finalSections
   );
 }
 
@@ -11847,9 +11851,23 @@ async function fillLogicHoles(project, featureId, argv, out, deps) {
     }
   });
   const summary = await fillFeature(inputs, fillDeps, wiring.options);
+  for (const path of refreshHoleDocs(project.root, folder, plan, loadHolesLibrary(wiring.libraryDir))) out.log(`  r\xE9\xE9crite  ${path}`);
   report(wiring, summary, { unit: "trou", human: "HUMAIN (todo)" });
   return summary.unfilled === 0 ? 0 : 1;
 }
+function refreshHoleDocs(projectRoot, folder, plan, library) {
+  const changed = [];
+  for (const hole of plan.holes) {
+    const relativePath = `${folder}/holes/${hole.id}.gen.md`;
+    const path = join6(projectRoot, relativePath);
+    const content = emitHoleDoc(plan, hole, library);
+    if (existsSync5(path) && readFileSync6(path, "utf8") === content) continue;
+    mkdirSync3(join6(projectRoot, folder, "holes"), { recursive: true });
+    writeFileSync3(path, content, "utf8");
+    changed.push(relativePath);
+  }
+  return changed;
+}
 function viewContextOf(projectRoot, plan, view) {
   const docPath = join6(projectRoot, plan.folder, "holes", `${view.hole.id}.gen.md`);
   const doc = existsSync5(docPath) ? readFileSync6(docPath, "utf8") : `# ${view.hole.id}`;

package/dist/cli/fill-command.d.ts

@@ -1,3 +1,4 @@
+import { type FeaturePlan } from "../emit/plan.js";
 import type { CustomViewPlan, ScreenPlan } from "../emit/screen-plan.js";
 import { type HoleLibraryEntry } from "../hole-shape.js";
 import { type FillOptions } from "../fill/fill.js";
@@ -46,6 +47,8 @@ export interface FillCommandDeps {
 }
 /** An entry recorded in the library: a new file, or the provenance of an existing one extended. */
 export declare function recordLibraryEntry(libraryDir: string, entry: HoleLibraryEntry): "created" | "extended" | "unchanged";
+/** Re-emits the `holes/<id>.gen.md` of a feature against the library as it stands; answers the repo-relative paths it changed. */
+export declare function refreshHoleDocs(projectRoot: string, folder: string, plan: FeaturePlan, library: readonly HoleLibraryEntry[]): string[];
 /** The context a view candidate is drawn on: the view's hole doc, then the product's pattern catalogue when the repo keeps one (D53). */
 export declare function viewContextOf(projectRoot: string, plan: ScreenPlan, view: CustomViewPlan): string;
 export declare function runFillCommand(project: GenerateProject, featureId: string | undefined, argv: readonly string[], out: CommandOutput, deps?: FillCommandDeps): Promise<number>;

package/dist/cli/run.js

@@ -37,7 +37,7 @@ import {
   throwOgygieError,
   verifyGeneration,
   writeExtensionRegistries
-} from "../chunk-MI725PT3.js";
+} from "../chunk-VPJEACPK.js";
 
 // src/cli/check-command.ts
 import { existsSync, readFileSync, readdirSync } from "node:fs";

package/dist/index.js

@@ -193,7 +193,7 @@ import {
   viewCandidateTextOf,
   viewExampleTestName,
   vocabularyOf
-} from "./chunk-MI725PT3.js";
+} from "./chunk-VPJEACPK.js";
 
 // src/prompt-card.ts
 var phrase = (caseKey) => caseKey.replace(/^with:/u, "avec ").replace(/^without:/u, "sans ");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ogygie/generate",
-  "version": "0.33.0",
+  "version": "0.34.1",
   "description": "Ogygie generator: reads the `# Génération` block of a spec and its schemas.ts, derives everything deterministic without a model (routes, pipeline, database, factories, tests, screens, previews), fills the typed holes of logic.ts by library, draw and escalation, and draws the first schemas.ts of a new feature — judged by the gates. Sixth package of the lockstep (D55).",
   "license": "MIT",
   "type": "module",
@@ -29,7 +29,7 @@
     }
   },
   "dependencies": {
-    "@ogygie/core": "0.33.0",
+    "@ogygie/core": "0.34.1",
     "tsx": "^4.20.0",
     "yaml": "^2.9.0",
     "zod": "^4.0.0"
@@ -38,7 +38,7 @@
     "@lingui/babel-plugin-lingui-macro": "^5.9.5",
     "@lingui/core": "^5.9.5",
     "@lingui/react": "^5.9.5",
-    "@ogygie/ui": "0.33.0",
+    "@ogygie/ui": "0.34.1",
     "@starter/api": "0.1.0",
     "@tanstack/react-query": "^5.102.2",
     "@tanstack/react-router": "^1.170.32",