screw-up 0.15.0 → 0.17.0

package/dist/{internal-Dy8K0duL.js → analyzer-DxAKRQPj.js}

@@ -1,14 +1,14 @@
 /*!
  * name: screw-up
- * version: 0.15.0
+ * version: 0.17.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: 63679526c0d6c7819c2b3e78d96ac3e2c8fc0d46
+ * git.commit.hash: 6ca2d4183d3123c9e0cf7aa444bdb85c1e60e9fb
  */
-import * as fs from "fs";
 import { existsSync } from "fs";
+import * as fs from "fs/promises";
 import { readFile } from "fs/promises";
 import { dirname, join } from "path";
 import { glob } from "glob";
@@ -1095,6 +1095,241 @@ const JSON5 = {
   stringify
 };
 var lib = JSON5;
+const createConsoleLogger = () => {
+  return {
+    debug: (msg) => console.debug(msg),
+    info: (msg) => console.info(msg),
+    warn: (msg) => console.warn(msg),
+    error: (msg) => console.error(msg)
+  };
+};
+const flattenObject = (obj, prefix, map) => {
+  for (const [key2, value] of Object.entries(obj)) {
+    if (!value)
+      continue;
+    const fullKey = prefix ? `${prefix}.${key2}` : key2;
+    if (typeof value === "string") {
+      map[fullKey] = value;
+    } else if (Array.isArray(value)) {
+      map[fullKey] = value.map((v) => String(v)).join(",");
+    } else if (typeof value === "object") {
+      flattenObject(value, fullKey, map);
+    } else {
+      map[fullKey] = String(value);
+    }
+  }
+};
+const findWorkspaceRoot = async (startPath, logger) => {
+  let currentPath = startPath;
+  while (currentPath !== dirname(currentPath)) {
+    const packageJsonPath = join(currentPath, "package.json");
+    if (existsSync(packageJsonPath)) {
+      try {
+        const content = await readFile(packageJsonPath, "utf-8");
+        const packageJson = lib.parse(content);
+        if (packageJson.workspaces || existsSync(join(currentPath, "pnpm-workspace.yaml")) || existsSync(join(currentPath, "lerna.json"))) {
+          return currentPath;
+        }
+      } catch (error) {
+        logger.warn(`Failed to parse package.json at ${packageJsonPath}: ${error}`);
+      }
+    }
+    currentPath = dirname(currentPath);
+  }
+  return void 0;
+};
+const collectWorkspaceSiblings = async (workspaceRoot, fetchGitMetadata, alwaysOverrideVersionFromGit, inheritableFields, logger) => {
+  const siblings = /* @__PURE__ */ new Map();
+  try {
+    const rootPackageJsonPath = join(workspaceRoot, "package.json");
+    const content = await readFile(rootPackageJsonPath, "utf-8");
+    const rootPackageJson = lib.parse(content);
+    const workspacePatterns = rootPackageJson.workspaces;
+    if (!workspacePatterns || !Array.isArray(workspacePatterns)) {
+      return siblings;
+    }
+    const workspaceDirs = /* @__PURE__ */ new Set();
+    for (const pattern of workspacePatterns) {
+      const matches = await glob(pattern, {
+        cwd: workspaceRoot
+      });
+      matches.forEach((match) => workspaceDirs.add(match));
+    }
+    for (const workspaceDir of workspaceDirs) {
+      const packageJsonPath = join(workspaceRoot, workspaceDir, "package.json");
+      if (existsSync(packageJsonPath)) {
+        try {
+          const packagePath = join(workspaceRoot, workspaceDir);
+          const resolvedPackage = await resolveRawPackageJsonObject(
+            packagePath,
+            fetchGitMetadata,
+            alwaysOverrideVersionFromGit,
+            inheritableFields,
+            logger
+          );
+          const packageJson = resolvedPackage.metadata;
+          if (packageJson.name && packageJson.version) {
+            siblings.set(packageJson.name, {
+              name: packageJson.name,
+              version: packageJson.version,
+              path: packagePath
+            });
+          }
+        } catch (error) {
+          logger.warn(`Failed to resolve package.json from ${packageJsonPath}: ${error}`);
+        }
+      }
+    }
+  } catch (error) {
+    logger.warn(`Failed to collect workspace siblings from ${workspaceRoot}: ${error}`);
+  }
+  return siblings;
+};
+const replacePeerDependenciesWildcards = (packageJson, siblings, versionPrefix) => {
+  const modifiedPackageJson = lib.parse(JSON.stringify(packageJson));
+  if (!modifiedPackageJson.peerDependencies || typeof modifiedPackageJson.peerDependencies !== "object") {
+    return modifiedPackageJson;
+  }
+  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}`;
+    }
+  }
+  return modifiedPackageJson;
+};
+const mergePackageMetadata = async (fetchGitMetadata, alwaysOverrideVersionFromGit, sourceMap, parentMetadata, childMetadata, parentSourceDir, childSourceDir, _repositoryPath) => {
+  const metadata = await fetchGitMetadata();
+  const merged = {};
+  flattenObject(metadata, "", merged);
+  for (const key2 in parentMetadata) {
+    const value = parentMetadata[key2];
+    if (value !== void 0) {
+      merged[key2] = value;
+      sourceMap.set(key2, parentSourceDir);
+    }
+  }
+  for (const key2 in childMetadata) {
+    const value = childMetadata[key2];
+    if (value !== void 0) {
+      merged[key2] = value;
+      sourceMap.set(key2, childSourceDir);
+    }
+  }
+  if (alwaysOverrideVersionFromGit && metadata.version) {
+    merged.version = metadata.version;
+  }
+  return merged;
+};
+const mergeRawPackageJson = async (fetchGitMetadata, alwaysOverrideVersionFromGit, inheritableFields, sourceMap, parentMetadata, childMetadata, parentSourceDir, childSourceDir, repositoryPath) => {
+  const gitMetadata = await fetchGitMetadata();
+  const merged = { ...gitMetadata };
+  for (const key2 in parentMetadata) {
+    if (inheritableFields.has(key2)) {
+      const value = parentMetadata[key2];
+      if (value !== void 0) {
+        merged[key2] = value;
+        sourceMap.set(key2, parentSourceDir);
+      }
+    }
+  }
+  for (const key2 in childMetadata) {
+    const value = childMetadata[key2];
+    if (value !== void 0) {
+      merged[key2] = value;
+      sourceMap.set(key2, childSourceDir);
+    }
+  }
+  if (alwaysOverrideVersionFromGit && gitMetadata.version) {
+    merged.version = gitMetadata.version;
+    sourceMap.set("version", repositoryPath);
+  }
+  return merged;
+};
+const resolvePackageMetadataT = async (projectRoot, logger, readPackageMetadataFn, mergePackageMetadataFn) => {
+  const workspaceRoot = await findWorkspaceRoot(projectRoot, logger);
+  if (!workspaceRoot) {
+    const localPackagePath = join(projectRoot, "package.json");
+    const localMetadata = await readPackageMetadataFn(localPackagePath);
+    return mergePackageMetadataFn(
+      {},
+      localMetadata,
+      "",
+      // dummy
+      projectRoot,
+      projectRoot
+    );
+  }
+  const projectPackagePath = join(projectRoot, "package.json");
+  const rootPackagePath = join(workspaceRoot, "package.json");
+  const metadata = await readPackageMetadataFn(rootPackagePath);
+  if (projectPackagePath !== rootPackagePath && existsSync(projectPackagePath)) {
+    const projectMetadata = await readPackageMetadataFn(projectPackagePath);
+    return mergePackageMetadataFn(
+      metadata,
+      projectMetadata,
+      workspaceRoot,
+      projectRoot,
+      projectRoot
+    );
+  } else {
+    return mergePackageMetadataFn(
+      {},
+      metadata,
+      "",
+      // dummy
+      workspaceRoot,
+      projectRoot
+    );
+  }
+};
+const readPackageMetadata = async (logger, packagePath) => {
+  try {
+    const content = await readFile(packagePath, "utf-8");
+    const json = lib.parse(content);
+    const map = {};
+    flattenObject(json, "", map);
+    return map;
+  } catch (error) {
+    logger.error(`Failed to read package.json from ${packagePath}: ${error}`);
+    return {};
+  }
+};
+const resolvePackageMetadata = async (projectRoot, fetchGitMetadata, alwaysOverrideVersionFromGit, logger) => {
+  const sourceMap = /* @__PURE__ */ new Map();
+  const metadata = await resolvePackageMetadataT(
+    projectRoot,
+    logger,
+    readPackageMetadata.bind(void 0, logger),
+    mergePackageMetadata.bind(void 0, fetchGitMetadata, alwaysOverrideVersionFromGit, sourceMap)
+  );
+  return {
+    metadata,
+    sourceMap
+  };
+};
+const readRawPackageJson = async (logger, packagePath) => {
+  try {
+    const content = await readFile(packagePath, "utf-8");
+    return lib.parse(content);
+  } catch (error) {
+    logger.error(`Failed to read package.json from ${packagePath}: ${error}`);
+    throw error;
+  }
+};
+const resolveRawPackageJsonObject = async (projectRoot, fetchGitMetadata, alwaysOverrideVersionFromGit, inheritableFields, logger) => {
+  const sourceMap = /* @__PURE__ */ new Map();
+  const packageJson = await resolvePackageMetadataT(
+    projectRoot,
+    logger,
+    readRawPackageJson.bind(void 0, logger),
+    mergeRawPackageJson.bind(void 0, fetchGitMetadata, alwaysOverrideVersionFromGit, inheritableFields, sourceMap)
+  );
+  return {
+    metadata: packageJson,
+    sourceMap
+  };
+};
 function getDefaultExportFromCjs(x) {
   return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
 }
@@ -1574,10 +1809,10 @@ const getRelatedBranches = async (repositoryPath, commitHash) => {
     return [];
   }
 };
-const hasModifiedFiles = async (repositoryPath) => {
+const getModifiedFiles = async (repositoryPath) => {
   try {
     const status = await git.statusMatrix({ fs, dir: repositoryPath });
-    return status.some(
+    return status.filter(
       ([, head, workdir, stage]) => workdir === 2 || // modified in working directory (unstaged)
       stage === 2 || // modified in stage (staged)  
       stage === 3 || // added to stage (staged)
@@ -1586,9 +1821,12 @@ const hasModifiedFiles = async (repositoryPath) => {
       // untracked files (respecting .gitignore)
     );
   } catch (e) {
-    return false;
+    return [];
   }
 };
+const formatModifiedFile = (modifiedFile) => {
+  return `'${modifiedFile[0]}':${modifiedFile[1]}:${modifiedFile[2]}:${modifiedFile[3]}`;
+};
 const lookupVersionLabelRecursive = async (cwd, commit, reachedCommits) => {
   const scheduledStack = [];
   let version = { major: 0, minor: 0, build: 1, original: "0.0.1" };
@@ -1653,9 +1891,13 @@ const getGitMetadata = async (repositoryPath, checkWorkingDirectoryStatus, logge
     const gitMetadata = { tags: [], branches: [] };
     metadata.git = gitMetadata;
     if (version) {
-      const hasModified = checkWorkingDirectoryStatus && await hasModifiedFiles(gitRootPath);
-      if (hasModified) {
-        version = incrementLastVersionComponent(version);
+      if (checkWorkingDirectoryStatus) {
+        const modifiedFiles = await getModifiedFiles(gitRootPath);
+        if (modifiedFiles.length >= 1) {
+          const newVersion = incrementLastVersionComponent(version);
+          logger.debug(`Increased git version by detected modified items: ${formatVersion(version)} ---> ${formatVersion(newVersion)}, Files=[${modifiedFiles.map(formatModifiedFile).join(", ")}]`);
+          version = newVersion;
+        }
       }
       const gitVersion = formatVersion(version);
       gitMetadata.version = gitVersion;
@@ -1676,239 +1918,17 @@ const getGitMetadata = async (repositoryPath, checkWorkingDirectoryStatus, logge
   }
   return metadata;
 };
-const createConsoleLogger = () => {
-  return {
-    debug: (msg) => console.debug(msg),
-    info: (msg) => console.info(msg),
-    warn: (msg) => console.warn(msg),
-    error: (msg) => console.error(msg)
-  };
-};
-const flattenObject = (obj, prefix, map) => {
-  for (const [key2, value] of Object.entries(obj)) {
-    if (!value)
-      continue;
-    const fullKey = prefix ? `${prefix}.${key2}` : key2;
-    if (typeof value === "string") {
-      map[fullKey] = value;
-    } else if (Array.isArray(value)) {
-      map[fullKey] = value.map((v) => String(v)).join(",");
-    } else if (typeof value === "object") {
-      flattenObject(value, fullKey, map);
-    } else {
-      map[fullKey] = String(value);
-    }
-  }
-};
-const findWorkspaceRoot = async (startPath, logger) => {
-  let currentPath = startPath;
-  while (currentPath !== dirname(currentPath)) {
-    const packageJsonPath = join(currentPath, "package.json");
-    if (existsSync(packageJsonPath)) {
-      try {
-        const content = await readFile(packageJsonPath, "utf-8");
-        const packageJson = lib.parse(content);
-        if (packageJson.workspaces || existsSync(join(currentPath, "pnpm-workspace.yaml")) || existsSync(join(currentPath, "lerna.json"))) {
-          return currentPath;
-        }
-      } catch (error) {
-        logger.warn(`Failed to parse package.json at ${packageJsonPath}: ${error}`);
-      }
-    }
-    currentPath = dirname(currentPath);
-  }
-  return void 0;
-};
-const collectWorkspaceSiblings = async (workspaceRoot, checkWorkingDirectoryStatus, alwaysOverrideVersionFromGit, inheritableFields, logger) => {
-  const siblings = /* @__PURE__ */ new Map();
-  try {
-    const rootPackageJsonPath = join(workspaceRoot, "package.json");
-    const content = await readFile(rootPackageJsonPath, "utf-8");
-    const rootPackageJson = lib.parse(content);
-    const workspacePatterns = rootPackageJson.workspaces;
-    if (!workspacePatterns || !Array.isArray(workspacePatterns)) {
-      return siblings;
-    }
-    const workspaceDirs = /* @__PURE__ */ new Set();
-    for (const pattern of workspacePatterns) {
-      const matches = await glob(pattern, {
-        cwd: workspaceRoot
-      });
-      matches.forEach((match) => workspaceDirs.add(match));
-    }
-    for (const workspaceDir of workspaceDirs) {
-      const packageJsonPath = join(workspaceRoot, workspaceDir, "package.json");
-      if (existsSync(packageJsonPath)) {
-        try {
-          const packagePath = join(workspaceRoot, workspaceDir);
-          const resolvedPackage = await resolveRawPackageJsonObject(
-            packagePath,
-            checkWorkingDirectoryStatus,
-            alwaysOverrideVersionFromGit,
-            inheritableFields,
-            logger
-          );
-          const packageJson = resolvedPackage.metadata;
-          if (packageJson.name && packageJson.version) {
-            siblings.set(packageJson.name, {
-              name: packageJson.name,
-              version: packageJson.version,
-              path: packagePath
-            });
-          }
-        } catch (error) {
-          logger.warn(`Failed to resolve package.json from ${packageJsonPath}: ${error}`);
-        }
-      }
-    }
-  } catch (error) {
-    logger.warn(`Failed to collect workspace siblings from ${workspaceRoot}: ${error}`);
-  }
-  return siblings;
-};
-const replacePeerDependenciesWildcards = (packageJson, siblings, versionPrefix) => {
-  const modifiedPackageJson = lib.parse(JSON.stringify(packageJson));
-  if (!modifiedPackageJson.peerDependencies || typeof modifiedPackageJson.peerDependencies !== "object") {
-    return modifiedPackageJson;
-  }
-  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}`;
-    }
-  }
-  return modifiedPackageJson;
-};
-const mergePackageMetadata = async (checkWorkingDirectoryStatus, alwaysOverrideVersionFromGit, sourceMap, logger, parentMetadata, childMetadata, parentSourceDir, childSourceDir, repositoryPath) => {
-  const metadata = await getGitMetadata(repositoryPath, checkWorkingDirectoryStatus, logger);
-  const merged = {};
-  flattenObject(metadata, "", merged);
-  for (const key2 in parentMetadata) {
-    const value = parentMetadata[key2];
-    if (value !== void 0) {
-      merged[key2] = value;
-      sourceMap.set(key2, parentSourceDir);
-    }
-  }
-  for (const key2 in childMetadata) {
-    const value = childMetadata[key2];
-    if (value !== void 0) {
-      merged[key2] = value;
-      sourceMap.set(key2, childSourceDir);
-    }
-  }
-  if (alwaysOverrideVersionFromGit && metadata.version) {
-    merged.version = metadata.version;
-  }
-  return merged;
-};
-const mergeRawPackageJson = async (checkWorkingDirectoryStatus, alwaysOverrideVersionFromGit, inheritableFields, sourceMap, logger, parentMetadata, childMetadata, parentSourceDir, childSourceDir, repositoryPath) => {
-  const gitMetadata = await getGitMetadata(repositoryPath, checkWorkingDirectoryStatus, logger);
-  const merged = { ...gitMetadata };
-  for (const key2 in parentMetadata) {
-    if (inheritableFields.has(key2)) {
-      const value = parentMetadata[key2];
-      if (value !== void 0) {
-        merged[key2] = value;
-        sourceMap.set(key2, parentSourceDir);
-      }
-    }
-  }
-  for (const key2 in childMetadata) {
-    const value = childMetadata[key2];
-    if (value !== void 0) {
-      merged[key2] = value;
-      sourceMap.set(key2, childSourceDir);
-    }
-  }
-  if (alwaysOverrideVersionFromGit && gitMetadata.version) {
-    merged.version = gitMetadata.version;
-    sourceMap.set("version", repositoryPath);
-  }
-  return merged;
-};
-const resolvePackageMetadataT = async (projectRoot, logger, readPackageMetadataFn, mergePackageMetadataFn) => {
-  const workspaceRoot = await findWorkspaceRoot(projectRoot, logger);
-  if (!workspaceRoot) {
-    const localPackagePath = join(projectRoot, "package.json");
-    const localMetadata = await readPackageMetadataFn(localPackagePath);
-    return mergePackageMetadataFn(
-      {},
-      localMetadata,
-      "",
-      // dummy
-      projectRoot,
-      projectRoot
-    );
-  }
-  const projectPackagePath = join(projectRoot, "package.json");
-  const rootPackagePath = join(workspaceRoot, "package.json");
-  const metadata = await readPackageMetadataFn(rootPackagePath);
-  if (projectPackagePath !== rootPackagePath && existsSync(projectPackagePath)) {
-    const projectMetadata = await readPackageMetadataFn(projectPackagePath);
-    return mergePackageMetadataFn(
-      metadata,
-      projectMetadata,
-      workspaceRoot,
-      projectRoot,
-      projectRoot
-    );
-  } else {
-    return mergePackageMetadataFn(
-      {},
-      metadata,
-      "",
-      // dummy
-      workspaceRoot,
-      projectRoot
-    );
-  }
-};
-const readPackageMetadata = async (logger, packagePath) => {
-  try {
-    const content = await readFile(packagePath, "utf-8");
-    const json = lib.parse(content);
-    const map = {};
-    flattenObject(json, "", map);
-    return map;
-  } catch (error) {
-    logger.error(`Failed to read package.json from ${packagePath}: ${error}`);
-    return {};
-  }
-};
-const resolvePackageMetadata = async (projectRoot, checkWorkingDirectoryStatus, alwaysOverrideVersionFromGit, logger) => {
-  const sourceMap = /* @__PURE__ */ new Map();
-  const metadata = await resolvePackageMetadataT(
-    projectRoot,
-    logger,
-    readPackageMetadata.bind(void 0, logger),
-    mergePackageMetadata.bind(void 0, checkWorkingDirectoryStatus, alwaysOverrideVersionFromGit, sourceMap, logger)
-  );
-  return {
-    metadata,
-    sourceMap
-  };
-};
-const readRawPackageJson = async (logger, packagePath) => {
-  try {
-    const content = await readFile(packagePath, "utf-8");
-    return lib.parse(content);
-  } catch (error) {
-    logger.error(`Failed to read package.json from ${packagePath}: ${error}`);
-    throw error;
-  }
-};
-const resolveRawPackageJsonObject = async (projectRoot, checkWorkingDirectoryStatus, alwaysOverrideVersionFromGit, inheritableFields, logger) => {
-  const sourceMap = /* @__PURE__ */ new Map();
-  const packageJson = await resolvePackageMetadataT(
-    projectRoot,
-    logger,
-    readRawPackageJson.bind(void 0, logger),
-    mergeRawPackageJson.bind(void 0, checkWorkingDirectoryStatus, alwaysOverrideVersionFromGit, inheritableFields, sourceMap, logger)
-  );
-  return {
-    metadata: packageJson,
-    sourceMap
+const getFetchGitMetadata = (targetDir, checkWorkingDirectoryStatus, logger) => {
+  let cachedMetadata;
+  return async () => {
+    if (!cachedMetadata) {
+      cachedMetadata = await getGitMetadata(
+        targetDir,
+        checkWorkingDirectoryStatus,
+        logger
+      );
+    }
+    return cachedMetadata;
   };
 };
 export {
@@ -1917,6 +1937,7 @@ export {
   createConsoleLogger as c,
   replacePeerDependenciesWildcards as d,
   findWorkspaceRoot as f,
+  getFetchGitMetadata as g,
   resolvePackageMetadata as r
 };
-//# sourceMappingURL=internal-Dy8K0duL.js.map
+//# sourceMappingURL=analyzer-DxAKRQPj.js.map