@git.zone/cli 3.0.2 → 3.2.0

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.
@@ -3,8 +3,9 @@ import * as paths from "../paths.js";
3
3
  import { logger } from "../gitzone.logging.js";
4
4
  import { getCliMode, printJson } from "../helpers.climode.js";
5
5
  import { inferVersionTypeFromPending, movePendingToVersion, readPendingChangelog, } from "../helpers.changelog.js";
6
- import { resolveReleaseWorkflow, } from "../helpers.workflow.js";
6
+ import { formatTsdockerMinimumVersion, getDeclaredTsdockerRange, getTsdockerMinimumVersion, resolveReleaseWorkflow, supportsTsdockerMinimumVersion, } from "../helpers.workflow.js";
7
7
  import * as commitHelpers from "../mod_commit/mod.helpers.js";
8
+ import { hasInstalledProjectTsdockerBinary } from "../helpers.tsdocker.js";
8
9
  export const run = async (argvArg) => {
9
10
  const mode = await getCliMode(argvArg);
10
11
  const subcommand = argvArg._?.[1];
@@ -188,6 +189,40 @@ async function runDockerTarget(smartshellInstance, workflow) {
188
189
  if (!workflow.dockerEnabled) {
189
190
  return [{ target: "docker", status: "skipped", message: "disabled" }];
190
191
  }
192
+ let packageJson;
193
+ try {
194
+ packageJson = JSON.parse(await plugins.fs.readFile(plugins.path.join(paths.cwd, "package.json"), "utf8"));
195
+ }
196
+ catch {
197
+ packageJson = undefined;
198
+ }
199
+ if (!getDeclaredTsdockerRange(packageJson)) {
200
+ return [{
201
+ target: "tsdocker",
202
+ status: "failed",
203
+ message: "Docker releases require @git.zone/tsdocker as a project dependency",
204
+ }];
205
+ }
206
+ if (!(await hasInstalledProjectTsdockerBinary(paths.cwd))) {
207
+ return [{
208
+ target: "tsdocker",
209
+ status: "failed",
210
+ message: "Docker releases require the installed project-local tSDocker binary",
211
+ }];
212
+ }
213
+ const minimumTsdockerVersion = getTsdockerMinimumVersion(workflow.dockerBuildRegistries.length > 0, workflow.dockerTest);
214
+ if (minimumTsdockerVersion) {
215
+ const versionResult = await smartshellInstance.exec("pnpm exec tsdocker --version");
216
+ if (versionResult.exitCode !== 0
217
+ || !supportsTsdockerMinimumVersion(versionResult.combinedOutput, minimumTsdockerVersion)) {
218
+ const minimumVersion = formatTsdockerMinimumVersion(minimumTsdockerVersion);
219
+ return [{
220
+ target: "tsdocker",
221
+ status: "failed",
222
+ message: `Docker release options require project-local @git.zone/tsdocker >= ${minimumVersion}`,
223
+ }];
224
+ }
225
+ }
191
226
  const command = buildTsdockerPushCommand(workflow);
192
227
  const result = await smartshellInstance.exec(command);
193
228
  const output = result.combinedOutput;
@@ -199,8 +234,17 @@ async function runDockerTarget(smartshellInstance, workflow) {
199
234
  message: result.exitCode === 0 ? undefined : firstMeaningfulLine(output),
200
235
  }];
201
236
  }
202
- function buildTsdockerPushCommand(workflow) {
203
- const commandParts = ["tsdocker", "push"];
237
+ export function buildTsdockerPushCommand(workflow) {
238
+ const commandParts = ["pnpm", "exec", "tsdocker", "push"];
239
+ if (workflow.dockerRegistry) {
240
+ commandParts.push(`--registry=${shellQuote(workflow.dockerRegistry)}`);
241
+ }
242
+ if (workflow.dockerBuildRegistries.length > 0) {
243
+ commandParts.push(`--build-registries=${shellQuote(workflow.dockerBuildRegistries.join(","))}`);
244
+ }
245
+ if (workflow.dockerTest) {
246
+ commandParts.push("--test");
247
+ }
204
248
  if (workflow.dockerNoBuild) {
205
249
  commandParts.push("--no-build");
206
250
  }
@@ -245,6 +289,9 @@ function printReleasePlan(workflow) {
245
289
  }
246
290
  if (workflow.targets.includes("docker")) {
247
291
  console.log(`docker engine: ${workflow.dockerEngine}`);
292
+ console.log(`docker registry: ${workflow.dockerRegistry || "all configured registries"}`);
293
+ console.log(`docker build authentication: ${workflow.dockerBuildRegistries.length > 0 ? workflow.dockerBuildRegistries.join(", ") : "all configured registries"}`);
294
+ console.log(`docker image tests: ${workflow.dockerTest ? "required before destination publication" : "not requested"}`);
248
295
  console.log(`docker patterns: ${workflow.dockerPatterns.length > 0 ? workflow.dockerPatterns.join(", ") : "all Dockerfiles"}`);
249
296
  console.log(`docker options: ${formatDockerOptions(workflow)}`);
250
297
  }
@@ -252,6 +299,13 @@ function printReleasePlan(workflow) {
252
299
  }
253
300
  function formatDockerOptions(workflow) {
254
301
  const options = [];
302
+ if (workflow.dockerRegistry)
303
+ options.push(`registry=${workflow.dockerRegistry}`);
304
+ if (workflow.dockerBuildRegistries.length > 0) {
305
+ options.push(`buildRegistries=${workflow.dockerBuildRegistries.join(",")}`);
306
+ }
307
+ if (workflow.dockerTest)
308
+ options.push("test");
255
309
  if (workflow.dockerCached)
256
310
  options.push("cached");
257
311
  if (workflow.dockerParallel)
@@ -323,4 +377,4 @@ export function showHelp(mode) {
323
377
  console.log(" --plan Show resolved workflow without mutating files");
324
378
  console.log("");
325
379
  }
326
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/mod_release/index.ts"],"names":[],"mappings":"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"}
380
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/mod_release/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@git.zone/cli",
3
3
  "private": false,
4
- "version": "3.0.2",
4
+ "version": "3.2.0",
5
5
  "description": "A comprehensive CLI tool for enhancing and managing local development workflows with gitzone utilities, focusing on project setup, version control, code formatting, and template management.",
6
6
  "main": "dist_ts/index.js",
7
7
  "typings": "dist_ts/index.d.ts",
package/readme.md CHANGED
@@ -243,6 +243,9 @@ CLI workflow config lives under `@git.zone/cli` in `.smartconfig.json`. Docker b
243
243
  "docker": {
244
244
  "enabled": true,
245
245
  "engine": "tsdocker",
246
+ "registry": "registry.gitlab.com",
247
+ "buildRegistries": ["registry.gitlab.com"],
248
+ "test": true,
246
249
  "patterns": [],
247
250
  "cached": true,
248
251
  "parallel": true
@@ -266,12 +269,31 @@ NPM registries belong only here:
266
269
  @git.zone/cli.release.targets.npm.registries
267
270
  ```
268
271
 
269
- Docker registries belong only here and should be registry hosts without `http://` or `https://`:
272
+ Canonical Docker destinations and repository mappings belong here. Registry
273
+ values should be hosts without `http://` or `https://`:
270
274
 
271
275
  ```text
272
276
  @git.zone/tsdocker.registries
273
277
  ```
274
278
 
279
+ The Docker release target runs the project's pinned `@git.zone/tsdocker` through
280
+ `pnpm exec`; install it in each Docker-producing project:
281
+
282
+ ```bash
283
+ pnpm add --save-dev @git.zone/tsdocker
284
+ ```
285
+
286
+ Set `release.targets.docker.registry` to select one destination already declared
287
+ by the tSDocker config when a release must not publish to every configured
288
+ registry.
289
+ Set `release.targets.docker.buildRegistries` when the build should authenticate
290
+ only the configured registries used by private base images; an empty list keeps
291
+ the compatibility default of authenticating every configured registry. Bounded
292
+ build authentication requires project-local `@git.zone/tsdocker` 3.3.0 or newer.
293
+ Set `release.targets.docker.test` to `true` to require every selected image test
294
+ to pass before destination publication. This requires project-local
295
+ `@git.zone/tsdocker` 3.4.0 or newer.
296
+
275
297
  Useful config commands:
276
298
 
277
299
  ```bash
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@git.zone/cli',
6
- version: '3.0.2',
6
+ version: '3.2.0',
7
7
  description: 'A comprehensive CLI tool for enhancing and managing local development workflows with gitzone utilities, focusing on project setup, version control, code formatting, and template management.'
8
8
  }
@@ -0,0 +1,30 @@
1
+ import * as plugins from './plugins.js';
2
+
3
+ export type TTsdockerBinaryAccess = (binaryPathArg: string) => Promise<void>;
4
+
5
+ export const getProjectTsdockerBinPath = (
6
+ projectRootArg: string,
7
+ platformArg: NodeJS.Platform = process.platform,
8
+ ): string => {
9
+ return plugins.path.join(
10
+ projectRootArg,
11
+ 'node_modules',
12
+ '.bin',
13
+ platformArg === 'win32' ? 'tsdocker.CMD' : 'tsdocker',
14
+ );
15
+ };
16
+
17
+ export const hasInstalledProjectTsdockerBinary = async (
18
+ projectRootArg: string,
19
+ platformArg: NodeJS.Platform = process.platform,
20
+ accessArg: TTsdockerBinaryAccess = async (binaryPathArg) => {
21
+ await plugins.fs.access(binaryPathArg);
22
+ },
23
+ ): Promise<boolean> => {
24
+ try {
25
+ await accessArg(getProjectTsdockerBinPath(projectRootArg, platformArg));
26
+ return true;
27
+ } catch {
28
+ return false;
29
+ }
30
+ };
@@ -53,6 +53,9 @@ export interface IReleaseNpmTargetConfig {
53
53
  export interface IReleaseDockerTargetConfig {
54
54
  enabled?: boolean;
55
55
  engine?: "tsdocker";
56
+ registry?: string;
57
+ buildRegistries?: string[];
58
+ test?: boolean;
56
59
  patterns?: string[];
57
60
  cached?: boolean;
58
61
  parallel?: boolean | number;
@@ -116,6 +119,9 @@ export interface IResolvedReleaseWorkflow {
116
119
  npmAlreadyPublished: "success" | "error";
117
120
  dockerEnabled: boolean;
118
121
  dockerEngine: "tsdocker";
122
+ dockerRegistry?: string;
123
+ dockerBuildRegistries: string[];
124
+ dockerTest: boolean;
119
125
  dockerPatterns: string[];
120
126
  dockerCached: boolean;
121
127
  dockerParallel: boolean | number;
@@ -145,6 +151,78 @@ const unique = <T>(items: T[]): T[] => {
145
151
  return result;
146
152
  };
147
153
 
154
+ export type TTsdockerMinimumVersion = readonly [number, number, number];
155
+
156
+ export const getTsdockerMinimumVersion = (
157
+ buildRegistriesRequestedArg: boolean,
158
+ imageTestsRequestedArg: boolean,
159
+ ): TTsdockerMinimumVersion | undefined => {
160
+ if (imageTestsRequestedArg) {
161
+ return [3, 4, 0];
162
+ }
163
+ if (buildRegistriesRequestedArg) {
164
+ return [3, 3, 0];
165
+ }
166
+ return undefined;
167
+ };
168
+
169
+ export const formatTsdockerMinimumVersion = (
170
+ minimumVersionArg: TTsdockerMinimumVersion,
171
+ ): string => minimumVersionArg.join(".");
172
+
173
+ export const supportsTsdockerMinimumVersion = (
174
+ versionOutputArg: string,
175
+ minimumVersionArg: TTsdockerMinimumVersion,
176
+ ): boolean => {
177
+ const match = versionOutputArg.trim().match(
178
+ /(?:^|\s)(\d+)\.(\d+)\.(\d+)(?:\s|$)/,
179
+ );
180
+ if (!match) {
181
+ return false;
182
+ }
183
+ const actualVersion = [Number(match[1]), Number(match[2]), Number(match[3])];
184
+ for (let index = 0; index < actualVersion.length; index += 1) {
185
+ if (actualVersion[index] > minimumVersionArg[index]) {
186
+ return true;
187
+ }
188
+ if (actualVersion[index] < minimumVersionArg[index]) {
189
+ return false;
190
+ }
191
+ }
192
+ return true;
193
+ };
194
+
195
+ export const resolveDockerTestSetting = (valueArg: unknown): boolean => {
196
+ if (valueArg === undefined) {
197
+ return false;
198
+ }
199
+ if (typeof valueArg !== "boolean") {
200
+ throw new Error("release.targets.docker.test must be true or false");
201
+ }
202
+ return valueArg;
203
+ };
204
+
205
+ const isStringRecord = (valueArg: unknown): valueArg is Record<string, unknown> => {
206
+ return typeof valueArg === "object" && valueArg !== null && !Array.isArray(valueArg);
207
+ };
208
+
209
+ export const getDeclaredTsdockerRange = (packageJsonArg: unknown): string | undefined => {
210
+ if (!isStringRecord(packageJsonArg)) {
211
+ return undefined;
212
+ }
213
+ for (const dependencyField of ["devDependencies", "dependencies"] as const) {
214
+ const dependencies = packageJsonArg[dependencyField];
215
+ if (!isStringRecord(dependencies)) {
216
+ continue;
217
+ }
218
+ const versionRange = dependencies["@git.zone/tsdocker"];
219
+ if (typeof versionRange === "string" && versionRange.trim()) {
220
+ return versionRange.trim();
221
+ }
222
+ }
223
+ return undefined;
224
+ };
225
+
148
226
  const normalizeConfirmation = (
149
227
  value: unknown,
150
228
  fallback: TConfirmationMode,
@@ -395,6 +473,16 @@ export const resolveReleaseWorkflow = async (argvArg: any): Promise<IResolvedRel
395
473
  npmAlreadyPublished: npmConfig.alreadyPublished || "success",
396
474
  dockerEnabled,
397
475
  dockerEngine: "tsdocker",
476
+ dockerRegistry: typeof dockerConfig.registry === "string" && dockerConfig.registry.trim()
477
+ ? dockerConfig.registry.trim()
478
+ : undefined,
479
+ dockerBuildRegistries: Array.isArray(dockerConfig.buildRegistries)
480
+ ? dockerConfig.buildRegistries
481
+ .filter((registryArg): registryArg is string => typeof registryArg === "string")
482
+ .map((registryArg) => registryArg.trim())
483
+ .filter(Boolean)
484
+ : [],
485
+ dockerTest: resolveDockerTestSetting(dockerConfig.test),
398
486
  dockerPatterns: Array.isArray(dockerConfig.patterns) ? dockerConfig.patterns : [],
399
487
  dockerCached: dockerConfig.cached ?? false,
400
488
  dockerParallel: dockerConfig.parallel ?? false,
@@ -19,6 +19,13 @@ import {
19
19
  CURRENT_GITZONE_CLI_SCHEMA_VERSION,
20
20
  migrateSmartconfigData,
21
21
  } from "../helpers.smartconfigmigrations.js";
22
+ import {
23
+ formatTsdockerMinimumVersion,
24
+ getDeclaredTsdockerRange,
25
+ getTsdockerMinimumVersion,
26
+ supportsTsdockerMinimumVersion,
27
+ } from "../helpers.workflow.js";
28
+ import { hasInstalledProjectTsdockerBinary } from "../helpers.tsdocker.js";
22
29
 
23
30
  export { ReleaseConfig, CommitConfig };
24
31
 
@@ -871,6 +878,20 @@ async function handleRelease(mode: ICliMode): Promise<void> {
871
878
  }
872
879
 
873
880
  if (enabledTargets.includes("docker")) {
881
+ const registry = await askValue<string>(interactInstance, {
882
+ type: "input",
883
+ name: "dockerRegistry",
884
+ message: "Single tsdocker registry target (empty means all configured registries):",
885
+ default: currentTargets.docker?.registry || "",
886
+ });
887
+ const buildRegistries = await askValue<string>(interactInstance, {
888
+ type: "input",
889
+ name: "dockerBuildRegistries",
890
+ message: "Registries to authenticate before Docker builds (comma-separated, empty means all):",
891
+ default: Array.isArray(currentTargets.docker?.buildRegistries)
892
+ ? currentTargets.docker.buildRegistries.join(", ")
893
+ : "",
894
+ });
874
895
  const patterns = await askValue<string>(interactInstance, {
875
896
  type: "input",
876
897
  name: "dockerPatterns",
@@ -879,6 +900,12 @@ async function handleRelease(mode: ICliMode): Promise<void> {
879
900
  ? currentTargets.docker.patterns.join(", ")
880
901
  : "",
881
902
  });
903
+ const test = await askValue<boolean>(interactInstance, {
904
+ type: "confirm",
905
+ name: "dockerTest",
906
+ message: "Run configured image tests before destination publication?",
907
+ default: currentTargets.docker?.test ?? false,
908
+ });
882
909
  const cached = await askValue<boolean>(interactInstance, {
883
910
  type: "confirm",
884
911
  name: "dockerCached",
@@ -906,6 +933,9 @@ async function handleRelease(mode: ICliMode): Promise<void> {
906
933
  releaseTargets.docker = {
907
934
  enabled: true,
908
935
  engine: "tsdocker",
936
+ registry: registry.trim() || undefined,
937
+ buildRegistries: parseCsv(buildRegistries),
938
+ test,
909
939
  patterns: parseCsv(patterns),
910
940
  cached,
911
941
  parallel: parseDockerParallel(parallel),
@@ -1296,6 +1326,7 @@ function parseConfigValue(rawValue: string): any {
1296
1326
  ) {
1297
1327
  return JSON.parse(trimmedValue);
1298
1328
  }
1329
+
1299
1330
  return rawValue;
1300
1331
  }
1301
1332
 
@@ -1963,6 +1994,44 @@ async function validateDockerTarget(
1963
1994
  });
1964
1995
  }
1965
1996
 
1997
+ if (
1998
+ dockerTarget.registry !== undefined
1999
+ && (typeof dockerTarget.registry !== "string"
2000
+ || !dockerTarget.registry.trim()
2001
+ || /^https?:\/\//.test(dockerTarget.registry))
2002
+ ) {
2003
+ findings.push({
2004
+ level: "error",
2005
+ message: `Invalid tsdocker release registry: ${formatValue(dockerTarget.registry)}`,
2006
+ fix: "Use one configured registry host without a protocol, or remove release.targets.docker.registry.",
2007
+ });
2008
+ }
2009
+
2010
+ if (
2011
+ dockerTarget.buildRegistries !== undefined
2012
+ && (!Array.isArray(dockerTarget.buildRegistries)
2013
+ || dockerTarget.buildRegistries.some((registryArg: unknown) =>
2014
+ typeof registryArg !== "string"
2015
+ || !registryArg.trim()
2016
+ || /^https?:\/\//.test(registryArg)
2017
+ )
2018
+ || new Set(dockerTarget.buildRegistries).size !== dockerTarget.buildRegistries.length)
2019
+ ) {
2020
+ findings.push({
2021
+ level: "error",
2022
+ message: "Invalid tsdocker build registry authentication list",
2023
+ fix: "Use unique configured registry hosts without protocols, or remove release.targets.docker.buildRegistries.",
2024
+ });
2025
+ }
2026
+
2027
+ if (dockerTarget.test !== undefined && typeof dockerTarget.test !== "boolean") {
2028
+ findings.push({
2029
+ level: "error",
2030
+ message: `Invalid tsdocker image test setting: ${formatValue(dockerTarget.test)}`,
2031
+ fix: "Set release.targets.docker.test to true or false, or remove it.",
2032
+ });
2033
+ }
2034
+
1966
2035
  if (!isValidDockerParallel(dockerTarget.parallel)) {
1967
2036
  findings.push({
1968
2037
  level: "error",
@@ -1982,7 +2051,11 @@ async function validateDockerTarget(
1982
2051
  validateTsdockerProjectConfig(tsdockerConfig, findings);
1983
2052
  }
1984
2053
 
1985
- await validateTsdockerCommand(findings);
2054
+ await validateTsdockerCommand(
2055
+ findings,
2056
+ dockerTarget.buildRegistries,
2057
+ dockerTarget.test === true,
2058
+ );
1986
2059
 
1987
2060
  findings.push({
1988
2061
  level: "ok",
@@ -2064,30 +2137,74 @@ function validateTsdockerProjectConfig(
2064
2137
  });
2065
2138
  }
2066
2139
 
2067
- async function validateTsdockerCommand(findings: IDoctorFinding[]): Promise<void> {
2140
+ async function validateTsdockerCommand(
2141
+ findings: IDoctorFinding[],
2142
+ buildRegistriesArg: unknown,
2143
+ imageTestsRequestedArg: boolean,
2144
+ ): Promise<void> {
2145
+ let packageJson: unknown;
2146
+ try {
2147
+ packageJson = JSON.parse(
2148
+ await plugins.fs.readFile(plugins.path.join(process.cwd(), "package.json"), "utf8"),
2149
+ );
2150
+ } catch {
2151
+ packageJson = undefined;
2152
+ }
2153
+ if (!getDeclaredTsdockerRange(packageJson)) {
2154
+ findings.push({
2155
+ level: "error",
2156
+ message: "Docker release target requires project-local @git.zone/tsdocker",
2157
+ fix: "Run pnpm add --save-dev @git.zone/tsdocker.",
2158
+ });
2159
+ }
2160
+ if (!(await hasInstalledProjectTsdockerBinary(process.cwd()))) {
2161
+ findings.push({
2162
+ level: "error",
2163
+ message: "Project-local tSDocker binary is not installed",
2164
+ fix: "Run pnpm install after declaring @git.zone/tsdocker.",
2165
+ });
2166
+ }
2068
2167
  const smartshellInstance = new plugins.smartshell.Smartshell({
2069
2168
  executor: "bash",
2070
2169
  sourceFilePaths: [],
2071
2170
  });
2072
2171
  try {
2073
2172
  const result = await smartshellInstance.execSpawn(
2074
- "tsdocker",
2075
- ["--version"],
2173
+ "pnpm",
2174
+ ["exec", "tsdocker", "--version"],
2076
2175
  { silent: true, timeout: 8000 },
2077
2176
  );
2078
2177
  if (result.exitCode === 0) {
2079
2178
  findings.push({ level: "ok", message: "tsdocker command is available" });
2179
+ const minimumTsdockerVersion = getTsdockerMinimumVersion(
2180
+ Array.isArray(buildRegistriesArg) && buildRegistriesArg.length > 0,
2181
+ imageTestsRequestedArg,
2182
+ );
2183
+ if (
2184
+ minimumTsdockerVersion
2185
+ && !supportsTsdockerMinimumVersion(
2186
+ result.combinedOutput,
2187
+ minimumTsdockerVersion,
2188
+ )
2189
+ ) {
2190
+ const minimumVersion = formatTsdockerMinimumVersion(minimumTsdockerVersion);
2191
+ findings.push({
2192
+ level: "error",
2193
+ message: `Docker release options require @git.zone/tsdocker >= ${minimumVersion}`,
2194
+ fix: `Upgrade the project's @git.zone/tsdocker dev dependency to at least ${minimumVersion}.`,
2195
+ });
2196
+ }
2080
2197
  } else {
2081
2198
  findings.push({
2082
2199
  level: "error",
2083
- message: "tsdocker command is not available",
2084
- fix: "Install @git.zone/tsdocker globally or make it available on PATH.",
2200
+ message: "Project-local tsdocker command is not available",
2201
+ fix: "Install @git.zone/tsdocker as a project dev dependency.",
2085
2202
  });
2086
2203
  }
2087
2204
  } catch (error) {
2088
2205
  findings.push({
2089
2206
  level: "error",
2090
- message: "Could not execute tsdocker",
2207
+ message: "Could not execute project-local tsdocker",
2091
2208
  fix: error instanceof Error ? error.message : String(error),
2092
2209
  });
2093
2210
  }