@toolproof-core/schema 1.0.0 → 1.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toolproof-core/schema",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "JSON schemas and TypeScript types for ToolProof",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -31,15 +31,15 @@
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "tsc -b",
     "build:scripts": "tsc -p tsconfig.scripts.json",
-    "rewriteAnchors": "node ./dist/scripts/rewriteAnchors.js",
-    "extractSchemas": "node ./dist/scripts/extractSchemas.js",
-    "extractSubSchema": "node ./dist/scripts/extractSubSchemaWithDefs.js",
+    "normalizeAnchorsToPointers": "node ./dist/scripts/normalizeAnchorsToPointers.js",
+    "extractSchemasFromResourceTypeShells": "node ./dist/scripts/extractSchemasFromResourceTypeShells.js",
+    "generateStandaloneSchema": "node ./dist/scripts/generateStandaloneSchema.js",
     "generateTypes": "node ./dist/scripts/generateTypes.js",
-    "generateResourceTypeType": "node ./dist/scripts/generateResourceTypeType.js",
-    "generateResourceShells": "node ./dist/scripts/generateResourceShells.js",
+    "generateStandaloneType": "node ./dist/scripts/generateStandaloneType.js",
+    "wrapResourceTypesWithResourceShells": "node ./dist/scripts/wrapResourceTypesWithResourceShells.js",
     "generateSchemaShims": "node ./dist/scripts/generateSchemaShims.js",
     "generateDependencies": "node ./dist/scripts/generateDependencies.js",
-    "generateResourceTypeGenesisType": "node ./dist/scripts/generateResourceTypeType.js --name Genesis",
-    "update": "rimraf /s /q dist && pnpm run build:scripts && pnpm run rewriteAnchors && pnpm run extractSchemas && pnpm run extractSubSchema -- --name Job && pnpm run extractSubSchema -- --name ResourceType && pnpm run extractSubSchema -- --name RawStrategy && pnpm run extractSubSchema -- --name RunnableStrategy && pnpm run extractSubSchema -- --name StrategyRun && pnpm run extractSubSchema -- --name Goal && pnpm run generateResourceShells && pnpm run generateSchemaShims && pnpm run generateTypes && pnpm run generateResourceTypeType -- --name Job && pnpm run generateResourceTypeType -- --name ResourceType && pnpm run generateResourceTypeType -- --name RawStrategy && pnpm run generateResourceTypeType -- --name RunnableStrategy && pnpm run generateResourceTypeGenesisType && pnpm run generateDependencies"
+    "generateResourceTypeGenesisType": "node ./dist/scripts/generateStandaloneType.js --name Genesis",
+    "update": "rimraf /s /q dist && pnpm run build:scripts && pnpm run normalizeAnchorsToPointers && pnpm run extractSchemasFromResourceTypeShells && pnpm run generateStandaloneSchema -- --name Job && pnpm run generateStandaloneSchema -- --name ResourceType && pnpm run generateStandaloneSchema -- --name RawStrategy && pnpm run generateStandaloneSchema -- --name RunnableStrategy && pnpm run generateStandaloneSchema -- --name StrategyRun && pnpm run generateStandaloneSchema -- --name Goal && pnpm run wrapResourceTypesWithResourceShells && pnpm run generateSchemaShims && pnpm run generateTypes && pnpm run generateStandaloneType -- --name Job && pnpm run generateStandaloneType -- --name ResourceType && pnpm run generateStandaloneType -- --name RawStrategy && pnpm run generateStandaloneType -- --name RunnableStrategy && pnpm run generateResourceTypeGenesisType && pnpm run generateDependencies"
   }
 }

package/src/Genesis.json

@@ -509,71 +509,6 @@
                     }
                 }
             },
-            "JobRunIdentity": {
-                "identity": "TYPE-JobRunIdentity",
-                "name": "JobRunIdentity",
-                "description": "dummy-description",
-                "resourceTypeImplementationKind": "internal-without-identity",
-                "nucleusSchema": {
-                    "$anchor": "JobRunIdentity",
-                    "$schema": "https://json-schema.org/draft/2020-12/schema",
-                    "type": "string",
-                    "pattern": "^JobRun-.+$"
-                }
-            },
-            "JobRun": {
-                "identity": "TYPE-JobRun",
-                "name": "JobRun",
-                "description": "dummy-description",
-                "resourceTypeImplementationKind": "internal-with-identity",
-                "nucleusSchema": {
-                    "$anchor": "JobRun",
-                    "$schema": "https://json-schema.org/draft/2020-12/schema",
-                    "type": "object",
-                    "required": [
-                        "identity",
-                        "jobHandle"
-                    ],
-                    "properties": {
-                        "identity": {
-                            "$ref": "#JobRunIdentity"
-                        },
-                        "jobHandle": {
-                            "$ref": "#JobIdentity"
-                        }
-                    },
-                    "allOf": [
-                        {
-                            "$comment": "This will be overlayed dynamically to specify roleBindings corresponding to the roles of the underlying job.",
-                            "$ref": "#RoleBindingsFacet"
-                        }
-                    ]
-                }
-            },
-            "Conditional": {
-                "identity": "TYPE-Conditional",
-                "name": "Conditional",
-                "description": "dummy-description",
-                "resourceTypeImplementationKind": "internal-without-identity",
-                "nucleusSchema": {
-                    "$anchor": "Conditional",
-                    "$schema": "https://json-schema.org/draft/2020-12/schema",
-                    "type": "object",
-                    "required": [
-                        "when",
-                        "what"
-                    ],
-                    "properties": {
-                        "when": {
-                            "$ref": "#JobStep"
-                        },
-                        "what": {
-                            "$ref": "#JobStep"
-                        }
-                    },
-                    "unevaluatedProperties": false
-                }
-            },
             "StepKind": {
                 "identity": "TYPE-StepKind",
                 "name": "StepKind",
@@ -619,7 +554,7 @@
                     "$anchor": "JobStepIdentity",
                     "$schema": "https://json-schema.org/draft/2020-12/schema",
                     "type": "string",
-                    "pattern": "^JobStep-.+$"
+                    "pattern": "^JOB_STEP-.+$"
                 }
             },
             "JobStep": {
@@ -633,7 +568,7 @@
                     "type": "object",
                     "required": [
                         "identity",
-                        "jobRun"
+                        "jobHandle"
                     ],
                     "properties": {
                         "identity": {
@@ -642,17 +577,45 @@
                         "stepKind": {
                             "const": "job"
                         },
-                        "jobRun": {
-                            "$ref": "#JobRun"
+                        "jobHandle": {
+                            "$ref": "#JobIdentity"
                         }
                     },
                     "allOf": [
                         {
                             "$ref": "#StepKindFacet"
+                        },
+                        {
+                            "$comment": "This will be overlayed dynamically to specify roleBindings corresponding to the roles of the underlying job.",
+                            "$ref": "#RoleBindingsFacet"
                         }
                     ]
                 }
             },
+            "Conditional": {
+                "identity": "TYPE-Conditional",
+                "name": "Conditional",
+                "description": "dummy-description",
+                "resourceTypeImplementationKind": "internal-without-identity",
+                "nucleusSchema": {
+                    "$anchor": "Conditional",
+                    "$schema": "https://json-schema.org/draft/2020-12/schema",
+                    "type": "object",
+                    "required": [
+                        "when",
+                        "what"
+                    ],
+                    "properties": {
+                        "when": {
+                            "$ref": "#JobStep"
+                        },
+                        "what": {
+                            "$ref": "#JobStep"
+                        }
+                    },
+                    "unevaluatedProperties": false
+                }
+            },
             "BranchStepIdentity": {
                 "identity": "TYPE-BranchStepIdentity",
                 "name": "BranchStepIdentity",
@@ -662,7 +625,7 @@
                     "$anchor": "BranchStepIdentity",
                     "$schema": "https://json-schema.org/draft/2020-12/schema",
                     "type": "string",
-                    "pattern": "^BRANCHSTEP-.+$"
+                    "pattern": "^BRANCH_STEP-.+$"
                 }
             },
             "BranchStep": {
@@ -710,7 +673,7 @@
                     "$anchor": "WhileStepIdentity",
                     "$schema": "https://json-schema.org/draft/2020-12/schema",
                     "type": "string",
-                    "pattern": "^WHILESTEP-.+$"
+                    "pattern": "^WHILE_STEP-.+$"
                 }
             },
             "WhileStep": {
@@ -753,7 +716,7 @@
                     "$anchor": "ForStepIdentity",
                     "$schema": "https://json-schema.org/draft/2020-12/schema",
                     "type": "string",
-                    "pattern": "^FORSTEP-.+$"
+                    "pattern": "^FOR_STEP-.+$"
                 }
             },
             "ForStep": {
@@ -849,14 +812,14 @@
                     "type": "object",
                     "required": [
                         "resourceRoleHandle",
-                        "jobRunHandle"
+                        "jobStepHandle"
                     ],
                     "properties": {
                         "resourceRoleHandle": {
                             "$ref": "#ResourceRoleIdentity"
                         },
-                        "jobRunHandle": {
-                            "$ref": "#JobRunIdentity"
+                        "jobStepHandle": {
+                            "$ref": "#JobStepIdentity"
                         }
                     }
                 }
@@ -1301,13 +1264,13 @@
                     "unevaluatedProperties": false
                 }
             },
-            "JobRunSocket": {
-                "identity": "TYPE-JobRunSocket",
-                "name": "JobRunSocket",
+            "JobStepSocket": {
+                "identity": "TYPE-JobStepSocket",
+                "name": "JobStepSocket",
                 "description": "dummy-description",
                 "resourceTypeImplementationKind": "internal-without-identity",
                 "nucleusSchema": {
-                    "$anchor": "JobRunSocket",
+                    "$anchor": "JobStepSocket",
                     "$schema": "https://json-schema.org/draft/2020-12/schema",
                     "type": "object",
                     "propertyNames": {
@@ -1328,10 +1291,10 @@
                     "$schema": "https://json-schema.org/draft/2020-12/schema",
                     "type": "object",
                     "propertyNames": {
-                        "$ref": "#JobRunIdentity"
+                        "$ref": "#JobStepIdentity"
                     },
                     "additionalProperties": {
-                        "$ref": "#JobRunSocket"
+                        "$ref": "#JobStepSocket"
                     }
                 }
             },
@@ -1637,12 +1600,6 @@
                         },
                         "threadStepIndex": {
                             "type": "integer"
-                        },
-                        "jobRunHandle": {
-                            "$ref": "#JobRunIdentity"
-                        },
-                        "jobHandle": {
-                            "$ref": "#JobIdentity"
                         }
                     }
                 }