jprdonnelly/pyscript
1
0
Fork 0
mirror of https://github.com/pyscript/pyscript.git synced 2025-12-19 18:27:29 -05:00
Code Issues Projects Releases Wiki Activity

same thread syncify (#1372)

Browse Source 
Switch to using the new version of synclink with support for same thread syncify (and also correct types). 
Uses syncify to replace one use of `_unwrapped_remote`.
This commit is contained in:
Hood Chatham
2023-04-11 21:31:05 -07:00
committed by GitHub
parent e3602f464b
commit fc5089ac59
6 changed files with 83 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
pyscriptjs/package-lock.json generated
View File

@@ -7,7 +7,7 @@
"": {
"name": "pyscript",
"version": "0.0.1",
"dependencies": {
"devDependencies": {
"@codemirror/commands": "^6.2.2",
"@codemirror/lang-python": "^6.1.2",
"@codemirror/language": "^6.6.0",
@@ -15,16 +15,13 @@
"@codemirror/theme-one-dark": "^6.1.1",
"@codemirror/view": "^6.9.3",
"@hoodmane/toml-j0.4": "^1.1.2",
"codemirror": "6.0.1",
"synclink": "^0.1.1"
},
"devDependencies": {
"@jest/globals": "29.1.2",
"@types/codemirror": "^5.60.5",
"@types/jest": "29.1.2",
"@types/node": "18.8.3",
"@typescript-eslint/eslint-plugin": "5.39.0",
"@typescript-eslint/parser": "5.39.0",
"codemirror": "6.0.1",
"cross-env": "7.0.3",
"esbuild": "0.17.12",
"eslint": "8.25.0",
@@ -32,6 +29,7 @@
"jest-environment-jsdom": "29.1.2",
"prettier": "2.7.1",
"pyodide": "0.22.1",
"synclink": "^0.2.4",
"ts-jest": "29.0.3",
"tslib": "2.4.0",
"typescript": "4.8.4"
@@ -654,6 +652,7 @@
"version": "6.4.2",
"resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.4.2.tgz",
"integrity": "sha512-8WE2xp+D0MpWEv5lZ6zPW1/tf4AGb358T5GWYiKEuCP8MvFfT3tH2mIF9Y2yr2e3KbHuSvsVhosiEyqCpiJhZQ==",
"dev": true,
"dependencies": {
"@codemirror/language": "^6.0.0",
"@codemirror/state": "^6.0.0",
@@ -671,6 +670,7 @@
"version": "6.2.2",
"resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.2.2.tgz",
"integrity": "sha512-s9lPVW7TxXrI/7voZ+HmD/yiAlwAYn9PH5SUVSUhsxXHhv4yl5eZ3KLntSoTynfdgVYM0oIpccQEWRBQgmNZyw==",
"dev": true,
"dependencies": {
"@codemirror/language": "^6.0.0",
"@codemirror/state": "^6.2.0",
@@ -682,6 +682,7 @@
"version": "6.1.2",
"resolved": "https://registry.npmjs.org/@codemirror/lang-python/-/lang-python-6.1.2.tgz",
"integrity": "sha512-nbQfifLBZstpt6Oo4XxA2LOzlSp4b/7Bc5cmodG1R+Cs5PLLCTUvsMNWDnziiCfTOG/SW1rVzXq/GbIr6WXlcw==",
"dev": true,
"dependencies": {
"@codemirror/autocomplete": "^6.3.2",
"@codemirror/language": "^6.0.0",
@@ -692,6 +693,7 @@
"version": "6.6.0",
"resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.6.0.tgz",
"integrity": "sha512-cwUd6lzt3MfNYOobdjf14ZkLbJcnv4WtndYaoBkbor/vF+rCNguMPK0IRtvZJG4dsWiaWPcK8x1VijhvSxnstg==",
"dev": true,
"dependencies": {
"@codemirror/state": "^6.0.0",
"@codemirror/view": "^6.0.0",
@@ -705,6 +707,7 @@
"version": "6.2.0",
"resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.2.0.tgz",
"integrity": "sha512-KVCECmR2fFeYBr1ZXDVue7x3q5PMI0PzcIbA+zKufnkniMBo1325t0h1jM85AKp8l3tj67LRxVpZfgDxEXlQkg==",
"dev": true,
"dependencies": {
"@codemirror/state": "^6.0.0",
"@codemirror/view": "^6.0.0",
@@ -715,6 +718,7 @@
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.3.0.tgz",
"integrity": "sha512-rBhZxzT34CarfhgCZGhaLBScABDN3iqJxixzNuINp9lrb3lzm0nTpR77G1VrxGO3HOGK7j62jcJftQM7eCOIuw==",
"dev": true,
"dependencies": {
"@codemirror/state": "^6.0.0",
"@codemirror/view": "^6.0.0",
@@ -724,12 +728,14 @@
"node_modules/@codemirror/state": {
"version": "6.2.0",
"resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.2.0.tgz",
"integrity": "sha512-69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA=="
"integrity": "sha512-69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA==",
"dev": true
},
"node_modules/@codemirror/theme-one-dark": {
"version": "6.1.1",
"resolved": "https://registry.npmjs.org/@codemirror/theme-one-dark/-/theme-one-dark-6.1.1.tgz",
"integrity": "sha512-+CfzmScfJuD6uDF5bHJkAjWTQ2QAAHxODCPxUEgcImDYcJLT+4l5vLnBHmDVv46kCC5uUJGMrBJct2Z6JbvqyQ==",
"dev": true,
"dependencies": {
"@codemirror/language": "^6.0.0",
"@codemirror/state": "^6.0.0",
@@ -741,6 +747,7 @@
"version": "6.9.3",
"resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.9.3.tgz",
"integrity": "sha512-BJ5mvEIhFM+SrNwc5X8pLIvMM9ffjkviVbxpg84Xk2OE8ZyKaEbId8kX+nAYEEso7+qnbwsXe1bkAHsasebMow==",
"dev": true,
"dependencies": {
"@codemirror/state": "^6.1.4",
"style-mod": "^4.0.0",
@@ -1125,7 +1132,8 @@
"node_modules/@hoodmane/toml-j0.4": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/@hoodmane/toml-j0.4/-/toml-j0.4-1.1.2.tgz",
"integrity": "sha512-vQvFpjssFt39GcYwsFLDts6eReKSWeDwFt3AufXnM62ACIG2MgvOVomNRo4kQUYV0G3+zpu4LezUWw5JCFgF0Q=="
"integrity": "sha512-vQvFpjssFt39GcYwsFLDts6eReKSWeDwFt3AufXnM62ACIG2MgvOVomNRo4kQUYV0G3+zpu4LezUWw5JCFgF0Q==",
"dev": true
},
"node_modules/@humanwhocodes/config-array": {
"version": "0.10.7",
@@ -1596,12 +1604,14 @@
"node_modules/@lezer/common": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.0.2.tgz",
"integrity": "sha512-SVgiGtMnMnW3ActR8SXgsDhw7a0w0ChHSYAyAUxxrOiJ1OqYWEKk/xJd84tTSPo1mo6DXLObAJALNnd0Hrv7Ng=="
"integrity": "sha512-SVgiGtMnMnW3ActR8SXgsDhw7a0w0ChHSYAyAUxxrOiJ1OqYWEKk/xJd84tTSPo1mo6DXLObAJALNnd0Hrv7Ng==",
"dev": true
},
"node_modules/@lezer/highlight": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.3.tgz",
"integrity": "sha512-3vLKLPThO4td43lYRBygmMY18JN3CPh9w+XS2j8WC30vR4yZeFG4z1iFe4jXE43NtGqe//zHW5q8ENLlHvz9gw==",
"dev": true,
"dependencies": {
"@lezer/common": "^1.0.0"
}
@@ -1610,6 +1620,7 @@
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.3.tgz",
"integrity": "sha512-JPQe3mwJlzEVqy67iQiiGozhcngbO8QBgpqZM6oL1Wj/dXckrEexpBLeFkq0edtW5IqnPRFxA24BHJni8Js69w==",
"dev": true,
"dependencies": {
"@lezer/common": "^1.0.0"
}
@@ -1618,6 +1629,7 @@
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/@lezer/python/-/python-1.1.3.tgz",
"integrity": "sha512-rUdt5/H8JjVY3YIROZF2ZNUMx7eYB7h0cmC8c4TfkgJt4xcn6vLpjCOCk1usP4vV3YfMC+VDB786dKjJ6tL5Hw==",
"dev": true,
"dependencies": {
"@lezer/highlight": "^1.0.0",
"@lezer/lr": "^1.0.0"
@@ -2486,6 +2498,7 @@
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz",
"integrity": "sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==",
"dev": true,
"dependencies": {
"@codemirror/autocomplete": "^6.0.0",
"@codemirror/commands": "^6.0.0",
@@ -2547,7 +2560,8 @@
"node_modules/crelt": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.5.tgz",
"integrity": "sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA=="
"integrity": "sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA==",
"dev": true
},
"node_modules/cross-env": {
"version": "7.0.3",
@@ -5493,7 +5507,8 @@
"node_modules/style-mod": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.0.2.tgz",
"integrity": "sha512-C4myMmRTO8iaC5Gg+N1ftK2WT4eXUTMAa+HEFPPrfVeO/NtqLTtAmV1HbqnuGtLwCek44Ra76fdGUkSqjiMPcQ=="
"integrity": "sha512-C4myMmRTO8iaC5Gg+N1ftK2WT4eXUTMAa+HEFPPrfVeO/NtqLTtAmV1HbqnuGtLwCek44Ra76fdGUkSqjiMPcQ==",
"dev": true
},
"node_modules/supports-color": {
"version": "7.2.0",
@@ -5525,9 +5540,10 @@
"license": "MIT"
},
"node_modules/synclink": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/synclink/-/synclink-0.1.1.tgz",
"integrity": "sha512-34eBqFHZn3f2PX/tz/z0E+817Um6ESFNsBkMoGqoGgBX0qlLNlRXFoHSNIUSjTK8l5Qs4gL99Xwrz0vNAUrPEw=="
"version": "0.2.4",
"resolved": "https://registry.npmjs.org/synclink/-/synclink-0.2.4.tgz",
"integrity": "sha512-wgG4jQgPe1OPgE7gJgP3/3jCiVkEcXr1jzl+7pbGtBtp7Og2o337YGNYFwCz2ulERKoYzPyYMCDfAYjShgzCTg==",
"dev": true
},
"node_modules/test-exclude": {
"version": "6.0.0",
@@ -5796,7 +5812,8 @@
"node_modules/w3c-keyname": {
"version": "2.2.6",
"resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.6.tgz",
"integrity": "sha512-f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg=="
"integrity": "sha512-f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg==",
"dev": true
},
"node_modules/w3c-xmlserializer": {
"version": "4.0.0",
@@ -6484,6 +6501,7 @@
"version": "6.4.2",
"resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.4.2.tgz",
"integrity": "sha512-8WE2xp+D0MpWEv5lZ6zPW1/tf4AGb358T5GWYiKEuCP8MvFfT3tH2mIF9Y2yr2e3KbHuSvsVhosiEyqCpiJhZQ==",
"dev": true,
"requires": {
"@codemirror/language": "^6.0.0",
"@codemirror/state": "^6.0.0",
@@ -6495,6 +6513,7 @@
"version": "6.2.2",
"resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.2.2.tgz",
"integrity": "sha512-s9lPVW7TxXrI/7voZ+HmD/yiAlwAYn9PH5SUVSUhsxXHhv4yl5eZ3KLntSoTynfdgVYM0oIpccQEWRBQgmNZyw==",
"dev": true,
"requires": {
"@codemirror/language": "^6.0.0",
"@codemirror/state": "^6.2.0",
@@ -6506,6 +6525,7 @@
"version": "6.1.2",
"resolved": "https://registry.npmjs.org/@codemirror/lang-python/-/lang-python-6.1.2.tgz",
"integrity": "sha512-nbQfifLBZstpt6Oo4XxA2LOzlSp4b/7Bc5cmodG1R+Cs5PLLCTUvsMNWDnziiCfTOG/SW1rVzXq/GbIr6WXlcw==",
"dev": true,
"requires": {
"@codemirror/autocomplete": "^6.3.2",
"@codemirror/language": "^6.0.0",
@@ -6516,6 +6536,7 @@
"version": "6.6.0",
"resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.6.0.tgz",
"integrity": "sha512-cwUd6lzt3MfNYOobdjf14ZkLbJcnv4WtndYaoBkbor/vF+rCNguMPK0IRtvZJG4dsWiaWPcK8x1VijhvSxnstg==",
"dev": true,
"requires": {
"@codemirror/state": "^6.0.0",
"@codemirror/view": "^6.0.0",
@@ -6529,6 +6550,7 @@
"version": "6.2.0",
"resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.2.0.tgz",
"integrity": "sha512-KVCECmR2fFeYBr1ZXDVue7x3q5PMI0PzcIbA+zKufnkniMBo1325t0h1jM85AKp8l3tj67LRxVpZfgDxEXlQkg==",
"dev": true,
"requires": {
"@codemirror/state": "^6.0.0",
"@codemirror/view": "^6.0.0",
@@ -6539,6 +6561,7 @@
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.3.0.tgz",
"integrity": "sha512-rBhZxzT34CarfhgCZGhaLBScABDN3iqJxixzNuINp9lrb3lzm0nTpR77G1VrxGO3HOGK7j62jcJftQM7eCOIuw==",
"dev": true,
"requires": {
"@codemirror/state": "^6.0.0",
"@codemirror/view": "^6.0.0",
@@ -6548,12 +6571,14 @@
"@codemirror/state": {
"version": "6.2.0",
"resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.2.0.tgz",
"integrity": "sha512-69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA=="
"integrity": "sha512-69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA==",
"dev": true
},
"@codemirror/theme-one-dark": {
"version": "6.1.1",
"resolved": "https://registry.npmjs.org/@codemirror/theme-one-dark/-/theme-one-dark-6.1.1.tgz",
"integrity": "sha512-+CfzmScfJuD6uDF5bHJkAjWTQ2QAAHxODCPxUEgcImDYcJLT+4l5vLnBHmDVv46kCC5uUJGMrBJct2Z6JbvqyQ==",
"dev": true,
"requires": {
"@codemirror/language": "^6.0.0",
"@codemirror/state": "^6.0.0",
@@ -6565,6 +6590,7 @@
"version": "6.9.3",
"resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.9.3.tgz",
"integrity": "sha512-BJ5mvEIhFM+SrNwc5X8pLIvMM9ffjkviVbxpg84Xk2OE8ZyKaEbId8kX+nAYEEso7+qnbwsXe1bkAHsasebMow==",
"dev": true,
"requires": {
"@codemirror/state": "^6.1.4",
"style-mod": "^4.0.0",
@@ -6745,7 +6771,8 @@
"@hoodmane/toml-j0.4": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/@hoodmane/toml-j0.4/-/toml-j0.4-1.1.2.tgz",
"integrity": "sha512-vQvFpjssFt39GcYwsFLDts6eReKSWeDwFt3AufXnM62ACIG2MgvOVomNRo4kQUYV0G3+zpu4LezUWw5JCFgF0Q=="
"integrity": "sha512-vQvFpjssFt39GcYwsFLDts6eReKSWeDwFt3AufXnM62ACIG2MgvOVomNRo4kQUYV0G3+zpu4LezUWw5JCFgF0Q==",
"dev": true
},
"@humanwhocodes/config-array": {
"version": "0.10.7",
@@ -7114,12 +7141,14 @@
"@lezer/common": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.0.2.tgz",
"integrity": "sha512-SVgiGtMnMnW3ActR8SXgsDhw7a0w0ChHSYAyAUxxrOiJ1OqYWEKk/xJd84tTSPo1mo6DXLObAJALNnd0Hrv7Ng=="
"integrity": "sha512-SVgiGtMnMnW3ActR8SXgsDhw7a0w0ChHSYAyAUxxrOiJ1OqYWEKk/xJd84tTSPo1mo6DXLObAJALNnd0Hrv7Ng==",
"dev": true
},
"@lezer/highlight": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.3.tgz",
"integrity": "sha512-3vLKLPThO4td43lYRBygmMY18JN3CPh9w+XS2j8WC30vR4yZeFG4z1iFe4jXE43NtGqe//zHW5q8ENLlHvz9gw==",
"dev": true,
"requires": {
"@lezer/common": "^1.0.0"
}
@@ -7128,6 +7157,7 @@
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.3.tgz",
"integrity": "sha512-JPQe3mwJlzEVqy67iQiiGozhcngbO8QBgpqZM6oL1Wj/dXckrEexpBLeFkq0edtW5IqnPRFxA24BHJni8Js69w==",
"dev": true,
"requires": {
"@lezer/common": "^1.0.0"
}
@@ -7136,6 +7166,7 @@
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/@lezer/python/-/python-1.1.3.tgz",
"integrity": "sha512-rUdt5/H8JjVY3YIROZF2ZNUMx7eYB7h0cmC8c4TfkgJt4xcn6vLpjCOCk1usP4vV3YfMC+VDB786dKjJ6tL5Hw==",
"dev": true,
"requires": {
"@lezer/highlight": "^1.0.0",
"@lezer/lr": "^1.0.0"
@@ -7776,6 +7807,7 @@
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz",
"integrity": "sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==",
"dev": true,
"requires": {
"@codemirror/autocomplete": "^6.0.0",
"@codemirror/commands": "^6.0.0",
@@ -7831,7 +7863,8 @@
"crelt": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.5.tgz",
"integrity": "sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA=="
"integrity": "sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA==",
"dev": true
},
"cross-env": {
"version": "7.0.3",
@@ -10031,7 +10064,8 @@
"style-mod": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.0.2.tgz",
"integrity": "sha512-C4myMmRTO8iaC5Gg+N1ftK2WT4eXUTMAa+HEFPPrfVeO/NtqLTtAmV1HbqnuGtLwCek44Ra76fdGUkSqjiMPcQ=="
"integrity": "sha512-C4myMmRTO8iaC5Gg+N1ftK2WT4eXUTMAa+HEFPPrfVeO/NtqLTtAmV1HbqnuGtLwCek44Ra76fdGUkSqjiMPcQ==",
"dev": true
},
"supports-color": {
"version": "7.2.0",
@@ -10053,9 +10087,10 @@
"dev": true
},
"synclink": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/synclink/-/synclink-0.1.1.tgz",
"integrity": "sha512-34eBqFHZn3f2PX/tz/z0E+817Um6ESFNsBkMoGqoGgBX0qlLNlRXFoHSNIUSjTK8l5Qs4gL99Xwrz0vNAUrPEw=="
"version": "0.2.4",
"resolved": "https://registry.npmjs.org/synclink/-/synclink-0.2.4.tgz",
"integrity": "sha512-wgG4jQgPe1OPgE7gJgP3/3jCiVkEcXr1jzl+7pbGtBtp7Og2o337YGNYFwCz2ulERKoYzPyYMCDfAYjShgzCTg==",
"dev": true
},
"test-exclude": {
"version": "6.0.0",
@@ -10239,7 +10274,8 @@
"w3c-keyname": {
"version": "2.2.6",
"resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.6.tgz",
"integrity": "sha512-f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg=="
"integrity": "sha512-f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg==",
"dev": true
},
"w3c-xmlserializer": {
"version": "4.0.0",

36
pyscriptjs/package.json
View File

@@ -14,24 +14,6 @@
"test:watch": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --watch"
},
"devDependencies": {
"@jest/globals": "29.1.2",
"@types/codemirror": "^5.60.5",
"@types/jest": "29.1.2",
"@types/node": "18.8.3",
"@typescript-eslint/eslint-plugin": "5.39.0",
"@typescript-eslint/parser": "5.39.0",
"cross-env": "7.0.3",
"esbuild": "0.17.12",
"eslint": "8.25.0",
"jest": "29.1.2",
"jest-environment-jsdom": "29.1.2",
"prettier": "2.7.1",
"pyodide": "0.22.1",
"ts-jest": "29.0.3",
"tslib": "2.4.0",
"typescript": "4.8.4"
},
"dependencies": {
"@codemirror/commands": "^6.2.2",
"@codemirror/lang-python": "^6.1.2",
"@codemirror/language": "^6.6.0",
@@ -39,7 +21,23 @@
"@codemirror/theme-one-dark": "^6.1.1",
"@codemirror/view": "^6.9.3",
"@hoodmane/toml-j0.4": "^1.1.2",
"@jest/globals": "29.1.2",
"@types/codemirror": "^5.60.5",
"@types/jest": "29.1.2",
"@types/node": "18.8.3",
"@typescript-eslint/eslint-plugin": "5.39.0",
"@typescript-eslint/parser": "5.39.0",
"codemirror": "6.0.1",
"synclink": "^0.1.1"
"cross-env": "7.0.3",
"esbuild": "0.17.12",
"eslint": "8.25.0",
"jest": "29.1.2",
"jest-environment-jsdom": "29.1.2",
"prettier": "2.7.1",
"pyodide": "0.22.1",
"synclink": "0.2.4",
"ts-jest": "29.0.3",
"tslib": "2.4.0",
"typescript": "4.8.4"
}
}

4
pyscriptjs/src/interpreter_client.ts
View File

@@ -37,9 +37,9 @@ export class InterpreterClient extends Object {
/**
* initializes the remote interpreter, which further loads the underlying
* interface.
* */
*/
async initializeRemote(): Promise<void> {
await this._unwrapped_remote.loadInterpreter(this.config, this.stdio);
await this._remote.loadInterpreter(this.config, Synclink.proxy(this.stdio));
// await this._remote.loadInterpreter(this.config, Synclink.proxy(this.stdio));
this.globals = this._remote.globals;
}

2
pyscriptjs/src/main.ts
View File

@@ -188,7 +188,7 @@ export class PyScriptApp {
const interpreter_cfg = this.config.interpreters[0];
const remote_interpreter = new RemoteInterpreter(interpreter_cfg.src);
const { port1, port2 } = new MessageChannel();
const { port1, port2 } = new Synclink.FakeMessageChannel() as unknown as MessageChannel;
port1.start();
port2.start();
Synclink.expose(remote_interpreter, port2);

6
pyscriptjs/src/remote_interpreter.ts
View File

@@ -94,15 +94,15 @@ export class RemoteInterpreter extends Object {
* contain these files and is clearly the wrong
* path.
*/
async loadInterpreter(config: AppConfig, stdio: Stdio): Promise<void> {
async loadInterpreter(config: AppConfig, stdio: Synclink.Remote<Stdio & ProxyMarked>): Promise<void> {
this.interface = Synclink.proxy(
await loadPyodide({
stdout: (msg: string) => {
// TODO: add syncify when moved to worker
stdio.stdout_writeline(msg);
stdio.stdout_writeline(msg).syncify();
},
stderr: (msg: string) => {
stdio.stderr_writeline(msg);
stdio.stderr_writeline(msg).syncify();
},
fullStdLib: false,
}),

2
pyscriptjs/tests/unit/pyodide.test.ts
View File

@@ -13,7 +13,7 @@ describe('RemoteInterpreter', () => {
let interpreter: InterpreterClient;
let stdio: CaptureStdio = new CaptureStdio();
let RemoteInterpreter;
const { port1, port2 } = new MessageChannel();
const { port1, port2 } = new Synclink.FakeMessageChannel() as unknown as MessageChannel;
beforeAll(async () => {
const SRC = '../pyscriptjs/node_modules/pyodide/pyodide.js';
const config: AppConfig = { interpreters: [{ src: SRC }] };