@link-assistant/web-capture 1.7.2 → 1.7.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @link-assistant/web-capture
 
+## 1.7.4
+
+### Patch Changes
+
+- 494da4e: Move turndown-plugin-gfm into runtime dependencies so published CLI installs include the GFM plugin used by Markdown conversion.
+
+## 1.7.3
+
+### Patch Changes
+
+- 237afeb: Fix the JavaScript CLI so strict argument parsing accepts positional capture URLs while still rejecting unknown options.
+
 ## 1.7.2
 
 ### Patch Changes

package/bin/web-capture.js

@@ -16,6 +16,12 @@ const config = makeConfig({
       .usage(
         'web-capture - Capture web pages as HTML, Markdown, or PNG\n\nUsage:\n  web-capture --serve [--port <port>]       Start as API server\n  web-capture <url> [options]               Capture a URL to file/stdout'
       )
+      .command('$0 [url]', 'Capture a URL or start the API server', (yargs) =>
+        yargs.positional('url', {
+          type: 'string',
+          description: 'URL to capture',
+        })
+      )
       .option('serve', {
         alias: 's',
         type: 'boolean',
@@ -77,6 +83,7 @@ const config = makeConfig({
       .option('output', {
         alias: 'o',
         type: 'string',
+        nargs: 1,
         description:
           'Output file path (default: stdout for text, auto-generated for images)',
       })
@@ -232,6 +239,19 @@ const config = makeConfig({
   },
 });
 
+function getUrlArgument() {
+  if (typeof config.url === 'string' && config.url.length > 0) {
+    return config.url;
+  }
+
+  const separatorIndex = process.argv.indexOf('--');
+  if (separatorIndex !== -1 && separatorIndex < process.argv.length - 1) {
+    return process.argv[separatorIndex + 1];
+  }
+
+  return null;
+}
+
 async function startServer(port) {
   // Import the Express app
   const { app } = await import('../src/index.js');
@@ -824,8 +844,7 @@ async function captureUrl(url, options) {
 }
 
 async function main() {
-  // Get positional arguments (non-option arguments)
-  const url = config._ && config._.length > 0 ? config._[0] : null;
+  const url = getUrlArgument();
 
   if (config.serve) {
     // Server mode

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-assistant/web-capture",
-  "version": "1.7.2",
+  "version": "1.7.4",
   "description": "CLI and microservice to render web pages as HTML, Markdown, or PNG",
   "main": "src/index.js",
   "bin": {
@@ -44,7 +44,8 @@
     "playwright": "^1.49.0",
     "puppeteer": "^24.8.2",
     "puppeteer-core": "^24.40.0",
-    "turndown": "^7.1.1"
+    "turndown": "^7.1.1",
+    "turndown-plugin-gfm": "^1.0.2"
   },
   "devDependencies": {
     "@babel/core": "^7.24.0",
@@ -62,8 +63,7 @@
     "lint-staged": "^16.2.6",
     "nock": "^13.5.4",
     "prettier": "^3.6.2",
-    "supertest": "^6.3.4",
-    "turndown-plugin-gfm": "^1.0.2"
+    "supertest": "^6.3.4"
   },
   "type": "module",
   "keywords": [

package/tests/unit/cli.test.js

@@ -1,5 +1,6 @@
 // Unit tests for CLI argument parsing and functionality
 import { spawn } from 'child_process';
+import http from 'node:http';
 import { fileURLToPath } from 'url';
 import { dirname, resolve } from 'path';
 
@@ -33,6 +34,38 @@ function runCli(args, options = {}) {
   });
 }
 
+function startFixtureServer() {
+  return new Promise((resolve, reject) => {
+    const server = http.createServer((req, res) => {
+      res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
+      res.end(
+        '<!doctype html><html><body><h1>Issue 68</h1><p>Captured from positional URL.</p></body></html>'
+      );
+    });
+
+    server.on('error', reject);
+    server.listen(0, '127.0.0.1', () => {
+      const { port } = server.address();
+      resolve({
+        server,
+        url: `http://127.0.0.1:${port}/article`,
+      });
+    });
+  });
+}
+
+function stopFixtureServer(server) {
+  return new Promise((resolve, reject) => {
+    server.close((err) => {
+      if (err) {
+        reject(err);
+        return;
+      }
+      resolve();
+    });
+  });
+}
+
 describe('CLI', () => {
   describe('--help', () => {
     test('shows help message with --help flag', async () => {
@@ -78,12 +111,63 @@ describe('CLI', () => {
   });
 
   describe('URL validation', () => {
+    test('accepts a URL as a positional argument', async () => {
+      const { server, url } = await startFixtureServer();
+
+      try {
+        const result = await runCli([
+          url,
+          '--format',
+          'markdown',
+          '--output',
+          '-',
+        ]);
+
+        expect(result.code).toBe(0);
+        expect(result.stderr).not.toContain('Unknown argument');
+        expect(result.stdout).toContain('Issue 68');
+        expect(result.stdout).toContain('Captured from positional URL.');
+      } finally {
+        await stopFixtureServer(server);
+      }
+    }, 15000);
+
+    test('accepts a URL after the -- argument separator', async () => {
+      const { server, url } = await startFixtureServer();
+
+      try {
+        const result = await runCli([
+          '--format',
+          'markdown',
+          '--output',
+          '-',
+          '--',
+          url,
+        ]);
+
+        expect(result.code).toBe(0);
+        expect(result.stderr).not.toContain('Missing URL');
+        expect(result.stdout).toContain('Issue 68');
+      } finally {
+        await stopFixtureServer(server);
+      }
+    }, 15000);
+
+    test('rejects unknown options', async () => {
+      const result = await runCli([
+        '--unknown-option-for-issue-68',
+        'https://example.com',
+      ]);
+
+      expect(result.code).toBe(1);
+      expect(result.stderr).toContain('Unknown argument');
+    });
+
     test('rejects invalid URL', async () => {
-      const result = await runCli(['not-a-valid-url-without-dots']);
-      // Should fail with invalid URL or show help due to strict mode
+      const result = await runCli(['http://[invalid-url']);
+      // Should fail before trying to capture.
       expect(result.code).toBe(1);
-      // Either an error message or help output (from yargs strict mode)
-      expect(result.stdout.length + result.stderr.length).toBeGreaterThan(0);
+      expect(result.stderr).toContain('Invalid URL');
     }, 15000);
   });
 

package/tests/unit/package-runtime-dependencies.test.js

@@ -0,0 +1,48 @@
+import { readFileSync } from 'fs';
+import { dirname, resolve } from 'path';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const jsRoot = resolve(__dirname, '../..');
+
+function readJson(relativePath) {
+  return JSON.parse(readFileSync(resolve(jsRoot, relativePath), 'utf8'));
+}
+
+const runtimeImports = [
+  {
+    packageName: 'turndown-plugin-gfm',
+    sourceFile: 'src/lib.js',
+  },
+];
+
+describe('runtime package dependencies', () => {
+  test.each(runtimeImports)(
+    '$packageName is declared as a production dependency',
+    ({ packageName, sourceFile }) => {
+      const source = readFileSync(resolve(jsRoot, sourceFile), 'utf8');
+      const packageJson = readJson('package.json');
+
+      expect(source).toContain(`from '${packageName}'`);
+      expect(packageJson.dependencies).toHaveProperty(packageName);
+      expect(packageJson.devDependencies || {}).not.toHaveProperty(packageName);
+    }
+  );
+
+  test.each(runtimeImports)(
+    '$packageName is not marked dev-only in package-lock.json',
+    ({ packageName }) => {
+      const packageLock = readJson('package-lock.json');
+
+      expect(packageLock.packages[''].dependencies).toHaveProperty(packageName);
+      expect(packageLock.packages[''].devDependencies || {}).not.toHaveProperty(
+        packageName
+      );
+      expect(packageLock.packages[`node_modules/${packageName}`]).toBeDefined();
+      expect(packageLock.packages[`node_modules/${packageName}`].dev).not.toBe(
+        true
+      );
+    }
+  );
+});