timonel 2.10.0 → 2.10.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [2.10.1](https://github.com/KenkoGeek/timonel/compare/v2.10.0...v2.10.1) (2025-09-20)
+
+### Bug Fixes
+
+- **cli:** improve version display and fallback handling ([#117](https://github.com/KenkoGeek/timonel/issues/117)) ([7ad67e2](https://github.com/KenkoGeek/timonel/commit/7ad67e23f936edcc6e9e7d886c257046ca4dccc6))
+- **helm:** remove debug logs from helmChartWriter ([742e1c9](https://github.com/KenkoGeek/timonel/commit/742e1c94f2858ec1afaf90cf5f2955b692e18f6b))
+
 # [2.10.0](https://github.com/KenkoGeek/timonel/compare/v2.9.2...v2.10.0) (2025-09-20)
 
 ### Bug Fixes

package/dist/cli.js

@@ -8,14 +8,53 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const UMBRELLA_CONFIG_FILE = 'umbrella.config.json';
 const UMBRELLA_FILE_NAME = 'umbrella.ts';
+const PACKAGE_JSON_FILE = 'package.json';
+function isValidPath(filePath, expectedFileName) {
+    try {
+        const resolvedPath = path.resolve(filePath);
+        const normalizedPath = path.normalize(resolvedPath);
+        if (normalizedPath.includes('..') || normalizedPath.includes('~')) {
+            return false;
+        }
+        if (!normalizedPath.endsWith(expectedFileName)) {
+            return false;
+        }
+        const suspiciousPatterns = ['\\', '..', '~', '$', '`', '|', '&', ';', '(', ')'];
+        return !suspiciousPatterns.some((pattern) => normalizedPath.includes(pattern));
+    }
+    catch {
+        return false;
+    }
+}
 function getVersion() {
     try {
-        const packagePath = path.join(__dirname, '..', 'package.json');
-        const packageJson = JSON.parse(fs.readFileSync(packagePath, 'utf8'));
-        return packageJson.version || '0.1.0';
+        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) {
+            if (!isValidPath(packagePath, PACKAGE_JSON_FILE)) {
+                continue;
+            }
+            if (fs.existsSync(packagePath)) {
+                try {
+                    const packageJson = JSON.parse(fs.readFileSync(packagePath, 'utf8'));
+                    return packageJson.version || 'unknown';
+                }
+                catch {
+                    continue;
+                }
+            }
+        }
+        if (process.env.npm_package_version) {
+            return process.env.npm_package_version;
+        }
+        return 'unknown';
     }
     catch {
-        return '0.1.0';
+        return 'unknown';
     }
 }
 function log(msg, silent = false) {

package/dist/lib/helmChartWriter.js

@@ -133,27 +133,14 @@ function getTargetDirectory(target) {
     return target === 'crds' ? 'crds' : 'templates';
 }
 function writeSingleAssetFile(outDir, targetDir, assetId, yaml) {
-    if (assetId === 'ingress' && yaml.includes('number:')) {
-        console.log('Writing ingress file with number fields');
-        const numberLines = yaml.split('\n').filter((line) => line.includes('number:'));
-        console.log('Number lines:', numberLines);
-    }
     const filename = `${assetId}.yaml`;
     fs.mkdirSync(path.join(outDir, targetDir), { recursive: true });
     fs.writeFileSync(path.join(outDir, targetDir, filename), yaml + '\n');
 }
 function writeMultipleAssetFiles(outDir, targetDir, assetId, yaml) {
-    if (assetId === 'ingress' && yaml.includes('number:')) {
-        console.log('🔍 Writing ingress file (multiple) with content:');
-        const numberLines = yaml.split('\n').filter((line) => line.includes('number:'));
-        console.log('Number lines:', numberLines);
-    }
     const parts = splitDocs(yaml);
     parts.forEach((doc, index) => {
         const filename = `${assetId}${parts.length > 1 ? `-${index + 1}` : ''}.yaml`;
-        if (assetId === 'ingress' && doc.includes('number:')) {
-            console.log(`🔍 Writing document ${index + 1} for ingress:`, doc.split('\n').filter((line) => line.includes('number:')));
-        }
         fs.mkdirSync(path.join(outDir, targetDir), { recursive: true });
         fs.writeFileSync(path.join(outDir, targetDir, filename), doc + '\n');
     });

package/dist/lib/rutter.js

@@ -168,7 +168,7 @@ ${yamlContent.trim()}
         return [...this.assets];
     }
     toSynthArray() {
-        console.log(`📦 Synthesizing chart assets for: ${this.meta.name}`);
+        console.log(`Synthesizing chart assets for: ${this.meta.name}`);
         const apiObjectIds = [];
         for (const child of this.chart.node.children) {
             if (child instanceof ApiObject && !child.node.id.endsWith('-placeholder')) {
@@ -184,7 +184,7 @@ ${yamlContent.trim()}
             }
             return true;
         });
-        console.log(`📋 Found ${manifestObjs.length} manifest objects to process`);
+        console.log(`Found ${manifestObjs.length} manifest objects to process`);
         const enriched = manifestObjs.map((obj) => {
             if (obj && typeof obj === 'object') {
                 const o = obj;
@@ -420,7 +420,7 @@ ${helper.template}
             helpersContent = generateHelpersTemplate(this.props.cloudProvider);
         }
         const synthAssets = this.toSynthArray();
-        console.log(`📄 Generated ${synthAssets.length} assets for chart`);
+        console.log(`Generated ${synthAssets.length} assets for chart`);
         HelmChartWriter.write({
             outDir,
             meta: this.meta,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "timonel",
   "type": "module",
-  "version": "2.10.0",
+  "version": "2.10.1",
   "description": "Timonel: programmatic Helm chart generator using cdk8s (TypeScript)",
   "bin": {
     "timonel": "dist/cli.js",
@@ -86,7 +86,7 @@
     "constructs": "^10.4.2",
     "handlebars": "^4.7.8",
     "js-yaml": "^4.1.0",
-    "timonel": "^2.9.2",
+    "timonel": "^2.10.0",
     "ts-node": "^10.9.2",
     "yaml": "^2.8.1"
   },