@onexapis/cli 1.0.3 → 1.0.4

package/dist/cli.js

@@ -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,12 @@ 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");