publish 0.10.0-6 using optionalDependencies

package.json

@@ -1,6 +1,6 @@
 {
   "name": "typst",
-  "version": "0.10.0-5",
+  "version": "0.10.0-6",
   "description": "A new markup-based typesetting system that is powerful and easy to learn.",
   "keywords": [
     "typesetting",
@@ -28,11 +28,13 @@
   "scripts": {
     "pretest": "tsc",
     "test": "node --test",
+    "prepare": "bash tools/prepare.sh",
     "build": "tsc",
     "format": "prettier -w .",
     "lint": "tsc --noEmit",
     "postversion": "node tools/postversion.js",
-    "generate-dist-packages": "node tools/generate-dist-packages.js"
+    "generate-dist-packages": "node tools/generate-dist-packages.js",
+    "prepublishOnly": "bash tools/prepublishOnly.sh"
   },
   "dependencies": {
     "execa": "^8.0.1"
@@ -44,10 +46,10 @@
     "vitest": "^1.0.4"
   },
   "optionalDependencies": {
-    "@typst-community/typst-win32-x64": "0.10.0-5",
-    "@typst-community/typst-darwin-x64": "0.10.0-5",
-    "@typst-community/typst-darwin-arm64": "0.10.0-5",
-    "@typst-community/typst-linux-arm64": "0.10.0-5",
-    "@typst-community/typst-linux-x64": "0.10.0-5"
+    "@typst-community/typst-win32-x64": "0.10.0-6",
+    "@typst-community/typst-darwin-x64": "0.10.0-6",
+    "@typst-community/typst-darwin-arm64": "0.10.0-6",
+    "@typst-community/typst-linux-arm64": "0.10.0-6",
+    "@typst-community/typst-linux-x64": "0.10.0-6"
   }
 }

packages/typst-community+typst-darwin-arm64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typst-community/typst-darwin-arm64",
-  "version": "0.10.0-5",
+  "version": "0.10.0-6",
   "exports": "./.typst/bin/typst",
   "os": [
     "darwin"

packages/typst-community+typst-darwin-x64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typst-community/typst-darwin-x64",
-  "version": "0.10.0-5",
+  "version": "0.10.0-6",
   "exports": "./.typst/bin/typst",
   "os": [
     "darwin"

packages/typst-community+typst-linux-arm64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typst-community/typst-linux-arm64",
-  "version": "0.10.0-5",
+  "version": "0.10.0-6",
   "exports": "./.typst/bin/typst",
   "os": [
     "linux"

packages/typst-community+typst-linux-x64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typst-community/typst-linux-x64",
-  "version": "0.10.0-5",
+  "version": "0.10.0-6",
   "exports": "./.typst/bin/typst",
   "os": [
     "linux"

packages/typst-community+typst-win32-x64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typst-community/typst-win32-x64",
-  "version": "0.10.0-5",
+  "version": "0.10.0-6",
   "exports": "./.typst/bin/typst",
   "os": [
     "win32"

src/help.ts

@@ -0,0 +1,9 @@
+import { $ } from "execa";
+import getTypstPath from "./lib/getTypstPath.js";
+
+export default async function help(options: { signal?: AbortSignal } = {}) {
+  const { stdout } = await $({
+    signal: options.signal,
+  })`${getTypstPath()} --help`;
+  return stdout;
+}

src/index.ts

@@ -2,3 +2,5 @@ export { default as compile, type TypstCompileOptions } from "./compile.js";
 export { default as fonts, type TypstFontsOptions } from "./fonts.js";
 export { default as query, type TypstQueryOptions } from "./query.js";
 export { default as watch, type TypstWatchOptions } from "./watch.js";
+export { default as help } from "./help.js";
+export { default as version } from "./version.js";

src/lib/getTypstPath.ts

@@ -1,14 +1,24 @@
 import { createRequire } from "node:module";
+import { fileURLToPath, pathToFileURL } from "node:url";
 const require = createRequire(new URL(import.meta.url));
-import.meta.resolve ??= (s) => require.resolve(s);
+import.meta.resolve ??= (s) => pathToFileURL(require.resolve(s)).href;
 
-const getTypstPath = {
-  "win32,x64": () => import.meta.resolve("@typst-community/typst-win32-x64"),
-  "darwin-x64": () => import.meta.resolve("@typst-community/typst-darwin-x64"),
-  "darwin-arm64": () =>
-    import.meta.resolve("@typst-community/typst-darwin-arm64"),
-  "linux-arm64": () =>
-    import.meta.resolve("@typst-community/typst-linux-arm64"),
-  "linux-x64": () => import.meta.resolve("@typst-community/typst-linux-x64"),
-}[[process.platform, process.arch].toString()]!;
+const getTypstPath =
+  {
+    "win32,x64": () =>
+      fileURLToPath(import.meta.resolve("@typst-community/typst-win32-x64")),
+    "darwin,x64": () =>
+      fileURLToPath(import.meta.resolve("@typst-community/typst-darwin-x64")),
+    "darwin,arm64": () =>
+      fileURLToPath(import.meta.resolve("@typst-community/typst-darwin-arm64")),
+    "linux,arm64": () =>
+      fileURLToPath(import.meta.resolve("@typst-community/typst-linux-arm64")),
+    "linux,x64": () =>
+      fileURLToPath(import.meta.resolve("@typst-community/typst-linux-x64")),
+  }[[process.platform, process.arch].toString()] ??
+  (() => {
+    throw new ReferenceError(
+      `@typst-community/typst-[os]-[arch] not found for ${process.platform}-${process.arch}`,
+    );
+  });
 export default getTypstPath;

src/query.ts

@@ -16,11 +16,10 @@ export interface TypstQueryOptions {
 
 export default async function query(
   inputRaw: PathLike,
-  selectorRaw: PathLike,
+  selector: string,
   options: TypstQueryOptions = {},
 ) {
   const inputPath = pathOrFileURLToPath(inputRaw);
-  const selectorPath = pathOrFileURLToPath(selectorRaw);
   const opts = [];
   if (options.root != null)
     opts.push("--root", pathOrFileURLToPath(options.root));
@@ -35,7 +34,7 @@ export default async function query(
     opts.push("--cert", pathOrFileURLToPath(options.cert));
   const { stdout } = await $({
     signal: options.signal,
-  })`${getTypstPath()} query ${opts} ${inputPath} ${selectorPath}`;
+  })`${getTypstPath()} query ${opts} ${inputPath} ${selector}`;
   const json = JSON.parse(stdout);
   return json;
 }

src/version.ts

@@ -0,0 +1,10 @@
+import { $ } from "execa";
+import getTypstPath from "./lib/getTypstPath.js";
+
+export default async function version(options: { signal?: AbortSignal } = {}) {
+  const { stdout } = await $({
+    signal: options.signal,
+  })`${getTypstPath()} --version`;
+  const version = stdout.match(/\d+\.\d+\.\d+/)[0];
+  return version;
+}

test/fonts.test.js

@@ -2,7 +2,7 @@ import test from "node:test";
 import assert from "node:assert/strict";
 import * as typst from "../dist/index.js";
 
-test("compile example.typ", async () => {
+test("fonts", async () => {
   const r = await typst.fonts();
-  console.log(r);
+  console.log(`${r.length} fonts`);
 });

test/help.test.js

@@ -0,0 +1,8 @@
+import test from "node:test";
+import assert from "node:assert/strict";
+import * as typst from "../dist/index.js";
+
+test("help", async () => {
+  const r = await typst.help();
+  console.log(`${r.length} chars`);
+});

test/main.test.js

@@ -3,7 +3,7 @@ import assert from "node:assert/strict";
 import { $ } from "execa";
 import { fileURLToPath } from "node:url";
 
-test("main.js --help", async () => {
+test("main.js --version", async () => {
   const mainPath = fileURLToPath(new URL("../dist/main.js", import.meta.url));
-  await $({ stdio: "inherit" })`${process.execPath} ${mainPath} --help`;
+  await $({ stdio: "inherit" })`${process.execPath} ${mainPath} --version`;
 });

test/query.test.js

@@ -2,7 +2,10 @@ import test from "node:test";
 import assert from "node:assert/strict";
 import * as typst from "../dist/index.js";
 
-test("compile example.typ", async () => {
-  const r = await typst.query(new URL("./example.typ"), "<note>");
+test("query example.typ <note>", async () => {
+  const r = await typst.query(
+    new URL("./example.typ", import.meta.url),
+    "<note>",
+  );
   console.log(r);
 });

test/version.test.js

@@ -0,0 +1,8 @@
+import test from "node:test";
+import assert from "node:assert/strict";
+import * as typst from "../dist/index.js";
+
+test("version", async () => {
+  const r = await typst.version();
+  console.log(`got typst v${r}`);
+});

tools/postversion.js

@@ -10,11 +10,11 @@ let text = await readFile(packageFile, "utf8");
 let package_ = JSON.parse(text);
 
 const tuples = [
-  "@typst-community/typst-win32-x64",
-  "@typst-community/typst-darwin-x64",
-  "@typst-community/typst-darwin-arm64",
-  "@typst-community/typst-linux-arm64",
-  "@typst-community/typst-linux-x64",
+  "win32-x64",
+  "darwin-x64",
+  "darwin-arm64",
+  "linux-arm64",
+  "linux-x64",
 ];
 
 for (const tuple of tuples) {

tools/prepare.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+set -ex
+tuple=$(node -p '`${process.platform}-${process.arch}`')
+npm link "./packages/typst-community+typst-$tuple"

tools/prepublishOnly.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -ex
+for tuple in win32-x64 darwin-x64 darwin-arm64 linux-arm64 linux-x64; do
+  pushd "./packages/typst-community+typst-$tuple"
+  npm publish
+  popd
+done