@toolproof-npm/schema 0.1.32 → 0.1.33

package/dist/_lib/types/ResourceData_Job.d.ts

@@ -1,8 +1,8 @@
 // Auto-generated strict composite type. Do not edit.
-export type ResourceData_Job = ResourceCanonicalMetaBase & {
+export type ResourceData_Job = ResourceMetaBase & {
   extractedData: Job;
 };
-export type ResourceCanonicalMetaBase = ResourceBase &
+export type ResourceMetaBase = ResourceBase &
   ResourceKind & {
     kind: "realized";
   } & Path &

package/dist/_lib/types/types.d.ts

@@ -27,8 +27,6 @@ export type CombinedEntry =
   | Path
   | PendingRef
   | ResourceBase
-  | ResourceCanonicalMeta
-  | ResourceCanonicalMetaBase
   | ResourceData
   | ResourceFormatData
   | ResourceFormatId
@@ -37,11 +35,14 @@ export type CombinedEntry =
   | ResourceKind
   | ResourceMap
   | ResourceMeta
+  | ResourceMetaBase
   | ResourcePotentialInput
   | ResourcePotentialOutput
+  | ResourceRawMeta
   | ResourceRoleId
   | ResourceRoleValue
   | ResourceSocket
+  | ResourceTypeBase
   | ResourceTypeData
   | ResourceTypeId
   | ResourceTypeMeta
@@ -55,7 +56,6 @@ export type CombinedEntry =
   | StepId
   | StepKind
   | Timestamp
-  | TypeBase
   | Uri
   | WhileStep
   | WhileStepId
@@ -298,30 +298,25 @@ export type ResourceBase = Identifiable & {
  * via the `definition` "ResourceTypeId".
  */
 export type ResourceTypeId = string;
-export type ResourceCanonicalMeta = ResourceBase &
-  ResourceKind & {
-    kind: "realized";
-} & Path &
-  Timestamp;
-/**
- * This interface was referenced by `GenesisJson`'s JSON-Schema
- * via the `definition` "ResourceCanonicalMetaBase".
- */
-export type ResourceCanonicalMetaBase = ResourceBase &
-  ResourceKind & {
-    kind: "realized";
-} & Path &
-  Timestamp;
 /**
  * This interface was referenced by `GenesisJson`'s JSON-Schema
  * via the `definition` "ResourceData".
  */
-export type ResourceData = ResourceCanonicalMetaBase & {
+export type ResourceData = ResourceMetaBase & {
   extractedData: {
     identity: string | number | boolean;
     [k: string]: JsonValue;
   };
 };
+/**
+ * This interface was referenced by `GenesisJson`'s JSON-Schema
+ * via the `definition` "ResourceMetaBase".
+ */
+export type ResourceMetaBase = ResourceBase &
+  ResourceKind & {
+    kind: "realized";
+} & Path &
+  Timestamp;
 /**
  * This interface was referenced by `GenesisJson`'s JSON-Schema
  * via the `definition` "ResourceFormatData".
@@ -348,11 +343,16 @@ export type ResourcePotentialOutput = ResourceBase &
   ResourceKind & {
     kind: "potential-output";
 };
+export type ResourceMeta = ResourceBase &
+  ResourceKind & {
+    kind: "realized";
+} & Path &
+  Timestamp;
 /**
  * This interface was referenced by `GenesisJson`'s JSON-Schema
- * via the `definition` "ResourceMeta".
+ * via the `definition` "ResourceRawMeta".
  */
-export type ResourceMeta = ResourceBase & CanonicalRef & Timestamp;
+export type ResourceRawMeta = ResourceBase & CanonicalRef & Timestamp;
 /**
  * This interface was referenced by `GenesisJson`'s JSON-Schema
  * via the `definition` "ResourceRoleValue".
@@ -362,22 +362,22 @@ export type ResourceRoleValue = {
 } & Documented;
 /**
  * This interface was referenced by `GenesisJson`'s JSON-Schema
- * via the `definition` "ResourceTypeData".
- */
-export type ResourceTypeData = TypeBase & ExtractionSchema;
-/**
- * This interface was referenced by `GenesisJson`'s JSON-Schema
- * via the `definition` "TypeBase".
+ * via the `definition` "ResourceTypeBase".
  */
-export type TypeBase = IdentifiableDocumented & {
+export type ResourceTypeBase = IdentifiableDocumented & {
   id: ResourceTypeId;
   resourceFormatId: ResourceFormatId;
 };
+/**
+ * This interface was referenced by `GenesisJson`'s JSON-Schema
+ * via the `definition` "ResourceTypeData".
+ */
+export type ResourceTypeData = ResourceTypeBase & ExtractionSchema;
 /**
  * This interface was referenced by `GenesisJson`'s JSON-Schema
  * via the `definition` "ResourceTypeMeta".
  */
-export type ResourceTypeMeta = TypeBase &
+export type ResourceTypeMeta = ResourceTypeBase &
   Path & {
 };
 /**
@@ -434,9 +434,9 @@ export type WorkflowSpec = Identifiable & {
 export type WorkflowSpecId = string;
 /**
  * This interface was referenced by `GenesisJson`'s JSON-Schema
- * via the `definition` "ResourceCanonicalMeta".
+ * via the `definition` "ResourceMeta".
  */
-export type ResourceCanonicalMetaBase1 = ResourceBase &
+export type ResourceMetaBase1 = ResourceBase &
   ResourceKind & {
     kind: "realized";
 } & Path &

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export { default as GenesisSchema } from './schemas/Genesis.js';
 export { default as JobSchema } from './schemas/Job.js';
 export type { ResourceData_Job as ResourceData_JobJson } from './_lib/types/ResourceData_Job.js';
-export type { Identifiable as IdentifiableJson, Documented as DocumentedJson, IdentifiableDocumented as IdentifiableDocumentedJson, ResourceFormatId as ResourceFormatIdJson, ResourceFormatMeta as ResourceFormatMetaJson, ResourceFormatData as ResourceFormatDataJson, ExtractionSchema as ExtractionSchemaJson, ExtractionSchemaValue as ExtractionSchemaValueJson, IdentityProp as IdentityPropJson, MeritProp as MeritPropJson, ResourceTypeId as ResourceTypeIdJson, ResourceTypeMeta as ResourceTypeMetaJson, ResourceTypeData as ResourceTypeDataJson, ResourceRoleId as ResourceRoleIdJson, ResourceRoleValue as ResourceRoleValueJson, ExecutionId as ExecutionIdJson, Execution as ExecutionJson, ConditionalWrapper as ConditionalWrapperJson, RoleMap as RoleMapJson, RolesOuter as RolesOuterJson, RoleBindingMap as RoleBindingMapJson, RoleBindingsOuter as RoleBindingsOuterJson, ResourceId as ResourceIdJson, WorkStepId as WorkStepIdJson, BranchStepId as BranchStepIdJson, WhileStepId as WhileStepIdJson, ForStepId as ForStepIdJson, WorkStep as WorkStepJson, BranchStep as BranchStepJson, WhileStep as WhileStepJson, ForStep as ForStepJson, StepId as StepIdJson, Step as StepJson, ResourceSocket as ResourceSocketJson, ResourcePotentialInput as ResourcePotentialInputJson, ResourcePotentialOutput as ResourcePotentialOutputJson, ResourceMeta as ResourceMetaJson, ResourceData as ResourceDataJson, ResourceMap as ResourceMapJson, WorkflowId as WorkflowIdJson, Workflow as WorkflowJson, WorkflowSpecId as WorkflowSpecIdJson, WorkflowSpec as WorkflowSpecJson, Job as JobJson, JsonValue as JsonValueJson, } from './_lib/types/types.js';
+export type { Identifiable as IdentifiableJson, Documented as DocumentedJson, IdentifiableDocumented as IdentifiableDocumentedJson, ResourceFormatId as ResourceFormatIdJson, ResourceFormatMeta as ResourceFormatMetaJson, ResourceFormatData as ResourceFormatDataJson, ExtractionSchema as ExtractionSchemaJson, ExtractionSchemaValue as ExtractionSchemaValueJson, IdentityProp as IdentityPropJson, MeritProp as MeritPropJson, ResourceTypeId as ResourceTypeIdJson, ResourceTypeMeta as ResourceTypeMetaJson, ResourceTypeData as ResourceTypeDataJson, ResourceRoleId as ResourceRoleIdJson, ResourceRoleValue as ResourceRoleValueJson, ExecutionId as ExecutionIdJson, Execution as ExecutionJson, ConditionalWrapper as ConditionalWrapperJson, RoleMap as RoleMapJson, RolesOuter as RolesOuterJson, RoleBindingMap as RoleBindingMapJson, RoleBindingsOuter as RoleBindingsOuterJson, ResourceId as ResourceIdJson, WorkStepId as WorkStepIdJson, BranchStepId as BranchStepIdJson, WhileStepId as WhileStepIdJson, ForStepId as ForStepIdJson, WorkStep as WorkStepJson, BranchStep as BranchStepJson, WhileStep as WhileStepJson, ForStep as ForStepJson, StepId as StepIdJson, Step as StepJson, ResourceSocket as ResourceSocketJson, ResourcePotentialInput as ResourcePotentialInputJson, ResourcePotentialOutput as ResourcePotentialOutputJson, ResourceRawMeta as ResourceRawMetaJson, ResourceMeta as ResourceMetaJson, ResourceData as ResourceDataJson, ResourceMap as ResourceMapJson, WorkflowId as WorkflowIdJson, Workflow as WorkflowJson, WorkflowSpecId as WorkflowSpecIdJson, WorkflowSpec as WorkflowSpecJson, Job as JobJson, JsonValue as JsonValueJson, } from './_lib/types/types.js';
 export { unsafeBrand, asResourceTypeId, asResourceRoleId, asExecutionId, asResourceId, asWorkStepId, asBranchStepId, asForStepId, asResourceFormatId, asWhileStepId, asWorkflowId, asWorkflowSpecId, asResourceTypeIds, asResourceRoleIds, asExecutionIds, asResourceIds, asWorkStepIds, asBranchStepIds, asForStepIds, asResourceFormatIds, asWhileStepIds, asWorkflowIds, asWorkflowSpecIds, } from './scripts/brandFactories.js';

package/dist/schemas/Genesis.json

@@ -533,7 +533,7 @@
             "type": "object",
             "properties": {
                 "pendingRef": {
-                    "$comment": "This points to a resource created at a previous step in the same workflow. This resource is not yet realized at the time of defining the workflow, but will be realized when the step using this resource is executed.The Engine resolves this pointer at runtime.",
+                    "$comment": "This points to a resource created at a previous step in the same workflow. This resource is not yet realized at the time of defining the workflow, but will be realized when the step using this resource is executed.The Engine resolves this ref at runtime.",
                     "$ref": "#/$defs/ResourceSocket"
                 }
             },
@@ -575,48 +575,12 @@
             ],
             "$anchor": "ResourceBase"
         },
-        "ResourceCanonicalMeta": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "unevaluatedProperties": false,
-            "$anchor": "ResourceCanonicalMeta",
-            "$ref": "#/$defs/ResourceCanonicalMetaBase"
-        },
-        "ResourceCanonicalMetaBase": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "allOf": [
-                {
-                    "$ref": "#/$defs/ResourceBase"
-                },
-                {
-                    "$ref": "#/$defs/ResourceKind"
-                },
-                {
-                    "properties": {
-                        "kind": {
-                            "const": "realized"
-                        }
-                    },
-                    "required": [
-                        "kind"
-                    ]
-                },
-                {
-                    "$ref": "#/$defs/Path"
-                },
-                {
-                    "$ref": "#/$defs/Timestamp"
-                }
-            ],
-            "$anchor": "ResourceCanonicalMetaBase"
-        },
         "ResourceData": {
             "$schema": "https://json-schema.org/draft/2020-12/schema",
             "type": "object",
             "allOf": [
                 {
-                    "$ref": "#/$defs/ResourceCanonicalMetaBase"
+                    "$ref": "#/$defs/ResourceMetaBase"
                 },
                 {
                     "properties": {
@@ -731,6 +695,13 @@
             }
         },
         "ResourceMeta": {
+            "$schema": "https://json-schema.org/draft/2020-12/schema",
+            "type": "object",
+            "unevaluatedProperties": false,
+            "$anchor": "ResourceMeta",
+            "$ref": "#/$defs/ResourceMetaBase"
+        },
+        "ResourceMetaBase": {
             "$schema": "https://json-schema.org/draft/2020-12/schema",
             "type": "object",
             "allOf": [
@@ -738,14 +709,26 @@
                     "$ref": "#/$defs/ResourceBase"
                 },
                 {
-                    "$ref": "#/$defs/CanonicalRef"
+                    "$ref": "#/$defs/ResourceKind"
+                },
+                {
+                    "properties": {
+                        "kind": {
+                            "const": "realized"
+                        }
+                    },
+                    "required": [
+                        "kind"
+                    ]
+                },
+                {
+                    "$ref": "#/$defs/Path"
                 },
                 {
                     "$ref": "#/$defs/Timestamp"
                 }
             ],
-            "unevaluatedProperties": false,
-            "$anchor": "ResourceMeta"
+            "$anchor": "ResourceMetaBase"
         },
         "ResourcePotentialInput": {
             "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -798,6 +781,23 @@
             "unevaluatedProperties": false,
             "$anchor": "ResourcePotentialOutput"
         },
+        "ResourceRawMeta": {
+            "$schema": "https://json-schema.org/draft/2020-12/schema",
+            "type": "object",
+            "allOf": [
+                {
+                    "$ref": "#/$defs/ResourceBase"
+                },
+                {
+                    "$ref": "#/$defs/CanonicalRef"
+                },
+                {
+                    "$ref": "#/$defs/Timestamp"
+                }
+            ],
+            "unevaluatedProperties": false,
+            "$anchor": "ResourceRawMeta"
+        },
         "ResourceRoleId": {
             "$schema": "https://json-schema.org/draft/2020-12/schema",
             "type": "string",
@@ -841,12 +841,36 @@
             ],
             "$anchor": "ResourceSocket"
         },
+        "ResourceTypeBase": {
+            "$schema": "https://json-schema.org/draft/2020-12/schema",
+            "type": "object",
+            "allOf": [
+                {
+                    "$ref": "#/$defs/IdentifiableDocumented"
+                },
+                {
+                    "properties": {
+                        "id": {
+                            "$ref": "#/$defs/ResourceTypeId"
+                        },
+                        "resourceFormatId": {
+                            "$ref": "#/$defs/ResourceFormatId"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "resourceFormatId"
+                    ]
+                }
+            ],
+            "$anchor": "ResourceTypeBase"
+        },
         "ResourceTypeData": {
             "$schema": "https://json-schema.org/draft/2020-12/schema",
             "type": "object",
             "allOf": [
                 {
-                    "$ref": "#/$defs/TypeBase"
+                    "$ref": "#/$defs/ResourceTypeBase"
                 },
                 {
                     "$ref": "#/$defs/ExtractionSchema"
@@ -865,7 +889,7 @@
             "type": "object",
             "allOf": [
                 {
-                    "$ref": "#/$defs/TypeBase"
+                    "$ref": "#/$defs/ResourceTypeBase"
                 },
                 {
                     "$ref": "#/$defs/Path"
@@ -1048,30 +1072,6 @@
             ],
             "$anchor": "Timestamp"
         },
-        "TypeBase": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "allOf": [
-                {
-                    "$ref": "#/$defs/IdentifiableDocumented"
-                },
-                {
-                    "properties": {
-                        "id": {
-                            "$ref": "#/$defs/ResourceTypeId"
-                        },
-                        "resourceFormatId": {
-                            "$ref": "#/$defs/ResourceFormatId"
-                        }
-                    },
-                    "required": [
-                        "id",
-                        "resourceFormatId"
-                    ]
-                }
-            ],
-            "$anchor": "TypeBase"
-        },
         "Uri": {
             "$schema": "https://json-schema.org/draft/2020-12/schema",
             "type": "object",

package/dist/scripts/generateResourceData.js

@@ -52,7 +52,7 @@ async function main() {
         title: `ResourceData_${name}`,
         type: 'object',
         allOf: [
-            { $ref: './Genesis.json#/$defs/ResourceCanonicalMetaBase' },
+            { $ref: './Genesis.json#/$defs/ResourceMetaBase' },
             {
                 type: 'object',
                 required: ['extractedData'],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toolproof-npm/schema",
-  "version": "0.1.32",
+  "version": "0.1.33",
   "description": "JSON schemas and TypeScript types for ToolProof",
   "keywords": [
     "toolproof",