@living-architecture/riviere-cli 0.8.2 → 0.8.3

package/dist/bin.js

@@ -26270,6 +26270,63 @@ function extractLiteralValue(expression, file2, line) {
 
 // ../riviere-extract-ts/dist/domain/value-extraction/evaluate-extraction-rule-generic.js
 import { SyntaxKind as SyntaxKind2 } from "ts-morph";
+function getInterfaceTypeArgs(classDecl, interfaceName) {
+  const implementsClause = classDecl.getImplements();
+  for (const impl of implementsClause) {
+    const expression = impl.getExpression();
+    if (expression.getText() === interfaceName) {
+      return impl.getTypeArguments();
+    }
+  }
+  const extendsClause = classDecl.getExtends();
+  if (extendsClause === void 0) {
+    return void 0;
+  }
+  const baseClass = classDecl.getBaseClass();
+  if (baseClass === void 0)
+    return void 0;
+  return getInterfaceTypeArgs(baseClass, interfaceName);
+}
+function extractTypeNames(typeNode) {
+  if (typeNode.getKind() === SyntaxKind2.UnionType) {
+    const unionType = typeNode.asKindOrThrow(SyntaxKind2.UnionType);
+    return unionType.getTypeNodes().map((t) => t.getText());
+  }
+  return [typeNode.getText()];
+}
+function evaluateFromGenericArgRule(rule, classDecl) {
+  const { interface: interfaceName, position, transform: transform2 } = rule.fromGenericArg;
+  const sourceFile = classDecl.getSourceFile();
+  const location = {
+    filePath: sourceFile.getFilePath(),
+    line: classDecl.getStartLineNumber()
+  };
+  const typeArgs = getInterfaceTypeArgs(classDecl, interfaceName);
+  if (typeArgs === void 0) {
+    throw new ExtractionError(`Class '${classDecl.getName() ?? "anonymous"}' does not implement interface '${interfaceName}'`, location.filePath, location.line);
+  }
+  const typeArg = typeArgs[position];
+  if (typeArg === void 0) {
+    throw new ExtractionError(`Position ${position} out of bounds. Interface has ${typeArgs.length} type argument(s)`, location.filePath, location.line);
+  }
+  if (typeArg.getKind() === SyntaxKind2.TypeReference) {
+    const typeRef = typeArg.asKindOrThrow(SyntaxKind2.TypeReference);
+    const typeName = typeRef.getTypeName();
+    if (typeName.getKind() === SyntaxKind2.Identifier) {
+      const classTypeParams = classDecl.getTypeParameters();
+      const paramName = typeName.getText();
+      const isTypeParam = classTypeParams.some((p) => p.getName() === paramName);
+      if (isTypeParam) {
+        throw new ExtractionError(`Generic argument at position ${position} is type parameter '${paramName}', expected concrete type`, location.filePath, location.line);
+      }
+    }
+  }
+  const typeNames = extractTypeNames(typeArg);
+  if (transform2 === void 0) {
+    return { value: typeNames };
+  }
+  return { value: typeNames.map((name) => applyTransforms(name, transform2)) };
+}
 
 // ../riviere-extract-ts/dist/domain/value-extraction/evaluate-extraction-rule.js
 import { SyntaxKind as SyntaxKind3 } from "ts-morph";
@@ -26290,6 +26347,17 @@ function evaluateFromClassNameRule(rule, classDecl) {
   }
   return { value: applyTransforms(className, transform2) };
 }
+function evaluateFromMethodNameRule(rule, methodDecl) {
+  const methodName = methodDecl.getName();
+  if (rule.fromMethodName === true) {
+    return { value: methodName };
+  }
+  const transform2 = rule.fromMethodName.transform;
+  if (transform2 === void 0) {
+    return { value: methodName };
+  }
+  return { value: applyTransforms(methodName, transform2) };
+}
 function evaluateFromFilePathRule(rule, filePath) {
   const { pattern, capture, transform: transform2 } = rule.fromFilePath;
   const regex = new RegExp(pattern);
@@ -27954,6 +28022,12 @@ function isFromFilePathRule(rule) {
 function isFromPropertyRule(rule) {
   return "fromProperty" in rule;
 }
+function isFromMethodNameRule(rule) {
+  return "fromMethodName" in rule;
+}
+function isFromGenericArgRule(rule) {
+  return "fromGenericArg" in rule;
+}
 function findClassAtLine(project, draft) {
   const sourceFile = project.getSourceFile(draft.location.file);
   if (sourceFile === void 0) {
@@ -27965,6 +28039,34 @@ function findClassAtLine(project, draft) {
   }
   return classDecl;
 }
+function findMethodAtLine(project, draft) {
+  const sourceFile = project.getSourceFile(draft.location.file);
+  if (sourceFile === void 0) {
+    throw new ExtractionError(`Source file '${draft.location.file}' not found in project`, draft.location.file, draft.location.line);
+  }
+  for (const classDecl of sourceFile.getClasses()) {
+    const method = classDecl.getMethods().find((m) => m.getStartLineNumber() === draft.location.line);
+    if (method !== void 0) {
+      return method;
+    }
+  }
+  throw new ExtractionError(`No method declaration found at line ${draft.location.line}`, draft.location.file, draft.location.line);
+}
+function findContainingClass(project, draft) {
+  const sourceFile = project.getSourceFile(draft.location.file);
+  if (sourceFile === void 0) {
+    throw new ExtractionError(`Source file '${draft.location.file}' not found in project`, draft.location.file, draft.location.line);
+  }
+  const methodLine = draft.location.line;
+  for (const classDecl of sourceFile.getClasses()) {
+    const classStart = classDecl.getStartLineNumber();
+    const classEnd = classDecl.getEndLineNumber();
+    if (methodLine >= classStart && methodLine <= classEnd) {
+      return classDecl;
+    }
+  }
+  throw new ExtractionError(`No containing class found for method at line ${methodLine}`, draft.location.file, draft.location.line);
+}
 function evaluateClassRule(rule, classDecl) {
   if (isFromClassNameRule(rule)) {
     return evaluateFromClassNameRule(rule, classDecl);
@@ -27981,6 +28083,14 @@ function evaluateRule(rule, draft, project) {
   if (isFromFilePathRule(rule)) {
     return evaluateFromFilePathRule(rule, draft.location.file);
   }
+  if (isFromMethodNameRule(rule)) {
+    const methodDecl = findMethodAtLine(project, draft);
+    return evaluateFromMethodNameRule(rule, methodDecl);
+  }
+  if (isFromGenericArgRule(rule)) {
+    const classDecl2 = findContainingClass(project, draft);
+    return evaluateFromGenericArgRule(rule, classDecl2);
+  }
   const classDecl = findClassAtLine(project, draft);
   return evaluateClassRule(rule, classDecl);
 }
@@ -28660,7 +28770,7 @@ function parsePackageJson(pkg) {
 }
 function loadPackageJson() {
   if (true) {
-    return { version: "0.8.1" };
+    return { version: "0.8.2" };
   }
   const require2 = createRequire2(import.meta.url);
   return parsePackageJson(require2("../../package.json"));

package/dist/index.js

@@ -26295,6 +26295,63 @@ function extractLiteralValue(expression, file2, line) {
 
 // ../riviere-extract-ts/dist/domain/value-extraction/evaluate-extraction-rule-generic.js
 import { SyntaxKind as SyntaxKind2 } from "ts-morph";
+function getInterfaceTypeArgs(classDecl, interfaceName) {
+  const implementsClause = classDecl.getImplements();
+  for (const impl of implementsClause) {
+    const expression = impl.getExpression();
+    if (expression.getText() === interfaceName) {
+      return impl.getTypeArguments();
+    }
+  }
+  const extendsClause = classDecl.getExtends();
+  if (extendsClause === void 0) {
+    return void 0;
+  }
+  const baseClass = classDecl.getBaseClass();
+  if (baseClass === void 0)
+    return void 0;
+  return getInterfaceTypeArgs(baseClass, interfaceName);
+}
+function extractTypeNames(typeNode) {
+  if (typeNode.getKind() === SyntaxKind2.UnionType) {
+    const unionType = typeNode.asKindOrThrow(SyntaxKind2.UnionType);
+    return unionType.getTypeNodes().map((t) => t.getText());
+  }
+  return [typeNode.getText()];
+}
+function evaluateFromGenericArgRule(rule, classDecl) {
+  const { interface: interfaceName, position, transform: transform2 } = rule.fromGenericArg;
+  const sourceFile = classDecl.getSourceFile();
+  const location = {
+    filePath: sourceFile.getFilePath(),
+    line: classDecl.getStartLineNumber()
+  };
+  const typeArgs = getInterfaceTypeArgs(classDecl, interfaceName);
+  if (typeArgs === void 0) {
+    throw new ExtractionError(`Class '${classDecl.getName() ?? "anonymous"}' does not implement interface '${interfaceName}'`, location.filePath, location.line);
+  }
+  const typeArg = typeArgs[position];
+  if (typeArg === void 0) {
+    throw new ExtractionError(`Position ${position} out of bounds. Interface has ${typeArgs.length} type argument(s)`, location.filePath, location.line);
+  }
+  if (typeArg.getKind() === SyntaxKind2.TypeReference) {
+    const typeRef = typeArg.asKindOrThrow(SyntaxKind2.TypeReference);
+    const typeName = typeRef.getTypeName();
+    if (typeName.getKind() === SyntaxKind2.Identifier) {
+      const classTypeParams = classDecl.getTypeParameters();
+      const paramName = typeName.getText();
+      const isTypeParam = classTypeParams.some((p) => p.getName() === paramName);
+      if (isTypeParam) {
+        throw new ExtractionError(`Generic argument at position ${position} is type parameter '${paramName}', expected concrete type`, location.filePath, location.line);
+      }
+    }
+  }
+  const typeNames = extractTypeNames(typeArg);
+  if (transform2 === void 0) {
+    return { value: typeNames };
+  }
+  return { value: typeNames.map((name) => applyTransforms(name, transform2)) };
+}
 
 // ../riviere-extract-ts/dist/domain/value-extraction/evaluate-extraction-rule.js
 import { SyntaxKind as SyntaxKind3 } from "ts-morph";
@@ -26315,6 +26372,17 @@ function evaluateFromClassNameRule(rule, classDecl) {
   }
   return { value: applyTransforms(className, transform2) };
 }
+function evaluateFromMethodNameRule(rule, methodDecl) {
+  const methodName = methodDecl.getName();
+  if (rule.fromMethodName === true) {
+    return { value: methodName };
+  }
+  const transform2 = rule.fromMethodName.transform;
+  if (transform2 === void 0) {
+    return { value: methodName };
+  }
+  return { value: applyTransforms(methodName, transform2) };
+}
 function evaluateFromFilePathRule(rule, filePath) {
   const { pattern, capture, transform: transform2 } = rule.fromFilePath;
   const regex = new RegExp(pattern);
@@ -27979,6 +28047,12 @@ function isFromFilePathRule(rule) {
 function isFromPropertyRule(rule) {
   return "fromProperty" in rule;
 }
+function isFromMethodNameRule(rule) {
+  return "fromMethodName" in rule;
+}
+function isFromGenericArgRule(rule) {
+  return "fromGenericArg" in rule;
+}
 function findClassAtLine(project, draft) {
   const sourceFile = project.getSourceFile(draft.location.file);
   if (sourceFile === void 0) {
@@ -27990,6 +28064,34 @@ function findClassAtLine(project, draft) {
   }
   return classDecl;
 }
+function findMethodAtLine(project, draft) {
+  const sourceFile = project.getSourceFile(draft.location.file);
+  if (sourceFile === void 0) {
+    throw new ExtractionError(`Source file '${draft.location.file}' not found in project`, draft.location.file, draft.location.line);
+  }
+  for (const classDecl of sourceFile.getClasses()) {
+    const method = classDecl.getMethods().find((m) => m.getStartLineNumber() === draft.location.line);
+    if (method !== void 0) {
+      return method;
+    }
+  }
+  throw new ExtractionError(`No method declaration found at line ${draft.location.line}`, draft.location.file, draft.location.line);
+}
+function findContainingClass(project, draft) {
+  const sourceFile = project.getSourceFile(draft.location.file);
+  if (sourceFile === void 0) {
+    throw new ExtractionError(`Source file '${draft.location.file}' not found in project`, draft.location.file, draft.location.line);
+  }
+  const methodLine = draft.location.line;
+  for (const classDecl of sourceFile.getClasses()) {
+    const classStart = classDecl.getStartLineNumber();
+    const classEnd = classDecl.getEndLineNumber();
+    if (methodLine >= classStart && methodLine <= classEnd) {
+      return classDecl;
+    }
+  }
+  throw new ExtractionError(`No containing class found for method at line ${methodLine}`, draft.location.file, draft.location.line);
+}
 function evaluateClassRule(rule, classDecl) {
   if (isFromClassNameRule(rule)) {
     return evaluateFromClassNameRule(rule, classDecl);
@@ -28006,6 +28108,14 @@ function evaluateRule(rule, draft, project) {
   if (isFromFilePathRule(rule)) {
     return evaluateFromFilePathRule(rule, draft.location.file);
   }
+  if (isFromMethodNameRule(rule)) {
+    const methodDecl = findMethodAtLine(project, draft);
+    return evaluateFromMethodNameRule(rule, methodDecl);
+  }
+  if (isFromGenericArgRule(rule)) {
+    const classDecl2 = findContainingClass(project, draft);
+    return evaluateFromGenericArgRule(rule, classDecl2);
+  }
   const classDecl = findClassAtLine(project, draft);
   return evaluateClassRule(rule, classDecl);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@living-architecture/riviere-cli",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "publishConfig": {
     "access": "public"
   },
@@ -33,8 +33,8 @@
     "ts-morph": "^24.0.0",
     "yaml": "^2.7.0",
     "@living-architecture/riviere-builder": "0.6.1",
-    "@living-architecture/riviere-extract-ts": "0.2.2",
     "@living-architecture/riviere-extract-config": "0.4.1",
+    "@living-architecture/riviere-extract-ts": "0.2.3",
     "@living-architecture/riviere-query": "0.5.1",
     "@living-architecture/riviere-schema": "0.5.1"
   }