@chriswiegman/hugo-tools 0.1.1 → 0.2.0

package/CHANGELOG.md

@@ -5,6 +5,26 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
+## 0.2.0 - 2026-05-09
+
+### Features
+
+* Rework pick-image to move images into the dated assets directory and insert references directly into content files (frontmatter images array or markdown image tag)
+
+### Chores
+
+* Update project dependencies.
+
+## 0.1.2 - 2026-05-04
+
+### Features
+
+* VS Code command also does initial tag extraction.
+
+### Bug Fixes
+
+* Ensure VS Code tasks run on appropriate JS targets
+
 ## 0.1.1 - 2026-05-04
 
 ### Features

package/README.md

@@ -196,13 +196,34 @@ Requires `extract-tags` to have been run at least once.
 
 ### `pick-image`
 
-Lists images in your `imagesDir` for the current year/month, lets you pick one, and copies the Hugo-relative path to the clipboard.
+Moves an image into your `imagesDir` under the current year/month and inserts a reference into a Hugo content file.
 
 ```sh
-pick-image
+pick-image <image-file> [content-file]
 ```
 
-Clipboard support: macOS (`pbcopy`), Windows (`clip`), Linux (`xclip`, `xsel`, or `wl-copy` — whichever is available).
+**What it does:**
+
+- Moves `<image-file>` to `assets/images/YYYY/MM/<filename>` (creates the directory if needed)
+- Derives the Hugo URL path by stripping the `assets/` prefix (e.g. `/images/YYYY/MM/filename`)
+- If a `[content-file]` is given:
+  - Appends the path to the `images:` array in front matter when that field is present (replacing any placeholder `  -` entry)
+  - Otherwise appends a `![](path)` markdown tag to the end of the body
+- If no `[content-file]` is given, copies the URL path to the clipboard instead
+
+**Examples:**
+
+```sh
+# Move photo.jpg and insert into the currently open draft
+pick-image ~/Downloads/photo.jpg content/drafts/my-post.md
+
+# Move photo.jpg and copy the path to the clipboard
+pick-image ~/Downloads/photo.jpg
+```
+
+The VS Code "Pick Image" task prompts for the image path and automatically passes the currently open file as the content target — drag the image file into the terminal prompt to fill the path.
+
+Clipboard support (no-content-file mode): macOS (`pbcopy`), Windows (`clip`), Linux (`xclip`, `xsel`, or `wl-copy` — whichever is available).
 
 ---
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chriswiegman/hugo-tools",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "A set of tools to make blogging easier with Hugo.",
   "keywords": [
     "hugo",
@@ -41,7 +41,7 @@
   },
   "scripts": {
     "lint": "eslint src/",
-    "test": "node --test src/book.test.mjs src/publish.test.mjs src/extract-tags.test.mjs src/draft.test.mjs"
+    "test": "node --test src/book.test.mjs src/publish.test.mjs src/extract-tags.test.mjs src/draft.test.mjs src/pick-image.test.mjs"
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",

package/src/extract-tags.js

@@ -231,4 +231,4 @@ if (require.main === module) {
   main();
 }
 
-module.exports = { extractFrontmatter, parseListItems, generatePrefixes };
+module.exports = { extractFrontmatter, parseListItems, generatePrefixes, main };

package/src/pick-image.js

@@ -1,42 +1,43 @@
 #!/usr/bin/env node
 'use strict';
 
-// Lists images in the configured images directory for the current year/month
-// and copies the selected path to the clipboard.
+// Moves an image into assets/images/<year>/<month>/ and inserts a reference
+// into a Hugo content file — appending to the frontmatter images: array when
+// present, or appending a markdown image tag to the body otherwise.
 
 const fs = require('fs');
 const path = require('path');
-const readline = require('readline');
 const { execSync, execFileSync } = require('child_process');
 const config = require('./config');
 
-config.requireHugoSite();
-
 const IMAGE_EXTS = new Set(['.jpg', '.jpeg', '.png', '.webp', '.gif']);
 
-const now = new Date();
-const year = now.getFullYear().toString();
-const month = String(now.getMonth() + 1).padStart(2, '0');
-const imageDir = path.join(process.cwd(), config.imagesDir, year, month);
-const imagePath = `/${config.imagesDir}/${year}/${month}`;
-
-if (!fs.existsSync(imageDir)) {
-  console.error(`No image directory found at ${imageDir}`);
-  process.exit(1);
+function urlFromImagesDir(imagesDir, year, month, filename) {
+  const urlBase = imagesDir.replace(/^assets\//, '');
+  return `/${urlBase}/${year}/${month}/${filename}`;
 }
 
-const files = fs.readdirSync(imageDir)
-  .filter(f => IMAGE_EXTS.has(path.extname(f).toLowerCase()))
-  .sort();
-
-if (files.length === 0) {
-  console.error(`No images found in ${imageDir}`);
-  process.exit(1);
+function appendMarkdown(content, urlPath) {
+  return `${content.trimEnd()}\n\n![](${urlPath})\n`;
 }
 
-console.log(`\nImages in ${imagePath}/:\n`);
-files.forEach((f, i) => console.log(`  ${i + 1}) ${f}`));
-console.log('');
+function insertImage(content, urlPath) {
+  const fmEnd = content.indexOf('\n---', 4);
+  if (!content.startsWith('---\n') || fmEnd === -1) {
+    return appendMarkdown(content, urlPath);
+  }
+  const frontmatter = content.slice(4, fmEnd);
+  if (!/^images:/m.test(frontmatter)) {
+    return appendMarkdown(content, urlPath);
+  }
+  return content.replace(
+    /^(images:)((?:\n {2}-[^\n]*)*)/m,
+    (_, key, block) => {
+      const existing = block.split('\n').filter(line => /^ {2}- \S/.test(line));
+      return [key, ...existing, `  - ${urlPath}`].join('\n');
+    }
+  );
+}
 
 function copyToClipboard(text) {
   const platform = process.platform;
@@ -48,7 +49,6 @@ function copyToClipboard(text) {
     execFileSync('clip', { input: text });
     return;
   }
-  // Linux: try common clipboard tools in order
   const tools = [
     ['xclip', ['-selection', 'clipboard']],
     ['xsel', ['--clipboard', '--input']],
@@ -65,16 +65,63 @@ function copyToClipboard(text) {
   console.log('(clipboard unavailable — copy the path above manually)');
 }
 
-const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-rl.question(`Select image (1-${files.length}): `, answer => {
-  rl.close();
-  const choice = parseInt(answer, 10);
-  if (choice >= 1 && choice <= files.length) {
-    const result = `${imagePath}/${files[choice - 1]}`;
-    copyToClipboard(result);
-    console.log(`\nCopied to clipboard: ${result}`);
-  } else {
-    console.error('Invalid selection');
+if (require.main === module) {
+  config.requireHugoSite();
+
+  const args = process.argv.slice(2);
+  if (args.length === 0) {
+    console.error('Usage: pick-image <image-file> [content-file]');
+    process.exit(1);
+  }
+
+  const imageFile = path.resolve(args[0]);
+  const contentFile = args[1] ? path.resolve(args[1]) : null;
+
+  if (!fs.existsSync(imageFile)) {
+    console.error(`Image not found: ${imageFile}`);
+    process.exit(1);
+  }
+
+  const ext = path.extname(imageFile).toLowerCase();
+  if (!IMAGE_EXTS.has(ext)) {
+    console.error(`Unsupported image format: ${ext}`);
+    process.exit(1);
+  }
+
+  const now = new Date();
+  const year = now.getFullYear().toString();
+  const month = String(now.getMonth() + 1).padStart(2, '0');
+  const filename = path.basename(imageFile);
+  const destDir = path.join(process.cwd(), config.imagesDir, year, month);
+  const destFile = path.join(destDir, filename);
+  const urlPath = urlFromImagesDir(config.imagesDir, year, month, filename);
+
+  fs.mkdirSync(destDir, { recursive: true });
+
+  if (path.resolve(imageFile) !== path.resolve(destFile)) {
+    if (fs.existsSync(destFile)) {
+      console.error(`File already exists at destination: ${destFile}`);
+      process.exit(1);
+    }
+    fs.renameSync(imageFile, destFile);
+    console.log(`Moved to: ${destFile}`);
+  }
+
+  if (!contentFile) {
+    copyToClipboard(urlPath);
+    console.log(`Path copied to clipboard: ${urlPath}`);
+    process.exit(0);
+  }
+
+  if (!fs.existsSync(contentFile)) {
+    console.error(`Content file not found: ${contentFile}`);
     process.exit(1);
   }
-});
+
+  const original = fs.readFileSync(contentFile, 'utf8');
+  const updated = insertImage(original, urlPath);
+  fs.writeFileSync(contentFile, updated);
+  console.log(`Updated: ${path.relative(process.cwd(), contentFile)}`);
+}
+
+module.exports = { urlFromImagesDir, appendMarkdown, insertImage };

package/src/pick-image.test.mjs

@@ -0,0 +1,110 @@
+import assert from 'node:assert/strict';
+import { test } from 'node:test';
+import { createRequire } from 'node:module';
+
+const require = createRequire(import.meta.url);
+const { urlFromImagesDir, appendMarkdown, insertImage } = require('./pick-image.js');
+
+// ---------------------------------------------------------------------------
+// urlFromImagesDir
+// ---------------------------------------------------------------------------
+
+test('urlFromImagesDir: strips assets/ prefix', () => {
+  assert.equal(urlFromImagesDir('assets/images', '2026', '05', 'photo.jpg'), '/images/2026/05/photo.jpg');
+});
+
+test('urlFromImagesDir: preserves dir without assets/ prefix', () => {
+  assert.equal(urlFromImagesDir('images', '2026', '05', 'photo.jpg'), '/images/2026/05/photo.jpg');
+});
+
+test('urlFromImagesDir: preserves custom directory name', () => {
+  assert.equal(urlFromImagesDir('assets/media', '2026', '05', 'photo.jpg'), '/media/2026/05/photo.jpg');
+});
+
+// ---------------------------------------------------------------------------
+// appendMarkdown
+// ---------------------------------------------------------------------------
+
+test('appendMarkdown: appends image tag with blank line separator', () => {
+  const result = appendMarkdown('Body text.\n', '/images/2026/05/photo.jpg');
+  assert.equal(result, 'Body text.\n\n![](/images/2026/05/photo.jpg)\n');
+});
+
+test('appendMarkdown: trims trailing whitespace before appending', () => {
+  const result = appendMarkdown('Body text.\n\n\n', '/images/2026/05/photo.jpg');
+  assert.equal(result, 'Body text.\n\n![](/images/2026/05/photo.jpg)\n');
+});
+
+test('appendMarkdown: works when content has no trailing newline', () => {
+  const result = appendMarkdown('Body text.', '/images/2026/05/photo.jpg');
+  assert.equal(result, 'Body text.\n\n![](/images/2026/05/photo.jpg)\n');
+});
+
+// ---------------------------------------------------------------------------
+// insertImage — no frontmatter or no images: field → markdown fallback
+// ---------------------------------------------------------------------------
+
+test('insertImage: appends markdown when no frontmatter', () => {
+  const content = 'Just a plain body.\n';
+  const result = insertImage(content, '/images/2026/05/photo.jpg');
+  assert.ok(result.includes('![](/images/2026/05/photo.jpg)'));
+  assert.ok(result.includes('Just a plain body.'));
+});
+
+test('insertImage: appends markdown when frontmatter has no images: field', () => {
+  const content = '---\ntitle: "My Post"\n---\nBody text.\n';
+  const result = insertImage(content, '/images/2026/05/photo.jpg');
+  assert.ok(result.includes('![](/images/2026/05/photo.jpg)'));
+  assert.ok(result.includes('Body text.'));
+});
+
+// ---------------------------------------------------------------------------
+// insertImage — frontmatter images: array manipulation
+// ---------------------------------------------------------------------------
+
+test('insertImage: replaces placeholder (  -) with real path', () => {
+  const content = '---\ntitle: "My Post"\nimages:\n  -\n---\nBody.\n';
+  const result = insertImage(content, '/images/2026/05/photo.jpg');
+  assert.ok(result.includes('  - /images/2026/05/photo.jpg'));
+  assert.ok(!result.includes('\n  -\n'));
+  assert.ok(!result.includes('![]('));
+});
+
+test('insertImage: appends to existing single-item images array', () => {
+  const content = '---\ntitle: "My Post"\nimages:\n  - /images/2026/01/old.jpg\n---\nBody.\n';
+  const result = insertImage(content, '/images/2026/05/new.jpg');
+  assert.ok(result.includes('  - /images/2026/01/old.jpg'));
+  assert.ok(result.includes('  - /images/2026/05/new.jpg'));
+  assert.ok(!result.includes('![]('));
+});
+
+test('insertImage: appends to existing multi-item images array', () => {
+  const content = '---\nimages:\n  - /images/2026/01/a.jpg\n  - /images/2026/02/b.jpg\n---\n';
+  const result = insertImage(content, '/images/2026/05/c.jpg');
+  const lines = result.split('\n');
+  const imgLines = lines.filter(l => l.startsWith('  - '));
+  assert.equal(imgLines.length, 3);
+  assert.equal(imgLines[2], '  - /images/2026/05/c.jpg');
+});
+
+test('insertImage: does not duplicate existing items', () => {
+  const content = '---\nimages:\n  - /images/2026/01/a.jpg\n---\n';
+  const result = insertImage(content, '/images/2026/05/b.jpg');
+  const count = (result.match(/ {2}- \/images/g) || []).length;
+  assert.equal(count, 2);
+});
+
+test('insertImage: leaves other frontmatter fields untouched', () => {
+  const content = '---\ntitle: "My Post"\nimages:\n  -\ncategories:\n  - Tech\ntags:\n  - go\n---\nBody.\n';
+  const result = insertImage(content, '/images/2026/05/photo.jpg');
+  assert.ok(result.includes('title: "My Post"'));
+  assert.ok(result.includes('categories:\n  - Tech'));
+  assert.ok(result.includes('tags:\n  - go'));
+  assert.ok(result.includes('Body.'));
+});
+
+test('insertImage: body content is preserved when updating frontmatter', () => {
+  const content = '---\ntitle: "My Post"\nimages:\n  -\n---\nThis is the body.\n';
+  const result = insertImage(content, '/images/2026/05/photo.jpg');
+  assert.ok(result.includes('This is the body.'));
+});

package/src/vscode.js

@@ -7,7 +7,7 @@
  *   vscode
  *
  * Writes to <vscodeDir>/ (default .vscode/):
- *   tasks.json      — tasks for draft, add-tags, publish, pick-image
+ *   tasks.json      — tasks for draft, extract-tags, add-tags, publish, pick-image
  *   extensions.json — recommended extensions
  *   settings.json   — markdown editor settings
  *
@@ -17,42 +17,44 @@
 const fs = require('fs');
 const path = require('path');
 const { requireHugoSite, vscodeDir } = require('./config');
+const { main: extractTags } = require('./extract-tags');
 
 const TASKS = {
-  version: '2.0.0',
-  tasks: [
+  "version": "2.0.0",
+  "tasks": [
     {
-      label: 'Create Draft',
-      type: 'shell',
-      command: 'draft',
-      problemMatcher: [],
+      "label": "Create Draft",
+      "type": "shell",
+      "command": "npx draft",
+      "problemMatcher": []
     },
     {
-      label: 'Add Tags',
-      type: 'shell',
-      command: 'add-tags',
-      problemMatcher: [],
+      "label": "Add Tags",
+      "type": "shell",
+      "command": "npx add-tags",
+      "problemMatcher": []
     },
     {
-      label: 'Publish Draft (now)',
-      type: 'shell',
-      // publish prints "Published:\n  <path>" — grep extracts the path and opens it
-      command: 'output=$(publish "${relativeFile}" now); echo "$output"; newFile=$(echo "$output" | grep -oE \'content/[^ ]+\\.md\'); [ -n "$newFile" ] && code -r "${workspaceFolder}/$newFile"',
-      problemMatcher: [],
+      "label": "Publish Draft (now)",
+      "type": "shell",
+      "command": "output=$(npx publish \"${relativeFile}\" now); echo \"$output\"; newFile=$(echo \"$output\" | grep -oE 'content/[^ ]+\\.md'); [ -n \"$newFile\" ] && code -r \"${workspaceFolder}/$newFile\"",
+      "problemMatcher": []
     },
     {
-      label: 'Publish Draft (later)',
-      type: 'shell',
-      command: 'read -p "Publish date (YYYY-MM-DD): " d; output=$(publish "${relativeFile}" later "$d"); echo "$output"; newFile=$(echo "$output" | grep -oE \'content/[^ ]+\\.md\'); [ -n "$newFile" ] && code -r "${workspaceFolder}/$newFile"',
-      problemMatcher: [],
+      "label": "Publish Draft (later)",
+      "type": "shell",
+      "command": "read -p \"Publish date (YYYY-MM-DD): \" d; output=$(npx publish \"${relativeFile}\" later \"$d\"); echo \"$output\"; newFile=$(echo \"$output\" | grep -oE 'content/[^ ]+\\.md'); [ -n \"$newFile\" ] && code -r \"${workspaceFolder}/$newFile\"",
+      "problemMatcher": []
     },
     {
-      label: 'Pick Image',
-      type: 'shell',
-      command: 'pick-image',
-      problemMatcher: [],
-      presentation: { focus: true },
-    },
+      "label": "Pick Image",
+      "type": "shell",
+      "command": "read -p 'Image path: ' img; npx pick-image \"$img\" \"${relativeFile}\"",
+      "problemMatcher": [],
+      "presentation": {
+        "focus": true
+      }
+    }
   ],
 };
 
@@ -93,9 +95,11 @@ function main() {
   const dir = path.join(process.cwd(), vscodeDir);
   fs.mkdirSync(dir, { recursive: true });
 
-  writeIfAbsent(path.join(dir, 'tasks.json'),     JSON.stringify(TASKS,      null, 2) + '\n');
+  writeIfAbsent(path.join(dir, 'tasks.json'), JSON.stringify(TASKS, null, 2) + '\n');
   writeIfAbsent(path.join(dir, 'extensions.json'), JSON.stringify(EXTENSIONS, null, 2) + '\n');
-  writeIfAbsent(path.join(dir, 'settings.json'),   JSON.stringify(SETTINGS,   null, 2) + '\n');
+  writeIfAbsent(path.join(dir, 'settings.json'), JSON.stringify(SETTINGS, null, 2) + '\n');
+
+  extractTags();
 }
 
 main();