carrick 0.3.116 → 0.3.118

package/sidecar/dist/src/validators.js

@@ -219,12 +219,24 @@ const CheckPairEndpointSchema = z.object({
     service_name: z.string().min(1),
     alias: z.string().min(1),
 });
-const CheckPairSpecSchema = z.object({
+const CheckPairSpecSchema = z
+    .object({
     pair_key: z.string().min(1),
     protocol: z.enum(['http', 'graphql', 'socket', 'pubsub']),
     type_kind: z.enum(['request', 'response', 'both']),
     producer: CheckPairEndpointSchema,
     consumer: CheckPairEndpointSchema,
+    topic: z.string().min(1).optional(),
+})
+    .superRefine((spec, ctx) => {
+    // carrick#1979: the topic is the pub/sub operation's own key. It is
+    // required there and refused elsewhere, so zod can never strip a stray one.
+    if (spec.protocol === 'pubsub' && spec.topic === undefined) {
+        ctx.addIssue({ code: 'custom', path: ['topic'], message: 'A pubsub pair requires a topic' });
+    }
+    if (spec.protocol !== 'pubsub' && spec.topic !== undefined) {
+        ctx.addIssue({ code: 'custom', path: ['topic'], message: 'Only a pubsub pair carries a topic' });
+    }
 });
 export const CheckV2RequestSchema = BaseRequestSchema.extend({
     action: z.literal('check_v2'),
@@ -258,6 +270,13 @@ export const AddProgramFilesRequestSchema = BaseRequestSchema.extend({
     action: z.literal('add_program_files'),
     files: z.array(z.string().min(1, 'File path cannot be empty')),
 });
+export const PositionRowsRequestSchema = BaseRequestSchema.extend({
+    action: z.literal('position_rows'),
+    files: z.array(z.string().min(1, 'File path cannot be empty')),
+    scan_root: z.string().min(1, 'Scan root cannot be empty'),
+    out_path: z.string().min(1, 'Out path cannot be empty'),
+    service: z.string(),
+});
 export const ResolveDefinitionsRequestSchema = BaseRequestSchema.extend({
     action: z.literal('resolve_definitions'),
     stub_dir: z.string().min(1, 'Stub dir cannot be empty'),
@@ -337,6 +356,25 @@ const ClaimSlotSchema = z
 })
     .strict();
 const BoundNameSchema = z.object({ bound: z.enum(['maker', 'scope']) }).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
+ * verdict, since one element this schema refuses fails the whole request.
+ */
+const RunsSlotSchema = z
+    .object({
+    arg: z.number().int().nonnegative(),
+    key: z.string().min(1).optional(),
+    bound: z.literal('maker').optional(),
+})
+    .strict();
+const YieldsSchema = z
+    .object({
+    param: z.number().int().nonnegative(),
+    export: z.string().min(1),
+    side: z.string().min(1),
+})
+    .strict();
 const ClaimOnSchema = z.enum(['export', 'instance', 'both']);
 const MemberPathSchema = z.array(z.string().min(1));
 const KeyLabelsSchema = z.record(z.string().min(1), z.enum(['name', 'not_name']));
@@ -360,6 +398,7 @@ const LibraryClaimSchema = z.discriminatedUnion('kind', [
         prefix: ClaimSlotSchema.optional(),
         name: ClaimSlotSchema.optional(),
         handler: ClaimSlotSchema.optional(),
+        runs: ClaimSlotSchema.optional(),
         key_labels: KeyLabelsSchema.optional(),
         name_scope: NameScopeSchema.optional(),
         picker: z.string().optional(),
@@ -396,6 +435,10 @@ const LibraryClaimSchema = z.discriminatedUnion('kind', [
         options: ClaimSlotSchema.optional(),
         method: z.string().min(1).optional(),
         method_key: ClaimSlotSchema.optional(),
+        method_default: z.string().min(1).optional(),
+        base: ClaimSlotSchema.optional(),
+        runs: RunsSlotSchema.optional(),
+        yields: YieldsSchema.optional(),
     })
         .strict(),
     z
@@ -464,6 +507,7 @@ export const SidecarRequestSchema = z.discriminatedUnion('action', [
     ShutdownRequestSchema,
     ListProgramFilesRequestSchema,
     AddProgramFilesRequestSchema,
+    PositionRowsRequestSchema,
 ]);
 /**
  * Validates and parses incoming JSON into a typed SidecarRequest