@toolproof-core/lib 1.0.41 → 1.0.43

package/dist/lookups/lookups.d.ts

@@ -16,7 +16,11 @@ export declare const CONSTANTS: {
         };
     };
     readonly Cosmos: {
-        readonly ErrorOutputRoleName: "ErrorOutput";
+        readonly RoleNames: {
+            readonly ErrorOutput: "ErrorOutput";
+            readonly LessThanSource: "LessThanSource";
+            readonly LessThanTarget: "LessThanTarget";
+        };
     };
     readonly Names: {
         readonly AtomicTypeRef: "AtomicTypeRef";

package/dist/lookups/lookups.js

@@ -18,7 +18,11 @@ export const CONSTANTS = {
         },
     },
     Cosmos: {
-        ErrorOutputRoleName: 'ErrorOutput',
+        RoleNames: {
+            ErrorOutput: 'ErrorOutput',
+            LessThanSource: 'LessThanSource',
+            LessThanTarget: 'LessThanTarget',
+        }
     }
 };
 export const MAPPINGS = {

package/dist/utils/mutableStrategyOverlay.js

@@ -58,42 +58,42 @@ function getOutputRoleValue(tool, roleName) {
     return tool.roleSpec.outputRoleValueByName[roleName];
 }
 export function bindInternalInputPotential(strategyState, targetAddress, sourceAddress, context) {
-    const sourceToolStep = context.toolStepByKey.get(sourceAddress.toolStepKey) ?? null;
+    const sourceToolStep = context.toolStepByKey.get(sourceAddress.toolStepKey);
     if (!sourceToolStep) {
         throw new Error(`Source tool step not found for '${sourceAddress.toolStepKey}'.`);
     }
-    const targetToolStep = context.toolStepByKey.get(targetAddress.toolStepKey) ?? null;
+    const targetToolStep = context.toolStepByKey.get(targetAddress.toolStepKey);
     if (!targetToolStep) {
         throw new Error(`Target tool step not found for '${targetAddress.toolStepKey}'.`);
     }
-    const sourceTool = context.toolMap.get(sourceToolStep.toolHandle) ?? null;
+    const sourceTool = context.toolMap.get(sourceToolStep.toolHandle);
     if (!sourceTool) {
         throw new Error(`Source tool not found for '${sourceToolStep.toolHandle}'.`);
     }
-    const targetTool = context.toolMap.get(targetToolStep.toolHandle) ?? null;
+    const targetTool = context.toolMap.get(targetToolStep.toolHandle);
     if (!targetTool) {
         throw new Error(`Target tool not found for '${targetToolStep.toolHandle}'.`);
     }
-    const targetInputRole = getInputRoleValue(targetTool, targetAddress.roleName);
-    if (!targetInputRole) {
+    const targetInputRoleValue = getInputRoleValue(targetTool, targetAddress.roleName);
+    if (!targetInputRoleValue) {
         throw new Error(`Target input role not found for (${targetAddress.toolStepKey}, ${targetAddress.roleName}).`);
     }
-    const sourceOutputRole = getOutputRoleValue(sourceTool, sourceAddress.roleName);
-    const sourceInputRole = getInputRoleValue(sourceTool, sourceAddress.roleName);
+    const sourceOutputRoleValue = getOutputRoleValue(sourceTool, sourceAddress.roleName);
+    const sourceInputRoleValue = getInputRoleValue(sourceTool, sourceAddress.roleName);
     const sourceInputEntryByRoleName = strategyState[sourceAddress.toolStepKey];
     const sourceInputEntry = sourceInputEntryByRoleName?.[sourceAddress.roleName];
-    const sourceRoleType = sourceOutputRole
-        ? extractResourceTypeHandleFromRoleValue(sourceOutputRole)
-        : sourceInputRole
-            ? extractResourceTypeHandleFromRoleValue(sourceInputRole)
+    const sourceRoleType = sourceOutputRoleValue
+        ? extractResourceTypeHandleFromRoleValue(sourceOutputRoleValue)
+        : sourceInputRoleValue
+            ? extractResourceTypeHandleFromRoleValue(sourceInputRoleValue)
             : null;
-    const targetRoleType = extractResourceTypeHandleFromRoleValue(targetInputRole);
-    if (!sourceOutputRole && sourceInputRole) {
+    const targetRoleType = extractResourceTypeHandleFromRoleValue(targetInputRoleValue);
+    if (!sourceOutputRoleValue && sourceInputRoleValue) {
         if (!sourceInputEntry) {
             throw new Error(`Source input role is not bound for (${sourceAddress.toolStepKey}, ${sourceAddress.roleName}).`); // ATTENTION: not an ontological invariant, but it might help catch some mistakes early on.
         }
     }
-    if (!sourceOutputRole && !sourceInputRole) {
+    if (!sourceOutputRoleValue && !sourceInputRoleValue) {
         throw new Error(`Source role not found for (${sourceAddress.toolStepKey}, ${sourceAddress.roleName}).`);
     }
     if (!sourceRoleType || !targetRoleType || sourceRoleType !== targetRoleType) {

package/dist/utils/stepExpansion.d.ts

@@ -0,0 +1,6 @@
+import type { MutableStep, MutableToolStep, MutableToolStepKey } from './mutableStrategyOverlay.js';
+export type StepExpansionOrder = {
+    branchCaseOrder?: 'when-what' | 'what-when';
+    loopCaseOrder?: 'what-when' | 'when-what';
+};
+export declare function extractToolStepsFromStep<TKey extends string = MutableToolStepKey, TStep extends MutableStep<TKey> = MutableStep<TKey>>(step: TStep, order?: StepExpansionOrder): MutableToolStep<TKey>[];

package/dist/utils/stepExpansion.js

@@ -0,0 +1,32 @@
+import { CONSTANTS } from '../lookups/lookups.js';
+export function extractToolStepsFromStep(step, order = {}) {
+    const { branchCaseOrder = 'when-what', loopCaseOrder = 'what-when', } = order;
+    if (step.stepKind === CONSTANTS.Enums.StepKind.tool) {
+        return [step];
+    }
+    if (step.stepKind === CONSTANTS.Enums.StepKind.branch) {
+        const branch = step;
+        const cases = branch.cases ?? [];
+        return cases.flatMap((stepCase) => {
+            if (branchCaseOrder === 'what-when') {
+                return [stepCase.what, stepCase.when];
+            }
+            return [stepCase.when, stepCase.what];
+        }).filter(Boolean);
+    }
+    if (step.stepKind === CONSTANTS.Enums.StepKind.while) {
+        const loop = step;
+        if (loopCaseOrder === 'when-what') {
+            return [loop.case.when, loop.case.what].filter(Boolean);
+        }
+        return [loop.case.what, loop.case.when].filter(Boolean);
+    }
+    if (step.stepKind === CONSTANTS.Enums.StepKind.for) {
+        const loop = step;
+        if (loopCaseOrder === 'when-what') {
+            return [loop.case.when, loop.case.what].filter(Boolean);
+        }
+        return [loop.case.what, loop.case.when].filter(Boolean);
+    }
+    return [];
+}

package/dist/utils/stepParallelization.js

@@ -1,4 +1,4 @@
-import { CONSTANTS } from '../lookups/lookups.js';
+import { extractToolStepsFromStep } from './stepExpansion.js';
 export function getIndependentThreads(steps, strategyState) {
     const getOwnerLabel = (ownerIndex) => {
         const step = steps[ownerIndex];
@@ -17,28 +17,8 @@ export function getIndependentThreads(steps, strategyState) {
         toolStepByKey.set(toolStep.toolStepKey, toolStep);
     };
     steps.forEach((step, ownerIndex) => {
-        if (step.stepKind === CONSTANTS.Enums.StepKind.tool) {
-            addToolStep(step, ownerIndex);
-            return;
-        }
-        if (step.stepKind === CONSTANTS.Enums.StepKind.for) {
-            const loop = step;
-            addToolStep(loop.case?.what, ownerIndex);
-            addToolStep(loop.case?.when, ownerIndex);
-            return;
-        }
-        if (step.stepKind === CONSTANTS.Enums.StepKind.while) {
-            const loop = step;
-            addToolStep(loop.case?.what, ownerIndex);
-            addToolStep(loop.case?.when, ownerIndex);
-            return;
-        }
-        if (step.stepKind === CONSTANTS.Enums.StepKind.branch) {
-            const branch = step;
-            for (const stepCase of branch.cases) {
-                addToolStep(stepCase?.what, ownerIndex);
-                addToolStep(stepCase?.when, ownerIndex);
-            }
+        for (const toolStep of extractToolStepsFromStep(step, { branchCaseOrder: 'what-when' })) {
+            addToolStep(toolStep, ownerIndex);
         }
     });
     const ownerAdj = new Map();

package/dist/utils/strategyExtraction.js

@@ -1,4 +1,5 @@
 import { CONSTANTS } from '../lookups/lookups.js';
+import { extractToolStepsFromStep } from './stepExpansion.js';
 export function getInputRoleSpecEntriesFromTool(tool) {
     return Object.entries(tool.roleSpec.inputRoleValueByName);
 }
@@ -20,32 +21,9 @@ export function extractResourceTypeHandleFromRoleValue(roleValue) {
 }
 export function extractToolStepsFromStrategy(strategy) {
     const toolSteps = [];
-    const visitStep = (step) => {
-        switch (step.stepKind) {
-            case 'tool': {
-                toolSteps.push(step);
-                return;
-            }
-            case 'branch': {
-                for (const conditional of step.cases) {
-                    toolSteps.push(conditional.when, conditional.what);
-                }
-                return;
-            }
-            case 'while':
-            case 'for': {
-                toolSteps.push(step.case.when, step.case.what);
-                return;
-            }
-            default: {
-                const _exhaustive = step;
-                return _exhaustive;
-            }
-        }
-    };
     for (const threadSteps of strategy.stepsByThreadIndex) {
         for (const step of threadSteps) {
-            visitStep(step);
+            toolSteps.push(...extractToolStepsFromStep(step, { loopCaseOrder: 'when-what' }));
         }
     }
     return toolSteps;
@@ -80,7 +58,7 @@ export function extractRoleSpecByDirectionByToolHandleFromStrategy(strategy, too
     return roleSpecByDirectionByToolHandle;
 }
 export function extractSingleBranchableOutputResourceTypeHandle(tool) {
-    const outputRoleSpecEntries = getOutputRoleSpecEntriesFromTool(tool).filter(([roleName]) => roleName !== CONSTANTS.Cosmos.ErrorOutputRoleName);
+    const outputRoleSpecEntries = getOutputRoleSpecEntriesFromTool(tool).filter(([roleName]) => roleName !== CONSTANTS.Cosmos.RoleNames.ErrorOutput);
     if (!outputRoleSpecEntries[0] || outputRoleSpecEntries.length !== 1) {
         throw new Error(`Tool ${tool.handle} must have exactly one branchable output resource type to be branchable/loopable`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toolproof-core/lib",
-  "version": "1.0.41",
+  "version": "1.0.43",
   "description": "",
   "type": "module",
   "keywords": [],
@@ -39,6 +39,10 @@
       "types": "./dist/utils/stepCreation.d.ts",
       "import": "./dist/utils/stepCreation.js"
     },
+    "./step-expansion": {
+      "types": "./dist/utils/stepExpansion.d.ts",
+      "import": "./dist/utils/stepExpansion.js"
+    },
     "./tool-step-paths": {
       "types": "./dist/utils/toolStepPaths.d.ts",
       "import": "./dist/utils/toolStepPaths.js"

package/src/lookups/lookups.ts

@@ -19,7 +19,11 @@ export const CONSTANTS = {
         },
     },
     Cosmos: {
-        ErrorOutputRoleName: 'ErrorOutput' as const,
+        RoleNames: {
+            ErrorOutput: 'ErrorOutput' as const,
+            LessThanSource: 'LessThanSource' as const,
+            LessThanTarget: 'LessThanTarget' as const,
+        }
     }
 } as const;
 

package/src/utils/mutableStrategyOverlay.ts

@@ -210,52 +210,52 @@ export function bindInternalInputPotential<TKey extends string, TStrategyState e
     }
 ): TStrategyState {
 
-    const sourceToolStep = context.toolStepByKey.get(sourceAddress.toolStepKey) ?? null;
+    const sourceToolStep = context.toolStepByKey.get(sourceAddress.toolStepKey);
     if (!sourceToolStep) {
         throw new Error(`Source tool step not found for '${sourceAddress.toolStepKey}'.`);
     }
 
-    const targetToolStep = context.toolStepByKey.get(targetAddress.toolStepKey) ?? null;
+    const targetToolStep = context.toolStepByKey.get(targetAddress.toolStepKey);
     if (!targetToolStep) {
         throw new Error(`Target tool step not found for '${targetAddress.toolStepKey}'.`);
     }
 
-    const sourceTool = context.toolMap.get(sourceToolStep.toolHandle) ?? null;
+    const sourceTool = context.toolMap.get(sourceToolStep.toolHandle);
     if (!sourceTool) {
         throw new Error(`Source tool not found for '${sourceToolStep.toolHandle}'.`);
     }
 
-    const targetTool = context.toolMap.get(targetToolStep.toolHandle) ?? null;
+    const targetTool = context.toolMap.get(targetToolStep.toolHandle);
     if (!targetTool) {
         throw new Error(`Target tool not found for '${targetToolStep.toolHandle}'.`);
     }
 
-    const targetInputRole = getInputRoleValue(targetTool, targetAddress.roleName);
-    if (!targetInputRole) {
+    const targetInputRoleValue = getInputRoleValue(targetTool, targetAddress.roleName);
+    if (!targetInputRoleValue) {
         throw new Error(`Target input role not found for (${targetAddress.toolStepKey}, ${targetAddress.roleName}).`);
     }
 
-    const sourceOutputRole = getOutputRoleValue(sourceTool, sourceAddress.roleName);
-    const sourceInputRole = getInputRoleValue(sourceTool, sourceAddress.roleName);
+    const sourceOutputRoleValue = getOutputRoleValue(sourceTool, sourceAddress.roleName);
+    const sourceInputRoleValue = getInputRoleValue(sourceTool, sourceAddress.roleName);
 
     const sourceInputEntryByRoleName = strategyState[sourceAddress.toolStepKey];
     const sourceInputEntry = sourceInputEntryByRoleName?.[sourceAddress.roleName];
 
-    const sourceRoleType = sourceOutputRole
-        ? extractResourceTypeHandleFromRoleValue(sourceOutputRole)
-        : sourceInputRole
-            ? extractResourceTypeHandleFromRoleValue(sourceInputRole)
+    const sourceRoleType = sourceOutputRoleValue
+        ? extractResourceTypeHandleFromRoleValue(sourceOutputRoleValue)
+        : sourceInputRoleValue
+            ? extractResourceTypeHandleFromRoleValue(sourceInputRoleValue)
             : null;
 
-    const targetRoleType = extractResourceTypeHandleFromRoleValue(targetInputRole);
+    const targetRoleType = extractResourceTypeHandleFromRoleValue(targetInputRoleValue);
 
-    if (!sourceOutputRole && sourceInputRole) {
+    if (!sourceOutputRoleValue && sourceInputRoleValue) {
         if (!sourceInputEntry) {
             throw new Error(`Source input role is not bound for (${sourceAddress.toolStepKey}, ${sourceAddress.roleName}).`); // ATTENTION: not an ontological invariant, but it might help catch some mistakes early on.
         }
     }
 
-    if (!sourceOutputRole && !sourceInputRole) {
+    if (!sourceOutputRoleValue && !sourceInputRoleValue) {
         throw new Error(`Source role not found for (${sourceAddress.toolStepKey}, ${sourceAddress.roleName}).`);
     }
 

package/src/utils/stepExpansion.ts

@@ -0,0 +1,63 @@
+import { CONSTANTS } from '../lookups/lookups.js';
+import type {
+    MutableBranchStep,
+    MutableForStep,
+    MutableStep,
+    MutableToolStep,
+    MutableToolStepKey,
+    MutableWhileStep,
+} from './mutableStrategyOverlay.js';
+
+export type StepExpansionOrder = {
+    branchCaseOrder?: 'when-what' | 'what-when';
+    loopCaseOrder?: 'what-when' | 'when-what';
+};
+
+export function extractToolStepsFromStep<
+    TKey extends string = MutableToolStepKey,
+    TStep extends MutableStep<TKey> = MutableStep<TKey>,
+>(
+    step: TStep,
+    order: StepExpansionOrder = {},
+): MutableToolStep<TKey>[] {
+    const {
+        branchCaseOrder = 'when-what',
+        loopCaseOrder = 'what-when',
+    } = order;
+
+    if (step.stepKind === CONSTANTS.Enums.StepKind.tool) {
+        return [step as MutableToolStep<TKey>];
+    }
+
+    if (step.stepKind === CONSTANTS.Enums.StepKind.branch) {
+        const branch = step as MutableBranchStep<TKey>;
+        const cases = branch.cases ?? [];
+        return cases.flatMap((stepCase) => {
+            if (branchCaseOrder === 'what-when') {
+                return [stepCase.what, stepCase.when];
+            }
+
+            return [stepCase.when, stepCase.what];
+        }).filter(Boolean) as MutableToolStep<TKey>[];
+    }
+
+    if (step.stepKind === CONSTANTS.Enums.StepKind.while) {
+        const loop = step as MutableWhileStep<TKey>;
+        if (loopCaseOrder === 'when-what') {
+            return [loop.case.when, loop.case.what].filter(Boolean) as MutableToolStep<TKey>[];
+        }
+
+        return [loop.case.what, loop.case.when].filter(Boolean) as MutableToolStep<TKey>[];
+    }
+
+    if (step.stepKind === CONSTANTS.Enums.StepKind.for) {
+        const loop = step as MutableForStep<TKey>;
+        if (loopCaseOrder === 'when-what') {
+            return [loop.case.when, loop.case.what].filter(Boolean) as MutableToolStep<TKey>[];
+        }
+
+        return [loop.case.what, loop.case.when].filter(Boolean) as MutableToolStep<TKey>[];
+    }
+
+    return [] as MutableToolStep<TKey>[];
+}

package/src/utils/stepParallelization.ts

@@ -1,13 +1,10 @@
 import type {
-	MutableBranchStep,
-	MutableForStep,
 	MutableStep,
 	MutableStrategyState,
 	MutableToolStep,
 	MutableToolStepKey,
-	MutableWhileStep,
 } from './mutableStrategyOverlay.js';
-import { CONSTANTS } from '../lookups/lookups.js';
+import { extractToolStepsFromStep } from './stepExpansion.js';
 
 export function getIndependentThreads<
 	TKey extends string = MutableToolStepKey,
@@ -44,31 +41,8 @@ export function getIndependentThreads<
 	};
 
 	steps.forEach((step, ownerIndex) => {
-		if (step.stepKind === CONSTANTS.Enums.StepKind.tool) {
-			addToolStep(step as MutableToolStep<TKey>, ownerIndex);
-			return;
-		}
-
-		if (step.stepKind === CONSTANTS.Enums.StepKind.for) {
-			const loop = step as MutableForStep<TKey>;
-			addToolStep(loop.case?.what, ownerIndex);
-			addToolStep(loop.case?.when, ownerIndex);
-			return;
-		}
-
-		if (step.stepKind === CONSTANTS.Enums.StepKind.while) {
-			const loop = step as MutableWhileStep<TKey>;
-			addToolStep(loop.case?.what, ownerIndex);
-			addToolStep(loop.case?.when, ownerIndex);
-			return;
-		}
-
-		if (step.stepKind === CONSTANTS.Enums.StepKind.branch) {
-			const branch = step as MutableBranchStep<TKey>;
-			for (const stepCase of branch.cases) {
-				addToolStep(stepCase?.what, ownerIndex);
-				addToolStep(stepCase?.when, ownerIndex);
-			}
+		for (const toolStep of extractToolStepsFromStep<TKey, TStep>(step, { branchCaseOrder: 'what-when' })) {
+			addToolStep(toolStep, ownerIndex);
 		}
 	});
 

package/src/utils/strategyExtraction.ts

@@ -8,10 +8,10 @@ import type {
 } from '@toolproof-core/genesis';
 import type {
     MutableStrategy,
-    MutableStep,
     MutableToolStep
 } from './mutableStrategyOverlay.js';
 import { CONSTANTS } from '../lookups/lookups.js';
+import { extractToolStepsFromStep } from './stepExpansion.js';
 
 export type RoleSpecEntry = [RoleName, RoleValue];
 
@@ -55,33 +55,9 @@ export function extractResourceTypeHandleFromRoleValue(
 export function extractToolStepsFromStrategy(strategy: MutableStrategy): MutableToolStep[] {
     const toolSteps: MutableToolStep[] = [];
 
-    const visitStep = (step: MutableStep) => {
-        switch (step.stepKind) {
-            case 'tool': {
-                toolSteps.push(step);
-                return;
-            }
-            case 'branch': {
-                for (const conditional of step.cases) {
-                    toolSteps.push(conditional.when, conditional.what);
-                }
-                return;
-            }
-            case 'while':
-            case 'for': {
-                toolSteps.push(step.case.when, step.case.what);
-                return;
-            }
-            default: {
-                const _exhaustive: never = step;
-                return _exhaustive;
-            }
-        }
-    };
-
     for (const threadSteps of strategy.stepsByThreadIndex) {
         for (const step of threadSteps) {
-            visitStep(step);
+            toolSteps.push(...extractToolStepsFromStep(step, { loopCaseOrder: 'when-what' }));
         }
     }
 
@@ -137,7 +113,7 @@ export function extractSingleBranchableOutputResourceTypeHandle(
     tool: Tool,
 ): ResourceTypeHandle | null {
     const outputRoleSpecEntries = getOutputRoleSpecEntriesFromTool(tool).filter(
-        ([roleName]) => roleName !== CONSTANTS.Cosmos.ErrorOutputRoleName,
+        ([roleName]) => roleName !== CONSTANTS.Cosmos.RoleNames.ErrorOutput,
     );
 
     if (!outputRoleSpecEntries[0] || outputRoleSpecEntries.length !== 1) {