v2.13.1

changelog.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 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
+
+- Added comprehensive test/ fixture (sandbox-npmts) including package.json, npmextra.json, readme, GitLab CI (.gitlab-ci.yml), .npmrc, VSCode launch/settings and qenv.yml
+- Added test sources and helper files under test/test and test/ts (browser and node tests, commitinfo data, simple library code)
+- Updated dependencies in package.json: @git.zone/tsdoc -> ^1.11.4, @push.rocks/smartfs -> ^1.3.1
+
 ## 2025-12-15 - 2.12.2 - fix(cli)
 noop: no changes
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@git.zone/cli",
   "private": false,
-  "version": "2.12.2",
+  "version": "2.13.1",
   "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",
@@ -67,7 +67,7 @@
     "@types/node": "^25.0.2"
   },
   "dependencies": {
-    "@git.zone/tsdoc": "^1.11.3",
+    "@git.zone/tsdoc": "^1.11.4",
     "@git.zone/tspublish": "^1.10.3",
     "@push.rocks/commitinfo": "^1.0.12",
     "@push.rocks/early": "^4.0.4",
@@ -78,7 +78,7 @@
     "@push.rocks/smartcli": "^4.0.19",
     "@push.rocks/smartdiff": "^1.1.0",
     "@push.rocks/smartfile": "^13.1.2",
-    "@push.rocks/smartfs": "^1.2.0",
+    "@push.rocks/smartfs": "^1.3.1",
     "@push.rocks/smartgulp": "^3.0.4",
     "@push.rocks/smartjson": "^6.0.0",
     "@push.rocks/smartlegal": "^1.0.27",

pnpm-lock.yaml

@@ -9,8 +9,8 @@ importers:
   .:
     dependencies:
       '@git.zone/tsdoc':
-        specifier: ^1.11.3
-        version: 1.11.3(ws@8.18.3)(zod@3.25.76)
+        specifier: ^1.11.4
+        version: 1.11.4(ws@8.18.3)(zod@3.25.76)
       '@git.zone/tspublish':
         specifier: ^1.10.3
         version: 1.10.3
@@ -42,8 +42,8 @@ importers:
         specifier: ^13.1.2
         version: 13.1.2
       '@push.rocks/smartfs':
-        specifier: ^1.2.0
-        version: 1.2.0
+        specifier: ^1.3.1
+        version: 1.3.1
       '@push.rocks/smartgulp':
         specifier: ^3.0.4
         version: 3.0.4
@@ -520,8 +520,8 @@ packages:
     resolution: {integrity: sha512-YD1qMYA/4eOuF57V0ccR+xo6ww1+QOYFA2K5gBPFBDNh9VdfvWxxDhOUybja8lT9PVMoli8PHG5WA5tKJkdXIQ==}
     hasBin: true
 
-  '@git.zone/tsdoc@1.11.3':
-    resolution: {integrity: sha512-U6X9laKv9CTZiqtQpqVMZ2x3qKH1ucey3y16T5UQ70j7wza2GV9rwdkTIHgpYrWFBMSoh909T+ELH8qWbRqimw==}
+  '@git.zone/tsdoc@1.11.4':
+    resolution: {integrity: sha512-KheUOJjm5NjReHkruid7ATTpHSUlTGpOtVGGxAJJhmIJdqIhbxNzT4YQ2RF6jEk/M33Y+OdnSDk77hdn27ZFyw==}
     hasBin: true
 
   '@git.zone/tspublish@1.10.3':
@@ -1093,8 +1093,8 @@ packages:
   '@push.rocks/smartfm@2.2.2':
     resolution: {integrity: sha512-kLrBv/vWXJmB558LI5C79fWXLKOnno998vnp3opfB+uyznT2E6LkcpKsxdjwe1V/r+Z5GlhXPOWmGgHPCzUR6w==}
 
-  '@push.rocks/smartfs@1.2.0':
-    resolution: {integrity: sha512-1R47jJZwX869z7DYgKeAZKTU1SbGnM7W/ZmgsI7AkQQhiascNqY3/gF4V5kIprmuf1WhpRbCbZyum8s7J1LDdg==}
+  '@push.rocks/smartfs@1.3.1':
+    resolution: {integrity: sha512-ZSduVS8tM+/erbyCTvRRvc9gLWwbpqN5xdIIkMr+gub7fowSeJb7tR2rnGwySa63DyimU0q2KTp79VV9YqGLeg==}
 
   '@push.rocks/smartgit@3.3.1':
     resolution: {integrity: sha512-fnyF9Fr5y0ClSFiw/yMAWXlxvteWK2eXJ5i8/wsJcAyWqwTZ9KvMkVe33ofiZ/ZPuQ5JG9CXmoE0MST++5Xv6g==}
@@ -5031,7 +5031,7 @@ snapshots:
       '@push.rocks/smartcli': 4.0.19
       '@push.rocks/smartdelay': 3.0.5
       '@push.rocks/smartfile': 13.1.2
-      '@push.rocks/smartfs': 1.2.0
+      '@push.rocks/smartfs': 1.3.1
       '@push.rocks/smartlog': 3.1.10
       '@push.rocks/smartpath': 6.0.0
       '@push.rocks/smartpromise': 4.2.3
@@ -5050,7 +5050,7 @@ snapshots:
       '@push.rocks/early': 4.0.4
       '@push.rocks/smartcli': 4.0.19
       '@push.rocks/smartdelay': 3.0.5
-      '@push.rocks/smartfs': 1.2.0
+      '@push.rocks/smartfs': 1.3.1
       '@push.rocks/smartlog': 3.1.10
       '@push.rocks/smartlog-destination-local': 9.0.2
       '@push.rocks/smartpath': 6.0.0
@@ -5066,7 +5066,7 @@ snapshots:
       - '@swc/helpers'
       - supports-color
 
-  '@git.zone/tsdoc@1.11.3(ws@8.18.3)(zod@3.25.76)':
+  '@git.zone/tsdoc@1.11.4(ws@8.18.3)(zod@3.25.76)':
     dependencies:
       '@git.zone/tspublish': 1.10.3
       '@push.rocks/early': 4.0.4
@@ -5077,7 +5077,7 @@ snapshots:
       '@push.rocks/smartcli': 4.0.19
       '@push.rocks/smartdelay': 3.0.5
       '@push.rocks/smartfile': 13.1.2
-      '@push.rocks/smartfs': 1.2.0
+      '@push.rocks/smartfs': 1.3.1
       '@push.rocks/smartgit': 3.3.1
       '@push.rocks/smartinteract': 2.0.16
       '@push.rocks/smartlog': 3.1.10
@@ -5888,7 +5888,7 @@ snapshots:
       '@push.rocks/smartai': 0.8.0(typescript@5.9.3)(ws@8.18.3)(zod@3.25.76)
       '@push.rocks/smartbrowser': 2.0.8(typescript@5.9.3)
       '@push.rocks/smartdeno': 1.2.0
-      '@push.rocks/smartfs': 1.2.0
+      '@push.rocks/smartfs': 1.3.1
       '@push.rocks/smartrequest': 5.0.1
       '@push.rocks/smartshell': 3.3.0
       minimatch: 10.1.1
@@ -6099,7 +6099,7 @@ snapshots:
   '@push.rocks/smartdeno@1.2.0':
     dependencies:
       '@push.rocks/smartarchive': 5.0.1
-      '@push.rocks/smartfs': 1.2.0
+      '@push.rocks/smartfs': 1.3.1
       '@push.rocks/smartpath': 6.0.0
       '@push.rocks/smartshell': 3.3.0
       '@push.rocks/smartunique': 3.0.9
@@ -6208,7 +6208,7 @@ snapshots:
       '@push.rocks/lik': 6.2.2
       '@push.rocks/smartdelay': 3.0.5
       '@push.rocks/smartfile-interfaces': 1.0.7
-      '@push.rocks/smartfs': 1.2.0
+      '@push.rocks/smartfs': 1.3.1
       '@push.rocks/smarthash': 3.2.6
       '@push.rocks/smartjson': 5.2.0
       '@push.rocks/smartmime': 2.0.4
@@ -6224,7 +6224,7 @@ snapshots:
     dependencies:
       gray-matter: 4.0.3
 
-  '@push.rocks/smartfs@1.2.0':
+  '@push.rocks/smartfs@1.3.1':
     dependencies:
       '@push.rocks/smartpath': 6.0.0
 
@@ -6580,7 +6580,7 @@ snapshots:
   '@push.rocks/smarts3@3.0.3':
     dependencies:
       '@push.rocks/smartbucket': 4.3.0
-      '@push.rocks/smartfs': 1.2.0
+      '@push.rocks/smartfs': 1.3.1
       '@push.rocks/smartpath': 6.0.0
       '@push.rocks/smartxml': 2.0.0
       '@tsclass/tsclass': 9.3.0

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@git.zone/cli',
-  version: '2.12.2',
+  version: '2.13.1',
   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]) {
-      npmextraJson[newKey] = npmextraJson[oldKey];
+    if (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]) {
-      npmextraJson[newKey] = npmextraJson[oldKey];
+    if (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;
     }