improvement(utils): adopt shared compareStrings and isRecordLike over local copies

Author: waleedlatif1

apps/sim/ee/scim/lib/protocol/canonical.ts

@@ -1,9 +1,10 @@
 import type { ScimUserAttributes, ScimUserEmail } from '@sim/db/schema'
+import { isRecordLike } from '@sim/utils/object'
 import { isValidEmailSyntax } from '@sim/utils/string'
 import type { ScimGroupWriteParsed, ScimUserWriteParsed } from '@/lib/api/contracts/scim'
 import { SCIM_ENTERPRISE_USER_SCHEMA } from '@/ee/scim/lib/protocol/constants'
 import { invalidValue } from '@/ee/scim/lib/protocol/errors'
-import { isRecord, isScimPasswordAttribute } from '@/ee/scim/lib/protocol/normalize'
+import { isScimPasswordAttribute } from '@/ee/scim/lib/protocol/normalize'
 
 /** Attributes Sim models itself; everything else is preserved under `extra`. */
 const MODELLED_USER_KEYS = new Set([
@@ -111,7 +112,7 @@ export function toCanonicalUser(body: ScimUserWriteParsed): ScimUserAttributes {
     ...(displayName ? { displayName, displayNameSource: 'provider' as const } : {}),
     name,
     emails,
-    ...(isRecord(enterprise) ? { enterprise: normalizeEnterprise(enterprise) } : {}),
+    ...(isRecordLike(enterprise) ? { enterprise: normalizeEnterprise(enterprise) } : {}),
     ...(extra ? { extra } : {}),
   }
 }
@@ -142,7 +143,7 @@ function normalizeEnterprise(value: Record<string, unknown>): EnterpriseAttribut
   const manager = value.manager
   if (typeof manager === 'string' && manager.trim()) {
     enterprise.manager = { value: manager.trim() }
-  } else if (isRecord(manager)) {
+  } else if (isRecordLike(manager)) {
     const managerValue = text(manager.value)
     const displayName = text(manager.displayName)
     if (managerValue || displayName) {
@@ -195,6 +196,6 @@ export function toCanonicalGroup(body: ScimGroupWriteParsed): CanonicalScimGroup
 /** Reads the member id out of a PATCH value entry, which may be bare or wrapped. */
 export function readMemberValue(entry: unknown): string {
   if (typeof entry === 'string') return entry.trim()
-  if (isRecord(entry) && typeof entry.value === 'string') return entry.value.trim()
+  if (isRecordLike(entry) && typeof entry.value === 'string') return entry.value.trim()
   throw invalidValue('Group member entries require a value')
 }

apps/sim/ee/scim/lib/protocol/group-patch.ts

@@ -1,7 +1,8 @@
+import { isRecordLike } from '@sim/utils/object'
 import type { ScimPatchOperation } from '@/lib/api/contracts/scim'
 import { readMemberValue } from '@/ee/scim/lib/protocol/canonical'
 import { invalidPath, invalidValue, mutability, noTarget } from '@/ee/scim/lib/protocol/errors'
-import { isRecord, normalizeAttributePath } from '@/ee/scim/lib/protocol/normalize'
+import { normalizeAttributePath } from '@/ee/scim/lib/protocol/normalize'
 
 /**
  * A parsed Group PATCH.
@@ -86,7 +87,7 @@ export function parseGroupPatch(operations: readonly ScimPatchOperation[]): Grou
 
     if (!operation.path) {
       const value = operation.value
-      if (!isRecord(value)) {
+      if (!isRecordLike(value)) {
         throw invalidValue('A PATCH operation without a path requires an object value')
       }
       incremental = false

apps/sim/ee/scim/lib/protocol/normalize.ts

@@ -1,3 +1,4 @@
+import { isRecordLike } from '@sim/utils/object'
 /**
  * Tolerances for what identity providers actually send, as distinct from what
  * RFC 7644 describes.
@@ -35,11 +36,6 @@ export function unwrapSingleElement(value: unknown): unknown {
   return Array.isArray(value) && value.length === 1 ? value[0] : value
 }
 
-/** True when the value is a plain object rather than an array or null. */
-export function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === 'object' && value !== null && !Array.isArray(value)
-}
-
 /**
  * Strips a schema URN prefix from an attribute path and decodes it.
  *
@@ -94,7 +90,7 @@ export function canonicalizeAttributeNames(
   body: unknown,
   canonicalNames: readonly string[]
 ): unknown {
-  if (!isRecord(body)) return body
+  if (!isRecordLike(body)) return body
   const byLower = new Map(canonicalNames.map((name) => [name.toLowerCase(), name]))
   const result: Record<string, unknown> = {}
   for (const [key, value] of Object.entries(body)) {

apps/sim/ee/scim/lib/protocol/resources.ts

@@ -1,4 +1,5 @@
 import type { ScimUserAttributes } from '@sim/db/schema'
+import { isRecordLike } from '@sim/utils/object'
 import {
   SCIM_ENTERPRISE_USER_SCHEMA,
   SCIM_GROUP_SCHEMA,
@@ -7,11 +8,7 @@ import {
   SCIM_USER_SCHEMA,
 } from '@/ee/scim/lib/protocol/constants'
 import { invalidValue } from '@/ee/scim/lib/protocol/errors'
-import {
-  isRecord,
-  isScimPasswordAttribute,
-  normalizeAttributePath,
-} from '@/ee/scim/lib/protocol/normalize'
+import { isScimPasswordAttribute, normalizeAttributePath } from '@/ee/scim/lib/protocol/normalize'
 
 export interface ScimResourceMeta {
   resourceType: 'User' | 'Group'
@@ -291,7 +288,7 @@ function projectAttribute(
       .filter((entry) => entry !== undefined)
     return included || projected.length > 0 ? projected : undefined
   }
-  if (!isRecord(value)) return included ? value : undefined
+  if (!isRecordLike(value)) return included ? value : undefined
   const projected: Record<string, unknown> = {}
   for (const [key, nested] of Object.entries(value)) {
     const selected = projectAttribute(

apps/sim/ee/scim/lib/protocol/user-patch.ts

@@ -1,8 +1,8 @@
 import type { ScimUserAttributes, ScimUserEmail } from '@sim/db/schema'
+import { isRecordLike } from '@sim/utils/object'
 import type { ScimPatchOperation } from '@/lib/api/contracts/scim'
 import { invalidPath, invalidValue, mutability, noTarget } from '@/ee/scim/lib/protocol/errors'
 import {
-  isRecord,
   isScimPasswordAttribute,
   normalizeAttributePath,
   normalizeScimBoolean,
@@ -89,7 +89,7 @@ function normalizeEmailList(
   const entries = Array.isArray(value) ? value : [value]
   const normalized: ScimUserEmail[] = []
   for (const entry of entries) {
-    if (!isRecord(entry)) throw invalidValue(`${attribute} entries must be objects`)
+    if (!isRecordLike(entry)) throw invalidValue(`${attribute} entries must be objects`)
     const address = requireString(entry.value, `${attribute}.value`)
     normalized.push({
       value: address.toLowerCase(),
@@ -146,7 +146,7 @@ function applyOperation(
         else user.enterprise = undefined
         return
       }
-      if (!isRecord(value)) throw invalidValue(`${path} requires an object value`)
+      if (!isRecordLike(value)) throw invalidValue(`${path} requires an object value`)
       for (const [sub, nested] of sortFormattedLast(Object.entries(value))) {
         applyOperation(user, op, `${path}.${sub}`, nested)
       }
@@ -253,7 +253,7 @@ function applyOperation(
         user.enterprise.manager = { value: unwrapped }
         return
       }
-      if (isRecord(unwrapped)) {
+      if (isRecordLike(unwrapped)) {
         user.enterprise.manager = {
           ...(typeof unwrapped.value === 'string' ? { value: unwrapped.value } : {}),
           ...(typeof unwrapped.displayName === 'string'
@@ -301,7 +301,7 @@ function extensionTarget(
       ...(path.length > existing.length ? { attribute: path.slice(existing.length + 1) } : {}),
     }
   }
-  if (resourceAttribute && isRecord(value)) return { schema: path }
+  if (resourceAttribute && isRecordLike(value)) return { schema: path }
   const separator = path.lastIndexOf(':')
   if (separator <= 'urn:'.length) throw invalidPath(`User PATCH path ${path} is not supported`)
   return { schema: path.slice(0, separator), attribute: path.slice(separator + 1) }
@@ -329,14 +329,14 @@ function applyExtraOperation(
     if (!extension.attribute) {
       if (op === 'remove') delete user.extra[extension.schema]
       else {
-        if (!isRecord(value)) throw invalidValue(`${path} requires an object value`)
+        if (!isRecordLike(value)) throw invalidValue(`${path} requires an object value`)
         const current = user.extra[extension.schema]
-        user.extra[extension.schema] = { ...(isRecord(current) ? current : {}), ...value }
+        user.extra[extension.schema] = { ...(isRecordLike(current) ? current : {}), ...value }
       }
       return
     }
     const current = user.extra[extension.schema]
-    const attributes = isRecord(current) ? { ...current } : {}
+    const attributes = isRecordLike(current) ? { ...current } : {}
     applyExtraAttribute(attributes, op, extension.attribute, value)
     user.extra[extension.schema] = attributes
     return
@@ -368,18 +368,18 @@ function applyExtraAttribute(
   if (type) {
     const list = Array.isArray(attributes[attribute]) ? [...attributes[attribute]] : []
     const index = list.findIndex(
-      (entry) => isRecord(entry) && String(entry.type).toLowerCase() === type.toLowerCase()
+      (entry) => isRecordLike(entry) && String(entry.type).toLowerCase() === type.toLowerCase()
     )
     if (op === 'remove' && !sub) {
       if (index !== -1) list.splice(index, 1)
     } else if (sub) {
       if (op === 'remove' && index === -1) return
-      const current = index !== -1 && isRecord(list[index]) ? list[index] : { type }
+      const current = index !== -1 && isRecordLike(list[index]) ? list[index] : { type }
       const key = Object.keys(current).find((key) => key.toLowerCase() === sub.toLowerCase()) ?? sub
       const next = { ...current, [key]: op === 'remove' ? undefined : value }
       if (index === -1) list.push(next)
       else list[index] = next
-    } else if (isRecord(value)) {
+    } else if (isRecordLike(value)) {
       if (index === -1) list.push({ type, ...value })
       else list[index] = { ...(list[index] as Record<string, unknown>), ...value }
     } else {
@@ -389,7 +389,7 @@ function applyExtraAttribute(
     return
   }
 
-  const current = isRecord(attributes[attribute]) ? { ...attributes[attribute] } : {}
+  const current = isRecordLike(attributes[attribute]) ? { ...attributes[attribute] } : {}
   const key = Object.keys(current).find((key) => key.toLowerCase() === sub.toLowerCase()) ?? sub
   current[key] = op === 'remove' ? undefined : value
   attributes[attribute] = current
@@ -404,7 +404,7 @@ function applyExtraAttribute(
  */
 function sortDeep(value: unknown): unknown {
   if (Array.isArray(value)) return value.map(sortDeep)
-  if (!isRecord(value)) return value
+  if (!isRecordLike(value)) return value
   const sorted: Record<string, unknown> = {}
   for (const key of Object.keys(value).sort()) sorted[key] = sortDeep(value[key])
   return sorted
@@ -454,7 +454,7 @@ export function applyUserPatch(
 
     if (!operation.path) {
       const value = operation.value
-      if (!isRecord(value)) {
+      if (!isRecordLike(value)) {
         throw invalidValue('A PATCH operation without a path requires an object value')
       }
       /**

apps/sim/executor/utils/file-tool-processor.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { toError } from '@sim/utils/errors'
-import { omit } from '@sim/utils/object'
+import { isRecordLike, omit } from '@sim/utils/object'
 import { isCanonicalBase64 } from '@/lib/api/contracts/primitives'
 import { isUserFile, type UserFileLike } from '@/lib/core/utils/user-file'
 import {
@@ -16,10 +16,6 @@ import type { ToolDefinition } from '@/tools/types'
 
 const logger = createLogger('FileToolProcessor')
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === 'object' && value !== null && !Array.isArray(value)
-}
-
 /** Strip a data URI prefix while preserving legitimate zero-byte payloads. */
 function stripBase64DataUri(value: string): string {
   return /^data:[^,]*;base64,/i.test(value) ? value.slice(value.indexOf(',') + 1) : value
@@ -113,7 +109,7 @@ export class FileToolProcessor {
         const files = outputDef.type === 'file[]' && Array.isArray(value) ? value : [value]
         for (const file of files) {
           signal?.throwIfAborted()
-          if (!isRecord(file)) throw new Error('File output must be a file object')
+          if (!isRecordLike(file)) throw new Error('File output must be a file object')
           if (isUserFile(file)) {
             if (file.base64 !== undefined) replacements.set(file, omit(file, ['base64']))
             continue
@@ -137,15 +133,15 @@ export class FileToolProcessor {
       })
       if (replacements.size === 0) return toolOutput
       const output = replaceFileReferences(toolOutput, replacements)
-      if (!isRecord(output)) throw new Error('Tool file output must be an object')
+      if (!isRecordLike(output)) throw new Error('Tool file output must be an object')
       return output
     }
     if (pendingFiles.size === 0) return present([])
     return storeInternalToolFileResult(
       createInternalToolFilesResult([...pendingFiles.values()], present),
       context,
       (output) => {
-        if (!isRecord(output)) throw new Error('Tool file output must be an object')
+        if (!isRecordLike(output)) throw new Error('Tool file output must be an object')
         return output
       },
       signal
@@ -178,7 +174,7 @@ export class FileToolProcessor {
         data instanceof ArrayBuffer
           ? Buffer.from(data)
           : Buffer.from(data.buffer, data.byteOffset, data.byteLength)
-    } else if (Array.isArray(data) || (isRecord(data) && data.type === 'Buffer')) {
+    } else if (Array.isArray(data) || (isRecordLike(data) && data.type === 'Buffer')) {
       const bytes = Array.isArray(data) ? data : data.data
       if (!Array.isArray(bytes)) throw new Error(`Invalid serialized buffer format for ${name}`)
       assertFileSize(bytes.length, name, remainingBytes)

apps/sim/executor/utils/resolved-secret-matcher-capacity.ts

@@ -1,14 +1,10 @@
+import { compareStrings } from '@sim/utils/string'
+
 const MAX_MATCHER_NODES = 250_000
 const MAX_SECRET_LITERAL_LENGTH = 64 * 1024
 
 export type ResolvedSecretMatcherCapacityFailure = 'literal-too-long' | 'node-limit-exceeded'
 
-function compareStrings(left: string, right: string): number {
-  if (left < right) return -1
-  if (left > right) return 1
-  return 0
-}
-
 function commonPrefixLength(left: string, right: string): number {
   const limit = Math.min(left.length, right.length)
   let index = 0

apps/sim/executor/utils/resolved-secret-matcher.ts

@@ -1,3 +1,4 @@
+import { compareStrings } from '@sim/utils/string'
 import { MAX_INLINE_MATERIALIZATION_BYTES } from '@/lib/execution/payloads/limits'
 import { isNonIdentifyingSecretLiteral } from '@/executor/utils/resolved-secret-match-policy'
 import { getResolvedSecretMatcherCapacityFailure } from '@/executor/utils/resolved-secret-matcher-capacity'
@@ -49,12 +50,6 @@ class ResolvedSecretMatcherError extends Error {
   }
 }
 
-function compareStrings(left: string, right: string): number {
-  if (left < right) return -1
-  if (left > right) return 1
-  return 0
-}
-
 function createMatcherFromReplacements(
   replacements: readonly SecretReplacement[]
 ): ResolvedSecretMatcher {

apps/sim/executor/utils/resolved-secret-trace-registry.ts

@@ -1,5 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { getErrorMessage } from '@sim/utils/errors'
+import { compareStrings } from '@sim/utils/string'
 import { decryptSecret } from '@/lib/core/security/encryption'
 import { isLargeArrayManifest } from '@/lib/execution/payloads/large-array-manifest-metadata'
 import { isLargeValueRef } from '@/lib/execution/payloads/large-value-ref'
@@ -443,12 +444,6 @@ export interface CreateResolvedSecretTraceRegistryOptions {
   workspaceUnredactedKeys?: readonly string[]
 }
 
-function compareStrings(left: string, right: string): number {
-  if (left < right) return -1
-  if (left > right) return 1
-  return 0
-}
-
 function cloneProvenanceScope(scope: ResolvedSecretTraceScopeV1): ResolvedSecretTraceScopeV1 {
   return {
     userId: scope.userId,

apps/sim/lib/execution/durable-secret-provenance.ts

@@ -1,5 +1,6 @@
 import { createHash } from 'node:crypto'
 import type { DurableSecretProvenanceEntry } from '@sim/db/schema'
+import { compareStrings } from '@sim/utils/string'
 import {
   isPrivateSecretProvenanceBundleV1,
   type PrivateSecretProvenanceBundleV1,
@@ -24,10 +25,6 @@ export const EXACT_EMPTY_DURABLE_SECRET_PROVENANCE = Object.freeze({
   entries: Object.freeze([]),
 })
 
-function compareStrings(left: string, right: string): number {
-  return left < right ? -1 : left > right ? 1 : 0
-}
-
 /** Normalizes one private sidecar payload and enforces the shared resource bounds. */
 export function normalizeDurableSecretProvenanceEntries(
   value: unknown