v2.13.2

changelog.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 2025-12-16 - 2.13.2 - fix(deps)
+bump @git.zone/tspublish to ^1.11.0
+
+- Updated dependency @git.zone/tspublish from ^1.10.3 to ^1.11.0 in package.json
+
+## 2025-12-16 - 2.13.1 - fix(npmextra)
+merge old npmextra keys into new keys during migration, preserving existing new values
+
+- Changed migration logic to merge data when both old and new keys exist instead of skipping the merge.
+- Merge preserves existing new-key values (old values do not overwrite new ones) and still deletes the old key after migration.
+- Applied the fix in both ts/mod_format/format.npmextra.ts and ts/mod_format/formatters/npmextra.formatter.ts.
+- Adds a console log for successful migrations; behavior for single-key rename remains unchanged.
+
 ## 2025-12-16 - 2.13.0 - feat(tests)
 feat(tests): add sandbox test fixture, CI and editor configs; bump deps
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@git.zone/cli",
   "private": false,
-  "version": "2.13.0",
+  "version": "2.13.2",
   "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.",
   "main": "dist_ts/index.ts",
   "typings": "dist_ts/index.d.ts",
@@ -68,7 +68,7 @@
   },
   "dependencies": {
     "@git.zone/tsdoc": "^1.11.4",
-    "@git.zone/tspublish": "^1.10.3",
+    "@git.zone/tspublish": "^1.11.0",
     "@push.rocks/commitinfo": "^1.0.12",
     "@push.rocks/early": "^4.0.4",
     "@push.rocks/gulp-function": "^3.0.7",

pnpm-lock.yaml

@@ -12,8 +12,8 @@ importers:
         specifier: ^1.11.4
         version: 1.11.4(ws@8.18.3)(zod@3.25.76)
       '@git.zone/tspublish':
-        specifier: ^1.10.3
+        specifier: ^1.11.0
-        version: 1.10.3
+        version: 1.11.0
       '@push.rocks/commitinfo':
         specifier: ^1.0.12
         version: 1.0.12
@@ -524,8 +524,8 @@ packages:
     resolution: {integrity: sha512-KheUOJjm5NjReHkruid7ATTpHSUlTGpOtVGGxAJJhmIJdqIhbxNzT4YQ2RF6jEk/M33Y+OdnSDk77hdn27ZFyw==}
     hasBin: true
 
-  '@git.zone/tspublish@1.10.3':
+  '@git.zone/tspublish@1.11.0':
-    resolution: {integrity: sha512-o2/jvNsdLC8SRdH1kQ7JjNOQNu9el0FpJ/QOW3mgiC5C9reuTp18iU4kijsVVLgvw4KZv6Z289SoKPh3HPsS0g==}
+    resolution: {integrity: sha512-dkgaDBTzZJ53lAV72r7OW/W7l/KqpkncFuPojr11JO35OKAbjjDhZbAwPv4oGX9NplyXrhC5VJRPNX/orqNTHA==}
     hasBin: true
 
   '@git.zone/tsrun@2.0.1':
@@ -5026,7 +5026,7 @@ snapshots:
 
   '@git.zone/tsbuild@4.0.2':
     dependencies:
-      '@git.zone/tspublish': 1.10.3
+      '@git.zone/tspublish': 1.11.0
       '@push.rocks/early': 4.0.4
       '@push.rocks/smartcli': 4.0.19
       '@push.rocks/smartdelay': 3.0.5
@@ -5068,7 +5068,7 @@ snapshots:
 
   '@git.zone/tsdoc@1.11.4(ws@8.18.3)(zod@3.25.76)':
     dependencies:
-      '@git.zone/tspublish': 1.10.3
+      '@git.zone/tspublish': 1.11.0
       '@push.rocks/early': 4.0.4
       '@push.rocks/npmextra': 5.3.3
       '@push.rocks/qenv': 6.1.3
@@ -5101,16 +5101,18 @@ snapshots:
       - ws
       - zod
 
-  '@git.zone/tspublish@1.10.3':
+  '@git.zone/tspublish@1.11.0':
     dependencies:
       '@push.rocks/consolecolor': 2.0.3
+      '@push.rocks/npmextra': 5.3.3
       '@push.rocks/smartcli': 4.0.19
       '@push.rocks/smartdelay': 3.0.5
-      '@push.rocks/smartfile': 11.2.7
+      '@push.rocks/smartfile': 13.1.2
+      '@push.rocks/smartfs': 1.3.1
       '@push.rocks/smartlog': 3.1.10
       '@push.rocks/smartnpm': 2.0.6
       '@push.rocks/smartpath': 6.0.0
-      '@push.rocks/smartrequest': 4.4.2
+      '@push.rocks/smartrequest': 5.0.1
       '@push.rocks/smartshell': 3.3.0
     transitivePeerDependencies:
       - '@nuxt/kit'

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@git.zone/cli',
-  version: '2.13.0',
+  version: '2.13.2',
   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.'
 }

ts/mod_format/format.npmextra.ts

@@ -16,8 +16,17 @@ const migrateNamespaceKeys = (npmextraJson: any): boolean => {
     { oldKey: 'szci', newKey: '@ship.zone/szci' },
   ];
   for (const { oldKey, newKey } of migrations) {
-    if (npmextraJson[oldKey] && !npmextraJson[newKey]) {
+    if (npmextraJson[oldKey]) {
-      npmextraJson[newKey] = npmextraJson[oldKey];
+      if (!npmextraJson[newKey]) {
+        // New key doesn't exist - simple rename
+        npmextraJson[newKey] = npmextraJson[oldKey];
+      } else {
+        // New key exists - merge old into new (old values don't overwrite new)
+        npmextraJson[newKey] = {
+          ...npmextraJson[oldKey],
+          ...npmextraJson[newKey],
+        };
+      }
       delete npmextraJson[oldKey];
       migrated = true;
       console.log(`Migrated npmextra.json: ${oldKey} -> ${newKey}`);

ts/mod_format/formatters/npmextra.formatter.ts

@@ -16,8 +16,17 @@ const migrateNamespaceKeys = (npmextraJson: any): boolean => {
     { oldKey: 'szci', newKey: '@ship.zone/szci' },
   ];
   for (const { oldKey, newKey } of migrations) {
-    if (npmextraJson[oldKey] && !npmextraJson[newKey]) {
+    if (npmextraJson[oldKey]) {
-      npmextraJson[newKey] = npmextraJson[oldKey];
+      if (!npmextraJson[newKey]) {
+        // New key doesn't exist - simple rename
+        npmextraJson[newKey] = npmextraJson[oldKey];
+      } else {
+        // New key exists - merge old into new (old values don't overwrite new)
+        npmextraJson[newKey] = {
+          ...npmextraJson[oldKey],
+          ...npmextraJson[newKey],
+        };
+      }
       delete npmextraJson[oldKey];
       migrated = true;
     }