timonel 2.12.2 → 2.13.0

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+# [2.13.0](https://github.com/KenkoGeek/timonel/compare/v2.12.2...v2.13.0) (2025-11-24)
+
+### Features
+
+- **core:** exporting createHelmExpression() from helmYamlSerializer ([#196](https://github.com/KenkoGeek/timonel/issues/196)) ([e9ee2d0](https://github.com/KenkoGeek/timonel/commit/e9ee2d08b6ad305e0652c53e7756240793987861))
+
+# [2.13.0-beta.1](https://github.com/KenkoGeek/timonel/compare/v2.12.2...v2.13.0-beta.1) (2025-11-24)
+
+### Features
+
+- **core:** exporting createHelmExpression() from helmYamlSerializer ([#196](https://github.com/KenkoGeek/timonel/issues/196)) ([e9ee2d0](https://github.com/KenkoGeek/timonel/commit/e9ee2d08b6ad305e0652c53e7756240793987861))
+
 ## [2.12.2](https://github.com/KenkoGeek/timonel/compare/v2.12.1...v2.12.2) (2025-11-22)
 
 ### Bug Fixes

package/SECURITY.md

@@ -34,6 +34,8 @@
 
 We provide security updates for the following versions:
 
+<!-- markdownlint-disable MD060 -->
+
 | Version | Supported      | Security Updates | End of Life |
 | ------- | -------------- | ---------------- | ----------- |
 | 2.4.0+  | ✅ Current     | Full support     | TBD         |

package/dist/index.d.ts

@@ -11,3 +11,4 @@ export type { KarpenterDisruption, KarpenterDisruptionBudget, KarpenterEC2NodeCl
 export { DEFAULT_TERMINATION_GRACE_PERIOD, isValidDisruptionBudget, isValidKubernetesDuration, KarpenterVersionUtils, } from './lib/resources/cloud/aws/karpenterResources.js';
 export { AWS_HELPERS, createHelper, FILE_ACCESS_HELPERS, formatHelpers, generateHelpersTemplate, getDefaultHelpers, getHelpersByCategory, KUBERNETES_HELPERS, SPRIG_HELPERS, STANDARD_HELPERS, TEMPLATE_FUNCTION_HELPERS, type HelperDefinition, } from './lib/utils/helmHelpers.js';
 export { createLogger, logger, LogLevel, TimonelLogger, type LogContext, type LoggerConfig, } from './lib/utils/logger.js';
+export { createHelmExpression, isHelmExpression, type HelmExpression, } from './lib/utils/helmYamlSerializer.js';

package/dist/index.js

@@ -8,3 +8,4 @@ export { UmbrellaChartTemplate as UmbrellaChart } from './lib/templates/umbrella
 export { DEFAULT_TERMINATION_GRACE_PERIOD, isValidDisruptionBudget, isValidKubernetesDuration, KarpenterVersionUtils, } from './lib/resources/cloud/aws/karpenterResources.js';
 export { AWS_HELPERS, createHelper, FILE_ACCESS_HELPERS, formatHelpers, generateHelpersTemplate, getDefaultHelpers, getHelpersByCategory, KUBERNETES_HELPERS, SPRIG_HELPERS, STANDARD_HELPERS, TEMPLATE_FUNCTION_HELPERS, } from './lib/utils/helmHelpers.js';
 export { createLogger, logger, LogLevel, TimonelLogger, } from './lib/utils/logger.js';
+export { createHelmExpression, isHelmExpression, } from './lib/utils/helmYamlSerializer.js';

package/dist/lib/helmChartWriter.d.ts

@@ -1,3 +1,4 @@
+import { type TimonelLogger } from './utils/logger.js';
 import type { HelperDefinition as ExternalHelperDefinition } from './utils/helmHelpers/types.js';
 export type HelperDefinition = ExternalHelperDefinition;
 export interface HelmChartMeta {
@@ -44,6 +45,7 @@ export interface HelmChartWriteOptions {
     helpersTpl?: string | HelperDefinition[];
     notesTpl?: string;
     valuesSchema?: Record<string, unknown>;
+    logger?: TimonelLogger;
 }
 export declare class HelmChartWriter {
     static write(opts: HelmChartWriteOptions): void;

package/dist/lib/helmChartWriter.js

@@ -5,8 +5,8 @@ import { createLogger } from './utils/logger.js';
 import { dumpHelmAwareYaml } from './utils/helmYamlSerializer.js';
 export class HelmChartWriter {
     static write(opts) {
-        const { outDir, meta, defaultValues = {}, envValues = {}, assets, helpersTpl, notesTpl, valuesSchema, } = opts;
-        const logger = createLogger('helm-chart-writer');
+        const { outDir, meta, defaultValues = {}, envValues = {}, assets, helpersTpl, notesTpl, valuesSchema, logger: customLogger, } = opts;
+        const logger = customLogger ?? createLogger('helm-chart-writer');
         const timer = logger.time('helm_chart_write');
         logger.info('Starting Helm chart write operation', {
             chartName: meta.name,

package/dist/lib/rutter.d.ts

@@ -2,6 +2,7 @@ import { ApiObject } from 'cdk8s';
 import type { ChartProps } from 'cdk8s';
 import type { Ingress, ServiceAccount } from 'cdk8s-plus-33';
 import type { Construct } from 'constructs';
+import { type TimonelLogger } from './utils/logger.js';
 import type { AWSALBIngressSpec, AWSEBSStorageClassSpec, AWSECRServiceAccountSpec, AWSEFSStorageClassSpec, AWSIRSAServiceAccountSpec } from './resources/cloud/aws/awsResources.js';
 import type { KarpenterEC2NodeClassSpec, KarpenterNodeClaimSpec, KarpenterNodePoolSpec } from './resources/cloud/aws/karpenterResources.js';
 import type { HelperDefinition } from './utils/helmHelpers.js';
@@ -130,5 +131,6 @@ export interface RutterProps {
     namespace?: string;
     scope?: Construct;
     singleManifestFile?: boolean;
+    logger?: TimonelLogger;
 }
 export type { AWSALBIngressSpec, AWSEBSStorageClassSpec, AWSEFSStorageClassSpec, AWSIRSAServiceAccountSpec, } from './resources/cloud/aws/awsResources.js';

package/dist/lib/rutter.js

@@ -5,16 +5,16 @@ import { HelmChartWriter } from './helmChartWriter.js';
 import { AWSResources } from './resources/cloud/aws/awsResources.js';
 import { createLogger } from './utils/logger.js';
 import { KarpenterResources } from './resources/cloud/aws/karpenterResources.js';
-import { dumpHelmAwareYaml } from './utils/helmYamlSerializer.js';
+import { dumpHelmAwareYaml, isHelmExpression } from './utils/helmYamlSerializer.js';
 import { generateHelpersTemplate } from './utils/helmHelpers.js';
 export class Rutter {
     constructor(props) {
         this.assets = [];
-        this.logger = createLogger('rutter');
         this.defaultValues = props.defaultValues ?? {};
         this.envValues = props.envValues ?? {};
         this.meta = props.meta;
         this.props = props;
+        this.logger = props.logger ?? createLogger('rutter');
         this.logger.info('Initializing chart', {
             chartName: props.meta.name,
             version: props.meta.version,
@@ -169,13 +169,13 @@ ${yamlContent.trim()}
             });
             throw new Error('Manifest metadata must have a name');
         }
-        if (typeof metadata.name !== 'string') {
-            this.logger.error('Validation failed: metadata.name must be a string', {
+        if (typeof metadata.name !== 'string' && !isHelmExpression(metadata.name)) {
+            this.logger.error('Validation failed: metadata.name must be a string or HelmExpression', {
                 operation: 'manifest_validation',
                 issue: 'invalid_metadata_name_type',
                 actual_type: typeof metadata.name,
             });
-            throw new Error('Manifest metadata.name must be a string');
+            throw new Error('Manifest metadata.name must be a string or HelmExpression');
         }
     }
     getMeta() {
@@ -476,6 +476,7 @@ ${helper.template}
             envValues: this.envValues,
             assets: synthAssets,
             helpersTpl: helpersContent,
+            logger: this.logger,
         });
         this.logger.info('Chart write operation completed successfully', {
             chartName: this.meta.name,

package/dist/lib/security.js

@@ -72,9 +72,10 @@ export class SecurityUtils {
             return String(message);
         }
         return (message
-            .replace(/[\x00-\x1F\x7F]/g, '')
-            .replace(/\r\n/g, ' ')
+            .replace(/\r\n/g, '\n')
+            .replace(/[\x00-\x09\x0B-\x0C\x0E-\x1F\x7F]/g, '')
             .replace(/[\r\n]/g, ' ')
+            .replace(/\s+/g, ' ')
             .trim());
     }
     static sanitizeEnvironmentName(env) {
@@ -105,20 +106,23 @@ export class SecurityUtils {
         if (!/^[a-zA-Z0-9]/.test(templatePath) || !/[a-zA-Z0-9]$/.test(templatePath)) {
             return false;
         }
-        if (!/^[a-zA-Z0-9._-]+$/.test(templatePath)) {
+        if (!/^[a-zA-Z0-9._\-/]+$/.test(templatePath)) {
             return false;
         }
         if (templatePath.includes('..') || templatePath.includes('//')) {
             return false;
         }
         const reservedWords = ['nil', 'null', 'undefined', 'true', 'false'];
-        const pathSegments = templatePath.split('.');
-        for (const segment of pathSegments) {
-            if (reservedWords.includes(segment.toLowerCase())) {
-                return false;
-            }
-            if (segment.length === 0) {
-                return false;
+        const pathParts = templatePath.split('/');
+        for (const part of pathParts) {
+            const segments = part.split('.');
+            for (const segment of segments) {
+                if (reservedWords.includes(segment.toLowerCase())) {
+                    return false;
+                }
+                if (segment.length === 0 && segments.length > 1) {
+                    continue;
+                }
             }
         }
         return true;

package/dist/lib/types.d.ts

@@ -1,4 +1,5 @@
 import type { Chart } from 'cdk8s';
+import type { TimonelLogger } from './utils/logger.js';
 export interface ChartProps {
     name: string;
     version: string;
@@ -19,6 +20,7 @@ export interface ChartProps {
         [key: string]: unknown;
     }>;
     [key: string]: unknown;
+    logger?: TimonelLogger;
 }
 export interface SubchartProps {
     name: string;

package/dist/lib/umbrellaRutter.d.ts

@@ -1,5 +1,6 @@
 import type { HelmChartMeta } from './helmChartWriter.js';
 import type { Rutter } from './rutter.js';
+import { type TimonelLogger } from './utils/logger.js';
 export interface SubchartSpec {
     name: string;
     rutter: Rutter;
@@ -12,10 +13,12 @@ export interface UmbrellaRutterProps {
     meta: HelmChartMeta;
     subcharts: SubchartSpec[];
     defaultValues?: Record<string, unknown>;
+    logger?: TimonelLogger;
     envValues?: Record<string, Record<string, unknown>>;
 }
 export declare class UmbrellaRutter {
     private readonly props;
+    private readonly logger;
     constructor(props: UmbrellaRutterProps);
     private validateMetadata;
     write(outDir: string): void;

package/dist/lib/umbrellaRutter.js

@@ -1,9 +1,16 @@
 import { writeFileSync, mkdirSync } from 'fs';
 import { join } from 'path';
+import { createLogger } from './utils/logger.js';
 import { SecurityUtils } from './security.js';
 import { dumpHelmAwareYaml } from './utils/helmYamlSerializer.js';
 export class UmbrellaRutter {
     constructor(props) {
+        this.logger = props.logger ?? createLogger('umbrella-rutter');
+        this.logger.info('Initializing umbrella chart', {
+            name: props.meta.name,
+            version: props.meta.version,
+            subchartsCount: props.subcharts.length,
+        });
         this.validateMetadata(props.meta);
         this.props = props;
     }

package/dist/lib/utils/helmYamlSerializer.d.ts

@@ -6,7 +6,7 @@ interface HelmExpressionMatch {
     start: number;
     end: number;
 }
-interface HelmExpression {
+export interface HelmExpression {
     __helmExpression: true;
     value: string;
 }

package/dist/lib/utils/helmYamlSerializer.js

@@ -47,6 +47,9 @@ function preprocessHelmExpressions(obj, depth = 0) {
     if (depth > 100) {
         throw new Error('Maximum recursion depth exceeded during Helm preprocessing');
     }
+    if (isHelmExpression(obj)) {
+        return obj;
+    }
     if (typeof obj === 'string') {
         if (detectHelmExpressions(obj).length > 0) {
             return createHelmExpression(obj);
@@ -102,6 +105,7 @@ export function stringify(obj, options = {}) {
     const jsYamlOptions = {
         lineWidth: options.lineWidth ?? 0,
         quotingType: options.doubleQuotedAsJSON ? '"' : "'",
+        forceQuotes: options.doubleQuotedAsJSON,
     };
     return dumpHelmAwareYaml(obj, jsYamlOptions);
 }
@@ -109,6 +113,17 @@ export function validateHelmYaml(yaml) {
     const errors = [];
     const warnings = [];
     const expressions = parseHelmExpressions(yaml);
+    const openBraces = (yaml.match(/\{\{/g) || []).length;
+    const closeBraces = (yaml.match(/\}\}/g) || []).length;
+    if (openBraces !== closeBraces) {
+        errors.push({
+            type: 'syntax',
+            message: 'Unbalanced Helm template braces detected in file',
+            line: 0,
+            column: 0,
+            expression: '',
+        });
+    }
     for (const expr of expressions) {
         try {
             validateHelmSyntax(expr.expression);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "timonel",
   "type": "module",
-  "version": "2.12.2",
+  "version": "2.13.0",
   "description": "Timonel: programmatic Helm chart generator using cdk8s (TypeScript)",
   "bin": {
     "timonel": "dist/cli.js",
@@ -21,6 +21,10 @@
     "./lib/utils/logger": {
       "types": "./dist/lib/utils/logger.d.ts",
       "default": "./dist/lib/utils/logger.js"
+    },
+    "./lib/utils/helmYamlSerializer": {
+      "types": "./dist/lib/utils/helmYamlSerializer.d.ts",
+      "default": "./dist/lib/utils/helmYamlSerializer.js"
     }
   },
   "scripts": {
@@ -63,7 +67,7 @@
   "author": "Franklin García <KenkoGeek>",
   "license": "MIT",
   "engines": {
-    "node": ">=20",
+    "node": ">=22",
     "pnpm": ">=9.0.0"
   },
   "repository": {
@@ -87,44 +91,44 @@
     ]
   },
   "dependencies": {
-    "cdk8s": "^2.70.16",
-    "cdk8s-plus-33": "^2.3.8",
-    "constructs": "^10.4.2",
+    "cdk8s": "^2.70.28",
+    "cdk8s-plus-33": "^2.4.6",
+    "constructs": "^10.4.3",
     "handlebars": "^4.7.8",
-    "js-yaml": "^4.1.0",
-    "pino": "^10.0.0",
-    "pino-pretty": "^13.1.1",
+    "js-yaml": "^4.1.1",
+    "pino": "^10.1.0",
+    "pino-pretty": "^13.1.2",
     "ts-node": "^10.9.2",
     "yaml": "^2.8.1"
   },
   "devDependencies": {
-    "@commitlint/cli": "^20.0.0",
+    "@commitlint/cli": "^20.1.0",
     "@commitlint/config-conventional": "^20.0.0",
-    "@eslint/js": "^9.36.0",
+    "@eslint/js": "^9.39.1",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/exec": "^7.1.0",
     "@semantic-release/git": "^10.0.1",
     "@types/js-yaml": "^4.0.9",
-    "@types/node": "^24.5.2",
-    "@typescript-eslint/eslint-plugin": "^8.44.1",
-    "@typescript-eslint/parser": "^8.44.1",
+    "@types/node": "^24.10.1",
+    "@typescript-eslint/eslint-plugin": "^8.47.0",
+    "@typescript-eslint/parser": "^8.47.0",
     "@vitest/coverage-v8": "^3.2.4",
     "conventional-changelog-cli": "^5.0.0",
-    "eslint": "^9.36.0",
+    "eslint": "^9.39.1",
     "eslint-config-prettier": "^10.1.8",
     "eslint-import-resolver-typescript": "^4.4.4",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-security": "^3.0.1",
     "eslint-plugin-sonarjs": "^3.0.5",
-    "eslint-plugin-unused-imports": "^4.2.0",
+    "eslint-plugin-unused-imports": "^4.3.0",
     "husky": "^9.1.7",
-    "lint-staged": "^16.2.1",
+    "lint-staged": "^16.2.7",
     "markdownlint": "^0.39.0",
-    "markdownlint-cli": "^0.45.0",
+    "markdownlint-cli": "^0.46.0",
     "prettier": "^3.6.2",
-    "semantic-release": "^24.2.9",
+    "semantic-release": "^25.0.2",
     "tsx": "^4.20.6",
-    "typescript": "^5.9.2",
+    "typescript": "^5.9.3",
     "vitest": "^3.2.4"
   },
   "files": [