@living-architecture/riviere-extract-ts 0.2.9 → 0.2.10

package/README.md

@@ -23,7 +23,9 @@ import type { ExtractionConfig } from '@living-architecture/riviere-extract-conf
 const config: ExtractionConfig = {
   modules: [
     {
-      path: 'src/**/*.ts',
+      name: 'users',
+      path: '.',
+      glob: 'src/**/*.ts',
       api: {
         find: 'methods',
         where: { hasDecorator: { name: 'Get' } },

package/dist/features/extraction/domain/component-extraction/extractor.js

@@ -131,9 +131,9 @@ function createFunctionComponent(func, filePath, domain, componentType) {
 function findMatchingModule(filePath, modules, globMatcher, configDir) {
     const normalized = filePath.replaceAll(/\\+/g, '/');
     if (configDir === undefined) {
-        return modules.find((m) => globMatcher(normalized, m.path));
+        return modules.find((m) => globMatcher(normalized, posix.join(m.path, m.glob)));
     }
     const normalizedConfigDir = configDir.replaceAll(/\\+/g, '/');
     const pathToMatch = posix.relative(normalizedConfigDir, normalized);
-    return modules.find((m) => globMatcher(pathToMatch, m.path));
+    return modules.find((m) => globMatcher(pathToMatch, posix.join(m.path, m.glob)));
 }

package/dist/features/extraction/domain/config-resolution/resolve-config.js

@@ -13,6 +13,7 @@ function resolveModule(moduleConfig, loader) {
     return {
         name: moduleConfig.name,
         path: moduleConfig.path,
+        glob: moduleConfig.glob,
         api: requireRule(moduleConfig.api, 'api', moduleConfig.name),
         useCase: requireRule(moduleConfig.useCase, 'useCase', moduleConfig.name),
         domainOp: requireRule(moduleConfig.domainOp, 'domainOp', moduleConfig.name),
@@ -32,6 +33,7 @@ function resolveModuleWithExtends(moduleConfig, extendsSource, loader) {
     return {
         name: moduleConfig.name,
         path: moduleConfig.path,
+        glob: moduleConfig.glob,
         api: moduleConfig.api ?? baseModule.api,
         useCase: moduleConfig.useCase ?? baseModule.useCase,
         domainOp: moduleConfig.domainOp ?? baseModule.domainOp,

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

@@ -6,7 +6,7 @@ import { applyTransforms } from '../../../../platform/domain/string-transforms/t
 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));
+    return modules.find((m) => globMatcher(pathToMatch, posix.join(m.path, m.glob)));
 }
 function getBuiltInRule(module, componentType) {
     const ruleMap = {

package/dist/test-fixtures.d.ts

@@ -1,6 +1,6 @@
 import type { ResolvedExtractionConfig, DetectionRule, CustomTypes, ComponentType } from '@living-architecture/riviere-extract-config';
 export declare function createResolvedConfig(): ResolvedExtractionConfig;
-export declare function createConfigWithCustomTypes(moduleName: string, modulePath: string, customTypes: CustomTypes): ResolvedExtractionConfig;
-export declare function createConfigWithRule(moduleName: string, modulePath: string, componentType: ComponentType, rule: DetectionRule): ResolvedExtractionConfig;
-export declare function createOrdersUseCaseConfig(modulePath?: string): ResolvedExtractionConfig;
+export declare function createConfigWithCustomTypes(moduleName: string, modulePath: string, customTypes: CustomTypes, moduleGlob?: string): ResolvedExtractionConfig;
+export declare function createConfigWithRule(moduleName: string, modulePath: string, componentType: ComponentType, rule: DetectionRule, moduleGlob?: string): ResolvedExtractionConfig;
+export declare function createOrdersUseCaseConfig(modulePath?: string, moduleGlob?: string): ResolvedExtractionConfig;
 //# sourceMappingURL=test-fixtures.d.ts.map

package/dist/test-fixtures.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-fixtures.d.ts","sourceRoot":"","sources":["../src/test-fixtures.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,wBAAwB,EAExB,aAAa,EACb,WAAW,EACX,aAAa,EACd,MAAM,6CAA6C,CAAA;AAmBpD,wBAAgB,oBAAoB,IAAI,wBAAwB,CAE/D;AAED,wBAAgB,2BAA2B,CACzC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,WAAW,GACvB,wBAAwB,CAU1B;AAED,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,aAAa,GAClB,wBAAwB,CAU1B;AAED,wBAAgB,yBAAyB,CAAC,UAAU,SAAc,GAAG,wBAAwB,CAK5F"}
+{"version":3,"file":"test-fixtures.d.ts","sourceRoot":"","sources":["../src/test-fixtures.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,wBAAwB,EAExB,aAAa,EACb,WAAW,EACX,aAAa,EACd,MAAM,6CAA6C,CAAA;AAoBpD,wBAAgB,oBAAoB,IAAI,wBAAwB,CAE/D;AAED,wBAAgB,2BAA2B,CACzC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,WAAW,EACxB,UAAU,SAAO,GAChB,wBAAwB,CAW1B;AAED,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,aAAa,EACnB,UAAU,SAAO,GAChB,wBAAwB,CAW1B;AAED,wBAAgB,yBAAyB,CACvC,UAAU,SAAW,EACrB,UAAU,SAAO,GAChB,wBAAwB,CAW1B"}

package/dist/test-fixtures.js

@@ -2,7 +2,8 @@ const NOT_USED = { notUsed: true };
 function createMinimalModule(overrides = {}) {
     return {
         name: 'test',
-        path: 'src/**',
+        path: '.',
+        glob: 'src/**',
         api: NOT_USED,
         useCase: NOT_USED,
         domainOp: NOT_USED,
@@ -16,31 +17,33 @@ function createMinimalModule(overrides = {}) {
 export function createResolvedConfig() {
     return { modules: [createMinimalModule()] };
 }
-export function createConfigWithCustomTypes(moduleName, modulePath, customTypes) {
+export function createConfigWithCustomTypes(moduleName, modulePath, customTypes, moduleGlob = '**') {
     return {
         modules: [
             createMinimalModule({
                 name: moduleName,
                 path: modulePath,
+                glob: moduleGlob,
                 customTypes,
             }),
         ],
     };
 }
-export function createConfigWithRule(moduleName, modulePath, componentType, rule) {
+export function createConfigWithRule(moduleName, modulePath, componentType, rule, moduleGlob = '**') {
     return {
         modules: [
             createMinimalModule({
                 name: moduleName,
                 path: modulePath,
+                glob: moduleGlob,
                 [componentType]: rule,
             }),
         ],
     };
 }
-export function createOrdersUseCaseConfig(modulePath = 'orders/**') {
+export function createOrdersUseCaseConfig(modulePath = 'orders', moduleGlob = '**') {
     return createConfigWithRule('orders', modulePath, 'useCase', {
         find: 'classes',
         where: { hasDecorator: { name: 'UseCase' } },
-    });
+    }, moduleGlob);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@living-architecture/riviere-extract-ts",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -24,7 +24,7 @@
   "dependencies": {
     "minimatch": "^10.0.1",
     "ts-morph": "^24.0.0",
-    "@living-architecture/riviere-extract-config": "0.4.4",
-    "@living-architecture/riviere-schema": "0.5.4"
+    "@living-architecture/riviere-schema": "0.5.5",
+    "@living-architecture/riviere-extract-config": "0.4.5"
   }
 }