@onexapis/cli 1.0.2 → 1.0.4

package/README.md

@@ -213,10 +213,25 @@ onex clone simple -v 1.0.0 -o ./my-clone --no-install
 
 ## S3 Configuration
 
-The `upload`, `download`, and `clone` commands use S3 for storage. The CLI **automatically loads `.env.local` and `.env`** from the project root, so you only need to configure once:
+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
+# .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=your-access-key
+AWS_SECRET_ACCESS_KEY=your-secret-key
+```
+
+### Global config (for personal use / running outside a project)
 
 ```bash
-# .env.local (at project root)
+# ~/.onex/.env
 BUCKET_NAME=my-bucket
 AWS_REGION=ap-southeast-1
 AWS_ACCESS_KEY_ID=your-access-key
@@ -226,8 +241,8 @@ AWS_SECRET_ACCESS_KEY=your-secret-key
 Then all S3 commands just work without extra flags:
 
 ```bash
-onex upload --theme simple    # picks up bucket + credentials from .env.local
-onex clone simple             # same
+onex upload --theme simple    # picks up config automatically
+onex clone simple             # works from any directory
 onex download -t simple       # same
 ```
 

package/dist/cli.js

@@ -2,6 +2,7 @@
 'use strict';
 
 var path = require('path');
+var os = require('os');
 var dotenv = require('dotenv');
 var fs = require('fs-extra');
 var ejs = require('ejs');
@@ -15,12 +16,12 @@ 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 path__default = /*#__PURE__*/_interopDefault(path);
+var os__default = /*#__PURE__*/_interopDefault(os);
 var dotenv__default = /*#__PURE__*/_interopDefault(dotenv);
 var fs__default = /*#__PURE__*/_interopDefault(fs);
 var ejs__default = /*#__PURE__*/_interopDefault(ejs);
@@ -31,7 +32,6 @@ 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);
@@ -174,18 +174,16 @@ function getProjectRoot() {
 }
 function getThemesDir() {
   const root = getProjectRoot();
-  const themesDir = path__default.default.join(root, "themes");
-  if (fs__default.default.existsSync(themesDir)) {
-    return themesDir;
-  }
-  return path__default.default.join(root, "src/themes");
+  if (fs__default.default.existsSync(path__default.default.join(root, "themes"))) return path__default.default.join(root, "themes");
+  if (fs__default.default.existsSync(path__default.default.join(root, "src/themes"))) return path__default.default.join(root, "src/themes");
+  return path__default.default.dirname(root);
 }
 function getFeaturesDir() {
   return path__default.default.join(getProjectRoot(), "src/features");
 }
 function isOneXProject() {
   const root = getProjectRoot();
-  return fs__default.default.existsSync(path__default.default.join(root, "themes")) || fs__default.default.existsSync(path__default.default.join(root, "src/themes"));
+  return fs__default.default.existsSync(path__default.default.join(root, "themes")) || fs__default.default.existsSync(path__default.default.join(root, "src/themes")) || fs__default.default.existsSync(path__default.default.join(root, "theme.config.ts")) || fs__default.default.existsSync(path__default.default.join(root, "bundle-entry.ts"));
 }
 function ensureOneXProject() {
   if (!isOneXProject()) {
@@ -679,6 +677,14 @@ export const homePageConfig: PageConfig = {
 async function createSectionCommand(name, options) {
   logger.header("Create New Section");
   ensureOneXProject();
+  if (!options.theme) {
+    const isStandaloneTheme = ["theme.config.ts", "bundle-entry.ts"].some(
+      (f) => fs__default.default.existsSync(path__default.default.join(process.cwd(), f))
+    );
+    if (isStandaloneTheme) {
+      options.theme = path__default.default.basename(process.cwd());
+    }
+  }
   const sectionName = toKebabCase(name);
   if (!validateName(sectionName)) {
     logger.error(
@@ -910,6 +916,14 @@ ${hasTemplate ? `export { ${data.sectionNamePascal}Default } from "./${data.sect
 async function createBlockCommand(name, options) {
   logger.header("Create New Block");
   ensureOneXProject();
+  if (!options.theme) {
+    const isStandaloneTheme = ["theme.config.ts", "bundle-entry.ts"].some(
+      (f) => fs__default.default.existsSync(path__default.default.join(process.cwd(), f))
+    );
+    if (isStandaloneTheme) {
+      options.theme = path__default.default.basename(process.cwd());
+    }
+  }
   const blockName = toKebabCase(name);
   if (!validateName(blockName)) {
     logger.error(
@@ -1470,8 +1484,8 @@ async function validateCommand(options) {
     }
     themeToValidate = options.theme;
   } else {
-    const manifestPath2 = path__default.default.join(process.cwd(), "manifest.ts");
-    if (fs__default.default.existsSync(manifestPath2)) {
+    const isThemeDir = ["theme.config.ts", "bundle-entry.ts", "manifest.ts"].some((f) => fs__default.default.existsSync(path__default.default.join(process.cwd(), f)));
+    if (isThemeDir) {
       themeToValidate = path__default.default.basename(process.cwd());
       logger.info(`Validating current theme: ${themeToValidate}`);
     } else {
@@ -1648,8 +1662,8 @@ async function buildCommand(options) {
       process.exit(1);
     }
   } else {
-    const manifestPath = path__default.default.join(process.cwd(), "manifest.ts");
-    if (fs__default.default.existsSync(manifestPath)) {
+    const isThemeDir = ["theme.config.ts", "bundle-entry.ts", "manifest.ts"].some((f) => fs__default.default.existsSync(path__default.default.join(process.cwd(), f)));
+    if (isThemeDir) {
       themePath = process.cwd();
       themeName = path__default.default.basename(themePath);
       logger.info(`Building current theme: ${themeName}`);
@@ -1750,8 +1764,8 @@ async function packageCommand(options) {
       process.exit(1);
     }
   } else {
-    const manifestPath = path__default.default.join(process.cwd(), "manifest.ts");
-    if (fs__default.default.existsSync(manifestPath)) {
+    const isThemeDir = ["theme.config.ts", "bundle-entry.ts", "manifest.ts"].some((f) => fs__default.default.existsSync(path__default.default.join(process.cwd(), f)));
+    if (isThemeDir) {
       themePath = process.cwd();
       themeName = path__default.default.basename(themePath);
       logger.info(`Packaging current theme: ${themeName}`);
@@ -2693,9 +2707,13 @@ 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 });
+try {
+  const 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 });
+} catch (e) {
+}
+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(