@everystack/cli 0.4.90 → 0.4.91

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@everystack/cli",
-  "version": "0.4.90",
+  "version": "0.4.91",
   "description": "CLI and OTA updates for Expo apps on everystack",
   "license": "AGPL-3.0-only",
   "author": "Scalable Technology, Inc. <licensing@scalable.technology>",

package/src/cli/commands/db-reconcile.ts

@@ -476,6 +476,7 @@ export function buildReconcileReport(plan: ReconcilePlan): string[] {
   for (const a of plan.actions) {
     const cost = a.bytes !== undefined ? `; ${formatBytes(a.bytes)}${a.rows ? `, ~${a.rows} rows` : ''}` : '';
     lines.push(`${VERB_GLYPH[a.action] ?? '?'} ${a.action} ${a.identity} (${a.reason}${cost})`);
+    for (const r of a.revokes ?? []) lines.push(`    - ${r} (no longer declared)`);
   }
   // Pending identity migrations. Bookkeeping only — no DDL, no object changed — but they ARE a
   // write, and they were invisible here while also being excluded from `checkFails`. Silence in

package/src/cli/derived-apply.ts

@@ -140,9 +140,11 @@ export type OwnerApplyMode = 'set-role' | 'alter-owner';
  * carry pg_dump's WITH NO DATA ordering.)
  *
  * A declared owner is enacted one of two ways; see {@link OwnerApplyMode} for which and why.
+ * `revokes` (a replace's REVOKEs of dropped grantees) trail the attachments, inside the owner
+ * block for the same reason the attachments are.
  */
-function objectSql(obj: SourceObject, ownerMode: OwnerApplyMode = 'set-role'): string[] {
-  const statements = [obj.sql, ...obj.attachments.map((a) => a.sql)];
+function objectSql(obj: SourceObject, ownerMode: OwnerApplyMode = 'set-role', revokes: readonly string[] = []): string[] {
+  const statements = [obj.sql, ...obj.attachments.map((a) => a.sql), ...revokes];
   if (obj.kind === 'materialized view' && WITH_NO_DATA_RE.test(normalizeSql(obj.sql))) {
     statements.push(`REFRESH MATERIALIZED VIEW ${quoteQualified(obj.identity)}`);
   }
@@ -457,7 +459,7 @@ export function renderReconcileSql(plan: ReconcilePlan, source: SourceObject[],
       case 'replace': {
         const obj = srcById.get(action.identity);
         if (!obj) throw new Error(`replace action for ${action.identity} has no source object`);
-        statements.push(...objectSql(obj, ownerMode).map(ensureOrReplace));
+        statements.push(...objectSql(obj, ownerMode, action.revokes).map(ensureOrReplace));
         record.push(action.identity);
         break;
       }

package/src/cli/derived-grants.ts

@@ -62,6 +62,12 @@ export function isPlainGrantAttachment(a: Attachment): boolean {
   return g !== null && !g[2]; // g[2] is the (columns) group — present => column-scoped => not plain
 }
 
+/** Whether the attachments run a `REVOKE ALL … FROM PUBLIC` — PUBLIC holds nothing after them
+ *  beyond what a later attachment grants it back. */
+export function revokesPublic(attachments: readonly Attachment[]): boolean {
+  return attachments.some((a) => a.kind === 'grant' && REVOKE_PUBLIC_RE.test(a.sql));
+}
+
 /** The declared grant contract, read back from an object's own grant attachments. */
 export function parseGrantAttachments(attachments: readonly Attachment[]): ParsedGrants {
   const grants: Record<string, Set<string>> = {};
@@ -86,7 +92,12 @@ export function parseGrantAttachments(attachments: readonly Attachment[]): Parse
     target ??= onTarget.trim();
     const privileges = privilegeList.split(',').map((p) => p.trim().toUpperCase()).filter(Boolean);
     for (const role of roleList.split(',').map((r) => r.trim()).filter(Boolean)) {
-      for (const privilege of privileges) (grants[role] ??= new Set()).add(privilege);
+      // PUBLIC is a keyword, not a role: `TO public` and `TO PUBLIC` are one grantee, and the live
+      // read spells it `PUBLIC` (the table path's granteeKey, same rule). Keyed as written, a
+      // lowercase declaration read as a REVOKE from PUBLIC plus a GRANT to `public` — a replace,
+      // which keeps only the REVOKE, removed every caller's access.
+      const grantee = role.toLowerCase() === 'public' ? 'PUBLIC' : role;
+      for (const privilege of privileges) (grants[grantee] ??= new Set()).add(privilege);
     }
   }
 

package/src/cli/derived-plan.ts

@@ -27,7 +27,7 @@
 import { type ParsedSources, type SourceObject, type DerivedKind } from './derived-source';
 import type { DerivedCatalog, LiveObject } from './derived-introspect';
 import { triggerDropSql } from './derived-apply';
-import { parseGrantAttachments, diffObjectGrants } from './derived-grants';
+import { parseGrantAttachments, diffObjectGrants, revokesPublic } from './derived-grants';
 import { legacyFunctionIdentity, splitFunctionIdentity } from './pg-argtypes';
 
 export type ReconcileVerb = 'create' | 'replace' | 'refresh' | 'drop' | 'baseline' | 'rebaseline' | 'prune' | 'backfill';
@@ -43,6 +43,10 @@ export interface ReconcileAction {
   /** Drops for the structural kinds — a trigger's `DROP TRIGGER … ON table`, a 'sql'
    *  object's recorded/declared drop. Legacy kinds keep the keyword rendering. */
   dropSql?: string;
+  /** A replace's REVOKEs of grantees the source no longer declares. CREATE OR REPLACE keeps the
+   *  live ACL and the attachments only add, so without these a dropped role keeps its privilege.
+   *  They run with the replace, inside its owner block — REVOKE on a function needs its owner. */
+  revokes?: string[];
 }
 
 export interface DriftFinding {
@@ -461,6 +465,10 @@ export function planReconcile(
 
   const regrants: RegrantFinding[] = [];
   const dependencyDrift: DependencyDriftFinding[] = [];
+  const ownerContext = (src: SourceObject, liveObj: LiveObject): { declared?: string; live?: string } => ({
+    ...(src.owner !== undefined ? { declared: src.owner } : {}),
+    ...(liveObj.owner !== undefined ? { live: liveObj.owner } : {}),
+  });
   // Rebaselined objects join the lens: their live catalog rows are as real as a skip's,
   // and running the checks NOW means a migration converges (grants ride the same apply)
   // instead of surfacing on the next plan.
@@ -493,11 +501,7 @@ export function planReconcile(
         // KNOWN LIMIT: a privilege an owner has deliberately self-revoked is not restored — that
         // is a failure to ADD access (availability), never to remove it, and unnormalized code did
         // not converge on it either.
-        const owners = {
-          ...(src.owner !== undefined ? { declared: src.owner } : {}),
-          ...(liveObj.owner !== undefined ? { live: liveObj.owner } : {}),
-        };
-        const { statements, suppressed } = diffObjectGrants(target, parsed.grants, liveObj.grants, owners);
+        const { statements, suppressed } = diffObjectGrants(target, parsed.grants, liveObj.grants, ownerContext(src, liveObj));
         if (statements.length > 0) regrants.push({ identity: src.identity, statements });
         // Never silent: a withheld revoke is reported every run until the owner is declared.
         for (const note of suppressed) extraWarnings.push(note);
@@ -631,6 +635,34 @@ export function planReconcile(
     return { action, identity: id, kind, reason, ...cost, ...structural };
   };
 
+  /**
+   * The REVOKEs a function replace needs to converge its ACL in the same apply.
+   *
+   * CREATE OR REPLACE keeps the live ACL, and the compiled attachments only ADD: a REVOKE ALL
+   * FROM PUBLIC (unless PUBLIC is declared), then one GRANT per declared role. So a role dropped
+   * from the abilities in the same change as a body edit kept its EXECUTE until a second apply
+   * found it as grant drift. The ACL after the replace is the live one minus PUBLIC (when the
+   * attachments revoke it) plus the declared grants, so only the REVOKEs of the diff are left
+   * to do. They ride the replace itself rather than the regrant pass, because the replace runs
+   * inside its owner's SET ROLE block and a REVOKE on a function needs its owner.
+   *
+   * Read after the dependency cascade: a function it promoted to drop+create is recreated with a
+   * fresh ACL from its attachments alone, and is no longer in fnReplace.
+   */
+  const replaceRevokes = (id: string): string[] => {
+    const src = srcById.get(id);
+    const liveObj = liveById.get(id);
+    if (!src || !liveObj || liveObj.grants === undefined) return [];
+    const parsed = parseGrantAttachments(src.attachments);
+    if (parsed.hasColumnGrants) return [];
+    const target = parsed.target ?? `FUNCTION ${src.identity}`;
+    const afterReplace = { ...liveObj.grants };
+    if (revokesPublic(src.attachments)) delete afterReplace.PUBLIC;
+    const { statements, suppressed } = diffObjectGrants(target, parsed.grants, afterReplace, ownerContext(src, liveObj));
+    for (const note of suppressed) extraWarnings.push(note);
+    return statements.filter((st) => /^REVOKE\b/i.test(st));
+  };
+
   const actions: ReconcileAction[] = [
     ...orderDrops(dropSet).map((id) => actionFor(id, 'drop', rebuild.get(id) ?? drop.get(id) ?? '')),
     // 'sql'-kind drops (rebuilds + removals) — invisible to the live catalog, so they
@@ -638,7 +670,10 @@ export function planReconcile(
     ...[...sqlDrops.entries()].sort((a, b) => a[0].localeCompare(b[0]))
       .map(([id, d]) => ({ action: 'drop' as const, identity: id, kind: 'sql' as DerivedKind, reason: d.reason, dropSql: d.dropSql })),
     ...[...fnReplace.entries()].sort((a, b) => seqOf(a[0]) - seqOf(b[0]))
-      .map(([id, reason]) => actionFor(id, 'replace', reason)),
+      .map(([id, reason]) => {
+        const revokes = replaceRevokes(id);
+        return { ...actionFor(id, 'replace', reason), ...(revokes.length ? { revokes } : {}) };
+      }),
     ...createSet.sort((a, b) => seqOf(a) - seqOf(b))
       .map((id) => actionFor(id, 'create', rebuild.get(id) ?? create.get(id) ?? '')),
     ...[...refresh.entries()].sort((a, b) => seqOf(a[0]) - seqOf(b[0]))