@swell/cli 1.0.0-alpha → 1.0.2

package/README.md

@@ -66,6 +66,14 @@ swell storefronts pull --id P5OzfzLD -t menus -f menus.json
 swell storefronts push --id P5OzfzLD -t editor -s set -f ../origin-storefront/config/editor.json
 ```
 
+### Without logging in
+
+```sh
+swell storefronts pull --id P5OzfzLD -t editor --store my-test-store --secret-key my-dev-secret-key
+swell storefronts pull --id P5OzfzLD -t menus -f menus.json --store my-test-store --secret-key my-dev-secret-key
+swell storefronts push --id P5OzfzLD -t editor -s set -f ../origin-storefront/config/editor.json --store my-test-store --secret-key my-dev-secret-key
+```
+
 ## Model
 
 Push or pull model definitions, including namespaced models (e.g. content models), abstract content models and content fields.
@@ -121,3 +129,13 @@ swell model pull -m theme.origin.page --content -f models/page.json # pull a con
 swell model push -f models/orders.json
 swell model push -c -f models/page.json # push a content model
 ```
+
+### Without logging in
+
+```sh
+swell model pull -m products --store my-test-store --secret-key my-dev-secret-key
+swell model pull -m theme.origin.page --content -f models/page.json --store my-test-store --secret-key my-dev-secret-key
+
+swell model push -f models/orders.json --store my-test-store --secret-key my-dev-secret-key
+swell model push -c -f models/page.json --store my-test-store --secret-key my-dev-secret-key
+```

package/dist/bin/{multipart-parser-97941dba.js → multipart-parser-85ef9626.js}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import { F as FormData, a as File } from './swell-cfd63c19.js';
+import { F as FormData, a as File } from './swell-0f71f07d.js';
 import 'node:assert';
 import 'node:child_process';
 import 'node:async_hooks';

package/dist/bin/{swell-cfd63c19.js → swell-0f71f07d.js}

@@ -2246,7 +2246,7 @@ catch (err) {
         defaults$2.quote = quotePowerShell;
     }
 }
-function getStore() {
+function getStore$1() {
     return storage.getStore() || defaults$2;
 }
 const $ = new Proxy(function (pieces, ...args) {
@@ -2267,18 +2267,18 @@ const $ = new Proxy(function (pieces, ...args) {
         }
         cmd += s + pieces[++i];
     }
-    promise._bind(cmd, from, resolve, reject, getStore());
+    promise._bind(cmd, from, resolve, reject, getStore$1());
     // Postpone run to allow promise configuration.
     setImmediate(() => promise.isHalted || promise.run());
     return promise;
 }, {
     set(_, key, value) {
-        const target = key in Function.prototype ? _ : getStore();
+        const target = key in Function.prototype ? _ : getStore$1();
         Reflect.set(target, key, value);
         return true;
     },
     get(_, key) {
-        const target = key in Function.prototype ? _ : getStore();
+        const target = key in Function.prototype ? _ : getStore$1();
         return Reflect.get(target, key);
     },
 });
@@ -2295,7 +2295,7 @@ class ProcessPromise extends Promise {
         this._from = '';
         this._resolve = noop$2;
         this._reject = noop$2;
-        this._snapshot = getStore();
+        this._snapshot = getStore$1();
         this._stdio = ['inherit', 'pipe', 'pipe'];
         this._nothrow = false;
         this._quiet = false;
@@ -15385,7 +15385,7 @@ class Body {
 			return formData;
 		}
 
-		const {toFormData} = await import('./multipart-parser-97941dba.js');
+		const {toFormData} = await import('./multipart-parser-85ef9626.js');
 		return toFormData(this.body, ct);
 	}
 
@@ -22487,14 +22487,6 @@ async function question(query, options) {
         resolve(answer);
     }));
 }
-async function stdin() {
-    let buf = '';
-    process.stdin.setEncoding('utf8');
-    for await (const chunk of process.stdin) {
-        buf += chunk;
-    }
-    return buf;
-}
 
 const flagSymbol = Symbol('arg flag');
 
@@ -22900,7 +22892,7 @@ const modelPullParams = {
  * @param {string} params.model - id of the model to pull
  */
 async function modelPull(params, config = {}) {
-  const { clientId, status, api } = config;
+  const { storeId, status, api } = config;
   const { '--content': isContent, '--file': file, '--model': model } = params;
   const modelType = isContent ? 'content' : 'models';
 
@@ -22919,7 +22911,7 @@ async function modelPull(params, config = {}) {
   if (!modelSchema) {
     status.fail(
       `Could not find ${chalk.bold(model)} for ${chalk.magenta.bold(
-        clientId,
+        storeId,
       )} store.`,
     );
   } else {
@@ -22932,7 +22924,7 @@ async function modelPull(params, config = {}) {
     status.succeed(
       `Successfully pulled ${chalk.bold(model)} model${
         file ? ` to ${file}` : ''
-      } from ${chalk.magenta.bold(clientId)} store.`,
+      } from ${chalk.magenta.bold(storeId)} store.`,
     );
   }
 }
@@ -24213,7 +24205,7 @@ const configPath =
 const configStore = new Configstore(
   'swell',
   {
-    // [clientId]: {
+    // [storeId]: {
     //   user : { ... }
     // }
   },
@@ -24222,9 +24214,9 @@ const configStore = new Configstore(
   },
 );
 
-async function ensureLoggedIn(clientId) {
-  const currentStore = clientId || getDefaultClient();
-  const userConfig = getClientConfig(currentStore, 'user');
+async function ensureLoggedIn(storeId) {
+  const currentStore = storeId || getDefaultStore();
+  const userConfig = getStoreConfig(currentStore, 'user');
 
   // still not logged in
   if (!userConfig) {
@@ -24238,31 +24230,31 @@ async function ensureLoggedIn(clientId) {
   return userConfig;
 }
 
-function getDefaultClient() {
+function getDefaultStore() {
   return Object.entries(configStore.all).find(
-    ([_clientId, clientConfig]) => clientConfig.default,
+    ([_storeId, storeConfig]) => storeConfig.default,
   )?.[0];
 }
 
-function setDefaultStore(clientId) {
-  const currentDefault = getDefaultClient();
+function setDefaultStore(storeId) {
+  const currentDefault = getDefaultStore();
 
   if (currentDefault) {
     configStore.delete(`${currentDefault}.default`);
   }
 
-  setStoreConfig(clientId, '', {
+  setStoreConfig(storeId, '', {
     default: true,
   });
 }
 
-function getClientConfig(clientId, configPath = '') {
-  return configStore.get([clientId, configPath].filter(Boolean).join('.'));
+function getStoreConfig(storeId, configPath = '') {
+  return configStore.get([storeId, configPath].filter(Boolean).join('.'));
 }
 
-function setStoreConfig(clientId, configPath = '', value) {
+function setStoreConfig(storeId, configPath = '', value) {
   return configStore.set(
-    [clientId, configPath].filter(Boolean).join('.'),
+    [storeId, configPath].filter(Boolean).join('.'),
     value,
   );
 }
@@ -24271,9 +24263,9 @@ function clearStoreConfig() {
   return configStore.clear();
 }
 
-function getClient(args) {
-  const { '--client': clientId } = args;
-  return clientId || getDefaultClient();
+function getStore(args) {
+  const { '--store': storeId } = args;
+  return storeId || getDefaultStore();
 }
 
 function getSecretKey(args) {
@@ -24314,12 +24306,10 @@ const STRATEGIES$2 = ['merge', 'set'];
  * @param {string} params.strategy - merge strategy to use; options: merge, set. Defaults to merge.
  */
 async function modelPush(params, config = {}) {
-  const { clientId, status, api } = config;
+  const { storeId, status, api } = config;
   const { '--file': file, '--input': input, '--content': isContent } = params;
   let { '--strategy': strategy } = params;
 
-  const modelType = isContent ? 'content' : 'models';
-
   strategy = strategy || STRATEGIES$2[0];
   validateEnumArg('push strategy', strategy, STRATEGIES$2);
 
@@ -24327,14 +24317,16 @@ async function modelPush(params, config = {}) {
     status.fail(
       'You need to provide a JSON file (e.g -f model.json) or a JSON string through stdin',
     );
+    return;
   }
 
   const jsonContent = file
     ? await readJSON(resolve(process.cwd(), file))
-    : JSON.parse(await stdin());
+    : JSON.parse(input);
 
   if (!jsonContent) {
     status.fail('You need to provide a valid JSON object');
+    return;
   }
 
   const {
@@ -24354,7 +24346,7 @@ async function modelPush(params, config = {}) {
   const slug = modelSlug || snakeCase(name);
 
   const id = [
-    sourceType || clientId,
+    sourceType || storeId,
     sourceId || 'com',
     [namespace, slug].filter(Boolean).join('_'),
   ].join('.');
@@ -24365,15 +24357,12 @@ async function modelPush(params, config = {}) {
     slug,
   };
 
-  const apiPathOpts = {
-    adminPath: `data/:${modelType}/${id}`,
-    backendPath: `:${modelType}/${id}`,
-  };
+  const objectApiPathOpts = apiPathOpts(isContent, id);
 
-  const existingModel = await api.get(apiPathOpts);
+  const existingModel = await api.get(objectApiPathOpts);
 
   if (existingModel) {
-    api.put(apiPathOpts, {
+    await api.put(objectApiPathOpts, {
       body: JSON.stringify(
         strategy === 'set'
           ? {
@@ -24385,18 +24374,28 @@ async function modelPush(params, config = {}) {
   } else {
     delete model.id; // let the backend do its thing
 
-    api.post(`data/:${modelType}`, {
+    const result = await api.post(apiPathOpts(isContent), {
       body: JSON.stringify(model),
     });
+    if (result?.errors) console.log(result);
   }
 
   status.succeed(
     `Successfully pushed ${chalk.bold(id)} model to ${chalk.magenta.bold(
-      clientId,
+      storeId,
     )} store.`,
   );
 }
 
+function apiPathOpts(isContent, id) {
+  const modelType = isContent ? ':content' : ':models';
+
+  return {
+    adminPath: ['data', modelType, id].filter(Boolean).join('/'),
+    backendPath: [modelType, id].filter(Boolean).join('/'),
+  };
+}
+
 var src = {exports: {}};
 
 var browser = {exports: {}};
@@ -30084,7 +30083,7 @@ const TYPES$1 = ['editor', 'settings', 'menus'];
  * @param {string} params.type - type of configuration to pull; options: editor, settings, menus
  */
 async function storefrontsPull(params, config = {}) {
-  const { clientId, status, api } = config;
+  const { storeId, status, api } = config;
 
   let {
     '--file': file,
@@ -30118,7 +30117,7 @@ async function storefrontsPull(params, config = {}) {
   status.succeed(
     `Successfully pulled ${chalk.bold(type)} configuration${
       file ? ` to ${file}` : ''
-    } from ${chalk.magenta.bold(clientId)} storefront ${chalk.magenta.bold(
+    } from ${chalk.magenta.bold(storeId)} storefront ${chalk.magenta.bold(
       id,
     )}.`,
   );
@@ -30173,7 +30172,7 @@ const TYPES = ['editor', 'settings', 'menus'];
  * @param {string} params.type - type of configuration to push; options: editor, settings, menus
  */
 async function storefrontsPush(params, config = {}) {
-  const { clientId, status, api } = config;
+  const { storeId, status, api } = config;
 
   let {
     '--file': file,
@@ -30251,26 +30250,33 @@ async function storefrontsPush(params, config = {}) {
     `Successfully updated ${chalk.bold(
       type,
     )} configuration for ${chalk.magenta.bold(
-      clientId,
+      storeId,
     )} storefront ${chalk.magenta.bold(id)}.`,
   );
 }
 
 const storefrontsToggleEditorParams = {
   '--id': String,
+  '--enable': Boolean,
+  '--theme-id': String,
 };
 
 /**
- * Enable or disable the editor for a storefront
+ * Enable or disable the editor for a storefront and set the source theme id
+ * if not already set.
  *
  * @param {string} params.id - id of the storefront to push data to
+ * @param {boolean} params.enable - whether to enable or disable the editor.
+ *  If not specified, the existing value will be negated.
+ * @param {string} params.themeId - id of the theme to use as the source
  */
 async function storefrontsToggleEditor(params, config = {}) {
-  const { clientId, status, api } = config;
-  const { '--id': id } = params;
+  const { storeId, status, api } = config;
+  const { '--id': id, '--enable': enable, '--theme-id': themeId } = params;
 
   if (!id) {
     status.fail('You need to specify a storefront id for this command');
+    return;
   }
 
   const apiPathOpts = {
@@ -30278,22 +30284,47 @@ async function storefrontsToggleEditor(params, config = {}) {
     backendPath: `:storefronts/${id}`,
   };
 
-  const currentData = await api.get(apiPathOpts);
-  const newEditorValue = !Boolean(currentData['editor']);
+  const valuesToUpdate = {
+    editor: enable,
+  };
+
+  const outputMessage = [
+    `Successfully set editor values for ${chalk.magenta.bold(
+      storeId,
+    )} storefront ${chalk.magenta.bold(id)}.`,
+  ];
+
+  if (enable === undefined) {
+    const currentData = await api.get(apiPathOpts);
+    valuesToUpdate.editor = !Boolean(currentData['editor']);
+  }
+
+  outputMessage.push(
+    `Enabled editor: ${chalk.magenta.bold(valuesToUpdate.editor)}`,
+  );
+
+  if (themeId) {
+    valuesToUpdate.source_model = 'themes';
+    valuesToUpdate.source_id = themeId;
+    outputMessage.push(`Source theme id: ${chalk.magenta.bold(themeId)}`);
+  }
 
   status.text = `Pushing storefront ${chalk.bold(id)} data`;
 
-  await api.put(apiPathOpts, {
-    body: JSON.stringify({ editor: newEditorValue }),
+  const response = await api.put(apiPathOpts, {
+    body: JSON.stringify(valuesToUpdate),
   });
 
-  status.succeed(
-    `Successfully toogled editor for ${chalk.magenta.bold(
-      clientId,
-    )} storefront ${chalk.magenta.bold(id)}. New value is ${chalk.magenta.bold(
-      newEditorValue,
-    )}`,
-  );
+  if (response?.errors?.source_id?.code === 'IMMUTABLE') {
+    status.fail(
+      `Failed to update storefront ${chalk.magenta.bold(
+        id,
+      )}: theme already set`,
+    );
+    return;
+  }
+
+  status.succeed(outputMessage.join('\n'));
 }
 
 const loginParams = {
@@ -30308,7 +30339,7 @@ const loginParams = {
 
 async function login(params, config = {}) {
   const { status, api } = config;
-  let { clientId } = config;
+  let { storeId } = config;
 
   let {
     '--username': username,
@@ -30319,9 +30350,9 @@ async function login(params, config = {}) {
 
   status.info('Logging in.');
 
-  clientId ||= await question('Your store ID (i.e. STORE_ID.swell.store): ');
+  storeId ||= await question('Your store ID (i.e. STORE_ID.swell.store): ');
 
-  if (getClientConfig(clientId, 'user')) {
+  if (getStoreConfig(storeId, 'user')) {
     const continueLogin =
       yes ||
       (await yesNoQuestion(
@@ -30359,15 +30390,15 @@ async function login(params, config = {}) {
   }
 
   if (setDefault || configStore.size === 0) {
-    setDefaultStore(clientId);
+    setDefaultStore(storeId);
   }
 
-  setStoreConfig(clientId, 'user', user);
+  setStoreConfig(storeId, 'user', user);
 
   status.succeed(
     `Successfully logged in as ${chalk.bold(
       user.username,
-    )} to ${chalk.magenta.bold(clientId)} store`,
+    )} to ${chalk.magenta.bold(storeId)} store`,
   );
 }
 
@@ -30379,11 +30410,11 @@ const validateEmail = (value) => emailFormat.test(value);
 login.skipAdminLogin = true;
 
 async function logout(_params, config = {}) {
-  const { status, api, clientId } = config;
+  const { status, api, storeId } = config;
 
   status.info('Logging out.');
 
-  if (!getClientConfig(clientId, 'user')) {
+  if (!getStoreConfig(storeId, 'user')) {
     status.fail('You are not logged in.');
     return;
   }
@@ -30417,7 +30448,7 @@ const versionParams = {
 
 function version(_params, config = {}) {
   const { status } = config;
-  status.succeed('1.0.0-alpha');
+  status.succeed('1.0.2');
 }
 
 const API_BASE_URL = process.env.API_BASE_URL || 'https://api.swell.store';
@@ -30431,7 +30462,7 @@ const defaultHeaders = (opts) => ({
 });
 
 const authenticatedHeaders = (storeId, opts = {}) => {
-  const sessionId = getClientConfig(storeId, 'user.session_id');
+  const sessionId = getStoreConfig(storeId, 'user.session_id');
   const { secretKey, ...moreOpts } = opts;
 
   if (secretKey) {
@@ -30452,8 +30483,8 @@ const authenticatedHeaders = (storeId, opts = {}) => {
 };
 
 class Api {
-  constructor(clientId, secretKey) {
-    this.clientId = clientId;
+  constructor(storeId, secretKey) {
+    this.storeId = storeId;
     this.secretKey = secretKey;
   }
 
@@ -30465,7 +30496,7 @@ class Api {
     let path;
 
     const fetchOptions = {
-      headers: authenticatedHeaders(this.clientId, {
+      headers: authenticatedHeaders(this.storeId, {
         secretKey: this.secretKey,
       }),
       ...options,
@@ -30477,19 +30508,21 @@ class Api {
       path = `${API_BASE_URL}/${pathOpts.backendPath}`;
     }
 
-    path = path.replace('${STORE_ID}', this.clientId);
+    path = path.replace('${STORE_ID}', this.storeId);
 
     if (!path) throw new Error('Operation not supported.');
 
     const resp = await fetch(path, fetchOptions);
+    const respData = await resp.text();
 
-    if (!resp.ok) throw new Error(await resp.text());
+    if (!resp.ok) throw new Error(respData);
 
-    // Avoid 0-length responses from the Backend API triggering JSON parsing errors
     try {
-      return await resp.json();
+      return JSON.parse(respData);
     } catch (e) {
-      console.log(e);
+      // respData could be "{}" (length: >=2) but it shouldn't be "{", " " (whitespace - length: 1) or
+      // "" (empty response - length: 0) while logging the error.
+      if (respData.length >= 2) console.log(e);
       return null;
     }
   }
@@ -30514,17 +30547,17 @@ class Api {
 }
 
 async function prepareAndRunCommand(func, { status, args }) {
-  const clientId = getClient(args);
+  const storeId = getStore(args);
   const secretKey = getSecretKey(args);
 
-  if (!secretKey && !func.skipAdminLogin) await ensureLoggedIn(clientId);
+  if (!secretKey && !func.skipAdminLogin) await ensureLoggedIn(storeId);
 
   try {
     status.start();
     return func(args, {
-      clientId,
+      storeId,
       status,
-      api: new Api(clientId, secretKey),
+      api: new Api(storeId, secretKey),
     });
   } catch (error) {
     status.fail(error.message);
@@ -30533,12 +30566,12 @@ async function prepareAndRunCommand(func, { status, args }) {
 }
 
 const cliArgs = {
-  // Types
   '--quiet': Boolean,
   '--verbose': Boolean,
   '--dry-run': Boolean,
   '--yes': Boolean,
   '--secret-key': String,
+  '--store': String,
 
   // Aliases
   '-q': '--quiet',

package/dist/bin/swell.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-export { s as default } from './swell-cfd63c19.js';
+export { s as default } from './swell-0f71f07d.js';
 import 'node:assert';
 import 'node:child_process';
 import 'node:async_hooks';

package/dist/man/swell.1

@@ -1,4 +1,4 @@
-.TH "SWELL" "1" "May 2023" "1.0.0-alpha"
+.TH "SWELL" "1" "May 2023" "1.0.2"
 .SH "NAME"
 \fBswell\fR \- CLI to the Swell platform
 .TS

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swell/cli",
-  "version": "1.0.0-alpha",
+  "version": "1.0.2",
   "description": "Swell's command line interface/utility",
   "keywords": [
     "swell",