@symbo.ls/cli 2.34.4 → 2.34.7

package/bin/collab.js

@@ -11,7 +11,7 @@ import { stringifyFunctionsForTransport } from '../helpers/transportUtils.js'
 import { getCurrentProjectData } from '../helpers/apiUtils.js'
 import { computeCoarseChanges, computeOrdersForTuples, preprocessChanges } from '../helpers/changesUtils.js'
 import { createFs } from './fs.js'
-import { stripOrderFields } from '../helpers/orderUtils.js'
+import { applyOrderFields } from '../helpers/orderUtils.js'
 import { normalizeKeys } from '../helpers/compareUtils.js'
 import {
   augmentProjectWithLocalPackageDependencies,
@@ -174,8 +174,8 @@ export async function startCollab(options) {
   }
 
   async function writeProjectAndFs(fullObj) {
-    // Avoid persisting ordering metadata into local repository files
-    const persistedObj = stripOrderFields(fullObj)
+    // Apply platform ordering while avoiding persisting `__order` locally
+    const persistedObj = applyOrderFields(fullObj)
     // Keep schema.dependencies consistent and sync dependencies into local package.json
     try {
       ensureSchemaDependencies(persistedObj)
@@ -229,7 +229,7 @@ export async function startCollab(options) {
   try {
     const { projectPath } = getConfigPaths()
     await fs.promises.mkdir(path.dirname(projectPath), { recursive: true })
-    await fs.promises.writeFile(projectPath, JSON.stringify(stripOrderFields(initialData), null, 2))
+    await fs.promises.writeFile(projectPath, JSON.stringify(applyOrderFields(initialData), null, 2))
   } catch (_) {}
   currentBase = { ...(initialData || {}) }
 
@@ -289,6 +289,13 @@ export async function startCollab(options) {
         : preprocessChanges(currentBase || {}, payload?.changes || []).granularChanges
       if (!Array.isArray(tuples) || !tuples.length) return
       applyTuples(currentBase, tuples)
+      // Apply server-provided ordering metadata so newly added keys don't just
+      // append to the end locally.
+      let orders = payload?.orders
+      if (typeof orders === 'string') {
+        try { orders = JSON.parse(orders) } catch (_) {}
+      }
+      applyOrders(currentBase, orders)
       // If server omits schema.dependencies updates, ensure it's present locally
       ensureSchemaDependencies(currentBase)
       await writeProjectAndFs(currentBase)

package/bin/fetch.js

@@ -13,7 +13,7 @@ import { showAuthRequiredMessages } from '../helpers/buildMessages.js'
 import { loadSymbolsConfig, resolveDistDir } from '../helpers/symbolsConfig.js'
 import { loadCliConfig, readLock, writeLock, updateLegacySymbolsJson, getConfigPaths } from '../helpers/config.js'
 import { ensureSchemaDependencies, findNearestPackageJson, syncPackageJsonDependencies } from '../helpers/dependenciesUtils.js'
-import { stripOrderFields } from '../helpers/orderUtils.js'
+import { applyOrderFields } from '../helpers/orderUtils.js'
 const { isObjectLike } = (utils.default || utils)
 
 const debugMsg = chalk.dim(
@@ -85,7 +85,8 @@ export const fetchFromCli = async (opts) => {
       await fs.promises.mkdir(path.dirname(projectPath), { recursive: true })
       // Ensure schema.dependencies exists for payload.dependencies
       ensureSchemaDependencies(payload)
-      await fs.promises.writeFile(projectPath, JSON.stringify(stripOrderFields(payload), null, 2))
+      const persisted = applyOrderFields(payload)
+      await fs.promises.writeFile(projectPath, JSON.stringify(persisted, null, 2))
     } catch (e) {
       console.error(chalk.bold.red('\nError writing file'))
       if (verbose) console.error(e)
@@ -134,9 +135,9 @@ export const fetchFromCli = async (opts) => {
     }
 
     if (update || force) {
-      createFs(stripOrderFields(payload), distDir, { update: true, metadata: false })
+      createFs(applyOrderFields(payload), distDir, { update: true, metadata: false })
     } else {
-      createFs(stripOrderFields(payload), distDir, { metadata: false })
+      createFs(applyOrderFields(payload), distDir, { metadata: false })
     }
 }
 

package/bin/sync.js

@@ -16,7 +16,7 @@ import { createFs } from './fs.js'
 import { showAuthRequiredMessages, showBuildErrorMessages } from '../helpers/buildMessages.js'
 import { loadSymbolsConfig, resolveDistDir } from '../helpers/symbolsConfig.js'
 import { loadCliConfig, readLock, writeLock, getConfigPaths, updateLegacySymbolsJson } from '../helpers/config.js'
-import { stripOrderFields } from '../helpers/orderUtils.js'
+import { applyOrderFields, stripOrderFields } from '../helpers/orderUtils.js'
 import { stringifyFunctionsForTransport } from '../helpers/transportUtils.js'
 import {
   augmentProjectWithLocalPackageDependencies,
@@ -320,7 +320,8 @@ export async function syncProjectChanges(options) {
 
     // Apply changes to local files
     console.log(chalk.dim('Updating local files...'))
-    await createFs(stripOrderFields(updatedServerData), distDir, { update: true, metadata: false })
+    const orderedUpdatedServerData = applyOrderFields(updatedServerData)
+    await createFs(orderedUpdatedServerData, distDir, { update: true, metadata: false })
     console.log(chalk.gray('Local files updated successfully'))
 
     console.log(chalk.bold.green('\nProject synced successfully!'))
@@ -336,7 +337,7 @@ export async function syncProjectChanges(options) {
     })
     try {
       const { projectPath } = getConfigPaths()
-      await fs.promises.writeFile(projectPath, JSON.stringify(stripOrderFields(updatedServerData), null, 2))
+      await fs.promises.writeFile(projectPath, JSON.stringify(orderedUpdatedServerData, null, 2))
     } catch (_) {}
 
   } catch (error) {

package/helpers/changesUtils.js

@@ -34,6 +34,15 @@ function asPlain(obj) {
   return stripMetaDeep(normalizeKeys(obj || {}))
 }
 
+function getPropCaseInsensitive(obj, key) {
+  if (!obj || typeof obj !== 'object') return undefined
+  // Prefer exact key first to avoid surprises.
+  if (Object.prototype.hasOwnProperty.call(obj, key)) return obj[key]
+  const lower = typeof key === 'string' ? key.toLowerCase() : key
+  if (typeof lower === 'string' && Object.prototype.hasOwnProperty.call(obj, lower)) return obj[lower]
+  return obj[key]
+}
+
 function equal(a, b) {
   // Coarse compare; sufficient for top-level merges
   try {
@@ -49,8 +58,8 @@ export function computeChangedKeys(base, local, keys = DATA_KEYS) {
   const b = asPlain(local)
   // Only consider top-level data keys; ignore 'schema' entirely
   for (const key of [...keys]) {
-    const ak = a?.[key]
-    const bk = b?.[key]
+    const ak = getPropCaseInsensitive(a, key)
+    const bk = getPropCaseInsensitive(b, key)
     if (bk === undefined && ak !== undefined) {
       changed.push(key)
       continue
@@ -72,15 +81,17 @@ export function computeCoarseChanges(base, local, keys = DATA_KEYS) {
   const baseSchema = a?.schema || {}
 
   for (const typeKey of [...keys]) {
-    const aSection = a?.[typeKey] || {}
-    const bSection = b?.[typeKey] || {}
-    const aSchemaSection = baseSchema?.[typeKey] || {}
+    const aSection = getPropCaseInsensitive(a, typeKey) || {}
+    const bSection = getPropCaseInsensitive(b, typeKey) || {}
+    const aSchemaSection = getPropCaseInsensitive(baseSchema, typeKey) || {}
 
     // If sections are not plain objects (or are arrays), fallback to coarse replacement on the section itself
     const aIsObject = aSection && typeof aSection === 'object' && !Array.isArray(aSection)
     const bIsObject = bSection && typeof bSection === 'object' && !Array.isArray(bSection)
     if (!aIsObject || !bIsObject) {
-      if (b?.hasOwnProperty(typeKey) === false && a?.hasOwnProperty(typeKey) === true) {
+      const hasB = Object.prototype.hasOwnProperty.call(b, typeKey) || Object.prototype.hasOwnProperty.call(b, typeKey.toLowerCase())
+      const hasA = Object.prototype.hasOwnProperty.call(a, typeKey) || Object.prototype.hasOwnProperty.call(a, typeKey.toLowerCase())
+      if (!hasB && hasA) {
         changes.push(['delete', [typeKey]])
       } else if (!equal(aSection, bSection)) {
         changes.push(['update', [typeKey], bSection])

package/helpers/orderUtils.js

@@ -43,4 +43,71 @@ export function stripOrderFields(input) {
   return walk(input)
 }
 
+/**
+ * Apply Symbols ordering metadata (`__order`) to object key insertion order,
+ * while removing the `__order` fields from the returned structure.
+ *
+ * This lets us generate deterministic file output (e.g. index.js exports) that
+ * matches the platform ordering without persisting platform metadata into the
+ * repository.
+ *
+ * - Preserves functions and non-plain objects as-is
+ * - Clones arrays and plain objects
+ * - Handles cycles via WeakMap
+ */
+export function applyOrderFields(input) {
+  const seen = new WeakMap()
+
+  function isPlainObject(v) {
+    return Object.prototype.toString.call(v) === '[object Object]'
+  }
+
+  function walk(value) {
+    if (Array.isArray(value)) {
+      if (seen.has(value)) return seen.get(value)
+      const out = new Array(value.length)
+      seen.set(value, out)
+      for (let i = 0; i < value.length; i++) out[i] = walk(value[i])
+      return out
+    }
+
+    if (value && typeof value === 'object') {
+      // Keep non-plain objects (Date, Map, etc.) as-is
+      if (!isPlainObject(value)) return value
+      if (seen.has(value)) return seen.get(value)
+
+      const out = {}
+      seen.set(value, out)
+
+      const order = Array.isArray(value.__order) ? value.__order : null
+      const keys = Object.keys(value).filter((k) => k !== '__order')
+      const used = new Set()
+
+      if (order) {
+        for (let i = 0; i < order.length; i++) {
+          const k = order[i]
+          if (k === '__order') continue
+          if (Object.prototype.hasOwnProperty.call(value, k) && !used.has(k)) {
+            out[k] = walk(value[k])
+            used.add(k)
+          }
+        }
+      }
+
+      for (let i = 0; i < keys.length; i++) {
+        const k = keys[i]
+        if (used.has(k)) continue
+        out[k] = walk(value[k])
+        used.add(k)
+      }
+
+      return out
+    }
+
+    return value
+  }
+
+  return walk(input)
+}
+
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symbo.ls/cli",
-  "version": "2.34.4",
+  "version": "2.34.7",
   "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.34.4",
-    "@symbo.ls/init": "^2.34.4",
-    "@symbo.ls/socket": "^2.34.4",
+    "@symbo.ls/fetch": "^2.34.7",
+    "@symbo.ls/init": "^2.34.7",
+    "@symbo.ls/socket": "^2.34.7",
     "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": "24af4cb709642223c3fa555fa6fb954570c31b6b"
+  "gitHead": "dc0a8d8734cf5720ecad250b62f0eb4ad2b87590"
 }