@caleuche/cli 0.2.2 → 0.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/CHANGELOG.md +6 -0
  2. package/dist/batch.js +12 -8
  3. package/package.json +1 -1
  4. package/src/batch.ts +21 -9
package/CHANGELOG.md CHANGED
@@ -1,5 +1,11 @@
1
1
  # @caleuche/cli
2
2
 
3
+ ## 0.2.3
4
+
5
+ ### Patch Changes
6
+
7
+ - 0d6214d: Making batch output path relative. Fixing variant references.
8
+
3
9
  ## 0.2.2
4
10
 
5
11
  ### Patch Changes
package/dist/batch.js CHANGED
@@ -37,21 +37,21 @@ function loadVariantDefinitions(variants) {
37
37
  return definitions;
38
38
  }
39
39
  function resolveVariantDefinition(variant, variantRegistry) {
40
- if ((0, utils_1.isVariantPath)(variant)) {
41
- const v = (0, utils_1.parse)(variant);
40
+ if ((0, utils_1.isVariantPath)(variant.data)) {
41
+ const v = (0, utils_1.parse)(variant.data);
42
42
  if (!v) {
43
43
  console.error(`Failed to parse variant at path: ${variant}`);
44
44
  return null;
45
45
  }
46
46
  return v;
47
47
  }
48
- else if ((0, utils_1.isVariantDefinition)(variant)) {
49
- return variant;
48
+ else if ((0, utils_1.isVariantDefinition)(variant.data)) {
49
+ return variant.data;
50
50
  }
51
- else if ((0, utils_1.isVariantReference)(variant)) {
52
- const v = variantRegistry[variant];
51
+ else if ((0, utils_1.isVariantReference)(variant.data)) {
52
+ const v = variantRegistry[variant.data];
53
53
  if (!v) {
54
- console.error(`Variant reference "${variant}" not found in registry.`);
54
+ console.error(`Variant reference "${variant.data}" not found in registry.`);
55
55
  return null;
56
56
  }
57
57
  return v;
@@ -74,22 +74,26 @@ function batchCompile(batchFile) {
74
74
  process.exit(1);
75
75
  }
76
76
  const variants = loadVariantDefinitions(bachDefinition.variants);
77
+ console.log(`Loaded ${Object.keys(variants || {}).length} variant definitions from batch file.`);
77
78
  if (!variants) {
78
79
  process.exit(1);
79
80
  }
80
81
  const samples = bachDefinition.samples;
81
82
  for (const sampleDefinition of samples) {
83
+ console.log(`Processing sample: ${sampleDefinition.templatePath}`);
82
84
  const templatePath = path_1.default.join(path_1.default.dirname(batchFile), sampleDefinition.templatePath);
83
85
  const sample = (0, common_1.resolveAndParseSample)(templatePath);
84
86
  if (!sample) {
85
87
  process.exit(1);
86
88
  }
87
89
  for (const variant of sampleDefinition.variants) {
90
+ console.log("Processing variant...");
88
91
  const resolvedVariant = resolveVariantDefinition(variant, variants);
89
92
  if (!resolvedVariant) {
90
93
  process.exit(1);
91
94
  }
92
- if (!(0, common_1.compileAndWriteOutput)(sample, resolvedVariant.data, variant.output, {
95
+ const effectiveOutputPath = path_1.default.join(path_1.default.dirname(batchFile), variant.output);
96
+ if (!(0, common_1.compileAndWriteOutput)(sample, resolvedVariant, effectiveOutputPath, {
93
97
  project: true,
94
98
  })) {
95
99
  console.error(`Sample: ${sampleDefinition.templatePath}, Variant: ${JSON.stringify(variant)}`);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@caleuche/cli",
3
- "version": "0.2.2",
3
+ "version": "0.2.3",
4
4
  "main": "dist/index.js",
5
5
  "bin": {
6
6
  "che": "dist/index.js"
package/src/batch.ts CHANGED
@@ -43,22 +43,24 @@ function loadVariantDefinitions(
43
43
  }
44
44
 
45
45
  function resolveVariantDefinition(
46
- variant: SampleVariant,
46
+ variant: SampleVariantConfig,
47
47
  variantRegistry: Record<string, SampleVariantDefinition>,
48
48
  ): SampleVariantDefinition | null {
49
- if (isVariantPath(variant)) {
50
- const v = parse<SampleVariantDefinition>(variant);
49
+ if (isVariantPath(variant.data)) {
50
+ const v = parse<SampleVariantDefinition>(variant.data);
51
51
  if (!v) {
52
52
  console.error(`Failed to parse variant at path: ${variant}`);
53
53
  return null;
54
54
  }
55
55
  return v;
56
- } else if (isVariantDefinition(variant)) {
57
- return variant;
58
- } else if (isVariantReference(variant)) {
59
- const v = variantRegistry[variant];
56
+ } else if (isVariantDefinition(variant.data)) {
57
+ return variant.data;
58
+ } else if (isVariantReference(variant.data)) {
59
+ const v = variantRegistry[variant.data];
60
60
  if (!v) {
61
- console.error(`Variant reference "${variant}" not found in registry.`);
61
+ console.error(
62
+ `Variant reference "${variant.data}" not found in registry.`,
63
+ );
62
64
  return null;
63
65
  }
64
66
  return v;
@@ -82,11 +84,15 @@ export function batchCompile(batchFile: string) {
82
84
  process.exit(1);
83
85
  }
84
86
  const variants = loadVariantDefinitions(bachDefinition.variants);
87
+ console.log(
88
+ `Loaded ${Object.keys(variants || {}).length} variant definitions from batch file.`,
89
+ );
85
90
  if (!variants) {
86
91
  process.exit(1);
87
92
  }
88
93
  const samples = bachDefinition.samples;
89
94
  for (const sampleDefinition of samples) {
95
+ console.log(`Processing sample: ${sampleDefinition.templatePath}`);
90
96
  const templatePath = path.join(
91
97
  path.dirname(batchFile),
92
98
  sampleDefinition.templatePath,
@@ -97,13 +103,19 @@ export function batchCompile(batchFile: string) {
97
103
  }
98
104
 
99
105
  for (const variant of sampleDefinition.variants) {
106
+ console.log("Processing variant...");
100
107
  const resolvedVariant = resolveVariantDefinition(variant, variants);
101
108
  if (!resolvedVariant) {
102
109
  process.exit(1);
103
110
  }
104
111
 
112
+ const effectiveOutputPath = path.join(
113
+ path.dirname(batchFile),
114
+ variant.output,
115
+ );
116
+
105
117
  if (
106
- !compileAndWriteOutput(sample, resolvedVariant.data, variant.output, {
118
+ !compileAndWriteOutput(sample, resolvedVariant, effectiveOutputPath, {
107
119
  project: true,
108
120
  })
109
121
  ) {