@dk/jolly 0.1.5 → 0.1.7

package/bun.lock

@@ -5,7 +5,7 @@
     "": {
       "name": "@saleor/jolly",
       "dependencies": {
-        "dotenv": "^17.4.0",
+        "@dotenvx/dotenvx": "^1.59.1",
         "yargs": "^17.7.2",
       },
       "devDependencies": {
@@ -16,6 +16,16 @@
     },
   },
   "packages": {
+    "@dotenvx/dotenvx": ["@dotenvx/dotenvx@1.59.1", "", { "dependencies": { "commander": "^11.1.0", "dotenv": "^17.2.1", "eciesjs": "^0.4.10", "execa": "^5.1.1", "fdir": "^6.2.0", "ignore": "^5.3.0", "object-treeify": "1.1.33", "picomatch": "^4.0.2", "which": "^4.0.0" }, "bin": { "dotenvx": "src/cli/dotenvx.js" } }, "sha512-Qg+meC+XFxliuVSDlEPkKnaUjdaJKK6FNx/Wwl2UxhQR8pyPIuLhMavsF7ePdB9qFZUWV1jEK3ckbJir/WmF4w=="],
+
+    "@ecies/ciphers": ["@ecies/ciphers@0.2.6", "", { "peerDependencies": { "@noble/ciphers": "^1.0.0" } }, "sha512-patgsRPKGkhhoBjETV4XxD0En4ui5fbX0hzayqI3M8tvNMGUoUvmyYAIWwlxBc1KX5cturfqByYdj5bYGRpN9g=="],
+
+    "@noble/ciphers": ["@noble/ciphers@1.3.0", "", {}, "sha512-2I0gnIVPtfnMw9ee9h1dJG7tp81+8Ob3OJb3Mv37rx5L40/b0i7djjCVvGOVqc9AEIQyvyu1i6ypKdFw8R8gQw=="],
+
+    "@noble/curves": ["@noble/curves@1.9.7", "", { "dependencies": { "@noble/hashes": "1.8.0" } }, "sha512-gbKGcRUYIjA3/zCCNaWDciTMFI0dCkvou3TL8Zmy5Nc7sJ47a0jtOeZoTaMxkuqRo9cRhjOdZJXegxYE5FN/xw=="],
+
+    "@noble/hashes": ["@noble/hashes@1.8.0", "", {}, "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A=="],
+
     "@types/node": ["@types/node@25.5.0", "", { "dependencies": { "undici-types": "~7.18.0" } }, "sha512-jp2P3tQMSxWugkCUKLRPVUpGaL5MVFwF8RDuSRztfwgN1wmqJeMSbKlnEtQqU8UrhTmzEmZdu2I6v2dpp7XIxw=="],
 
     "@types/yargs": ["@types/yargs@17.0.35", "", { "dependencies": { "@types/yargs-parser": "*" } }, "sha512-qUHkeCyQFxMXg79wQfTtfndEC+N9ZZg76HJftDJp+qH2tV7Gj4OJi7l+PiWwJ+pWtW8GwSmqsDj/oymhrTWXjg=="],
@@ -34,26 +44,70 @@
 
     "color-name": ["color-name@1.1.4", "", {}, "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="],
 
+    "commander": ["commander@11.1.0", "", {}, "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ=="],
+
+    "cross-spawn": ["cross-spawn@7.0.6", "", { "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", "which": "^2.0.1" } }, "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA=="],
+
     "dotenv": ["dotenv@17.4.0", "", {}, "sha512-kCKF62fwtzwYm0IGBNjRUjtJgMfGapII+FslMHIjMR5KTnwEmBmWLDRSnc3XSNP8bNy34tekgQyDT0hr7pERRQ=="],
 
+    "eciesjs": ["eciesjs@0.4.18", "", { "dependencies": { "@ecies/ciphers": "^0.2.5", "@noble/ciphers": "^1.3.0", "@noble/curves": "^1.9.7", "@noble/hashes": "^1.8.0" } }, "sha512-wG99Zcfcys9fZux7Cft8BAX/YrOJLJSZ3jyYPfhZHqN2E+Ffx+QXBDsv3gubEgPtV6dTzJMSQUwk1H98/t/0wQ=="],
+
     "emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="],
 
     "escalade": ["escalade@3.2.0", "", {}, "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA=="],
 
+    "execa": ["execa@5.1.1", "", { "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.0", "human-signals": "^2.1.0", "is-stream": "^2.0.0", "merge-stream": "^2.0.0", "npm-run-path": "^4.0.1", "onetime": "^5.1.2", "signal-exit": "^3.0.3", "strip-final-newline": "^2.0.0" } }, "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg=="],
+
+    "fdir": ["fdir@6.5.0", "", { "peerDependencies": { "picomatch": "^3 || ^4" }, "optionalPeers": ["picomatch"] }, "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg=="],
+
     "get-caller-file": ["get-caller-file@2.0.5", "", {}, "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="],
 
+    "get-stream": ["get-stream@6.0.1", "", {}, "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="],
+
+    "human-signals": ["human-signals@2.1.0", "", {}, "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="],
+
+    "ignore": ["ignore@5.3.2", "", {}, "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g=="],
+
     "is-fullwidth-code-point": ["is-fullwidth-code-point@3.0.0", "", {}, "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="],
 
+    "is-stream": ["is-stream@2.0.1", "", {}, "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="],
+
+    "isexe": ["isexe@3.1.5", "", {}, "sha512-6B3tLtFqtQS4ekarvLVMZ+X+VlvQekbe4taUkf/rhVO3d/h0M2rfARm/pXLcPEsjjMsFgrFgSrhQIxcSVrBz8w=="],
+
+    "merge-stream": ["merge-stream@2.0.0", "", {}, "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="],
+
+    "mimic-fn": ["mimic-fn@2.1.0", "", {}, "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="],
+
+    "npm-run-path": ["npm-run-path@4.0.1", "", { "dependencies": { "path-key": "^3.0.0" } }, "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="],
+
+    "object-treeify": ["object-treeify@1.1.33", "", {}, "sha512-EFVjAYfzWqWsBMRHPMAXLCDIJnpMhdWAqR7xG6M6a2cs6PMFpl/+Z20w9zDW4vkxOFfddegBKq9Rehd0bxWE7A=="],
+
+    "onetime": ["onetime@5.1.2", "", { "dependencies": { "mimic-fn": "^2.1.0" } }, "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="],
+
+    "path-key": ["path-key@3.1.1", "", {}, "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="],
+
+    "picomatch": ["picomatch@4.0.4", "", {}, "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A=="],
+
     "require-directory": ["require-directory@2.1.1", "", {}, "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="],
 
+    "shebang-command": ["shebang-command@2.0.0", "", { "dependencies": { "shebang-regex": "^3.0.0" } }, "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="],
+
+    "shebang-regex": ["shebang-regex@3.0.0", "", {}, "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="],
+
+    "signal-exit": ["signal-exit@3.0.7", "", {}, "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="],
+
     "string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="],
 
     "strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
 
+    "strip-final-newline": ["strip-final-newline@2.0.0", "", {}, "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="],
+
     "typescript": ["typescript@5.9.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw=="],
 
     "undici-types": ["undici-types@7.18.2", "", {}, "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w=="],
 
+    "which": ["which@4.0.0", "", { "dependencies": { "isexe": "^3.1.1" }, "bin": { "node-which": "bin/which.js" } }, "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg=="],
+
     "wrap-ansi": ["wrap-ansi@7.0.0", "", { "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" } }, "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="],
 
     "y18n": ["y18n@5.0.8", "", {}, "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="],
@@ -61,5 +115,9 @@
     "yargs": ["yargs@17.7.2", "", { "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", "string-width": "^4.2.3", "y18n": "^5.0.5", "yargs-parser": "^21.1.1" } }, "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w=="],
 
     "yargs-parser": ["yargs-parser@21.1.1", "", {}, "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="],
+
+    "cross-spawn/which": ["which@2.0.2", "", { "dependencies": { "isexe": "^2.0.0" }, "bin": { "node-which": "./bin/node-which" } }, "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="],
+
+    "cross-spawn/which/isexe": ["isexe@2.0.0", "", {}, "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="],
   }
 }

package/dist/bootstrap.js

@@ -11,47 +11,70 @@ class SaleorCloudClient {
     }
   }
   async request(endpoint, options) {
-    const response = await fetch(`${this.baseUrl}${endpoint}`, {
+    const mergedOptions = {
+      method: options?.method || "GET",
       ...options,
       headers: {
-        Authorization: `Bearer ${this.token}`,
+        Authorization: `Token ${this.token}`,
         "Content-Type": "application/json",
         ...options?.headers
       }
-    });
+    };
+    const response = await fetch(`${this.baseUrl}${endpoint}`, mergedOptions);
     if (!response.ok) {
-      throw new Error(`API error: ${response.status} ${response.statusText}`);
+      const body = await response.text();
+      throw new Error(`API error: ${response.status} ${response.statusText} - ${body}`);
     }
     return response.json();
   }
-  async getStores() {
-    return this.request("/stores");
+  async getOrganizations() {
+    return this.request("/organizations");
   }
-  async createStore(name, region = "us-east-1") {
-    return this.request("/stores", {
+  async getProjects(organizationSlug) {
+    return this.request(`/organizations/${organizationSlug}/projects`);
+  }
+  async createProject(organizationSlug, name, region) {
+    return this.request(`/organizations/${organizationSlug}/projects`, {
       method: "POST",
       body: JSON.stringify({ name, region })
     });
   }
-  async getEnvironments(storeId) {
-    return this.request(`/stores/${storeId}/environments`);
+  async getEnvironments(organizationSlug, projectSlug) {
+    return this.request(`/organizations/${organizationSlug}/projects/${projectSlug}/environments`);
   }
-  async createEnvironment(storeId, name) {
-    return this.request(`/stores/${storeId}/environments`, {
+  async createEnvironment(organizationSlug, projectSlug, name, region) {
+    return this.request(`/organizations/${organizationSlug}/projects/${projectSlug}/environments`, {
       method: "POST",
-      body: JSON.stringify({ name })
+      body: JSON.stringify({ name, region })
     });
   }
+  async getEnvironment(organizationSlug, projectSlug, environmentSlug) {
+    return this.request(`/organizations/${organizationSlug}/projects/${projectSlug}/environments/${environmentSlug}`);
+  }
   async registerApp(environmentId, appType, name) {
     return this.request(`/environments/${environmentId}/apps`, {
       method: "POST",
       body: JSON.stringify({ type: appType, name })
     });
   }
+  async getStores() {
+    return this.getOrganizations();
+  }
+  async createStore(name, region = "us-east-1") {
+    const { organizations } = await this.getOrganizations();
+    if (organizations.length === 0) {
+      throw new Error("No organizations found. Create one at https://cloud.saleor.io");
+    }
+    return this.createProject(organizations[0].slug, name, region);
+  }
+  async createEnvironmentFromStore(storeId, name) {
+    const { environments } = await this.getEnvironments(storeId, "default");
+    return this.createEnvironment(storeId, environments.length > 0 ? environments[0].project?.slug || "default" : "default", name, "default");
+  }
 }
 
 // src/api/auth.ts
-import { config } from "dotenv";
+import { config } from "@dotenvx/dotenvx";
 config();
 function requireToken() {
   const token = process.env.SALEOR_CLOUD_TOKEN;
@@ -125,14 +148,14 @@ function info(msg) {
 async function createStore(name, region) {
   const token = requireToken();
   const client = new SaleorCloudClient(token);
-  info(`Creating store: ${name} in ${region}...`);
+  console.log(info(`Creating store: ${name} in ${region}...`));
   try {
     const result = await client.createStore(name, region);
-    success(`Store created successfully!`);
-    info(`Store ID: ${result.store.id}`);
-    info(`Dashboard: https://cloud.saleor.io/stores/${result.store.id}`);
+    console.log(success(`Store created successfully!`));
+    console.log(info(`Project slug: ${result.project.slug}`));
+    console.log(info(`Dashboard: https://cloud.saleor.io/organizations/default/projects/${result.project.slug}`));
   } catch (err) {
-    error(`Failed to create store: ${err}`);
+    console.log(error(`Failed to create store: ${err}`));
     process.exit(1);
   }
 }

package/dist/index.js

@@ -33,47 +33,70 @@ class SaleorCloudClient {
     }
   }
   async request(endpoint, options) {
-    const response = await fetch(`${this.baseUrl}${endpoint}`, {
+    const mergedOptions = {
+      method: options?.method || "GET",
       ...options,
       headers: {
-        Authorization: `Bearer ${this.token}`,
+        Authorization: `Token ${this.token}`,
         "Content-Type": "application/json",
         ...options?.headers
       }
-    });
+    };
+    const response = await fetch(`${this.baseUrl}${endpoint}`, mergedOptions);
     if (!response.ok) {
-      throw new Error(`API error: ${response.status} ${response.statusText}`);
+      const body = await response.text();
+      throw new Error(`API error: ${response.status} ${response.statusText} - ${body}`);
     }
     return response.json();
   }
-  async getStores() {
-    return this.request("/stores");
+  async getOrganizations() {
+    return this.request("/organizations");
   }
-  async createStore(name, region = "us-east-1") {
-    return this.request("/stores", {
+  async getProjects(organizationSlug) {
+    return this.request(`/organizations/${organizationSlug}/projects`);
+  }
+  async createProject(organizationSlug, name, region) {
+    return this.request(`/organizations/${organizationSlug}/projects`, {
       method: "POST",
       body: JSON.stringify({ name, region })
     });
   }
-  async getEnvironments(storeId) {
-    return this.request(`/stores/${storeId}/environments`);
+  async getEnvironments(organizationSlug, projectSlug) {
+    return this.request(`/organizations/${organizationSlug}/projects/${projectSlug}/environments`);
   }
-  async createEnvironment(storeId, name) {
-    return this.request(`/stores/${storeId}/environments`, {
+  async createEnvironment(organizationSlug, projectSlug, name, region) {
+    return this.request(`/organizations/${organizationSlug}/projects/${projectSlug}/environments`, {
       method: "POST",
-      body: JSON.stringify({ name })
+      body: JSON.stringify({ name, region })
     });
   }
+  async getEnvironment(organizationSlug, projectSlug, environmentSlug) {
+    return this.request(`/organizations/${organizationSlug}/projects/${projectSlug}/environments/${environmentSlug}`);
+  }
   async registerApp(environmentId, appType, name) {
     return this.request(`/environments/${environmentId}/apps`, {
       method: "POST",
       body: JSON.stringify({ type: appType, name })
     });
   }
+  async getStores() {
+    return this.getOrganizations();
+  }
+  async createStore(name, region = "us-east-1") {
+    const { organizations } = await this.getOrganizations();
+    if (organizations.length === 0) {
+      throw new Error("No organizations found. Create one at https://cloud.saleor.io");
+    }
+    return this.createProject(organizations[0].slug, name, region);
+  }
+  async createEnvironmentFromStore(storeId, name) {
+    const { environments } = await this.getEnvironments(storeId, "default");
+    return this.createEnvironment(storeId, environments.length > 0 ? environments[0].project?.slug || "default" : "default", name, "default");
+  }
 }
 
 // src/api/auth.ts
-import { config } from "dotenv";
+import { config } from "@dotenvx/dotenvx";
 import { writeFileSync, existsSync, readFileSync } from "fs";
 import { join } from "path";
 config();
@@ -194,51 +217,51 @@ function info(msg) {
 async function createStore(name, region) {
   const token = requireToken();
   const client = new SaleorCloudClient(token);
-  info(`Creating store: ${name} in ${region}...`);
+  console.log(info(`Creating store: ${name} in ${region}...`));
   try {
     const result = await client.createStore(name, region);
-    success(`Store created successfully!`);
-    info(`Store ID: ${result.store.id}`);
-    info(`Dashboard: https://cloud.saleor.io/stores/${result.store.id}`);
+    console.log(success(`Store created successfully!`));
+    console.log(info(`Project slug: ${result.project.slug}`));
+    console.log(info(`Dashboard: https://cloud.saleor.io/organizations/default/projects/${result.project.slug}`));
   } catch (err) {
-    error(`Failed to create store: ${err}`);
+    console.log(error(`Failed to create store: ${err}`));
     process.exit(1);
   }
 }
 async function listStores() {
   const token = requireToken();
   const client = new SaleorCloudClient(token);
-  info("Fetching stores...");
+  console.log(info("Fetching organizations..."));
   try {
-    const result = await client.getStores();
-    if (result.stores.length === 0) {
-      info("No stores found. Create one with: jolly store create --name <name>");
+    const { organizations } = await client.getOrganizations();
+    if (organizations.length === 0) {
+      console.log(info("No organizations found. Create one at https://cloud.saleor.io"));
       return;
     }
-    success(`Found ${result.stores.length} store(s):
-`);
-    for (const store of result.stores) {
-      console.log(`  ${store.name} (${store.id})`);
-      console.log(`    Region: ${store.region}`);
-      console.log(`    Created: ${new Date(store.created_at).toLocaleDateString()}`);
+    console.log(success(`Found ${organizations.length} organization(s):
+`));
+    for (const org of organizations) {
+      console.log(`  ${org.name} (${org.slug})`);
+      console.log(`    Email: ${org.owner_email}`);
+      console.log(`    Created: ${new Date(org.created).toLocaleDateString()}`);
       console.log();
     }
   } catch (err) {
-    error(`Failed to list stores: ${err}`);
+    console.log(error(`Failed to list stores: ${err}`));
     process.exit(1);
   }
 }
-async function createEnvironment(storeId, name) {
+async function createEnvironment(organizationSlug, name) {
   const token = requireToken();
   const client = new SaleorCloudClient(token);
-  info(`Creating environment: ${name} for store ${storeId}...`);
+  console.log(info(`Creating environment: ${name} for organization ${organizationSlug}...`));
   try {
-    const result = await client.createEnvironment(storeId, name);
-    success(`Environment created successfully!`);
-    info(`Environment ID: ${result.environment.id}`);
-    info(`API URL will be available at: https://${result.environment.id}.saleor.cloud`);
+    const { environment } = await client.createEnvironment(organizationSlug, "default", name, "us-east-1");
+    console.log(success(`Environment created successfully!`));
+    console.log(info(`Environment key: ${environment.key}`));
+    console.log(info(`Domain: ${environment.domain}`));
   } catch (err) {
-    error(`Failed to create environment: ${err}`);
+    console.log(error(`Failed to create environment: ${err}`));
     process.exit(1);
   }
 }
@@ -323,26 +346,26 @@ var PAYMENT_APP_URLS = {
   stripe: "https://stripe-payment.saleor.io"
 };
 async function createApp(name, type, environmentId, provider) {
-  info(`Creating ${type} app: ${name}`);
+  console.log(info(`Creating ${type} app: ${name}`));
   if (type === "payment") {
     const paymentProvider = provider || "dummy";
-    info(`Payment provider: ${paymentProvider}`);
-    info(`Using hosted payment app: ${PAYMENT_APP_URLS[paymentProvider]}`);
+    console.log(info(`Payment provider: ${paymentProvider}`));
+    console.log(info(`Using hosted payment app: ${PAYMENT_APP_URLS[paymentProvider]}`));
     if (environmentId) {
       await registerHostedApp(environmentId, name, paymentProvider);
     } else {
-      success(`
-Payment app "${name}" configured to use ${PAYMENT_APP_URLS[paymentProvider]}`);
-      info(`
-To complete setup:`);
-      info(`1. Go to your dashboard at https://cloud.saleor.io`);
-      info(`2. Navigate to Apps > Third party apps`);
-      info(`3. Add the ${paymentProvider} payment app from ${PAYMENT_APP_URLS[paymentProvider]}`);
+      console.log(success(`
+Payment app "${name}" configured to use ${PAYMENT_APP_URLS[paymentProvider]}`));
+      console.log(info(`
+To complete setup:`));
+      console.log(info(`1. Go to your dashboard at https://cloud.saleor.io`));
+      console.log(info(`2. Navigate to Apps > Third party apps`));
+      console.log(info(`3. Add the ${paymentProvider} payment app from ${PAYMENT_APP_URLS[paymentProvider]}`));
     }
     return;
   }
   const template = APP_TEMPLATES[type];
-  info(`Cloning template from: ${template.repo}`);
+  console.log(info(`Cloning template from: ${template.repo}`));
   try {
     const { spawn } = await import("child_process");
     const child = spawn("git", ["clone", template.repo, name], {
@@ -350,39 +373,39 @@ To complete setup:`);
     });
     child.on("close", (code) => {
       if (code === 0) {
-        success(`
-${type} app "${name}" created successfully!`);
-        info(`
-To get started:`);
-        info(`cd ${name}`);
-        info(`npm install`);
-        info(`npm run dev`);
+        console.log(success(`
+${type} app "${name}" created successfully!`));
+        console.log(info(`
+To get started:`));
+        console.log(info(`cd ${name}`));
+        console.log(info(`npm install`));
+        console.log(info(`npm run dev`));
         if (environmentId) {
-          info(`
-Registering app with environment ${environmentId}...`);
+          console.log(info(`
+Registering app with environment ${environmentId}...`));
           registerLocalApp(environmentId, name, type);
         }
       } else {
-        error(`Failed to clone template (exit code: ${code})`);
+        console.log(error(`Failed to clone template (exit code: ${code})`));
         process.exit(1);
       }
     });
   } catch (err) {
-    error(`Failed to create app: ${err}`);
+    console.log(error(`Failed to create app: ${err}`));
     process.exit(1);
   }
 }
 async function registerHostedApp(environmentId, name, provider) {
   const token = requireToken();
   const client = new SaleorCloudClient(token);
-  info(`Registering hosted ${provider} payment app with environment...`);
+  console.log(info(`Registering hosted ${provider} payment app with environment...`));
   try {
     const result = await client.registerApp(environmentId, "payment", name);
-    success(`Payment app registered successfully!`);
-    info(`App ID: ${result.app.id}`);
-    info(`Payment URL: ${PAYMENT_APP_URLS[provider]}`);
+    console.log(success(`Payment app registered successfully!`));
+    console.log(info(`App ID: ${result.app.id}`));
+    console.log(info(`Payment URL: ${PAYMENT_APP_URLS[provider]}`));
   } catch (err) {
-    error(`Failed to register app: ${err}`);
+    console.log(error(`Failed to register app: ${err}`));
     process.exit(1);
   }
 }
@@ -391,11 +414,11 @@ async function registerLocalApp(environmentId, name, type) {
   const client = new SaleorCloudClient(token);
   try {
     const result = await client.registerApp(environmentId, type, name);
-    success(`App registered with environment!`);
-    info(`App ID: ${result.app.id}`);
+    console.log(success(`App registered with environment!`));
+    console.log(info(`App ID: ${result.app.id}`));
   } catch (err) {
-    warning(`Could not register app automatically: ${err}`);
-    info(`You can register manually in the dashboard.`);
+    console.log(warning(`Could not register app automatically: ${err}`));
+    console.log(info(`You can register manually in the dashboard.`));
   }
 }
 function warning(msg) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dk/jolly",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Saleor project bootstrapper and agent configurator",
   "type": "module",
   "bin": {
@@ -9,18 +9,18 @@
     "init-jolly": "./dist/agent.js"
   },
   "scripts": {
-    "build": "bun build src/cli/index.ts --outdir=dist --target=node --external yargs --external dotenv && bun build src/cli/bootstrap.ts --outdir=dist --target=node --external yargs --external dotenv && bun build src/cli/agent.ts --outdir=dist --target=node --external yargs --external dotenv",
+    "build": "bun build src/cli/index.ts --outdir=dist --target=node --external yargs --external @dotenvx/dotenvx && bun build src/cli/bootstrap.ts --outdir=dist --target=node --external yargs --external @dotenvx/dotenvx && bun build src/cli/agent.ts --outdir=dist --target=node --external yargs --external @dotenvx/dotenvx",
     "prepublishOnly": "bun run build",
     "jolly": "bun src/cli/index.ts",
     "dev": "bun --watch src/cli/index.ts",
     "test": "bun test",
     "typecheck": "bun tsc --noEmit",
-    "release": "npm version patch && npm publish",
-    "release:minor": "npm version minor && npm publish",
-    "release:major": "npm version major && npm publish"
+    "release": "npm version patch --no-git-tag-version && npm publish",
+    "release:minor": "npm version minor --no-git-tag-version && npm publish",
+    "release:major": "npm version major --no-git-tag-version && npm publish"
   },
   "dependencies": {
-    "dotenv": "^17.4.0",
+    "@dotenvx/dotenvx": "^1.59.1",
     "yargs": "^17.7.2"
   },
   "devDependencies": {

package/src/api/auth.ts

@@ -1,4 +1,4 @@
-import { config } from 'dotenv';
+import { config } from '@dotenvx/dotenvx';
 import { writeFileSync, existsSync, readFileSync } from 'fs';
 import { join } from 'path';