timonel 2.11.0 → 2.12.0

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+# [2.12.0](https://github.com/KenkoGeek/timonel/compare/v2.11.0...v2.12.0) (2025-09-28)
+
+### Bug Fixes
+
+- **cli:** harden flag handling and path validation ([#130](https://github.com/KenkoGeek/timonel/issues/130)) ([2186d88](https://github.com/KenkoGeek/timonel/commit/2186d886428752025e7bf531c4a6541dade683a6))
+
+### Features
+
+- **docs:** update references and CLI [skip ci] ([23704d3](https://github.com/KenkoGeek/timonel/commit/23704d3164cfbb92d183af40c70e27a32b566d06))
+- **docs:** update references and CLI [skip ci] ([be4bcdc](https://github.com/KenkoGeek/timonel/commit/be4bcdca62cb3a9339e5ad70efc0ba31a6d9d5be))
+
 # [2.11.0](https://github.com/KenkoGeek/timonel/compare/v2.10.2...v2.11.0) (2025-09-26)
 
 ### Features

package/README.md

@@ -38,9 +38,6 @@ npm install -g timonel
 
 # Or use with pnpm
 pnpm add -g timonel
-
-# Verify installation
-tl --version
 ```
 
 ### Basic Usage
@@ -157,10 +154,10 @@ If you get `Error: Cannot find module 'cdk8s'` when running `tl umbrella synth`:
   "version": "1.0.0",
   "type": "module",
   "dependencies": {
-    "cdk8s": "^2.70.15",
-    "cdk8s-plus-33": "^2.3.6",
+    "cdk8s": "^2.70.16",
+    "cdk8s-plus-33": "^2.3.8",
     "constructs": "^10.4.2",
-    "timonel": "^2.9.2"
+    "timonel": "^2.11.0"
   },
   "devDependencies": {
     "@types/node": "^24.5.2",
@@ -176,45 +173,6 @@ npm install
 tl umbrella synth  # Now it works!
 ```
 
-### Version Display Issues
-
-If the CLI shows an incorrect version:
-
-**Problem**: The CLI might be using cached or hardcoded version information.
-
-**Solution**: Rebuild the project:
-
-```bash
-# In the Timonel project directory
-pnpm build
-tl --version  # Should show correct version
-```
-
-### TypeScript Compilation Errors
-
-If you encounter TypeScript errors when using umbrella charts:
-
-**Problem**: Type mismatches in subchart configurations.
-
-**Solution**: Ensure proper type casting for version and description fields:
-
-```typescript
-// ✅ Correct
-const subchart = {
-  name: 'my-service',
-  version: '1.0.0' as string,
-  description: 'My service' as string,
-  chart: myChartFunction,
-};
-
-// ❌ Incorrect
-const subchart = {
-  name: 'my-service',
-  version: someUnknownValue, // This will cause TypeScript errors
-  chart: myChartFunction,
-};
-```
-
 ## 🤝 Contributing
 
 See our [Contributing Guide](https://github.com/KenkoGeek/timonel/wiki/Contributing) for development

package/dist/cli.js

@@ -12,37 +12,20 @@ const UMBRELLA_FILE_NAME = 'umbrella.ts';
 const PACKAGE_JSON_FILE = 'package.json';
 function getVersion() {
     try {
-        const possiblePaths = [
-            path.resolve(__dirname, '..', PACKAGE_JSON_FILE),
-            path.resolve(__dirname, '..', '..', PACKAGE_JSON_FILE),
-            path.resolve(process.cwd(), PACKAGE_JSON_FILE),
-            path.resolve(__dirname, PACKAGE_JSON_FILE),
-        ];
-        for (const packagePath of possiblePaths) {
-            try {
-                const validatedPath = SecurityUtils.validatePath(packagePath, process.cwd());
-                if (fs.existsSync(validatedPath)) {
-                    try {
-                        const packageJson = JSON.parse(fs.readFileSync(validatedPath, 'utf8'));
-                        return packageJson.version || 'unknown';
-                    }
-                    catch {
-                        continue;
-                    }
-                }
-            }
-            catch {
-                continue;
-            }
+        const packagePath = path.resolve(__dirname, '..', PACKAGE_JSON_FILE);
+        const allowedBase = path.resolve(__dirname, '..');
+        const validatedPath = SecurityUtils.validatePath(packagePath, allowedBase);
+        const packageJson = JSON.parse(fs.readFileSync(validatedPath, 'utf8'));
+        if (packageJson.version) {
+            return packageJson.version;
         }
-        if (process.env.npm_package_version) {
-            return process.env.npm_package_version;
-        }
-        return 'unknown';
     }
     catch {
-        return 'unknown';
     }
+    if (process.env.npm_package_version) {
+        return process.env.npm_package_version;
+    }
+    return 'unknown';
 }
 const cliLogger = createLogger('cli');
 function log(msg, silent = false) {
@@ -162,7 +145,23 @@ await import(pathToFileURL('${tempChartFile}').href);
     }
 }
 async function cmdValidate(flags) {
-    const result = spawnSync('helm', ['lint', '.'], {
+    const lintArgs = ['lint', '.'];
+    if (flags?.env) {
+        try {
+            const sanitizedEnv = SecurityUtils.sanitizeEnvironmentName(flags.env);
+            lintArgs.push('-f', `values-${sanitizedEnv}.yaml`);
+        }
+        catch (error) {
+            console.error(SecurityUtils.sanitizeLogMessage(error.message));
+            process.exit(1);
+        }
+    }
+    if (flags?.set) {
+        for (const setValue of flags.set) {
+            lintArgs.push('--set', setValue);
+        }
+    }
+    const result = spawnSync('helm', lintArgs, {
         stdio: flags?.silent ? 'pipe' : 'inherit',
         encoding: 'utf8',
     });
@@ -180,6 +179,21 @@ async function cmdDeploy(release, namespace, flags) {
     if (namespace) {
         args.push('--namespace', namespace);
     }
+    if (flags?.env) {
+        try {
+            const sanitizedEnv = SecurityUtils.sanitizeEnvironmentName(flags.env);
+            args.push('-f', `values-${sanitizedEnv}.yaml`);
+        }
+        catch (error) {
+            console.error(SecurityUtils.sanitizeLogMessage(error.message));
+            process.exit(1);
+        }
+    }
+    if (flags?.set) {
+        for (const setValue of flags.set) {
+            args.push('--set', setValue);
+        }
+    }
     const result = spawnSync('helm', args.filter((arg) => Boolean(arg)), {
         stdio: flags?.silent ? 'pipe' : 'inherit',
         encoding: 'utf8',
@@ -343,8 +357,19 @@ async function cmdUmbrellaAdd(subchartPath, silent = false) {
     }
     const config = JSON.parse(fs.readFileSync(configFile, 'utf8'));
     const subchartName = path.basename(validSubchartPath);
-    const subchartDir = path.join(process.cwd(), 'charts', validSubchartPath);
+    const chartsRoot = path.join(process.cwd(), 'charts');
+    const targetSubchartPath = path.join(chartsRoot, validSubchartPath);
+    let subchartDir;
+    try {
+        subchartDir = SecurityUtils.validatePath(targetSubchartPath, chartsRoot);
+    }
+    catch (error) {
+        console.error(SecurityUtils.sanitizeLogMessage(error.message));
+        process.exit(1);
+    }
     fs.mkdirSync(subchartDir, { recursive: true });
+    const relativeSubchartPath = path.relative(chartsRoot, subchartDir) || subchartName;
+    const normalizedSubchartPath = relativeSubchartPath.split(path.sep).join('/');
     const chartFile = path.join(subchartDir, 'chart.ts');
     const { generateFlexibleSubchartTemplate } = await import('./lib/templates/flexible-subchart.js');
     const subchartContent = generateFlexibleSubchartTemplate(subchartName);
@@ -352,11 +377,11 @@ async function cmdUmbrellaAdd(subchartPath, silent = false) {
     config.subcharts.push({
         name: subchartName,
         version: getVersion(),
-        path: `./charts/${validSubchartPath}/chart.ts`,
+        path: `./charts/${normalizedSubchartPath}/chart.ts`,
     });
     fs.writeFileSync(configFile, JSON.stringify(config, null, 2));
-    updateUmbrellaTs(validSubchartPath, subchartName);
-    log(`Subchart ${subchartName} added to umbrella at path '${validSubchartPath}'`, silent);
+    updateUmbrellaTs(normalizedSubchartPath, subchartName);
+    log(`Subchart ${subchartName} added to umbrella at path '${normalizedSubchartPath}'`, silent);
 }
 async function cmdUmbrellaSynth(outDir, flags) {
     const umbrellaFile = path.join(process.cwd(), UMBRELLA_FILE_NAME);

package/dist/lib/utils/helmYamlSerializer.js

@@ -217,7 +217,7 @@ function isQuotesBalanced(str) {
 function validateFunctionCalls(_content) {
 }
 function checkCommonIssues(yaml, warnings) {
-    const deprecatedFunctions = ['template', 'default'];
+    const deprecatedFunctions = ['template'];
     for (const func of deprecatedFunctions) {
         const pattern = new RegExp(`\\{\\{[^}]*\\b${func}\\b[^}]*\\}\\}`, 'g');
         let match;
@@ -232,7 +232,7 @@ function checkCommonIssues(yaml, warnings) {
     }
 }
 function checkQuotedExpressions(yaml, warnings) {
-    const quotedPatterns = [/'\(\\{\\{[^}]+\\}\\}\)'/g, /"\(\\{\\{[^}]+\\}\\}\)"/g];
+    const quotedPatterns = [/'(\{\{[^}]+\}\})'/g, /"(\{\{[^}]+\}\})"/g];
     for (const pattern of quotedPatterns) {
         let match;
         pattern.lastIndex = 0;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "timonel",
   "type": "module",
-  "version": "2.11.0",
+  "version": "2.12.0",
   "description": "Timonel: programmatic Helm chart generator using cdk8s (TypeScript)",
   "bin": {
     "timonel": "dist/cli.js",