@toolproof-core/genesis 1.0.56 → 1.0.58

package/dist/src/utils/typeGenerationPostProcess.js

@@ -108,27 +108,15 @@ function fixRecursiveArrayAliasSelfReference(ts, typeName) {
     }
     return lines.join('\n');
 }
-function brandToolStepPathAliases(ts) {
-    return ts.replace(/\/\*\*\r?\n \* This interface was referenced by `Genesis`'s JSON-Schema\r?\n \* via the `definition` "ToolStepPath"\.\r?\n \*\/\r?\nexport type ToolStepPath =\r?\n[\s\S]*?;\r?\n\/\*\*\r?\n \* This interface was referenced by `Genesis`'s JSON-Schema\r?\n \* via the `definition` "UnthreadedToolStepPath"\.\r?\n \*\/\r?\nexport type UnthreadedToolStepPath =\r?\n[\s\S]*?;\r?\n\/\*\*\r?\n \* This interface was referenced by `Genesis`'s JSON-Schema\r?\n \* via the `definition` "ThreadedToolStepPath"\.\r?\n \*\/\r?\nexport type ThreadedToolStepPath =\r?\n[\s\S]*?;/, `/**
+function brandToolStepPathAlias(ts) {
+    return ts.replace(/\/\*\*\r?\n \* This interface was referenced by `Genesis`'s JSON-Schema\r?\n \* via the `definition` "ToolStepPath"\.\r?\n \*\/\r?\nexport type ToolStepPath =\r?\n[\s\S]*?;/, `/**
  * This interface was referenced by \`Genesis\`'s JSON-Schema
  * via the \`definition\` "ToolStepPath".
  */
 export type ToolStepPath =
- UnthreadedToolStepPath | ThreadedToolStepPath;
-/**
- * This interface was referenced by \`Genesis\`'s JSON-Schema
- * via the \`definition\` "UnthreadedToolStepPath".
- */
-export type UnthreadedToolStepPath =
- string & { readonly __brand: 'UnthreadedToolStepPath' };
-/**
- * This interface was referenced by \`Genesis\`'s JSON-Schema
- * via the \`definition\` "ThreadedToolStepPath".
- */
-export type ThreadedToolStepPath =
- string & { readonly __brand: 'ThreadedToolStepPath' };`);
+ string & { readonly __brand: 'ToolStepPath' };`);
 }
-function addTypedToolStepRoleAddressAliases(ts) {
+function addTypedToolStepRoleAddressAlias(ts) {
     return ts.replace(/\/\*\*\r?\n \* This interface was referenced by `Genesis`'s JSON-Schema\r?\n \* via the `definition` "ToolStepRoleAddress"\.\r?\n \*\/\r?\nexport interface ToolStepRoleAddress \{\r?\n  roleName: (?:string|RoleName);\r?\n  toolStepPath: ToolStepPath;\r?\n\}/, `/**
  * This interface was referenced by \`Genesis\`'s JSON-Schema
  * via the \`definition\` "ToolStepRoleAddress".
@@ -136,19 +124,7 @@ function addTypedToolStepRoleAddressAliases(ts) {
 export interface ToolStepRoleAddress {
   roleName: RoleName;
     toolStepPath: ToolStepPath;
-}
-/**
- * This interface was referenced by \`Genesis\`'s JSON-Schema
- * via the \`definition\` "UnthreadedToolStepRoleAddress".
- */
-export type UnthreadedToolStepRoleAddress =
- ToolStepRoleAddress & { toolStepPath: UnthreadedToolStepPath };
-/**
- * This interface was referenced by \`Genesis\`'s JSON-Schema
- * via the \`definition\` "ThreadedToolStepRoleAddress".
- */
-export type ThreadedToolStepRoleAddress =
- ToolStepRoleAddress & { toolStepPath: ThreadedToolStepPath };`);
+}`);
 }
 export function postProcessEmittedTypes(ts, parsedSchema) {
     ts = ts.replace(/^\s*\[k:\s*string\]:\s*unknown;\s*(?:\r?\n)?/gm, '');
@@ -175,20 +151,14 @@ export function postProcessEmittedTypes(ts, parsedSchema) {
         const tmpl = patternTemplates[typeName];
         return `${p1}${typeName}${p3}${tmpl ?? 'string'};`;
     });
-    ts = brandToolStepPathAliases(ts);
-    ts = addTypedToolStepRoleAddressAliases(ts);
+    ts = brandToolStepPathAlias(ts);
+    ts = addTypedToolStepRoleAddressAlias(ts);
     const roleNameKeyType = 'RoleName';
-    const unthreadedToolStepPathKeyType = 'UnthreadedToolStepPath';
-    const threadedToolStepPathKeyType = 'ThreadedToolStepPath';
     const toolStepPathKeyType = 'ToolStepPath';
     ts = ts.replace(/export interface RoleValueByName\s*\{\s*\[k:\s*string\]:\s*RoleValue;\s*\}/g, `export type RoleValueByName = Record<${roleNameKeyType}, RoleValue>;`);
     const strategyStateInputEntryByRoleNameValueType = deriveStrategyStateInputEntryByRoleNameValueType(parsedSchema);
     ts = ts.replace(/export interface StrategyStateInputEntryByRoleName\s*\{\s*\[k:\s*string\]:\s*[^;]+;\s*\}/g, `export type StrategyStateInputEntryByRoleName = Record<${roleNameKeyType}, ${strategyStateInputEntryByRoleNameValueType}>;`);
     ts = ts.replace(/export\s+type\s+StrategyStateInputEntryByRoleName\s*=\s*Record<\s*RoleName\s*,\s*[^>]+>\s*;/g, `export type StrategyStateInputEntryByRoleName = Record<${roleNameKeyType}, ${strategyStateInputEntryByRoleNameValueType}>;`);
-    ts = ts.replace(/export interface StrategyStateInputEntryByRoleNameByUnthreadedToolStepPath\s*\{\s*\[k:\s*string\]:\s*StrategyStateInputEntryByRoleName;\s*\}/g, `export type StrategyStateInputEntryByRoleNameByUnthreadedToolStepPath = Record<${unthreadedToolStepPathKeyType}, StrategyStateInputEntryByRoleName>;`);
-    ts = ts.replace(/export interface StrategyStateInputEntryByRoleNameByThreadedToolStepPath\s*\{\s*\[k:\s*string\]:\s*StrategyStateInputEntryByRoleName;\s*\}/g, `export type StrategyStateInputEntryByRoleNameByThreadedToolStepPath = Record<${threadedToolStepPathKeyType}, StrategyStateInputEntryByRoleName>;`);
-    ts = ts.replace(/export\s+type\s+UnthreadedStrategyState\s*=\s*StrategyStateInputEntryByRoleNameByUnthreadedToolStepPath\s*;/g, `export type UnthreadedStrategyState = Record<${unthreadedToolStepPathKeyType}, StrategyStateInputEntryByRoleName>;`);
-    ts = ts.replace(/export\s+type\s+ThreadedStrategyState\s*=\s*StrategyStateInputEntryByRoleNameByThreadedToolStepPath\s*;/g, `export type ThreadedStrategyState = Record<${threadedToolStepPathKeyType}, StrategyStateInputEntryByRoleName>;`);
     ts = ts.replace(/(strategyState\??:\s*)\{\s*\[k:\s*string\]:\s*StrategyStateInputEntryByRoleName;\s*\};/g, `$1Record<${toolStepPathKeyType}, StrategyStateInputEntryByRoleName>;`);
     ts = ts.replace(/(strategyStateUpdate\??:\s*)\{\s*\[k:\s*string\]:\s*StrategyStateInputEntryByRoleName;\s*\};/g, `$1Record<${toolStepPathKeyType}, StrategyStateInputEntryByRoleName>;`);
     ts = ts.replace(/export interface StepsByThreadIndexFacet\s*\{\s*stepsByThreadIndex:\s*StepArrayArray;\s*\}/g, 'export interface StepsByThreadIndexFacet {\n  stepsByThreadIndex: StepArrayArray;\n}');

package/dist/src/utils/zodCodegen.d.ts

@@ -4,7 +4,7 @@ export type JsonSchemaToZodWarning = {
     message: string;
 };
 export type JsonSchemaToZodResult = {
-    expressionsByName: Record<string, string>;
+    expressionByName: Record<string, string>;
     warnings: JsonSchemaToZodWarning[];
 };
 export declare function jsonSchemaToZodExpressions(standaloneSchema: JsonSchema, rootName: string): JsonSchemaToZodResult;

package/dist/src/utils/zodCodegen.js

@@ -76,7 +76,7 @@ function emitRecordLikeObjectSchema(node, ctx, path) {
         }
         else if (typeof pn.$ref === 'string') {
             const defName = resolveLocalRef(pn.$ref, ctx);
-            const resolved = defName ? ctx.defsByName[defName] : undefined;
+            const resolved = defName ? ctx.defByName[defName] : undefined;
             if (isObject(resolved) && typeof resolved.pattern === 'string') {
                 keyPattern = resolved.pattern;
             }
@@ -112,7 +112,7 @@ function resolveSchemaIfRef(node, ctx) {
     if (isObject(node) && typeof node.$ref === 'string') {
         const defName = resolveLocalRef(node.$ref, ctx);
         if (defName)
-            return ctx.defsByName[defName];
+            return ctx.defByName[defName];
     }
     return node;
 }
@@ -508,14 +508,14 @@ export function jsonSchemaToZodExpressions(standaloneSchema, rootName) {
     const defNames = new Set(Object.keys(defs));
     const ctx = {
         defNames,
-        defsByName: defs,
+        defByName: defs,
         anchorToDefName: buildAnchorMap(defs),
         warnings: []
     };
-    const expressionsByName = {};
+    const expressionByName = {};
     for (const defName of Object.keys(defs)) {
-        expressionsByName[defName] = emitSchema(defs[defName], ctx, `$defs.${defName}`);
+        expressionByName[defName] = emitSchema(defs[defName], ctx, `$defs.${defName}`);
     }
-    expressionsByName[rootName] = emitSchema(normalized, ctx, rootName);
-    return { expressionsByName, warnings: ctx.warnings };
+    expressionByName[rootName] = emitSchema(normalized, ctx, rootName);
+    return { expressionByName, warnings: ctx.warnings };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toolproof-core/genesis",
-  "version": "1.0.56",
+  "version": "1.0.58",
   "description": "Core ToolProof ontology, schemas, declarations, implementations, and generated type artifacts.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",