@git.zone/cli 6.17.0 → 6.17.1

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.
@@ -5,11 +5,11 @@
5
5
  "schema": {
6
6
  "type": "object",
7
7
  "properties": {
8
- "npmci": {
8
+ "@ship.zone/szci": {
9
9
  "type": "object",
10
- "description": "settings for npmci"
10
+ "description": "settings for szci"
11
11
  },
12
- "gitzone": {
12
+ "@git.zone/cli": {
13
13
  "type": "object",
14
14
  "description": "settings for gitzone",
15
15
  "properties": {
@@ -3,7 +3,7 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@git.zone/cli',
6
- version: '6.17.0',
6
+ version: '6.17.1',
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
  };
9
9
  //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxlQUFlO0lBQ3JCLE9BQU8sRUFBRSxRQUFRO0lBQ2pCLFdBQVcsRUFBRSwrTEFBK0w7Q0FDN00sQ0FBQSJ9
@@ -1,12 +1,28 @@
1
1
  import { BaseFormatter } from '../classes.baseformatter.js';
2
- import type { IPlannedChange } from '../interfaces.format.js';
2
+ import type { IFormatWarning, IPlannedChange } from '../interfaces.format.js';
3
3
  export declare class TemplatesFormatter extends BaseFormatter {
4
+ private replacementWarnings;
4
5
  get name(): string;
6
+ validate(): Promise<IFormatWarning[]>;
5
7
  /**
6
8
  * Render a template directory through smartscaf and return a map of path → content.
7
9
  */
8
10
  private renderTemplate;
9
11
  analyze(): Promise<IPlannedChange[]>;
12
+ /**
13
+ * Parse a JSON object a merge needs. A file that is not a JSON object cannot
14
+ * be merged into, and guessing its shape would lose data: the caller is told
15
+ * why and falls back to replacing it.
16
+ */
17
+ private parseJsonObjectForMerge;
18
+ /**
19
+ * Merge the rendered template into the destination's own top-level keys. The
20
+ * template owns every key it declares; a key only the project declares — an
21
+ * editor setting the template never knew about — survives the update.
22
+ * A template-owned key is taken as a whole, so an array the template declares
23
+ * replaces the project's array of the same name.
24
+ */
25
+ private mergeJsonTopLevel;
10
26
  private analyzeTemplate;
11
27
  applyChange(change: IPlannedChange): Promise<void>;
12
28
  }
@@ -3,9 +3,13 @@ import * as plugins from '../mod.plugins.js';
3
3
  import * as paths from '../../paths.js';
4
4
  import { logger, logVerbose } from '../../gitzone.logging.js';
5
5
  export class TemplatesFormatter extends BaseFormatter {
6
+ replacementWarnings = [];
6
7
  get name() {
7
8
  return 'templates';
8
9
  }
10
+ async validate() {
11
+ return this.replacementWarnings;
12
+ }
9
13
  /**
10
14
  * Render a template directory through smartscaf and return a map of path → content.
11
15
  */
@@ -31,10 +35,19 @@ export class TemplatesFormatter extends BaseFormatter {
31
35
  const changes = [];
32
36
  const project = this.project;
33
37
  const projectType = project.gitzoneConfig?.data?.projectType;
38
+ this.replacementWarnings = [];
34
39
  // VSCode template - for all projects
35
40
  const vscodeChanges = await this.analyzeTemplate('vscode', [
36
- { templatePath: '.vscode/settings.json', destPath: '.vscode/settings.json' },
37
- { templatePath: '.vscode/launch.json', destPath: '.vscode/launch.json' },
41
+ {
42
+ templatePath: '.vscode/settings.json',
43
+ destPath: '.vscode/settings.json',
44
+ merge: 'jsonTopLevel',
45
+ },
46
+ {
47
+ templatePath: '.vscode/launch.json',
48
+ destPath: '.vscode/launch.json',
49
+ merge: 'jsonTopLevel',
50
+ },
38
51
  ]);
39
52
  changes.push(...vscodeChanges);
40
53
  // CI and other templates based on projectType
@@ -45,26 +58,26 @@ export class TemplatesFormatter extends BaseFormatter {
45
58
  || project.gitzoneConfig?.data?.npmciOptions?.npmAccessLevel;
46
59
  const ciTemplate = accessLevel === 'public' ? 'ci_default' : 'ci_default_private';
47
60
  const ciChanges = await this.analyzeTemplate(ciTemplate, [
48
- { templatePath: '.gitea/workflows/default_nottags.yaml', destPath: '.gitea/workflows/default_nottags.yaml' },
49
- { templatePath: '.gitea/workflows/default_tags.yaml', destPath: '.gitea/workflows/default_tags.yaml' },
61
+ { templatePath: '.gitea/workflows/default_nottags.yaml', destPath: '.gitea/workflows/default_nottags.yaml', merge: 'replace' },
62
+ { templatePath: '.gitea/workflows/default_tags.yaml', destPath: '.gitea/workflows/default_tags.yaml', merge: 'replace' },
50
63
  ]);
51
64
  changes.push(...ciChanges);
52
65
  break;
53
66
  case 'service':
54
67
  case 'website':
55
68
  const dockerCiChanges = await this.analyzeTemplate('ci_docker', [
56
- { templatePath: '.gitea/workflows/docker_nottags.yaml', destPath: '.gitea/workflows/docker_nottags.yaml' },
57
- { templatePath: '.gitea/workflows/docker_tags.yaml', destPath: '.gitea/workflows/docker_tags.yaml' },
69
+ { templatePath: '.gitea/workflows/docker_nottags.yaml', destPath: '.gitea/workflows/docker_nottags.yaml', merge: 'replace' },
70
+ { templatePath: '.gitea/workflows/docker_tags.yaml', destPath: '.gitea/workflows/docker_tags.yaml', merge: 'replace' },
58
71
  ]);
59
72
  changes.push(...dockerCiChanges);
60
73
  const dockerfileChanges = await this.analyzeTemplate('dockerfile_service', [
61
- { templatePath: 'Dockerfile', destPath: 'Dockerfile' },
62
- { templatePath: 'dockerignore', destPath: '.dockerignore' },
74
+ { templatePath: 'Dockerfile', destPath: 'Dockerfile', merge: 'replace' },
75
+ { templatePath: 'dockerignore', destPath: '.dockerignore', merge: 'replace' },
63
76
  ]);
64
77
  changes.push(...dockerfileChanges);
65
78
  const cliChanges = await this.analyzeTemplate('cli', [
66
- { templatePath: 'cli.js', destPath: 'cli.js' },
67
- { templatePath: 'cli.ts.js', destPath: 'cli.ts.js' },
79
+ { templatePath: 'cli.js', destPath: 'cli.js', merge: 'replace' },
80
+ { templatePath: 'cli.ts.js', destPath: 'cli.ts.js', merge: 'replace' },
68
81
  ]);
69
82
  changes.push(...cliChanges);
70
83
  break;
@@ -72,19 +85,71 @@ export class TemplatesFormatter extends BaseFormatter {
72
85
  // Update templates based on projectType
73
86
  if (projectType === 'website') {
74
87
  const websiteChanges = await this.analyzeTemplate('website_update', [
75
- { templatePath: 'html/index.html', destPath: 'html/index.html' },
88
+ { templatePath: 'html/index.html', destPath: 'html/index.html', merge: 'replace' },
76
89
  ]);
77
90
  changes.push(...websiteChanges);
78
91
  }
79
92
  else if (projectType === 'wcc') {
80
93
  const wccChanges = await this.analyzeTemplate('wcc_update', [
81
- { templatePath: 'html/index.html', destPath: 'html/index.html' },
82
- { templatePath: 'html/index.ts', destPath: 'html/index.ts' },
94
+ { templatePath: 'html/index.html', destPath: 'html/index.html', merge: 'replace' },
95
+ { templatePath: 'html/index.ts', destPath: 'html/index.ts', merge: 'replace' },
83
96
  ]);
84
97
  changes.push(...wccChanges);
85
98
  }
86
99
  return changes;
87
100
  }
101
+ /**
102
+ * Parse a JSON object a merge needs. A file that is not a JSON object cannot
103
+ * be merged into, and guessing its shape would lose data: the caller is told
104
+ * why and falls back to replacing it.
105
+ */
106
+ parseJsonObjectForMerge(contentArg, sourceDescriptionArg) {
107
+ let parsed;
108
+ try {
109
+ parsed = JSON.parse(contentArg);
110
+ }
111
+ catch (error) {
112
+ const errorMessage = error instanceof Error ? error.message : String(error);
113
+ return {
114
+ reason: `${sourceDescriptionArg} is not valid JSON (${errorMessage})`,
115
+ };
116
+ }
117
+ if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) {
118
+ return { reason: `${sourceDescriptionArg} is not a JSON object` };
119
+ }
120
+ return { object: parsed };
121
+ }
122
+ /**
123
+ * Merge the rendered template into the destination's own top-level keys. The
124
+ * template owns every key it declares; a key only the project declares — an
125
+ * editor setting the template never knew about — survives the update.
126
+ * A template-owned key is taken as a whole, so an array the template declares
127
+ * replaces the project's array of the same name.
128
+ */
129
+ mergeJsonTopLevel(currentContentArg, renderedContentArg) {
130
+ const rendered = this.parseJsonObjectForMerge(renderedContentArg, 'the rendered template');
131
+ const current = this.parseJsonObjectForMerge(currentContentArg, 'the current file');
132
+ const renderedObject = rendered.object;
133
+ const currentObject = current.object;
134
+ if (!renderedObject || !currentObject) {
135
+ return {
136
+ content: renderedContentArg,
137
+ replacedReason: rendered.reason ?? current.reason,
138
+ };
139
+ }
140
+ // Nothing of the project's own is at stake, so the template's own text —
141
+ // its indentation and inline arrays included — stays the settled state.
142
+ const foreignKeys = Object.keys(currentObject).filter((keyArg) => !(keyArg in renderedObject));
143
+ if (foreignKeys.length === 0) {
144
+ return { content: renderedContentArg };
145
+ }
146
+ const merged = {
147
+ ...currentObject,
148
+ ...renderedObject,
149
+ };
150
+ const trailingNewline = renderedContentArg.endsWith('\n') ? '\n' : '';
151
+ return { content: `${JSON.stringify(merged, null, 2)}${trailingNewline}` };
152
+ }
88
153
  async analyzeTemplate(templateName, files) {
89
154
  const changes = [];
90
155
  const templateDir = plugins.path.join(paths.templatesDir, templateName);
@@ -118,13 +183,29 @@ export class TemplatesFormatter extends BaseFormatter {
118
183
  .encoding('utf8')
119
184
  .read());
120
185
  }
121
- if (processedContent !== currentContent) {
186
+ const outcome = destExists && file.merge === 'jsonTopLevel'
187
+ ? this.mergeJsonTopLevel(currentContent, processedContent)
188
+ : { content: processedContent };
189
+ if (outcome.content !== currentContent) {
190
+ // A replacement the project did not ask for must state its reason
191
+ // where the decision is made: in the plan the user confirms.
192
+ if (outcome.replacedReason) {
193
+ const replacementMessage = `${file.destPath} is replaced by the ${templateName} template instead of merged, because ${outcome.replacedReason}. Top-level keys only this project declares are lost.`;
194
+ this.replacementWarnings.push({
195
+ level: 'warning',
196
+ message: replacementMessage,
197
+ module: this.name,
198
+ });
199
+ logVerbose(replacementMessage);
200
+ }
122
201
  changes.push({
123
202
  type: destExists ? 'modify' : 'create',
124
203
  path: file.destPath,
125
204
  module: this.name,
126
- description: `Apply template ${templateName}/${file.templatePath}`,
127
- content: processedContent,
205
+ description: outcome.replacedReason
206
+ ? `Replace ${file.destPath}: ${outcome.replacedReason}`
207
+ : `Apply template ${templateName}/${file.templatePath}`,
208
+ content: outcome.content,
128
209
  });
129
210
  }
130
211
  }
@@ -142,4 +223,4 @@ export class TemplatesFormatter extends BaseFormatter {
142
223
  logger.log('info', `Applied template to ${change.path}`);
143
224
  }
144
225
  }
145
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVtcGxhdGVzLmZvcm1hdHRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3RzL21vZF9mb3JtYXQvZm9ybWF0dGVycy90ZW1wbGF0ZXMuZm9ybWF0dGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUU1RCxPQUFPLEtBQUssT0FBTyxNQUFNLG1CQUFtQixDQUFDO0FBQzdDLE9BQU8sS0FBSyxLQUFLLE1BQU0sZ0JBQWdCLENBQUM7QUFDeEMsT0FBTyxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUU5RCxNQUFNLE9BQU8sa0JBQW1CLFNBQVEsYUFBYTtJQUNuRCxJQUFJLElBQUk7UUFDTixPQUFPLFdBQVcsQ0FBQztJQUNyQixDQUFDO0lBRUQ7O09BRUc7SUFDSyxLQUFLLENBQUMsY0FBYyxDQUFDLFlBQW9CO1FBQy9DLE1BQU0sV0FBVyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxZQUFZLEVBQUUsWUFBWSxDQUFDLENBQUM7UUFFeEUsTUFBTSxZQUFZLEdBQUcsSUFBSSxPQUFPLENBQUMsU0FBUyxDQUFDLFlBQVksQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUNyRSxNQUFNLFlBQVksQ0FBQyxtQkFBbUIsRUFBRSxDQUFDO1FBRXpDLE1BQU0sV0FBVyxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsYUFBYSxFQUFFLElBQUksQ0FBQztRQUNyRCxJQUFJLFdBQVcsRUFBRSxDQUFDO1lBQ2hCLE1BQU0sWUFBWSxDQUFDLGVBQWUsQ0FBQztnQkFDakMsTUFBTSxFQUFFLFdBQVcsQ0FBQyxNQUFNO2dCQUMxQixXQUFXLEVBQUUsV0FBVyxDQUFDLFdBQVc7YUFDckMsQ0FBQyxDQUFDO1FBQ0wsQ0FBQztRQUVELE1BQU0sYUFBYSxHQUFHLE1BQU0sWUFBWSxDQUFDLGNBQWMsRUFBRSxD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
226
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"templates.formatter.js","sourceRoot":"","sources":["../../../../ts/mod_format/formatters/templates.formatter.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": "6.17.0",
4
+ "version": "6.17.1",
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",
@@ -39,24 +39,24 @@
39
39
  },
40
40
  "homepage": "https://code.foss.global/git.zone/cli#README",
41
41
  "devDependencies": {
42
- "@api.global/typedrequest": "8.0.4",
43
- "@git.zone/tsbuild": "^4.5.0",
44
- "@git.zone/tspack": "1.3.0",
42
+ "@api.global/typedrequest": "^8.2.0",
43
+ "@git.zone/tsbuild": "^4.5.1",
44
+ "@git.zone/tspack": "^1.4.0",
45
45
  "@git.zone/tsrun": "^2.0.6",
46
- "@git.zone/tstest": "6.1.1",
47
- "@types/node": "26.5.1"
46
+ "@git.zone/tstest": "^6.1.2",
47
+ "@types/node": "^26.5.1"
48
48
  },
49
49
  "dependencies": {
50
50
  "@aws-sdk/client-s3": "3.1095.0",
51
- "@git.zone/tsdoc": "^2.1.1",
52
- "@git.zone/tsdocker": "3.5.9",
53
- "@git.zone/tspublish": "^1.14.0",
51
+ "@git.zone/tsdoc": "^2.2.1",
52
+ "@git.zone/tsdocker": "3.8.1",
53
+ "@git.zone/tspublish": "^1.14.1",
54
54
  "@push.rocks/commitinfo": "^1.1.1",
55
55
  "@push.rocks/early": "^4.0.4",
56
56
  "@push.rocks/projectinfo": "^5.1.0",
57
57
  "@push.rocks/smartbucket": "4.13.0",
58
- "@push.rocks/smartcli": "^4.0.20",
59
- "@push.rocks/smartconfig": "^6.0.1",
58
+ "@push.rocks/smartcli": "^4.3.1",
59
+ "@push.rocks/smartconfig": "^6.2.4",
60
60
  "@push.rocks/smartdelay": "^3.0.5",
61
61
  "@push.rocks/smartdiff": "^1.1.0",
62
62
  "@push.rocks/smartfile": "^13.1.2",
@@ -64,7 +64,7 @@
64
64
  "@push.rocks/smartinteract": "^2.0.16",
65
65
  "@push.rocks/smartjson": "^6.0.0",
66
66
  "@push.rocks/smartlegal": "^1.0.27",
67
- "@push.rocks/smartlog": "^3.2.1",
67
+ "@push.rocks/smartlog": "^3.2.1 || ^4.0.0",
68
68
  "@push.rocks/smartlog-destination-local": "^9.0.2",
69
69
  "@push.rocks/smartmustache": "^3.0.2",
70
70
  "@push.rocks/smartnetwork": "^4.4.0",
package/readme.md CHANGED
@@ -996,6 +996,8 @@ gitzone format fix
996
996
 
997
997
  Formatters include cleanup, smartconfig normalization, dependency license checks, package metadata normalization, template updates, `.gitignore`, TypeScript config, Prettier, README existence checks, and configured copy operations.
998
998
 
999
+ The template formatter owns `.vscode/settings.json` and `.vscode/launch.json` in every project, and the Gitea workflows, Dockerfile, CLI entry points and HTML entry files of the project types that declare them. Workflow and entry files are written from the template as a whole. The two `.vscode` files are merged at the top level instead: every key the template declares is refreshed, and every other top-level key — an editor setting only your project has, such as `deno.enable` — is kept. Two limits follow from that. A key the template itself declares is taken as a whole, so an array such as `json.schemas` or `configurations` is replaced rather than unioned, and a merged file is re-serialized with two-space indentation, so a project that keeps its own key loses hand-made formatting in those two files. A `.vscode` file that is not valid JSON cannot be merged and is replaced by the template as a whole. That never happens silently: the plan line reads `Replace .vscode/settings.json: the current file is not valid JSON (…)` instead of the usual `Apply template …`, and the run prints a warning that keys only your project declares are lost. Both appear in `gitzone format`, `gitzone format check` and `gitzone format plan --json`, so you see them before confirming a write.
1000
+
999
1001
  `gitzone format fix` intentionally lives outside the default format path. Normal format runs stay deterministic; the fix command uses opencode only after deterministic formatters have done what they can.
1000
1002
 
1001
1003
  ## Development Services
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@git.zone/cli',
6
- version: '6.17.0',
6
+ version: '6.17.1',
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
  }
@@ -1,14 +1,47 @@
1
1
  import { BaseFormatter } from '../classes.baseformatter.js';
2
- import type { IPlannedChange } from '../interfaces.format.js';
2
+ import type { IFormatWarning, IPlannedChange } from '../interfaces.format.js';
3
3
  import * as plugins from '../mod.plugins.js';
4
4
  import * as paths from '../../paths.js';
5
5
  import { logger, logVerbose } from '../../gitzone.logging.js';
6
6
 
7
+ /**
8
+ * `replace` writes the rendered template over the destination. `jsonTopLevel`
9
+ * keeps the top-level keys a project added itself, because an editor
10
+ * configuration is shared between the template and its user.
11
+ */
12
+ type TTemplateMergeStrategy = 'replace' | 'jsonTopLevel';
13
+
14
+ interface ITemplateFile {
15
+ templatePath: string;
16
+ destPath: string;
17
+ merge: TTemplateMergeStrategy;
18
+ }
19
+
20
+ /**
21
+ * The content a file should end up with, plus the reason a requested merge
22
+ * could not run, which makes the resulting whole-file replacement explainable.
23
+ */
24
+ interface ITemplateMergeOutcome {
25
+ content: string;
26
+ replacedReason?: string;
27
+ }
28
+
29
+ interface IJsonObjectParseOutcome {
30
+ object?: Record<string, unknown>;
31
+ reason?: string;
32
+ }
33
+
7
34
  export class TemplatesFormatter extends BaseFormatter {
35
+ private replacementWarnings: IFormatWarning[] = [];
36
+
8
37
  get name(): string {
9
38
  return 'templates';
10
39
  }
11
40
 
41
+ async validate(): Promise<IFormatWarning[]> {
42
+ return this.replacementWarnings;
43
+ }
44
+
12
45
  /**
13
46
  * Render a template directory through smartscaf and return a map of path → content.
14
47
  */
@@ -39,11 +72,20 @@ export class TemplatesFormatter extends BaseFormatter {
39
72
  const changes: IPlannedChange[] = [];
40
73
  const project = this.project;
41
74
  const projectType = project.gitzoneConfig?.data?.projectType;
75
+ this.replacementWarnings = [];
42
76
 
43
77
  // VSCode template - for all projects
44
78
  const vscodeChanges = await this.analyzeTemplate('vscode', [
45
- { templatePath: '.vscode/settings.json', destPath: '.vscode/settings.json' },
46
- { templatePath: '.vscode/launch.json', destPath: '.vscode/launch.json' },
79
+ {
80
+ templatePath: '.vscode/settings.json',
81
+ destPath: '.vscode/settings.json',
82
+ merge: 'jsonTopLevel',
83
+ },
84
+ {
85
+ templatePath: '.vscode/launch.json',
86
+ destPath: '.vscode/launch.json',
87
+ merge: 'jsonTopLevel',
88
+ },
47
89
  ]);
48
90
  changes.push(...vscodeChanges);
49
91
 
@@ -55,8 +97,8 @@ export class TemplatesFormatter extends BaseFormatter {
55
97
  || project.gitzoneConfig?.data?.npmciOptions?.npmAccessLevel;
56
98
  const ciTemplate = accessLevel === 'public' ? 'ci_default' : 'ci_default_private';
57
99
  const ciChanges = await this.analyzeTemplate(ciTemplate, [
58
- { templatePath: '.gitea/workflows/default_nottags.yaml', destPath: '.gitea/workflows/default_nottags.yaml' },
59
- { templatePath: '.gitea/workflows/default_tags.yaml', destPath: '.gitea/workflows/default_tags.yaml' },
100
+ { templatePath: '.gitea/workflows/default_nottags.yaml', destPath: '.gitea/workflows/default_nottags.yaml', merge: 'replace' },
101
+ { templatePath: '.gitea/workflows/default_tags.yaml', destPath: '.gitea/workflows/default_tags.yaml', merge: 'replace' },
60
102
  ]);
61
103
  changes.push(...ciChanges);
62
104
  break;
@@ -64,20 +106,20 @@ export class TemplatesFormatter extends BaseFormatter {
64
106
  case 'service':
65
107
  case 'website':
66
108
  const dockerCiChanges = await this.analyzeTemplate('ci_docker', [
67
- { templatePath: '.gitea/workflows/docker_nottags.yaml', destPath: '.gitea/workflows/docker_nottags.yaml' },
68
- { templatePath: '.gitea/workflows/docker_tags.yaml', destPath: '.gitea/workflows/docker_tags.yaml' },
109
+ { templatePath: '.gitea/workflows/docker_nottags.yaml', destPath: '.gitea/workflows/docker_nottags.yaml', merge: 'replace' },
110
+ { templatePath: '.gitea/workflows/docker_tags.yaml', destPath: '.gitea/workflows/docker_tags.yaml', merge: 'replace' },
69
111
  ]);
70
112
  changes.push(...dockerCiChanges);
71
113
 
72
114
  const dockerfileChanges = await this.analyzeTemplate('dockerfile_service', [
73
- { templatePath: 'Dockerfile', destPath: 'Dockerfile' },
74
- { templatePath: 'dockerignore', destPath: '.dockerignore' },
115
+ { templatePath: 'Dockerfile', destPath: 'Dockerfile', merge: 'replace' },
116
+ { templatePath: 'dockerignore', destPath: '.dockerignore', merge: 'replace' },
75
117
  ]);
76
118
  changes.push(...dockerfileChanges);
77
119
 
78
120
  const cliChanges = await this.analyzeTemplate('cli', [
79
- { templatePath: 'cli.js', destPath: 'cli.js' },
80
- { templatePath: 'cli.ts.js', destPath: 'cli.ts.js' },
121
+ { templatePath: 'cli.js', destPath: 'cli.js', merge: 'replace' },
122
+ { templatePath: 'cli.ts.js', destPath: 'cli.ts.js', merge: 'replace' },
81
123
  ]);
82
124
  changes.push(...cliChanges);
83
125
  break;
@@ -86,13 +128,13 @@ export class TemplatesFormatter extends BaseFormatter {
86
128
  // Update templates based on projectType
87
129
  if (projectType === 'website') {
88
130
  const websiteChanges = await this.analyzeTemplate('website_update', [
89
- { templatePath: 'html/index.html', destPath: 'html/index.html' },
131
+ { templatePath: 'html/index.html', destPath: 'html/index.html', merge: 'replace' },
90
132
  ]);
91
133
  changes.push(...websiteChanges);
92
134
  } else if (projectType === 'wcc') {
93
135
  const wccChanges = await this.analyzeTemplate('wcc_update', [
94
- { templatePath: 'html/index.html', destPath: 'html/index.html' },
95
- { templatePath: 'html/index.ts', destPath: 'html/index.ts' },
136
+ { templatePath: 'html/index.html', destPath: 'html/index.html', merge: 'replace' },
137
+ { templatePath: 'html/index.ts', destPath: 'html/index.ts', merge: 'replace' },
96
138
  ]);
97
139
  changes.push(...wccChanges);
98
140
  }
@@ -100,9 +142,78 @@ export class TemplatesFormatter extends BaseFormatter {
100
142
  return changes;
101
143
  }
102
144
 
145
+ /**
146
+ * Parse a JSON object a merge needs. A file that is not a JSON object cannot
147
+ * be merged into, and guessing its shape would lose data: the caller is told
148
+ * why and falls back to replacing it.
149
+ */
150
+ private parseJsonObjectForMerge(
151
+ contentArg: string,
152
+ sourceDescriptionArg: string,
153
+ ): IJsonObjectParseOutcome {
154
+ let parsed: unknown;
155
+ try {
156
+ parsed = JSON.parse(contentArg);
157
+ } catch (error) {
158
+ const errorMessage = error instanceof Error ? error.message : String(error);
159
+ return {
160
+ reason: `${sourceDescriptionArg} is not valid JSON (${errorMessage})`,
161
+ };
162
+ }
163
+ if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) {
164
+ return { reason: `${sourceDescriptionArg} is not a JSON object` };
165
+ }
166
+ return { object: parsed as Record<string, unknown> };
167
+ }
168
+
169
+ /**
170
+ * Merge the rendered template into the destination's own top-level keys. The
171
+ * template owns every key it declares; a key only the project declares — an
172
+ * editor setting the template never knew about — survives the update.
173
+ * A template-owned key is taken as a whole, so an array the template declares
174
+ * replaces the project's array of the same name.
175
+ */
176
+ private mergeJsonTopLevel(
177
+ currentContentArg: string,
178
+ renderedContentArg: string,
179
+ ): ITemplateMergeOutcome {
180
+ const rendered = this.parseJsonObjectForMerge(
181
+ renderedContentArg,
182
+ 'the rendered template',
183
+ );
184
+ const current = this.parseJsonObjectForMerge(
185
+ currentContentArg,
186
+ 'the current file',
187
+ );
188
+ const renderedObject = rendered.object;
189
+ const currentObject = current.object;
190
+ if (!renderedObject || !currentObject) {
191
+ return {
192
+ content: renderedContentArg,
193
+ replacedReason: rendered.reason ?? current.reason,
194
+ };
195
+ }
196
+
197
+ // Nothing of the project's own is at stake, so the template's own text —
198
+ // its indentation and inline arrays included — stays the settled state.
199
+ const foreignKeys = Object.keys(currentObject).filter(
200
+ (keyArg) => !(keyArg in renderedObject),
201
+ );
202
+ if (foreignKeys.length === 0) {
203
+ return { content: renderedContentArg };
204
+ }
205
+
206
+ const merged: Record<string, unknown> = {
207
+ ...currentObject,
208
+ ...renderedObject,
209
+ };
210
+ const trailingNewline = renderedContentArg.endsWith('\n') ? '\n' : '';
211
+ return { content: `${JSON.stringify(merged, null, 2)}${trailingNewline}` };
212
+ }
213
+
103
214
  private async analyzeTemplate(
104
215
  templateName: string,
105
- files: Array<{ templatePath: string; destPath: string }>,
216
+ files: ITemplateFile[],
106
217
  ): Promise<IPlannedChange[]> {
107
218
  const changes: IPlannedChange[] = [];
108
219
  const templateDir = plugins.path.join(paths.templatesDir, templateName);
@@ -141,13 +252,32 @@ export class TemplatesFormatter extends BaseFormatter {
141
252
  .read()) as string;
142
253
  }
143
254
 
144
- if (processedContent !== currentContent) {
255
+ const outcome: ITemplateMergeOutcome =
256
+ destExists && file.merge === 'jsonTopLevel'
257
+ ? this.mergeJsonTopLevel(currentContent, processedContent)
258
+ : { content: processedContent };
259
+
260
+ if (outcome.content !== currentContent) {
261
+ // A replacement the project did not ask for must state its reason
262
+ // where the decision is made: in the plan the user confirms.
263
+ if (outcome.replacedReason) {
264
+ const replacementMessage = `${file.destPath} is replaced by the ${templateName} template instead of merged, because ${outcome.replacedReason}. Top-level keys only this project declares are lost.`;
265
+ this.replacementWarnings.push({
266
+ level: 'warning',
267
+ message: replacementMessage,
268
+ module: this.name,
269
+ });
270
+ logVerbose(replacementMessage);
271
+ }
272
+
145
273
  changes.push({
146
274
  type: destExists ? 'modify' : 'create',
147
275
  path: file.destPath,
148
276
  module: this.name,
149
- description: `Apply template ${templateName}/${file.templatePath}`,
150
- content: processedContent,
277
+ description: outcome.replacedReason
278
+ ? `Replace ${file.destPath}: ${outcome.replacedReason}`
279
+ : `Apply template ${templateName}/${file.templatePath}`,
280
+ content: outcome.content,
151
281
  });
152
282
  }
153
283
  }