@osimart/create-storefront 1.0.0 → 1.0.1

package/README.md

@@ -1,4 +1,4 @@
-# @osimart/osimart-storefront
+# @osimart/create-storefront
 
 The Osimart storefront **platform**, published as a private Nuxt layer. It has no look of
 its own. Every theme repo extends it:
@@ -77,5 +77,5 @@ developer (read).
 ## Working on the platform and a theme together
 
 ```bash
-cd osimart-theme-base && npm link ../osimart-storefront && npm run dev
+cd osimart-theme-base && npm link ../create-storefront && npm run dev
 ```

package/app/plugins/{geo.ts → geo.js}

@@ -21,4 +21,4 @@ export default defineNuxtPlugin(async () => {
       console.error('[GEO] Client-side fetch error:', err)
     }
   }
-})
+})

package/app/plugins/{vue-query.ts → vue-query.js}

@@ -2,4 +2,4 @@ import { VueQueryPlugin } from '@tanstack/vue-query'
 
 export default defineNuxtPlugin((nuxtApp) => {
   nuxtApp.vueApp.use(VueQueryPlugin)
-})
+})

package/bin/osimart-theme.mjs

@@ -18,7 +18,8 @@
  *
  * Env (read from .env too):
  *   OSIMART_THEME_TOKEN     Theme access token (dashboard → Theme access)
- *   OSIMART_THEME_DEV_URL   default: ${NUXT_PUBLIC_STORE_API_BASE}theme-dev/
+ *   NUXT_PUBLIC_STORE_API_BASE   the store's API (already set for `npm run dev`); the CLI calls
+ *                                <its origin>/store/apis/theme-dev/
  *
  * Backend contract: THEME_DEV_API.md in @ositcom/osimart-storefront.
  */
@@ -51,25 +52,33 @@ function fail(message) {
   process.exit(1);
 }
 
+/**
+ * The builder API's theme-dev route, on the same backend the storefront
+ * already talks to (NUXT_PUBLIC_STORE_API_BASE). OSIMART_THEME_DEV_URL only
+ * overrides it if the routes are mounted somewhere other than /store/apis/theme-dev/.
+ */
+const BUILDER_PATH = "/store/apis/theme-dev/";
+
 function baseUrl() {
-  const explicit = process.env.OSIMART_THEME_DEV_URL;
+  const override = process.env.OSIMART_THEME_DEV_URL;
+  if (override) return override.endsWith("/") ? override : `${override}/`;
   const api = process.env.NUXT_PUBLIC_STORE_API_BASE;
-  const url = explicit || (api ? `${api.replace(/\/+$/, "")}/theme-dev/` : "");
-  if (!url) fail("Set OSIMART_THEME_DEV_URL or NUXT_PUBLIC_STORE_API_BASE in .env");
-  return url.endsWith("/") ? url : `${url}/`;
+  if (!api) fail("Set NUXT_PUBLIC_STORE_API_BASE in .env (the store's API, e.g. http://test6.192.168.1.12.nip.io:8000/)");
+  return new URL(BUILDER_PATH, api).toString();
 }
 
 async function request(method, path, body) {
   const token = process.env.OSIMART_THEME_TOKEN;
   if (!token) fail("Set OSIMART_THEME_TOKEN in .env (dashboard → Theme access)");
-  const res = await fetch(new URL(path, baseUrl()), {
+  const url = new URL(path, baseUrl());
+  const res = await fetch(url, {
     method,
     headers: { Authorization: `ThemeToken ${token}`, "Content-Type": "application/json", Accept: "application/json" },
     body: body === undefined ? undefined : JSON.stringify(body),
   });
   const text = await res.text();
   let data = null;
-  try { data = text ? JSON.parse(text) : null; } catch { data = { detail: text.slice(0, 300) }; }
+  try { data = text ? JSON.parse(text) : null; } catch { data = { detail: `not a theme-dev endpoint: ${url}` }; }
   if (!res.ok) {
     const err = new Error(data?.detail || data?.message || `HTTP ${res.status}`);
     err.status = res.status;
@@ -184,8 +193,12 @@ async function pull(args) {
     console.log(`  (schemas not saved: ${e.message})`);
   }
 
-  saveState({ theme_id: data.theme.id, theme_name: data.theme.name, role: data.theme.role, version: data.theme.version, pulled_at: new Date().toISOString() });
-  console.log(`✔ pulled "${data.theme.name}" (${data.theme.role}) — ${data.templates?.length ?? 0} templates, ${Object.keys(groups).length} groups`);
+  saveState({
+    store_id: data.theme.store?.id, store_name: data.theme.store?.name,
+    theme_id: data.theme.id, theme_name: data.theme.name, role: data.theme.role,
+    version: data.theme.version, pulled_at: new Date().toISOString(),
+  });
+  console.log(`✔ pulled "${data.theme.name}" (${data.theme.role}) from ${data.theme.store?.name ?? "the store"} — ${data.templates?.length ?? 0} templates, ${Object.keys(groups).length} groups`);
 }
 
 async function push(args) {
@@ -197,7 +210,15 @@ async function push(args) {
   // 1. Section types the theme adds (their schemas), so the editor can place them.
   const sections = readLocalSchemas();
   if (sections.length || prune) {
-    const report = await request("POST", "sections/sync/", { sections, prune, dry_run: dryRun });
+    let report;
+    try {
+      report = await request("POST", "sections/sync/", {
+        sections, prune, dry_run: dryRun, expected_store: force ? null : state().store_id ?? null,
+      });
+    } catch (e) {
+      if (e.status === 400 && e.data) fail(`Section schemas rejected:\n${JSON.stringify(e.data, null, 2)}`);
+      throw e;
+    }
     console.log(`${dryRun ? "◌" : "✔"} section schemas: ${sections.length}`);
     for (const key of ["created", "updated", "unchanged", "deleted", "kept_in_use"]) {
       if (report?.[key]?.length) console.log(`  ${key.padEnd(11)} ${report[key].join(", ")}`);
@@ -210,17 +231,19 @@ async function push(args) {
     console.log("  nothing in theme/ to push (run pull first)");
     return;
   }
-  const { version, theme_id, role } = state();
+  const { version, theme_id, role, store_id } = state();
   const sameTheme = theme === theme_id || theme === String(role || "").toLowerCase();
   try {
     const res = await request("PUT", "theme/", {
       theme,
       // The merchant may have edited the theme in the dashboard since the pull.
       base_version: force || !sameTheme ? null : version ?? null,
+      // Files pulled from another store (token swapped)? The backend refuses.
+      expected_store: force ? null : store_id ?? null,
       dry_run: dryRun,
       ...local,
     });
-    console.log(`${dryRun ? "◌ dry run" : "✔ pushed"} to "${res.theme.name}" (${res.theme.role}) — ${local.templates.length} templates`);
+    console.log(`${dryRun ? "◌ dry run" : "✔ pushed"} to "${res.theme.name}" (${res.theme.role}) on ${res.theme.store?.name ?? "the store"} — ${local.templates.length} templates`);
     for (const key of ["created", "updated", "unchanged"]) {
       if (res[key]?.length) console.log(`  ${key.padEnd(9)} ${res[key].join(", ")}`);
     }

package/nuxt.config.ts

@@ -2,9 +2,9 @@ import { fileURLToPath } from "node:url";
 import osiSections from "./nuxt/osi-sections";
 
 /**
- * @ositcom/osimart-storefront — the platform. Extended by every theme repo:
+ * @ositcom/create-storefront — the platform. Extended by every theme repo:
  *
- *   extends: ["@ositcom/osimart-storefront"]
+ *   extends: ["@ositcom/create-storefront"]
  *
  * This package holds the logic (composables, services, the script of every
  * theme section/component under app/logic), the platform pages (routing,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@osimart/create-storefront",
-  "version": "1.0.0",
-  "description": "Osimart storefront platform \u2014 logic, platform pages and CLI; extended by every theme repo",
+  "version": "1.0.1",
+  "description": "Osimart storefront platform — logic, platform pages and CLI; extended by every theme repo",
   "type": "module",
   "main": "./nuxt.config.ts",
   "bin": {
@@ -43,4 +43,4 @@
   },
   "license": "UNLICENSED",
   "homepage": "https://osimart.com"
-}
+}