@autometa/cli 1.0.0-rc.6 → 1.0.0-rc.7

package/dist/index.js

@@ -2423,25 +2423,34 @@ function parseScopeOverrideTag(tags) {
 }
 function resolveFeatureScope(options) {
   const override = parseScopeOverrideTag(options.feature.tags);
+  const fileScope = resolveFileScope(options.featureAbsPath, options.groupIndex);
+  const inferred = (() => {
+    if (fileScope.kind !== "root") {
+      return fileScope;
+    }
+    if (options.hoistedFeatureScopingMode !== "directory") {
+      return fileScope;
+    }
+    return resolveHoistedDirectoryScope({
+      featureAbsPath: options.featureAbsPath,
+      hoistedFeatureRootsAbs: options.hoistedFeatureRootsAbs,
+      groupIndex: options.groupIndex,
+      strict: options.hoistedFeatureScopingStrict
+    });
+  })();
   if (override) {
     if (override.modulePath && override.modulePath.length > 0) {
       return { kind: "module", group: override.group, modulePath: override.modulePath };
     }
+    if (inferred.kind === "module" && inferred.group === override.group) {
+      return inferred;
+    }
+    if (inferred.kind === "group" && inferred.group === override.group) {
+      return inferred;
+    }
     return { kind: "group", group: override.group };
   }
-  const fileScope = resolveFileScope(options.featureAbsPath, options.groupIndex);
-  if (fileScope.kind !== "root") {
-    return fileScope;
-  }
-  if (options.hoistedFeatureScopingMode !== "directory") {
-    return fileScope;
-  }
-  return resolveHoistedDirectoryScope({
-    featureAbsPath: options.featureAbsPath,
-    hoistedFeatureRootsAbs: options.hoistedFeatureRootsAbs,
-    groupIndex: options.groupIndex,
-    strict: options.hoistedFeatureScopingStrict
-  });
+  return inferred;
 }
 function isVisibleStepScope(stepScope, featureScope) {
   if (featureScope.kind === "root") {