yuppi 1.2.10 → 1.2.12
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 +0 -4
- package/dist/main.d.mts +1 -4
- package/dist/main.d.ts +1 -4
- package/dist/main.js +2 -8
- package/dist/main.mjs +2 -8
- package/package.json +2 -1
package/README.md
CHANGED
|
@@ -9,7 +9,6 @@
|
|
|
9
9
|
[Promise]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise
|
|
10
10
|
[Void]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Undefined
|
|
11
11
|
[YuppiOptionsDefault]: ./src/defaults/YuppiOptions.default.ts
|
|
12
|
-
[Any]: ./src/patterns/Any.pattern.ts
|
|
13
12
|
[Domain]: ./src/patterns/Domain.pattern.ts
|
|
14
13
|
[Email]: ./src/patterns/Email.pattern.ts
|
|
15
14
|
[HTTP]: ./src/patterns/HTTP.pattern.ts
|
|
@@ -104,7 +103,6 @@ Yuppi
|
|
|
104
103
|
│ └── convertToJSONSchema(schema)
|
|
105
104
|
│
|
|
106
105
|
├── Patterns
|
|
107
|
-
│ ├── Any
|
|
108
106
|
│ ├── Domain
|
|
109
107
|
│ ├── Email
|
|
110
108
|
│ ├── HTTP
|
|
@@ -305,7 +303,6 @@ Convert your Yuppi schema into [JSON Schema](https://json-schema.org).
|
|
|
305
303
|
> type: "string",
|
|
306
304
|
> minLength: 1,
|
|
307
305
|
> maxLength: 32,
|
|
308
|
-
> pattern: "[\\s\\S]*"
|
|
309
306
|
> },
|
|
310
307
|
> username: {
|
|
311
308
|
> type: "string",
|
|
@@ -331,7 +328,6 @@ Convert your Yuppi schema into [JSON Schema](https://json-schema.org).
|
|
|
331
328
|
|
|
332
329
|
| Pattern | Description | Examples |
|
|
333
330
|
| ------------- | ------------------------------ | -------------------------------------------------------------------------------- |
|
|
334
|
-
| [Any] | Everything will pass. | `"Yuppi!"` ✅<br/>`" "` ✅ |
|
|
335
331
|
| [Domain] | Domains. | `"google.com"` ✅<br/>`"www.google.com"` ✅<br/>`"https://google.com"` ❌ |
|
|
336
332
|
| [Email] | Emails. | `"fir4tozden@gmail.com"` ✅<br/>`"fir4tozden+2@gmail.com"` ❌ |
|
|
337
333
|
| [HTTP] | HTTP only links. | `"https://google.com"` ✅<br/>`"http://google.com"` ✅<br/>`"google.com"` ❌ |
|
package/dist/main.d.mts
CHANGED
|
@@ -122,8 +122,6 @@ declare class Yuppi {
|
|
|
122
122
|
convertToJSONSchema(schema: Schema): JSONSchema;
|
|
123
123
|
}
|
|
124
124
|
|
|
125
|
-
declare const Any = "[\\s\\S]*";
|
|
126
|
-
|
|
127
125
|
declare const Domain = "^([a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,}$";
|
|
128
126
|
|
|
129
127
|
declare const Email = "^[a-zA-Z0-9._-]+@([a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,}$";
|
|
@@ -136,7 +134,6 @@ declare const URI = "^([a-zA-Z][a-zA-Z0-9+\\-.]*:\\/\\/)([a-zA-Z0-9._%+-]+(:[a-z
|
|
|
136
134
|
|
|
137
135
|
declare const Username = "^(?=.*[a-zA-Z])[a-zA-Z0-9][a-zA-Z0-9_]*$";
|
|
138
136
|
|
|
139
|
-
declare const Patterns_barrel_Any: typeof Any;
|
|
140
137
|
declare const Patterns_barrel_Domain: typeof Domain;
|
|
141
138
|
declare const Patterns_barrel_Email: typeof Email;
|
|
142
139
|
declare const Patterns_barrel_HTTP: typeof HTTP;
|
|
@@ -144,7 +141,7 @@ declare const Patterns_barrel_PhoneNumber: typeof PhoneNumber;
|
|
|
144
141
|
declare const Patterns_barrel_URI: typeof URI;
|
|
145
142
|
declare const Patterns_barrel_Username: typeof Username;
|
|
146
143
|
declare namespace Patterns_barrel {
|
|
147
|
-
export {
|
|
144
|
+
export { Patterns_barrel_Domain as Domain, Patterns_barrel_Email as Email, Patterns_barrel_HTTP as HTTP, Patterns_barrel_PhoneNumber as PhoneNumber, Patterns_barrel_URI as URI, Patterns_barrel_Username as Username };
|
|
148
145
|
}
|
|
149
146
|
|
|
150
147
|
type ValidationError = ValidationError$1;
|
package/dist/main.d.ts
CHANGED
|
@@ -122,8 +122,6 @@ declare class Yuppi {
|
|
|
122
122
|
convertToJSONSchema(schema: Schema): JSONSchema;
|
|
123
123
|
}
|
|
124
124
|
|
|
125
|
-
declare const Any = "[\\s\\S]*";
|
|
126
|
-
|
|
127
125
|
declare const Domain = "^([a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,}$";
|
|
128
126
|
|
|
129
127
|
declare const Email = "^[a-zA-Z0-9._-]+@([a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,}$";
|
|
@@ -136,7 +134,6 @@ declare const URI = "^([a-zA-Z][a-zA-Z0-9+\\-.]*:\\/\\/)([a-zA-Z0-9._%+-]+(:[a-z
|
|
|
136
134
|
|
|
137
135
|
declare const Username = "^(?=.*[a-zA-Z])[a-zA-Z0-9][a-zA-Z0-9_]*$";
|
|
138
136
|
|
|
139
|
-
declare const Patterns_barrel_Any: typeof Any;
|
|
140
137
|
declare const Patterns_barrel_Domain: typeof Domain;
|
|
141
138
|
declare const Patterns_barrel_Email: typeof Email;
|
|
142
139
|
declare const Patterns_barrel_HTTP: typeof HTTP;
|
|
@@ -144,7 +141,7 @@ declare const Patterns_barrel_PhoneNumber: typeof PhoneNumber;
|
|
|
144
141
|
declare const Patterns_barrel_URI: typeof URI;
|
|
145
142
|
declare const Patterns_barrel_Username: typeof Username;
|
|
146
143
|
declare namespace Patterns_barrel {
|
|
147
|
-
export {
|
|
144
|
+
export { Patterns_barrel_Domain as Domain, Patterns_barrel_Email as Email, Patterns_barrel_HTTP as HTTP, Patterns_barrel_PhoneNumber as PhoneNumber, Patterns_barrel_URI as URI, Patterns_barrel_Username as Username };
|
|
148
145
|
}
|
|
149
146
|
|
|
150
147
|
type ValidationError = ValidationError$1;
|
package/dist/main.js
CHANGED
|
@@ -40,11 +40,6 @@ var import_lodash = __toESM(require("lodash"));
|
|
|
40
40
|
|
|
41
41
|
// src/utils/ConvertToYup.util.ts
|
|
42
42
|
var Yup = __toESM(require("yup"));
|
|
43
|
-
|
|
44
|
-
// src/patterns/Any.pattern.ts
|
|
45
|
-
var Any = "[\\s\\S]*";
|
|
46
|
-
|
|
47
|
-
// src/utils/ConvertToYup.util.ts
|
|
48
43
|
var convertToYup = (schema, error_messages) => {
|
|
49
44
|
const base = (schema2, key, config) => {
|
|
50
45
|
schema2 = schema2.nullable();
|
|
@@ -74,7 +69,7 @@ var convertToYup = (schema, error_messages) => {
|
|
|
74
69
|
config.enum.map((item) => item.trim()),
|
|
75
70
|
({ path }) => (error_messages?.string?.enum ?? "").replaceAll("{path}", path)
|
|
76
71
|
);
|
|
77
|
-
if (config.pattern) schema2 = schema2.matches(new RegExp(config.pattern
|
|
72
|
+
if (config.pattern) schema2 = schema2.matches(new RegExp(config.pattern), ({ path }) => (error_messages?.string?.pattern ?? "").replaceAll("{path}", path).replaceAll("{pattern}", config.pattern ? new RegExp(config.pattern).source : ""));
|
|
78
73
|
if (config.min)
|
|
79
74
|
schema2 = schema2.min(
|
|
80
75
|
config.min,
|
|
@@ -148,7 +143,7 @@ var convertToJSONSchema = (schema) => {
|
|
|
148
143
|
const build = (key, config) => {
|
|
149
144
|
let schema2;
|
|
150
145
|
if (config.type === "string") {
|
|
151
|
-
schema2 = import_typebox.Type.String({ enum: config.enum, minLength: config.min, maxLength: config.max, pattern: new RegExp(config.pattern
|
|
146
|
+
schema2 = import_typebox.Type.String({ enum: config.enum, minLength: config.min, maxLength: config.max, pattern: config.pattern ? new RegExp(config.pattern).source : void 0, default: config.default });
|
|
152
147
|
schema2 = base(schema2, key, config);
|
|
153
148
|
return schema2;
|
|
154
149
|
} else if (config.type === "number") {
|
|
@@ -247,7 +242,6 @@ var Yuppi = class {
|
|
|
247
242
|
// src/barrels/Patterns.barrel.ts
|
|
248
243
|
var Patterns_barrel_exports = {};
|
|
249
244
|
__export(Patterns_barrel_exports, {
|
|
250
|
-
Any: () => Any,
|
|
251
245
|
Domain: () => Domain,
|
|
252
246
|
Email: () => Email,
|
|
253
247
|
HTTP: () => HTTP,
|
package/dist/main.mjs
CHANGED
|
@@ -9,11 +9,6 @@ import _ from "lodash";
|
|
|
9
9
|
|
|
10
10
|
// src/utils/ConvertToYup.util.ts
|
|
11
11
|
import * as Yup from "yup";
|
|
12
|
-
|
|
13
|
-
// src/patterns/Any.pattern.ts
|
|
14
|
-
var Any = "[\\s\\S]*";
|
|
15
|
-
|
|
16
|
-
// src/utils/ConvertToYup.util.ts
|
|
17
12
|
var convertToYup = (schema, error_messages) => {
|
|
18
13
|
const base = (schema2, key, config) => {
|
|
19
14
|
schema2 = schema2.nullable();
|
|
@@ -43,7 +38,7 @@ var convertToYup = (schema, error_messages) => {
|
|
|
43
38
|
config.enum.map((item) => item.trim()),
|
|
44
39
|
({ path }) => (error_messages?.string?.enum ?? "").replaceAll("{path}", path)
|
|
45
40
|
);
|
|
46
|
-
if (config.pattern) schema2 = schema2.matches(new RegExp(config.pattern
|
|
41
|
+
if (config.pattern) schema2 = schema2.matches(new RegExp(config.pattern), ({ path }) => (error_messages?.string?.pattern ?? "").replaceAll("{path}", path).replaceAll("{pattern}", config.pattern ? new RegExp(config.pattern).source : ""));
|
|
47
42
|
if (config.min)
|
|
48
43
|
schema2 = schema2.min(
|
|
49
44
|
config.min,
|
|
@@ -117,7 +112,7 @@ var convertToJSONSchema = (schema) => {
|
|
|
117
112
|
const build = (key, config) => {
|
|
118
113
|
let schema2;
|
|
119
114
|
if (config.type === "string") {
|
|
120
|
-
schema2 = Type.String({ enum: config.enum, minLength: config.min, maxLength: config.max, pattern: new RegExp(config.pattern
|
|
115
|
+
schema2 = Type.String({ enum: config.enum, minLength: config.min, maxLength: config.max, pattern: config.pattern ? new RegExp(config.pattern).source : void 0, default: config.default });
|
|
121
116
|
schema2 = base(schema2, key, config);
|
|
122
117
|
return schema2;
|
|
123
118
|
} else if (config.type === "number") {
|
|
@@ -216,7 +211,6 @@ var Yuppi = class {
|
|
|
216
211
|
// src/barrels/Patterns.barrel.ts
|
|
217
212
|
var Patterns_barrel_exports = {};
|
|
218
213
|
__export(Patterns_barrel_exports, {
|
|
219
|
-
Any: () => Any,
|
|
220
214
|
Domain: () => Domain,
|
|
221
215
|
Email: () => Email,
|
|
222
216
|
HTTP: () => HTTP,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "yuppi",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.12",
|
|
4
4
|
"description": "Schemas that can be converted to Yup and JSON Schema.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"homepage": "https://github.com/keift/yuppi",
|
|
@@ -31,6 +31,7 @@
|
|
|
31
31
|
},
|
|
32
32
|
"keywords": [
|
|
33
33
|
"validate",
|
|
34
|
+
"validation",
|
|
34
35
|
"typecheck",
|
|
35
36
|
"yup",
|
|
36
37
|
"json-schema",
|