mirror of https://github.com/pyodide/pyodide.git
MAINT Split js2python_init into a separate .js file (#2136)
This commit is contained in:
Hood Chatham
GitHub
parent
6bdd96c964
commit
75aa9ba678
|
|
@ -61,319 +61,5 @@ EM_JS_REF(PyObject*, js2python_convert, (JsRef id, int depth), {
|
|||
return Module.js2python_convert(id, new Map(), depth);
|
||||
});
|
||||
|
||||
EM_JS_NUM(errcode, js2python_init, (), {
|
||||
let PropagateError = Module._PropagatePythonError;
|
||||
function __js2python_string(value)
|
||||
{
|
||||
// The general idea here is to allocate a Python string and then
|
||||
// have JavaScript write directly into its buffer. We first need
|
||||
// to determine if is needs to be a 1-, 2- or 4-byte string, since
|
||||
// Python handles all 3.
|
||||
let max_code_point = 0;
|
||||
let num_code_points = 0;
|
||||
for (let c of value) {
|
||||
num_code_points++;
|
||||
let code_point = c.codePointAt(0);
|
||||
max_code_point =
|
||||
code_point > max_code_point ? code_point : max_code_point;
|
||||
}
|
||||
|
||||
let result = _PyUnicode_New(num_code_points, max_code_point);
|
||||
// clang-format off
|
||||
if (result === 0) {
|
||||
// clang-format on
|
||||
throw new PropagateError();
|
||||
}
|
||||
|
||||
let ptr = _PyUnicode_Data(result);
|
||||
if (max_code_point > 0xffff) {
|
||||
for (let c of value) {
|
||||
HEAPU32[ptr / 4] = c.codePointAt(0);
|
||||
ptr += 4;
|
||||
}
|
||||
} else if (max_code_point > 0xff) {
|
||||
for (let c of value) {
|
||||
HEAPU16[ptr / 2] = c.codePointAt(0);
|
||||
ptr += 2;
|
||||
}
|
||||
} else {
|
||||
for (let c of value) {
|
||||
HEAPU8[ptr] = c.codePointAt(0);
|
||||
ptr += 1;
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
};
|
||||
|
||||
function __js2python_bigint(value)
|
||||
{
|
||||
let value_orig = value;
|
||||
let length = 0;
|
||||
if (value < 0) {
|
||||
value = -value;
|
||||
}
|
||||
while (value) {
|
||||
length++;
|
||||
value >>= BigInt(32);
|
||||
}
|
||||
let stackTop = stackSave();
|
||||
let ptr = stackAlloc(length * 4);
|
||||
value = value_orig;
|
||||
for (let i = 0; i < length; i++) {
|
||||
DEREF_U32(ptr, i) = Number(value & BigInt(0xffffffff));
|
||||
value >>= BigInt(32);
|
||||
}
|
||||
let result = __PyLong_FromByteArray(ptr,
|
||||
length * 4 /* length in bytes */,
|
||||
true /* little endian */,
|
||||
true /* signed? */);
|
||||
stackRestore(stackTop);
|
||||
return result;
|
||||
};
|
||||
|
||||
/**
|
||||
* This function converts immutable types. numbers, bigints, strings,
|
||||
* booleans, undefined, and null are converted. PyProxies are unwrapped.
|
||||
*
|
||||
* If `value` is of any other type then `undefined` is returned.
|
||||
*
|
||||
* If `value` is one of those types but an error is raised during conversion,
|
||||
* we throw a PropagateError to propogate the error out to C. This causes
|
||||
* special handling in the EM_JS wrapper.
|
||||
*/
|
||||
Module._js2python_convertImmutable = function(value)
|
||||
{
|
||||
let result = __js2python_convertImmutableInner(value);
|
||||
// clang-format off
|
||||
if (result === 0) {
|
||||
// clang-format on
|
||||
throw new PropagateError();
|
||||
}
|
||||
return result;
|
||||
};
|
||||
|
||||
function __js2python_convertImmutableInner(value)
|
||||
{
|
||||
let type = typeof value;
|
||||
// clang-format off
|
||||
if (type === 'string') {
|
||||
return __js2python_string(value);
|
||||
} else if (type === 'number') {
|
||||
if(Number.isSafeInteger(value)){
|
||||
return _PyLong_FromDouble(value);
|
||||
} else {
|
||||
return _PyFloat_FromDouble(value);
|
||||
}
|
||||
} else if(type === "bigint"){
|
||||
return __js2python_bigint(value);
|
||||
} else if (value === undefined || value === null) {
|
||||
return __js2python_none();
|
||||
} else if (value === true) {
|
||||
return __js2python_true();
|
||||
} else if (value === false) {
|
||||
return __js2python_false();
|
||||
} else if (Module.isPyProxy(value)) {
|
||||
return __js2python_pyproxy(Module.PyProxy_getPtr(value));
|
||||
}
|
||||
// clang-format on
|
||||
return undefined;
|
||||
};
|
||||
|
||||
function __js2python_convertList(obj, cache, depth)
|
||||
{
|
||||
let list = _PyList_New(obj.length);
|
||||
// clang-format off
|
||||
if (list === 0) {
|
||||
// clang-format on
|
||||
return 0;
|
||||
}
|
||||
let entryid = 0;
|
||||
let item = 0;
|
||||
try {
|
||||
cache.set(obj, list);
|
||||
for (let i = 0; i < obj.length; i++) {
|
||||
entryid = Module.hiwire.new_value(obj[i]);
|
||||
item = Module.js2python_convert(entryid, cache, depth);
|
||||
// clang-format off
|
||||
// PyList_SetItem steals a reference to item no matter what
|
||||
_Py_IncRef(item);
|
||||
if (_PyList_SetItem(list, i, item) === -1) {
|
||||
// clang-format on
|
||||
throw new PropagateError();
|
||||
}
|
||||
Module.hiwire.decref(entryid);
|
||||
entryid = 0;
|
||||
_Py_DecRef(item);
|
||||
item = 0;
|
||||
}
|
||||
} catch (e) {
|
||||
Module.hiwire.decref(entryid);
|
||||
_Py_DecRef(item);
|
||||
_Py_DecRef(list);
|
||||
throw e;
|
||||
}
|
||||
|
||||
return list;
|
||||
};
|
||||
|
||||
function __js2python_convertMap(obj, entries, cache, depth)
|
||||
{
|
||||
let dict = _PyDict_New();
|
||||
// clang-format off
|
||||
if (dict === 0) {
|
||||
// clang-format on
|
||||
return 0;
|
||||
}
|
||||
let key_py = 0;
|
||||
let value_id = 0;
|
||||
let value_py = 0;
|
||||
try {
|
||||
cache.set(obj, dict);
|
||||
for (let[key_js, value_js] of entries) {
|
||||
key_py = Module._js2python_convertImmutable(key_js);
|
||||
// clang-format off
|
||||
if (key_py === undefined) {
|
||||
// clang-format on
|
||||
let key_type =
|
||||
(key_js.constructor && key_js.constructor.name) || typeof(key_js);
|
||||
// clang-format off
|
||||
throw new Error(`Cannot use key of type ${key_type} as a key to a Python dict`);
|
||||
// clang-format on
|
||||
}
|
||||
value_id = Module.hiwire.new_value(value_js);
|
||||
value_py = Module.js2python_convert(value_id, cache, depth);
|
||||
|
||||
// clang-format off
|
||||
if (_PyDict_SetItem(dict, key_py, value_py) === -1) {
|
||||
// clang-format on
|
||||
throw new PropagateError();
|
||||
}
|
||||
_Py_DecRef(key_py);
|
||||
key_py = 0;
|
||||
Module.hiwire.decref(value_id);
|
||||
value_id = 0;
|
||||
_Py_DecRef(value_py);
|
||||
value_py = 0;
|
||||
}
|
||||
} catch (e) {
|
||||
_Py_DecRef(key_py);
|
||||
Module.hiwire.decref(value_id);
|
||||
_Py_DecRef(value_py);
|
||||
_Py_DecRef(dict);
|
||||
throw e;
|
||||
}
|
||||
return dict;
|
||||
};
|
||||
|
||||
function __js2python_convertSet(obj, cache, depth)
|
||||
{
|
||||
let set = _PySet_New(0);
|
||||
// clang-format off
|
||||
if (set === 0) {
|
||||
// clang-format on
|
||||
return 0;
|
||||
}
|
||||
let key_py = 0;
|
||||
try {
|
||||
cache.set(obj, set);
|
||||
for (let key_js of obj) {
|
||||
key_py = Module._js2python_convertImmutable(key_js);
|
||||
// clang-format off
|
||||
if (key_py === undefined) {
|
||||
// clang-format on
|
||||
let key_type =
|
||||
(key_js.constructor && key_js.constructor.name) || typeof(key_js);
|
||||
// clang-format off
|
||||
throw new Error(`Cannot use key of type ${key_type} as a key to a Python set`);
|
||||
// clang-format on
|
||||
}
|
||||
let errcode = _PySet_Add(set, key_py);
|
||||
// clang-format off
|
||||
if (errcode === -1) {
|
||||
// clang-format on
|
||||
throw new PropagateError();
|
||||
}
|
||||
_Py_DecRef(key_py);
|
||||
key_py = 0;
|
||||
}
|
||||
} catch (e) {
|
||||
_Py_DecRef(key_py);
|
||||
_Py_DecRef(set);
|
||||
throw e;
|
||||
}
|
||||
return set;
|
||||
};
|
||||
|
||||
function checkBoolIntCollision(obj, ty)
|
||||
{
|
||||
if (obj.has(1) && obj.has(true)) {
|
||||
throw new Error(`Cannot faithfully convert ${
|
||||
ty } into Python since it ` +
|
||||
"contains both 1 and true as keys.");
|
||||
}
|
||||
if (obj.has(0) && obj.has(false)) {
|
||||
throw new Error(`Cannot faithfully convert ${
|
||||
ty } into Python since it ` +
|
||||
"contains both 0 and false as keys.");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert mutable types: Array, Map, Set, and Objects whose prototype is
|
||||
* either null or the default. Anything else is wrapped in a Proxy. This
|
||||
* should only be used on values for which __js2python_convertImmutable
|
||||
* returned `undefined`.
|
||||
*/
|
||||
function __js2python_convertOther(id, value, cache, depth)
|
||||
{
|
||||
let toStringTag = Object.prototype.toString.call(value);
|
||||
// clang-format off
|
||||
if (Array.isArray(value) || value === "[object HTMLCollection]" ||
|
||||
value === "[object NodeList]") {
|
||||
return __js2python_convertList(value, cache, depth);
|
||||
}
|
||||
if (toStringTag === "[object Map]" || value instanceof Map) {
|
||||
checkBoolIntCollision(value, "Map");
|
||||
return __js2python_convertMap(value, value.entries(), cache, depth);
|
||||
}
|
||||
if (toStringTag === "[object Set]" || value instanceof Set) {
|
||||
checkBoolIntCollision(value, "Set");
|
||||
return __js2python_convertSet(value, cache, depth);
|
||||
}
|
||||
if (toStringTag === "[object Object]" && (value.constructor === undefined || value.constructor.name === "Object")) {
|
||||
return __js2python_convertMap(value, Object.entries(value), cache, depth);
|
||||
}
|
||||
if (toStringTag === "[object ArrayBuffer]" || ArrayBuffer.isView(value)){
|
||||
let [format_utf8, itemsize] = Module.get_buffer_datatype(value);
|
||||
return _JsBuffer_CopyIntoMemoryView(id, value.byteLength, format_utf8, itemsize);
|
||||
}
|
||||
// clang-format on
|
||||
return _JsProxy_create(id);
|
||||
};
|
||||
|
||||
/**
|
||||
* Convert a JavaScript object to Python to a given depth. The `cache`
|
||||
* argument should be a new empty map (it is needed for recursive calls).
|
||||
*/
|
||||
Module.js2python_convert = function(id, cache, depth)
|
||||
{
|
||||
let value = Module.hiwire.get_value(id);
|
||||
let result = Module._js2python_convertImmutable(value);
|
||||
// clang-format off
|
||||
if (result !== undefined) {
|
||||
return result;
|
||||
}
|
||||
if (depth === 0) {
|
||||
return _JsProxy_create(id);
|
||||
}
|
||||
result = cache.get(value);
|
||||
if (result !== undefined) {
|
||||
return result;
|
||||
}
|
||||
// clang-format on
|
||||
return __js2python_convertOther(id, value, cache, depth - 1);
|
||||
};
|
||||
|
||||
return 0;
|
||||
})
|
||||
#include "include_js_file.h"
|
||||
#include "js2python.js"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,294 @@
|
|||
JS_FILE(js2python_init, () => {
|
||||
0, 0; /* Magic, see include_js_file.h */
|
||||
let PropagateError = Module._PropagatePythonError;
|
||||
function __js2python_string(value) {
|
||||
// The general idea here is to allocate a Python string and then
|
||||
// have JavaScript write directly into its buffer. We first need
|
||||
// to determine if is needs to be a 1-, 2- or 4-byte string, since
|
||||
// Python handles all 3.
|
||||
let max_code_point = 0;
|
||||
let num_code_points = 0;
|
||||
for (let c of value) {
|
||||
num_code_points++;
|
||||
let code_point = c.codePointAt(0);
|
||||
max_code_point =
|
||||
code_point > max_code_point ? code_point : max_code_point;
|
||||
}
|
||||
|
||||
let result = _PyUnicode_New(num_code_points, max_code_point);
|
||||
if (result === 0) {
|
||||
throw new PropagateError();
|
||||
}
|
||||
|
||||
let ptr = _PyUnicode_Data(result);
|
||||
if (max_code_point > 0xffff) {
|
||||
for (let c of value) {
|
||||
HEAPU32[ptr / 4] = c.codePointAt(0);
|
||||
ptr += 4;
|
||||
}
|
||||
} else if (max_code_point > 0xff) {
|
||||
for (let c of value) {
|
||||
HEAPU16[ptr / 2] = c.codePointAt(0);
|
||||
ptr += 2;
|
||||
}
|
||||
} else {
|
||||
for (let c of value) {
|
||||
HEAPU8[ptr] = c.codePointAt(0);
|
||||
ptr += 1;
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
function __js2python_bigint(value) {
|
||||
let value_orig = value;
|
||||
let length = 0;
|
||||
if (value < 0) {
|
||||
value = -value;
|
||||
}
|
||||
while (value) {
|
||||
length++;
|
||||
value >>= BigInt(32);
|
||||
}
|
||||
let stackTop = stackSave();
|
||||
let ptr = stackAlloc(length * 4);
|
||||
value = value_orig;
|
||||
for (let i = 0; i < length; i++) {
|
||||
ASSIGN_U32(ptr, i, Number(value & BigInt(0xffffffff)));
|
||||
value >>= BigInt(32);
|
||||
}
|
||||
let result = __PyLong_FromByteArray(
|
||||
ptr,
|
||||
length * 4 /* length in bytes */,
|
||||
true /* little endian */,
|
||||
true /* signed? */
|
||||
);
|
||||
stackRestore(stackTop);
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* This function converts immutable types. numbers, bigints, strings,
|
||||
* booleans, undefined, and null are converted. PyProxies are unwrapped.
|
||||
*
|
||||
* If `value` is of any other type then `undefined` is returned.
|
||||
*
|
||||
* If `value` is one of those types but an error is raised during conversion,
|
||||
* we throw a PropagateError to propogate the error out to C. This causes
|
||||
* special handling in the EM_JS wrapper.
|
||||
*/
|
||||
Module._js2python_convertImmutable = function (value) {
|
||||
let result = __js2python_convertImmutableInner(value);
|
||||
if (result === 0) {
|
||||
throw new PropagateError();
|
||||
}
|
||||
return result;
|
||||
};
|
||||
|
||||
function __js2python_convertImmutableInner(value) {
|
||||
let type = typeof value;
|
||||
if (type === "string") {
|
||||
return __js2python_string(value);
|
||||
} else if (type === "number") {
|
||||
if (Number.isSafeInteger(value)) {
|
||||
return _PyLong_FromDouble(value);
|
||||
} else {
|
||||
return _PyFloat_FromDouble(value);
|
||||
}
|
||||
} else if (type === "bigint") {
|
||||
return __js2python_bigint(value);
|
||||
} else if (value === undefined || value === null) {
|
||||
return __js2python_none();
|
||||
} else if (value === true) {
|
||||
return __js2python_true();
|
||||
} else if (value === false) {
|
||||
return __js2python_false();
|
||||
} else if (Module.isPyProxy(value)) {
|
||||
return __js2python_pyproxy(Module.PyProxy_getPtr(value));
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
|
||||
function __js2python_convertList(obj, cache, depth) {
|
||||
let list = _PyList_New(obj.length);
|
||||
if (list === 0) {
|
||||
return 0;
|
||||
}
|
||||
let entryid = 0;
|
||||
let item = 0;
|
||||
try {
|
||||
cache.set(obj, list);
|
||||
for (let i = 0; i < obj.length; i++) {
|
||||
entryid = Module.hiwire.new_value(obj[i]);
|
||||
item = Module.js2python_convert(entryid, cache, depth);
|
||||
// PyList_SetItem steals a reference to item no matter what
|
||||
_Py_IncRef(item);
|
||||
if (_PyList_SetItem(list, i, item) === -1) {
|
||||
throw new PropagateError();
|
||||
}
|
||||
Module.hiwire.decref(entryid);
|
||||
entryid = 0;
|
||||
_Py_DecRef(item);
|
||||
item = 0;
|
||||
}
|
||||
} catch (e) {
|
||||
Module.hiwire.decref(entryid);
|
||||
_Py_DecRef(item);
|
||||
_Py_DecRef(list);
|
||||
throw e;
|
||||
}
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
function __js2python_convertMap(obj, entries, cache, depth) {
|
||||
let dict = _PyDict_New();
|
||||
if (dict === 0) {
|
||||
return 0;
|
||||
}
|
||||
let key_py = 0;
|
||||
let value_id = 0;
|
||||
let value_py = 0;
|
||||
try {
|
||||
cache.set(obj, dict);
|
||||
for (let [key_js, value_js] of entries) {
|
||||
key_py = Module._js2python_convertImmutable(key_js);
|
||||
if (key_py === undefined) {
|
||||
let key_type =
|
||||
(key_js.constructor && key_js.constructor.name) || typeof key_js;
|
||||
throw new Error(
|
||||
`Cannot use key of type ${key_type} as a key to a Python dict`
|
||||
);
|
||||
}
|
||||
value_id = Module.hiwire.new_value(value_js);
|
||||
value_py = Module.js2python_convert(value_id, cache, depth);
|
||||
|
||||
if (_PyDict_SetItem(dict, key_py, value_py) === -1) {
|
||||
throw new PropagateError();
|
||||
}
|
||||
_Py_DecRef(key_py);
|
||||
key_py = 0;
|
||||
Module.hiwire.decref(value_id);
|
||||
value_id = 0;
|
||||
_Py_DecRef(value_py);
|
||||
value_py = 0;
|
||||
}
|
||||
} catch (e) {
|
||||
_Py_DecRef(key_py);
|
||||
Module.hiwire.decref(value_id);
|
||||
_Py_DecRef(value_py);
|
||||
_Py_DecRef(dict);
|
||||
throw e;
|
||||
}
|
||||
return dict;
|
||||
}
|
||||
|
||||
function __js2python_convertSet(obj, cache, depth) {
|
||||
let set = _PySet_New(0);
|
||||
if (set === 0) {
|
||||
return 0;
|
||||
}
|
||||
let key_py = 0;
|
||||
try {
|
||||
cache.set(obj, set);
|
||||
for (let key_js of obj) {
|
||||
key_py = Module._js2python_convertImmutable(key_js);
|
||||
if (key_py === undefined) {
|
||||
let key_type =
|
||||
(key_js.constructor && key_js.constructor.name) || typeof key_js;
|
||||
throw new Error(
|
||||
`Cannot use key of type ${key_type} as a key to a Python set`
|
||||
);
|
||||
}
|
||||
let errcode = _PySet_Add(set, key_py);
|
||||
if (errcode === -1) {
|
||||
throw new PropagateError();
|
||||
}
|
||||
_Py_DecRef(key_py);
|
||||
key_py = 0;
|
||||
}
|
||||
} catch (e) {
|
||||
_Py_DecRef(key_py);
|
||||
_Py_DecRef(set);
|
||||
throw e;
|
||||
}
|
||||
return set;
|
||||
}
|
||||
|
||||
function checkBoolIntCollision(obj, ty) {
|
||||
if (obj.has(1) && obj.has(true)) {
|
||||
throw new Error(
|
||||
`Cannot faithfully convert ${ty} into Python since it ` +
|
||||
"contains both 1 and true as keys."
|
||||
);
|
||||
}
|
||||
if (obj.has(0) && obj.has(false)) {
|
||||
throw new Error(
|
||||
`Cannot faithfully convert ${ty} into Python since it ` +
|
||||
"contains both 0 and false as keys."
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert mutable types: Array, Map, Set, and Objects whose prototype is
|
||||
* either null or the default. Anything else is wrapped in a Proxy. This
|
||||
* should only be used on values for which __js2python_convertImmutable
|
||||
* returned `undefined`.
|
||||
*/
|
||||
function __js2python_convertOther(id, value, cache, depth) {
|
||||
let toStringTag = Object.prototype.toString.call(value);
|
||||
if (
|
||||
Array.isArray(value) ||
|
||||
value === "[object HTMLCollection]" ||
|
||||
value === "[object NodeList]"
|
||||
) {
|
||||
return __js2python_convertList(value, cache, depth);
|
||||
}
|
||||
if (toStringTag === "[object Map]" || value instanceof Map) {
|
||||
checkBoolIntCollision(value, "Map");
|
||||
return __js2python_convertMap(value, value.entries(), cache, depth);
|
||||
}
|
||||
if (toStringTag === "[object Set]" || value instanceof Set) {
|
||||
checkBoolIntCollision(value, "Set");
|
||||
return __js2python_convertSet(value, cache, depth);
|
||||
}
|
||||
if (
|
||||
toStringTag === "[object Object]" &&
|
||||
(value.constructor === undefined || value.constructor.name === "Object")
|
||||
) {
|
||||
return __js2python_convertMap(value, Object.entries(value), cache, depth);
|
||||
}
|
||||
if (toStringTag === "[object ArrayBuffer]" || ArrayBuffer.isView(value)) {
|
||||
let [format_utf8, itemsize] = Module.get_buffer_datatype(value);
|
||||
return _JsBuffer_CopyIntoMemoryView(
|
||||
id,
|
||||
value.byteLength,
|
||||
format_utf8,
|
||||
itemsize
|
||||
);
|
||||
}
|
||||
return _JsProxy_create(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert a JavaScript object to Python to a given depth. The `cache`
|
||||
* argument should be a new empty map (it is needed for recursive calls).
|
||||
*/
|
||||
Module.js2python_convert = function (id, cache, depth) {
|
||||
let value = Module.hiwire.get_value(id);
|
||||
let result = Module._js2python_convertImmutable(value);
|
||||
if (result !== undefined) {
|
||||
return result;
|
||||
}
|
||||
if (depth === 0) {
|
||||
return _JsProxy_create(id);
|
||||
}
|
||||
result = cache.get(value);
|
||||
if (result !== undefined) {
|
||||
return result;
|
||||
}
|
||||
return __js2python_convertOther(id, value, cache, depth - 1);
|
||||
};
|
||||
});
|
||||
|
|
@ -12,6 +12,7 @@
|
|||
#define DEREF_F32(addr, offset) HEAPF32[(addr >> 2) + offset]
|
||||
#define DEREF_F64(addr, offset) HEAPF64[(addr >> 3) + offset]
|
||||
|
||||
#define ASSIGN_U32(addr, offset, value) DEREF_U32(addr, offset) = value
|
||||
#if WASM_BIGINT
|
||||
// We have HEAPU64 / HEAPI64 in this case.
|
||||
#define DEREF_U64(addr, offset) HEAPU64[(addr >> 3) + offset]
|
||||
|
|
|
|||
Loading…
Reference in New Issue