@emeryld/rrroutes-export 1.0.9 → 1.0.10

package/dist/index.mjs

@@ -1357,6 +1357,7 @@ var CHANGESET_CFG_FIELDS = [
   "feed"
 ];
 var SCHEMA_SECTIONS = ["params", "query", "body", "output"];
+var MODULE_EXTENSIONS = [".ts", ".tsx", ".mts", ".cts", ".js", ".mjs", ".cjs"];
 var SOURCE_KEY_BY_SECTION = {
   params: "paramsSchema",
   query: "querySchema",
@@ -1471,6 +1472,65 @@ async function resolveCommitPath(cwd, fromCommit, toCommit) {
   const commits = pathRaw.split("\n").map((item) => item.trim()).filter(Boolean);
   return [fromCommit, ...commits];
 }
+function modulePathStem(modulePath) {
+  const normalized = normalizePath(modulePath).replace(/^\/+/, "");
+  for (const ext of MODULE_EXTENSIONS) {
+    if (normalized.endsWith(ext)) {
+      return normalized.slice(0, -ext.length);
+    }
+  }
+  return normalized;
+}
+function extensionVariants(pathLike) {
+  const stem = modulePathStem(pathLike);
+  return MODULE_EXTENSIONS.map((ext) => `${stem}${ext}`);
+}
+async function buildModulePathCandidates(repoRoot, toCommit, requestedModuleRel) {
+  const requested = normalizePath(requestedModuleRel).replace(/^\/+/, "");
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  const pushCandidate = (value) => {
+    const normalized = normalizePath(value).replace(/^\/+/, "");
+    if (!normalized) return;
+    if (seen.has(normalized)) return;
+    seen.add(normalized);
+    out.push(normalized);
+  };
+  pushCandidate(requested);
+  extensionVariants(requested).forEach(pushCandidate);
+  const history = await runGit(repoRoot, [
+    "log",
+    "--follow",
+    "--name-only",
+    "--format=",
+    toCommit,
+    "--",
+    requested
+  ]);
+  history.split("\n").map((item) => item.trim()).filter(Boolean).forEach((candidate) => {
+    pushCandidate(candidate);
+    extensionVariants(candidate).forEach(pushCandidate);
+  });
+  return out;
+}
+async function commitHasPath(repoRoot, commitSha, candidatePath) {
+  try {
+    await execFile("git", ["cat-file", "-e", `${commitSha}:${candidatePath}`], {
+      cwd: repoRoot
+    });
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function resolveModulePathForCommit(repoRoot, commitSha, candidates) {
+  for (const candidate of candidates) {
+    if (await commitHasPath(repoRoot, commitSha, candidate)) {
+      return candidate;
+    }
+  }
+  return void 0;
+}
 function parentDirectories(relativePath) {
   const clean = normalizePath(relativePath).replace(/^\/+/, "");
   const dir = path4.posix.dirname(clean);
@@ -1482,8 +1542,11 @@ function parentDirectories(relativePath) {
   }
   return out;
 }
-function buildRelevantConfigFiles(moduleRel, tsconfigRel) {
-  const dirs = new Set(parentDirectories(moduleRel));
+function buildRelevantConfigFiles(moduleCandidates, tsconfigRel) {
+  const dirs = /* @__PURE__ */ new Set();
+  for (const moduleRel of moduleCandidates) {
+    parentDirectories(moduleRel).forEach((item) => dirs.add(item));
+  }
   if (tsconfigRel) {
     parentDirectories(tsconfigRel).forEach((item) => dirs.add(item));
     dirs.add(path4.posix.dirname(normalizePath(tsconfigRel)));
@@ -1496,7 +1559,7 @@ function buildRelevantConfigFiles(moduleRel, tsconfigRel) {
   }
   return files;
 }
-async function commitTouchedRelevantPaths(cwd, commit, moduleRel, tsconfigRel) {
+async function commitTouchedRelevantPaths(cwd, commit, moduleCandidates, tsconfigRel) {
   const changed = await runGit(cwd, [
     "show",
     "--pretty=format:",
@@ -1505,27 +1568,35 @@ async function commitTouchedRelevantPaths(cwd, commit, moduleRel, tsconfigRel) {
     commit
   ]);
   const changedFiles = changed.split("\n").map((item) => normalizePath(item.trim()).replace(/^\/+/, "")).filter(Boolean);
-  const moduleFile = normalizePath(moduleRel).replace(/^\/+/, "");
-  const moduleDir = normalizePath(path4.posix.dirname(moduleFile)).replace(/^\/+/, "");
+  const moduleFiles = Array.from(
+    new Set(moduleCandidates.map((item) => normalizePath(item).replace(/^\/+/, "")))
+  );
+  const moduleDirs = Array.from(
+    new Set(
+      moduleFiles.map((item) => normalizePath(path4.posix.dirname(item)).replace(/^\/+/, "")).filter((item) => item && item !== ".")
+    )
+  );
   const tsconfigFile = tsconfigRel ? normalizePath(tsconfigRel).replace(/^\/+/, "") : void 0;
-  const configFiles = buildRelevantConfigFiles(moduleFile, tsconfigFile);
+  const configFiles = buildRelevantConfigFiles(moduleFiles, tsconfigFile);
   return changedFiles.some((file) => {
-    if (file === moduleFile) return true;
-    if (moduleDir && moduleDir !== "." && (file === moduleDir || file.startsWith(`${moduleDir}/`))) {
-      return true;
+    if (moduleFiles.includes(file)) return true;
+    for (const moduleDir of moduleDirs) {
+      if (file === moduleDir || file.startsWith(`${moduleDir}/`)) {
+        return true;
+      }
     }
     if (tsconfigFile && file === tsconfigFile) return true;
     return configFiles.has(file);
   });
 }
-async function filterCommits(cwd, commits, moduleRel, tsconfigRel) {
+async function filterCommits(cwd, commits, moduleCandidates, tsconfigRel) {
   if (commits.length <= 1) {
     return commits;
   }
   const keep = [commits[0]];
   for (let i = 1; i < commits.length; i += 1) {
     const commit = commits[i];
-    if (await commitTouchedRelevantPaths(cwd, commit, moduleRel, tsconfigRel)) {
+    if (await commitTouchedRelevantPaths(cwd, commit, moduleCandidates, tsconfigRel)) {
       keep.push(commit);
     }
   }
@@ -1991,12 +2062,31 @@ ${message}`
 async function loadSnapshotExport(options) {
   return loadChangelogInput(options.entryPath, options.exportName);
 }
-async function createSnapshot(repoRoot, moduleRel, exportName, commit, tempRoot, tsconfigRel, exportOptions, log) {
+async function createSnapshot(repoRoot, moduleCandidates, exportName, commit, tempRoot, tsconfigRel, exportOptions, log) {
   const worktreeDir = path4.join(tempRoot, `wt-${commit.sha.slice(0, 12)}`);
   await runGit(repoRoot, ["worktree", "add", "--detach", worktreeDir, commit.sha]);
   try {
     await ensureWorktreeDependencies(repoRoot, worktreeDir);
-    const modulePath = path4.resolve(worktreeDir, moduleRel);
+    const resolvedModuleRel = await resolveModulePathForCommit(
+      repoRoot,
+      commit.sha,
+      moduleCandidates
+    );
+    if (!resolvedModuleRel) {
+      log?.(
+        `[changelog] unresolved module for commit ${commit.sha.slice(0, 12)}; using empty snapshot`
+      );
+      return {
+        commit,
+        routesByKey: {},
+        sourceObjectsById: {},
+        unresolvedModule: true
+      };
+    }
+    log?.(
+      `[changelog] resolved module for commit ${commit.sha.slice(0, 12)}: ${resolvedModuleRel}`
+    );
+    const modulePath = path4.resolve(worktreeDir, resolvedModuleRel);
     let snapshotRuntimePath = modulePath;
     let resolvedTsconfigPath;
     if (isTypeScriptModule(modulePath)) {
@@ -2011,7 +2101,7 @@ async function createSnapshot(repoRoot, moduleRel, exportName, commit, tempRoot,
       );
       snapshotRuntimePath = await compileSnapshotEntry({
         worktreeDir,
-        moduleRel,
+        moduleRel: resolvedModuleRel,
         modulePath,
         tsconfigPath: resolvedTsconfigPath,
         commitSha: commit.sha,
@@ -2268,12 +2358,18 @@ async function exportFinalizedLeavesChangelog(options) {
   log("[changelog] resolving commit window");
   const window = await resolveCommitWindow(repoRoot, options.from, options.to);
   log(`[changelog] window: ${window.from.slice(0, 12)}..${window.to.slice(0, 12)}`);
+  const moduleCandidates = await buildModulePathCandidates(
+    repoRoot,
+    window.to,
+    modulePathRelative
+  );
+  log(`[changelog] module candidates discovered: ${moduleCandidates.length}`);
   const allCommits = await resolveCommitPath(repoRoot, window.from, window.to);
   log(`[changelog] commits in ancestry path: ${allCommits.length}`);
   const selectedCommitShas = await filterCommits(
     repoRoot,
     allCommits,
-    modulePathRelative,
+    moduleCandidates,
     tsconfigRelative
   );
   log(`[changelog] commits after path filter: ${selectedCommitShas.length}`);
@@ -2290,6 +2386,7 @@ async function exportFinalizedLeavesChangelog(options) {
   log(`[changelog] temp workspace: ${tempRoot}`);
   try {
     const snapshots = [];
+    const unresolvedModuleCommits = [];
     for (let index = 0; index < commits.length; index += 1) {
       const commit = commits[index];
       log(
@@ -2298,7 +2395,7 @@ async function exportFinalizedLeavesChangelog(options) {
       snapshots.push(
         await createSnapshot(
           repoRoot,
-          modulePathRelative,
+          moduleCandidates,
           exportName,
           commit,
           tempRoot,
@@ -2307,6 +2404,9 @@ async function exportFinalizedLeavesChangelog(options) {
           log
         )
       );
+      if (snapshots[snapshots.length - 1]?.unresolvedModule) {
+        unresolvedModuleCommits.push(commit.sha);
+      }
     }
     const routeEvents = [];
     const sourceEvents = [];
@@ -2331,7 +2431,8 @@ async function exportFinalizedLeavesChangelog(options) {
         exportName,
         from: window.from,
         to: window.to,
-        selectedCommitCount: commits.length
+        selectedCommitCount: commits.length,
+        unresolvedModuleCommits: unresolvedModuleCommits.length > 0 ? unresolvedModuleCommits : void 0
       },
       commits,
       byRoute: routeRecordByKey(routeEvents),
@@ -2358,6 +2459,8 @@ var __private = {
   resolveCommitWindow,
   resolveCommitPath,
   filterCommits,
+  buildModulePathCandidates,
+  resolveModulePathForCommit,
   resolveSnapshotTsconfig,
   toEmittedModulePath,
   buildCompileCacheKey,