@onexapis/cli 1.0.1 → 1.0.3

package/README.md

@@ -35,10 +35,10 @@ onex validate --theme simple
 onex build --theme simple
 
 # Upload to S3
-onex upload --theme simple --bucket my-bucket
+onex upload --theme simple
 
 # Clone a theme from S3
-onex clone simple --bucket my-bucket
+onex clone simple
 ```
 
 ## Commands
@@ -170,13 +170,16 @@ Upload compiled theme to S3 as `bundle.zip` + `source.zip`.
 
 ```bash
 # Dry run first
-onex upload --theme simple --bucket my-bucket --dry-run
+onex upload --theme simple --dry-run
 
 # Upload to staging
-onex upload --theme simple --bucket my-bucket
+onex upload --theme simple
 
 # Upload to production
-onex upload --theme simple --bucket my-bucket -e production
+onex upload --theme simple -e production
+
+# Override bucket
+onex upload --theme simple --bucket custom-bucket
 ```
 
 ### `onex download`
@@ -204,20 +207,48 @@ Clone theme source code from S3.
 | `--no-install` | Skip running `pnpm install` after clone |
 
 ```bash
-onex clone simple --bucket my-bucket
+onex clone simple
 onex clone simple -v 1.0.0 -o ./my-clone --no-install
 ```
 
 ## S3 Configuration
 
-The `upload`, `download`, and `clone` commands use S3 for storage. Configure via environment variables:
+The `upload`, `download`, and `clone` commands use S3 for storage. The CLI automatically loads env files in this order (first found wins):
+
+1. **Project-level**: `.env.local` and `.env` at the project root
+2. **Global**: `~/.onex/.env` (works from any directory)
+
+### Project config (recommended for teams)
 
 ```bash
-# AWS (default)
+# .env.local (at project root — shared with the team via .env.example)
+BUCKET_NAME=my-bucket
 AWS_REGION=ap-southeast-1
-AWS_ACCESS_KEY_ID=...
-AWS_SECRET_ACCESS_KEY=...
+AWS_ACCESS_KEY_ID=your-access-key
+AWS_SECRET_ACCESS_KEY=your-secret-key
+```
+
+### Global config (for personal use / running outside a project)
+
+```bash
+# ~/.onex/.env
+BUCKET_NAME=my-bucket
+AWS_REGION=ap-southeast-1
+AWS_ACCESS_KEY_ID=your-access-key
+AWS_SECRET_ACCESS_KEY=your-secret-key
+```
 
+Then all S3 commands just work without extra flags:
+
+```bash
+onex upload --theme simple    # picks up config automatically
+onex clone simple             # works from any directory
+onex download -t simple       # same
+```
+
+### Adapter Modes
+
+```bash
 # MinIO (set ADAPTER_MODE=vps)
 ADAPTER_MODE=vps
 MINIO_ENDPOINT=localhost:9000
@@ -226,11 +257,15 @@ MINIO_SECRET_KEY=minioadmin
 
 # LocalStack (set ADAPTER_MODE=local)
 ADAPTER_MODE=local
-
-# Override bucket name directly
-BUCKET_NAME=my-bucket
 ```
 
+### Bucket Name Resolution
+
+Priority order:
+1. `--bucket` CLI flag
+2. `BUCKET_NAME` environment variable
+3. Default: `onex-themes-staging` or `onex-themes-prod` (based on `--environment`)
+
 ## Theme Structure
 
 Themes live in the `themes/` directory at the project root:

package/dist/cli.js

@@ -1,35 +1,37 @@
 #!/usr/bin/env node
 'use strict';
 
-var commander = require('commander');
-var chalk4 = require('chalk');
 var path = require('path');
-var fs2 = require('fs');
-var child_process = require('child_process');
-var inquirer = require('inquirer');
-var ora = require('ora');
+var os = require('os');
+var dotenv = require('dotenv');
 var fs = require('fs-extra');
 var ejs = require('ejs');
+var child_process = require('child_process');
+var chalk4 = require('chalk');
+var ora = require('ora');
+var commander = require('commander');
+var fs2 = require('fs');
+var inquirer = require('inquirer');
 var archiver = require('archiver');
 var FormData = require('form-data');
 var fetch = require('node-fetch');
 var clientS3 = require('@aws-sdk/client-s3');
-var os = require('os');
 var AdmZip = require('adm-zip');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
-var chalk4__default = /*#__PURE__*/_interopDefault(chalk4);
 var path__default = /*#__PURE__*/_interopDefault(path);
-var fs2__default = /*#__PURE__*/_interopDefault(fs2);
-var inquirer__default = /*#__PURE__*/_interopDefault(inquirer);
-var ora__default = /*#__PURE__*/_interopDefault(ora);
+var os__default = /*#__PURE__*/_interopDefault(os);
+var dotenv__default = /*#__PURE__*/_interopDefault(dotenv);
 var fs__default = /*#__PURE__*/_interopDefault(fs);
 var ejs__default = /*#__PURE__*/_interopDefault(ejs);
+var chalk4__default = /*#__PURE__*/_interopDefault(chalk4);
+var ora__default = /*#__PURE__*/_interopDefault(ora);
+var fs2__default = /*#__PURE__*/_interopDefault(fs2);
+var inquirer__default = /*#__PURE__*/_interopDefault(inquirer);
 var archiver__default = /*#__PURE__*/_interopDefault(archiver);
 var FormData__default = /*#__PURE__*/_interopDefault(FormData);
 var fetch__default = /*#__PURE__*/_interopDefault(fetch);
-var os__default = /*#__PURE__*/_interopDefault(os);
 var AdmZip__default = /*#__PURE__*/_interopDefault(AdmZip);
 
 var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : /* @__PURE__ */ Symbol.for("Symbol." + name);
@@ -86,34 +88,7 @@ var Logger = class {
 };
 var logger = new Logger();
 
-// src/utils/validators.ts
-function validateName(name) {
-  return /^[a-z0-9]+(-[a-z0-9]+)*$/.test(name);
-}
-function toKebabCase(str) {
-  return str.replace(/([a-z])([A-Z])/g, "$1-$2").replace(/[\s_]+/g, "-").toLowerCase();
-}
-function toPascalCase(str) {
-  return str.split(/[-_\s]+/).map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()).join("");
-}
-function validateThemeName(name) {
-  return /^[a-z][a-z0-9-]*$/.test(name);
-}
-function getValidCategories() {
-  return [
-    "headers",
-    "heroes",
-    "content",
-    "features",
-    "testimonials",
-    "galleries",
-    "cta",
-    "footers",
-    "ecommerce",
-    "blog",
-    "contact"
-  ];
-}
+// src/utils/file-helpers.ts
 async function renderTemplate(templatePath, data) {
   const template = await fs__default.default.readFile(templatePath, "utf-8");
   return ejs__default.default.render(template, data);
@@ -260,6 +235,35 @@ async function installDependencies(projectPath, packageManager = "npm") {
   });
 }
 
+// src/utils/validators.ts
+function validateName(name) {
+  return /^[a-z0-9]+(-[a-z0-9]+)*$/.test(name);
+}
+function toKebabCase(str) {
+  return str.replace(/([a-z])([A-Z])/g, "$1-$2").replace(/[\s_]+/g, "-").toLowerCase();
+}
+function toPascalCase(str) {
+  return str.split(/[-_\s]+/).map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()).join("");
+}
+function validateThemeName(name) {
+  return /^[a-z][a-z0-9-]*$/.test(name);
+}
+function getValidCategories() {
+  return [
+    "headers",
+    "heroes",
+    "content",
+    "features",
+    "testimonials",
+    "galleries",
+    "cta",
+    "footers",
+    "ecommerce",
+    "blog",
+    "contact"
+  ];
+}
+
 // src/commands/init.ts
 async function initCommand(projectName, options = {}) {
   logger.header("Create New OneX Theme Project");
@@ -2689,6 +2693,10 @@ async function cloneCommand(themeName, options) {
 }
 
 // src/cli.ts
+var projectRoot = getProjectRoot();
+dotenv__default.default.config({ path: path__default.default.join(projectRoot, ".env.local"), quiet: true });
+dotenv__default.default.config({ path: path__default.default.join(projectRoot, ".env"), quiet: true });
+dotenv__default.default.config({ path: path__default.default.join(os__default.default.homedir(), ".onex", ".env"), quiet: true });
 var program = new commander.Command();
 program.name("onex").description("CLI tool for OneX theme development").version("0.1.0");
 program.command("init").description("Create a new OneX theme project").argument("[project-name]", "Name of the project").option(