@living-architecture/riviere-cli 0.7.15 → 0.7.17

package/dist/bin.js

@@ -25312,6 +25312,13 @@ var extraction_config_schema_default = {
         ui: {
           $ref: "#/$defs/componentRule",
           description: "Detection rule for UI components"
+        },
+        customTypes: {
+          type: "object",
+          description: "User-defined component types with their detection rules",
+          additionalProperties: {
+            $ref: "#/$defs/detectionRule"
+          }
         }
       },
       if: {
@@ -27349,24 +27356,35 @@ function extractFromFile(project, filePath, config2, configDir) {
   return extractFromModule(sourceFile, filePath, matchingModule);
 }
 function extractFromModule(sourceFile, filePath, module) {
-  return COMPONENT_TYPES.flatMap((componentType) => extractComponentType(sourceFile, filePath, module, componentType));
+  const builtInComponents = COMPONENT_TYPES.flatMap((componentType) => extractComponentType(sourceFile, filePath, module, componentType));
+  const customComponents = extractCustomTypes(sourceFile, filePath, module);
+  return [...builtInComponents, ...customComponents];
 }
-function extractComponentType(sourceFile, filePath, module, componentType) {
-  const rule = module[componentType];
-  if (!isDetectionRule(rule)) {
+function extractCustomTypes(sourceFile, filePath, module) {
+  if (module.customTypes === void 0) {
     return [];
   }
+  return Object.entries(module.customTypes).flatMap(([typeName, rule]) => extractWithRule(sourceFile, filePath, module.name, typeName, rule));
+}
+function extractWithRule(sourceFile, filePath, domain2, componentType, rule) {
   if (rule.find === "classes") {
-    return extractClasses(sourceFile, filePath, module.name, componentType, rule);
+    return extractClasses(sourceFile, filePath, domain2, componentType, rule);
   }
   if (rule.find === "methods") {
-    return extractMethods(sourceFile, filePath, module.name, componentType, rule);
+    return extractMethods(sourceFile, filePath, domain2, componentType, rule);
   }
   if (rule.find === "functions") {
-    return extractFunctions(sourceFile, filePath, module.name, componentType, rule);
+    return extractFunctions(sourceFile, filePath, domain2, componentType, rule);
   }
   return [];
 }
+function extractComponentType(sourceFile, filePath, module, componentType) {
+  const rule = module[componentType];
+  if (!isDetectionRule(rule)) {
+    return [];
+  }
+  return extractWithRule(sourceFile, filePath, module.name, componentType, rule);
+}
 function extractClasses(sourceFile, filePath, domain2, componentType, rule) {
   return sourceFile.getClasses().filter((c) => evaluatePredicate(c, rule.where)).flatMap((c) => createClassComponent(c, filePath, domain2, componentType));
 }

package/dist/index.js

@@ -25329,6 +25329,13 @@ var extraction_config_schema_default = {
         ui: {
           $ref: "#/$defs/componentRule",
           description: "Detection rule for UI components"
+        },
+        customTypes: {
+          type: "object",
+          description: "User-defined component types with their detection rules",
+          additionalProperties: {
+            $ref: "#/$defs/detectionRule"
+          }
         }
       },
       if: {
@@ -27366,24 +27373,35 @@ function extractFromFile(project, filePath, config2, configDir) {
   return extractFromModule(sourceFile, filePath, matchingModule);
 }
 function extractFromModule(sourceFile, filePath, module) {
-  return COMPONENT_TYPES.flatMap((componentType) => extractComponentType(sourceFile, filePath, module, componentType));
+  const builtInComponents = COMPONENT_TYPES.flatMap((componentType) => extractComponentType(sourceFile, filePath, module, componentType));
+  const customComponents = extractCustomTypes(sourceFile, filePath, module);
+  return [...builtInComponents, ...customComponents];
 }
-function extractComponentType(sourceFile, filePath, module, componentType) {
-  const rule = module[componentType];
-  if (!isDetectionRule(rule)) {
+function extractCustomTypes(sourceFile, filePath, module) {
+  if (module.customTypes === void 0) {
     return [];
   }
+  return Object.entries(module.customTypes).flatMap(([typeName, rule]) => extractWithRule(sourceFile, filePath, module.name, typeName, rule));
+}
+function extractWithRule(sourceFile, filePath, domain2, componentType, rule) {
   if (rule.find === "classes") {
-    return extractClasses(sourceFile, filePath, module.name, componentType, rule);
+    return extractClasses(sourceFile, filePath, domain2, componentType, rule);
   }
   if (rule.find === "methods") {
-    return extractMethods(sourceFile, filePath, module.name, componentType, rule);
+    return extractMethods(sourceFile, filePath, domain2, componentType, rule);
   }
   if (rule.find === "functions") {
-    return extractFunctions(sourceFile, filePath, module.name, componentType, rule);
+    return extractFunctions(sourceFile, filePath, domain2, componentType, rule);
   }
   return [];
 }
+function extractComponentType(sourceFile, filePath, module, componentType) {
+  const rule = module[componentType];
+  if (!isDetectionRule(rule)) {
+    return [];
+  }
+  return extractWithRule(sourceFile, filePath, module.name, componentType, rule);
+}
 function extractClasses(sourceFile, filePath, domain2, componentType, rule) {
   return sourceFile.getClasses().filter((c) => evaluatePredicate(c, rule.where)).flatMap((c) => createClassComponent(c, filePath, domain2, componentType));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@living-architecture/riviere-cli",
-  "version": "0.7.15",
+  "version": "0.7.17",
   "publishConfig": {
     "access": "public"
   },
@@ -33,9 +33,9 @@
     "ts-morph": "^24.0.0",
     "yaml": "^2.7.0",
     "@living-architecture/riviere-builder": "0.5.20",
+    "@living-architecture/riviere-extract-ts": "0.1.20",
     "@living-architecture/riviere-query": "0.4.20",
     "@living-architecture/riviere-schema": "0.4.20",
-    "@living-architecture/riviere-extract-config": "0.1.21",
-    "@living-architecture/riviere-extract-ts": "0.1.18"
+    "@living-architecture/riviere-extract-config": "0.2.0"
   }
 }