@feeef.dev/cli 0.2.2 → 0.2.3

package/dist/index.js

@@ -737,7 +737,13 @@ function nextComponentOrder(parentDir) {
     if (fs3.statSync(abs).isFile() && /\.(tsx|jsx)$/.test(name)) {
       sourcePath = abs;
     } else if (fs3.statSync(abs).isDirectory()) {
-      for (const entry of ["component.tsx", "component.jsx"]) {
+      const id = name;
+      for (const entry of [
+        `${id}.tsx`,
+        `${id}.jsx`,
+        "component.tsx",
+        "component.jsx"
+      ]) {
         const p2 = path3.join(abs, entry);
         if (fs3.existsSync(p2)) {
           sourcePath = p2;
@@ -1152,10 +1158,54 @@ async function resolveBoundStore(srcDir) {
   }
   return { storeId: store.id, slug: store.slug };
 }
+function isLoopbackHost(hostname) {
+  const h = hostname.toLowerCase();
+  return h === "localhost" || h === "127.0.0.1" || h === "::1" || h === "0.0.0.0";
+}
+function assertRemotePreviewApiMatch(apiBase, previewUrl) {
+  if (process.env["FEEEF_ALLOW_LOCAL_API_REMOTE_PREVIEW"] === "1") return;
+  let apiHost = "";
+  let previewHost = "";
+  try {
+    apiHost = new URL(apiBase).hostname;
+  } catch {
+    return;
+  }
+  try {
+    previewHost = new URL(previewUrl).hostname;
+  } catch {
+    return;
+  }
+  if (isLoopbackHost(apiHost) && !isLoopbackHost(previewHost)) {
+    throw new Error(
+      [
+        "Draft preview mismatch: CLI API is local, but preview URL is hosted.",
+        `  API      ${apiBase}`,
+        `  Preview  ${previewUrl}`,
+        "",
+        "Hosted shops load drafts from production API \u2014 your local PUT never reaches them,",
+        "so the page shows the live theme.",
+        "",
+        "Fix:",
+        "  feeef config set apiUrl https://api.feeef.org/v1",
+        "  feeef signin",
+        "  feeef template dev",
+        "",
+        "Or use local Next: feeef template dev --local",
+        "(override: FEEEF_ALLOW_LOCAL_API_REMOTE_PREVIEW=1)"
+      ].join("\n")
+    );
+  }
+}
 async function runRemoteDraftPreview(srcDir) {
   const outPath = path8.join(srcDir, "dist", "data.json");
   const { storeId, slug } = await resolveBoundStore(srcDir);
-  const { ff } = createClient({ requireAuth: true });
+  const { ff, baseURL } = createClient({ requireAuth: true });
+  if (isLoopbackHost(new URL(baseURL).hostname)) {
+    warn(
+      `API is ${baseURL} \u2014 hosted ?preview= will only work if that API is what the shop calls.`
+    );
+  }
   const s = spinner2();
   s.start("Building template\u2026");
   const { buildTemplate } = await loadBuild();
@@ -1188,6 +1238,7 @@ async function runRemoteDraftPreview(srcDir) {
       }
       const data = JSON.parse(fs6.readFileSync(outPath, "utf8"));
       const result = await ff.stores.putTemplatePreview(storeId, { data });
+      assertRemotePreviewApiMatch(baseURL, result.previewUrl);
       lastPreviewUrl = withDevLog(result.previewUrl);
       ok(`Draft preview updated \u2192 ${pc.cyan(lastPreviewUrl)}`);
     } catch (e) {
@@ -1368,7 +1419,25 @@ async function runTemplateDev(dirArg, opts) {
   intro2("feeef template dev");
   try {
     const srcDir = resolveThemeDir(dirArg);
-    if (opts.local || opts.storefront) {
+    let useLocal = Boolean(opts.local || opts.storefront);
+    if (!useLocal) {
+      const cfg = loadConfig();
+      let apiHost = "";
+      try {
+        apiHost = new URL(defaultApiUrl(cfg)).hostname;
+      } catch {
+      }
+      const hasStorefront = Boolean(
+        opts.storefront || cfg.storefrontPath || process.env["FEEEF_STOREFRONT_PATH"]
+      );
+      if (isLoopbackHost(apiHost) && hasStorefront) {
+        warn(
+          "Local API + storefrontPath detected \u2192 using --local (hosted ?preview= would show the live theme)."
+        );
+        useLocal = true;
+      }
+    }
+    if (useLocal) {
       await runLocalStorefrontPreview(srcDir, opts);
       return;
     }
@@ -1633,10 +1702,16 @@ function collectPublishableComponents(srcDir) {
     const entries = [...byId.entries()].map(([id, entryPath]) => ({ id, entryPath })).sort((a, b) => a.id.localeCompare(b.id));
     for (const { id: name, entryPath } of entries) {
       const isDir = fs9.statSync(entryPath).isDirectory();
-      const metaPath = isDir ? path11.join(entryPath, "component.json") : entryPath.endsWith(".json") ? entryPath : null;
-      const tsxPath = isDir ? path11.join(entryPath, "component.tsx") : entryPath.endsWith(".tsx") ? entryPath : null;
-      const jsxPath = isDir ? path11.join(entryPath, "component.jsx") : entryPath.endsWith(".jsx") ? entryPath : null;
-      const entry = tsxPath && fs9.existsSync(tsxPath) ? tsxPath : jsxPath && fs9.existsSync(jsxPath) ? jsxPath : null;
+      const namedJson = isDir ? path11.join(entryPath, `${name}.json`) : null;
+      const legacyJson = isDir ? path11.join(entryPath, "component.json") : null;
+      const metaPath = isDir ? namedJson && fs9.existsSync(namedJson) ? namedJson : legacyJson && fs9.existsSync(legacyJson) ? legacyJson : null : entryPath.endsWith(".json") ? entryPath : null;
+      const namedTsx = isDir ? path11.join(entryPath, `${name}.tsx`) : null;
+      const namedJsx = isDir ? path11.join(entryPath, `${name}.jsx`) : null;
+      const legacyTsx = isDir ? path11.join(entryPath, "component.tsx") : null;
+      const legacyJsx = isDir ? path11.join(entryPath, "component.jsx") : null;
+      const tsxPath = isDir ? namedTsx && fs9.existsSync(namedTsx) ? namedTsx : legacyTsx && fs9.existsSync(legacyTsx) ? legacyTsx : null : entryPath.endsWith(".tsx") ? entryPath : null;
+      const jsxPath = isDir ? namedJsx && fs9.existsSync(namedJsx) ? namedJsx : legacyJsx && fs9.existsSync(legacyJsx) ? legacyJsx : null : entryPath.endsWith(".jsx") ? entryPath : null;
+      const entry = tsxPath ? tsxPath : jsxPath ? jsxPath : null;
       let meta = {};
       if (metaPath && fs9.existsSync(metaPath)) {
         meta = JSON.parse(fs9.readFileSync(metaPath, "utf8"));
@@ -2103,6 +2178,20 @@ async function initFromPublicTemplate(dest, name, templateId, ff) {
   download.start("Downloading template\u2026");
   const full = await ff.storeTemplates.find({ id: templateId });
   download.stop("Template downloaded");
+  const listPrice = Math.max(
+    0,
+    Number(full.price ?? 0) - Number(full.discount ?? 0)
+  );
+  if (listPrice > 0 && !full.data) {
+    fail(
+      "This is a paid template. Purchase + install it from the merchant app \u2014 CLI unpack of paid source is not available."
+    );
+  }
+  if (listPrice > 0) {
+    fail(
+      `Paid template (${listPrice} DZD). Buy it for your store in the merchant app; do not unpack with feeef template init --from.`
+    );
+  }
   const data = full.data;
   if (!data || typeof data !== "object" || !("pages" in data)) {
     fail("Template has no usable data.pages \u2014 cannot unpack");
@@ -2433,8 +2522,10 @@ async function runTemplatePublish(dirArg, opts) {
     }
     const store = await ff.stores.find({ id: storeId });
     const title = opts.title || rc.title || meta.name || path13.basename(srcDir);
+    const price = Math.max(0, Number(opts.price ?? 0) || 0);
     info(`Template  ${srcDir}`);
     info(`Store  ${store.slug || storeId} (${policy})`);
+    if (price > 0) info(`Price  ${price} DZD (platform cut applies on sale)`);
     const outPath = path13.join(srcDir, "dist", "data.json");
     const s = spinner2();
     s.start("Building\u2026");
@@ -2588,17 +2679,19 @@ async function runTemplatePublish(dirArg, opts) {
     if (templateRow) {
       templateRow = await ff.storeTemplates.update({
         id: templateRow.id,
-        data: { title, schema, data, policy }
+        data: { title, schema, data, policy, price }
       });
       s.stop(`Updated ${templateRow.id}`);
     } else {
       templateRow = await ff.storeTemplates.create({
-        storeId,
-        title,
-        schema,
-        data,
-        policy,
-        price: 0
+        data: {
+          storeId,
+          title,
+          schema,
+          data,
+          policy,
+          price
+        }
       });
       s.stop(`Created ${templateRow.id}`);
     }
@@ -2623,6 +2716,24 @@ async function runTemplatePublish(dirArg, opts) {
       }
       s.stop(`Locales: ${locales.map((l) => l.locale).join(", ")}`);
     }
+    if (typeof ff.storeTemplates.createRelease === "function") {
+      s.start("Publishing release\u2026");
+      const release = await ff.storeTemplates.createRelease(templateId, {
+        ...opts.version ? { version: opts.version } : {},
+        changelog: opts.changelog ?? null,
+        schema,
+        data
+      });
+      s.stop(`Release ${release.version} (${release.id})`);
+    } else {
+      await http3.post(`/store_templates/${templateId}/releases`, {
+        ...opts.version ? { version: opts.version } : {},
+        changelog: opts.changelog ?? null,
+        schema,
+        data
+      });
+      ok("Release published");
+    }
     const shouldApply = opts.yes && opts.apply !== false ? true : await askApply(store.slug || storeId, opts.apply);
     if (shouldApply) {
       s.start("Installing on store\u2026");
@@ -2805,7 +2916,7 @@ function createProgram() {
   ).argument("[store]", "Store id or slug (optional \u2014 interactive picker)").option("--api-url <url>", "API override for this template").action(async (store, opts) => {
     await runUse(store, opts);
   });
-  program.command("publish").description("Build + publish current template (alias of template publish)").argument("[dir]", "Template directory").option("--public", "Policy public (default private)").option("--unlisted", "Policy unlisted").option("--store <id>", "Owner store id").option("--title <title>", "Marketplace title").option("--yes", "Skip prompts").option("--apply", "Install onto the store").option("--no-apply", "Do not install").action(async (dir, opts) => {
+  program.command("publish").description("Build + publish current template (alias of template publish)").argument("[dir]", "Template directory").option("--public", "Policy public (default private)").option("--unlisted", "Policy unlisted").option("--store <id>", "Owner store id").option("--title <title>", "Marketplace title").option("--price <n>", "List price in DZD (0 = free)").option("--version <semver>", "Release version (default: auto bump)").option("--changelog <text>", "Release changelog for merchants").option("--yes", "Skip prompts").option("--apply", "Install onto the store").option("--no-apply", "Do not install").action(async (dir, opts) => {
     await runTemplatePublish(dir, opts);
   });
   const template = program.command("template").description(
@@ -2870,7 +2981,7 @@ function createProgram() {
   ).action(async (dir, opts) => {
     await runTemplateDev(dir, opts);
   });
-  template.command("publish").description("Build, upload components + template + locales, optional install").argument("[dir]", "Template directory").option("--public", "Policy public (default private)").option("--unlisted", "Policy unlisted").option("--store <id>", "Owner store id").option("--title <title>", "Marketplace title").option("--yes", "Skip prompts").option("--apply", "Install onto the store").option("--no-apply", "Do not install").action(async (dir, opts) => {
+  template.command("publish").description("Build, upload components + template + locales, optional install").argument("[dir]", "Template directory").option("--public", "Policy public (default private)").option("--unlisted", "Policy unlisted").option("--store <id>", "Owner store id").option("--title <title>", "Marketplace title").option("--price <n>", "List price in DZD (0 = free)").option("--version <semver>", "Release version (default: auto bump)").option("--changelog <text>", "Release changelog for merchants").option("--yes", "Skip prompts").option("--apply", "Install onto the store").option("--no-apply", "Do not install").action(async (dir, opts) => {
     await runTemplatePublish(dir, opts);
   });
   const cloud = program.command("cloud").description("Cloud providers (Azure / GCP / AWS) \u2014 coming soon");