@toolproof-npm/schema 0.1.48 → 0.1.51

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.
@@ -585,8 +585,7 @@
585
585
  }
586
586
  }
587
587
  }
588
- },
589
- "additionalProperties": false
588
+ }
590
589
  }
591
590
  }
592
591
  },
@@ -659,6 +658,9 @@
659
658
  "properties": {
660
659
  "properties": {
661
660
  "type": "object",
661
+ "required": [
662
+ "identity"
663
+ ],
662
664
  "properties": {
663
665
  "identity": {}
664
666
  }
@@ -688,6 +690,9 @@
688
690
  "properties": {
689
691
  "properties": {
690
692
  "type": "object",
693
+ "required": [
694
+ "merit"
695
+ ],
691
696
  "properties": {
692
697
  "merit": {}
693
698
  }
@@ -820,21 +825,19 @@
820
825
  "$anchor": "ResourceType",
821
826
  "$schema": "https://json-schema.org/draft/2020-12/schema",
822
827
  "type": "object",
823
- "allOf": [
824
- {
825
- "required": [
826
- "identity",
827
- "resourceFormatRef"
828
- ],
829
- "properties": {
830
- "identity": {
831
- "$ref": "#/$defs/ResourceTypeIdentity"
832
- },
833
- "resourceFormatRef": {
834
- "$ref": "#/$defs/ResourceFormatIdentity"
835
- }
836
- }
828
+ "required": [
829
+ "identity",
830
+ "resourceFormatRef"
831
+ ],
832
+ "properties": {
833
+ "identity": {
834
+ "$ref": "#/$defs/ResourceTypeIdentity"
837
835
  },
836
+ "resourceFormatRef": {
837
+ "$ref": "#/$defs/ResourceFormatIdentity"
838
+ }
839
+ },
840
+ "allOf": [
838
841
  {
839
842
  "$ref": "#/$defs/Documented"
840
843
  },
@@ -843,7 +846,7 @@
843
846
  },
844
847
  {
845
848
  "if": {
846
- "$comment": "If resourceFormatRef is FORMAT-ApplicationJson, then extractor must not be present, but if resourceFormatRef is not FORMAT-ApplicationJson, then extractor must be present. This is because resources of types with format FORMAT-ApplicationJson are self-contained and do not need an extractor.",
849
+ "$comment": "If resourceFormatRef is FORMAT-ApplicationJson, then extractorUri must not be present, but if resourceFormatRef is not FORMAT-ApplicationJson, then extractorUri must be present. This is because resources of types with format FORMAT-ApplicationJson are self-contained and do not need an extractor.",
847
850
  "properties": {
848
851
  "resourceFormatRef": {
849
852
  "const": "FORMAT-ApplicationJson"
@@ -853,17 +856,17 @@
853
856
  "then": {
854
857
  "not": {
855
858
  "required": [
856
- "extractor"
859
+ "extractorUri"
857
860
  ]
858
861
  }
859
862
  },
860
863
  "else": {
861
864
  "type": "object",
862
865
  "required": [
863
- "extractor"
866
+ "extractorUri"
864
867
  ],
865
868
  "properties": {
866
- "extractor": {
869
+ "extractorUri": {
867
870
  "type": "string",
868
871
  "format": "uri"
869
872
  }
@@ -892,17 +895,15 @@
892
895
  "$anchor": "ResourceFormat",
893
896
  "$schema": "https://json-schema.org/draft/2020-12/schema",
894
897
  "type": "object",
898
+ "required": [
899
+ "identity"
900
+ ],
901
+ "properties": {
902
+ "identity": {
903
+ "$ref": "#/$defs/ResourceFormatIdentity"
904
+ }
905
+ },
895
906
  "allOf": [
896
- {
897
- "required": [
898
- "identity"
899
- ],
900
- "properties": {
901
- "identity": {
902
- "$ref": "#/$defs/ResourceFormatIdentity"
903
- }
904
- }
905
- },
906
907
  {
907
908
  "$ref": "#/$defs/Documented"
908
909
  }
@@ -1119,27 +1120,25 @@
1119
1120
  "name": "Job",
1120
1121
  "description": "dummy-description",
1121
1122
  "resourceFormatRef": "FORMAT-ApplicationJob",
1122
- "extractor": "https://extractors.toolproof.com/v0/JobExtractor.js",
1123
+ "extractorUri": "https://extractors.toolproof.com/v0/JobExtractor.js",
1123
1124
  "extractionSchema": {
1124
1125
  "$anchor": "Job",
1125
1126
  "$schema": "https://json-schema.org/draft/2020-12/schema",
1126
1127
  "type": "object",
1127
- "allOf": [
1128
- {
1129
- "required": [
1130
- "identity",
1131
- "implementationUri"
1132
- ],
1133
- "properties": {
1134
- "identity": {
1135
- "$ref": "#/$defs/JobIdentity"
1136
- },
1137
- "implementationUri": {
1138
- "type": "string",
1139
- "format": "uri"
1140
- }
1141
- }
1128
+ "required": [
1129
+ "identity",
1130
+ "implementationUri"
1131
+ ],
1132
+ "properties": {
1133
+ "identity": {
1134
+ "$ref": "#/$defs/JobIdentity"
1142
1135
  },
1136
+ "implementationUri": {
1137
+ "type": "string",
1138
+ "format": "uri"
1139
+ }
1140
+ },
1141
+ "allOf": [
1143
1142
  {
1144
1143
  "$ref": "#/$defs/Documented"
1145
1144
  },
@@ -1321,22 +1320,18 @@
1321
1320
  "$anchor": "ResourceBase",
1322
1321
  "$schema": "https://json-schema.org/draft/2020-12/schema",
1323
1322
  "type": "object",
1324
- "allOf": [
1325
- {
1326
- "required": [
1327
- "identity",
1328
- "resourceTypeRef"
1329
- ],
1330
- "properties": {
1331
- "identity": {
1332
- "$ref": "#/$defs/ResourceIdentity"
1333
- },
1334
- "resourceTypeRef": {
1335
- "$ref": "#/$defs/ResourceTypeIdentity"
1336
- }
1337
- }
1323
+ "required": [
1324
+ "identity",
1325
+ "resourceTypeRef"
1326
+ ],
1327
+ "properties": {
1328
+ "identity": {
1329
+ "$ref": "#/$defs/ResourceIdentity"
1330
+ },
1331
+ "resourceTypeRef": {
1332
+ "$ref": "#/$defs/ResourceTypeIdentity"
1338
1333
  }
1339
- ]
1334
+ }
1340
1335
  }
1341
1336
  }
1342
1337
  },
@@ -1757,22 +1752,19 @@
1757
1752
  "$anchor": "Execution",
1758
1753
  "$schema": "https://json-schema.org/draft/2020-12/schema",
1759
1754
  "type": "object",
1760
- "allOf": [
1761
- {
1762
- "type": "object",
1763
- "required": [
1764
- "identity",
1765
- "jobRef"
1766
- ],
1767
- "properties": {
1768
- "identity": {
1769
- "$ref": "#/$defs/ExecutionIdentity"
1770
- },
1771
- "jobRef": {
1772
- "$ref": "#/$defs/JobIdentity"
1773
- }
1774
- }
1755
+ "required": [
1756
+ "identity",
1757
+ "jobRef"
1758
+ ],
1759
+ "properties": {
1760
+ "identity": {
1761
+ "$ref": "#/$defs/ExecutionIdentity"
1775
1762
  },
1763
+ "jobRef": {
1764
+ "$ref": "#/$defs/JobIdentity"
1765
+ }
1766
+ },
1767
+ "allOf": [
1776
1768
  {
1777
1769
  "$comment": "This will be overlayed at runtime to specify roleBindings corresponding to the roles of the underlying job.",
1778
1770
  "$ref": "#/$defs/RoleBindingsWrapper"
@@ -1890,28 +1882,25 @@
1890
1882
  "$anchor": "WorkStep",
1891
1883
  "$schema": "https://json-schema.org/draft/2020-12/schema",
1892
1884
  "type": "object",
1885
+ "required": [
1886
+ "identity",
1887
+ "kind",
1888
+ "execution"
1889
+ ],
1890
+ "properties": {
1891
+ "identity": {
1892
+ "$ref": "#/$defs/WorkStepIdentity"
1893
+ },
1894
+ "kind": {
1895
+ "const": "work"
1896
+ },
1897
+ "execution": {
1898
+ "$ref": "#/$defs/Execution"
1899
+ }
1900
+ },
1893
1901
  "allOf": [
1894
1902
  {
1895
1903
  "$ref": "#/$defs/StepKind"
1896
- },
1897
- {
1898
- "type": "object",
1899
- "required": [
1900
- "identity",
1901
- "kind",
1902
- "execution"
1903
- ],
1904
- "properties": {
1905
- "identity": {
1906
- "$ref": "#/$defs/WorkStepIdentity"
1907
- },
1908
- "kind": {
1909
- "const": "work"
1910
- },
1911
- "execution": {
1912
- "$ref": "#/$defs/Execution"
1913
- }
1914
- }
1915
1904
  }
1916
1905
  ]
1917
1906
  }
@@ -1957,33 +1946,30 @@
1957
1946
  "$anchor": "BranchStep",
1958
1947
  "$schema": "https://json-schema.org/draft/2020-12/schema",
1959
1948
  "type": "object",
1949
+ "required": [
1950
+ "identity",
1951
+ "kind",
1952
+ "cases"
1953
+ ],
1954
+ "properties": {
1955
+ "identity": {
1956
+ "$ref": "#/$defs/BranchStepIdentity"
1957
+ },
1958
+ "kind": {
1959
+ "const": "branch"
1960
+ },
1961
+ "cases": {
1962
+ "type": "array",
1963
+ "items": {
1964
+ "$ref": "#/$defs/Conditional"
1965
+ },
1966
+ "minItems": 1,
1967
+ "uniqueItems": true
1968
+ }
1969
+ },
1960
1970
  "allOf": [
1961
1971
  {
1962
1972
  "$ref": "#/$defs/StepKind"
1963
- },
1964
- {
1965
- "type": "object",
1966
- "required": [
1967
- "identity",
1968
- "kind",
1969
- "cases"
1970
- ],
1971
- "properties": {
1972
- "identity": {
1973
- "$ref": "#/$defs/BranchStepIdentity"
1974
- },
1975
- "kind": {
1976
- "const": "branch"
1977
- },
1978
- "cases": {
1979
- "type": "array",
1980
- "items": {
1981
- "$ref": "#/$defs/Conditional"
1982
- },
1983
- "minItems": 1,
1984
- "uniqueItems": true
1985
- }
1986
- }
1987
1973
  }
1988
1974
  ]
1989
1975
  }
@@ -2029,28 +2015,25 @@
2029
2015
  "$anchor": "WhileStep",
2030
2016
  "$schema": "https://json-schema.org/draft/2020-12/schema",
2031
2017
  "type": "object",
2018
+ "required": [
2019
+ "identity",
2020
+ "kind",
2021
+ "case"
2022
+ ],
2023
+ "properties": {
2024
+ "identity": {
2025
+ "$ref": "#/$defs/WhileStepIdentity"
2026
+ },
2027
+ "kind": {
2028
+ "const": "while"
2029
+ },
2030
+ "case": {
2031
+ "$ref": "#/$defs/Conditional"
2032
+ }
2033
+ },
2032
2034
  "allOf": [
2033
2035
  {
2034
2036
  "$ref": "#/$defs/StepKind"
2035
- },
2036
- {
2037
- "type": "object",
2038
- "required": [
2039
- "identity",
2040
- "kind",
2041
- "case"
2042
- ],
2043
- "properties": {
2044
- "identity": {
2045
- "$ref": "#/$defs/WhileStepIdentity"
2046
- },
2047
- "kind": {
2048
- "const": "while"
2049
- },
2050
- "case": {
2051
- "$ref": "#/$defs/Conditional"
2052
- }
2053
- }
2054
2037
  }
2055
2038
  ]
2056
2039
  }
@@ -2096,28 +2079,25 @@
2096
2079
  "$anchor": "ForStep",
2097
2080
  "$schema": "https://json-schema.org/draft/2020-12/schema",
2098
2081
  "type": "object",
2082
+ "required": [
2083
+ "identity",
2084
+ "kind",
2085
+ "case"
2086
+ ],
2087
+ "properties": {
2088
+ "identity": {
2089
+ "$ref": "#/$defs/ForStepIdentity"
2090
+ },
2091
+ "kind": {
2092
+ "const": "for"
2093
+ },
2094
+ "case": {
2095
+ "$ref": "#/$defs/Conditional"
2096
+ }
2097
+ },
2099
2098
  "allOf": [
2100
2099
  {
2101
2100
  "$ref": "#/$defs/StepKind"
2102
- },
2103
- {
2104
- "type": "object",
2105
- "required": [
2106
- "identity",
2107
- "kind",
2108
- "case"
2109
- ],
2110
- "properties": {
2111
- "identity": {
2112
- "$ref": "#/$defs/ForStepIdentity"
2113
- },
2114
- "kind": {
2115
- "const": "for"
2116
- },
2117
- "case": {
2118
- "$ref": "#/$defs/Conditional"
2119
- }
2120
- }
2121
2101
  }
2122
2102
  ]
2123
2103
  }
@@ -2199,27 +2179,22 @@
2199
2179
  "$anchor": "StatelessStrategy",
2200
2180
  "$schema": "https://json-schema.org/draft/2020-12/schema",
2201
2181
  "type": "object",
2202
- "allOf": [
2203
- {
2204
- "type": "object",
2205
- "required": [
2206
- "identity",
2207
- "steps"
2208
- ],
2209
- "properties": {
2210
- "identity": {
2211
- "$ref": "#/$defs/StatelessStrategyIdentity"
2212
- },
2213
- "steps": {
2214
- "type": "array",
2215
- "items": {
2216
- "$ref": "#/$defs/Step"
2217
- },
2218
- "uniqueItems": true
2219
- }
2220
- }
2221
- }
2182
+ "required": [
2183
+ "identity",
2184
+ "steps"
2222
2185
  ],
2186
+ "properties": {
2187
+ "identity": {
2188
+ "$ref": "#/$defs/StatelessStrategyIdentity"
2189
+ },
2190
+ "steps": {
2191
+ "type": "array",
2192
+ "items": {
2193
+ "$ref": "#/$defs/Step"
2194
+ },
2195
+ "uniqueItems": true
2196
+ }
2197
+ },
2223
2198
  "unevaluatedProperties": false
2224
2199
  }
2225
2200
  }
@@ -2339,21 +2314,19 @@
2339
2314
  "$anchor": "StatefulStrategy",
2340
2315
  "$schema": "https://json-schema.org/draft/2020-12/schema",
2341
2316
  "type": "object",
2342
- "allOf": [
2343
- {
2344
- "required": [
2345
- "identity",
2346
- "statelessStrategy"
2347
- ],
2348
- "properties": {
2349
- "identity": {
2350
- "$ref": "#/$defs/StatefulStrategyIdentity"
2351
- },
2352
- "statelessStrategy": {
2353
- "$ref": "#/$defs/StatelessStrategy"
2354
- }
2355
- }
2317
+ "required": [
2318
+ "identity",
2319
+ "statelessStrategy"
2320
+ ],
2321
+ "properties": {
2322
+ "identity": {
2323
+ "$ref": "#/$defs/StatefulStrategyIdentity"
2356
2324
  },
2325
+ "statelessStrategy": {
2326
+ "$ref": "#/$defs/StatelessStrategy"
2327
+ }
2328
+ },
2329
+ "allOf": [
2357
2330
  {
2358
2331
  "$ref": "#/$defs/StrategyStateWrapper"
2359
2332
  }