@sequenceholdings/orm 2.3.0 → 2.4.0

package/dist/cli.cjs

@@ -2180,6 +2180,7 @@ var Parser2 = class {
       return node;
     }
     if (this.peekKeyword("exists")) return this.parseExists();
+    if (this.peekKeyword("visible") && this.tokens[this.index + 1]?.kind === "lparen") return this.parseVisible();
     return this.parseComparison();
   }
   parseBooleanCall(fn) {
@@ -2199,6 +2200,13 @@ var Parser2 = class {
     this.expect("rparen", "')' closing exists(...)");
     return { kind: "exists", path, where };
   }
+  parseVisible() {
+    this.advance();
+    this.expect("lparen", "'(' after visible");
+    const path = this.parsePath("a link path in visible(...)");
+    this.expect("rparen", "')' closing visible(...)");
+    return { kind: "visible", path };
+  }
   parseComparison() {
     const left = this.parseOperand();
     const operator = this.expect("operator", "a comparison operator");
@@ -2314,6 +2322,24 @@ function parsePolicy(source) {
 
 // src/predicate-v2/compile.ts
 var POLICY_MAX_LINK_DEPTH = 3;
+function scopeToNamespace(pred, namespace) {
+  switch (pred.kind) {
+    case "capability":
+    case "role":
+      return pred.namespace ? pred : { ...pred, namespace };
+    case "and":
+    case "or":
+      return { ...pred, operands: pred.operands.map((operand) => scopeToNamespace(operand, namespace)) };
+    case "not":
+      return { ...pred, operand: scopeToNamespace(pred.operand, namespace) };
+    case "exists":
+      return { ...pred, where: scopeToNamespace(pred.where, namespace) };
+    case "aggPredicate":
+      return pred.where ? { ...pred, where: scopeToNamespace(pred.where, namespace) } : pred;
+    default:
+      return pred;
+  }
+}
 var CMP_BY_OP = {
   "=": "eq",
   "!=": "neq",
@@ -2347,7 +2373,7 @@ function resolveLink(info, ref) {
 function columnCandidates(info) {
   return [...info.columns.map((c) => c.name), ...info.links.map((l) => l.name)];
 }
-var PolicyCompiler = class {
+var PolicyCompiler = class _PolicyCompiler {
   constructor(ctx) {
     this.ctx = ctx;
   }
@@ -2360,13 +2386,15 @@ var PolicyCompiler = class {
         return { kind: node.kind, operands: node.operands.map((operand) => this.compile(operand, table, depth)) };
       case "not":
         assertNoNegatedExternalClaim(node.operand);
-        return { kind: "not", operand: this.compile(node.operand, table, depth) };
+        return { kind: "not", operand: new _PolicyCompiler({ ...this.ctx, negated: true }).compile(node.operand, table, depth) };
       case "capability":
         return { kind: "capability", key: node.key };
       case "role":
         return { kind: "role", key: node.key };
       case "exists":
         return this.compileExists(node.path, node.where, table, depth);
+      case "visible":
+        return this.compileVisible(node.path, table, depth);
       case "compare":
         return this.compileCompare(node, table, depth);
     }
@@ -2380,6 +2408,36 @@ var PolicyCompiler = class {
     }
     return pred;
   }
+  /** `visible(path)` → `exists(path, <final target's read policy>)`. */
+  compileVisible(path, table, depth) {
+    const { links, finalTable } = this.resolveLinkPath(path, table, depth, { toOneOnly: false });
+    const readPolicy = this.ctx.resolver.readPolicy;
+    if (!readPolicy) {
+      throw new PolicyCompileError(
+        `visible(${path.join(".")}) needs the target's read policy, which this compile context does not provide`,
+        "visible-unresolvable"
+      );
+    }
+    if (this.ctx.visiting.includes(finalTable)) {
+      throw new PolicyCompileError(
+        `visible(${path.join(".")}) on '${table}' reaches '${finalTable}' whose read policy is already being expanded (${[...this.ctx.visiting, finalTable].join(" \u2192 ")})`,
+        "visible-cycle"
+      );
+    }
+    const expression = readPolicy(finalTable);
+    let pred = expression === void 0 ? { kind: "const", value: true } : compilePolicyAt({
+      expression,
+      table: finalTable,
+      ctx: { ...this.ctx, visiting: [...this.ctx.visiting, finalTable] },
+      depth: depth + links.length
+    });
+    const owner = this.ctx.resolver.policyNamespace?.(finalTable);
+    if (owner) pred = scopeToNamespace(pred, owner);
+    for (let i = links.length - 1; i >= 0; i -= 1) {
+      pred = { kind: "exists", link: links[i].name, where: pred };
+    }
+    return pred;
+  }
   resolveLinkPath(path, table, depth, { toOneOnly }) {
     const links = [];
     let current = table;
@@ -2440,6 +2498,7 @@ var PolicyCompiler = class {
       );
     }
     if (valueSide.kind === "claim" && isExternalPolicyClaimKey(valueSide.key)) {
+      if (this.ctx.negated) throw negatedExternalClaim(valueSide.key);
       assertExternalClaimComparison({ op, key: valueSide.key, column: info.columns.find((c) => c.name === column) });
     }
     let cmp = this.buildCmp(op, column, valueSide);
@@ -2477,22 +2536,22 @@ function assertExternalClaimComparison({ op, key, column }) {
     );
   }
 }
+function negatedExternalClaim(key) {
+  return new PolicyCompileError(
+    `claim('${key}') cannot appear under not(): a negated borrower comparison admits other borrowers' rows`,
+    "unsupported-comparison"
+  );
+}
 function assertNoNegatedExternalClaim(operand) {
   walkPolicy(operand, (node) => {
     if (node.kind !== "compare") return;
     const claim = [node.left, node.right].find((side) => side.kind === "claim" && isExternalPolicyClaimKey(side.key));
-    if (claim?.kind === "claim") {
-      throw new PolicyCompileError(
-        `claim('${claim.key}') cannot appear under not(): a negated borrower comparison admits other borrowers' rows`,
-        "unsupported-comparison"
-      );
-    }
+    if (claim?.kind === "claim") throw negatedExternalClaim(claim.key);
   });
 }
-function compilePredicateV2({ expression, table, resolver, maxLinkDepth }) {
+function compilePredicateAt({ expression, table, ctx, depth }) {
   const parsed = typeof expression === "string" ? parsePolicy(expression) : expression;
-  const compiler = new PolicyCompiler({ resolver, maxLinkDepth: maxLinkDepth ?? POLICY_MAX_LINK_DEPTH });
-  return compiler.compile(parsed.ast, table, 0);
+  return new PolicyCompiler(ctx).compile(parsed.ast, table, depth);
 }
 function assertClaimsOnlyWhen(parsed) {
   walkPolicy(parsed.ast, (node) => {
@@ -2509,25 +2568,34 @@ function assertClaimsOnlyWhen(parsed) {
         "when-not-claims-only"
       );
     }
-    if (node.kind === "exists") {
+    if (node.kind === "exists" || node.kind === "visible") {
       throw new PolicyCompileError(
-        "variant 'when' guards are claims-only \u2014 exists() is not allowed",
+        `variant 'when' guards are claims-only \u2014 ${node.kind}() is not allowed`,
         "when-not-claims-only"
       );
     }
   });
 }
-function compilePolicy({ expression, table, resolver, maxLinkDepth }) {
-  if (typeof expression === "string") {
-    return compilePredicateV2({ expression, table, resolver, maxLinkDepth });
-  }
-  const defaultPred = compilePredicateV2({ expression: expression.default, table, resolver, maxLinkDepth });
+function initialVisiting({ table, access }) {
+  return (access ?? "read") === "read" ? [table] : [];
+}
+function compilePolicy({ expression, table, resolver, maxLinkDepth, access }) {
+  return compilePolicyAt({
+    expression,
+    table,
+    depth: 0,
+    ctx: { resolver, maxLinkDepth: maxLinkDepth ?? POLICY_MAX_LINK_DEPTH, visiting: initialVisiting({ table, access }) }
+  });
+}
+function compilePolicyAt({ expression, table, ctx, depth }) {
+  if (typeof expression === "string") return compilePredicateAt({ expression, table, ctx, depth });
+  const defaultPred = compilePredicateAt({ expression: expression.default, table, ctx, depth });
   if (expression.variants.length === 0) return defaultPred;
   const branches = expression.variants.map((variant) => {
     const parsedWhen = parsePolicy(variant.when);
     assertClaimsOnlyWhen(parsedWhen);
-    const when = compilePredicateV2({ expression: parsedWhen, table, resolver, maxLinkDepth });
-    const grant = variant.allow === true ? { kind: "const", value: true } : compilePredicateV2({ expression: variant.policy, table, resolver, maxLinkDepth });
+    const when = compilePredicateAt({ expression: parsedWhen, table, ctx, depth });
+    const grant = variant.allow === true ? { kind: "const", value: true } : compilePredicateAt({ expression: variant.policy, table, ctx, depth });
     return { kind: "and", operands: [when, grant] };
   });
   return { kind: "or", operands: [defaultPred, ...branches] };
@@ -2565,33 +2633,6 @@ function andPred(...preds) {
   if (operands.length === 1) return operands[0];
   return { kind: "and", operands };
 }
-function walkPred(pred, visit2) {
-  visit2(pred);
-  switch (pred.kind) {
-    case "and":
-    case "or":
-      for (const operand of pred.operands) walkPred(operand, visit2);
-      return;
-    case "not":
-      walkPred(pred.operand, visit2);
-      return;
-    case "exists":
-      walkPred(pred.where, visit2);
-      return;
-    case "aggPredicate":
-      if (pred.where) walkPred(pred.where, visit2);
-      return;
-    default:
-      return;
-  }
-}
-function predContainsExists(pred) {
-  let found = false;
-  walkPred(pred, (node) => {
-    if (node.kind === "exists" || node.kind === "aggPredicate") found = true;
-  });
-  return found;
-}
 
 // src/compiler-gql/inject.ts
 function collectPinnedColumns(writePolicy) {
@@ -2735,12 +2776,6 @@ var PolicyInjector = class {
     if (root.op === "resolvedWrite") return this.injectResolvedWrite(root, returning);
     if (root.op === "insert" || root.op === "insertOne") {
       const insertPolicy = this.insert(table);
-      if (predContainsExists(insertPolicy)) {
-        throw new DocumentCompileError(
-          `table '${table}' cannot be inserted into: v2.0 insert checks are claims + inserted-values only, but its insert policy traverses a link (exists)`,
-          "insert-check-unrepresentable"
-        );
-      }
       const pins = (this.ctx.pins.get(table) ?? []).map(
         (pin) => ({ column: pin.column, value: { kind: "claim", key: pin.claim } })
       );
@@ -2755,22 +2790,14 @@ var PolicyInjector = class {
     const updatePolicy = this.update(table);
     const where = andPred(updatePolicy, root.where ? this.injectDocPred(root.where, table) : void 0);
     if (root.op === "update" || root.op === "updateByPk") {
-      const check = predContainsExists(updatePolicy) && !this.ctx.composed ? {} : { insertCheck: updatePolicy };
-      return { ...root, where, ...check, returning };
+      return { ...root, where, insertCheck: updatePolicy, returning };
     }
     if (root.op === "cowOverride") {
       const insertPolicy = this.insert(table);
-      if (predContainsExists(insertPolicy)) {
-        throw new DocumentCompileError(
-          `table '${table}' cannot be copy-on-write overridden: v2.0 insert checks are claims + inserted-values only, but its insert policy traverses a link (exists)`,
-          "insert-check-unrepresentable"
-        );
-      }
       const pins = (this.ctx.pins.get(table) ?? []).map(
         (pin) => ({ column: pin.column, value: { kind: "claim", key: pin.claim } })
       );
-      const check = predContainsExists(updatePolicy) && !this.ctx.composed ? {} : { insertCheck: updatePolicy };
-      return { ...root, pinnedColumns: pins, cowCopyCheck: insertPolicy, where, ...check, returning };
+      return { ...root, pinnedColumns: pins, cowCopyCheck: insertPolicy, where, insertCheck: updatePolicy, returning };
     }
     return { ...root, where, returning };
   }
@@ -3004,7 +3031,7 @@ function scopePolicy(pred, namespace) {
   switch (pred.kind) {
     case "capability":
     case "role":
-      return { ...pred, namespace };
+      return pred.namespace ? pred : { ...pred, namespace };
     case "and":
     case "or":
       return { ...pred, operands: pred.operands.map((p) => scopePolicy(p, namespace)) };
@@ -3213,7 +3240,14 @@ function buildCompileContext(rawCanonical) {
   const updatePolicies = /* @__PURE__ */ new Map();
   const pins = /* @__PURE__ */ new Map();
   const splitWritePolicyTables = /* @__PURE__ */ new Set();
-  const resolver = { tables };
+  const readPolicyExpressions = new Map(relations.map((relation) => [relation.table, relation.policies.read]));
+  const resolver = {
+    tables,
+    readPolicy: (table) => readPolicyExpressions.get(table),
+    // In a composed namespace, an imported table's read policy (inlined by
+    // visible()) is checked against the namespace that owns it.
+    ...normalized.imports?.length ? { policyNamespace: (table) => owners.get(table)?.namespace } : {}
+  };
   for (const table of relations) {
     const isView = viewNames.has(table.table);
     const compilePolicyFor = (access, store) => {
@@ -3222,7 +3256,7 @@ function buildCompileContext(rawCanonical) {
         return;
       }
       try {
-        const pred = compilePolicy({ expression, table: table.table, resolver });
+        const pred = compilePolicy({ expression, table: table.table, resolver, access });
         store.set(table.table, normalized.imports?.length ? scopePolicy(pred, owners.get(table.table).namespace) : pred);
       } catch (error) {
         if (error instanceof PolicyCompileError || error instanceof PolicyParseError) {