@toolproof-npm/schema 0.1.30 → 0.1.32

package/dist/_lib/test.js

@@ -6,14 +6,14 @@ const Job = {
     roles: {
         inputMap: {
             'ROLE-1234': {
-                resourceTypeId: 'RT-1234',
+                resourceTypeId: 'TYPE-1234',
                 name: 'name',
                 description: 'description'
             }
         },
         outputMap: {
             'ROLE-5678': {
-                resourceTypeId: 'RT-5678',
+                resourceTypeId: 'TYPE-5678',
                 name: 'name',
                 description: 'description'
             }
@@ -67,7 +67,7 @@ const jobBeta = {
 // This checks (no error expected); we're providing all required fields
 const resourceDataJobAlpha = {
     id: 'RESOURCE-1',
-    resourceTypeId: 'RT-ID',
+    resourceTypeId: 'TYPE-ID',
     creationContext: {
         resourceRoleId: 'ROLE-ID',
         executionId: 'EXECUTION-ID',
@@ -81,7 +81,7 @@ const resourceDataJobAlpha = {
 // This SHOULD fail (missing path) once ResourceData_Job enforces Path strictly.
 const resourceDataJobAlpha2 = {
     id: 'RESOURCE-3',
-    resourceTypeId: 'RT-ID',
+    resourceTypeId: 'TYPE-ID',
     creationContext: {
         resourceRoleId: 'ROLE-ID',
         executionId: 'EXECUTION-ID',
@@ -95,7 +95,7 @@ const resourceDataJobAlpha2 = {
 // This should fail; we're missing extractedData
 const resourceDataJobAlpha3 = {
     id: 'RESOURCE-2',
-    resourceTypeId: 'RT-ID',
+    resourceTypeId: 'TYPE-ID',
     creationContext: {
         resourceRoleId: 'ROLE-ID',
         executionId: 'EXECUTION-ID',
@@ -108,7 +108,7 @@ const resourceDataJobAlpha3 = {
 // This SHOULD fail (missing roles.outputMap) once Job's roles is strictly enforced.
 const resourceDataJobBeta = {
     id: 'RESOURCE-4',
-    resourceTypeId: 'RT-ID',
+    resourceTypeId: 'TYPE-ID',
     creationContext: {
         resourceRoleId: 'ROLE-ID',
         executionId: 'EXECUTION-ID',

package/dist/_lib/types/types.d.ts

@@ -478,7 +478,7 @@ export interface RoleBindingsInner {
  * This interface was referenced by `GenesisJson`'s JSON-Schema
  * via the `definition` "RoleBindingMap".
  */
-export type RoleBindingMap = Record<RoleId, ResourceId>;
+export type RoleBindingMap = Record<ResourceRoleId, ResourceId>;
 /**
  * This interface was referenced by `GenesisJson`'s JSON-Schema
  * via the `definition` "CanonicalRef".
@@ -620,7 +620,7 @@ export interface Timestamp {
  * This interface was referenced by `GenesisJson`'s JSON-Schema
  * via the `definition` "ResourceMap".
  */
-export type ResourceMap = Record<ExecutionId, Record<RoleId, ResourcePotentialInput | ResourcePotentialOutput | ResourceData>>;
+export type ResourceMap = Record<ExecutionId, Record<ResourceRoleId, ResourcePotentialInput | ResourcePotentialOutput | ResourceData>>;
 /**
  * This interface was referenced by `GenesisJson`'s JSON-Schema
  * via the `definition` "RoleBindingsOuter".
@@ -632,7 +632,7 @@ export interface RoleBindingsOuter1 {
  * This interface was referenced by `GenesisJson`'s JSON-Schema
  * via the `definition` "RoleMap".
  */
-export type RoleMap = Record<RoleId, RoleLiteral>;
+export type RoleMap = Record<ResourceRoleId, ResourceRoleValue>;
 /**
  * This interface was referenced by `GenesisJson`'s JSON-Schema
  * via the `definition` "RolesInner".

package/dist/index.d.ts

@@ -2,4 +2,4 @@ export { default as GenesisSchema } from './schemas/Genesis.js';
 export { default as JobSchema } from './schemas/Job.js';
 export type { ResourceData_Job as ResourceData_JobJson } from './_lib/types/ResourceData_Job.js';
 export type { Identifiable as IdentifiableJson, Documented as DocumentedJson, IdentifiableDocumented as IdentifiableDocumentedJson, ResourceFormatId as ResourceFormatIdJson, ResourceFormatMeta as ResourceFormatMetaJson, ResourceFormatData as ResourceFormatDataJson, ExtractionSchema as ExtractionSchemaJson, ExtractionSchemaValue as ExtractionSchemaValueJson, IdentityProp as IdentityPropJson, MeritProp as MeritPropJson, ResourceTypeId as ResourceTypeIdJson, ResourceTypeMeta as ResourceTypeMetaJson, ResourceTypeData as ResourceTypeDataJson, ResourceRoleId as ResourceRoleIdJson, ResourceRoleValue as ResourceRoleValueJson, ExecutionId as ExecutionIdJson, Execution as ExecutionJson, ConditionalWrapper as ConditionalWrapperJson, RoleMap as RoleMapJson, RolesOuter as RolesOuterJson, RoleBindingMap as RoleBindingMapJson, RoleBindingsOuter as RoleBindingsOuterJson, ResourceId as ResourceIdJson, WorkStepId as WorkStepIdJson, BranchStepId as BranchStepIdJson, WhileStepId as WhileStepIdJson, ForStepId as ForStepIdJson, WorkStep as WorkStepJson, BranchStep as BranchStepJson, WhileStep as WhileStepJson, ForStep as ForStepJson, StepId as StepIdJson, Step as StepJson, ResourceSocket as ResourceSocketJson, ResourcePotentialInput as ResourcePotentialInputJson, ResourcePotentialOutput as ResourcePotentialOutputJson, ResourceMeta as ResourceMetaJson, ResourceData as ResourceDataJson, ResourceMap as ResourceMapJson, WorkflowId as WorkflowIdJson, Workflow as WorkflowJson, WorkflowSpecId as WorkflowSpecIdJson, WorkflowSpec as WorkflowSpecJson, Job as JobJson, JsonValue as JsonValueJson, } from './_lib/types/types.js';
-export { unsafeBrand, asResourceTypeId, asRoleId, asExecutionId, asResourceId, asWorkStepId, asBranchStepId, asForStepId, asResourceFormatId, asWhileStepId, asWorkflowId, asWorkflowSpecId, asResourceTypeIds, asRoleIds, asExecutionIds, asResourceIds, asWorkStepIds, asBranchStepIds, asForStepIds, asResourceFormatIds, asWhileStepIds, asWorkflowIds, asWorkflowSpecIds, } from './scripts/brandFactories.js';
+export { unsafeBrand, asResourceTypeId, asResourceRoleId, asExecutionId, asResourceId, asWorkStepId, asBranchStepId, asForStepId, asResourceFormatId, asWhileStepId, asWorkflowId, asWorkflowSpecId, asResourceTypeIds, asResourceRoleIds, asExecutionIds, asResourceIds, asWorkStepIds, asBranchStepIds, asForStepIds, asResourceFormatIds, asWhileStepIds, asWorkflowIds, asWorkflowSpecIds, } from './scripts/brandFactories.js';

package/dist/index.js

@@ -2,4 +2,4 @@
 export { default as GenesisSchema } from './schemas/Genesis.js';
 export { default as JobSchema } from './schemas/Job.js';
 // Re-export brand factories so consumers can construct branded IDs at runtime.
-export { unsafeBrand, asResourceTypeId, asRoleId, asExecutionId, asResourceId, asWorkStepId, asBranchStepId, asForStepId, asResourceFormatId, asWhileStepId, asWorkflowId, asWorkflowSpecId, asResourceTypeIds, asRoleIds, asExecutionIds, asResourceIds, asWorkStepIds, asBranchStepIds, asForStepIds, asResourceFormatIds, asWhileStepIds, asWorkflowIds, asWorkflowSpecIds, } from './scripts/brandFactories.js';
+export { unsafeBrand, asResourceTypeId, asResourceRoleId, asExecutionId, asResourceId, asWorkStepId, asBranchStepId, asForStepId, asResourceFormatId, asWhileStepId, asWorkflowId, asWorkflowSpecId, asResourceTypeIds, asResourceRoleIds, asExecutionIds, asResourceIds, asWorkStepIds, asBranchStepIds, asForStepIds, asResourceFormatIds, asWhileStepIds, asWorkflowIds, asWorkflowSpecIds, } from './scripts/brandFactories.js';

package/dist/schemas/Genesis.json

@@ -663,7 +663,7 @@
             "$schema": "https://json-schema.org/draft/2020-12/schema",
             "type": "string",
             "$anchor": "ResourceFormatId",
-            "pattern": "^RF-.+$"
+            "pattern": "^FORMAT-.+$"
         },
         "ResourceFormatMeta": {
             "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -802,7 +802,7 @@
             "$schema": "https://json-schema.org/draft/2020-12/schema",
             "type": "string",
             "$anchor": "ResourceRoleId",
-            "pattern": "^RR-.+$"
+            "pattern": "^ROLE-.+$"
         },
         "ResourceRoleValue": {
             "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -858,7 +858,7 @@
             "$schema": "https://json-schema.org/draft/2020-12/schema",
             "type": "string",
             "$anchor": "ResourceTypeId",
-            "pattern": "^RT-.+$"
+            "pattern": "^TYPE-.+$"
         },
         "ResourceTypeMeta": {
             "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -874,10 +874,10 @@
                     "if": {
                         "properties": {
                             "resourceFormatId": {
-                                "const": "RF-ApplicationJson"
+                                "const": "FORMAT-ApplicationJson"
                             }
                         },
-                        "$comment": "If resourceFormatId is RF-ApplicationJson, then uri must not be present, but if resourceFormatId is not RF-ApplicationJson, then uri must be present. This is because resources of types with format RF-ApplicationJson are self-contained and do not need an extractor."
+                        "$comment": "If resourceFormatId is FORMAT-ApplicationJson, then uri must not be present, but if resourceFormatId is not FORMAT-ApplicationJson, then uri must be present. This is because resources of types with format FORMAT-ApplicationJson are self-contained and do not need an extractor."
                     },
                     "then": {
                         "not": {

package/dist/schemas/Job.json

@@ -149,13 +149,13 @@
             "$schema": "https://json-schema.org/draft/2020-12/schema",
             "type": "string",
             "$anchor": "ResourceRoleId",
-            "pattern": "^RR-.+$"
+            "pattern": "^ROLE-.+$"
         },
         "ResourceTypeId": {
             "$schema": "https://json-schema.org/draft/2020-12/schema",
             "type": "string",
             "$anchor": "ResourceTypeId",
-            "pattern": "^RT-.+$"
+            "pattern": "^TYPE-.+$"
         }
     }
 }

package/dist/scripts/brandFactories.d.ts

@@ -2,7 +2,7 @@ import type { ExecutionId, ResourceId, WorkStepId, BranchStepId, ForStepId, Reso
 /** Generic unsafe brand helper when a bespoke factory is not available. */
 export declare function unsafeBrand<T extends string>(s: string): T;
 export declare const asResourceTypeId: (s: string) => string;
-export declare const asRoleId: (s: string) => string;
+export declare const asResourceRoleId: (s: string) => string;
 export declare const asExecutionId: (s: string) => string;
 export declare const asResourceId: (s: string) => string;
 export declare const asWorkStepId: (s: string) => string;
@@ -13,7 +13,7 @@ export declare const asWhileStepId: (s: string) => string;
 export declare const asWorkflowId: (s: string) => string;
 export declare const asWorkflowSpecId: (s: string) => string;
 export declare const asResourceTypeIds: (xs: string[]) => ResourceTypeId[];
-export declare const asRoleIds: (xs: string[]) => ResourceRoleId[];
+export declare const asResourceRoleIds: (xs: string[]) => ResourceRoleId[];
 export declare const asExecutionIds: (xs: string[]) => ExecutionId[];
 export declare const asResourceIds: (xs: string[]) => ResourceId[];
 export declare const asWorkStepIds: (xs: string[]) => WorkStepId[];

package/dist/scripts/brandFactories.js

@@ -19,13 +19,13 @@ export function unsafeBrand(s) {
     return s;
 }
 // Known patterns from schemas (when available)
-const RE_RT_ID = /^RT-.+$/;
+const RE_TYPE_ID = /^TYPE-.+$/;
 const RE_SIGNATURE_ID = /^SIGNATURE-.+$/;
 const RE_JOB_ID = /^JOB-.+$/;
 const RE_ROLE_ID = /^ROLE-.+$/;
 // Factories for each Id-like type
-export const asResourceTypeId = makeFactory("ResourceTypeId", RE_RT_ID);
-export const asRoleId = makeFactory("RoleId", RE_ROLE_ID);
+export const asResourceTypeId = makeFactory("ResourceTypeId", RE_TYPE_ID);
+export const asResourceRoleId = makeFactory("ResourceRoleId", RE_ROLE_ID);
 // IDs without strict regex patterns in the current schemas: keep unchecked casts.
 export const asExecutionId = makeFactory("ExecutionId");
 export const asResourceId = makeFactory("ResourceId");
@@ -38,7 +38,7 @@ export const asWorkflowId = makeFactory("WorkflowId");
 export const asWorkflowSpecId = makeFactory("WorkflowSpecId");
 // Batch helpers
 export const asResourceTypeIds = (xs) => xs.map(asResourceTypeId);
-export const asRoleIds = (xs) => xs.map(asRoleId);
+export const asResourceRoleIds = (xs) => xs.map(asResourceRoleId);
 export const asExecutionIds = (xs) => xs.map(asExecutionId);
 export const asResourceIds = (xs) => xs.map(asResourceId);
 export const asWorkStepIds = (xs) => xs.map(asWorkStepId);

package/dist/scripts/generateTypes.js

@@ -185,7 +185,7 @@ async function main() {
             }
         });
         // Remove permissive index signatures that make interfaces open-ended.
-        // Keep meaningful map-like signatures (e.g., `[k: string]: RoleLiteral`) intact.
+        // Keep meaningful map-like signatures (e.g., `[k: string]: ResourceRoleValue`) intact.
         // Robust single-pass: delete the entire line (with optional trailing newline) where the signature appears.
         // This avoids introducing extra blank lines while handling CRLF/LF and varying indentation.
         ts = ts.replace(/^\s*\[k:\s*string\]:\s*unknown;\s*(?:\r?\n)?/gm, '');
@@ -331,9 +331,9 @@ async function main() {
         });
         // Post-process map-like interfaces to enforce key constraints via template literal Id types.
         // Replace index-signature interfaces with Record<IdType, ValueType> so object literal keys are checked.
-        ts = ts.replace(/export interface RoleMap\s*{[^}]*}/g, 'export type RoleMap = Record<RoleId, RoleLiteral>;');
-        ts = ts.replace(/export interface RoleBindingMap\s*{[^}]*}/g, 'export type RoleBindingMap = Record<RoleId, ResourceId>;');
-        ts = ts.replace(/export interface ResourceMap\s*\{[^}]*\{[^}]*\}[^}]*\}/gs, 'export type ResourceMap = Record<ExecutionId, Record<RoleId, ResourcePotentialInput | ResourcePotentialOutput | ResourceData>>;');
+        ts = ts.replace(/export interface RoleMap\s*{[^}]*}/g, 'export type RoleMap = Record<ResourceRoleId, ResourceRoleValue>;');
+        ts = ts.replace(/export interface RoleBindingMap\s*{[^}]*}/g, 'export type RoleBindingMap = Record<ResourceRoleId, ResourceId>;');
+        ts = ts.replace(/export interface ResourceMap\s*\{[^}]*\{[^}]*\}[^}]*\}/gs, 'export type ResourceMap = Record<ExecutionId, Record<ResourceRoleId, ResourcePotentialInput | ResourcePotentialOutput | ResourceData>>;');
         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.30",
+  "version": "0.1.32",
   "description": "JSON schemas and TypeScript types for ToolProof",
   "keywords": [
     "toolproof",