@suchipi/quickjs 0.2.1 → 0.4.0

package/build/dts/quickjs.d.ts

@@ -19,6 +19,18 @@ interface ObjectConstructor {
   isPrimitive(input: any): boolean;
 }
 
+interface StringConstructor {
+  /**
+   * A no-op template literal tag.
+   *
+   * https://github.com/tc39/proposal-string-cooked
+   */
+  cooked(
+    strings: readonly string[] | ArrayLike<string>,
+    ...substitutions: any[]
+  ): string;
+}
+
 interface SymbolConstructor {
   /**
    * A method that changes the result of using the `typeof` operator on the

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

@@ -0,0 +1,27 @@
+#!/usr/bin/env quickjs-run
+
+// Simple script which reads in a file, converts it to bytecode, and writes out
+// the bytecode to a new file.
+
+/// <reference path="../quickjs/quickjs.d.ts" />
+/// <reference path="../quickjs-libc/quickjs-libc.d.ts" />
+/// <reference path="../quickjs-libbytecode/quickjs-libbytecode.d.ts" />
+
+import * as std from "quickjs:std";
+import * as Bytecode from "quickjs:bytecode";
+
+function main() {
+  const [_quickjsRun, _thisScript, inputFile, outputFile] = scriptArgs;
+
+  if (!(inputFile && outputFile)) {
+    throw new Error(
+      "You must pass two positional arguments to this script: the input file path (js) and the output file path (bytecode binary)."
+    );
+  }
+
+  const bytecode = Bytecode.fromFile(inputFile);
+  const out = std.open(outputFile, "wb");
+  out.write(bytecode, 0, bytecode.byteLength);
+}
+
+main();

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

@@ -0,0 +1,27 @@
+#!/usr/bin/env quickjs-run
+
+// Simple script which reads in a file, converts it to bytecode, and writes out
+// the bytecode to a new file.
+
+/// <reference path="../quickjs/quickjs.d.ts" />
+/// <reference path="../quickjs-libc/quickjs-libc.d.ts" />
+/// <reference path="../quickjs-libbytecode/quickjs-libbytecode.d.ts" />
+
+import * as std from "quickjs:std";
+import * as Bytecode from "quickjs:bytecode";
+
+function main() {
+  const [_quickjsRun, _thisScript, inputFile, outputFile] = scriptArgs;
+
+  if (!(inputFile && outputFile)) {
+    throw new Error(
+      "You must pass two positional arguments to this script: the input file path (js) and the output file path (bytecode binary)."
+    );
+  }
+
+  const bytecode = Bytecode.fromFile(inputFile);
+  const out = std.open(outputFile, "wb");
+  out.write(bytecode, 0, bytecode.byteLength);
+}
+
+main();

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

@@ -0,0 +1,27 @@
+#!/usr/bin/env quickjs-run
+
+// Simple script which reads in a file, converts it to bytecode, and writes out
+// the bytecode to a new file.
+
+/// <reference path="../quickjs/quickjs.d.ts" />
+/// <reference path="../quickjs-libc/quickjs-libc.d.ts" />
+/// <reference path="../quickjs-libbytecode/quickjs-libbytecode.d.ts" />
+
+import * as std from "quickjs:std";
+import * as Bytecode from "quickjs:bytecode";
+
+function main() {
+  const [_quickjsRun, _thisScript, inputFile, outputFile] = scriptArgs;
+
+  if (!(inputFile && outputFile)) {
+    throw new Error(
+      "You must pass two positional arguments to this script: the input file path (js) and the output file path (bytecode binary)."
+    );
+  }
+
+  const bytecode = Bytecode.fromFile(inputFile);
+  const out = std.open(outputFile, "wb");
+  out.write(bytecode, 0, bytecode.byteLength);
+}
+
+main();

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

@@ -0,0 +1,27 @@
+#!/usr/bin/env quickjs-run
+
+// Simple script which reads in a file, converts it to bytecode, and writes out
+// the bytecode to a new file.
+
+/// <reference path="../quickjs/quickjs.d.ts" />
+/// <reference path="../quickjs-libc/quickjs-libc.d.ts" />
+/// <reference path="../quickjs-libbytecode/quickjs-libbytecode.d.ts" />
+
+import * as std from "quickjs:std";
+import * as Bytecode from "quickjs:bytecode";
+
+function main() {
+  const [_quickjsRun, _thisScript, inputFile, outputFile] = scriptArgs;
+
+  if (!(inputFile && outputFile)) {
+    throw new Error(
+      "You must pass two positional arguments to this script: the input file path (js) and the output file path (bytecode binary)."
+    );
+  }
+
+  const bytecode = Bytecode.fromFile(inputFile);
+  const out = std.open(outputFile, "wb");
+  out.write(bytecode, 0, bytecode.byteLength);
+}
+
+main();

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

@@ -0,0 +1,27 @@
+#!/usr/bin/env quickjs-run
+
+// Simple script which reads in a file, converts it to bytecode, and writes out
+// the bytecode to a new file.
+
+/// <reference path="../quickjs/quickjs.d.ts" />
+/// <reference path="../quickjs-libc/quickjs-libc.d.ts" />
+/// <reference path="../quickjs-libbytecode/quickjs-libbytecode.d.ts" />
+
+import * as std from "quickjs:std";
+import * as Bytecode from "quickjs:bytecode";
+
+function main() {
+  const [_quickjsRun, _thisScript, inputFile, outputFile] = scriptArgs;
+
+  if (!(inputFile && outputFile)) {
+    throw new Error(
+      "You must pass two positional arguments to this script: the input file path (js) and the output file path (bytecode binary)."
+    );
+  }
+
+  const bytecode = Bytecode.fromFile(inputFile);
+  const out = std.open(outputFile, "wb");
+  out.write(bytecode, 0, bytecode.byteLength);
+}
+
+main();

package/npm/cli/qjs.js

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
-const runBinary = require("./run-binary");
+const runBinary = require("../run-binary");
 
 runBinary("qjs");

package/npm/cli/qjsc.js

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
-const runBinary = require("./run-binary");
+const runBinary = require("../run-binary");
 
 runBinary("qjsc");

package/npm/cli/quickjs-run.js

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
-const runBinary = require("./run-binary");
+const runBinary = require("../run-binary");
 
 runBinary("quickjs-run");

package/npm/index.js

@@ -1,54 +1,28 @@
+const fs = require("fs");
 const path = require("path");
 
-exports.buildArtifactsLocation = function buildArtifactsLocation() {
+function buildArtifactsLocation() {
   return path.resolve(__dirname, "..", "build");
-};
+}
+exports.buildArtifactsLocation = buildArtifactsLocation;
 
-exports.identifyCurrentPlatform = function identifyCurrentPlatform() {
-  const platform = process.platform;
-  switch (platform) {
-    case "darwin":
-    case "linux":
-    case "win32": {
-      break;
-    }
-    default: {
-      throw new Error(`Unsupported platform: ${platform}`);
-    }
-  }
+const platforms = require("./platforms.json");
+exports.platforms = platforms;
 
-  /** @type {string} */
-  let arch = process.arch;
-  switch (arch) {
-    case "arm64": {
-      arch = "aarch64";
-      break;
-    }
-    case "x64": {
-      arch = "x86_64";
-      break;
-    }
-    default: {
-      throw new Error(`Unsupported processor architecture: ${arch}`);
-    }
-  }
+function identifyCurrentPlatform() {
+  const matchingPlatform = platforms.find((platform) => {
+    return (
+      platform.os === process.platform &&
+      platform.architectures.includes(process.arch)
+    );
+  });
 
-  switch (platform) {
-    case "darwin": {
-      return `${arch}-apple-darwin`;
-    }
-    case "win32": {
-      if (arch !== "x86_64") {
-        throw new Error(`Architecture is not supported on Windows: ${arch}`);
-      }
-      return `${arch}-pc-windows-static`;
-    }
-    case "linux": {
-      return `${arch}-unknown-linux-static`;
-    }
-    default: {
-      // should be unreachable
-      throw new Error(`Unsupported platform: ${platform}`);
-    }
+  if (matchingPlatform) {
+    return matchingPlatform;
+  } else {
+    throw new Error(
+      `Unsupported platform: ${process.platform}/${process.arch}`
+    );
   }
-};
+}
+exports.identifyCurrentPlatform = identifyCurrentPlatform;

package/npm/platforms.json

@@ -0,0 +1,65 @@
+[
+  {
+    "name": "aarch64-apple-darwin",
+    "architectures": ["aarch64", "arm64"],
+    "os": "darwin",
+    "abi": "",
+    "programSuffix": ""
+  },
+  {
+    "name": "aarch64-unknown-linux-gnu",
+    "architectures": ["aarch64", "arm64"],
+    "os": "linux",
+    "abi": "gnu",
+    "programSuffix": ""
+  },
+  {
+    "name": "aarch64-unknown-linux-musl",
+    "architectures": ["aarch64", "arm64"],
+    "os": "linux",
+    "abi": "musl",
+    "programSuffix": ""
+  },
+  {
+    "name": "aarch64-unknown-linux-static",
+    "architectures": ["aarch64", "arm64"],
+    "os": "linux",
+    "abi": "static",
+    "programSuffix": ""
+  },
+  {
+    "name": "x86_64-apple-darwin",
+    "architectures": ["x86_64", "amd64", "x64"],
+    "os": "darwin",
+    "abi": "",
+    "programSuffix": ""
+  },
+  {
+    "name": "x86_64-pc-windows-static",
+    "architectures": ["x86_64", "amd64", "x64"],
+    "os": "windows",
+    "abi": "",
+    "programSuffix": ".exe"
+  },
+  {
+    "name": "x86_64-unknown-linux-gnu",
+    "architectures": ["x86_64", "amd64", "x64"],
+    "os": "linux",
+    "abi": "gnu",
+    "programSuffix": ""
+  },
+  {
+    "name": "x86_64-unknown-linux-musl",
+    "architectures": ["x86_64", "amd64", "x64"],
+    "os": "linux",
+    "abi": "musl",
+    "programSuffix": ""
+  },
+  {
+    "name": "x86_64-unknown-linux-static",
+    "architectures": ["x86_64", "amd64", "x64"],
+    "os": "linux",
+    "abi": "static",
+    "programSuffix": ""
+  }
+]

package/npm/{cli/run-binary.js → run-binary.js}

@@ -1,15 +1,18 @@
 #!/usr/bin/env node
 const path = require("path");
 const child_process = require("child_process");
-const { identifyCurrentPlatform } = require("..");
+const { identifyCurrentPlatform, buildArtifactsLocation } = require(".");
 
 module.exports = function runBinary(name) {
+  const buildDir = buildArtifactsLocation();
   const platform = identifyCurrentPlatform();
 
-  let bin = path.resolve(__dirname, "..", "..", "build", platform, "bin", name);
-  if (process.platform === "win32") {
-    bin += ".exe";
-  }
+  const bin = path.resolve(
+    buildDir,
+    platform.name,
+    "bin",
+    name + platform.programSuffix
+  );
 
   const argv = process.argv.slice(2);
 

package/package.json

@@ -1,17 +1,18 @@
 {
   "name": "@suchipi/quickjs",
   "description": "Suchipi's QuickJS Fork",
-  "version": "0.2.1",
+  "version": "0.4.0",
   "main": "./npm/index.js",
   "bin": {
-    "qjs": "./npm/cli/qjs.js",
-    "qjsc": "./npm/cli/qjsc.js",
-    "quickjs-run": "./npm/cli/quickjs-run.js"
+    "qjs": "npm/cli/qjs.js",
+    "qjsc": "npm/cli/qjsc.js",
+    "quickjs-run": "npm/cli/quickjs-run.js"
   },
   "devDependencies": {
     "@babel/core": "^7.20.5",
     "@babel/preset-env": "^7.20.2",
     "@babel/preset-typescript": "^7.18.6",
+    "@suchipi/print": "^2.5.0",
     "@suchipi/shinobi": "^0.2.0",
     "@types/jest": "^29.2.4",
     "@types/node": "^18.11.9",
@@ -28,7 +29,10 @@
   },
   "prettier": {},
   "license": "MIT",
-  "repository": "suchipi/quickjs",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/suchipi/quickjs.git"
+  },
   "publishConfig": {
     "access": "public"
   }

package/tsconfig.json

@@ -18,11 +18,12 @@
     "allowJs": true,
     "checkJs": true,
     "noEmit": true,
-    "lib": ["ES2020"],
+    "lib": ["ES2021"],
     "module": "ES2020",
     "moduleResolution": "node",
     "strictNullChecks": true,
     "esModuleInterop": true,
-    "types": ["jest"]
+    "types": ["jest"],
+    "resolveJsonModule": true
   }
 }