@git.zone/cli 7.0.0 → 7.1.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.
Files changed (35) hide show
  1. package/assets/templates/ci_default/.gitea/workflows/default_nottags.yaml +15 -50
  2. package/assets/templates/ci_default/.gitea/workflows/default_tags.yaml +17 -86
  3. package/assets/templates/ci_docker/.gitea/workflows/docker_nottags.yaml +18 -56
  4. package/assets/templates/ci_docker/.gitea/workflows/docker_tags.yaml +17 -89
  5. package/assets/templates/dockerfile_service/Dockerfile +18 -37
  6. package/assets/templates/dockerfile_service/dockerignore +10 -0
  7. package/assets/templates/service/npmextra.json +0 -9
  8. package/assets/templates/smartconfig/_smartconfig.json +0 -3
  9. package/assets/templates/vscode/.vscode/settings.json +0 -4
  10. package/assets/templates/website/.smartscaf.yml +1 -0
  11. package/assets/templates/website/npmextra.json +0 -9
  12. package/dist_ts/00_commitinfo_data.js +1 -1
  13. package/dist_ts/classes.gitzoneconfig.d.ts +0 -3
  14. package/dist_ts/classes.gitzoneconfig.js +1 -10
  15. package/dist_ts/helpers.smartconfigmigrations.d.ts +1 -0
  16. package/dist_ts/helpers.smartconfigmigrations.js +83 -4
  17. package/dist_ts/mod_config/index.js +55 -2
  18. package/dist_ts/mod_format/formatters/smartconfig.formatter.js +1 -4
  19. package/dist_ts/mod_format/formatters/templates.formatter.js +4 -10
  20. package/dist_ts/mod_format/formatters/tsconfig.formatter.js +11 -2
  21. package/dist_ts/plugins.d.ts +3 -3
  22. package/dist_ts/plugins.js +1 -1
  23. package/package.json +4 -4
  24. package/readme.md +6 -2
  25. package/ts/00_commitinfo_data.ts +1 -1
  26. package/ts/classes.gitzoneconfig.ts +0 -16
  27. package/ts/helpers.smartconfigmigrations.ts +98 -3
  28. package/ts/mod_config/index.ts +60 -0
  29. package/ts/mod_format/formatters/smartconfig.formatter.ts +0 -3
  30. package/ts/mod_format/formatters/templates.formatter.ts +3 -10
  31. package/ts/mod_format/formatters/tsconfig.formatter.ts +10 -1
  32. package/ts/plugins.ts +3 -3
  33. package/assets/templates/ci_default_private/.gitea/workflows/default_nottags.yaml +0 -66
  34. package/assets/templates/ci_default_private/.gitea/workflows/default_tags.yaml +0 -103
  35. package/assets/templates/website/Dockerfile +0 -3
@@ -54,10 +54,7 @@ export class TemplatesFormatter extends BaseFormatter {
54
54
  switch (projectType) {
55
55
  case 'npm':
56
56
  case 'wcc':
57
- const accessLevel = project.gitzoneConfig?.data?.release?.accessLevel
58
- || project.gitzoneConfig?.data?.npmciOptions?.npmAccessLevel;
59
- const ciTemplate = accessLevel === 'public' ? 'ci_default' : 'ci_default_private';
60
- const ciChanges = await this.analyzeTemplate(ciTemplate, [
57
+ const ciChanges = await this.analyzeTemplate('ci_default', [
61
58
  { templatePath: '.gitea/workflows/default_nottags.yaml', destPath: '.gitea/workflows/default_nottags.yaml', merge: 'replace' },
62
59
  { templatePath: '.gitea/workflows/default_tags.yaml', destPath: '.gitea/workflows/default_tags.yaml', merge: 'replace' },
63
60
  ]);
@@ -70,11 +67,8 @@ export class TemplatesFormatter extends BaseFormatter {
70
67
  { templatePath: '.gitea/workflows/docker_tags.yaml', destPath: '.gitea/workflows/docker_tags.yaml', merge: 'replace' },
71
68
  ]);
72
69
  changes.push(...dockerCiChanges);
73
- const dockerfileChanges = await this.analyzeTemplate('dockerfile_service', [
74
- { templatePath: 'Dockerfile', destPath: 'Dockerfile', merge: 'replace' },
75
- { templatePath: 'dockerignore', destPath: '.dockerignore', merge: 'replace' },
76
- ]);
77
- changes.push(...dockerfileChanges);
70
+ // A Dockerfile describes the project's own image, so format neither
71
+ // creates nor changes it; `gitzone template` scaffolds a first one.
78
72
  const cliChanges = await this.analyzeTemplate('cli', [
79
73
  { templatePath: 'cli.js', destPath: 'cli.js', merge: 'replace' },
80
74
  { templatePath: 'cli.ts.js', destPath: 'cli.ts.js', merge: 'replace' },
@@ -223,4 +217,4 @@ export class TemplatesFormatter extends BaseFormatter {
223
217
  logger.log('info', `Applied template to ${change.path}`);
224
218
  }
225
219
  }
226
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"templates.formatter.js","sourceRoot":"","sources":["../../../../ts/mod_format/formatters/templates.formatter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D,OAAO,KAAK,OAAO,MAAM,mBAAmB,CAAC;AAC7C,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AA6B9D,MAAM,OAAO,kBAAmB,SAAQ,aAAa;IAC3C,mBAAmB,GAAqB,EAAE,CAAC;IAEnD,IAAI,IAAI;QACN,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,OAAO,IAAI,CAAC,mBAAmB,CAAC;IAClC,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,cAAc,CAAC,YAAoB;QAC/C,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QAExE,MAAM,YAAY,GAAG,IAAI,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QACrE,MAAM,YAAY,CAAC,mBAAmB,EAAE,CAAC;QAEzC,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC;QACrD,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,YAAY,CAAC,eAAe,CAAC;gBACjC,MAAM,EAAE,WAAW,CAAC,MAAM;gBAC1B,WAAW,EAAE,WAAW,CAAC,WAAW;aACrC,CAAC,CAAC;QACL,CAAC;QAED,MAAM,aAAa,GAAG,MAAM,YAAY,CAAC,cAAc,EAAE,CAAC;QAE1D,MAAM,OAAO,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC1C,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;YACjC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnD,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,OAAO,GAAqB,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC7B,MAAM,WAAW,GAAG,OAAO,CAAC,aAAa,EAAE,IAAI,EAAE,WAAW,CAAC;QAC7D,IAAI,CAAC,mBAAmB,GAAG,EAAE,CAAC;QAE9B,qCAAqC;QACrC,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE;YACzD;gBACE,YAAY,EAAE,uBAAuB;gBACrC,QAAQ,EAAE,uBAAuB;gBACjC,KAAK,EAAE,cAAc;aACtB;YACD;gBACE,YAAY,EAAE,qBAAqB;gBACnC,QAAQ,EAAE,qBAAqB;gBAC/B,KAAK,EAAE,cAAc;aACtB;SACF,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC;QAE/B,8CAA8C;QAC9C,QAAQ,WAAW,EAAE,CAAC;YACpB,KAAK,KAAK,CAAC;YACX,KAAK,KAAK;gBACR,MAAM,WAAW,GAAI,OAAO,CAAC,aAAa,EAAE,IAAY,EAAE,OAAO,EAAE,WAAW;uBACzE,OAAO,CAAC,aAAa,EAAE,IAAI,EAAE,YAAY,EAAE,cAAc,CAAC;gBAC/D,MAAM,UAAU,GAAG,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,oBAAoB,CAAC;gBAClF,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE;oBACvD,EAAE,YAAY,EAAE,uCAAuC,EAAE,QAAQ,EAAE,uCAAuC,EAAE,KAAK,EAAE,SAAS,EAAE;oBAC9H,EAAE,YAAY,EAAE,oCAAoC,EAAE,QAAQ,EAAE,oCAAoC,EAAE,KAAK,EAAE,SAAS,EAAE;iBACzH,CAAC,CAAC;gBACH,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;gBAC3B,MAAM;YAER,KAAK,SAAS,CAAC;YACf,KAAK,SAAS;gBACZ,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE;oBAC9D,EAAE,YAAY,EAAE,sCAAsC,EAAE,QAAQ,EAAE,sCAAsC,EAAE,KAAK,EAAE,SAAS,EAAE;oBAC5H,EAAE,YAAY,EAAE,mCAAmC,EAAE,QAAQ,EAAE,mCAAmC,EAAE,KAAK,EAAE,SAAS,EAAE;iBACvH,CAAC,CAAC;gBACH,OAAO,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,CAAC;gBAEjC,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,oBAAoB,EAAE;oBACzE,EAAE,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,SAAS,EAAE;oBACxE,EAAE,YAAY,EAAE,cAAc,EAAE,QAAQ,EAAE,eAAe,EAAE,KAAK,EAAE,SAAS,EAAE;iBAC9E,CAAC,CAAC;gBACH,OAAO,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,CAAC;gBAEnC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE;oBACnD,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE;oBAChE,EAAE,YAAY,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,EAAE,KAAK,EAAE,SAAS,EAAE;iBACvE,CAAC,CAAC;gBACH,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;gBAC5B,MAAM;QACV,CAAC;QAED,wCAAwC;QACxC,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC9B,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,gBAAgB,EAAE;gBAClE,EAAE,YAAY,EAAE,iBAAiB,EAAE,QAAQ,EAAE,iBAAiB,EAAE,KAAK,EAAE,SAAS,EAAE;aACnF,CAAC,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,CAAC;QAClC,CAAC;aAAM,IAAI,WAAW,KAAK,KAAK,EAAE,CAAC;YACjC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE;gBAC1D,EAAE,YAAY,EAAE,iBAAiB,EAAE,QAAQ,EAAE,iBAAiB,EAAE,KAAK,EAAE,SAAS,EAAE;gBAClF,EAAE,YAAY,EAAE,eAAe,EAAE,QAAQ,EAAE,eAAe,EAAE,KAAK,EAAE,SAAS,EAAE;aAC/E,CAAC,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;QAC9B,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;;;OAIG;IACK,uBAAuB,CAC7B,UAAkB,EAClB,oBAA4B;QAE5B,IAAI,MAAe,CAAC;QACpB,IAAI,CAAC;YACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAClC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC5E,OAAO;gBACL,MAAM,EAAE,GAAG,oBAAoB,uBAAuB,YAAY,GAAG;aACtE,CAAC;QACJ,CAAC;QACD,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3E,OAAO,EAAE,MAAM,EAAE,GAAG,oBAAoB,uBAAuB,EAAE,CAAC;QACpE,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,MAAiC,EAAE,CAAC;IACvD,CAAC;IAED;;;;;;OAMG;IACK,iBAAiB,CACvB,iBAAyB,EACzB,kBAA0B;QAE1B,MAAM,QAAQ,GAAG,IAAI,CAAC,uBAAuB,CAC3C,kBAAkB,EAClB,uBAAuB,CACxB,CAAC;QACF,MAAM,OAAO,GAAG,IAAI,CAAC,uBAAuB,CAC1C,iBAAiB,EACjB,kBAAkB,CACnB,CAAC;QACF,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC;QACvC,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;QACrC,IAAI,CAAC,cAAc,IAAI,CAAC,aAAa,EAAE,CAAC;YACtC,OAAO;gBACL,OAAO,EAAE,kBAAkB;gBAC3B,cAAc,EAAE,QAAQ,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM;aAClD,CAAC;QACJ,CAAC;QAED,yEAAyE;QACzE,wEAAwE;QACxE,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,CACnD,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,cAAc,CAAC,CACxC,CAAC;QACF,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7B,OAAO,EAAE,OAAO,EAAE,kBAAkB,EAAE,CAAC;QACzC,CAAC;QAED,MAAM,MAAM,GAA4B;YACtC,GAAG,aAAa;YAChB,GAAG,cAAc;SAClB,CAAC;QACF,MAAM,eAAe,GAAG,kBAAkB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QACtE,OAAO,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,eAAe,EAAE,EAAE,CAAC;IAC7E,CAAC;IAEO,KAAK,CAAC,eAAe,CAC3B,YAAoB,EACpB,KAAsB;QAEtB,MAAM,OAAO,GAAqB,EAAE,CAAC;QACrC,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QAExE,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,MAAM,EAAE,CAAC;QAC7E,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,UAAU,CAAC,YAAY,YAAY,YAAY,CAAC,CAAC;YACjD,OAAO,OAAO,CAAC;QACjB,CAAC;QAED,IAAI,aAAkC,CAAC;QACvC,IAAI,CAAC;YACH,aAAa,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;QAC1D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC5E,UAAU,CAAC,6BAA6B,YAAY,KAAK,YAAY,EAAE,CAAC,CAAC;YACzE,OAAO,OAAO,CAAC;QACjB,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,8EAA8E;YAC9E,MAAM,gBAAgB,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC;mBACxD,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAEtC,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACtB,UAAU,CAAC,iBAAiB,IAAI,CAAC,YAAY,+BAA+B,CAAC,CAAC;gBAC9E,SAAS;YACX,CAAC;YAED,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAC;YACtE,IAAI,cAAc,GAAG,EAAE,CAAC;YACxB,IAAI,UAAU,EAAE,CAAC;gBACf,cAAc,GAAG,CAAC,MAAM,OAAO,CAAC,OAAO;qBACpC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;qBACnB,QAAQ,CAAC,MAAM,CAAC;qBAChB,IAAI,EAAE,CAAW,CAAC;YACvB,CAAC;YAED,MAAM,OAAO,GACX,UAAU,IAAI,IAAI,CAAC,KAAK,KAAK,cAAc;gBACzC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,cAAc,EAAE,gBAAgB,CAAC;gBAC1D,CAAC,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC;YAEpC,IAAI,OAAO,CAAC,OAAO,KAAK,cAAc,EAAE,CAAC;gBACvC,kEAAkE;gBAClE,6DAA6D;gBAC7D,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;oBAC3B,MAAM,kBAAkB,GAAG,GAAG,IAAI,CAAC,QAAQ,uBAAuB,YAAY,wCAAwC,OAAO,CAAC,cAAc,uDAAuD,CAAC;oBACpM,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC;wBAC5B,KAAK,EAAE,SAAS;wBAChB,OAAO,EAAE,kBAAkB;wBAC3B,MAAM,EAAE,IAAI,CAAC,IAAI;qBAClB,CAAC,CAAC;oBACH,UAAU,CAAC,kBAAkB,CAAC,CAAC;gBACjC,CAAC;gBAED,OAAO,CAAC,IAAI,CAAC;oBACX,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ;oBACtC,IAAI,EAAE,IAAI,CAAC,QAAQ;oBACnB,MAAM,EAAE,IAAI,CAAC,IAAI;oBACjB,WAAW,EAAE,OAAO,CAAC,cAAc;wBACjC,CAAC,CAAC,WAAW,IAAI,CAAC,QAAQ,KAAK,OAAO,CAAC,cAAc,EAAE;wBACvD,CAAC,CAAC,kBAAkB,YAAY,IAAI,IAAI,CAAC,YAAY,EAAE;oBACzD,OAAO,EAAE,OAAO,CAAC,OAAO;iBACzB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAsB;QACtC,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,OAAO;QAE5B,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7B,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QACrD,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QACrD,CAAC;QACD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,uBAAuB,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3D,CAAC;CACF"}
220
+ //# 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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"}
@@ -25,6 +25,10 @@ export class TsconfigFormatter extends BaseFormatter {
25
25
  tsconfigObject.compilerOptions = tsconfigObject.compilerOptions || {};
26
26
  tsconfigObject.compilerOptions.baseUrl = '.';
27
27
  const existingPaths = tsconfigObject.compilerOptions.paths || {};
28
+ // Up to 7.0.1 a descriptor without a name was mapped to the key
29
+ // "undefined". No package has that name, so the entry is not kept as a
30
+ // custom path.
31
+ delete existingPaths.undefined;
28
32
  // Get module paths from tspublish, merging with existing custom paths
29
33
  const tspublishPaths = {};
30
34
  try {
@@ -33,7 +37,12 @@ export class TsconfigFormatter extends BaseFormatter {
33
37
  const publishModules = await tsPublishInstance.getModuleSubDirs(paths.cwd);
34
38
  for (const publishModule of Object.keys(publishModules)) {
35
39
  const publishConfig = publishModules[publishModule];
36
- tspublishPaths[`${publishConfig.name}`] = [
40
+ // A descriptor without a name only orders a build folder; it
41
+ // publishes no package that an import path could name.
42
+ if (typeof publishConfig.name !== 'string' || publishConfig.name === '') {
43
+ continue;
44
+ }
45
+ tspublishPaths[publishConfig.name] = [
37
46
  `./${publishModule}/index.js`,
38
47
  ];
39
48
  }
@@ -63,4 +72,4 @@ export class TsconfigFormatter extends BaseFormatter {
63
72
  logger.log('info', 'Updated tsconfig.json');
64
73
  }
65
74
  }
66
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHNjb25maWcuZm9ybWF0dGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vdHMvbW9kX2Zvcm1hdC9mb3JtYXR0ZXJzL3RzY29uZmlnLmZvcm1hdHRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFNUQsT0FBTyxLQUFLLE9BQU8sTUFBTSxtQkFBbUIsQ0FBQztBQUM3QyxPQUFPLEtBQUssS0FBSyxNQUFNLGdCQUFnQixDQUFDO0FBQ3hDLE9BQU8sRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFOUQsTUFBTSxPQUFPLGlCQUFrQixTQUFRLGFBQWE7SUFDbEQsSUFBSSxJQUFJO1FBQ04sT0FBTyxVQUFVLENBQUM7SUFDcEIsQ0FBQztJQUVELEtBQUssQ0FBQyxPQUFPO1FBQ1gsTUFBTSxPQUFPLEdBQXFCLEVBQUUsQ0FBQztRQUNyQyxNQUFNLFlBQVksR0FBRyxlQUFlLENBQUM7UUFFckMsdUJBQXVCO1FBQ3ZCLE1BQU0sTUFBTSxHQUFHLE1BQU0sT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLENBQUMsTUFBTSxFQUFFLENBQUM7UUFDakUsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQ1osVUFBVSxDQUFDLHdDQUF3QyxDQUFDLENBQUM7WUFDckQsT0FBTyxPQUFPLENBQUM7UUFDakIsQ0FBQztRQUVELHVCQUF1QjtRQUN2QixNQUFNLGNBQWMsR0FBRyxDQUFDLE1BQU0sT0FBTyxDQUFDLE9BQU87YUFDMUMsSUFBSSxDQUFDLFlBQVksQ0FBQzthQUNsQixRQUFRLENBQUMsTUFBTSxDQUFDO2FBQ2hCLElBQUksRUFBRSxDQUFXLENBQUM7UUFFckIsZ0NBQWdDO1FBQ2hDLE1BQU0sY0FBYyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsY0FBYyxDQUFDLENBQUM7UUFDbEQsY0FBYyxDQUFDLGVBQWUsR0FBRyxjQUFjLENBQUMsZUFBZSxJQUFJLEVBQUUsQ0FBQztRQUN0RSxjQUFjLENBQUMsZUFBZSxDQUFDLE9BQU8sR0FBRyxHQUFHLENBQUM7UUFDN0MsTUFBTSxhQUFhLEdBQUcsY0FBYyxDQUFDLGVBQWUsQ0FBQyxLQUFLLElBQUksRUFBRSxDQUFDO1FBRWpFLHNFQUFzRTtRQUN0RSxNQUFNLGNBQWMsR0FBNkIsRUFBRSxDQUFDO1FBQ3BELElBQUksQ0FBQztZQUNILE1BQU0sWUFBWSxHQUFHLE1BQU0sTUFBTSxDQUFDLHFCQUFxQixDQUFDLENBQUM7WUFDekQsTUFBTSxpQkFBaUIsR0FBRyxJQUFJLFlBQVksQ0FBQyxTQUFTLEVBQUUsQ0FBQztZQUN2RCxNQUFNLGNBQWMsR0FBRyxNQUFNLGlCQUFpQixDQUFDLGdCQUFnQixDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUUzRSxLQUFLLE1BQU0sYUFBYSxJQUFJLE1BQU0sQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLEVBQUUsQ0FBQztnQkFDeEQsTUFBTSxhQUFhLEdBQUcsY0FBYyxDQUFDLGFBQWEsQ0FBQyxDQUFDO2dCQUNwRCxjQUFjLENBQUMsR0FBRyxhQUFhLENBQUMsSUFBSSxFQUFFLENBQUMsR0FBRztvQkFDeEMsS0FBSyxhQUFhLFdBQVc7aUJBQzlCLENBQUM7WUFDSixDQUFDO1FBQ0gsQ0FBQztRQUFDLE9BQU8sS0FBSyxFQUFFLENBQUM7WUFDZixNQUFNLFlBQVksR0FBRyxLQUFLLFlBQVksS0FBSyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDNUUsVUFBVSxDQUFDLG9DQUFvQyxZQUFZLEVBQUUsQ0FBQyxDQUFDO1FBQ2pFLENBQUM7UUFFRCxjQUFjLENBQUMsZUFBZSxDQUFDLEtBQUssR0FBRyxFQUFFLEdBQUcsYUFBYSxFQUFFLEdBQUcsY0FBYyxFQUFFLENBQUM7UUFFL0UsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxjQUFjLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBRTNELHFDQUFxQztRQUNyQyxJQUFJLFVBQVUsS0FBSyxjQUFjLEVBQUUsQ0FBQztZQUNsQyxPQUFPLENBQUMsSUFBSSxDQUFDO2dCQUNYLElBQUksRUFBRSxRQUFRO2dCQUNkLElBQUksRUFBRSxZQUFZO2dCQUNsQixNQUFNLEVBQUUsSUFBSSxDQUFDLElBQUk7Z0JBQ2pCLFdBQVcsRUFBRSx5Q0FBeUM7Z0JBQ3RELE9BQU8sRUFBRSxVQUFVO2FBQ3BCLENBQUMsQ0FBQztRQUNMLENBQUM7UUFFRCxPQUFPLE9BQU8sQ0FBQztJQUNqQixDQUFDO0lBRUQsS0FBSyxDQUFDLFdBQVcsQ0FBQyxNQUFzQjtRQUN0QyxJQUFJLE1BQU0sQ0FBQyxJQUFJLEtBQUssUUFBUSxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU87WUFBRSxPQUFPO1FBRXhELE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNuRCxNQUFNLENBQUMsR0FBRyxDQUFDLE1BQU0sRUFBRSx1QkFBdUIsQ0FBQyxDQUFDO0lBQzlDLENBQUM7Q0FDRiJ9
75
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHNjb25maWcuZm9ybWF0dGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vdHMvbW9kX2Zvcm1hdC9mb3JtYXR0ZXJzL3RzY29uZmlnLmZvcm1hdHRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFNUQsT0FBTyxLQUFLLE9BQU8sTUFBTSxtQkFBbUIsQ0FBQztBQUM3QyxPQUFPLEtBQUssS0FBSyxNQUFNLGdCQUFnQixDQUFDO0FBQ3hDLE9BQU8sRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFOUQsTUFBTSxPQUFPLGlCQUFrQixTQUFRLGFBQWE7SUFDbEQsSUFBSSxJQUFJO1FBQ04sT0FBTyxVQUFVLENBQUM7SUFDcEIsQ0FBQztJQUVELEtBQUssQ0FBQyxPQUFPO1FBQ1gsTUFBTSxPQUFPLEdBQXFCLEVBQUUsQ0FBQztRQUNyQyxNQUFNLFlBQVksR0FBRyxlQUFlLENBQUM7UUFFckMsdUJBQXVCO1FBQ3ZCLE1BQU0sTUFBTSxHQUFHLE1BQU0sT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLENBQUMsTUFBTSxFQUFFLENBQUM7UUFDakUsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQ1osVUFBVSxDQUFDLHdDQUF3QyxDQUFDLENBQUM7WUFDckQsT0FBTyxPQUFPLENBQUM7UUFDakIsQ0FBQztRQUVELHVCQUF1QjtRQUN2QixNQUFNLGNBQWMsR0FBRyxDQUFDLE1BQU0sT0FBTyxDQUFDLE9BQU87YUFDMUMsSUFBSSxDQUFDLFlBQVksQ0FBQzthQUNsQixRQUFRLENBQUMsTUFBTSxDQUFDO2FBQ2hCLElBQUksRUFBRSxDQUFXLENBQUM7UUFFckIsZ0NBQWdDO1FBQ2hDLE1BQU0sY0FBYyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsY0FBYyxDQUFDLENBQUM7UUFDbEQsY0FBYyxD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
@@ -26,7 +26,7 @@ import * as tsdockerReleaseProtocol from '@git.zone/tsdocker/dist_ts/classes.rel
26
26
  import * as tspublish from '@git.zone/tspublish';
27
27
  export type { IReleaseCapabilitiesResult, IReleaseCleanupResult, IReleaseDestinationEvidence, IReleaseProbeResult, IReleasePromotionContext, IReleasePromotionResult, IReleaseQualificationRequest, IReleaseQualificationResult, IReleaseValidationResult, TReleasePromotionEvidence, TReleaseProtocolCommand, } from '@git.zone/tsdocker/dist_ts/interfaces/index.js';
28
28
  export declare const smartfs: SmartFs;
29
- export declare const loadDcrouterApi: () => Promise<typeof import("@serve.zone/dcrouter/apiclient")>;
30
- export type { DcRouterApiClient, TestingApi } from '@serve.zone/dcrouter/apiclient';
31
- export type { data as dcrouterData } from '@serve.zone/dcrouter/interfaces';
29
+ export declare const loadDcrouterApi: () => Promise<typeof import("@serve.zone/dcrouter-apiclient")>;
30
+ export type { DcRouterApiClient, TestingApi } from '@serve.zone/dcrouter-apiclient';
31
+ export type { data as dcrouterData } from '@serve.zone/dcrouter-apiclient/interfaces';
32
32
  export { smartlog, smartlogDestinationLocal, smartconfig, path, os, fs, fsConstants, crypto, fsSync, childProcess, tty, projectinfo, smartcli, smartpath, smartpromise, smartupdate, smartshell, smartnetwork, smartfile, smartinteract, smartdelay, objectstorage, s3, tsdockerReleaseProtocol, tspublish, };
@@ -27,6 +27,6 @@ import * as tsdockerReleaseProtocol from '@git.zone/tsdocker/dist_ts/classes.rel
27
27
  import * as tspublish from '@git.zone/tspublish';
28
28
  // Create smartfs instance for filesystem operations
29
29
  export const smartfs = new SmartFs(new SmartFsProviderNode());
30
- export const loadDcrouterApi = () => import('@serve.zone/dcrouter/apiclient');
30
+ export const loadDcrouterApi = () => import('@serve.zone/dcrouter-apiclient');
31
31
  export { smartlog, smartlogDestinationLocal, smartconfig, path, os, fs, fsConstants, crypto, fsSync, childProcess, tty, projectinfo, smartcli, smartpath, smartpromise, smartupdate, smartshell, smartnetwork, smartfile, smartinteract, smartdelay, objectstorage, s3, tsdockerReleaseProtocol, tspublish, };
32
32
  //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL3BsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLFFBQVEsTUFBTSxzQkFBc0IsQ0FBQztBQUNqRCxPQUFPLEtBQUssd0JBQXdCLE1BQU0sd0NBQXdDLENBQUM7QUFDbkYsT0FBTyxLQUFLLFdBQVcsTUFBTSx5QkFBeUIsQ0FBQztBQUN2RCxPQUFPLEtBQUssSUFBSSxNQUFNLE1BQU0sQ0FBQztBQUM3QixPQUFPLEtBQUssRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUM5QixPQUFPLEtBQUssRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQ3ZDLE9BQU8sRUFBRSxTQUFTLElBQUksV0FBVyxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBQ25ELE9BQU8sS0FBSyxNQUFNLE1BQU0sYUFBYSxDQUFDO0FBQ3RDLE9BQU8sS0FBSyxNQUFNLE1BQU0sU0FBUyxDQUFDO0FBQ2xDLE9BQU8sS0FBSyxZQUFZLE1BQU0sb0JBQW9CLENBQUM7QUFDbkQsT0FBTyxLQUFLLEdBQUcsTUFBTSxVQUFVLENBQUM7QUFDaEMsT0FBTyxLQUFLLFdBQVcsTUFBTSx5QkFBeUIsQ0FBQztBQUN2RCxPQUFPLEtBQUssUUFBUSxNQUFNLHNCQUFzQixDQUFDO0FBQ2pELE9BQU8sS0FBSyxTQUFTLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxLQUFLLFlBQVksTUFBTSwwQkFBMEIsQ0FBQztBQUN6RCxPQUFPLEtBQUssV0FBVyxNQUFNLHlCQUF5QixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxVQUFVLE1BQU0sd0JBQXdCLENBQUM7QUFDckQsT0FBTyxLQUFLLFlBQVksTUFBTSwwQkFBMEIsQ0FBQztBQUN6RCxPQUFPLEtBQUssU0FBUyxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sRUFBRSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNuRSxPQUFPLEtBQUssYUFBYSxNQUFNLDJCQUEyQixDQUFDO0FBQzNELE9BQU8sS0FBSyxVQUFVLE1BQU0sd0JBQXdCLENBQUM7QUFFckQsc0JBQXNCO0FBQ3RCLE9BQU8sS0FBSyxhQUFhLE1BQU0sb0NBQW9DLENBQUM7QUFFcEUsT0FBTyxLQUFLLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUN6QyxPQUFPLEtBQUssdUJBQXVCLE1BQU0sdURBQXVELENBQUM7QUFDakcsT0FBTyxLQUFLLFNBQVMsTUFBTSxxQkFBcUIsQ0FBQztBQWdCakQsb0RBQW9EO0FBQ3BELE1BQU0sQ0FBQyxNQUFNLE9BQU8sR0FBRyxJQUFJLE9BQU8sQ0FBQyxJQUFJLG1CQUFtQixFQUFFLENBQUMsQ0FBQztBQUU5RCxNQUFNLENBQUMsTUFBTSxlQUFlLEdBQUcsR0FBRyxFQUFFLENBQUMsTUFBTSxDQUFDLGdDQUFnQyxDQUFDLENBQUM7QUFJOUUsT0FBTyxFQUNMLFFBQVEsRUFDUix3QkFBd0IsRUFDeEIsV0FBVyxFQUNYLElBQUksRUFDSixFQUFFLEVBQ0YsRUFBRSxFQUNGLFdBQVcsRUFDWCxNQUFNLEVBQ04sTUFBTSxFQUNOLFlBQVksRUFDWixHQUFHLEVBQ0gsV0FBVyxFQUNYLFFBQVEsRUFDUixTQUFTLEVBQ1QsWUFBWSxFQUNaLFdBQVcsRUFDWCxVQUFVLEVBQ1YsWUFBWSxFQUNaLFNBQVMsRUFDVCxhQUFhLEVBQ2IsVUFBVSxFQUNWLGFBQWEsRUFDYixFQUFFLEVBQ0YsdUJBQXVCLEVBQ3ZCLFNBQVMsR0FDVixDQUFDIn0=
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@git.zone/cli",
3
3
  "private": false,
4
- "version": "7.0.0",
4
+ "version": "7.1.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",
@@ -44,7 +44,7 @@
44
44
  "@git.zone/tspack": "^1.4.0",
45
45
  "@git.zone/tsrun": "^2.0.6",
46
46
  "@git.zone/tstest": "^6.1.5",
47
- "@types/node": "^26.5.1"
47
+ "@types/node": "^26.6.1"
48
48
  },
49
49
  "dependencies": {
50
50
  "@aws-sdk/client-s3": "3.1095.0",
@@ -77,7 +77,7 @@
77
77
  "@push.rocks/smartshell": "^4.0.0",
78
78
  "@push.rocks/smartunique": "^3.0.9",
79
79
  "@push.rocks/smartupdate": "^2.0.7",
80
- "@serve.zone/dcrouter": "19.1.1",
80
+ "@serve.zone/dcrouter-apiclient": "32.3.0",
81
81
  "prettier": "^3.9.6"
82
82
  },
83
83
  "files": [
@@ -98,7 +98,7 @@
98
98
  ],
99
99
  "scripts": {
100
100
  "test": "(pnpm run testUnit && pnpm run clean && pnpm run prepareTest && pnpm run testCli && pnpm run testFormat && pnpm run testCommit && pnpm run testDeprecate && pnpm run testVersion && pnpm run testReadme && pnpm run testUpdate && pnpm run testTemplateNpm && pnpm run testTemplateLit) && rm -rf .nogit/test",
101
- "testUnit": "tstest 'test.*.node.ts'",
101
+ "testUnit": "tstest 'test/test.*.node.ts'",
102
102
  "build": "tsbuild tsfolders",
103
103
  "clean": "(rm -rf .nogit/test/)",
104
104
  "prepareTest": "(mkdir -p .nogit && git clone https://gitlab.com/sandboxzone/sandbox-npmts.git .nogit/test/)",
package/readme.md CHANGED
@@ -388,7 +388,7 @@ The pnpm release tests cover known command dialects and dynamic version qualific
388
388
  and qualify actual packaging and script-free tarball publication with the active
389
389
  version. Run `testUnit` with each maturity-eligible standalone version and a matching
390
390
  project pin in an isolated checkout. For a focused matrix, invoke the project-local
391
- `tstest` on `test.pnpmrelease.node.ts` from a disposable directory whose
391
+ `tstest` on `test/test.pnpmrelease.node.ts` from a disposable directory whose
392
392
  `package.json` pins that row. Do not wrap these invocations in another `pnpm with`:
393
393
  pnpm rejects nested use. Keep the normal release-age policy for every row.
394
394
 
@@ -848,6 +848,8 @@ gitzone config access public
848
848
  gitzone config migrate 2
849
849
  ```
850
850
 
851
+ `@ship.zone/szci` belongs to szci, which GitZone no longer uses or reads. `gitzone config migrate` and `gitzone format` remove what the block holds without information: an empty `npmGlobalTools` list, an `npmAccessLevel` that `release.targets.npm.accessLevel` already holds (the value moves there when that key is absent), and an `npmRegistryUrl` that `release.targets.npm.registries` already lists. A block left empty is deleted, and every other key stays. This cleanup never adds a publish registry: an `npmRegistryUrl` that the npm target does not list stays in the block. The migration from schema 1 is a separate step and still carries the `npmRegistryUrl` of a schema-1 configuration into `release.targets.npm.registries`. `gitzone config doctor` names the current home of each kept key, for example `@git.zone/tsdocker.registryRepoMap` for `dockerRegistryRepoMap` and `@git.zone/tsdocker.buildArgEnvMap` for `dockerBuildargEnvMap`.
852
+
851
853
  ### Managed Assets
852
854
 
853
855
  Projects can opt into generated, updateable repository assets through `@git.zone/cli.assets`. The first supported kind is `denoBinaryCli`, which manages installer scripts, npm binary wrappers, postinstall downloaders, and Gitea release workflows for Deno-compiled CLI binaries.
@@ -1030,7 +1032,9 @@ gitzone format fix
1030
1032
 
1031
1033
  Formatters include cleanup, smartconfig normalization, dependency license checks, package metadata normalization, template updates, `.gitignore`, TypeScript config, Prettier, README existence checks, and configured copy operations.
1032
1034
 
1033
- 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.
1035
+ The template formatter owns `.vscode/settings.json` and `.vscode/launch.json` in every project, and the Gitea workflows, 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 formatter never creates or changes a `Dockerfile` or `.dockerignore`: they describe the project's own image. `gitzone template service` and `gitzone template website` scaffold a first pnpm-based Dockerfile.
1036
+
1037
+ The Gitea workflows verify and never publish. npm and wcc projects get `default_nottags.yaml` and `default_tags.yaml`, service and website projects `docker_nottags.yaml` and `docker_tags.yaml`. Each runs in `code.foss.global/host.today/ht-docker-node:latest`: a pinned checkout that keeps no credentials, then `pnpm --version`, `pnpm install --frozen-lockfile`, `pnpm build` and `pnpm test`. No setup action installs pnpm: the image's pnpm switches to the version that `package.json` pins in `packageManager`, pnpm 10 included, so the printed version is the one that installs, builds and tests. The switch downloads that version from the npm registry, so the runner needs registry access, which the install needs anyway. They use no secrets and build no images; a tag workflow verifies the tagged commit, and `gitzone release` publishes packages and images. 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.
1034
1038
 
1035
1039
  `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.
1036
1040
 
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@git.zone/cli',
6
- version: '7.0.0',
6
+ version: '7.1.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
  }
@@ -20,9 +20,6 @@ export interface IGitzoneConfigData {
20
20
  legalUrl: string;
21
21
  };
22
22
  copy: { [key: string]: string };
23
- npmciOptions: {
24
- npmAccessLevel: 'public' | 'private';
25
- };
26
23
  }
27
24
 
28
25
  /**
@@ -40,19 +37,6 @@ export class GitzoneConfig {
40
37
  public async readConfigFromCwd() {
41
38
  const smartconfigInstance = new plugins.smartconfig.Smartconfig(paths.cwd);
42
39
  this.data = smartconfigInstance.dataFor<IGitzoneConfigData>('@git.zone/cli', {});
43
-
44
- // Read szci config for backward compatibility
45
- const szciConfig = smartconfigInstance.dataFor<any>('@ship.zone/szci', {});
46
-
47
- // Prefer accessLevel from @git.zone/cli.release, fallback to @ship.zone/szci.npmAccessLevel
48
- const accessLevel =
49
- (this.data as any)?.release?.accessLevel ||
50
- szciConfig?.npmAccessLevel ||
51
- 'public';
52
-
53
- this.data.npmciOptions = {
54
- npmAccessLevel: accessLevel,
55
- };
56
40
  }
57
41
 
58
42
  constructor() {}
@@ -7,6 +7,7 @@ export interface ISmartconfigMigrationResult {
7
7
  }
8
8
 
9
9
  const CLI_NAMESPACE = "@git.zone/cli";
10
+ export const SHIPZONE_NAMESPACE = "@ship.zone/szci";
10
11
 
11
12
  const isPlainObject = (value: unknown): value is Record<string, any> => {
12
13
  return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -57,8 +58,8 @@ const migrateNamespaceKeys = (smartconfigJson: Record<string, any>): boolean =>
57
58
  { oldKey: "gitzone", newKey: CLI_NAMESPACE },
58
59
  { oldKey: "tsdoc", newKey: "@git.zone/tsdoc" },
59
60
  { oldKey: "npmdocker", newKey: "@git.zone/tsdocker" },
60
- { oldKey: "npmci", newKey: "@ship.zone/szci" },
61
- { oldKey: "szci", newKey: "@ship.zone/szci" },
61
+ { oldKey: "npmci", newKey: SHIPZONE_NAMESPACE },
62
+ { oldKey: "szci", newKey: SHIPZONE_NAMESPACE },
62
63
  ];
63
64
 
64
65
  for (const { oldKey, newKey } of migrations) {
@@ -80,13 +81,101 @@ const migrateNamespaceKeys = (smartconfigJson: Record<string, any>): boolean =>
80
81
  return migrated;
81
82
  };
82
83
 
84
+ /**
85
+ * The npm release target, created on request. A value that is not an object
86
+ * anywhere on the path is left alone: an invalid configuration is the
87
+ * doctor's to report, not the migration's to overwrite.
88
+ */
89
+ const resolveNpmTarget = (
90
+ smartconfigJson: Record<string, any>,
91
+ createArg: boolean,
92
+ ): Record<string, any> | undefined => {
93
+ let parent = smartconfigJson;
94
+ for (const key of [CLI_NAMESPACE, "release", "targets", "npm"]) {
95
+ if (parent[key] === undefined && createArg) {
96
+ parent[key] = {};
97
+ }
98
+ if (!isPlainObject(parent[key])) {
99
+ return undefined;
100
+ }
101
+ parent = parent[key];
102
+ }
103
+ return parent;
104
+ };
105
+
106
+ /**
107
+ * gitzone neither writes nor reads the `@ship.zone/szci` namespace any more;
108
+ * the block belongs to szci. This removes what carries no information: szci's
109
+ * default of no global tools, and values the canonical
110
+ * `@git.zone/cli.release.targets.npm` settings already hold. An access level
111
+ * moves there when the canonical key is absent. Every other key stays, and
112
+ * `gitzone config doctor` names its current home. Unlike `migrateToV2` the
113
+ * step is not tied to a schema version, because schema-2 configurations still
114
+ * carry the block; a second run changes nothing.
115
+ */
116
+ const migrateShipzoneNamespace = (smartconfigJson: Record<string, any>): boolean => {
117
+ const shipzoneConfig = smartconfigJson[SHIPZONE_NAMESPACE];
118
+ if (!isPlainObject(shipzoneConfig)) {
119
+ return false;
120
+ }
121
+ let migrated = false;
122
+
123
+ if (
124
+ Array.isArray(shipzoneConfig.npmGlobalTools) &&
125
+ shipzoneConfig.npmGlobalTools.length === 0
126
+ ) {
127
+ delete shipzoneConfig.npmGlobalTools;
128
+ migrated = true;
129
+ }
130
+
131
+ const accessLevel = shipzoneConfig.npmAccessLevel;
132
+ if (accessLevel === "public" || accessLevel === "private") {
133
+ const canonicalAccessLevel = resolveNpmTarget(smartconfigJson, false)?.accessLevel;
134
+ if (canonicalAccessLevel === undefined) {
135
+ const npmTarget = resolveNpmTarget(smartconfigJson, true);
136
+ if (npmTarget) {
137
+ npmTarget.accessLevel = accessLevel;
138
+ delete shipzoneConfig.npmAccessLevel;
139
+ migrated = true;
140
+ }
141
+ } else if (canonicalAccessLevel === accessLevel) {
142
+ delete shipzoneConfig.npmAccessLevel;
143
+ migrated = true;
144
+ }
145
+ }
146
+
147
+ const registryUrl = shipzoneConfig.npmRegistryUrl;
148
+ if (typeof registryUrl === "string" && registryUrl.trim()) {
149
+ const registries = resolveNpmTarget(smartconfigJson, false)?.registries;
150
+ const alreadyListed =
151
+ Array.isArray(registries) &&
152
+ registries.some(
153
+ (registry: unknown) =>
154
+ typeof registry === "string" &&
155
+ registry.trim() !== "" &&
156
+ normalizeRegistryUrl(registry) === normalizeRegistryUrl(registryUrl),
157
+ );
158
+ if (alreadyListed) {
159
+ delete shipzoneConfig.npmRegistryUrl;
160
+ migrated = true;
161
+ }
162
+ }
163
+
164
+ if (Object.keys(shipzoneConfig).length === 0) {
165
+ delete smartconfigJson[SHIPZONE_NAMESPACE];
166
+ migrated = true;
167
+ }
168
+
169
+ return migrated;
170
+ };
171
+
83
172
  const migrateToV2 = (smartconfigJson: Record<string, any>): boolean => {
84
173
  const cliConfig = ensureObject(smartconfigJson, CLI_NAMESPACE);
85
174
  let migrated = migrateLegacyReleaseArray(smartconfigJson);
86
175
  const releaseConfig = ensureObject(cliConfig, "release");
87
176
 
88
177
  const targets = ensureObject(releaseConfig, "targets");
89
- const shipzoneConfig = smartconfigJson["@ship.zone/szci"];
178
+ const shipzoneConfig = smartconfigJson[SHIPZONE_NAMESPACE];
90
179
 
91
180
  if (isPlainObject(releaseConfig.git) && !isPlainObject(targets.git)) {
92
181
  targets.git = releaseConfig.git;
@@ -233,6 +322,12 @@ export const migrateSmartconfigData = (
233
322
  currentVersion = 2;
234
323
  }
235
324
 
325
+ // Runs after migrateToV2, which consumes two keys of the block, so that an
326
+ // emptied block is deleted in the same pass.
327
+ if (targetVersion >= 2) {
328
+ migrated = migrateShipzoneNamespace(smartconfigJson) || migrated;
329
+ }
330
+
236
331
  if (targetVersion === CURRENT_GITZONE_CLI_SCHEMA_VERSION && cliConfig.schemaVersion !== targetVersion) {
237
332
  cliConfig.schemaVersion = targetVersion;
238
333
  migrated = true;
@@ -17,6 +17,7 @@ import {
17
17
  } from "../helpers.smartconfig.js";
18
18
  import {
19
19
  CURRENT_GITZONE_CLI_SCHEMA_VERSION,
20
+ SHIPZONE_NAMESPACE,
20
21
  migrateSmartconfigData,
21
22
  } from "../helpers.smartconfigmigrations.js";
22
23
  import {
@@ -1192,6 +1193,7 @@ async function collectDoctorFindings(): Promise<IDoctorFinding[]> {
1192
1193
  });
1193
1194
  }
1194
1195
  }
1196
+ findings.push(...collectShipzoneNamespaceFindings(smartconfigData));
1195
1197
 
1196
1198
  if (cliConfig.schemaVersion === CURRENT_GITZONE_CLI_SCHEMA_VERSION) {
1197
1199
  findings.push({
@@ -1227,6 +1229,64 @@ async function collectDoctorFindings(): Promise<IDoctorFinding[]> {
1227
1229
  return findings;
1228
1230
  }
1229
1231
 
1232
+ /**
1233
+ * Where each key gitzone once read from `@ship.zone/szci` lives now.
1234
+ */
1235
+ const shipzoneKeyHomes: Record<string, string> = {
1236
+ npmAccessLevel: `${CLI_NAMESPACE}.release.targets.npm.accessLevel`,
1237
+ npmRegistryUrl: `${CLI_NAMESPACE}.release.targets.npm.registries`,
1238
+ dockerRegistryRepoMap: "@git.zone/tsdocker.registryRepoMap",
1239
+ dockerBuildargEnvMap: "@git.zone/tsdocker.buildArgEnvMap",
1240
+ npmGlobalTools: "the devDependencies of package.json",
1241
+ };
1242
+
1243
+ /**
1244
+ * Reports `@ship.zone/szci` as `gitzone config migrate` would leave it: keys
1245
+ * the migration removes need no manual step, and every key it keeps is named
1246
+ * with its current home.
1247
+ */
1248
+ function collectShipzoneNamespaceFindings(
1249
+ smartconfigDataArg: Record<string, any>,
1250
+ ): IDoctorFinding[] {
1251
+ const findings: IDoctorFinding[] = [];
1252
+ const migratedData = structuredClone(smartconfigDataArg);
1253
+ migrateSmartconfigData(migratedData);
1254
+ const keptBlock: unknown = migratedData[SHIPZONE_NAMESPACE];
1255
+
1256
+ if (SHIPZONE_NAMESPACE in smartconfigDataArg) {
1257
+ findings.push({
1258
+ level: "warn",
1259
+ message: `Legacy namespace '${SHIPZONE_NAMESPACE}' is present`,
1260
+ fix:
1261
+ keptBlock === undefined
1262
+ ? "Run `gitzone config migrate`. The block holds only szci defaults and values release.targets.npm already carries, so the migration removes it."
1263
+ : "Run `gitzone config migrate`, then move every key it keeps to its current home.",
1264
+ });
1265
+ }
1266
+ if (keptBlock === undefined) {
1267
+ return findings;
1268
+ }
1269
+ if (!isPlainObject(keptBlock)) {
1270
+ findings.push({
1271
+ level: "warn",
1272
+ message: `${SHIPZONE_NAMESPACE} is not an object`,
1273
+ fix: "Remove it. gitzone does not read it.",
1274
+ });
1275
+ return findings;
1276
+ }
1277
+ for (const key of Object.keys(keptBlock)) {
1278
+ const home = shipzoneKeyHomes[key];
1279
+ findings.push({
1280
+ level: "warn",
1281
+ message: `${SHIPZONE_NAMESPACE}.${key} is not read by gitzone`,
1282
+ fix: home
1283
+ ? `Its current home is ${home}. Move the value there if it still applies, then remove the key.`
1284
+ : "Nothing in gitzone reads it. Remove it once no other tool does.",
1285
+ });
1286
+ }
1287
+ return findings;
1288
+ }
1289
+
1230
1290
  /**
1231
1291
  * Handle services configuration
1232
1292
  */
@@ -36,9 +36,6 @@ export class SmartconfigFormatter extends BaseFormatter {
36
36
  if (!smartconfigJson["@git.zone/cli"]) {
37
37
  smartconfigJson["@git.zone/cli"] = {};
38
38
  }
39
- if (!smartconfigJson["@ship.zone/szci"]) {
40
- smartconfigJson["@ship.zone/szci"] = {};
41
- }
42
39
 
43
40
  const newContent = JSON.stringify(smartconfigJson, null, 2);
44
41
 
@@ -93,10 +93,7 @@ export class TemplatesFormatter extends BaseFormatter {
93
93
  switch (projectType) {
94
94
  case 'npm':
95
95
  case 'wcc':
96
- const accessLevel = (project.gitzoneConfig?.data as any)?.release?.accessLevel
97
- || project.gitzoneConfig?.data?.npmciOptions?.npmAccessLevel;
98
- const ciTemplate = accessLevel === 'public' ? 'ci_default' : 'ci_default_private';
99
- const ciChanges = await this.analyzeTemplate(ciTemplate, [
96
+ const ciChanges = await this.analyzeTemplate('ci_default', [
100
97
  { templatePath: '.gitea/workflows/default_nottags.yaml', destPath: '.gitea/workflows/default_nottags.yaml', merge: 'replace' },
101
98
  { templatePath: '.gitea/workflows/default_tags.yaml', destPath: '.gitea/workflows/default_tags.yaml', merge: 'replace' },
102
99
  ]);
@@ -111,12 +108,8 @@ export class TemplatesFormatter extends BaseFormatter {
111
108
  ]);
112
109
  changes.push(...dockerCiChanges);
113
110
 
114
- const dockerfileChanges = await this.analyzeTemplate('dockerfile_service', [
115
- { templatePath: 'Dockerfile', destPath: 'Dockerfile', merge: 'replace' },
116
- { templatePath: 'dockerignore', destPath: '.dockerignore', merge: 'replace' },
117
- ]);
118
- changes.push(...dockerfileChanges);
119
-
111
+ // A Dockerfile describes the project's own image, so format neither
112
+ // creates nor changes it; `gitzone template` scaffolds a first one.
120
113
  const cliChanges = await this.analyzeTemplate('cli', [
121
114
  { templatePath: 'cli.js', destPath: 'cli.js', merge: 'replace' },
122
115
  { templatePath: 'cli.ts.js', destPath: 'cli.ts.js', merge: 'replace' },
@@ -31,6 +31,10 @@ export class TsconfigFormatter extends BaseFormatter {
31
31
  tsconfigObject.compilerOptions = tsconfigObject.compilerOptions || {};
32
32
  tsconfigObject.compilerOptions.baseUrl = '.';
33
33
  const existingPaths = tsconfigObject.compilerOptions.paths || {};
34
+ // Up to 7.0.1 a descriptor without a name was mapped to the key
35
+ // "undefined". No package has that name, so the entry is not kept as a
36
+ // custom path.
37
+ delete existingPaths.undefined;
34
38
 
35
39
  // Get module paths from tspublish, merging with existing custom paths
36
40
  const tspublishPaths: Record<string, string[]> = {};
@@ -41,7 +45,12 @@ export class TsconfigFormatter extends BaseFormatter {
41
45
 
42
46
  for (const publishModule of Object.keys(publishModules)) {
43
47
  const publishConfig = publishModules[publishModule];
44
- tspublishPaths[`${publishConfig.name}`] = [
48
+ // A descriptor without a name only orders a build folder; it
49
+ // publishes no package that an import path could name.
50
+ if (typeof publishConfig.name !== 'string' || publishConfig.name === '') {
51
+ continue;
52
+ }
53
+ tspublishPaths[publishConfig.name] = [
45
54
  `./${publishModule}/index.js`,
46
55
  ];
47
56
  }
package/ts/plugins.ts CHANGED
@@ -45,9 +45,9 @@ export type {
45
45
  // Create smartfs instance for filesystem operations
46
46
  export const smartfs = new SmartFs(new SmartFsProviderNode());
47
47
 
48
- export const loadDcrouterApi = () => import('@serve.zone/dcrouter/apiclient');
49
- export type { DcRouterApiClient, TestingApi } from '@serve.zone/dcrouter/apiclient';
50
- export type { data as dcrouterData } from '@serve.zone/dcrouter/interfaces';
48
+ export const loadDcrouterApi = () => import('@serve.zone/dcrouter-apiclient');
49
+ export type { DcRouterApiClient, TestingApi } from '@serve.zone/dcrouter-apiclient';
50
+ export type { data as dcrouterData } from '@serve.zone/dcrouter-apiclient/interfaces';
51
51
 
52
52
  export {
53
53
  smartlog,
@@ -1,66 +0,0 @@
1
- name: Default (not tags)
2
-
3
- on:
4
- push:
5
- tags-ignore:
6
- - '**'
7
-
8
- env:
9
- IMAGE: code.foss.global/hosttoday/ht-docker-node:npmci
10
- NPMCI_COMPUTED_REPOURL: https://${-{gitea.repository_owner}-}:${-{secrets.GITEA_TOKEN}-}@{{module.githost}}/${-{gitea.repository}-}.git
11
- NPMCI_TOKEN_NPM: ${-{secrets.NPMCI_TOKEN_NPM}-}
12
- NPMCI_TOKEN_NPM2: ${-{secrets.NPMCI_TOKEN_NPM2}-}
13
- NPMCI_GIT_GITHUBTOKEN: ${-{secrets.NPMCI_GIT_GITHUBTOKEN}-}
14
- NPMCI_URL_CLOUDLY: ${-{secrets.NPMCI_URL_CLOUDLY}-}
15
-
16
- jobs:
17
- security:
18
- runs-on: ubuntu-latest
19
- continue-on-error: true
20
- container:
21
- image: ${-{ env.IMAGE }-}
22
-
23
- steps:
24
- - uses: actions/checkout@v3
25
-
26
- - name: Install pnpm and npmci
27
- run: |
28
- pnpm install -g pnpm
29
- pnpm install -g @ship.zone/npmci
30
-
31
- - name: Run npm prepare
32
- run: npmci npm prepare
33
-
34
- - name: Audit production dependencies
35
- run: |
36
- npmci command npm config set registry https://registry.npmjs.org
37
- npmci command pnpm audit --audit-level=high --prod
38
- continue-on-error: true
39
-
40
- - name: Audit development dependencies
41
- run: |
42
- npmci command npm config set registry https://registry.npmjs.org
43
- npmci command pnpm audit --audit-level=high --dev
44
- continue-on-error: true
45
-
46
- test:
47
- if: ${-{ always() }-}
48
- needs: security
49
- runs-on: ubuntu-latest
50
- container:
51
- image: ${-{ env.IMAGE }-}
52
-
53
- steps:
54
- - uses: actions/checkout@v3
55
-
56
- - name: Test stable
57
- run: |
58
- npmci node install stable
59
- npmci npm install
60
- npmci npm test
61
-
62
- - name: Test build
63
- run: |
64
- npmci node install stable
65
- npmci npm install
66
- npmci npm build