@sequenceholdings/orm 2.8.1 → 2.8.2

package/dist/cli.js

@@ -6004,7 +6004,7 @@ function generateSqlOperations({ artifact }) {
       lines.push(
         `export type ${prefix}Variables = SqlQueryVariables`,
         `export type ${prefix}Result = SqlQueryResult`,
-        `export const ${prefix}: OperationReference<${prefix}Variables, ${prefix}Result> = ${JSON.stringify({ namespace: artifact.namespace, hash: operation.opHash })}`,
+        `export const ${prefix}: OperationReference<${prefix}Variables, ${prefix}Result> = ${JSON.stringify({ namespace: artifact.namespace, name: operation.name, kind: operation.kind })}`,
         ""
       );
       continue;
@@ -6019,7 +6019,7 @@ function generateSqlOperations({ artifact }) {
 ${variables}
 }`,
       `export type ${prefix}Result = { columns: Array<{ name: string; type: string; nullable: boolean }>; rows: Array<[${row}]>; truncated: boolean }`,
-      `export const ${prefix}: OperationReference<${prefix}Variables, ${prefix}Result> = ${JSON.stringify({ namespace: artifact.namespace, hash: operation.opHash })}`,
+      `export const ${prefix}: OperationReference<${prefix}Variables, ${prefix}Result> = ${JSON.stringify({ namespace: artifact.namespace, name: operation.name, kind: operation.kind })}`,
       ""
     );
   }
@@ -6809,29 +6809,23 @@ var CodegenGqlError = class extends Error {
     this.name = "CodegenGqlError";
   }
 };
-var MANIFEST_VERSION = 1;
-var OP_HASH_RE = /^sha256:[0-9a-f]{64}$/;
+var MANIFEST_VERSION = 2;
 var GRAPHQL_NAME_RE = /^[_A-Za-z][_0-9A-Za-z]*$/;
 var manifestRequiresSchema = z.object({
   capability: z.string().min(1).optional(),
   role: z.string().min(1).optional()
 }).nullable();
 var manifestOperationSchema = z.object({
-  hash: z.string().regex(OP_HASH_RE),
   kind: z.enum(["query", "mutation"]),
   requires: manifestRequiresSchema
 });
 var operationsManifestSchema = z.object({
-  manifestVersion: z.literal(MANIFEST_VERSION),
-  schemaHash: z.string().min(1),
-  opsHash: z.string().regex(OP_HASH_RE),
+  manifestVersion: z.union([z.literal(1), z.literal(MANIFEST_VERSION)]),
   operations: z.record(z.string().regex(GRAPHQL_NAME_RE), manifestOperationSchema)
 });
 function buildOperationsManifest({
-  schemaHash,
   operations
 }) {
-  if (schemaHash.length === 0) throw new CodegenGqlError("schemaHash must be a non-empty string.");
   const sorted = [...operations].sort((a, b) => a.name.localeCompare(b.name));
   const seen = /* @__PURE__ */ new Set();
   const entries = sorted.map((op) => {
@@ -6842,20 +6836,14 @@ function buildOperationsManifest({
       throw new CodegenGqlError(`Duplicate operation name "${op.name}" \u2014 operation names must be unique per namespace.`);
     }
     seen.add(op.name);
-    if (!OP_HASH_RE.test(op.hash)) {
-      throw new CodegenGqlError(`Operation "${op.name}" has malformed hash "${op.hash}" (expected sha256:<64 hex>).`);
-    }
-    return { name: op.name, hash: op.hash, kind: op.kind, requires: normalizeRequires(op.requires) };
+    return { name: op.name, kind: op.kind, requires: normalizeRequires(op.requires) };
   });
-  const opsHash = `sha256:${createHash("sha256").update(stableJson(entries)).digest("hex")}`;
   const operationsRecord = {};
   for (const entry of entries) {
-    operationsRecord[entry.name] = { hash: entry.hash, kind: entry.kind, requires: entry.requires };
+    operationsRecord[entry.name] = { kind: entry.kind, requires: entry.requires };
   }
   return {
     manifestVersion: MANIFEST_VERSION,
-    schemaHash,
-    opsHash,
     operations: operationsRecord
   };
 }
@@ -11685,11 +11673,10 @@ async function writeGenerateOutputs(dir, project) {
 `);
   const operations = Object.entries(manifest.operations).map(([name2, op]) => ({
     name: name2,
-    hash: op.opHash,
     kind: op.kind,
     requires: op.requires
   }));
-  const manifestFile = buildOperationsManifest({ schemaHash: manifest.schemaHash, operations });
+  const manifestFile = buildOperationsManifest({ operations });
   await writeFile(join(dir, OPERATIONS_MANIFEST_FILE), `${JSON.stringify(manifestFile, null, 2)}
 `);
   await writeFile(join(dir, TYPE_POLICIES_FILE), generateTypePolicies(loaded.canonical));
@@ -11802,13 +11789,12 @@ async function executeV2Command(rest) {
   const namespace = loaded.canonical.namespace;
   let response;
   try {
-    response = await apiRequestStrict("POST", `${DATA_ENDPOINT_PREFIX}/${namespace}`, { op: selected.hash, variables });
+    response = await apiRequestStrict("POST", `${DATA_ENDPOINT_PREFIX}/${namespace}`, { op: `${selected.kind}:${operation}`, expectedKind: selected.kind, variables });
   } catch (error) {
     if (!(error instanceof AtlasRequestError) || error.status !== 404) throw error;
     const diagnosis = await diagnoseUnknownOperation({
       namespace,
       operation,
-      localHash: selected.hash,
       retry: `seq-studio orm execute ${namespace} ${operation}${env ? ` -e ${env}` : ""} --variables-file ${variablesFile}`
     }).catch(() => null);
     throw diagnosis ? new OrmDefinitionError(diagnosis) : error;
@@ -11816,7 +11802,7 @@ async function executeV2Command(rest) {
   console.log(JSON.stringify(response, null, 2));
   return 0;
 }
-async function diagnoseUnknownOperation({ namespace, operation, localHash, retry }) {
+async function diagnoseUnknownOperation({ namespace, operation, retry }) {
   const encoded = encodeURIComponent(namespace);
   const listing = await apiRequest(
     "GET",
@@ -11839,15 +11825,10 @@ async function diagnoseUnknownOperation({ namespace, operation, localHash, retry
   if (!deployed) {
     return `operation ${operation} is not in ${namespace}'s deployed version ${listing.schema_version_id}. Apply this checkout to deploy it (seq-studio orm apply), or list the deployed operations: seq-studio orm describe ${namespace} --operations`;
   }
-  if (deployed.op_hash === localHash) return null;
   return [
-    `operation ${operation}: this checkout's ${OPERATIONS_MANIFEST_FILE} does not match ${namespace}'s deployed version.`,
-    `  local hash:       ${localHash}`,
-    `  deployed hash:    ${deployed.op_hash}`,
-    `  deployed version: ${listing.schema_version_id}`,
-    "Run the deployed operation by name (no checkout needed):",
-    `  ${retry}`,
-    "Or bring the checkout up to date (git pull, then seq-studio orm generate) and retry."
+    `operation ${operation} exists in ${namespace}'s deployed version ${listing.schema_version_id}, but its guarded name was refused.`,
+    "Update Atlas to a runtime that supports guarded operation names, or retry if the operation set changed during lookup.",
+    `  ${retry}`
   ].join("\n");
 }
 async function validateV2Command(dir) {