@living-architecture/riviere-extract-ts 0.2.0 → 0.2.2

package/dist/domain/value-extraction/enrich-components.d.ts

@@ -0,0 +1,27 @@
+import type { Project } from 'ts-morph';
+import type { ResolvedExtractionConfig } from '@living-architecture/riviere-extract-config';
+import type { DraftComponent, GlobMatcher } from '../component-extraction/extractor';
+type MetadataValue = string | number | boolean | string[];
+export interface EnrichedComponent {
+    type: string;
+    name: string;
+    location: {
+        file: string;
+        line: number;
+    };
+    domain: string;
+    metadata: Record<string, MetadataValue>;
+    _missing?: string[];
+}
+export interface EnrichmentFailure {
+    component: DraftComponent;
+    field: string;
+    error: string;
+}
+export interface EnrichmentResult {
+    components: EnrichedComponent[];
+    failures: EnrichmentFailure[];
+}
+export declare function enrichComponents(draftComponents: DraftComponent[], config: ResolvedExtractionConfig, project: Project, globMatcher: GlobMatcher, configDir: string): EnrichmentResult;
+export {};
+//# sourceMappingURL=enrich-components.d.ts.map

package/dist/domain/value-extraction/enrich-components.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"enrich-components.d.ts","sourceRoot":"","sources":["../../../src/domain/value-extraction/enrich-components.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACQ,OAAO,EAC1B,MAAM,UAAU,CAAA;AAEjB,OAAO,KAAK,EACV,wBAAwB,EAQzB,MAAM,6CAA6C,CAAA;AACpD,OAAO,KAAK,EACV,cAAc,EAAE,WAAW,EAC5B,MAAM,mCAAmC,CAAA;AAU1C,KAAK,aAAa,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,EAAE,CAAA;AAEzD,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,CAAA;QACZ,IAAI,EAAE,MAAM,CAAA;KACb,CAAA;IACD,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IACvC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;CACpB;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,cAAc,CAAA;IACzB,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,iBAAiB,EAAE,CAAA;IAC/B,QAAQ,EAAE,iBAAiB,EAAE,CAAA;CAC9B;AAuND,wBAAgB,gBAAgB,CAC9B,eAAe,EAAE,cAAc,EAAE,EACjC,MAAM,EAAE,wBAAwB,EAChC,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,MAAM,GAChB,gBAAgB,CAclB"}

package/dist/domain/value-extraction/enrich-components.js

@@ -0,0 +1,158 @@
+import { posix } from 'node:path';
+import { evaluateLiteralRule, evaluateFromClassNameRule, evaluateFromFilePathRule, evaluateFromPropertyRule, } from './evaluate-extraction-rule';
+import { ExtractionError } from '../../platform/domain/ast-literals/literal-detection';
+function findMatchingModule(filePath, modules, globMatcher, configDir) {
+    const normalized = filePath.replaceAll(/\\+/g, '/');
+    const pathToMatch = posix.relative(configDir.replaceAll(/\\+/g, '/'), normalized);
+    return modules.find((m) => globMatcher(pathToMatch, m.path));
+}
+function isDetectionRule(rule) {
+    /* istanbul ignore if -- @preserve: unreachable with typed ResolvedExtractionConfig; defensive guard */
+    if (typeof rule !== 'object' || rule === null) {
+        return false;
+    }
+    return 'find' in rule && 'where' in rule;
+}
+function getBuiltInRule(module, componentType) {
+    const ruleMap = {
+        api: module.api,
+        useCase: module.useCase,
+        domainOp: module.domainOp,
+        event: module.event,
+        eventHandler: module.eventHandler,
+        ui: module.ui,
+    };
+    const rule = ruleMap[componentType];
+    if (isDetectionRule(rule)) {
+        return rule;
+    }
+    return undefined;
+}
+function findDetectionRule(module, componentType) {
+    const builtInTypes = [
+        'api',
+        'useCase',
+        'domainOp',
+        'event',
+        'eventHandler',
+        'ui',
+    ];
+    if (builtInTypes.includes(componentType)) {
+        return getBuiltInRule(module, componentType);
+    }
+    return module.customTypes?.[componentType];
+}
+function isLiteralRule(rule) {
+    return 'literal' in rule;
+}
+function isFromClassNameRule(rule) {
+    return 'fromClassName' in rule;
+}
+function isFromFilePathRule(rule) {
+    return 'fromFilePath' in rule;
+}
+function isFromPropertyRule(rule) {
+    return 'fromProperty' in rule;
+}
+function findClassAtLine(project, draft) {
+    const sourceFile = project.getSourceFile(draft.location.file);
+    if (sourceFile === undefined) {
+        throw new ExtractionError(`Source file '${draft.location.file}' not found in project`, draft.location.file, draft.location.line);
+    }
+    const classDecl = sourceFile
+        .getClasses()
+        .find((c) => c.getStartLineNumber() === draft.location.line);
+    if (classDecl === undefined) {
+        throw new ExtractionError(`No class declaration found at line ${draft.location.line}`, draft.location.file, draft.location.line);
+    }
+    return classDecl;
+}
+function evaluateClassRule(rule, classDecl) {
+    if (isFromClassNameRule(rule)) {
+        return evaluateFromClassNameRule(rule, classDecl);
+    }
+    /* istanbul ignore next -- @preserve: only fromProperty reaches here; defensive guard */
+    if (!isFromPropertyRule(rule)) {
+        throw new ExtractionError('Unsupported extraction rule type for class-based component', classDecl.getSourceFile().getFilePath(), classDecl.getStartLineNumber());
+    }
+    return evaluateFromPropertyRule(rule, classDecl);
+}
+function evaluateRule(rule, draft, project) {
+    if (isLiteralRule(rule)) {
+        return evaluateLiteralRule(rule);
+    }
+    if (isFromFilePathRule(rule)) {
+        return evaluateFromFilePathRule(rule, draft.location.file);
+    }
+    const classDecl = findClassAtLine(project, draft);
+    return evaluateClassRule(rule, classDecl);
+}
+function componentWithEmptyMetadata(draft) {
+    return {
+        enriched: {
+            ...draft,
+            metadata: {},
+        },
+        failures: [],
+    };
+}
+function extractMetadataFields(extractBlock, draft, project) {
+    const metadata = {};
+    const missing = [];
+    const failures = [];
+    for (const [fieldName, extractionRule] of Object.entries(extractBlock)) {
+        try {
+            metadata[fieldName] = evaluateRule(extractionRule, draft, project).value;
+        }
+        catch (error) {
+            /* istanbul ignore next -- @preserve: catch always receives Error instances from ExtractionError */
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            failures.push({
+                component: draft,
+                field: fieldName,
+                error: errorMessage,
+            });
+            missing.push(fieldName);
+        }
+    }
+    return {
+        metadata,
+        missing,
+        failures,
+    };
+}
+function enrichSingleComponent(draft, config, project, globMatcher, configDir) {
+    const module = findMatchingModule(draft.location.file, config.modules, globMatcher, configDir);
+    if (module === undefined) {
+        return componentWithEmptyMetadata(draft);
+    }
+    const detectionRule = findDetectionRule(module, draft.type);
+    if (detectionRule?.extract === undefined) {
+        return componentWithEmptyMetadata(draft);
+    }
+    const extracted = extractMetadataFields(detectionRule.extract, draft, project);
+    const enriched = {
+        ...draft,
+        metadata: extracted.metadata,
+    };
+    if (extracted.missing.length > 0) {
+        enriched._missing = extracted.missing;
+    }
+    return {
+        enriched,
+        failures: extracted.failures,
+    };
+}
+export function enrichComponents(draftComponents, config, project, globMatcher, configDir) {
+    const allComponents = [];
+    const allFailures = [];
+    for (const draft of draftComponents) {
+        const result = enrichSingleComponent(draft, config, project, globMatcher, configDir);
+        allComponents.push(result.enriched);
+        allFailures.push(...result.failures);
+    }
+    return {
+        components: allComponents,
+        failures: allFailures,
+    };
+}

package/dist/domain/value-extraction/evaluate-extraction-rule-generic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"evaluate-extraction-rule-generic.d.ts","sourceRoot":"","sources":["../../../src/domain/value-extraction/evaluate-extraction-rule-generic.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAA;AAC/F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAKhD,KAAK,uBAAuB,GAAG;IAAE,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CAAA;AA+BlD,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,4BAA4B,EAClC,SAAS,EAAE,gBAAgB,GAC1B,uBAAuB,CAqDzB"}
+{"version":3,"file":"evaluate-extraction-rule-generic.d.ts","sourceRoot":"","sources":["../../../src/domain/value-extraction/evaluate-extraction-rule-generic.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAA;AAC/F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAKhD,KAAK,uBAAuB,GAAG;IAAE,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CAAA;AAmClD,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,4BAA4B,EAClC,SAAS,EAAE,gBAAgB,GAC1B,uBAAuB,CAqDzB"}

package/dist/domain/value-extraction/evaluate-extraction-rule-generic.js

@@ -9,11 +9,15 @@ function getInterfaceTypeArgs(classDecl, interfaceName) {
             return impl.getTypeArguments();
         }
     }
-    const baseClass = classDecl.getBaseClass();
-    if (baseClass !== undefined) {
-        return getInterfaceTypeArgs(baseClass, interfaceName);
+    const extendsClause = classDecl.getExtends();
+    if (extendsClause === undefined) {
+        return undefined;
     }
-    return undefined;
+    const baseClass = classDecl.getBaseClass();
+    /* v8 ignore next -- @preserve: getExtends() !== undefined guarantees getBaseClass() returns a value */
+    if (baseClass === undefined)
+        return undefined;
+    return getInterfaceTypeArgs(baseClass, interfaceName);
 }
 function extractTypeNames(typeNode) {
     if (typeNode.getKind() === SyntaxKind.UnionType) {

package/dist/domain/value-extraction/evaluate-extraction-rule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"evaluate-extraction-rule.d.ts","sourceRoot":"","sources":["../../../src/domain/value-extraction/evaluate-extraction-rule.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACrB,2BAA2B,EAC3B,4BAA4B,EAC5B,0BAA0B,EAC1B,0BAA0B,EAC1B,8BAA8B,EAC9B,+BAA+B,EAChC,MAAM,6CAA6C,CAAA;AAEpD,OAAO,EACL,+BAA+B,EAC/B,iCAAiC,EACjC,6BAA6B,EAC7B,KAAK,aAAa,EAClB,KAAK,eAAe,GACrB,MAAM,mCAAmC,CAAA;AAE1C,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAA;AAC/E,OAAO,KAAK,EACV,gBAAgB,EAAE,iBAAiB,EAAE,SAAS,EAC/C,MAAM,UAAU,CAAA;AAQjB,MAAM,MAAM,iBAAiB,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAA;AAEpD,KAAK,eAAe,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,EAAE,CAAA;AAE3D,MAAM,MAAM,gBAAgB,GAAG;IAAE,KAAK,EAAE,eAAe,CAAA;CAAE,CAAA;AAMzD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,qBAAqB,GAAG,gBAAgB,CAEjF;AAED,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,2BAA2B,EACjC,SAAS,EAAE,gBAAgB,GAC1B,gBAAgB,CAalB;AAED,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,4BAA4B,EAClC,UAAU,EAAE,iBAAiB,GAC5B,gBAAgB,CAalB;AAED,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,0BAA0B,EAChC,QAAQ,EAAE,MAAM,GACf,gBAAgB,CA6BlB;AAkCD,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,0BAA0B,EAChC,SAAS,EAAE,gBAAgB,GAC1B,gBAAgB,CAgClB;AA8GD,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,8BAA8B,EACpC,SAAS,EAAE,SAAS,GACnB,gBAAgB,CAelB;AAED,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,+BAA+B,EACrC,SAAS,EAAE,SAAS,GACnB,gBAAgB,CAkBlB"}
+{"version":3,"file":"evaluate-extraction-rule.d.ts","sourceRoot":"","sources":["../../../src/domain/value-extraction/evaluate-extraction-rule.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACrB,2BAA2B,EAC3B,4BAA4B,EAC5B,0BAA0B,EAC1B,0BAA0B,EAC1B,8BAA8B,EAC9B,+BAA+B,EAChC,MAAM,6CAA6C,CAAA;AAEpD,OAAO,EACL,+BAA+B,EAC/B,iCAAiC,EACjC,6BAA6B,EAC7B,KAAK,aAAa,EAClB,KAAK,eAAe,GACrB,MAAM,mCAAmC,CAAA;AAE1C,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAA;AAC/E,OAAO,KAAK,EACV,gBAAgB,EAAE,iBAAiB,EAAE,SAAS,EAC/C,MAAM,UAAU,CAAA;AAQjB,MAAM,MAAM,iBAAiB,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAA;AAEpD,KAAK,eAAe,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,EAAE,CAAA;AAE3D,MAAM,MAAM,gBAAgB,GAAG;IAAE,KAAK,EAAE,eAAe,CAAA;CAAE,CAAA;AAMzD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,qBAAqB,GAAG,gBAAgB,CAEjF;AAED,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,2BAA2B,EACjC,SAAS,EAAE,gBAAgB,GAC1B,gBAAgB,CAalB;AAED,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,4BAA4B,EAClC,UAAU,EAAE,iBAAiB,GAC5B,gBAAgB,CAalB;AAED,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,0BAA0B,EAChC,QAAQ,EAAE,MAAM,GACf,gBAAgB,CA6BlB;AAqCD,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,0BAA0B,EAChC,SAAS,EAAE,gBAAgB,GAC1B,gBAAgB,CAgClB;AA8GD,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,8BAA8B,EACpC,SAAS,EAAE,SAAS,GACnB,gBAAgB,CAelB;AAED,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,+BAA+B,EACrC,SAAS,EAAE,SAAS,GACnB,gBAAgB,CAkBlB"}

package/dist/domain/value-extraction/evaluate-extraction-rule.js

@@ -58,10 +58,13 @@ function findPropertyInHierarchy(classDecl, propertyName, isStatic) {
             line: property.getStartLineNumber(),
         };
     }
-    const baseClass = classDecl.getBaseClass();
-    if (baseClass === undefined) {
+    if (classDecl.getExtends() === undefined) {
         return undefined;
     }
+    const baseClass = classDecl.getBaseClass();
+    /* v8 ignore next -- @preserve: getExtends() !== undefined guarantees getBaseClass() returns a value */
+    if (baseClass === undefined)
+        return undefined;
     return findPropertyInHierarchy(baseClass, propertyName, isStatic);
 }
 export function evaluateFromPropertyRule(rule, classDecl) {

package/dist/shell/index.d.ts

@@ -4,4 +4,5 @@ export { resolveConfig, type ConfigLoader } from '../domain/config-resolution/re
 export { ConfigLoaderRequiredError, MissingComponentRuleError, } from '../domain/config-resolution/config-resolution-errors';
 export { evaluateLiteralRule, evaluateFromClassNameRule, evaluateFromMethodNameRule, evaluateFromFilePathRule, evaluateFromPropertyRule, evaluateFromDecoratorArgRule, evaluateFromDecoratorNameRule, evaluateFromGenericArgRule, evaluateFromMethodSignatureRule, evaluateFromConstructorParamsRule, evaluateFromParameterTypeRule, applyTransforms, ExtractionError, type ExtractionContext, type ExtractionResult, type ParameterInfo, type MethodSignature, } from '../domain/value-extraction';
 export { matchesGlob } from '../platform/infra/glob-matching/minimatch-glob';
+export { enrichComponents, type EnrichedComponent, type EnrichmentFailure, type EnrichmentResult, } from '../domain/value-extraction/enrich-components';
 //# sourceMappingURL=index.d.ts.map

package/dist/shell/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/shell/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,KAAK,cAAc,EACnB,KAAK,WAAW,GACjB,MAAM,0CAA0C,CAAA;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mDAAmD,CAAA;AACrF,OAAO,EACL,aAAa,EAAE,KAAK,YAAY,EACjC,MAAM,4CAA4C,CAAA;AACnD,OAAO,EACL,yBAAyB,EACzB,yBAAyB,GAC1B,MAAM,sDAAsD,CAAA;AAC7D,OAAO,EACL,mBAAmB,EACnB,yBAAyB,EACzB,0BAA0B,EAC1B,wBAAwB,EACxB,wBAAwB,EACxB,4BAA4B,EAC5B,6BAA6B,EAC7B,0BAA0B,EAC1B,+BAA+B,EAC/B,iCAAiC,EACjC,6BAA6B,EAC7B,eAAe,EACf,eAAe,EACf,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACrB,KAAK,aAAa,EAClB,KAAK,eAAe,GACrB,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,gDAAgD,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/shell/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,KAAK,cAAc,EACnB,KAAK,WAAW,GACjB,MAAM,0CAA0C,CAAA;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mDAAmD,CAAA;AACrF,OAAO,EACL,aAAa,EAAE,KAAK,YAAY,EACjC,MAAM,4CAA4C,CAAA;AACnD,OAAO,EACL,yBAAyB,EACzB,yBAAyB,GAC1B,MAAM,sDAAsD,CAAA;AAC7D,OAAO,EACL,mBAAmB,EACnB,yBAAyB,EACzB,0BAA0B,EAC1B,wBAAwB,EACxB,wBAAwB,EACxB,4BAA4B,EAC5B,6BAA6B,EAC7B,0BAA0B,EAC1B,+BAA+B,EAC/B,iCAAiC,EACjC,6BAA6B,EAC7B,eAAe,EACf,eAAe,EACf,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACrB,KAAK,aAAa,EAClB,KAAK,eAAe,GACrB,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,gDAAgD,CAAA;AAC5E,OAAO,EACL,gBAAgB,EAChB,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,GACtB,MAAM,8CAA8C,CAAA"}

package/dist/shell/index.js

@@ -4,3 +4,4 @@ export { resolveConfig } from '../domain/config-resolution/resolve-config';
 export { ConfigLoaderRequiredError, MissingComponentRuleError, } from '../domain/config-resolution/config-resolution-errors';
 export { evaluateLiteralRule, evaluateFromClassNameRule, evaluateFromMethodNameRule, evaluateFromFilePathRule, evaluateFromPropertyRule, evaluateFromDecoratorArgRule, evaluateFromDecoratorNameRule, evaluateFromGenericArgRule, evaluateFromMethodSignatureRule, evaluateFromConstructorParamsRule, evaluateFromParameterTypeRule, applyTransforms, ExtractionError, } from '../domain/value-extraction';
 export { matchesGlob } from '../platform/infra/glob-matching/minimatch-glob';
+export { enrichComponents, } from '../domain/value-extraction/enrich-components';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@living-architecture/riviere-extract-ts",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -24,6 +24,6 @@
   "dependencies": {
     "minimatch": "^10.0.1",
     "ts-morph": "^24.0.0",
-    "@living-architecture/riviere-extract-config": "0.4.0"
+    "@living-architecture/riviere-extract-config": "0.4.1"
   }
 }