@baukit/data-contracts 0.10.19 → 0.10.21

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/README.md CHANGED
@@ -72,6 +72,22 @@ with `trimmedUnicodeScalarCount(value)`, and replace a `JSON.stringify` plus `Te
72
72
  with `compactJsonUtf8Bytes(value)`. Unlike raw `JSON.stringify`, the helper rejects values that JSON
73
73
  would omit or replace with `null`.
74
74
 
75
+ `checkRange(measured: number, minimum: number, maximum: number): LimitRange` checks inclusive
76
+ bounds and returns `{ measured, minimum, maximum }`. Values below the minimum or above the
77
+ maximum throw `LimitOutOfRangeError` with those fields. All arguments must be non-negative safe
78
+ integers. Inverted bounds throw `RangeError`. Zero and equal bounds are valid.
79
+
80
+ ```ts
81
+ import { checkRange, enforceLimit } from '@baukit/data-contracts/limits';
82
+
83
+ enforceLimit('intervalSeconds', 'out_of_range', () => checkRange(3600, 3600, 2678400));
84
+ ```
85
+
86
+ `enforceLimit` maps `LimitOutOfRangeError` to `LimitRangeError`, a subclass of `LimitError`.
87
+ It carries `reason: 'out_of_range'`, `field`, `measured`, `minimum`, and `maximum`. Its inherited
88
+ `allowed` equals `maximum` for callers that already read maximum limit errors. Invalid arguments
89
+ and inverted bounds remain `RangeError` and pass through without becoming policy rejections.
90
+
75
91
  ### Limits policy files
76
92
 
77
93
  `parseLimitsPolicy(value, schema)` validates a product's limits policy file, such as the
@@ -79,10 +95,28 @@ would omit or replace with `null`.
79
95
  section. The parser requires a string `$comment`, the exact version, the exact section and key sets,
80
96
  and positive safe integers. Keys listed in `allowZero` as `section.key` also accept zero. Any other
81
97
  shape throws `LimitsPolicyError`, whose message names the failing path but never a value. Pass the
82
- schema `as const` so the result type has one `number` property per declared key.
98
+ schema `as const` so the result type follows the declared keys. Add range paths to `rangeKeys`
99
+ as `section.key`. Those entries contain exactly `{ minimum, maximum }`, with non-negative safe
100
+ integer bounds and `minimum <= maximum`. A range key cannot also appear in `allowZero`.
101
+
102
+ ```ts
103
+ const schema = {
104
+ version: 1,
105
+ sections: { text: ['max_characters'], ranges: ['interval_seconds'] },
106
+ rangeKeys: ['ranges.interval_seconds'],
107
+ } as const;
108
+ const policy = parseLimitsPolicy({
109
+ $comment: 'Reviewed limits.',
110
+ version: 1,
111
+ text: { max_characters: 200 },
112
+ ranges: { interval_seconds: { minimum: 3600, maximum: 2678400 } },
113
+ }, schema);
114
+ // policy.ranges.interval_seconds has minimum and maximum number properties.
115
+ ```
83
116
 
84
- `enforceLimit(field, reason, check)` runs one check and turns `LimitExceededError` into
85
- `LimitError`, which carries `reason`, `field`, `measured`, and `allowed`. Other errors pass through.
117
+ `enforceLimit(field, reason, check)` maps `LimitExceededError` into `LimitError`, which carries
118
+ `reason`, `field`, `measured`, and `allowed`. It maps range failures to `LimitRangeError` as
119
+ described above. Other errors pass through.
86
120
 
87
121
  ```ts
88
122
  import { checkTrimmedUnicodeScalars, enforceLimit, parseLimitsPolicy } from '@baukit/data-contracts/limits';
package/dist/limits.d.ts CHANGED
@@ -7,6 +7,19 @@ export declare class LimitExceededError extends Error implements LimitMeasuremen
7
7
  readonly allowed: number;
8
8
  constructor(measured: number, allowed: number);
9
9
  }
10
+ export interface LimitBounds {
11
+ readonly minimum: number;
12
+ readonly maximum: number;
13
+ }
14
+ export interface LimitRange extends LimitBounds {
15
+ readonly measured: number;
16
+ }
17
+ export declare class LimitOutOfRangeError extends Error implements LimitRange {
18
+ readonly measured: number;
19
+ readonly minimum: number;
20
+ readonly maximum: number;
21
+ constructor(measured: number, minimum: number, maximum: number);
22
+ }
10
23
  export type ResourceMeasurementErrorCode = 'invalid_unicode' | 'unsupported_json_value' | 'non_finite_json_number' | 'circular_json_value';
11
24
  export declare class ResourceMeasurementError extends TypeError {
12
25
  readonly code: ResourceMeasurementErrorCode;
@@ -17,6 +30,7 @@ export declare function compactJsonUtf8Bytes(value: unknown): number;
17
30
  export declare function byteLength(value: Uint8Array): number;
18
31
  export declare function collectionLength(value: readonly unknown[]): number;
19
32
  export declare function checkMeasurement(measured: number, allowed: number): LimitMeasurement;
33
+ export declare function checkRange(measured: number, minimum: number, maximum: number): LimitRange;
20
34
  export declare function checkTrimmedUnicodeScalars(value: string, allowed: number): LimitMeasurement;
21
35
  export declare function checkCompactJsonUtf8Bytes(value: unknown, allowed: number): LimitMeasurement;
22
36
  export declare function checkBytes(value: Uint8Array, allowed: number): LimitMeasurement;
@@ -25,12 +39,18 @@ export interface LimitsPolicySchema {
25
39
  readonly version: number;
26
40
  readonly sections: Readonly<Record<string, readonly string[]>>;
27
41
  readonly allowZero?: readonly string[];
42
+ readonly rangeKeys?: readonly string[];
28
43
  }
44
+ type PolicyValue<Schema extends LimitsPolicySchema, Path extends string> = Schema extends {
45
+ readonly rangeKeys: readonly (infer RangePath)[];
46
+ } ? Path extends RangePath ? LimitBounds : number : number;
29
47
  export type LimitsPolicy<Schema extends LimitsPolicySchema> = {
30
48
  readonly $comment: string;
31
49
  readonly version: number;
32
50
  } & {
33
- readonly [Section in keyof Schema['sections']]: Readonly<Record<Schema['sections'][Section][number], number>>;
51
+ readonly [Section in keyof Schema['sections']]: {
52
+ readonly [Key in Schema['sections'][Section][number]]: PolicyValue<Schema, `${Section & string}.${Key}`>;
53
+ };
34
54
  };
35
55
  export declare class LimitsPolicyError extends Error {
36
56
  constructor(message: string);
@@ -42,6 +62,12 @@ export declare class LimitError<Reason extends string = string> extends Error im
42
62
  readonly allowed: number;
43
63
  constructor(reason: Reason, field: string, measurement: LimitMeasurement);
44
64
  }
65
+ export declare class LimitRangeError extends LimitError<'out_of_range'> implements LimitRange {
66
+ readonly minimum: number;
67
+ readonly maximum: number;
68
+ constructor(field: string, measurement: LimitRange);
69
+ }
45
70
  export declare function parseLimitsPolicy<const Schema extends LimitsPolicySchema>(value: unknown, schema: Schema): LimitsPolicy<Schema>;
46
- export declare function enforceLimit(field: string, reason: string, check: () => LimitMeasurement): LimitMeasurement;
71
+ export declare function enforceLimit<Measurement extends LimitMeasurement | LimitRange>(field: string, reason: string, check: () => Measurement): Measurement;
72
+ export {};
47
73
  //# sourceMappingURL=limits.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"limits.d.ts","sourceRoot":"","sources":["../src/limits.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"limits.d.ts","sourceRoot":"","sources":["../src/limits.ts"],"names":[],"mappings":"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"}
package/dist/limits.js CHANGED
@@ -8,6 +8,18 @@ export class LimitExceededError extends Error {
8
8
  this.allowed = allowed;
9
9
  }
10
10
  }
11
+ export class LimitOutOfRangeError extends Error {
12
+ measured;
13
+ minimum;
14
+ maximum;
15
+ constructor(measured, minimum, maximum) {
16
+ super(`Measured ${String(measured)} is outside ${String(minimum)}..=${String(maximum)}`);
17
+ this.name = 'LimitOutOfRangeError';
18
+ this.measured = measured;
19
+ this.minimum = minimum;
20
+ this.maximum = maximum;
21
+ }
22
+ }
11
23
  export class ResourceMeasurementError extends TypeError {
12
24
  code;
13
25
  constructor(code) {
@@ -51,6 +63,17 @@ export function checkMeasurement(measured, allowed) {
51
63
  throw new LimitExceededError(measured, allowed);
52
64
  return { measured, allowed };
53
65
  }
66
+ export function checkRange(measured, minimum, maximum) {
67
+ assertNonNegativeSafeInteger(measured, 'measured');
68
+ assertNonNegativeSafeInteger(minimum, 'minimum');
69
+ assertNonNegativeSafeInteger(maximum, 'maximum');
70
+ if (minimum > maximum)
71
+ throw new RangeError('minimum must not exceed maximum');
72
+ if (measured < minimum || measured > maximum) {
73
+ throw new LimitOutOfRangeError(measured, minimum, maximum);
74
+ }
75
+ return { measured, minimum, maximum };
76
+ }
54
77
  export function checkTrimmedUnicodeScalars(value, allowed) {
55
78
  return checkMeasurement(trimmedUnicodeScalarCount(value), allowed);
56
79
  }
@@ -83,6 +106,16 @@ export class LimitError extends Error {
83
106
  this.allowed = measurement.allowed;
84
107
  }
85
108
  }
109
+ export class LimitRangeError extends LimitError {
110
+ minimum;
111
+ maximum;
112
+ constructor(field, measurement) {
113
+ super('out_of_range', field, { measured: measurement.measured, allowed: measurement.maximum });
114
+ this.name = 'LimitRangeError';
115
+ this.minimum = measurement.minimum;
116
+ this.maximum = measurement.maximum;
117
+ }
118
+ }
86
119
  const POLICY_ROOT = 'limits';
87
120
  const RESERVED_POLICY_KEYS = ['$comment', 'version'];
88
121
  export function parseLimitsPolicy(value, schema) {
@@ -96,8 +129,9 @@ export function parseLimitsPolicy(value, schema) {
96
129
  throw new LimitsPolicyError(`Unsupported limits policy version ${String(policy['version'])}`);
97
130
  }
98
131
  const allowZero = new Set(schema.allowZero ?? []);
132
+ const rangeKeys = new Set(schema.rangeKeys ?? []);
99
133
  for (const [section, keys] of Object.entries(schema.sections)) {
100
- checkPolicySection(policy, section, keys, allowZero);
134
+ checkPolicySection(policy, section, keys, allowZero, rangeKeys);
101
135
  }
102
136
  return policy;
103
137
  }
@@ -108,6 +142,8 @@ export function enforceLimit(field, reason, check) {
108
142
  catch (error) {
109
143
  if (error instanceof LimitExceededError)
110
144
  throw new LimitError(reason, field, error);
145
+ if (error instanceof LimitOutOfRangeError)
146
+ throw new LimitRangeError(field, error);
111
147
  throw error;
112
148
  }
113
149
  }
@@ -124,12 +160,23 @@ function assertPolicySchema(schema) {
124
160
  if (!known.has(path))
125
161
  throw new TypeError(`Limits policy allowZero names unknown ${path}`);
126
162
  }
163
+ for (const path of schema.rangeKeys ?? []) {
164
+ if (!known.has(path))
165
+ throw new TypeError(`Limits policy rangeKeys names unknown ${path}`);
166
+ if (schema.allowZero?.includes(path)) {
167
+ throw new TypeError(`Limits policy range key ${path} cannot also use allowZero`);
168
+ }
169
+ }
127
170
  }
128
- function checkPolicySection(policy, section, keys, allowZero) {
171
+ function checkPolicySection(policy, section, keys, allowZero, rangeKeys) {
129
172
  const path = `${POLICY_ROOT}.${section}`;
130
173
  const values = expectPolicyObject(policy[section], path);
131
174
  expectExactKeys(values, keys, path);
132
175
  for (const key of keys) {
176
+ if (rangeKeys.has(`${section}.${key}`)) {
177
+ checkPolicyRange(values[key], `${path}.${key}`);
178
+ continue;
179
+ }
133
180
  const minimum = allowZero.has(`${section}.${key}`) ? 0 : 1;
134
181
  const limit = values[key];
135
182
  if (typeof limit !== 'number' || !Number.isSafeInteger(limit) || limit < minimum) {
@@ -138,6 +185,19 @@ function checkPolicySection(policy, section, keys, allowZero) {
138
185
  }
139
186
  }
140
187
  }
188
+ function checkPolicyRange(value, path) {
189
+ const bounds = expectPolicyObject(value, path);
190
+ expectExactKeys(bounds, ['minimum', 'maximum'], path);
191
+ for (const key of ['minimum', 'maximum']) {
192
+ const bound = bounds[key];
193
+ if (typeof bound !== 'number' || !Number.isSafeInteger(bound) || bound < 0) {
194
+ throw new LimitsPolicyError(`${path}.${key} must be a non-negative integer`);
195
+ }
196
+ }
197
+ if (Number(bounds['minimum']) > Number(bounds['maximum'])) {
198
+ throw new LimitsPolicyError(`${path}.minimum must not exceed maximum`);
199
+ }
200
+ }
141
201
  function expectPolicyObject(value, path) {
142
202
  if (typeof value !== 'object' || value === null || Array.isArray(value)) {
143
203
  throw new LimitsPolicyError(`${path} must be an object`);
@@ -1 +1 @@
1
- {"version":3,"file":"limits.js","sourceRoot":"","sources":["../src/limits.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"limits.js","sourceRoot":"","sources":["../src/limits.ts"],"names":[],"mappings":"AAKA,MAAM,OAAO,kBAAmB,SAAQ,KAAK;IAClC,QAAQ,CAAS;IACjB,OAAO,CAAS;IAEzB,YAAY,QAAgB,EAAE,OAAe;QAC3C,KAAK,CAAC,YAAY,MAAM,CAAC,QAAQ,CAAC,oBAAoB,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACzE,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC;QACjC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;CACF;AAWD,MAAM,OAAO,oBAAqB,SAAQ,KAAK;IACpC,QAAQ,CAAS;IACjB,OAAO,CAAS;IAChB,OAAO,CAAS;IAEzB,YAAY,QAAgB,EAAE,OAAe,EAAE,OAAe;QAC5D,KAAK,CAAC,YAAY,MAAM,CAAC,QAAQ,CAAC,eAAe,MAAM,CAAC,OAAO,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACzF,IAAI,CAAC,IAAI,GAAG,sBAAsB,CAAC;QACnC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;CACF;AAKD,MAAM,OAAO,wBAAyB,SAAQ,SAAS;IAC5C,IAAI,CAA+B;IAE5C,YAAY,IAAkC;QAC5C,KAAK,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC,CAAC;QACxC,IAAI,CAAC,IAAI,GAAG,0BAA0B,CAAC;QACvC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;CACF;AAED,MAAM,UAAU,yBAAyB,CAAC,KAAa;IACrD,MAAM,OAAO,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IACtC,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,OAAO,KAAK,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;QAC9B,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,MAAM,KAAK,SAAS,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC;YAAE,MAAM;QAChE,KAAK,IAAI,CAAC,CAAC;IACb,CAAC;IAED,IAAI,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC;IAC1B,OAAO,IAAI,GAAG,KAAK,EAAE,CAAC;QACpB,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;QACjC,IAAI,MAAM,KAAK,SAAS,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC;YAAE,MAAM;QAChE,IAAI,IAAI,CAAC,CAAC;IACZ,CAAC;IACD,OAAO,IAAI,GAAG,KAAK,CAAC;AACtB,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,KAAc;IACjD,eAAe,CAAC,KAAK,EAAE,IAAI,OAAO,EAAE,CAAC,CAAC;IACtC,OAAO,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,KAAiB;IAC1C,OAAO,KAAK,CAAC,UAAU,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAAyB;IACxD,OAAO,KAAK,CAAC,MAAM,CAAC;AACtB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,QAAgB,EAAE,OAAe;IAChE,4BAA4B,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IACnD,4BAA4B,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IACjD,IAAI,QAAQ,GAAG,OAAO;QAAE,MAAM,IAAI,kBAAkB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACxE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,QAAgB,EAAE,OAAe,EAAE,OAAe;IAC3E,4BAA4B,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IACnD,4BAA4B,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IACjD,4BAA4B,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IACjD,IAAI,OAAO,GAAG,OAAO;QAAE,MAAM,IAAI,UAAU,CAAC,iCAAiC,CAAC,CAAC;IAC/E,IAAI,QAAQ,GAAG,OAAO,IAAI,QAAQ,GAAG,OAAO,EAAE,CAAC;QAC7C,MAAM,IAAI,oBAAoB,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,KAAa,EAAE,OAAe;IACvE,OAAO,gBAAgB,CAAC,yBAAyB,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;AACrE,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,KAAc,EAAE,OAAe;IACvE,OAAO,gBAAgB,CAAC,oBAAoB,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;AAChE,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,KAAiB,EAAE,OAAe;IAC3D,OAAO,gBAAgB,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;AACtD,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,KAAyB,EAAE,OAAe;IACxE,OAAO,gBAAgB,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;AAC5D,CAAC;AA6BD,MAAM,OAAO,iBAAkB,SAAQ,KAAK;IAC1C,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;IAClC,CAAC;CACF;AAED,MAAM,OAAO,UAA2C,SAAQ,KAAK;IAC1D,MAAM,CAAS;IACf,KAAK,CAAS;IACd,QAAQ,CAAS;IACjB,OAAO,CAAS;IAEzB,YAAY,MAAc,EAAE,KAAa,EAAE,WAA6B;QACtE,KAAK,CAAC,sBAAsB,KAAK,KAAK,MAAM,EAAE,CAAC,CAAC;QAChD,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC;QACrC,IAAI,CAAC,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC;IACrC,CAAC;CACF;AAED,MAAM,OAAO,eAAgB,SAAQ,UAA0B;IACpD,OAAO,CAAS;IAChB,OAAO,CAAS;IAEzB,YAAY,KAAa,EAAE,WAAuB;QAChD,KAAK,CAAC,cAAc,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,WAAW,CAAC,QAAQ,EAAE,OAAO,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC;QAC/F,IAAI,CAAC,IAAI,GAAG,iBAAiB,CAAC;QAC9B,IAAI,CAAC,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC;QACnC,IAAI,CAAC,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC;IACrC,CAAC;CACF;AAED,MAAM,WAAW,GAAG,QAAQ,CAAC;AAC7B,MAAM,oBAAoB,GAAsB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;AAExE,MAAM,UAAU,iBAAiB,CAC/B,KAAc,EACd,MAAc;IAEd,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAC3B,MAAM,MAAM,GAAG,kBAAkB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;IACtD,eAAe,CAAC,MAAM,EAAE,CAAC,GAAG,oBAAoB,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;IACjG,IAAI,OAAO,MAAM,CAAC,UAAU,CAAC,KAAK,QAAQ,EAAE,CAAC;QAC3C,MAAM,IAAI,iBAAiB,CAAC,GAAG,WAAW,4BAA4B,CAAC,CAAC;IAC1E,CAAC;IACD,IAAI,MAAM,CAAC,SAAS,CAAC,KAAK,MAAM,CAAC,OAAO,EAAE,CAAC;QACzC,MAAM,IAAI,iBAAiB,CAAC,qCAAqC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC;IAChG,CAAC;IACD,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;IAClD,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;IAClD,KAAK,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC9D,kBAAkB,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IAClE,CAAC;IACD,OAAO,MAA8B,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,YAAY,CAC1B,KAAa,EACb,MAAc,EACd,KAAwB;IAExB,IAAI,CAAC;QACH,OAAO,KAAK,EAAE,CAAC;IACjB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,kBAAkB;YAAE,MAAM,IAAI,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QACpF,IAAI,KAAK,YAAY,oBAAoB;YAAE,MAAM,IAAI,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACnF,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,kBAAkB,CAAC,MAA0B;IACpD,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;IAChC,KAAK,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC9D,IAAI,oBAAoB,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3C,MAAM,IAAI,SAAS,CAAC,yBAAyB,OAAO,cAAc,CAAC,CAAC;QACtE,CAAC;QACD,KAAK,MAAM,GAAG,IAAI,IAAI;YAAE,KAAK,CAAC,GAAG,CAAC,GAAG,OAAO,IAAI,GAAG,EAAE,CAAC,CAAC;IACzD,CAAC;IACD,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,SAAS,IAAI,EAAE,EAAE,CAAC;QAC1C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,MAAM,IAAI,SAAS,CAAC,yCAAyC,IAAI,EAAE,CAAC,CAAC;IAC7F,CAAC;IACD,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,SAAS,IAAI,EAAE,EAAE,CAAC;QAC1C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,MAAM,IAAI,SAAS,CAAC,yCAAyC,IAAI,EAAE,CAAC,CAAC;QAC3F,IAAI,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACrC,MAAM,IAAI,SAAS,CAAC,2BAA2B,IAAI,4BAA4B,CAAC,CAAC;QACnF,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,kBAAkB,CACzB,MAA+B,EAC/B,OAAe,EACf,IAAuB,EACvB,SAA8B,EAC9B,SAA8B;IAE9B,MAAM,IAAI,GAAG,GAAG,WAAW,IAAI,OAAO,EAAE,CAAC;IACzC,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC;IACzD,eAAe,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACpC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,SAAS,CAAC,GAAG,CAAC,GAAG,OAAO,IAAI,GAAG,EAAE,CAAC,EAAE,CAAC;YACvC,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,IAAI,GAAG,EAAE,CAAC,CAAC;YAChD,SAAS;QACX,CAAC;QACD,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,OAAO,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3D,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,OAAO,EAAE,CAAC;YACjF,MAAM,QAAQ,GAAG,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,oBAAoB,CAAC;YACjF,MAAM,IAAI,iBAAiB,CAAC,GAAG,IAAI,IAAI,GAAG,YAAY,QAAQ,EAAE,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAc,EAAE,IAAY;IACpD,MAAM,MAAM,GAAG,kBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC/C,eAAe,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,IAAI,CAAC,CAAC;IACtD,KAAK,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC;QACzC,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;YAC3E,MAAM,IAAI,iBAAiB,CAAC,GAAG,IAAI,IAAI,GAAG,iCAAiC,CAAC,CAAC;QAC/E,CAAC;IACH,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;QAC1D,MAAM,IAAI,iBAAiB,CAAC,GAAG,IAAI,kCAAkC,CAAC,CAAC;IACzE,CAAC;AACH,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAc,EAAE,IAAY;IACtD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACxE,MAAM,IAAI,iBAAiB,CAAC,GAAG,IAAI,oBAAoB,CAAC,CAAC;IAC3D,CAAC;IACD,OAAO,KAAgC,CAAC;AAC1C,CAAC;AAED,SAAS,eAAe,CACtB,KAA8B,EAC9B,QAA2B,EAC3B,IAAY;IAEZ,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;IACzC,MAAM,MAAM,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC;IACpC,IAAI,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,KAAK,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QAC1F,MAAM,IAAI,iBAAiB,CAAC,GAAG,IAAI,gCAAgC,CAAC,CAAC;IACvE,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,KAAa;IACnC,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACrD,MAAM,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACtC,IAAI,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3B,MAAM,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;YAC3C,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;gBAAE,MAAM,IAAI,wBAAwB,CAAC,iBAAiB,CAAC,CAAC;YACnF,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,GAAG,MAAM,CAAC,GAAG,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC;YACnE,KAAK,IAAI,CAAC,CAAC;YACX,SAAS;QACX,CAAC;QACD,IAAI,cAAc,CAAC,KAAK,CAAC;YAAE,MAAM,IAAI,wBAAwB,CAAC,iBAAiB,CAAC,CAAC;QACjF,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACtB,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,eAAe,CAAC,KAAa;IACpC,OAAO,KAAK,IAAI,MAAM,IAAI,KAAK,IAAI,MAAM,CAAC;AAC5C,CAAC;AAED,SAAS,cAAc,CAAC,KAAa;IACnC,OAAO,KAAK,IAAI,MAAM,IAAI,KAAK,IAAI,MAAM,CAAC;AAC5C,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAa;IACxC,OAAO,CACL,CAAC,KAAK,IAAI,MAAM,IAAI,KAAK,IAAI,MAAM,CAAC;QACpC,KAAK,KAAK,MAAM;QAChB,KAAK,KAAK,MAAM;QAChB,KAAK,KAAK,MAAM;QAChB,KAAK,KAAK,MAAM;QAChB,CAAC,KAAK,IAAI,MAAM,IAAI,KAAK,IAAI,MAAM,CAAC;QACpC,KAAK,KAAK,MAAM;QAChB,KAAK,KAAK,MAAM;QAChB,KAAK,KAAK,MAAM;QAChB,KAAK,KAAK,MAAM;QAChB,KAAK,KAAK,MAAM,CACjB,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,KAAc,EAAE,SAA0B;IACjE,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,SAAS;QAAE,OAAO;IACzD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,cAAc,CAAC,KAAK,CAAC,CAAC;QACtB,OAAO;IACT,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAC5B,MAAM,IAAI,wBAAwB,CAAC,wBAAwB,CAAC,CAAC;QAC/D,CAAC;QACD,OAAO;IACT,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,MAAM,IAAI,wBAAwB,CAAC,wBAAwB,CAAC,CAAC;IAC/D,CAAC;IACD,IAAI,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,wBAAwB,CAAC,qBAAqB,CAAC,CAAC;IAEpF,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACrB,IAAI,CAAC;QACH,IAAI,MAAM,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnD,MAAM,IAAI,wBAAwB,CAAC,wBAAwB,CAAC,CAAC;QAC/D,CAAC;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;gBACrD,MAAM,UAAU,GAAG,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;gBACjE,IAAI,UAAU,KAAK,SAAS,IAAI,CAAC,CAAC,OAAO,IAAI,UAAU,CAAC,EAAE,CAAC;oBACzD,MAAM,IAAI,wBAAwB,CAAC,wBAAwB,CAAC,CAAC;gBAC/D,CAAC;gBACD,eAAe,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;YAC/C,CAAC;YACD,OAAO;QACT,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,CAAC,cAAc,CAAC,KAAK,CAAkB,CAAC;QAChE,IAAI,SAAS,KAAK,MAAM,CAAC,SAAS,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;YACzD,MAAM,IAAI,wBAAwB,CAAC,wBAAwB,CAAC,CAAC;QAC/D,CAAC;QACD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YACrC,cAAc,CAAC,GAAG,CAAC,CAAC;YACpB,MAAM,UAAU,GAAG,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YAC/D,IAAI,UAAU,KAAK,SAAS,IAAI,CAAC,CAAC,OAAO,IAAI,UAAU,CAAC,EAAE,CAAC;gBACzD,MAAM,IAAI,wBAAwB,CAAC,wBAAwB,CAAC,CAAC;YAC/D,CAAC;YACD,eAAe,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;YAAS,CAAC;QACT,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,KAAa;IACnC,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,KAAK,MAAM,MAAM,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;QAC3C,IAAI,MAAM,IAAI,IAAI;YAAE,MAAM,IAAI,CAAC,CAAC;aAC3B,IAAI,MAAM,IAAI,KAAK;YAAE,MAAM,IAAI,CAAC,CAAC;aACjC,IAAI,MAAM,IAAI,MAAM;YAAE,MAAM,IAAI,CAAC,CAAC;;YAClC,MAAM,IAAI,CAAC,CAAC;IACnB,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,4BAA4B,CAAC,KAAa,EAAE,IAAY;IAC/D,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;QAC9C,MAAM,IAAI,UAAU,CAAC,GAAG,IAAI,sCAAsC,CAAC,CAAC;IACtE,CAAC;AACH,CAAC;AAED,SAAS,0BAA0B,CAAC,IAAkC;IACpE,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,iBAAiB;YACpB,OAAO,kDAAkD,CAAC;QAC5D,KAAK,wBAAwB;YAC3B,OAAO,wDAAwD,CAAC;QAClE,KAAK,wBAAwB;YAC3B,OAAO,kDAAkD,CAAC;QAC5D,KAAK,qBAAqB;YACxB,OAAO,2DAA2D,CAAC;IACvE,CAAC;AACH,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@baukit/data-contracts",
3
- "version": "0.10.19",
3
+ "version": "0.10.21",
4
4
  "description": "Runtime-neutral data contracts, measurement helpers, and executable adapter conformance tests.",
5
5
  "license": "MIT",
6
6
  "author": "Patrick Koss",
@@ -1,10 +1,14 @@
1
1
  import { describe, expect, expectTypeOf, it } from 'vitest';
2
2
 
3
+ import fixtureCorpus from '../../../../fixtures/limits/resource-budget-measurements-v1.json' with { type: 'json' };
4
+
3
5
  import {
4
6
  LimitError,
5
7
  LimitExceededError,
8
+ LimitRangeError,
6
9
  LimitsPolicyError,
7
10
  checkMeasurement,
11
+ checkRange,
8
12
  checkTrimmedUnicodeScalars,
9
13
  enforceLimit,
10
14
  parseLimitsPolicy,
@@ -27,6 +31,33 @@ const policy = {
27
31
  };
28
32
 
29
33
  describe('parseLimitsPolicy', () => {
34
+ const rangeSchema = {
35
+ ...schema,
36
+ sections: { ...schema.sections, ranges: ['interval_seconds'] },
37
+ rangeKeys: ['ranges.interval_seconds'],
38
+ } as const;
39
+
40
+ it.each(fixtureCorpus.range_policies)('validates range policy: $name', ({ bounds, valid }) => {
41
+ const value = { ...policy, ranges: { interval_seconds: bounds } };
42
+ if (!valid) {
43
+ expect(() => parseLimitsPolicy(value, rangeSchema)).toThrow(LimitsPolicyError);
44
+ return;
45
+ }
46
+ const parsed = parseLimitsPolicy(value, rangeSchema);
47
+ expect(parsed.ranges.interval_seconds).toEqual(bounds);
48
+ expectTypeOf(parsed.ranges.interval_seconds.minimum).toEqualTypeOf<number>();
49
+ expectTypeOf(parsed.text.max_characters).toEqualTypeOf<number>();
50
+ });
51
+
52
+ it('rejects unknown range keys and allowZero on a range', () => {
53
+ expect(() => parseLimitsPolicy(policy, { ...schema, rangeKeys: ['text.unknown'] })).toThrow(
54
+ TypeError,
55
+ );
56
+ expect(() =>
57
+ parseLimitsPolicy(policy, { ...schema, rangeKeys: ['transport.daily_budget'] }),
58
+ ).toThrow(TypeError);
59
+ });
60
+
30
61
  it('returns the policy typed by the schema', () => {
31
62
  const parsed = parseLimitsPolicy(policy, schema);
32
63
 
@@ -103,6 +134,38 @@ describe('parseLimitsPolicy', () => {
103
134
  });
104
135
 
105
136
  describe('enforceLimit', () => {
137
+ it('returns range measurements without losing their bounds', () => {
138
+ const result = enforceLimit('intervalSeconds', 'out_of_range', () =>
139
+ checkRange(3600, 3600, 2678400),
140
+ );
141
+ expect(result).toEqual({ measured: 3600, minimum: 3600, maximum: 2678400 });
142
+ expectTypeOf(result.minimum).toEqualTypeOf<number>();
143
+ });
144
+
145
+ it.each([3599, 2678401])('maps %s to out_of_range with both bounds', (measured) => {
146
+ let caught: unknown;
147
+ try {
148
+ enforceLimit('intervalSeconds', 'out_of_range', () => checkRange(measured, 3600, 2678400));
149
+ } catch (error) {
150
+ caught = error;
151
+ }
152
+ expect(caught).toBeInstanceOf(LimitError);
153
+ expect(caught).toBeInstanceOf(LimitRangeError);
154
+ expect(caught).toMatchObject({
155
+ reason: 'out_of_range',
156
+ field: 'intervalSeconds',
157
+ measured,
158
+ minimum: 3600,
159
+ maximum: 2678400,
160
+ });
161
+ });
162
+
163
+ it('passes inverted range failures through', () => {
164
+ expect(() =>
165
+ enforceLimit('intervalSeconds', 'out_of_range', () => checkRange(1, 10, 0)),
166
+ ).toThrow(RangeError);
167
+ });
168
+
106
169
  it('returns the measurement when the value fits', () => {
107
170
  expect(
108
171
  enforceLimit('title', 'text_too_long', () => checkTrimmedUnicodeScalars(' ab ', 2)),
@@ -4,12 +4,14 @@ import fixtureCorpus from '../../../../fixtures/limits/resource-budget-measureme
4
4
 
5
5
  import {
6
6
  LimitExceededError,
7
+ LimitOutOfRangeError,
7
8
  ResourceMeasurementError,
8
9
  byteLength,
9
10
  checkBytes,
10
11
  checkCollection,
11
12
  checkCompactJsonUtf8Bytes,
12
13
  checkMeasurement,
14
+ checkRange,
13
15
  checkTrimmedUnicodeScalars,
14
16
  collectionLength,
15
17
  compactJsonUtf8Bytes,
@@ -43,6 +45,45 @@ interface FixtureCorpus {
43
45
 
44
46
  const fixtures = fixtureCorpus as FixtureCorpus;
45
47
 
48
+ describe('whole-number ranges', () => {
49
+ it.each(fixtureCorpus.ranges)('$name', ({ measured, minimum, maximum, outcome }) => {
50
+ if (outcome === 'ok') {
51
+ expect(checkRange(measured, minimum, maximum)).toEqual({ measured, minimum, maximum });
52
+ return;
53
+ }
54
+ if (outcome === 'invalid_bounds') {
55
+ expect(() => checkRange(measured, minimum, maximum)).toThrow(RangeError);
56
+ expect(() => checkRange(measured, minimum, maximum)).toThrow(
57
+ 'minimum must not exceed maximum',
58
+ );
59
+ return;
60
+ }
61
+ expect(outcome).toBe('out_of_range');
62
+ try {
63
+ checkRange(measured, minimum, maximum);
64
+ } catch (error) {
65
+ expect(error).toBeInstanceOf(LimitOutOfRangeError);
66
+ expect(error).toMatchObject({ measured, minimum, maximum });
67
+ return;
68
+ }
69
+ throw new Error('Expected LimitOutOfRangeError');
70
+ });
71
+
72
+ it('rejects invalid whole-number arguments', () => {
73
+ for (const value of [
74
+ -1,
75
+ 0.5,
76
+ Number.NaN,
77
+ Number.POSITIVE_INFINITY,
78
+ Number.MAX_SAFE_INTEGER + 1,
79
+ ]) {
80
+ expect(() => checkRange(value, 0, 10)).toThrow(RangeError);
81
+ expect(() => checkRange(1, value, 10)).toThrow(RangeError);
82
+ expect(() => checkRange(1, 0, value)).toThrow(RangeError);
83
+ }
84
+ });
85
+ });
86
+
46
87
  describe('resource-budget measurements', () => {
47
88
  it('counts ASCII, composed, decomposed, and joined emoji scalars', () => {
48
89
  expect(trimmedUnicodeScalarCount(' plain ')).toBe(5);
package/src/limits.ts CHANGED
@@ -15,6 +15,29 @@ export class LimitExceededError extends Error implements LimitMeasurement {
15
15
  }
16
16
  }
17
17
 
18
+ export interface LimitBounds {
19
+ readonly minimum: number;
20
+ readonly maximum: number;
21
+ }
22
+
23
+ export interface LimitRange extends LimitBounds {
24
+ readonly measured: number;
25
+ }
26
+
27
+ export class LimitOutOfRangeError extends Error implements LimitRange {
28
+ readonly measured: number;
29
+ readonly minimum: number;
30
+ readonly maximum: number;
31
+
32
+ constructor(measured: number, minimum: number, maximum: number) {
33
+ super(`Measured ${String(measured)} is outside ${String(minimum)}..=${String(maximum)}`);
34
+ this.name = 'LimitOutOfRangeError';
35
+ this.measured = measured;
36
+ this.minimum = minimum;
37
+ this.maximum = maximum;
38
+ }
39
+ }
40
+
18
41
  export type ResourceMeasurementErrorCode =
19
42
  'invalid_unicode' | 'unsupported_json_value' | 'non_finite_json_number' | 'circular_json_value';
20
43
 
@@ -66,6 +89,17 @@ export function checkMeasurement(measured: number, allowed: number): LimitMeasur
66
89
  return { measured, allowed };
67
90
  }
68
91
 
92
+ export function checkRange(measured: number, minimum: number, maximum: number): LimitRange {
93
+ assertNonNegativeSafeInteger(measured, 'measured');
94
+ assertNonNegativeSafeInteger(minimum, 'minimum');
95
+ assertNonNegativeSafeInteger(maximum, 'maximum');
96
+ if (minimum > maximum) throw new RangeError('minimum must not exceed maximum');
97
+ if (measured < minimum || measured > maximum) {
98
+ throw new LimitOutOfRangeError(measured, minimum, maximum);
99
+ }
100
+ return { measured, minimum, maximum };
101
+ }
102
+
69
103
  export function checkTrimmedUnicodeScalars(value: string, allowed: number): LimitMeasurement {
70
104
  return checkMeasurement(trimmedUnicodeScalarCount(value), allowed);
71
105
  }
@@ -86,15 +120,27 @@ export interface LimitsPolicySchema {
86
120
  readonly version: number;
87
121
  readonly sections: Readonly<Record<string, readonly string[]>>;
88
122
  readonly allowZero?: readonly string[];
123
+ readonly rangeKeys?: readonly string[];
89
124
  }
90
125
 
126
+ type PolicyValue<Schema extends LimitsPolicySchema, Path extends string> = Schema extends {
127
+ readonly rangeKeys: readonly (infer RangePath)[];
128
+ }
129
+ ? Path extends RangePath
130
+ ? LimitBounds
131
+ : number
132
+ : number;
133
+
91
134
  export type LimitsPolicy<Schema extends LimitsPolicySchema> = {
92
135
  readonly $comment: string;
93
136
  readonly version: number;
94
137
  } & {
95
- readonly [Section in keyof Schema['sections']]: Readonly<
96
- Record<Schema['sections'][Section][number], number>
97
- >;
138
+ readonly [Section in keyof Schema['sections']]: {
139
+ readonly [Key in Schema['sections'][Section][number]]: PolicyValue<
140
+ Schema,
141
+ `${Section & string}.${Key}`
142
+ >;
143
+ };
98
144
  };
99
145
 
100
146
  export class LimitsPolicyError extends Error {
@@ -120,6 +166,18 @@ export class LimitError<Reason extends string = string> extends Error implements
120
166
  }
121
167
  }
122
168
 
169
+ export class LimitRangeError extends LimitError<'out_of_range'> implements LimitRange {
170
+ readonly minimum: number;
171
+ readonly maximum: number;
172
+
173
+ constructor(field: string, measurement: LimitRange) {
174
+ super('out_of_range', field, { measured: measurement.measured, allowed: measurement.maximum });
175
+ this.name = 'LimitRangeError';
176
+ this.minimum = measurement.minimum;
177
+ this.maximum = measurement.maximum;
178
+ }
179
+ }
180
+
123
181
  const POLICY_ROOT = 'limits';
124
182
  const RESERVED_POLICY_KEYS: readonly string[] = ['$comment', 'version'];
125
183
 
@@ -137,21 +195,23 @@ export function parseLimitsPolicy<const Schema extends LimitsPolicySchema>(
137
195
  throw new LimitsPolicyError(`Unsupported limits policy version ${String(policy['version'])}`);
138
196
  }
139
197
  const allowZero = new Set(schema.allowZero ?? []);
198
+ const rangeKeys = new Set(schema.rangeKeys ?? []);
140
199
  for (const [section, keys] of Object.entries(schema.sections)) {
141
- checkPolicySection(policy, section, keys, allowZero);
200
+ checkPolicySection(policy, section, keys, allowZero, rangeKeys);
142
201
  }
143
202
  return policy as LimitsPolicy<Schema>;
144
203
  }
145
204
 
146
- export function enforceLimit(
205
+ export function enforceLimit<Measurement extends LimitMeasurement | LimitRange>(
147
206
  field: string,
148
207
  reason: string,
149
- check: () => LimitMeasurement,
150
- ): LimitMeasurement {
208
+ check: () => Measurement,
209
+ ): Measurement {
151
210
  try {
152
211
  return check();
153
212
  } catch (error) {
154
213
  if (error instanceof LimitExceededError) throw new LimitError(reason, field, error);
214
+ if (error instanceof LimitOutOfRangeError) throw new LimitRangeError(field, error);
155
215
  throw error;
156
216
  }
157
217
  }
@@ -167,6 +227,12 @@ function assertPolicySchema(schema: LimitsPolicySchema): void {
167
227
  for (const path of schema.allowZero ?? []) {
168
228
  if (!known.has(path)) throw new TypeError(`Limits policy allowZero names unknown ${path}`);
169
229
  }
230
+ for (const path of schema.rangeKeys ?? []) {
231
+ if (!known.has(path)) throw new TypeError(`Limits policy rangeKeys names unknown ${path}`);
232
+ if (schema.allowZero?.includes(path)) {
233
+ throw new TypeError(`Limits policy range key ${path} cannot also use allowZero`);
234
+ }
235
+ }
170
236
  }
171
237
 
172
238
  function checkPolicySection(
@@ -174,11 +240,16 @@ function checkPolicySection(
174
240
  section: string,
175
241
  keys: readonly string[],
176
242
  allowZero: ReadonlySet<string>,
243
+ rangeKeys: ReadonlySet<string>,
177
244
  ): void {
178
245
  const path = `${POLICY_ROOT}.${section}`;
179
246
  const values = expectPolicyObject(policy[section], path);
180
247
  expectExactKeys(values, keys, path);
181
248
  for (const key of keys) {
249
+ if (rangeKeys.has(`${section}.${key}`)) {
250
+ checkPolicyRange(values[key], `${path}.${key}`);
251
+ continue;
252
+ }
182
253
  const minimum = allowZero.has(`${section}.${key}`) ? 0 : 1;
183
254
  const limit = values[key];
184
255
  if (typeof limit !== 'number' || !Number.isSafeInteger(limit) || limit < minimum) {
@@ -188,6 +259,20 @@ function checkPolicySection(
188
259
  }
189
260
  }
190
261
 
262
+ function checkPolicyRange(value: unknown, path: string): void {
263
+ const bounds = expectPolicyObject(value, path);
264
+ expectExactKeys(bounds, ['minimum', 'maximum'], path);
265
+ for (const key of ['minimum', 'maximum']) {
266
+ const bound = bounds[key];
267
+ if (typeof bound !== 'number' || !Number.isSafeInteger(bound) || bound < 0) {
268
+ throw new LimitsPolicyError(`${path}.${key} must be a non-negative integer`);
269
+ }
270
+ }
271
+ if (Number(bounds['minimum']) > Number(bounds['maximum'])) {
272
+ throw new LimitsPolicyError(`${path}.minimum must not exceed maximum`);
273
+ }
274
+ }
275
+
191
276
  function expectPolicyObject(value: unknown, path: string): Record<string, unknown> {
192
277
  if (typeof value !== 'object' || value === null || Array.isArray(value)) {
193
278
  throw new LimitsPolicyError(`${path} must be an object`);