typebox 1.3.3 → 1.3.4

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.
@@ -61,5 +61,5 @@ export declare function Keys(value: Record<PropertyKey, unknown>): string[];
61
61
  export declare function Symbols(value: Record<PropertyKey, unknown>): symbol[];
62
62
  /** Returns the property values for the given object via `Object.values()` */
63
63
  export declare function Values(value: Record<PropertyKey, unknown>): unknown[];
64
- /** Tests values for deep equality */
64
+ /** Returns true if left and right values are structurally equal */
65
65
  export declare function IsDeepEqual(left: unknown, right: unknown): boolean;
@@ -1,3 +1,4 @@
1
+ // deno-fmt-ignore-file
1
2
  import * as String from './string.mjs';
2
3
  // --------------------------------------------------------------------------
3
4
  // Guards
@@ -203,7 +204,9 @@ function DeepEqualArray(left, right) {
203
204
  return IsArray(right) && IsEqual(left.length, right.length) &&
204
205
  left.every((_, index) => IsDeepEqual(left[index], right[index]));
205
206
  }
206
- /** Tests values for deep equality */
207
+ /** Returns true if left and right values are structurally equal */
207
208
  export function IsDeepEqual(left, right) {
208
- return (IsArray(left) ? DeepEqualArray(left, right) : IsObject(left) ? DeepEqualObject(left, right) : IsEqual(left, right));
209
+ return (IsArray(left) ? DeepEqualArray(left, right) :
210
+ IsObject(left) ? DeepEqualObject(left, right) :
211
+ IsEqual(left, right));
209
212
  }
@@ -1,47 +1,66 @@
1
1
  // deno-fmt-ignore-file
2
- import * as Schema from '../types/index.mjs';
3
2
  import { Hashing } from '../../system/hashing/index.mjs';
4
3
  import { EmitGuard as E } from '../../guard/index.mjs';
5
4
  import { BuildSchema } from './schema.mjs';
6
- const functions = new Map();
5
+ const index = [0];
6
+ const names = new Map;
7
+ const funcs = new Map();
8
+ // ------------------------------------------------------------------
9
+ // CreateName
10
+ // ------------------------------------------------------------------
11
+ function NextName() {
12
+ return Hashing.Hash(index[0]++);
13
+ }
14
+ function CreateName(schema, href) {
15
+ if (!names.has(schema))
16
+ names.set(schema, new Map());
17
+ const hrefs = names.get(schema);
18
+ if (hrefs.has(href))
19
+ return hrefs.get(href);
20
+ const name = NextName();
21
+ hrefs.set(href, name);
22
+ return name;
23
+ }
7
24
  // ------------------------------------------------------------------
8
25
  // CreateCallExpression
9
26
  // ------------------------------------------------------------------
10
- function CreateCallExpression(context, _schema, hash, value) {
27
+ function CreateCallExpression(context, _schema, name, value) {
11
28
  return context.UseUnevaluated()
12
- ? E.Call(`check_${hash}`, ['context', value])
13
- : E.Call(`check_${hash}`, [value]);
29
+ ? E.Call(`check_${name}`, ['context', value])
30
+ : E.Call(`check_${name}`, [value]);
14
31
  }
15
32
  // ------------------------------------------------------------------
16
33
  // CreateFunctionExpression
17
34
  // ------------------------------------------------------------------
18
- function CreateFunctionExpression(stack, context, schema, hash) {
35
+ function CreateFunctionExpression(stack, context, schema, name) {
19
36
  const expression = BuildSchema(stack, context, schema, 'value');
20
37
  return context.UseUnevaluated()
21
- ? E.ConstDeclaration(`check_${hash}`, E.ArrowFunction(['context', 'value'], expression))
22
- : E.ConstDeclaration(`check_${hash}`, E.ArrowFunction(['value'], expression));
38
+ ? E.ConstDeclaration(`check_${name}`, E.ArrowFunction(['context', 'value'], expression))
39
+ : E.ConstDeclaration(`check_${name}`, E.ArrowFunction(['value'], expression));
23
40
  }
24
41
  // ------------------------------------------------------------------
25
42
  // ResetFunctions
26
43
  // ------------------------------------------------------------------
27
44
  export function ResetFunctions() {
28
- functions.clear();
45
+ index[0] = 0;
46
+ names.clear();
47
+ funcs.clear();
29
48
  }
30
49
  // ------------------------------------------------------------------
31
50
  // GetFunctions
32
51
  // ------------------------------------------------------------------
33
52
  export function GetFunctions() {
34
- return [...functions.values()];
53
+ return [...funcs.values()];
35
54
  }
36
55
  // ------------------------------------------------------------------
37
56
  // CreateFunction
38
57
  // ------------------------------------------------------------------
39
58
  export function CreateFunction(stack, context, schema, value) {
40
- const hash = Schema.IsSchemaObject(schema) ? Hashing.Hash({ __baseURL: stack.BaseURL().href, ...schema }) : Hashing.Hash(schema);
41
- const call = CreateCallExpression(context, schema, hash, value);
42
- if (functions.has(hash))
59
+ const name = CreateName(schema, stack.BaseURL().href);
60
+ const call = CreateCallExpression(context, schema, name, value);
61
+ if (funcs.has(name))
43
62
  return call;
44
- functions.set(hash, '');
45
- functions.set(hash, CreateFunctionExpression(stack, context, schema, hash));
63
+ funcs.set(name, '');
64
+ funcs.set(name, CreateFunctionExpression(stack, context, schema, name));
46
65
  return call;
47
66
  }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "typebox",
3
3
  "description": "Json Schema Type Builder with Static Type Resolution for TypeScript",
4
- "version": "1.3.3",
4
+ "version": "1.3.4",
5
5
  "keywords": [
6
6
  "typescript",
7
7
  "jsonschema"
package/readme.md CHANGED
@@ -111,27 +111,24 @@ type User = Type.Static<typeof User> // type User = {
111
111
 
112
112
  ## Script
113
113
 
114
- [Documentation](https://sinclairzx81.github.io/typebox/#/docs/script/overview) | [Example 1](https://www.typescriptlang.org/play/?target=99&module=7#code/JYWwDg9gTgLgBAFQJ5gKZwGZQiOByGFVAIwgA88AoSgehrgFonmXW32POv3b7k0AdAGUAxlGBgYACjwC5eAJS9G3VWvXdqdOADkAhiFQBnMHpGpKIiADsj8ALJ6YACzgBeREWFiJ0gAaUcHCEaHAAaqgiMNAATO5wAN5wZABccNYAriDEqFAANHBIaZnZuXAAvoHBROGR0VAAzPEAogBuegA2GU6oADwRUbFwAGSJcABexVk5UBUAfFUh6AP1ACwt7V09-XXQTaNJAO5TpbPlC35KygAiqGjWACao1vD6hiZmFla28En2xq5yvF+KhvOJJFIknIBI4XBUCn4gosahFYKgyPEElUgpAjMAYMAbGkVtBVnlseloCBOsTdo1yUEghlWrTBlAYlVKkElnAAOKoHCoGBQJCYimtXIE8xGWlosgAbQAugzGcBHsBpScZkrOcjQrDcsBOmLGXADMRgM8YKy1iqgg9gBgMBkjKgbaS7XATJEMh09FB3VBVrruTV-kZXB4saaAOYCwzCop8+NCkWe6kwQ00uAG8SdXWXLT0ABKGReoHQxdQGA6dUJ1ko4ecAjA2DQsEtRgEccFiZbbclnYEEo70oE+NQIC7rYg7YJxhbEDxBJs-dng4XZEbALXc6HPYTIt3G67I6lC4nU+PHYX1ipnWv867W6bj-3Kb7M73C7PGovmavL8TwEZk303bcIzArsMyzDooIEB0nRdUEgJvZ8IObVCnwEGC8zgrCh3NS0Xngl8dwIhdcKNfCBzQgRvREX1-VIos4CEGAnA1OAAElrAwXJnnMShnWsKJ6zgKBnieKApHeZw0hBYQOKlXolggDAcwBOYFESKo5O7D8j1-aV5QABkVRdl3rAQtyCfSD1TJBh0HEzzIEO8oGpODbLgezDKc4zjDMizQJ8-SqIfRDnVdGy9J3CK4KIq1Yrs+Kejw+i0EYv0oFi8ogA) | [Example 2](https://www.typescriptlang.org/play/?target=99&module=7#code/JYWwDg9gTgLgBAFQJ5gKZwGZQiOByGFVAIwgA88AoSgehrgFonmXW32POv3b7k0AdACpejbuImTu1OnAByAQxCoAzmAUBjVJQB2S1eq1wAsgpgALOAG9KcOKjKRYcDRB0r4ANVQaY0AExwALyIRAIA8sQAVj4wABRWcGQAXKGCcgCuIMSoUHEAlAA0cEip-KgCmdm5BXAAvvm29o7Q8K7uXrHQAMzBaRUAogBuCgA2GWaoceUCAJI6MLkqsXEA2t6+AcUzkTG+CXAAXmVhVTl5+fX5ALr5jXYOTm1uHnAbflAALH0zw2MTi2mYXmiygy326y6UG62zCuxWiQA7id0llzrUGrdGnUZPQACKoNA6AAmqAW8n0ak02nar28sAcPzh0QRTUgKmAMGAblSpgsAne0E+hSaOmgIDGvLM5gFUJhTQyQyl-MFUH8lAalFp8AA4qgcKgYFAkEzBPD9jY7ENclytCoURUAIJQKAKJBxemLMhFJrAEnAO0OgTO13umZnGp3DWNbUmSZQYBjU0Vc3xS1wJTEYBkmDKmWq4VNYnADAYDLLPOyzZfEV2NQ+DKjBRQSsF6Nal7wYyqSwhHYsi1NADm+uURtKcD1BvHtbgEtBidGytyi-bogAShkFqB0OvUBhRrFuTpKN2VDKwNg0LBsyoBCPp8aBJeINeuaoBNab3aBJzUCA7xfN9b2fCAOS5NxnyvG0QLIU8eyg18YI-B8xyfIDkLvL9bQ-P8AMQ4CPzFKAJVGAjMIEOCzwvaCbxQ0dDXQ2j3ywmCfzwwDmJAxVyLou8qIQjC+IEecVzGXiWIEYtS3LCohMkgTzwkkDRITcT5JAzNswWZSP0UmikOE1TF10u96w0Rtm1MyjcTgABlGAzADOB5gwXIyS0Sgyx0XxjzgKAyVJPJlHPIMHKcjQAB5CDQCAMBMHsAD5LnTEKZVQxikE-NjVFWAAGa5QPA48bLsNL7wY8dsu-XKCoEYjSNKucEIyqrsIDWrCp4uCyoQ4zxOkstlia8r+rIrScxGvr4xM8zLKgGy6iAA) | [Challenge](test/typescript/readme.md)
115
-
116
- TypeBox includes a syntax engine that can transform TypeScript declarations into JSON Schema. The engine is a full syntactic frontend to Type.* and supports many advanced type-level constructs such as Conditional, Mapped, Indexed, Infer, Generics, Distributed types and more. This feature is implemented symmetrically at runtime and statically via TypeScript Template Literal types.
117
-
118
- Syntax highlighting is available via the [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=sinclairzx81.typebox-script)
114
+ [Documentation](https://sinclairzx81.github.io/typebox/#/docs/script/overview) | [Example 1](https://www.typescriptlang.org/play/?target=99&module=7#code/JYWwDg9gTgLgBAFQJ5gKZwGZQiOByGFVAIwgA88AoSgehrgFkIATAVwBtVKBjCAOwDO8BgEMYACzgBeREQB0AZW5RgYGAAoABpThxCaOADVU3GNABM0uAG84ZAFxw+rEMVRQANHCSPnr93AAvjp6REYmZlAAzFa2Dk4ubp7evonuXgBeqf5QQSH66Mam0AAssXbZSV4+CTmZlelwAO4NucGaAJTUdHAAIqhofMyofMIsHFy8gvC2DKgCkoFWyGiKyqoaohJemrr5YcawqGSxIbqQAsAwwPyORZElHmdO0CAi7HcR0FFPurqsADdPsUoOYQsFdAU4ABxVA4VAwKBIU5-OAA9zXbjzT5HMgAbQAur8-sAhsAsQJWoTwfsDFt3MB3ii-iJXMARjBgQ9ibpmMAMBhWAJUFzSjy4AI0NwOCIoKKoCUaZCwnMFszdABzOEgBFIxyw+GIpDit4wBnvRz0lTvGmdbr0ABKrFGoHQDtQGE4phufEoqvEcjA2DQsHZAjkWsNSMDwYxYbk6NDFLkV1QIHDQYgIeu80DEEu134MazcdzZD98wDmez8cjOqNxZrucTmNzqfTjdL4b4r3endDZYrC37OfDdd1SBH8Zb5LbZo71a7ckBU8H-tX4dN5vYG7kfIFQtQu-L68XA83Ym3u9ZxHZo2PQ6rsfPci31p3Z9HcklJhlUAftD0AoMBiOScAAJJ8Bg7gjFilCCnw3r8HAUAjMMUDqDqCyOCsR7AaB3AADwFBAGCMJWAB8HQ2CEWEBuODYzhSeIAAwEnmBY+nI5a6HREbahOCZxsxbFyD2UBvDuPFwHxDHRkx8ysexK7SXxb6Mju+6CsK3G0ZWr6Xu+cg3neMC6bx+nqX2P7Suwsq6YEQA) | [Example 2](https://www.typescriptlang.org/play/?target=99&module=7#code/JYWwDg9gTgLgBAFQJ5gKZwGZQiOByGFVAIwgA88AoSgehrgFkIATAVwBtVKA7AQxFQBnMLwDG6BrxgALOAG9KcOKjKRYcURG6D4ANVSiY0AExwAvIiIA6APLEAVgZgAKOXDIAuS2isA5ViDEqFDOAJQANHBIXsg+-oHBYXAAvqGKyqrQ8Jraek7QAMzm3qi2Dk6u7jHW8UEhEVHVcQF1YZEAXk2ltYmhKWlKKmrZWjpw+obQACzFsaV2joaVniV+Lb2R0as99R1dawm7cADu+ztJqZTJ1HRwACKoaNzMqNzwTGyclDlj+rAqs2sCwqCiUkEEwBgwC0XkkMisEyMUCm4XS3GgIF47FhUmkCPyUAKqKUrAAbjj4YiTFc0j94ABxVA4VAwKBIQE+YFLUFwUnBKHiQT7ACCUCgvCQzj+MBUEXSwGewEFIrFEuccwOrVCaUudMYUmCwCxHPm5W56X4xGArxgFLxVORxLgzGAGAwrEEqDt+MmjvSwgMHF4UG9DqmNO+o3eQlkFg1XJcPIA5kyBKytozmemnZiZVAjdj9XmCxHaPQAEqsN6gdDl1AYTiGaHcSgMGNWMDYNCwa2CKwprNsjtd-m9qx8nuCqyQ1AgPudiDdqFCDsQCFQrTDxejldkVvthdLscDtNDw87vsTgUrmdzrdHlfoqCY9j3i9WPdtwR4889lcnlkzxHP9L1HKdb3nYDlz7Mk3xAj992-ODoKsXNDSxZCxxdN0PVKX8UM-A8oLHND8ww-Cx0ta03kw3dEJ-YiV1IgtaL7ANRCDKBWIQss4AAZRgKQlTgABJbgMGCV5xEod1uCbLQ4CgV4XhCARv32AShNEAAeQg0AgDBGBjAA+PoeTUvEAPTccwKEABtAAGABdVd12bBClAs-tU0ApAbMneznKsJ8Xw8uAvKsocryVQKXNgvdPPbZiMOw91PTCrzktfKibQypKDTI192M4hDkiAA) | [Challenge](test/typescript/readme.md)
119
115
 
116
+ TypeBox includes a runtime scripting engine that can transform TypeScript definitions into JSON Schema. The engine is implemented symmetrically at runtime and inside TypeScript's type system. It supports many programmable type-level constructs such as Conditional, Mapped, Indexed, Generic, Distributive Conditional, and more. The engine is designed for TypeScript 7 but is supported in TypeScript 5 and above.
120
117
 
121
118
  ### Example
122
119
 
123
- The following uses Script to parse TypeScript declarations into JSON Schema.
120
+ Syntax highlighting is available via the [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=sinclairzx81.typebox-script)
124
121
 
125
122
  ```typescript
126
123
  // Module
127
124
  const Math = Type.Script(`
128
125
  type Vector2 = { x: number, y: number }
129
- type Vector3 = Evaluate<Vector2 & { z: number }>
130
- type Vector4 = Evaluate<Vector3 & { w: number }>
126
+ type Vector3 = { x: number, y: number, z: number }
127
+ type Vector4 = { x: number, y: number, z: number, w: number }
131
128
  `)
132
129
 
133
130
  // Dependent Module
134
- const { Mesh } = Type.Script({ ...Math }, `
131
+ const { Mesh } = Type.Script(Math, `
135
132
  type Vertex = {
136
133
  position: Vector4,
137
134
  normal: Vector3,
@@ -298,29 +295,29 @@ The following table shows compile performance for various JSON Schema structures
298
295
  ┌──────────────────────┬─────────────┬─────────────┐
299
296
  │ Compile │ TB1X │ AJV8 │
300
297
  ├──────────────────────┼─────────────┼─────────────┤
301
- │ Boolean │ 29.2K ops/s │ 7.1K ops/s │
302
- │ Number │ 34.5K ops/s │ 7.6K ops/s │
303
- │ String │ 48.9K ops/s │ 8.7K ops/s │
304
- │ Null │ 39.6K ops/s │ 7.6K ops/s │
305
- │ Literal_String │ 46.8K ops/s │ 6.8K ops/s │
306
- │ Literal_Number │ 48.3K ops/s │ 7.4K ops/s │
307
- │ Literal_Boolean │ 48.8K ops/s │ 7.3K ops/s │
308
- │ Pattern │ 32.5K ops/s │ 6.1K ops/s │
309
- │ Object_Open │ 6.6K ops/s │ 1.4K ops/s │
310
- │ Object_Close │ 7.6K ops/s │ 1K ops/s │
311
- │ Object_Vector3 │ 20.8K ops/s │ 2.8K ops/s │
312
- │ Object_Basis3 │ 7.5K ops/s │ 1K ops/s │
313
- │ Intersect_And │ 23K ops/s │ 3.9K ops/s │
314
- │ Intersect_Structural │ 8.7K ops/s │ 1.2K ops/s │
315
- │ Union_Or │ 17.9K ops/s │ 3.4K ops/s │
316
- │ Union_Structural │ 11.3K ops/s │ 2.1K ops/s │
317
- │ Tuple_Values │ 9.6K ops/s │ 2.1K ops/s │
318
- │ Tuple_Objects │ 2.1K ops/s │ 350 ops/s │
319
- │ Array_Numbers_4 │ 33.6K ops/s │ 4.2K ops/s │
320
- │ Array_Numbers_8 │ 39K ops/s │ 3.7K ops/s │
321
- │ Array_Numbers_16 │ 29.6K ops/s │ 3.8K ops/s │
322
- │ Array_Objects_Open │ 7.7K ops/s │ 833 ops/s │
323
- │ Array_Objects_Close │ 7.6K ops/s │ 860 ops/s │
298
+ │ Boolean │ 39.7K ops/s │ 6.8K ops/s │
299
+ │ Number │ 86.2K ops/s │ 7.5K ops/s │
300
+ │ String │ 82.6K ops/s │ 8.2K ops/s │
301
+ │ Null │ 62K ops/s │ 7.3K ops/s │
302
+ │ Literal_String │ 72.1K ops/s │ 5.7K ops/s │
303
+ │ Literal_Number │ 72.7K ops/s │ 6.9K ops/s │
304
+ │ Literal_Boolean │ 80.9K ops/s │ 7K ops/s │
305
+ │ Pattern │ 38.7K ops/s │ 5.7K ops/s │
306
+ │ Object_Open │ 16.3K ops/s │ 1.3K ops/s │
307
+ │ Object_Close │ 15.7K ops/s │ 952 ops/s │
308
+ │ Object_Vector3 │ 40.2K ops/s │ 3.2K ops/s │
309
+ │ Object_Basis3 │ 16.1K ops/s │ 834 ops/s │
310
+ │ Intersect_And │ 45.7K ops/s │ 3.5K ops/s │
311
+ │ Intersect_Structural │ 21K ops/s │ 1.6K ops/s │
312
+ │ Union_Or │ 45.1K ops/s │ 3.4K ops/s │
313
+ │ Union_Structural │ 27.6K ops/s │ 2K ops/s │
314
+ │ Tuple_Values │ 14.7K ops/s │ 2K ops/s │
315
+ │ Tuple_Objects │ 3.7K ops/s │ 380 ops/s │
316
+ │ Array_Numbers_4 │ 73.6K ops/s │ 4.3K ops/s │
317
+ │ Array_Numbers_8 │ 50.9K ops/s │ 3.8K ops/s │
318
+ │ Array_Numbers_16 │ 85K ops/s │ 3.9K ops/s │
319
+ │ Array_Objects_Open │ 18.9K ops/s │ 789 ops/s │
320
+ │ Array_Objects_Close │ 17.9K ops/s │ 909 ops/s │
324
321
  └──────────────────────┴─────────────┴─────────────┘
325
322
  ```
326
323