@suchipi/quickjs 0.5.0 → 0.7.0

package/build/dts/quickjs-modulesys.d.ts

@@ -1,18 +1,8 @@
 /**
- * A global which lets you configure the module loader (import/export/require).
- * You can use these properties to add support for importing new filetypes.
- *
- * This global can also be used to identify whether an object is a module
- * namespace record.
+ * An object which lets you configure the module loader (import/export/require).
+ * You can change these properties to add support for importing new filetypes.
  */
-interface ModuleGlobal {
-  /**
-   * Returns true if `target` is a module namespace object.
-   */
-  [Symbol.hasInstance](target: any): target is {
-    [key: string | number | symbol]: any;
-  };
-
+interface ModuleDelegate {
   /**
    * A list of filetype extensions that may be omitted from an import specifier
    * string.
@@ -24,7 +14,7 @@ interface ModuleGlobal {
    * See the doc comment on {@link require} for more information.
    *
    * NOTE: If you add a new extension to this array, you will likely also want
-   * to add to {@link Module.compilers}.
+   * to add to {@link compilers}.
    */
   searchExtensions: Array<string>;
 
@@ -51,7 +41,7 @@ interface ModuleGlobal {
    * ```js
    * import * as std from "std";
    *
-   * Module.compilers[".txt"] = (filename, content) => {
+   * ModuleDelegate.compilers[".txt"] = (filename, content) => {
    *   return `export default ${JSON.stringify(content)}`;
    * }
    * ```
@@ -65,24 +55,20 @@ interface ModuleGlobal {
    * And `names` will be a string containing the contents of names.txt.
    *
    * NOTE: When adding to this object, you may also wish to add to
-   * {@link Module.searchExtensions}.
+   * {@link searchExtensions}.
    */
   compilers: {
     [extensionWithDot: string]: (filename: string, content: string) => string;
   };
 
   /**
-   * Create a virtual built-in module whose exports consist of the own
-   * enumerable properties of `obj`.
-   */
-  define(name: string, obj: { [key: string]: any }): void;
-
-  /**
-   * Resolves a require/import request from `fromFile` into a canonicalized path.
+   * Resolves a require/import request from `fromFile` into a canonicalized
+   * path.
    *
    * To change native module resolution behavior, replace this function with
    * your own implementation. Note that you must handle
-   * `Module.searchExtensions` yourself in your replacement implementation.
+   * `ModuleDelegate.searchExtensions` yourself in your replacement
+   * implementation.
    */
   resolve(name: string, fromFile: string): string;
 
@@ -90,15 +76,12 @@ interface ModuleGlobal {
    * Reads the contents of the given resolved module name into a string.
    *
    * To change native module loading behavior, replace this function with your
-   * own implementation. Note that you must handle `Module.compilers` yourself
-   * in your replacement implementation.
+   * own implementation. Note that you must handle `ModuleDelegate.compilers`
+   * yourself in your replacement implementation.
    */
   read(modulePath: string): string;
 }
 
-// global added by QJMS_AddModuleGlobal
-declare var Module: ModuleGlobal;
-
 interface RequireFunction {
   /**
    * Synchronously import a module.
@@ -107,8 +90,8 @@ interface RequireFunction {
    *
    * If `source` does not have a file extension, and a file without an extension
    * cannot be found, the engine will check for files with the extensions in
-   * {@link Module.searchExtensions}, and use one of those if present. This
-   * behavior also happens when using normal `import` statements.
+   * {@link ModuleDelegate.searchExtensions}, and use one of those if present.
+   * This behavior also happens when using normal `import` statements.
    *
    * For example, if you write:
    *
@@ -117,20 +100,20 @@ interface RequireFunction {
    * ```
    *
    * but there's no file named `somewhere` in the same directory as the file
-   * where that import appears, and `Module.searchExtensions` is the default
-   * value:
+   * where that import appears, and `ModuleDelegate.searchExtensions` is the
+   * default value:
    *
    * ```js
    * [".js"]
    * ```
    *
    * then the engine will look for `somewhere.js`. If that doesn't exist, the
-   * engine will look for `somewhere/index.js`. If *that* doesn't exist, an error
-   * will be thrown.
+   * engine will look for `somewhere/index.js`. If *that* doesn't exist, an
+   * error will be thrown.
    *
-   * If you add more extensions to `Module.searchExtensions`, then the engine
-   * will use those, too. It will search in the same order as the strings appear
-   * in the `Module.searchExtensions` array.
+   * If you add more extensions to `ModuleDelegate.searchExtensions`, then the
+   * engine will use those, too. It will search in the same order as the strings
+   * appear in the `ModuleDelegate.searchExtensions` array.
    */
   (source: string): any;
 
@@ -140,7 +123,7 @@ interface RequireFunction {
   resolve: (source: string) => string;
 }
 
-// global added by QJMS_AddRequireGlobal
+// global added by QJMS_InitContext
 declare var require: RequireFunction;
 
 // gets set per-module by QJMS_SetModuleImportMeta
@@ -170,11 +153,12 @@ interface ImportMeta {
    *
    * Equivalent to `globalThis.require.resolve`.
    *
-   * Behaves similarly to [the browser import.meta.resolve](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/import.meta/resolve),
+   * Behaves similarly to [the browser
+   * import.meta.resolve](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/import.meta/resolve),
    * but it does not ensure that the returned string is a valid URL, because it
-   * delegates directly to {@link Module.resolve} to resolve the name. If you
-   * want this to return URL strings, change `Module.resolve` and `Module.read`
-   * to work with URL strings.
+   * delegates directly to {@link ModuleDelegate.resolve} to resolve the name.
+   * If you want this to return URL strings, change `ModuleDelegate.resolve` and
+   * `ModuleDelegate.read` to work with URL strings.
    */
   resolve: RequireFunction["resolve"];
 }

package/build/x86_64-apple-darwin/bin/file-to-bytecode.js

@@ -11,7 +11,8 @@ import * as std from "quickjs:std";
 import * as Bytecode from "quickjs:bytecode";
 
 function main() {
-  const [_quickjsRun, _thisScript, inputFile, outputFile] = scriptArgs;
+  let [_quickjsRun, _thisScript, inputFile, outputFile, encodedFileName] =
+    scriptArgs;
 
   if (!(inputFile && outputFile)) {
     throw new Error(
@@ -19,7 +20,11 @@ function main() {
     );
   }
 
-  const bytecode = Bytecode.fromFile(inputFile);
+  if (!encodedFileName) {
+    encodedFileName = inputFile;
+  }
+
+  const bytecode = Bytecode.fromFile(inputFile, { encodedFileName });
   const out = std.open(outputFile, "wb");
   out.write(bytecode, 0, bytecode.byteLength);
 }

package/build/x86_64-pc-windows-static/bin/file-to-bytecode.js

@@ -11,7 +11,8 @@ import * as std from "quickjs:std";
 import * as Bytecode from "quickjs:bytecode";
 
 function main() {
-  const [_quickjsRun, _thisScript, inputFile, outputFile] = scriptArgs;
+  let [_quickjsRun, _thisScript, inputFile, outputFile, encodedFileName] =
+    scriptArgs;
 
   if (!(inputFile && outputFile)) {
     throw new Error(
@@ -19,7 +20,11 @@ function main() {
     );
   }
 
-  const bytecode = Bytecode.fromFile(inputFile);
+  if (!encodedFileName) {
+    encodedFileName = inputFile;
+  }
+
+  const bytecode = Bytecode.fromFile(inputFile, { encodedFileName });
   const out = std.open(outputFile, "wb");
   out.write(bytecode, 0, bytecode.byteLength);
 }

package/build/x86_64-unknown-linux-gnu/bin/file-to-bytecode.js

@@ -11,7 +11,8 @@ import * as std from "quickjs:std";
 import * as Bytecode from "quickjs:bytecode";
 
 function main() {
-  const [_quickjsRun, _thisScript, inputFile, outputFile] = scriptArgs;
+  let [_quickjsRun, _thisScript, inputFile, outputFile, encodedFileName] =
+    scriptArgs;
 
   if (!(inputFile && outputFile)) {
     throw new Error(
@@ -19,7 +20,11 @@ function main() {
     );
   }
 
-  const bytecode = Bytecode.fromFile(inputFile);
+  if (!encodedFileName) {
+    encodedFileName = inputFile;
+  }
+
+  const bytecode = Bytecode.fromFile(inputFile, { encodedFileName });
   const out = std.open(outputFile, "wb");
   out.write(bytecode, 0, bytecode.byteLength);
 }

package/build/x86_64-unknown-linux-musl/bin/file-to-bytecode.js

@@ -11,7 +11,8 @@ import * as std from "quickjs:std";
 import * as Bytecode from "quickjs:bytecode";
 
 function main() {
-  const [_quickjsRun, _thisScript, inputFile, outputFile] = scriptArgs;
+  let [_quickjsRun, _thisScript, inputFile, outputFile, encodedFileName] =
+    scriptArgs;
 
   if (!(inputFile && outputFile)) {
     throw new Error(
@@ -19,7 +20,11 @@ function main() {
     );
   }
 
-  const bytecode = Bytecode.fromFile(inputFile);
+  if (!encodedFileName) {
+    encodedFileName = inputFile;
+  }
+
+  const bytecode = Bytecode.fromFile(inputFile, { encodedFileName });
   const out = std.open(outputFile, "wb");
   out.write(bytecode, 0, bytecode.byteLength);
 }

package/build/x86_64-unknown-linux-static/bin/file-to-bytecode.js

@@ -11,7 +11,8 @@ import * as std from "quickjs:std";
 import * as Bytecode from "quickjs:bytecode";
 
 function main() {
-  const [_quickjsRun, _thisScript, inputFile, outputFile] = scriptArgs;
+  let [_quickjsRun, _thisScript, inputFile, outputFile, encodedFileName] =
+    scriptArgs;
 
   if (!(inputFile && outputFile)) {
     throw new Error(
@@ -19,7 +20,11 @@ function main() {
     );
   }
 
-  const bytecode = Bytecode.fromFile(inputFile);
+  if (!encodedFileName) {
+    encodedFileName = inputFile;
+  }
+
+  const bytecode = Bytecode.fromFile(inputFile, { encodedFileName });
   const out = std.open(outputFile, "wb");
   out.write(bytecode, 0, bytecode.byteLength);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@suchipi/quickjs",
   "description": "Suchipi's QuickJS Fork",
-  "version": "0.5.0",
+  "version": "0.7.0",
   "main": "./npm/index.js",
   "bin": {
     "qjs": "npm/cli/qjs.js",
@@ -13,7 +13,7 @@
     "@babel/preset-env": "^7.20.2",
     "@babel/preset-typescript": "^7.18.6",
     "@suchipi/print": "^2.5.0",
-    "@suchipi/shinobi": "^0.2.0",
+    "@suchipi/shinobi": "^1.0.0",
     "@types/jest": "^29.2.4",
     "@types/node": "^18.11.9",
     "@types/shelljs": "^0.8.11",

package/.gitmodules

@@ -1,6 +0,0 @@
-[submodule "src/run-test262/test262"]
-	path = src/run-test262/test262
-	url = https://github.com/tc39/test262.git
-[submodule "src/run-test262/test262o"]
-	path = src/run-test262/test262o
-	url = https://github.com/tc39/test262.git