@toolproof-core/lib 1.0.17 → 1.0.19

package/src/utils/extractData.ts

@@ -77,13 +77,13 @@ export function extractRoleMapFromRawStrategy(rawStrategy: RawStrategyJson, jobM
         const job = jobMap.get(jobHandle);
         if (!job) continue;
 
-        for (const [rid, role] of Object.entries(job.roles.inputRoleValueByIdentity)) {
+        for (const [rid, role] of Object.entries(job.roleSpec.inputRoleValueByIdentity)) {
             roleMap.set(rid as ResourceRoleIdentityJson, {
                 identity: rid as ResourceRoleIdentityJson,
                 ...role,
             });
         }
-        for (const [rid, role] of Object.entries(job.roles.outputRoleValueByIdentity)) {
+        for (const [rid, role] of Object.entries(job.roleSpec.outputRoleValueByIdentity)) {
             roleMap.set(rid as ResourceRoleIdentityJson, {
                 identity: rid as ResourceRoleIdentityJson,
                 ...role,
@@ -96,7 +96,7 @@ export function extractRoleMapFromRawStrategy(rawStrategy: RawStrategyJson, jobM
 
 export function extractSingleNonErrorOutputTypeHandle(job: JobJson): ResourceTypeIdentityJson | null {
     const errorRoleId = CONSTANTS.Cosmos.ROLE_ErrorOutput;
-    const outputEntries = Object.entries(job.roles.outputRoleValueByIdentity).filter(([roleId]) => roleId !== errorRoleId);
+    const outputEntries = Object.entries(job.roleSpec.outputRoleValueByIdentity).filter(([roleId]) => roleId !== errorRoleId);
     if (!outputEntries || !outputEntries[0] || outputEntries.length !== 1) {
         throw new Error(`Job ${job.identity} must have exactly one non-error output role to be branchable/loopable`);
     } // ATTENTION_PUREIFY

package/src/utils/parallelizeSteps.ts

@@ -90,24 +90,24 @@ export function getIndependentThreads(steps: StepJson[], strategyState: Strategy
         ensureOwner(ownerIndex);
 
         const jobStep = jobStepById.get(jobStepId);
-        const inputBindings = jobStep?.roleBindings?.inputBindings ?? [];
+        const inputBindings = jobStep?.roleBindingSpec?.inputBindings ?? [];
         const bucket = strategyState?.[jobStepId] ?? ({} as any);
 
         for (const inputRoleHandle of inputBindings) {
             const entry = bucket?.[inputRoleHandle as ResourceRoleIdentityJson] as any;
-            if (!entry || entry.resourceShellKind !== 'inputPotential') continue;
+            if (!entry || entry.resourceShellKind !== 'internalInputPotential') continue;
 
             const creatorJobStepHandle = entry?.creationContext?.jobStepHandle as JobStepIdentityJson | undefined;
             if (!creatorJobStepHandle) {
                 throw new Error(
-                    `Unresolvable inputPotential in jobStep '${jobStepId}' (${getOwnerLabel(ownerIndex)}): missing creationContext.jobStepHandle for role '${inputRoleHandle}'`
+                    `Unresolvable internalInputPotential in jobStep '${jobStepId}' (${getOwnerLabel(ownerIndex)}): missing creationContext.jobStepHandle for role '${inputRoleHandle}'`
                 );
             }
 
             const producerOwner = jobStepIdToOwner.get(creatorJobStepHandle);
             if (producerOwner === undefined) {
                 throw new Error(
-                    `Unresolvable inputPotential in jobStep '${jobStepId}' (${getOwnerLabel(ownerIndex)}): creator jobStepHandle '${creatorJobStepHandle}' not found in strategy steps`
+                    `Unresolvable internalInputPotential in jobStep '${jobStepId}' (${getOwnerLabel(ownerIndex)}): creator jobStepHandle '${creatorJobStepHandle}' not found in strategy steps`
                 );
             }
 

package/src/utils/resolveResourceChain.ts

@@ -1,9 +1,9 @@
 import type {
     CreationContextJson,
+    ExternalInputPotentialShellJson,
+    InternalInputPotentialShellJson,
+    OutputPotentialShellJson,
     ResourceJson,
-    ResourceMissingJson,
-    ResourceInputPotentialJson,
-    ResourceOutputPotentialJson,
     ResourcePotentialJson,
     StrategyStateJson,
 } from '@toolproof-core/schema';
@@ -11,8 +11,8 @@ import { CONSTANTS } from '../artifacts/artifacts.js';
 
 export type ResolveResult =
     | { status: typeof CONSTANTS.Enums.ResourceShellKind.materialized; entry: ResourceJson; path: CreationContextJson[] }
-    | { status: typeof CONSTANTS.Enums.ResourceShellKind.missing; entry: ResourceMissingJson; path: CreationContextJson[] }
-    | { status: typeof CONSTANTS.Enums.ResourceShellKind.outputPotential; entry: ResourceOutputPotentialJson; path: CreationContextJson[] }
+    | { status: typeof CONSTANTS.Enums.ResourceShellKind.externalInputPotential; entry: ExternalInputPotentialShellJson; path: CreationContextJson[] }
+    | { status: typeof CONSTANTS.Enums.ResourceShellKind.outputPotential; entry: OutputPotentialShellJson; path: CreationContextJson[] }
     | { status: 'unresolved'; reason: 'not-found' | 'cycle' | 'depth-exceeded'; path: CreationContextJson[] };
 
 export function resolveResourceChain(
@@ -45,16 +45,16 @@ export function resolveResourceChain(
         if (entry.resourceShellKind === CONSTANTS.Enums.ResourceShellKind.materialized) {
             return { status: CONSTANTS.Enums.ResourceShellKind.materialized, entry: entry as ResourceJson, path };
         }
-        if (entry.resourceShellKind === CONSTANTS.Enums.ResourceShellKind.missing) {
-            return { status: CONSTANTS.Enums.ResourceShellKind.missing, entry: entry as ResourceMissingJson, path };
+        if (entry.resourceShellKind === CONSTANTS.Enums.ResourceShellKind.externalInputPotential) {
+            return { status: CONSTANTS.Enums.ResourceShellKind.externalInputPotential, entry: entry as ExternalInputPotentialShellJson, path };
         }
         if (entry.resourceShellKind === CONSTANTS.Enums.ResourceShellKind.outputPotential) {
-            return { status: CONSTANTS.Enums.ResourceShellKind.outputPotential, entry: entry as ResourceOutputPotentialJson, path };
+            return { status: CONSTANTS.Enums.ResourceShellKind.outputPotential, entry: entry as OutputPotentialShellJson, path };
         }
 
-        // inputPotential: follow ref backwards
-        if (entry.resourceShellKind === CONSTANTS.Enums.ResourceShellKind.inputPotential) {
-            current = (entry as ResourceInputPotentialJson).creationContext;
+        // internalInputPotential: follow ref backwards
+        if (entry.resourceShellKind === CONSTANTS.Enums.ResourceShellKind.internalInputPotential) {
+            current = (entry as InternalInputPotentialShellJson).creationContext;
             continue;
         }