@cellajs/cli 0.6.1 → 0.6.2

package/dist/index.js

@@ -228,7 +228,7 @@ import process5 from "process";
 // package.json
 var package_default = {
   name: "@cellajs/cli",
-  version: "0.6.1",
+  version: "0.6.2",
   private: false,
   license: "MIT",
   description: "CLI for managing your monorepo and upgrading it with upstream Cella.",
@@ -1436,6 +1436,129 @@ function formatAlignmentsLine(total, open) {
   return `alignments: ${parts.join(" \xB7 ")}`;
 }
 
+// src/utils/upstream-overrides.ts
+import { Node, Project as Project2, SyntaxKind as SyntaxKind2 } from "ts-morph";
+var LIST_KEYS = ["pinned", "ignored"];
+function resolveExpression(node, sourceFile, depth = 0) {
+  if (!node || depth > 8) return node;
+  if (Node.isParenthesizedExpression(node) || Node.isAsExpression(node) || Node.isSatisfiesExpression(node)) {
+    return resolveExpression(node.getExpression(), sourceFile, depth + 1);
+  }
+  if (Node.isIdentifier(node)) {
+    return resolveExpression(
+      sourceFile.getVariableDeclaration(node.getText())?.getInitializer(),
+      sourceFile,
+      depth + 1
+    );
+  }
+  return node;
+}
+function findConfigObject(sourceFile) {
+  for (const call of sourceFile.getDescendantsOfKind(SyntaxKind2.CallExpression)) {
+    if (call.getExpression().getText() !== "defineConfig") continue;
+    const arg = resolveExpression(call.getArguments()[0], sourceFile);
+    if (Node.isObjectLiteralExpression(arg)) return arg;
+  }
+  const exported = sourceFile.getExportAssignment((assignment) => !assignment.isExportEquals());
+  const value = resolveExpression(exported?.getExpression(), sourceFile);
+  return Node.isObjectLiteralExpression(value) ? value : void 0;
+}
+function readProperty(object, name, sourceFile) {
+  for (const property of object.getProperties()) {
+    if (Node.isPropertyAssignment(property)) {
+      if (property.getName().replace(/^['"`]|['"`]$/g, "") !== name) continue;
+      return resolveExpression(property.getInitializer(), sourceFile) ?? null;
+    }
+    if (Node.isShorthandPropertyAssignment(property) && property.getName() === name) {
+      return resolveExpression(property.getNameNode(), sourceFile) ?? null;
+    }
+  }
+  return void 0;
+}
+function readStringEntries(node) {
+  if (!Node.isArrayLiteralExpression(node)) return null;
+  const entries = [];
+  for (const element of node.getElements()) {
+    if (Node.isStringLiteral(element) || Node.isNoSubstitutionTemplateLiteral(element)) {
+      entries.push(element.getLiteralValue());
+    }
+  }
+  return entries;
+}
+function readPackageJsonKeys(config, sourceFile) {
+  const settings = readProperty(config, "settings", sourceFile);
+  if (settings === void 0) return [...DEFAULT_PACKAGE_JSON_KEYS];
+  if (!settings || !Node.isObjectLiteralExpression(settings)) return null;
+  const current = readProperty(settings, "packageJsonKeys", sourceFile);
+  const keys = current === void 0 ? readProperty(settings, "packageJsonSync", sourceFile) : current;
+  if (keys === void 0) return [...DEFAULT_PACKAGE_JSON_KEYS];
+  return keys ? readStringEntries(keys) : null;
+}
+function parseOverrideLists(source) {
+  try {
+    const project = new Project2({ useInMemoryFileSystem: true, skipLoadingLibFiles: true });
+    const sourceFile = project.createSourceFile("cella.config.ts", source);
+    const config = findConfigObject(sourceFile);
+    if (!config) return null;
+    const lists = {
+      pinned: [],
+      ignored: [],
+      packageJsonKeys: readPackageJsonKeys(config, sourceFile)
+    };
+    const overrides = readProperty(config, "overrides", sourceFile);
+    if (overrides === void 0) return lists;
+    if (!overrides || !Node.isObjectLiteralExpression(overrides)) return null;
+    for (const key of LIST_KEYS) {
+      const list = readProperty(overrides, key, sourceFile);
+      if (list === void 0) continue;
+      const entries = list ? readStringEntries(list) : null;
+      if (!entries) return null;
+      lists[key] = entries;
+    }
+    return lists;
+  } catch {
+    return null;
+  }
+}
+function diffOverrideLists(base, incoming, fork) {
+  const diff = (key) => {
+    const baseSet = new Set(base[key].map(normalizeEntry).filter(Boolean));
+    const incomingSet = new Set(incoming[key].map(normalizeEntry).filter(Boolean));
+    const forkEntries = fork[key].map(normalizeEntry).filter(Boolean);
+    return {
+      added: [...incomingSet].filter((entry) => !baseSet.has(entry) && !isUnderAnyFolder(entry, forkEntries)),
+      removed: [...baseSet].filter((entry) => !incomingSet.has(entry) && forkEntries.includes(entry))
+    };
+  };
+  const diffKeys = () => {
+    const [baseKeys, incomingKeys, forkKeys] = [base.packageJsonKeys, incoming.packageJsonKeys, fork.packageJsonKeys];
+    if (!baseKeys || !incomingKeys || !forkKeys) return { added: [], removed: [] };
+    return {
+      added: [...new Set(incomingKeys)].filter((key) => !baseKeys.includes(key) && !forkKeys.includes(key)),
+      removed: [...new Set(baseKeys)].filter((key) => !incomingKeys.includes(key) && forkKeys.includes(key))
+    };
+  };
+  return { pinned: diff("pinned"), ignored: diff("ignored"), packageJsonKeys: diffKeys() };
+}
+async function compareUpstreamOverrides(repoPath, mergeBaseRef, incomingRef, forkConfig) {
+  const [baseSource, incomingSource] = await Promise.all(
+    [mergeBaseRef, incomingRef].map((ref) => git(["show", `${ref}:${CONFIG_FILE}`], repoPath, { ignoreErrors: true }))
+  );
+  if (baseSource === incomingSource) return void 0;
+  const base = baseSource ? parseOverrideLists(baseSource) : null;
+  if (!base) return { kind: "unreadable", side: "base" };
+  const incoming = incomingSource ? parseOverrideLists(incomingSource) : null;
+  if (!incoming) return { kind: "unreadable", side: "incoming" };
+  const fork = {
+    pinned: forkConfig.overrides?.pinned ?? [],
+    ignored: forkConfig.overrides?.ignored ?? [],
+    packageJsonKeys: forkConfig.settings.packageJsonKeys ?? DEFAULT_PACKAGE_JSON_KEYS
+  };
+  const changes = diffOverrideLists(base, incoming, fork);
+  const count3 = Object.values(changes).reduce((n, list) => n + list.added.length + list.removed.length, 0);
+  return count3 > 0 ? { kind: "changes", ...changes } : void 0;
+}
+
 // src/utils/overrides.ts
 function normalizeEntry(entry) {
   return entry.trim().replace(/^\.\//, "").replace(/\/+$/, "");
@@ -1491,8 +1614,11 @@ async function validateOverrides(config, forkPath, upstreamRef) {
   }
   if (upstream && pinsUpstreamHas.length > 0) {
     const differs = await listChangedSinceRef(forkPath, upstream, pinsUpstreamHas.map(normalizeEntry));
+    const upstreamSource = await git(["show", `${upstream}:${CONFIG_FILE}`], forkPath, { ignoreErrors: true });
+    const upstreamPins = upstreamSource && parseOverrideLists(upstreamSource)?.pinned.map(normalizeEntry) || [];
     for (const entry of pinsUpstreamHas) {
       if (differs.some((changed) => isUnderAnyFolder(changed, [entry]))) continue;
+      if (upstreamPins.includes(normalizeEntry(entry))) continue;
       warnings.push(`pin is identical to upstream, it only drops upstream's next change: ${entry}`);
     }
   }
@@ -1814,129 +1940,6 @@ function cliVersionMismatch(running, range) {
   ].join("\n");
 }
 
-// src/utils/upstream-overrides.ts
-import { Node, Project as Project2, SyntaxKind as SyntaxKind2 } from "ts-morph";
-var LIST_KEYS = ["pinned", "ignored"];
-function resolveExpression(node, sourceFile, depth = 0) {
-  if (!node || depth > 8) return node;
-  if (Node.isParenthesizedExpression(node) || Node.isAsExpression(node) || Node.isSatisfiesExpression(node)) {
-    return resolveExpression(node.getExpression(), sourceFile, depth + 1);
-  }
-  if (Node.isIdentifier(node)) {
-    return resolveExpression(
-      sourceFile.getVariableDeclaration(node.getText())?.getInitializer(),
-      sourceFile,
-      depth + 1
-    );
-  }
-  return node;
-}
-function findConfigObject(sourceFile) {
-  for (const call of sourceFile.getDescendantsOfKind(SyntaxKind2.CallExpression)) {
-    if (call.getExpression().getText() !== "defineConfig") continue;
-    const arg = resolveExpression(call.getArguments()[0], sourceFile);
-    if (Node.isObjectLiteralExpression(arg)) return arg;
-  }
-  const exported = sourceFile.getExportAssignment((assignment) => !assignment.isExportEquals());
-  const value = resolveExpression(exported?.getExpression(), sourceFile);
-  return Node.isObjectLiteralExpression(value) ? value : void 0;
-}
-function readProperty(object, name, sourceFile) {
-  for (const property of object.getProperties()) {
-    if (Node.isPropertyAssignment(property)) {
-      if (property.getName().replace(/^['"`]|['"`]$/g, "") !== name) continue;
-      return resolveExpression(property.getInitializer(), sourceFile) ?? null;
-    }
-    if (Node.isShorthandPropertyAssignment(property) && property.getName() === name) {
-      return resolveExpression(property.getNameNode(), sourceFile) ?? null;
-    }
-  }
-  return void 0;
-}
-function readStringEntries(node) {
-  if (!Node.isArrayLiteralExpression(node)) return null;
-  const entries = [];
-  for (const element of node.getElements()) {
-    if (Node.isStringLiteral(element) || Node.isNoSubstitutionTemplateLiteral(element)) {
-      entries.push(element.getLiteralValue());
-    }
-  }
-  return entries;
-}
-function readPackageJsonKeys(config, sourceFile) {
-  const settings = readProperty(config, "settings", sourceFile);
-  if (settings === void 0) return [...DEFAULT_PACKAGE_JSON_KEYS];
-  if (!settings || !Node.isObjectLiteralExpression(settings)) return null;
-  const current = readProperty(settings, "packageJsonKeys", sourceFile);
-  const keys = current === void 0 ? readProperty(settings, "packageJsonSync", sourceFile) : current;
-  if (keys === void 0) return [...DEFAULT_PACKAGE_JSON_KEYS];
-  return keys ? readStringEntries(keys) : null;
-}
-function parseOverrideLists(source) {
-  try {
-    const project = new Project2({ useInMemoryFileSystem: true, skipLoadingLibFiles: true });
-    const sourceFile = project.createSourceFile("cella.config.ts", source);
-    const config = findConfigObject(sourceFile);
-    if (!config) return null;
-    const lists = {
-      pinned: [],
-      ignored: [],
-      packageJsonKeys: readPackageJsonKeys(config, sourceFile)
-    };
-    const overrides = readProperty(config, "overrides", sourceFile);
-    if (overrides === void 0) return lists;
-    if (!overrides || !Node.isObjectLiteralExpression(overrides)) return null;
-    for (const key of LIST_KEYS) {
-      const list = readProperty(overrides, key, sourceFile);
-      if (list === void 0) continue;
-      const entries = list ? readStringEntries(list) : null;
-      if (!entries) return null;
-      lists[key] = entries;
-    }
-    return lists;
-  } catch {
-    return null;
-  }
-}
-function diffOverrideLists(base, incoming, fork) {
-  const diff = (key) => {
-    const baseSet = new Set(base[key].map(normalizeEntry).filter(Boolean));
-    const incomingSet = new Set(incoming[key].map(normalizeEntry).filter(Boolean));
-    const forkEntries = fork[key].map(normalizeEntry).filter(Boolean);
-    return {
-      added: [...incomingSet].filter((entry) => !baseSet.has(entry) && !isUnderAnyFolder(entry, forkEntries)),
-      removed: [...baseSet].filter((entry) => !incomingSet.has(entry) && forkEntries.includes(entry))
-    };
-  };
-  const diffKeys = () => {
-    const [baseKeys, incomingKeys, forkKeys] = [base.packageJsonKeys, incoming.packageJsonKeys, fork.packageJsonKeys];
-    if (!baseKeys || !incomingKeys || !forkKeys) return { added: [], removed: [] };
-    return {
-      added: [...new Set(incomingKeys)].filter((key) => !baseKeys.includes(key) && !forkKeys.includes(key)),
-      removed: [...new Set(baseKeys)].filter((key) => !incomingKeys.includes(key) && forkKeys.includes(key))
-    };
-  };
-  return { pinned: diff("pinned"), ignored: diff("ignored"), packageJsonKeys: diffKeys() };
-}
-async function compareUpstreamOverrides(repoPath, mergeBaseRef, incomingRef, forkConfig) {
-  const [baseSource, incomingSource] = await Promise.all(
-    [mergeBaseRef, incomingRef].map((ref) => git(["show", `${ref}:${CONFIG_FILE}`], repoPath, { ignoreErrors: true }))
-  );
-  if (baseSource === incomingSource) return void 0;
-  const base = baseSource ? parseOverrideLists(baseSource) : null;
-  if (!base) return { kind: "unreadable", side: "base" };
-  const incoming = incomingSource ? parseOverrideLists(incomingSource) : null;
-  if (!incoming) return { kind: "unreadable", side: "incoming" };
-  const fork = {
-    pinned: forkConfig.overrides?.pinned ?? [],
-    ignored: forkConfig.overrides?.ignored ?? [],
-    packageJsonKeys: forkConfig.settings.packageJsonKeys ?? DEFAULT_PACKAGE_JSON_KEYS
-  };
-  const changes = diffOverrideLists(base, incoming, fork);
-  const count3 = Object.values(changes).reduce((n, list) => n + list.added.length + list.removed.length, 0);
-  return count3 > 0 ? { kind: "changes", ...changes } : void 0;
-}
-
 // src/services/analyze-core.ts
 function isReportableIgnored(filePath) {
   return !isManagedFile(filePath) && !isGeneratedFile(filePath);