@onexapis/cli 1.0.2 → 1.0.4

package/dist/index.mjs

@@ -89,8 +89,8 @@ function validateThemeName(name) {
   return /^[a-z][a-z0-9-]*$/.test(name);
 }
 function pathExists(filePath) {
-  const fs8 = __require("fs-extra");
-  return fs8.existsSync(filePath);
+  const fs10 = __require("fs-extra");
+  return fs10.existsSync(filePath);
 }
 function validateCategory(category) {
   const validCategories = [
@@ -208,18 +208,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()) {
@@ -684,6 +682,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(
@@ -915,6 +921,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(
@@ -1484,8 +1498,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}`);