@toolproof-npm/schema 0.1.49 → 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.
@@ -684,21 +684,19 @@
684
684
  "$anchor": "ResourceType",
685
685
  "$schema": "https://json-schema.org/draft/2020-12/schema",
686
686
  "type": "object",
687
- "allOf": [
688
- {
689
- "required": [
690
- "identity",
691
- "resourceFormatRef"
692
- ],
693
- "properties": {
694
- "identity": {
695
- "$ref": "#ResourceTypeIdentity"
696
- },
697
- "resourceFormatRef": {
698
- "$ref": "#ResourceFormatIdentity"
699
- }
700
- }
687
+ "required": [
688
+ "identity",
689
+ "resourceFormatRef"
690
+ ],
691
+ "properties": {
692
+ "identity": {
693
+ "$ref": "#ResourceTypeIdentity"
701
694
  },
695
+ "resourceFormatRef": {
696
+ "$ref": "#ResourceFormatIdentity"
697
+ }
698
+ },
699
+ "allOf": [
702
700
  {
703
701
  "$ref": "#Documented"
704
702
  },
@@ -707,7 +705,7 @@
707
705
  },
708
706
  {
709
707
  "if": {
710
- "$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.",
708
+ "$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.",
711
709
  "properties": {
712
710
  "resourceFormatRef": {
713
711
  "const": "FORMAT-ApplicationJson"
@@ -717,17 +715,17 @@
717
715
  "then": {
718
716
  "not": {
719
717
  "required": [
720
- "extractor"
718
+ "extractorUri"
721
719
  ]
722
720
  }
723
721
  },
724
722
  "else": {
725
723
  "type": "object",
726
724
  "required": [
727
- "extractor"
725
+ "extractorUri"
728
726
  ],
729
727
  "properties": {
730
- "extractor": {
728
+ "extractorUri": {
731
729
  "type": "string",
732
730
  "format": "uri"
733
731
  }
@@ -746,17 +744,15 @@
746
744
  "$anchor": "ResourceFormat",
747
745
  "$schema": "https://json-schema.org/draft/2020-12/schema",
748
746
  "type": "object",
747
+ "required": [
748
+ "identity"
749
+ ],
750
+ "properties": {
751
+ "identity": {
752
+ "$ref": "#ResourceFormatIdentity"
753
+ }
754
+ },
749
755
  "allOf": [
750
- {
751
- "required": [
752
- "identity"
753
- ],
754
- "properties": {
755
- "identity": {
756
- "$ref": "#ResourceFormatIdentity"
757
- }
758
- }
759
- },
760
756
  {
761
757
  "$ref": "#Documented"
762
758
  }
@@ -893,27 +889,25 @@
893
889
  "name": "Job",
894
890
  "description": "dummy-description",
895
891
  "resourceFormatRef": "FORMAT-ApplicationJob",
896
- "extractor": "https://extractors.toolproof.com/v0/JobExtractor.js",
892
+ "extractorUri": "https://extractors.toolproof.com/v0/JobExtractor.js",
897
893
  "extractionSchema": {
898
894
  "$anchor": "Job",
899
895
  "$schema": "https://json-schema.org/draft/2020-12/schema",
900
896
  "type": "object",
901
- "allOf": [
902
- {
903
- "required": [
904
- "identity",
905
- "implementationUri"
906
- ],
907
- "properties": {
908
- "identity": {
909
- "$ref": "#JobIdentity"
910
- },
911
- "implementationUri": {
912
- "type": "string",
913
- "format": "uri"
914
- }
915
- }
897
+ "required": [
898
+ "identity",
899
+ "implementationUri"
900
+ ],
901
+ "properties": {
902
+ "identity": {
903
+ "$ref": "#JobIdentity"
916
904
  },
905
+ "implementationUri": {
906
+ "type": "string",
907
+ "format": "uri"
908
+ }
909
+ },
910
+ "allOf": [
917
911
  {
918
912
  "$ref": "#Documented"
919
913
  },
@@ -1035,22 +1029,18 @@
1035
1029
  "$anchor": "ResourceBase",
1036
1030
  "$schema": "https://json-schema.org/draft/2020-12/schema",
1037
1031
  "type": "object",
1038
- "allOf": [
1039
- {
1040
- "required": [
1041
- "identity",
1042
- "resourceTypeRef"
1043
- ],
1044
- "properties": {
1045
- "identity": {
1046
- "$ref": "#ResourceIdentity"
1047
- },
1048
- "resourceTypeRef": {
1049
- "$ref": "#ResourceTypeIdentity"
1050
- }
1051
- }
1032
+ "required": [
1033
+ "identity",
1034
+ "resourceTypeRef"
1035
+ ],
1036
+ "properties": {
1037
+ "identity": {
1038
+ "$ref": "#ResourceIdentity"
1039
+ },
1040
+ "resourceTypeRef": {
1041
+ "$ref": "#ResourceTypeIdentity"
1052
1042
  }
1053
- ]
1043
+ }
1054
1044
  }
1055
1045
  },
1056
1046
  "ResourceKind": {
@@ -1351,22 +1341,19 @@
1351
1341
  "$anchor": "Execution",
1352
1342
  "$schema": "https://json-schema.org/draft/2020-12/schema",
1353
1343
  "type": "object",
1354
- "allOf": [
1355
- {
1356
- "type": "object",
1357
- "required": [
1358
- "identity",
1359
- "jobRef"
1360
- ],
1361
- "properties": {
1362
- "identity": {
1363
- "$ref": "#ExecutionIdentity"
1364
- },
1365
- "jobRef": {
1366
- "$ref": "#JobIdentity"
1367
- }
1368
- }
1344
+ "required": [
1345
+ "identity",
1346
+ "jobRef"
1347
+ ],
1348
+ "properties": {
1349
+ "identity": {
1350
+ "$ref": "#ExecutionIdentity"
1369
1351
  },
1352
+ "jobRef": {
1353
+ "$ref": "#JobIdentity"
1354
+ }
1355
+ },
1356
+ "allOf": [
1370
1357
  {
1371
1358
  "$comment": "This will be overlayed at runtime to specify roleBindings corresponding to the roles of the underlying job.",
1372
1359
  "$ref": "#RoleBindingsWrapper"
@@ -1444,28 +1431,25 @@
1444
1431
  "$anchor": "WorkStep",
1445
1432
  "$schema": "https://json-schema.org/draft/2020-12/schema",
1446
1433
  "type": "object",
1434
+ "required": [
1435
+ "identity",
1436
+ "kind",
1437
+ "execution"
1438
+ ],
1439
+ "properties": {
1440
+ "identity": {
1441
+ "$ref": "#WorkStepIdentity"
1442
+ },
1443
+ "kind": {
1444
+ "const": "work"
1445
+ },
1446
+ "execution": {
1447
+ "$ref": "#Execution"
1448
+ }
1449
+ },
1447
1450
  "allOf": [
1448
1451
  {
1449
1452
  "$ref": "#StepKind"
1450
- },
1451
- {
1452
- "type": "object",
1453
- "required": [
1454
- "identity",
1455
- "kind",
1456
- "execution"
1457
- ],
1458
- "properties": {
1459
- "identity": {
1460
- "$ref": "#WorkStepIdentity"
1461
- },
1462
- "kind": {
1463
- "const": "work"
1464
- },
1465
- "execution": {
1466
- "$ref": "#Execution"
1467
- }
1468
- }
1469
1453
  }
1470
1454
  ]
1471
1455
  }
@@ -1491,33 +1475,30 @@
1491
1475
  "$anchor": "BranchStep",
1492
1476
  "$schema": "https://json-schema.org/draft/2020-12/schema",
1493
1477
  "type": "object",
1478
+ "required": [
1479
+ "identity",
1480
+ "kind",
1481
+ "cases"
1482
+ ],
1483
+ "properties": {
1484
+ "identity": {
1485
+ "$ref": "#BranchStepIdentity"
1486
+ },
1487
+ "kind": {
1488
+ "const": "branch"
1489
+ },
1490
+ "cases": {
1491
+ "type": "array",
1492
+ "items": {
1493
+ "$ref": "#Conditional"
1494
+ },
1495
+ "minItems": 1,
1496
+ "uniqueItems": true
1497
+ }
1498
+ },
1494
1499
  "allOf": [
1495
1500
  {
1496
1501
  "$ref": "#StepKind"
1497
- },
1498
- {
1499
- "type": "object",
1500
- "required": [
1501
- "identity",
1502
- "kind",
1503
- "cases"
1504
- ],
1505
- "properties": {
1506
- "identity": {
1507
- "$ref": "#BranchStepIdentity"
1508
- },
1509
- "kind": {
1510
- "const": "branch"
1511
- },
1512
- "cases": {
1513
- "type": "array",
1514
- "items": {
1515
- "$ref": "#Conditional"
1516
- },
1517
- "minItems": 1,
1518
- "uniqueItems": true
1519
- }
1520
- }
1521
1502
  }
1522
1503
  ]
1523
1504
  }
@@ -1543,28 +1524,25 @@
1543
1524
  "$anchor": "WhileStep",
1544
1525
  "$schema": "https://json-schema.org/draft/2020-12/schema",
1545
1526
  "type": "object",
1527
+ "required": [
1528
+ "identity",
1529
+ "kind",
1530
+ "case"
1531
+ ],
1532
+ "properties": {
1533
+ "identity": {
1534
+ "$ref": "#WhileStepIdentity"
1535
+ },
1536
+ "kind": {
1537
+ "const": "while"
1538
+ },
1539
+ "case": {
1540
+ "$ref": "#Conditional"
1541
+ }
1542
+ },
1546
1543
  "allOf": [
1547
1544
  {
1548
1545
  "$ref": "#StepKind"
1549
- },
1550
- {
1551
- "type": "object",
1552
- "required": [
1553
- "identity",
1554
- "kind",
1555
- "case"
1556
- ],
1557
- "properties": {
1558
- "identity": {
1559
- "$ref": "#WhileStepIdentity"
1560
- },
1561
- "kind": {
1562
- "const": "while"
1563
- },
1564
- "case": {
1565
- "$ref": "#Conditional"
1566
- }
1567
- }
1568
1546
  }
1569
1547
  ]
1570
1548
  }
@@ -1590,28 +1568,25 @@
1590
1568
  "$anchor": "ForStep",
1591
1569
  "$schema": "https://json-schema.org/draft/2020-12/schema",
1592
1570
  "type": "object",
1571
+ "required": [
1572
+ "identity",
1573
+ "kind",
1574
+ "case"
1575
+ ],
1576
+ "properties": {
1577
+ "identity": {
1578
+ "$ref": "#ForStepIdentity"
1579
+ },
1580
+ "kind": {
1581
+ "const": "for"
1582
+ },
1583
+ "case": {
1584
+ "$ref": "#Conditional"
1585
+ }
1586
+ },
1593
1587
  "allOf": [
1594
1588
  {
1595
1589
  "$ref": "#StepKind"
1596
- },
1597
- {
1598
- "type": "object",
1599
- "required": [
1600
- "identity",
1601
- "kind",
1602
- "case"
1603
- ],
1604
- "properties": {
1605
- "identity": {
1606
- "$ref": "#ForStepIdentity"
1607
- },
1608
- "kind": {
1609
- "const": "for"
1610
- },
1611
- "case": {
1612
- "$ref": "#Conditional"
1613
- }
1614
- }
1615
1590
  }
1616
1591
  ]
1617
1592
  }
@@ -1663,27 +1638,22 @@
1663
1638
  "$anchor": "StatelessStrategy",
1664
1639
  "$schema": "https://json-schema.org/draft/2020-12/schema",
1665
1640
  "type": "object",
1666
- "allOf": [
1667
- {
1668
- "type": "object",
1669
- "required": [
1670
- "identity",
1671
- "steps"
1672
- ],
1673
- "properties": {
1674
- "identity": {
1675
- "$ref": "#StatelessStrategyIdentity"
1676
- },
1677
- "steps": {
1678
- "type": "array",
1679
- "items": {
1680
- "$ref": "#Step"
1681
- },
1682
- "uniqueItems": true
1683
- }
1684
- }
1685
- }
1641
+ "required": [
1642
+ "identity",
1643
+ "steps"
1686
1644
  ],
1645
+ "properties": {
1646
+ "identity": {
1647
+ "$ref": "#StatelessStrategyIdentity"
1648
+ },
1649
+ "steps": {
1650
+ "type": "array",
1651
+ "items": {
1652
+ "$ref": "#Step"
1653
+ },
1654
+ "uniqueItems": true
1655
+ }
1656
+ },
1687
1657
  "unevaluatedProperties": false
1688
1658
  }
1689
1659
  },
@@ -1763,21 +1733,19 @@
1763
1733
  "$anchor": "StatefulStrategy",
1764
1734
  "$schema": "https://json-schema.org/draft/2020-12/schema",
1765
1735
  "type": "object",
1766
- "allOf": [
1767
- {
1768
- "required": [
1769
- "identity",
1770
- "statelessStrategy"
1771
- ],
1772
- "properties": {
1773
- "identity": {
1774
- "$ref": "#StatefulStrategyIdentity"
1775
- },
1776
- "statelessStrategy": {
1777
- "$ref": "#StatelessStrategy"
1778
- }
1779
- }
1736
+ "required": [
1737
+ "identity",
1738
+ "statelessStrategy"
1739
+ ],
1740
+ "properties": {
1741
+ "identity": {
1742
+ "$ref": "#StatefulStrategyIdentity"
1780
1743
  },
1744
+ "statelessStrategy": {
1745
+ "$ref": "#StatelessStrategy"
1746
+ }
1747
+ },
1748
+ "allOf": [
1781
1749
  {
1782
1750
  "$ref": "#StrategyStateWrapper"
1783
1751
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@toolproof-npm/schema",
3
- "version": "0.1.49",
3
+ "version": "0.1.51",
4
4
  "description": "JSON schemas and TypeScript types for ToolProof",
5
5
  "keywords": [
6
6
  "toolproof",