mk: --loader => --import

mk/literate.sh

@@ -13,8 +13,7 @@ literate_run() {
     pushd $1 >/dev/null
     FILE=README.md
   fi
-  export TS_CONFIG_PATH=$ROOTDIR/mk/tsconfig-literate.json
-  node --loader $ROOTDIR/mk/loader.mjs $FILE
+  node --import $ROOTDIR/mk/loader-import.mjs $FILE
   popd >/dev/null
 }
 

mk/loader-import.mjs

@@ -0,0 +1,5 @@
+import { register } from "node:module";
+import { fileURLToPath } from "node:url";
+
+process.env.TS_CONFIG_PATH = fileURLToPath(new URL("tsconfig-literate.json", import.meta.url));
+register(new URL("loader.mjs", import.meta.url));

packages/autoconfig/README.md

@@ -77,7 +77,7 @@ console.log("fastest face is", `${fastestFace}`);
 // By default, default route "/" is added to the face, so that you can send Interests right away.
 try {
   const t0 = Date.now();
-  const data = await new Endpoint({ fw }).consume(`/ndn/edu/ucla/ping/${Math.trunc(Math.random() * 1e8)}`);
+  const data = await new Endpoint({ fw }).consume(`/ndn/edu/memphis/ping/${Math.trunc(Math.random() * 1e8)}`);
   console.log("Interest satisfied", `${data.name}`, `${Date.now() - t0}ms`);
 } catch (err: unknown) {
   console.warn(err);

packages/cat/ndncat.sh

@@ -1,4 +1,3 @@
 #!/bin/bash
 PKGDIR="$(readlink -f $(dirname "${BASH_SOURCE[0]}"))"
-export TS_CONFIG_PATH=$(readlink -f ${PKGDIR}/../../mk/tsconfig-literate.json)
-node --loader ${PKGDIR}/../../mk/loader.mjs ${PKGDIR}/lib/main_node.js "$@"
+node --import ${PKGDIR}/../../mk/loader-import.mjs ${PKGDIR}/lib/main_node.js "$@"

packages/keychain-cli/ndnts-keychain.sh

@@ -1,4 +1,3 @@
 #!/bin/bash
 PKGDIR="$(readlink -f $(dirname "${BASH_SOURCE[0]}"))"
-export TS_CONFIG_PATH=$(readlink -f ${PKGDIR}/../../mk/tsconfig-literate.json)
-node --loader ${PKGDIR}/../../mk/loader.mjs ${PKGDIR}/lib/main_node.js "$@"
+node --import ${PKGDIR}/../../mk/loader-import.mjs ${PKGDIR}/lib/main_node.js "$@"

packages/repo-cli/ndnts-repo.sh

@@ -1,4 +1,3 @@
 #!/bin/bash
 PKGDIR="$(readlink -f $(dirname "${BASH_SOURCE[0]}"))"
-export TS_CONFIG_PATH=$(readlink -f ${PKGDIR}/../../mk/tsconfig-literate.json)
-node --loader ${PKGDIR}/../../mk/loader.mjs ${PKGDIR}/lib/main_node.js "$@"
+node --import ${PKGDIR}/../../mk/loader-import.mjs ${PKGDIR}/lib/main_node.js "$@"