@lukoweb/apitogo 0.1.23 → 0.1.37

package/src/vite/api/schema-codegen.ts

@@ -1,163 +1,163 @@
-import { type RecordAny, traverse } from "../../lib/util/traverse.js";
-
-const unescapeJsonPointer = (uri: string) =>
-  decodeURIComponent(uri.replace(/~1/g, "/").replace(/~0/g, "~"));
-
-const getSegmentsFromPath = (path: string) =>
-  path.split("/").slice(1).map(unescapeJsonPointer);
-
-// Find all $ref occurrences in the schema and assign them unique variable names
-const createLocalRefMap = (obj: RecordAny) => {
-  const refMap = new Map<string, number>();
-  const siblingsMap = new Map<
-    string,
-    { refPath: string; siblings: RecordAny }
-  >();
-
-  traverse(obj, (node) => {
-    if (typeof node.$ref === "string" && node.$ref.startsWith("#/")) {
-      if (!refMap.has(node.$ref)) {
-        refMap.set(node.$ref, refMap.size);
-      }
-
-      const { $ref, ...siblings } = node;
-
-      if (Object.keys(siblings).length > 0) {
-        const uniqueKey = `${$ref}__${siblingsMap.size}`;
-        siblingsMap.set(uniqueKey, { refPath: $ref, siblings });
-        node.__uniqueRefKey = uniqueKey;
-      }
-    }
-    return node;
-  });
-
-  return { refMap, siblingsMap };
-};
-
-// Replace $ref nodes with markers that become JS variable references
-const setRefMarkers = (obj: RecordAny, refMap: Map<string, number>) =>
-  traverse(obj, (node) => {
-    const { $ref, __uniqueRefKey } = node;
-    if (typeof $ref === "string" && refMap.has($ref)) {
-      return __uniqueRefKey
-        ? `__refMap+Siblings:${__uniqueRefKey}`
-        : `__refMap:${$ref}`;
-    }
-    return node;
-  });
-
-// Replace ref markers in generated code with actual variable references
-const replaceMarkers = (code: string, mergedRefs: Map<string, string>) =>
-  code
-    .replace(/"__refMap:(.*?)"/g, '__refMap["$1"]')
-    .replace(
-      /"__refMap\+Siblings:(.*?)"/g,
-      (_, key) => mergedRefs.get(key) ?? `__refMap["${key}"]`,
-    );
-
-const lookup = (
-  schema: RecordAny,
-  path: string,
-  filePath?: string,
-): RecordAny => {
-  const parts = getSegmentsFromPath(path);
-  let val = schema;
-
-  for (const part of parts) {
-    while (val.$ref?.startsWith("#/")) {
-      val = val.$ref === path ? val : lookup(schema, val.$ref, filePath);
-    }
-
-    if (val[part] === undefined) {
-      throw new Error(
-        `Error in ${filePath ?? "code generation"}: Could not find path segment ${part} in path: ${path}`,
-      );
-    }
-
-    val = val[part];
-  }
-
-  return val;
-};
-
-const stringify = (obj: unknown, indent = 2) =>
-  JSON.stringify(obj, null, indent);
-
-/**
- * Generate JavaScript code that exports the schema with all references resolved as variables.
- *
- * Handles circular references by:
- * 1. Creating empty objects first to establish the references
- * 2. Adding these objects to the reference map
- * 3. Using Object.assign to populate their properties later
- *
- * This ensures object identity throughout the circular references.
- */
-export const generateCode = (schema: RecordAny, filePath?: string) => {
-  const { refMap, siblingsMap } = createLocalRefMap(schema);
-  const lines: string[] = [];
-
-  lines.push(
-    `const __refs = Array.from({ length: ${refMap.size} }, () => ({}));`,
-    "const __refMap = {",
-    Array.from(refMap)
-      .map(([refPath, index]) => `  "${refPath}": __refs[${index}]`)
-      .join(",\n"),
-    "};",
-    "const __refMapPaths = Object.keys(__refMap);",
-  );
-
-  // Pre-declare merged ref variables as empty objects so they can be referenced
-  // during base ref population (they get populated after)
-  const mergedRefs = new Map<string, string>();
-
-  for (const uniqueKey of siblingsMap.keys()) {
-    const varName = `__merged_${mergedRefs.size}`;
-    mergedRefs.set(uniqueKey, varName);
-    lines.push(`const ${varName} = {};`);
-  }
-
-  const toCode = (obj: RecordAny) =>
-    replaceMarkers(stringify(setRefMarkers(obj, refMap)), mergedRefs);
-
-  // Pass 1: Populate all base refs. Bare $ref+siblings aliases are deferred
-  // until all regular base refs are populated (ordering is DFS-dependent).
-  const deferred: string[] = [];
-  for (const [refPath, index] of refMap) {
-    const value = lookup(schema, refPath, filePath);
-
-    if (!value) {
-      // biome-ignore lint/suspicious/noConsole: Logging allowed here
-      console.warn(`Could not find value for refPath: ${refPath}`);
-      continue;
-    }
-
-    const siblingEntry =
-      value.__uniqueRefKey && siblingsMap.get(value.__uniqueRefKey);
-    const target = siblingEntry ? deferred : lines;
-
-    target.push(
-      siblingEntry
-        ? `Object.assign(__refs[${index}], __refMap["${siblingEntry.refPath}"], ${stringify(siblingEntry.siblings)});`
-        : `Object.assign(__refs[${index}], ${toCode(value)});`,
-      `Object.defineProperty(__refs[${index}], "__$ref", { value: __refMapPaths[${index}], enumerable: false });`,
-    );
-  }
-  lines.push(...deferred);
-
-  // Pass 2: Populate merged objects (refs with sibling overrides like description)
-  for (const [uniqueKey, { refPath, siblings }] of siblingsMap) {
-    const varName = mergedRefs.get(uniqueKey);
-    const refIndex = refMap.get(refPath);
-    lines.push(
-      `Object.assign(${varName}, __refMap["${refPath}"], ${stringify(siblings)});`,
-      `Object.defineProperty(${varName}, "__$ref", { value: __refMapPaths[${refIndex}], enumerable: false });`,
-    );
-  }
-
-  const finalCode = toCode(schema);
-
-  lines.push(`export const schema = ${finalCode};`);
-
-  return lines.join("\n");
-};
+import { type RecordAny, traverse } from "../../lib/util/traverse.js";
+
+const unescapeJsonPointer = (uri: string) =>
+  decodeURIComponent(uri.replace(/~1/g, "/").replace(/~0/g, "~"));
+
+const getSegmentsFromPath = (path: string) =>
+  path.split("/").slice(1).map(unescapeJsonPointer);
+
+// Find all $ref occurrences in the schema and assign them unique variable names
+const createLocalRefMap = (obj: RecordAny) => {
+  const refMap = new Map<string, number>();
+  const siblingsMap = new Map<
+    string,
+    { refPath: string; siblings: RecordAny }
+  >();
+
+  traverse(obj, (node) => {
+    if (typeof node.$ref === "string" && node.$ref.startsWith("#/")) {
+      if (!refMap.has(node.$ref)) {
+        refMap.set(node.$ref, refMap.size);
+      }
+
+      const { $ref, ...siblings } = node;
+
+      if (Object.keys(siblings).length > 0) {
+        const uniqueKey = `${$ref}__${siblingsMap.size}`;
+        siblingsMap.set(uniqueKey, { refPath: $ref, siblings });
+        node.__uniqueRefKey = uniqueKey;
+      }
+    }
+    return node;
+  });
+
+  return { refMap, siblingsMap };
+};
+
+// Replace $ref nodes with markers that become JS variable references
+const setRefMarkers = (obj: RecordAny, refMap: Map<string, number>) =>
+  traverse(obj, (node) => {
+    const { $ref, __uniqueRefKey } = node;
+    if (typeof $ref === "string" && refMap.has($ref)) {
+      return __uniqueRefKey
+        ? `__refMap+Siblings:${__uniqueRefKey}`
+        : `__refMap:${$ref}`;
+    }
+    return node;
+  });
+
+// Replace ref markers in generated code with actual variable references
+const replaceMarkers = (code: string, mergedRefs: Map<string, string>) =>
+  code
+    .replace(/"__refMap:(.*?)"/g, '__refMap["$1"]')
+    .replace(
+      /"__refMap\+Siblings:(.*?)"/g,
+      (_, key) => mergedRefs.get(key) ?? `__refMap["${key}"]`,
+    );
+
+const lookup = (
+  schema: RecordAny,
+  path: string,
+  filePath?: string,
+): RecordAny => {
+  const parts = getSegmentsFromPath(path);
+  let val = schema;
+
+  for (const part of parts) {
+    while (val.$ref?.startsWith("#/")) {
+      val = val.$ref === path ? val : lookup(schema, val.$ref, filePath);
+    }
+
+    if (val[part] === undefined) {
+      throw new Error(
+        `Error in ${filePath ?? "code generation"}: Could not find path segment ${part} in path: ${path}`,
+      );
+    }
+
+    val = val[part];
+  }
+
+  return val;
+};
+
+const stringify = (obj: unknown, indent = 2) =>
+  JSON.stringify(obj, null, indent);
+
+/**
+ * Generate JavaScript code that exports the schema with all references resolved as variables.
+ *
+ * Handles circular references by:
+ * 1. Creating empty objects first to establish the references
+ * 2. Adding these objects to the reference map
+ * 3. Using Object.assign to populate their properties later
+ *
+ * This ensures object identity throughout the circular references.
+ */
+export const generateCode = (schema: RecordAny, filePath?: string) => {
+  const { refMap, siblingsMap } = createLocalRefMap(schema);
+  const lines: string[] = [];
+
+  lines.push(
+    `const __refs = Array.from({ length: ${refMap.size} }, () => ({}));`,
+    "const __refMap = {",
+    Array.from(refMap)
+      .map(([refPath, index]) => `  "${refPath}": __refs[${index}]`)
+      .join(",\n"),
+    "};",
+    "const __refMapPaths = Object.keys(__refMap);",
+  );
+
+  // Pre-declare merged ref variables as empty objects so they can be referenced
+  // during base ref population (they get populated after)
+  const mergedRefs = new Map<string, string>();
+
+  for (const uniqueKey of siblingsMap.keys()) {
+    const varName = `__merged_${mergedRefs.size}`;
+    mergedRefs.set(uniqueKey, varName);
+    lines.push(`const ${varName} = {};`);
+  }
+
+  const toCode = (obj: RecordAny) =>
+    replaceMarkers(stringify(setRefMarkers(obj, refMap)), mergedRefs);
+
+  // Pass 1: Populate all base refs. Bare $ref+siblings aliases are deferred
+  // until all regular base refs are populated (ordering is DFS-dependent).
+  const deferred: string[] = [];
+  for (const [refPath, index] of refMap) {
+    const value = lookup(schema, refPath, filePath);
+
+    if (!value) {
+      // biome-ignore lint/suspicious/noConsole: Logging allowed here
+      console.warn(`Could not find value for refPath: ${refPath}`);
+      continue;
+    }
+
+    const siblingEntry =
+      value.__uniqueRefKey && siblingsMap.get(value.__uniqueRefKey);
+    const target = siblingEntry ? deferred : lines;
+
+    target.push(
+      siblingEntry
+        ? `Object.assign(__refs[${index}], __refMap["${siblingEntry.refPath}"], ${stringify(siblingEntry.siblings)});`
+        : `Object.assign(__refs[${index}], ${toCode(value)});`,
+      `Object.defineProperty(__refs[${index}], "__$ref", { value: __refMapPaths[${index}], enumerable: false });`,
+    );
+  }
+  lines.push(...deferred);
+
+  // Pass 2: Populate merged objects (refs with sibling overrides like description)
+  for (const [uniqueKey, { refPath, siblings }] of siblingsMap) {
+    const varName = mergedRefs.get(uniqueKey);
+    const refIndex = refMap.get(refPath);
+    lines.push(
+      `Object.assign(${varName}, __refMap["${refPath}"], ${stringify(siblings)});`,
+      `Object.defineProperty(${varName}, "__$ref", { value: __refMapPaths[${refIndex}], enumerable: false });`,
+    );
+  }
+
+  const finalCode = toCode(schema);
+
+  lines.push(`export const schema = ${finalCode};`);
+
+  return lines.join("\n");
+};

package/src/vite/config.ts

@@ -15,8 +15,9 @@ import { getZudokuRootDir } from "../cli/common/package-json.js";
 import { loadZudokuConfig } from "../config/loader.js";
 import { CdnUrlSchema } from "../config/validators/ZudokuConfig.js";
 import { joinUrl } from "../lib/util/joinUrl.js";
-import { ensurePagefindDevStub } from "./pagefind-dev-stub.js";
+import { loadDevPortalViteDefines } from "./dev-portal-env.js";
 import { findPackageRoot } from "./package-root.js";
+import { ensurePagefindDevStub } from "./pagefind-dev-stub.js";
 import vitePlugin from "./plugin.js";
 import { getZuploSystemConfigurations } from "./zuplo.js";
 
@@ -96,6 +97,8 @@ export async function getViteConfig(
     getZuploSystemConfigurations(process.env.ZUPLO_SYSTEM_CONFIGURATIONS)
       ?.__ZUPLO_DEPLOYMENT_NAME;
 
+  const devPortalDefines = await loadDevPortalViteDefines(dir, configEnv.mode);
+
   const viteConfig: InlineConfig = {
     root: dir,
     base,
@@ -126,6 +129,7 @@ export async function getViteConfig(
         "ZUPLO_GATEWAY_SERVICE_URL",
       ]),
       ...publicVarsProcessEnvDefine,
+      ...devPortalDefines,
     },
     ssr: {
       target: "node",

package/src/vite/css/collect.ts

@@ -1,42 +1,42 @@
-import { type DevEnvironment, isCSSRequest } from "vite";
-
-export async function collectStyle(
-  server: DevEnvironment,
-  entries: string[],
-  cssModuleMap: Map<string, string>,
-) {
-  const urls = await collectStyleUrls(server, entries);
-
-  return urls.map((url) => cssModuleMap.get(url) ?? "").join("\n");
-}
-
-async function collectStyleUrls(
-  server: DevEnvironment,
-  entries: string[],
-): Promise<string[]> {
-  const visited = new Set<string>();
-
-  async function traverse(url: string) {
-    const [, id] = await server.moduleGraph.resolveUrl(url);
-    if (visited.has(id)) {
-      return;
-    }
-    visited.add(id);
-    const mod = server.moduleGraph.getModuleById(id);
-    if (!mod) {
-      return;
-    }
-    await Promise.all(
-      [...mod.importedModules].map((childMod) => traverse(childMod.url)),
-    );
-  }
-
-  // ensure vite's import analysis is ready _only_ for top entries to not go too aggresive
-  await Promise.all(entries.map((e) => server.transformRequest(e)));
-
-  // traverse
-  await Promise.all(entries.map((url) => traverse(url)));
-
-  // filter
-  return [...visited].filter((url) => isCSSRequest(url));
-}
+import { type DevEnvironment, isCSSRequest } from "vite";
+
+export async function collectStyle(
+  server: DevEnvironment,
+  entries: string[],
+  cssModuleMap: Map<string, string>,
+) {
+  const urls = await collectStyleUrls(server, entries);
+
+  return urls.map((url) => cssModuleMap.get(url) ?? "").join("\n");
+}
+
+async function collectStyleUrls(
+  server: DevEnvironment,
+  entries: string[],
+): Promise<string[]> {
+  const visited = new Set<string>();
+
+  async function traverse(url: string) {
+    const [, id] = await server.moduleGraph.resolveUrl(url);
+    if (visited.has(id)) {
+      return;
+    }
+    visited.add(id);
+    const mod = server.moduleGraph.getModuleById(id);
+    if (!mod) {
+      return;
+    }
+    await Promise.all(
+      [...mod.importedModules].map((childMod) => traverse(childMod.url)),
+    );
+  }
+
+  // ensure vite's import analysis is ready _only_ for top entries to not go too aggresive
+  await Promise.all(entries.map((e) => server.transformRequest(e)));
+
+  // traverse
+  await Promise.all(entries.map((url) => traverse(url)));
+
+  // filter
+  return [...visited].filter((url) => isCSSRequest(url));
+}

package/src/vite/css/plugin.ts

@@ -1,105 +1,105 @@
-// Taken and adapted from
-// https://github.com/hi-ogawa/vite-plugins/tree/main/packages/ssr-css
-import path from "node:path";
-import { type DevEnvironment, isCSSRequest, type Plugin } from "vite";
-import { getCurrentConfig } from "../../config/loader.js";
-import { virtualModuleId as THEME_VIRTUAL_MODULE } from "../plugin-theme.js";
-import { collectStyle } from "./collect.js";
-
-const VIRTUAL_ENTRY = "virtual:ssr-css.css";
-
-export function vitePluginSsrCss(pluginOpts: { entries: string[] }): Plugin {
-  let server: DevEnvironment;
-
-  const config = getCurrentConfig();
-
-  const virtualHref = path.join(
-    config.basePath ?? "",
-    `/@id/__x00__${VIRTUAL_ENTRY}?direct`,
-  );
-  const cssModuleMap = new Map<string, string>();
-
-  return {
-    name: "zudoku-ssr-css",
-    apply: "serve",
-    configureServer(server_) {
-      server = server_.environments.ssr;
-
-      // invalidate virtual modules for each inline request
-      server_.middlewares.use((req, _res, next) => {
-        if (req.url === virtualHref) {
-          invalidateModule(server, `\0${VIRTUAL_ENTRY}?direct`);
-        }
-        next();
-      });
-
-      // Clear CSS cache when config files change
-      server_.watcher.on("change", (file) => {
-        const currentConfig = getCurrentConfig();
-        if (
-          currentConfig.__meta.dependencies.includes(file) ||
-          file === currentConfig.__meta.configPath
-        ) {
-          cssModuleMap.clear();
-          invalidateModule(server, `\0${VIRTUAL_ENTRY}?direct`);
-          invalidateModule(server, `\0${THEME_VIRTUAL_MODULE}`);
-        }
-      });
-    },
-
-    resolveId(id) {
-      return id.startsWith(VIRTUAL_ENTRY) ? `\0${id}` : undefined;
-    },
-    transform(code, id) {
-      if (!isCSSRequest(id)) return;
-
-      cssModuleMap.set(id, code);
-    },
-    async load(id) {
-      if (!id.startsWith(`\0${VIRTUAL_ENTRY}`)) return;
-
-      const url = new URL(id.slice(1), "https://test.local");
-      let code = await collectStyle(server, pluginOpts.entries, cssModuleMap);
-      if (!url.searchParams.has("direct")) {
-        code = `export default ${JSON.stringify(code)};`;
-      }
-      return code;
-    },
-
-    // also expose via transformIndexHtml
-    transformIndexHtml: {
-      handler: async () => {
-        return [
-          {
-            tag: "link",
-            injectTo: "head",
-            attrs: {
-              rel: "stylesheet",
-              href: virtualHref,
-              "data-ssr-css": true,
-            },
-          },
-          {
-            tag: "script",
-            injectTo: "head",
-            attrs: { type: "module" },
-            children: `
-              import { createHotContext } from "/@vite/client";
-              const hot = createHotContext("/__clear_ssr_css");
-              hot.on("vite:afterUpdate", () => {
-                document.querySelectorAll("[data-ssr-css]").forEach(node => node.remove());
-              });
-            `,
-          },
-        ];
-      },
-    },
-  };
-}
-
-function invalidateModule(server: DevEnvironment, id: string) {
-  const mod = server.moduleGraph.getModuleById(id);
-  if (mod) {
-    server.moduleGraph.invalidateModule(mod);
-  }
-}
+// Taken and adapted from
+// https://github.com/hi-ogawa/vite-plugins/tree/main/packages/ssr-css
+import path from "node:path";
+import { type DevEnvironment, isCSSRequest, type Plugin } from "vite";
+import { getCurrentConfig } from "../../config/loader.js";
+import { virtualModuleId as THEME_VIRTUAL_MODULE } from "../plugin-theme.js";
+import { collectStyle } from "./collect.js";
+
+const VIRTUAL_ENTRY = "virtual:ssr-css.css";
+
+export function vitePluginSsrCss(pluginOpts: { entries: string[] }): Plugin {
+  let server: DevEnvironment;
+
+  const config = getCurrentConfig();
+
+  const virtualHref = path.join(
+    config.basePath ?? "",
+    `/@id/__x00__${VIRTUAL_ENTRY}?direct`,
+  );
+  const cssModuleMap = new Map<string, string>();
+
+  return {
+    name: "zudoku-ssr-css",
+    apply: "serve",
+    configureServer(server_) {
+      server = server_.environments.ssr;
+
+      // invalidate virtual modules for each inline request
+      server_.middlewares.use((req, _res, next) => {
+        if (req.url === virtualHref) {
+          invalidateModule(server, `\0${VIRTUAL_ENTRY}?direct`);
+        }
+        next();
+      });
+
+      // Clear CSS cache when config files change
+      server_.watcher.on("change", (file) => {
+        const currentConfig = getCurrentConfig();
+        if (
+          currentConfig.__meta.dependencies.includes(file) ||
+          file === currentConfig.__meta.configPath
+        ) {
+          cssModuleMap.clear();
+          invalidateModule(server, `\0${VIRTUAL_ENTRY}?direct`);
+          invalidateModule(server, `\0${THEME_VIRTUAL_MODULE}`);
+        }
+      });
+    },
+
+    resolveId(id) {
+      return id.startsWith(VIRTUAL_ENTRY) ? `\0${id}` : undefined;
+    },
+    transform(code, id) {
+      if (!isCSSRequest(id)) return;
+
+      cssModuleMap.set(id, code);
+    },
+    async load(id) {
+      if (!id.startsWith(`\0${VIRTUAL_ENTRY}`)) return;
+
+      const url = new URL(id.slice(1), "https://test.local");
+      let code = await collectStyle(server, pluginOpts.entries, cssModuleMap);
+      if (!url.searchParams.has("direct")) {
+        code = `export default ${JSON.stringify(code)};`;
+      }
+      return code;
+    },
+
+    // also expose via transformIndexHtml
+    transformIndexHtml: {
+      handler: async () => {
+        return [
+          {
+            tag: "link",
+            injectTo: "head",
+            attrs: {
+              rel: "stylesheet",
+              href: virtualHref,
+              "data-ssr-css": true,
+            },
+          },
+          {
+            tag: "script",
+            injectTo: "head",
+            attrs: { type: "module" },
+            children: `
+              import { createHotContext } from "/@vite/client";
+              const hot = createHotContext("/__clear_ssr_css");
+              hot.on("vite:afterUpdate", () => {
+                document.querySelectorAll("[data-ssr-css]").forEach(node => node.remove());
+              });
+            `,
+          },
+        ];
+      },
+    },
+  };
+}
+
+function invalidateModule(server: DevEnvironment, id: string) {
+  const mod = server.moduleGraph.getModuleById(id);
+  if (mod) {
+    server.moduleGraph.invalidateModule(mod);
+  }
+}