@actuarial-ts/data 0.8.1 → 0.10.0

package/README.md

@@ -3,15 +3,15 @@
 Typed ingestion, preparation, and data-review boundaries for the actuarial-ts SDK. It supports loss-run/exposure CSVs, annual claim-development adaptation, triangle assembly, and generalized diagnostic review designed to support ASOP No. 23 work.
 
 ```bash
-npm install @actuarial-ts/data@0.8.1 @actuarial-ts/core@0.8.1
+npm install @actuarial-ts/data@0.10.0 @actuarial-ts/core@0.10.0
 ```
 
 Node 20+, ESM. Responsibility for the review and resulting actuarial work remains with the actuary.
 
 SDK 0.8 adds strict parsers, source mapping, externally staged revision
 history, and complete customization resource-policy validation. See the
-[0.8 adoption guide](https://github.com/yerromnitsuj/actng/blob/v0.8.1/docs/migrations/0.8-reusable-customization.md)
-and [customization reference](https://github.com/yerromnitsuj/actng/blob/v0.8.1/docs/reference/reusable-customization.md).
+[0.8 adoption guide](https://github.com/yerromnitsuj/actng/blob/v0.10.0/docs/migrations/0.8-reusable-customization.md)
+and [customization reference](https://github.com/yerromnitsuj/actng/blob/v0.10.0/docs/reference/reusable-customization.md).
 
 ## Existing ingestion and triangle review
 
@@ -98,8 +98,8 @@ JSON, spreads, and casts cannot recreate these owners. Use
 `createCompactDiagnosticRunIdentity` in compliance for compact completed runs;
 the eager provenance function is not interchangeable.
 
-See the runnable [compact adoption guide](https://github.com/yerromnitsuj/actng/blob/v0.8.1/docs/migrations/0.7-compact-diagnostics.md)
-and [replay/resource-policy reference](https://github.com/yerromnitsuj/actng/blob/v0.8.1/docs/reference/diagnostic-replay-stream.md).
+See the runnable [compact adoption guide](https://github.com/yerromnitsuj/actng/blob/v0.10.0/docs/migrations/0.7-compact-diagnostics.md)
+and [replay/resource-policy reference](https://github.com/yerromnitsuj/actng/blob/v0.10.0/docs/reference/diagnostic-replay-stream.md).
 Compact representation preserves evidence; it is not a claim that an arbitrary
 large dataset or host memory budget has passed acceptance.
 
@@ -114,8 +114,18 @@ immutable preparation and exact review evidence; every other selection follows
 the ordinary compact preparation path. The API does not promise a latency or
 process-memory target.
 
-See the [formula catalog](https://github.com/yerromnitsuj/actng/blob/v0.8.1/docs/reference/diagnostic-formulas.md) and [migration guide](https://github.com/yerromnitsuj/actng/blob/v0.8.1/docs/migrations/0.6-generalized-diagnostics.md).
+See the [formula catalog](https://github.com/yerromnitsuj/actng/blob/v0.10.0/docs/reference/diagnostic-formulas.md) and [migration guide](https://github.com/yerromnitsuj/actng/blob/v0.10.0/docs/migrations/0.6-generalized-diagnostics.md).
 
 ## License
 
 Apache-2.0. See LICENSE and NOTICE.
+
+SDK 0.9 adds native post-aggregation formulas and correct financial currency units.
+See the [0.9 migration guide](https://github.com/yerromnitsuj/actng/blob/v0.10.0/docs/migrations/0.9-analysis-expressions.md).
+
+## Composite history sources
+
+SDK 0.10 adds multiple original artifacts within one claim namespace, explicit
+composite identity selectors and complete input-artifact membership checks.
+Upgrade the five SDK packages together and preserve the producing runtime
+with archived evidence. See the [0.10 migration guide](https://github.com/yerromnitsuj/actng/blob/v0.10.0/docs/migrations/0.10-composite-history.md).

package/dist/customizationContracts.d.ts

@@ -1,4 +1,4 @@
-import { type AnalysisDefinition, type AnalysisClassificationDefinition, type AnalysisPredicate, type AnalysisRecipe, type AnalysisResult, type AnalysisScenario, type AnalysisScenarioGrid, type CustomizationExposureObservation, type CustomizationResourceLimits, type ExposureAllocationTarget, type ExposureLevelSchedule, type ExposureRevisionSelection, type HistoricalDatasetInput, type JsonValue } from "@actuarial-ts/core";
+import { type AnalysisDefinition, type AnalysisMeasureExpression, type AnalysisClassificationDefinition, type AnalysisPredicate, type AnalysisRecipe, type AnalysisResult, type AnalysisScenario, type AnalysisScenarioGrid, type CustomizationExposureObservation, type CustomizationResourceLimits, type ExposureAllocationTarget, type ExposureLevelSchedule, type ExposureRevisionSelection, type HistoricalDatasetInput, type JsonValue } from "@actuarial-ts/core";
 import { z } from "zod";
 /** Complete, closed resource policy for every customization streaming boundary. */
 export declare const customizationResourceLimitsSchema: z.ZodType<CustomizationResourceLimits>;
@@ -223,14 +223,32 @@ export declare const historicalDatasetInputSchema: z.ZodEffects<z.ZodObject<{
         namespace: z.ZodEffects<z.ZodString, string, string>;
         artifactId: z.ZodEffects<z.ZodString, string, string>;
         mappingVersion: z.ZodEffects<z.ZodString, string, string>;
+        additionalArtifacts: z.ZodOptional<z.ZodArray<z.ZodObject<{
+            artifactId: z.ZodEffects<z.ZodString, string, string>;
+            mappingVersion: z.ZodEffects<z.ZodString, string, string>;
+        }, "strict", z.ZodTypeAny, {
+            artifactId: string;
+            mappingVersion: string;
+        }, {
+            artifactId: string;
+            mappingVersion: string;
+        }>, "many">>;
     }, "strict", z.ZodTypeAny, {
         artifactId: string;
         namespace: string;
         mappingVersion: string;
+        additionalArtifacts?: {
+            artifactId: string;
+            mappingVersion: string;
+        }[] | undefined;
     }, {
         artifactId: string;
         namespace: string;
         mappingVersion: string;
+        additionalArtifacts?: {
+            artifactId: string;
+            mappingVersion: string;
+        }[] | undefined;
     }>, "many">;
     evaluationDates: z.ZodOptional<z.ZodArray<z.ZodEffects<z.ZodString, string, string>, "many">>;
     openingBalances: z.ZodOptional<z.ZodArray<z.ZodObject<{
@@ -473,6 +491,10 @@ export declare const historicalDatasetInputSchema: z.ZodEffects<z.ZodObject<{
         artifactId: string;
         namespace: string;
         mappingVersion: string;
+        additionalArtifacts?: {
+            artifactId: string;
+            mappingVersion: string;
+        }[] | undefined;
     }[];
     revisionView: {
         kind: "as-known";
@@ -536,6 +558,10 @@ export declare const historicalDatasetInputSchema: z.ZodEffects<z.ZodObject<{
         artifactId: string;
         namespace: string;
         mappingVersion: string;
+        additionalArtifacts?: {
+            artifactId: string;
+            mappingVersion: string;
+        }[] | undefined;
     }[];
     revisionView: {
         kind: "as-known";
@@ -599,6 +625,10 @@ export declare const historicalDatasetInputSchema: z.ZodEffects<z.ZodObject<{
         artifactId: string;
         namespace: string;
         mappingVersion: string;
+        additionalArtifacts?: {
+            artifactId: string;
+            mappingVersion: string;
+        }[] | undefined;
     }[];
     revisionView: {
         kind: "as-known";
@@ -662,6 +692,10 @@ export declare const historicalDatasetInputSchema: z.ZodEffects<z.ZodObject<{
         artifactId: string;
         namespace: string;
         mappingVersion: string;
+        additionalArtifacts?: {
+            artifactId: string;
+            mappingVersion: string;
+        }[] | undefined;
     }[];
     revisionView: {
         kind: "as-known";
@@ -871,6 +905,13 @@ export declare const analysisDefinitionSchema: z.ZodEffects<z.ZodObject<{
             valuationSelection?: "exact" | "origin-static" | "latest-on-or-before" | undefined;
         }>, "many">;
     }, "strict", z.ZodTypeAny, {
+        exposure: {
+            id: string;
+            populationKeys: string[];
+            timeBasis: "interval" | "point-in-time" | "already-earned";
+            reportingFilterEffect: "none" | "matching-exposure-dimensions";
+            valuationSelection?: "exact" | "origin-static" | "latest-on-or-before" | undefined;
+        }[];
         financial: {
             id: string;
             subject: "claim" | "claimant" | "occurrence" | "policy" | "coverage";
@@ -899,6 +940,7 @@ export declare const analysisDefinitionSchema: z.ZodEffects<z.ZodObject<{
                 asOfDate: string;
             };
         };
+    }, {
         exposure: {
             id: string;
             populationKeys: string[];
@@ -906,7 +948,6 @@ export declare const analysisDefinitionSchema: z.ZodEffects<z.ZodObject<{
             reportingFilterEffect: "none" | "matching-exposure-dimensions";
             valuationSelection?: "exact" | "origin-static" | "latest-on-or-before" | undefined;
         }[];
-    }, {
         financial: {
             id: string;
             subject: "claim" | "claimant" | "occurrence" | "policy" | "coverage";
@@ -935,13 +976,6 @@ export declare const analysisDefinitionSchema: z.ZodEffects<z.ZodObject<{
                 asOfDate: string;
             };
         };
-        exposure: {
-            id: string;
-            populationKeys: string[];
-            timeBasis: "interval" | "point-in-time" | "already-earned";
-            reportingFilterEffect: "none" | "matching-exposure-dimensions";
-            valuationSelection?: "exact" | "origin-static" | "latest-on-or-before" | undefined;
-        }[];
     }>;
     policySchedule: z.ZodArray<z.ZodEffects<z.ZodObject<{
         id: z.ZodEffects<z.ZodString, string, string>;
@@ -1264,6 +1298,7 @@ export declare const analysisDefinitionSchema: z.ZodEffects<z.ZodObject<{
             event: "closed-date";
             censor: "evaluation-date";
         }>]>;
+        unitFactors: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodEffects<z.ZodString, string, string>, z.ZodNumber>, Record<string, number>, Record<string, number>>>;
         populationScopeId: z.ZodEffects<z.ZodString, string, string>;
         condition: z.ZodOptional<z.ZodType<AnalysisPredicate, z.ZodTypeDef, AnalysisPredicate>>;
     }, "strict", z.ZodTypeAny, {
@@ -1310,6 +1345,7 @@ export declare const analysisDefinitionSchema: z.ZodEffects<z.ZodObject<{
             censor: "evaluation-date";
         };
         populationScopeId: string;
+        unitFactors?: Record<string, number> | undefined;
         condition?: AnalysisPredicate | undefined;
     }, {
         id: string;
@@ -1355,8 +1391,22 @@ export declare const analysisDefinitionSchema: z.ZodEffects<z.ZodObject<{
             censor: "evaluation-date";
         };
         populationScopeId: string;
+        unitFactors?: Record<string, number> | undefined;
         condition?: AnalysisPredicate | undefined;
     }>, "many">;
+    derivedMeasures: z.ZodOptional<z.ZodArray<z.ZodObject<{
+        id: z.ZodEffects<z.ZodString, string, string>;
+        expression: z.ZodType<AnalysisMeasureExpression, z.ZodTypeDef, AnalysisMeasureExpression>;
+        developmentSemantics: z.ZodEnum<["cumulative", "incremental", "point-in-time"]>;
+    }, "strict", z.ZodTypeAny, {
+        expression: AnalysisMeasureExpression;
+        id: string;
+        developmentSemantics: "point-in-time" | "cumulative" | "incremental";
+    }, {
+        expression: AnalysisMeasureExpression;
+        id: string;
+        developmentSemantics: "point-in-time" | "cumulative" | "incremental";
+    }>, "many">>;
     financialTerms: z.ZodArray<z.ZodDiscriminatedUnion<"kind", [z.ZodObject<{
         kind: z.ZodEnum<["claim-layer", "occurrence-layer"]>;
         id: z.ZodEffects<z.ZodString, string, string>;
@@ -1512,11 +1562,19 @@ export declare const analysisDefinitionSchema: z.ZodEffects<z.ZodObject<{
             censor: "evaluation-date";
         };
         populationScopeId: string;
+        unitFactors?: Record<string, number> | undefined;
         condition?: AnalysisPredicate | undefined;
     }[];
     analysisContractVersion: "actuarial-analysis/1";
     version: string;
     scopes: {
+        exposure: {
+            id: string;
+            populationKeys: string[];
+            timeBasis: "interval" | "point-in-time" | "already-earned";
+            reportingFilterEffect: "none" | "matching-exposure-dimensions";
+            valuationSelection?: "exact" | "origin-static" | "latest-on-or-before" | undefined;
+        }[];
         financial: {
             id: string;
             subject: "claim" | "claimant" | "occurrence" | "policy" | "coverage";
@@ -1545,13 +1603,6 @@ export declare const analysisDefinitionSchema: z.ZodEffects<z.ZodObject<{
                 asOfDate: string;
             };
         };
-        exposure: {
-            id: string;
-            populationKeys: string[];
-            timeBasis: "interval" | "point-in-time" | "already-earned";
-            reportingFilterEffect: "none" | "matching-exposure-dimensions";
-            valuationSelection?: "exact" | "origin-static" | "latest-on-or-before" | undefined;
-        }[];
     };
     policySchedule: {
         id: string;
@@ -1616,6 +1667,11 @@ export declare const analysisDefinitionSchema: z.ZodEffects<z.ZodObject<{
         allocation: "proportional" | "chronological";
         deductible: number;
     })[];
+    derivedMeasures?: {
+        expression: AnalysisMeasureExpression;
+        id: string;
+        developmentSemantics: "point-in-time" | "cumulative" | "incremental";
+    }[] | undefined;
     financialAdjustments?: ({
         kind: "scale";
         id: string;
@@ -1688,11 +1744,19 @@ export declare const analysisDefinitionSchema: z.ZodEffects<z.ZodObject<{
             censor: "evaluation-date";
         };
         populationScopeId: string;
+        unitFactors?: Record<string, number> | undefined;
         condition?: AnalysisPredicate | undefined;
     }[];
     analysisContractVersion: "actuarial-analysis/1";
     version: string;
     scopes: {
+        exposure: {
+            id: string;
+            populationKeys: string[];
+            timeBasis: "interval" | "point-in-time" | "already-earned";
+            reportingFilterEffect: "none" | "matching-exposure-dimensions";
+            valuationSelection?: "exact" | "origin-static" | "latest-on-or-before" | undefined;
+        }[];
         financial: {
             id: string;
             subject: "claim" | "claimant" | "occurrence" | "policy" | "coverage";
@@ -1721,13 +1785,6 @@ export declare const analysisDefinitionSchema: z.ZodEffects<z.ZodObject<{
                 asOfDate: string;
             };
         };
-        exposure: {
-            id: string;
-            populationKeys: string[];
-            timeBasis: "interval" | "point-in-time" | "already-earned";
-            reportingFilterEffect: "none" | "matching-exposure-dimensions";
-            valuationSelection?: "exact" | "origin-static" | "latest-on-or-before" | undefined;
-        }[];
     };
     policySchedule: {
         id: string;
@@ -1792,6 +1849,11 @@ export declare const analysisDefinitionSchema: z.ZodEffects<z.ZodObject<{
         allocation: "proportional" | "chronological";
         deductible: number;
     })[];
+    derivedMeasures?: {
+        expression: AnalysisMeasureExpression;
+        id: string;
+        developmentSemantics: "point-in-time" | "cumulative" | "incremental";
+    }[] | undefined;
     financialAdjustments?: ({
         kind: "scale";
         id: string;
@@ -1864,11 +1926,19 @@ export declare const analysisDefinitionSchema: z.ZodEffects<z.ZodObject<{
             censor: "evaluation-date";
         };
         populationScopeId: string;
+        unitFactors?: Record<string, number> | undefined;
         condition?: AnalysisPredicate | undefined;
     }[];
     analysisContractVersion: "actuarial-analysis/1";
     version: string;
     scopes: {
+        exposure: {
+            id: string;
+            populationKeys: string[];
+            timeBasis: "interval" | "point-in-time" | "already-earned";
+            reportingFilterEffect: "none" | "matching-exposure-dimensions";
+            valuationSelection?: "exact" | "origin-static" | "latest-on-or-before" | undefined;
+        }[];
         financial: {
             id: string;
             subject: "claim" | "claimant" | "occurrence" | "policy" | "coverage";
@@ -1897,13 +1967,6 @@ export declare const analysisDefinitionSchema: z.ZodEffects<z.ZodObject<{
                 asOfDate: string;
             };
         };
-        exposure: {
-            id: string;
-            populationKeys: string[];
-            timeBasis: "interval" | "point-in-time" | "already-earned";
-            reportingFilterEffect: "none" | "matching-exposure-dimensions";
-            valuationSelection?: "exact" | "origin-static" | "latest-on-or-before" | undefined;
-        }[];
     };
     policySchedule: {
         id: string;
@@ -1968,6 +2031,11 @@ export declare const analysisDefinitionSchema: z.ZodEffects<z.ZodObject<{
         allocation: "proportional" | "chronological";
         deductible: number;
     })[];
+    derivedMeasures?: {
+        expression: AnalysisMeasureExpression;
+        id: string;
+        developmentSemantics: "point-in-time" | "cumulative" | "incremental";
+    }[] | undefined;
     financialAdjustments?: ({
         kind: "scale";
         id: string;
@@ -2040,11 +2108,19 @@ export declare const analysisDefinitionSchema: z.ZodEffects<z.ZodObject<{
             censor: "evaluation-date";
         };
         populationScopeId: string;
+        unitFactors?: Record<string, number> | undefined;
         condition?: AnalysisPredicate | undefined;
     }[];
     analysisContractVersion: "actuarial-analysis/1";
     version: string;
     scopes: {
+        exposure: {
+            id: string;
+            populationKeys: string[];
+            timeBasis: "interval" | "point-in-time" | "already-earned";
+            reportingFilterEffect: "none" | "matching-exposure-dimensions";
+            valuationSelection?: "exact" | "origin-static" | "latest-on-or-before" | undefined;
+        }[];
         financial: {
             id: string;
             subject: "claim" | "claimant" | "occurrence" | "policy" | "coverage";
@@ -2073,13 +2149,6 @@ export declare const analysisDefinitionSchema: z.ZodEffects<z.ZodObject<{
                 asOfDate: string;
             };
         };
-        exposure: {
-            id: string;
-            populationKeys: string[];
-            timeBasis: "interval" | "point-in-time" | "already-earned";
-            reportingFilterEffect: "none" | "matching-exposure-dimensions";
-            valuationSelection?: "exact" | "origin-static" | "latest-on-or-before" | undefined;
-        }[];
     };
     policySchedule: {
         id: string;
@@ -2144,6 +2213,11 @@ export declare const analysisDefinitionSchema: z.ZodEffects<z.ZodObject<{
         allocation: "proportional" | "chronological";
         deductible: number;
     })[];
+    derivedMeasures?: {
+        expression: AnalysisMeasureExpression;
+        id: string;
+        developmentSemantics: "point-in-time" | "cumulative" | "incremental";
+    }[] | undefined;
     financialAdjustments?: ({
         kind: "scale";
         id: string;
@@ -2238,7 +2312,7 @@ export declare const analysisRecipeSchema: z.ZodEffects<z.ZodObject<{
         kind: "adapt-diagnostics";
         diagnosticDefinitionId: string;
     }>]>, "many">;
-    requiredCapabilities: z.ZodArray<z.ZodEnum<["history-snapshots", "history-changes", "irregular-periods", "exposure-earning", "typed-populations", "descriptive-statistics", "reserving-triangle-adapter", "bounded-execution", "shared-financial-terms", "recipes", "scenarios"]>, "many">;
+    requiredCapabilities: z.ZodArray<z.ZodEnum<["history-snapshots", "history-changes", "irregular-periods", "exposure-earning", "typed-populations", "descriptive-statistics", "derived-analysis-measures", "reserving-triangle-adapter", "bounded-execution", "shared-financial-terms", "recipes", "scenarios"]>, "many">;
     parameters: z.ZodRecord<z.ZodEffects<z.ZodString, string, string>, z.ZodType<JsonValue, z.ZodTypeDef, JsonValue>>;
 }, "strict", z.ZodTypeAny, {
     id: string;
@@ -2268,7 +2342,7 @@ export declare const analysisRecipeSchema: z.ZodEffects<z.ZodObject<{
         kind: "adapt-diagnostics";
         diagnosticDefinitionId: string;
     })[];
-    requiredCapabilities: ("history-snapshots" | "history-changes" | "irregular-periods" | "exposure-earning" | "typed-populations" | "descriptive-statistics" | "reserving-triangle-adapter" | "bounded-execution" | "shared-financial-terms" | "recipes" | "scenarios")[];
+    requiredCapabilities: ("history-snapshots" | "history-changes" | "irregular-periods" | "exposure-earning" | "typed-populations" | "descriptive-statistics" | "derived-analysis-measures" | "reserving-triangle-adapter" | "bounded-execution" | "shared-financial-terms" | "recipes" | "scenarios")[];
     parameters: Record<string, JsonValue>;
 }, {
     id: string;
@@ -2298,7 +2372,7 @@ export declare const analysisRecipeSchema: z.ZodEffects<z.ZodObject<{
         kind: "adapt-diagnostics";
         diagnosticDefinitionId: string;
     })[];
-    requiredCapabilities: ("history-snapshots" | "history-changes" | "irregular-periods" | "exposure-earning" | "typed-populations" | "descriptive-statistics" | "reserving-triangle-adapter" | "bounded-execution" | "shared-financial-terms" | "recipes" | "scenarios")[];
+    requiredCapabilities: ("history-snapshots" | "history-changes" | "irregular-periods" | "exposure-earning" | "typed-populations" | "descriptive-statistics" | "derived-analysis-measures" | "reserving-triangle-adapter" | "bounded-execution" | "shared-financial-terms" | "recipes" | "scenarios")[];
     parameters: Record<string, JsonValue>;
 }>, {
     id: string;
@@ -2328,7 +2402,7 @@ export declare const analysisRecipeSchema: z.ZodEffects<z.ZodObject<{
         kind: "adapt-diagnostics";
         diagnosticDefinitionId: string;
     })[];
-    requiredCapabilities: ("history-snapshots" | "history-changes" | "irregular-periods" | "exposure-earning" | "typed-populations" | "descriptive-statistics" | "reserving-triangle-adapter" | "bounded-execution" | "shared-financial-terms" | "recipes" | "scenarios")[];
+    requiredCapabilities: ("history-snapshots" | "history-changes" | "irregular-periods" | "exposure-earning" | "typed-populations" | "descriptive-statistics" | "derived-analysis-measures" | "reserving-triangle-adapter" | "bounded-execution" | "shared-financial-terms" | "recipes" | "scenarios")[];
     parameters: Record<string, JsonValue>;
 }, {
     id: string;
@@ -2358,7 +2432,7 @@ export declare const analysisRecipeSchema: z.ZodEffects<z.ZodObject<{
         kind: "adapt-diagnostics";
         diagnosticDefinitionId: string;
     })[];
-    requiredCapabilities: ("history-snapshots" | "history-changes" | "irregular-periods" | "exposure-earning" | "typed-populations" | "descriptive-statistics" | "reserving-triangle-adapter" | "bounded-execution" | "shared-financial-terms" | "recipes" | "scenarios")[];
+    requiredCapabilities: ("history-snapshots" | "history-changes" | "irregular-periods" | "exposure-earning" | "typed-populations" | "descriptive-statistics" | "derived-analysis-measures" | "reserving-triangle-adapter" | "bounded-execution" | "shared-financial-terms" | "recipes" | "scenarios")[];
     parameters: Record<string, JsonValue>;
 }>;
 export declare const analysisResultSchema: z.ZodType<AnalysisResult>;

package/dist/customizationContracts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"customizationContracts.d.ts","sourceRoot":"","sources":["../src/customizationContracts.ts"],"names":[],"mappings":"AAAA,OAAO,EAUL,KAAK,kBAAkB,EACvB,KAAK,gCAAgC,EACrC,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,gBAAgB,EACrB,KAAK,oBAAoB,EACzB,KAAK,gCAAgC,EACrC,KAAK,2BAA2B,EAChC,KAAK,wBAAwB,EAC7B,KAAK,qBAAqB,EAC1B,KAAK,yBAAyB,EAC9B,KAAK,sBAAsB,EAC3B,KAAK,SAAS,EAGf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAYxB,mFAAmF;AACnF,eAAO,MAAM,iCAAiC,EAAE,CAAC,CAAC,OAAO,CAAC,2BAA2B,CAS1E,CAAC;AAsDZ,eAAO,MAAM,sCAAsC,EAAE,CAAC,CAAC,OAAO,CAAC,gCAAgC,CAwB3F,CAAC;AAEL,eAAO,MAAM,8BAA8B,EAAE,CAAC,CAAC,OAAO,CAAC,wBAAwB,CASyD,CAAC;AAEzI,eAAO,MAAM,+BAA+B,EAAE,CAAC,CAAC,OAAO,CAAC,yBAAyB,CAMtE,CAAC;AAEZ,eAAO,MAAM,2BAA2B,EAAE,CAAC,CAAC,OAAO,CAAC,qBAAqB,CAkBvE,CAAC;AAEH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkE/B,CAAC;AAEL,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAmKrC,CAAC;AAkIL,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAoMjC,CAAC;AAYL,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+C7B,CAAC;AAoBL,eAAO,MAAM,oBAAoB,EAAE,CAAC,CAAC,OAAO,CAAC,cAAc,CAoBhD,CAAC;AAQZ,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EASjC,CAAC;AAEH,eAAO,MAAM,0BAA0B,EAAE,CAAC,CAAC,OAAO,CAAC,oBAAoB,CA0BnE,CAAC;AAEL,eAAO,MAAM,4BAA4B,EAAE,CAAC,CAAC,OAAO,CAAC,gCAAgC,CAkBnF,CAAC;AAuBH,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,GAAG,sBAAsB,CAElF;AAED,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,OAAO,GAAG,2BAA2B,CAE5F;AAED,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,OAAO,GAAG,sBAAsB,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAE1G;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG,kBAAkB,CAE1E;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,cAAc,CAElE;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,cAAc,CAElE;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,gBAAgB,CAEtE;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,OAAO,GAAG,oBAAoB,CAE9E;AAED,wBAAgB,sCAAsC,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,gCAAgC,EAAE,CAElH;AAED,wBAAgB,8BAA8B,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,wBAAwB,EAAE,CAElG;AAED,wBAAgB,8BAA8B,CAAC,KAAK,EAAE,OAAO,GAAG,yBAAyB,CAExF;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,OAAO,GAAG,qBAAqB,CAEhF;AAED,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,GAAG,gCAAgC,CAE5F"}
+{"version":3,"file":"customizationContracts.d.ts","sourceRoot":"","sources":["../src/customizationContracts.ts"],"names":[],"mappings":"AAAA,OAAO,EAWL,KAAK,kBAAkB,EACvB,KAAK,yBAAyB,EAC9B,KAAK,gCAAgC,EACrC,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,gBAAgB,EACrB,KAAK,oBAAoB,EACzB,KAAK,gCAAgC,EACrC,KAAK,2BAA2B,EAChC,KAAK,wBAAwB,EAC7B,KAAK,qBAAqB,EAC1B,KAAK,yBAAyB,EAC9B,KAAK,sBAAsB,EAC3B,KAAK,SAAS,EAGf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAYxB,mFAAmF;AACnF,eAAO,MAAM,iCAAiC,EAAE,CAAC,CAAC,OAAO,CAAC,2BAA2B,CAS1E,CAAC;AAsDZ,eAAO,MAAM,sCAAsC,EAAE,CAAC,CAAC,OAAO,CAAC,gCAAgC,CAwB3F,CAAC;AAEL,eAAO,MAAM,8BAA8B,EAAE,CAAC,CAAC,OAAO,CAAC,wBAAwB,CASyD,CAAC;AAEzI,eAAO,MAAM,+BAA+B,EAAE,CAAC,CAAC,OAAO,CAAC,yBAAyB,CAMtE,CAAC;AAEZ,eAAO,MAAM,2BAA2B,EAAE,CAAC,CAAC,OAAO,CAAC,qBAAqB,CAkBvE,CAAC;AAEH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkE/B,CAAC;AAEL,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4KrC,CAAC;AA4IL,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAgNjC,CAAC;AAYL,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+C7B,CAAC;AAoBL,eAAO,MAAM,oBAAoB,EAAE,CAAC,CAAC,OAAO,CAAC,cAAc,CA8BhD,CAAC;AAQZ,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EASjC,CAAC;AAEH,eAAO,MAAM,0BAA0B,EAAE,CAAC,CAAC,OAAO,CAAC,oBAAoB,CA0BnE,CAAC;AAEL,eAAO,MAAM,4BAA4B,EAAE,CAAC,CAAC,OAAO,CAAC,gCAAgC,CAkBnF,CAAC;AAuBH,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,GAAG,sBAAsB,CAElF;AAED,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,OAAO,GAAG,2BAA2B,CAE5F;AAED,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,OAAO,GAAG,sBAAsB,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAE1G;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG,kBAAkB,CAE1E;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,cAAc,CAElE;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,cAAc,CAElE;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,gBAAgB,CAEtE;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,OAAO,GAAG,oBAAoB,CAE9E;AAED,wBAAgB,sCAAsC,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,gCAAgC,EAAE,CAElH;AAED,wBAAgB,8BAA8B,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,wBAAwB,EAAE,CAElG;AAED,wBAAgB,8BAA8B,CAAC,KAAK,EAAE,OAAO,GAAG,yBAAyB,CAExF;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,OAAO,GAAG,qBAAqB,CAEhF;AAED,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,GAAG,gCAAgC,CAE5F"}

package/dist/customizationContracts.js

@@ -1,4 +1,4 @@
-import { ANALYSIS_DEFINITION_CONTRACT_VERSION, ANALYSIS_RECIPE_CONTRACT_VERSION, ANALYSIS_RESULT_CONTRACT_VERSION, CUSTOMIZATION_CAPABILITIES, HISTORICAL_DATASET_CONTRACT_VERSION, DiagnosticValidationError, diagnosticJsonPreflight, isDiagnosticToken, isRealIsoDate, } from "@actuarial-ts/core";
+import { ANALYSIS_DEFINITION_CONTRACT_VERSION, ANALYSIS_RECIPE_CONTRACT_VERSION, ANALYSIS_RESULT_CONTRACT_VERSION, CUSTOMIZATION_CAPABILITIES, HISTORICAL_DATASET_CONTRACT_VERSION, DiagnosticValidationError, diagnosticJsonPreflight, compileAnalysisExpressions, isDiagnosticToken, isRealIsoDate, } from "@actuarial-ts/core";
 import { z } from "zod";
 const token = z
     .string()
@@ -203,7 +203,10 @@ export const historicalDatasetInputSchema = z
     missingSnapshotRecord: z.enum(["unknown", "carried-forward"]),
     sources: z
         .array(z
-        .object({ namespace: token, artifactId: token, mappingVersion: token })
+        .object({
+        namespace: token, artifactId: token, mappingVersion: token,
+        additionalArtifacts: z.array(z.object({ artifactId: token, mappingVersion: token }).strict()).min(1).optional(),
+    })
         .strict())
         .min(1),
     evaluationDates: z.array(date).optional(),
@@ -232,7 +235,13 @@ export const historicalDatasetInputSchema = z
                 message: "Source namespace is duplicated",
             });
         namespaces.add(source.namespace);
-        artifactByNamespace.set(source.namespace, source.artifactId);
+        const artifacts = new Set([source.artifactId]);
+        source.additionalArtifacts?.forEach((artifact, position) => {
+            if (artifacts.has(artifact.artifactId))
+                context.addIssue({ code: z.ZodIssueCode.custom, path: ["sources", index, "additionalArtifacts", position, "artifactId"], message: "Artifact ID is duplicated within the source namespace" });
+            artifacts.add(artifact.artifactId);
+        });
+        artifactByNamespace.set(source.namespace, artifacts);
     });
     input.records.forEach((record, index) => {
         if (!namespaces.has(record.sourceNamespace))
@@ -242,7 +251,7 @@ export const historicalDatasetInputSchema = z
                 message: "Record references an unknown source namespace",
             });
         if (artifactByNamespace.has(record.sourceNamespace) &&
-            artifactByNamespace.get(record.sourceNamespace) !== record.source.artifactId)
+            !artifactByNamespace.get(record.sourceNamespace).has(record.source.artifactId))
             context.addIssue({
                 code: z.ZodIssueCode.custom,
                 path: ["records", index, "source", "artifactId"],
@@ -326,7 +335,7 @@ export const historicalDatasetInputSchema = z
                 message: "Opening balance references an unknown source namespace",
             });
         if (artifactByNamespace.has(balance.sourceNamespace) &&
-            artifactByNamespace.get(balance.sourceNamespace) !== balance.source.artifactId)
+            !artifactByNamespace.get(balance.sourceNamespace).has(balance.source.artifactId))
             context.addIssue({
                 code: z.ZodIssueCode.custom,
                 path: ["openingBalances", index, "source", "artifactId"],
@@ -452,6 +461,15 @@ function duplicatePaths(values, base, context) {
         seen.add(value.id);
     });
 }
+const unitFactors = z.record(token, z.number().int().min(-32).max(32)).refine((value) => Object.keys(value).length <= 32, "At most 32 unit factors are supported");
+const measureExpression = z.lazy(() => z.discriminatedUnion("op", [
+    z.object({ op: z.literal("measure"), measureId: token }).strict(),
+    z.object({ op: z.literal("exposure"), exposureId: token }).strict(),
+    z.object({ op: z.literal("constant"), value: finite, unitFactors }).strict(),
+    z.object({ op: z.literal("add"), terms: z.array(measureExpression).min(1).max(32) }).strict(),
+    z.object({ op: z.enum(["subtract", "multiply"]), left: measureExpression, right: measureExpression }).strict(),
+    z.object({ op: z.literal("divide"), numerator: measureExpression, denominator: measureExpression }).strict(),
+]));
 export const analysisDefinitionSchema = z
     .object({
     analysisContractVersion: z.literal(ANALYSIS_DEFINITION_CONTRACT_VERSION),
@@ -546,15 +564,30 @@ export const analysisDefinitionSchema = z
         unit: token,
         developmentSemantics: z.enum(["cumulative", "incremental", "point-in-time"]),
         statistic,
+        unitFactors: unitFactors.optional(),
         populationScopeId: token,
         condition: predicate.optional(),
     })
         .strict()),
+    derivedMeasures: z.array(z.object({
+        id: token,
+        expression: measureExpression,
+        developmentSemantics: z.enum(["cumulative", "incremental", "point-in-time"]),
+    }).strict()).max(64).optional(),
     financialTerms: z.array(financialTerm),
     financialAdjustments: z.array(financialAdjustment).optional(),
 })
     .strict()
     .superRefine((definition, context) => {
+    try {
+        compileAnalysisExpressions(definition);
+    }
+    catch (error) {
+        if (!(error instanceof DiagnosticValidationError))
+            throw error;
+        for (const issue of error.issues)
+            context.addIssue({ code: z.ZodIssueCode.custom, path: ["derivedMeasures"], message: issue.message });
+    }
     duplicatePaths(definition.dimensions, "dimensions", context);
     duplicatePaths(definition.scopes.exposure, "scopes.exposure", context);
     duplicatePaths(definition.policySchedule, "policySchedule", context);
@@ -729,6 +762,16 @@ export const analysisResultSchema = z.object({
         numerator: finite.nullable(),
         denominator: finite.nullable(),
         findings: z.array(capabilityFinding),
+        derivation: z.object({
+            stage: z.literal("post-aggregation"),
+            unitFactors,
+            components: z.array(z.object({
+                kind: z.enum(["measure", "exposure"]), id: token, unit: token,
+                value: finite.nullable(), status: z.enum(["available", "unavailable"]),
+                contributingObservations: z.number().int().nonnegative(),
+                excludedObservations: z.number().int().nonnegative(),
+            }).strict()).max(1024),
+        }).strict().optional(),
     }).strict()),
 }).strict();
 const scenarioChange = z.discriminatedUnion("kind", [