screw-up 1.3.0 → 1.5.0

package/dist/{packageMetadata-CFcZlT3V.js → packageMetadata-C2Yob7-F.js}

@@ -1,11 +1,11 @@
 /*!
  * name: screw-up
- * version: 1.3.0
+ * version: 1.5.0
  * description: Simply package metadata inserter on Vite plugin
  * author: Kouji Matsui (@kekyo@mi.kekyo.net)
  * license: MIT
  * repository.url: https://github.com/kekyo/screw-up.git
- * git.commit.hash: eaf2f91941a8c1d085b1c493a55e0041b39f0cb3
+ * git.commit.hash: 72fd5b88656bc400ba3fed500895826208e23217
  */
 import { existsSync } from "fs";
 import * as fs from "fs/promises";
@@ -1120,8 +1120,7 @@ const createConsoleLogger = (prefix, driver) => {
 };
 const flattenObject = (obj, prefix, map) => {
   for (const [key2, value] of Object.entries(obj)) {
-    if (!value)
-      continue;
+    if (!value) continue;
     const fullKey = prefix ? `${prefix}.${key2}` : key2;
     if (typeof value === "string") {
       map[fullKey] = value;
@@ -1146,7 +1145,9 @@ const findWorkspaceRoot = async (startPath, logger) => {
           return currentPath;
         }
       } catch (error) {
-        logger.warn(`Failed to parse package.json at ${packageJsonPath}: ${error}`);
+        logger.warn(
+          `Failed to parse package.json at ${packageJsonPath}: ${error}`
+        );
       }
     }
     currentPath = dirname(currentPath);
@@ -1191,12 +1192,16 @@ const collectWorkspaceSiblings = async (workspaceRoot, fetchGitMetadata, alwaysO
             });
           }
         } catch (error) {
-          logger.warn(`Failed to resolve package.json from ${packageJsonPath}: ${error}`);
+          logger.warn(
+            `Failed to resolve package.json from ${packageJsonPath}: ${error}`
+          );
         }
       }
     }
   } catch (error) {
-    logger.warn(`Failed to collect workspace siblings from ${workspaceRoot}: ${error}`);
+    logger.warn(
+      `Failed to collect workspace siblings from ${workspaceRoot}: ${error}`
+    );
   }
   return siblings;
 };
@@ -1205,7 +1210,9 @@ const replacePeerDependenciesWildcards = (packageJson, siblings, versionPrefix)
   if (!modifiedPackageJson.peerDependencies || typeof modifiedPackageJson.peerDependencies !== "object") {
     return modifiedPackageJson;
   }
-  for (const [depName, depVersion] of Object.entries(modifiedPackageJson.peerDependencies)) {
+  for (const [depName, depVersion] of Object.entries(
+    modifiedPackageJson.peerDependencies
+  )) {
     if (depVersion === "*" && siblings.has(depName)) {
       const sibling = siblings.get(depName);
       modifiedPackageJson.peerDependencies[depName] = `${versionPrefix}${sibling.version}`;
@@ -1316,7 +1323,12 @@ const resolvePackageMetadata = async (projectRoot, fetchGitMetadata, alwaysOverr
     projectRoot,
     logger,
     readPackageMetadata.bind(void 0, logger),
-    mergePackageMetadata.bind(void 0, fetchGitMetadata, alwaysOverrideVersionFromGit, sourceMap)
+    mergePackageMetadata.bind(
+      void 0,
+      fetchGitMetadata,
+      alwaysOverrideVersionFromGit,
+      sourceMap
+    )
   );
   return {
     metadata,
@@ -1338,7 +1350,13 @@ const resolveRawPackageJsonObject = async (projectRoot, fetchGitMetadata, always
     projectRoot,
     logger,
     readRawPackageJson.bind(void 0, logger),
-    mergeRawPackageJson.bind(void 0, fetchGitMetadata, alwaysOverrideVersionFromGit, inheritableFields, sourceMap)
+    mergeRawPackageJson.bind(
+      void 0,
+      fetchGitMetadata,
+      alwaysOverrideVersionFromGit,
+      inheritableFields,
+      sourceMap
+    )
   );
   return {
     metadata: packageJson,
@@ -1737,8 +1755,16 @@ const getCommit = async (repositoryPath, hash) => {
 };
 const getCurrentCommit = async (repositoryPath) => {
   try {
-    const currentOid = await git.resolveRef({ fs, dir: repositoryPath, ref: "HEAD" });
-    const commit = await git.readCommit({ fs, dir: repositoryPath, oid: currentOid });
+    const currentOid = await git.resolveRef({
+      fs,
+      dir: repositoryPath,
+      ref: "HEAD"
+    });
+    const commit = await git.readCommit({
+      fs,
+      dir: repositoryPath,
+      oid: currentOid
+    });
     return {
       hash: commit.oid,
       shortHash: commit.oid.substring(0, 7),
@@ -1750,44 +1776,72 @@ const getCurrentCommit = async (repositoryPath) => {
     return void 0;
   }
 };
-const getRelatedTags = async (repositoryPath, commitHash) => {
+const buildTagCache = async (repositoryPath) => {
+  const cache = {
+    commitToTags: /* @__PURE__ */ new Map(),
+    initialized: true
+  };
   try {
     const tags = await git.listTags({ fs, dir: repositoryPath });
-    const tagInfos = [];
-    for (const tagName of tags) {
-      try {
-        const tagOid = await git.resolveRef({ fs, dir: repositoryPath, ref: `refs/tags/${tagName}` });
-        let targetCommitOid = tagOid;
+    await Promise.all(
+      tags.map(async (tagName) => {
         try {
-          const tagObject = await git.readTag({ fs, dir: repositoryPath, oid: tagOid });
-          if (tagObject && tagObject.tag.object) {
-            targetCommitOid = tagObject.tag.object;
-          }
-        } catch (e) {
-        }
-        if (targetCommitOid === commitHash) {
+          const tagOid = await git.resolveRef({
+            fs,
+            dir: repositoryPath,
+            ref: `refs/tags/${tagName}`
+          });
           const version2 = parseVersion(tagName);
-          if (version2 && isValidVersion(version2)) {
-            tagInfos.push({
-              name: tagName,
-              hash: commitHash,
-              version: version2
-            });
-          } else {
-            tagInfos.push({
-              name: tagName,
-              hash: commitHash,
-              version: void 0
+          const tagInfo = {
+            name: tagName,
+            hash: tagOid,
+            // This will be updated for annotated tags
+            version: version2 && isValidVersion(version2) ? version2 : void 0
+          };
+          if (!cache.commitToTags.has(tagOid)) {
+            cache.commitToTags.set(tagOid, []);
+          }
+          cache.commitToTags.get(tagOid).push({ ...tagInfo, hash: tagOid });
+          try {
+            const tagObject = await git.readTag({
+              fs,
+              dir: repositoryPath,
+              oid: tagOid
             });
+            if (tagObject && tagObject.tag.object) {
+              const commitOid = tagObject.tag.object;
+              const lightweightTags = cache.commitToTags.get(tagOid);
+              if (lightweightTags) {
+                const index = lightweightTags.findIndex(
+                  (t) => t.name === tagName
+                );
+                if (index >= 0) {
+                  lightweightTags.splice(index, 1);
+                  if (lightweightTags.length === 0) {
+                    cache.commitToTags.delete(tagOid);
+                  }
+                }
+              }
+              if (!cache.commitToTags.has(commitOid)) {
+                cache.commitToTags.set(commitOid, []);
+              }
+              cache.commitToTags.get(commitOid).push({ ...tagInfo, hash: commitOid });
+            }
+          } catch (e) {
           }
+        } catch (e) {
         }
-      } catch (e) {
-      }
-    }
-    return tagInfos.sort((a, b) => a.name.localeCompare(b.name));
+      })
+    );
   } catch (e) {
+  }
+  return cache;
+};
+const getRelatedTagsFromCache = (cache, commitHash) => {
+  if (!cache.initialized) {
     return [];
   }
+  return cache.commitToTags.get(commitHash) || [];
 };
 const getRelatedTagsForVersioning = async (repositoryPath, commitHash) => {
   try {
@@ -1795,16 +1849,12 @@ const getRelatedTagsForVersioning = async (repositoryPath, commitHash) => {
     const tagInfos = [];
     for (const tagName of tags) {
       try {
-        const tagOid = await git.resolveRef({ fs, dir: repositoryPath, ref: `refs/tags/${tagName}` });
-        let targetCommitOid = tagOid;
-        try {
-          const tagObject = await git.readTag({ fs, dir: repositoryPath, oid: tagOid });
-          if (tagObject && tagObject.tag.object) {
-            targetCommitOid = tagObject.tag.object;
-          }
-        } catch (e) {
-        }
-        if (targetCommitOid === commitHash) {
+        const tagOid = await git.resolveRef({
+          fs,
+          dir: repositoryPath,
+          ref: `refs/tags/${tagName}`
+        });
+        if (tagOid === commitHash) {
           const version2 = parseVersion(tagName);
           if (version2 && isValidVersion(version2)) {
             tagInfos.push({
@@ -1813,6 +1863,25 @@ const getRelatedTagsForVersioning = async (repositoryPath, commitHash) => {
               version: version2
             });
           }
+        } else {
+          try {
+            const tagObject = await git.readTag({
+              fs,
+              dir: repositoryPath,
+              oid: tagOid
+            });
+            if (tagObject && tagObject.tag.object === commitHash) {
+              const version2 = parseVersion(tagName);
+              if (version2 && isValidVersion(version2)) {
+                tagInfos.push({
+                  name: tagName,
+                  hash: commitHash,
+                  version: version2
+                });
+              }
+            }
+          } catch (e) {
+          }
         }
       } catch (e) {
       }
@@ -1828,7 +1897,11 @@ const getRelatedBranches = async (repositoryPath, commitHash) => {
     const relatedBranches = [];
     for (const branch of branches) {
       try {
-        const branchOid = await git.resolveRef({ fs, dir: repositoryPath, ref: branch });
+        const branchOid = await git.resolveRef({
+          fs,
+          dir: repositoryPath,
+          ref: branch
+        });
         if (branchOid === commitHash) {
           relatedBranches.push(branch);
         }
@@ -1845,7 +1918,7 @@ const getModifiedFiles = async (repositoryPath) => {
     const status = await git.statusMatrix({ fs, dir: repositoryPath });
     return status.filter(
       ([, head, workdir, stage]) => workdir === 2 || // modified in working directory (unstaged)
-      stage === 2 || // modified in stage (staged)  
+      stage === 2 || // modified in stage (staged)
       stage === 3 || // added to stage (staged)
       head === 1 && workdir === 0 || // deleted from working directory
       head === 0 && workdir === 1
@@ -1858,7 +1931,7 @@ const getModifiedFiles = async (repositoryPath) => {
 const formatModifiedFile = (modifiedFile) => {
   return `'${modifiedFile[0]}':${modifiedFile[1]}:${modifiedFile[2]}:${modifiedFile[3]}`;
 };
-const lookupVersionLabelRecursive = async (cwd, commit, reachedCommits) => {
+const lookupVersionLabelRecursive = async (cwd, commit, reachedCommits, tagCache) => {
   const scheduledStack = [];
   let version2 = { major: 0, minor: 0, build: 1, original: "0.0.1" };
   let currentCommit = commit;
@@ -1867,7 +1940,7 @@ const lookupVersionLabelRecursive = async (cwd, commit, reachedCommits) => {
       version2 = reachedCommits.get(currentCommit.hash);
       break;
     }
-    const relatedTags = await getRelatedTagsForVersioning(cwd, currentCommit.hash);
+    const relatedTags = tagCache ? getRelatedTagsFromCache(tagCache, currentCommit.hash) : await getRelatedTagsForVersioning(cwd, currentCommit.hash);
     const versionCandidates = relatedTags.filter((tag) => tag.version && isValidVersion(tag.version)).filter((tag) => tag.version.minor !== void 0).sort((a, b) => compareVersions(a.version, b.version));
     if (versionCandidates.length >= 1) {
       version2 = versionCandidates[0].version;
@@ -1876,9 +1949,15 @@ const lookupVersionLabelRecursive = async (cwd, commit, reachedCommits) => {
     }
     let parentCommits = [];
     try {
-      const commitObj = await git.readCommit({ fs, dir: cwd, oid: currentCommit.hash });
+      const commitObj = await git.readCommit({
+        fs,
+        dir: cwd,
+        oid: currentCommit.hash
+      });
       const parentHashes = commitObj.commit.parent || [];
-      parentCommits = (await Promise.all(parentHashes.map((parentHash) => getCommit(cwd, parentHash)))).filter((ci) => ci !== void 0);
+      parentCommits = (await Promise.all(
+        parentHashes.map((parentHash) => getCommit(cwd, parentHash))
+      )).filter((ci) => ci !== void 0);
     } catch (e) {
     }
     if (parentCommits.length === 0) {
@@ -1893,7 +1972,12 @@ const lookupVersionLabelRecursive = async (cwd, commit, reachedCommits) => {
     const { commit: scheduledCommit, parents } = scheduled;
     if (parents.length >= 2) {
       for (let index = 1; index < parents.length; index++) {
-        const alternateParentVersion = await lookupVersionLabelRecursive(cwd, parents[index], reachedCommits);
+        const alternateParentVersion = await lookupVersionLabelRecursive(
+          cwd,
+          parents[index],
+          reachedCommits,
+          tagCache
+        );
         if (alternateParentVersion && compareVersions(alternateParentVersion, version2) < 0) {
           version2 = alternateParentVersion;
         }
@@ -1917,8 +2001,17 @@ const getGitMetadata = async (repositoryPath, checkWorkingDirectoryStatus, logge
     if (!currentCommit) {
       return metadata;
     }
+    const tagCache = await buildTagCache(gitRootPath);
+    logger.debug(
+      `Built tag cache with ${tagCache.commitToTags.size} commit entries`
+    );
     const reachedCommits = /* @__PURE__ */ new Map();
-    let version2 = await lookupVersionLabelRecursive(gitRootPath, currentCommit, reachedCommits);
+    let version2 = await lookupVersionLabelRecursive(
+      gitRootPath,
+      currentCommit,
+      reachedCommits,
+      tagCache
+    );
     const gitMetadata = { tags: [], branches: [] };
     metadata.git = gitMetadata;
     if (version2) {
@@ -1926,7 +2019,9 @@ const getGitMetadata = async (repositoryPath, checkWorkingDirectoryStatus, logge
         const modifiedFiles = await getModifiedFiles(gitRootPath);
         if (modifiedFiles.length >= 1) {
           const newVersion = incrementLastVersionComponent(version2);
-          logger.debug(`Increased git version by detected modified items: ${formatVersion(version2)} ---> ${formatVersion(newVersion)}, Files=[${modifiedFiles.map(formatModifiedFile).join(", ")}]`);
+          logger.debug(
+            `Increased git version by detected modified items: ${formatVersion(version2)} ---> ${formatVersion(newVersion)}, Files=[${modifiedFiles.map(formatModifiedFile).join(", ")}]`
+          );
           version2 = newVersion;
         }
       }
@@ -1940,9 +2035,12 @@ const getGitMetadata = async (repositoryPath, checkWorkingDirectoryStatus, logge
       date: dayjs(currentCommit.date).format("YYYY-MM-DDTHH:mm:ssZ[Z]"),
       message: currentCommit.message
     };
-    const relatedTags = await getRelatedTags(gitRootPath, currentCommit.hash);
+    const relatedTags = getRelatedTagsFromCache(tagCache, currentCommit.hash);
     gitMetadata.tags = relatedTags.map((tag) => tag.name);
-    const relatedBranches = await getRelatedBranches(gitRootPath, currentCommit.hash);
+    const relatedBranches = await getRelatedBranches(
+      gitRootPath,
+      currentCommit.hash
+    );
     gitMetadata.branches = relatedBranches;
   } catch (error) {
     logger.warn(`Failed to extract git metadata: ${error}`);
@@ -1963,11 +2061,11 @@ const getFetchGitMetadata = (targetDir, checkWorkingDirectoryStatus, logger) =>
   };
 };
 const name = "screw-up";
-const version = "1.3.0";
+const version = "1.5.0";
 const author = "Kouji Matsui (@kekyo@mi.kekyo.net)";
 const license = "MIT";
 const repository_url = "https://github.com/kekyo/screw-up.git";
-const git_commit_hash = "eaf2f91941a8c1d085b1c493a55e0041b39f0cb3";
+const git_commit_hash = "72fd5b88656bc400ba3fed500895826208e23217";
 const packageMetadata = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   author,
@@ -1990,4 +2088,4 @@ export {
   resolvePackageMetadata as r,
   version as v
 };
-//# sourceMappingURL=packageMetadata-CFcZlT3V.js.map
+//# sourceMappingURL=packageMetadata-C2Yob7-F.js.map