mirrors/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-15 07:22:27 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

jsgen: fix direct map key access and map.len (fix #24616, fix #24605) (#24620)

Browse source
This commit is contained in:
Gonzalo Chumillas 2025-05-31 06:00:34 +01:00 • committed by GitHub
parent bb2d605653
commit b84512d408
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 69 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
vlib/builtin/js/map.js.v
View file

@ -8,11 +8,11 @@ pub:
fn (mut m map) internal_set(key JS.Any, val JS.Any) {
//$if es5 {
#if ('$toJS' in key) key = key.$toJS();
#if (key.hasOwnProperty('$toJS')) key = key.$toJS();
#if (!(key in m.val.map)) m.val.length++;
#m.val.map[key] = val
/*} $else {
# if ('$toJS' in key) key = key.$toJS();
# if (key.hasOwnProperty('$toJS')) key = key.$toJS();
# m.val.m.set(key,val);
}*/
_ := key
@ -22,10 +22,10 @@ fn (mut m map) internal_set(key JS.Any, val JS.Any) {
fn (mut m map) internal_get(key JS.Any) JS.Any {
mut val := JS.Any(unsafe { nil })
//$if es5 {
#if (typeof key != "string" && '$toJS' in key) key = key.$toJS();
#if (typeof key != "string" && key.hasOwnProperty('$toJS')) key = key.$toJS();
#val = m.val.map[key]
/*} $else {
# if ('$toJS' in key) key = key.$toJS();
# if (key.hasOwnProperty('$toJS')) key = key.$toJS();
# val = m.val.m.get(key)
}*/
_ := key
@ -34,11 +34,11 @@ fn (mut m map) internal_get(key JS.Any) JS.Any {
#map.prototype.get = function (key) { return map_internal_get(this,key); }
#map.prototype.set = function(key,val) { map_internal_set(this,key,val); }
#map.prototype.has = function (key) { if (typeof key != "string" && '$toJS' in key) { key = key.$toJS() } return key in this.map; }
#map.prototype.has = function (key) { if (typeof key != "string" && key.hasOwnProperty('$toJS')) { key = key.$toJS() } return key in this.map; }
// Removes the mapping of a particular key from the map.
@[unsafe]
pub fn (mut m map) delete(key JS.Any) {
#let k = '$toJS' in key ? key.$toJS() : key;
#let k = key.hasOwnProperty('$toJS') ? key.$toJS() : key;
#if (delete m.val.map[k]) { m.val.length--; };