@docusaurus/utils-validation 0.0.0-4518 → 0.0.0-4524
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/lib/JoiFrontMatter.d.ts +8 -0
- package/lib/JoiFrontMatter.d.ts.map +1 -1
- package/lib/JoiFrontMatter.js +8 -5
- package/lib/JoiFrontMatter.js.map +1 -1
- package/lib/validationSchemas.d.ts.map +1 -1
- package/lib/validationSchemas.js +2 -1
- package/lib/validationSchemas.js.map +1 -1
- package/lib/validationUtils.d.ts.map +1 -1
- package/lib/validationUtils.js +5 -9
- package/lib/validationUtils.js.map +1 -1
- package/package.json +4 -4
- package/src/JoiFrontMatter.ts +8 -5
- package/src/validationSchemas.ts +2 -1
- package/src/validationUtils.ts +5 -7
package/lib/JoiFrontMatter.d.ts
CHANGED
|
@@ -5,5 +5,13 @@
|
|
|
5
5
|
* LICENSE file in the root directory of this source tree.
|
|
6
6
|
*/
|
|
7
7
|
import Joi from './Joi';
|
|
8
|
+
/**
|
|
9
|
+
* Enhance the default Joi.string() type so that it can convert number to
|
|
10
|
+
* strings. If user use front matter "tag: 2021", we shouldn't need to ask her
|
|
11
|
+
* to write "tag: '2021'". Also yaml tries to convert patterns like "2019-01-01"
|
|
12
|
+
* to dates automatically.
|
|
13
|
+
* @see https://github.com/facebook/docusaurus/issues/4642
|
|
14
|
+
* @see https://github.com/sideway/joi/issues/1442#issuecomment-823997884
|
|
15
|
+
*/
|
|
8
16
|
export declare const JoiFrontMatter: typeof Joi;
|
|
9
17
|
//# sourceMappingURL=JoiFrontMatter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JoiFrontMatter.d.ts","sourceRoot":"","sources":["../src/JoiFrontMatter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,GAAG,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"JoiFrontMatter.d.ts","sourceRoot":"","sources":["../src/JoiFrontMatter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,GAAG,MAAM,OAAO,CAAC;AAaxB;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,EAAE,OAAO,GAAsC,CAAC"}
|
package/lib/JoiFrontMatter.js
CHANGED
|
@@ -9,11 +9,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
9
9
|
exports.JoiFrontMatter = void 0;
|
|
10
10
|
const tslib_1 = require("tslib");
|
|
11
11
|
const Joi_1 = (0, tslib_1.__importDefault)(require("./Joi"));
|
|
12
|
-
// Enhance the default Joi.string() type so that it can convert number to strings
|
|
13
|
-
// If user use front matter "tag: 2021", we shouldn't need to ask the user to write "tag: '2021'"
|
|
14
|
-
// Also yaml tries to convert patterns like "2019-01-01" to dates automatically
|
|
15
|
-
// see https://github.com/facebook/docusaurus/issues/4642
|
|
16
|
-
// see https://github.com/sideway/joi/issues/1442#issuecomment-823997884
|
|
17
12
|
const JoiFrontMatterString = {
|
|
18
13
|
type: 'string',
|
|
19
14
|
base: Joi_1.default.string(),
|
|
@@ -25,5 +20,13 @@ const JoiFrontMatterString = {
|
|
|
25
20
|
return { value };
|
|
26
21
|
},
|
|
27
22
|
};
|
|
23
|
+
/**
|
|
24
|
+
* Enhance the default Joi.string() type so that it can convert number to
|
|
25
|
+
* strings. If user use front matter "tag: 2021", we shouldn't need to ask her
|
|
26
|
+
* to write "tag: '2021'". Also yaml tries to convert patterns like "2019-01-01"
|
|
27
|
+
* to dates automatically.
|
|
28
|
+
* @see https://github.com/facebook/docusaurus/issues/4642
|
|
29
|
+
* @see https://github.com/sideway/joi/issues/1442#issuecomment-823997884
|
|
30
|
+
*/
|
|
28
31
|
exports.JoiFrontMatter = Joi_1.default.extend(JoiFrontMatterString);
|
|
29
32
|
//# sourceMappingURL=JoiFrontMatter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JoiFrontMatter.js","sourceRoot":"","sources":["../src/JoiFrontMatter.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;AAEH,6DAAwB;AAExB,
|
|
1
|
+
{"version":3,"file":"JoiFrontMatter.js","sourceRoot":"","sources":["../src/JoiFrontMatter.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;AAEH,6DAAwB;AAExB,MAAM,oBAAoB,GAAkB;IAC1C,IAAI,EAAE,QAAQ;IACd,IAAI,EAAE,aAAG,CAAC,MAAM,EAAE;IAClB,2EAA2E;IAC3E,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;QACjB,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,YAAY,IAAI,EAAE;YACtD,OAAO,EAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAC,CAAC;SAClC;QACD,OAAO,EAAC,KAAK,EAAC,CAAC;IACjB,CAAC;CACF,CAAC;AACF;;;;;;;GAOG;AACU,QAAA,cAAc,GAAe,aAAG,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validationSchemas.d.ts","sourceRoot":"","sources":["../src/validationSchemas.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,GAAG,MAAM,OAAO,CAAC;AAKxB,eAAO,MAAM,cAAc,kBAEE,CAAC;AAU9B,eAAO,MAAM,mBAAmB,iBAAwB,CAAC;AACzD,eAAO,MAAM,mBAAmB,iBAAwB,CAAC;AAEzD,eAAO,MAAM,iBAAiB,uBAA2B,CAAC;AAI1D,eAAO,MAAM,SAAS,
|
|
1
|
+
{"version":3,"file":"validationSchemas.d.ts","sourceRoot":"","sources":["../src/validationSchemas.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,GAAG,MAAM,OAAO,CAAC;AAKxB,eAAO,MAAM,cAAc,kBAEE,CAAC;AAU9B,eAAO,MAAM,mBAAmB,iBAAwB,CAAC;AACzD,eAAO,MAAM,mBAAmB,iBAAwB,CAAC;AAEzD,eAAO,MAAM,iBAAiB,uBAA2B,CAAC;AAI1D,eAAO,MAAM,SAAS,wBAgBpB,CAAC;AAEH,eAAO,MAAM,cAAc,kBASxB,CAAC;AAeJ,eAAO,MAAM,qBAAqB,iBAK9B,CAAC;AAEL,eAAO,MAAM,2BAA2B;;;CASvC,CAAC"}
|
package/lib/validationSchemas.js
CHANGED
|
@@ -23,7 +23,8 @@ exports.AdmonitionsSchema = Joi_1.default.object().default({});
|
|
|
23
23
|
// TODO how can we make this emit a custom error message :'(
|
|
24
24
|
// Joi is such a pain, good luck to annoying trying to improve this
|
|
25
25
|
exports.URISchema = Joi_1.default.alternatives(Joi_1.default.string().uri({ allowRelative: true }),
|
|
26
|
-
// This custom validation logic is required notably because Joi does not
|
|
26
|
+
// This custom validation logic is required notably because Joi does not
|
|
27
|
+
// accept paths like /a/b/c ...
|
|
27
28
|
Joi_1.default.custom((val, helpers) => {
|
|
28
29
|
try {
|
|
29
30
|
// eslint-disable-next-line no-new
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validationSchemas.js","sourceRoot":"","sources":["../src/validationSchemas.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;AAEH,6DAAwB;AACxB,6CAAqE;AAErE,qDAAgD;AAEnC,QAAA,cAAc,GAAG,aAAG,CAAC,MAAM,EAAE;KACvC,KAAK,CAAC,eAAe,CAAC;KACtB,OAAO,CAAC,yBAAiB,CAAC,CAAC;AAE9B,MAAM,qBAAqB,GAAG,aAAG,CAAC,KAAK,EAAE;KACtC,KAAK,CACJ,aAAG,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,aAAG,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,EACvE,aAAG,CAAC,QAAQ,EAAE,EACd,aAAG,CAAC,MAAM,EAAE,CACb;KACA,OAAO,CAAC,EAAE,CAAC,CAAC;AAEF,QAAA,mBAAmB,GAAG,qBAAqB,CAAC;AAC5C,QAAA,mBAAmB,GAAG,qBAAqB,CAAC;AAE5C,QAAA,iBAAiB,GAAG,aAAG,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AAE1D,4DAA4D;AAC5D,oEAAoE;AACvD,QAAA,SAAS,GAAG,aAAG,CAAC,YAAY,CACvC,aAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAC,aAAa,EAAE,IAAI,EAAC,CAAC;AACvC,
|
|
1
|
+
{"version":3,"file":"validationSchemas.js","sourceRoot":"","sources":["../src/validationSchemas.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validationUtils.d.ts","sourceRoot":"","sources":["../src/validationUtils.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAU7B,eAAO,MAAM,+BAA+B,SACU,CAAC;AAMvD,eAAO,MAAM,0BAA0B,QAAO,IAK7C,CAAC;AAEF,wBAAgB,YAAY,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,eAAe,GAAG,IAAI,CAOhE;AAED,wBAAgB,sBAAsB,CAAC,CAAC,SAAS;IAAC,EAAE,CAAC,EAAE,MAAM,CAAA;CAAC,EAC5D,MAAM,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAC3B,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAClB,CAAC,
|
|
1
|
+
{"version":3,"file":"validationUtils.d.ts","sourceRoot":"","sources":["../src/validationUtils.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAU7B,eAAO,MAAM,+BAA+B,SACU,CAAC;AAMvD,eAAO,MAAM,0BAA0B,QAAO,IAK7C,CAAC;AAEF,wBAAgB,YAAY,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,eAAe,GAAG,IAAI,CAOhE;AAED,wBAAgB,sBAAsB,CAAC,CAAC,SAAS;IAAC,EAAE,CAAC,EAAE,MAAM,CAAA;CAAC,EAC5D,MAAM,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAC3B,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAClB,CAAC,CAsBH;AAED,wBAAgB,oBAAoB,CAAC,CAAC,EACpC,MAAM,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAC3B,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,GACtB,CAAC,CAqBH;AAED,wBAAgB,mBAAmB,CAAC,CAAC,EACnC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpC,MAAM,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,GAC1B,CAAC,CAyBH"}
|
package/lib/validationUtils.js
CHANGED
|
@@ -52,11 +52,9 @@ function normalizePluginOptions(schema, options) {
|
|
|
52
52
|
logger_1.default.error(error);
|
|
53
53
|
return options;
|
|
54
54
|
}
|
|
55
|
-
|
|
56
|
-
throw error;
|
|
57
|
-
}
|
|
55
|
+
throw error;
|
|
58
56
|
}
|
|
59
|
-
return value; // TODO remove !
|
|
57
|
+
return value; // TODO remove this ! in TS 4.6, see https://twitter.com/sebastienlorber/status/1481950042277793793
|
|
60
58
|
}
|
|
61
59
|
exports.normalizePluginOptions = normalizePluginOptions;
|
|
62
60
|
function normalizeThemeConfig(schema, themeConfig) {
|
|
@@ -74,11 +72,9 @@ function normalizeThemeConfig(schema, themeConfig) {
|
|
|
74
72
|
logger_1.default.error(error);
|
|
75
73
|
return themeConfig;
|
|
76
74
|
}
|
|
77
|
-
|
|
78
|
-
throw error;
|
|
79
|
-
}
|
|
75
|
+
throw error;
|
|
80
76
|
}
|
|
81
|
-
return value; // TODO remove !
|
|
77
|
+
return value; // TODO remove this ! in TS 4.6
|
|
82
78
|
}
|
|
83
79
|
exports.normalizeThemeConfig = normalizeThemeConfig;
|
|
84
80
|
function validateFrontMatter(frontMatter, schema) {
|
|
@@ -100,7 +96,7 @@ ${errorDetails.map(({ message }) => message)}
|
|
|
100
96
|
`;
|
|
101
97
|
throw error;
|
|
102
98
|
}
|
|
103
|
-
return value; // TODO remove !
|
|
99
|
+
return value; // TODO remove this ! in TS 4.6
|
|
104
100
|
}
|
|
105
101
|
exports.validateFrontMatter = validateFrontMatter;
|
|
106
102
|
//# sourceMappingURL=validationUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validationUtils.js","sourceRoot":"","sources":["../src/validationUtils.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;AAGH,6EAAwC;AACxC,2DAAmD;AAEnD,+DAA+D;AAC/D,iDAAiD;AACjD,4EAA4E;AAC5E,oEAAoE;AACpE,6EAA6E;AAC7E,2EAA2E;AAC9D,QAAA,+BAA+B,GAC1C,OAAO,CAAC,GAAG,CAAC,6BAA6B,KAAK,MAAM,CAAC;AAEvD,IAAI,uCAA+B,EAAE;IACnC,gBAAM,CAAC,KAAK,CAAA,+BAA+B,+BAA+B,sCAAsC,CAAC;CAClH;AAEM,MAAM,0BAA0B,GAAG,GAAS,EAAE;IACnD,gBAAM,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAC7C,gBAAM,CAAC,IAAI,CAAC;;4FAE8E,CAAC,CAAC;AAC9F,CAAC,CAAC;AALW,QAAA,0BAA0B,8BAKrC;AAEF,SAAgB,YAAY,CAAC,OAA6B;IACxD,IAAI,OAAO,EAAE;QACX,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO;aACpC,GAAG,CAAC,CAAC,EAAC,OAAO,EAAC,EAAE,EAAE,CAAC,OAAO,CAAC;aAC3B,IAAI,CAAC,IAAI,CAAC,CAAC;QACd,gBAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;KAC9B;AACH,CAAC;AAPD,oCAOC;AAED,SAAgB,sBAAsB,CACpC,MAA2B,EAC3B,OAAmB;IAEnB,sEAAsE;IACtE,yCAAyC;IACzC,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC;QAChC,EAAE,EAAE,kCAAc;KACnB,CAAC,CAAC;IACH,MAAM,EAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAC,GAAG,WAAW,CAAC,QAAQ,CAAC,OAAO,EAAE;QAC5D,OAAO,EAAE,KAAK;KACf,CAAC,CAAC;IAEH,YAAY,CAAC,OAAO,CAAC,CAAC;IAEtB,IAAI,KAAK,EAAE;QACT,IAAA,kCAA0B,GAAE,CAAC;QAC7B,IAAI,uCAA+B,EAAE;YACnC,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACpB,OAAO,OAAY,CAAC;SACrB;
|
|
1
|
+
{"version":3,"file":"validationUtils.js","sourceRoot":"","sources":["../src/validationUtils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@docusaurus/utils-validation",
|
|
3
|
-
"version": "0.0.0-
|
|
3
|
+
"version": "0.0.0-4524",
|
|
4
4
|
"description": "Node validation utility functions for Docusaurus packages.",
|
|
5
5
|
"main": "./lib/index.js",
|
|
6
6
|
"types": "./lib/index.d.ts",
|
|
@@ -18,8 +18,8 @@
|
|
|
18
18
|
},
|
|
19
19
|
"license": "MIT",
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@docusaurus/logger": "0.0.0-
|
|
22
|
-
"@docusaurus/utils": "0.0.0-
|
|
21
|
+
"@docusaurus/logger": "0.0.0-4524",
|
|
22
|
+
"@docusaurus/utils": "0.0.0-4524",
|
|
23
23
|
"joi": "^17.4.2",
|
|
24
24
|
"tslib": "^2.3.1"
|
|
25
25
|
},
|
|
@@ -32,5 +32,5 @@
|
|
|
32
32
|
"engines": {
|
|
33
33
|
"node": ">=14"
|
|
34
34
|
},
|
|
35
|
-
"gitHead": "
|
|
35
|
+
"gitHead": "41a6bff3a67446f7d2a2972cbe4d05fec7378a15"
|
|
36
36
|
}
|
package/src/JoiFrontMatter.ts
CHANGED
|
@@ -7,11 +7,6 @@
|
|
|
7
7
|
|
|
8
8
|
import Joi from './Joi';
|
|
9
9
|
|
|
10
|
-
// Enhance the default Joi.string() type so that it can convert number to strings
|
|
11
|
-
// If user use front matter "tag: 2021", we shouldn't need to ask the user to write "tag: '2021'"
|
|
12
|
-
// Also yaml tries to convert patterns like "2019-01-01" to dates automatically
|
|
13
|
-
// see https://github.com/facebook/docusaurus/issues/4642
|
|
14
|
-
// see https://github.com/sideway/joi/issues/1442#issuecomment-823997884
|
|
15
10
|
const JoiFrontMatterString: Joi.Extension = {
|
|
16
11
|
type: 'string',
|
|
17
12
|
base: Joi.string(),
|
|
@@ -23,4 +18,12 @@ const JoiFrontMatterString: Joi.Extension = {
|
|
|
23
18
|
return {value};
|
|
24
19
|
},
|
|
25
20
|
};
|
|
21
|
+
/**
|
|
22
|
+
* Enhance the default Joi.string() type so that it can convert number to
|
|
23
|
+
* strings. If user use front matter "tag: 2021", we shouldn't need to ask her
|
|
24
|
+
* to write "tag: '2021'". Also yaml tries to convert patterns like "2019-01-01"
|
|
25
|
+
* to dates automatically.
|
|
26
|
+
* @see https://github.com/facebook/docusaurus/issues/4642
|
|
27
|
+
* @see https://github.com/sideway/joi/issues/1442#issuecomment-823997884
|
|
28
|
+
*/
|
|
26
29
|
export const JoiFrontMatter: typeof Joi = Joi.extend(JoiFrontMatterString);
|
package/src/validationSchemas.ts
CHANGED
|
@@ -31,7 +31,8 @@ export const AdmonitionsSchema = Joi.object().default({});
|
|
|
31
31
|
// Joi is such a pain, good luck to annoying trying to improve this
|
|
32
32
|
export const URISchema = Joi.alternatives(
|
|
33
33
|
Joi.string().uri({allowRelative: true}),
|
|
34
|
-
// This custom validation logic is required notably because Joi does not
|
|
34
|
+
// This custom validation logic is required notably because Joi does not
|
|
35
|
+
// accept paths like /a/b/c ...
|
|
35
36
|
Joi.custom((val, helpers) => {
|
|
36
37
|
try {
|
|
37
38
|
// eslint-disable-next-line no-new
|
package/src/validationUtils.ts
CHANGED
|
@@ -58,12 +58,11 @@ export function normalizePluginOptions<T extends {id?: string}>(
|
|
|
58
58
|
if (isValidationDisabledEscapeHatch) {
|
|
59
59
|
logger.error(error);
|
|
60
60
|
return options as T;
|
|
61
|
-
} else {
|
|
62
|
-
throw error;
|
|
63
61
|
}
|
|
62
|
+
throw error;
|
|
64
63
|
}
|
|
65
64
|
|
|
66
|
-
return value!; // TODO remove !
|
|
65
|
+
return value!; // TODO remove this ! in TS 4.6, see https://twitter.com/sebastienlorber/status/1481950042277793793
|
|
67
66
|
}
|
|
68
67
|
|
|
69
68
|
export function normalizeThemeConfig<T>(
|
|
@@ -86,11 +85,10 @@ export function normalizeThemeConfig<T>(
|
|
|
86
85
|
if (isValidationDisabledEscapeHatch) {
|
|
87
86
|
logger.error(error);
|
|
88
87
|
return themeConfig as T;
|
|
89
|
-
} else {
|
|
90
|
-
throw error;
|
|
91
88
|
}
|
|
89
|
+
throw error;
|
|
92
90
|
}
|
|
93
|
-
return value!; // TODO remove !
|
|
91
|
+
return value!; // TODO remove this ! in TS 4.6
|
|
94
92
|
}
|
|
95
93
|
|
|
96
94
|
export function validateFrontMatter<T>(
|
|
@@ -120,5 +118,5 @@ ${errorDetails.map(({message}) => message)}
|
|
|
120
118
|
throw error;
|
|
121
119
|
}
|
|
122
120
|
|
|
123
|
-
return value!; // TODO remove !
|
|
121
|
+
return value!; // TODO remove this ! in TS 4.6
|
|
124
122
|
}
|