@opencrvs/toolkit 1.9.6-rc.cd4bb81 → 1.9.6-rc.d5ae78e

package/dist/commons/conditionals/conditionals.d.ts

@@ -4,7 +4,6 @@ import { ITokenPayload as TokenPayload, Scope } from '../authentication';
 import { PartialSchema as AjvJSONSchemaType } from 'ajv/dist/types/json-schema';
 import { userSerializer } from '../events/serializers/user/serializer';
 import { UUID } from '../uuid';
-import { todayDateTimeValueSerializer } from '../events/serializers/date/serializer';
 /** @knipignore */
 export type JSONSchema = {
     $id: string;
@@ -65,10 +64,6 @@ type FieldReference = {
     $$field: string;
     $$subfield: string[];
 };
-/**
- * Generate conditional rules for current date
- */
-export declare const now: typeof todayDateTimeValueSerializer;
 /**
  *
  * Generate conditional rules for user.

package/dist/commons/events/DeduplicationConfig.d.ts

@@ -119,14 +119,32 @@ declare const DateRangeMatcher: z.ZodObject<z.objectUtil.extendShape<{
         pivot: z.ZodOptional<z.ZodNumber>;
         days: z.ZodNumber;
         boost: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
+        alsoMatchAgainst: z.ZodOptional<z.ZodArray<z.ZodObject<{
+            $$field: z.ZodEffects<z.ZodString, string, string>;
+            $$subfield: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+        }, "strip", z.ZodTypeAny, {
+            $$field: string;
+            $$subfield?: string[] | undefined;
+        }, {
+            $$field: string;
+            $$subfield?: string[] | undefined;
+        }>, "many">>;
     }, "strip", z.ZodTypeAny, {
         boost: number;
         days: number;
         pivot?: number | undefined;
+        alsoMatchAgainst?: {
+            $$field: string;
+            $$subfield?: string[] | undefined;
+        }[] | undefined;
     }, {
         days: number;
         boost?: number | undefined;
         pivot?: number | undefined;
+        alsoMatchAgainst?: {
+            $$field: string;
+            $$subfield?: string[] | undefined;
+        }[] | undefined;
     }>;
 }>, "strip", z.ZodTypeAny, {
     type: "dateRange";
@@ -134,6 +152,10 @@ declare const DateRangeMatcher: z.ZodObject<z.objectUtil.extendShape<{
         boost: number;
         days: number;
         pivot?: number | undefined;
+        alsoMatchAgainst?: {
+            $$field: string;
+            $$subfield?: string[] | undefined;
+        }[] | undefined;
     };
     fieldId: string;
 }, {
@@ -142,6 +164,10 @@ declare const DateRangeMatcher: z.ZodObject<z.objectUtil.extendShape<{
         days: number;
         boost?: number | undefined;
         pivot?: number | undefined;
+        alsoMatchAgainst?: {
+            $$field: string;
+            $$subfield?: string[] | undefined;
+        }[] | undefined;
     };
     fieldId: string;
 }>;

package/dist/commons/events/FieldConfig.d.ts

@@ -1768,19 +1768,7 @@ declare const DateField: z.ZodObject<z.objectUtil.extendShape<{
     analytics: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
 }, {
     type: z.ZodLiteral<"DATE">;
-    defaultValue: z.ZodOptional<z.ZodUnion<[z.ZodEffects<z.ZodUnion<[z.ZodUnion<[z.ZodObject<{
-        $$date: z.ZodOptional<z.ZodLiteral<"now">>;
-        $$time: z.ZodOptional<z.ZodLiteral<"now">>;
-    }, "strip", z.ZodTypeAny, {
-        $$date?: "now" | undefined;
-        $$time?: "now" | undefined;
-    }, {
-        $$date?: "now" | undefined;
-        $$time?: "now" | undefined;
-    }>, z.ZodLiteral<"$$date">]>, z.ZodLiteral<"$$time">]>, "$$date", "$$date" | "$$time" | {
-        $$date?: "now" | undefined;
-        $$time?: "now" | undefined;
-    }>, z.ZodString]>>;
+    defaultValue: z.ZodOptional<z.ZodString>;
     configuration: z.ZodOptional<z.ZodObject<{
         notice: z.ZodOptional<z.ZodObject<import("./TranslationConfig").MessageDescriptorZod, "strip", z.ZodTypeAny, TranslationConfig, {
             id: string;
@@ -1902,10 +1890,7 @@ declare const DateField: z.ZodObject<z.objectUtil.extendShape<{
     hideLabel?: boolean | undefined;
     uncorrectable?: boolean | undefined;
     analytics?: boolean | undefined;
-    defaultValue?: string | {
-        $$date?: "now" | undefined;
-        $$time?: "now" | undefined;
-    } | undefined;
+    defaultValue?: string | undefined;
     configuration?: {
         notice?: {
             id: string;
@@ -2280,19 +2265,7 @@ declare const TimeField: z.ZodObject<z.objectUtil.extendShape<{
     analytics: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
 }, {
     type: z.ZodLiteral<"TIME">;
-    defaultValue: z.ZodOptional<z.ZodUnion<[z.ZodEffects<z.ZodUnion<[z.ZodUnion<[z.ZodObject<{
-        $$date: z.ZodOptional<z.ZodLiteral<"now">>;
-        $$time: z.ZodOptional<z.ZodLiteral<"now">>;
-    }, "strip", z.ZodTypeAny, {
-        $$date?: "now" | undefined;
-        $$time?: "now" | undefined;
-    }, {
-        $$date?: "now" | undefined;
-        $$time?: "now" | undefined;
-    }>, z.ZodLiteral<"$$date">]>, z.ZodLiteral<"$$time">]>, "$$time", "$$date" | "$$time" | {
-        $$date?: "now" | undefined;
-        $$time?: "now" | undefined;
-    }>, z.ZodString]>>;
+    defaultValue: z.ZodOptional<z.ZodString>;
     configuration: z.ZodOptional<z.ZodObject<{
         use12HourFormat: z.ZodOptional<z.ZodBoolean>;
         notice: z.ZodOptional<z.ZodObject<import("./TranslationConfig").MessageDescriptorZod, "strip", z.ZodTypeAny, TranslationConfig, {
@@ -2418,10 +2391,7 @@ declare const TimeField: z.ZodObject<z.objectUtil.extendShape<{
     hideLabel?: boolean | undefined;
     uncorrectable?: boolean | undefined;
     analytics?: boolean | undefined;
-    defaultValue?: string | {
-        $$date?: "now" | undefined;
-        $$time?: "now" | undefined;
-    } | undefined;
+    defaultValue?: string | undefined;
     configuration?: {
         notice?: {
             id: string;

package/dist/commons/events/FieldValue.d.ts

@@ -38,7 +38,6 @@ export declare const AgeUpdateValue: z.ZodNullable<z.ZodOptional<z.ZodObject<{
     asOfDateRef: string;
 }>>>;
 export declare const TimeValue: z.ZodString;
-export type TimeValue = z.infer<typeof TimeValue>;
 export declare const DatetimeValue: z.ZodString;
 export declare const SelectDateRangeValue: z.ZodEnum<["last7Days", "last30Days", "last90Days", "last365Days"]>;
 export declare const DateRangeFieldValue: z.ZodUnion<[z.ZodObject<{

package/dist/commons/events/TemplateConfig.d.ts

@@ -8,8 +8,6 @@ import { FieldValue } from './FieldValue';
  * Available system variables for configuration.
  */
 export type SystemVariables = {
-    $$date: string;
-    $$time: string;
     user: {
         id: string;
         province?: string;

package/dist/commons/events/deduplication.d.ts

@@ -26,6 +26,10 @@ export declare function field(fieldId: string): {
             days: number;
             boost?: number | undefined;
             pivot?: number | undefined;
+            alsoMatchAgainst?: {
+                $$field: string;
+                $$subfield?: string[] | undefined;
+            }[] | undefined;
         };
     };
 };

package/dist/conditionals/index.js

@@ -38,7 +38,6 @@ __export(conditionals_exports, {
   isFieldReference: () => isFieldReference,
   never: () => never,
   not: () => not,
-  now: () => now,
   or: () => or,
   user: () => user
 });
@@ -107,19 +106,6 @@ function omitKeyDeep(obj, keyToRemove) {
   return newObj;
 }
 
-// ../commons/src/events/serializers/date/serializer.ts
-var import_zod2 = require("zod");
-var SerializedNowDateTime = import_zod2.z.object({
-  $$date: import_zod2.z.literal("now").optional(),
-  $$time: import_zod2.z.literal("now").optional()
-}).or(import_zod2.z.literal("$$date")).or(import_zod2.z.literal("$$time"));
-function todayDateTimeValueSerializer() {
-  return {
-    $$date: "now",
-    $$time: "now"
-  };
-}
-
 // ../commons/src/conditionals/conditionals.ts
 function defineConditional(schema) {
   const schemaWithooutIDRef = omitKeyDeep(schema, "$id");
@@ -193,7 +179,6 @@ function wrapToPathOptional(condition, path) {
     };
   }, condition);
 }
-var now = Object.assign(todayDateTimeValueSerializer, {});
 var user = Object.assign(userSerializer, {
   hasScope: (scope) => defineConditional({
     type: "object",

package/dist/events/deduplication.d.ts

@@ -26,6 +26,10 @@ export declare function field(fieldId: string): {
             days: number;
             boost?: number | undefined;
             pivot?: number | undefined;
+            alsoMatchAgainst?: {
+                $$field: string;
+                $$subfield?: string[] | undefined;
+            }[] | undefined;
         };
     };
 };