@squiz/dx-json-schema-lib 1.21.1-alpha.13 → 1.21.1-alpha.16

Sign up to get free protection for your applications and to get access to all the features.
Files changed (67) hide show
  1. package/.npm/_logs/2023-03-15T00_26_26_642Z-debug-0.log +37 -0
  2. package/lib/JsonValidationService.d.ts +1 -1
  3. package/lib/JsonValidationService.js +15 -5
  4. package/lib/JsonValidationService.js.map +1 -1
  5. package/lib/JsonValidationService.spec.js +444 -445
  6. package/lib/JsonValidationService.spec.js.map +1 -1
  7. package/lib/index.d.ts +5 -1
  8. package/lib/index.js +5 -1
  9. package/lib/index.js.map +1 -1
  10. package/lib/jsonTypeResolution/{arbitraryTypeResolution.d.ts → TypeResolver.d.ts} +7 -12
  11. package/lib/jsonTypeResolution/{arbitraryTypeResolution.js → TypeResolver.js} +17 -17
  12. package/lib/jsonTypeResolution/TypeResolver.js.map +1 -0
  13. package/lib/jsonTypeResolution/{arbitraryTypeResolution.spec.js → TypeResolver.spec.js} +12 -39
  14. package/lib/jsonTypeResolution/TypeResolver.spec.js.map +1 -0
  15. package/lib/jsonTypeResolution/TypeResolverBuilder.d.ts +12 -0
  16. package/lib/jsonTypeResolution/TypeResolverBuilder.js +32 -0
  17. package/lib/jsonTypeResolution/TypeResolverBuilder.js.map +1 -0
  18. package/lib/manifest/v1/DxContentMetaSchema.json +1 -1
  19. package/lib/manifest/v1/MatrixAssetSchema.json +28 -8
  20. package/lib/manifest/v1/v1.d.ts +10 -7
  21. package/lib/primitiveTypes/FormattedText.d.ts +8 -0
  22. package/lib/primitiveTypes/FormattedText.js +21 -0
  23. package/lib/primitiveTypes/FormattedText.js.map +1 -0
  24. package/lib/primitiveTypes/SquizImage.d.ts +26 -0
  25. package/lib/primitiveTypes/SquizImage.js +105 -0
  26. package/lib/primitiveTypes/SquizImage.js.map +1 -0
  27. package/lib/primitiveTypes/index.d.ts +2 -0
  28. package/lib/primitiveTypes/index.js +19 -0
  29. package/lib/primitiveTypes/index.js.map +1 -0
  30. package/lib/resolvableTypes/MatrixAsset.d.ts +9 -0
  31. package/lib/resolvableTypes/MatrixAsset.js +21 -0
  32. package/lib/resolvableTypes/MatrixAsset.js.map +1 -0
  33. package/lib/resolvableTypes/index.d.ts +1 -0
  34. package/lib/resolvableTypes/index.js +18 -0
  35. package/lib/resolvableTypes/index.js.map +1 -0
  36. package/package.json +5 -4
  37. package/src/JsonValidationService.spec.ts +585 -584
  38. package/src/JsonValidationService.ts +19 -9
  39. package/src/index.ts +6 -1
  40. package/src/jsonTypeResolution/{arbitraryTypeResolution.spec.ts → TypeResolver.spec.ts} +23 -70
  41. package/src/jsonTypeResolution/{arbitraryTypeResolution.ts → TypeResolver.ts} +27 -23
  42. package/src/jsonTypeResolution/TypeResolverBuilder.ts +43 -0
  43. package/src/manifest/v1/DxContentMetaSchema.json +1 -1
  44. package/src/manifest/v1/MatrixAssetSchema.json +28 -8
  45. package/src/manifest/v1/v1.ts +22 -9
  46. package/src/primitiveTypes/FormattedText.ts +24 -0
  47. package/src/primitiveTypes/SquizImage.ts +128 -0
  48. package/src/primitiveTypes/index.ts +2 -0
  49. package/src/resolvableTypes/MatrixAsset.ts +24 -0
  50. package/src/resolvableTypes/index.ts +1 -0
  51. package/tsconfig.tsbuildinfo +1 -1
  52. package/.npm/_logs/2023-03-14T06_15_33_115Z-debug-0.log +0 -39
  53. package/lib/jsonTypeResolution/arbitraryTypeResolution.js.map +0 -1
  54. package/lib/jsonTypeResolution/arbitraryTypeResolution.spec.js.map +0 -1
  55. package/lib/jsonTypeResolution/index.d.ts +0 -76
  56. package/lib/jsonTypeResolution/index.js +0 -35
  57. package/lib/jsonTypeResolution/index.js.map +0 -1
  58. package/lib/jsonTypeResolution/primitiveTypes.d.ts +0 -10
  59. package/lib/jsonTypeResolution/primitiveTypes.js +0 -27
  60. package/lib/jsonTypeResolution/primitiveTypes.js.map +0 -1
  61. package/lib/jsonTypeResolution/resolvableTypes.d.ts +0 -12
  62. package/lib/jsonTypeResolution/resolvableTypes.js +0 -30
  63. package/lib/jsonTypeResolution/resolvableTypes.js.map +0 -1
  64. package/src/jsonTypeResolution/index.ts +0 -16
  65. package/src/jsonTypeResolution/primitiveTypes.ts +0 -32
  66. package/src/jsonTypeResolution/resolvableTypes.ts +0 -37
  67. /package/lib/jsonTypeResolution/{arbitraryTypeResolution.spec.d.ts → TypeResolver.spec.d.ts} +0 -0
@@ -0,0 +1,26 @@
1
+ import { PrimitiveType } from '../jsonTypeResolution/TypeResolver';
2
+ interface SquizImageData {
3
+ width: number;
4
+ height: number;
5
+ url: string;
6
+ mimeType: string;
7
+ byteSize: number;
8
+ sha1Hash: string;
9
+ aspectRatio: string;
10
+ }
11
+ interface SquizImageShape {
12
+ name: string;
13
+ alt?: string;
14
+ caption?: string;
15
+ exif?: import('exif').ExifData;
16
+ imageVariations: {
17
+ original: SquizImageData;
18
+ small?: SquizImageData[];
19
+ medium?: SquizImageData[];
20
+ large?: SquizImageData[];
21
+ aspectRatios?: SquizImageData[];
22
+ };
23
+ }
24
+ export declare const SquizImageType: PrimitiveType<"SquizImage", SquizImageShape>;
25
+ export type SquizImageType = typeof SquizImageType;
26
+ export {};
@@ -0,0 +1,105 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.SquizImageType = void 0;
4
+ const TypeResolver_1 = require("../jsonTypeResolution/TypeResolver");
5
+ exports.SquizImageType = (0, TypeResolver_1.PrimitiveType)({
6
+ title: 'SquizImage',
7
+ type: 'object',
8
+ properties: {
9
+ name: {
10
+ type: 'string',
11
+ },
12
+ alt: {
13
+ type: 'string',
14
+ },
15
+ caption: {
16
+ type: 'string',
17
+ },
18
+ exif: {
19
+ type: 'object',
20
+ properties: {
21
+ image: {
22
+ type: 'object',
23
+ },
24
+ thumbnail: {
25
+ type: 'object',
26
+ },
27
+ exif: {
28
+ type: 'object',
29
+ },
30
+ gps: {
31
+ type: 'object',
32
+ },
33
+ interoperability: {
34
+ type: 'object',
35
+ },
36
+ makernote: {
37
+ type: 'object',
38
+ },
39
+ },
40
+ required: ['image', 'thumbnail', 'exif', 'gps', 'interoperability', 'makernote'],
41
+ },
42
+ imageVariations: {
43
+ type: 'object',
44
+ properties: {
45
+ original: { $ref: '#/definitions/SquizImageData' },
46
+ small: {
47
+ type: 'array',
48
+ items: {
49
+ $ref: '#/definitions/SquizImageData',
50
+ },
51
+ },
52
+ medium: {
53
+ type: 'array',
54
+ items: {
55
+ $ref: '#/definitions/SquizImageData',
56
+ },
57
+ },
58
+ large: {
59
+ type: 'array',
60
+ items: {
61
+ $ref: '#/definitions/SquizImageData',
62
+ },
63
+ },
64
+ aspectRatios: {
65
+ type: 'array',
66
+ items: {
67
+ $ref: '#/definitions/SquizImageData',
68
+ },
69
+ },
70
+ },
71
+ required: ['original'],
72
+ },
73
+ },
74
+ required: ['name', 'imageVariations'],
75
+ definitions: {
76
+ SquizImageData: {
77
+ type: 'object',
78
+ properties: {
79
+ width: {
80
+ type: 'number',
81
+ },
82
+ height: {
83
+ type: 'number',
84
+ },
85
+ url: {
86
+ type: 'string',
87
+ },
88
+ mimeType: {
89
+ type: 'string',
90
+ },
91
+ byteSize: {
92
+ type: 'number',
93
+ },
94
+ sha1Hash: {
95
+ type: 'string',
96
+ },
97
+ aspectRatio: {
98
+ type: 'string',
99
+ },
100
+ },
101
+ required: ['width', 'height', 'url', 'mimeType', 'byteSize', 'sha1Hash', 'aspectRatio'],
102
+ },
103
+ },
104
+ });
105
+ //# sourceMappingURL=SquizImage.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"SquizImage.js","sourceRoot":"","sources":["../../src/primitiveTypes/SquizImage.ts"],"names":[],"mappings":";;;AAAA,qEAAmE;AA2BtD,QAAA,cAAc,GAAG,IAAA,4BAAa,EAAgC;IACzE,KAAK,EAAE,YAAY;IACnB,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,IAAI,EAAE;YACJ,IAAI,EAAE,QAAQ;SACf;QACD,GAAG,EAAE;YACH,IAAI,EAAE,QAAQ;SACf;QACD,OAAO,EAAE;YACP,IAAI,EAAE,QAAQ;SACf;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,KAAK,EAAE;oBACL,IAAI,EAAE,QAAQ;iBACf;gBACD,SAAS,EAAE;oBACT,IAAI,EAAE,QAAQ;iBACf;gBACD,IAAI,EAAE;oBACJ,IAAI,EAAE,QAAQ;iBACf;gBACD,GAAG,EAAE;oBACH,IAAI,EAAE,QAAQ;iBACf;gBACD,gBAAgB,EAAE;oBAChB,IAAI,EAAE,QAAQ;iBACf;gBACD,SAAS,EAAE;oBACT,IAAI,EAAE,QAAQ;iBACf;aACF;YACD,QAAQ,EAAE,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,EAAE,WAAW,CAAC;SACjF;QACD,eAAe,EAAE;YACf,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,QAAQ,EAAE,EAAE,IAAI,EAAE,8BAA8B,EAAE;gBAClD,KAAK,EAAE;oBACL,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE;wBACL,IAAI,EAAE,8BAA8B;qBACrC;iBACF;gBACD,MAAM,EAAE;oBACN,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE;wBACL,IAAI,EAAE,8BAA8B;qBACrC;iBACF;gBACD,KAAK,EAAE;oBACL,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE;wBACL,IAAI,EAAE,8BAA8B;qBACrC;iBACF;gBACD,YAAY,EAAE;oBACZ,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE;wBACL,IAAI,EAAE,8BAA8B;qBACrC;iBACF;aACF;YACD,QAAQ,EAAE,CAAC,UAAU,CAAC;SACvB;KACF;IACD,QAAQ,EAAE,CAAC,MAAM,EAAE,iBAAiB,CAAC;IACrC,WAAW,EAAE;QACX,cAAc,EAAE;YACd,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,KAAK,EAAE;oBACL,IAAI,EAAE,QAAQ;iBACf;gBACD,MAAM,EAAE;oBACN,IAAI,EAAE,QAAQ;iBACf;gBACD,GAAG,EAAE;oBACH,IAAI,EAAE,QAAQ;iBACf;gBACD,QAAQ,EAAE;oBACR,IAAI,EAAE,QAAQ;iBACf;gBACD,QAAQ,EAAE;oBACR,IAAI,EAAE,QAAQ;iBACf;gBACD,QAAQ,EAAE;oBACR,IAAI,EAAE,QAAQ;iBACf;gBACD,WAAW,EAAE;oBACX,IAAI,EAAE,QAAQ;iBACf;aACF;YACD,QAAQ,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,aAAa,CAAC;SACxF;KACF;CACF,CAAC,CAAC"}
@@ -0,0 +1,2 @@
1
+ export * from './SquizImage';
2
+ export * from './FormattedText';
@@ -0,0 +1,19 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
+ for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
+ };
16
+ Object.defineProperty(exports, "__esModule", { value: true });
17
+ __exportStar(require("./SquizImage"), exports);
18
+ __exportStar(require("./FormattedText"), exports);
19
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/primitiveTypes/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA6B;AAC7B,kDAAgC"}
@@ -0,0 +1,9 @@
1
+ import { ResolvableType } from '../jsonTypeResolution/TypeResolver';
2
+ interface MatrixAssetShape {
3
+ matrixAssetId: string;
4
+ matrixContentIdentifier: string;
5
+ matrixDomain?: string;
6
+ }
7
+ export declare const MatrixAssetType: ResolvableType<"MatrixAsset", MatrixAssetShape>;
8
+ export type MatrixAssetType = typeof MatrixAssetType;
9
+ export {};
@@ -0,0 +1,21 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.MatrixAssetType = void 0;
4
+ const TypeResolver_1 = require("../jsonTypeResolution/TypeResolver");
5
+ exports.MatrixAssetType = (0, TypeResolver_1.ResolvableType)({
6
+ title: 'MatrixAsset',
7
+ type: 'object',
8
+ properties: {
9
+ matrixAssetId: {
10
+ type: 'string',
11
+ },
12
+ matrixContentIdentifier: {
13
+ type: 'string',
14
+ },
15
+ matrixDomain: {
16
+ type: 'string',
17
+ },
18
+ },
19
+ required: ['matrixAssetId', 'matrixContentIdentifier'],
20
+ });
21
+ //# sourceMappingURL=MatrixAsset.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"MatrixAsset.js","sourceRoot":"","sources":["../../src/resolvableTypes/MatrixAsset.ts"],"names":[],"mappings":";;;AAAA,qEAAoE;AAOvD,QAAA,eAAe,GAAG,IAAA,6BAAc,EAAkC;IAC7E,KAAK,EAAE,aAAa;IACpB,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,aAAa,EAAE;YACb,IAAI,EAAE,QAAQ;SACf;QACD,uBAAuB,EAAE;YACvB,IAAI,EAAE,QAAQ;SACf;QACD,YAAY,EAAE;YACZ,IAAI,EAAE,QAAQ;SACf;KACF;IACD,QAAQ,EAAE,CAAC,eAAe,EAAE,yBAAyB,CAAC;CACvD,CAAC,CAAC"}
@@ -0,0 +1 @@
1
+ export * from './MatrixAsset';
@@ -0,0 +1,18 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
+ for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
+ };
16
+ Object.defineProperty(exports, "__esModule", { value: true });
17
+ __exportStar(require("./MatrixAsset"), exports);
18
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/resolvableTypes/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@squiz/dx-json-schema-lib",
3
- "version": "1.21.1-alpha.13",
3
+ "version": "1.21.1-alpha.16",
4
4
  "description": "",
5
5
  "main": "lib/index.js",
6
6
  "scripts": {
@@ -13,9 +13,10 @@
13
13
  "author": "",
14
14
  "license": "ISC",
15
15
  "devDependencies": {
16
+ "@types/exif": "0.6.3",
16
17
  "@types/express": "4.17.17",
17
18
  "@types/jest": "28.1.8",
18
- "@types/node": "17.0.27",
19
+ "@types/node": "18.15.2",
19
20
  "dotenv": "16.0.3",
20
21
  "jest": "29.4.1",
21
22
  "json-schema-to-typescript": "11.0.3",
@@ -27,8 +28,8 @@
27
28
  },
28
29
  "dependencies": {
29
30
  "@sagold/json-query": "6.0.0",
30
- "json-schema-library": "7.4.5",
31
+ "json-schema-library": "github:Carl-Foster/json-schema-library#7e8d02c",
31
32
  "ts-brand": "0.0.2"
32
33
  },
33
- "gitHead": "4d6aa4982ad220602d31fddf081abab79b9128c6"
34
+ "gitHead": "1d008f8debcfd1acaad50d73fa83b51c46253bf4"
34
35
  }