@toolproof-npm/schema 0.1.82 → 0.1.84

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import { WorkStepIdentity, BranchStepIdentity, WhileStepIdentity, ForStepIdentit
 export { default as SchemaGenesis } from './genesis/generated/schemas/Genesis.js';
 export { default as SchemaJob } from './genesis/generated/schemas/Job.js';
 export { default as SchemaRunRecording } from './genesis/generated/schemas/RunRecording.js';
-export { default as ResourceTypeGenesis } from './genesis/generated/resource-type-envelopes/Genesis.js';
+export { default as ResourceTypeGenesis } from './genesis/generated/resourceTypes/Genesis.js';
 export { default as dependencies } from './genesis/generated/dependencies_ordered.json';
 export { default as terminals } from './genesis/generated/terminals.json';
 export type { ResourceTypeGenesis as ResourceTypeGenesisJson } from './genesis/generated/types/ResourceTypeGenesis.js';
@@ -11,8 +11,8 @@ export type { Resource_ResourceType as Resource_ResourceTypeJson } from './genes
 export type { Resource_Job as Resource_JobJson } from './genesis/generated/types/Resource_Job.js';
 export type { Resource_StatelessStrategy as Resource_StatelessStrategyJson } from './genesis/generated/types/Resource_StatelessStrategy.js';
 export type { Resource_StatefulStrategy as Resource_StatefulStrategyJson } from './genesis/generated/types/Resource_StatefulStrategy.js';
-export type { Resource_StrategyRun as Resource_StrategyRunJson } from './genesis/generated/types/Resource_StrategyRun.js';
+export type { Resource_RunnableStrategy as Resource_RunnableStrategyJson } from './genesis/generated/types/Resource_RunnableStrategy.js';
 export type StepIdentityJson = WorkStepIdentity | BranchStepIdentity | WhileStepIdentity | ForStepIdentity;
 export type { Documented as DocumentedJson, ResourceFormatIdentity as ResourceFormatIdentityJson, ResourceFormat as ResourceFormatJson, ExtractionSchema as ExtractionSchemaJson, IdentityProp as IdentityPropJson, MeritProp as MeritPropJson, ResourceTypeIdentity as ResourceTypeIdentityJson, ResourceType as ResourceTypeJson, ResourceRoleIdentity as ResourceRoleIdentityJson, ResourceRoleValue as ResourceRoleValueJson, ExecutionIdentity as ExecutionIdentityJson, Execution as ExecutionJson, Conditional as ConditionalJson, RoleMap as RoleMapJson, Roles as RolesJson, RoleBindingMap as RoleBindingMapJson, RoleBindings as RoleBindingsJson, ResourceIdentity as ResourceIdentityJson, WorkStepIdentity as WorkStepIdentityJson, BranchStepIdentity as BranchStepIdentityJson, WhileStepIdentity as WhileStepIdentityJson, ForStepIdentity as ForStepIdentityJson, WorkStep as WorkStepJson, BranchStep as BranchStepJson, WhileStep as WhileStepJson, ForStep as ForStepJson, StepKind as StepKindJson, Step as StepJson, CreationContext as CreationContextJson, ResourceMissing as ResourceMissingJson, ResourcePotentialInput as ResourcePotentialInputJson, ResourcePotentialOutput as ResourcePotentialOutputJson, ResourceMetaBase as ResourceMetaJson, // ATTENTION: type not generated for ResourceMeta
-Resource as ResourceJson, StrategyState as StrategyStateJson, StatelessStrategyIdentity as StatelessStrategyIdentityJson, StatelessStrategy as StatelessStrategyJson, StatefulStrategyIdentity as StatefulStrategyIdentityJson, StatefulStrategy as StatefulStrategyJson, StrategyRunIdentity as StrategyRunIdentityJson, StrategyRunStatus as StrategyRunStatusJson, StrategyRun as StrategyRunJson, StrategyRunUpdate as StrategyRunUpdateJson, JobIdentity as JobIdentityJson, Job as JobJson, JsonData as JsonDataJson, StrategyThreadIdentity as StrategyThreadIdentityJson, StrategyThreadMap as StrategyThreadMapJson, ExecutionSocket as ExecutionSocketJson, ExecutionSocketMaterialized as ExecutionSocketMaterializedJson, Timestamp as TimestampJson, } from './genesis/generated/types/types.js';
+Resource as ResourceJson, StrategyState as StrategyStateJson, StatelessStrategyIdentity as StatelessStrategyIdentityJson, StatelessStrategy as StatelessStrategyJson, StatefulStrategyIdentity as StatefulStrategyIdentityJson, StatefulStrategy as StatefulStrategyJson, RunnableStrategyIdentity as RunnableStrategyIdentityJson, RunnableStrategyStatus as RunnableStrategyStatusJson, RunnableStrategy as RunnableStrategyJson, RunnableStrategyUpdate as RunnableStrategyUpdateJson, JobIdentity as JobIdentityJson, Job as JobJson, JsonData as JsonDataJson, StrategyThreadIdentity as StrategyThreadIdentityJson, StrategyThreadMap as StrategyThreadMapJson, ExecutionSocket as ExecutionSocketJson, Timestamp as TimestampJson, } from './genesis/generated/types/types.js';
 export { isResourceRoleIdentityJson, isStrategyThreadIdentityJson } from './identityGuards.js';

package/dist/index.js

@@ -2,7 +2,7 @@
 export { default as SchemaGenesis } from './genesis/generated/schemas/Genesis.js';
 export { default as SchemaJob } from './genesis/generated/schemas/Job.js';
 export { default as SchemaRunRecording } from './genesis/generated/schemas/RunRecording.js';
-export { default as ResourceTypeGenesis } from './genesis/generated/resource-type-envelopes/Genesis.js';
+export { default as ResourceTypeGenesis } from './genesis/generated/resourceTypes/Genesis.js';
 export { default as dependencies } from './genesis/generated/dependencies_ordered.json';
 export { default as terminals } from './genesis/generated/terminals.json';
 export { isResourceRoleIdentityJson, isStrategyThreadIdentityJson } from './identityGuards.js';

package/dist/scripts/generateTypes.js

@@ -476,10 +476,8 @@ async function main() {
         // These are emitted as `[k: string]` by json-schema-to-typescript but are identity-keyed in practice.
         const executionSocketValueType = 'ResourceMissing | ResourcePotentialInput | ResourcePotentialOutput | Resource';
         ts = ts.replace(/export interface ExecutionSocket\s*\{\s*\[k:\s*string\]:\s*[^;]+;\s*\}/g, `export type ExecutionSocket = Record<${resourceRoleKeyType}, ${executionSocketValueType}>;`);
-        ts = ts.replace(/export interface ExecutionSocketMaterialized\s*\{\s*\[k:\s*string\]:\s*Resource;\s*\}/g, `export type ExecutionSocketMaterialized = Record<${resourceRoleKeyType}, Resource>;`);
         ts = ts.replace(/export interface StrategyState\s*\{\s*\[k:\s*string\]:\s*ExecutionSocket;\s*\}/g, `export type StrategyState = Record<${executionKeyType}, ExecutionSocket>;`);
-        ts = ts.replace(/(strategyStateUpdate:\s*)\{\s*\[k:\s*string\]:\s*ExecutionSocketMaterialized;\s*\};/g, `$1Record<${executionKeyType}, ExecutionSocketMaterialized>;`);
-        ts = ts.replace(/(strategyStateUpdateWide\??:\s*)\{\s*\[k:\s*string\]:\s*ExecutionSocket;\s*\};/g, `$1Record<${executionKeyType}, ExecutionSocket>;`);
+        ts = ts.replace(/(strategyStateUpdate\??:\s*)\{\s*\[k:\s*string\]:\s*ExecutionSocket;\s*\};/g, `$1Record<${executionKeyType}, ExecutionSocket>;`);
         // Ensure key constraints for strategyThreadMap are preserved as template-literal identity keys.
         // json-schema-to-typescript emits `[k: string]: Step[];`, but we want keys to be `StrategyThreadIdentity`.
         ts = ts.replace(/export interface StrategyThreadMap\s*\{\s*\[k:\s*string\]:\s*Step\[\];\s*\}/g, `export type StrategyThreadMap = Record<${strategyThreadKeyType}, Step[]>;`);

package/package.json

@@ -1,65 +1,65 @@
 {
-  "name": "@toolproof-npm/schema",
-  "version": "0.1.82",
-  "description": "JSON schemas and TypeScript types for ToolProof",
-  "keywords": [
-    "toolproof",
-    "schemas",
-    "json-schema",
-    "typescript"
-  ],
-  "author": "ToolProof Team",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ToolProof/core.git",
-    "directory": "packages/_schemas"
-  },
-  "homepage": "https://github.com/ToolProof/core#readme",
-  "bugs": {
-    "url": "https://github.com/ToolProof/core/issues"
-  },
-  "type": "module",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "exports": {
-    ".": {
-      "import": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+    "name": "@toolproof-npm/schema",
+    "version": "0.1.84",
+    "description": "JSON schemas and TypeScript types for ToolProof",
+    "keywords": [
+        "toolproof",
+        "schemas",
+        "json-schema",
+        "typescript"
+    ],
+    "author": "ToolProof Team",
+    "license": "MIT",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/ToolProof/core.git",
+        "directory": "packages/_schemas"
     },
-    "./identityGuards": {
-      "import": "./dist/identityGuards.js",
-      "types": "./dist/identityGuards.d.ts"
+    "homepage": "https://github.com/ToolProof/core#readme",
+    "bugs": {
+        "url": "https://github.com/ToolProof/core/issues"
+    },
+    "type": "module",
+    "main": "dist/index.js",
+    "types": "dist/index.d.ts",
+    "exports": {
+        ".": {
+            "import": "./dist/index.js",
+            "types": "./dist/index.d.ts"
+        },
+        "./identityGuards": {
+            "import": "./dist/identityGuards.js",
+            "types": "./dist/identityGuards.d.ts"
+        }
+    },
+    "scripts": {
+        "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",
+        "resolveRefsInGenesisStory": "pnpm run build:scripts && node ./dist/scripts/resolveRefsInGenesisStory.js",
+        "generateTypes": "node ./dist/scripts/generateTypes.js",
+        "generateResourceTypeGenesisType": "node ./dist/scripts/generateResourceTypeGenesisType.js",
+        "generateResourceTypeType": "node ./dist/scripts/generateResourceTypeType.js",
+        "generateResourceEnvelopes": "node ./dist/scripts/generateResourceEnvelopes.js",
+        "generateSchemaShims": "node ./dist/scripts/generateSchemaShims.js",
+        "generateDependencies": "node ./dist/scripts/generateDependencies.js",
+        "generateDependenciesOrdered": "node ./dist/scripts/generateDependenciesOrdered.js",
+        "generateTerminals": "node ./dist/scripts/generateTerminals.js",
+        "update": "rimraf /s /q dist && pnpm run build:scripts && pnpm run rewriteAnchors && pnpm run generateResourceEnvelopes && pnpm run extractSchemas && pnpm run extractSubschema -- --name Job && pnpm run extractSubschema -- --name ResourceFormat && pnpm run extractSubschema -- --name ResourceType && pnpm run extractSubschema -- --name StatelessStrategy && pnpm run extractSubschema -- --name StatefulStrategy && pnpm run extractSubschema -- --name RunnableStrategy && pnpm run extractSubschema -- --name RunRecording && pnpm run generateSchemaShims && pnpm run generateTypes && pnpm run generateResourceTypeType -- --name Job && pnpm run generateResourceTypeType -- --name ResourceFormat && pnpm run generateResourceTypeType -- --name ResourceType && pnpm run generateResourceTypeType -- --name StatelessStrategy && pnpm run generateResourceTypeType -- --name StatefulStrategy && pnpm run generateResourceTypeType -- --name RunnableStrategy && pnpm run generateResourceTypeGenesisType && pnpm run generateDependencies && pnpm run generateDependenciesOrdered && pnpm run generateTerminals && pnpm run build"
+    },
+    "files": [
+        "dist",
+        "README.md"
+    ],
+    "devDependencies": {
+        "@apidevtools/json-schema-ref-parser": "^14.2.1",
+        "@types/node": "^20.8.1",
+        "ajv-cli": "^5.0.0",
+        "ajv-formats": "^3.0.1",
+        "json-schema-to-typescript": "^15.0.4",
+        "rimraf": "^5.0.0",
+        "typescript": "^5.0.0"
     }
-  },
-  "files": [
-    "dist",
-    "README.md"
-  ],
-  "devDependencies": {
-    "@apidevtools/json-schema-ref-parser": "^14.2.1",
-    "@types/node": "^20.8.1",
-    "ajv-cli": "^5.0.0",
-    "ajv-formats": "^3.0.1",
-    "json-schema-to-typescript": "^15.0.4",
-    "rimraf": "^5.0.0",
-    "typescript": "^5.0.0"
-  },
-  "scripts": {
-    "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",
-    "resolveRefsInGenesisStory": "pnpm run build:scripts && node ./dist/scripts/resolveRefsInGenesisStory.js",
-    "generateTypes": "node ./dist/scripts/generateTypes.js",
-    "generateResourceTypeGenesisType": "node ./dist/scripts/generateResourceTypeGenesisType.js",
-    "generateResourceTypeType": "node ./dist/scripts/generateResourceTypeType.js",
-    "generateResourceEnvelopes": "node ./dist/scripts/generateResourceEnvelopes.js",
-    "generateSchemaShims": "node ./dist/scripts/generateSchemaShims.js",
-    "generateDependencies": "node ./dist/scripts/generateDependencies.js",
-    "generateDependenciesOrdered": "node ./dist/scripts/generateDependenciesOrdered.js",
-    "generateTerminals": "node ./dist/scripts/generateTerminals.js",
-    "update": "rimraf /s /q dist && pnpm run build:scripts && pnpm run rewriteAnchors && pnpm run generateResourceEnvelopes && pnpm run extractSchemas && pnpm run extractSubschema -- --name Job && pnpm run extractSubschema -- --name ResourceFormat && pnpm run extractSubschema -- --name ResourceType && pnpm run extractSubschema -- --name StatelessStrategy && pnpm run extractSubschema -- --name StatefulStrategy && pnpm run extractSubschema -- --name StrategyRun && pnpm run extractSubschema -- --name RunRecording && pnpm run generateSchemaShims && pnpm run generateTypes && pnpm run generateResourceTypeType -- --name Job && pnpm run generateResourceTypeType -- --name ResourceFormat && pnpm run generateResourceTypeType -- --name ResourceType && pnpm run generateResourceTypeType -- --name StatelessStrategy && pnpm run generateResourceTypeType -- --name StatefulStrategy && pnpm run generateResourceTypeType -- --name StrategyRun && pnpm run generateResourceTypeGenesisType && pnpm run build && pnpm run generateDependencies && pnpm run generateDependenciesOrdered && pnpm run generateTerminals"
-  }
-}
+}

package/dist/genesis/generated/resource-envelopes/Genesis.d.ts

@@ -1,2 +0,0 @@
-import resources from './Genesis.json';
-export default resources;

package/dist/genesis/generated/resource-envelopes/Genesis.js

@@ -1,2 +0,0 @@
-import resources from './Genesis.json' with { type: 'json' };
-export default resources;