@lukoweb/apitogo 0.1.61 → 0.1.63

package/dist/cli/cli.js

@@ -852,7 +852,7 @@ var init_ModulesSchema = __esm({
       sku: z3.string(),
       displayName: z3.string(),
       priceAmount: z3.number().default(0),
-      priceCurrency: z3.string().optional(),
+      priceCurrency: z3.string().trim().toLowerCase().regex(/^[a-z]{3}$/, "priceCurrency must be a 3-letter ISO 4217 code (lowercase)").optional(),
       billingPeriod: z3.string().optional(),
       limitsJson: z3.string().optional(),
       includedActionKeys: z3.array(z3.string()).optional()
@@ -993,17 +993,30 @@ async function readEffectiveManifest(rootDir, _env) {
     return null;
   }
 }
-var BillingPeriodSchema, ManifestPlanInputSchema, DevPortalLocalManifestSchema;
+var BillingPeriodSchema, PriceCurrencySchema, ALLOWED_RUNTIME_VERSIONS, ManifestPlanInputSchema, DevPortalLocalManifestSchema;
 var init_local_manifest = __esm({
   "src/config/local-manifest.ts"() {
     init_apitogo_config_loader();
     init_landing_manifest();
     BillingPeriodSchema = z4.enum(["month", "year", "monthly", "annual"]);
+    PriceCurrencySchema = z4.string().trim().toLowerCase().regex(/^[a-z]{3}$/, "priceCurrency must be a 3-letter ISO 4217 code (lowercase)");
+    ALLOWED_RUNTIME_VERSIONS = [
+      "DOTNET_10",
+      "DOTNET_9",
+      "DOTNET_8",
+      "NODE_24_LTS",
+      "NODE_22_LTS",
+      "PYTHON_314",
+      "PYTHON_313",
+      "PYTHON_312",
+      "PYTHON_311",
+      "PYTHON_310"
+    ];
     ManifestPlanInputSchema = z4.object({
       sku: z4.string().min(1),
       displayName: z4.string().min(1),
       priceAmount: z4.number().default(0),
-      priceCurrency: z4.string().optional(),
+      priceCurrency: PriceCurrencySchema.optional(),
       billingPeriod: BillingPeriodSchema.optional(),
       limitsJson: z4.string().optional(),
       includedActionKeys: z4.array(z4.string()).optional()
@@ -1042,8 +1055,15 @@ var init_local_manifest = __esm({
         sourceDirectory: z4.string().optional(),
         publishDirectory: z4.string().optional(),
         openApiPath: z4.string().optional(),
-        runtime: z4.string().optional(),
-        runtimeVersion: z4.string().optional(),
+        runtime: z4.enum(["dotnet", "nodejs", "python"]).or(z4.string()).optional(),
+        runtimeVersion: z4.string().optional().refine(
+          (value) => value === void 0 || ALLOWED_RUNTIME_VERSIONS.includes(value.toUpperCase()) || /^(8(\.0)?|9(\.0)?|10(\.0)?|net8\.0|net9\.0|net10\.0|24|22|3\.(10|11|12|13|14))$/i.test(
+            value
+          ),
+          {
+            message: `runtimeVersion must be a platform slug (${ALLOWED_RUNTIME_VERSIONS.join(", ")}) or a known alias such as 8.0`
+          }
+        ),
         deployed: z4.boolean().optional()
       }).optional(),
       gateway: z4.object({
@@ -4772,6 +4792,18 @@ import {
   runnerImport,
   loadEnv as viteLoadEnv
 } from "vite";
+function mergeJsonConfigWithRuntimeOverrides(fileConfig, importedConfig) {
+  const jsonConfig = buildApitogoConfig({
+    ...fileConfig,
+    plugins: importedConfig.plugins
+  });
+  return {
+    ...jsonConfig,
+    // Custom pages carry React elements and therefore only exist in the
+    // imported TSX config. They cannot be read from or cloned through JSON.
+    navigation: importedConfig.navigation ?? jsonConfig.navigation
+  };
+}
 async function getConfigFilePath(rootDir) {
   for (const fileName of zudokuConfigFiles) {
     const filepath = path5.join(rootDir, fileName);
@@ -4806,10 +4838,7 @@ async function loadZudokuConfigWithMeta(rootDir) {
   let config2;
   try {
     const fileConfig = loadApitogoConfig(rootDir);
-    config2 = buildApitogoConfig({
-      ...fileConfig,
-      plugins: importedConfig.plugins
-    });
+    config2 = mergeJsonConfigWithRuntimeOverrides(fileConfig, importedConfig);
   } catch {
     config2 = importedConfig;
   }
@@ -4906,6 +4935,7 @@ async function loadZudokuConfig(configEnv, rootDir) {
     return { config, envPrefix, publicEnv };
   }
   ({ publicEnv, envPrefix } = loadEnv(configEnv, rootDir));
+  let loadSucceeded = false;
   try {
     const loadedConfig = await loadZudokuConfigWithMeta(rootDir);
     const manifestEnv = resolveManifestEnv(configEnv.mode);
@@ -4943,6 +4973,7 @@ async function loadZudokuConfig(configEnv, rootDir) {
         { timestamp: true }
       );
     }
+    loadSucceeded = true;
     return { config, envPrefix, publicEnv };
   } catch (error) {
     const errorMessage = error instanceof Error ? error.message : String(error);
@@ -4951,7 +4982,11 @@ async function loadZudokuConfig(configEnv, rootDir) {
     }
     throw new Error(errorMessage, { cause: error });
   } finally {
-    await updateModifiedTimes();
+    if (loadSucceeded) {
+      await updateModifiedTimes();
+    } else {
+      modifiedTimes = void 0;
+    }
   }
 }
 var config, envPrefix, publicEnv, modifiedTimes, zudokuConfigFiles, serverConfigOutputFiles, virtualModuleStubPlugin, getCurrentConfig;
@@ -5238,7 +5273,7 @@ import {
 // package.json
 var package_default = {
   name: "@lukoweb/apitogo",
-  version: "0.1.61",
+  version: "0.1.63",
   type: "module",
   sideEffects: [
     "**/*.css",
@@ -7583,9 +7618,7 @@ var viteConfigReloadPlugin = () => ({
       if (file !== currentConfig.__meta.configPath && file.endsWith(".tsx"))
         return;
       invalidate(server);
-      Object.values(server.environments).forEach((env) => {
-        env.moduleGraph.invalidateAll();
-      });
+      reload(server);
       logger.info(
         colors3.blue(
           `Config ${path13.basename(currentConfig.__meta.configPath)} changed. Reloading...`

package/dist/declarations/config/loader.d.ts

@@ -16,6 +16,7 @@ export type ConfigWithMeta = ZudokuConfig & {
     };
     __resolvedModules: ResolvedModulesConfig;
 };
+export declare function mergeJsonConfigWithRuntimeOverrides(fileConfig: Record<string, unknown>, importedConfig: ZudokuConfig): ZudokuConfig;
 export declare function findOutputPathOfServerConfig(output: RollupOutput | RollupOutput[] | RollupWatcher): string;
 export declare const getCurrentConfig: () => ConfigWithMeta;
 export declare const setCurrentConfig: (newConfig: ConfigWithMeta) => void;

package/dist/declarations/config/local-manifest.d.ts

@@ -8,6 +8,7 @@ export declare const APITOGO_MANIFEST_ENV_FILES: {
 };
 export { APITOGO_CONFIG_FILENAME };
 export type ApitogoManifestEnv = keyof typeof APITOGO_MANIFEST_ENV_FILES;
+export declare const ALLOWED_RUNTIME_VERSIONS: readonly ["DOTNET_10", "DOTNET_9", "DOTNET_8", "NODE_24_LTS", "NODE_22_LTS", "PYTHON_314", "PYTHON_313", "PYTHON_312", "PYTHON_311", "PYTHON_310"];
 export declare const ManifestPlanInputSchema: z.ZodObject<{
     sku: z.ZodString;
     displayName: z.ZodString;
@@ -70,7 +71,11 @@ export declare const DevPortalLocalManifestSchema: z.ZodObject<{
         sourceDirectory: z.ZodOptional<z.ZodString>;
         publishDirectory: z.ZodOptional<z.ZodString>;
         openApiPath: z.ZodOptional<z.ZodString>;
-        runtime: z.ZodOptional<z.ZodString>;
+        runtime: z.ZodOptional<z.ZodUnion<[z.ZodEnum<{
+            python: "python";
+            dotnet: "dotnet";
+            nodejs: "nodejs";
+        }>, z.ZodString]>>;
         runtimeVersion: z.ZodOptional<z.ZodString>;
         deployed: z.ZodOptional<z.ZodBoolean>;
     }, z.core.$strip>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lukoweb/apitogo",
-  "version": "0.1.61",
+  "version": "0.1.63",
   "type": "module",
   "sideEffects": [
     "**/*.css",

package/src/config/loader.ts

@@ -69,6 +69,23 @@ const zudokuConfigFiles = [
 
 const serverConfigOutputFiles = ["apitogo.config.js", "zudoku.config.js"];
 
+export function mergeJsonConfigWithRuntimeOverrides(
+  fileConfig: Record<string, unknown>,
+  importedConfig: ZudokuConfig,
+): ZudokuConfig {
+  const jsonConfig = buildApitogoConfig({
+    ...fileConfig,
+    plugins: importedConfig.plugins,
+  });
+
+  return {
+    ...jsonConfig,
+    // Custom pages carry React elements and therefore only exist in the
+    // imported TSX config. They cannot be read from or cloned through JSON.
+    navigation: importedConfig.navigation ?? jsonConfig.navigation,
+  };
+}
+
 async function getConfigFilePath(rootDir: string) {
   for (const fileName of zudokuConfigFiles) {
     const filepath = path.join(rootDir, fileName);
@@ -123,10 +140,7 @@ async function loadZudokuConfigWithMeta(
   let config: ZudokuConfig;
   try {
     const fileConfig = loadApitogoConfig(rootDir);
-    config = buildApitogoConfig({
-      ...fileConfig,
-      plugins: importedConfig.plugins,
-    });
+    config = mergeJsonConfigWithRuntimeOverrides(fileConfig, importedConfig);
   } catch {
     config = importedConfig;
   }
@@ -271,6 +285,7 @@ export async function loadZudokuConfig(
 
   ({ publicEnv, envPrefix } = loadEnv(configEnv, rootDir));
 
+  let loadSucceeded = false;
   try {
     const loadedConfig = await loadZudokuConfigWithMeta(rootDir);
     const manifestEnv = resolveManifestEnv(configEnv.mode);
@@ -313,6 +328,7 @@ export async function loadZudokuConfig(
       );
     }
 
+    loadSucceeded = true;
     return { config, envPrefix, publicEnv };
   } catch (error) {
     const errorMessage = error instanceof Error ? error.message : String(error);
@@ -324,7 +340,13 @@ export async function loadZudokuConfig(
 
     throw new Error(errorMessage, { cause: error });
   } finally {
-    await updateModifiedTimes();
+    if (loadSucceeded) {
+      await updateModifiedTimes();
+    } else {
+      // A watcher may have observed a file while it was being replaced.
+      // Retry on the next request instead of caching the failed file mtimes.
+      modifiedTimes = undefined;
+    }
   }
 }
 

package/src/config/local-manifest.ts

@@ -28,11 +28,30 @@ export type ApitogoManifestEnv = keyof typeof APITOGO_MANIFEST_ENV_FILES;
 
 const BillingPeriodSchema = z.enum(["month", "year", "monthly", "annual"]);
 
+const PriceCurrencySchema = z
+  .string()
+  .trim()
+  .toLowerCase()
+  .regex(/^[a-z]{3}$/, "priceCurrency must be a 3-letter ISO 4217 code (lowercase)");
+
+export const ALLOWED_RUNTIME_VERSIONS = [
+  "DOTNET_10",
+  "DOTNET_9",
+  "DOTNET_8",
+  "NODE_24_LTS",
+  "NODE_22_LTS",
+  "PYTHON_314",
+  "PYTHON_313",
+  "PYTHON_312",
+  "PYTHON_311",
+  "PYTHON_310",
+] as const;
+
 export const ManifestPlanInputSchema = z.object({
   sku: z.string().min(1),
   displayName: z.string().min(1),
   priceAmount: z.number().default(0),
-  priceCurrency: z.string().optional(),
+  priceCurrency: PriceCurrencySchema.optional(),
   billingPeriod: BillingPeriodSchema.optional(),
   limitsJson: z.string().optional(),
   includedActionKeys: z.array(z.string()).optional(),
@@ -90,8 +109,21 @@ export const DevPortalLocalManifestSchema = z.object({
       sourceDirectory: z.string().optional(),
       publishDirectory: z.string().optional(),
       openApiPath: z.string().optional(),
-      runtime: z.string().optional(),
-      runtimeVersion: z.string().optional(),
+      runtime: z.enum(["dotnet", "nodejs", "python"]).or(z.string()).optional(),
+      runtimeVersion: z
+        .string()
+        .optional()
+        .refine(
+          (value) =>
+            value === undefined ||
+            (ALLOWED_RUNTIME_VERSIONS as readonly string[]).includes(value.toUpperCase()) ||
+            /^(8(\.0)?|9(\.0)?|10(\.0)?|net8\.0|net9\.0|net10\.0|24|22|3\.(10|11|12|13|14))$/i.test(
+              value,
+            ),
+          {
+            message: `runtimeVersion must be a platform slug (${ALLOWED_RUNTIME_VERSIONS.join(", ")}) or a known alias such as 8.0`,
+          },
+        ),
       deployed: z.boolean().optional(),
     })
     .optional(),

package/src/config/validators/ModulesSchema.ts

@@ -262,7 +262,12 @@ const PlanCatalogItemSchema = z.object({
   sku: z.string(),
   displayName: z.string(),
   priceAmount: z.number().default(0),
-  priceCurrency: z.string().optional(),
+  priceCurrency: z
+    .string()
+    .trim()
+    .toLowerCase()
+    .regex(/^[a-z]{3}$/, "priceCurrency must be a 3-letter ISO 4217 code (lowercase)")
+    .optional(),
   billingPeriod: z.string().optional(),
   limitsJson: z.string().optional(),
   includedActionKeys: z.array(z.string()).optional(),

package/src/vite/plugin-config-reload.ts

@@ -34,9 +34,7 @@ export const viteConfigReloadPlugin = (): Plugin => ({
         return;
 
       invalidateNavigation(server);
-      Object.values(server.environments).forEach((env) => {
-        env.moduleGraph.invalidateAll();
-      });
+      reload(server);
 
       logger.info(
         colors.blue(