@caleuche/cli 0.2.1 → 0.2.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @caleuche/cli
 
+## 0.2.3
+
+### Patch Changes
+
+- 0d6214d: Making batch output path relative. Fixing variant references.
+
+## 0.2.2
+
+### Patch Changes
+
+- e4e7ca9: Fixing issue with batch compilation.
+
 ## 0.2.1
 
 ### Patch Changes

package/dist/batch.js

@@ -7,6 +7,7 @@ exports.batchCompile = batchCompile;
 const fs_1 = __importDefault(require("fs"));
 const utils_1 = require("./utils");
 const common_1 = require("./common");
+const path_1 = __importDefault(require("path"));
 function loadVariantDefinition(variant) {
     if ((0, utils_1.isVariantDefinition)(variant)) {
         return variant;
@@ -36,21 +37,21 @@ function loadVariantDefinitions(variants) {
     return definitions;
 }
 function resolveVariantDefinition(variant, variantRegistry) {
-    if ((0, utils_1.isVariantPath)(variant)) {
-        const v = (0, utils_1.parse)(variant);
+    if ((0, utils_1.isVariantPath)(variant.data)) {
+        const v = (0, utils_1.parse)(variant.data);
         if (!v) {
             console.error(`Failed to parse variant at path: ${variant}`);
             return null;
         }
         return v;
     }
-    else if ((0, utils_1.isVariantDefinition)(variant)) {
-        return variant;
+    else if ((0, utils_1.isVariantDefinition)(variant.data)) {
+        return variant.data;
     }
-    else if ((0, utils_1.isVariantReference)(variant)) {
-        const v = variantRegistry[variant];
+    else if ((0, utils_1.isVariantReference)(variant.data)) {
+        const v = variantRegistry[variant.data];
         if (!v) {
-            console.error(`Variant reference "${variant}" not found in registry.`);
+            console.error(`Variant reference "${variant.data}" not found in registry.`);
             return null;
         }
         return v;
@@ -73,21 +74,26 @@ function batchCompile(batchFile) {
         process.exit(1);
     }
     const variants = loadVariantDefinitions(bachDefinition.variants);
+    console.log(`Loaded ${Object.keys(variants || {}).length} variant definitions from batch file.`);
     if (!variants) {
         process.exit(1);
     }
     const samples = bachDefinition.samples;
     for (const sampleDefinition of samples) {
-        const sample = (0, common_1.resolveAndParseSample)(sampleDefinition.templatePath);
+        console.log(`Processing sample: ${sampleDefinition.templatePath}`);
+        const templatePath = path_1.default.join(path_1.default.dirname(batchFile), sampleDefinition.templatePath);
+        const sample = (0, common_1.resolveAndParseSample)(templatePath);
         if (!sample) {
             process.exit(1);
         }
         for (const variant of sampleDefinition.variants) {
+            console.log("Processing variant...");
             const resolvedVariant = resolveVariantDefinition(variant, variants);
             if (!resolvedVariant) {
                 process.exit(1);
             }
-            if (!(0, common_1.compileAndWriteOutput)(sample, resolvedVariant, variant.output, {
+            const effectiveOutputPath = path_1.default.join(path_1.default.dirname(batchFile), variant.output);
+            if (!(0, common_1.compileAndWriteOutput)(sample, resolvedVariant, effectiveOutputPath, {
                 project: true,
             })) {
                 console.error(`Sample: ${sampleDefinition.templatePath}, Variant: ${JSON.stringify(variant)}`);

package/dist/index.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
 const compile_1 = require("./compile");
+const batch_1 = require("./batch");
 const package_json_1 = require("../package.json");
 commander_1.program
     .name("@caleuche/cli")
@@ -12,7 +13,5 @@ commander_1.program
     .command("compile <sample-directory> <data-file> <output-directory>")
     .option("-p, --project", "Generate project file")
     .action(compile_1.compile);
-commander_1.program.command("batch <batch-file>").action((batchFile) => {
-    console.log(`Batch compiling samples from ${batchFile}`);
-});
+commander_1.program.command("batch <batch-file>").action(batch_1.batchCompile);
 commander_1.program.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caleuche/cli",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "main": "dist/index.js",
   "bin": {
     "che": "dist/index.js"

package/src/batch.ts

@@ -6,6 +6,7 @@ import {
   parse,
 } from "./utils";
 import { compileAndWriteOutput, resolveAndParseSample } from "./common";
+import path from "path";
 
 function loadVariantDefinition(
   variant: SampleVariantDefinition | SampleVariantPath,
@@ -42,22 +43,24 @@ function loadVariantDefinitions(
 }
 
 function resolveVariantDefinition(
-  variant: SampleVariant,
+  variant: SampleVariantConfig,
   variantRegistry: Record<string, SampleVariantDefinition>,
 ): SampleVariantDefinition | null {
-  if (isVariantPath(variant)) {
-    const v = parse<SampleVariantDefinition>(variant);
+  if (isVariantPath(variant.data)) {
+    const v = parse<SampleVariantDefinition>(variant.data);
     if (!v) {
       console.error(`Failed to parse variant at path: ${variant}`);
       return null;
     }
     return v;
-  } else if (isVariantDefinition(variant)) {
-    return variant;
-  } else if (isVariantReference(variant)) {
-    const v = variantRegistry[variant];
+  } else if (isVariantDefinition(variant.data)) {
+    return variant.data;
+  } else if (isVariantReference(variant.data)) {
+    const v = variantRegistry[variant.data];
     if (!v) {
-      console.error(`Variant reference "${variant}" not found in registry.`);
+      console.error(
+        `Variant reference "${variant.data}" not found in registry.`,
+      );
       return null;
     }
     return v;
@@ -81,24 +84,38 @@ export function batchCompile(batchFile: string) {
     process.exit(1);
   }
   const variants = loadVariantDefinitions(bachDefinition.variants);
+  console.log(
+    `Loaded ${Object.keys(variants || {}).length} variant definitions from batch file.`,
+  );
   if (!variants) {
     process.exit(1);
   }
   const samples = bachDefinition.samples;
   for (const sampleDefinition of samples) {
-    const sample = resolveAndParseSample(sampleDefinition.templatePath);
+    console.log(`Processing sample: ${sampleDefinition.templatePath}`);
+    const templatePath = path.join(
+      path.dirname(batchFile),
+      sampleDefinition.templatePath,
+    );
+    const sample = resolveAndParseSample(templatePath);
     if (!sample) {
       process.exit(1);
     }
 
     for (const variant of sampleDefinition.variants) {
+      console.log("Processing variant...");
       const resolvedVariant = resolveVariantDefinition(variant, variants);
       if (!resolvedVariant) {
         process.exit(1);
       }
 
+      const effectiveOutputPath = path.join(
+        path.dirname(batchFile),
+        variant.output,
+      );
+
       if (
-        !compileAndWriteOutput(sample, resolvedVariant, variant.output, {
+        !compileAndWriteOutput(sample, resolvedVariant, effectiveOutputPath, {
           project: true,
         })
       ) {

package/src/index.ts

@@ -2,6 +2,7 @@
 
 import { program } from "commander";
 import { compile } from "./compile";
+import { batchCompile } from "./batch";
 import { version } from "../package.json";
 
 program
@@ -14,8 +15,6 @@ program
   .option("-p, --project", "Generate project file")
   .action(compile);
 
-program.command("batch <batch-file>").action((batchFile) => {
-  console.log(`Batch compiling samples from ${batchFile}`);
-});
+program.command("batch <batch-file>").action(batchCompile);
 
 program.parse();