philippedistributive · Apr 3, 2024 · Feb 1, 2024 · Feb 1, 2024 · Feb 1, 2024 · Feb 1, 2024
diff --git a/.github/workflows/test-and-publish.yaml b/.github/workflows/test-and-publish.yaml
@@ -52,7 +52,7 @@ jobs:
         with:
           path: |
             ./_spidermonkey_install/*
-          key: spidermonkey115.7.0-${{ runner.os }}-${{ runner.arch }}
+          key: spidermonkey115.8.0-${{ runner.os }}-${{ runner.arch }}
           lookup-only: true # skip download
       - name: Setup XCode
         if: ${{ (matrix.os == 'macos-13' || matrix.os == 'macos-14') && steps.cache-spidermonkey.outputs.cache-hit != 'true' }}
@@ -72,7 +72,7 @@ jobs:
         with:
           path: |
             ./_spidermonkey_install/*
-          key: spidermonkey115.7.0-${{ runner.os }}-${{ runner.arch }}
+          key: spidermonkey115.8.0-${{ runner.os }}-${{ runner.arch }}
           lookup-only: true # skip download
       - name: Install dependencies
         if: ${{ steps.cache-spidermonkey.outputs.cache-hit != 'true' }}
@@ -153,7 +153,7 @@ jobs:
         with:
           path: |
             ./_spidermonkey_install/*
-          key: spidermonkey115.7.0-${{ runner.os }}-${{ runner.arch }}
+          key: spidermonkey115.8.0-${{ runner.os }}-${{ runner.arch }}
           fail-on-cache-miss: true # SpiderMonkey is expected to be cached in its dedicated job
       - name: Build pminit
         run: |

diff --git a/README.md b/README.md
@@ -8,7 +8,8 @@ using the Python engine to provide the Javascript host environment.
 
 We feature JavaScript Array and Object methods implemented on Python List and Dictionaries using the cPython C API, and the inverse using the Mozilla Firefox Spidermonkey JavaScript C++ API.
 
-This product is in an intermediate stage, approximately 95% to MVP as of March 2024. It is under active development by [Distributive](https://distributive.network/).
+This product is in an advanced stage, approximately 95% to MVP as of March 2024. It is under active development by [Distributive](https://distributive.network/).
+
 External contributions and feedback are welcome and encouraged.
 
 ### tl;dr
@@ -250,6 +251,7 @@ generated by enumerating the global variable in the current SpiderMonkey context
 ## Built-In Functions
 
 See definitions in [python/pythonmonkey/global.d.ts](https://github.com/Distributive-Network/PythonMonkey/blob/main/python/pythonmonkey/global.d.ts).
+Including:
 
 - `console`
 - `atob`
@@ -386,10 +388,10 @@ in Python. Simply decorate a Dict named `exports` inside a file with a `.py` ext
 loaded by `require()` -- in either JavaScript or Python.
 
 ### Program Module
-The program module, or main module, is a special module in CommonJS. In a program module,
+The program module, or main module, is a special module in CommonJS. In a program module:
  - variables defined in the outermost scope are properties of `globalThis`
  - returning from the outermost scope is a syntax error
- - the `arguments` variable in an Array-like object which holds your program's argument vector
+ - the `arguments` variable in an Array which holds your program's argument vector
    (command-line arguments)
 
 ```console
@@ -416,7 +418,7 @@ exports['today'] = date.today()
 # Troubleshooting Tips
 
 ## CommonJS (require)
-If you are having trouble with the CommonJS require function, set environment variable `DEBUG='ctx-module*'` and you can see the filenames it tries to laod.
+If you are having trouble with the CommonJS require function, set environment variable `DEBUG='ctx-module*'` and you can see the filenames it tries to load.
 
 ## pmdb
 
@@ -453,7 +455,7 @@ List of commands:
 ```console
 $ pmjs
 
-Welcome to PythonMonkey v0.2.0.
+Welcome to PythonMonkey v0.4.0.
 Type ".help" for more information.
 > .python import sys
 > .python sys.path

diff --git a/build.py b/build.py
@@ -2,7 +2,9 @@
 #              Main PythonMonkey build automation script. Run with `poetry build`.
 # @author      Hamada Gasmallah, hamada@distributive.network
 # @date        April 2023
+# @copyright Copyright (c) 2023 Distributive Corp.
 #
+
 import subprocess
 import os, sys
 import platform

diff --git a/include/BoolType.hh b/include/BoolType.hh
@@ -2,10 +2,9 @@
  * @file BoolType.hh
  * @author Caleb Aikens (caleb@distributive.network)
  * @brief Struct for representing python bools
- * @version 0.1
  * @date 2022-12-02
  *
- * @copyright Copyright (c) 2022
+ * @copyright Copyright (c) 2022 Distributive Corp.
  *
  */
 

diff --git a/include/BufferType.hh b/include/BufferType.hh
@@ -2,7 +2,6 @@
  * @file BufferType.hh
  * @author Tom Tang (xmader@distributive.network)
  * @brief Struct for representing ArrayBuffers
- * @version 0.1
  * @date 2023-04-27
  *
  * @copyright Copyright (c) 2023 Distributive Corp.

diff --git a/include/DateType.hh b/include/DateType.hh
@@ -2,10 +2,9 @@
  * @file DateType.hh
  * @author Caleb Aikens (caleb@distributive.network)
  * @brief Struct for representing python dates
- * @version 0.1
  * @date 2022-12-21
  *
- * @copyright Copyright (c) 2022
+ * @copyright Copyright (c) 2022 Distributive Corp.
  *
  */
 

diff --git a/include/DictType.hh b/include/DictType.hh
@@ -2,10 +2,9 @@
  * @file DictType.hh
  * @author Caleb Aikens (caleb@distributive.network) & Giovanni Tedesco (giovanni@distributive.network)
  * @brief Struct representing python dictionaries
- * @version 0.1
  * @date 2022-08-10
  *
- * @copyright Copyright (c) 2022
+ * @copyright Copyright (c) 2022 Distributive Corp.
  *
  */
 

diff --git a/include/ExceptionType.hh b/include/ExceptionType.hh
@@ -2,7 +2,6 @@
  * @file ExceptionType.hh
  * @author Tom Tang (xmader@distributive.network) and Philippe Laporte (philippe@distributive.network)
  * @brief Struct for representing Python Exception objects from a corresponding JS Error object
- * @version 0.1
  * @date 2023-04-11
  *
  * @copyright Copyright (c) 2023-2024 Distributive Corp.

diff --git a/include/FloatType.hh b/include/FloatType.hh
@@ -2,10 +2,9 @@
  * @file FloatType.hh
  * @author Caleb Aikens (caleb@distributive.network)
  * @brief Struct for representing python floats
- * @version 0.1
  * @date 2022-12-02
  *
- * @copyright Copyright (c) 2022
+ * @copyright Copyright (c) 2022 Distributive Corp.
  *
  */
 

diff --git a/include/FuncType.hh b/include/FuncType.hh
@@ -2,12 +2,12 @@
  * @file FuncType.hh
  * @author Caleb Aikens (caleb@distributive.network) & Giovanni Tedesco (giovanni@distributive.network)
  * @brief Struct representing python functions
- * @version 0.1
  * @date 2022-08-08
  *
- * @copyright Copyright (c) 2022
+ * @copyright Copyright (c) 2022 Distributive Corp.
  *
  */
+
 #ifndef PythonMonkey_FuncType_
 #define PythonMonkey_FuncType_
 

diff --git a/include/IntType.hh b/include/IntType.hh
@@ -2,10 +2,9 @@
  * @file IntType.hh
  * @author Caleb Aikens (caleb@distributive.network) & Giovanni Tedesco (giovanni@distributive.network) & Tom Tang (xmader@distributive.network)
  * @brief Struct for representing python ints
- * @version 0.2
  * @date 2023-03-16
  *
- * @copyright Copyright (c) 2023
+ * @copyright Copyright (c) 2023 Distributive Corp.
  *
  */
 

diff --git a/include/JSArrayIterProxy.hh b/include/JSArrayIterProxy.hh
@@ -5,7 +5,7 @@
  * @version 0.1
  * @date 2024-01-15
  *
- * Copyright (c) 2024 Distributive Corp.
+ * @copyright Copyright (c) 2024 Distributive Corp.
  *
  */
 

diff --git a/include/JSArrayProxy.hh b/include/JSArrayProxy.hh
@@ -5,7 +5,7 @@
  * @version 0.1
  * @date 2023-11-22
  *
- * Copyright (c) 2023 Distributive Corp.
+ * @copyright Copyright (c) 2023 Distributive Corp.
  *
  */
 
@@ -24,7 +24,7 @@
  */
 typedef struct {
   PyListObject list;
-  JS::RootedObject jsArray;
+  JS::PersistentRootedObject *jsArray;
 } JSArrayProxy;
 
 /**
@@ -40,26 +40,6 @@ public:
    */
   static void JSArrayProxy_dealloc(JSArrayProxy *self);
 
-  /**
-   * @brief New method (.tp_new), creates a new instance of the JSArrayProxy type, exposed as the __new()__ method in python
-   *
-   * @param type - The type of object to be created, will always be JSArrayProxyType or a derived type
-   * @param args - arguments to the __new()__ method, not used
-   * @param kwds - keyword arguments to the __new()__ method, not used
-   * @return PyObject* - A new instance of JSArrayProxy
-   */
-  static PyObject *JSArrayProxy_new(PyTypeObject *type, PyObject *args, PyObject *kwds);
-
-  /**
-   * @brief Initialization method (.tp_init), initializes a newly created instance of JSArrayProxy. exposed as the __init()__ method in python
-   *
-   * @param self - The JSArrayProxy to be initialized
-   * @param args - arguments to the __init()__ method, expected to be a dict
-   * @param kwds - keyword arguments to the __init()__ method, not used
-   * @return int - -1 on exception, return any other value otherwise
-   */
-  static int JSArrayProxy_init(JSArrayProxy *self, PyObject *args, PyObject *kwds);
-
   /**
    * @brief Length method (.mp_length and .sq_length), returns the number of keys in the JSObject, used by the python len() method
    *
@@ -78,13 +58,13 @@ public:
   static PyObject *JSArrayProxy_get(JSArrayProxy *self, PyObject *key);
 
 
-/**
- * @brief Getter method (.mp_subscript), returns a value from the JSArrayProxy given a key which can be a slice, used by several built-in python methods as well as the [] and operator
- *
- * @param self - The JSArrayProxy
- * @param key - The key for the value in the JSArrayProxy
- * @return PyObject* NULL on exception, the corresponding value otherwise
- */
+  /**
+   * @brief Getter method (.mp_subscript), returns a value from the JSArrayProxy given a key which can be a slice, used by several built-in python methods as well as the [] and operator
+   *
+   * @param self - The JSArrayProxy
+   * @param key - The key for the value in the JSArrayProxy
+   * @return PyObject* NULL on exception, the corresponding value otherwise
+   */
   static PyObject *JSArrayProxy_get_subscript(JSArrayProxy *self, PyObject *key);
 
   /**
@@ -182,25 +162,7 @@ public:
    * @param self - The JSArrayProxy
    * @return None
    */
-  static PyObject *JSArrayProxy_clear(JSArrayProxy *self);
-
-  /**
-   * @brief .tp_clear method
-   *
-   * @param self - The JSArrayProxy
-   * @return 0 on success
-   */
-  static int JSArrayProxy_clear_slot(JSArrayProxy *self);
-
-  /**
-   * @brief .tp_traverse method
-   *
-   * @param self - The JSArrayProxy
-   * @param visitproc - The function to be applied on each element of the list
-   * @param arg - The argument to the visit function
-   * @return 0 on success
-   */
-  static int JSArrayProxy_traverse(JSArrayProxy *self, visitproc visit, void *arg);
+  static PyObject *JSArrayProxy_clear_method(JSArrayProxy *self);
 
   /**
    * @brief copy method
@@ -413,7 +375,7 @@ PyDoc_STRVAR(list___reversed____doc__,
  */
 static PyMethodDef JSArrayProxy_methods[] = {
   {"__reversed__", (PyCFunction)JSArrayProxyMethodDefinitions::JSArrayProxy_iter_reverse, METH_NOARGS, list___reversed____doc__},
-  {"clear", (PyCFunction)JSArrayProxyMethodDefinitions::JSArrayProxy_clear, METH_NOARGS, py_list_clear__doc__},
+  {"clear", (PyCFunction)JSArrayProxyMethodDefinitions::JSArrayProxy_clear_method, METH_NOARGS, py_list_clear__doc__},
   {"copy", (PyCFunction)JSArrayProxyMethodDefinitions::JSArrayProxy_copy, METH_NOARGS, list_copy__doc__},
   {"append", (PyCFunction)JSArrayProxyMethodDefinitions::JSArrayProxy_append, METH_O, list_append__doc__},
   {"insert", (PyCFunction)JSArrayProxyMethodDefinitions::JSArrayProxy_insert, METH_FASTCALL, list_insert__doc__},

diff --git a/include/JSFunctionProxy.hh b/include/JSFunctionProxy.hh
@@ -2,10 +2,9 @@
  * @file JSFunctionProxy.hh
  * @author Caleb Aikens (caleb@distributive.network)
  * @brief JSFunctionProxy is a custom C-implemented python type. It acts as a proxy for JSFunctions from Spidermonkey, and behaves like a function would.
- * @version 0.1
  * @date 2023-09-28
  *
- * Copyright (c) 2023 Distributive Corp.
+ * @copyright Copyright (c) 2023 Distributive Corp.
  *
  */
 

diff --git a/include/JSMethodProxy.hh b/include/JSMethodProxy.hh
@@ -2,10 +2,9 @@
  * @file JSMethodProxy.hh
  * @author Caleb Aikens (caleb@distributive.network)
  * @brief JSMethodProxy is a custom C-implemented python type. It acts as a proxy for JSFunctions from Spidermonkey, and behaves like a method would, treating `self` as `this`.
- * @version 0.1
  * @date 2023-11-14
  *
- * Copyright (c) 2023 Distributive Corp.
+ * @copyright Copyright (c) 2023 Distributive Corp.
  *
  */
 

diff --git a/include/JSObjectItemsProxy.hh b/include/JSObjectItemsProxy.hh
@@ -2,10 +2,9 @@
  * @file JSObjectItemsProxy.hh
  * @author Philippe Laporte (philippe@distributive.network)
  * @brief JSObjectItemsProxy is a custom C-implemented python type that derives from dict items
- * @version 0.1
  * @date 2024-01-19
  *
- * Copyright (c) 2024 Distributive Corp.
+ * @copyright Copyright (c) 2024 Distributive Corp.
  *
  */
 

diff --git a/include/JSObjectIterProxy.hh b/include/JSObjectIterProxy.hh
@@ -2,10 +2,9 @@
  * @file JSObjectIterProxy.hh
  * @author Philippe Laporte (philippe@distributive.network)
  * @brief JSObjectIterProxy is a custom C-implemented python type that derives from PyDictIterKey
- * @version 0.1
  * @date 2024-01-17
  *
- * Copyright (c) 2024 Distributive Corp.
+ * @copyright Copyright (c) 2024 Distributive Corp.
  *
  */
 
@@ -29,7 +28,7 @@
 
 typedef struct {
   PyObject_HEAD
-  JS::RootedIdVector *props; // not conceptually the best use of the Rooted type but it works. There is no easy inter-operation with a JS::Heap type
+  JS::PersistentRootedIdVector *props;
   int it_index;
   bool reversed;
   int kind;

diff --git a/include/JSObjectKeysProxy.hh b/include/JSObjectKeysProxy.hh
@@ -2,10 +2,9 @@
  * @file JSObjectKeysProxy.hh
  * @author Philippe Laporte (philippe@distributive.network)
  * @brief JSObjectKeysProxy is a custom C-implemented python type that derives from dict keys
- * @version 0.1
  * @date 2024-01-16
  *
- * Copyright (c) 2024 Distributive Corp.
+ * @copyright Copyright (c) 2024 Distributive Corp.
  *
  */