create-oke 0.10.2 → 0.10.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-oke",
-  "version": "0.10.2",
+  "version": "0.10.3",
   "description": "Scaffold an okengine app — bunx create-oke@latest <name>",
   "license": "MIT",
   "repository": {

package/src/ai-setup/apply.ts

@@ -5,6 +5,7 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { OLLAMA_IMAGE } from "../drivers-catalog.ts";
+import { extractImages, findImagesBlock, replaceImagesBlock } from "../transform.ts";
 
 /** Choices applied to the project. */
 export type AiSetupApplyInput = {
@@ -127,24 +128,19 @@ export function upsertAiDrivers(source: string, driver: string): string {
 }
 
 /**
+ * Set one dotted role's image pin, preserving every other pin (including
+ * `store.*` / `channel.*` nesting) via {@link extractImages} /
+ * {@link replaceImagesBlock} — a parse/set/render round-trip rather than a
+ * single-line regex, so nested sub-objects are never corrupted.
+ *
  * @param source - Config source
- * @param key - Image role
+ * @param key - Image role (dotted for `store.*` / `channel.*`, flat otherwise)
  * @param image - Image ref
  */
 export function upsertImage(source: string, key: string, image: string): string {
-  const keyLit = key.includes(".") ? `"${key}"` : key;
-  const line = `    ${keyLit}: "${image}",`;
-  const imagesRe = /images:\s*\{([\s\S]*?)\n\s*\}/;
-  const m = imagesRe.exec(source);
-  if (!m) return source;
-  const body = m[1]!;
-  if (new RegExp(`${keyLit}\\s*:`).test(body) || new RegExp(`"${key}"\\s*:`).test(body)) {
-    return source.replace(
-      new RegExp(`(["']?${key.replace(".", "\\.")}["']?\\s*:\\s*)"[^"]*"`),
-      `$1"${image}"`,
-    );
-  }
-  return source.replace(imagesRe, `images: {${body}\n${line}\n  }`);
+  if (!findImagesBlock(source)) return source;
+  const images = { ...extractImages(source), [key]: image };
+  return replaceImagesBlock(source, images);
 }
 
 /** Options for {@link upsertEnv}. */

package/src/transform.test.ts

@@ -21,7 +21,11 @@ function evalConfig(source: string): {
     ai?: unknown;
     channel?: { ai?: unknown; email?: unknown };
   };
-  images?: Record<string, string>;
+  images?: {
+    store?: Record<string, string>;
+    channel?: Record<string, string>;
+    ai?: string;
+  };
 } {
   const body = source
     .replace(/^import\s+[\s\S]*?from\s+["'][^"']+["'];?\s*/m, "")
@@ -60,7 +64,7 @@ describe("applyCreateAnswers images", () => {
     expect(next).not.toMatch(/images:\s*\{[^}]*\blocal:\s*"/s);
     expect(next).not.toMatch(/images:\s*\{[^}]*\bdocker:\s*"/s);
     expect(next).not.toMatch(/images:\s*\{[^}]*:\s*"libsql"/s);
-    expect(next).toContain('"store.sql": "postgres:18-alpine"');
+    expect(next).toMatch(/images:\s*\{\s*store:\s*\{[^}]*\bsql: "postgres:18-alpine"/s);
   });
 
   test("index meilisearch pins store.index image without comment leakage", () => {
@@ -68,7 +72,7 @@ describe("applyCreateAnswers images", () => {
       templateConfig(),
       defaultsWithIndex("meilisearch", "meilisearch"),
     );
-    expect(next).toContain('"store.index": "getmeili/meilisearch:v1.37"');
+    expect(next).toMatch(/images:\s*\{\s*store:\s*\{[^}]*\bindex: "getmeili\/meilisearch:v1.37"/s);
     expect(next).not.toMatch(/images:\s*\{[^}]*\btest:\s*"memory"/s);
   });
 });

package/src/transform.ts

@@ -298,8 +298,11 @@ ${close}}`;
 /** Env-column keys that must never appear under `images`. */
 const IMAGE_ENV_COLUMNS = new Set(["local", "docker", "test", "prod"]);
 
-/** Known compose role keys written into `images`. */
-const IMAGE_ROLE_KEY = /^(?:store\.(?:sql|kv|files|index)|channel\.email|vault|ai|pgdog)$/;
+/** Known compose role keys written into `images` (dotted, post-flatten). */
+const IMAGE_ROLE_KEY = /^(?:store\.(?:sql|kv|files|index)|channel\.email|vault|ai|pgdog|proxy)$/;
+
+/** `images` sub-object keys that nest role facets (mirrors `drivers` nesting). */
+const IMAGE_NEST_KEYS = ["store", "channel"] as const;
 
 /**
  * Keep `images` in sync with chosen docker drivers.
@@ -374,43 +377,111 @@ function aiImageForDefaults(defaults: CreateDefaults): string {
 }
 
 /**
- * Parse role→image pins from an `images` block.
+ * Locate the `images: { … }` block by brace depth (not the first `}`) so
+ * nested `store: { … }` / `channel: { … }` sub-blocks don't close the match
+ * early.
+ *
+ * @param source - Config source
+ */
+export function findImagesBlock(source: string): {
+  readonly start: number;
+  readonly bodyStart: number;
+  readonly bodyEnd: number;
+  readonly end: number;
+} | null {
+  const m = /images:\s*\{/.exec(source);
+  if (!m) return null;
+  const start = m.index;
+  const openIdx = start + m[0].length - 1;
+  let depth = 0;
+  for (let i = openIdx; i < source.length; i++) {
+    const ch = source[i];
+    if (ch === "{") depth++;
+    else if (ch === "}") {
+      depth--;
+      if (depth === 0) return { start, bodyStart: openIdx + 1, bodyEnd: i, end: i + 1 };
+    }
+  }
+  return null;
+}
+
+/**
+ * Parse dotted role→image pins from an `images` block, flattening one level
+ * of `store` / `channel` nesting (mirrors {@link flattenImagesConfig} in
+ * `okengine/config`).
  *
  * Skips `//` comment lines and rejects env-column keys (`local`/`docker`/…).
  *
  * @param source - Config source
  */
-function extractImages(source: string): Record<string, string> {
-  const m = /images:\s*\{([\s\S]*?)\n\s*\},/.exec(source);
-  if (!m) return {};
+export function extractImages(source: string): Record<string, string> {
+  const block = findImagesBlock(source);
+  if (!block) return {};
   const out: Record<string, string> = {};
-  for (const line of m[1]!.split("\n")) {
-    const trimmed = line.trim();
-    if (!trimmed || trimmed.startsWith("//")) continue;
-    const hit = /["']?([\w.]+)["']?\s*:\s*"([^"]+)"/.exec(trimmed);
+  let context: (typeof IMAGE_NEST_KEYS)[number] | null = null;
+  for (const raw of source.slice(block.bodyStart, block.bodyEnd).split("\n")) {
+    const line = raw.trim();
+    if (!line || line.startsWith("//")) continue;
+    const nestOpen = /^(store|channel):\s*\{\s*$/.exec(line);
+    if (nestOpen) {
+      context = nestOpen[1] as (typeof IMAGE_NEST_KEYS)[number];
+      continue;
+    }
+    if (line === "}," || line === "}") {
+      context = null;
+      continue;
+    }
+    const hit = /^["']?([\w.]+)["']?\s*:\s*"([^"]+)"/.exec(line);
     if (!hit) continue;
-    const key = hit[1]!;
-    if (IMAGE_ENV_COLUMNS.has(key) || !IMAGE_ROLE_KEY.test(key)) continue;
+    const rawKey = hit[1]!;
+    if (IMAGE_ENV_COLUMNS.has(rawKey)) continue;
+    const key = context ? `${context}.${rawKey}` : rawKey;
+    if (!IMAGE_ROLE_KEY.test(key)) continue;
     out[key] = hit[2]!;
   }
   return out;
 }
 
+/**
+ * Render dotted role→image pins back into a nested `images: { … }` literal —
+ * `store.*` / `channel.*` under their sub-object, everything else flat.
+ *
+ * @param images - Dotted role → image
+ */
+function formatImagesBlock(images: Record<string, string>): string {
+  const store: Array<[string, string]> = [];
+  const channel: Array<[string, string]> = [];
+  const flat: Array<[string, string]> = [];
+  for (const [key, value] of Object.entries(images)) {
+    if (key.startsWith("store.")) store.push([key.slice("store.".length), value]);
+    else if (key.startsWith("channel.")) channel.push([key.slice("channel.".length), value]);
+    else flat.push([key, value]);
+  }
+  const lines: string[] = [];
+  if (store.length > 0) {
+    lines.push("    store: {");
+    for (const [k, v] of store) lines.push(`      ${k}: "${v}",`);
+    lines.push("    },");
+  }
+  if (channel.length > 0) {
+    lines.push("    channel: {");
+    for (const [k, v] of channel) lines.push(`      ${k}: "${v}",`);
+    lines.push("    },");
+  }
+  for (const [k, v] of flat) lines.push(`    ${k}: "${v}",`);
+  return `images: {\n${lines.join("\n")}\n  }`;
+}
+
 /**
  * @param source - Config source
- * @param images - Role → image
+ * @param images - Dotted role → image
  */
-function replaceImagesBlock(source: string, images: Record<string, string>): string {
-  const lines = Object.entries(images).map(([k, v]) => {
-    const key = k.includes(".") ? `"${k}"` : k;
-    return `    ${key}: "${v}",`;
-  });
-  const block = `images: {\n${lines.join("\n")}\n  }`;
-  const re = /images:\s*\{[\s\S]*?\n\s*\}/;
-  if (!re.test(source)) {
+export function replaceImagesBlock(source: string, images: Record<string, string>): string {
+  const block = findImagesBlock(source);
+  if (!block) {
     throw new Error("create-oke: oke.config.ts missing images block");
   }
-  return source.replace(re, block);
+  return `${source.slice(0, block.start)}${formatImagesBlock(images)}${source.slice(block.end)}`;
 }
 
 /**

package/templates/advanced/oke.config.ts

@@ -71,13 +71,17 @@ export default defineConfig({
     // Opt in: create-oke --ai / oke ai setup writes drivers.ai + src/core/ai.ts
   },
   images: {
-    "store.sql": "postgres:18-alpine",
-    pgdog: "ghcr.io/pgdogdev/pgdog:v0.1.51",
-    "store.kv": "redis:8-alpine",
-    "store.files": "rustfs/rustfs:1.0.0-beta.11",
-    "channel.email": "axllent/mailpit:v1.22.3",
+    store: {
+      sql: "postgres:18-alpine",
+      kv: "redis:8-alpine",
+      files: "rustfs/rustfs:1.0.0-beta.11",
+      // index: "getmeili/meilisearch:v1.37",
+    },
+    channel: {
+      email: "axllent/mailpit:v1.22.3",
+    },
     vault: "openbao/openbao:2.6.1",
-    // "store.index": "getmeili/meilisearch:v1.37",
+    pgdog: "ghcr.io/pgdogdev/pgdog:v0.1.51",
     // ai: "ghcr.io/ggml-org/llama.cpp:server-b10290", // or ollama/ollama:0.32.6
   },
   i18n: { locales: ["en", "ar"], default: "en", dir: { ar: "rtl" } },

package/templates/advanced/src/core/store.ts

@@ -1,5 +1,5 @@
 import { store } from "okengine";
-import * as schema from "../db/schema.decl";
+import * as schema from "@/db/schema.decl";
 
 /** App SQL store — tables from {@link schema}. */
 export const db = store.sql("app", { schema });

package/templates/advanced/src/flows/notes/index.ts

@@ -1,8 +1,8 @@
 import { on, flow, http, every, gate, fail } from "okengine";
 import { eq, isNull } from "drizzle-orm";
 
-import { db, files, noteCreatedMail, webhookSecret } from "../../core";
-import { notes } from "../../db/schema.decl";
+import { db, files, noteCreatedMail, webhookSecret } from "@/core";
+import { notes } from "@/db/schema.decl";
 import {
   NoteAttachIn,
   NoteAttachOut,

package/templates/advanced/tsconfig.json

@@ -6,6 +6,9 @@
     "moduleDetection": "force",
     "types": ["bun"],
     "moduleResolution": "bundler",
+    "paths": {
+      "@/*": ["./src/*"]
+    },
     "allowImportingTsExtensions": true,
     "verbatimModuleSyntax": true,
     "noEmit": true,

package/templates/standard/oke.config.ts

@@ -64,12 +64,16 @@ export default defineConfig({
     },
   },
   images: {
-    "store.sql": "postgres:18-alpine",
-    pgdog: "ghcr.io/pgdogdev/pgdog:v0.1.51",
-    "store.kv": "redis:8-alpine",
-    "store.files": "rustfs/rustfs:1.0.0-beta.11",
-    "channel.email": "axllent/mailpit:v1.22.3",
+    store: {
+      sql: "postgres:18-alpine",
+      kv: "redis:8-alpine",
+      files: "rustfs/rustfs:1.0.0-beta.11",
+    },
+    channel: {
+      email: "axllent/mailpit:v1.22.3",
+    },
     vault: "openbao/openbao:2.6.1",
+    pgdog: "ghcr.io/pgdogdev/pgdog:v0.1.51",
   },
   i18n: { locales: ["en", "ar"], default: "en", dir: { ar: "rtl" } },
 });

package/templates/standard/src/core/store.ts

@@ -1,5 +1,5 @@
 import { store } from "okengine";
-import * as schema from "../db/schema.decl";
+import * as schema from "@/db/schema.decl";
 
 /** App SQL store — tables from {@link schema}. */
 export const db = store.sql("app", { schema });

package/templates/standard/src/flows/notes/index.ts

@@ -1,8 +1,8 @@
 import { on, flow, http, gate, fail } from "okengine";
 import { eq, isNull } from "drizzle-orm";
 
-import { db, noteCreatedMail, webhookSecret } from "../../core";
-import { notes } from "../../db/schema.decl";
+import { db, noteCreatedMail, webhookSecret } from "@/core";
+import { notes } from "@/db/schema.decl";
 import { NoteCreateIn, NoteIdIn, NoteListOut, NoteOut, NotFound } from "./shapes";
 import { noteCreated } from "./signals";
 

package/templates/standard/tsconfig.json

@@ -6,6 +6,9 @@
     "moduleDetection": "force",
     "types": ["bun"],
     "moduleResolution": "bundler",
+    "paths": {
+      "@/*": ["./src/*"]
+    },
     "allowImportingTsExtensions": true,
     "verbatimModuleSyntax": true,
     "noEmit": true,