@companyhelm/cli 0.4.0 → 0.4.1

package/dist/commands/set-image-version.d.ts

@@ -13,7 +13,7 @@ export interface InteractiveImageSelector {
     listAvailableTags(service: ManagedImageService, limit: number): Promise<AvailableImageTag[]>;
     buildImageReference(service: ManagedImageService, tag: string): string;
 }
-export interface ImageConfigStore {
+export interface ImageVersionStore {
     load(): {
         images: Partial<Record<ManagedImageService, string>>;
     };
@@ -26,6 +26,6 @@ export declare function runSetImageVersion(options: SetImageVersionOptions, depe
     input?: Readable;
     output?: Writable;
     registry?: InteractiveImageSelector;
-    configStore?: ImageConfigStore;
+    configStore?: ImageVersionStore;
 }): Promise<void>;
 export declare function registerSetImageVersionCommand(program: Command): void;

package/dist/commands/set-image-version.js

@@ -1,7 +1,7 @@
 import * as clack from "@clack/prompts";
 import { MANAGED_IMAGE_SERVICES, requireManagedImageService } from "../core/runtime/ManagedImages.js";
 import { PublicImageTagRegistry } from "../core/runtime/PublicImageTagRegistry.js";
-import { RepoConfigStore } from "../core/runtime/RepoConfigStore.js";
+import { ImageConfigStore } from "../core/runtime/ImageConfigStore.js";
 import { requireInteractiveTerminal, unwrapPromptResult } from "./interactive.js";
 function parsePositiveInteger(value) {
     const parsed = Number.parseInt(value, 10);
@@ -59,7 +59,7 @@ export async function runSetImageVersion(options, dependencies = {}) {
     const input = dependencies.input ?? process.stdin;
     const output = dependencies.output ?? process.stdout;
     const registry = dependencies.registry ?? new PublicImageTagRegistry();
-    const configStore = dependencies.configStore ?? new RepoConfigStore();
+    const configStore = dependencies.configStore ?? new ImageConfigStore();
     clack.intro("CompanyHelm image selection", { output });
     const selectedService = options.service
         ? requireManagedImageService(options.service)
@@ -78,7 +78,7 @@ export async function runSetImageVersion(options, dependencies = {}) {
 export function registerSetImageVersionCommand(program) {
     program
         .command("set-image-version")
-        .description("Interactively choose an API or frontend image tag and store it in the project config.")
+        .description("Interactively choose an API or frontend image tag and store it in the packaged image config.")
         .option("-s, --service <service>", "Prefill the service to update (api or frontend)")
         .option("-l, --limit <count>", "How many image tags to show", parsePositiveInteger, 20)
         .action(async (options) => {

package/dist/config/image_config.d.ts

@@ -0,0 +1,4 @@
+export declare const PACKAGED_IMAGE_CONFIG: {
+    readonly api: "public.ecr.aws/x6n0f2k4/companyhelm-api:0.6.1";
+    readonly frontend: "public.ecr.aws/x6n0f2k4/companyhelm-web:0.1.1";
+};

package/dist/config/image_config.js

@@ -0,0 +1,4 @@
+export const PACKAGED_IMAGE_CONFIG = {
+    api: "public.ecr.aws/x6n0f2k4/companyhelm-api:0.6.1",
+    frontend: "public.ecr.aws/x6n0f2k4/companyhelm-web:0.1.1"
+};

package/dist/core/runtime/ImageCatalog.d.ts

@@ -1,8 +1,11 @@
+import { ImageConfigStore } from "./ImageConfigStore.js";
 export interface RuntimeImages {
     api: string;
     frontend: string;
     postgres: string;
 }
 export declare class ImageCatalog {
+    private readonly configStore;
+    constructor(configStore?: ImageConfigStore);
     resolve(): RuntimeImages;
 }

package/dist/core/runtime/ImageCatalog.js

@@ -1,11 +1,15 @@
 import { defaultManagedImageReference } from "./ManagedImages.js";
-import { RepoConfigStore } from "./RepoConfigStore.js";
+import { ImageConfigStore } from "./ImageConfigStore.js";
 export class ImageCatalog {
+    configStore;
+    constructor(configStore = new ImageConfigStore()) {
+        this.configStore = configStore;
+    }
     resolve() {
-        const configuredImages = new RepoConfigStore().load().images;
+        const configuredImages = this.configStore.load().images;
         return {
-            api: configuredImages.api || process.env.COMPANYHELM_API_IMAGE || defaultManagedImageReference("api"),
-            frontend: configuredImages.frontend || process.env.COMPANYHELM_WEB_IMAGE || defaultManagedImageReference("frontend"),
+            api: process.env.COMPANYHELM_API_IMAGE || configuredImages.api || defaultManagedImageReference("api"),
+            frontend: process.env.COMPANYHELM_WEB_IMAGE || configuredImages.frontend || defaultManagedImageReference("frontend"),
             postgres: process.env.COMPANYHELM_POSTGRES_IMAGE || "postgres:16-alpine"
         };
     }

package/dist/core/runtime/{RepoConfigStore.d.ts → ImageConfigStore.d.ts}

@@ -1,16 +1,15 @@
-import type { ManagedImageService } from "./ManagedImages.js";
-export interface RepoConfig {
+import { type ManagedImageService } from "./ManagedImages.js";
+export interface ImageConfig {
     images: Partial<Record<ManagedImageService, string>>;
 }
-export declare class RepoConfigStore {
+export declare class ImageConfigStore {
     private readonly root;
     constructor(root?: string);
     configPath(): string;
-    load(): RepoConfig;
+    load(): ImageConfig;
     setImage(service: ManagedImageService, image: string): {
         configPath: string;
         image: string;
     };
-    save(config: RepoConfig): void;
-    private parse;
+    save(config: ImageConfig): void;
 }

package/dist/core/runtime/ImageConfigStore.js

@@ -0,0 +1,51 @@
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { MANAGED_IMAGE_SERVICES, defaultManagedImageReference } from "./ManagedImages.js";
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+function defaultPackageRoot() {
+    return path.resolve(__dirname, "../../..");
+}
+export class ImageConfigStore {
+    root;
+    constructor(root = defaultPackageRoot()) {
+        this.root = root;
+    }
+    configPath() {
+        return path.join(this.root, "src", "config", "image_config.ts");
+    }
+    load() {
+        const configPath = this.configPath();
+        if (!fs.existsSync(configPath)) {
+            return { images: {} };
+        }
+        const images = {};
+        for (const rawLine of fs.readFileSync(configPath, "utf8").split(/\r?\n/)) {
+            const match = rawLine.match(/^\s+(api|frontend):\s+"([^"]+)",?$/);
+            if (match) {
+                images[match[1]] = match[2];
+            }
+        }
+        return { images };
+    }
+    setImage(service, image) {
+        const nextConfig = this.load();
+        nextConfig.images[service] = image;
+        this.save(nextConfig);
+        return { configPath: this.configPath(), image };
+    }
+    save(config) {
+        const lines = [
+            "export const PACKAGED_IMAGE_CONFIG = {",
+            ...MANAGED_IMAGE_SERVICES.map((service) => {
+                const image = config.images[service] ?? defaultManagedImageReference(service);
+                return `  ${service}: "${image}"`;
+            }).map((line, index, all) => `${line}${index < all.length - 1 ? "," : ""}`),
+            "} as const;",
+            ""
+        ];
+        fs.mkdirSync(path.dirname(this.configPath()), { recursive: true });
+        fs.writeFileSync(this.configPath(), lines.join("\n"), "utf8");
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@companyhelm/cli",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Bootstrap and manage a local CompanyHelm deployment.",
   "license": "MIT",
   "private": false,
@@ -17,10 +17,11 @@
   },
   "files": [
     "dist",
-    "src/templates"
+    "src/templates",
+    "src/config/image_config.ts"
   ],
   "scripts": {
-    "build": "tsc -p tsconfig.json && node scripts/copy-templates.cjs",
+    "build": "rm -rf dist && tsc -p tsconfig.json && node scripts/copy-templates.cjs",
     "set-image-version": "npm run build && node dist/cli.js set-image-version",
     "start": "npm run build && node dist/cli.js",
     "test": "npm run build && vitest run"

package/src/config/image_config.ts

@@ -0,0 +1,4 @@
+export const PACKAGED_IMAGE_CONFIG = {
+  api: "public.ecr.aws/x6n0f2k4/companyhelm-api:0.6.1",
+  frontend: "public.ecr.aws/x6n0f2k4/companyhelm-web:0.1.1"
+} as const;

package/dist/core/runtime/RepoConfigStore.js

@@ -1,63 +0,0 @@
-import fs from "node:fs";
-import path from "node:path";
-function defaultRepoConfigRoot() {
-    return process.cwd();
-}
-export class RepoConfigStore {
-    root;
-    constructor(root = defaultRepoConfigRoot()) {
-        this.root = root;
-    }
-    configPath() {
-        return path.join(this.root, "config.yaml");
-    }
-    load() {
-        const configPath = this.configPath();
-        if (!fs.existsSync(configPath)) {
-            return { images: {} };
-        }
-        return this.parse(fs.readFileSync(configPath, "utf8"));
-    }
-    setImage(service, image) {
-        const nextConfig = this.load();
-        nextConfig.images[service] = image;
-        this.save(nextConfig);
-        return { configPath: this.configPath(), image };
-    }
-    save(config) {
-        const lines = ["images:"];
-        if (config.images.api) {
-            lines.push(`  api: ${config.images.api}`);
-        }
-        if (config.images.frontend) {
-            lines.push(`  frontend: ${config.images.frontend}`);
-        }
-        fs.mkdirSync(path.dirname(this.configPath()), { recursive: true });
-        fs.writeFileSync(this.configPath(), `${lines.join("\n")}\n`, "utf8");
-    }
-    parse(content) {
-        const images = {};
-        let inImagesSection = false;
-        for (const rawLine of content.split(/\r?\n/)) {
-            const line = rawLine.trimEnd();
-            if (line.trim().length === 0 || line.trimStart().startsWith("#")) {
-                continue;
-            }
-            if (line === "images:") {
-                inImagesSection = true;
-                continue;
-            }
-            if (inImagesSection && /^[^\s]/.test(line)) {
-                inImagesSection = false;
-            }
-            if (!inImagesSection) {
-                continue;
-            }
-            const match = line.match(/^  (api|frontend):\s*(.+)$/);
-            if (match) {
-                images[match[1]] = match[2];
-            }
-        }
-        return { images };
-    }
-}