@atlashub/smartstack-cli 2.6.0 → 2.6.2

package/dist/index.js

@@ -116644,16 +116644,7 @@ EndGlobal
       ]
     }
   ];
-  let smartstackVersion = null;
-  if (config.preview) {
-    logger.info("Fetching latest SmartStack preview version from NuGet...");
-    smartstackVersion = await getLatestNuGetVersion("SmartStack", true);
-    if (smartstackVersion) {
-      logger.info(`Latest preview version: ${source_default.cyan(smartstackVersion)}`);
-    } else {
-      logger.warning("Could not fetch latest version, using --prerelease fallback");
-    }
-  }
+  const smartstackVersion = config.smartStackVersion || null;
   const prereleaseFlag = config.preview ? " --prerelease" : "";
   for (const { project, packages } of nugetPackages) {
     for (const pkg2 of packages) {
@@ -116784,7 +116775,7 @@ appsettings.*.Local.json
     projectType: "client",
     dbContext: "extensions",
     baseNamespace: projectName,
-    smartStackVersion: "1.0.0",
+    smartStackVersion: config.smartStackVersion || "1.0.0",
     initialized: (/* @__PURE__ */ new Date()).toISOString()
   };
   const relPath3 = ".smartstack/config.json";
@@ -117738,6 +117729,14 @@ var initCommand = new Command("init").description("Initialize a new SmartStack p
       await import_fs_extra5.default.ensureDir((0, import_path6.join)(finalProjectDir, ".smartstack"));
       await saveInitState(finalProjectDir, state);
     }
+    if (!config.smartStackVersion) {
+      logger.info("Resolving SmartStack package version...");
+      const resolvedVersion = await getLatestNuGetVersion("SmartStack", config.preview);
+      if (resolvedVersion) {
+        config.smartStackVersion = resolvedVersion;
+        logger.info(`SmartStack version: ${source_default.cyan(resolvedVersion)}`);
+      }
+    }
     await executeStep(state, "config", finalProjectDir, dryRun, () => createConfigFiles(config, state, dryRun));
     await executeStep(state, "backend", finalProjectDir, dryRun, () => createBackendStructure(config, state, dryRun));
     await executeStep(state, "frontend", finalProjectDir, dryRun, () => createFrontendStructure(config, state, dryRun));
@@ -124543,11 +124542,19 @@ async function getLatestNuGetVersion2(packageName, prerelease) {
     if (!versions || versions.length === 0) {
       return null;
     }
-    const filteredVersions = prerelease ? versions.filter((v) => v.includes("-")) : versions.filter((v) => !v.includes("-"));
-    if (filteredVersions.length === 0) {
-      return null;
+    if (prerelease) {
+      const prereleaseVersions = versions.filter((v) => v.includes("-"));
+      if (prereleaseVersions.length > 0) {
+        return prereleaseVersions[prereleaseVersions.length - 1];
+      }
+      return versions[versions.length - 1];
     }
-    return filteredVersions[filteredVersions.length - 1];
+    const stableVersions = versions.filter((v) => !v.includes("-"));
+    if (stableVersions.length > 0) {
+      return stableVersions[stableVersions.length - 1];
+    }
+    logger.warning(`No stable version found for ${packageName}, using latest prerelease`);
+    return versions[versions.length - 1];
   } catch (error) {
     logger.warning(`Error fetching latest version for ${packageName}: ${error instanceof Error ? error.message : error}`);
     return null;
@@ -124561,15 +124568,31 @@ async function getLatestNpmVersion(packageName, prerelease) {
       return null;
     }
     const data = await response.json();
+    const distTags = data["dist-tags"];
+    if (distTags) {
+      const tag = prerelease ? "next" : "latest";
+      if (distTags[tag]) {
+        return distTags[tag];
+      }
+      if (prerelease && distTags["latest"]) {
+        return distTags["latest"];
+      }
+    }
     const versions = Object.keys(data.versions);
     if (!versions || versions.length === 0) {
       return null;
     }
-    const filteredVersions = prerelease ? versions.filter((v) => v.includes("-")) : versions.filter((v) => !v.includes("-"));
-    if (filteredVersions.length === 0) {
-      return null;
+    if (prerelease) {
+      const prereleaseVersions = versions.filter((v) => v.includes("-"));
+      if (prereleaseVersions.length > 0) {
+        return prereleaseVersions[prereleaseVersions.length - 1];
+      }
     }
-    return filteredVersions[filteredVersions.length - 1];
+    const stableVersions = versions.filter((v) => !v.includes("-"));
+    if (stableVersions.length > 0) {
+      return stableVersions[stableVersions.length - 1];
+    }
+    return versions[versions.length - 1];
   } catch (error) {
     logger.warning(`Error fetching latest npm version for ${packageName}: ${error instanceof Error ? error.message : error}`);
     return null;
@@ -124589,6 +124612,23 @@ async function detectSmartStackProject() {
     return { isProject: false, projectDir: cwd };
   }
 }
+function readPackageVersion(csprojContent, packageName) {
+  const regex2 = new RegExp(
+    `<PackageReference\\s+Include="${packageName}"\\s+Version="([^"]+)"`,
+    "i"
+  );
+  const match2 = csprojContent.match(regex2);
+  return match2 ? match2[1] : null;
+}
+function readAllPackageReferences(csprojContent) {
+  const regex2 = /<PackageReference\s+Include="([^"]+)"\s+Version="([^"]+)"/gi;
+  const packages = [];
+  let match2;
+  while ((match2 = regex2.exec(csprojContent)) !== null) {
+    packages.push({ name: match2[1], currentVersion: match2[2] });
+  }
+  return packages;
+}
 async function findProjectsWithSmartStack(projectDir) {
   const srcDir = (0, import_path7.join)(projectDir, "src");
   if (!await import_fs_extra6.default.pathExists(srcDir)) {
@@ -124604,14 +124644,32 @@ async function findProjectsWithSmartStack(projectDir) {
       for (const csproj of csprojFiles) {
         const csprojPath = (0, import_path7.join)(folderPath, csproj);
         const content = await import_fs_extra6.default.readFile(csprojPath, "utf-8");
-        if (content.includes("SmartStack")) {
-          projects.push(csprojPath);
+        const currentVersion = readPackageVersion(content, "SmartStack");
+        if (currentVersion !== null) {
+          projects.push({
+            csprojPath,
+            relPath: csprojPath.replace(projectDir, "").replace(/^[/\\]/, ""),
+            currentVersion
+          });
         }
       }
     }
   }
   return projects;
 }
+async function readFrontendVersion(frontendDir) {
+  try {
+    const packageJsonPath = (0, import_path7.join)(frontendDir, "package.json");
+    const packageJson = await import_fs_extra6.default.readJson(packageJsonPath);
+    const version2 = packageJson.dependencies?.["@atlashub/smartstack"];
+    if (!version2 || version2 === "latest" || version2 === "next") {
+      return null;
+    }
+    return version2.replace(/^[\^~]/, "");
+  } catch {
+    return null;
+  }
+}
 async function findFrontendDirectory(projectDir) {
   const webDir = (0, import_path7.join)(projectDir, "web");
   if (!await import_fs_extra6.default.pathExists(webDir)) {
@@ -124734,6 +124792,16 @@ async function executeMigrations(projectDir, fromVersion, toVersion, dryRun) {
 var upgradeCommand = new Command("upgrade").description("Upgrade SmartStack packages to the latest version").option("--preview", "Upgrade to latest preview/prerelease version").option("--dry-run", "Show what would be upgraded without actually upgrading").action(async (options) => {
   logger.header("SmartStack Package Upgrade");
   const dryRun = options.dryRun || false;
+  const result = {
+    nugetUpgraded: 0,
+    nugetSkipped: 0,
+    nugetFailed: 0,
+    otherPkgUpdated: 0,
+    otherPkgSkipped: 0,
+    otherPkgFailed: 0,
+    npmUpgraded: false,
+    npmSkipped: false
+  };
   if (dryRun) {
     logger.warning("DRY RUN MODE - No packages will be upgraded");
     console.log();
@@ -124747,8 +124815,8 @@ var upgradeCommand = new Command("upgrade").description("Upgrade SmartStack pack
   const { config, projectDir } = detection;
   logger.info(`Project: ${source_default.cyan(config.baseNamespace)}`);
   logger.info(`Type: ${source_default.cyan(config.projectType)}`);
-  const currentVersion = config.smartStackVersion || "2.0.0-preview.380";
-  logger.info(`Current version: ${source_default.yellow(currentVersion)}`);
+  const configVersion = config.smartStackVersion || "unknown";
+  logger.info(`Config version: ${source_default.yellow(configVersion)}`);
   console.log();
   const usePreview = options.preview || false;
   logger.info(`Target: ${usePreview ? source_default.yellow("Preview/Prerelease") : source_default.green("Stable")}`);
@@ -124768,21 +124836,82 @@ var upgradeCommand = new Command("upgrade").description("Upgrade SmartStack pack
   logger.info("Scanning for SmartStack projects...");
   const projects = await findProjectsWithSmartStack(projectDir);
   if (projects.length === 0) {
-    logger.warning("No .NET projects found with SmartStack package.");
+    logger.warning("No .NET projects found with SmartStack PackageReference.");
+    logger.info('Tip: Ensure your .csproj files contain <PackageReference Include="SmartStack" Version="..." />');
   } else {
-    logger.info(`Found ${source_default.cyan(projects.length)} project(s) to upgrade:`);
-    projects.forEach((p) => {
-      const relPath = p.replace(projectDir, "").replace(/^[/\\]/, "");
-      logger.info(`  \u2022 ${relPath}`);
-    });
+    logger.info(`Found ${source_default.cyan(projects.length)} project(s):`);
+    for (const p of projects) {
+      const versionInfo = p.currentVersion ? `${source_default.yellow(p.currentVersion)} \u2192 ${source_default.cyan(nugetVersion)}` : source_default.gray("version unknown");
+      const upToDate = p.currentVersion === nugetVersion;
+      const statusIcon = upToDate ? source_default.green("\u2713") : source_default.yellow("\u2191");
+      logger.info(`  ${statusIcon} ${p.relPath} (${upToDate ? source_default.green("up to date") : versionInfo})`);
+    }
+    console.log();
+    const projectsToUpgrade = projects.filter((p) => p.currentVersion !== nugetVersion);
+    result.nugetSkipped = projects.length - projectsToUpgrade.length;
+    if (projectsToUpgrade.length === 0) {
+      logger.success(`All ${projects.length} project(s) already at ${source_default.cyan(nugetVersion)}`);
+    } else {
+      logger.info(`Upgrading ${projectsToUpgrade.length} project(s)...`);
+      for (const project of projectsToUpgrade) {
+        logger.info(`Upgrading ${source_default.cyan(project.relPath)}...`);
+        try {
+          execCommand2(`dotnet add "${project.csprojPath}" package SmartStack --version ${nugetVersion}`, void 0, dryRun);
+          result.nugetUpgraded++;
+        } catch (error) {
+          result.nugetFailed++;
+          logger.error(`Failed to upgrade ${project.relPath}: ${error instanceof Error ? error.message : error}`);
+        }
+      }
+      if (result.nugetUpgraded > 0) {
+        logger.success(`${result.nugetUpgraded} project(s) upgraded to ${source_default.cyan(nugetVersion)}`);
+      }
+      if (result.nugetFailed > 0) {
+        logger.error(`${result.nugetFailed} project(s) failed to upgrade`);
+      }
+    }
     console.log();
-    logger.info("Upgrading NuGet packages...");
+    logger.info("Checking other NuGet packages...");
     for (const project of projects) {
-      const relPath = project.replace(projectDir, "").replace(/^[/\\]/, "");
-      logger.info(`Upgrading ${source_default.cyan(relPath)}...`);
-      execCommand2(`dotnet add "${project}" package SmartStack --version ${nugetVersion}`, void 0, dryRun);
+      const content = await import_fs_extra6.default.readFile(project.csprojPath, "utf-8");
+      const allPackages = readAllPackageReferences(content);
+      const otherPackages = allPackages.filter((p) => p.name !== "SmartStack");
+      if (otherPackages.length === 0) continue;
+      const relPath = project.relPath;
+      for (const pkg2 of otherPackages) {
+        try {
+          const output = dryRun ? `[DRY RUN] dotnet add "${project.csprojPath}" package ${pkg2.name}` : (0, import_child_process6.execSync)(
+            `dotnet add "${project.csprojPath}" package ${pkg2.name}`,
+            { shell: true, encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }
+          );
+          if (dryRun) {
+            logger.info(`  [DRY RUN] ${pkg2.name} ${source_default.yellow(pkg2.currentVersion)} \u2192 latest`);
+            result.otherPkgUpdated++;
+            continue;
+          }
+          const newContent = await import_fs_extra6.default.readFile(project.csprojPath, "utf-8");
+          const newVersion = readPackageVersion(newContent, pkg2.name);
+          if (newVersion && newVersion !== pkg2.currentVersion) {
+            logger.success(`  ${source_default.green("\u2713")} ${pkg2.name} ${source_default.yellow(pkg2.currentVersion)} \u2192 ${source_default.cyan(newVersion)}`);
+            result.otherPkgUpdated++;
+          } else {
+            result.otherPkgSkipped++;
+          }
+        } catch (error) {
+          result.otherPkgFailed++;
+          logger.error(`  ${source_default.red("\u2717")} ${pkg2.name}: ${error instanceof Error ? error.message : error}`);
+        }
+      }
+    }
+    if (result.otherPkgUpdated > 0) {
+      logger.success(`${result.otherPkgUpdated} package(s) updated`);
+    }
+    if (result.otherPkgSkipped > 0) {
+      logger.info(`${result.otherPkgSkipped} package(s) already at latest`);
+    }
+    if (result.otherPkgFailed > 0) {
+      logger.error(`${result.otherPkgFailed} package(s) failed to update`);
     }
-    logger.success(`NuGet packages upgraded to ${source_default.cyan(nugetVersion)}`);
     console.log();
   }
   const frontendDir = await findFrontendDirectory(projectDir);
@@ -124790,18 +124919,25 @@ var upgradeCommand = new Command("upgrade").description("Upgrade SmartStack pack
     logger.warning("No frontend directory found with @atlashub/smartstack package.");
   } else {
     const relFrontendPath = frontendDir.replace(projectDir, "").replace(/^[/\\]/, "");
-    logger.info(`Frontend: ${source_default.cyan(relFrontendPath)}`);
-    if (npmVersion) {
+    const currentFrontendVersion = await readFrontendVersion(frontendDir);
+    if (currentFrontendVersion && npmVersion && currentFrontendVersion === npmVersion) {
+      logger.info(`Frontend: ${source_default.cyan(relFrontendPath)} ${source_default.green("\u2713")} already at ${source_default.cyan(npmVersion)}`);
+      result.npmSkipped = true;
+    } else if (npmVersion) {
+      const versionInfo = currentFrontendVersion ? `${source_default.yellow(currentFrontendVersion)} \u2192 ${source_default.cyan(npmVersion)}` : `\u2192 ${source_default.cyan(npmVersion)}`;
+      logger.info(`Frontend: ${source_default.cyan(relFrontendPath)} (${versionInfo})`);
       logger.info("Upgrading npm package...");
       const success = tryExecCommand(`npm install @atlashub/smartstack@${npmVersion}`, frontendDir, dryRun);
       if (success) {
         logger.success(`npm package upgraded to ${source_default.cyan(npmVersion)}`);
+        result.npmUpgraded = true;
       } else {
         logger.warning(`Version ${npmVersion} not yet available, trying @next tag...`);
         const tag = usePreview ? "next" : "latest";
         const fallbackSuccess = tryExecCommand(`npm install @atlashub/smartstack@${tag}`, frontendDir, dryRun);
         if (fallbackSuccess) {
           logger.success(`npm package upgraded to @${tag}`);
+          result.npmUpgraded = true;
         } else {
           logger.error("Failed to upgrade npm package. Please try again later or run: npm install @atlashub/smartstack@next");
         }
@@ -124814,7 +124950,7 @@ var upgradeCommand = new Command("upgrade").description("Upgrade SmartStack pack
   logger.info("Checking for code migrations...");
   const migrationSummary = await executeMigrations(
     projectDir,
-    currentVersion,
+    configVersion,
     nugetVersion,
     dryRun
   );
@@ -124832,26 +124968,57 @@ var upgradeCommand = new Command("upgrade").description("Upgrade SmartStack pack
     config.smartStackVersion = nugetVersion;
     const configPath = (0, import_path7.join)(projectDir, ".smartstack", "config.json");
     await import_fs_extra6.default.writeJson(configPath, config, { spaces: 2 });
-    logger.success(`Updated project version to ${source_default.cyan(nugetVersion)}`);
+    logger.success(`Updated config version to ${source_default.cyan(nugetVersion)}`);
     console.log();
   }
-  const summary = [
-    source_default.green.bold("Upgrade completed successfully!"),
-    "",
-    source_default.bold("Upgraded packages:"),
-    `  \u2022 NuGet SmartStack: ${source_default.cyan(nugetVersion)}`,
-    npmVersion ? `  \u2022 npm @atlashub/smartstack: ${source_default.cyan(npmVersion)}` : "",
-    "",
-    migrationSummary.totalApplied > 0 ? source_default.bold("Code migrations:") : "",
-    migrationSummary.totalApplied > 0 ? `  \u2022 ${source_default.green(migrationSummary.totalApplied)} migration(s) applied` : "",
-    migrationSummary.hasErrors ? `  \u2022 ${source_default.red("Some migrations failed - review errors above")}` : "",
-    migrationSummary.totalApplied > 0 ? "" : "",
-    source_default.yellow("Next steps:"),
-    `  1. Review changes: ${source_default.cyan("git diff")}`,
-    `  2. Test your application`,
-    `  3. Commit changes: ${source_default.cyan('git add . && git commit -m "chore: upgrade SmartStack packages"')}`
-  ].filter(Boolean);
-  logger.box(summary, "success");
+  const totalChanged = result.nugetUpgraded + result.otherPkgUpdated + (result.npmUpgraded ? 1 : 0) + migrationSummary.totalApplied;
+  const allUpToDate = totalChanged === 0 && result.nugetFailed === 0 && result.otherPkgFailed === 0;
+  if (allUpToDate) {
+    const summary = [
+      source_default.green.bold("Already up to date!"),
+      "",
+      `  NuGet SmartStack: ${source_default.cyan(nugetVersion)}`,
+      npmVersion ? `  npm @atlashub/smartstack: ${source_default.cyan(npmVersion)}` : "",
+      "",
+      "All packages at latest versions."
+    ].filter(Boolean);
+    logger.box(summary, "success");
+  } else {
+    const lines = [
+      source_default.green.bold("Upgrade completed!"),
+      ""
+    ];
+    if (result.nugetUpgraded > 0) {
+      lines.push(`  ${source_default.green("\u2713")} SmartStack: ${result.nugetUpgraded} project(s) \u2192 ${source_default.cyan(nugetVersion)}`);
+    }
+    if (result.nugetSkipped > 0) {
+      lines.push(`  ${source_default.gray("\u2013")} SmartStack: ${result.nugetSkipped} project(s) already up to date`);
+    }
+    if (result.nugetFailed > 0) {
+      lines.push(`  ${source_default.red("\u2717")} SmartStack: ${result.nugetFailed} project(s) failed`);
+    }
+    if (result.otherPkgUpdated > 0) {
+      lines.push(`  ${source_default.green("\u2713")} Other NuGet: ${result.otherPkgUpdated} package(s) updated`);
+    }
+    if (result.otherPkgFailed > 0) {
+      lines.push(`  ${source_default.red("\u2717")} Other NuGet: ${result.otherPkgFailed} package(s) failed`);
+    }
+    if (result.npmUpgraded) {
+      lines.push(`  ${source_default.green("\u2713")} npm: @atlashub/smartstack \u2192 ${source_default.cyan(npmVersion)}`);
+    }
+    if (result.npmSkipped) {
+      lines.push(`  ${source_default.gray("\u2013")} npm: already up to date`);
+    }
+    if (migrationSummary.totalApplied > 0) {
+      lines.push(`  ${source_default.green("\u2713")} Code migrations: ${migrationSummary.totalApplied} applied`);
+    }
+    lines.push("");
+    lines.push(source_default.yellow("Next steps:"));
+    lines.push(`  1. Review changes: ${source_default.cyan("git diff")}`);
+    lines.push(`  2. Test your application`);
+    lines.push(`  3. Commit changes: ${source_default.cyan('git add . && git commit -m "chore: upgrade SmartStack to ' + nugetVersion + '"')}`);
+    logger.box(lines, "success");
+  }
 });
 
 // src/lib/license.ts