@lukoweb/apitogo 0.1.136 → 0.1.138

package/dist/cli/cli.js

@@ -5809,7 +5809,7 @@ import {
 // package.json
 var package_default = {
   name: "@lukoweb/apitogo",
-  version: "0.1.136",
+  version: "0.1.138",
   type: "module",
   sideEffects: [
     "**/*.css",
@@ -16864,11 +16864,17 @@ async function checkGatewayPlansOnPlatform(client, args) {
   };
 }
 async function assertGatewayPlansValidForPublish(client, args) {
+  const localErrors = args.localErrors ?? [];
   const check2 = await checkGatewayPlansOnPlatform(client, args);
-  if (!check2 || check2.errors.length === 0) {
+  const localFields = new Set(localErrors.map((issue) => issue.field));
+  const errors = [
+    ...localErrors,
+    ...(check2?.errors ?? []).filter((issue) => !localFields.has(issue.field))
+  ];
+  if (errors.length === 0) {
     return { blocked: false };
   }
-  const { errors, warnings } = check2;
+  const warnings = check2?.warnings ?? [];
   return {
     blocked: true,
     payload: {
@@ -16877,8 +16883,8 @@ async function assertGatewayPlansValidForPublish(client, args) {
       ...args.projectId ? { projectId: args.projectId } : {},
       errors,
       warnings,
-      userMessage: `Deploy is blocked: apitogo.config.json has ${errors.length} plan ${errors.length === 1 ? "error" : "errors"}.`,
-      nextStep: "Fix every issue listed in errors in apitogo.config.json plans, then retry publish."
+      userMessage: `Deploy is blocked: apitogo.config.json has ${errors.length} ${errors.length === 1 ? "error" : "errors"}.`,
+      nextStep: "Fix every issue listed in errors in apitogo.config.json, then retry publish."
     }
   };
 }
@@ -20988,19 +20994,23 @@ async function shouldSkipBackendRedeploy(client, projectId, manifest, ledger, ex
   }
   return { skip: false };
 }
-function validateManifestForPublish(manifest, secrets, emailOptions) {
+function prepareManifestForPublish(manifest) {
   if (!manifest.plans?.length) {
     throw new Error("apitogo.config.json must include at least one plan.");
   }
   const { manifest: normalized } = normalizeManifestForPlatform(manifest);
-  const platformValidation = validateManifestForPlatformPublish(normalized);
-  if (!platformValidation.valid) {
-    throw new Error(
-      `apitogo.config.json is not platform-compatible: ${platformValidation.issues.map((issue) => `${issue.field}: ${issue.message}`).join("; ")}`
-    );
+  return {
+    manifest: normalized,
+    issues: validateManifestForPlatformPublish(normalized).issues
+  };
+}
+function throwOnManifestIssues(issues) {
+  if (issues.length === 0) {
+    return;
   }
-  validateSecretsForPublish(normalized, secrets, emailOptions);
-  return normalized;
+  throw new Error(
+    `apitogo.config.json is not platform-compatible: ${issues.map((issue) => `${issue.field}: ${issue.message}`).join("; ")}`
+  );
 }
 async function runApplyFromSiteDirectory(client, config2, args, progress) {
   const wait = args.wait !== false;
@@ -21055,18 +21065,17 @@ async function runApplyFromSiteDirectory(client, config2, args, progress) {
       client,
       projectIdHint
     );
-    const manifest = validateManifestForPublish(
-      loadedManifest,
-      secrets,
-      emailOptions
-    );
-    await writeManifest(args.sourceDirectory, manifest);
+    const { manifest, issues: manifestIssues } = prepareManifestForPublish(loadedManifest);
     if (includeApihub) {
       await publishProgress?.onStep("Validating gateway plans");
       const plansGate = await assertGatewayPlansValidForPublish(client, {
         projectId: args.createNewProject ? void 0 : projectIdHint,
         plans: manifest.plans ?? [],
-        planTier: args.platformPlan
+        planTier: args.platformPlan,
+        localErrors: manifestIssues.map(({ field, message }) => ({
+          field,
+          message
+        }))
       });
       if (plansGate.blocked) {
         return JSON.stringify(
@@ -21079,7 +21088,11 @@ async function runApplyFromSiteDirectory(client, config2, args, progress) {
           2
         );
       }
+    } else {
+      throwOnManifestIssues(manifestIssues);
     }
+    validateSecretsForPublish(manifest, secrets, emailOptions);
+    await writeManifest(args.sourceDirectory, manifest);
     const stripeRequired = manifestRequiresStripe(manifest.plans);
     const ledgerResume = resolveResumeStepFromLedger(ledger, PUBLISH_STEPS);
     const effectiveResumeFromStep = args.resumeFromStep ?? ledgerResume;
@@ -21998,7 +22011,7 @@ function formatBlockedOrFailedResultForHuman(parsed) {
   }
   if (status2 === "blocked" && parsed.reason === "gateway_plans_invalid") {
     const lines = [
-      typeof parsed.userMessage === "string" ? parsed.userMessage : "Deploy is blocked: apitogo.config.json has plan errors."
+      typeof parsed.userMessage === "string" ? parsed.userMessage : "Deploy is blocked: apitogo.config.json has errors."
     ];
     for (const issue of Array.isArray(parsed.errors) ? parsed.errors : []) {
       lines.push(`  - ${formatGatewayPlanIssue(issue)}`);

package/dist/declarations/cli/platform/helpers/gateway-plan-validation.d.ts

@@ -15,6 +15,7 @@ export declare function assertGatewayPlansValidForPublish(client: PlatformApiCli
     projectId?: string;
     plans: ManifestPlanInput[];
     planTier?: string;
+    localErrors?: GatewayPlanValidationIssueDto[];
 }): Promise<{
     blocked: true;
     payload: Record<string, unknown>;

package/package.json

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