@onexapis/cli 1.1.6 → 1.1.8

package/dist/cli.mjs

@@ -12,6 +12,7 @@ import fs from 'fs-extra';
 import ejs from 'ejs';
 import { execSync, spawn } from 'child_process';
 import { Command } from 'commander';
+import { createRequire } from 'module';
 import fs2 from 'fs';
 import inquirer from 'inquirer';
 import archiver from 'archiver';
@@ -327,7 +328,7 @@ async function extractDataRequirements(themePath) {
   return requirements;
 }
 async function generateManifest2(themeName, themePath, outputDir) {
-  let version = "1.0.0";
+  let version2 = "1.0.0";
   let themeId = themeName;
   try {
     const pkgContent = await fs7.readFile(
@@ -335,7 +336,7 @@ async function generateManifest2(themeName, themePath, outputDir) {
       "utf-8"
     );
     const pkg = JSON.parse(pkgContent);
-    version = pkg.version || version;
+    version2 = pkg.version || version2;
     if (pkg.name) {
       themeId = pkg.name.replace(/^@onex-themes\//, "");
     }
@@ -359,7 +360,7 @@ async function generateManifest2(themeName, themePath, outputDir) {
   const entryFile = jsFiles.find((f) => f.includes("bundle-entry")) || "bundle-entry.js";
   const manifest = {
     themeId,
-    version,
+    version: version2,
     name: themeId.charAt(0).toUpperCase() + themeId.slice(1),
     compiledAt: (/* @__PURE__ */ new Date()).toISOString(),
     format: "esm",
@@ -715,7 +716,8 @@ export function headers() { return new Headers(); }
         };
         return {
           contents: stubs[args.path] || "export default {};",
-          loader: "jsx"
+          loader: "jsx",
+          resolveDir: themePath
         };
       });
     }
@@ -1263,10 +1265,10 @@ export const manifest: ThemeExport = {
   author: "${data.author}",
 
   // Theme configuration
-  config: () => import("./theme.config").then((m) => m.themeConfig),
+  config: () => import("./config").then((m) => m.themeConfig),
 
   // Theme layout (header/footer sections)
-  layout: () => import("./theme.layout").then((m) => m.themeLayout),
+  layout: () => import("./layout").then((m) => m.themeLayout),
 
   // Available sections in this theme
   sections: {
@@ -1432,9 +1434,9 @@ function generateThemeIndex(data) {
  * ${data.themeNamePascal} Theme
  */
 
-export { manifest as ${data.themeName}Manifest } from "./manifest";
-export { themeConfig as ${data.themeName}Config } from "./theme.config";
-export { themeLayout as ${data.themeName}Layout } from "./theme.layout";
+export { manifest as ${data.themeNamePascal}Manifest } from "./manifest";
+export { themeConfig as ${data.themeNamePascal}Config } from "./config";
+export { themeLayout as ${data.themeNamePascal}Layout } from "./layout";
 `;
 }
 function generateHomePage(data) {
@@ -2275,9 +2277,9 @@ async function listThemesInfo() {
     const versionMatch = manifestContent.match(/version:\s*["'](.+)["']/);
     const descMatch = manifestContent.match(/description:\s*["'](.+)["']/);
     const displayName = nameMatch ? nameMatch[1] : theme;
-    const version = versionMatch ? versionMatch[1] : "unknown";
+    const version2 = versionMatch ? versionMatch[1] : "unknown";
     const description = descMatch ? descMatch[1] : "";
-    logger.log(chalk4.cyan(`  ${displayName}`) + chalk4.gray(` (v${version})`));
+    logger.log(chalk4.cyan(`  ${displayName}`) + chalk4.gray(` (v${version2})`));
     if (description) {
       logger.log(chalk4.gray(`    ${description}`));
     }
@@ -2625,14 +2627,14 @@ async function packageCommand(options) {
     }
   }
   const packageJsonPath = path8.join(themePath, "package.json");
-  let version = "1.0.0";
+  let version2 = "1.0.0";
   if (fs.existsSync(packageJsonPath)) {
     const packageJson = await fs.readJson(packageJsonPath);
-    version = packageJson.version || "1.0.0";
+    version2 = packageJson.version || "1.0.0";
   }
   logger.newLine();
   logger.info(`Theme: ${themeName}`);
-  logger.info(`Version: ${version}`);
+  logger.info(`Version: ${version2}`);
   logger.newLine();
   const compiledThemePath = path8.join(
     process.cwd(),
@@ -2667,7 +2669,7 @@ async function packageCommand(options) {
   }
   logger.newLine();
   logger.section("Step 2: Create Package");
-  const packageName = options.name || `${themeName}-${version}`;
+  const packageName = options.name || `${themeName}-${version2}`;
   const outputDir = options.output || path8.join(process.cwd(), "dist");
   const outputPath = path8.join(outputDir, `${packageName}.zip`);
   await fs.ensureDir(outputDir);
@@ -2882,7 +2884,7 @@ function getBucketName(env) {
   const environment = env || process.env.ENVIRONMENT || "staging";
   return environment === "production" ? "onex-themes-prod" : "onex-themes-staging";
 }
-async function findCompiledThemeDir(themeId, version) {
+async function findCompiledThemeDir(themeId, version2) {
   const searchPaths = [path8.resolve(process.cwd(), "dist")];
   for (const dir of searchPaths) {
     if (await fs.pathExists(dir)) {
@@ -2952,9 +2954,9 @@ async function findSourceDir(themeId, explicitDir) {
   }
   return null;
 }
-async function updateLatestPointer(s3Client, bucket, themeId, version) {
+async function updateLatestPointer(s3Client, bucket, themeId, version2) {
   const latestData = {
-    version,
+    version: version2,
     uploadedAt: (/* @__PURE__ */ new Date()).toISOString()
   };
   await s3Client.send(
@@ -2971,23 +2973,23 @@ async function uploadCommand(options) {
   const spinner = ora("Preparing theme upload...").start();
   try {
     let themeId;
-    let version;
+    let version2;
     if (options.theme) {
       themeId = options.theme;
-      version = options.version || "1.0.0";
+      version2 = options.version || "1.0.0";
     } else {
       const manifest = await readManifest();
       themeId = manifest.themeId;
-      version = options.version || manifest.version || "1.0.0";
+      version2 = options.version || manifest.version || "1.0.0";
     }
-    spinner.text = `Found theme: ${themeId}@${version}`;
+    spinner.text = `Found theme: ${themeId}@${version2}`;
     const bucket = options.bucket || getBucketName(options.environment);
     const s3Client = getS3Client();
-    const compiledDir = await findCompiledThemeDir(themeId, version);
+    const compiledDir = await findCompiledThemeDir(themeId, version2);
     if (!compiledDir) {
       spinner.fail(
         chalk4.red(
-          `Compiled theme not found for ${themeId}@${version}. Run 'onex build' first.`
+          `Compiled theme not found for ${themeId}@${version2}. Run 'onex build' first.`
         )
       );
       logger.info(chalk4.gray(`Expected location:
@@ -2997,7 +2999,7 @@ async function uploadCommand(options) {
     spinner.succeed(`Found compiled theme at: ${compiledDir}`);
     spinner.start("Creating bundle.zip...");
     const tmpDir = os.tmpdir();
-    const bundleZipPath = path8.join(tmpDir, `${themeId}-${version}-bundle.zip`);
+    const bundleZipPath = path8.join(tmpDir, `${themeId}-${version2}-bundle.zip`);
     await createZipFromDir(compiledDir, bundleZipPath);
     const bundleZipBuffer = await fs.readFile(bundleZipPath);
     const bundleSizeMB = (bundleZipBuffer.length / 1024 / 1024).toFixed(2);
@@ -3008,7 +3010,7 @@ async function uploadCommand(options) {
       console.log(chalk4.gray(`  bundle.zip: ${bundleSizeMB} MB`));
       console.log(
         chalk4.cyan(
-          `  S3 path: s3://${bucket}/themes/${themeId}/${version}/bundle.zip`
+          `  S3 path: s3://${bucket}/themes/${themeId}/${version2}/bundle.zip`
         )
       );
       if (!options.skipSource) {
@@ -3017,7 +3019,7 @@ async function uploadCommand(options) {
           console.log(chalk4.gray(`  source dir: ${sourceDir}`));
           console.log(
             chalk4.cyan(
-              `  S3 path: s3://${bucket}/themes/${themeId}/${version}/source.zip`
+              `  S3 path: s3://${bucket}/themes/${themeId}/${version2}/source.zip`
             )
           );
         } else {
@@ -3031,7 +3033,7 @@ async function uploadCommand(options) {
       return;
     }
     spinner.start("Uploading bundle.zip to S3...");
-    const bundleS3Key = `themes/${themeId}/${version}/bundle.zip`;
+    const bundleS3Key = `themes/${themeId}/${version2}/bundle.zip`;
     await s3Client.send(
       new PutObjectCommand({
         Bucket: bucket,
@@ -3053,7 +3055,7 @@ async function uploadCommand(options) {
         spinner.start("Creating source.zip...");
         const sourceZipPath = path8.join(
           tmpDir,
-          `${themeId}-${version}-source.zip`
+          `${themeId}-${version2}-source.zip`
         );
         await createZipFromDir(sourceDir, sourceZipPath, [
           "node_modules/**",
@@ -3067,7 +3069,7 @@ async function uploadCommand(options) {
         const sourceSizeMB = (sourceZipBuffer.length / 1024 / 1024).toFixed(2);
         spinner.succeed(`Created source.zip (${sourceSizeMB} MB)`);
         spinner.start("Uploading source.zip to S3...");
-        const sourceS3Key = `themes/${themeId}/${version}/source.zip`;
+        const sourceS3Key = `themes/${themeId}/${version2}/source.zip`;
         await s3Client.send(
           new PutObjectCommand({
             Bucket: bucket,
@@ -3088,20 +3090,20 @@ async function uploadCommand(options) {
       }
     }
     spinner.start("Updating latest.json pointer...");
-    await updateLatestPointer(s3Client, bucket, themeId, version);
+    await updateLatestPointer(s3Client, bucket, themeId, version2);
     spinner.succeed("Updated latest.json pointer");
     console.log();
     logger.success(chalk4.green.bold("Theme uploaded successfully!"));
     console.log();
     console.log(
-      chalk4.cyan("   Theme:   ") + chalk4.white(`${themeId}@${version}`)
+      chalk4.cyan("   Theme:   ") + chalk4.white(`${themeId}@${version2}`)
     );
     console.log(chalk4.cyan("   Bucket:  ") + chalk4.white(bucket));
     console.log(
       chalk4.cyan("   Files:   ") + chalk4.white(`bundle.zip${sourceUploaded ? " + source.zip" : ""}`)
     );
     console.log(
-      chalk4.cyan("   Path:    ") + chalk4.gray(`s3://${bucket}/themes/${themeId}/${version}/`)
+      chalk4.cyan("   Path:    ") + chalk4.gray(`s3://${bucket}/themes/${themeId}/${version2}/`)
     );
     console.log();
   } catch (error) {
@@ -3243,7 +3245,7 @@ async function downloadCommand(options) {
   const spinner = ora("Initializing download...").start();
   try {
     const themeId = options.themeId || process.env.NEXT_PUBLIC_THEME_ID || process.env.THEME_ID;
-    const version = options.version || process.env.THEME_VERSION || "latest";
+    const version2 = options.version || process.env.THEME_VERSION || "latest";
     const bucket = options.bucket || getBucketName2(options.environment);
     const outputDir = options.output || "./active-theme";
     if (!themeId) {
@@ -3254,10 +3256,10 @@ async function downloadCommand(options) {
       );
       process.exit(1);
     }
-    spinner.text = `Downloading ${themeId}@${version} from ${bucket}...`;
+    spinner.text = `Downloading ${themeId}@${version2} from ${bucket}...`;
     const s3Client = getS3Client2();
-    let resolvedVersion = version;
-    if (version === "latest") {
+    let resolvedVersion = version2;
+    if (version2 === "latest") {
       spinner.text = "Resolving latest version...";
       resolvedVersion = await resolveLatestVersion(s3Client, bucket, themeId);
       spinner.succeed(
@@ -3497,14 +3499,14 @@ async function cloneCommand(themeName, options) {
       );
       process.exit(1);
     }
-    let version = options.version || "latest";
-    if (version === "latest") {
+    let version2 = options.version || "latest";
+    if (version2 === "latest") {
       spinner.text = "Resolving latest version...";
-      version = await resolveLatestVersion2(s3Client, bucket, themeName);
-      spinner.succeed(`Resolved latest version: ${chalk4.cyan(version)}`);
+      version2 = await resolveLatestVersion2(s3Client, bucket, themeName);
+      spinner.succeed(`Resolved latest version: ${chalk4.cyan(version2)}`);
     }
-    spinner.start(`Downloading source.zip for ${themeName}@${version}...`);
-    const s3Key = `themes/${themeName}/${version}/source.zip`;
+    spinner.start(`Downloading source.zip for ${themeName}@${version2}...`);
+    const s3Key = `themes/${themeName}/${version2}/source.zip`;
     let zipBuffer;
     try {
       const response = await s3Client.send(
@@ -3576,7 +3578,7 @@ async function cloneCommand(themeName, options) {
     logger.success(chalk4.green.bold("Theme cloned successfully!"));
     console.log();
     console.log(
-      chalk4.cyan("   Source:   ") + chalk4.gray(`${themeName}@${version}`)
+      chalk4.cyan("   Source:   ") + chalk4.gray(`${themeName}@${version2}`)
     );
     console.log(chalk4.cyan("   Theme:    ") + chalk4.white(newName));
     console.log(chalk4.cyan("   Location: ") + chalk4.white(outputDir));
@@ -3851,8 +3853,10 @@ dotenv.config({
   path: path8.join(os.homedir(), ".onex", ".env"),
   quiet: true
 });
+var require2 = createRequire(import.meta.url);
+var { version } = require2("../package.json");
 var program = new Command();
-program.name("onex").description("CLI tool for OneX theme development").version("0.1.0");
+program.name("onex").description("CLI tool for OneX theme development").version(version);
 program.command("init").description("Create a new OneX theme project").argument("[project-name]", "Name of the project").option(
   "-t, --template <template>",
   "Template to use (default, minimal)",