@fireberry/cli 0.0.5-beta.7 → 0.0.5-beta.8

package/dist/api/axios.js

@@ -2,7 +2,6 @@ import "../config/env.js";
 import axios from "axios";
 import { getApiToken } from "./config.js";
 import packageJson from "../../package.json" with { type: "json" };
-// Determine default API URL based on version
 const getDefaultApiUrl = () => {
     if (process.env.FIREBERRY_API_URL) {
         return process.env.FIREBERRY_API_URL;
@@ -26,7 +25,7 @@ fbApi.interceptors.request.use(async (config) => {
     try {
         const token = await getApiToken();
         if (token) {
-            config.headers.tokenid = token;
+            config.headers.tokenId = token;
         }
     }
     catch (error) {

package/dist/api/requests.d.ts

@@ -1,3 +1,4 @@
 import "../config/env.js";
-import type { CreateAppRequest } from "./types.js";
+import type { CreateAppRequest, ZippedComponent } from "./types.js";
 export declare const createApp: (data: CreateAppRequest) => Promise<void>;
+export declare const pushComponents: (appId: string, components: ZippedComponent[]) => Promise<void>;

package/dist/api/requests.js

@@ -9,3 +9,12 @@ export const createApp = async (data) => {
         throw new Error(error instanceof Error ? error.message : "Unknown error");
     }
 };
+export const pushComponents = async (appId, components) => {
+    const url = `/services/developer/push`;
+    try {
+        await api.post(url, { appId, components });
+    }
+    catch (error) {
+        throw new Error(error instanceof Error ? error.message : "Unknown error");
+    }
+};

package/dist/api/types.d.ts

@@ -11,3 +11,25 @@ export interface ApiResponse<T> {
     success: boolean;
     message?: string;
 }
+interface ManifestApp {
+    id: string;
+    name: string;
+    description?: string;
+}
+export interface ManifestComponent {
+    type: string;
+    title: string;
+    key: string;
+    path: string;
+    settings?: Record<string, unknown>;
+}
+export interface Manifest {
+    app: ManifestApp;
+    components?: ManifestComponent[];
+}
+export interface ZippedComponent {
+    title: string;
+    key: string;
+    build: Buffer;
+}
+export {};

package/dist/bin/fireberry.js

@@ -4,6 +4,7 @@ import chalk from "chalk";
 import { runInit } from "../commands/init.js";
 import { runCreate } from "../commands/create.js";
 import packageJson from "../../package.json" with { type: "json" };
+import { runPush } from "../commands/push.js";
 const program = new Command();
 program
     .name("fireberry")
@@ -24,6 +25,12 @@ program
     const name = nameArgs ? nameArgs.join("-") : undefined;
     await runCreate({ name });
 });
+program
+    .command("push")
+    .description("Push app to Fireberry")
+    .action(async () => {
+    await runPush();
+});
 program.parseAsync(process.argv).catch((err) => {
     const errorMessage = err instanceof Error
         ? err.message

package/dist/commands/init.js

@@ -5,7 +5,7 @@ import fs from "fs-extra";
 import ora from "ora";
 import chalk from "chalk";
 export async function runInit({ tokenid } = {}) {
-    let token = tokenid;
+    let token = tokenid?.trim();
     if (!token) {
         const answers = await inquirer.prompt([
             {

package/dist/commands/push.d.ts

@@ -0,0 +1 @@
+export declare function runPush(): Promise<void>;

package/dist/commands/push.js

@@ -0,0 +1,32 @@
+import ora from "ora";
+import chalk from "chalk";
+import { getManifest, handleComponents } from "../utils/components.utils.js";
+import { pushComponents } from "../api/requests.js";
+export async function runPush() {
+    const spinner = ora("Checking manifest...").start();
+    try {
+        const manifest = await getManifest();
+        spinner.succeed("Manifest loaded successfully");
+        spinner.start("Validating and zipping components...");
+        const zippedComponents = await handleComponents(manifest);
+        const count = zippedComponents.length;
+        if (count > 0) {
+            spinner.succeed(`${count} component${count > 1 ? "s" : ""} validated and zipped`);
+            console.log(chalk.cyan("\nComponents ready to push:"));
+            zippedComponents.forEach((comp, idx) => {
+                const sizeKB = (comp.build.length / 1024).toFixed(2);
+                console.log(chalk.gray(`  ${idx + 1}. ${comp.title} (${comp.key}) - ${sizeKB} KB`));
+            });
+            spinner.start("Uploading to Fireberry...");
+            await pushComponents(manifest.app.id, zippedComponents);
+            spinner.succeed("Components pushed successfully");
+        }
+        else {
+            spinner.succeed("No components to push");
+        }
+    }
+    catch (error) {
+        spinner.fail("Push failed");
+        throw error;
+    }
+}

package/dist/utils/components.utils.d.ts

@@ -0,0 +1,5 @@
+import { Manifest, ManifestComponent, ZippedComponent } from "../api/types.js";
+export declare const getManifest: () => Promise<Manifest>;
+export declare const validateComponentBuild: (componentPath: string, comp: ManifestComponent) => Promise<void>;
+export declare const zipComponentBuild: (componentPath: string, title: string) => Promise<Buffer>;
+export declare const handleComponents: (manifest: Manifest) => Promise<ZippedComponent[]>;

package/dist/utils/components.utils.js

@@ -0,0 +1,88 @@
+import path from "node:path";
+import fs from "fs-extra";
+import yaml from "js-yaml";
+import chalk from "chalk";
+import * as tar from "tar";
+import os from "node:os";
+export const getManifest = async () => {
+    const manifestPath = path.join(process.cwd(), "manifest.yml");
+    if (!(await fs.pathExists(manifestPath))) {
+        throw new Error(`No manifest.yml found at ${chalk.yellow(process.cwd())}.\n` +
+            `Please run this command from your Fireberry app directory.`);
+    }
+    const manifestContent = await fs.readFile(manifestPath, "utf-8");
+    const manifest = yaml.load(manifestContent);
+    if (!manifest || !manifest.app) {
+        throw new Error("manifest.yml must contain an 'app' section");
+    }
+    if (!manifest.app.id || !manifest.app.name) {
+        throw new Error("manifest.yml app section must contain 'id' and 'name' fields");
+    }
+    return manifest;
+};
+export const validateComponentBuild = async (componentPath, comp) => {
+    if (!(await fs.pathExists(componentPath))) {
+        throw new Error(`Component "${comp.title}" path does not exist: ${chalk.yellow(componentPath)}\n` + `Make sure the path in manifest.yml is correct.`);
+    }
+    const stats = await fs.stat(componentPath);
+    if (stats.isDirectory()) {
+        const files = await fs.readdir(componentPath);
+        if (files.length === 0) {
+            throw new Error(`Component <${comp.key}> at: /${comp.path} not found`);
+        }
+    }
+};
+export const zipComponentBuild = async (componentPath, title) => {
+    const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "fireberry-"));
+    const tarballPath = path.join(tmpDir, `${title}.tar.gz`);
+    try {
+        const stats = await fs.stat(componentPath);
+        if (stats.isDirectory()) {
+            await tar.create({
+                gzip: true,
+                file: tarballPath,
+                cwd: componentPath,
+            }, ["."]);
+        }
+        else {
+            const tempBuildDir = path.join(tmpDir, "build");
+            await fs.ensureDir(tempBuildDir);
+            const fileName = path.basename(componentPath);
+            await fs.copy(componentPath, path.join(tempBuildDir, fileName));
+            await tar.create({
+                gzip: true,
+                file: tarballPath,
+                cwd: tempBuildDir,
+            }, ["."]);
+        }
+        const buffer = await fs.readFile(tarballPath);
+        await fs.remove(tmpDir);
+        return buffer;
+    }
+    catch (error) {
+        await fs.remove(tmpDir);
+        throw error;
+    }
+};
+export const handleComponents = async (manifest) => {
+    const components = manifest.components;
+    if (!components || components.length === 0) {
+        return [];
+    }
+    const keys = components.map((comp) => comp.key);
+    if (new Set(keys).size !== keys.length) {
+        throw new Error("All component keys must be unique");
+    }
+    const zippedComponents = [];
+    for (const comp of components) {
+        const componentPath = path.join(process.cwd(), comp.path);
+        await validateComponentBuild(componentPath, comp);
+        const buildBuffer = await zipComponentBuild(componentPath, comp.title);
+        zippedComponents.push({
+            title: comp.title,
+            key: comp.key,
+            build: buildBuffer,
+        });
+    }
+    return zippedComponents;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fireberry/cli",
-  "version": "0.0.5-beta.7",
+  "version": "0.0.5-beta.8",
   "description": "Fireberry CLI tool",
   "type": "module",
   "author": "",
@@ -14,6 +14,7 @@
   "scripts": {
     "start": "node dist/bin/fireberry.js",
     "build": "tsc",
+    "build:dev": "npm run clean && tsc && npm link && chmod +x dist/bin/fireberry.js",
     "dev": "tsc --watch",
     "clean": "rm -rf dist",
     "prebuild": "npm run clean",
@@ -47,12 +48,15 @@
     "env-paths": "^3.0.0",
     "fs-extra": "^11.2.0",
     "inquirer": "^9.2.12",
+    "js-yaml": "^4.1.0",
     "ora": "^8.0.1",
+    "tar": "^7.5.1",
     "uuid": "^13.0.0"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
     "@types/inquirer": "^9.0.7",
+    "@types/js-yaml": "^4.0.9",
     "@types/node": "^20.11.24",
     "@types/uuid": "^10.0.0",
     "typescript": "^5.3.3"

package/src/api/axios.ts

@@ -3,7 +3,6 @@ import axios, { AxiosInstance, AxiosRequestConfig } from "axios";
 import { getApiToken } from "./config.js";
 import packageJson from "../../package.json" with { type: "json" };
 
-// Determine default API URL based on version
 const getDefaultApiUrl = () => {
   if (process.env.FIREBERRY_API_URL) {
     return process.env.FIREBERRY_API_URL;
@@ -34,7 +33,7 @@ fbApi.interceptors.request.use(
     try {
       const token = await getApiToken();
       if (token) {
-        config.headers.tokenid = token;
+        config.headers.tokenId = token;
       }
     } catch (error) {
       console.warn("Failed to get API token:", error);

package/src/api/requests.ts

@@ -1,11 +1,23 @@
 import "../config/env.js";
 import { api } from "./axios.js";
-import type { CreateAppRequest } from "./types.js";
+import type { CreateAppRequest, ZippedComponent } from "./types.js";
 
 export const createApp = async (data: CreateAppRequest): Promise<void> => {
   const url = "/services/developer/create";
   try {
-    await api.post(url, data);
+    await api.post<void>(url, data);
+  } catch (error) {
+    throw new Error(error instanceof Error ? error.message : "Unknown error");
+  }
+};
+
+export const pushComponents = async (
+  appId: string,
+  components: ZippedComponent[]
+): Promise<void> => {
+  const url = `/services/developer/push`;
+  try {
+    await api.post<void>(url, { appId, components });
   } catch (error) {
     throw new Error(error instanceof Error ? error.message : "Unknown error");
   }

package/src/api/types.ts

@@ -13,3 +13,28 @@ export interface ApiResponse<T> {
   success: boolean;
   message?: string;
 }
+
+interface ManifestApp {
+  id: string;
+  name: string;
+  description?: string;
+}
+
+export interface ManifestComponent {
+  type: string;
+  title: string;
+  key: string;
+  path: string;
+  settings?: Record<string, unknown>;
+}
+
+export interface Manifest {
+  app: ManifestApp;
+  components?: ManifestComponent[];
+}
+
+export interface ZippedComponent {
+  title: string;
+  key: string;
+  build: Buffer;
+}

package/src/bin/fireberry.ts

@@ -4,6 +4,7 @@ import chalk from "chalk";
 import { runInit } from "../commands/init.js";
 import { runCreate } from "../commands/create.js";
 import packageJson from "../../package.json" with { type: "json" };
+import { runPush } from "../commands/push.js";
 
 const program = new Command();
 
@@ -29,6 +30,13 @@ program
         await runCreate({ name });
   });
 
+program
+  .command("push")
+  .description("Push app to Fireberry")
+  .action(async () => {
+    await runPush();
+  });
+
 program.parseAsync(process.argv).catch((err: unknown) => {
   const errorMessage = err instanceof Error 
     ? err.message

package/src/commands/init.ts

@@ -15,7 +15,7 @@ export interface Config {
 }
 
 export async function runInit({ tokenid }: InitOptions = {}): Promise<void> {
-  let token = tokenid;
+  let token = tokenid?.trim();
   if (!token) {
     const answers = await inquirer.prompt([
       {

package/src/commands/push.ts

@@ -0,0 +1,42 @@
+import ora from "ora";
+import chalk from "chalk";
+import { getManifest, handleComponents } from "../utils/components.utils.js";
+import { pushComponents } from "../api/requests.js";
+
+export async function runPush(): Promise<void> {
+  const spinner = ora("Checking manifest...").start();
+
+  try {
+    const manifest = await getManifest();
+    spinner.succeed("Manifest loaded successfully");
+
+    spinner.start("Validating and zipping components...");
+
+    const zippedComponents = await handleComponents(manifest);
+
+    const count = zippedComponents.length;
+    if (count > 0) {
+      spinner.succeed(
+        `${count} component${count > 1 ? "s" : ""} validated and zipped`
+      );
+
+      console.log(chalk.cyan("\nComponents ready to push:"));
+      zippedComponents.forEach((comp, idx) => {
+        const sizeKB = (comp.build.length / 1024).toFixed(2);
+        console.log(
+          chalk.gray(`  ${idx + 1}. ${comp.title} (${comp.key}) - ${sizeKB} KB`)
+        );
+      });
+
+      spinner.start("Uploading to Fireberry...");
+
+      await pushComponents(manifest.app.id, zippedComponents);
+      spinner.succeed("Components pushed successfully");
+    } else {
+      spinner.succeed("No components to push");
+    }
+  } catch (error) {
+    spinner.fail("Push failed");
+    throw error;
+  }
+}

package/src/utils/components.utils.ts

@@ -0,0 +1,135 @@
+import path from "node:path";
+import fs from "fs-extra";
+import yaml from "js-yaml";
+import chalk from "chalk";
+import * as tar from "tar";
+import os from "node:os";
+import { Manifest, ManifestComponent, ZippedComponent } from "../api/types.js";
+
+export const getManifest = async (): Promise<Manifest> => {
+  const manifestPath = path.join(process.cwd(), "manifest.yml");
+
+  if (!(await fs.pathExists(manifestPath))) {
+    throw new Error(
+      `No manifest.yml found at ${chalk.yellow(process.cwd())}.\n` +
+        `Please run this command from your Fireberry app directory.`
+    );
+  }
+
+  const manifestContent = await fs.readFile(manifestPath, "utf-8");
+
+  const manifest = yaml.load(manifestContent) as Manifest;
+
+  if (!manifest || !manifest.app) {
+    throw new Error("manifest.yml must contain an 'app' section");
+  }
+
+  if (!manifest.app.id || !manifest.app.name) {
+    throw new Error(
+      "manifest.yml app section must contain 'id' and 'name' fields"
+    );
+  }
+
+  return manifest;
+};
+
+export const validateComponentBuild = async (
+  componentPath: string,
+  comp: ManifestComponent
+) => {
+  if (!(await fs.pathExists(componentPath))) {
+    throw new Error(
+      `Component "${comp.title}" path does not exist: ${chalk.yellow(
+        componentPath
+      )}\n` + `Make sure the path in manifest.yml is correct.`
+    );
+  }
+
+  const stats = await fs.stat(componentPath);
+
+  if (stats.isDirectory()) {
+    const files = await fs.readdir(componentPath);
+    if (files.length === 0) {
+      throw new Error(`Component <${comp.key}> at: /${comp.path} not found`);
+    }
+  }
+};
+
+export const zipComponentBuild = async (
+  componentPath: string,
+  title: string
+): Promise<Buffer> => {
+  const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "fireberry-"));
+  const tarballPath = path.join(tmpDir, `${title}.tar.gz`);
+
+  try {
+    const stats = await fs.stat(componentPath);
+
+    if (stats.isDirectory()) {
+      await tar.create(
+        {
+          gzip: true,
+          file: tarballPath,
+          cwd: componentPath,
+        },
+        ["."]
+      );
+    } else {
+      const tempBuildDir = path.join(tmpDir, "build");
+      await fs.ensureDir(tempBuildDir);
+
+      const fileName = path.basename(componentPath);
+      await fs.copy(componentPath, path.join(tempBuildDir, fileName));
+
+      await tar.create(
+        {
+          gzip: true,
+          file: tarballPath,
+          cwd: tempBuildDir,
+        },
+        ["."]
+      );
+    }
+
+    const buffer = await fs.readFile(tarballPath);
+
+    await fs.remove(tmpDir);
+
+    return buffer;
+  } catch (error) {
+    await fs.remove(tmpDir);
+    throw error;
+  }
+};
+
+export const handleComponents = async (
+  manifest: Manifest
+): Promise<ZippedComponent[]> => {
+  const components = manifest.components;
+  if (!components || components.length === 0) {
+    return [];
+  }
+
+  const keys = components.map((comp) => comp.key);
+  if (new Set(keys).size !== keys.length) {
+    throw new Error("All component keys must be unique");
+  }
+
+  const zippedComponents: ZippedComponent[] = [];
+
+  for (const comp of components) {
+    const componentPath = path.join(process.cwd(), comp.path);
+
+    await validateComponentBuild(componentPath, comp);
+
+    const buildBuffer = await zipComponentBuild(componentPath, comp.title);
+
+    zippedComponents.push({
+      title: comp.title,
+      key: comp.key,
+      build: buildBuffer,
+    });
+  }
+
+  return zippedComponents;
+};