@vibeorm/schema 5.1.0 → 5.2.0

package/dist/index.js

@@ -1943,6 +1943,11 @@ function validateRowRules(params) {
 function wellFormedName(params) {
   return [...params.name].every((character) => character.length !== 1 || character.charCodeAt(0) < 55296 || character.charCodeAt(0) > 57343);
 }
+var REPEATED_RULE_ADVICE = Object.freeze({
+  appendOnly: "Keep one: it already refuses every UPDATE and DELETE.",
+  rowFixed: "Merge them into one rule whose except list holds only the fields both leave mutable.",
+  frozen: "Merge them into one rule, or protect the fields of a later stage with a fixed rule gated by onceSet."
+});
 function validateRowRulesWithLookup(params) {
   const { model, dialect } = params;
   const rules = model.rowRules;
@@ -1954,7 +1959,7 @@ function validateRowRulesWithLookup(params) {
   const add = (params) => {
     issues.push({ rule: params.rule ?? "row-rule-invalid", model: model.name, ...params });
   };
-  const seenKinds = new Set;
+  const firstOfKind = new Map;
   const seenDefinitions = new Set;
   const seenNames = new Set;
   for (const value of rules) {
@@ -1965,18 +1970,22 @@ function validateRowRulesWithLookup(params) {
     }
     const rule = value;
     const generated = rule.kind === "appendOnly" ? new Set : params.generatedFields({ model });
-    if (seenNames.has(rule.name))
+    const first = rule.kind === "fixed" ? undefined : firstOfKind.get(rule.kind);
+    if (first !== undefined && rule.kind !== "fixed")
+      add({ message: `Model "${model.name}" declares more than one ${rule.kind} row rule (${first}, ${rule.name}). A model takes at most one ${rule.kind} rule; only fixed rules may repeat. ${REPEATED_RULE_ADVICE[rule.kind]}` });
+    else if (seenNames.has(rule.name))
       add({ rule: "row-rule-name-collision", message: `Row rules share the physical stem ${rule.name}; supply an explicit, distinct name stem` });
     seenNames.add(rule.name);
     if (model.isView)
       add({ message: "Row rules require a stored table, not a view" });
-    if (rule.kind !== "fixed" && seenKinds.has(rule.kind))
-      add({ message: `Only one ${rule.kind} row rule is allowed per model` });
-    seenKinds.add(rule.kind);
-    const definition = rule.kind === "fixed" ? JSON.stringify([rule.kind, [...rule.columns].sort(), rule.when]) : rule.kind;
-    if (seenDefinitions.has(definition))
-      add({ message: `Duplicate ${rule.kind} row-rule declaration` });
-    seenDefinitions.add(definition);
+    if (rule.kind !== "fixed" && first === undefined)
+      firstOfKind.set(rule.kind, rule.name);
+    if (rule.kind === "fixed") {
+      const definition = JSON.stringify([rule.kind, [...rule.columns].sort(), rule.when]);
+      if (seenDefinitions.has(definition))
+        add({ message: "Duplicate fixed row-rule declaration" });
+      seenDefinitions.add(definition);
+    }
     const pair = rowRuleObjectNames({ rule });
     const names = dialect === "postgres" ? [pair.functionName, pair.triggerName] : (rule.kind === "appendOnly" ? ["update", "delete"] : ["update"]).map((event) => rowRuleTriggerName({ rule, event }));
     for (const name of names) {
@@ -2011,7 +2020,7 @@ function validateRowRulesWithLookup(params) {
     if (rule.kind !== "appendOnly" && (rule.kind === "fixed" && rule.columns.length === 0 || protectedFieldsWithGenerated({ model, rule, generated }).length === 0))
       add({ message: `${rule.kind} requires at least one protected stored field` });
   }
-  if (seenKinds.has("appendOnly") && rules.length > 1)
+  if (firstOfKind.has("appendOnly") && rules.length > 1)
     add({ message: "appendOnly cannot combine with other row rules; it already refuses every UPDATE and DELETE" });
   return issues;
 }
@@ -2876,6 +2885,11 @@ var GENERATED_TYPE_NAMES = {
     "ScalarOrderByInput",
     "RelationOrderByInput",
     "RelationFindManyArgs",
+    "RelationAggregateOrderByInput",
+    "RelationAvgOrderByInput",
+    "RelationSumOrderByInput",
+    "RelationMinOrderByInput",
+    "RelationMaxOrderByInput",
     "CreateInput",
     "UncheckedCreateInput",
     "CreateManyInput",
@@ -4535,4 +4549,4 @@ export {
   validatorRefIssue
 };
 
-//# debugId=92D7E56C6E6AF7A964756E2164756E21
+//# debugId=6A81F5FFEA4B498F64756E2164756E21