@devkong/cli 0.0.3 → 0.0.5

package/index.js

@@ -66759,13 +66759,13 @@ function generateShortId() {
   uuidHash.push(uuidToJavaHashCode(guid()) & 2147483647);
   return sqids.encode(uuidHash);
 }
-async function spawnCommand(commandText, logger = null) {
+async function spawnCommand(commandText, logger = null, shell = false) {
   return new Promise((resolve2, reject) => {
     const commandWithArgs = commandText.split(" ").filter((s) => s);
     logger.debug(commandText);
     const command = commandWithArgs.shift();
     const commandArgs = commandWithArgs;
-    const child = (0, import_child_process.spawn)(command, commandArgs, { stdio: ["pipe", "pipe", "pipe"] });
+    const child = (0, import_child_process.spawn)(command, commandArgs, { shell, stdio: ["pipe", "pipe", "pipe"] });
     let stdout = "";
     let stderr = "";
     child.stdout.on("data", (data) => {
@@ -69401,17 +69401,17 @@ var InstallCommand = class {
   constructor(verbose) {
     this.verbose = verbose;
   }
-  async execute(extensionName) {
+  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}`;
+          task.output = `${scriptPath} ${workspaceDirectory}`;
           await spawnCommand(
-            `${scriptPath} ${extensionPath}`,
-            new ListrTaskLogger(task, this.verbose ? 3 /* DEBUG */ : 0 /* INFO */)
+            `${scriptPath} ${workspaceDirectory}`,
+            new ListrTaskLogger(task, this.verbose ? 3 /* DEBUG */ : 0 /* INFO */),
+            true
           );
         },
         rendererOptions: {
@@ -69437,14 +69437,14 @@ var GenerateCommand = class {
   }
   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(this.verbose).execute(extensionName);
+    await new InstallCommand(this.verbose).execute(workspace.directory);
   }
 };
 
@@ -69700,7 +69700,7 @@ 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");
             }
@@ -69744,7 +69744,7 @@ 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
@@ -69800,11 +69800,7 @@ var PublishCommand = class {
           title: "Generate schema",
           task: async (ctx, task) => {
             const logger = new ListrTaskLogger(task, this.verbose ? 3 /* DEBUG */ : 0 /* INFO */);
-            try {
-              ctx.schemaText = await spawnCommand(this.getSchemaCmdText("python3"), logger);
-            } catch {
-              ctx.schemaText = await spawnCommand(this.getSchemaCmdText("python"), logger);
-            }
+            ctx.schemaText = await spawnCommand(this.getSchemaCmdText(), logger);
           },
           rendererOptions: defaultRendererOptions
         },
@@ -69824,7 +69820,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)
             };
@@ -69860,7 +69856,11 @@ var PublishCommand = class {
   dockerLoginCmdText(username, password, 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`;
   }
@@ -69971,18 +69971,21 @@ async function main() {
   });
   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(options.verbose).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")).addOption(new Option("--verbose", "Show full logs during command execution")).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), options.verbose).execute(
-        kongJson.name
+        kongJson.name,
+        options.notes
       );
     } catch (ex) {
       printError("publish-version command failed", ex);

package/package.json

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

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

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

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

@@ -6,7 +6,7 @@ export declare class PublishCommand {
     private managementClient;
     private get wslPrefix();
     constructor(profile: Profile, verbose?: boolean);
-    execute(repoName: string): Promise<void>;
+    execute(repoName: string, notes: string): Promise<void>;
     private resolveRegistryUrl;
     private dockerBuildCmdText;
     private dockerPushCmdText;

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

@@ -8,5 +8,5 @@ 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, logger?: ILogger): Promise<string>;
+export declare function spawnCommand(commandText: string, logger?: ILogger, shell?: boolean): Promise<string>;
 export declare function printError(message: string, error: unknown): void;