@living-architecture/riviere-cli 0.2.4 → 0.3.0

package/dist/bin.js

@@ -6802,7 +6802,7 @@ var require_dist = __commonJS({
 });
 
 // src/cli.ts
-import { Command as Command20 } from "commander";
+import { Command as Command21 } from "commander";
 import { createRequire } from "module";
 
 // src/commands/builder/add-component.ts
@@ -6954,11 +6954,6 @@ var riviere_schema_default = {
         },
         sourceLocation: {
           $ref: "#/definitions/sourceLocation"
-        },
-        metadata: {
-          type: "object",
-          description: "Extensible metadata for custom properties",
-          additionalProperties: true
         }
       }
     },
@@ -6973,7 +6968,6 @@ var riviere_schema_default = {
         module: { type: "string", minLength: 1 },
         description: { type: "string" },
         sourceLocation: { $ref: "#/definitions/sourceLocation" },
-        metadata: { type: "object", additionalProperties: true },
         route: { type: "string", description: "URL route where UI component is rendered", minLength: 1 }
       },
       additionalProperties: false
@@ -6989,7 +6983,6 @@ var riviere_schema_default = {
         module: { type: "string", minLength: 1 },
         description: { type: "string" },
         sourceLocation: { $ref: "#/definitions/sourceLocation" },
-        metadata: { type: "object", additionalProperties: true },
         apiType: { const: "REST" },
         httpMethod: { type: "string", enum: ["GET", "POST", "PUT", "PATCH", "DELETE", "HEAD", "OPTIONS"] },
         path: { type: "string", description: "API path" }
@@ -7007,7 +7000,6 @@ var riviere_schema_default = {
         module: { type: "string", minLength: 1 },
         description: { type: "string" },
         sourceLocation: { $ref: "#/definitions/sourceLocation" },
-        metadata: { type: "object", additionalProperties: true },
         apiType: { const: "GraphQL" },
         operationName: { type: "string", description: "GraphQL operation name" }
       },
@@ -7024,7 +7016,6 @@ var riviere_schema_default = {
         module: { type: "string", minLength: 1 },
         description: { type: "string" },
         sourceLocation: { $ref: "#/definitions/sourceLocation" },
-        metadata: { type: "object", additionalProperties: true },
         apiType: { const: "other" }
       },
       additionalProperties: false
@@ -7039,8 +7030,7 @@ var riviere_schema_default = {
         domain: { type: "string", minLength: 1 },
         module: { type: "string", minLength: 1 },
         description: { type: "string" },
-        sourceLocation: { $ref: "#/definitions/sourceLocation" },
-        metadata: { type: "object", additionalProperties: true }
+        sourceLocation: { $ref: "#/definitions/sourceLocation" }
       },
       additionalProperties: false
     },
@@ -7055,7 +7045,6 @@ var riviere_schema_default = {
         module: { type: "string", minLength: 1 },
         description: { type: "string" },
         sourceLocation: { $ref: "#/definitions/sourceLocation" },
-        metadata: { type: "object", additionalProperties: true },
         operationName: { type: "string", description: "Operation name" },
         entity: { type: "string", description: "Entity name" },
         signature: { $ref: "#/definitions/operationSignature" },
@@ -7076,7 +7065,6 @@ var riviere_schema_default = {
         module: { type: "string", minLength: 1 },
         description: { type: "string" },
         sourceLocation: { $ref: "#/definitions/sourceLocation" },
-        metadata: { type: "object", additionalProperties: true },
         eventName: { type: "string", description: "Event name" },
         eventSchema: { type: "string", description: "Event schema definition" }
       },
@@ -7093,7 +7081,6 @@ var riviere_schema_default = {
         module: { type: "string", minLength: 1 },
         description: { type: "string" },
         sourceLocation: { $ref: "#/definitions/sourceLocation" },
-        metadata: { type: "object", additionalProperties: true },
         subscribedEvents: { type: "array", items: { type: "string" }, description: "Events this handler subscribes to" }
       },
       additionalProperties: false
@@ -7109,7 +7096,6 @@ var riviere_schema_default = {
         module: { type: "string", minLength: 1 },
         description: { type: "string" },
         sourceLocation: { $ref: "#/definitions/sourceLocation" },
-        metadata: { type: "object", additionalProperties: true },
         customTypeName: { type: "string", description: "Name of the custom type (must match a key in metadata.customTypes)", minLength: 1 }
       },
       additionalProperties: false
@@ -7153,11 +7139,6 @@ var riviere_schema_default = {
         },
         sourceLocation: {
           $ref: "#/definitions/sourceLocation"
-        },
-        metadata: {
-          type: "object",
-          description: "Extensible metadata for custom properties",
-          additionalProperties: true
         }
       },
       additionalProperties: false
@@ -7191,11 +7172,6 @@ var riviere_schema_default = {
         },
         sourceLocation: {
           $ref: "#/definitions/sourceLocation"
-        },
-        metadata: {
-          type: "object",
-          description: "Extensible metadata for custom properties",
-          additionalProperties: true
         }
       },
       additionalProperties: false
@@ -7276,7 +7252,7 @@ var riviere_schema_default = {
           description: "Classification of domain's role in system"
         }
       },
-      additionalProperties: true
+      additionalProperties: false
     },
     customTypeDefinition: {
       type: "object",
@@ -21523,22 +21499,6 @@ function validateCustomTypes(graph) {
         message: `Custom type '${customTypeName}' is not defined in metadata.customTypes`,
         code: "INVALID_TYPE"
       });
-      return;
-    }
-    const typeDefinition = customTypes[customTypeName];
-    const requiredProperties = typeDefinition?.requiredProperties;
-    const hasNoRequiredProperties = requiredProperties === void 0;
-    if (hasNoRequiredProperties)
-      return;
-    const requiredPropertyNames = Object.keys(requiredProperties);
-    const componentMetadata = component.metadata;
-    const missingProperties = componentMetadata ? requiredPropertyNames.filter((prop) => !(prop in componentMetadata)) : requiredPropertyNames;
-    if (missingProperties.length > 0) {
-      errors.push({
-        path: `/components/${index}`,
-        message: `Custom component is missing required properties for type '${customTypeName}': ${missingProperties.join(", ")}`,
-        code: "INVALID_TYPE"
-      });
     }
   });
   return errors;
@@ -22575,8 +22535,7 @@ var RiviereBuilder = class _RiviereBuilder {
       module: input.module,
       route: input.route,
       sourceLocation: input.sourceLocation,
-      ...input.description !== void 0 && { description: input.description },
-      ...input.metadata !== void 0 && { metadata: input.metadata }
+      ...input.description !== void 0 && { description: input.description }
     };
     return this.registerComponent(component);
   }
@@ -22614,8 +22573,7 @@ var RiviereBuilder = class _RiviereBuilder {
       ...input.httpMethod !== void 0 && { httpMethod: input.httpMethod },
       ...input.path !== void 0 && { path: input.path },
       ...input.operationName !== void 0 && { operationName: input.operationName },
-      ...input.description !== void 0 && { description: input.description },
-      ...input.metadata !== void 0 && { metadata: input.metadata }
+      ...input.description !== void 0 && { description: input.description }
     };
     return this.registerComponent(component);
   }
@@ -22646,8 +22604,7 @@ var RiviereBuilder = class _RiviereBuilder {
       domain: input.domain,
       module: input.module,
       sourceLocation: input.sourceLocation,
-      ...input.description !== void 0 && { description: input.description },
-      ...input.metadata !== void 0 && { metadata: input.metadata }
+      ...input.description !== void 0 && { description: input.description }
     };
     return this.registerComponent(component);
   }
@@ -22689,8 +22646,7 @@ var RiviereBuilder = class _RiviereBuilder {
       ...input.behavior !== void 0 && { behavior: input.behavior },
       ...input.stateChanges !== void 0 && { stateChanges: input.stateChanges },
       ...input.businessRules !== void 0 && { businessRules: input.businessRules },
-      ...input.description !== void 0 && { description: input.description },
-      ...input.metadata !== void 0 && { metadata: input.metadata }
+      ...input.description !== void 0 && { description: input.description }
     };
     return this.registerComponent(component);
   }
@@ -22724,8 +22680,7 @@ var RiviereBuilder = class _RiviereBuilder {
       eventName: input.eventName,
       sourceLocation: input.sourceLocation,
       ...input.eventSchema !== void 0 && { eventSchema: input.eventSchema },
-      ...input.description !== void 0 && { description: input.description },
-      ...input.metadata !== void 0 && { metadata: input.metadata }
+      ...input.description !== void 0 && { description: input.description }
     };
     return this.registerComponent(component);
   }
@@ -22758,8 +22713,7 @@ var RiviereBuilder = class _RiviereBuilder {
       module: input.module,
       subscribedEvents: input.subscribedEvents,
       sourceLocation: input.sourceLocation,
-      ...input.description !== void 0 && { description: input.description },
-      ...input.metadata !== void 0 && { metadata: input.metadata }
+      ...input.description !== void 0 && { description: input.description }
     };
     return this.registerComponent(component);
   }
@@ -22831,8 +22785,7 @@ var RiviereBuilder = class _RiviereBuilder {
       domain: input.domain,
       module: input.module,
       sourceLocation: input.sourceLocation,
-      ...input.description !== void 0 && { description: input.description },
-      ...input.metadata !== void 0 && { metadata: input.metadata }
+      ...input.description !== void 0 && { description: input.description }
     };
     return this.registerComponent(component);
   }
@@ -22977,8 +22930,7 @@ var RiviereBuilder = class _RiviereBuilder {
       target: input.target,
       ...input.type !== void 0 && { type: input.type },
       ...input.description !== void 0 && { description: input.description },
-      ...input.sourceLocation !== void 0 && { sourceLocation: input.sourceLocation },
-      ...input.metadata !== void 0 && { metadata: input.metadata }
+      ...input.sourceLocation !== void 0 && { sourceLocation: input.sourceLocation }
     };
     this.graph.externalLinks.push(externalLink);
     return externalLink;
@@ -24165,8 +24117,89 @@ Examples:
   });
 }
 
-// src/commands/query/entry-points.ts
+// src/commands/builder/define-custom-type.ts
 import { Command as Command14 } from "commander";
+import { writeFile as writeFile10 } from "node:fs/promises";
+var VALID_PROPERTY_TYPES = ["string", "number", "boolean", "array", "object"];
+function isValidPropertyType(value) {
+  return VALID_PROPERTY_TYPES.some((t) => t === value);
+}
+function parsePropertySpec(spec) {
+  const parts = spec.split(":");
+  if (parts.length < 2 || parts.length > 3) {
+    return { error: `Invalid property format: "${spec}". Expected "name:type" or "name:type:description"` };
+  }
+  const [name, type, description] = parts;
+  if (!name || name.trim() === "") {
+    return { error: "Property name cannot be empty" };
+  }
+  if (!type || !isValidPropertyType(type)) {
+    return { error: `Invalid property type: "${type}". Valid types: ${VALID_PROPERTY_TYPES.join(", ")}` };
+  }
+  const definition = { type };
+  if (description && description.trim() !== "") {
+    definition.description = description;
+  }
+  return { name: name.trim(), definition };
+}
+function parsePropertySpecs(specs) {
+  if (specs === void 0 || specs.length === 0) {
+    return { success: true, properties: {} };
+  }
+  const properties = {};
+  for (const spec of specs) {
+    const result = parsePropertySpec(spec);
+    if ("error" in result) {
+      return { success: false, error: result.error };
+    }
+    if (properties[result.name] !== void 0) {
+      return { success: false, error: `Duplicate property name: "${result.name}"` };
+    }
+    properties[result.name] = result.definition;
+  }
+  return { success: true, properties };
+}
+function collect(value, previous) {
+  return previous.concat([value]);
+}
+function createDefineCustomTypeCommand() {
+  return new Command14("define-custom-type").description("Define a custom component type").requiredOption("--name <name>", "Custom type name").option("--description <desc>", "Custom type description").option("--required-property <spec>", "Required property (format: name:type[:description])", collect, []).option("--optional-property <spec>", "Optional property (format: name:type[:description])", collect, []).option("--graph <path>", getDefaultGraphPathDescription()).option("--json", "Output result as JSON").action(async (options) => {
+    const requiredResult = parsePropertySpecs(options.requiredProperty);
+    if (!requiredResult.success) {
+      console.log(JSON.stringify(formatError2("VALIDATION_ERROR" /* ValidationError */, requiredResult.error, [])));
+      return;
+    }
+    const optionalResult = parsePropertySpecs(options.optionalProperty);
+    if (!optionalResult.success) {
+      console.log(JSON.stringify(formatError2("VALIDATION_ERROR" /* ValidationError */, optionalResult.error, [])));
+      return;
+    }
+    await withGraphBuilder(options.graph, async (builder, graphPath) => {
+      builder.defineCustomType({
+        name: options.name,
+        ...options.description !== void 0 && { description: options.description },
+        ...Object.keys(requiredResult.properties).length > 0 && { requiredProperties: requiredResult.properties },
+        ...Object.keys(optionalResult.properties).length > 0 && { optionalProperties: optionalResult.properties }
+      });
+      await writeFile10(graphPath, builder.serialize(), "utf-8");
+      if (options.json === true) {
+        console.log(
+          JSON.stringify(
+            formatSuccess({
+              name: options.name,
+              ...options.description !== void 0 && { description: options.description },
+              ...Object.keys(requiredResult.properties).length > 0 && { requiredProperties: requiredResult.properties },
+              ...Object.keys(optionalResult.properties).length > 0 && { optionalProperties: optionalResult.properties }
+            })
+          )
+        );
+      }
+    });
+  });
+}
+
+// src/commands/query/entry-points.ts
+import { Command as Command15 } from "commander";
 
 // src/commands/query/load-graph.ts
 import { readFile as readFile3 } from "node:fs/promises";
@@ -24214,7 +24247,7 @@ async function withGraph(graphPathOption, handler) {
 
 // src/commands/query/entry-points.ts
 function createEntryPointsCommand() {
-  return new Command14("entry-points").description("List entry points (APIs, UIs, EventHandlers with no incoming links)").addHelpText(
+  return new Command15("entry-points").description("List entry points (APIs, UIs, EventHandlers with no incoming links)").addHelpText(
     "after",
     `
 Examples:
@@ -24232,9 +24265,9 @@ Examples:
 }
 
 // src/commands/query/domains.ts
-import { Command as Command15 } from "commander";
+import { Command as Command16 } from "commander";
 function createDomainsCommand() {
-  return new Command15("domains").description("List domains with component counts").addHelpText(
+  return new Command16("domains").description("List domains with component counts").addHelpText(
     "after",
     `
 Examples:
@@ -24252,9 +24285,9 @@ Examples:
 }
 
 // src/commands/query/trace.ts
-import { Command as Command16 } from "commander";
+import { Command as Command17 } from "commander";
 function createTraceCommand() {
-  return new Command16("trace").description("Trace flow from a component (bidirectional)").addHelpText(
+  return new Command17("trace").description("Trace flow from a component (bidirectional)").addHelpText(
     "after",
     `
 Examples:
@@ -24288,9 +24321,9 @@ Examples:
 }
 
 // src/commands/query/orphans.ts
-import { Command as Command17 } from "commander";
+import { Command as Command18 } from "commander";
 function createOrphansCommand() {
-  return new Command17("orphans").description("Find orphan components with no links").addHelpText(
+  return new Command18("orphans").description("Find orphan components with no links").addHelpText(
     "after",
     `
 Examples:
@@ -24308,7 +24341,7 @@ Examples:
 }
 
 // src/commands/query/components.ts
-import { Command as Command18 } from "commander";
+import { Command as Command19 } from "commander";
 
 // src/commands/query/component-output.ts
 function toComponentOutput(component) {
@@ -24322,7 +24355,7 @@ function toComponentOutput(component) {
 
 // src/commands/query/components.ts
 function createComponentsCommand() {
-  return new Command18("components").description("List components with optional filtering").addHelpText(
+  return new Command19("components").description("List components with optional filtering").addHelpText(
     "after",
     `
 Examples:
@@ -24355,9 +24388,9 @@ Examples:
 }
 
 // src/commands/query/search.ts
-import { Command as Command19 } from "commander";
+import { Command as Command20 } from "commander";
 function createSearchCommand() {
-  return new Command19("search").description("Search components by name").addHelpText(
+  return new Command20("search").description("Search components by name").addHelpText(
     "after",
     `
 Examples:
@@ -24391,7 +24424,7 @@ function loadPackageJson() {
 }
 var packageJson = loadPackageJson();
 function createProgram() {
-  const program2 = new Command20();
+  const program2 = new Command21();
   program2.name("riviere").version(packageJson.version);
   const builderCmd = program2.command("builder").description("Commands for building a graph");
   builderCmd.addCommand(createAddComponentCommand());
@@ -24407,6 +24440,7 @@ function createProgram() {
   builderCmd.addCommand(createComponentSummaryCommand());
   builderCmd.addCommand(createComponentChecklistCommand());
   builderCmd.addCommand(createCheckConsistencyCommand());
+  builderCmd.addCommand(createDefineCustomTypeCommand());
   const queryCmd = program2.command("query").description("Commands for querying a graph");
   queryCmd.addCommand(createEntryPointsCommand());
   queryCmd.addCommand(createDomainsCommand());

package/dist/index.js

@@ -6801,7 +6801,7 @@ var require_dist = __commonJS({
 });
 
 // src/cli.ts
-import { Command as Command20 } from "commander";
+import { Command as Command21 } from "commander";
 import { createRequire } from "module";
 
 // src/commands/builder/add-component.ts
@@ -6953,11 +6953,6 @@ var riviere_schema_default = {
         },
         sourceLocation: {
           $ref: "#/definitions/sourceLocation"
-        },
-        metadata: {
-          type: "object",
-          description: "Extensible metadata for custom properties",
-          additionalProperties: true
         }
       }
     },
@@ -6972,7 +6967,6 @@ var riviere_schema_default = {
         module: { type: "string", minLength: 1 },
         description: { type: "string" },
         sourceLocation: { $ref: "#/definitions/sourceLocation" },
-        metadata: { type: "object", additionalProperties: true },
         route: { type: "string", description: "URL route where UI component is rendered", minLength: 1 }
       },
       additionalProperties: false
@@ -6988,7 +6982,6 @@ var riviere_schema_default = {
         module: { type: "string", minLength: 1 },
         description: { type: "string" },
         sourceLocation: { $ref: "#/definitions/sourceLocation" },
-        metadata: { type: "object", additionalProperties: true },
         apiType: { const: "REST" },
         httpMethod: { type: "string", enum: ["GET", "POST", "PUT", "PATCH", "DELETE", "HEAD", "OPTIONS"] },
         path: { type: "string", description: "API path" }
@@ -7006,7 +6999,6 @@ var riviere_schema_default = {
         module: { type: "string", minLength: 1 },
         description: { type: "string" },
         sourceLocation: { $ref: "#/definitions/sourceLocation" },
-        metadata: { type: "object", additionalProperties: true },
         apiType: { const: "GraphQL" },
         operationName: { type: "string", description: "GraphQL operation name" }
       },
@@ -7023,7 +7015,6 @@ var riviere_schema_default = {
         module: { type: "string", minLength: 1 },
         description: { type: "string" },
         sourceLocation: { $ref: "#/definitions/sourceLocation" },
-        metadata: { type: "object", additionalProperties: true },
         apiType: { const: "other" }
       },
       additionalProperties: false
@@ -7038,8 +7029,7 @@ var riviere_schema_default = {
         domain: { type: "string", minLength: 1 },
         module: { type: "string", minLength: 1 },
         description: { type: "string" },
-        sourceLocation: { $ref: "#/definitions/sourceLocation" },
-        metadata: { type: "object", additionalProperties: true }
+        sourceLocation: { $ref: "#/definitions/sourceLocation" }
       },
       additionalProperties: false
     },
@@ -7054,7 +7044,6 @@ var riviere_schema_default = {
         module: { type: "string", minLength: 1 },
         description: { type: "string" },
         sourceLocation: { $ref: "#/definitions/sourceLocation" },
-        metadata: { type: "object", additionalProperties: true },
         operationName: { type: "string", description: "Operation name" },
         entity: { type: "string", description: "Entity name" },
         signature: { $ref: "#/definitions/operationSignature" },
@@ -7075,7 +7064,6 @@ var riviere_schema_default = {
         module: { type: "string", minLength: 1 },
         description: { type: "string" },
         sourceLocation: { $ref: "#/definitions/sourceLocation" },
-        metadata: { type: "object", additionalProperties: true },
         eventName: { type: "string", description: "Event name" },
         eventSchema: { type: "string", description: "Event schema definition" }
       },
@@ -7092,7 +7080,6 @@ var riviere_schema_default = {
         module: { type: "string", minLength: 1 },
         description: { type: "string" },
         sourceLocation: { $ref: "#/definitions/sourceLocation" },
-        metadata: { type: "object", additionalProperties: true },
         subscribedEvents: { type: "array", items: { type: "string" }, description: "Events this handler subscribes to" }
       },
       additionalProperties: false
@@ -7108,7 +7095,6 @@ var riviere_schema_default = {
         module: { type: "string", minLength: 1 },
         description: { type: "string" },
         sourceLocation: { $ref: "#/definitions/sourceLocation" },
-        metadata: { type: "object", additionalProperties: true },
         customTypeName: { type: "string", description: "Name of the custom type (must match a key in metadata.customTypes)", minLength: 1 }
       },
       additionalProperties: false
@@ -7152,11 +7138,6 @@ var riviere_schema_default = {
         },
         sourceLocation: {
           $ref: "#/definitions/sourceLocation"
-        },
-        metadata: {
-          type: "object",
-          description: "Extensible metadata for custom properties",
-          additionalProperties: true
         }
       },
       additionalProperties: false
@@ -7190,11 +7171,6 @@ var riviere_schema_default = {
         },
         sourceLocation: {
           $ref: "#/definitions/sourceLocation"
-        },
-        metadata: {
-          type: "object",
-          description: "Extensible metadata for custom properties",
-          additionalProperties: true
         }
       },
       additionalProperties: false
@@ -7275,7 +7251,7 @@ var riviere_schema_default = {
           description: "Classification of domain's role in system"
         }
       },
-      additionalProperties: true
+      additionalProperties: false
     },
     customTypeDefinition: {
       type: "object",
@@ -21522,22 +21498,6 @@ function validateCustomTypes(graph) {
         message: `Custom type '${customTypeName}' is not defined in metadata.customTypes`,
         code: "INVALID_TYPE"
       });
-      return;
-    }
-    const typeDefinition = customTypes[customTypeName];
-    const requiredProperties = typeDefinition?.requiredProperties;
-    const hasNoRequiredProperties = requiredProperties === void 0;
-    if (hasNoRequiredProperties)
-      return;
-    const requiredPropertyNames = Object.keys(requiredProperties);
-    const componentMetadata = component.metadata;
-    const missingProperties = componentMetadata ? requiredPropertyNames.filter((prop) => !(prop in componentMetadata)) : requiredPropertyNames;
-    if (missingProperties.length > 0) {
-      errors.push({
-        path: `/components/${index}`,
-        message: `Custom component is missing required properties for type '${customTypeName}': ${missingProperties.join(", ")}`,
-        code: "INVALID_TYPE"
-      });
     }
   });
   return errors;
@@ -22574,8 +22534,7 @@ var RiviereBuilder = class _RiviereBuilder {
       module: input.module,
       route: input.route,
       sourceLocation: input.sourceLocation,
-      ...input.description !== void 0 && { description: input.description },
-      ...input.metadata !== void 0 && { metadata: input.metadata }
+      ...input.description !== void 0 && { description: input.description }
     };
     return this.registerComponent(component);
   }
@@ -22613,8 +22572,7 @@ var RiviereBuilder = class _RiviereBuilder {
       ...input.httpMethod !== void 0 && { httpMethod: input.httpMethod },
       ...input.path !== void 0 && { path: input.path },
       ...input.operationName !== void 0 && { operationName: input.operationName },
-      ...input.description !== void 0 && { description: input.description },
-      ...input.metadata !== void 0 && { metadata: input.metadata }
+      ...input.description !== void 0 && { description: input.description }
     };
     return this.registerComponent(component);
   }
@@ -22645,8 +22603,7 @@ var RiviereBuilder = class _RiviereBuilder {
       domain: input.domain,
       module: input.module,
       sourceLocation: input.sourceLocation,
-      ...input.description !== void 0 && { description: input.description },
-      ...input.metadata !== void 0 && { metadata: input.metadata }
+      ...input.description !== void 0 && { description: input.description }
     };
     return this.registerComponent(component);
   }
@@ -22688,8 +22645,7 @@ var RiviereBuilder = class _RiviereBuilder {
       ...input.behavior !== void 0 && { behavior: input.behavior },
       ...input.stateChanges !== void 0 && { stateChanges: input.stateChanges },
       ...input.businessRules !== void 0 && { businessRules: input.businessRules },
-      ...input.description !== void 0 && { description: input.description },
-      ...input.metadata !== void 0 && { metadata: input.metadata }
+      ...input.description !== void 0 && { description: input.description }
     };
     return this.registerComponent(component);
   }
@@ -22723,8 +22679,7 @@ var RiviereBuilder = class _RiviereBuilder {
       eventName: input.eventName,
       sourceLocation: input.sourceLocation,
       ...input.eventSchema !== void 0 && { eventSchema: input.eventSchema },
-      ...input.description !== void 0 && { description: input.description },
-      ...input.metadata !== void 0 && { metadata: input.metadata }
+      ...input.description !== void 0 && { description: input.description }
     };
     return this.registerComponent(component);
   }
@@ -22757,8 +22712,7 @@ var RiviereBuilder = class _RiviereBuilder {
       module: input.module,
       subscribedEvents: input.subscribedEvents,
       sourceLocation: input.sourceLocation,
-      ...input.description !== void 0 && { description: input.description },
-      ...input.metadata !== void 0 && { metadata: input.metadata }
+      ...input.description !== void 0 && { description: input.description }
     };
     return this.registerComponent(component);
   }
@@ -22830,8 +22784,7 @@ var RiviereBuilder = class _RiviereBuilder {
       domain: input.domain,
       module: input.module,
       sourceLocation: input.sourceLocation,
-      ...input.description !== void 0 && { description: input.description },
-      ...input.metadata !== void 0 && { metadata: input.metadata }
+      ...input.description !== void 0 && { description: input.description }
     };
     return this.registerComponent(component);
   }
@@ -22976,8 +22929,7 @@ var RiviereBuilder = class _RiviereBuilder {
       target: input.target,
       ...input.type !== void 0 && { type: input.type },
       ...input.description !== void 0 && { description: input.description },
-      ...input.sourceLocation !== void 0 && { sourceLocation: input.sourceLocation },
-      ...input.metadata !== void 0 && { metadata: input.metadata }
+      ...input.sourceLocation !== void 0 && { sourceLocation: input.sourceLocation }
     };
     this.graph.externalLinks.push(externalLink);
     return externalLink;
@@ -24181,8 +24133,89 @@ Examples:
   });
 }
 
-// src/commands/query/entry-points.ts
+// src/commands/builder/define-custom-type.ts
 import { Command as Command14 } from "commander";
+import { writeFile as writeFile10 } from "node:fs/promises";
+var VALID_PROPERTY_TYPES = ["string", "number", "boolean", "array", "object"];
+function isValidPropertyType(value) {
+  return VALID_PROPERTY_TYPES.some((t) => t === value);
+}
+function parsePropertySpec(spec) {
+  const parts = spec.split(":");
+  if (parts.length < 2 || parts.length > 3) {
+    return { error: `Invalid property format: "${spec}". Expected "name:type" or "name:type:description"` };
+  }
+  const [name, type, description] = parts;
+  if (!name || name.trim() === "") {
+    return { error: "Property name cannot be empty" };
+  }
+  if (!type || !isValidPropertyType(type)) {
+    return { error: `Invalid property type: "${type}". Valid types: ${VALID_PROPERTY_TYPES.join(", ")}` };
+  }
+  const definition = { type };
+  if (description && description.trim() !== "") {
+    definition.description = description;
+  }
+  return { name: name.trim(), definition };
+}
+function parsePropertySpecs(specs) {
+  if (specs === void 0 || specs.length === 0) {
+    return { success: true, properties: {} };
+  }
+  const properties = {};
+  for (const spec of specs) {
+    const result = parsePropertySpec(spec);
+    if ("error" in result) {
+      return { success: false, error: result.error };
+    }
+    if (properties[result.name] !== void 0) {
+      return { success: false, error: `Duplicate property name: "${result.name}"` };
+    }
+    properties[result.name] = result.definition;
+  }
+  return { success: true, properties };
+}
+function collect(value, previous) {
+  return previous.concat([value]);
+}
+function createDefineCustomTypeCommand() {
+  return new Command14("define-custom-type").description("Define a custom component type").requiredOption("--name <name>", "Custom type name").option("--description <desc>", "Custom type description").option("--required-property <spec>", "Required property (format: name:type[:description])", collect, []).option("--optional-property <spec>", "Optional property (format: name:type[:description])", collect, []).option("--graph <path>", getDefaultGraphPathDescription()).option("--json", "Output result as JSON").action(async (options) => {
+    const requiredResult = parsePropertySpecs(options.requiredProperty);
+    if (!requiredResult.success) {
+      console.log(JSON.stringify(formatError2("VALIDATION_ERROR" /* ValidationError */, requiredResult.error, [])));
+      return;
+    }
+    const optionalResult = parsePropertySpecs(options.optionalProperty);
+    if (!optionalResult.success) {
+      console.log(JSON.stringify(formatError2("VALIDATION_ERROR" /* ValidationError */, optionalResult.error, [])));
+      return;
+    }
+    await withGraphBuilder(options.graph, async (builder, graphPath) => {
+      builder.defineCustomType({
+        name: options.name,
+        ...options.description !== void 0 && { description: options.description },
+        ...Object.keys(requiredResult.properties).length > 0 && { requiredProperties: requiredResult.properties },
+        ...Object.keys(optionalResult.properties).length > 0 && { optionalProperties: optionalResult.properties }
+      });
+      await writeFile10(graphPath, builder.serialize(), "utf-8");
+      if (options.json === true) {
+        console.log(
+          JSON.stringify(
+            formatSuccess({
+              name: options.name,
+              ...options.description !== void 0 && { description: options.description },
+              ...Object.keys(requiredResult.properties).length > 0 && { requiredProperties: requiredResult.properties },
+              ...Object.keys(optionalResult.properties).length > 0 && { optionalProperties: optionalResult.properties }
+            })
+          )
+        );
+      }
+    });
+  });
+}
+
+// src/commands/query/entry-points.ts
+import { Command as Command15 } from "commander";
 
 // src/commands/query/load-graph.ts
 import { readFile as readFile3 } from "node:fs/promises";
@@ -24230,7 +24263,7 @@ async function withGraph(graphPathOption, handler) {
 
 // src/commands/query/entry-points.ts
 function createEntryPointsCommand() {
-  return new Command14("entry-points").description("List entry points (APIs, UIs, EventHandlers with no incoming links)").addHelpText(
+  return new Command15("entry-points").description("List entry points (APIs, UIs, EventHandlers with no incoming links)").addHelpText(
     "after",
     `
 Examples:
@@ -24248,9 +24281,9 @@ Examples:
 }
 
 // src/commands/query/domains.ts
-import { Command as Command15 } from "commander";
+import { Command as Command16 } from "commander";
 function createDomainsCommand() {
-  return new Command15("domains").description("List domains with component counts").addHelpText(
+  return new Command16("domains").description("List domains with component counts").addHelpText(
     "after",
     `
 Examples:
@@ -24268,9 +24301,9 @@ Examples:
 }
 
 // src/commands/query/trace.ts
-import { Command as Command16 } from "commander";
+import { Command as Command17 } from "commander";
 function createTraceCommand() {
-  return new Command16("trace").description("Trace flow from a component (bidirectional)").addHelpText(
+  return new Command17("trace").description("Trace flow from a component (bidirectional)").addHelpText(
     "after",
     `
 Examples:
@@ -24304,9 +24337,9 @@ Examples:
 }
 
 // src/commands/query/orphans.ts
-import { Command as Command17 } from "commander";
+import { Command as Command18 } from "commander";
 function createOrphansCommand() {
-  return new Command17("orphans").description("Find orphan components with no links").addHelpText(
+  return new Command18("orphans").description("Find orphan components with no links").addHelpText(
     "after",
     `
 Examples:
@@ -24324,7 +24357,7 @@ Examples:
 }
 
 // src/commands/query/components.ts
-import { Command as Command18 } from "commander";
+import { Command as Command19 } from "commander";
 
 // src/commands/query/component-output.ts
 function toComponentOutput(component) {
@@ -24338,7 +24371,7 @@ function toComponentOutput(component) {
 
 // src/commands/query/components.ts
 function createComponentsCommand() {
-  return new Command18("components").description("List components with optional filtering").addHelpText(
+  return new Command19("components").description("List components with optional filtering").addHelpText(
     "after",
     `
 Examples:
@@ -24371,9 +24404,9 @@ Examples:
 }
 
 // src/commands/query/search.ts
-import { Command as Command19 } from "commander";
+import { Command as Command20 } from "commander";
 function createSearchCommand() {
-  return new Command19("search").description("Search components by name").addHelpText(
+  return new Command20("search").description("Search components by name").addHelpText(
     "after",
     `
 Examples:
@@ -24407,7 +24440,7 @@ function loadPackageJson() {
 }
 var packageJson = loadPackageJson();
 function createProgram() {
-  const program = new Command20();
+  const program = new Command21();
   program.name("riviere").version(packageJson.version);
   const builderCmd = program.command("builder").description("Commands for building a graph");
   builderCmd.addCommand(createAddComponentCommand());
@@ -24423,6 +24456,7 @@ function createProgram() {
   builderCmd.addCommand(createComponentSummaryCommand());
   builderCmd.addCommand(createComponentChecklistCommand());
   builderCmd.addCommand(createCheckConsistencyCommand());
+  builderCmd.addCommand(createDefineCustomTypeCommand());
   const queryCmd = program.command("query").description("Commands for querying a graph");
   queryCmd.addCommand(createEntryPointsCommand());
   queryCmd.addCommand(createDomainsCommand());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@living-architecture/riviere-cli",
-  "version": "0.2.4",
+  "version": "0.3.0",
   "publishConfig": {
     "access": "public"
   },
@@ -27,8 +27,8 @@
   "dependencies": {
     "commander": "^14.0.2",
     "tslib": "^2.3.0",
-    "@living-architecture/riviere-builder": "0.2.3",
-    "@living-architecture/riviere-query": "0.2.3",
-    "@living-architecture/riviere-schema": "0.2.1"
+    "@living-architecture/riviere-builder": "0.2.4",
+    "@living-architecture/riviere-schema": "0.2.2",
+    "@living-architecture/riviere-query": "0.2.4"
   }
 }