@symbo.ls/cli 2.33.36 → 2.33.37

package/bin/push.js

@@ -16,6 +16,7 @@ import { loadSymbolsConfig, resolveDistDir } from '../helpers/symbolsConfig.js'
 import { loadCliConfig, readLock, writeLock, updateLegacySymbolsJson } from '../helpers/config.js'
 import { stripOrderFields } from '../helpers/orderUtils.js'
 import { augmentProjectWithLocalPackageDependencies, findNearestPackageJson } from '../helpers/dependenciesUtils.js'
+import { stringifyFunctionsForTransport } from '../helpers/transportUtils.js'
 
 
 async function buildLocalProject (distDir) {
@@ -153,8 +154,10 @@ export async function pushProjectChanges(options) {
     console.log(chalk.gray('Server state fetched successfully'))
 
     // Calculate coarse local changes vs server snapshot (or base)
-    const base = normalizeKeys(stripOrderFields(serverProject || {}))
-    const changes = computeCoarseChanges(base, stripOrderFields(localProject))
+    // Prepare safe, JSON-serialisable snapshots for diffing & transport (stringify functions)
+    const base = normalizeKeys(stringifyFunctionsForTransport(stripOrderFields(serverProject || {})))
+    const local = normalizeKeys(stringifyFunctionsForTransport(stripOrderFields(localProject)))
+    const changes = computeCoarseChanges(base, local)
 
     if (!changes.length) {
       console.log(chalk.bold.yellow('\nNo changes to push'))
@@ -169,7 +172,7 @@ export async function pushProjectChanges(options) {
     })
 
     // Confirm push
-    const shouldProceed = await confirmChanges(changes, base, localProject)
+    const shouldProceed = await confirmChanges(changes, base, local)
     if (!shouldProceed) {
       console.log(chalk.yellow('Push cancelled'))
       return
@@ -185,7 +188,7 @@ export async function pushProjectChanges(options) {
     const operationId = `cli-${Date.now()}`
     // Derive granular changes against server base and compute orders using local for pending children
     const { granularChanges } = preprocessChanges(base, changes)
-    const orders = computeOrdersForTuples(stripOrderFields(localProject), granularChanges)
+    const orders = computeOrdersForTuples(local, granularChanges)
     const result = await postProjectChanges(projectId, authToken, {
       branch,
       type,

package/bin/sync.js

@@ -17,6 +17,7 @@ import { showAuthRequiredMessages, showBuildErrorMessages } from '../helpers/bui
 import { loadSymbolsConfig, resolveDistDir } from '../helpers/symbolsConfig.js'
 import { loadCliConfig, readLock, writeLock, getConfigPaths, updateLegacySymbolsJson } from '../helpers/config.js'
 import { stripOrderFields } from '../helpers/orderUtils.js'
+import { stringifyFunctionsForTransport } from '../helpers/transportUtils.js'
 import {
   augmentProjectWithLocalPackageDependencies,
   ensureSchemaDependencies,
@@ -227,9 +228,10 @@ export async function syncProjectChanges(options) {
     ensureSchemaDependencies(localProject)
 
     // Generate coarse local and remote changes via simple three-way rebase
-    const base = normalizeKeys(baseSnapshot || {})
-    const local = normalizeKeys(stripOrderFields(localProject || {}))
-    const remote = normalizeKeys(stripOrderFields(serverProject || {}))
+    // Prepare safe, JSON-serialisable snapshots for diffing & transport (stringify functions)
+    const base = normalizeKeys(stringifyFunctionsForTransport(stripOrderFields(baseSnapshot || {})))
+    const local = normalizeKeys(stringifyFunctionsForTransport(stripOrderFields(localProject || {})))
+    const remote = normalizeKeys(stringifyFunctionsForTransport(stripOrderFields(serverProject || {})))
     const { ours, theirs, conflicts, finalChanges } = threeWayRebase(base, local, remote)
 
     const localChanges = ours

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symbo.ls/cli",
-  "version": "2.33.36",
+  "version": "2.33.37",
   "description": "Fetch your Symbols configuration",
   "main": "bin/fetch.js",
   "author": "Symbols",
@@ -15,9 +15,9 @@
     "vpatch": "npm version patch && npm publish"
   },
   "dependencies": {
-    "@symbo.ls/fetch": "^2.33.36",
-    "@symbo.ls/init": "^2.33.36",
-    "@symbo.ls/socket": "^2.33.36",
+    "@symbo.ls/fetch": "^2.33.37",
+    "@symbo.ls/init": "^2.33.37",
+    "@symbo.ls/socket": "^2.33.37",
     "chalk": "^5.4.1",
     "chokidar": "^4.0.3",
     "commander": "^13.1.0",
@@ -28,5 +28,5 @@
     "socket.io-client": "^4.8.1",
     "v8-compile-cache": "^2.4.0"
   },
-  "gitHead": "c49777e3aee153b8b68f55a2aa9a3a5988483e2f"
+  "gitHead": "383eb71ccab284ca3b27477941b24d7152d51e67"
 }