@griffin-app/griffin-cli 1.0.2 → 1.0.4

package/dist/core/discovery.d.ts

@@ -1,7 +1,6 @@
-import type { TestPlanV1 } from "@griffin-app/griffin-ts/types";
-export type RawTestPlan = Omit<TestPlanV1, "id" | "environment" | "project">;
+import type { PlanDSL } from "@griffin-app/griffin-ts/types";
 export interface DiscoveredPlan {
-    plan: RawTestPlan;
+    plan: PlanDSL;
     filePath: string;
     exportName: string;
 }

package/dist/core/discovery.js

@@ -1,14 +1,8 @@
 import { glob } from "glob";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
-import { TestPlanV1Schema } from "@griffin-app/griffin-ts/schema";
+import { PlanDSLSchema } from "@griffin-app/griffin-ts/schema";
 import { Value } from "typebox/value";
-import { Type } from "typebox";
-const RawTestPlanSchema = Type.Omit(TestPlanV1Schema, [
-    "id",
-    "environment",
-    "project",
-]);
 /**
  * Discover and load test plan files from the filesystem
  */
@@ -21,7 +15,6 @@ export async function discoverPlans(pattern, ignore) {
         absolute: true,
         cwd: process.cwd(),
     });
-    console.log(`Found ${files.length} test file(s)`);
     // Load each file
     for (const filePath of files) {
         try {
@@ -38,7 +31,7 @@ export async function discoverPlans(pattern, ignore) {
     return { plans, errors };
 }
 function isPlan(value) {
-    return Value.Check(RawTestPlanSchema, value);
+    return Value.Check(PlanDSLSchema, value);
 }
 /**
  * Load plans from a single file
@@ -60,7 +53,7 @@ async function loadPlansFromFile(filePath) {
                 });
             }
             else {
-                const errors = Value.Errors(RawTestPlanSchema, module.default);
+                const errors = Value.Errors(PlanDSLSchema, module.default);
                 throw new Error(`Default export is not a valid TestPlan. Got: ${JSON.stringify(errors, null, 2)}`);
             }
         }

package/dist/core/plan-diff.d.ts

@@ -1,5 +1,5 @@
-import type { RawTestPlan } from "./discovery.js";
-import type { TestPlanV1 } from "@griffin-app/griffin-ts/types";
+import type { PlanDSL } from "@griffin-app/griffin-ts/types";
+import { PlanV1 } from "@griffin-app/griffin-hub-sdk";
 import { NodeType } from "@griffin-app/griffin-ts/schema";
 /**
  * Represents a change to a single field
@@ -15,7 +15,7 @@ export interface FieldChange {
 export interface NodeChange {
     type: "add" | "remove" | "modify";
     nodeId: string;
-    nodeType: NodeType;
+    nodeType: NodeType.ASSERTION | NodeType.ENDPOINT | NodeType.WAIT;
     summary: string;
     fieldChanges: FieldChange[];
 }
@@ -39,4 +39,4 @@ export interface PlanChanges {
 /**
  * Compare two test plans and return granular changes
  */
-export declare function comparePlans(local: RawTestPlan, remote: TestPlanV1): PlanChanges;
+export declare function comparePlans(local: PlanDSL, remote: PlanV1): PlanChanges;

package/dist/core/plan-diff.js

@@ -1,4 +1,5 @@
 import objectHash from "object-hash";
+import { NodeType } from "@griffin-app/griffin-ts/schema";
 /**
  * Compare two test plans and return granular changes
  */
@@ -116,13 +117,13 @@ function compareNodeFields(local, remote) {
         return changes;
     }
     switch (local.type) {
-        case "ENDPOINT":
+        case NodeType.ENDPOINT:
             compareEndpointFields(local, remote, changes);
             break;
-        case "WAIT":
+        case NodeType.WAIT:
             compareWaitFields(local, remote, changes);
             break;
-        case "ASSERTION":
+        case NodeType.ASSERTION:
             compareAssertionFields(local, remote, changes);
             break;
     }

package/dist/core/sdk.d.ts

@@ -1,16 +1,8 @@
-import { PlanApi, RunsApi } from "@griffin-app/griffin-hub-sdk";
-import type { TestPlanV1 } from "@griffin-app/griffin-ts/types";
+import { GriffinHubSdk } from "@griffin-app/griffin-hub-sdk";
 /**
  * Create configured SDK API instances
  */
-export declare function createSdkClients(config: {
+export declare function createSdk(config: {
     baseUrl: string;
     apiToken?: string;
-}): {
-    planApi: PlanApi;
-    runsApi: RunsApi;
-};
-/**
- * Inject projectId into a plan payload before sending to runner
- */
-export declare function injectProjectId(plan: Omit<TestPlanV1, "project">, projectId: string): TestPlanV1;
+}): GriffinHubSdk;

package/dist/core/sdk.js

@@ -1,23 +1,19 @@
-import { PlanApi, RunsApi, Configuration } from "@griffin-app/griffin-hub-sdk";
+import { GriffinHubSdk } from "@griffin-app/griffin-hub-sdk";
+import { createClient } from "@griffin-app/griffin-hub-sdk/client";
 /**
  * Create configured SDK API instances
  */
-export function createSdkClients(config) {
-    const configuration = new Configuration({
-        basePath: config.baseUrl.replace(/\/$/, ""), // Remove trailing slash
-        accessToken: config.apiToken,
+export function createSdk(config) {
+    const client = createClient({
+        baseURL: config.baseUrl,
     });
-    return {
-        planApi: new PlanApi(configuration),
-        runsApi: new RunsApi(configuration),
-    };
-}
-/**
- * Inject projectId into a plan payload before sending to runner
- */
-export function injectProjectId(plan, projectId) {
-    return {
-        ...plan,
-        project: projectId,
-    };
+    client.setConfig({
+        auth() {
+            return config.apiToken;
+        },
+    });
+    const sdk = new GriffinHubSdk({
+        client: client,
+    });
+    return sdk;
 }

package/dist/core/variables.js

@@ -46,6 +46,17 @@ function isVariableRef(value) {
     return (typeof varData.key === "string" &&
         (varData.template === undefined || typeof varData.template === "string"));
 }
+function isStringLiteral(value) {
+    if (typeof value !== "object" || value === null) {
+        return false;
+    }
+    const obj = value;
+    if (!("$literal" in obj) ||
+        typeof obj.$literal !== "string") {
+        return false;
+    }
+    return true;
+}
 /**
  * Resolve a single variable reference to its string value.
  *
@@ -83,6 +94,9 @@ export function resolveVariablesInPlan(obj, variables) {
     if (isVariableRef(obj)) {
         return resolveVariable(obj, variables);
     }
+    if (isStringLiteral(obj)) {
+        return obj.$literal;
+    }
     // Recursively process arrays
     if (Array.isArray(obj)) {
         return obj.map((item) => resolveVariablesInPlan(item, variables));

package/dist/index.d.ts

@@ -7,7 +7,7 @@ export { getStateDirPath, getStateFilePath, stateExists, loadState, saveState, i
 export { discoverPlans, formatDiscoveryErrors } from "./core/discovery.js";
 export { computeDiff, formatDiff, formatDiffJson } from "./core/diff.js";
 export { applyDiff, formatApplyResult } from "./core/apply.js";
-export { createSdkClients, injectProjectId } from "./core/sdk.js";
+export { createSdk } from "./core/sdk.js";
 export { detectProjectId } from "./core/project.js";
 export { executeInit } from "./commands/init.js";
 export { executeValidate } from "./commands/validate.js";

package/dist/index.js

@@ -4,7 +4,7 @@ export { getStateDirPath, getStateFilePath, stateExists, loadState, saveState, i
 export { discoverPlans, formatDiscoveryErrors } from "./core/discovery.js";
 export { computeDiff, formatDiff, formatDiffJson } from "./core/diff.js";
 export { applyDiff, formatApplyResult } from "./core/apply.js";
-export { createSdkClients, injectProjectId } from "./core/sdk.js";
+export { createSdk } from "./core/sdk.js";
 export { detectProjectId } from "./core/project.js";
 // Export command executors (for programmatic use)
 export { executeInit } from "./commands/init.js";

package/dist/resolve.d.ts

@@ -0,0 +1,3 @@
+import { PlanV1 } from "@griffin-app/griffin-hub-sdk";
+import { PlanDSL } from "@griffin-app/griffin-ts/types";
+export declare function resolvePlan(plan: PlanDSL, projectId: string, envName: string, variables: Record<string, string>): Omit<PlanV1, "id">;

package/dist/resolve.js

@@ -0,0 +1,9 @@
+import { resolveVariablesInPlan } from "./core/variables.js";
+export function resolvePlan(plan, projectId, envName, variables) {
+    const resolvedPlan = resolveVariablesInPlan(plan, variables);
+    return {
+        ...resolvedPlan,
+        project: projectId,
+        environment: envName,
+    };
+}

package/dist/schemas/state.js

@@ -6,9 +6,7 @@ import { Type } from "typebox";
  * Note: The hub is now the source of truth for plans.
  * This file only stores configuration (project, environments, runner connection).
  */
-export const EnvironmentConfigSchema = Type.Object({
-// Empty for now - may be used for environment-specific config in the future
-});
+export const EnvironmentConfigSchema = Type.Object({});
 export const RunnerConfigSchema = Type.Object({
     baseUrl: Type.String(),
     apiToken: Type.Optional(Type.String()),

package/dist/test-runner.js

@@ -1,16 +1,19 @@
 import "tsx";
 import { Value } from "typebox/value";
 import { executePlanV1, AxiosAdapter, EnvSecretProvider, SecretProviderRegistry, } from "@griffin-app/griffin-plan-executor";
-import { TestPlanV1Schema } from "@griffin-app/griffin-ts/schema";
-import { Type } from "typebox";
+import { PlanDSLSchema } from "@griffin-app/griffin-ts/schema";
 import { randomUUID } from "crypto";
-import { loadVariables, resolveVariablesInPlan } from "./core/variables.js";
+import { loadVariables } from "./core/variables.js";
 import { getProjectId } from "./core/state.js";
-const RawTestSchema = Type.Omit(TestPlanV1Schema, [
-    "id",
-    "environment",
-    "project",
-]);
+import { resolvePlan } from "./resolve.js";
+import { terminal } from "./utils/terminal.js";
+function validateDsl(plan) {
+    const errors = Value.Errors(PlanDSLSchema, plan);
+    if (errors.length > 0) {
+        throw new Error(`Invalid plan: ${JSON.stringify([...errors], null, 2)}`);
+    }
+    return plan;
+}
 /**
  * Runs a TypeScript test file and executes the resulting JSON plan.
  */
@@ -18,31 +21,24 @@ export async function runTestFile(filePath, envName) {
     const variables = await loadVariables(envName);
     const projectId = await getProjectId();
     const defaultExport = await import(filePath);
-    const rawPlan = defaultExport.default;
-    console.log(`Project ID: ${projectId}`);
-    // Resolve all variable references in the plan
-    const resolvedPlan = resolveVariablesInPlan(rawPlan, variables);
+    const rawPlan = validateDsl(defaultExport.default);
+    terminal.dim(`Project ID: ${projectId}`);
+    const resolvedPlan = resolvePlan(rawPlan, projectId, envName, variables);
     const secretRegistry = new SecretProviderRegistry();
     secretRegistry.register(new EnvSecretProvider());
     try {
-        const parsedPlan = Value.Parse(RawTestSchema, resolvedPlan);
-        const syntheticPlan = {
-            ...parsedPlan,
+        const result = await executePlanV1({
+            ...resolvedPlan,
             id: randomUUID(),
-            project: projectId,
-            environment: envName,
-        };
-        const result = await executePlanV1(syntheticPlan, "default-org", {
+        }, "default-org", {
             mode: "local",
             httpClient: new AxiosAdapter(),
             secretRegistry: secretRegistry,
         });
-        console.log(JSON.stringify(result, null, 2));
         return result;
     }
     catch (error) {
-        const errors = Value.Errors(RawTestSchema, resolvedPlan);
-        throw new Error(`Invalid plan: ${JSON.stringify([...errors], null, 2)}: ${error}`);
+        throw new Error(`Error executing plan: ${error instanceof Error ? error.message : String(error)}`);
     }
 }
 //function findWorkspaceRoot(): string {

package/dist/utils/console.d.ts

@@ -0,0 +1,5 @@
+/**
+ * @deprecated Use terminal from "./terminal.js" instead
+ * This file is kept for backwards compatibility
+ */
+export { terminal as console, colors } from "./terminal.js";

package/dist/utils/console.js

@@ -0,0 +1,5 @@
+/**
+ * @deprecated Use terminal from "./terminal.js" instead
+ * This file is kept for backwards compatibility
+ */
+export { terminal as console, colors } from "./terminal.js";

package/dist/utils/terminal.d.ts

@@ -0,0 +1,100 @@
+import { Ora } from "ora";
+import Table from "cli-table3";
+/**
+ * Color utilities
+ */
+export declare const colors: {
+    readonly cyan: import("picocolors/types").Formatter;
+    readonly green: import("picocolors/types").Formatter;
+    readonly yellow: import("picocolors/types").Formatter;
+    readonly red: import("picocolors/types").Formatter;
+    readonly blue: import("picocolors/types").Formatter;
+    readonly magenta: import("picocolors/types").Formatter;
+    readonly gray: import("picocolors/types").Formatter;
+    readonly dim: import("picocolors/types").Formatter;
+    readonly bold: import("picocolors/types").Formatter;
+    readonly underline: import("picocolors/types").Formatter;
+};
+/**
+ * Unified Terminal interface for all CLI interactions
+ */
+export declare class Terminal {
+    /**
+     * Log info message with icon
+     */
+    info(message: string): void;
+    /**
+     * Log success message with icon
+     */
+    success(message: string): void;
+    /**
+     * Log warning message with icon
+     */
+    warn(message: string): void;
+    /**
+     * Log error message with icon to stderr
+     */
+    error(message: string): void;
+    /**
+     * Log plain message (no styling)
+     */
+    log(message: string): void;
+    /**
+     * Log dimmed/secondary message
+     */
+    dim(message: string): void;
+    /**
+     * Log a blank line
+     */
+    blank(): void;
+    /**
+     * Create a spinner for async operations
+     */
+    spinner(text: string): Ora;
+    /**
+     * Ask for confirmation (yes/no)
+     */
+    confirm(message: string, initial?: boolean): Promise<boolean>;
+    /**
+     * Prompt user to select from a list
+     */
+    select<T extends string>(message: string, choices: T[]): Promise<T>;
+    /**
+     * Prompt user for text input
+     */
+    input(message: string, initial?: string): Promise<string>;
+    /**
+     * Create a formatted table
+     */
+    table(options?: {
+        head?: string[];
+        colWidths?: number[];
+    }): Table.Table;
+    /**
+     * Print a formatted table
+     */
+    printTable(data: Array<Record<string, any>>, columns?: string[]): void;
+    /**
+     * Access to color functions
+     */
+    get colors(): {
+        readonly cyan: import("picocolors/types").Formatter;
+        readonly green: import("picocolors/types").Formatter;
+        readonly yellow: import("picocolors/types").Formatter;
+        readonly red: import("picocolors/types").Formatter;
+        readonly blue: import("picocolors/types").Formatter;
+        readonly magenta: import("picocolors/types").Formatter;
+        readonly gray: import("picocolors/types").Formatter;
+        readonly dim: import("picocolors/types").Formatter;
+        readonly bold: import("picocolors/types").Formatter;
+        readonly underline: import("picocolors/types").Formatter;
+    };
+    /**
+     * Exit process with error code
+     */
+    exit(code: number): never;
+}
+/**
+ * Default terminal instance
+ */
+export declare const terminal: Terminal;

package/dist/utils/terminal.js

@@ -0,0 +1,148 @@
+import pc from "picocolors";
+import ora from "ora";
+import enquirer from "enquirer";
+import Table from "cli-table3";
+/**
+ * Color utilities
+ */
+export const colors = {
+    cyan: pc.cyan,
+    green: pc.green,
+    yellow: pc.yellow,
+    red: pc.red,
+    blue: pc.blue,
+    magenta: pc.magenta,
+    gray: pc.gray,
+    dim: pc.dim,
+    bold: pc.bold,
+    underline: pc.underline,
+};
+/**
+ * Unified Terminal interface for all CLI interactions
+ */
+export class Terminal {
+    /**
+     * Log info message with icon
+     */
+    info(message) {
+        console.log(pc.blue("ℹ"), message);
+    }
+    /**
+     * Log success message with icon
+     */
+    success(message) {
+        console.log(pc.green("✔"), message);
+    }
+    /**
+     * Log warning message with icon
+     */
+    warn(message) {
+        console.log(pc.yellow("⚠"), message);
+    }
+    /**
+     * Log error message with icon to stderr
+     */
+    error(message) {
+        console.error(pc.red("✖"), message);
+    }
+    /**
+     * Log plain message (no styling)
+     */
+    log(message) {
+        console.log(message);
+    }
+    /**
+     * Log dimmed/secondary message
+     */
+    dim(message) {
+        console.log(pc.dim(message));
+    }
+    /**
+     * Log a blank line
+     */
+    blank() {
+        console.log("");
+    }
+    /**
+     * Create a spinner for async operations
+     */
+    spinner(text) {
+        return ora(text);
+    }
+    /**
+     * Ask for confirmation (yes/no)
+     */
+    async confirm(message, initial = false) {
+        const response = await enquirer.prompt({
+            type: "confirm",
+            name: "confirmed",
+            message,
+            initial,
+        });
+        return response.confirmed;
+    }
+    /**
+     * Prompt user to select from a list
+     */
+    async select(message, choices) {
+        const response = await enquirer.prompt({
+            type: "select",
+            name: "selected",
+            message,
+            choices,
+        });
+        return response.selected;
+    }
+    /**
+     * Prompt user for text input
+     */
+    async input(message, initial) {
+        const response = await enquirer.prompt({
+            type: "input",
+            name: "value",
+            message,
+            initial,
+        });
+        return response.value;
+    }
+    /**
+     * Create a formatted table
+     */
+    table(options) {
+        return new Table({
+            head: options?.head,
+            style: { head: ["cyan"] },
+        });
+    }
+    /**
+     * Print a formatted table
+     */
+    printTable(data, columns) {
+        if (data.length === 0) {
+            this.dim("(no data)");
+            return;
+        }
+        const cols = columns || Object.keys(data[0]);
+        const table = this.table({ head: cols });
+        for (const row of data) {
+            table.push(cols.map((col) => row[col]?.toString() || ""));
+        }
+        console.log(table.toString());
+    }
+    /**
+     * Access to color functions
+     */
+    get colors() {
+        return colors;
+    }
+    /**
+     * Exit process with error code
+     */
+    exit(code) {
+        process.exit(code);
+    }
+}
+/**
+ * Default terminal instance
+ */
+export const terminal = new Terminal();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@griffin-app/griffin-cli",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "CLI tool for running and managing griffin API tests",
   "type": "module",
   "main": "dist/index.js",
@@ -23,12 +23,16 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@griffin-app/griffin-hub-sdk": "1.0.1",
-    "@griffin-app/griffin-plan-executor": "0.1.8",
-    "@griffin-app/griffin-ts": "0.1.7",
+    "@griffin-app/griffin-hub-sdk": "1.0.2",
+    "@griffin-app/griffin-plan-executor": "0.1.10",
+    "@griffin-app/griffin-ts": "0.1.8",
+    "cli-table3": "^0.6.5",
     "commander": "^12.1.0",
+    "enquirer": "^2.4.1",
     "glob": "^11.0.0",
     "object-hash": "^3.0.0",
+    "ora": "^8.1.1",
+    "picocolors": "^1.1.1",
     "typebox": "^1.0.78",
     "yaml": "^2.8.2"
   },