@toolproof-npm/schema 0.1.31 → 0.1.32

package/dist/_lib/test.js

@@ -5,15 +5,15 @@ const Job = {
     uri: 'uri',
     roles: {
         inputMap: {
-            'RR-1234': {
-                resourceTypeId: 'RT-1234',
+            'ROLE-1234': {
+                resourceTypeId: 'TYPE-1234',
                 name: 'name',
                 description: 'description'
             }
         },
         outputMap: {
-            'RR-5678': {
-                resourceTypeId: 'RT-5678',
+            'ROLE-5678': {
+                resourceTypeId: 'TYPE-5678',
                 name: 'name',
                 description: 'description'
             }
@@ -67,9 +67,9 @@ 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: 'RR-ID',
+        resourceRoleId: 'ROLE-ID',
         executionId: 'EXECUTION-ID',
     },
     kind: 'realized',
@@ -81,9 +81,9 @@ 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: 'RR-ID',
+        resourceRoleId: 'ROLE-ID',
         executionId: 'EXECUTION-ID',
     },
     kind: 'realized',
@@ -95,9 +95,9 @@ const resourceDataJobAlpha2 = {
 // This should fail; we're missing extractedData
 const resourceDataJobAlpha3 = {
     id: 'RESOURCE-2',
-    resourceTypeId: 'RT-ID',
+    resourceTypeId: 'TYPE-ID',
     creationContext: {
-        resourceRoleId: 'RR-ID',
+        resourceRoleId: 'ROLE-ID',
         executionId: 'EXECUTION-ID',
     },
     kind: 'realized',
@@ -108,9 +108,9 @@ 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: 'RR-ID',
+        resourceRoleId: 'ROLE-ID',
         executionId: 'EXECUTION-ID',
     },
     kind: 'realized',

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

@@ -632,7 +632,7 @@ export interface RoleBindingsOuter1 {
  * This interface was referenced by `GenesisJson`'s JSON-Schema
  * via the `definition` "RoleMap".
  */
-export type RoleMap = Record<ResourceRoleId, RoleLiteral>;
+export type RoleMap = Record<ResourceRoleId, ResourceRoleValue>;
 /**
  * This interface was referenced by `GenesisJson`'s JSON-Schema
  * via the `definition` "RolesInner".

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.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_RR_ID = /^RR-.+$/;
+const RE_ROLE_ID = /^ROLE-.+$/;
 // Factories for each Id-like type
-export const asResourceTypeId = makeFactory("ResourceTypeId", RE_RT_ID);
-export const asResourceRoleId = makeFactory("ResourceRoleId", RE_RR_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");

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,7 +331,7 @@ 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<ResourceRoleId, RoleLiteral>;');
+        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);

package/package.json

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