carrick 0.3.127 → 0.3.129

package/sidecar/dist/src/validators.js

@@ -256,6 +256,8 @@ export const InferRequestSchema = BaseRequestSchema.extend({
         source_file: z.string().min(1),
     }))
         .optional(),
+    // Declared below with the library claims; read lazily (carrick#2674).
+    server_claims: z.lazy(() => ServerClaimsSchema).optional(),
 });
 export const HealthRequestSchema = BaseRequestSchema.extend({
     action: z.literal('health'),
@@ -364,7 +366,15 @@ const ClaimSlotSchema = z
     key: z.string().min(1).optional(),
 })
     .strict();
-const BoundNameSchema = z.object({ bound: z.enum(['maker', 'scope']) }).strict();
+const BoundNameSchema = z.object({ bound: z.enum(['maker', 'scope', 'key']) }).strict();
+/** Procedure routers (#2474 R6a): where a router member takes its procedures, and how nested keys join. */
+const CollectsSchema = z
+    .object({
+    arg: z.number().int().nonnegative(),
+    key: z.string().min(1).optional(),
+    join: z.string().min(1),
+})
+    .strict();
 /**
  * Label structure v2 (carrick#2434). The schema takes the shape only: which
  * method word, side or export a field names is the verifier's per-check
@@ -391,6 +401,7 @@ const RequestAtSchema = z
     path: z.array(z.string().min(1)).optional(),
     url: z.array(z.string().min(1)).optional(),
     method: z.array(z.string().min(1)).optional(),
+    body: z.array(z.string().min(1)).optional(),
 })
     .strict();
 const ClaimOnSchema = z.enum(['export', 'instance', 'both']);
@@ -426,7 +437,8 @@ const LibraryClaimSchema = z.discriminatedUnion('kind', [
         .object({
         kind: z.literal('scope'),
         member: z.string().min(1),
-        name: ClaimSlotSchema,
+        // Exactly one of `name` and `collects`: the verifier's verdict (#2474 R6a).
+        name: ClaimSlotSchema.optional(),
         path: MemberPathSchema.optional(),
         on: ClaimOnSchema.optional(),
         of: z.string().min(1).optional(),
@@ -436,6 +448,7 @@ const LibraryClaimSchema = z.discriminatedUnion('kind', [
         runs: ClaimSlotSchema.optional(),
         yields: YieldsSchema.optional(),
         mounts: ClaimSlotSchema.optional(),
+        collects: CollectsSchema.optional(),
     })
         .strict(),
     z
@@ -494,6 +507,36 @@ const LibraryCheckSchema = z
     claim: LibraryClaimSchema,
 })
     .strict();
+/**
+ * The server-framework claims an `infer` request reads handler parameters
+ * through (carrick#2674). Each check is read on its own by
+ * `settledServerChecks`: a refused one is dropped, never the request.
+ */
+const ServerClaimsSchema = z
+    .object({
+    from_dir: z.string().min(1),
+    scan_root: z.string().min(1).optional(),
+    checks: z.array(z.unknown()),
+    type_packages: z.record(z.string().min(1), z.array(z.string().min(1))).optional(),
+})
+    .strict();
+/**
+ * The checks of an `infer` request's server claims the library-check schema
+ * takes, and how many it refused (carrick#2674). A refused claim reads
+ * nothing; the others still do.
+ */
+export function settledServerChecks(checks) {
+    const settled = [];
+    let refused = 0;
+    for (const check of checks) {
+        const parsed = LibraryCheckSchema.safeParse(check);
+        if (parsed.success)
+            settled.push(parsed.data);
+        else
+            refused += 1;
+    }
+    return { checks: settled, refused };
+}
 export const VerifyLibraryClaimsRequestSchema = BaseRequestSchema.extend({
     action: z.literal('verify_library_claims'),
     from_dir: z.string().min(1),