Fixed: Make the isa property on classes not enumerable. (#3100)

As we have a tool-free bridges between many classes and JavaScript types by setting the isa property on the type, for example CPArray and Array. Using the for...in enumeration the isa property will be included in the loop if the property is enumerable (this is the default behavior). This commit set the property as not enumerable.

Also added test case for check that the isa property on classes are not enumerable using a for...in loop.
This commit is contained in:
Martin Carlberg authored and GitHub committed 2025-05-14 10:09:01 +02:00
1 parent 2f563fb870
commit 86d595b086
10 files changed
+173 -13

No files matched your search

+12 -1
View File
@@ -360,4 +360,15 @@ var concat = Array.prototype.concat,
@end
Array.prototype.isa = _CPJavaScriptArray;
if (Array.prototype.isa !== _CPJavaScriptArray)
{
Object.defineProperties(Array.prototype,
{
isa:
{
value: _CPJavaScriptArray,
enumerable: false,
writable: true
}
});
}
+24 -2
View File
@@ -214,5 +214,27 @@
@end
CFData.prototype.isa = CPData;
CFMutableData.prototype.isa = CPData;
if (CFData.prototype.isa !== CPData)
{
Object.defineProperties(CFData.prototype,
{
isa:
{
value: CPData,
enumerable: false,
writable: true
}
})
};
if (CFMutableData.prototype.isa !== CPData)
{
Object.defineProperties(CFMutableData.prototype,
{
isa:
{
value: CPData,
enumerable: false,
writable: true
}
});
}
+12 -1
View File
@@ -286,7 +286,18 @@ Date.parseISO8601 = function (date)
return timestamp;
};
Date.prototype.isa = CPDate;
if (Date.prototype.isa !== CPDate)
{
Object.defineProperties(Date.prototype,
{
isa:
{
value: CPDate,
enumerable: false,
writable: true
}
});
}
function _isNumberType(value)
{
+24 -2
View File
@@ -751,5 +751,27 @@ var CPDictionaryMaxDescriptionRecursion = 10;
@end
CFDictionary.prototype.isa = CPDictionary;
CFMutableDictionary.prototype.isa = CPMutableDictionary;
if (CFDictionary.prototype.isa !== CPDictionary)
{
Object.defineProperties(CFDictionary.prototype,
{
isa:
{
value: CPDictionary,
enumerable: false,
writable: true
}
});
}
if (CFMutableDictionary.prototype.isa !== CPMutableDictionary)
{
Object.defineProperties(CFMutableDictionary.prototype,
{
isa:
{
value: CPMutableDictionary,
enumerable: false,
writable: true
}
});
}
+12 -1
View File
@@ -166,5 +166,16 @@ var CPErrorCodeKey = @"CPErrorCodeKey",
@end
CFError.prototype.isa = CPError;
if (CFError.prototype.isa !== CPError)
{
Object.defineProperties(CFError.prototype,
{
isa:
{
value: CPError,
enumerable: false,
writable: true
}
});
}
+24 -2
View File
@@ -222,8 +222,30 @@ var CPExceptionNameKey = @"CPExceptionNameKey",
// toll-free bridge Error to CPException
// [CPException alloc] uses an objj_exception, which is a subclass of Error
Error.prototype.isa = CPException;
Error.prototype._userInfo = null;
if (Error.prototype.isa !== CPException)
{
Object.defineProperties(Error.prototype,
{
isa:
{
value: CPException,
enumerable: false,
writable: true
}
});
}
if (Error.prototype._userInfo !== null)
{
Object.defineProperties(Error.prototype,
{
_userInfo:
{
value: null,
enumerable: false,
writable: true
}
});
}
[CPException initialize];
+25 -2
View File
@@ -346,6 +346,29 @@ FIXME: Do we need this?
@end
Number.prototype.isa = CPNumber;
Boolean.prototype.isa = CPNumber;
if (Number.prototype.isa !== CPNumber)
{
Object.defineProperties(Number.prototype,
{
isa:
{
value: CPNumber,
enumerable: false,
writable: true
}
});
}
if (Boolean.prototype.isa !== CPNumber)
{
Object.defineProperties(Boolean.prototype,
{
isa:
{
value: CPNumber,
enumerable: false,
writable: true
}
});
}
[CPNumber initialize];
+12 -1
View File
@@ -1010,4 +1010,15 @@ String.prototype.stripDiacritics = function()
return output;
};
String.prototype.isa = CPString;
if (String.prototype.isa !== CPString)
{
Object.defineProperties(String.prototype,
{
isa:
{
value: CPString,
enumerable: false,
writable: true
}
})
};
+12 -1
View File
@@ -260,4 +260,15 @@ var CPURLURLStringKey = @"CPURLURLStringKey",
@end
CFURL.prototype.isa = [CPURL class];
if (CFURL.prototype.isa !== CPURL)
{
Object.defineProperties(CFURL.prototype,
{
isa:
{
value: CPURL,
enumerable: false,
writable: true
}
})
};
+16
View File
@@ -722,6 +722,22 @@
}];
}
// As we have a tool-free bridges between many classes and JavaScript types by setting the isa property
// on the type, for example Array and CPArray. Using the for...in enumeration the isa property should not
// be included in the loop as the property is now not enumerable.
- (void)testLoopingArrayWithForIn
{
let array = @[@"a", @"b", @"c", @"d"],
i = 0;
for (const element in array) {
i = i + 1;
element + element; // Remove warning that the variable is never read
}
[self assert:i equals:4];
}
@end
@implementation AlwaysEqual : CPObject