@sanlam-fintech-digital/mfe-platform-cli 0.2.8 → 0.4.0

package/dist/nuget/manager.js

@@ -13,25 +13,59 @@ const os_1 = __importDefault(require("os"));
 const chalk_1 = __importDefault(require("chalk"));
 const fast_xml_parser_1 = require("fast-xml-parser");
 /**
- * Get platform-specific NuGet config path
+ * Get platform-specific NuGet config paths (primary and legacy fallback)
  */
-function getNugetConfigPath(configPath) {
-    if (configPath)
-        return configPath;
+function getNugetConfigPaths() {
     const platform = process.platform;
     if (platform === 'win32') {
         const appData = process.env.APPDATA || path_1.default.join(os_1.default.homedir(), 'AppData', 'Roaming');
-        return path_1.default.join(appData, 'NuGet', 'NuGet.Config');
+        const primary = path_1.default.join(appData, 'NuGet', 'NuGet.Config');
+        return { primary, legacy: null };
     }
     else {
-        return path_1.default.join(os_1.default.homedir(), '.config', 'NuGet', 'NuGet.Config');
+        const primary = path_1.default.join(os_1.default.homedir(), '.nuget', 'NuGet', 'NuGet.Config');
+        const legacy = path_1.default.join(os_1.default.homedir(), '.config', 'NuGet', 'NuGet.Config');
+        return { primary, legacy };
+    }
+}
+/**
+ * Resolve the NuGet config path to use, checking both new and legacy locations.
+ * If a custom path is provided it is used as-is.
+ * Otherwise the new primary path (~/.nuget/NuGet/NuGet.Config) takes precedence,
+ * falling back to the legacy path (~/.config/NuGet/NuGet.Config) when it exists
+ * and the primary does not.
+ */
+async function resolveNugetConfigPath(configPath) {
+    if (configPath)
+        return configPath;
+    const { primary, legacy } = getNugetConfigPaths();
+    if (!legacy)
+        return primary;
+    // Prefer primary; fall back to legacy only when primary is absent (ENOENT)
+    try {
+        await promises_1.default.access(primary);
+        return primary;
+    }
+    catch (err) {
+        // Only fall back to legacy when the primary path truly does not exist.
+        // For any other error (e.g. EACCES, EIO) keep the primary path so the
+        // caller sees the real failure rather than silently switching paths.
+        if (err.code !== 'ENOENT')
+            return primary;
+        try {
+            await promises_1.default.access(legacy);
+            return legacy;
+        }
+        catch {
+            return primary;
+        }
     }
 }
 /**
  * Backup existing NuGet.config
  */
 async function backupNugetConfig(configPath) {
-    const nugetPath = getNugetConfigPath(configPath);
+    const nugetPath = await resolveNugetConfigPath(configPath);
     const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
     const backupPath = `${nugetPath}.backup.${timestamp}`;
     try {
@@ -49,7 +83,7 @@ async function backupNugetConfig(configPath) {
  * Read and parse NuGet.config
  */
 async function readNugetConfig(configPath) {
-    const nugetPath = getNugetConfigPath(configPath);
+    const nugetPath = await resolveNugetConfigPath(configPath);
     try {
         const content = await promises_1.default.readFile(nugetPath, 'utf-8');
         const parser = new fast_xml_parser_1.XMLParser({
@@ -103,9 +137,7 @@ async function addNuGetFeeds(feeds, tokenMap, configPath) {
         // Add credentials if token provided
         const token = tokenMap?.get(feed.url);
         if (token) {
-            // Normalize credential key (replace invalid XML chars)
-            const credKey = sourceName.replace(/[^a-zA-Z0-9_]/g, '_');
-            credentials[credKey] = {
+            credentials[sourceName] = {
                 add: [
                     { '@_key': 'Username', '@_value': 'PersonalAccessToken' },
                     { '@_key': 'ClearTextPassword', '@_value': token }
@@ -119,7 +151,7 @@ async function addNuGetFeeds(feeds, tokenMap, configPath) {
  * Write NuGet.config
  */
 async function writeNugetConfig(config, configPath) {
-    const nugetPath = getNugetConfigPath(configPath);
+    const nugetPath = await resolveNugetConfigPath(configPath);
     const dir = path_1.default.dirname(nugetPath);
     // Ensure directory exists
     await promises_1.default.mkdir(dir, { recursive: true });
@@ -140,6 +172,6 @@ async function writeNugetConfig(config, configPath) {
  * Restore from backup
  */
 async function restoreNugetFromBackup(backupPath, configPath) {
-    const nugetPath = getNugetConfigPath(configPath);
+    const nugetPath = await resolveNugetConfigPath(configPath);
     await promises_1.default.copyFile(backupPath, nugetPath);
 }

package/dist/types/config.js

@@ -6,6 +6,29 @@ const zod_1 = require("zod");
  * Package feed type
  */
 const FeedTypeSchema = zod_1.z.enum(['npm', 'nuget']).default('npm');
+/**
+ * Validates if a string is a valid XML element name.
+ * XML 1.0 specification (https://www.w3.org/TR/xml/#NT-Name):
+ * - Must start with a letter (A-Z, a-z) or underscore (_)
+ * - Can contain letters, digits, hyphens (-), underscores (_), and periods (.)
+ * - Cannot start with "xml" (case-insensitive)
+ * - Cannot contain spaces or special characters like @, $, %, etc.
+ */
+function isValidXmlElementName(name) {
+    // Empty string is invalid
+    if (!name)
+        return false;
+    // Must start with letter or underscore (not digit, hyphen, or period)
+    if (!/^[A-Za-z_]/.test(name))
+        return false;
+    // Can only contain letters, digits, hyphens, underscores, and periods
+    if (!/^[A-Za-z_][A-Za-z0-9._-]*$/.test(name))
+        return false;
+    // Cannot start with "xml" (case-insensitive)
+    if (/^xml/i.test(name))
+        return false;
+    return true;
+}
 /**
  * Individual registry entry (npm or NuGet feed)
  */
@@ -13,6 +36,19 @@ const RegistryEntrySchema = zod_1.z.object({
     scope: zod_1.z.string().describe('npm scope (e.g., "@org/package") or NuGet source name'),
     url: zod_1.z.url().describe('Registry/Feed URL (Azure DevOps, GitHub, or public)').transform((url) => url.replace(/\/+$/, '')),
     feedType: FeedTypeSchema.optional().describe('Package feed type (defaults to npm for backward compatibility)'),
+}).superRefine((data, ctx) => {
+    // For NuGet feeds, the scope becomes an XML element name in NuGet.Config
+    // Validate it meets XML element name requirements
+    const feedType = data.feedType || 'npm';
+    if (feedType === 'nuget' && !isValidXmlElementName(data.scope)) {
+        ctx.addIssue({
+            code: zod_1.z.ZodIssueCode.custom,
+            message: `NuGet source name "${data.scope}" is not a valid XML element name. ` +
+                `It must start with a letter or underscore, contain only letters, digits, hyphens, underscores, and periods, ` +
+                `and cannot start with "xml" (case-insensitive).`,
+            path: ['scope'],
+        });
+    }
 });
 /**
  * Azure DevOps auth group (requires tenantId)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanlam-fintech-digital/mfe-platform-cli",
-  "version": "0.2.8",
+  "version": "0.4.0",
   "description": "Bootstrapping and orchestration CLI for the Sanlam Fintech Digital platform",
   "main": "dist/index.js",
   "bin": {