@toolproof-npm/schema 0.1.47 → 0.1.49

package/dist/genesis/generated/resources/Genesis.json

@@ -585,8 +585,7 @@
                             }
                         }
                     }
-                },
-                "additionalProperties": false
+                }
             }
         }
     },
@@ -659,6 +658,9 @@
                                     "properties": {
                                         "properties": {
                                             "type": "object",
+                                            "required": [
+                                                "identity"
+                                            ],
                                             "properties": {
                                                 "identity": {}
                                             }
@@ -688,6 +690,9 @@
                                     "properties": {
                                         "properties": {
                                             "type": "object",
+                                            "required": [
+                                                "merit"
+                                            ],
                                             "properties": {
                                                 "merit": {}
                                             }

package/dist/genesis/generated/schemas/Genesis.json

@@ -164,7 +164,10 @@
                                         "type": "object",
                                         "properties": {
                                             "identity": {}
-                                        }
+                                        },
+                                        "required": [
+                                            "identity"
+                                        ]
                                     }
                                 }
                             },
@@ -193,7 +196,10 @@
                                         "type": "object",
                                         "properties": {
                                             "merit": {}
-                                        }
+                                        },
+                                        "required": [
+                                            "merit"
+                                        ]
                                     }
                                 }
                             },
@@ -641,7 +647,6 @@
                 "required",
                 "properties"
             ],
-            "additionalProperties": false,
             "$anchor": "MeritProp"
         },
         "MeritSchema": {

package/dist/genesis/generated/schemas/ResourceType.json

@@ -138,7 +138,10 @@
                                         "type": "object",
                                         "properties": {
                                             "identity": {}
-                                        }
+                                        },
+                                        "required": [
+                                            "identity"
+                                        ]
                                     }
                                 }
                             },
@@ -167,7 +170,10 @@
                                         "type": "object",
                                         "properties": {
                                             "merit": {}
-                                        }
+                                        },
+                                        "required": [
+                                            "merit"
+                                        ]
                                     }
                                 }
                             },
@@ -337,7 +343,6 @@
                 "required",
                 "properties"
             ],
-            "additionalProperties": false,
             "$anchor": "MeritProp"
         },
         "IdentitySchema": {

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

@@ -1,56 +1,3 @@
 // Auto-generated strict composite type. Do not edit.
-export type Resource_Job = ResourceMetaBase & {
-  extractedData: Job;
-};
-export type ResourceMetaBase = ResourceBase &
-  CreationContextWrapper &
-  ResourceKind & {
-    kind: "materialized";
-  } & Timestamp &
-  Path;
-export type ResourceBase = {
-  identity: string;
-  resourceTypeRef: string;
-};
-export type Job = {
-  identity: string;
-  implementationUri: string;
-} & Documented &
-  RolesWrapper;
-export type Documented = Named & Described;
-export type ResourceRoleValue = {
-  resourceTypeRef: string;
-} & Documented;
-
-export interface CreationContextWrapper {
-  creationContext: CreationContext;
-}
-export interface CreationContext {
-  executionRef: string;
-  resourceRoleRef: string;
-}
-export interface ResourceKind {
-  kind: "missing" | "potential-input" | "potential-output" | "materialized";
-}
-export interface Timestamp {
-  timestamp: string;
-}
-export interface Path {
-  path: string;
-}
-export interface Named {
-  name: string;
-}
-export interface Described {
-  description: string;
-}
-export interface RolesWrapper {
-  roles: Roles;
-}
-export interface Roles {
-  inputMap: RoleMap;
-  outputMap: RoleMap;
-}
-export interface RoleMap {
-  [k: string]: ResourceRoleValue;
-}
+import type { ResourceMetaBase, Job as ExtractedData } from './types.js';
+export type Resource_Job = ResourceMetaBase & { extractedData: ExtractedData };

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

@@ -1,41 +1,3 @@
 // Auto-generated strict composite type. Do not edit.
-export type Resource_ResourceFormat = ResourceMetaBase & {
-  extractedData: ResourceFormat;
-};
-export type ResourceMetaBase = ResourceBase &
-  CreationContextWrapper &
-  ResourceKind & {
-    kind: "materialized";
-  } & Timestamp &
-  Path;
-export type ResourceBase = {
-  identity: string;
-  resourceTypeRef: string;
-};
-export type ResourceFormat = {
-  identity: string;
-} & Documented;
-export type Documented = Named & Described;
-
-export interface CreationContextWrapper {
-  creationContext: CreationContext;
-}
-export interface CreationContext {
-  executionRef: string;
-  resourceRoleRef: string;
-}
-export interface ResourceKind {
-  kind: "missing" | "potential-input" | "potential-output" | "materialized";
-}
-export interface Timestamp {
-  timestamp: string;
-}
-export interface Path {
-  path: string;
-}
-export interface Named {
-  name: string;
-}
-export interface Described {
-  description: string;
-}
+import type { ResourceMetaBase, ResourceFormat as ExtractedData } from './types.js';
+export type Resource_ResourceFormat = ResourceMetaBase & { extractedData: ExtractedData };

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

@@ -1,62 +1,3 @@
 // Auto-generated strict composite type. Do not edit.
-export type Resource_ResourceType = ResourceMetaBase & {
-  extractedData: ResourceType;
-};
-export type ResourceMetaBase = ResourceBase &
-  CreationContextWrapper &
-  ResourceKind & {
-    kind: "materialized";
-  } & Timestamp &
-  Path;
-export type ResourceBase = {
-  identity: string;
-  resourceTypeRef: string;
-};
-export type ResourceType = {
-  identity: string;
-  resourceFormatRef: string;
-} & Documented &
-  ExtractionSchemaWrapper & {
-  };
-export type Documented = Named & Described;
-export type ExtractionSchema = {
-} & {
-  $schema: "https://json-schema.org/draft/2020-12/schema";
-  $defs?: {
-  };
-  type: "object";
-  allOf?: {
-  }[];
-  properties?: {
-  };
-  required?: string[];
-  additionalProperties?: false;
-  unevaluatedProperties?: false;
-  $anchor: string;
-};
-
-export interface CreationContextWrapper {
-  creationContext: CreationContext;
-}
-export interface CreationContext {
-  executionRef: string;
-  resourceRoleRef: string;
-}
-export interface ResourceKind {
-  kind: "missing" | "potential-input" | "potential-output" | "materialized";
-}
-export interface Timestamp {
-  timestamp: string;
-}
-export interface Path {
-  path: string;
-}
-export interface Named {
-  name: string;
-}
-export interface Described {
-  description: string;
-}
-export interface ExtractionSchemaWrapper {
-  extractionSchema: ExtractionSchema;
-}
+import type { ResourceMetaBase, ResourceType as ExtractedData } from './types.js';
+export type Resource_ResourceType = ResourceMetaBase & { extractedData: ExtractedData };

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

@@ -1,80 +1,3 @@
 // Auto-generated strict composite type. Do not edit.
-export type Resource_StatelessStrategy = ResourceMetaBase & {
-  extractedData: StatelessStrategy;
-};
-export type ResourceMetaBase = ResourceBase &
-  CreationContextWrapper &
-  ResourceKind & {
-    kind: "materialized";
-  } & Timestamp &
-  Path;
-export type ResourceBase = {
-  identity: string;
-  resourceTypeRef: string;
-};
-export type StatelessStrategy = {
-  identity: string;
-  steps: Step[];
-};
-export type Step = WorkStep | BranchStep | WhileStep | ForStep;
-export type WorkStep = StepKind & {
-  execution: Execution;
-  identity: string;
-  kind: "work";
-};
-export type Execution = {
-  identity: string;
-  jobRef: string;
-} & RoleBindingsWrapper;
-export type BranchStep = StepKind & {
-  /**
-   * @minItems 1
-   */
-  cases: [Conditional, ...Conditional[]];
-  identity: string;
-  kind: "branch";
-};
-export type WhileStep = StepKind & {
-  case: Conditional;
-  identity: string;
-  kind: "while";
-};
-export type ForStep = StepKind & {
-  case: Conditional;
-  identity: string;
-  kind: "for";
-};
-
-export interface CreationContextWrapper {
-  creationContext: CreationContext;
-}
-export interface CreationContext {
-  executionRef: string;
-  resourceRoleRef: string;
-}
-export interface ResourceKind {
-  kind: "missing" | "potential-input" | "potential-output" | "materialized";
-}
-export interface Timestamp {
-  timestamp: string;
-}
-export interface Path {
-  path: string;
-}
-export interface StepKind {
-  kind: "work" | "branch" | "while" | "for";
-}
-export interface RoleBindingsWrapper {
-  roleBindings: RoleBindings;
-}
-export interface RoleBindings {
-  inputBindingMap: RoleBindingMap;
-  outputBindingMap: RoleBindingMap;
-}
-export interface RoleBindingMap {
-  [k: string]: string;
-}
-export interface Conditional {
-  what: WorkStep;
-  when: WorkStep;
-}
+import type { ResourceMetaBase, StatelessStrategy as ExtractedData } from './types.js';
+export type Resource_StatelessStrategy = ResourceMetaBase & { extractedData: ExtractedData };

package/dist/genesis/resourceTypes/Genesis.json

@@ -494,8 +494,7 @@
                                 }
                             }
                         }
-                    },
-                    "additionalProperties": false
+                    }
                 }
             },
             "ExtractionSchema": {
@@ -558,6 +557,9 @@
                                         "properties": {
                                             "properties": {
                                                 "type": "object",
+                                                "required": [
+                                                    "identity"
+                                                ],
                                                 "properties": {
                                                     "identity": {}
                                                 }
@@ -587,6 +589,9 @@
                                         "properties": {
                                             "properties": {
                                                 "type": "object",
+                                                "required": [
+                                                    "merit"
+                                                ],
                                                 "properties": {
                                                     "merit": {}
                                                 }

package/dist/scripts/generateResourceTypeType.js

@@ -1,6 +1,4 @@
 import fs from 'fs';
-import path from 'path';
-import { compileFromFile } from 'json-schema-to-typescript';
 import { getConfig } from './_lib/config.js';
 /**
  * Generate a typed Resource variant where `extractedData` is typed to a specific schema
@@ -15,8 +13,6 @@ async function main() {
         console.error('Missing --name <SchemaBasename> argument');
         process.exit(1);
     }
-    const projectRoot = config.getRoot();
-    const schemasDir = config.getOutputDir();
     const inPath = config.getOutputPath(`${name}.json`);
     if (!fs.existsSync(inPath)) {
         console.error(`Schema file not found: ${inPath}`);
@@ -46,73 +42,33 @@ async function main() {
     const outPath = config.getTypesSrcPath(outName);
     const outJsName = `Resource_${name}.js`;
     const outJsPath = config.getTypesSrcPath(outJsName);
-    // Build a composite schema in output directory so that local $ref paths are simple
-    const schemasOutDir = config.getOutputDir();
-    const compositePath = path.join(schemasOutDir, `.composite.Resource_${name}.json`);
-    const compositeSchema = {
-        $schema: 'https://json-schema.org/draft/2020-12/schema',
-        title: `Resource_${name}`,
-        type: 'object',
-        allOf: [
-            { $ref: `./${config.getSourceFile()}#/$defs/ResourceMetaBase` },
-            {
-                type: 'object',
-                required: ['extractedData'],
-                properties: {
-                    extractedData: { $ref: `./${name}.json` }
-                },
-                unevaluatedProperties: false
-            }
-        ],
-        unevaluatedProperties: false
-    };
-    // Write composite schema
-    fs.writeFileSync(compositePath, JSON.stringify(compositeSchema, null, 2), 'utf8');
-    try {
-        // Compile to TypeScript declarations
-        let ts = await compileFromFile(compositePath, {
-            bannerComment: '',
-            declareExternallyReferenced: true,
-            unreachableDefinitions: true,
-            $refOptions: {
-                resolve: {
-                    file: { order: 1 },
-                    http: false,
-                    https: false
-                }
-            }
-        });
-        // Remove noisy index signatures that make types too permissive
-        ts = ts.replace(/\n\s*\[k:\s*string\]:\s*unknown;\n/g, '\n');
-        // Ensure it is a module
-        if (!/\bexport\b/.test(ts)) {
-            ts += '\nexport {}\n';
-        }
-        const header = '// Auto-generated strict composite type. Do not edit.\n';
-        fs.writeFileSync(outPath, header + ts, 'utf8');
-        console.log(`Wrote ${outPath}`);
-        // Ensure a runtime-resolvable JS shim exists alongside the .d.ts for NodeNext resolution
-        if (!fs.existsSync(outJsPath)) {
-            fs.writeFileSync(outJsPath, 'export {}\n', 'utf8');
-            console.log(`Wrote ${outJsPath}`);
-        }
-        // Also copy both files into dist so consumers can resolve the module and its types
-        const distLibDir = config.getTypesDistDir();
-        fs.mkdirSync(distLibDir, { recursive: true });
-        const distDtsPath = config.getTypesDistPath(outName);
-        const distJsPath = config.getTypesDistPath(outJsName);
-        fs.writeFileSync(distDtsPath, header + ts, 'utf8');
-        fs.writeFileSync(distJsPath, 'export {}\n', 'utf8');
-        console.log(`Wrote ${distDtsPath}`);
-        console.log(`Wrote ${distJsPath}`);
-    }
-    finally {
-        // Cleanup composite schema file
-        try {
-            fs.unlinkSync(compositePath);
-        }
-        catch { }
+    // IMPORTANT:
+    // We intentionally do NOT re-run json-schema-to-typescript here.
+    // That path produces self-contained types that degrade schema-patterned identities/refs
+    // into plain `string`, which then becomes incompatible with our canonical branded
+    // identity types in `types.d.ts` (e.g. `ResourceIdentity = `RESOURCE-${string}``).
+    //
+    // Instead, we generate a tiny module that composes the canonical types:
+    //   Resource_<Name> = ResourceMetaBase & { extractedData: <Name> }
+    const header = '// Auto-generated strict composite type. Do not edit.\n';
+    const ts = `import type { ResourceMetaBase, ${name} as ExtractedData } from './types.js';\n` +
+        `export type Resource_${name} = ResourceMetaBase & { extractedData: ExtractedData };\n`;
+    fs.writeFileSync(outPath, header + ts, 'utf8');
+    console.log(`Wrote ${outPath}`);
+    // Ensure a runtime-resolvable JS shim exists alongside the .d.ts for NodeNext resolution
+    if (!fs.existsSync(outJsPath)) {
+        fs.writeFileSync(outJsPath, 'export {}\n', 'utf8');
+        console.log(`Wrote ${outJsPath}`);
     }
+    // Also copy both files into dist so consumers can resolve the module and its types
+    const distLibDir = config.getTypesDistDir();
+    fs.mkdirSync(distLibDir, { recursive: true });
+    const distDtsPath = config.getTypesDistPath(outName);
+    const distJsPath = config.getTypesDistPath(outJsName);
+    fs.writeFileSync(distDtsPath, header + ts, 'utf8');
+    fs.writeFileSync(distJsPath, 'export {}\n', 'utf8');
+    console.log(`Wrote ${distDtsPath}`);
+    console.log(`Wrote ${distJsPath}`);
 }
 function parseArgs(args) {
     let name;

package/package.json

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