@otwld/nx-helm 0.0.10 → 0.0.12

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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@otwld/nx-helm",
3
- "version": "0.0.10",
3
+ "version": "0.0.12",
4
4
  "private": false,
5
5
  "type": "module",
6
6
  "exports": {
@@ -1,5 +1,6 @@
1
1
  import { spawnSync } from 'node:child_process';
2
- import { existsSync, mkdirSync, readdirSync, writeFileSync } from 'node:fs';
2
+ import { existsSync, mkdirSync, mkdtempSync, readdirSync, rmSync, writeFileSync, } from 'node:fs';
3
+ import { tmpdir } from 'node:os';
3
4
  import { dirname, join, resolve } from 'node:path';
4
5
  export const lintExecutor = async (options, context) => {
5
6
  try {
@@ -61,15 +62,18 @@ export const releasePublishExecutor = async (options, context) => {
61
62
  buildDependencies(root, true);
62
63
  helm(['lint', '.'], root);
63
64
  helm(['template', context.projectName ?? 'chart', '.'], root);
64
- const output = resolve(context.root, interpolate(options.outputPath, context));
65
- mkdirSync(output, { recursive: true });
66
- const before = new Set(readdirSync(output));
67
- // Helm, not this adapter, reads Chart.yaml and chooses the versioned archive.
68
- helm(['package', '.', '--destination', output], root);
69
- const archives = readdirSync(output).filter((file) => file.endsWith('.tgz') && !before.has(file));
70
- if (archives.length !== 1)
71
- throw new Error('[nx-helm] Helm must create exactly one new chart archive for publication.');
72
- helm(['push', join(output, archives[0]), options.registry], root);
65
+ const output = mkdtempSync(join(tmpdir(), 'otwld-helm-publish-'));
66
+ try {
67
+ // Helm, not this executor, reads Chart.yaml and chooses the versioned archive.
68
+ helm(['package', '.', '--destination', output], root);
69
+ const archives = readdirSync(output).filter((file) => file.endsWith('.tgz'));
70
+ if (archives.length !== 1)
71
+ throw new Error('[nx-helm] Helm must create exactly one chart archive for publication.');
72
+ helm(['push', join(output, archives[0]), options.registry], root);
73
+ }
74
+ finally {
75
+ rmSync(output, { recursive: true, force: true });
76
+ }
73
77
  return { success: true };
74
78
  }
75
79
  catch (error) {
@@ -1 +1 @@
1
- {"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../../../../plugins/nx/helm/src/executors/commands.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../../../../plugins/nx/helm/src/executors/commands.ts"],"names":[],"mappings":"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"}
package/src/index.d.ts CHANGED
@@ -1,3 +1,3 @@
1
- export { createNodes } from './plugin.js';
1
+ export { createDependencies, createNodes } from './plugin.js';
2
2
  export { default as chartGenerator } from './generators/chart.js';
3
3
  export { lintExecutor, packageExecutor, releasePublishExecutor, templateExecutor, } from './executors/commands.js';
package/src/index.js CHANGED
@@ -1,4 +1,4 @@
1
- export { createNodes } from './plugin.js';
1
+ export { createDependencies, createNodes } from './plugin.js';
2
2
  export { default as chartGenerator } from './generators/chart.js';
3
3
  export { lintExecutor, packageExecutor, releasePublishExecutor, templateExecutor, } from './executors/commands.js';
4
4
  //# sourceMappingURL=index.js.map
package/src/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../plugins/nx/helm/src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EACL,YAAY,EACZ,eAAe,EACf,sBAAsB,EACtB,gBAAgB,GACjB,MAAM,yBAAyB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../plugins/nx/helm/src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EACL,YAAY,EACZ,eAAe,EACf,sBAAsB,EACtB,gBAAgB,GACjB,MAAM,yBAAyB,CAAC"}
package/src/plugin.d.ts CHANGED
@@ -1,7 +1,13 @@
1
- import type { CreateNodes } from '@nx/devkit';
1
+ import type { CreateDependencies, CreateNodes } from '@nx/devkit';
2
2
  export interface HelmPluginOptions {
3
3
  publish?: {
4
4
  registry?: string;
5
5
  };
6
6
  }
7
7
  export declare const createNodes: CreateNodes<HelmPluginOptions>;
8
+ /**
9
+ * Infer only direct, local Helm chart dependencies. A chart dependency has no
10
+ * relationship to an application or image project merely because that project
11
+ * happens to be nearby in the workspace.
12
+ */
13
+ export declare const createDependencies: CreateDependencies<HelmPluginOptions>;
package/src/plugin.js CHANGED
@@ -1,11 +1,62 @@
1
- import { createNodesFromFiles, readJsonFile } from '@nx/devkit';
2
- import { existsSync } from 'node:fs';
3
- import { dirname, join, relative } from 'node:path';
1
+ import { createNodesFromFiles, DependencyType, readJsonFile } from '@nx/devkit';
2
+ import { existsSync, readFileSync } from 'node:fs';
3
+ import { dirname, join, relative, resolve } from 'node:path';
4
+ import { parseDocument } from 'yaml';
4
5
  const helmRuntime = { runtime: "helm version --template '{{.Version}}'" };
6
+ const semverCore = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/;
7
+ const semverIdentifiers = /^[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*$/;
5
8
  export const createNodes = [
6
9
  '**/Chart.yaml',
7
10
  async (files, options, context) => createNodesFromFiles((file, pluginOptions, callbackContext) => createChartNodes(file, pluginOptions, callbackContext), files, options, context),
8
11
  ];
12
+ /**
13
+ * Infer only direct, local Helm chart dependencies. A chart dependency has no
14
+ * relationship to an application or image project merely because that project
15
+ * happens to be nearby in the workspace.
16
+ */
17
+ export const createDependencies = (_options, context) => {
18
+ const chartProjectsByRoot = new Map(Object.entries(context.projects)
19
+ .filter(([, project]) => isChartProject(project, context.workspaceRoot))
20
+ .map(([name, project]) => [
21
+ resolve(context.workspaceRoot, project.root),
22
+ name,
23
+ ]));
24
+ const dependencies = [];
25
+ for (const [source, project] of Object.entries(context.projects)) {
26
+ if (!isChartProject(project, context.workspaceRoot))
27
+ continue;
28
+ const chartPath = join(context.workspaceRoot, project.root, 'Chart.yaml');
29
+ for (const dependencyRoot of localDependencyRoots(chartPath)) {
30
+ const target = chartProjectsByRoot.get(dependencyRoot);
31
+ if (target && target !== source)
32
+ dependencies.push({
33
+ source,
34
+ target,
35
+ sourceFile: join(project.root, 'Chart.yaml').replaceAll('\\', '/'),
36
+ type: DependencyType.static,
37
+ });
38
+ }
39
+ }
40
+ return dependencies;
41
+ };
42
+ function isChartProject(project, workspaceRoot) {
43
+ return (project.tags?.includes('type:chart') === true &&
44
+ existsSync(join(workspaceRoot, project.root, 'Chart.yaml')));
45
+ }
46
+ function localDependencyRoots(chartPath) {
47
+ const document = parseDocument(readFileSync(chartPath, 'utf8'));
48
+ if (document.errors.length)
49
+ throw new Error(`[nx-helm] Invalid ${chartPath}: ${document.errors[0].message}`);
50
+ const dependencies = document.toJS()?.dependencies;
51
+ if (!Array.isArray(dependencies))
52
+ return [];
53
+ return dependencies.flatMap((dependency) => {
54
+ const repository = dependency?.repository;
55
+ if (typeof repository !== 'string' || !repository.startsWith('file://'))
56
+ return [];
57
+ return [resolve(dirname(chartPath), repository.slice('file://'.length))];
58
+ });
59
+ }
9
60
  function createChartNodes(file, options, context) {
10
61
  const absoluteRoot = dirname(join(context.workspaceRoot, file));
11
62
  const root = relative(context.workspaceRoot, absoluteRoot).replaceAll('\\', '/');
@@ -13,6 +64,9 @@ function createChartNodes(file, options, context) {
13
64
  root.startsWith('..') ||
14
65
  !existsSync(join(absoluteRoot, 'project.json')))
15
66
  return {};
67
+ const version = readChartVersion(join(absoluteRoot, 'Chart.yaml'));
68
+ const project = readProjectFile(absoluteRoot);
69
+ const projectRegistry = readRegistry(project.metadata?.helm?.registry);
16
70
  const inputs = ['{projectRoot}/**/*', helmRuntime];
17
71
  const targets = {
18
72
  'helm:lint': { executor: '@otwld/nx-helm:lint', cache: true, inputs },
@@ -37,8 +91,7 @@ function createChartNodes(file, options, context) {
37
91
  };
38
92
  // A chart owns its OCI repository in project metadata. A workspace plugin
39
93
  // option is deliberately only an explicit cross-chart override.
40
- const registry = readRegistry(options?.publish?.registry) ??
41
- readProjectRegistry(absoluteRoot);
94
+ const registry = readRegistry(options?.publish?.registry) ?? projectRegistry;
42
95
  if (registry)
43
96
  targets['nx-release-publish'] = {
44
97
  executor: '@otwld/nx-helm:release-publish',
@@ -50,14 +103,52 @@ function createChartNodes(file, options, context) {
50
103
  [root]: {
51
104
  root,
52
105
  targets,
53
- metadata: { targetGroups: { Helm: Object.keys(targets) } },
106
+ metadata: {
107
+ targetGroups: {
108
+ ...readTargetGroups(project.metadata?.targetGroups),
109
+ Helm: Object.keys(targets),
110
+ },
111
+ helm: {
112
+ ...(projectRegistry ? { registry: projectRegistry } : {}),
113
+ version,
114
+ },
115
+ },
54
116
  },
55
117
  },
56
118
  };
57
119
  }
58
- function readProjectRegistry(root) {
59
- const project = readJsonFile(join(root, 'project.json'));
60
- return readRegistry(project.metadata?.helm?.registry);
120
+ function readProjectFile(root) {
121
+ return readJsonFile(join(root, 'project.json'));
122
+ }
123
+ function readChartVersion(chartPath) {
124
+ const document = parseDocument(readFileSync(chartPath, 'utf8'));
125
+ if (document.errors.length)
126
+ throw new Error(`[nx-helm] Invalid ${chartPath}: ${document.errors[0].message}`);
127
+ const version = document.toJS()?.version;
128
+ if (typeof version !== 'string' || !isSemverLikeVersion(version))
129
+ throw new Error(`[nx-helm] ${chartPath} requires a semantic-version string version.`);
130
+ return version;
131
+ }
132
+ function isSemverLikeVersion(version) {
133
+ const [withoutBuild, ...build] = version.split('+');
134
+ if (!withoutBuild ||
135
+ build.length > 1 ||
136
+ (build.length === 1 && !semverIdentifiers.test(build[0])))
137
+ return false;
138
+ const prereleaseIndex = withoutBuild.indexOf('-');
139
+ const core = prereleaseIndex === -1
140
+ ? withoutBuild
141
+ : withoutBuild.slice(0, prereleaseIndex);
142
+ const prerelease = prereleaseIndex === -1
143
+ ? undefined
144
+ : withoutBuild.slice(prereleaseIndex + 1);
145
+ return (semverCore.test(core) &&
146
+ (prerelease === undefined || semverIdentifiers.test(prerelease)));
147
+ }
148
+ function readTargetGroups(value) {
149
+ return typeof value === 'object' && value !== null && !Array.isArray(value)
150
+ ? value
151
+ : {};
61
152
  }
62
153
  function readRegistry(value) {
63
154
  return typeof value === 'string' && value.trim() ? value.trim() : undefined;
package/src/plugin.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../../plugins/nx/helm/src/plugin.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../../plugins/nx/helm/src/plugin.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,oBAAoB,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAChF,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAarC,MAAM,WAAW,GAAG,EAAE,OAAO,EAAE,wCAAwC,EAAE,CAAC;AAC1E,MAAM,UAAU,GAAG,4CAA4C,CAAC;AAChE,MAAM,iBAAiB,GAAG,qCAAqC,CAAC;AAEhE,MAAM,CAAC,MAAM,WAAW,GAAmC;IACzD,eAAe;IACf,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,CAChC,oBAAoB,CAClB,CAAC,IAAI,EAAE,aAAa,EAAE,eAAe,EAAE,EAAE,CACvC,gBAAgB,CAAC,IAAI,EAAE,aAAa,EAAE,eAAe,CAAC,EACxD,KAAK,EACL,OAAO,EACP,OAAO,CACR;CACJ,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAA0C,CACvE,QAAQ,EACR,OAAO,EACP,EAAE;IACF,MAAM,mBAAmB,GAAG,IAAI,GAAG,CACjC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC;SAC7B,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;SACvE,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC;QACxB,OAAO,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,IAAI,CAAC;QAC5C,IAAI;KACL,CAAC,CACL,CAAC;IACF,MAAM,YAAY,GAKZ,EAAE,CAAC;IAET,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QACjE,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC;YAAE,SAAS;QAC9D,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC1E,KAAK,MAAM,cAAc,IAAI,oBAAoB,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7D,MAAM,MAAM,GAAG,mBAAmB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YACvD,IAAI,MAAM,IAAI,MAAM,KAAK,MAAM;gBAC7B,YAAY,CAAC,IAAI,CAAC;oBAChB,MAAM;oBACN,MAAM;oBACN,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC;oBAClE,IAAI,EAAE,cAAc,CAAC,MAAM;iBAC5B,CAAC,CAAC;QACP,CAAC;IACH,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAEF,SAAS,cAAc,CACrB,OAA0C,EAC1C,aAAqB;IAErB,OAAO,CACL,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,YAAY,CAAC,KAAK,IAAI;QAC7C,UAAU,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAC5D,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,SAAiB;IAC7C,MAAM,QAAQ,GAAG,aAAa,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;IAChE,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM;QACxB,MAAM,IAAI,KAAK,CACb,qBAAqB,SAAS,KAAK,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAChE,CAAC;IACJ,MAAM,YAAY,GAAG,QAAQ,CAAC,IAAI,EAAE,EAAE,YAAY,CAAC;IACnD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC;QAAE,OAAO,EAAE,CAAC;IAC5C,OAAO,YAAY,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QACzC,MAAM,UAAU,GAAG,UAAU,EAAE,UAAU,CAAC;QAC1C,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC;YACrE,OAAO,EAAE,CAAC;QACZ,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;AACL,CAAC;AACD,SAAS,gBAAgB,CACvB,IAAY,EACZ,OAAsC,EACtC,OAA2B;IAE3B,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC,CAAC;IAChE,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC,UAAU,CACnE,IAAI,EACJ,GAAG,CACJ,CAAC;IACF,IACE,CAAC,IAAI;QACL,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QACrB,CAAC,UAAU,CAAC,IAAI,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QAE/C,OAAO,EAAE,CAAC;IACZ,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC;IACnE,MAAM,OAAO,GAAG,eAAe,CAAC,YAAY,CAAC,CAAC;IAC9C,MAAM,eAAe,GAAG,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IACvE,MAAM,MAAM,GAAG,CAAC,oBAAoB,EAAE,WAAW,CAAC,CAAC;IACnD,MAAM,OAAO,GAAwC;QACnD,WAAW,EAAE,EAAE,QAAQ,EAAE,qBAAqB,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE;QACrE,eAAe,EAAE;YACf,QAAQ,EAAE,yBAAyB;YACnC,KAAK,EAAE,IAAI;YACX,MAAM;YACN,OAAO,EAAE,CAAC,uDAAuD,CAAC;YAClE,OAAO,EAAE;gBACP,UAAU,EAAE,uCAAuC;gBACnD,WAAW,EAAE,eAAe;aAC7B;YACD,cAAc,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE;SAChD;QACD,cAAc,EAAE;YACd,QAAQ,EAAE,wBAAwB;YAClC,KAAK,EAAE,IAAI;YACX,MAAM;YACN,OAAO,EAAE,CAAC,oCAAoC,CAAC;YAC/C,OAAO,EAAE,EAAE,UAAU,EAAE,oBAAoB,EAAE;SAC9C;KACF,CAAC;IACF,0EAA0E;IAC1E,gEAAgE;IAChE,MAAM,QAAQ,GAAG,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,IAAI,eAAe,CAAC;IAC7E,IAAI,QAAQ;QACV,OAAO,CAAC,oBAAoB,CAAC,GAAG;YAC9B,QAAQ,EAAE,gCAAgC;YAC1C,KAAK,EAAE,KAAK;YACZ,OAAO,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,oBAAoB,EAAE;SACxD,CAAC;IACJ,OAAO;QACL,QAAQ,EAAE;YACR,CAAC,IAAI,CAAC,EAAE;gBACN,IAAI;gBACJ,OAAO;gBACP,QAAQ,EAAE;oBACR,YAAY,EAAE;wBACZ,GAAG,gBAAgB,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC;wBACnD,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;qBAC3B;oBACD,IAAI,EAAE;wBACJ,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;wBACzD,OAAO;qBACR;iBACF;aACF;SACF;KACF,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,IAAY;IACnC,OAAO,YAAY,CAAkB,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;AACnE,CAAC;AAED,SAAS,gBAAgB,CAAC,SAAiB;IACzC,MAAM,QAAQ,GAAG,aAAa,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;IAChE,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM;QACxB,MAAM,IAAI,KAAK,CACb,qBAAqB,SAAS,KAAK,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAChE,CAAC;IACJ,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,EAAE,EAAE,OAAO,CAAC;IACzC,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC;QAC9D,MAAM,IAAI,KAAK,CACb,aAAa,SAAS,8CAA8C,CACrE,CAAC;IACJ,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,mBAAmB,CAAC,OAAe;IAC1C,MAAM,CAAC,YAAY,EAAE,GAAG,KAAK,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACpD,IACE,CAAC,YAAY;QACb,KAAK,CAAC,MAAM,GAAG,CAAC;QAChB,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAEzD,OAAO,KAAK,CAAC;IACf,MAAM,eAAe,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAClD,MAAM,IAAI,GACR,eAAe,KAAK,CAAC,CAAC;QACpB,CAAC,CAAC,YAAY;QACd,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC;IAC7C,MAAM,UAAU,GACd,eAAe,KAAK,CAAC,CAAC;QACpB,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,eAAe,GAAG,CAAC,CAAC,CAAC;IAC9C,OAAO,CACL,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC;QACrB,CAAC,UAAU,KAAK,SAAS,IAAI,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CACjE,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAc;IACtC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QACzE,CAAC,CAAE,KAAiC;QACpC,CAAC,CAAC,EAAE,CAAC;AACT,CAAC;AAED,SAAS,YAAY,CAAC,KAAc;IAClC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AAC9E,CAAC"}
@@ -12,10 +12,10 @@ export default class HelmVersionActions extends VersionActions {
12
12
  currentVersion: string | null;
13
13
  logText: string;
14
14
  } | null>;
15
- readCurrentVersionOfDependency(): Promise<{
15
+ readCurrentVersionOfDependency(tree: Tree, projectGraph: ProjectGraph, dependencyProjectName: string): Promise<{
16
16
  currentVersion: string | null;
17
17
  dependencyCollection: string | null;
18
18
  }>;
19
19
  updateProjectVersion(tree: Tree, newVersion: string): Promise<string[]>;
20
- updateProjectDependencies(_tree: Tree, _projectGraph: ProjectGraph, dependenciesToUpdate: Record<string, string>): Promise<string[]>;
20
+ updateProjectDependencies(tree: Tree, projectGraph: ProjectGraph, dependenciesToUpdate: Record<string, string>): Promise<string[]>;
21
21
  }
@@ -1,6 +1,9 @@
1
1
  import { VersionActions } from 'nx/release';
2
- import { join } from 'node:path';
3
- import { parseDocument } from 'yaml';
2
+ import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync, } from 'node:fs';
3
+ import { spawnSync } from 'node:child_process';
4
+ import { tmpdir } from 'node:os';
5
+ import { dirname, join, relative, resolve } from 'node:path';
6
+ import { isMap, isSeq, parseDocument } from 'yaml';
4
7
  /** Nx Release version-phase actions for standalone Helm charts. */
5
8
  export default class HelmVersionActions extends VersionActions {
6
9
  validManifestFilenames = ['Chart.yaml'];
@@ -14,7 +17,13 @@ export default class HelmVersionActions extends VersionActions {
14
17
  async readCurrentVersionFromRegistry() {
15
18
  return null;
16
19
  }
17
- async readCurrentVersionOfDependency() {
20
+ async readCurrentVersionOfDependency(tree, projectGraph, dependencyProjectName) {
21
+ const dependency = findLocalChartDependency(tree, this.projectGraphNode.data.root, projectGraph, dependencyProjectName);
22
+ if (dependency && typeof dependency.version === 'string')
23
+ return {
24
+ currentVersion: dependency.version,
25
+ dependencyCollection: 'dependencies',
26
+ };
18
27
  return { currentVersion: null, dependencyCollection: null };
19
28
  }
20
29
  async updateProjectVersion(tree, newVersion) {
@@ -27,10 +36,37 @@ export default class HelmVersionActions extends VersionActions {
27
36
  }
28
37
  return messages;
29
38
  }
30
- async updateProjectDependencies(_tree, _projectGraph, dependenciesToUpdate) {
31
- if (Object.keys(dependenciesToUpdate).length)
32
- throw new Error('[nx-helm] Helm charts do not update Nx project dependencies during versioning.');
33
- return [];
39
+ async updateProjectDependencies(tree, projectGraph, dependenciesToUpdate) {
40
+ const chartRoot = this.projectGraphNode.data.root;
41
+ const chartPath = join(chartRoot, 'Chart.yaml');
42
+ const chart = readChart(tree, chartPath);
43
+ const dependencies = chart.get('dependencies', true);
44
+ if (!isSeq(dependencies))
45
+ return [];
46
+ const chartProjectByRoot = new Map(Object.values(projectGraph.nodes)
47
+ .filter((node) => isChartProject(node.data, tree))
48
+ .map((node) => [normalizePath(node.data.root), node.name]));
49
+ let changed = false;
50
+ for (const dependency of dependencies.items) {
51
+ if (!isMap(dependency))
52
+ continue;
53
+ const repository = dependency.get('repository');
54
+ if (typeof repository !== 'string' || !repository.startsWith('file://'))
55
+ continue;
56
+ const target = chartProjectByRoot.get(resolveLocalRepository(chartRoot, repository));
57
+ const newVersion = target && dependenciesToUpdate[target];
58
+ if (newVersion && dependency.get('version') !== newVersion) {
59
+ dependency.set('version', newVersion);
60
+ changed = true;
61
+ }
62
+ }
63
+ if (!changed)
64
+ return [];
65
+ tree.write(chartPath, chart.toString());
66
+ regenerateLock(tree, chartRoot, projectGraph);
67
+ return [
68
+ `✍️ Local chart dependency versions and Helm lock updated: ${chartPath}`,
69
+ ];
34
70
  }
35
71
  }
36
72
  function readChart(tree, path) {
@@ -42,4 +78,80 @@ function readChart(tree, path) {
42
78
  throw new Error(`[nx-helm] Invalid ${path}: ${chart.errors[0].message}`);
43
79
  return chart;
44
80
  }
81
+ function findLocalChartDependency(tree, chartRoot, projectGraph, dependencyProjectName) {
82
+ const chart = readChart(tree, join(chartRoot, 'Chart.yaml')).toJS();
83
+ if (!Array.isArray(chart?.dependencies))
84
+ return undefined;
85
+ const target = projectGraph.nodes[dependencyProjectName];
86
+ if (!target || !isChartProject(target.data, tree))
87
+ return undefined;
88
+ return chart.dependencies.find((dependency) => typeof dependency.repository === 'string' &&
89
+ dependency.repository.startsWith('file://') &&
90
+ resolveLocalRepository(chartRoot, dependency.repository) ===
91
+ normalizePath(target.data.root));
92
+ }
93
+ function regenerateLock(tree, chartRoot, projectGraph) {
94
+ const temporary = mkdtempSync(join(tmpdir(), 'otwld-helm-version-'));
95
+ try {
96
+ materializeLocalChartTree(tree, chartRoot, projectGraph, temporary);
97
+ const temporaryChartRoot = join(temporary, chartRoot);
98
+ const result = spawnSync('/usr/bin/env', ['helm', 'dependency', 'update', '--skip-refresh', '.'], {
99
+ cwd: temporaryChartRoot,
100
+ encoding: 'utf8',
101
+ });
102
+ if (result.status !== 0)
103
+ throw new Error(`[nx-helm] helm dependency update failed: ${(result.stderr || result.stdout).trim()}`);
104
+ const lockPath = join(temporaryChartRoot, 'Chart.lock');
105
+ if (!existsSync(lockPath))
106
+ throw new Error('[nx-helm] Helm dependency update did not produce Chart.lock.');
107
+ tree.write(join(chartRoot, 'Chart.lock'), readFileSync(lockPath));
108
+ }
109
+ finally {
110
+ rmSync(temporary, { recursive: true, force: true });
111
+ }
112
+ }
113
+ function materializeLocalChartTree(tree, chartRoot, projectGraph, temporary, materialized = new Set()) {
114
+ if (materialized.has(chartRoot))
115
+ return;
116
+ materialized.add(chartRoot);
117
+ copyTreeDirectory(tree, chartRoot, temporary);
118
+ const chart = readChart(tree, join(chartRoot, 'Chart.yaml')).toJS();
119
+ if (!Array.isArray(chart?.dependencies))
120
+ return;
121
+ for (const dependency of chart.dependencies) {
122
+ if (typeof dependency?.repository !== 'string' ||
123
+ !dependency.repository.startsWith('file://'))
124
+ continue;
125
+ const targetRoot = Object.values(projectGraph.nodes).find((node) => isChartProject(node.data, tree) &&
126
+ normalizePath(node.data.root) ===
127
+ resolveLocalRepository(chartRoot, dependency.repository))?.data.root;
128
+ if (targetRoot)
129
+ materializeLocalChartTree(tree, targetRoot, projectGraph, temporary, materialized);
130
+ }
131
+ }
132
+ function copyTreeDirectory(tree, source, destinationRoot) {
133
+ for (const entry of tree.children(source)) {
134
+ const from = join(source, entry);
135
+ const destination = join(destinationRoot, from);
136
+ if (tree.isFile(from)) {
137
+ const contents = tree.read(from);
138
+ if (!contents)
139
+ continue;
140
+ mkdirSync(dirname(destination), { recursive: true });
141
+ writeFileSync(destination, contents);
142
+ }
143
+ else
144
+ copyTreeDirectory(tree, from, destinationRoot);
145
+ }
146
+ }
147
+ function isChartProject(project, tree) {
148
+ return (project.tags?.includes('type:chart') === true &&
149
+ tree.exists(join(project.root, 'Chart.yaml')));
150
+ }
151
+ function resolveLocalRepository(chartRoot, repository) {
152
+ return normalizePath(resolve(chartRoot, repository.slice('file://'.length)));
153
+ }
154
+ function normalizePath(path) {
155
+ return relative('.', resolve(path)).replaceAll('\\', '/');
156
+ }
45
157
  //# sourceMappingURL=version-actions.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"version-actions.js","sourceRoot":"","sources":["../../../../../../plugins/nx/helm/src/release/version-actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAG5C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAErC,mEAAmE;AACnE,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,cAAc;IAC5D,sBAAsB,GAAG,CAAC,YAAY,CAAC,CAAC;IAExC,KAAK,CAAC,oCAAoC,CACxC,IAAU;QAEV,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QACzE,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC5C,IAAI,OAAO,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,QAAQ;YAC1C,MAAM,IAAI,KAAK,CAAC,aAAa,YAAY,6BAA6B,CAAC,CAAC;QAC1E,OAAO,EAAE,cAAc,EAAE,KAAK,CAAC,GAAG,CAAC,SAAS,CAAW,EAAE,YAAY,EAAE,CAAC;IAC1E,CAAC;IAED,KAAK,CAAC,8BAA8B;QAIlC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,8BAA8B;QAIlC,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,oBAAoB,EAAE,IAAI,EAAE,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,IAAU,EACV,UAAkB;QAElB,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC9C,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;YACrD,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;YACjC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;YACpD,QAAQ,CAAC,IAAI,CACX,mBAAmB,UAAU,yBAAyB,QAAQ,CAAC,YAAY,EAAE,CAC9E,CAAC;QACJ,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,yBAAyB,CAC7B,KAAW,EACX,aAA2B,EAC3B,oBAA4C;QAE5C,IAAI,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,MAAM;YAC1C,MAAM,IAAI,KAAK,CACb,gFAAgF,CACjF,CAAC;QACJ,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AAED,SAAS,SAAS,CAAC,IAAU,EAAE,IAAY;IACzC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACxC,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,IAAI,GAAG,CAAC,CAAC;IAC5D,MAAM,KAAK,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IACrC,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM;QACrB,MAAM,IAAI,KAAK,CAAC,qBAAqB,IAAI,KAAK,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;IAC3E,OAAO,KAAK,CAAC;AACf,CAAC"}
1
+ {"version":3,"file":"version-actions.js","sourceRoot":"","sources":["../../../../../../plugins/nx/helm/src/release/version-actions.ts"],"names":[],"mappings":"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"}