github/sim
1
0
Fork 0
mirror of https://github.com/simstudioai/sim.git synced 2026-01-09 23:17:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert utils.ts back so evalator doesn't have JSON issue

Browse Source
This commit is contained in:
Waleed Latif
2025-02-13 18:05:31 -08:00
parent 5dc45509c1
commit 071e370de8
1 changed files with 6 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
executor/utils.ts
View File

@@ -1,16 +1,3 @@
function stringifyValue(value: any): string {
if (typeof value === 'string') {
return `"${value.replace(/"/g, '\\"').replace(/\n/g, '\\n')}"`
} else if (value === null) {
return 'null'
} else if (typeof value === 'undefined') {
return 'undefined'
} else if (typeof value === 'object') {
return JSON.stringify(value)
}
return String(value)
}
export function resolveEnvVariables(value: any, environmentVariables: Record<string, string>): any {
if (typeof value === 'string') {
const envMatches = value.match(/\{\{([^}]+)\}\}/g)
@@ -46,36 +33,29 @@ export function resolveBlockReferences(
): string {
const blockMatches = value.match(/<([^>]+)>/g)
let resolvedValue = value
if (blockMatches) {
for (const match of blockMatches) {
// e.g. "<someBlockId.response>"
const path = match.slice(1, -1)
const [blockRef, ...pathParts] = path.split('.')
let sourceBlock = blockById.get(blockRef)
if (!sourceBlock) {
const normalized = blockRef.toLowerCase().replace(/\s+/g, '')
sourceBlock = blockByName.get(normalized)
}
if (!sourceBlock) {
throw new Error(`Block reference "${blockRef}" was not found.`)
}
if (sourceBlock.enabled === false) {
throw new Error(
`Block "${sourceBlock.metadata?.title}" is disabled, and block "${currentBlockTitle}" depends on it.`
)
}
const sourceState = contextBlockStates.get(sourceBlock.id)
if (!sourceState) {
throw new Error(
`No state found for block "${sourceBlock.metadata?.title}" (ID: ${sourceBlock.id}).`
)
}
// Drill into the property path.
let replacementValue: any = sourceState
for (const part of pathParts) {
@@ -84,29 +64,13 @@ export function resolveBlockReferences(
}
replacementValue = replacementValue[part]
}
if (replacementValue !== undefined) {
// For condition blocks, we need to properly stringify the value
const isConditionBlock =
value.includes('!==') ||
value.includes('===') ||
value.includes('>=') ||
value.includes('<=') ||
value.includes('>') ||
value.includes('<') ||
value.includes('&&') ||
value.includes('||')
if (isConditionBlock) {
resolvedValue = resolvedValue.replace(match, stringifyValue(replacementValue))
} else {
resolvedValue = resolvedValue.replace(
match,
typeof replacementValue === 'object'
? JSON.stringify(replacementValue)
: String(replacementValue)
)
}
resolvedValue = resolvedValue.replace(
match,
typeof replacementValue === 'object'
? JSON.stringify(replacementValue)
: String(replacementValue)
)
} else {
throw new Error(
`No value found at path "${path}" in block "${sourceBlock.metadata?.title}".`
@@ -114,6 +78,5 @@ export function resolveBlockReferences(
}
}
}
return resolvedValue
}