appfunnel 0.12.0 → 0.14.0

package/dist/index.js

@@ -231,49 +231,21 @@ async function fetchStorePrices(projectId, storeId, options) {
   const data = await response.json();
   return data.data || [];
 }
-async function publishBuild(projectId, funnelId, manifest, assets, options, promote) {
-  const formData = new FormData();
-  formData.set("manifest", JSON.stringify(manifest));
-  if (funnelId) {
-    formData.set("funnelId", funnelId);
-  }
-  if (promote) {
-    formData.set("promote", "true");
-  }
-  for (const asset of assets) {
-    formData.append(
-      "assets",
-      new Blob([new Uint8Array(asset.content)], { type: asset.contentType }),
-      asset.path
-    );
-  }
-  try {
-    const response = await apiFetch(`/project/${projectId}/headless/publish`, {
-      ...options,
-      method: "POST",
-      body: formData
-    });
-    return await response.json();
-  } catch (err) {
-    if (err instanceof CLIError && err.code === "API_ERROR") {
-      if (err.statusCode === 413) {
-        throw new CLIError(
-          "BUNDLE_TOO_LARGE",
-          err.message,
-          "Reduce page bundle sizes. Check for large dependencies."
-        );
-      }
-      if (err.statusCode === 409) {
-        throw new CLIError(
-          "FUNNEL_NOT_HEADLESS",
-          err.message,
-          "Remove funnelId from config to create a new headless funnel."
-        );
-      }
-      throw new CLIError("PUBLISH_FAILED", err.message);
-    }
-    throw err;
-  }
+async function publishInit(projectId, body, options) {
+  const response = await apiFetch(`/project/${projectId}/headless/publish-init`, {
+    ...options,
+    method: "POST",
+    body: JSON.stringify(body)
+  });
+  return await response.json();
+}
+async function publishFinalize(projectId, body, options) {
+  const response = await apiFetch(`/project/${projectId}/headless/publish-finalize`, {
+    ...options,
+    method: "POST",
+    body: JSON.stringify(body)
+  });
+  return await response.json();
 }
 var DEFAULT_API_BASE2;
 var init_api = __esm({
@@ -289,25 +261,47 @@ var init_exports = {};
 __export(init_exports, {
   initCommand: () => initCommand
 });
-import { cpSync, existsSync, readFileSync as readFileSync2, writeFileSync as writeFileSync2, readdirSync } from "fs";
-import { join as join2, dirname } from "path";
-import { fileURLToPath } from "url";
+import { existsSync, readFileSync as readFileSync2, writeFileSync as writeFileSync2, mkdirSync as mkdirSync2 } from "fs";
+import { join as join2 } from "path";
+import { Readable } from "stream";
+import { extract } from "tar";
 import pc4 from "picocolors";
 import select2 from "@inquirer/select";
 import input from "@inquirer/input";
-function getTemplatesDir() {
-  const dir = join2(__dirname, "..", "templates");
-  if (!existsSync(dir)) {
-    throw new Error(`Templates directory not found at ${dir}`);
-  }
-  return dir;
-}
-function listTemplates() {
-  const root = getTemplatesDir();
-  return readdirSync(root, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => {
-    const configPath = join2(root, d.name, "template.json");
-    const config = existsSync(configPath) ? JSON.parse(readFileSync2(configPath, "utf-8")) : { name: d.name, description: "", products: [] };
-    return { dir: d.name, config };
+async function fetchTemplateIndex() {
+  const url = `https://raw.githubusercontent.com/${TEMPLATES_REPO}/main/index.json`;
+  const res = await fetch(url);
+  if (!res.ok) throw new Error(`Failed to fetch template index: ${res.status}`);
+  const index = await res.json();
+  const templates = await Promise.all(
+    index.map(async (entry) => {
+      const configUrl = `https://raw.githubusercontent.com/${TEMPLATES_REPO}/main/${entry.dir}/template.json`;
+      const configRes = await fetch(configUrl);
+      const config = configRes.ok ? await configRes.json() : { name: entry.name, description: entry.description, products: [] };
+      return { dir: entry.dir, config };
+    })
+  );
+  return templates;
+}
+async function downloadTemplate(templateDir, destDir) {
+  const tarballUrl = `https://api.github.com/repos/${TEMPLATES_REPO}/tarball/main`;
+  const res = await fetch(tarballUrl, {
+    headers: { Accept: "application/vnd.github+json" }
+  });
+  if (!res.ok) throw new Error(`Failed to download template: ${res.status}`);
+  mkdirSync2(destDir, { recursive: true });
+  const nodeStream = Readable.fromWeb(res.body);
+  await new Promise((resolve5, reject) => {
+    nodeStream.pipe(
+      extract({
+        cwd: destDir,
+        strip: 2,
+        filter: (path) => {
+          const parts = path.split("/");
+          return parts.length > 2 && parts[1] === templateDir;
+        }
+      })
+    ).on("finish", resolve5).on("error", reject);
   });
 }
 function formatInterval(interval, count) {
@@ -352,7 +346,9 @@ async function initCommand(nameArg) {
   const projectId = await promptForProject(creds.token);
   const projects = await fetchProjects(creds.token);
   const project = projects.find((p) => p.id === projectId);
-  const templates = listTemplates();
+  const templateSpinner = spinner("Fetching templates...");
+  const templates = await fetchTemplateIndex();
+  templateSpinner.stop();
   const selectedDir = await select2({
     message: "Choose a template",
     choices: templates.map((t) => ({
@@ -362,7 +358,6 @@ async function initCommand(nameArg) {
   });
   const chosen = templates.find((t) => t.dir === selectedDir);
   const templateConfig = chosen.config;
-  const templateDir = join2(getTemplatesDir(), chosen.dir);
   const productBindings = [];
   if (templateConfig.products.length > 0) {
     const storesSpinner = spinner("Fetching stores...");
@@ -444,7 +439,7 @@ async function initCommand(nameArg) {
     }
   }
   const s = spinner(`Creating ${name}...`);
-  cpSync(templateDir, dir, { recursive: true });
+  await downloadTemplate(selectedDir, dir);
   const templateJsonPath = join2(dir, "template.json");
   if (existsSync(templateJsonPath)) {
     const { unlinkSync } = await import("fs");
@@ -455,6 +450,12 @@ async function initCommand(nameArg) {
     const { renameSync } = await import("fs");
     renameSync(gitignoreSrc, join2(dir, ".gitignore"));
   }
+  const readmePath = join2(dir, "README.md");
+  if (existsSync(readmePath)) {
+    let readme = readFileSync2(readmePath, "utf-8");
+    readme = readme.replace("__NAME__", name);
+    writeFileSync2(readmePath, readme);
+  }
   const configPath = join2(dir, "appfunnel.config.ts");
   if (existsSync(configPath)) {
     let config = readFileSync2(configPath, "utf-8");
@@ -485,7 +486,7 @@ ${itemsStr},
     }
     writeFileSync2(configPath, config);
   }
-  const sdkVersion = `^${"0.12.0"}`;
+  const sdkVersion = `^${"0.14.0"}`;
   writeFileSync2(
     join2(dir, "package.json"),
     JSON.stringify(
@@ -528,7 +529,7 @@ ${itemsStr},
   console.log(`  ${pc4.dim("appfunnel dev")}`);
   console.log();
 }
-var __dirname, INTERVAL_LABELS;
+var TEMPLATES_REPO, INTERVAL_LABELS;
 var init_init = __esm({
   "src/commands/init.ts"() {
     "use strict";
@@ -536,7 +537,7 @@ var init_init = __esm({
     init_auth();
     init_projects();
     init_api();
-    __dirname = dirname(fileURLToPath(import.meta.url));
+    TEMPLATES_REPO = "appfunnel/templates";
     INTERVAL_LABELS = {
       day: { 1: "day", 7: "week", 14: "2 weeks", 30: "month" },
       week: { 1: "week", 2: "2 weeks", 4: "month", 12: "quarter", 52: "year" },
@@ -731,7 +732,7 @@ var init_config = __esm({
 import { readFileSync as readFileSync4 } from "fs";
 import { join as join4 } from "path";
 function checkVersionCompatibility(cwd) {
-  const cliVersion = "0.12.0";
+  const cliVersion = "0.14.0";
   const sdkVersion = getSdkVersion(cwd);
   const [cliMajor, cliMinor] = cliVersion.split(".").map(Number);
   const [sdkMajor, sdkMinor] = sdkVersion.split(".").map(Number);
@@ -770,7 +771,7 @@ var init_version = __esm({
 });
 
 // src/extract/pages.ts
-import { readdirSync as readdirSync2, readFileSync as readFileSync5, existsSync as existsSync3 } from "fs";
+import { readdirSync, readFileSync as readFileSync5, existsSync as existsSync3 } from "fs";
 import { join as join5, basename } from "path";
 function scanPages(cwd) {
   const pagesDir = resolvePagesDir(cwd);
@@ -781,7 +782,7 @@ function scanPages(cwd) {
       "Create src/pages/ and add at least one .tsx page file."
     );
   }
-  const files = readdirSync2(pagesDir).filter((f) => f.endsWith(".tsx") && !f.startsWith("_")).map((f) => basename(f, ".tsx")).sort();
+  const files = readdirSync(pagesDir).filter((f) => f.endsWith(".tsx") && !f.startsWith("_")).map((f) => basename(f, ".tsx")).sort();
   if (files.length === 0) {
     throw new CLIError(
       "NO_PAGES",
@@ -1154,13 +1155,13 @@ var init_html = __esm({
 
 // src/vite/plugin.ts
 import { resolve as resolve2, join as join7 } from "path";
-import { existsSync as existsSync5, writeFileSync as writeFileSync3, mkdirSync as mkdirSync2, readFileSync as readFileSync6, readdirSync as readdirSync3 } from "fs";
+import { existsSync as existsSync5, writeFileSync as writeFileSync3, mkdirSync as mkdirSync3, readFileSync as readFileSync6, readdirSync as readdirSync2 } from "fs";
 function loadTranslations(cwd) {
   const localesDir = join7(cwd, "locales");
   if (!existsSync5(localesDir)) return void 0;
   const translations = {};
   let hasAny = false;
-  for (const file of readdirSync3(localesDir)) {
+  for (const file of readdirSync2(localesDir)) {
     if (!file.endsWith(".json")) continue;
     const locale = file.replace(/\.json$/, "");
     try {
@@ -1194,7 +1195,7 @@ function appfunnelPlugin(options) {
   return {
     name: "appfunnel",
     config() {
-      mkdirSync2(appfunnelDir, { recursive: true });
+      mkdirSync3(appfunnelDir, { recursive: true });
       writeFileSync3(htmlPath, generateHtml(config.name || "AppFunnel"));
       return {
         // Don't let Vite auto-serve index.html — we handle it ourselves
@@ -1835,7 +1836,7 @@ __export(build_exports, {
 });
 import { resolve as resolve3, join as join9 } from "path";
 import { randomUUID as randomUUID2 } from "crypto";
-import { readFileSync as readFileSync8, writeFileSync as writeFileSync5, statSync, readdirSync as readdirSync4 } from "fs";
+import { readFileSync as readFileSync8, writeFileSync as writeFileSync5, statSync, readdirSync as readdirSync3 } from "fs";
 import pc8 from "picocolors";
 async function buildCommand() {
   const cwd = process.cwd();
@@ -1950,6 +1951,7 @@ async function buildCommand() {
     responses: config.responses || {},
     queryParams: { ...BUILTIN_QUERY_PARAMS, ...config.queryParams },
     data: config.data || {},
+    user: BUILTIN_USER_VARS,
     products: config.products || {},
     defaultLocale: config.defaultLocale,
     assets,
@@ -1972,7 +1974,7 @@ async function buildCommand() {
   if (totalSize > MAX_TOTAL_SIZE) {
     console.log(formatWarning(
       "BUNDLE_TOO_LARGE",
-      `Total bundle size (${formatSize(totalSize)}) exceeds the 2MB limit.`,
+      `Total bundle size (${formatSize(totalSize)}) exceeds the 10MB limit.`,
       "This will be rejected on publish. Reduce dependencies or code-split."
     ));
     console.log();
@@ -2055,7 +2057,7 @@ function validateConditionVariables(condition, pageKey, allVariables) {
 function collectAssets(outDir) {
   const assets = [];
   function walk(dir, prefix = "") {
-    for (const entry of readdirSync4(dir, { withFileTypes: true })) {
+    for (const entry of readdirSync3(dir, { withFileTypes: true })) {
       const relPath = prefix ? `${prefix}/${entry.name}` : entry.name;
       const fullPath = join9(dir, entry.name);
       if (entry.isDirectory()) {
@@ -2081,7 +2083,7 @@ function getSdkVersion2(cwd) {
     return "0.0.0";
   }
 }
-var MAX_TOTAL_SIZE, MAX_PAGE_SIZE, BUILTIN_QUERY_PARAMS;
+var MAX_TOTAL_SIZE, MAX_PAGE_SIZE, BUILTIN_QUERY_PARAMS, BUILTIN_USER_VARS;
 var init_build = __esm({
   "src/commands/build.ts"() {
     "use strict";
@@ -2094,7 +2096,7 @@ var init_build = __esm({
     init_html();
     init_errors();
     init_errors();
-    MAX_TOTAL_SIZE = 2 * 1024 * 1024;
+    MAX_TOTAL_SIZE = 10 * 1024 * 1024;
     MAX_PAGE_SIZE = 500 * 1024;
     BUILTIN_QUERY_PARAMS = {
       utm_source: { type: "string" },
@@ -2103,6 +2105,14 @@ var init_build = __esm({
       utm_content: { type: "string" },
       utm_term: { type: "string" }
     };
+    BUILTIN_USER_VARS = {
+      email: { type: "string" },
+      name: { type: "string" },
+      dateOfBirth: { type: "string" },
+      gender: { type: "string" },
+      stripeCustomerId: { type: "string" },
+      paddleCustomerId: { type: "string" }
+    };
   }
 });
 
@@ -2135,10 +2145,22 @@ __export(publish_exports, {
 });
 import { resolve as resolve4, join as join11 } from "path";
 import { readFileSync as readFileSync10, existsSync as existsSync6 } from "fs";
+import { execSync } from "child_process";
 import pc9 from "picocolors";
-function getMimeType(path) {
-  const ext = path.substring(path.lastIndexOf("."));
-  return MIME_TYPES[ext] || "application/octet-stream";
+import select3 from "@inquirer/select";
+function tryGit(command, cwd) {
+  try {
+    return execSync(command, { cwd, stdio: ["pipe", "pipe", "ignore"] }).toString().trim() || void 0;
+  } catch {
+    return void 0;
+  }
+}
+function getGitMetadata(cwd) {
+  const commitSha = tryGit("git rev-parse HEAD", cwd);
+  if (!commitSha) return {};
+  const branch = tryGit("git rev-parse --abbrev-ref HEAD", cwd);
+  const message = tryGit("git log -1 --pretty=%s", cwd);
+  return { commitSha, branch, message };
 }
 function formatSize2(bytes) {
   if (bytes < 1024) return `${bytes}B`;
@@ -2170,7 +2192,7 @@ async function publishCommand(options) {
   const manifest = JSON.parse(readFileSync10(manifestPath, "utf-8"));
   const assets = manifest.assets || [];
   const s = spinner("Preparing assets...");
-  const assetPayloads = [];
+  const assetBuffers = [];
   let totalBytes = 0;
   for (let i = 0; i < assets.length; i++) {
     const asset = assets[i];
@@ -2183,45 +2205,133 @@ async function publishCommand(options) {
         "Run 'appfunnel build' to regenerate."
       );
     }
-    const content = readFileSync10(fullPath);
-    totalBytes += content.length;
-    assetPayloads.push({
-      path: asset.path,
-      content,
-      contentType: getMimeType(asset.path)
-    });
+    const body = readFileSync10(fullPath);
+    totalBytes += body.length;
+    assetBuffers.push({ path: asset.path, body, size: body.length });
     s.text = `Preparing assets... ${i + 1}/${assets.length} ${pc9.dim(`(${formatSize2(totalBytes)})`)}`;
   }
-  s.text = `Uploading ${assets.length} assets ${pc9.dim(`(${formatSize2(totalBytes)})`)}`;
-  const result = await publishBuild(
+  s.stop();
+  const MAX_TOTAL_SIZE2 = 10 * 1024 * 1024;
+  if (totalBytes > MAX_TOTAL_SIZE2) {
+    throw new CLIError(
+      "BUNDLE_TOO_LARGE",
+      `Total bundle size (${formatSize2(totalBytes)}) exceeds the ${formatSize2(MAX_TOTAL_SIZE2)} limit.`,
+      "Reduce page bundle sizes. Check for large dependencies."
+    );
+  }
+  info(`${assets.length} assets prepared ${pc9.dim(`(${formatSize2(totalBytes)})`)}`);
+  let promote = options?.promote ?? false;
+  if (!promote) {
+    promote = await select3({
+      message: "Publish as the new active version?",
+      choices: [
+        { name: "Yes", value: true },
+        { name: "No", value: false }
+      ]
+    });
+  }
+  const git = getGitMetadata(cwd);
+  const initSpinner = spinner("Initializing publish...");
+  let initResult;
+  try {
+    initResult = await publishInit(
+      projectId,
+      {
+        manifest,
+        funnelId: config.funnelId || void 0,
+        promote,
+        commitSha: git.commitSha,
+        branch: git.branch,
+        message: git.message,
+        triggeredBy: creds.email || void 0
+      },
+      { token: creds.token }
+    );
+  } catch (err) {
+    initSpinner.stop();
+    if (err instanceof CLIError && err.code === "API_ERROR") {
+      if (err.statusCode === 413) {
+        throw new CLIError(
+          "BUNDLE_TOO_LARGE",
+          err.message,
+          "Reduce page bundle sizes. Check for large dependencies."
+        );
+      }
+      if (err.statusCode === 409) {
+        throw new CLIError(
+          "FUNNEL_NOT_HEADLESS",
+          err.message,
+          "Remove funnelId from config to create a new headless funnel."
+        );
+      }
+      throw new CLIError("PUBLISH_FAILED", err.message);
+    }
+    throw err;
+  }
+  initSpinner.stop();
+  info(`Build ${pc9.dim(initResult.buildId)} initialized`);
+  const uploadSpinner = spinner(`Uploading 0/${assets.length} assets...`);
+  const uploadInfoMap = new Map(initResult.assets.map((a) => [a.path, a]));
+  let uploaded = 0;
+  let uploadedBytes = 0;
+  const uploadAsset = async (asset) => {
+    const info2 = uploadInfoMap.get(asset.path);
+    if (!info2) {
+      throw new CLIError("PUBLISH_FAILED", `No upload URL for asset: ${asset.path}`);
+    }
+    const response = await fetch(info2.uploadUrl, {
+      method: "PUT",
+      body: new Uint8Array(asset.body),
+      headers: {
+        "Content-Type": info2.contentType
+      }
+    });
+    if (!response.ok) {
+      throw new CLIError(
+        "PUBLISH_FAILED",
+        `Failed to upload ${asset.path}: ${response.status} ${response.statusText}`
+      );
+    }
+    uploaded++;
+    uploadedBytes += asset.size;
+    uploadSpinner.text = `Uploading ${uploaded}/${assets.length} assets... ${pc9.dim(`(${formatSize2(uploadedBytes)}/${formatSize2(totalBytes)})`)}`;
+  };
+  const queue = [...assetBuffers];
+  const workers = [];
+  for (let i = 0; i < Math.min(UPLOAD_CONCURRENCY, queue.length); i++) {
+    workers.push((async () => {
+      while (queue.length > 0) {
+        const asset = queue.shift();
+        await uploadAsset(asset);
+      }
+    })());
+  }
+  await Promise.all(workers);
+  uploadSpinner.stop();
+  info(`${assets.length} assets uploaded ${pc9.dim(`(${formatSize2(totalBytes)})`)}`);
+  const finalizeSpinner = spinner("Finalizing publish...");
+  const result = await publishFinalize(
     projectId,
-    config.funnelId || "",
-    manifest,
-    assetPayloads,
-    { token: creds.token },
-    options?.promote
+    { buildId: initResult.buildId, funnelId: initResult.funnelId },
+    { token: creds.token }
   );
-  s.stop();
-  if (result.created && result.funnelId) {
-    patchConfigFunnelId(cwd, result.funnelId);
+  finalizeSpinner.stop();
+  if (initResult.created && initResult.funnelId) {
+    patchConfigFunnelId(cwd, initResult.funnelId);
     info(`Funnel created \u2014 funnelId added to appfunnel.config.ts`);
   }
   console.log();
   success(result.activated ? "Published and activated" : "Published successfully");
   console.log();
   console.log(`  ${pc9.dim("Build ID:")}   ${result.buildId}`);
-  if (result.funnelId && !config.funnelId) {
-    console.log(`  ${pc9.dim("Funnel:")}     ${result.funnelId}`);
+  if (initResult.funnelId && !config.funnelId) {
+    console.log(`  ${pc9.dim("Funnel:")}     ${initResult.funnelId}`);
   }
   console.log(`  ${pc9.dim("Dashboard:")}  ${pc9.cyan(result.dashboardUrl)}`);
   console.log(`  ${pc9.dim("Assets:")}     ${assets.length} files ${pc9.dim(`(${formatSize2(totalBytes)})`)}`);
-  if (!result.activated) {
-    console.log();
-    console.log(`  ${pc9.dim("Tip:")} Use ${pc9.cyan("--promote")} to activate immediately, or promote from the dashboard.`);
-  }
   console.log();
 }
-var MIME_TYPES;
+var UPLOAD_CONCURRENCY;
 var init_publish = __esm({
   "src/commands/publish.ts"() {
     "use strict";
@@ -2232,17 +2342,7 @@ var init_publish = __esm({
     init_api();
     init_errors();
     init_config_patch();
-    MIME_TYPES = {
-      ".js": "application/javascript",
-      ".css": "text/css",
-      ".html": "text/html",
-      ".json": "application/json",
-      ".svg": "image/svg+xml",
-      ".png": "image/png",
-      ".jpg": "image/jpeg",
-      ".woff2": "font/woff2",
-      ".woff": "font/woff"
-    };
+    UPLOAD_CONCURRENCY = 10;
   }
 });
 
@@ -2251,7 +2351,7 @@ init_errors();
 import { Command } from "commander";
 import pc10 from "picocolors";
 var program = new Command();
-program.name("appfunnel").description("Build and publish headless AppFunnel projects").version("0.12.0");
+program.name("appfunnel").description("Build and publish headless AppFunnel projects").version("0.14.0");
 program.command("init").argument("[name]", "Project directory name").description("Create a new AppFunnel project").action(async (name) => {
   const { initCommand: initCommand2 } = await Promise.resolve().then(() => (init_init(), init_exports));
   await initCommand2(name);