esm.dev 1.7.4 → 1.8.1

package/README.md

@@ -10,7 +10,7 @@ It expects you to have a local version of ESM.sh and verdaccio running. It will
 
 - You have [docker](https://www.docker.com/) installed
 - You have [docker compose](https://docs.docker.com/compose/) installed
-- You have a JavaScript runtime installed ([Node.js](https://nodejs.org/), [Deno](https://deno.com/), [Bun](https://bun.sh/) etc)
+- You have a JavaScript runtime installed, EG: [Node.js](https://nodejs.org/)
 
 ### Installation
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esm.dev",
-  "version": "1.7.4",
+  "version": "1.8.1",
   "description": "TypeScript library template",
   "type": "module",
   "sideEffects": false,
@@ -11,12 +11,13 @@
     "esm.dev": "./dist/cli.js"
   },
   "scripts": {
-    "build": "bun run clean && tsc",
+    "build": "npm run clean && tsc",
     "clean": "rimraf dist",
-    "esm.dev": "bun ./src/cli.ts",
+    "esm.dev": "node --experimental-strip-types --no-warnings=ExperimentalWarning ./src/cli.ts",
     "prepare": "husky",
     "start": "docker compose up --detach --remove-orphans",
-    "stop": "docker compose down"
+    "stop": "docker compose down",
+    "test": "vitest run"
   },
   "repository": {
     "type": "git",
@@ -33,21 +34,22 @@
     "@commitlint/cli": "19.8.1",
     "@commitlint/config-conventional": "19.8.1",
     "@commitlint/types": "19.8.1",
-    "@types/bun": "latest",
     "@types/http-proxy": "^1.17.16",
     "@types/lodash.debounce": "^4.0.9",
     "@types/mustache": "^4.2.6",
+    "@types/node": "^22.15.27",
     "@types/ramda": "^0.30.2",
     "husky": "9.1.7",
-    "lint-staged": "16.0.0",
+    "lint-staged": "16.1.0",
     "prettier": "3.5.3",
     "rimraf": "6.0.1",
     "semantic-release": "^24.2.4",
-    "typescript": "5.8.3"
+    "typescript": "5.8.3",
+    "vitest": "^3.1.4"
   },
   "lint-staged": {
     "*.{md,json,js,jsx,ts,tsx,yml,yaml}": [
-      "bunx prettier --ignore-path .gitignore --write"
+      "npx prettier --ignore-path .gitignore --write"
     ]
   },
   "dependencies": {
@@ -56,7 +58,10 @@
     "escape-string-regexp": "^5.0.0",
     "glob": "^11.0.2",
     "http-proxy": "^1.18.1",
+    "ignore": "^7.0.4",
     "lodash.debounce": "^4.0.8",
+    "minimatch": "^10.0.1",
+    "minipass": "^7.1.2",
     "mustache": "^4.2.0",
     "npm": "^11.4.1",
     "ramda": "^0.30.1",
@@ -65,5 +70,8 @@
     "typanion": "^3.14.0",
     "zod": "^3.25.23",
     "zx": "^8.5.4"
+  },
+  "optionalDependencies": {
+    "@rollup/rollup-linux-x64-musl": "^4.41.1"
   }
 }

package/dist/cli.js

@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-import { runExit } from 'clipanion';
-import { WatchCommand } from './commands/WatchCommand.js';
-import { RepublishCommand } from './commands/RepublishCommand.js';
-import { LoginCommand } from './commands/LoginCommand.js';
-import { TokenCommand } from './commands/TokenCommand.js';
-import { WaitForRegistryCommand } from './commands/WaitForRegistryCommand.js';
-import { StartCommand } from './commands/StartCommand.js';
-import { InitCommand } from './commands/InitCommand.js';
-import { VersionCommand } from './commands/VersionCommand.js';
-runExit([
-    InitCommand,
-    LoginCommand,
-    TokenCommand,
-    RepublishCommand,
-    StartCommand,
-    VersionCommand,
-    WaitForRegistryCommand,
-    WatchCommand,
-]);

package/dist/commands/ESMDevCommand.js

@@ -1,6 +0,0 @@
-import { Command } from 'clipanion';
-import { RegistrySpecific } from './mixins/RegistrySpecific.js';
-import { ESMStorageSpecific } from './mixins/ESMStorageSpecific.js';
-import { PackagePathSpecific } from './mixins/PackagePathSpecific.js';
-export class ESMDevCommand extends ESMStorageSpecific(RegistrySpecific(PackagePathSpecific(Command))) {
-}

package/dist/commands/InitCommand.js

@@ -1,50 +0,0 @@
-import { ESMDevCommand } from './ESMDevCommand.js';
-import { PackagePathSpecific } from './mixins/PackagePathSpecific.js';
-import { MustacheGeneratorCommand } from './MustacheGeneratorCommand.js';
-import { Option } from 'clipanion';
-import { isNumber } from 'typanion';
-export class InitCommand extends PackagePathSpecific(MustacheGeneratorCommand) {
-    static paths = [['init']];
-    static usage = ESMDevCommand.Usage({
-        description: 'Initialises your repo ready to work with ESM.sh locally',
-        examples: [
-            ['Create a minimal template', 'esm.dev init'],
-            ["Specify the packages you're developing", 'esm.dev init packages/*'],
-            [
-                'Specify different ports',
-                'esm.dev init --port 3001 --esm-port 8081 --registry-port 4444',
-            ],
-        ],
-    });
-    esmPort = Option.String('-e,--esm-port', '8080', {
-        description: 'The port of the ESM Server',
-        validator: isNumber(),
-    });
-    esmStoragePath = Option.String('-s,--esm-storage-path', './docker-storage/esm/esmd', {
-        description: "Path to ESM.sh's storage",
-    });
-    port = Option.String('-p,--port', '3000', {
-        description: "The server's port",
-    });
-    outputDirectory = Option.String('-o,--output-dir', '.', {
-        description: 'The output directory',
-    });
-    registryPort = Option.String('-r,--registry-port', '4873', {
-        description: 'The port of your local registry',
-        validator: isNumber(),
-    });
-    esmURL;
-    npmRegistryURL;
-    packages;
-    async execute() {
-        const path = await import('node:path');
-        this.templateDir = path.resolve(import.meta.dirname, '..', '..', 'templates', 'init');
-        this.destinationDir = this.outputDirectory;
-        this.packages = this.packagePaths.map((packagePath) => ({
-            path: packagePath,
-            basename: path.basename(packagePath),
-        }));
-        await this.removeDestinationFile('docker-compose.yaml', 'docker-compose.yml.mustache');
-        await super.execute();
-    }
-}

package/dist/commands/LoginCommand.js

@@ -1,12 +0,0 @@
-import { Command } from 'clipanion';
-import { RegistrySpecific } from './mixins/RegistrySpecific.js';
-export class LoginCommand extends RegistrySpecific(Command) {
-    static paths = [['login']];
-    static usage = Command.Usage({
-        description: 'Login in to the NPM registry',
-    });
-    async execute() {
-        const { login } = await import('../lib/login.js');
-        return login(this.registry);
-    }
-}

package/dist/commands/MustacheGeneratorCommand.js

@@ -1,9 +0,0 @@
-import { GeneratorCommand } from 'clipanion-generator-command';
-import { MustacheGenerator } from '../lib/MustacheGenerator.js';
-export class MustacheGeneratorCommand extends GeneratorCommand {
-    get generator() {
-        return new MustacheGenerator(this.templateDir, this.destinationDir, [
-            '.mustache',
-        ]);
-    }
-}

package/dist/commands/RepublishCommand.js

@@ -1,11 +0,0 @@
-import { ESMDevCommand } from './ESMDevCommand.js';
-export class RepublishCommand extends ESMDevCommand {
-    static paths = [['republish']];
-    static usage = ESMDevCommand.Usage({
-        description: 'Removes the references, of given packages, from the ESM server and registry and republishes.',
-    });
-    async execute() {
-        const { republish } = await import('../lib/republish.js');
-        await this.eachPackagePath((packagePath) => republish(packagePath, this));
-    }
-}

package/dist/commands/StartCommand.js

@@ -1,16 +0,0 @@
-import { ESMDevCommand } from './ESMDevCommand.js';
-import { Servable } from './mixins/Servable.js';
-import { Watchable } from './mixins/Watchable.js';
-import { ESMServed } from './mixins/ESMServed.js';
-export class StartCommand extends Servable(Watchable(ESMServed(ESMDevCommand))) {
-    static paths = [['start']];
-    static usage = ESMDevCommand.Usage({
-        description: 'Runs a server and concurrently watches a file system',
-    });
-    async execute() {
-        const { watch } = await import('../lib/watch.js');
-        const { serve } = await import('../lib/server.js');
-        serve(this.port, this.esmOrigin);
-        await this.eachPackagePath((packagePath) => watch(packagePath, this));
-    }
-}

package/dist/commands/TokenCommand.js

@@ -1,20 +0,0 @@
-import { Command } from 'clipanion';
-import { RegistrySpecific } from './mixins/RegistrySpecific.js';
-export class TokenCommand extends RegistrySpecific(Command) {
-    static paths = [['token']];
-    static usage = Command.Usage({
-        description: 'Get the NPM token',
-    });
-    async execute() {
-        const { default: escapeStringRegexp } = await import('escape-string-regexp');
-        const npmrc = await Bun.file(`~/.npmrc`).text();
-        const url = new URL(this.registry);
-        const regex = new RegExp(`^//${escapeStringRegexp(url.hostname)}/:_authToken=(.*)$`, 'm');
-        const match = regex.exec(npmrc);
-        if (!match) {
-            this.context.stderr.write(`Token has not been created yet\n`);
-            return 1;
-        }
-        this.context.stdout.write(match[1] + '\n');
-    }
-}

package/dist/commands/VersionCommand.js

@@ -1,13 +0,0 @@
-import { Command } from 'clipanion';
-import { readFile } from 'node:fs/promises';
-export class VersionCommand extends Command {
-    static paths = [['version']];
-    static usage = Command.Usage({
-        description: 'Display the version of esm.dev',
-    });
-    async execute() {
-        const path = await import('node:path');
-        const pckg = JSON.parse(await readFile(path.resolve(import.meta.dirname, '..', '..', 'package.json'), 'utf-8'));
-        this.context.stdout.write(`${pckg.version}\n`);
-    }
-}

package/dist/commands/WaitForRegistryCommand.js

@@ -1,12 +0,0 @@
-import { Command } from 'clipanion';
-import { RegistrySpecific } from './mixins/RegistrySpecific.js';
-import { Retryable } from './mixins/Retryable.js';
-export class WaitForRegistryCommand extends Retryable(RegistrySpecific(Command)) {
-    static paths = [['wait-for-registry'], ['wfr']];
-    static usage = Command.Usage({
-        description: 'wait for the registry to be online',
-    });
-    async execute() {
-        return this.retry(this.registry);
-    }
-}

package/dist/commands/WatchCommand.js

@@ -1,12 +0,0 @@
-import { ESMDevCommand } from './ESMDevCommand.js';
-import { Watchable } from './mixins/Watchable.js';
-export class WatchCommand extends Watchable(ESMDevCommand) {
-    static paths = [['watch']];
-    static usage = ESMDevCommand.Usage({
-        description: 'Watches directories and republishes on changes',
-    });
-    async execute() {
-        const { watch } = await import('../lib/watch.js');
-        await this.eachPackagePath((packagePath) => watch(packagePath, this));
-    }
-}

package/dist/commands/mixins/CommandClass.js

@@ -1 +0,0 @@
-export {};

package/dist/commands/mixins/ESMServed.js

@@ -1,9 +0,0 @@
-import { EnvOption } from '../../options/EnvOption.js';
-export function ESMServed(Base) {
-    class ESMServed extends Base {
-        esmOrigin = EnvOption('ESM_ORIGIN', '-e,--esm-origin', {
-            description: 'The base URL of the ESM Server',
-        });
-    }
-    return ESMServed;
-}

package/dist/commands/mixins/ESMStorageSpecific.js

@@ -1,9 +0,0 @@
-import { EnvOption } from '../../options/EnvOption.js';
-export function ESMStorageSpecific(Base) {
-    class ESMStorageSpecific extends Base {
-        esmStoragePath = EnvOption('ESM_STORAGE_PATH', '-s,--esm-storage-path', {
-            description: "Path to ESM.sh's storage",
-        });
-    }
-    return ESMStorageSpecific;
-}

package/dist/commands/mixins/PackagePathSpecific.js

@@ -1,14 +0,0 @@
-import { Option } from 'clipanion';
-export function PackagePathSpecific(Base) {
-    class PackagePathSpecific extends Base {
-        packagePaths = Option.Rest({
-            name: 'packages',
-        });
-        async eachPackagePath(cb) {
-            const { glob } = await import('glob');
-            const packagePaths = (await Promise.all(this.packagePaths.map((packagePath) => glob(packagePath)))).flat();
-            await Promise.all(packagePaths.map(cb));
-        }
-    }
-    return PackagePathSpecific;
-}

package/dist/commands/mixins/RegistrySpecific.js

@@ -1,9 +0,0 @@
-import { EnvOption } from '../../options/EnvOption.js';
-export function RegistrySpecific(Base) {
-    class RegistrySpecific extends Base {
-        registry = EnvOption('NPM_REGISTRY', '-r,--registry', {
-            description: 'The URL of your local registry',
-        });
-    }
-    return RegistrySpecific;
-}

package/dist/commands/mixins/Retryable.js

@@ -1,28 +0,0 @@
-import { Option } from 'clipanion';
-import { isNumber } from 'typanion';
-export function Retryable(Base) {
-    class Retryable extends Base {
-        timeout = Option.String('-t,--timeout', '10000', {
-            description: 'The amount of total ms to keep trying for',
-            validator: isNumber(),
-        });
-        interval = Option.String('-i,--interval', '300', {
-            description: 'The amount of ms inbetween each attempt',
-            validator: isNumber(),
-        });
-        async retry(endpoint) {
-            const { until } = await import('../../lib/until.js');
-            if (!(await until({
-                ...this,
-                try: async (signal) => {
-                    const response = await fetch(endpoint, { signal });
-                    return response.ok;
-                },
-            }))) {
-                this.context.stderr.write(`${endpoint} is not available\n`);
-                return 1;
-            }
-        }
-    }
-    return Retryable;
-}

package/dist/commands/mixins/Servable.js

@@ -1,11 +0,0 @@
-import { isNumber } from 'typanion';
-import { EnvOption } from '../../options/EnvOption.js';
-export function Servable(Base) {
-    class Servable extends Base {
-        port = EnvOption('PORT', '-p,--port', {
-            description: 'The port to run the server on',
-            validator: isNumber(),
-        });
-    }
-    return Servable;
-}

package/dist/commands/mixins/Watchable.js

@@ -1,9 +0,0 @@
-import { Option } from 'clipanion';
-export function Watchable(Base) {
-    class Watchable extends Base {
-        legacyMethod = Option.Boolean('-l,--legacy-method', false, {
-            description: 'Use a less performant, legacy, watch method. Sometimes needed in docker or vagrant environments.',
-        });
-    }
-    return Watchable;
-}

package/dist/lib/MustacheGenerator.js

@@ -1,9 +0,0 @@
-import Mustache from 'mustache';
-import { Generator } from 'clipanion-generator-command/Generator';
-export class MustacheGenerator extends Generator {
-    renderTemplate(templateContext, template) {
-        return Mustache.render(template, templateContext, undefined, {
-            escape: (x) => x,
-        });
-    }
-}

package/dist/lib/getPackageMeta.js

@@ -1,10 +0,0 @@
-import { readFile, stat as getStat } from 'node:fs/promises';
-import * as path from 'node:path';
-export async function getPackageMeta(packagePath) {
-    const stat = await getStat(packagePath);
-    const packageRoot = stat.isDirectory()
-        ? packagePath
-        : path.dirname(packagePath);
-    const pckg = JSON.parse(await readFile(path.join(packageRoot, 'package.json'), 'utf-8'));
-    return { name: pckg.name, packageRoot, private: pckg.private };
-}

package/dist/lib/login.js

@@ -1,31 +0,0 @@
-import { spawn } from 'node:child_process';
-export function login(registry) {
-    return new Promise((resolve) => {
-        const child = spawn('bunx', [
-            'npm',
-            'login',
-            '--registry',
-            registry,
-            '--quiet',
-        ]);
-        child.stderr.on('data', (d) => console.error(d.toString()));
-        child.stdout.on('data', (d) => {
-            const data = d.toString();
-            switch (true) {
-                case /username/i.test(data):
-                    child.stdin.write('esm.dev\n');
-                    break;
-                case /password/i.test(data):
-                    child.stdin.write('esm.dev\n');
-                    break;
-                case /email/i.test(data):
-                    child.stdin.write('esm.dev@esm.dev.com');
-                    break;
-                case /logged in as/i.test(data):
-                    child.stdin.end();
-                    break;
-            }
-        });
-        child.on('exit', resolve);
-    });
-}

package/dist/lib/publish.js

@@ -1,7 +0,0 @@
-import { $ } from 'zx';
-import * as path from 'node:path';
-export async function publish({ packageRoot, registry, }) {
-    await $({
-        cwd: path.resolve(packageRoot),
-    }) `bunx npm publish --registry ${registry}`;
-}

package/dist/lib/queue.js

@@ -1,41 +0,0 @@
-import debounce from 'lodash.debounce';
-import throat from 'throat';
-export async function queue(signal, fn) {
-    return _queue((...args) => {
-        signal.throwIfAborted();
-        return fn(...args);
-    });
-}
-const _queue = throat.default(1);
-/**
- * Just like debounce, but the first call will add a promise to the queue
- * and that promise won't resolve until the debounced function is finally called.
- */
-export function queuedDebounce(fn, delay, signal) {
-    let promiseWithResolvers;
-    signal.addEventListener('abort', (reason) => promiseWithResolvers?.reject(reason));
-    const debounced = debounce(async (...args) => {
-        try {
-            const result = await fn(...args);
-            promiseWithResolvers?.resolve(result);
-        }
-        catch (error) {
-            promiseWithResolvers?.reject(error);
-        }
-        finally {
-            promiseWithResolvers = undefined;
-        }
-    }, delay);
-    return (...args) => {
-        const { promise } = start();
-        debounced(...args);
-        return promise;
-    };
-    function start() {
-        if (!promiseWithResolvers) {
-            promiseWithResolvers = Promise.withResolvers();
-            queue(signal, async () => promiseWithResolvers?.promise);
-        }
-        return promiseWithResolvers;
-    }
-}

package/dist/lib/republish.js

@@ -1,9 +0,0 @@
-import { getPackageMeta } from './getPackageMeta.js';
-import { publish } from './publish.js';
-import { unpublish } from './unpublish.js';
-export async function republish(packagePath, opts) {
-    console.info(`Republishing ${packagePath}`);
-    const { name, packageRoot } = await getPackageMeta(packagePath);
-    await unpublish({ ...opts, name });
-    await publish({ ...opts, packageRoot });
-}

package/dist/lib/server.js

@@ -1,33 +0,0 @@
-import { queue } from './queue.js';
-import { createServer } from 'node:http';
-import httpProxy from 'http-proxy';
-import { addAbortSignal } from 'node:stream';
-export function serve(port, esmOrigin) {
-    const proxy = httpProxy.createProxyServer();
-    const abortController = new AbortController();
-    const signal = abortController.signal;
-    const server = createServer((req, res) => {
-        queue(signal, () => new Promise((resolve, reject) => {
-            console.info('Proxying', req.url);
-            addAbortSignal(signal, req);
-            addAbortSignal(signal, res);
-            req.on('error', reject);
-            res.on('error', reject);
-            res.on('close', resolve);
-            proxy.web(req, res, { target: esmOrigin });
-        })).catch((error) => {
-            res.statusCode = 500;
-            res.setHeader('Content-Type', 'application/json; charset=utf-8');
-            res.write(JSON.stringify(error));
-            res.end();
-        });
-    }).listen(port, () => {
-        console.info('ESM proxy server listining on', server.address());
-    });
-    return () => {
-        console.info('closing the server');
-        abortController.abort();
-        server.closeAllConnections();
-        server.close();
-    };
-}

package/dist/lib/unpublish.js

@@ -1,25 +0,0 @@
-import { $, ProcessOutput } from 'zx';
-import { glob } from 'glob';
-import { rm } from 'node:fs/promises';
-export async function unpublish({ registry, esmStoragePath, name, }) {
-    await Promise.all([
-        unpublishPackage(registry, name),
-        deleteESMCache(esmStoragePath, name),
-    ]);
-}
-async function unpublishPackage(registry, name) {
-    try {
-        await $ `bunx npm unpublish --registry ${registry} --force ${name}`;
-    }
-    catch (error) {
-        if (error instanceof ProcessOutput &&
-            !error.stderr.includes('npm error code E404'))
-            throw error;
-    }
-}
-async function deleteESMCache(esmStoragePath, name) {
-    await glob(`${esmStoragePath}/**/${name}@*`).then((paths) => Promise.all(paths.map((path) => {
-        console.info('Deleting', path);
-        return rm(path, { recursive: true });
-    })));
-}

package/dist/lib/until.js

@@ -1,16 +0,0 @@
-import { setTimeout } from 'node:timers/promises';
-export async function until({ interval, timeout, try: Try, }) {
-    const signal = AbortSignal.timeout(timeout);
-    while (!signal.aborted) {
-        try {
-            if (await Try(signal))
-                return true;
-        }
-        catch (error) { }
-        try {
-            await setTimeout(interval, { signal });
-        }
-        catch (error) { }
-    }
-    return false;
-}

package/dist/lib/watch.js

@@ -1,72 +0,0 @@
-import { watch as fsWatch, watchFile } from 'node:fs';
-import { republish } from './republish.js';
-import { getPackageMeta } from './getPackageMeta.js';
-import { readFile, writeFile } from 'node:fs/promises';
-import { createHash } from 'node:crypto';
-import { glob } from 'glob';
-import { queue, queuedDebounce } from './queue.js';
-export async function watch(packagePath, opts) {
-    const { name, packageRoot, private: prvte, } = await getPackageMeta(packagePath);
-    if (prvte) {
-        console.info(`${name} is a private package... ignoring`);
-        return () => { };
-    }
-    console.info('Watching', packagePath);
-    const abortController = new AbortController();
-    const signal = abortController.signal;
-    const republishPackage = () => republish(packagePath, opts).catch(console.error);
-    const debounceRepublish = queuedDebounce((filename = '') => {
-        console.info(`Change detected at ${packagePath}/${filename}`);
-        return republishPackage();
-    }, 1_000, signal);
-    await queue(signal, republishPackage);
-    if (opts.legacyMethod) {
-        const close = await legacyWatch(packagePath, () => debounceRepublish());
-        return () => {
-            console.info('stop watching');
-            close();
-            abortController.abort();
-        };
-    }
-    else {
-        const watcher = fsWatch(packageRoot, { recursive: true }, (_, filename) => debounceRepublish(filename ?? ''));
-        return () => {
-            console.info('stop watching');
-            watcher.close();
-            abortController.abort();
-        };
-    }
-}
-async function legacyWatch(dirname, cb) {
-    const filename = await hashDirectory(dirname);
-    const watcher = watchFile(filename, cb);
-    let timer;
-    beginTimer();
-    return () => {
-        watcher.unref();
-        clearTimeout(timer);
-    };
-    function beginTimer() {
-        timer = setTimeout(() => hashDirectory(dirname).catch(console.error).finally(beginTimer), 1_000);
-    }
-}
-async function hashDirectory(dirname) {
-    const filename = `/tmp/${dirname.replace(/\//g, '-')}.hash.txt`;
-    const files = await glob(`${dirname}/**/*`, { nodir: true });
-    const hashes = await Promise.all(files.map(async (file) => {
-        const contents = await readFile(file, 'utf-8');
-        return createHash('sha256').update(contents).digest('hex');
-    }));
-    const newHash = hashes.join('');
-    let previousHash = '';
-    try {
-        previousHash = await readFile(filename, 'utf-8');
-    }
-    catch (error) {
-        if (error.code !== 'ENOENT')
-            throw error;
-    }
-    if (newHash !== previousHash)
-        await writeFile(filename, newHash);
-    return filename;
-}

package/dist/options/EnvOption.js

@@ -1,6 +0,0 @@
-import { Option } from 'clipanion';
-export function EnvOption(envName, descriptor, opts = {}) {
-    return process.env[envName]
-        ? Option.String(descriptor, process.env[envName], opts)
-        : Option.String(descriptor, { ...opts, required: true });
-}