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

improvement(variables): changed object validation to support JavaScript object notation in addition to strict JSON

Browse Source
This commit is contained in:
Emir Karabeg
2025-05-15 16:05:33 -07:00
parent 0621caf5a5
commit 4bbc2b243c
2 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
apps/sim/app/w/[id]/components/panel/components/variables/variables.tsx
View File

@@ -179,22 +179,26 @@ export function Variables({ panelWidth }: VariablesProps) {
case 'object':
try {
// Handle both JavaScript and JSON syntax
let valueToValidate = String(variable.value).trim()
let valueToEvaluate = String(variable.value).trim()
// If it's clearly JS syntax, convert it to valid JSON
if (valueToValidate.includes("'") || /\b\w+\s*:/.test(valueToValidate)) {
// Replace JS single quotes with double quotes, but handle escaped quotes correctly
valueToValidate = valueToValidate
.replace(/(\w+)\s*:/g, '"$1":') // Convert unquoted property names to quoted
.replace(/'/g, '"') // Replace single quotes with double quotes
// Basic security check to prevent arbitrary code execution
if (!valueToEvaluate.startsWith('{') || !valueToEvaluate.endsWith('}')) {
return 'Not a valid object format'
}
const parsed = JSON.parse(valueToValidate)
return !parsed || typeof parsed !== 'object' || Array.isArray(parsed)
? 'Not a valid JSON object'
: undefined
} catch {
return 'Invalid JSON object syntax'
// Use Function constructor to safely evaluate the object expression
// This is safer than eval() and handles all JS object literal syntax
const parsed = new Function(`return ${valueToEvaluate}`)()
// Verify it's actually an object (not array or null)
if (parsed === null || typeof parsed !== 'object' || Array.isArray(parsed)) {
return 'Not a valid object'
}
return undefined // Valid object
} catch (e) {
console.log('Object parsing error:', e)
return 'Invalid object syntax'
}
case 'array':
try {

25
apps/sim/stores/panel/variables/store.ts
View File

@@ -53,12 +53,27 @@ function validateVariable(variable: Variable): string | undefined {
case 'object':
// Check if it's a valid JSON object
try {
const parsed = JSON.parse(String(variable.value))
if (parsed === null || typeof parsed !== 'object' || Array.isArray(parsed)) {
return 'Not a valid JSON object'
// Handle both JavaScript and JSON syntax
let valueToEvaluate = String(variable.value).trim()
// Basic security check to prevent arbitrary code execution
if (!valueToEvaluate.startsWith('{') || !valueToEvaluate.endsWith('}')) {
return 'Not a valid object format'
}
} catch {
return 'Invalid JSON object syntax'
// Use Function constructor to safely evaluate the object expression
// This handles both JSON and JS object literal syntax
const parsed = new Function(`return ${valueToEvaluate}`)()
// Verify it's actually an object (not array or null)
if (parsed === null || typeof parsed !== 'object' || Array.isArray(parsed)) {
return 'Not a valid object'
}
return undefined // Valid object
} catch (e) {
console.log('Object parsing error:', e)
return 'Invalid object syntax'
}
break
case 'array':