@onexapis/cli 1.0.2 → 1.0.4

package/dist/cli.mjs

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import path from 'path';
+import os from 'os';
 import dotenv from 'dotenv';
 import fs from 'fs-extra';
 import ejs from 'ejs';
@@ -13,7 +14,6 @@ import archiver from 'archiver';
 import FormData from 'form-data';
 import fetch from 'node-fetch';
 import { PutObjectCommand, GetObjectCommand, S3Client } from '@aws-sdk/client-s3';
-import os from 'os';
 import AdmZip from 'adm-zip';
 
 var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : /* @__PURE__ */ Symbol.for("Symbol." + name);
@@ -156,18 +156,16 @@ function getProjectRoot() {
 }
 function getThemesDir() {
   const root = getProjectRoot();
-  const themesDir = path.join(root, "themes");
-  if (fs.existsSync(themesDir)) {
-    return themesDir;
-  }
-  return path.join(root, "src/themes");
+  if (fs.existsSync(path.join(root, "themes"))) return path.join(root, "themes");
+  if (fs.existsSync(path.join(root, "src/themes"))) return path.join(root, "src/themes");
+  return path.dirname(root);
 }
 function getFeaturesDir() {
   return path.join(getProjectRoot(), "src/features");
 }
 function isOneXProject() {
   const root = getProjectRoot();
-  return fs.existsSync(path.join(root, "themes")) || fs.existsSync(path.join(root, "src/themes"));
+  return fs.existsSync(path.join(root, "themes")) || fs.existsSync(path.join(root, "src/themes")) || fs.existsSync(path.join(root, "theme.config.ts")) || fs.existsSync(path.join(root, "bundle-entry.ts"));
 }
 function ensureOneXProject() {
   if (!isOneXProject()) {
@@ -661,6 +659,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.existsSync(path.join(process.cwd(), f))
+    );
+    if (isStandaloneTheme) {
+      options.theme = path.basename(process.cwd());
+    }
+  }
   const sectionName = toKebabCase(name);
   if (!validateName(sectionName)) {
     logger.error(
@@ -892,6 +898,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.existsSync(path.join(process.cwd(), f))
+    );
+    if (isStandaloneTheme) {
+      options.theme = path.basename(process.cwd());
+    }
+  }
   const blockName = toKebabCase(name);
   if (!validateName(blockName)) {
     logger.error(
@@ -1452,8 +1466,8 @@ async function validateCommand(options) {
     }
     themeToValidate = options.theme;
   } else {
-    const manifestPath2 = path.join(process.cwd(), "manifest.ts");
-    if (fs.existsSync(manifestPath2)) {
+    const isThemeDir = ["theme.config.ts", "bundle-entry.ts", "manifest.ts"].some((f) => fs.existsSync(path.join(process.cwd(), f)));
+    if (isThemeDir) {
       themeToValidate = path.basename(process.cwd());
       logger.info(`Validating current theme: ${themeToValidate}`);
     } else {
@@ -1630,8 +1644,8 @@ async function buildCommand(options) {
       process.exit(1);
     }
   } else {
-    const manifestPath = path.join(process.cwd(), "manifest.ts");
-    if (fs.existsSync(manifestPath)) {
+    const isThemeDir = ["theme.config.ts", "bundle-entry.ts", "manifest.ts"].some((f) => fs.existsSync(path.join(process.cwd(), f)));
+    if (isThemeDir) {
       themePath = process.cwd();
       themeName = path.basename(themePath);
       logger.info(`Building current theme: ${themeName}`);
@@ -1732,8 +1746,8 @@ async function packageCommand(options) {
       process.exit(1);
     }
   } else {
-    const manifestPath = path.join(process.cwd(), "manifest.ts");
-    if (fs.existsSync(manifestPath)) {
+    const isThemeDir = ["theme.config.ts", "bundle-entry.ts", "manifest.ts"].some((f) => fs.existsSync(path.join(process.cwd(), f)));
+    if (isThemeDir) {
       themePath = process.cwd();
       themeName = path.basename(themePath);
       logger.info(`Packaging current theme: ${themeName}`);
@@ -2675,9 +2689,13 @@ async function cloneCommand(themeName, options) {
 }
 
 // src/cli.ts
-var projectRoot = getProjectRoot();
-dotenv.config({ path: path.join(projectRoot, ".env.local"), quiet: true });
-dotenv.config({ path: path.join(projectRoot, ".env"), quiet: true });
+try {
+  const projectRoot = getProjectRoot();
+  dotenv.config({ path: path.join(projectRoot, ".env.local"), quiet: true });
+  dotenv.config({ path: path.join(projectRoot, ".env"), quiet: true });
+} catch (e) {
+}
+dotenv.config({ path: path.join(os.homedir(), ".onex", ".env"), quiet: true });
 var program = new 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(