@opencrvs/toolkit 2.0.0-rc.d451982 → 2.0.0-rc.d6f0865

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -418,28 +418,20 @@ function schemaPriority(schema) {
418
418
  return idx === -1 ? 9999 : idx;
419
419
  }
420
420
  function safeUnion(schemas) {
421
+ const sortedSchemas = [...schemas].sort(
422
+ (a, b) => schemaPriority(a) - schemaPriority(b)
423
+ );
421
424
  return z7.any().superRefine((val, ctx) => {
422
- const successful = schemas.filter((s) => s.safeParse(val).success);
423
- if (successful.length === 1) {
424
- return;
425
- }
426
- if (successful.length === 0) {
427
- ctx.addIssue({
428
- code: "invalid_type",
429
- expected: "custom",
430
- message: "Value does not match any schema"
431
- });
432
- return;
433
- }
434
- successful.sort((a, b) => schemaPriority(a) - schemaPriority(b));
435
- const best = successful[0];
436
- if (!best.safeParse(val).success) {
437
- ctx.addIssue({
438
- expected: "custom",
439
- code: "invalid_type",
440
- message: "Value did not match the best schema"
441
- });
425
+ for (const schema of sortedSchemas) {
426
+ if (schema.safeParse(val).success) {
427
+ return;
428
+ }
442
429
  }
430
+ ctx.addIssue({
431
+ code: "invalid_type",
432
+ expected: "custom",
433
+ message: "Value does not match any schema"
434
+ });
443
435
  }).meta({
444
436
  description: "Value that matches exactly one of the possible schema types (TextValue, DateValue, DateRangeFieldValue). The best matching schema is chosen by priority."
445
437
  });
package/dist/cli.js CHANGED
@@ -2120,6 +2120,10 @@ Done. Converted ${convertedCount} config file(s), replaced ${totalReplaced} rout
2120
2120
  var import_ts_morph11 = require("ts-morph");
2121
2121
  var import_path11 = __toESM(require("path"));
2122
2122
 
2123
+ // ../commons/src/scopes.deprecated.do-not-use.ts
2124
+ var z4 = __toESM(require("zod/v4"));
2125
+ var import_lodash = require("lodash");
2126
+
2123
2127
  // ../commons/src/scopes.ts
2124
2128
  var z3 = __toESM(require("zod/v4"));
2125
2129
  var qs = __toESM(require("qs"));
@@ -2393,7 +2397,6 @@ var DEFAULT_SCOPE_OPTIONS = {
2393
2397
  };
2394
2398
 
2395
2399
  // ../commons/src/scopes.deprecated.do-not-use.ts
2396
- var z4 = __toESM(require("zod/v4"));
2397
2400
  var rawConfigurableScopeRegex = /^([a-zA-Z][a-zA-Z0-9.-]*(?:\.[a-zA-Z0-9.-]+)*)\[((?:\w+=[\w.-]+(?:\|[\w.-]+)*)(?:,[\w]+=[\w.-]+(?:\|[\w.-]+)*)*)\]$/;
2398
2401
  var rawConfigurableScope = z4.string().regex(rawConfigurableScopeRegex);
2399
2402
  var SearchScope = z4.object({
@@ -2627,6 +2630,74 @@ var legacyScopeToV2Scope = (v1Scope) => {
2627
2630
  }
2628
2631
  throw new Error(`Unsupported V1 scope type: ${v1Scope}`);
2629
2632
  };
2633
+ var MERGEABLE_USER_SCOPE_TYPES = ["user.create", "user.edit"];
2634
+ function isMergeableUserScopeType(type) {
2635
+ return MERGEABLE_USER_SCOPE_TYPES.includes(type);
2636
+ }
2637
+ function decodeLegacyScope(legacy) {
2638
+ const encoded = legacyScopeToV2Scope(legacy);
2639
+ const scope = decodeScope(encoded);
2640
+ if (!scope) {
2641
+ throw new Error(
2642
+ `Could not decode migrated scope from legacy '${legacy}' (encoded: '${encoded}').`
2643
+ );
2644
+ }
2645
+ return { legacy, scope };
2646
+ }
2647
+ function groupByType(entries) {
2648
+ return entries.reduce(
2649
+ (groups, entry) => ({
2650
+ ...groups,
2651
+ [entry.scope.type]: [...groups[entry.scope.type] ?? [], entry]
2652
+ }),
2653
+ {}
2654
+ );
2655
+ }
2656
+ function deduplicateEntries(entries) {
2657
+ return entries.filter(
2658
+ (entry, index) => entries.findIndex((e) => (0, import_lodash.isEqual)(e.scope, entry.scope)) === index
2659
+ );
2660
+ }
2661
+ function mergeEntries(type, entries) {
2662
+ const optionsList = entries.map(
2663
+ (e) => "options" in e.scope && e.scope.options ? e.scope.options : {}
2664
+ );
2665
+ const allKeys = optionsList.flatMap(
2666
+ (opts) => Object.keys(opts).filter((k) => opts[k] !== void 0)
2667
+ );
2668
+ const conflictKey = allKeys.find((key, i) => allKeys.indexOf(key) !== i);
2669
+ if (conflictKey) {
2670
+ const conflicting = entries.filter(
2671
+ (e) => conflictKey in ("options" in e.scope && e.scope.options || {})
2672
+ ).map((e) => JSON.stringify(e.legacy));
2673
+ throw new Error(
2674
+ `Cannot auto-merge two '${type}' scopes that both define '${conflictKey}'. Conflicting legacy scopes: [${conflicting.join(", ")}]. Resolve manually in roles.ts and re-run.`
2675
+ );
2676
+ }
2677
+ const mergedOptions = Object.assign({}, ...optionsList);
2678
+ const merged = Object.keys(mergedOptions).length > 0 ? { type, options: mergedOptions } : { type };
2679
+ const parsed = Scope2.safeParse(merged);
2680
+ if (!parsed.success) {
2681
+ throw new Error(
2682
+ `Merged '${type}' scope failed schema validation: ${parsed.error.message}. Legacy scopes: [${entries.map((e) => JSON.stringify(e.legacy)).join(", ")}].`
2683
+ );
2684
+ }
2685
+ return parsed.data;
2686
+ }
2687
+ function migrateLegacyScopesArrayToV2Scopes(legacyScopes) {
2688
+ const groups = groupByType(legacyScopes.map(decodeLegacyScope));
2689
+ return Object.entries(groups).flatMap(([type, entries]) => {
2690
+ const deduped = deduplicateEntries(entries);
2691
+ if (deduped.length <= 1) return deduped.map((e) => e.scope);
2692
+ if (!isMergeableUserScopeType(type)) {
2693
+ console.warn(
2694
+ `Multiple non-mergeable '${type}' scopes detected after dedup \u2014 kept all as-is. Legacy scopes: [${deduped.map((e) => JSON.stringify(e.legacy)).join(", ")}]. Review whether the duplication is intentional.`
2695
+ );
2696
+ return deduped.map((e) => e.scope);
2697
+ }
2698
+ return [mergeEntries(type, deduped)];
2699
+ });
2700
+ }
2630
2701
 
2631
2702
  // src/migrations/v2.0/migrate-scopes.ts
2632
2703
  var ROLES_FILE_RELATIVE_PATH = "src/data-seeding/roles/roles.ts";
@@ -2664,57 +2735,65 @@ function resolveLegacyScopeFromElement(element) {
2664
2735
  }
2665
2736
  function migrateScopesArrays(rolesFilePath, project) {
2666
2737
  const sourceFile = project.getSourceFile(rolesFilePath);
2667
- if (!sourceFile) return { migratedCount: 0, removedCount: 0 };
2738
+ if (!sourceFile) {
2739
+ return { migratedCount: 0, removedCount: 0, mergedCount: 0 };
2740
+ }
2668
2741
  let migratedCount = 0;
2669
2742
  let removedCount = 0;
2743
+ let mergedCount = 0;
2670
2744
  const scopesProperties = sourceFile.getDescendantsOfKind(import_ts_morph11.SyntaxKind.PropertyAssignment).filter((prop) => prop.getName() === SCOPES_PROPERTY_NAME);
2745
+ const relPath = import_path11.default.relative(process.cwd(), rolesFilePath);
2671
2746
  for (const scopesProp of scopesProperties) {
2672
2747
  const initializer = scopesProp.getInitializer();
2673
2748
  if (!initializer || !import_ts_morph11.Node.isArrayLiteralExpression(initializer)) continue;
2674
- const elements = initializer.getElements();
2675
- for (let index = elements.length - 1; index >= 0; index--) {
2676
- const element = elements[index];
2677
- if (!import_ts_morph11.Node.isExpression(element)) continue;
2749
+ const rawTexts = [];
2750
+ const legacyStrings = [];
2751
+ let anyChange = false;
2752
+ for (const element of initializer.getElements()) {
2678
2753
  const scopeKey = resolveScopeKeyFromElementAccess(element);
2679
2754
  if (scopeKey && !(scopeKey in SCOPES)) {
2680
2755
  console.warn(
2681
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Removing unknown scope reference: SCOPES.${scopeKey}`
2756
+ ` [${relPath}] Removing unknown scope reference: SCOPES.${scopeKey}`
2682
2757
  );
2683
- initializer.removeElement(index);
2684
2758
  removedCount++;
2759
+ anyChange = true;
2685
2760
  continue;
2686
2761
  }
2687
2762
  const legacyScope = resolveLegacyScopeFromElement(element);
2688
2763
  if (!legacyScope) {
2689
2764
  console.warn(
2690
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Skipping non-literal scope expression: ${element.getText()}`
2765
+ ` [${relPath}] Preserving non-literal scope expression verbatim: ${element.getText()}`
2691
2766
  );
2767
+ rawTexts.push(element.getText());
2692
2768
  continue;
2693
2769
  }
2694
- try {
2695
- const migratedScope = legacyScopeToV2Scope(legacyScope);
2696
- const scope = decodeScope(migratedScope);
2697
- if (!scope) {
2698
- console.warn(
2699
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not decode migrated scope '${migratedScope}'.`
2700
- );
2701
- continue;
2702
- }
2703
- element.replaceWithText(JSON.stringify(scope));
2704
- migratedCount++;
2705
- } catch (error) {
2706
- console.warn(
2707
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not migrate scope '${legacyScope}': ${error}`
2708
- );
2709
- }
2770
+ legacyStrings.push(legacyScope);
2771
+ anyChange = true;
2772
+ }
2773
+ if (!anyChange) continue;
2774
+ let mergedScopes;
2775
+ try {
2776
+ mergedScopes = migrateLegacyScopesArrayToV2Scopes(legacyStrings);
2777
+ } catch (error) {
2778
+ throw new Error(
2779
+ `[${relPath}] Failed to migrate scopes for role: ${error instanceof Error ? error.message : String(error)}`,
2780
+ { cause: error }
2781
+ );
2710
2782
  }
2783
+ migratedCount += legacyStrings.length;
2784
+ mergedCount += legacyStrings.length - mergedScopes.length;
2785
+ const outputElements = [
2786
+ ...rawTexts,
2787
+ ...mergedScopes.map((s) => JSON.stringify(s))
2788
+ ];
2789
+ scopesProp.setInitializer(`[${outputElements.join(", ")}]`);
2711
2790
  }
2712
2791
  if (removedCount > 0) {
2713
2792
  console.log(
2714
- ` Removed ${removedCount} unknown SCOPES reference(s) from '${import_path11.default.relative(process.cwd(), rolesFilePath)}'.`
2793
+ ` Removed ${removedCount} unknown SCOPES reference(s) from '${relPath}'.`
2715
2794
  );
2716
2795
  }
2717
- return { migratedCount, removedCount };
2796
+ return { migratedCount, removedCount, mergedCount };
2718
2797
  }
2719
2798
  function ensureScopesHelpersImport(rolesFilePath, project) {
2720
2799
  const sourceFile = project.getSourceFile(rolesFilePath);
@@ -2849,7 +2928,7 @@ async function main11() {
2849
2928
  return;
2850
2929
  }
2851
2930
  const importChanged = ensureScopesHelpersImport(rolesFilePath, project);
2852
- const { migratedCount, removedCount } = migrateScopesArrays(
2931
+ const { migratedCount, removedCount, mergedCount } = migrateScopesArrays(
2853
2932
  rolesFilePath,
2854
2933
  project
2855
2934
  );
@@ -2868,7 +2947,7 @@ async function main11() {
2868
2947
  }
2869
2948
  await sourceFile.save();
2870
2949
  console.log(
2871
- `Done. Migrated ${migratedCount} legacy scope(s), removed ${removedCount} unknown SCOPES reference(s), wrapped ${wrappedScopesCount} scope array(s) with defineScopes()${wrappedRoles ? ", wrapped roles with defineRoles()" : ""}${removedRoleType ? ", and removed Role type definition" : ""}${importChanged ? ". Updated toolkit/scopes imports." : "."}`
2950
+ `Done. Migrated ${migratedCount} legacy scope(s), merged ${mergedCount} AND-paired scope(s) into single v2 objects (privilege-escalation fix, see issue #12489), removed ${removedCount} unknown SCOPES reference(s), wrapped ${wrappedScopesCount} scope array(s) with defineScopes()${wrappedRoles ? ", wrapped roles with defineRoles()" : ""}${removedRoleType ? ", and removed Role type definition" : ""}${importChanged ? ". Updated toolkit/scopes imports." : "."}`
2872
2951
  );
2873
2952
  }
2874
2953
 
@@ -1105,6 +1105,7 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
1105
1105
  annotation?: Record<string, unknown> | undefined;
1106
1106
  originalActionId?: string | undefined;
1107
1107
  keepAssignment?: boolean | undefined;
1108
+ waitFor?: boolean | undefined;
1108
1109
  createdAtLocation?: string | null | undefined;
1109
1110
  };
1110
1111
  output: {
@@ -1225,6 +1226,7 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
1225
1226
  annotation?: Record<string, unknown> | undefined;
1226
1227
  originalActionId?: string | undefined;
1227
1228
  keepAssignment?: boolean | undefined;
1229
+ waitFor?: boolean | undefined;
1228
1230
  createdAtLocation?: string | null | undefined;
1229
1231
  type?: "DECLARE" | undefined;
1230
1232
  };
@@ -1799,6 +1801,7 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
1799
1801
  annotation?: Record<string, unknown> | undefined;
1800
1802
  originalActionId?: string | undefined;
1801
1803
  keepAssignment?: boolean | undefined;
1804
+ waitFor?: boolean | undefined;
1802
1805
  createdAtLocation?: string | null | undefined;
1803
1806
  type?: "CUSTOM" | undefined;
1804
1807
  };
@@ -2154,6 +2157,7 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
2154
2157
  annotation?: Record<string, unknown> | undefined;
2155
2158
  originalActionId?: string | undefined;
2156
2159
  keepAssignment?: boolean | undefined;
2160
+ waitFor?: boolean | undefined;
2157
2161
  createdAtLocation?: string | null | undefined;
2158
2162
  };
2159
2163
  output: {
@@ -2467,6 +2471,7 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
2467
2471
  annotation?: Record<string, unknown> | undefined;
2468
2472
  originalActionId?: string | undefined;
2469
2473
  keepAssignment?: boolean | undefined;
2474
+ waitFor?: boolean | undefined;
2470
2475
  createdAtLocation?: string | null | undefined;
2471
2476
  type?: "UNASSIGN" | undefined;
2472
2477
  assignedTo?: null | undefined;
@@ -2960,6 +2965,7 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
2960
2965
  annotation?: Record<string, unknown> | undefined;
2961
2966
  originalActionId?: string | undefined;
2962
2967
  keepAssignment?: boolean | undefined;
2968
+ waitFor?: boolean | undefined;
2963
2969
  createdAtLocation?: string | null | undefined;
2964
2970
  type?: "MARK_AS_DUPLICATE" | undefined;
2965
2971
  content?: {
@@ -3277,6 +3283,7 @@ export declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
3277
3283
  annotation?: Record<string, unknown> | undefined;
3278
3284
  originalActionId?: string | undefined;
3279
3285
  keepAssignment?: boolean | undefined;
3286
+ waitFor?: boolean | undefined;
3280
3287
  createdAtLocation?: string | null | undefined;
3281
3288
  type?: "MARK_AS_NOT_DUPLICATE" | undefined;
3282
3289
  };
@@ -6,6 +6,7 @@ export declare const BaseActionInput: z.ZodObject<{
6
6
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
7
7
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
8
8
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
9
+ waitFor: z.ZodOptional<z.ZodBoolean>;
9
10
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
10
11
  }, z.core.$strip>;
11
12
  export declare const RegisterActionInput: z.ZodObject<{
@@ -15,6 +16,7 @@ export declare const RegisterActionInput: z.ZodObject<{
15
16
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
16
17
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
17
18
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
19
+ waitFor: z.ZodOptional<z.ZodBoolean>;
18
20
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
19
21
  type: z.ZodDefault<z.ZodLiteral<"REGISTER">>;
20
22
  registrationNumber: z.ZodOptional<z.ZodString>;
@@ -27,6 +29,7 @@ export declare const NotifyActionInput: z.ZodObject<{
27
29
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
28
30
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
29
31
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
32
+ waitFor: z.ZodOptional<z.ZodBoolean>;
30
33
  type: z.ZodDefault<z.ZodLiteral<"NOTIFY">>;
31
34
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
32
35
  }, z.core.$strip>;
@@ -38,6 +41,7 @@ export declare const DeclareActionInput: z.ZodObject<{
38
41
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
39
42
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
40
43
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
44
+ waitFor: z.ZodOptional<z.ZodBoolean>;
41
45
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
42
46
  type: z.ZodDefault<z.ZodLiteral<"DECLARE">>;
43
47
  }, z.core.$strip>;
@@ -48,6 +52,7 @@ export declare const EditActionInput: z.ZodObject<{
48
52
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
49
53
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
50
54
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
55
+ waitFor: z.ZodOptional<z.ZodBoolean>;
51
56
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
52
57
  type: z.ZodDefault<z.ZodLiteral<"EDIT">>;
53
58
  content: z.ZodObject<{
@@ -62,6 +67,7 @@ export declare const PrintCertificateActionInput: z.ZodObject<{
62
67
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
63
68
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
64
69
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
70
+ waitFor: z.ZodOptional<z.ZodBoolean>;
65
71
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
66
72
  type: z.ZodDefault<z.ZodLiteral<"PRINT_CERTIFICATE">>;
67
73
  content: z.ZodOptional<z.ZodObject<{
@@ -76,6 +82,7 @@ export declare const RejectDeclarationActionInput: z.ZodObject<{
76
82
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
77
83
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
78
84
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
85
+ waitFor: z.ZodOptional<z.ZodBoolean>;
79
86
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
80
87
  type: z.ZodDefault<z.ZodLiteral<"REJECT">>;
81
88
  content: z.ZodObject<{
@@ -90,6 +97,7 @@ export declare const DuplicateDetectedActionInput: z.ZodObject<{
90
97
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
91
98
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
92
99
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
100
+ waitFor: z.ZodOptional<z.ZodBoolean>;
93
101
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
94
102
  type: z.ZodDefault<z.ZodLiteral<"DUPLICATE_DETECTED">>;
95
103
  content: z.ZodObject<{
@@ -106,6 +114,7 @@ export declare const MarkAsDuplicateActionInput: z.ZodObject<{
106
114
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
107
115
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
108
116
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
117
+ waitFor: z.ZodOptional<z.ZodBoolean>;
109
118
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
110
119
  type: z.ZodDefault<z.ZodLiteral<"MARK_AS_DUPLICATE">>;
111
120
  content: z.ZodOptional<z.ZodObject<{
@@ -120,6 +129,7 @@ export declare const MarkNotDuplicateActionInput: z.ZodObject<{
120
129
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
121
130
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
122
131
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
132
+ waitFor: z.ZodOptional<z.ZodBoolean>;
123
133
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
124
134
  type: z.ZodDefault<z.ZodLiteral<"MARK_AS_NOT_DUPLICATE">>;
125
135
  }, z.core.$strip>;
@@ -131,6 +141,7 @@ export declare const ArchiveActionInput: z.ZodObject<{
131
141
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
132
142
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
133
143
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
144
+ waitFor: z.ZodOptional<z.ZodBoolean>;
134
145
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
135
146
  type: z.ZodDefault<z.ZodLiteral<"ARCHIVE">>;
136
147
  content: z.ZodObject<{
@@ -145,6 +156,7 @@ export declare const AssignActionInput: z.ZodObject<{
145
156
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
146
157
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
147
158
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
159
+ waitFor: z.ZodOptional<z.ZodBoolean>;
148
160
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
149
161
  type: z.ZodLiteral<"ASSIGN">;
150
162
  assignedTo: z.ZodString;
@@ -157,6 +169,7 @@ export declare const UnassignActionInput: z.ZodObject<{
157
169
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
158
170
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
159
171
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
172
+ waitFor: z.ZodOptional<z.ZodBoolean>;
160
173
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
161
174
  type: z.ZodDefault<z.ZodLiteral<"UNASSIGN">>;
162
175
  assignedTo: z.ZodDefault<z.ZodLiteral<null>>;
@@ -169,6 +182,7 @@ export declare const RequestCorrectionActionInput: z.ZodObject<{
169
182
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
170
183
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
171
184
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
185
+ waitFor: z.ZodOptional<z.ZodBoolean>;
172
186
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
173
187
  type: z.ZodDefault<z.ZodLiteral<"REQUEST_CORRECTION">>;
174
188
  }, z.core.$strip>;
@@ -180,6 +194,7 @@ export declare const RejectCorrectionActionInput: z.ZodObject<{
180
194
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
181
195
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
182
196
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
197
+ waitFor: z.ZodOptional<z.ZodBoolean>;
183
198
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
184
199
  requestId: z.ZodString;
185
200
  type: z.ZodDefault<z.ZodLiteral<"REJECT_CORRECTION">>;
@@ -195,6 +210,7 @@ export declare const ApproveCorrectionActionInput: z.ZodObject<{
195
210
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
196
211
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
197
212
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
213
+ waitFor: z.ZodOptional<z.ZodBoolean>;
198
214
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
199
215
  requestId: z.ZodString;
200
216
  type: z.ZodDefault<z.ZodLiteral<"APPROVE_CORRECTION">>;
@@ -207,6 +223,7 @@ export declare const ReadActionInput: z.ZodObject<{
207
223
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
208
224
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
209
225
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
226
+ waitFor: z.ZodOptional<z.ZodBoolean>;
210
227
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
211
228
  type: z.ZodDefault<z.ZodLiteral<"READ">>;
212
229
  }, z.core.$strip>;
@@ -222,6 +239,7 @@ export declare const CustomActionInput: z.ZodObject<{
222
239
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
223
240
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
224
241
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
242
+ waitFor: z.ZodOptional<z.ZodBoolean>;
225
243
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
226
244
  type: z.ZodDefault<z.ZodLiteral<"CUSTOM">>;
227
245
  customActionType: z.ZodString;
@@ -242,6 +260,7 @@ export declare const ActionInput: z.ZodDiscriminatedUnion<[z.ZodObject<{
242
260
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
243
261
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
244
262
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
263
+ waitFor: z.ZodOptional<z.ZodBoolean>;
245
264
  type: z.ZodDefault<z.ZodLiteral<"CREATE">>;
246
265
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
247
266
  }, z.core.$strip>, z.ZodObject<{
@@ -251,6 +270,7 @@ export declare const ActionInput: z.ZodDiscriminatedUnion<[z.ZodObject<{
251
270
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
252
271
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
253
272
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
273
+ waitFor: z.ZodOptional<z.ZodBoolean>;
254
274
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
255
275
  type: z.ZodDefault<z.ZodLiteral<"REGISTER">>;
256
276
  registrationNumber: z.ZodOptional<z.ZodString>;
@@ -261,6 +281,7 @@ export declare const ActionInput: z.ZodDiscriminatedUnion<[z.ZodObject<{
261
281
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
262
282
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
263
283
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
284
+ waitFor: z.ZodOptional<z.ZodBoolean>;
264
285
  type: z.ZodDefault<z.ZodLiteral<"NOTIFY">>;
265
286
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
266
287
  }, z.core.$strip>, z.ZodObject<{
@@ -270,6 +291,7 @@ export declare const ActionInput: z.ZodDiscriminatedUnion<[z.ZodObject<{
270
291
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
271
292
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
272
293
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
294
+ waitFor: z.ZodOptional<z.ZodBoolean>;
273
295
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
274
296
  type: z.ZodDefault<z.ZodLiteral<"DECLARE">>;
275
297
  }, z.core.$strip>, z.ZodObject<{
@@ -279,6 +301,7 @@ export declare const ActionInput: z.ZodDiscriminatedUnion<[z.ZodObject<{
279
301
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
280
302
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
281
303
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
304
+ waitFor: z.ZodOptional<z.ZodBoolean>;
282
305
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
283
306
  type: z.ZodDefault<z.ZodLiteral<"REJECT">>;
284
307
  content: z.ZodObject<{
@@ -291,6 +314,7 @@ export declare const ActionInput: z.ZodDiscriminatedUnion<[z.ZodObject<{
291
314
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
292
315
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
293
316
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
317
+ waitFor: z.ZodOptional<z.ZodBoolean>;
294
318
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
295
319
  type: z.ZodDefault<z.ZodLiteral<"DUPLICATE_DETECTED">>;
296
320
  content: z.ZodObject<{
@@ -306,6 +330,7 @@ export declare const ActionInput: z.ZodDiscriminatedUnion<[z.ZodObject<{
306
330
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
307
331
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
308
332
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
333
+ waitFor: z.ZodOptional<z.ZodBoolean>;
309
334
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
310
335
  type: z.ZodDefault<z.ZodLiteral<"MARK_AS_DUPLICATE">>;
311
336
  content: z.ZodOptional<z.ZodObject<{
@@ -318,6 +343,7 @@ export declare const ActionInput: z.ZodDiscriminatedUnion<[z.ZodObject<{
318
343
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
319
344
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
320
345
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
346
+ waitFor: z.ZodOptional<z.ZodBoolean>;
321
347
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
322
348
  type: z.ZodDefault<z.ZodLiteral<"MARK_AS_NOT_DUPLICATE">>;
323
349
  }, z.core.$strip>, z.ZodObject<{
@@ -327,6 +353,7 @@ export declare const ActionInput: z.ZodDiscriminatedUnion<[z.ZodObject<{
327
353
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
328
354
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
329
355
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
356
+ waitFor: z.ZodOptional<z.ZodBoolean>;
330
357
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
331
358
  type: z.ZodDefault<z.ZodLiteral<"ARCHIVE">>;
332
359
  content: z.ZodObject<{
@@ -339,6 +366,7 @@ export declare const ActionInput: z.ZodDiscriminatedUnion<[z.ZodObject<{
339
366
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
340
367
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
341
368
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
369
+ waitFor: z.ZodOptional<z.ZodBoolean>;
342
370
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
343
371
  type: z.ZodLiteral<"ASSIGN">;
344
372
  assignedTo: z.ZodString;
@@ -349,6 +377,7 @@ export declare const ActionInput: z.ZodDiscriminatedUnion<[z.ZodObject<{
349
377
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
350
378
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
351
379
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
380
+ waitFor: z.ZodOptional<z.ZodBoolean>;
352
381
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
353
382
  type: z.ZodDefault<z.ZodLiteral<"UNASSIGN">>;
354
383
  assignedTo: z.ZodDefault<z.ZodLiteral<null>>;
@@ -359,6 +388,7 @@ export declare const ActionInput: z.ZodDiscriminatedUnion<[z.ZodObject<{
359
388
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
360
389
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
361
390
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
391
+ waitFor: z.ZodOptional<z.ZodBoolean>;
362
392
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
363
393
  type: z.ZodDefault<z.ZodLiteral<"PRINT_CERTIFICATE">>;
364
394
  content: z.ZodOptional<z.ZodObject<{
@@ -371,6 +401,7 @@ export declare const ActionInput: z.ZodDiscriminatedUnion<[z.ZodObject<{
371
401
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
372
402
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
373
403
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
404
+ waitFor: z.ZodOptional<z.ZodBoolean>;
374
405
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
375
406
  type: z.ZodDefault<z.ZodLiteral<"REQUEST_CORRECTION">>;
376
407
  }, z.core.$strip>, z.ZodObject<{
@@ -380,6 +411,7 @@ export declare const ActionInput: z.ZodDiscriminatedUnion<[z.ZodObject<{
380
411
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
381
412
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
382
413
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
414
+ waitFor: z.ZodOptional<z.ZodBoolean>;
383
415
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
384
416
  requestId: z.ZodString;
385
417
  type: z.ZodDefault<z.ZodLiteral<"REJECT_CORRECTION">>;
@@ -393,6 +425,7 @@ export declare const ActionInput: z.ZodDiscriminatedUnion<[z.ZodObject<{
393
425
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
394
426
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
395
427
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
428
+ waitFor: z.ZodOptional<z.ZodBoolean>;
396
429
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
397
430
  requestId: z.ZodString;
398
431
  type: z.ZodDefault<z.ZodLiteral<"APPROVE_CORRECTION">>;
@@ -403,6 +436,7 @@ export declare const ActionInput: z.ZodDiscriminatedUnion<[z.ZodObject<{
403
436
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
404
437
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
405
438
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
439
+ waitFor: z.ZodOptional<z.ZodBoolean>;
406
440
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
407
441
  type: z.ZodDefault<z.ZodLiteral<"READ">>;
408
442
  }, z.core.$strip>, z.ZodObject<{
@@ -412,6 +446,7 @@ export declare const ActionInput: z.ZodDiscriminatedUnion<[z.ZodObject<{
412
446
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
413
447
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
414
448
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
449
+ waitFor: z.ZodOptional<z.ZodBoolean>;
415
450
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
416
451
  type: z.ZodDefault<z.ZodLiteral<"CUSTOM">>;
417
452
  customActionType: z.ZodString;
@@ -422,6 +457,7 @@ export declare const ActionInput: z.ZodDiscriminatedUnion<[z.ZodObject<{
422
457
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
423
458
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
424
459
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
460
+ waitFor: z.ZodOptional<z.ZodBoolean>;
425
461
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
426
462
  type: z.ZodDefault<z.ZodLiteral<"EDIT">>;
427
463
  content: z.ZodObject<{
@@ -51,6 +51,7 @@ export declare const DraftInput: z.ZodObject<{
51
51
  annotation: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodType<import("./FieldValue").FieldUpdateValue, unknown, z.core.$ZodTypeInternals<import("./FieldValue").FieldUpdateValue, unknown>>>>;
52
52
  originalActionId: z.ZodOptional<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
53
53
  keepAssignment: z.ZodOptional<z.ZodBoolean>;
54
+ waitFor: z.ZodOptional<z.ZodBoolean>;
54
55
  createdAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
55
56
  type: z.ZodEnum<{
56
57
  CUSTOM: "CUSTOM";
@@ -1414,28 +1414,20 @@ function schemaPriority(schema) {
1414
1414
  return idx === -1 ? 9999 : idx;
1415
1415
  }
1416
1416
  function safeUnion(schemas) {
1417
+ const sortedSchemas = [...schemas].sort(
1418
+ (a, b) => schemaPriority(a) - schemaPriority(b)
1419
+ );
1417
1420
  return z12.any().superRefine((val, ctx) => {
1418
- const successful = schemas.filter((s) => s.safeParse(val).success);
1419
- if (successful.length === 1) {
1420
- return;
1421
- }
1422
- if (successful.length === 0) {
1423
- ctx.addIssue({
1424
- code: "invalid_type",
1425
- expected: "custom",
1426
- message: "Value does not match any schema"
1427
- });
1428
- return;
1429
- }
1430
- successful.sort((a, b) => schemaPriority(a) - schemaPriority(b));
1431
- const best = successful[0];
1432
- if (!best.safeParse(val).success) {
1433
- ctx.addIssue({
1434
- expected: "custom",
1435
- code: "invalid_type",
1436
- message: "Value did not match the best schema"
1437
- });
1421
+ for (const schema of sortedSchemas) {
1422
+ if (schema.safeParse(val).success) {
1423
+ return;
1424
+ }
1438
1425
  }
1426
+ ctx.addIssue({
1427
+ code: "invalid_type",
1428
+ expected: "custom",
1429
+ message: "Value does not match any schema"
1430
+ });
1439
1431
  }).meta({
1440
1432
  description: "Value that matches exactly one of the possible schema types (TextValue, DateValue, DateRangeFieldValue). The best matching schema is chosen by priority."
1441
1433
  });
@@ -5900,6 +5892,7 @@ var BaseActionInput = z38.object({
5900
5892
  originalActionId: UUID.optional(),
5901
5893
  // should not be part of base action.
5902
5894
  keepAssignment: z38.boolean().optional(),
5895
+ waitFor: z38.boolean().optional(),
5903
5896
  // For normal users, the createdAtLocation is resolved on the backend from the user's primaryOfficeId.
5904
5897
  // @TODO: createdAtLocation should be limited to actions that system users can perform. For normal users, it should not be part of the base action.
5905
5898
  createdAtLocation: UUID.nullish().describe(
@@ -2132,6 +2132,10 @@ Done. Converted ${convertedCount} config file(s), replaced ${totalReplaced} rout
2132
2132
  var import_ts_morph11 = require("ts-morph");
2133
2133
  var import_path11 = __toESM(require("path"));
2134
2134
 
2135
+ // ../commons/src/scopes.deprecated.do-not-use.ts
2136
+ var z4 = __toESM(require("zod/v4"));
2137
+ var import_lodash = require("lodash");
2138
+
2135
2139
  // ../commons/src/scopes.ts
2136
2140
  var z3 = __toESM(require("zod/v4"));
2137
2141
  var qs = __toESM(require("qs"));
@@ -2405,7 +2409,6 @@ var DEFAULT_SCOPE_OPTIONS = {
2405
2409
  };
2406
2410
 
2407
2411
  // ../commons/src/scopes.deprecated.do-not-use.ts
2408
- var z4 = __toESM(require("zod/v4"));
2409
2412
  var rawConfigurableScopeRegex = /^([a-zA-Z][a-zA-Z0-9.-]*(?:\.[a-zA-Z0-9.-]+)*)\[((?:\w+=[\w.-]+(?:\|[\w.-]+)*)(?:,[\w]+=[\w.-]+(?:\|[\w.-]+)*)*)\]$/;
2410
2413
  var rawConfigurableScope = z4.string().regex(rawConfigurableScopeRegex);
2411
2414
  var SearchScope = z4.object({
@@ -2639,6 +2642,74 @@ var legacyScopeToV2Scope = (v1Scope) => {
2639
2642
  }
2640
2643
  throw new Error(`Unsupported V1 scope type: ${v1Scope}`);
2641
2644
  };
2645
+ var MERGEABLE_USER_SCOPE_TYPES = ["user.create", "user.edit"];
2646
+ function isMergeableUserScopeType(type) {
2647
+ return MERGEABLE_USER_SCOPE_TYPES.includes(type);
2648
+ }
2649
+ function decodeLegacyScope(legacy) {
2650
+ const encoded = legacyScopeToV2Scope(legacy);
2651
+ const scope = decodeScope(encoded);
2652
+ if (!scope) {
2653
+ throw new Error(
2654
+ `Could not decode migrated scope from legacy '${legacy}' (encoded: '${encoded}').`
2655
+ );
2656
+ }
2657
+ return { legacy, scope };
2658
+ }
2659
+ function groupByType(entries) {
2660
+ return entries.reduce(
2661
+ (groups, entry) => ({
2662
+ ...groups,
2663
+ [entry.scope.type]: [...groups[entry.scope.type] ?? [], entry]
2664
+ }),
2665
+ {}
2666
+ );
2667
+ }
2668
+ function deduplicateEntries(entries) {
2669
+ return entries.filter(
2670
+ (entry, index) => entries.findIndex((e) => (0, import_lodash.isEqual)(e.scope, entry.scope)) === index
2671
+ );
2672
+ }
2673
+ function mergeEntries(type, entries) {
2674
+ const optionsList = entries.map(
2675
+ (e) => "options" in e.scope && e.scope.options ? e.scope.options : {}
2676
+ );
2677
+ const allKeys = optionsList.flatMap(
2678
+ (opts) => Object.keys(opts).filter((k) => opts[k] !== void 0)
2679
+ );
2680
+ const conflictKey = allKeys.find((key, i) => allKeys.indexOf(key) !== i);
2681
+ if (conflictKey) {
2682
+ const conflicting = entries.filter(
2683
+ (e) => conflictKey in ("options" in e.scope && e.scope.options || {})
2684
+ ).map((e) => JSON.stringify(e.legacy));
2685
+ throw new Error(
2686
+ `Cannot auto-merge two '${type}' scopes that both define '${conflictKey}'. Conflicting legacy scopes: [${conflicting.join(", ")}]. Resolve manually in roles.ts and re-run.`
2687
+ );
2688
+ }
2689
+ const mergedOptions = Object.assign({}, ...optionsList);
2690
+ const merged = Object.keys(mergedOptions).length > 0 ? { type, options: mergedOptions } : { type };
2691
+ const parsed = Scope2.safeParse(merged);
2692
+ if (!parsed.success) {
2693
+ throw new Error(
2694
+ `Merged '${type}' scope failed schema validation: ${parsed.error.message}. Legacy scopes: [${entries.map((e) => JSON.stringify(e.legacy)).join(", ")}].`
2695
+ );
2696
+ }
2697
+ return parsed.data;
2698
+ }
2699
+ function migrateLegacyScopesArrayToV2Scopes(legacyScopes) {
2700
+ const groups = groupByType(legacyScopes.map(decodeLegacyScope));
2701
+ return Object.entries(groups).flatMap(([type, entries]) => {
2702
+ const deduped = deduplicateEntries(entries);
2703
+ if (deduped.length <= 1) return deduped.map((e) => e.scope);
2704
+ if (!isMergeableUserScopeType(type)) {
2705
+ console.warn(
2706
+ `Multiple non-mergeable '${type}' scopes detected after dedup \u2014 kept all as-is. Legacy scopes: [${deduped.map((e) => JSON.stringify(e.legacy)).join(", ")}]. Review whether the duplication is intentional.`
2707
+ );
2708
+ return deduped.map((e) => e.scope);
2709
+ }
2710
+ return [mergeEntries(type, deduped)];
2711
+ });
2712
+ }
2642
2713
 
2643
2714
  // src/migrations/v2.0/migrate-scopes.ts
2644
2715
  var ROLES_FILE_RELATIVE_PATH = "src/data-seeding/roles/roles.ts";
@@ -2676,57 +2747,65 @@ function resolveLegacyScopeFromElement(element) {
2676
2747
  }
2677
2748
  function migrateScopesArrays(rolesFilePath, project) {
2678
2749
  const sourceFile = project.getSourceFile(rolesFilePath);
2679
- if (!sourceFile) return { migratedCount: 0, removedCount: 0 };
2750
+ if (!sourceFile) {
2751
+ return { migratedCount: 0, removedCount: 0, mergedCount: 0 };
2752
+ }
2680
2753
  let migratedCount = 0;
2681
2754
  let removedCount = 0;
2755
+ let mergedCount = 0;
2682
2756
  const scopesProperties = sourceFile.getDescendantsOfKind(import_ts_morph11.SyntaxKind.PropertyAssignment).filter((prop) => prop.getName() === SCOPES_PROPERTY_NAME);
2757
+ const relPath = import_path11.default.relative(process.cwd(), rolesFilePath);
2683
2758
  for (const scopesProp of scopesProperties) {
2684
2759
  const initializer = scopesProp.getInitializer();
2685
2760
  if (!initializer || !import_ts_morph11.Node.isArrayLiteralExpression(initializer)) continue;
2686
- const elements = initializer.getElements();
2687
- for (let index = elements.length - 1; index >= 0; index--) {
2688
- const element = elements[index];
2689
- if (!import_ts_morph11.Node.isExpression(element)) continue;
2761
+ const rawTexts = [];
2762
+ const legacyStrings = [];
2763
+ let anyChange = false;
2764
+ for (const element of initializer.getElements()) {
2690
2765
  const scopeKey = resolveScopeKeyFromElementAccess(element);
2691
2766
  if (scopeKey && !(scopeKey in SCOPES)) {
2692
2767
  console.warn(
2693
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Removing unknown scope reference: SCOPES.${scopeKey}`
2768
+ ` [${relPath}] Removing unknown scope reference: SCOPES.${scopeKey}`
2694
2769
  );
2695
- initializer.removeElement(index);
2696
2770
  removedCount++;
2771
+ anyChange = true;
2697
2772
  continue;
2698
2773
  }
2699
2774
  const legacyScope = resolveLegacyScopeFromElement(element);
2700
2775
  if (!legacyScope) {
2701
2776
  console.warn(
2702
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Skipping non-literal scope expression: ${element.getText()}`
2777
+ ` [${relPath}] Preserving non-literal scope expression verbatim: ${element.getText()}`
2703
2778
  );
2779
+ rawTexts.push(element.getText());
2704
2780
  continue;
2705
2781
  }
2706
- try {
2707
- const migratedScope = legacyScopeToV2Scope(legacyScope);
2708
- const scope = decodeScope(migratedScope);
2709
- if (!scope) {
2710
- console.warn(
2711
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not decode migrated scope '${migratedScope}'.`
2712
- );
2713
- continue;
2714
- }
2715
- element.replaceWithText(JSON.stringify(scope));
2716
- migratedCount++;
2717
- } catch (error) {
2718
- console.warn(
2719
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not migrate scope '${legacyScope}': ${error}`
2720
- );
2721
- }
2782
+ legacyStrings.push(legacyScope);
2783
+ anyChange = true;
2784
+ }
2785
+ if (!anyChange) continue;
2786
+ let mergedScopes;
2787
+ try {
2788
+ mergedScopes = migrateLegacyScopesArrayToV2Scopes(legacyStrings);
2789
+ } catch (error) {
2790
+ throw new Error(
2791
+ `[${relPath}] Failed to migrate scopes for role: ${error instanceof Error ? error.message : String(error)}`,
2792
+ { cause: error }
2793
+ );
2722
2794
  }
2795
+ migratedCount += legacyStrings.length;
2796
+ mergedCount += legacyStrings.length - mergedScopes.length;
2797
+ const outputElements = [
2798
+ ...rawTexts,
2799
+ ...mergedScopes.map((s) => JSON.stringify(s))
2800
+ ];
2801
+ scopesProp.setInitializer(`[${outputElements.join(", ")}]`);
2723
2802
  }
2724
2803
  if (removedCount > 0) {
2725
2804
  console.log(
2726
- ` Removed ${removedCount} unknown SCOPES reference(s) from '${import_path11.default.relative(process.cwd(), rolesFilePath)}'.`
2805
+ ` Removed ${removedCount} unknown SCOPES reference(s) from '${relPath}'.`
2727
2806
  );
2728
2807
  }
2729
- return { migratedCount, removedCount };
2808
+ return { migratedCount, removedCount, mergedCount };
2730
2809
  }
2731
2810
  function ensureScopesHelpersImport(rolesFilePath, project) {
2732
2811
  const sourceFile = project.getSourceFile(rolesFilePath);
@@ -2861,7 +2940,7 @@ async function main11() {
2861
2940
  return;
2862
2941
  }
2863
2942
  const importChanged = ensureScopesHelpersImport(rolesFilePath, project);
2864
- const { migratedCount, removedCount } = migrateScopesArrays(
2943
+ const { migratedCount, removedCount, mergedCount } = migrateScopesArrays(
2865
2944
  rolesFilePath,
2866
2945
  project
2867
2946
  );
@@ -2880,7 +2959,7 @@ async function main11() {
2880
2959
  }
2881
2960
  await sourceFile.save();
2882
2961
  console.log(
2883
- `Done. Migrated ${migratedCount} legacy scope(s), removed ${removedCount} unknown SCOPES reference(s), wrapped ${wrappedScopesCount} scope array(s) with defineScopes()${wrappedRoles ? ", wrapped roles with defineRoles()" : ""}${removedRoleType ? ", and removed Role type definition" : ""}${importChanged ? ". Updated toolkit/scopes imports." : "."}`
2962
+ `Done. Migrated ${migratedCount} legacy scope(s), merged ${mergedCount} AND-paired scope(s) into single v2 objects (privilege-escalation fix, see issue #12489), removed ${removedCount} unknown SCOPES reference(s), wrapped ${wrappedScopesCount} scope array(s) with defineScopes()${wrappedRoles ? ", wrapped roles with defineRoles()" : ""}${removedRoleType ? ", and removed Role type definition" : ""}${importChanged ? ". Updated toolkit/scopes imports." : "."}`
2884
2963
  );
2885
2964
  }
2886
2965
 
@@ -1 +1 @@
1
- {"version":3,"file":"migrate-scopes.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/migrate-scopes.ts"],"names":[],"mappings":"AAyVA,iBAAe,IAAI,kBAmDlB;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
1
+ {"version":3,"file":"migrate-scopes.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/migrate-scopes.ts"],"names":[],"mappings":"AAoXA,iBAAe,IAAI,kBAmDlB;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
@@ -25,7 +25,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
25
25
  exports.main = main;
26
26
  const ts_morph_1 = require("ts-morph");
27
27
  const path_1 = __importDefault(require("path"));
28
- const scopes_1 = require("../commons/scopes");
29
28
  const scopes_deprecated_do_not_use_1 = require("../commons/scopes.deprecated.do-not-use");
30
29
  const ROLES_FILE_RELATIVE_PATH = 'src/data-seeding/roles/roles.ts';
31
30
  const SCOPES_PROPERTY_NAME = 'scopes';
@@ -65,60 +64,85 @@ function resolveLegacyScopeFromElement(element) {
65
64
  }
66
65
  return null;
67
66
  }
67
+ /**
68
+ * Walks each `scopes: [...]` array in the roles file, classifies elements,
69
+ * and rewrites the whole array using `migrateLegacyScopesArrayToV2Scopes`
70
+ * (which preserves v1.9 AND semantics by merging pairs of legacy scopes
71
+ * that targeted the same v2 type). See issue #12489.
72
+ *
73
+ * Elements are partitioned into three kinds:
74
+ * - drop: `SCOPES.X` references where X is not in the SCOPES map (warned
75
+ * and removed, matching pre-refactor behavior).
76
+ * - raw: non-literal expressions we cannot statically resolve (e.g.
77
+ * `...sharedScopes` spreads). Preserved verbatim in output so authoring
78
+ * intent isn't lost.
79
+ * - legacy: literal strings or resolvable `SCOPES.X` references.
80
+ * Collected and passed as a batch to the merge function.
81
+ *
82
+ * The output array text is `[...rawTexts, ...mergedScopesAsJson]`. Order of
83
+ * legacy entries relative to raw expressions is not preserved — scopes in a
84
+ * v2 array compose with OR, so position is semantically irrelevant.
85
+ */
68
86
  function migrateScopesArrays(rolesFilePath, project) {
69
87
  const sourceFile = project.getSourceFile(rolesFilePath);
70
- if (!sourceFile)
71
- return { migratedCount: 0, removedCount: 0 };
88
+ if (!sourceFile) {
89
+ return { migratedCount: 0, removedCount: 0, mergedCount: 0 };
90
+ }
72
91
  let migratedCount = 0;
73
92
  let removedCount = 0;
93
+ let mergedCount = 0;
74
94
  const scopesProperties = sourceFile
75
95
  .getDescendantsOfKind(ts_morph_1.SyntaxKind.PropertyAssignment)
76
96
  .filter((prop) => prop.getName() === SCOPES_PROPERTY_NAME);
97
+ const relPath = path_1.default.relative(process.cwd(), rolesFilePath);
77
98
  for (const scopesProp of scopesProperties) {
78
99
  const initializer = scopesProp.getInitializer();
79
100
  if (!initializer || !ts_morph_1.Node.isArrayLiteralExpression(initializer))
80
101
  continue;
81
- const elements = initializer.getElements();
82
- for (let index = elements.length - 1; index >= 0; index--) {
83
- const element = elements[index];
84
- if (!ts_morph_1.Node.isExpression(element))
85
- continue;
102
+ const rawTexts = [];
103
+ const legacyStrings = [];
104
+ let anyChange = false;
105
+ for (const element of initializer.getElements()) {
86
106
  const scopeKey = resolveScopeKeyFromElementAccess(element);
87
107
  if (scopeKey && !(scopeKey in scopes_deprecated_do_not_use_1.SCOPES)) {
88
108
  // eslint-disable-next-line no-console
89
- console.warn(` [${path_1.default.relative(process.cwd(), rolesFilePath)}] Removing unknown scope reference: SCOPES.${scopeKey}`);
90
- initializer.removeElement(index);
109
+ console.warn(` [${relPath}] Removing unknown scope reference: SCOPES.${scopeKey}`);
91
110
  removedCount++;
111
+ anyChange = true;
92
112
  continue;
93
113
  }
94
114
  const legacyScope = resolveLegacyScopeFromElement(element);
95
115
  if (!legacyScope) {
96
116
  // eslint-disable-next-line no-console
97
- console.warn(` [${path_1.default.relative(process.cwd(), rolesFilePath)}] Skipping non-literal scope expression: ${element.getText()}`);
117
+ console.warn(` [${relPath}] Preserving non-literal scope expression verbatim: ${element.getText()}`);
118
+ rawTexts.push(element.getText());
98
119
  continue;
99
120
  }
100
- try {
101
- const migratedScope = (0, scopes_deprecated_do_not_use_1.legacyScopeToV2Scope)(legacyScope);
102
- const scope = (0, scopes_1.decodeScope)(migratedScope);
103
- if (!scope) {
104
- // eslint-disable-next-line no-console
105
- console.warn(` [${path_1.default.relative(process.cwd(), rolesFilePath)}] Could not decode migrated scope '${migratedScope}'.`);
106
- continue;
107
- }
108
- element.replaceWithText(JSON.stringify(scope));
109
- migratedCount++;
110
- }
111
- catch (error) {
112
- // eslint-disable-next-line no-console
113
- console.warn(` [${path_1.default.relative(process.cwd(), rolesFilePath)}] Could not migrate scope '${legacyScope}': ${error}`);
114
- }
121
+ legacyStrings.push(legacyScope);
122
+ anyChange = true;
123
+ }
124
+ if (!anyChange)
125
+ continue;
126
+ let mergedScopes;
127
+ try {
128
+ mergedScopes = (0, scopes_deprecated_do_not_use_1.migrateLegacyScopesArrayToV2Scopes)(legacyStrings);
129
+ }
130
+ catch (error) {
131
+ throw new Error(`[${relPath}] Failed to migrate scopes for role: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
115
132
  }
133
+ migratedCount += legacyStrings.length;
134
+ mergedCount += legacyStrings.length - mergedScopes.length;
135
+ const outputElements = [
136
+ ...rawTexts,
137
+ ...mergedScopes.map((s) => JSON.stringify(s))
138
+ ];
139
+ scopesProp.setInitializer(`[${outputElements.join(', ')}]`);
116
140
  }
117
141
  if (removedCount > 0) {
118
142
  // eslint-disable-next-line no-console
119
- console.log(` Removed ${removedCount} unknown SCOPES reference(s) from '${path_1.default.relative(process.cwd(), rolesFilePath)}'.`);
143
+ console.log(` Removed ${removedCount} unknown SCOPES reference(s) from '${relPath}'.`);
120
144
  }
121
- return { migratedCount, removedCount };
145
+ return { migratedCount, removedCount, mergedCount };
122
146
  }
123
147
  function ensureScopesHelpersImport(rolesFilePath, project) {
124
148
  const sourceFile = project.getSourceFile(rolesFilePath);
@@ -262,7 +286,7 @@ function main() {
262
286
  return;
263
287
  }
264
288
  const importChanged = ensureScopesHelpersImport(rolesFilePath, project);
265
- const { migratedCount, removedCount } = migrateScopesArrays(rolesFilePath, project);
289
+ const { migratedCount, removedCount, mergedCount } = migrateScopesArrays(rolesFilePath, project);
266
290
  const wrappedScopesCount = wrapScopesArraysWithDefineScopes(rolesFilePath, project);
267
291
  const wrappedRoles = wrapRolesWithDefineRoles(rolesFilePath, project);
268
292
  const removedRoleType = removeRoleTypeDefinitionAndUnusedImports(rolesFilePath, project);
@@ -276,6 +300,6 @@ function main() {
276
300
  return;
277
301
  }
278
302
  yield sourceFile.save();
279
- console.log(`Done. Migrated ${migratedCount} legacy scope(s), removed ${removedCount} unknown SCOPES reference(s), wrapped ${wrappedScopesCount} scope array(s) with defineScopes()${wrappedRoles ? ', wrapped roles with defineRoles()' : ''}${removedRoleType ? ', and removed Role type definition' : ''}${importChanged ? '. Updated toolkit/scopes imports.' : '.'}`);
303
+ console.log(`Done. Migrated ${migratedCount} legacy scope(s), merged ${mergedCount} AND-paired scope(s) into single v2 objects (privilege-escalation fix, see issue #12489), removed ${removedCount} unknown SCOPES reference(s), wrapped ${wrappedScopesCount} scope array(s) with defineScopes()${wrappedRoles ? ', wrapped roles with defineRoles()' : ''}${removedRoleType ? ', and removed Role type definition' : ''}${importChanged ? '. Updated toolkit/scopes imports.' : '.'}`);
280
304
  });
281
305
  }
@@ -980,28 +980,20 @@ function schemaPriority(schema) {
980
980
  return idx === -1 ? 9999 : idx;
981
981
  }
982
982
  function safeUnion(schemas) {
983
+ const sortedSchemas = [...schemas].sort(
984
+ (a, b) => schemaPriority(a) - schemaPriority(b)
985
+ );
983
986
  return z12.any().superRefine((val, ctx) => {
984
- const successful = schemas.filter((s) => s.safeParse(val).success);
985
- if (successful.length === 1) {
986
- return;
987
- }
988
- if (successful.length === 0) {
989
- ctx.addIssue({
990
- code: "invalid_type",
991
- expected: "custom",
992
- message: "Value does not match any schema"
993
- });
994
- return;
995
- }
996
- successful.sort((a, b) => schemaPriority(a) - schemaPriority(b));
997
- const best = successful[0];
998
- if (!best.safeParse(val).success) {
999
- ctx.addIssue({
1000
- expected: "custom",
1001
- code: "invalid_type",
1002
- message: "Value did not match the best schema"
1003
- });
987
+ for (const schema of sortedSchemas) {
988
+ if (schema.safeParse(val).success) {
989
+ return;
990
+ }
1004
991
  }
992
+ ctx.addIssue({
993
+ code: "invalid_type",
994
+ expected: "custom",
995
+ message: "Value does not match any schema"
996
+ });
1005
997
  }).meta({
1006
998
  description: "Value that matches exactly one of the possible schema types (TextValue, DateValue, DateRangeFieldValue). The best matching schema is chosen by priority."
1007
999
  });
@@ -4180,6 +4172,7 @@ var BaseActionInput = z38.object({
4180
4172
  originalActionId: UUID.optional(),
4181
4173
  // should not be part of base action.
4182
4174
  keepAssignment: z38.boolean().optional(),
4175
+ waitFor: z38.boolean().optional(),
4183
4176
  // For normal users, the createdAtLocation is resolved on the backend from the user's primaryOfficeId.
4184
4177
  // @TODO: createdAtLocation should be limited to actions that system users can perform. For normal users, it should not be part of the base action.
4185
4178
  createdAtLocation: UUID.nullish().describe(
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@opencrvs/toolkit",
3
- "version": "2.0.0-rc.d451982",
3
+ "version": "2.0.0-rc.d6f0865",
4
4
  "description": "OpenCRVS toolkit for building country configurations",
5
5
  "license": "MPL-2.0",
6
6
  "bin": {