pyodide 0.20.0 → 0.20.1-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pyodide",
-  "version": "0.20.0",
+  "version": "0.20.1-alpha.1",
   "description": "The Pyodide JavaScript package",
   "keywords": [
     "python",
@@ -18,8 +18,14 @@
   "devDependencies": {
     "@rollup/plugin-commonjs": "^21.0.1",
     "@rollup/plugin-node-resolve": "^13.1.3",
+    "@types/assert": "^1.5.6",
     "@types/emscripten": "^1.39.5",
-    "@types/node-fetch": "^3.0.3",
+    "@types/expect": "^24.3.0",
+    "@types/mocha": "^9.1.0",
+    "@types/node": "^17.0.25",
+    "@types/node-fetch": "^2.6.1",
+    "@types/ws": "^8.5.3",
+    "dts-bundle-generator": "^6.7.0",
     "error-stack-parser": "^2.0.6",
     "mocha": "^9.0.2",
     "prettier": "^2.2.1",
@@ -27,18 +33,33 @@
     "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-ts": "^2.0.5",
     "terser": "^5.7.0",
-    "ts-node": "^10.4.0",
+    "ts-mocha": "^9.0.2",
     "tsd": "^0.15.1",
-    "typescript": "^4.2.4",
-    "typedoc": "^0.22.11"
+    "typedoc": "^0.22.11",
+    "typescript": "^4.2.4"
   },
-  "type": "module",
+  "main": "pyodide.js",
+  "exports": {
+    ".": {
+      "require": "./pyodide.js",
+      "import": "./pyodide.mjs"
+    },
+    "./pyodide.mjs": "./pyodide.mjs",
+    "./pyodide.js": "./pyodide.js",
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "pyodide*",
+    "packages.json",
+    "distutils.tar",
+    "console.html"
+  ],
   "scripts": {
-    "test": "mocha --loader node_modules/ts-node/dist/esm.js"
+    "test": "ts-mocha -p tsconfig.test.json test/**/*.test.ts"
   },
   "mocha": {
     "timeout": 30000,
-    "file": "./test/conftest.mjs"
+    "file": "test/conftest.ts"
   },
   "tsd": {
     "compilerOptions": {
@@ -50,6 +71,7 @@
   },
   "dependencies": {
     "base-64": "^1.0.0",
-    "node-fetch": "^2.6.1"
+    "node-fetch": "^2.6.1",
+    "ws": "^8.5.0"
   }
 }

package/pyodide.ts

@@ -2,15 +2,14 @@
  * The main bootstrap code for loading pyodide.
  */
 import ErrorStackParser from "error-stack-parser";
-import { Module, setStandardStreams, setHomeDirectory, API } from "./module.js";
-import { loadScript, _loadBinaryFile, initNodeModules } from "./compat.js";
-import { initializePackageIndex, loadPackage } from "./load-package.js";
-import { makePublicAPI, PyodideInterface } from "./api.js";
-import "./error_handling.gen.js";
+import { loadScript, _loadBinaryFile, initNodeModules } from "./compat";
 
-import { PyProxy, PyProxyDict } from "./pyproxy.gen";
+import { createModule, setStandardStreams, setHomeDirectory } from "./module";
 
-export {
+import type { PyodideInterface } from "./api.js";
+import type { PyProxy, PyProxyDict } from "./pyproxy.gen";
+
+export type {
   PyProxy,
   PyProxyWithLength,
   PyProxyDict,
@@ -28,16 +27,6 @@ export {
 
 export type Py2JsResult = any;
 
-let runPythonInternal_dict: PyProxy; // Initialized in finalizeBootstrap
-/**
- * Just like `runPython` except uses a different globals dict and gets
- * `eval_code` from `_pyodide` so that it can work before `pyodide` is imported.
- * @private
- */
-API.runPythonInternal = function (code: string): any {
-  return API._pyodide._base.eval_code(code, runPythonInternal_dict);
-};
-
 /**
  * A proxy around globals that falls back to checking for a builtin if has or
  * get fails to find a global with the given key. Note that this proxy is
@@ -68,7 +57,7 @@ function wrapPythonGlobals(
   });
 }
 
-function unpackPyodidePy(pyodide_py_tar: Uint8Array) {
+function unpackPyodidePy(Module: any, pyodide_py_tar: Uint8Array) {
   const fileName = "/pyodide_py.tar";
   let stream = Module.FS.open(fileName, "w");
   Module.FS.write(
@@ -105,11 +94,11 @@ del importlib
  * the core `pyodide` apis. (But package loading is not ready quite yet.)
  * @private
  */
-function finalizeBootstrap(config: ConfigType) {
+function finalizeBootstrap(API: any, config: ConfigType) {
   // First make internal dict so that we can use runPythonInternal.
   // runPythonInternal uses a separate namespace, so we don't pollute the main
   // environment with variables from our setup.
-  runPythonInternal_dict = API._pyodide._base.eval_code("{}") as PyProxy;
+  API.runPythonInternal_dict = API._pyodide._base.eval_code("{}") as PyProxy;
   API.importlib = API.runPythonInternal("import importlib; importlib");
   let import_module = API.importlib.import_module;
 
@@ -130,7 +119,7 @@ function finalizeBootstrap(config: ConfigType) {
   importhook.register_js_finder();
   importhook.register_js_module("js", config.jsglobals);
 
-  let pyodide = makePublicAPI();
+  let pyodide = API.makePublicAPI();
   importhook.register_js_module("pyodide_js", pyodide);
 
   // import pyodide_py. We want to ensure that as much stuff as possible is
@@ -175,7 +164,7 @@ function calculateIndexURL(): string {
   } catch (e) {
     err = e;
   }
-  const fileName = ErrorStackParser.parse(err)[0].fileName!;
+  let fileName = ErrorStackParser.parse(err)[0].fileName!;
   return fileName.slice(0, fileName.lastIndexOf("/"));
 }
 
@@ -183,7 +172,7 @@ function calculateIndexURL(): string {
  * See documentation for loadPyodide.
  * @private
  */
-type ConfigType = {
+export type ConfigType = {
   indexURL: string;
   homedir: string;
   fullStdLib?: boolean;
@@ -244,13 +233,9 @@ export async function loadPyodide(
     jsglobals?: object;
   } = {}
 ): Promise<PyodideInterface> {
-  if ((loadPyodide as any).inProgress) {
-    throw new Error("Pyodide is already loading.");
-  }
   if (!options.indexURL) {
     options.indexURL = calculateIndexURL();
   }
-  (loadPyodide as any).inProgress = true;
 
   const default_config = {
     fullStdLib: true,
@@ -258,21 +243,24 @@ export async function loadPyodide(
     stdin: globalThis.prompt ? globalThis.prompt : undefined,
     homedir: "/home/pyodide",
   };
-  let config = Object.assign(default_config, options) as ConfigType;
+  const config = Object.assign(default_config, options) as ConfigType;
   if (!config.indexURL.endsWith("/")) {
     config.indexURL += "/";
   }
   await initNodeModules();
-  let packageIndexReady = initializePackageIndex(config.indexURL);
-  let pyodide_py_tar_promise = _loadBinaryFile(
+  const pyodide_py_tar_promise = _loadBinaryFile(
     config.indexURL,
     "pyodide_py.tar"
   );
 
-  setStandardStreams(config.stdin, config.stdout, config.stderr);
-  setHomeDirectory(config.homedir);
+  const Module = createModule();
+  const API: any = { config };
+  Module.API = API;
+
+  setStandardStreams(Module, config.stdin, config.stdout, config.stderr);
+  setHomeDirectory(Module, config.homedir);
 
-  let moduleLoaded = new Promise((r) => (Module.postRun = r));
+  const moduleLoaded = new Promise((r) => (Module.postRun = r));
 
   // locateFile tells Emscripten where to find the data files that initialize
   // the file system.
@@ -294,15 +282,19 @@ export async function loadPyodide(
   };
 
   const pyodide_py_tar = await pyodide_py_tar_promise;
-  unpackPyodidePy(pyodide_py_tar);
+  unpackPyodidePy(Module, pyodide_py_tar);
   Module._pyodide_init();
 
-  let pyodide = finalizeBootstrap(config);
-  // Module.runPython works starting here.
-
-  await packageIndexReady;
+  const pyodide = finalizeBootstrap(API, config);
+  // API.runPython works starting here.
+  if (!pyodide.version.includes("dev")) {
+    // Currently only used in Node to download packages the first time they are
+    // loaded. But in other cases it's harmless.
+    API.setCdnUrl(`https://cdn.jsdelivr.net/pyodide/v${pyodide.version}/full/`);
+  }
+  await API.packageIndexReady;
   if (config.fullStdLib) {
-    await loadPackage(["distutils"]);
+    await pyodide.loadPackage(["distutils"]);
   }
   pyodide.runPython("print('Python initialization complete')");
   return pyodide;