@onexapis/cli 1.1.1 → 1.1.3

package/dist/index.js

@@ -17,6 +17,7 @@ var os = require('os');
 var archiver = require('archiver');
 var AdmZip = require('adm-zip');
 
+var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 function _interopNamespace(e) {
@@ -53,7 +54,6 @@ var AdmZip__default = /*#__PURE__*/_interopDefault(AdmZip);
 
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : /* @__PURE__ */ Symbol.for("Symbol." + name);
 var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
   get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
 }) : x)(function(x) {
@@ -67,7 +67,6 @@ var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __forAwait = (obj, it, method) => (it = obj[__knownSymbol("asyncIterator")]) ? it.call(obj) : (obj = obj[__knownSymbol("iterator")](), it = {}, method = (key, fn) => (fn = obj[key]) && (it[key] = (arg) => new Promise((yes, no, done) => (arg = fn.call(obj, arg), done = arg.done, Promise.resolve(arg.value).then((value) => yes({ value, done }), no)))), method("next"), method("return"), it);
 exports.Logger = void 0; exports.logger = void 0;
 var init_logger = __esm({
   "src/utils/logger.ts"() {
@@ -140,7 +139,7 @@ async function resolveNodeModulesFile(startDir, relativePath) {
     try {
       await fs6__default.default.access(candidate);
       return candidate;
-    } catch (e) {
+    } catch {
       const parent = path__default.default.dirname(dir);
       if (parent === dir) break;
       dir = parent;
@@ -159,7 +158,7 @@ function createCoreGlobalPlugin(themePath) {
       }));
       build2.onLoad({ filter: /.*/, namespace: "core-global" }, async (args) => {
         const match = args.path.match(/^@onexapis\/core(\/(.+))?$/);
-        const subpath = (match == null ? void 0 : match[2]) || "";
+        const subpath = match?.[2] || "";
         const moduleAccess = subpath ? `['${subpath}']` : "";
         let namedExports = [];
         const cacheKey = subpath || "__root__";
@@ -183,7 +182,7 @@ function createCoreGlobalPlugin(themePath) {
               namedExports.push(...names);
             }
             namedExports = [...new Set(namedExports)];
-          } catch (e) {
+          } catch {
           }
           exportsBySubpath[cacheKey] = namedExports;
         }
@@ -215,6 +214,73 @@ ${namedExportLines}
     }
   };
 }
+async function generateThemeData(themePath, outputDir, themeId) {
+  const { createJiti } = await import('jiti');
+  const jiti = createJiti((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.js', document.baseURI).href)));
+  let themeConfig = null;
+  let layoutConfig = null;
+  const pages = {};
+  for (const ext of [".ts", ".js"]) {
+    try {
+      const mod = await jiti.import(path__default.default.join(themePath, `theme.config${ext}`));
+      themeConfig = mod.default || mod;
+      break;
+    } catch {
+    }
+  }
+  for (const ext of [".ts", ".js"]) {
+    try {
+      const mod = await jiti.import(path__default.default.join(themePath, `theme.layout${ext}`));
+      layoutConfig = mod.default || mod;
+      break;
+    } catch {
+    }
+  }
+  const pagesDir = path__default.default.join(themePath, "pages");
+  try {
+    const files = await fs6__default.default.readdir(pagesDir);
+    for (const file of files) {
+      if (!file.match(/\.(ts|js)$/)) continue;
+      const name = file.replace(/\.(ts|js)$/, "");
+      try {
+        const mod = await jiti.import(path__default.default.join(pagesDir, file));
+        const config = mod.default || mod;
+        pages[name] = {
+          id: name,
+          name: config.title || name,
+          path: config.path || `/${name}`,
+          config: { id: name, ...config },
+          sections: config.sections || [],
+          seo: config.seo
+        };
+      } catch {
+      }
+    }
+  } catch {
+  }
+  await fs6__default.default.writeFile(
+    path__default.default.join(outputDir, "theme-data.json"),
+    JSON.stringify(
+      {
+        themeId,
+        theme: {
+          id: themeId,
+          name: themeConfig?.name || themeId,
+          config: themeConfig,
+          layout: {
+            header: layoutConfig?.headerSections || [],
+            footer: layoutConfig?.footerSections || []
+          },
+          pages: Object.keys(pages)
+        },
+        pages
+      },
+      null,
+      2
+    )
+  );
+  exports.logger.info(`Generated theme-data.json (${Object.keys(pages).length} pages)`);
+}
 async function contentHashEntry(outputDir) {
   const entryPath = path__default.default.join(outputDir, "bundle-entry.js");
   const mapPath = path__default.default.join(outputDir, "bundle-entry.js.map");
@@ -225,11 +291,11 @@ async function contentHashEntry(outputDir) {
   let entryContent;
   try {
     entryContent = await fs6__default.default.readFile(entryPath, "utf-8");
-  } catch (e) {
+  } catch {
     const indexPath = path__default.default.join(outputDir, "index.js");
     try {
       entryContent = await fs6__default.default.readFile(indexPath, "utf-8");
-    } catch (e2) {
+    } catch {
       exports.logger.warning("No entry file found in output, skipping content hash");
       return;
     }
@@ -246,7 +312,7 @@ async function contentHashEntry(outputDir) {
     try {
       await fs6__default.default.access(indexMapPath);
       await fs6__default.default.rename(indexMapPath, path__default.default.join(outputDir, hashedMapName2));
-    } catch (e2) {
+    } catch {
     }
     exports.logger.info(`Entry hashed: ${hashedName2}`);
     return;
@@ -263,10 +329,32 @@ async function contentHashEntry(outputDir) {
   try {
     await fs6__default.default.access(mapPath);
     await fs6__default.default.rename(mapPath, path__default.default.join(outputDir, hashedMapName));
-  } catch (e) {
+  } catch {
   }
   exports.logger.info(`Entry hashed: ${hashedName}`);
 }
+async function extractDataRequirements(themePath) {
+  const { createJiti } = await import('jiti');
+  const jiti = createJiti((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.js', document.baseURI).href)));
+  const schemaFiles = await glob.glob("sections/**/*.schema.ts", { cwd: themePath });
+  const requirements = {};
+  for (const file of schemaFiles) {
+    try {
+      const mod = await jiti.import(path__default.default.join(themePath, file));
+      const exports$1 = mod;
+      for (const value of Object.values(exports$1)) {
+        if (value && typeof value === "object" && typeof value.type === "string" && value.dataRequirements && typeof value.dataRequirements === "object") {
+          requirements[value.type] = value.dataRequirements;
+        }
+      }
+    } catch (err) {
+      exports.logger.warning(
+        `Could not load schema ${file}: ${err instanceof Error ? err.message : String(err)}`
+      );
+    }
+  }
+  return requirements;
+}
 async function generateManifest2(themeName, themePath, outputDir) {
   let version = "1.0.0";
   let themeId = themeName;
@@ -280,18 +368,19 @@ async function generateManifest2(themeName, themePath, outputDir) {
     if (pkg.name) {
       themeId = pkg.name.replace(/^@onex-themes\//, "");
     }
-  } catch (e) {
+  } catch {
   }
   const [sectionFiles, blockFiles, schemaFiles] = await Promise.all([
     glob.glob("sections/**/index.ts", { cwd: themePath }),
     glob.glob("blocks/**/index.ts", { cwd: themePath }),
     glob.glob("**/*.schema.ts", { cwd: themePath })
   ]);
+  const dataRequirements = await extractDataRequirements(themePath);
   let hasThemeConfig = false;
   try {
     await fs6__default.default.access(path__default.default.join(themePath, "theme.config.ts"));
     hasThemeConfig = true;
-  } catch (e) {
+  } catch {
   }
   const allFiles = await glob.glob("**/*", { cwd: outputDir, nodir: true });
   const jsFiles = allFiles.filter((f) => f.endsWith(".js"));
@@ -326,7 +415,9 @@ async function generateManifest2(themeName, themePath, outputDir) {
       blocks: blockFiles,
       schemas: schemaFiles,
       hasThemeConfig
-    }
+    },
+    // Section data requirements for server-side prefetching (keyed by section type)
+    dataRequirements
   };
   await fs6__default.default.writeFile(
     path__default.default.join(outputDir, "manifest.json"),
@@ -341,7 +432,7 @@ async function compileStandaloneTheme(themePath, themeName) {
   try {
     await fs6__default.default.access(bundleEntry);
     entryPoint = bundleEntry;
-  } catch (e) {
+  } catch {
   }
   const shimPath = path__default.default.join(outputDir, ".process-shim.js");
   await fs6__default.default.mkdir(outputDir, { recursive: true });
@@ -392,10 +483,11 @@ async function compileStandaloneTheme(themePath, themeName) {
     const result = await esbuild__namespace.build(buildOptions);
     try {
       await fs6__default.default.unlink(shimPath);
-    } catch (e) {
+    } catch {
     }
     await contentHashEntry(outputDir);
     await generateManifest2(themeName, themePath, outputDir);
+    await generateThemeData(themePath, outputDir, themeName);
     if (result.metafile) {
       const outputs = result.metafile.outputs;
       let totalSize = 0;
@@ -409,7 +501,7 @@ async function compileStandaloneTheme(themePath, themeName) {
   } catch (error) {
     try {
       await fs6__default.default.unlink(shimPath);
-    } catch (e) {
+    } catch {
     }
     exports.logger.error(`esbuild compilation failed: ${error}`);
     return false;
@@ -423,7 +515,7 @@ async function compileStandaloneThemeDev(themePath, themeName) {
   try {
     await fs6__default.default.access(bundleEntry);
     entryPoint = bundleEntry;
-  } catch (e) {
+  } catch {
   }
   const shimPath = path__default.default.join(outputDir, ".process-shim.js");
   await fs6__default.default.mkdir(outputDir, { recursive: true });
@@ -472,6 +564,7 @@ async function compileStandaloneThemeDev(themePath, themeName) {
   const context2 = await esbuild__namespace.context(buildOptions);
   await context2.rebuild();
   await generateManifest2(themeName, themePath, outputDir);
+  await generateThemeData(themePath, outputDir, themeName);
   return { context: context2, outputDir };
 }
 async function compilePreviewRuntime(themePath) {
@@ -489,7 +582,7 @@ async function compilePreviewRuntime(themePath) {
       await fs6__default.default.access(loc);
       previewEntryPath = loc;
       break;
-    } catch (e) {
+    } catch {
     }
   }
   if (!previewEntryPath) {
@@ -529,10 +622,13 @@ ${locations.join("\n")}`
         "zlib"
       ];
       for (const mod of nodeBuiltins) {
-        build2.onResolve({ filter: new RegExp(`^${mod.replace("/", "\\/")}$`) }, () => ({
-          path: mod,
-          namespace: "node-stub"
-        }));
+        build2.onResolve(
+          { filter: new RegExp(`^${mod.replace("/", "\\/")}$`) },
+          () => ({
+            path: mod,
+            namespace: "node-stub"
+          })
+        );
       }
       build2.onLoad({ filter: /.*/, namespace: "node-stub" }, (args) => {
         const stubs = {
@@ -546,8 +642,7 @@ ${locations.join("\n")}`
         };
       });
       build2.onResolve({ filter: /^lucide-react/ }, async (args) => {
-        var _a;
-        if ((_a = args.pluginData) == null ? void 0 : _a.skipStub) return void 0;
+        if (args.pluginData?.skipStub) return void 0;
         try {
           const result = await build2.resolve(args.path, {
             kind: args.kind,
@@ -557,7 +652,7 @@ ${locations.join("\n")}`
             pluginData: { skipStub: true }
           });
           if (!result.errors.length) return result;
-        } catch (e) {
+        } catch {
         }
         return { path: args.path, namespace: "lucide-stub" };
       });
@@ -579,8 +674,7 @@ export default new Proxy({}, { get: (_, name) => name === '__esModule' ? true :
         loader: "jsx"
       }));
       build2.onResolve({ filter: /^framer-motion/ }, async (args) => {
-        var _a;
-        if ((_a = args.pluginData) == null ? void 0 : _a.skipStub) return void 0;
+        if (args.pluginData?.skipStub) return void 0;
         try {
           const result = await build2.resolve(args.path, {
             kind: args.kind,
@@ -590,7 +684,7 @@ export default new Proxy({}, { get: (_, name) => name === '__esModule' ? true :
             pluginData: { skipStub: true }
           });
           if (!result.errors.length) return result;
-        } catch (e) {
+        } catch {
         }
         return { path: args.path, namespace: "motion-stub" };
       });
@@ -604,8 +698,59 @@ export default { motion, AnimatePresence };
         `.trim(),
         loader: "jsx"
       }));
+      build2.onResolve({ filter: /^next\// }, async (args) => {
+        if (args.pluginData?.skipStub) return void 0;
+        try {
+          const result = await build2.resolve(args.path, {
+            kind: args.kind,
+            resolveDir: args.resolveDir,
+            importer: args.importer,
+            namespace: "file",
+            pluginData: { skipStub: true }
+          });
+          if (!result.errors.length) return result;
+        } catch {
+        }
+        return { path: args.path, namespace: "next-stub" };
+      });
+      build2.onLoad({ filter: /.*/, namespace: "next-stub" }, (args) => {
+        const stubs = {
+          "next/image": `
+const Image = (props) => {
+  const { src, alt, width, height, fill, priority, ...rest } = props;
+  const imgSrc = typeof src === 'object' ? src.src : src;
+  return React.createElement('img', { src: imgSrc, alt, width: fill ? undefined : width, height: fill ? undefined : height, loading: priority ? 'eager' : 'lazy', ...rest });
+};
+import React from 'react';
+export default Image;
+          `,
+          "next/link": `
+const Link = ({ href, children, ...rest }) => React.createElement('a', { href, ...rest }, children);
+import React from 'react';
+export default Link;
+          `,
+          "next/navigation": `
+export function useRouter() { return { push(u){window.location.href=u}, replace(u){window.location.href=u}, back(){window.history.back()}, forward(){window.history.forward()}, refresh(){window.location.reload()}, prefetch(){} }; }
+export function usePathname() { return window.location.pathname; }
+export function useSearchParams() { return new URLSearchParams(window.location.search); }
+export function useParams() { return {}; }
+export function redirect(url) { window.location.href = url; }
+export function notFound() { throw new Error('Not Found'); }
+          `,
+          "next/headers": `
+export function cookies() { return { get(){}, getAll(){ return []; }, set(){}, delete(){}, has(){ return false; } }; }
+export function headers() { return new Headers(); }
+          `
+        };
+        return {
+          contents: stubs[args.path] || "export default {};",
+          loader: "jsx"
+        };
+      });
     }
   };
+  const shimPath = path__default.default.join(outputDir, ".process-shim-preview.js");
+  await fs6__default.default.writeFile(shimPath, PROCESS_SHIM);
   await esbuild__namespace.build({
     entryPoints: [previewEntryPath],
     bundle: true,
@@ -615,6 +760,7 @@ export default { motion, AnimatePresence };
     // Bundle React + core INTO the output (NOT externalized)
     external: [],
     plugins: [serverStubPlugin],
+    inject: [shimPath],
     minify: false,
     sourcemap: true,
     target: "es2020",
@@ -622,6 +768,12 @@ export default { motion, AnimatePresence };
     jsxImportSource: "react",
     define: {
       "process.env.NODE_ENV": JSON.stringify("development"),
+      "process.env.NEXT_PUBLIC_API_URL": JSON.stringify(
+        process.env.NEXT_PUBLIC_API_URL || ""
+      ),
+      "process.env.NEXT_PUBLIC_COMPANY_ID": JSON.stringify(
+        process.env.NEXT_PUBLIC_COMPANY_ID || ""
+      ),
       global: "globalThis"
     },
     loader: { ".tsx": "tsx", ".ts": "ts" },
@@ -632,6 +784,10 @@ export default { motion, AnimatePresence };
       "ignored-bare-import": "silent"
     }
   });
+  try {
+    await fs6__default.default.unlink(shimPath);
+  } catch {
+  }
   return outputPath;
 }
 var PROCESS_SHIM, reactGlobalPlugin;
@@ -1092,7 +1248,7 @@ Add your theme-specific blocks here.
           stdio: "ignore"
         });
         exports.logger.stopSpinner(true, "Git repository initialized!");
-      } catch (e) {
+      } catch {
         exports.logger.stopSpinner(false, "Failed to initialize git");
       }
     }
@@ -1103,7 +1259,7 @@ Add your theme-specific blocks here.
       try {
         await installDependencies(projectPath, packageManager);
         exports.logger.stopSpinner(true, "Dependencies installed!");
-      } catch (e) {
+      } catch {
         exports.logger.stopSpinner(false, "Failed to install dependencies");
         exports.logger.info(
           "You can install dependencies manually by running: cd " + name + " && npm install"
@@ -2185,7 +2341,6 @@ async function listThemesInfo() {
 // src/commands/build.ts
 init_logger();
 async function buildCommand(options) {
-  var _a;
   exports.logger.header("Build Theme");
   let themePath;
   let themeName;
@@ -2198,7 +2353,7 @@ async function buildCommand(options) {
       } else {
         themePath = path__default.default.join(process.cwd(), themeName);
       }
-    } catch (e) {
+    } catch {
       themePath = path__default.default.join(process.cwd(), themeName);
     }
     if (!fs__default.default.existsSync(themePath)) {
@@ -2255,7 +2410,7 @@ async function buildCommand(options) {
   }
   exports.logger.stopSpinner(true, "Lint passed");
   const pkgJson = fs__default.default.readJsonSync(packageJsonPath);
-  const buildScript = ((_a = pkgJson.scripts) == null ? void 0 : _a.build) || "";
+  const buildScript = pkgJson.scripts?.build || "";
   const isRecursive = buildScript.includes("onex build") || buildScript.includes("onex-cli build");
   exports.logger.startSpinner(
     options.watch ? "Building (watch mode)..." : "Building..."
@@ -2363,7 +2518,6 @@ async function findCompiledThemeDir(themeId, version) {
   return null;
 }
 async function readManifest() {
-  var _a;
   const manifestTsPath = path__default.default.resolve(process.cwd(), "manifest.ts");
   if (await fs__default.default.pathExists(manifestTsPath)) {
     try {
@@ -2377,7 +2531,7 @@ async function readManifest() {
   if (await fs__default.default.pathExists(packageJsonPath)) {
     const pkg = await fs__default.default.readJson(packageJsonPath);
     return {
-      themeId: ((_a = pkg.name) == null ? void 0 : _a.replace("@onex-themes/", "")) || "unknown",
+      themeId: pkg.name?.replace("@onex-themes/", "") || "unknown",
       version: pkg.version || "1.0.0"
     };
   }
@@ -2621,39 +2775,15 @@ function getBucketName2(env) {
 }
 async function streamToString(stream) {
   const chunks = [];
-  try {
-    for (var iter = __forAwait(stream), more, temp, error; more = !(temp = await iter.next()).done; more = false) {
-      const chunk = temp.value;
-      chunks.push(Buffer.from(chunk));
-    }
-  } catch (temp) {
-    error = [temp];
-  } finally {
-    try {
-      more && (temp = iter.return) && await temp.call(iter);
-    } finally {
-      if (error)
-        throw error[0];
-    }
+  for await (const chunk of stream) {
+    chunks.push(Buffer.from(chunk));
   }
   return Buffer.concat(chunks).toString("utf-8");
 }
 async function streamToBuffer(stream) {
   const chunks = [];
-  try {
-    for (var iter = __forAwait(stream), more, temp, error; more = !(temp = await iter.next()).done; more = false) {
-      const chunk = temp.value;
-      chunks.push(Buffer.from(chunk));
-    }
-  } catch (temp) {
-    error = [temp];
-  } finally {
-    try {
-      more && (temp = iter.return) && await temp.call(iter);
-    } finally {
-      if (error)
-        throw error[0];
-    }
+  for await (const chunk of stream) {
+    chunks.push(Buffer.from(chunk));
   }
   return Buffer.concat(chunks);
 }
@@ -2675,8 +2805,7 @@ async function resolveLatestVersion(s3Client, bucket, themeId) {
   }
 }
 async function createCompatibilityFiles(outputDir, manifest) {
-  var _a;
-  const entryFile = ((_a = manifest.output) == null ? void 0 : _a.entry) || "bundle-entry.js";
+  const entryFile = manifest.output?.entry || "bundle-entry.js";
   if (entryFile !== "bundle-entry.js" && entryFile.startsWith("bundle-entry-")) {
     const hashedPath = path__default.default.join(outputDir, entryFile);
     const stablePath = path__default.default.join(outputDir, "bundle-entry.js");
@@ -2847,39 +2976,15 @@ function getBucketName3(env) {
 }
 async function streamToString2(stream) {
   const chunks = [];
-  try {
-    for (var iter = __forAwait(stream), more, temp, error; more = !(temp = await iter.next()).done; more = false) {
-      const chunk = temp.value;
-      chunks.push(Buffer.from(chunk));
-    }
-  } catch (temp) {
-    error = [temp];
-  } finally {
-    try {
-      more && (temp = iter.return) && await temp.call(iter);
-    } finally {
-      if (error)
-        throw error[0];
-    }
+  for await (const chunk of stream) {
+    chunks.push(Buffer.from(chunk));
   }
   return Buffer.concat(chunks).toString("utf-8");
 }
 async function streamToBuffer2(stream) {
   const chunks = [];
-  try {
-    for (var iter = __forAwait(stream), more, temp, error; more = !(temp = await iter.next()).done; more = false) {
-      const chunk = temp.value;
-      chunks.push(Buffer.from(chunk));
-    }
-  } catch (temp) {
-    error = [temp];
-  } finally {
-    try {
-      more && (temp = iter.return) && await temp.call(iter);
-    } finally {
-      if (error)
-        throw error[0];
-    }
+  for await (const chunk of stream) {
+    chunks.push(Buffer.from(chunk));
   }
   return Buffer.concat(chunks);
 }
@@ -3055,6 +3160,19 @@ async function cloneCommand(themeName, options) {
     spinner.succeed(
       `Renamed theme: ${chalk4__default.default.gray(themeName)} \u2192 ${chalk4__default.default.cyan(newName)}`
     );
+    const envExamplePath = path__default.default.join(outputDir, ".env.example");
+    if (!await fs__default.default.pathExists(envExamplePath)) {
+      await fs__default.default.writeFile(
+        envExamplePath,
+        [
+          "# API Configuration (enables real data in preview)",
+          "# Get your Company ID from the OneX dashboard",
+          "NEXT_PUBLIC_API_URL=https://api-dev.onexeos.com",
+          "NEXT_PUBLIC_COMPANY_ID=",
+          ""
+        ].join("\n")
+      );
+    }
     if (options.install !== false) {
       const hasPkgJson = await fs__default.default.pathExists(
         path__default.default.join(outputDir, "package.json")
@@ -3085,6 +3203,7 @@ async function cloneCommand(themeName, options) {
     console.log();
     console.log(chalk4__default.default.cyan("Next steps:"));
     console.log(chalk4__default.default.gray(`   cd ${path__default.default.relative(process.cwd(), outputDir)}`));
+    console.log(chalk4__default.default.gray("   cp .env.example .env  # then add your Company ID"));
     if (options.install === false) {
       console.log(chalk4__default.default.gray("   pnpm install"));
     }