@devkong/cli 0.0.2-0 → 0.0.4

package/index.js

@@ -66759,23 +66759,23 @@ function generateShortId() {
   uuidHash.push(uuidToJavaHashCode(guid()) & 2147483647);
   return sqids.encode(uuidHash);
 }
-async function spawnCommand(commandText, inheritStdout = false) {
+async function spawnCommand(commandText, logger = null) {
   return new Promise((resolve2, reject) => {
     const commandWithArgs = commandText.split(" ").filter((s) => s);
+    logger.debug(commandText);
     const command = commandWithArgs.shift();
     const commandArgs = commandWithArgs;
-    const mode = inheritStdout ? "inherit" : "pipe";
-    const child = (0, import_child_process.spawn)(command, commandArgs, { stdio: [mode, mode, mode] });
+    const child = (0, import_child_process.spawn)(command, commandArgs, { shell: true, stdio: ["pipe", "pipe", "pipe"] });
     let stdout = "";
     let stderr = "";
-    if (!inheritStdout) {
-      child.stdout.on("data", (data) => {
-        stdout += data.toString();
-      });
-      child.stderr.on("data", (data) => {
-        stderr += data.toString();
-      });
-    }
+    child.stdout.on("data", (data) => {
+      stdout += data.toString();
+      logger?.debug(data);
+    });
+    child.stderr.on("data", (data) => {
+      stderr += data.toString();
+      logger?.error(data);
+    });
     child.on("close", (code) => {
       if (code === 0) {
         resolve2(stdout);
@@ -69369,18 +69369,54 @@ var Listr = class {
 
 // packages/kong-cli/src/commands/installCommand.ts
 var import_path3 = __toESM(require("path"));
+
+// packages/kong-cli/src/common/listrTaskLogger.ts
+var ListrTaskLogger = class {
+  constructor(task, logLevel = 0 /* INFO */) {
+    this.task = task;
+    this.logLevel = logLevel;
+  }
+  info(message2) {
+    this.task.output = message2;
+  }
+  debug(message2) {
+    if (this.logLevel == 3 /* DEBUG */) {
+      this.task.output = message2;
+    }
+  }
+  error(message2) {
+    if (this.logLevel >= 2 /* ERROR */) {
+      this.task.output = message2;
+    }
+  }
+  warn(message2) {
+    if (this.logLevel >= 1 /* WARN */) {
+      this.task.output = message2;
+    }
+  }
+};
+
+// packages/kong-cli/src/commands/installCommand.ts
 var InstallCommand = class {
-  async execute(extensionName) {
+  constructor(verbose) {
+    this.verbose = verbose;
+  }
+  async execute(workspaceDirectory) {
     await new Listr([
       {
         title: "Installing dependencies with pip",
         task: async (_2, task) => {
           const scriptPath = this.scriptPath();
-          const extensionPath = import_path3.default.join(process.cwd(), extensionName);
-          task.output = `${scriptPath} ${extensionPath}`;
-          await spawnCommand(`${scriptPath} ${extensionPath}`);
+          task.output = `${scriptPath} ${workspaceDirectory}`;
+          await spawnCommand(
+            `${scriptPath} ${workspaceDirectory}`,
+            new ListrTaskLogger(task, this.verbose ? 3 /* DEBUG */ : 0 /* INFO */)
+          );
         },
-        rendererOptions: { persistentOutput: true }
+        rendererOptions: {
+          bottomBar: this.verbose ? Infinity : true,
+          persistentOutput: true
+        }
       }
     ]).run();
   }
@@ -69395,16 +69431,19 @@ var InstallCommand = class {
 
 // packages/kong-cli/src/commands/generateCommand.ts
 var GenerateCommand = class {
+  constructor(verbose = false) {
+    this.verbose = verbose;
+  }
   async execute(extensionName, sdk, presetVersion) {
     const id = generateShortId();
-    await (0, import_create_nx_workspace.createWorkspace)(`@devkong/cli-nx@${presetVersion}`, {
+    const workspace = await (0, import_create_nx_workspace.createWorkspace)(`@devkong/cli-nx@${presetVersion}`, {
       name: extensionName,
       id,
       platform: sdk,
       nxCloud: "skip",
       packageManager: "npm"
     });
-    await new InstallCommand().execute(extensionName);
+    await new InstallCommand(this.verbose).execute(workspace.directory);
   }
 };
 
@@ -69643,7 +69682,8 @@ var ManagementClient = class {
 
 // packages/kong-cli/src/commands/listExtensionSnapshotCommand.ts
 var ListExtensionSnapshotCommand = class {
-  constructor(profile) {
+  constructor(profile, verbose) {
+    this.verbose = verbose;
     this.managementClient = new ManagementClient(profile.kongBaseUrl);
   }
   async execute() {
@@ -69659,12 +69699,14 @@ var ListExtensionSnapshotCommand = class {
             } else {
               const result = [];
               for (const ver of versions) {
-                result.push(`${ver.version}, ${ver.created}, ${ver.createdBy}`);
+                result.push(`${ver.version}, ${ver.created}, ${ver.createdBy}, ${ver.notes}`);
               }
               task.output = result.join("\n");
             }
           },
-          rendererOptions: { persistentOutput: true }
+          rendererOptions: {
+            persistentOutput: true
+          }
         }
       ],
       {
@@ -69692,7 +69734,8 @@ var RegistryClient = class {
 
 // packages/kong-cli/src/commands/publishCommand.ts
 var PublishCommand = class {
-  constructor(profile) {
+  constructor(profile, verbose = false) {
+    this.verbose = verbose;
     this.isWin = process.platform === "win32";
     this.registryClient = new RegistryClient(profile.kongBaseUrl);
     this.managementClient = new ManagementClient(profile.kongBaseUrl);
@@ -69700,7 +69743,11 @@ var PublishCommand = class {
   get wslPrefix() {
     return this.isWin ? "wsl" : "";
   }
-  async execute(repoName) {
+  async execute(repoName, notes) {
+    const defaultRendererOptions = {
+      bottomBar: this.verbose ? Infinity : true,
+      persistentOutput: true
+    };
     await new Listr(
       [
         {
@@ -69718,9 +69765,11 @@ var PublishCommand = class {
                 ctx.publishDetails.userName,
                 ctx.publishDetails.token,
                 regUrl
-              )
+              ),
+              new ListrTaskLogger(task, this.verbose ? 3 /* DEBUG */ : 0 /* INFO */)
             );
-          }
+          },
+          rendererOptions: defaultRendererOptions
         },
         {
           title: "Docker build",
@@ -69728,28 +69777,31 @@ var PublishCommand = class {
             const details = ctx.publishDetails;
             const regUrl = this.resolveRegistryUrl(details.repoName);
             ctx.fullImageName = `${regUrl}/${details.imageName}:${details.imageVersion}`;
-            await spawnCommand(this.dockerBuildCmdText(ctx.fullImageName));
-          }
+            await spawnCommand(
+              this.dockerBuildCmdText(ctx.fullImageName),
+              new ListrTaskLogger(task, this.verbose ? 3 /* DEBUG */ : 0 /* INFO */)
+            );
+          },
+          rendererOptions: defaultRendererOptions
         },
         {
           title: "Docker push",
           task: async (ctx, task) => {
             const cmd = this.dockerPushCmdText(ctx.fullImageName);
-            task.output = cmd;
-            await spawnCommand(cmd);
+            await spawnCommand(
+              cmd,
+              new ListrTaskLogger(task, this.verbose ? 3 /* DEBUG */ : 0 /* INFO */)
+            );
           },
-          rendererOptions: { persistentOutput: true }
+          rendererOptions: defaultRendererOptions
         },
         {
           title: "Generate schema",
           task: async (ctx, task) => {
-            try {
-              ctx.schemaText = await spawnCommand(this.getSchemaCmdText("python3"));
-            } catch {
-              ctx.schemaText = await spawnCommand(this.getSchemaCmdText("python"));
-            }
+            const logger = new ListrTaskLogger(task, this.verbose ? 3 /* DEBUG */ : 0 /* INFO */);
+            ctx.schemaText = await spawnCommand(this.getSchemaCmdText(), logger);
           },
-          rendererOptions: { persistentOutput: true }
+          rendererOptions: defaultRendererOptions
         },
         {
           title: "Save publish details",
@@ -69767,7 +69819,7 @@ var PublishCommand = class {
               outputSchema: jsonSchemas.output,
               metadata: kongJson,
               version: Number(ctx.publishDetails.imageVersion),
-              notes: "",
+              notes,
               created: utcNow(DEFAULT_TIMEZONE),
               createdBy: kongJson.ownership.at(0)
             };
@@ -69777,7 +69829,8 @@ var PublishCommand = class {
               snapshot
             );
             task.output = `Version ${ctx.publishDetails.imageVersion} published!`;
-          }
+          },
+          rendererOptions: defaultRendererOptions
         }
       ],
       {
@@ -69800,9 +69853,13 @@ var PublishCommand = class {
     return `${this.wslPrefix} docker push ${imageName}`;
   }
   dockerLoginCmdText(username, password, registry3) {
-    return `${this.wslPrefix} echo ${password} |docker login -u ${username} --password-stdin ${registry3}`;
+    return `${this.wslPrefix} /bin/bash -c 'echo ${password} |docker login -u ${username} --password-stdin ${registry3}'`;
   }
-  getSchemaCmdText(engine) {
+  getSchemaCmdText() {
+    let engine = ".\\.venv\\Scripts\\python.exe";
+    if (process.platform !== "win32") {
+      engine = "./.venv/bin/python";
+    }
     const mainPyPath = resolveProjectPath("src/main.py");
     return `${engine} ${mainPyPath} --schema`;
   }
@@ -69900,10 +69957,10 @@ import_dotenv_expand.default.expand(import_dotenv.default.config({ path: import_
 async function main() {
   const generateCommand = new Command("generate").description("Generate new extension").argument("name", "Extension name").addOption(
     new Option("--sdk", "Target sdk platform").choices(["python", "kotlin"]).default("python")
-  ).action(async (name, options) => {
+  ).addOption(new Option("--verbose", "Show full logs during command execution")).action(async (name, options) => {
     try {
       const presetVersion = getPresetVersion();
-      await new GenerateCommand().execute(name, options.sdk, presetVersion);
+      await new GenerateCommand(options.verbose).execute(name, options.sdk, presetVersion);
     } catch (ex) {
       printError("generate command failed", ex);
     }
@@ -69911,26 +69968,34 @@ async function main() {
   const configureCommand = new Command("configure").description("Configure access to kong environments").action(async () => {
     await new ConfigureCommand().execute();
   });
-  const installCommand = new Command("install").description("Setup virtual environment and install dependencies").action(async () => {
+  const installCommand = new Command("install").description("Setup virtual environment and install dependencies").addOption(new Option("--verbose", "Show full logs during command execution")).action(async (options) => {
     try {
-      await new InstallCommand().execute();
+      const kongJsonPath = resolveProjectPath("kong.json");
+      const projectRoot = import_path5.default.dirname(kongJsonPath);
+      await new InstallCommand(options.verbose).execute(projectRoot);
     } catch (ex) {
       printError("install command failed", ex);
     }
   });
   const publishVersionCommand = new Command("publish-version").description(
     "Build and automatically tag the current code with an incremented version, ready for selection in extension aliases"
-  ).addOption(new Option("--profile <name>", "Configured Kong profile to use").default("default")).action(async (options) => {
+  ).addOption(new Option("--profile <name>", "Configured Kong profile to use").default("default")).addOption(new Option("--verbose", "Show full logs during command execution")).addOption(new Option("--notes [text]", "Optional version notes").default("")).action(async (options) => {
     try {
       const kongJson = getKongJson();
-      await new PublishCommand(getProfile(options.profile)).execute(kongJson.name);
+      await new PublishCommand(getProfile(options.profile), options.verbose).execute(
+        kongJson.name,
+        options.notes
+      );
     } catch (ex) {
       printError("publish-version command failed", ex);
     }
   });
-  const listVersionsCommand = new Command("list-versions").description("List available versions").addOption(new Option("--profile <name>", "Configured Kong profile to use").default("default")).action(async (options) => {
+  const listVersionsCommand = new Command("list-versions").description("List available versions").addOption(new Option("--profile <name>", "Configured Kong profile to use").default("default")).addOption(new Option("--verbose", "Show full logs during command execution")).action(async (options) => {
     try {
-      await new ListExtensionSnapshotCommand(getProfile(options.profile)).execute();
+      await new ListExtensionSnapshotCommand(
+        getProfile(options.profile),
+        options.verbose
+      ).execute();
     } catch (ex) {
       printError("list-versions command failed", ex);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devkong/cli",
-  "version": "0.0.2-0",
+  "version": "0.0.4",
   "type": "commonjs",
   "main": "./index.js",
   "typings": "./index.d.ts",

package/packages/kong-cli/src/commands/generateCommand.d.ts

@@ -1,3 +1,5 @@
 export declare class GenerateCommand {
+    private verbose;
+    constructor(verbose?: boolean);
     execute(extensionName: string, sdk: "kotlin" | "python", presetVersion: string): Promise<void>;
 }

package/packages/kong-cli/src/commands/installCommand.d.ts

@@ -1,4 +1,6 @@
 export declare class InstallCommand {
-    execute(extensionName?: string): Promise<void>;
+    private verbose;
+    constructor(verbose: boolean);
+    execute(workspaceDirectory: string): Promise<void>;
     private scriptPath;
 }

package/packages/kong-cli/src/commands/listExtensionSnapshotCommand.d.ts

@@ -1,6 +1,7 @@
 import { Profile } from "../common/profile";
 export declare class ListExtensionSnapshotCommand {
+    private verbose;
     private readonly managementClient;
-    constructor(profile: Profile);
+    constructor(profile: Profile, verbose: boolean);
     execute(): Promise<void>;
 }

package/packages/kong-cli/src/commands/publishCommand.d.ts

@@ -1,11 +1,12 @@
 import { Profile } from "../common/profile";
 export declare class PublishCommand {
+    private verbose;
     private readonly isWin;
     private registryClient;
     private managementClient;
     private get wslPrefix();
-    constructor(profile: Profile);
-    execute(repoName: string): Promise<void>;
+    constructor(profile: Profile, verbose?: boolean);
+    execute(repoName: string, notes: string): Promise<void>;
     private resolveRegistryUrl;
     private dockerBuildCmdText;
     private dockerPushCmdText;

package/packages/kong-cli/src/common/listrTaskLogger.d.ts

@@ -0,0 +1,20 @@
+import { ILogger } from "./utils";
+interface ITaskWithOutput {
+    set output(output: string | never[]);
+}
+export declare enum LogLevel {
+    INFO = 0,
+    WARN = 1,
+    ERROR = 2,
+    DEBUG = 3
+}
+export declare class ListrTaskLogger implements ILogger {
+    private task;
+    private logLevel;
+    constructor(task: ITaskWithOutput, logLevel?: LogLevel);
+    info(message: string): void;
+    debug(message: string): void;
+    error(message: string): void;
+    warn(message: string): void;
+}
+export {};

package/packages/kong-cli/src/common/utils.d.ts

@@ -1,6 +1,12 @@
+export interface ILogger {
+    info(message: string): any;
+    debug(message: string): any;
+    error(message: string): any;
+    warn(message: string): any;
+}
 export declare function env(key: string): string;
 export declare function optionalEnv(key: string): string;
 export declare function resolveProjectPath(fileName: string): string;
 export declare function generateShortId(): string;
-export declare function spawnCommand(commandText: string, inheritStdout?: boolean): Promise<string>;
+export declare function spawnCommand(commandText: string, logger?: ILogger): Promise<string>;
 export declare function printError(message: string, error: unknown): void;

package/packages/kong-ts-contract/src/index.d.ts

@@ -1,4 +1,5 @@
 export type { AppCheckpoint } from "./lib/appCheckpoint";
+export type { AppDevRequest } from "./lib/appDevRequest";
 export type { AppDocument } from "./lib/appDocument";
 export type { AppDocumentBuild } from "./lib/appDocumentBuild";
 export type { AppDocumentSnapshot } from "./lib/appDocumentSnapshot";
@@ -13,7 +14,6 @@ export type { AppPresignedUrl } from "./lib/appPresignedUrl";
 export type { AppProcessAlias } from "./lib/appProcessAlias";
 export type { AppProcessAliasUse } from "./lib/appProcessAliasUse";
 export type { AppProcessInstanceId } from "./lib/appProcessInstanceId";
-export type { AppProcessTest } from "./lib/appProcessTest";
 export type { AppProject } from "./lib/appProject";
 export type { AppTestCase } from "./lib/appTestCase";
 export type { AppTestCaseDetails } from "./lib/appTestCaseDetails";

package/packages/kong-ts-contract/src/lib/appDevRequest.d.ts

@@ -0,0 +1,8 @@
+import { BusinessKey, JsonObject, UrlText, UtcDateTime } from "@kong/ts";
+export interface AppDevRequest {
+    url: UrlText;
+    businessKey: BusinessKey;
+    headers: Record<string, string>;
+    body: JsonObject;
+    deadline: UtcDateTime;
+}

package/packages/kong-ts-contract/src/lib/appProcessTest.d.ts

@@ -1,6 +0,0 @@
-import { JsonObject, UrlText, UtcDateTime } from "@kong/ts";
-export interface AppProcessTest {
-    url: UrlText;
-    payload: JsonObject;
-    deadline: UtcDateTime;
-}