@kaiord/cli 3.0.0 → 4.1.0

package/dist/bin/kaiord.js

@@ -151,11 +151,16 @@ init_esm_shims();
 // src/commands/convert/index.ts
 init_esm_shims();
 import {
+  createDefaultProviders,
   FitParsingError as FitParsingError3,
+  GarminParsingError,
   KrdValidationError as KrdValidationError3,
   ToleranceExceededError as ToleranceExceededError3
 } from "@kaiord/core";
-import { createAllProviders } from "@kaiord/all";
+import { createFitProviders } from "@kaiord/fit";
+import { createGarminProviders } from "@kaiord/garmin";
+import { createTcxProviders } from "@kaiord/tcx";
+import { createZwoProviders } from "@kaiord/zwo";
 
 // src/utils/config-loader.ts
 init_esm_shims();
@@ -168,9 +173,10 @@ import { z as z2 } from "zod";
 init_esm_shims();
 import { extname } from "path";
 import { z } from "zod";
-var fileFormatSchema = z.enum(["fit", "krd", "tcx", "zwo"]);
+var fileFormatSchema = z.enum(["fit", "gcn", "krd", "tcx", "zwo"]);
 var EXTENSION_TO_FORMAT = {
   ".fit": "fit",
+  ".gcn": "gcn",
   ".krd": "krd",
   ".tcx": "tcx",
   ".zwo": "zwo"
@@ -302,7 +308,7 @@ var ERROR_PATTERNS = [
     title: "Invalid argument",
     suggestions: [
       "Use --input-format to explicitly specify the format.",
-      "Supported formats: fit, krd, tcx, zwo"
+      "Supported formats: fit, gcn, krd, tcx, zwo"
     ]
   }
 ];
@@ -714,7 +720,7 @@ var loadFileAsKrd = async (filePath, format, providers) => {
   const detectedFormat = format || detectFormat(filePath);
   if (!detectedFormat) {
     throw new Error(
-      `Unable to detect format for file: ${filePath}. Supported formats: .fit, .krd, .tcx, .zwo`
+      `Unable to detect format for file: ${filePath}. Supported formats: .fit, .gcn, .krd, .tcx, .zwo`
     );
   }
   const fileData = await readFile2(filePath, detectedFormat);
@@ -739,6 +745,12 @@ var convertToKrd = async (data, format, providers) => {
     }
     return providers.convertZwiftToKrd({ zwiftString: data });
   }
+  if (format === "gcn") {
+    if (typeof data !== "string") {
+      throw new Error("GCN input must be string");
+    }
+    return providers.convertGarminToKrd({ gcnString: data });
+  }
   if (format === "krd") {
     if (typeof data !== "string") {
       throw new Error("KRD input must be string");
@@ -757,6 +769,9 @@ var convertFromKrd = async (krd, format, providers) => {
   if (format === "zwo") {
     return providers.convertKrdToZwift({ krd });
   }
+  if (format === "gcn") {
+    return providers.convertKrdToGarmin({ krd });
+  }
   if (format === "krd") {
     return JSON.stringify(krd, null, 2);
   }
@@ -773,7 +788,7 @@ var executeSingleFileConversion = async (options, providers, logger) => {
   const inputFormat = options.inputFormat || detectFormat(options.input);
   if (!inputFormat) {
     const error = new Error(
-      `Unable to detect input format from file: ${options.input}. Supported formats: .fit, .krd, .tcx, .zwo`
+      `Unable to detect input format from file: ${options.input}. Supported formats: .fit, .gcn, .krd, .tcx, .zwo`
     );
     error.name = "InvalidArgumentError";
     throw error;
@@ -786,7 +801,7 @@ var executeSingleFileConversion = async (options, providers, logger) => {
   const outputFormat = options.outputFormat || detectFormat(options.output);
   if (!outputFormat) {
     const error = new Error(
-      `Unable to detect output format from file: ${options.output}. Supported formats: .fit, .krd, .tcx, .zwo`
+      `Unable to detect output format from file: ${options.output}. Supported formats: .fit, .gcn, .krd, .tcx, .zwo`
     );
     error.name = "InvalidArgumentError";
     throw error;
@@ -1007,7 +1022,15 @@ var convertCommand = async (options) => {
     });
   }
   try {
-    const providers = createAllProviders(logger);
+    const providers = createDefaultProviders(
+      {
+        fit: createFitProviders(logger),
+        garmin: createGarminProviders(logger),
+        tcx: createTcxProviders(logger),
+        zwo: createZwoProviders(logger)
+      },
+      logger
+    );
     if (isBatchMode(validatedOptions.input)) {
       return await executeBatchConversion(validatedOptions, providers, logger);
     } else {
@@ -1032,6 +1055,8 @@ var convertCommand = async (options) => {
         exitCode = ExitCode.PERMISSION_DENIED;
       } else if (error instanceof FitParsingError3) {
         exitCode = ExitCode.PARSING_ERROR;
+      } else if (error instanceof GarminParsingError) {
+        exitCode = ExitCode.PARSING_ERROR;
       } else if (error instanceof KrdValidationError3) {
         exitCode = ExitCode.VALIDATION_ERROR;
       } else if (error instanceof ToleranceExceededError3) {
@@ -1049,7 +1074,11 @@ init_esm_shims();
 
 // src/commands/diff/index.ts
 init_esm_shims();
-import { createAllProviders as createAllProviders2 } from "@kaiord/all";
+import { createDefaultProviders as createDefaultProviders2 } from "@kaiord/core";
+import { createFitProviders as createFitProviders2 } from "@kaiord/fit";
+import { createGarminProviders as createGarminProviders2 } from "@kaiord/garmin";
+import { createTcxProviders as createTcxProviders2 } from "@kaiord/tcx";
+import { createZwoProviders as createZwoProviders2 } from "@kaiord/zwo";
 
 // src/commands/diff/comparators.ts
 init_esm_shims();
@@ -1057,8 +1086,8 @@ init_esm_shims();
 // src/commands/diff/compare-steps.ts
 init_esm_shims();
 var compareSteps = (krd1, krd2) => {
-  const workout1 = krd1.extensions?.workout;
-  const workout2 = krd2.extensions?.workout;
+  const workout1 = krd1.extensions?.structured_workout;
+  const workout2 = krd2.extensions?.structured_workout;
   const steps1 = workout1?.steps || [];
   const steps2 = workout2?.steps || [];
   const differences = [];
@@ -1242,7 +1271,15 @@ var diffCommand = async (options) => {
     });
   }
   try {
-    const providers = createAllProviders2(logger);
+    const providers = createDefaultProviders2(
+      {
+        fit: createFitProviders2(logger),
+        garmin: createGarminProviders2(logger),
+        tcx: createTcxProviders2(logger),
+        zwo: createZwoProviders2(logger)
+      },
+      logger
+    );
     logger.debug("Loading files for comparison", {
       file1: validatedOptions.file1,
       file2: validatedOptions.file2
@@ -1304,11 +1341,15 @@ var diffCommand = async (options) => {
 // src/commands/validate.ts
 init_esm_shims();
 import {
+  createDefaultProviders as createDefaultProviders3,
   createToleranceChecker,
   toleranceConfigSchema,
   validateRoundTrip
 } from "@kaiord/core";
-import { createAllProviders as createAllProviders3 } from "@kaiord/all";
+import { createFitProviders as createFitProviders3 } from "@kaiord/fit";
+import { createGarminProviders as createGarminProviders3 } from "@kaiord/garmin";
+import { createTcxProviders as createTcxProviders3 } from "@kaiord/tcx";
+import { createZwoProviders as createZwoProviders3 } from "@kaiord/zwo";
 import { readFile as fsReadFile2 } from "fs/promises";
 import ora3 from "ora";
 import { z as z5 } from "zod";
@@ -1378,7 +1419,15 @@ var validateCommand = async (options) => {
         config: toleranceConfig
       });
     }
-    const providers = createAllProviders3(logger);
+    const providers = createDefaultProviders3(
+      {
+        fit: createFitProviders3(logger),
+        garmin: createGarminProviders3(logger),
+        tcx: createTcxProviders3(logger),
+        zwo: createZwoProviders3(logger)
+      },
+      logger
+    );
     const toleranceChecker = toleranceConfig ? createToleranceChecker(toleranceConfig) : providers.toleranceChecker;
     const roundTripValidator = validateRoundTrip(
       providers.fitReader,
@@ -1506,11 +1555,11 @@ var main = async () => {
           description: "Output directory for batch conversion"
         }).option("input-format", {
           type: "string",
-          choices: ["fit", "krd", "tcx", "zwo"],
+          choices: ["fit", "gcn", "krd", "tcx", "zwo"],
           description: "Override input format detection"
         }).option("output-format", {
           type: "string",
-          choices: ["fit", "krd", "tcx", "zwo"],
+          choices: ["fit", "gcn", "krd", "tcx", "zwo"],
           description: "Override output format detection"
         }).example(
           "$0 convert -i workout.fit -o workout.krd",
@@ -1588,11 +1637,11 @@ var main = async () => {
           demandOption: true
         }).option("format1", {
           type: "string",
-          choices: ["fit", "krd", "tcx", "zwo"],
+          choices: ["fit", "gcn", "krd", "tcx", "zwo"],
           description: "Override format detection for first file"
         }).option("format2", {
           type: "string",
-          choices: ["fit", "krd", "tcx", "zwo"],
+          choices: ["fit", "gcn", "krd", "tcx", "zwo"],
           description: "Override format detection for second file"
         }).example(
           "$0 diff --file1 workout1.fit --file2 workout2.fit",
@@ -1648,6 +1697,8 @@ var main = async () => {
       const errorName = error.name;
       if (errorName === "FitParsingError") {
         process.exit(ExitCode.PARSING_ERROR);
+      } else if (errorName === "GarminParsingError") {
+        process.exit(ExitCode.PARSING_ERROR);
       } else if (errorName === "KrdValidationError") {
         process.exit(ExitCode.VALIDATION_ERROR);
       } else if (errorName === "ToleranceExceededError") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaiord/cli",
-  "version": "3.0.0",
+  "version": "4.1.0",
   "description": "Command-line interface for Kaiord workout file conversion",
   "type": "module",
   "bin": {
@@ -43,8 +43,11 @@
     "winston": "^3.11.0",
     "yargs": "^18.0.0",
     "zod": "^3.22.4",
-    "@kaiord/all": "^3.0.0",
-    "@kaiord/core": "^3.0.0"
+    "@kaiord/core": "^4.1.0",
+    "@kaiord/zwo": "^4.0.0",
+    "@kaiord/fit": "^4.0.0",
+    "@kaiord/garmin": "^4.1.0",
+    "@kaiord/tcx": "^4.0.0"
   },
   "devDependencies": {
     "@types/yargs": "^17.0.32",