@lukoweb/apitogo 0.1.51 → 0.1.54

package/src/config/apitogo-config-loader.ts

@@ -1,224 +1,6 @@
-import { existsSync, readFileSync } from "node:fs";
-import path from "node:path";
-
-export const APITOGO_CONFIG_FILENAME = "apitogo.config.json";
-
-const ENV_PREFIX = "APITOGO_CONFIG_";
-
-const MANIFEST_KEYS = [
-  "siteName",
-  "branding",
-  "pricing",
-  "authentication",
-  "plans",
-  "backend",
-  "gateway",
-  "projectId",
-  "projectName",
-] as const;
-
-const SITE_CONFIG_KEYS = [
-  "site",
-  "metadata",
-  "docs",
-  "modules",
-  "navigation",
-  "apis",
-  "redirects",
-  "theme",
-  "footer",
-  "search",
-  "llms",
-  "protectedRoutes",
-  "slots",
-  "mdx",
-  "apiKeys",
-  "catalog",
-  "versions",
-  "options",
-] as const;
-
-export type ApitogoJsonConfig = Record<string, unknown>;
-
-function parseEnvValue(raw: string | undefined): unknown {
-  if (raw === undefined) {
-    return raw;
-  }
-
-  const trimmed = raw.trim();
-  if (trimmed === "true") {
-    return true;
-  }
-  if (trimmed === "false") {
-    return false;
-  }
-  if (trimmed === "null") {
-    return null;
-  }
-
-  if (/^-?\d+(\.\d+)?$/.test(trimmed)) {
-    return Number(trimmed);
-  }
-
-  if (
-    (trimmed.startsWith("{") && trimmed.endsWith("}")) ||
-    (trimmed.startsWith("[") && trimmed.endsWith("]"))
-  ) {
-    try {
-      return JSON.parse(trimmed) as unknown;
-    } catch {
-      return trimmed;
-    }
-  }
-
-  return trimmed;
-}
-
-function setNestedValue(
-  target: Record<string, unknown>,
-  pathParts: string[],
-  value: unknown,
-): void {
-  if (pathParts.length === 0) {
-    return;
-  }
-
-  let current: Record<string, unknown> = target;
-  for (let index = 0; index < pathParts.length - 1; index += 1) {
-    const key = pathParts[index];
-    if (!key) {
-      return;
-    }
-    const next = current[key];
-    if (
-      next === undefined ||
-      next === null ||
-      typeof next !== "object" ||
-      Array.isArray(next)
-    ) {
-      current[key] = {};
-    }
-    current = current[key] as Record<string, unknown>;
-  }
-
-  const leafKey = pathParts[pathParts.length - 1];
-  if (!leafKey) {
-    return;
-  }
-
-  current[leafKey] = value;
-}
-
-export function applyEnvOverrides(
-  config: ApitogoJsonConfig,
-  env: NodeJS.ProcessEnv = process.env,
-): ApitogoJsonConfig {
-  const result = structuredClone(config);
-
-  for (const [key, value] of Object.entries(env)) {
-    if (!key.startsWith(ENV_PREFIX) || value === undefined) {
-      continue;
-    }
-
-    const pathParts = key
-      .slice(ENV_PREFIX.length)
-      .split("__")
-      .filter(Boolean);
-
-    if (pathParts.length === 0) {
-      continue;
-    }
-
-    setNestedValue(result, pathParts, parseEnvValue(value));
-  }
-
-  return result;
-}
-
-export function loadApitogoConfig(rootDir = process.cwd()): ApitogoJsonConfig {
-  const configPath = path.join(path.resolve(rootDir), APITOGO_CONFIG_FILENAME);
-
-  if (!existsSync(configPath)) {
-    throw new Error(
-      `Missing ${APITOGO_CONFIG_FILENAME} in ${path.resolve(rootDir)}`,
-    );
-  }
-
-  const raw = readFileSync(configPath, "utf8");
-  const parsed = JSON.parse(raw) as ApitogoJsonConfig;
-  return applyEnvOverrides(parsed, process.env);
-}
-
-export function extractManifest(
-  config: ApitogoJsonConfig | null | undefined,
-): ApitogoJsonConfig | null {
-  if (!config || typeof config !== "object") {
-    return null;
-  }
-
-  const manifest: ApitogoJsonConfig = {};
-  for (const key of MANIFEST_KEYS) {
-    if (config[key] !== undefined) {
-      manifest[key] = config[key];
-    }
-  }
-
-  const authentication = manifest.authentication;
-  if (authentication && typeof authentication === "object") {
-    const { enabled } = authentication as { enabled?: boolean };
-    manifest.authentication =
-      enabled === undefined ? undefined : { enabled };
-  }
-
-  return Object.keys(manifest).length > 0 ? manifest : null;
-}
-
-export function extractSiteConfig(
-  config: ApitogoJsonConfig | null | undefined,
-): ApitogoJsonConfig {
-  if (!config || typeof config !== "object") {
-    return {};
-  }
-
-  const siteConfig: ApitogoJsonConfig = {};
-  for (const key of SITE_CONFIG_KEYS) {
-    if (config[key] !== undefined) {
-      siteConfig[key] = config[key];
-    }
-  }
-
-  const auth = config.authentication;
-  if (auth && typeof auth === "object") {
-    const authRecord = auth as Record<string, unknown>;
-    if (authRecord.type) {
-      const { enabled: _enabled, ...authConfig } = authRecord;
-      siteConfig.authentication = authConfig;
-    }
-  }
-
-  const site = siteConfig.site;
-  const branding = config.branding;
-  const title =
-    (site &&
-      typeof site === "object" &&
-      (site as Record<string, unknown>).title) ??
-    (branding &&
-      typeof branding === "object" &&
-      (branding as Record<string, unknown>).title) ??
-    config.siteName;
-
-  if (title) {
-    siteConfig.site = {
-      ...(site && typeof site === "object"
-        ? (site as Record<string, unknown>)
-        : {}),
-      title,
-    };
-  }
-
-  return siteConfig;
-}
-
-export function apitogoConfigPath(rootDir: string): string {
-  return path.join(path.resolve(rootDir), APITOGO_CONFIG_FILENAME);
-}
+export * from "./apitogo-config-core.js";
+export {
+  apitogoConfigPath,
+  loadApitogoConfig,
+  readAuthenticationSecrets,
+} from "./apitogo-config-loader.node.js";

package/src/config/build-apitogo-config.ts

@@ -1,43 +1,52 @@
-import type { ApitogoConfig } from "./config.js";
+import type { ApitogoPlugin } from "../lib/core/plugins.js";
 import {
   extractSiteConfig,
-  loadApitogoConfig,
-} from "./apitogo-config-loader.js";
+  normalizeApitogoConfig,
+  type ApitogoJsonConfig,
+} from "./apitogo-config-core.js";
+import type { ApitogoConfig } from "./config.js";
 
-type BuildApitogoConfigOptions = {
-  rootDir?: string;
-  overrides?: Partial<ApitogoConfig>;
-};
+type BuildApitogoConfigOptions = Partial<ApitogoConfig> &
+  ApitogoJsonConfig & {
+    plugins?: ApitogoPlugin[];
+  };
 
 export function buildApitogoConfig({
-  rootDir,
-  overrides = {},
+  plugins,
+  plans: _legacyPlans,
+  ...jsonOverrides
 }: BuildApitogoConfigOptions = {}): ApitogoConfig {
-  const jsonConfig = loadApitogoConfig(rootDir);
+  const jsonConfig = normalizeApitogoConfig({
+    ...jsonOverrides,
+    ...(_legacyPlans !== undefined ? { plans: _legacyPlans } : {}),
+  } as ApitogoJsonConfig);
   const siteConfig = extractSiteConfig(jsonConfig);
+  const { plans: _rootPlans, ...restOverrides } =
+    jsonOverrides as ApitogoJsonConfig;
 
   return {
     ...siteConfig,
-    ...overrides,
+    ...restOverrides,
+    plugins,
     authentication: {
       ...(siteConfig.authentication as ApitogoConfig["authentication"]),
-      ...overrides.authentication,
+      ...jsonOverrides.authentication,
     },
     site: {
       ...(siteConfig.site as ApitogoConfig["site"]),
-      ...overrides.site,
+      ...jsonOverrides.site,
     },
     metadata: {
       ...(siteConfig.metadata as ApitogoConfig["metadata"]),
-      ...overrides.metadata,
+      ...jsonOverrides.metadata,
     },
     docs: {
       ...(siteConfig.docs as ApitogoConfig["docs"]),
-      ...overrides.docs,
+      ...jsonOverrides.docs,
     },
     modules: {
-      ...(siteConfig.modules as ApitogoConfig["modules"]),
-      ...overrides.modules,
+      ...(jsonConfig.modules as ApitogoConfig["modules"]),
+      ...jsonOverrides.modules,
     },
   } as ApitogoConfig;
 }

package/src/config/loader.ts

@@ -13,13 +13,21 @@ import { getZudokuRootDir } from "../cli/common/package-json.js";
 import { applyAuthenticationHeaderNav } from "../lib/authentication/auth-header-nav.js";
 import { runPluginTransformConfig } from "../lib/core/transform-config.js";
 import invariant from "../lib/util/invariant.js";
+import {
+  isBillingEnabled,
+  loadApitogoConfig,
+  readPlanCatalogItems,
+} from "./apitogo-config-loader.js";
 import { fileExists } from "./file-exists.js";
 import {
   isAuthenticationEnabled,
-  isPricingEnabled,
   manifestPathsForEnv,
+  manifestToPreviewCatalog,
+  plansToPreviewCatalog,
   readEffectiveManifest,
   resolveManifestEnv,
+  type DevPortalPreviewPlan,
+  type ManifestPlanInput,
 } from "./local-manifest.js";
 import { resolveModulesConfig } from "./resolve-modules.js";
 import type { ResolvedModulesConfig } from "./validators/ModulesSchema.js";
@@ -35,6 +43,7 @@ export type ConfigWithMeta = ZudokuConfig & {
     dependencies: string[];
     pricingEnabled?: boolean;
     authenticationEnabled?: boolean;
+    previewPlans?: DevPortalPreviewPlan[];
   };
   __resolvedModules: ResolvedModulesConfig;
 };
@@ -254,12 +263,20 @@ export async function loadZudokuConfig(
     const loadedConfig = await loadZudokuConfigWithMeta(rootDir);
     const manifestEnv = resolveManifestEnv(configEnv.mode);
     const manifest = await readEffectiveManifest(rootDir, manifestEnv);
+    const previewCatalog = manifestToPreviewCatalog(manifest);
+    const jsonConfig = loadApitogoConfig(rootDir);
+    const previewPlans = previewCatalog.plans.length
+      ? previewCatalog.plans
+      : plansToPreviewCatalog(
+          readPlanCatalogItems(jsonConfig) as ManifestPlanInput[],
+        ).plans;
     const configWithManifestMeta: ConfigWithMeta = {
       ...loadedConfig,
       __meta: {
         ...loadedConfig.__meta,
-        pricingEnabled: isPricingEnabled(manifest),
+        pricingEnabled: isBillingEnabled(jsonConfig),
         authenticationEnabled: isAuthenticationEnabled(manifest),
+        previewPlans,
       },
     };
     const transformedConfig = applyAuthenticationHeaderNav(
@@ -267,6 +284,10 @@ export async function loadZudokuConfig(
     );
     config = {
       ...transformedConfig,
+      __meta: {
+        ...transformedConfig.__meta,
+        ...configWithManifestMeta.__meta,
+      },
       __resolvedModules: resolveModulesConfig(transformedConfig),
     };
 

package/src/config/local-manifest.ts

@@ -4,16 +4,15 @@ import { z } from "zod";
 import {
   APITOGO_CONFIG_FILENAME,
   extractManifest,
+  isBillingEnabled,
   loadApitogoConfig,
+  readPlanCatalogItems,
 } from "./apitogo-config-loader.js";
 
-/** @deprecated Use {@link APITOGO_CONFIG_FILENAME}. */
-export const DEV_PORTAL_MANIFEST_FILENAME = "apitogo.local.json";
-
-/** @deprecated Use {@link APITOGO_CONFIG_FILENAME}. */
+/** @deprecated Legacy manifest filenames — apitogo.config.json is the only supported source. */
 export const APITOGO_MANIFEST_BASE_FILENAME = "apitogo.json";
 
-/** @deprecated Per-environment manifest overrides were replaced by apitogo.config.json + .env. */
+/** @deprecated Legacy per-environment manifest overrides. */
 export const APITOGO_MANIFEST_ENV_FILES = {
   development: "apitogo.local.json",
   production: "apitogo.prod.json",
@@ -28,14 +27,18 @@ const BillingPeriodSchema = z.enum(["month", "year", "monthly", "annual"]);
 export const ManifestPlanInputSchema = z.object({
   sku: z.string().min(1),
   displayName: z.string().min(1),
-  isFree: z.boolean(),
-  priceAmount: z.number().optional(),
+  priceAmount: z.number().default(0),
   priceCurrency: z.string().optional(),
   billingPeriod: BillingPeriodSchema.optional(),
   limitsJson: z.string().optional(),
   includedActionKeys: z.array(z.string()).optional(),
 });
 
+/** Free plans have zero price; paid plans have priceAmount greater than zero. */
+export function isPlanFree(plan: { priceAmount?: number }): boolean {
+  return (plan.priceAmount ?? 0) <= 0;
+}
+
 export const DevPortalLocalManifestSchema = z.object({
   siteName: z.string().optional(),
   branding: z
@@ -52,6 +55,29 @@ export const DevPortalLocalManifestSchema = z.object({
   authentication: z
     .object({
       enabled: z.boolean().optional(),
+      apiBaseUrl: z.string().optional(),
+      native: z
+        .object({
+          enabled: z.boolean().optional(),
+        })
+        .optional(),
+      email: z
+        .object({
+          provider: z.string().optional(),
+          from: z.string().optional(),
+        })
+        .optional(),
+      providers: z
+        .array(
+          z.object({
+            id: z.string().min(1),
+            displayName: z.string().optional(),
+            authority: z.string().optional(),
+            clientId: z.string().optional(),
+            scopes: z.string().optional(),
+          }),
+        )
+        .optional(),
     })
     .optional(),
   plans: z.array(ManifestPlanInputSchema).optional(),
@@ -76,7 +102,6 @@ export const DevPortalLocalManifestSchema = z.object({
     })
     .optional(),
   projectId: z.string().optional(),
-  projectName: z.string().optional(),
 });
 
 export type ManifestPlanInput = z.infer<typeof ManifestPlanInputSchema>;
@@ -87,7 +112,6 @@ export type DevPortalLocalManifest = z.infer<
 export type DevPortalPreviewPlan = {
   sku: string;
   displayName: string;
-  isFree: boolean;
   priceAmount: number;
   priceCurrency: string;
   billingPeriod: string;
@@ -113,6 +137,16 @@ export function isAuthenticationEnabled(
   return manifest?.authentication?.enabled === true;
 }
 
+export function isNativeAuthEnabledInManifest(
+  manifest: DevPortalLocalManifest | null | undefined,
+): boolean {
+  if (!isAuthenticationEnabled(manifest)) {
+    return false;
+  }
+
+  return manifest?.authentication?.native?.enabled !== false;
+}
+
 export function manifestToPreviewCatalog(
   manifest: DevPortalLocalManifest | null | undefined,
 ): DevPortalPreviewPlanCatalog {
@@ -151,7 +185,6 @@ export function plansToPreviewCatalog(
     plans: plans.map((plan) => ({
       sku: plan.sku,
       displayName: plan.displayName,
-      isFree: plan.isFree,
       priceAmount: plan.priceAmount ?? 0,
       priceCurrency: plan.priceCurrency ?? "usd",
       billingPeriod: normalizeBillingPeriod(plan.billingPeriod),
@@ -212,10 +245,7 @@ export function mergeManifest(
 }
 
 export function manifestFilePath(rootDir: string, filename?: string): string {
-  return path.join(
-    path.resolve(rootDir),
-    filename ?? DEV_PORTAL_MANIFEST_FILENAME,
-  );
+  return path.join(path.resolve(rootDir), filename ?? APITOGO_CONFIG_FILENAME);
 }
 
 export function manifestPathsForEnv(
@@ -283,60 +313,29 @@ function parseManifestRecord(
 
 export async function readEffectiveManifest(
   rootDir: string,
-  env: ApitogoManifestEnv,
+  _env: ApitogoManifestEnv,
 ): Promise<DevPortalLocalManifest | null> {
   try {
     const config = loadApitogoConfig(rootDir);
-    return parseManifestRecord(extractManifest(config));
-  } catch {
-    return readLegacyEffectiveManifest(rootDir, env);
-  }
-}
-
-async function readLegacyEffectiveManifest(
-  rootDir: string,
-  env: ApitogoManifestEnv,
-): Promise<DevPortalLocalManifest | null> {
-  const resolvedRoot = path.resolve(rootDir);
-  const basePath = path.join(resolvedRoot, APITOGO_MANIFEST_BASE_FILENAME);
-  const overridePath = path.join(resolvedRoot, APITOGO_MANIFEST_ENV_FILES[env]);
-  const hasBase = await fileExists(basePath);
-  const hasOverride = await fileExists(overridePath);
-
-  if (!hasBase) {
-    const legacy = await readManifestFile(
-      rootDir,
-      APITOGO_MANIFEST_ENV_FILES.development,
-    );
-    if (legacy) {
-      return legacy;
+    const manifest = parseManifestRecord(extractManifest(config));
+    if (!manifest) {
+      return null;
     }
 
-    if (hasOverride) {
-      return readManifestFile(rootDir, APITOGO_MANIFEST_ENV_FILES[env]);
+    if (!manifest.plans?.length) {
+      const items = readPlanCatalogItems(config);
+      if (items.length) {
+        manifest.plans = items as ManifestPlanInput[];
+      }
     }
 
+    return {
+      ...manifest,
+      pricing: { ...manifest.pricing, enabled: isBillingEnabled(config) },
+    };
+  } catch {
     return null;
   }
-
-  const base = await readManifestFile(rootDir, APITOGO_MANIFEST_BASE_FILENAME);
-  if (!base) {
-    return null;
-  }
-
-  if (!hasOverride) {
-    return base;
-  }
-
-  const override = await readManifestFile(
-    rootDir,
-    APITOGO_MANIFEST_ENV_FILES[env],
-  );
-  if (!override) {
-    return base;
-  }
-
-  return mergeManifest(base, override);
 }
 
 export async function readLocalManifest(

package/src/config/resolve-modules.ts

@@ -141,10 +141,14 @@ export const resolveModulesConfig = (
     : !!config.authentication;
 
   const apiKeysEnabled = explicit
-    ? (apiKeysModuleConfig?.enabled ?? config.apiKeys?.enabled ?? false)
-    : (config.apiKeys?.enabled ?? false);
+    ? (apiKeysModuleConfig?.enabled ?? false)
+    : false;
 
-  const plansEnabled = plansConfig?.enabled ?? false;
+  const billingEnabled =
+    (config as { __meta?: { pricingEnabled?: boolean } }).__meta
+      ?.pricingEnabled === true || plansConfig?.enabled === true;
+
+  const plansEnabled = billingEnabled;
 
   const userPanelEnabled =
     userPanelModule?.enabled ??
@@ -158,11 +162,10 @@ export const resolveModulesConfig = (
   return {
     docs: {
       enabled: docsEnabled,
-      files: docsModule?.files ?? config.docs?.files,
-      publishMarkdown:
-        docsModule?.publishMarkdown ?? config.docs?.publishMarkdown,
-      defaultOptions: docsModule?.defaultOptions ?? config.docs?.defaultOptions,
-      llms: docsModule?.llms ?? config.docs?.llms,
+      files: docsModule?.files,
+      publishMarkdown: docsModule?.publishMarkdown,
+      defaultOptions: docsModule?.defaultOptions,
+      llms: docsModule?.llms,
     },
     landing: {
       enabled: landingEnabled,
@@ -203,6 +206,7 @@ export const resolveModulesConfig = (
         enabled: plansEnabled,
         path: joinPanelPath(basePath, plansConfig?.path ?? "plans"),
         content: resolvePlansContent(plansConfig?.content),
+        items: plansConfig?.items,
       },
     },
   };
@@ -242,11 +246,10 @@ export const getEffectiveDocsConfig = (
   }
 
   return {
-    files: resolved.docs.files ?? config.docs?.files ?? [DEFAULT_DOCS_FILES],
-    publishMarkdown:
-      resolved.docs.publishMarkdown ?? config.docs?.publishMarkdown ?? false,
-    defaultOptions: resolved.docs.defaultOptions ?? config.docs?.defaultOptions,
-    llms: resolved.docs.llms ?? config.docs?.llms,
+    files: resolved.docs.files ?? [DEFAULT_DOCS_FILES],
+    publishMarkdown: resolved.docs.publishMarkdown ?? false,
+    defaultOptions: resolved.docs.defaultOptions,
+    llms: resolved.docs.llms,
   };
 };
 

package/src/config/validators/ModulesSchema.ts

@@ -154,6 +154,16 @@ export const ApiKeysModuleSchema = ModuleToggleSchema.extend({
     .describe("Route path for API key management."),
 });
 
+const PlanCatalogItemSchema = z.object({
+  sku: z.string(),
+  displayName: z.string(),
+  priceAmount: z.number().default(0),
+  priceCurrency: z.string().optional(),
+  billingPeriod: z.string().optional(),
+  limitsJson: z.string().optional(),
+  includedActionKeys: z.array(z.string()).optional(),
+});
+
 export const PlansModuleSchema = ModuleToggleSchema.extend({
   path: z
     .string()
@@ -164,6 +174,12 @@ export const PlansModuleSchema = ModuleToggleSchema.extend({
   content: PlansContentSchema.describe(
     "Default plans page content when no custom component is provided.",
   ),
+  items: z
+    .array(PlanCatalogItemSchema)
+    .optional()
+    .describe(
+      "Gateway plan catalog for /pricing preview and publish (canonical storage).",
+    ),
 });
 
 export const DashboardModuleSchema = ModuleToggleSchema.extend({
@@ -288,6 +304,7 @@ export type ResolvedPlansModule = {
   enabled: boolean;
   path: string;
   content: ResolvedPlansContent;
+  items?: z.infer<typeof PlanCatalogItemSchema>[];
 };
 
 export type ResolvedDashboardModule = {

package/src/config/validators/ZudokuConfig.ts

@@ -492,8 +492,32 @@ const AuthenticationSchema = z.discriminatedUnion("type", [
     redirectToAfterSignOut: z.string().optional(),
   }),
   z.object({
-    type: z.literal("dev-portal"),
+    type: z.literal("dev-portal").optional().default("dev-portal"),
     apiBaseUrl: z.string().optional(),
+    native: z
+      .object({
+        enabled: z.boolean().optional(),
+      })
+      .optional(),
+    email: z
+      .object({
+        provider: z.string().optional(),
+        from: z.string().optional(),
+        connectionString: z.string().optional(),
+      })
+      .optional(),
+    providers: z
+      .array(
+        z.object({
+          id: z.string().min(1),
+          displayName: z.string().optional(),
+          authority: z.string().optional(),
+          clientId: z.string().optional(),
+          clientSecret: z.string().optional(),
+          scopes: z.string().optional(),
+        }),
+      )
+      .optional(),
     redirectToAfterSignUp: z.string().optional(),
     redirectToAfterSignIn: z.string().optional(),
     redirectToAfterSignOut: z.string().optional(),

package/src/index.ts

@@ -77,5 +77,6 @@ export {
   applyEnvOverrides,
   extractManifest,
   extractSiteConfig,
-  loadApitogoConfig,
-} from "./config/apitogo-config-loader.js";
+  normalizeApitogoConfig,
+  resolveProjectDisplayName,
+} from "./config/apitogo-config-core.js";