@sequenceholdings/orm 2.9.0 → 2.10.0

package/dist/cli.d.cts

@@ -5,6 +5,13 @@ declare const TOKEN_ENV = "SEQUENCE_ORM_TOKEN";
 declare const SOURCE_ENV = "SEQUENCE_ORM_SOURCE";
 /** Namespace-admin override reason for an apply whose source does not verify; set by `seq-studio orm apply --unverified-source`. */
 declare const UNVERIFIED_SOURCE_REASON_ENV = "SEQUENCE_ORM_UNVERIFIED_SOURCE_REASON";
+/**
+ * The caller's token for the source claim's `source_environment`; set by `seq-studio orm apply --source-env`.
+ * Only the apply request carries it (as `x-sequence-source-authorization`), so Atlas can read the source there.
+ */
+declare const SOURCE_AUTHORIZATION_ENV = "SEQUENCE_ORM_SOURCE_AUTHORIZATION";
+/** The apply request's source environment credential header, when the delegate supplied one. */
+declare function applySourceHeaders(env?: NodeJS.ProcessEnv): Record<string, string>;
 /** The apply body's `source` claim, when the delegate supplied one. Atlas verifies it; it never authorizes anything. */
 declare function applySourceFromEnv(env?: NodeJS.ProcessEnv): {
     source?: Record<string, unknown>;
@@ -39,6 +46,8 @@ declare function errorDetail(payload: unknown): string | null;
 interface RegistryActivation {
     id: string;
     provenance_class: string;
+    /** Absent on an older Atlas; null for this deployment's own Git Service. */
+    source_environment?: string | null;
     source_commit: string | null;
     source_branch: string | null;
     source_path: string | null;
@@ -47,4 +56,4 @@ interface RegistryActivation {
     activated_at: string;
 }
 
-export { BASE_URL_ENV, ORM_MODULE_PATH_ENV, type RegistryActivation, SOURCE_ENV, TOKEN_ENV, UNVERIFIED_SOURCE_REASON_ENV, applySourceFromEnv, describeActivation, errorDetail, parseApplyWait, runCli, setTokenProvider };
+export { BASE_URL_ENV, ORM_MODULE_PATH_ENV, type RegistryActivation, SOURCE_AUTHORIZATION_ENV, SOURCE_ENV, TOKEN_ENV, UNVERIFIED_SOURCE_REASON_ENV, applySourceFromEnv, applySourceHeaders, describeActivation, errorDetail, parseApplyWait, runCli, setTokenProvider };

package/dist/cli.d.ts

@@ -5,6 +5,13 @@ declare const TOKEN_ENV = "SEQUENCE_ORM_TOKEN";
 declare const SOURCE_ENV = "SEQUENCE_ORM_SOURCE";
 /** Namespace-admin override reason for an apply whose source does not verify; set by `seq-studio orm apply --unverified-source`. */
 declare const UNVERIFIED_SOURCE_REASON_ENV = "SEQUENCE_ORM_UNVERIFIED_SOURCE_REASON";
+/**
+ * The caller's token for the source claim's `source_environment`; set by `seq-studio orm apply --source-env`.
+ * Only the apply request carries it (as `x-sequence-source-authorization`), so Atlas can read the source there.
+ */
+declare const SOURCE_AUTHORIZATION_ENV = "SEQUENCE_ORM_SOURCE_AUTHORIZATION";
+/** The apply request's source environment credential header, when the delegate supplied one. */
+declare function applySourceHeaders(env?: NodeJS.ProcessEnv): Record<string, string>;
 /** The apply body's `source` claim, when the delegate supplied one. Atlas verifies it; it never authorizes anything. */
 declare function applySourceFromEnv(env?: NodeJS.ProcessEnv): {
     source?: Record<string, unknown>;
@@ -39,6 +46,8 @@ declare function errorDetail(payload: unknown): string | null;
 interface RegistryActivation {
     id: string;
     provenance_class: string;
+    /** Absent on an older Atlas; null for this deployment's own Git Service. */
+    source_environment?: string | null;
     source_commit: string | null;
     source_branch: string | null;
     source_path: string | null;
@@ -47,4 +56,4 @@ interface RegistryActivation {
     activated_at: string;
 }
 
-export { BASE_URL_ENV, ORM_MODULE_PATH_ENV, type RegistryActivation, SOURCE_ENV, TOKEN_ENV, UNVERIFIED_SOURCE_REASON_ENV, applySourceFromEnv, describeActivation, errorDetail, parseApplyWait, runCli, setTokenProvider };
+export { BASE_URL_ENV, ORM_MODULE_PATH_ENV, type RegistryActivation, SOURCE_AUTHORIZATION_ENV, SOURCE_ENV, TOKEN_ENV, UNVERIFIED_SOURCE_REASON_ENV, applySourceFromEnv, applySourceHeaders, describeActivation, errorDetail, parseApplyWait, runCli, setTokenProvider };

package/dist/cli.js

@@ -1813,19 +1813,20 @@ var variableIrSchema = z.object({
   defaultValue: variableDefaultIrSchema.optional()
 });
 var sqlColumnSchema = z.object({ name: z.string(), type: z.enum(["text", "boolean", "integer", "bigint", "numeric", "double", "uuid", "date", "timestamptz", "jsonb"]), nullable: z.boolean() });
+var sqlObjectIrSchema = z.object({
+  ref: z.string(),
+  table: z.string(),
+  columns: z.array(sqlColumnSchema.extend({ type: z.string() })).min(1),
+  scan: z.string().min(1),
+  read: z.array(z.string()).min(1)
+}).strict();
 var compiledOperationSchema = z.object({
   language: z.literal("sql").optional(),
   /** Server-compiled object catalog and permission ceiling, never caller SQL. */
   sqlQuery: z.object({
     catalog: z.object({
       identity: z.string(),
-      objects: z.array(z.object({
-        ref: z.string(),
-        table: z.string(),
-        columns: z.array(sqlColumnSchema.extend({ type: z.string() })).min(1),
-        scan: z.string().min(1),
-        read: z.array(z.string()).min(1)
-      }).strict()).min(1).max(256)
+      objects: z.array(sqlObjectIrSchema).min(1).max(256)
     }).strict(),
     read: z.array(z.string()).min(1).max(256),
     maxRows: z.number().int().min(1).max(1e4)
@@ -2485,6 +2486,7 @@ var FLIPPED = {
   ">=": "<="
 };
 function resolveTable(resolver, table) {
+  resolver.onTable?.(table);
   const info = resolver.tables[table];
   if (!info) {
     throw new PolicyCompileError(`unknown table '${table}'`, "unknown-table", Object.keys(resolver.tables));
@@ -5400,10 +5402,13 @@ function sqlHash(value) {
   return `sha256:${createHash("sha256").update(value).digest("hex")}`;
 }
 function createSqlCatalog({ canonical, publishedObjects, executionTarget }) {
-  if (!publishedObjects.length || new Set(publishedObjects).size !== publishedObjects.length) throw new Error("SQL objects must be explicitly declared and unique");
   const { ctx, diagnostics } = buildCompileContext(canonical);
   if (diagnostics.some((d) => d.severity === "error")) throw new Error(diagnostics.map((d) => d.message).join("; "));
-  const identity = sqlHash(`ontology-sql-v1\0${computeSchemaHash(canonical)}\0${executionTarget}`);
+  return createSqlCatalogFromContext({ canonical, publishedObjects, executionTarget, ctx });
+}
+function createSqlCatalogFromContext({ canonical, publishedObjects, executionTarget, ctx, identity: suppliedIdentity }) {
+  if (!publishedObjects.length || new Set(publishedObjects).size !== publishedObjects.length) throw new Error("SQL objects must be explicitly declared and unique");
+  const identity = suppliedIdentity ?? sqlHash(`ontology-sql-v1\0${computeSchemaHash(canonical)}\0${executionTarget}`);
   const logicalNames = new Map(Object.entries(ctx.tables).map(([key, meta]) => [meta, key]));
   const refOf = (meta) => `${meta.namespace ?? canonical.namespace}/${logicalNames.get(meta)}`;
   const definitions = [canonical, ...canonical.imports ?? []];
@@ -5514,9 +5519,10 @@ var SqlEmitter = class {
         only(cte, ["ctename", "ctequery", "ctematerialized", "location"]);
         const name2 = str(cte.ctename);
         if (scope.ctes.has(name2)) fail3("duplicate CTE");
+        const materialization = cte.ctematerialized === "CTEMaterializeAlways" ? "MATERIALIZED " : cte.ctematerialized === "CTEMaterializeNever" ? "NOT MATERIALIZED " : cte.ctematerialized === "CTEMaterializeDefault" ? "" : fail3("unsupported CTE materialization");
         const result2 = this.select(obj(cte.ctequery), { ...parent, ctes: scope.ctes });
         scope.ctes.set(name2, result2);
-        ctes.push(`${quoteIdentifier(name2)} AS (${result2.text})`);
+        ctes.push(`${quoteIdentifier(name2)} AS ${materialization}(${result2.text})`);
       }
     }
     const result = node.op === "SETOP_UNION" ? this.union(node, scope) : this.projection(node, scope);
@@ -11425,6 +11431,11 @@ var BASE_URL_ENV = "SEQUENCE_ORM_BASE_URL";
 var TOKEN_ENV = "SEQUENCE_ORM_TOKEN";
 var SOURCE_ENV = "SEQUENCE_ORM_SOURCE";
 var UNVERIFIED_SOURCE_REASON_ENV = "SEQUENCE_ORM_UNVERIFIED_SOURCE_REASON";
+var SOURCE_AUTHORIZATION_ENV = "SEQUENCE_ORM_SOURCE_AUTHORIZATION";
+function applySourceHeaders(env = process.env) {
+  const token = env[SOURCE_AUTHORIZATION_ENV]?.trim();
+  return token ? { "x-sequence-source-authorization": `Bearer ${token}` } : {};
+}
 function applySourceFromEnv(env = process.env) {
   const reason = env[UNVERIFIED_SOURCE_REASON_ENV]?.trim();
   const override = reason ? { unverified_source_reason: reason } : {};
@@ -11984,7 +11995,8 @@ function describeActivation(activation) {
   const by = `by ${activation.actor_sub.replace(/^google-apps\|/, "")}`;
   if (activation.source_commit && activation.source_branch) {
     const at = activation.source_path ? ` at ${activation.source_path}` : "";
-    return `${since} from ${activation.source_commit.slice(0, 12)} on ${activation.source_branch}${at} (${activation.provenance_class}) ${by}`;
+    const branch = activation.source_environment ? `${activation.source_environment}:${activation.source_branch}` : activation.source_branch;
+    return `${since} from ${activation.source_commit.slice(0, 12)} on ${branch}${at} (${activation.provenance_class}) ${by}`;
   }
   const failure = activation.reported_source?.verification_failure;
   const why = typeof failure === "string" ? `: ${failure}` : "";
@@ -12196,7 +12208,7 @@ async function applyV2Command(rest, dir) {
     ...allowDestructive ? { allow_destructive: true } : {},
     ...schemaAlreadyActive && registered.operation_set_id ? { operation_set_id: registered.operation_set_id } : {},
     ...applySourceFromEnv()
-  });
+  }, applySourceHeaders());
   const live = { namespace, contentHash: registered.content_hash };
   if ("ops_only" in applied) {
     console.log(
@@ -12654,7 +12666,7 @@ async function applyCommand(rest) {
     version_id: registered.version_id,
     ...allowDestructive ? { allow_destructive: true } : {},
     ...applySourceFromEnv()
-  });
+  }, applySourceHeaders());
   if ("status" in applied) {
     const verdict = await awaitQueuedApply({ dir, namespace, contentHash: registered.content_hash, runId: applied.run_id, applyWait });
     return verdict === "live" ? writeGeneratedTypes(dir, loaded) : verdict;
@@ -12799,7 +12811,7 @@ async function apiRequest(method, path, body, options) {
   if (!token) throw new Error("not authenticated \u2014 run: seq-studio login");
   const response = await fetch(`${baseUrl}${path}`, {
     method,
-    headers: { Authorization: `Bearer ${token}`, "Content-Type": "application/json" },
+    headers: { ...options?.headers, Authorization: `Bearer ${token}`, "Content-Type": "application/json" },
     body: body === void 0 ? void 0 : JSON.stringify(body)
   });
   if (response.status === 404 && options?.allow404) return null;
@@ -12826,8 +12838,8 @@ function errorDetail(payload) {
   const fields = details && typeof details === "object" ? Object.entries(details).filter(([, value]) => typeof value === "string").map(([key, value]) => `${key}: ${String(value)}`) : [];
   return `${String(first.message)}${code ? ` (${code})` : ""}${fields.length ? ` [${fields.join(", ")}]` : ""}`;
 }
-async function apiRequestStrict(method, path, body) {
-  const result = await apiRequest(method, path, body);
+async function apiRequestStrict(method, path, body, headers) {
+  const result = await apiRequest(method, path, body, { headers });
   if (result === null) throw new Error(`${method} ${path} returned no payload`);
   return result;
 }
@@ -12854,6 +12866,6 @@ function positional(rest) {
 }
 var firstLine2 = (sql4) => sql4.split("\n")[0] ?? sql4;
 
-export { BASE_URL_ENV, ORM_MODULE_PATH_ENV, SOURCE_ENV, TOKEN_ENV, UNVERIFIED_SOURCE_REASON_ENV, applySourceFromEnv, describeActivation, errorDetail, parseApplyWait, runCli, setTokenProvider };
+export { BASE_URL_ENV, ORM_MODULE_PATH_ENV, SOURCE_AUTHORIZATION_ENV, SOURCE_ENV, TOKEN_ENV, UNVERIFIED_SOURCE_REASON_ENV, applySourceFromEnv, applySourceHeaders, describeActivation, errorDetail, parseApplyWait, runCli, setTokenProvider };
 //# sourceMappingURL=cli.js.map
 //# sourceMappingURL=cli.js.map