@toolproof-npm/schema 0.1.78 → 0.1.80

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/identityGuards.d.ts

@@ -0,0 +1,3 @@
+import type { ResourceRoleIdentity, StrategyThreadIdentity } from './genesis/generated/types/types.js';
+export declare function isResourceRoleIdentityJson(value: string): value is ResourceRoleIdentity;
+export declare function isStrategyThreadIdentityJson(value: string): value is StrategyThreadIdentity;

package/dist/identityGuards.js

@@ -0,0 +1,6 @@
+export function isResourceRoleIdentityJson(value) {
+    return value.startsWith('ROLE-');
+}
+export function isStrategyThreadIdentityJson(value) {
+    return value.startsWith('STRATEGY_THREAD-');
+}

package/dist/index.d.ts

@@ -14,3 +14,4 @@ export type { Resource_StrategyRun as Resource_StrategyRunJson } from './genesis
 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';
+export { isResourceRoleIdentityJson, isStrategyThreadIdentityJson } from './identityGuards.js';

package/dist/index.js

@@ -4,3 +4,4 @@ export { default as SchemaJob } from './genesis/generated/schemas/Job.js';
 export { default as ResourceTypeGenesis } from './genesis/generated/resource-type-envelopes/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

@@ -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.80",
   "description": "JSON schemas and TypeScript types for ToolProof",
   "keywords": [
     "toolproof",
@@ -26,6 +26,10 @@
     ".": {
       "import": "./dist/index.js",
       "types": "./dist/index.d.ts"
+    },
+    "./identityGuards": {
+      "import": "./dist/identityGuards.js",
+      "types": "./dist/identityGuards.d.ts"
     }
   },
   "files": [