@toolproof-npm/schema 0.1.78 → 0.1.79

package/dist/genesis/generated/types/types.d.ts

@@ -448,9 +448,7 @@ export interface Named {
  * This interface was referenced by `GenesisJson`'s JSON-Schema
  * via the `definition` "ExecutionSocket".
  */
-export interface ExecutionSocket {
-  [k: string]: ResourceMissing | ResourcePotentialInput | ResourcePotentialOutput | Resource;
-}
+export type ExecutionSocket = Record<ResourceRoleIdentity, ResourceMissing | ResourcePotentialInput | ResourcePotentialOutput | Resource>;
 /**
  * This interface was referenced by `GenesisJson`'s JSON-Schema
  * via the `definition` "ResourceBase".
@@ -484,9 +482,7 @@ export interface Path {
  * This interface was referenced by `GenesisJson`'s JSON-Schema
  * via the `definition` "ExecutionSocketMaterialized".
  */
-export interface ExecutionSocketMaterialized {
-  [k: string]: Resource;
-}
+export type ExecutionSocketMaterialized = Record<ResourceRoleIdentity, Resource>;
 /**
  * This interface was referenced by `GenesisJson`'s JSON-Schema
  * via the `definition` "ExtractionSchemaWrapper".
@@ -591,9 +587,7 @@ export interface StrategyStateWrapper {
  * This interface was referenced by `GenesisJson`'s JSON-Schema
  * via the `definition` "StrategyState".
  */
-export interface StrategyState {
-  [k: string]: ExecutionSocket;
-}
+export type StrategyState = Record<ExecutionIdentity, ExecutionSocket>;
 /**
  * This interface was referenced by `GenesisJson`'s JSON-Schema
  * via the `definition` "StrategyRunContext".
@@ -610,9 +604,7 @@ export interface StrategyThreadMapWrapper {
  * This interface was referenced by `GenesisJson`'s JSON-Schema
  * via the `definition` "StrategyThreadMap".
  */
-export interface StrategyThreadMap {
-  [k: string]: Step[];
-}
+export type StrategyThreadMap = Record<StrategyThreadIdentity, Step[]>;
 export interface StrategyStateWrapper1 {
   strategyState: StrategyState;
 }
@@ -623,12 +615,8 @@ export interface StrategyStateWrapper1 {
 export interface StrategyRunUpdate {
   strategyRun?: StrategyRun1;
   strategyRunRef: StrategyRunIdentity;
-  strategyStateUpdate: {
-    [k: string]: ExecutionSocketMaterialized;
-  };
-  strategyStateUpdateWide?: {
-    [k: string]: ExecutionSocket;
-  };
+  strategyStateUpdate: Record<ExecutionIdentity, ExecutionSocketMaterialized>;
+  strategyStateUpdateWide?: Record<ExecutionIdentity, ExecutionSocket>;
 }
 /**
  * This interface was referenced by `GenesisJson`'s JSON-Schema
@@ -860,12 +848,8 @@ export interface Conditional {
 export interface StrategyStateWrapper {
   strategyState: StrategyState;
 }
-export interface StrategyState {
-  [k: string]: ExecutionSocket;
-}
-export interface ExecutionSocket {
-  [k: string]: ResourceMissing | ResourcePotentialInput | ResourcePotentialOutput | Resource;
-}
+export type StrategyState = Record<ExecutionIdentity, ExecutionSocket>;
+export type ExecutionSocket = Record<ResourceRoleIdentity, ResourceMissing | ResourcePotentialInput | ResourcePotentialOutput | Resource>;
 export interface ResourceBase {
   identity: ResourceIdentity;
   resourceTypeRef: ResourceTypeIdentity;
@@ -1163,9 +1147,7 @@ export interface Timestamp {
 export interface StrategyThreadMapWrapper {
   strategyThreadMap: StrategyThreadMap;
 }
-export interface StrategyThreadMap {
-  [k: string]: Step[];
-}
+export type StrategyThreadMap = Record<StrategyThreadIdentity, Step[]>;
 export interface RoleBindingsWrapper {
   roleBindings: RoleBindings;
 }
@@ -1184,12 +1166,8 @@ export interface Conditional {
 export interface StrategyStateWrapper {
   strategyState: StrategyState;
 }
-export interface StrategyState {
-  [k: string]: ExecutionSocket;
-}
-export interface ExecutionSocket {
-  [k: string]: ResourceMissing | ResourcePotentialInput | ResourcePotentialOutput | Resource;
-}
+export type StrategyState = Record<ExecutionIdentity, ExecutionSocket>;
+export type ExecutionSocket = Record<ResourceRoleIdentity, ResourceMissing | ResourcePotentialInput | ResourcePotentialOutput | Resource>;
 export interface ResourceBase {
   identity: ResourceIdentity;
   resourceTypeRef: ResourceTypeIdentity;

package/dist/scripts/generateTypes.js

@@ -469,9 +469,20 @@ async function main() {
         const resourceRoleKeyType = 'ResourceRoleIdentity';
         const resourceKeyType = 'ResourceIdentity';
         const executionKeyType = 'ExecutionIdentity';
+        const strategyThreadKeyType = 'StrategyThreadIdentity';
         ts = ts.replace(/export interface RoleMap\s*{[^}]*}/g, `export type RoleMap = Record<${resourceRoleKeyType}, ResourceRoleValue>;`);
         ts = ts.replace(/export interface RoleBindingMap\s*{[^}]*}/g, `export type RoleBindingMap = Record<${resourceRoleKeyType}, ${resourceKeyType}>;`);
-        ts = ts.replace(/export interface StrategyState\s*\{[^}]*\{[^}]*\}[^}]*\}/gs, `export type StrategyState = Record<${executionKeyType}, Record<${resourceRoleKeyType}, ResourceMissing | ResourcePotentialInput | ResourcePotentialOutput | Resource>>;`);
+        // Normalize StrategyState & related socket maps to identity-keyed Records.
+        // 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>;`);
+        // 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[]>;`);
         parts.push(ts);
         let output = parts.join('\n');
         // Final guard: strip any lingering `[k: string]: unknown;` that might have been

package/package.json

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