@curl.md/amp 0.0.1 → 0.0.2

package/README.md

@@ -5,9 +5,12 @@ Amp plugin for `curl.md`.
 ## Install
 
 ```sh
-pnpm dlx @curl.md/amp install
+npx @curl.md/amp install
 ```
 
+Successful installs print the Amp config path and create
+`~/.config/amp/plugins/curlmd.ts`.
+
 ## License
 
 [MIT](https://github.com/wevm/curl.md/blob/main/LICENSE)

package/dist/install.js

@@ -1,53 +1,62 @@
 #!/usr/bin/env node
 import { spawnSync } from 'node:child_process';
+import { realpathSync } from 'node:fs';
 import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 import process from 'node:process';
 import { fileURLToPath } from 'node:url';
-if (isMain())
-    await main();
-export async function installAmpPlugin(options = {}) {
-    const env = options.env || process.env;
-    const platform = options.platform || process.platform;
-    const packageJson = options.packageJson || (await readPackageJson());
-    const ampConfigDir = options.ampConfigDir || getAmpConfigDir(env, platform);
-    const packageSpec = `${packageJson.name}@${packageJson.version}`;
-    await ensurePackageJson(ampConfigDir);
-    installPackage(ampConfigDir, packageSpec, options.spawnSync || spawnSync, env);
-    const shimPath = await writePluginShim(ampConfigDir);
-    return { ampConfigDir, packageSpec, shimPath };
-}
-export function getAmpConfigDir(env = process.env, platform = process.platform) {
-    if (env.AMP_CONFIG_DIR)
-        return env.AMP_CONFIG_DIR;
-    if (platform === 'win32') {
-        const appData = env.APPDATA || path.join(os.homedir(), 'AppData', 'Roaming');
-        return path.join(appData, 'amp');
-    }
-    const configHome = env.XDG_CONFIG_HOME || path.join(os.homedir(), '.config');
-    return path.join(configHome, 'amp');
-}
-async function main() {
+const isMain = (() => {
+    if (!process.argv[1])
+        return false;
+    const entryPath = (() => {
+        try {
+            return realpathSync(process.argv[1]);
+        }
+        catch {
+            return path.resolve(process.argv[1]);
+        }
+    })();
+    const modulePath = (() => {
+        try {
+            return realpathSync(fileURLToPath(import.meta.url));
+        }
+        catch {
+            return path.resolve(fileURLToPath(import.meta.url));
+        }
+    })();
+    return entryPath === modulePath;
+})();
+if (isMain) {
     const command = process.argv[2];
     if (command && command !== 'install') {
-        console.error('Usage: pnpm dlx @curl.md/amp install');
+        console.error('Usage: curlmd-amp install');
         process.exitCode = 1;
-        return;
-    }
-    try {
-        const result = await installAmpPlugin();
-        console.log(`Installed ${result.packageSpec}`);
-        console.log(`Amp config: ${result.ampConfigDir}`);
-        console.log(`Plugin shim: ${result.shimPath}`);
-        console.log('Next: run `amp`. If auth is needed, set `CURLMD_API_KEY` or run `curl.md auth login`.');
     }
-    catch (error) {
-        console.error(error instanceof Error ? error.message : String(error));
-        process.exitCode = 1;
+    else {
+        try {
+            const result = await installAmpPlugin();
+            console.log(`Installed ${result.packageSpec} to ${result.ampConfigDir}`);
+            console.log(`Plugin shim: ${result.shimPath}`);
+            console.log("Run 'amp' to get started");
+            console.log('If auth is needed, set `CURLMD_API_KEY` or run `curl.md auth login`.');
+        }
+        catch (error) {
+            console.error(`error: ${error instanceof Error ? error.message : String(error)}`);
+            process.exitCode = 1;
+        }
     }
 }
-async function ensurePackageJson(ampConfigDir) {
+export async function installAmpPlugin(options = {}) {
+    const env = options.env || process.env;
+    const platform = options.platform || process.platform;
+    const ampConfigDir = options.ampConfigDir || getAmpConfigDir(env, platform);
+    // Resolve the published package/version we should install into Amp's config dir.
+    const packageJson = options.packageJson ||
+        JSON.parse(await fs.readFile(path.join(path.dirname(fileURLToPath(import.meta.url)), path.basename(path.dirname(fileURLToPath(import.meta.url))) === 'dist' ? '..' : '.', 'package.json'), 'utf8'));
+    const packageSpec = `${packageJson.name}@${packageJson.version}`;
+    console.log(`Preparing Amp config in ${ampConfigDir}`);
+    // Amp expects a standalone package root it can resolve plugins from.
     await fs.mkdir(ampConfigDir, { recursive: true });
     const packageJsonPath = path.join(ampConfigDir, 'package.json');
     try {
@@ -56,28 +65,21 @@ async function ensurePackageJson(ampConfigDir) {
     catch {
         await fs.writeFile(packageJsonPath, `${JSON.stringify({ name: 'amp-plugins', private: true }, undefined, 2)}\n`, 'utf8');
     }
-}
-function installPackage(ampConfigDir, packageSpec, spawn, env) {
-    const result = spawn('pnpm', ['add', '--save-exact', packageSpec], {
+    console.log(`Installing ${packageSpec}`);
+    // Install the plugin package into that config-local node_modules.
+    const result = (options.spawnSync || spawnSync)(platform === 'win32' ? 'npm.cmd' : 'npm', ['install', '--save-exact', packageSpec], {
         cwd: ampConfigDir,
         env,
         stdio: 'inherit',
     });
     if (result.error)
         throw result.error;
-    if (result.status === 0)
-        return;
-    throw new Error(`Failed to install ${packageSpec} into ${ampConfigDir}.`);
-}
-async function readPackageJson() {
-    const currentDir = path.dirname(fileURLToPath(import.meta.url));
-    const packageJsonPath = path.join(currentDir, path.basename(currentDir) === 'dist' ? '..' : '.', 'package.json');
-    return JSON.parse(await fs.readFile(packageJsonPath, 'utf8'));
-}
-async function writePluginShim(ampConfigDir) {
-    const pluginsDir = path.join(ampConfigDir, 'plugins');
-    const shimPath = path.join(pluginsDir, 'curlmd.ts');
-    await fs.mkdir(pluginsDir, { recursive: true });
+    if (result.status !== 0)
+        throw new Error(`Failed to install ${packageSpec} into ${ampConfigDir}.`);
+    // Register the plugin by writing the shim file Amp loads from ~/.config/amp/plugins.
+    const shimPath = path.join(ampConfigDir, 'plugins', 'curlmd.ts');
+    console.log(`Writing plugin shim to ${shimPath}`);
+    await fs.mkdir(path.dirname(shimPath), { recursive: true });
     await fs.writeFile(shimPath, [
         '// @i-know-the-amp-plugin-api-is-wip-and-very-experimental-right-now',
         "import plugin from '@curl.md/amp'",
@@ -85,10 +87,15 @@ async function writePluginShim(ampConfigDir) {
         'export default plugin',
         '',
     ].join('\n'), 'utf8');
-    return shimPath;
+    return { ampConfigDir, packageSpec, shimPath };
 }
-function isMain() {
-    if (!process.argv[1])
-        return false;
-    return path.resolve(process.argv[1]) === fileURLToPath(import.meta.url);
+export function getAmpConfigDir(env = process.env, platform = process.platform) {
+    if (env.AMP_CONFIG_DIR)
+        return env.AMP_CONFIG_DIR;
+    if (platform === 'win32') {
+        const appData = env.APPDATA || path.join(os.homedir(), 'AppData', 'Roaming');
+        return path.join(appData, 'amp');
+    }
+    const configHome = env.XDG_CONFIG_HOME || path.join(os.homedir(), '.config');
+    return path.join(configHome, 'amp');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@curl.md/amp",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "curl.md plugin for Amp",
   "bin": {
     "curlmd-amp": "./dist/install.js"