vellum-ai 0.6.7 → 0.6.11

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.
Files changed (166) hide show
  1. package/Client.d.ts +9 -6
  2. package/Client.js +40 -37
  3. package/api/client/requests/ExecutePromptRequest.d.ts +7 -5
  4. package/api/client/requests/ExecutePromptStreamRequest.d.ts +7 -5
  5. package/api/resources/deployments/client/Client.d.ts +8 -5
  6. package/api/resources/deployments/client/Client.js +22 -17
  7. package/api/resources/documentIndexes/client/Client.d.ts +37 -12
  8. package/api/resources/documentIndexes/client/Client.js +128 -30
  9. package/api/resources/documents/client/Client.d.ts +11 -7
  10. package/api/resources/documents/client/Client.js +25 -22
  11. package/api/resources/folderEntities/client/Client.d.ts +4 -1
  12. package/api/resources/folderEntities/client/Client.js +4 -3
  13. package/api/resources/sandboxes/client/Client.d.ts +7 -4
  14. package/api/resources/sandboxes/client/Client.js +14 -13
  15. package/api/resources/testSuiteRuns/client/Client.d.ts +6 -3
  16. package/api/resources/testSuiteRuns/client/Client.js +13 -10
  17. package/api/resources/testSuites/client/Client.d.ts +6 -3
  18. package/api/resources/testSuites/client/Client.js +16 -14
  19. package/api/resources/workflowDeployments/client/Client.d.ts +7 -4
  20. package/api/resources/workflowDeployments/client/Client.js +17 -13
  21. package/api/resources/workflowSandboxes/client/Client.d.ts +4 -1
  22. package/api/resources/workflowSandboxes/client/Client.js +5 -6
  23. package/api/types/IterationStateEnum.d.ts +12 -0
  24. package/api/types/IterationStateEnum.js +10 -0
  25. package/api/types/MapNodeResultData.d.ts +2 -0
  26. package/api/types/PromptNodeResultData.d.ts +1 -0
  27. package/api/types/TestSuiteRunMetricNumberOutput.d.ts +1 -1
  28. package/api/types/TestSuiteRunMetricStringOutput.d.ts +1 -1
  29. package/api/types/TestSuiteTestCaseRejectedBulkResult.d.ts +1 -1
  30. package/api/types/index.d.ts +1 -0
  31. package/api/types/index.js +1 -0
  32. package/core/fetcher/Fetcher.d.ts +2 -0
  33. package/core/fetcher/Fetcher.js +19 -185
  34. package/core/fetcher/createRequestUrl.d.ts +1 -0
  35. package/core/fetcher/createRequestUrl.js +13 -0
  36. package/core/fetcher/getFetchFn.d.ts +4 -0
  37. package/core/fetcher/getFetchFn.js +55 -0
  38. package/core/fetcher/getRequestBody.d.ts +7 -0
  39. package/core/fetcher/getRequestBody.js +23 -0
  40. package/core/fetcher/getResponseBody.d.ts +1 -0
  41. package/core/fetcher/getResponseBody.js +48 -0
  42. package/core/fetcher/makeRequest.d.ts +1 -0
  43. package/core/fetcher/makeRequest.js +40 -0
  44. package/core/fetcher/requestWithRetries.d.ts +1 -0
  45. package/core/fetcher/requestWithRetries.js +32 -0
  46. package/core/fetcher/signals.d.ts +12 -0
  47. package/core/fetcher/signals.js +37 -0
  48. package/core/form-data-utils/FormDataWrapper.d.ts +10 -21
  49. package/core/form-data-utils/FormDataWrapper.js +82 -49
  50. package/core/runtime/runtime.d.ts +1 -0
  51. package/core/runtime/runtime.js +1 -0
  52. package/core/schemas/Schema.d.ts +7 -4
  53. package/core/schemas/builders/lazy/lazy.d.ts +2 -2
  54. package/core/schemas/builders/lazy/lazy.js +8 -19
  55. package/core/schemas/builders/lazy/lazyObject.js +1 -10
  56. package/core/schemas/builders/list/list.js +31 -44
  57. package/core/schemas/builders/object/object.js +90 -111
  58. package/core/schemas/builders/object/types.d.ts +2 -2
  59. package/core/schemas/builders/object-like/getObjectLikeUtils.js +3 -12
  60. package/core/schemas/builders/record/record.js +49 -60
  61. package/core/schemas/builders/schema-utils/getSchemaUtils.d.ts +2 -2
  62. package/core/schemas/builders/schema-utils/getSchemaUtils.js +18 -21
  63. package/core/schemas/builders/set/set.js +6 -15
  64. package/core/schemas/builders/undiscriminated-union/undiscriminatedUnion.js +21 -32
  65. package/core/schemas/builders/union/union.js +51 -62
  66. package/core/schemas/utils/maybeSkipValidation.js +3 -12
  67. package/dist/Client.d.ts +9 -6
  68. package/dist/Client.js +40 -37
  69. package/dist/api/client/requests/ExecutePromptRequest.d.ts +7 -5
  70. package/dist/api/client/requests/ExecutePromptStreamRequest.d.ts +7 -5
  71. package/dist/api/resources/deployments/client/Client.d.ts +8 -5
  72. package/dist/api/resources/deployments/client/Client.js +22 -17
  73. package/dist/api/resources/documentIndexes/client/Client.d.ts +37 -12
  74. package/dist/api/resources/documentIndexes/client/Client.js +128 -30
  75. package/dist/api/resources/documents/client/Client.d.ts +11 -7
  76. package/dist/api/resources/documents/client/Client.js +25 -22
  77. package/dist/api/resources/folderEntities/client/Client.d.ts +4 -1
  78. package/dist/api/resources/folderEntities/client/Client.js +4 -3
  79. package/dist/api/resources/sandboxes/client/Client.d.ts +7 -4
  80. package/dist/api/resources/sandboxes/client/Client.js +14 -13
  81. package/dist/api/resources/testSuiteRuns/client/Client.d.ts +6 -3
  82. package/dist/api/resources/testSuiteRuns/client/Client.js +13 -10
  83. package/dist/api/resources/testSuites/client/Client.d.ts +6 -3
  84. package/dist/api/resources/testSuites/client/Client.js +16 -14
  85. package/dist/api/resources/workflowDeployments/client/Client.d.ts +7 -4
  86. package/dist/api/resources/workflowDeployments/client/Client.js +17 -13
  87. package/dist/api/resources/workflowSandboxes/client/Client.d.ts +4 -1
  88. package/dist/api/resources/workflowSandboxes/client/Client.js +5 -6
  89. package/dist/api/types/IterationStateEnum.d.ts +12 -0
  90. package/dist/api/types/IterationStateEnum.js +10 -0
  91. package/dist/api/types/MapNodeResultData.d.ts +2 -0
  92. package/dist/api/types/PromptNodeResultData.d.ts +1 -0
  93. package/dist/api/types/TestSuiteRunMetricNumberOutput.d.ts +1 -1
  94. package/dist/api/types/TestSuiteRunMetricStringOutput.d.ts +1 -1
  95. package/dist/api/types/TestSuiteTestCaseRejectedBulkResult.d.ts +1 -1
  96. package/dist/api/types/index.d.ts +1 -0
  97. package/dist/api/types/index.js +1 -0
  98. package/dist/core/fetcher/Fetcher.d.ts +2 -0
  99. package/dist/core/fetcher/Fetcher.js +19 -185
  100. package/dist/core/fetcher/createRequestUrl.d.ts +1 -0
  101. package/dist/core/fetcher/createRequestUrl.js +13 -0
  102. package/dist/core/fetcher/getFetchFn.d.ts +4 -0
  103. package/dist/core/fetcher/getFetchFn.js +55 -0
  104. package/dist/core/fetcher/getRequestBody.d.ts +7 -0
  105. package/dist/core/fetcher/getRequestBody.js +23 -0
  106. package/dist/core/fetcher/getResponseBody.d.ts +1 -0
  107. package/dist/core/fetcher/getResponseBody.js +48 -0
  108. package/dist/core/fetcher/makeRequest.d.ts +1 -0
  109. package/dist/core/fetcher/makeRequest.js +40 -0
  110. package/dist/core/fetcher/requestWithRetries.d.ts +1 -0
  111. package/dist/core/fetcher/requestWithRetries.js +32 -0
  112. package/dist/core/fetcher/signals.d.ts +12 -0
  113. package/dist/core/fetcher/signals.js +37 -0
  114. package/dist/core/form-data-utils/FormDataWrapper.d.ts +10 -21
  115. package/dist/core/form-data-utils/FormDataWrapper.js +82 -49
  116. package/dist/core/runtime/runtime.d.ts +1 -0
  117. package/dist/core/runtime/runtime.js +1 -0
  118. package/dist/core/schemas/Schema.d.ts +7 -4
  119. package/dist/core/schemas/builders/lazy/lazy.d.ts +2 -2
  120. package/dist/core/schemas/builders/lazy/lazy.js +8 -19
  121. package/dist/core/schemas/builders/lazy/lazyObject.js +1 -10
  122. package/dist/core/schemas/builders/list/list.js +31 -44
  123. package/dist/core/schemas/builders/object/object.js +90 -111
  124. package/dist/core/schemas/builders/object/types.d.ts +2 -2
  125. package/dist/core/schemas/builders/object-like/getObjectLikeUtils.js +3 -12
  126. package/dist/core/schemas/builders/record/record.js +49 -60
  127. package/dist/core/schemas/builders/schema-utils/getSchemaUtils.d.ts +2 -2
  128. package/dist/core/schemas/builders/schema-utils/getSchemaUtils.js +18 -21
  129. package/dist/core/schemas/builders/set/set.js +6 -15
  130. package/dist/core/schemas/builders/undiscriminated-union/undiscriminatedUnion.js +21 -32
  131. package/dist/core/schemas/builders/union/union.js +51 -62
  132. package/dist/core/schemas/utils/maybeSkipValidation.js +3 -12
  133. package/dist/serialization/types/IterationStateEnum.d.ts +10 -0
  134. package/dist/serialization/types/IterationStateEnum.js +31 -0
  135. package/dist/serialization/types/MapNodeResultData.d.ts +2 -0
  136. package/dist/serialization/types/MapNodeResultData.js +2 -0
  137. package/dist/serialization/types/MetadataFilterConfigRequest.js +2 -10
  138. package/dist/serialization/types/MetadataFilterRuleRequest.js +2 -10
  139. package/dist/serialization/types/PromptNodeResultData.d.ts +1 -0
  140. package/dist/serialization/types/PromptNodeResultData.js +1 -0
  141. package/dist/serialization/types/TestSuiteRunMetricNumberOutput.d.ts +1 -1
  142. package/dist/serialization/types/TestSuiteRunMetricNumberOutput.js +1 -1
  143. package/dist/serialization/types/TestSuiteRunMetricStringOutput.d.ts +1 -1
  144. package/dist/serialization/types/TestSuiteRunMetricStringOutput.js +1 -1
  145. package/dist/serialization/types/TestSuiteTestCaseRejectedBulkResult.d.ts +1 -1
  146. package/dist/serialization/types/TestSuiteTestCaseRejectedBulkResult.js +1 -1
  147. package/dist/serialization/types/index.d.ts +1 -0
  148. package/dist/serialization/types/index.js +1 -0
  149. package/package.json +6 -1
  150. package/reference.md +2418 -0
  151. package/serialization/types/IterationStateEnum.d.ts +10 -0
  152. package/serialization/types/IterationStateEnum.js +31 -0
  153. package/serialization/types/MapNodeResultData.d.ts +2 -0
  154. package/serialization/types/MapNodeResultData.js +2 -0
  155. package/serialization/types/MetadataFilterConfigRequest.js +2 -10
  156. package/serialization/types/MetadataFilterRuleRequest.js +2 -10
  157. package/serialization/types/PromptNodeResultData.d.ts +1 -0
  158. package/serialization/types/PromptNodeResultData.js +1 -0
  159. package/serialization/types/TestSuiteRunMetricNumberOutput.d.ts +1 -1
  160. package/serialization/types/TestSuiteRunMetricNumberOutput.js +1 -1
  161. package/serialization/types/TestSuiteRunMetricStringOutput.d.ts +1 -1
  162. package/serialization/types/TestSuiteRunMetricStringOutput.js +1 -1
  163. package/serialization/types/TestSuiteTestCaseRejectedBulkResult.d.ts +1 -1
  164. package/serialization/types/TestSuiteTestCaseRejectedBulkResult.js +1 -1
  165. package/serialization/types/index.d.ts +1 -0
  166. package/serialization/types/index.js +1 -0
@@ -32,75 +32,108 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
32
32
  });
33
33
  };
34
34
  Object.defineProperty(exports, "__esModule", { value: true });
35
- exports.FormDataWrapper = void 0;
36
- const stream_1 = require("stream");
35
+ exports.newFormData = void 0;
37
36
  const runtime_1 = require("../runtime");
38
- class FormDataRequestBody {
39
- constructor(fd) {
40
- this.fd = fd;
41
- }
37
+ function newFormData() {
38
+ return __awaiter(this, void 0, void 0, function* () {
39
+ let formdata;
40
+ if (runtime_1.RUNTIME.type === "node" && runtime_1.RUNTIME.parsedVersion != null && runtime_1.RUNTIME.parsedVersion > 18) {
41
+ formdata = new Node19FormData();
42
+ }
43
+ else if (runtime_1.RUNTIME.type === "node") {
44
+ formdata = new Node16FormData();
45
+ }
46
+ else {
47
+ formdata = new WebFormData();
48
+ }
49
+ yield formdata.setup();
50
+ return formdata;
51
+ });
52
+ }
53
+ exports.newFormData = newFormData;
54
+ /**
55
+ * Form Data Implementation for Node.js 18+
56
+ */
57
+ class Node19FormData {
42
58
  setup() {
43
59
  return __awaiter(this, void 0, void 0, function* () {
44
- if (this.encoder == null && runtime_1.RUNTIME.type === "node") {
45
- this.encoder = new (yield Promise.resolve().then(() => __importStar(require("form-data-encoder")))).FormDataEncoder(this.fd);
46
- }
60
+ this.fd = new (yield Promise.resolve().then(() => __importStar(require("formdata-node")))).FormData();
47
61
  });
48
62
  }
49
- /**
50
- * @returns the multipart form data request
51
- */
52
- getBody() {
63
+ append(key, value) {
64
+ var _a;
65
+ (_a = this.fd) === null || _a === void 0 ? void 0 : _a.append(key, value);
66
+ }
67
+ appendFile(key, value, fileName) {
68
+ var _a;
53
69
  return __awaiter(this, void 0, void 0, function* () {
54
- if (runtime_1.RUNTIME.type !== "node") {
55
- return this.fd;
56
- }
57
- else {
58
- if (this.encoder == null) {
59
- yield this.setup();
60
- }
61
- return stream_1.Readable.from(this.encoder);
62
- }
70
+ (_a = this.fd) === null || _a === void 0 ? void 0 : _a.append(key, new (yield Promise.resolve().then(() => __importStar(require("buffer")))).Blob([value]), fileName);
71
+ });
72
+ }
73
+ getRequest() {
74
+ return __awaiter(this, void 0, void 0, function* () {
75
+ const encoder = new (yield Promise.resolve().then(() => __importStar(require("form-data-encoder")))).FormDataEncoder(this.fd);
76
+ return {
77
+ body: (yield Promise.resolve().then(() => __importStar(require("stream")))).Readable.from(encoder),
78
+ headers: encoder.headers,
79
+ };
80
+ });
81
+ }
82
+ }
83
+ /**
84
+ * Form Data Implementation for Node.js 16-18
85
+ */
86
+ class Node16FormData {
87
+ setup() {
88
+ return __awaiter(this, void 0, void 0, function* () {
89
+ this.fd = new (yield Promise.resolve().then(() => __importStar(require("form-data")))).default();
63
90
  });
64
91
  }
65
- /**
66
- * @returns headers that need to be added to the multipart form data request
67
- */
68
- getHeaders() {
92
+ append(key, value) {
93
+ var _a;
94
+ (_a = this.fd) === null || _a === void 0 ? void 0 : _a.append(key, value);
95
+ }
96
+ appendFile(key, value, fileName) {
97
+ var _a, _b;
69
98
  return __awaiter(this, void 0, void 0, function* () {
70
- if (runtime_1.RUNTIME.type !== "node") {
71
- return {};
99
+ if (fileName == null) {
100
+ (_a = this.fd) === null || _a === void 0 ? void 0 : _a.append(key, value);
72
101
  }
73
102
  else {
74
- if (this.encoder == null) {
75
- yield this.setup();
76
- }
77
- return {
78
- "Content-Length": this.encoder.length,
79
- };
103
+ (_b = this.fd) === null || _b === void 0 ? void 0 : _b.append(key, value, { filename: fileName });
80
104
  }
81
105
  });
82
106
  }
107
+ getRequest() {
108
+ return {
109
+ body: this.fd,
110
+ headers: this.fd ? this.fd.getHeaders() : {},
111
+ };
112
+ }
83
113
  }
84
114
  /**
85
- * FormDataWrapper is a utility to make form data
86
- * requests across both Browser and Node.js runtimes.
115
+ * Form Data Implementation for Web
87
116
  */
88
- class FormDataWrapper {
89
- append(name, value) {
117
+ class WebFormData {
118
+ setup() {
90
119
  return __awaiter(this, void 0, void 0, function* () {
91
- if (this.fd == null) {
92
- if (runtime_1.RUNTIME.type === "node") {
93
- this.fd = new (yield Promise.resolve().then(() => __importStar(require("formdata-node")))).FormData();
94
- }
95
- else {
96
- this.fd = new (yield Promise.resolve().then(() => __importStar(require("form-data")))).default();
97
- }
98
- }
99
- this.fd.append(name, value);
120
+ this.fd = new FormData();
121
+ });
122
+ }
123
+ append(key, value) {
124
+ var _a;
125
+ (_a = this.fd) === null || _a === void 0 ? void 0 : _a.append(key, value);
126
+ }
127
+ appendFile(key, value, fileName) {
128
+ var _a;
129
+ return __awaiter(this, void 0, void 0, function* () {
130
+ (_a = this.fd) === null || _a === void 0 ? void 0 : _a.append(key, new Blob([value]), fileName);
100
131
  });
101
132
  }
102
133
  getRequest() {
103
- return new FormDataRequestBody(this.fd);
134
+ return {
135
+ body: this.fd,
136
+ headers: {},
137
+ };
104
138
  }
105
139
  }
106
- exports.FormDataWrapper = FormDataWrapper;
@@ -5,4 +5,5 @@ export declare const RUNTIME: Runtime;
5
5
  export interface Runtime {
6
6
  type: "browser" | "web-worker" | "deno" | "bun" | "node" | "react-native" | "unknown" | "workerd";
7
7
  version?: string;
8
+ parsedVersion?: number;
8
9
  }
@@ -79,6 +79,7 @@ function evaluateRuntime() {
79
79
  return {
80
80
  type: "node",
81
81
  version: process.versions.node,
82
+ parsedVersion: Number(process.versions.node.split(".")[0]),
82
83
  };
83
84
  }
84
85
  if (isReactNative) {
@@ -1,12 +1,11 @@
1
1
  import { SchemaUtils } from "./builders";
2
- import { MaybePromise } from "./utils/MaybePromise";
3
2
  export declare type Schema<Raw = unknown, Parsed = unknown> = BaseSchema<Raw, Parsed> & SchemaUtils<Raw, Parsed>;
4
3
  export declare type inferRaw<S extends Schema> = S extends Schema<infer Raw, any> ? Raw : never;
5
4
  export declare type inferParsed<S extends Schema> = S extends Schema<any, infer Parsed> ? Parsed : never;
6
5
  export interface BaseSchema<Raw, Parsed> {
7
- parse: (raw: unknown, opts?: SchemaOptions) => MaybePromise<MaybeValid<Parsed>>;
8
- json: (parsed: unknown, opts?: SchemaOptions) => MaybePromise<MaybeValid<Raw>>;
9
- getType: () => SchemaType | Promise<SchemaType>;
6
+ parse: (raw: unknown, opts?: SchemaOptions) => MaybeValid<Parsed>;
7
+ json: (parsed: unknown, opts?: SchemaOptions) => MaybeValid<Raw>;
8
+ getType: () => SchemaType | SchemaType;
10
9
  }
11
10
  export declare const SchemaType: {
12
11
  readonly DATE: "date";
@@ -78,4 +77,8 @@ export interface SchemaOptions {
78
77
  * helpful for zurg's internal debug logging.
79
78
  */
80
79
  breadcrumbsPrefix?: string[];
80
+ /**
81
+ * whether to send 'null' for optional properties explicitly set to 'undefined'.
82
+ */
83
+ omitUndefined?: boolean;
81
84
  }
@@ -1,5 +1,5 @@
1
1
  import { BaseSchema, Schema } from "../../Schema";
2
- export declare type SchemaGetter<SchemaType extends Schema<any, any>> = () => SchemaType | Promise<SchemaType>;
2
+ export declare type SchemaGetter<SchemaType extends Schema<any, any>> = () => SchemaType;
3
3
  export declare function lazy<Raw, Parsed>(getter: SchemaGetter<Schema<Raw, Parsed>>): Schema<Raw, Parsed>;
4
4
  export declare function constructLazyBaseSchema<Raw, Parsed>(getter: SchemaGetter<Schema<Raw, Parsed>>): BaseSchema<Raw, Parsed>;
5
- export declare function getMemoizedSchema<SchemaType extends Schema<any, any>>(getter: SchemaGetter<SchemaType>): Promise<SchemaType>;
5
+ export declare function getMemoizedSchema<SchemaType extends Schema<any, any>>(getter: SchemaGetter<SchemaType>): SchemaType;
@@ -1,13 +1,4 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  Object.defineProperty(exports, "__esModule", { value: true });
12
3
  exports.getMemoizedSchema = exports.constructLazyBaseSchema = exports.lazy = void 0;
13
4
  const schema_utils_1 = require("../schema-utils");
@@ -18,19 +9,17 @@ function lazy(getter) {
18
9
  exports.lazy = lazy;
19
10
  function constructLazyBaseSchema(getter) {
20
11
  return {
21
- parse: (raw, opts) => __awaiter(this, void 0, void 0, function* () { return (yield getMemoizedSchema(getter)).parse(raw, opts); }),
22
- json: (parsed, opts) => __awaiter(this, void 0, void 0, function* () { return (yield getMemoizedSchema(getter)).json(parsed, opts); }),
23
- getType: () => __awaiter(this, void 0, void 0, function* () { return (yield getMemoizedSchema(getter)).getType(); }),
12
+ parse: (raw, opts) => getMemoizedSchema(getter).parse(raw, opts),
13
+ json: (parsed, opts) => getMemoizedSchema(getter).json(parsed, opts),
14
+ getType: () => getMemoizedSchema(getter).getType(),
24
15
  };
25
16
  }
26
17
  exports.constructLazyBaseSchema = constructLazyBaseSchema;
27
18
  function getMemoizedSchema(getter) {
28
- return __awaiter(this, void 0, void 0, function* () {
29
- const castedGetter = getter;
30
- if (castedGetter.__zurg_memoized == null) {
31
- castedGetter.__zurg_memoized = yield getter();
32
- }
33
- return castedGetter.__zurg_memoized;
34
- });
19
+ const castedGetter = getter;
20
+ if (castedGetter.__zurg_memoized == null) {
21
+ castedGetter.__zurg_memoized = getter();
22
+ }
23
+ return castedGetter.__zurg_memoized;
35
24
  }
36
25
  exports.getMemoizedSchema = getMemoizedSchema;
@@ -1,13 +1,4 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  Object.defineProperty(exports, "__esModule", { value: true });
12
3
  exports.lazyObject = void 0;
13
4
  const object_1 = require("../object");
@@ -15,7 +6,7 @@ const object_like_1 = require("../object-like");
15
6
  const schema_utils_1 = require("../schema-utils");
16
7
  const lazy_1 = require("./lazy");
17
8
  function lazyObject(getter) {
18
- const baseSchema = Object.assign(Object.assign({}, (0, lazy_1.constructLazyBaseSchema)(getter)), { _getRawProperties: () => __awaiter(this, void 0, void 0, function* () { return (yield (0, lazy_1.getMemoizedSchema)(getter))._getRawProperties(); }), _getParsedProperties: () => __awaiter(this, void 0, void 0, function* () { return (yield (0, lazy_1.getMemoizedSchema)(getter))._getParsedProperties(); }) });
9
+ const baseSchema = Object.assign(Object.assign({}, (0, lazy_1.constructLazyBaseSchema)(getter)), { _getRawProperties: () => (0, lazy_1.getMemoizedSchema)(getter)._getRawProperties(), _getParsedProperties: () => (0, lazy_1.getMemoizedSchema)(getter)._getParsedProperties() });
19
10
  return Object.assign(Object.assign(Object.assign(Object.assign({}, baseSchema), (0, schema_utils_1.getSchemaUtils)(baseSchema)), (0, object_like_1.getObjectLikeUtils)(baseSchema)), (0, object_1.getObjectUtils)(baseSchema));
20
11
  }
21
12
  exports.lazyObject = lazyObject;
@@ -1,13 +1,4 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  Object.defineProperty(exports, "__esModule", { value: true });
12
3
  exports.list = void 0;
13
4
  const Schema_1 = require("../../Schema");
@@ -16,11 +7,9 @@ const maybeSkipValidation_1 = require("../../utils/maybeSkipValidation");
16
7
  const schema_utils_1 = require("../schema-utils");
17
8
  function list(schema) {
18
9
  const baseSchema = {
19
- parse: (raw, opts) => __awaiter(this, void 0, void 0, function* () {
20
- return validateAndTransformArray(raw, (item, index) => {
21
- var _a;
22
- return schema.parse(item, Object.assign(Object.assign({}, opts), { breadcrumbsPrefix: [...((_a = opts === null || opts === void 0 ? void 0 : opts.breadcrumbsPrefix) !== null && _a !== void 0 ? _a : []), `[${index}]`] }));
23
- });
10
+ parse: (raw, opts) => validateAndTransformArray(raw, (item, index) => {
11
+ var _a;
12
+ return schema.parse(item, Object.assign(Object.assign({}, opts), { breadcrumbsPrefix: [...((_a = opts === null || opts === void 0 ? void 0 : opts.breadcrumbsPrefix) !== null && _a !== void 0 ? _a : []), `[${index}]`] }));
24
13
  }),
25
14
  json: (parsed, opts) => validateAndTransformArray(parsed, (item, index) => {
26
15
  var _a;
@@ -32,37 +21,35 @@ function list(schema) {
32
21
  }
33
22
  exports.list = list;
34
23
  function validateAndTransformArray(value, transformItem) {
35
- return __awaiter(this, void 0, void 0, function* () {
36
- if (!Array.isArray(value)) {
24
+ if (!Array.isArray(value)) {
25
+ return {
26
+ ok: false,
27
+ errors: [
28
+ {
29
+ message: (0, getErrorMessageForIncorrectType_1.getErrorMessageForIncorrectType)(value, "list"),
30
+ path: [],
31
+ },
32
+ ],
33
+ };
34
+ }
35
+ const maybeValidItems = value.map((item, index) => transformItem(item, index));
36
+ return maybeValidItems.reduce((acc, item) => {
37
+ if (acc.ok && item.ok) {
37
38
  return {
38
- ok: false,
39
- errors: [
40
- {
41
- message: (0, getErrorMessageForIncorrectType_1.getErrorMessageForIncorrectType)(value, "list"),
42
- path: [],
43
- },
44
- ],
39
+ ok: true,
40
+ value: [...acc.value, item.value],
45
41
  };
46
42
  }
47
- const maybeValidItems = yield Promise.all(value.map((item, index) => transformItem(item, index)));
48
- return maybeValidItems.reduce((acc, item) => {
49
- if (acc.ok && item.ok) {
50
- return {
51
- ok: true,
52
- value: [...acc.value, item.value],
53
- };
54
- }
55
- const errors = [];
56
- if (!acc.ok) {
57
- errors.push(...acc.errors);
58
- }
59
- if (!item.ok) {
60
- errors.push(...item.errors);
61
- }
62
- return {
63
- ok: false,
64
- errors,
65
- };
66
- }, { ok: true, value: [] });
67
- });
43
+ const errors = [];
44
+ if (!acc.ok) {
45
+ errors.push(...acc.errors);
46
+ }
47
+ if (!item.ok) {
48
+ errors.push(...item.errors);
49
+ }
50
+ return {
51
+ ok: false,
52
+ errors,
53
+ };
54
+ }, { ok: true, value: [] });
68
55
  }
@@ -1,13 +1,4 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  Object.defineProperty(exports, "__esModule", { value: true });
12
3
  exports.getObjectUtils = exports.object = void 0;
13
4
  const Schema_1 = require("../../Schema");
@@ -23,9 +14,9 @@ const schema_utils_1 = require("../schema-utils");
23
14
  const property_1 = require("./property");
24
15
  function object(schemas) {
25
16
  const baseSchema = {
26
- _getRawProperties: () => Promise.resolve(Object.entries(schemas).map(([parsedKey, propertySchema]) => (0, property_1.isProperty)(propertySchema) ? propertySchema.rawKey : parsedKey)),
27
- _getParsedProperties: () => Promise.resolve((0, keys_1.keys)(schemas)),
28
- parse: (raw, opts) => __awaiter(this, void 0, void 0, function* () {
17
+ _getRawProperties: () => Object.entries(schemas).map(([parsedKey, propertySchema]) => (0, property_1.isProperty)(propertySchema) ? propertySchema.rawKey : parsedKey),
18
+ _getParsedProperties: () => (0, keys_1.keys)(schemas),
19
+ parse: (raw, opts) => {
29
20
  const rawKeyToProperty = {};
30
21
  const requiredKeys = [];
31
22
  for (const [parsedKey, schemaOrObjectProperty] of (0, entries_1.entries)(schemas)) {
@@ -62,9 +53,10 @@ function object(schemas) {
62
53
  unrecognizedObjectKeys: opts === null || opts === void 0 ? void 0 : opts.unrecognizedObjectKeys,
63
54
  skipValidation: opts === null || opts === void 0 ? void 0 : opts.skipValidation,
64
55
  breadcrumbsPrefix: opts === null || opts === void 0 ? void 0 : opts.breadcrumbsPrefix,
56
+ omitUndefined: opts === null || opts === void 0 ? void 0 : opts.omitUndefined,
65
57
  });
66
- }),
67
- json: (parsed, opts) => __awaiter(this, void 0, void 0, function* () {
58
+ },
59
+ json: (parsed, opts) => {
68
60
  const requiredKeys = [];
69
61
  for (const [parsedKey, schemaOrObjectProperty] of (0, entries_1.entries)(schemas)) {
70
62
  const valueSchema = (0, property_1.isProperty)(schemaOrObjectProperty)
@@ -105,110 +97,99 @@ function object(schemas) {
105
97
  unrecognizedObjectKeys: opts === null || opts === void 0 ? void 0 : opts.unrecognizedObjectKeys,
106
98
  skipValidation: opts === null || opts === void 0 ? void 0 : opts.skipValidation,
107
99
  breadcrumbsPrefix: opts === null || opts === void 0 ? void 0 : opts.breadcrumbsPrefix,
100
+ omitUndefined: opts === null || opts === void 0 ? void 0 : opts.omitUndefined,
108
101
  });
109
- }),
102
+ },
110
103
  getType: () => Schema_1.SchemaType.OBJECT,
111
104
  };
112
105
  return Object.assign(Object.assign(Object.assign(Object.assign({}, (0, maybeSkipValidation_1.maybeSkipValidation)(baseSchema)), (0, schema_utils_1.getSchemaUtils)(baseSchema)), (0, object_like_1.getObjectLikeUtils)(baseSchema)), getObjectUtils(baseSchema));
113
106
  }
114
107
  exports.object = object;
115
108
  function validateAndTransformObject({ value, requiredKeys, getProperty, unrecognizedObjectKeys = "fail", skipValidation = false, breadcrumbsPrefix = [], }) {
116
- return __awaiter(this, void 0, void 0, function* () {
117
- if (!(0, isPlainObject_1.isPlainObject)(value)) {
118
- return {
119
- ok: false,
120
- errors: [
121
- {
122
- path: breadcrumbsPrefix,
123
- message: (0, getErrorMessageForIncorrectType_1.getErrorMessageForIncorrectType)(value, "object"),
124
- },
125
- ],
126
- };
127
- }
128
- const missingRequiredKeys = new Set(requiredKeys);
129
- const errors = [];
130
- const transformed = {};
131
- for (const [preTransformedKey, preTransformedItemValue] of Object.entries(value)) {
132
- const property = getProperty(preTransformedKey);
133
- if (property != null) {
134
- missingRequiredKeys.delete(preTransformedKey);
135
- const value = yield property.transform(preTransformedItemValue);
136
- if (value.ok) {
137
- transformed[property.transformedKey] = value.value;
138
- }
139
- else {
140
- transformed[preTransformedKey] = preTransformedItemValue;
141
- errors.push(...value.errors);
142
- }
109
+ if (!(0, isPlainObject_1.isPlainObject)(value)) {
110
+ return {
111
+ ok: false,
112
+ errors: [
113
+ {
114
+ path: breadcrumbsPrefix,
115
+ message: (0, getErrorMessageForIncorrectType_1.getErrorMessageForIncorrectType)(value, "object"),
116
+ },
117
+ ],
118
+ };
119
+ }
120
+ const missingRequiredKeys = new Set(requiredKeys);
121
+ const errors = [];
122
+ const transformed = {};
123
+ for (const [preTransformedKey, preTransformedItemValue] of Object.entries(value)) {
124
+ const property = getProperty(preTransformedKey);
125
+ if (property != null) {
126
+ missingRequiredKeys.delete(preTransformedKey);
127
+ const value = property.transform(preTransformedItemValue);
128
+ if (value.ok) {
129
+ transformed[property.transformedKey] = value.value;
143
130
  }
144
131
  else {
145
- switch (unrecognizedObjectKeys) {
146
- case "fail":
147
- errors.push({
148
- path: [...breadcrumbsPrefix, preTransformedKey],
149
- message: `Unexpected key "${preTransformedKey}"`,
150
- });
151
- break;
152
- case "strip":
153
- break;
154
- case "passthrough":
155
- transformed[preTransformedKey] = preTransformedItemValue;
156
- break;
157
- }
132
+ transformed[preTransformedKey] = preTransformedItemValue;
133
+ errors.push(...value.errors);
158
134
  }
159
135
  }
160
- errors.push(...requiredKeys
161
- .filter((key) => missingRequiredKeys.has(key))
162
- .map((key) => ({
163
- path: breadcrumbsPrefix,
164
- message: `Missing required key "${key}"`,
165
- })));
166
- if (errors.length === 0 || skipValidation) {
167
- return {
168
- ok: true,
169
- value: transformed,
170
- };
171
- }
172
136
  else {
173
- return {
174
- ok: false,
175
- errors,
176
- };
137
+ switch (unrecognizedObjectKeys) {
138
+ case "fail":
139
+ errors.push({
140
+ path: [...breadcrumbsPrefix, preTransformedKey],
141
+ message: `Unexpected key "${preTransformedKey}"`,
142
+ });
143
+ break;
144
+ case "strip":
145
+ break;
146
+ case "passthrough":
147
+ transformed[preTransformedKey] = preTransformedItemValue;
148
+ break;
149
+ }
177
150
  }
178
- });
151
+ }
152
+ errors.push(...requiredKeys
153
+ .filter((key) => missingRequiredKeys.has(key))
154
+ .map((key) => ({
155
+ path: breadcrumbsPrefix,
156
+ message: `Missing required key "${key}"`,
157
+ })));
158
+ if (errors.length === 0 || skipValidation) {
159
+ return {
160
+ ok: true,
161
+ value: transformed,
162
+ };
163
+ }
164
+ else {
165
+ return {
166
+ ok: false,
167
+ errors,
168
+ };
169
+ }
179
170
  }
180
171
  function getObjectUtils(schema) {
181
172
  return {
182
173
  extend: (extension) => {
183
174
  const baseSchema = {
184
- _getParsedProperties: () => __awaiter(this, void 0, void 0, function* () {
185
- return [
186
- ...(yield schema._getParsedProperties()),
187
- ...(yield extension._getParsedProperties()),
188
- ];
189
- }),
190
- _getRawProperties: () => __awaiter(this, void 0, void 0, function* () {
191
- return [
192
- ...(yield schema._getRawProperties()),
193
- ...(yield extension._getRawProperties()),
194
- ];
195
- }),
196
- parse: (raw, opts) => __awaiter(this, void 0, void 0, function* () {
175
+ _getParsedProperties: () => [...schema._getParsedProperties(), ...extension._getParsedProperties()],
176
+ _getRawProperties: () => [...schema._getRawProperties(), ...extension._getRawProperties()],
177
+ parse: (raw, opts) => {
197
178
  return validateAndTransformExtendedObject({
198
- extensionKeys: yield extension._getRawProperties(),
179
+ extensionKeys: extension._getRawProperties(),
199
180
  value: raw,
200
181
  transformBase: (rawBase) => schema.parse(rawBase, opts),
201
182
  transformExtension: (rawExtension) => extension.parse(rawExtension, opts),
202
183
  });
203
- }),
204
- json: (parsed, opts) => __awaiter(this, void 0, void 0, function* () {
184
+ },
185
+ json: (parsed, opts) => {
205
186
  return validateAndTransformExtendedObject({
206
- extensionKeys: yield extension._getParsedProperties(),
187
+ extensionKeys: extension._getParsedProperties(),
207
188
  value: parsed,
208
189
  transformBase: (parsedBase) => schema.json(parsedBase, opts),
209
190
  transformExtension: (parsedExtension) => extension.json(parsedExtension, opts),
210
191
  });
211
- }),
192
+ },
212
193
  getType: () => Schema_1.SchemaType.OBJECT,
213
194
  };
214
195
  return Object.assign(Object.assign(Object.assign(Object.assign({}, baseSchema), (0, schema_utils_1.getSchemaUtils)(baseSchema)), (0, object_like_1.getObjectLikeUtils)(baseSchema)), getObjectUtils(baseSchema));
@@ -217,27 +198,25 @@ function getObjectUtils(schema) {
217
198
  }
218
199
  exports.getObjectUtils = getObjectUtils;
219
200
  function validateAndTransformExtendedObject({ extensionKeys, value, transformBase, transformExtension, }) {
220
- return __awaiter(this, void 0, void 0, function* () {
221
- const extensionPropertiesSet = new Set(extensionKeys);
222
- const [extensionProperties, baseProperties] = (0, partition_1.partition)((0, keys_1.keys)(value), (key) => extensionPropertiesSet.has(key));
223
- const transformedBase = yield transformBase((0, filterObject_1.filterObject)(value, baseProperties));
224
- const transformedExtension = yield transformExtension((0, filterObject_1.filterObject)(value, extensionProperties));
225
- if (transformedBase.ok && transformedExtension.ok) {
226
- return {
227
- ok: true,
228
- value: Object.assign(Object.assign({}, transformedBase.value), transformedExtension.value),
229
- };
230
- }
231
- else {
232
- return {
233
- ok: false,
234
- errors: [
235
- ...(transformedBase.ok ? [] : transformedBase.errors),
236
- ...(transformedExtension.ok ? [] : transformedExtension.errors),
237
- ],
238
- };
239
- }
240
- });
201
+ const extensionPropertiesSet = new Set(extensionKeys);
202
+ const [extensionProperties, baseProperties] = (0, partition_1.partition)((0, keys_1.keys)(value), (key) => extensionPropertiesSet.has(key));
203
+ const transformedBase = transformBase((0, filterObject_1.filterObject)(value, baseProperties));
204
+ const transformedExtension = transformExtension((0, filterObject_1.filterObject)(value, extensionProperties));
205
+ if (transformedBase.ok && transformedExtension.ok) {
206
+ return {
207
+ ok: true,
208
+ value: Object.assign(Object.assign({}, transformedBase.value), transformedExtension.value),
209
+ };
210
+ }
211
+ else {
212
+ return {
213
+ ok: false,
214
+ errors: [
215
+ ...(transformedBase.ok ? [] : transformedBase.errors),
216
+ ...(transformedExtension.ok ? [] : transformedExtension.errors),
217
+ ],
218
+ };
219
+ }
241
220
  }
242
221
  function isSchemaRequired(schema) {
243
222
  return !isSchemaOptional(schema);
@@ -5,8 +5,8 @@ import { SchemaUtils } from "../schema-utils";
5
5
  import { Property } from "./property";
6
6
  export declare type ObjectSchema<Raw, Parsed> = BaseObjectSchema<Raw, Parsed> & ObjectLikeUtils<Raw, Parsed> & ObjectUtils<Raw, Parsed> & SchemaUtils<Raw, Parsed>;
7
7
  export interface BaseObjectSchema<Raw, Parsed> extends BaseSchema<Raw, Parsed> {
8
- _getRawProperties: () => Promise<(keyof Raw)[]>;
9
- _getParsedProperties: () => Promise<(keyof Parsed)[]>;
8
+ _getRawProperties: () => (keyof Raw)[];
9
+ _getParsedProperties: () => (keyof Parsed)[];
10
10
  }
11
11
  export interface ObjectUtils<Raw, Parsed> {
12
12
  extend: <RawExtension, ParsedExtension>(schemas: ObjectSchema<RawExtension, ParsedExtension>) => ObjectSchema<Raw & RawExtension, Parsed & ParsedExtension>;