@rio-cloud/cdk-v2-constructs 9.0.0-alpha.8 → 9.0.0
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.
- package/.jsii +883 -183
- package/README.md +65 -0
- package/docs/AGENTS_DOCUMENTATION.md +20 -203
- package/lib/fargate/datadog.d.ts +4 -1
- package/lib/fargate/datadog.js +6 -3
- package/lib/fargate/rio-fargate-service-blue-green-alpha.js +6 -1
- package/lib/fargate/rio-fargate-service.d.ts +22 -1
- package/lib/fargate/rio-fargate-service.js +11 -2
- package/lib/fargate/trace-sampling.d.ts +87 -0
- package/lib/fargate/trace-sampling.js +123 -0
- package/lib/sbom-catalog/lambda/handler.cjs +38 -1
- package/node_modules/zod/package.json +1 -1
- package/node_modules/zod/src/v4/classic/tests/array.test.ts +27 -0
- package/node_modules/zod/src/v4/classic/tests/map.test.ts +7 -0
- package/node_modules/zod/src/v4/classic/tests/set.test.ts +6 -0
- package/node_modules/zod/src/v4/core/compile.ts +9 -0
- package/node_modules/zod/src/v4/core/schemas.ts +35 -1
- package/node_modules/zod/src/v4/core/util.ts +13 -0
- package/node_modules/zod/src/v4/core/versions.ts +1 -1
- package/node_modules/zod/v4/core/compile.cjs +8 -0
- package/node_modules/zod/v4/core/compile.js +8 -0
- package/node_modules/zod/v4/core/schemas.cjs +30 -0
- package/node_modules/zod/v4/core/schemas.d.cts +3 -1
- package/node_modules/zod/v4/core/schemas.d.ts +3 -1
- package/node_modules/zod/v4/core/schemas.js +30 -0
- package/node_modules/zod/v4/core/util.cjs +15 -0
- package/node_modules/zod/v4/core/util.d.cts +2 -0
- package/node_modules/zod/v4/core/util.d.ts +2 -0
- package/node_modules/zod/v4/core/util.js +14 -0
- package/node_modules/zod/v4/core/versions.cjs +1 -1
- package/node_modules/zod/v4/core/versions.js +1 -1
- package/package.json +1 -1
- package/version.json +1 -1
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
import type * as constructs from 'constructs';
|
|
2
|
+
/**
|
|
3
|
+
* The trace sampling strategy used by the Fargate Datadog integration.
|
|
4
|
+
*/
|
|
5
|
+
export declare enum TraceSamplingMode {
|
|
6
|
+
/**
|
|
7
|
+
* Use RIO's per-Agent head-sampling target of 5 traces/sec and an additional
|
|
8
|
+
* error-sampling budget of 10 local error trace chunks/sec.
|
|
9
|
+
* Target-per-second sampling is a practical default for both low- and
|
|
10
|
+
* high-traffic services.
|
|
11
|
+
*/
|
|
12
|
+
DEFAULT = 0,
|
|
13
|
+
/** Do not set sampling environment variables; retain Datadog's defaults. */
|
|
14
|
+
DATADOG_DEFAULT = 1,
|
|
15
|
+
/** Set a fixed sampling rule on the application tracer. */
|
|
16
|
+
FIXED_RATE = 2,
|
|
17
|
+
/** Set a per-Agent target number of traces per second. */
|
|
18
|
+
TARGET_PER_SECOND = 3
|
|
19
|
+
}
|
|
20
|
+
/**
|
|
21
|
+
* Use RIO's default Datadog Agent sampling targets.
|
|
22
|
+
*
|
|
23
|
+
* This is also the default when `traceSampling` is omitted.
|
|
24
|
+
*/
|
|
25
|
+
export interface RioDefaultTraceSamplingOptions {
|
|
26
|
+
/**
|
|
27
|
+
* The sampling strategy. May be omitted to use the default.
|
|
28
|
+
*
|
|
29
|
+
* @defaultValue - `TraceSamplingMode.DEFAULT`
|
|
30
|
+
*/
|
|
31
|
+
readonly mode?: TraceSamplingMode.DEFAULT;
|
|
32
|
+
}
|
|
33
|
+
/** Do not set sampling environment variables; retain Datadog's defaults. */
|
|
34
|
+
export interface DatadogDefaultTraceSamplingOptions {
|
|
35
|
+
/** The sampling strategy. */
|
|
36
|
+
readonly mode: TraceSamplingMode.DATADOG_DEFAULT;
|
|
37
|
+
}
|
|
38
|
+
/** Configure a fixed application-tracer sampling rate. */
|
|
39
|
+
export interface FixedRateTraceSamplingOptions {
|
|
40
|
+
/** The sampling strategy. */
|
|
41
|
+
readonly mode: TraceSamplingMode.FIXED_RATE;
|
|
42
|
+
/**
|
|
43
|
+
* The global tracer sampling-rule rate, from 0.0 to 1.0 inclusive.
|
|
44
|
+
* Datadog tracers additionally apply their built-in 100-traces-per-second
|
|
45
|
+
* rate limit when sampling rules are configured. This construct does not
|
|
46
|
+
* expose or override that per-instance safeguard.
|
|
47
|
+
*/
|
|
48
|
+
readonly fixedRate: number;
|
|
49
|
+
}
|
|
50
|
+
/** Configure Datadog Agent target sampling. */
|
|
51
|
+
export interface TargetPerSecondTraceSamplingOptions {
|
|
52
|
+
/** The sampling strategy. */
|
|
53
|
+
readonly mode: TraceSamplingMode.TARGET_PER_SECOND;
|
|
54
|
+
/**
|
|
55
|
+
* The average head-sampling target in traces per second for each Agent
|
|
56
|
+
* sidecar (and therefore each Fargate service instance). Traffic spikes
|
|
57
|
+
* can exceed this target; it is not a hard cap on total ingestion.
|
|
58
|
+
*/
|
|
59
|
+
readonly targetTracesPerSecond: number;
|
|
60
|
+
/**
|
|
61
|
+
* The budget for additional local error trace chunks per second missed by
|
|
62
|
+
* head sampling, for each Agent sidecar (and therefore each Fargate service
|
|
63
|
+
* instance). This does not cap error traces already kept by head sampling.
|
|
64
|
+
*/
|
|
65
|
+
readonly errorTracesPerSecond?: number;
|
|
66
|
+
}
|
|
67
|
+
/**
|
|
68
|
+
* Options for configuring Datadog APM trace sampling.
|
|
69
|
+
*
|
|
70
|
+
* This discriminated union makes mode-specific settings invalid in TypeScript
|
|
71
|
+
* before synthesis. Numeric ranges are checked during synthesis.
|
|
72
|
+
*/
|
|
73
|
+
export type TraceSamplingOptions = RioDefaultTraceSamplingOptions | DatadogDefaultTraceSamplingOptions | FixedRateTraceSamplingOptions | TargetPerSecondTraceSamplingOptions;
|
|
74
|
+
export declare class TraceSamplingValidator implements constructs.IValidation {
|
|
75
|
+
private readonly traceSampling?;
|
|
76
|
+
constructor(traceSampling?: TraceSamplingOptions | undefined);
|
|
77
|
+
validate(): string[];
|
|
78
|
+
}
|
|
79
|
+
export declare function addTraceSamplingEnvironmentWarning(scope: constructs.Construct, environment: {
|
|
80
|
+
[key: string]: string;
|
|
81
|
+
} | undefined): void;
|
|
82
|
+
export declare function getApplicationTraceSamplingEnvironment(traceSampling?: TraceSamplingOptions): {
|
|
83
|
+
[key: string]: string;
|
|
84
|
+
};
|
|
85
|
+
export declare function getAgentTraceSamplingEnvironment(traceSampling?: TraceSamplingOptions): {
|
|
86
|
+
[key: string]: string;
|
|
87
|
+
};
|
|
@@ -0,0 +1,123 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var _a;
|
|
3
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
+
exports.TraceSamplingValidator = exports.TraceSamplingMode = void 0;
|
|
5
|
+
exports.addTraceSamplingEnvironmentWarning = addTraceSamplingEnvironmentWarning;
|
|
6
|
+
exports.getApplicationTraceSamplingEnvironment = getApplicationTraceSamplingEnvironment;
|
|
7
|
+
exports.getAgentTraceSamplingEnvironment = getAgentTraceSamplingEnvironment;
|
|
8
|
+
const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
|
|
9
|
+
const cdk = require("aws-cdk-lib");
|
|
10
|
+
/**
|
|
11
|
+
* The trace sampling strategy used by the Fargate Datadog integration.
|
|
12
|
+
*/
|
|
13
|
+
var TraceSamplingMode;
|
|
14
|
+
(function (TraceSamplingMode) {
|
|
15
|
+
/**
|
|
16
|
+
* Use RIO's per-Agent head-sampling target of 5 traces/sec and an additional
|
|
17
|
+
* error-sampling budget of 10 local error trace chunks/sec.
|
|
18
|
+
* Target-per-second sampling is a practical default for both low- and
|
|
19
|
+
* high-traffic services.
|
|
20
|
+
*/
|
|
21
|
+
TraceSamplingMode[TraceSamplingMode["DEFAULT"] = 0] = "DEFAULT";
|
|
22
|
+
/** Do not set sampling environment variables; retain Datadog's defaults. */
|
|
23
|
+
TraceSamplingMode[TraceSamplingMode["DATADOG_DEFAULT"] = 1] = "DATADOG_DEFAULT";
|
|
24
|
+
/** Set a fixed sampling rule on the application tracer. */
|
|
25
|
+
TraceSamplingMode[TraceSamplingMode["FIXED_RATE"] = 2] = "FIXED_RATE";
|
|
26
|
+
/** Set a per-Agent target number of traces per second. */
|
|
27
|
+
TraceSamplingMode[TraceSamplingMode["TARGET_PER_SECOND"] = 3] = "TARGET_PER_SECOND";
|
|
28
|
+
})(TraceSamplingMode || (exports.TraceSamplingMode = TraceSamplingMode = {}));
|
|
29
|
+
class TraceSamplingValidator {
|
|
30
|
+
constructor(traceSampling) {
|
|
31
|
+
this.traceSampling = traceSampling;
|
|
32
|
+
}
|
|
33
|
+
validate() {
|
|
34
|
+
const options = this.traceSampling;
|
|
35
|
+
if (!options) {
|
|
36
|
+
return [];
|
|
37
|
+
}
|
|
38
|
+
// Keep validating the runtime shape: JavaScript consumers and TypeScript
|
|
39
|
+
// callers using a cast can bypass the discriminated union.
|
|
40
|
+
const values = options;
|
|
41
|
+
const mode = values.mode ?? TraceSamplingMode.DEFAULT;
|
|
42
|
+
const hasFixedRate = values.fixedRate !== undefined;
|
|
43
|
+
const hasTargetTps = values.targetTracesPerSecond !== undefined;
|
|
44
|
+
const hasErrorTps = values.errorTracesPerSecond !== undefined;
|
|
45
|
+
const errors = [];
|
|
46
|
+
const isNonNegativeInteger = (value) => value !== undefined && Number.isInteger(value) && value >= 0;
|
|
47
|
+
if (mode === TraceSamplingMode.DEFAULT || mode === TraceSamplingMode.DATADOG_DEFAULT) {
|
|
48
|
+
if (hasFixedRate || hasTargetTps || hasErrorTps) {
|
|
49
|
+
errors.push(`${TraceSamplingMode[mode]} does not accept fixedRate, targetTracesPerSecond, or errorTracesPerSecond.`);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
else if (mode === TraceSamplingMode.FIXED_RATE) {
|
|
53
|
+
const fixedRate = values.fixedRate;
|
|
54
|
+
if (!hasFixedRate ||
|
|
55
|
+
fixedRate === undefined ||
|
|
56
|
+
!Number.isFinite(fixedRate) ||
|
|
57
|
+
fixedRate < 0.0 ||
|
|
58
|
+
fixedRate > 1.0) {
|
|
59
|
+
errors.push('FIXED_RATE requires fixedRate to be a number between 0 and 1 inclusive.');
|
|
60
|
+
}
|
|
61
|
+
if (hasTargetTps) {
|
|
62
|
+
errors.push('FIXED_RATE does not accept targetTracesPerSecond.');
|
|
63
|
+
}
|
|
64
|
+
if (hasErrorTps) {
|
|
65
|
+
errors.push('FIXED_RATE does not accept errorTracesPerSecond.');
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
else if (mode === TraceSamplingMode.TARGET_PER_SECOND) {
|
|
69
|
+
if (!isNonNegativeInteger(values.targetTracesPerSecond)) {
|
|
70
|
+
errors.push('TARGET_PER_SECOND requires targetTracesPerSecond to be a non-negative integer.');
|
|
71
|
+
}
|
|
72
|
+
if (hasFixedRate) {
|
|
73
|
+
errors.push('TARGET_PER_SECOND does not accept fixedRate.');
|
|
74
|
+
}
|
|
75
|
+
if (hasErrorTps && !isNonNegativeInteger(values.errorTracesPerSecond)) {
|
|
76
|
+
errors.push('TARGET_PER_SECOND errorTracesPerSecond must be a non-negative integer.');
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
errors.push('traceSampling.mode must be a TraceSamplingMode value.');
|
|
81
|
+
}
|
|
82
|
+
return errors;
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
exports.TraceSamplingValidator = TraceSamplingValidator;
|
|
86
|
+
_a = JSII_RTTI_SYMBOL_1;
|
|
87
|
+
TraceSamplingValidator[_a] = { fqn: "@rio-cloud-internal/cdk-v2-constructs.TraceSamplingValidator", version: "0.0.0" };
|
|
88
|
+
function addTraceSamplingEnvironmentWarning(scope, environment) {
|
|
89
|
+
const samplingKeys = ['DD_TRACE_SAMPLING_RULES', 'DD_TRACE_SAMPLE_RATE', 'DD_APM_TARGET_TPS', 'DD_APM_ERROR_TPS'];
|
|
90
|
+
const configuredKeys = samplingKeys.filter(key => environment && key in environment);
|
|
91
|
+
if (configuredKeys.length > 0) {
|
|
92
|
+
cdk.Validations.of(scope).addWarning('@rio-cloud/cdk-v2-constructs:directTraceSamplingEnvironment', [
|
|
93
|
+
`Direct trace-sampling environment variable(s) detected: ${configuredKeys.join(', ')}.`,
|
|
94
|
+
'Recommended action: remove these variables to use the DEFAULT sampling policy.',
|
|
95
|
+
'To select a different policy, configure datadogOptions.traceSampling explicitly.',
|
|
96
|
+
'Direct sampling environment variables remain supported only for backwards compatibility. Users who choose them are responsible for their compatibility and maintenance.',
|
|
97
|
+
].join('\n'));
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
function getApplicationTraceSamplingEnvironment(traceSampling) {
|
|
101
|
+
if (traceSampling?.mode === TraceSamplingMode.FIXED_RATE) {
|
|
102
|
+
const rules = [{ sample_rate: traceSampling.fixedRate }];
|
|
103
|
+
return { DD_TRACE_SAMPLING_RULES: JSON.stringify(rules) };
|
|
104
|
+
}
|
|
105
|
+
return {};
|
|
106
|
+
}
|
|
107
|
+
function getAgentTraceSamplingEnvironment(traceSampling) {
|
|
108
|
+
if (traceSampling?.mode === undefined || traceSampling.mode === TraceSamplingMode.DEFAULT) {
|
|
109
|
+
return { DD_APM_TARGET_TPS: '5', DD_APM_ERROR_TPS: '10' };
|
|
110
|
+
}
|
|
111
|
+
if (traceSampling?.mode === TraceSamplingMode.TARGET_PER_SECOND) {
|
|
112
|
+
const environment = {};
|
|
113
|
+
if (traceSampling.targetTracesPerSecond !== undefined) {
|
|
114
|
+
environment.DD_APM_TARGET_TPS = String(traceSampling.targetTracesPerSecond);
|
|
115
|
+
}
|
|
116
|
+
if (traceSampling.errorTracesPerSecond !== undefined) {
|
|
117
|
+
environment.DD_APM_ERROR_TPS = String(traceSampling.errorTracesPerSecond);
|
|
118
|
+
}
|
|
119
|
+
return environment;
|
|
120
|
+
}
|
|
121
|
+
return {};
|
|
122
|
+
}
|
|
123
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"trace-sampling.js","sourceRoot":"","sources":["../../src/fargate/trace-sampling.ts"],"names":[],"mappings":"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","sourcesContent":["import * as cdk from 'aws-cdk-lib';\nimport type * as constructs from 'constructs';\n\n/**\n * The trace sampling strategy used by the Fargate Datadog integration.\n */\nexport enum TraceSamplingMode {\n  /**\n   * Use RIO's per-Agent head-sampling target of 5 traces/sec and an additional\n   * error-sampling budget of 10 local error trace chunks/sec.\n   * Target-per-second sampling is a practical default for both low- and\n   * high-traffic services.\n   */\n  DEFAULT,\n\n  /** Do not set sampling environment variables; retain Datadog's defaults. */\n  DATADOG_DEFAULT,\n\n  /** Set a fixed sampling rule on the application tracer. */\n  FIXED_RATE,\n\n  /** Set a per-Agent target number of traces per second. */\n  TARGET_PER_SECOND,\n}\n\n/**\n * Use RIO's default Datadog Agent sampling targets.\n *\n * This is also the default when `traceSampling` is omitted.\n */\nexport interface RioDefaultTraceSamplingOptions {\n  /**\n   * The sampling strategy. May be omitted to use the default.\n   *\n   * @defaultValue - `TraceSamplingMode.DEFAULT`\n   */\n  readonly mode?: TraceSamplingMode.DEFAULT;\n}\n\n/** Do not set sampling environment variables; retain Datadog's defaults. */\nexport interface DatadogDefaultTraceSamplingOptions {\n  /** The sampling strategy. */\n  readonly mode: TraceSamplingMode.DATADOG_DEFAULT;\n}\n\n/** Configure a fixed application-tracer sampling rate. */\nexport interface FixedRateTraceSamplingOptions {\n  /** The sampling strategy. */\n  readonly mode: TraceSamplingMode.FIXED_RATE;\n\n  /**\n   * The global tracer sampling-rule rate, from 0.0 to 1.0 inclusive.\n   * Datadog tracers additionally apply their built-in 100-traces-per-second\n   * rate limit when sampling rules are configured. This construct does not\n   * expose or override that per-instance safeguard.\n   */\n  readonly fixedRate: number;\n}\n\n/** Configure Datadog Agent target sampling. */\nexport interface TargetPerSecondTraceSamplingOptions {\n  /** The sampling strategy. */\n  readonly mode: TraceSamplingMode.TARGET_PER_SECOND;\n\n  /**\n   * The average head-sampling target in traces per second for each Agent\n   * sidecar (and therefore each Fargate service instance). Traffic spikes\n   * can exceed this target; it is not a hard cap on total ingestion.\n   */\n  readonly targetTracesPerSecond: number;\n\n  /**\n   * The budget for additional local error trace chunks per second missed by\n   * head sampling, for each Agent sidecar (and therefore each Fargate service\n   * instance). This does not cap error traces already kept by head sampling.\n   */\n  readonly errorTracesPerSecond?: number;\n}\n\n/**\n * Options for configuring Datadog APM trace sampling.\n *\n * This discriminated union makes mode-specific settings invalid in TypeScript\n * before synthesis. Numeric ranges are checked during synthesis.\n */\nexport type TraceSamplingOptions =\n  | RioDefaultTraceSamplingOptions\n  | DatadogDefaultTraceSamplingOptions\n  | FixedRateTraceSamplingOptions\n  | TargetPerSecondTraceSamplingOptions;\n\n/** The untrusted runtime shape used by synthesis-time validation. */\ntype TraceSamplingValues = {\n  readonly mode?: TraceSamplingMode;\n  readonly fixedRate?: number;\n  readonly targetTracesPerSecond?: number;\n  readonly errorTracesPerSecond?: number;\n};\n\nexport class TraceSamplingValidator implements constructs.IValidation {\n  constructor(private readonly traceSampling?: TraceSamplingOptions) {}\n\n  validate(): string[] {\n    const options = this.traceSampling;\n    if (!options) {\n      return [];\n    }\n\n    // Keep validating the runtime shape: JavaScript consumers and TypeScript\n    // callers using a cast can bypass the discriminated union.\n    const values = options as TraceSamplingValues;\n    const mode = values.mode ?? TraceSamplingMode.DEFAULT;\n    const hasFixedRate = values.fixedRate !== undefined;\n    const hasTargetTps = values.targetTracesPerSecond !== undefined;\n    const hasErrorTps = values.errorTracesPerSecond !== undefined;\n    const errors: string[] = [];\n    const isNonNegativeInteger = (value: number | undefined) =>\n      value !== undefined && Number.isInteger(value) && value >= 0;\n\n    if (mode === TraceSamplingMode.DEFAULT || mode === TraceSamplingMode.DATADOG_DEFAULT) {\n      if (hasFixedRate || hasTargetTps || hasErrorTps) {\n        errors.push(\n          `${TraceSamplingMode[mode]} does not accept fixedRate, targetTracesPerSecond, or errorTracesPerSecond.`\n        );\n      }\n    } else if (mode === TraceSamplingMode.FIXED_RATE) {\n      const fixedRate = values.fixedRate;\n      if (\n        !hasFixedRate ||\n        fixedRate === undefined ||\n        !Number.isFinite(fixedRate) ||\n        fixedRate < 0.0 ||\n        fixedRate > 1.0\n      ) {\n        errors.push('FIXED_RATE requires fixedRate to be a number between 0 and 1 inclusive.');\n      }\n      if (hasTargetTps) {\n        errors.push('FIXED_RATE does not accept targetTracesPerSecond.');\n      }\n      if (hasErrorTps) {\n        errors.push('FIXED_RATE does not accept errorTracesPerSecond.');\n      }\n    } else if (mode === TraceSamplingMode.TARGET_PER_SECOND) {\n      if (!isNonNegativeInteger(values.targetTracesPerSecond)) {\n        errors.push('TARGET_PER_SECOND requires targetTracesPerSecond to be a non-negative integer.');\n      }\n      if (hasFixedRate) {\n        errors.push('TARGET_PER_SECOND does not accept fixedRate.');\n      }\n      if (hasErrorTps && !isNonNegativeInteger(values.errorTracesPerSecond)) {\n        errors.push('TARGET_PER_SECOND errorTracesPerSecond must be a non-negative integer.');\n      }\n    } else {\n      errors.push('traceSampling.mode must be a TraceSamplingMode value.');\n    }\n\n    return errors;\n  }\n}\n\nexport function addTraceSamplingEnvironmentWarning(\n  scope: constructs.Construct,\n  environment: { [key: string]: string } | undefined\n): void {\n  const samplingKeys = ['DD_TRACE_SAMPLING_RULES', 'DD_TRACE_SAMPLE_RATE', 'DD_APM_TARGET_TPS', 'DD_APM_ERROR_TPS'];\n  const configuredKeys = samplingKeys.filter(key => environment && key in environment);\n  if (configuredKeys.length > 0) {\n    cdk.Validations.of(scope).addWarning(\n      '@rio-cloud/cdk-v2-constructs:directTraceSamplingEnvironment',\n      [\n        `Direct trace-sampling environment variable(s) detected: ${configuredKeys.join(', ')}.`,\n        'Recommended action: remove these variables to use the DEFAULT sampling policy.',\n        'To select a different policy, configure datadogOptions.traceSampling explicitly.',\n        'Direct sampling environment variables remain supported only for backwards compatibility. Users who choose them are responsible for their compatibility and maintenance.',\n      ].join('\\n')\n    );\n  }\n}\n\nexport function getApplicationTraceSamplingEnvironment(traceSampling?: TraceSamplingOptions): {\n  [key: string]: string;\n} {\n  if (traceSampling?.mode === TraceSamplingMode.FIXED_RATE) {\n    const rules = [{ sample_rate: traceSampling.fixedRate }];\n    return { DD_TRACE_SAMPLING_RULES: JSON.stringify(rules) };\n  }\n  return {};\n}\n\nexport function getAgentTraceSamplingEnvironment(traceSampling?: TraceSamplingOptions): { [key: string]: string } {\n  if (traceSampling?.mode === undefined || traceSampling.mode === TraceSamplingMode.DEFAULT) {\n    return { DD_APM_TARGET_TPS: '5', DD_APM_ERROR_TPS: '10' };\n  }\n  if (traceSampling?.mode === TraceSamplingMode.TARGET_PER_SECOND) {\n    const environment: { [key: string]: string } = {};\n    if (traceSampling.targetTracesPerSecond !== undefined) {\n      environment.DD_APM_TARGET_TPS = String(traceSampling.targetTracesPerSecond);\n    }\n    if (traceSampling.errorTracesPerSecond !== undefined) {\n      environment.DD_APM_ERROR_TPS = String(traceSampling.errorTracesPerSecond);\n    }\n    return environment;\n  }\n  return {};\n}\n"]}
|
|
@@ -38779,6 +38779,7 @@ __export(util_exports, {
|
|
|
38779
38779
|
required: () => required,
|
|
38780
38780
|
safeExtend: () => safeExtend,
|
|
38781
38781
|
shallowClone: () => shallowClone,
|
|
38782
|
+
sizeCaps: () => sizeCaps,
|
|
38782
38783
|
slugify: () => slugify,
|
|
38783
38784
|
stringifyPrimitive: () => stringifyPrimitive,
|
|
38784
38785
|
toZod: () => toZod,
|
|
@@ -39298,6 +39299,18 @@ function prefixIssues(path, issues) {
|
|
|
39298
39299
|
function unwrapMessage(message) {
|
|
39299
39300
|
return typeof message === "string" ? message : message?.message;
|
|
39300
39301
|
}
|
|
39302
|
+
function sizeCaps(defChecks) {
|
|
39303
|
+
const caps = [];
|
|
39304
|
+
for (const ch of defChecks ?? []) {
|
|
39305
|
+
const d5 = ch._zod.def;
|
|
39306
|
+
if (!/_(length|size)$|_equals$/.test(d5.check))
|
|
39307
|
+
break;
|
|
39308
|
+
const max = d5.maximum ?? d5.length ?? d5.size;
|
|
39309
|
+
if (max >= 0)
|
|
39310
|
+
caps.push([max, ch]);
|
|
39311
|
+
}
|
|
39312
|
+
return caps;
|
|
39313
|
+
}
|
|
39301
39314
|
function attachSchema(issues, start, inst) {
|
|
39302
39315
|
var _a4;
|
|
39303
39316
|
for (let i5 = start; i5 < issues.length; i5++) {
|
|
@@ -40219,7 +40232,7 @@ ${content.join("\n")}
|
|
|
40219
40232
|
var version = {
|
|
40220
40233
|
major: 4,
|
|
40221
40234
|
minor: 6,
|
|
40222
|
-
patch:
|
|
40235
|
+
patch: 7
|
|
40223
40236
|
};
|
|
40224
40237
|
|
|
40225
40238
|
// node_modules/zod/v4/core/schemas.js
|
|
@@ -40727,6 +40740,29 @@ var $ZodNever = /* @__PURE__ */ $constructor("$ZodNever", (inst, def) => {
|
|
|
40727
40740
|
return payload;
|
|
40728
40741
|
};
|
|
40729
40742
|
});
|
|
40743
|
+
function capSize(inst, size) {
|
|
40744
|
+
const caps = sizeCaps(inst._zod.def.checks);
|
|
40745
|
+
if (!caps.length)
|
|
40746
|
+
return;
|
|
40747
|
+
const cap = Math.min(...caps.map((c5) => c5[0]));
|
|
40748
|
+
const parse3 = inst._zod.parse;
|
|
40749
|
+
inst._zod.parse = (payload, ctx) => {
|
|
40750
|
+
const n3 = size(payload.value);
|
|
40751
|
+
if (n3 > cap && !ctx?.skipChecks && ctx?.direction !== "backward") {
|
|
40752
|
+
for (const [max, ch] of sizeCaps(inst._zod.def.checks)) {
|
|
40753
|
+
if (n3 > max && ch._zod.def.when(payload)) {
|
|
40754
|
+
const start = payload.issues.length;
|
|
40755
|
+
ch._zod.check(payload);
|
|
40756
|
+
payload.issues[start].continue = false;
|
|
40757
|
+
attachSchema(payload.issues, start, inst);
|
|
40758
|
+
return payload;
|
|
40759
|
+
}
|
|
40760
|
+
}
|
|
40761
|
+
}
|
|
40762
|
+
return parse3(payload, ctx);
|
|
40763
|
+
};
|
|
40764
|
+
}
|
|
40765
|
+
var arraySize = (input) => Array.isArray(input) ? input.length : -1;
|
|
40730
40766
|
function handleArrayResult(result, final, index) {
|
|
40731
40767
|
if (result.issues.length) {
|
|
40732
40768
|
final.issues.push(...prefixIssues(index, result.issues));
|
|
@@ -40770,6 +40806,7 @@ var $ZodArray = /* @__PURE__ */ $constructor("$ZodArray", (inst, def) => {
|
|
|
40770
40806
|
}
|
|
40771
40807
|
return payload;
|
|
40772
40808
|
};
|
|
40809
|
+
capSize(inst, arraySize);
|
|
40773
40810
|
});
|
|
40774
40811
|
function handlePropertyResult(result, final, key, input, optin, optout) {
|
|
40775
40812
|
const isPresent = key in input;
|
|
@@ -140,6 +140,33 @@ test("continue parsing despite array size error", () => {
|
|
|
140
140
|
`);
|
|
141
141
|
});
|
|
142
142
|
|
|
143
|
+
test("an upper size bound fails before any element is parsed", () => {
|
|
144
|
+
let parsed = 0;
|
|
145
|
+
const el = z.string().refine(() => ++parsed);
|
|
146
|
+
let refined = 0;
|
|
147
|
+
const schema = z
|
|
148
|
+
.array(el)
|
|
149
|
+
.max(2, "too many")
|
|
150
|
+
.refine(() => ++refined);
|
|
151
|
+
expect(schema.safeParse([1, 2, 3]).error!.issues).toMatchObject([{ code: "too_big", path: [], message: "too many" }]);
|
|
152
|
+
expect(z.array(el).length(2).safeParse(["a", "b", "c"]).error!.issues).toMatchObject([
|
|
153
|
+
{ code: "too_big", exact: true },
|
|
154
|
+
]);
|
|
155
|
+
expect(z.object({ a: z.array(el).max(1) }).safeParse({ a: [1, 2] }).error!.issues).toMatchObject([
|
|
156
|
+
{ code: "too_big", path: ["a"] },
|
|
157
|
+
]);
|
|
158
|
+
expect([parsed, refined]).toEqual([0, 0]);
|
|
159
|
+
|
|
160
|
+
// a check that may rewrite the value ends the gate
|
|
161
|
+
expect(
|
|
162
|
+
z
|
|
163
|
+
.array(z.number())
|
|
164
|
+
.overwrite((a) => a.slice(0, 2))
|
|
165
|
+
.max(2)
|
|
166
|
+
.parse([1, 2, 3])
|
|
167
|
+
).toEqual([1, 2]);
|
|
168
|
+
});
|
|
169
|
+
|
|
143
170
|
test("parse should fail given sparse array", () => {
|
|
144
171
|
const schema = z.array(z.string()).nonempty().min(1).max(3);
|
|
145
172
|
const result = schema.safeParse(new Array(3));
|
|
@@ -97,6 +97,13 @@ test("failing when map is bigger than max() ", () => {
|
|
|
97
97
|
expect(result.success).toEqual(false);
|
|
98
98
|
expect(result.error!.issues.length).toEqual(1);
|
|
99
99
|
expect(result.error!.issues[0].code).toEqual("too_big");
|
|
100
|
+
const bad = new Map([
|
|
101
|
+
[1, 1],
|
|
102
|
+
[2, 2],
|
|
103
|
+
]);
|
|
104
|
+
const capped = z.map(z.string(), z.string()).max(1);
|
|
105
|
+
expect(capped.safeParse(bad).error!.issues).toMatchObject([{ code: "too_big" }]);
|
|
106
|
+
expect(capped.safeParse(new Set([1, 2])).error!.issues[0]).toMatchObject({ code: "invalid_type", expected: "map" });
|
|
100
107
|
});
|
|
101
108
|
|
|
102
109
|
test("failing when map does not match size() ", () => {
|
|
@@ -83,6 +83,12 @@ test("failing when set is bigger than max() ", () => {
|
|
|
83
83
|
expect(result.success).toEqual(false);
|
|
84
84
|
expect(result.error!.issues.length).toEqual(1);
|
|
85
85
|
expect(result.error!.issues[0].code).toEqual("too_big");
|
|
86
|
+
expect(
|
|
87
|
+
z
|
|
88
|
+
.set(z.string())
|
|
89
|
+
.max(1)
|
|
90
|
+
.safeParse(new Set([1, 2])).error!.issues
|
|
91
|
+
).toMatchObject([{ code: "too_big" }]);
|
|
86
92
|
});
|
|
87
93
|
|
|
88
94
|
test("failing when set does not match size() ", () => {
|
|
@@ -1551,6 +1551,12 @@ function generateNullableCheck(
|
|
|
1551
1551
|
return outputVar;
|
|
1552
1552
|
}
|
|
1553
1553
|
|
|
1554
|
+
function generateSizeGate(doc: Doc, schema: SomeType, size: string): void {
|
|
1555
|
+
for (const [max, check] of util.sizeCaps(schema._zod.def.checks)) {
|
|
1556
|
+
doc.write(`if (${size} > ${numericOperand(max, check._zod.def.check)}) return INVALID;`);
|
|
1557
|
+
}
|
|
1558
|
+
}
|
|
1559
|
+
|
|
1554
1560
|
function generateArrayCheck(
|
|
1555
1561
|
doc: Doc,
|
|
1556
1562
|
ctx: CompileContext,
|
|
@@ -1560,6 +1566,7 @@ function generateArrayCheck(
|
|
|
1560
1566
|
): string | null {
|
|
1561
1567
|
const def = schema._zod.def as unknown as { element: SomeType };
|
|
1562
1568
|
doc.write(`if (!Array.isArray(${accessor})) return INVALID;`);
|
|
1569
|
+
generateSizeGate(doc, schema, `${accessor}.length`);
|
|
1563
1570
|
|
|
1564
1571
|
// Build a new array with validated/transformed elements.
|
|
1565
1572
|
const outputVar = buildsValue ? newVar(ctx) : null;
|
|
@@ -2094,6 +2101,7 @@ function generateMapCheck(doc: Doc, ctx: CompileContext, schema: SomeType, acces
|
|
|
2094
2101
|
const def = schema._zod.def as unknown as { keyType: SomeType; valueType: SomeType };
|
|
2095
2102
|
|
|
2096
2103
|
doc.write(`if (!(${accessor} instanceof Map)) return INVALID;`);
|
|
2104
|
+
generateSizeGate(doc, schema, `${accessor}.size`);
|
|
2097
2105
|
|
|
2098
2106
|
const outputVar = newVar(ctx);
|
|
2099
2107
|
const kVar = newVar(ctx);
|
|
@@ -2115,6 +2123,7 @@ function generateSetCheck(doc: Doc, ctx: CompileContext, schema: SomeType, acces
|
|
|
2115
2123
|
const def = schema._zod.def as unknown as { valueType: SomeType };
|
|
2116
2124
|
|
|
2117
2125
|
doc.write(`if (!(${accessor} instanceof Set)) return INVALID;`);
|
|
2126
|
+
generateSizeGate(doc, schema, `${accessor}.size`);
|
|
2118
2127
|
|
|
2119
2128
|
const outputVar = newVar(ctx);
|
|
2120
2129
|
const valVar = newVar(ctx);
|
|
@@ -1844,6 +1844,34 @@ export interface $ZodArrayInternals<T extends SomeType = $ZodType> extends _$Zod
|
|
|
1844
1844
|
|
|
1845
1845
|
export interface $ZodArray<T extends SomeType = $ZodType> extends $ZodType<any, any, $ZodArrayInternals<T>> {}
|
|
1846
1846
|
|
|
1847
|
+
// an oversized container fails its leading size checks before any element is parsed
|
|
1848
|
+
function capSize(inst: $ZodType, size: (input: any) => number): void {
|
|
1849
|
+
const caps = util.sizeCaps(inst._zod.def.checks);
|
|
1850
|
+
if (!caps.length) return;
|
|
1851
|
+
const cap = Math.min(...caps.map((c) => c[0]));
|
|
1852
|
+
const parse = inst._zod.parse;
|
|
1853
|
+
inst._zod.parse = (payload, ctx) => {
|
|
1854
|
+
const n = size(payload.value);
|
|
1855
|
+
if (n > cap && !ctx?.skipChecks && ctx?.direction !== "backward") {
|
|
1856
|
+
for (const [max, ch] of util.sizeCaps(inst._zod.def.checks)) {
|
|
1857
|
+
if (n > max && ch._zod.def.when!(payload)) {
|
|
1858
|
+
const start = payload.issues.length;
|
|
1859
|
+
ch._zod.check(payload as ParsePayload<never>);
|
|
1860
|
+
// the value is still the raw input, so no later check may read it
|
|
1861
|
+
(payload.issues[start] as { continue?: boolean }).continue = false;
|
|
1862
|
+
util.attachSchema(payload.issues, start, inst);
|
|
1863
|
+
return payload;
|
|
1864
|
+
}
|
|
1865
|
+
}
|
|
1866
|
+
}
|
|
1867
|
+
return parse(payload, ctx);
|
|
1868
|
+
};
|
|
1869
|
+
}
|
|
1870
|
+
|
|
1871
|
+
const arraySize = (input: unknown): number => (Array.isArray(input) ? input.length : -1);
|
|
1872
|
+
const mapSize = (input: unknown): number => (input instanceof Map ? input.size : -1);
|
|
1873
|
+
const setSize = (input: unknown): number => (input instanceof Set ? input.size : -1);
|
|
1874
|
+
|
|
1847
1875
|
function handleArrayResult(result: ParsePayload<any>, final: ParsePayload<any[]>, index: number) {
|
|
1848
1876
|
if (result.issues.length) {
|
|
1849
1877
|
final.issues.push(...util.prefixIssues(index, result.issues));
|
|
@@ -1899,6 +1927,7 @@ export const $ZodArray: core.$constructor<$ZodArray> = /*@__PURE__*/ core.$const
|
|
|
1899
1927
|
|
|
1900
1928
|
return payload; //handleArrayResultsAsync(parseResults, final);
|
|
1901
1929
|
};
|
|
1930
|
+
capSize(inst, arraySize);
|
|
1902
1931
|
});
|
|
1903
1932
|
|
|
1904
1933
|
//////////////////////////////////////////
|
|
@@ -3218,8 +3247,11 @@ export type $InferZodRecordInput<
|
|
|
3218
3247
|
: Record<core.input<Key> & PropertyKey, core.input<Value>>;
|
|
3219
3248
|
|
|
3220
3249
|
export interface $ZodRecordInternals<Key extends $ZodRecordKey = $ZodRecordKey, Value extends SomeType = $ZodType>
|
|
3221
|
-
extends $ZodTypeInternals
|
|
3250
|
+
extends $ZodTypeInternals {
|
|
3222
3251
|
def: $ZodRecordDef<Key, Value>;
|
|
3252
|
+
// members rather than base type arguments, which TypeScript 7.1 reports as circular for `z.json()`
|
|
3253
|
+
output: $InferZodRecordOutput<Key, Value>;
|
|
3254
|
+
input: $InferZodRecordInput<Key, Value>;
|
|
3223
3255
|
isst: errors.$ZodIssueInvalidType | errors.$ZodIssueInvalidKey<Record<PropertyKey, unknown>>;
|
|
3224
3256
|
optin?: "optional" | undefined;
|
|
3225
3257
|
optout?: "optional" | undefined;
|
|
@@ -3480,6 +3512,7 @@ export const $ZodMap: core.$constructor<$ZodMap> = /*@__PURE__*/ core.$construct
|
|
|
3480
3512
|
if (proms.length) return Promise.all(proms).then(() => payload);
|
|
3481
3513
|
return payload;
|
|
3482
3514
|
};
|
|
3515
|
+
capSize(inst, mapSize);
|
|
3483
3516
|
});
|
|
3484
3517
|
|
|
3485
3518
|
function handleMapResult(
|
|
@@ -3582,6 +3615,7 @@ export const $ZodSet: core.$constructor<$ZodSet> = /*@__PURE__*/ core.$construct
|
|
|
3582
3615
|
if (proms.length) return Promise.all(proms).then(() => payload);
|
|
3583
3616
|
return payload;
|
|
3584
3617
|
};
|
|
3618
|
+
capSize(inst, setSize);
|
|
3585
3619
|
});
|
|
3586
3620
|
|
|
3587
3621
|
function handleSetResult(result: ParsePayload, final: ParsePayload<Set<any>>) {
|
|
@@ -935,6 +935,19 @@ export function unwrapMessage(message: string | { message: string } | undefined
|
|
|
935
935
|
}
|
|
936
936
|
|
|
937
937
|
/* A check holds no link back to the schema it is attached to — the same check instance is shared by every clone of that schema — so the owner is stamped onto the issues a check just raised, at the only point where both are in scope. Runs on the failure path only; `start` is the issue count from before the check ran. */
|
|
938
|
+
/** The leading size checks of `defChecks` that set an upper bound, each paired with it. */
|
|
939
|
+
export function sizeCaps(defChecks: checks.$ZodCheck<never>[] | undefined): [number, checks.$ZodCheck<never>][] {
|
|
940
|
+
const caps: [number, checks.$ZodCheck<never>][] = [];
|
|
941
|
+
for (const ch of defChecks ?? []) {
|
|
942
|
+
const d = ch._zod.def as any;
|
|
943
|
+
// a later check may rewrite the value
|
|
944
|
+
if (!/_(length|size)$|_equals$/.test(d.check)) break;
|
|
945
|
+
const max = d.maximum ?? d.length ?? d.size;
|
|
946
|
+
if (max >= 0) caps.push([max, ch]);
|
|
947
|
+
}
|
|
948
|
+
return caps;
|
|
949
|
+
}
|
|
950
|
+
|
|
938
951
|
export function attachSchema(issues: errors.$ZodRawIssue[], start: number, inst: schemas.$ZodType): void {
|
|
939
952
|
for (let i = start; i < issues.length; i++) {
|
|
940
953
|
(issues[i] as any).schema ??= inst;
|
|
@@ -1241,9 +1241,15 @@ function generateNullableCheck(doc, ctx, schema, accessor, buildsValue = true) {
|
|
|
1241
1241
|
doc.write(`}`);
|
|
1242
1242
|
return outputVar;
|
|
1243
1243
|
}
|
|
1244
|
+
function generateSizeGate(doc, schema, size) {
|
|
1245
|
+
for (const [max, check] of util.sizeCaps(schema._zod.def.checks)) {
|
|
1246
|
+
doc.write(`if (${size} > ${numericOperand(max, check._zod.def.check)}) return INVALID;`);
|
|
1247
|
+
}
|
|
1248
|
+
}
|
|
1244
1249
|
function generateArrayCheck(doc, ctx, schema, accessor, buildsValue = true) {
|
|
1245
1250
|
const def = schema._zod.def;
|
|
1246
1251
|
doc.write(`if (!Array.isArray(${accessor})) return INVALID;`);
|
|
1252
|
+
generateSizeGate(doc, schema, `${accessor}.length`);
|
|
1247
1253
|
// Build a new array with validated/transformed elements.
|
|
1248
1254
|
const outputVar = buildsValue ? newVar(ctx) : null;
|
|
1249
1255
|
const iVar = newVar(ctx);
|
|
@@ -1707,6 +1713,7 @@ function literalPropertyKey(ctx, key) {
|
|
|
1707
1713
|
function generateMapCheck(doc, ctx, schema, accessor) {
|
|
1708
1714
|
const def = schema._zod.def;
|
|
1709
1715
|
doc.write(`if (!(${accessor} instanceof Map)) return INVALID;`);
|
|
1716
|
+
generateSizeGate(doc, schema, `${accessor}.size`);
|
|
1710
1717
|
const outputVar = newVar(ctx);
|
|
1711
1718
|
const kVar = newVar(ctx);
|
|
1712
1719
|
const valVar = newVar(ctx);
|
|
@@ -1723,6 +1730,7 @@ function generateMapCheck(doc, ctx, schema, accessor) {
|
|
|
1723
1730
|
function generateSetCheck(doc, ctx, schema, accessor) {
|
|
1724
1731
|
const def = schema._zod.def;
|
|
1725
1732
|
doc.write(`if (!(${accessor} instanceof Set)) return INVALID;`);
|
|
1733
|
+
generateSizeGate(doc, schema, `${accessor}.size`);
|
|
1726
1734
|
const outputVar = newVar(ctx);
|
|
1727
1735
|
const valVar = newVar(ctx);
|
|
1728
1736
|
doc.write(`const ${outputVar} = new Set();`);
|
|
@@ -1210,9 +1210,15 @@ function generateNullableCheck(doc, ctx, schema, accessor, buildsValue = true) {
|
|
|
1210
1210
|
doc.write(`}`);
|
|
1211
1211
|
return outputVar;
|
|
1212
1212
|
}
|
|
1213
|
+
function generateSizeGate(doc, schema, size) {
|
|
1214
|
+
for (const [max, check] of util.sizeCaps(schema._zod.def.checks)) {
|
|
1215
|
+
doc.write(`if (${size} > ${numericOperand(max, check._zod.def.check)}) return INVALID;`);
|
|
1216
|
+
}
|
|
1217
|
+
}
|
|
1213
1218
|
function generateArrayCheck(doc, ctx, schema, accessor, buildsValue = true) {
|
|
1214
1219
|
const def = schema._zod.def;
|
|
1215
1220
|
doc.write(`if (!Array.isArray(${accessor})) return INVALID;`);
|
|
1221
|
+
generateSizeGate(doc, schema, `${accessor}.length`);
|
|
1216
1222
|
// Build a new array with validated/transformed elements.
|
|
1217
1223
|
const outputVar = buildsValue ? newVar(ctx) : null;
|
|
1218
1224
|
const iVar = newVar(ctx);
|
|
@@ -1676,6 +1682,7 @@ function literalPropertyKey(ctx, key) {
|
|
|
1676
1682
|
function generateMapCheck(doc, ctx, schema, accessor) {
|
|
1677
1683
|
const def = schema._zod.def;
|
|
1678
1684
|
doc.write(`if (!(${accessor} instanceof Map)) return INVALID;`);
|
|
1685
|
+
generateSizeGate(doc, schema, `${accessor}.size`);
|
|
1679
1686
|
const outputVar = newVar(ctx);
|
|
1680
1687
|
const kVar = newVar(ctx);
|
|
1681
1688
|
const valVar = newVar(ctx);
|
|
@@ -1692,6 +1699,7 @@ function generateMapCheck(doc, ctx, schema, accessor) {
|
|
|
1692
1699
|
function generateSetCheck(doc, ctx, schema, accessor) {
|
|
1693
1700
|
const def = schema._zod.def;
|
|
1694
1701
|
doc.write(`if (!(${accessor} instanceof Set)) return INVALID;`);
|
|
1702
|
+
generateSizeGate(doc, schema, `${accessor}.size`);
|
|
1695
1703
|
const outputVar = newVar(ctx);
|
|
1696
1704
|
const valVar = newVar(ctx);
|
|
1697
1705
|
doc.write(`const ${outputVar} = new Set();`);
|
|
@@ -860,6 +860,33 @@ exports.$ZodDate = core.$constructor("$ZodDate", (inst, def) => {
|
|
|
860
860
|
return payload;
|
|
861
861
|
};
|
|
862
862
|
});
|
|
863
|
+
// an oversized container fails its leading size checks before any element is parsed
|
|
864
|
+
function capSize(inst, size) {
|
|
865
|
+
const caps = util.sizeCaps(inst._zod.def.checks);
|
|
866
|
+
if (!caps.length)
|
|
867
|
+
return;
|
|
868
|
+
const cap = Math.min(...caps.map((c) => c[0]));
|
|
869
|
+
const parse = inst._zod.parse;
|
|
870
|
+
inst._zod.parse = (payload, ctx) => {
|
|
871
|
+
const n = size(payload.value);
|
|
872
|
+
if (n > cap && !ctx?.skipChecks && ctx?.direction !== "backward") {
|
|
873
|
+
for (const [max, ch] of util.sizeCaps(inst._zod.def.checks)) {
|
|
874
|
+
if (n > max && ch._zod.def.when(payload)) {
|
|
875
|
+
const start = payload.issues.length;
|
|
876
|
+
ch._zod.check(payload);
|
|
877
|
+
// the value is still the raw input, so no later check may read it
|
|
878
|
+
payload.issues[start].continue = false;
|
|
879
|
+
util.attachSchema(payload.issues, start, inst);
|
|
880
|
+
return payload;
|
|
881
|
+
}
|
|
882
|
+
}
|
|
883
|
+
}
|
|
884
|
+
return parse(payload, ctx);
|
|
885
|
+
};
|
|
886
|
+
}
|
|
887
|
+
const arraySize = (input) => (Array.isArray(input) ? input.length : -1);
|
|
888
|
+
const mapSize = (input) => (input instanceof Map ? input.size : -1);
|
|
889
|
+
const setSize = (input) => (input instanceof Set ? input.size : -1);
|
|
863
890
|
function handleArrayResult(result, final, index) {
|
|
864
891
|
if (result.issues.length) {
|
|
865
892
|
final.issues.push(...util.prefixIssues(index, result.issues));
|
|
@@ -905,6 +932,7 @@ exports.$ZodArray = core.$constructor("$ZodArray", (inst, def) => {
|
|
|
905
932
|
}
|
|
906
933
|
return payload; //handleArrayResultsAsync(parseResults, final);
|
|
907
934
|
};
|
|
935
|
+
capSize(inst, arraySize);
|
|
908
936
|
});
|
|
909
937
|
function handlePropertyResult(result, final, key, input, optin, optout) {
|
|
910
938
|
const isPresent = key in input;
|
|
@@ -1942,6 +1970,7 @@ exports.$ZodMap = core.$constructor("$ZodMap", (inst, def) => {
|
|
|
1942
1970
|
return Promise.all(proms).then(() => payload);
|
|
1943
1971
|
return payload;
|
|
1944
1972
|
};
|
|
1973
|
+
capSize(inst, mapSize);
|
|
1945
1974
|
});
|
|
1946
1975
|
function handleMapResult(keyResult, valueResult, final, key, input, inst, ctx) {
|
|
1947
1976
|
if (keyResult.issues.length) {
|
|
@@ -2011,6 +2040,7 @@ exports.$ZodSet = core.$constructor("$ZodSet", (inst, def) => {
|
|
|
2011
2040
|
return Promise.all(proms).then(() => payload);
|
|
2012
2041
|
return payload;
|
|
2013
2042
|
};
|
|
2043
|
+
capSize(inst, setSize);
|
|
2014
2044
|
});
|
|
2015
2045
|
function handleSetResult(result, final) {
|
|
2016
2046
|
if (result.issues.length) {
|
|
@@ -834,8 +834,10 @@ export type $InferZodRecordOutput<Key extends $ZodRecordKey = $ZodRecordKey, Val
|
|
|
834
834
|
export type $InferZodRecordInput<Key extends $ZodRecordKey = $ZodRecordKey, Value extends SomeType = $ZodType> = Key extends $partial ? Partial<Record<core.input<Key> & PropertyKey, core.input<Value>>> : [
|
|
835
835
|
Value
|
|
836
836
|
] extends [OptionalInSchema] ? Partial<Record<core.input<Key> & PropertyKey, core.input<Value>>> : Record<core.input<Key> & PropertyKey, core.input<Value>>;
|
|
837
|
-
export interface $ZodRecordInternals<Key extends $ZodRecordKey = $ZodRecordKey, Value extends SomeType = $ZodType> extends $ZodTypeInternals
|
|
837
|
+
export interface $ZodRecordInternals<Key extends $ZodRecordKey = $ZodRecordKey, Value extends SomeType = $ZodType> extends $ZodTypeInternals {
|
|
838
838
|
def: $ZodRecordDef<Key, Value>;
|
|
839
|
+
output: $InferZodRecordOutput<Key, Value>;
|
|
840
|
+
input: $InferZodRecordInput<Key, Value>;
|
|
839
841
|
isst: errors.$ZodIssueInvalidType | errors.$ZodIssueInvalidKey<Record<PropertyKey, unknown>>;
|
|
840
842
|
optin?: "optional" | undefined;
|
|
841
843
|
optout?: "optional" | undefined;
|