From 5f4d8ca5e8e655e6c4f7b4e1fa381e1176beb30b Mon Sep 17 00:00:00 2001 From: svemagie <869694+svemagie@users.noreply.github.com> Date: Thu, 12 Mar 2026 08:11:28 +0100 Subject: [PATCH] fix: detect article/note post type via permalink for AI frontmatter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Indiekit's getPostTemplateProperties() explicitly removes the post-type property before passing JF2 to postTemplate(). The v3 patch relied on post-type to set supportsAiDisclosure, which was therefore always false — causing the ai: frontmatter block to never be written regardless of what was selected in the backend form. v4 patch falls back to permalink URL pattern (/articles/, /notes/) to correctly detect the post type when post-type is absent. Co-Authored-By: Claude Sonnet 4.6 --- package.json | 3 +- .../patch-preset-eleventy-ai-frontmatter.mjs | 125 +++++++++++++++++- 2 files changed, 122 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 9721eb3f..a4caf764 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,8 @@ "description": "", "main": "index.js", "scripts": { - "postinstall": "node scripts/patch-lightningcss.mjs && node scripts/patch-endpoint-media-scope.mjs && node scripts/patch-endpoint-media-sharp-runtime.mjs && node scripts/patch-frontend-sharp-runtime.mjs && node scripts/patch-endpoint-files-upload-route.mjs && node scripts/patch-endpoint-files-upload-locales.mjs && node scripts/patch-endpoint-activitypub-locales.mjs && node scripts/patch-endpoint-activitypub-docloader-loglevel.mjs && node scripts/patch-endpoint-activitypub-private-url-docloader.mjs && node scripts/patch-endpoint-activitypub-migrate-alias-clear.mjs && node scripts/patch-endpoint-homepage-locales.mjs && node scripts/patch-endpoint-homepage-identity-defaults.mjs && node scripts/patch-federation-unlisted-guards.mjs && node scripts/patch-endpoint-micropub-where-note-visibility.mjs && node scripts/patch-endpoint-posts-ai-fields.mjs && node scripts/patch-endpoint-posts-ai-cleanup.mjs && node scripts/patch-endpoint-podroll-opml-upload.mjs && node scripts/patch-preset-eleventy-ai-frontmatter.mjs && node scripts/patch-frontend-serviceworker-file.mjs && node scripts/patch-endpoint-comments-locales.mjs && node scripts/patch-conversations-collection-guards.mjs && node scripts/patch-conversations-mastodon-disconnect.mjs && node scripts/patch-indiekit-routes-rate-limits.mjs && node scripts/patch-indiekit-error-production-stack.mjs && node scripts/patch-indieauth-devmode-guard.mjs && node scripts/patch-listening-endpoint-runtime-guards.mjs && node scripts/patch-endpoint-github-changelog-categories.mjs", + "postinstall": "xattr -w com.apple.fileprovider.ignore#P 1 node_modules 2>/dev/null || true && ...", + "postinstall": "xattr -w com.apple.fileprovider.ignore#P 1 node_modules 2>/dev/null || true && node scripts/patch-lightningcss.mjs && node scripts/patch-endpoint-media-scope.mjs && node scripts/patch-endpoint-media-sharp-runtime.mjs && node scripts/patch-frontend-sharp-runtime.mjs && node scripts/patch-endpoint-files-upload-route.mjs && node scripts/patch-endpoint-files-upload-locales.mjs && node scripts/patch-endpoint-activitypub-locales.mjs && node scripts/patch-endpoint-activitypub-docloader-loglevel.mjs && node scripts/patch-endpoint-activitypub-private-url-docloader.mjs && node scripts/patch-endpoint-activitypub-migrate-alias-clear.mjs && node scripts/patch-endpoint-homepage-locales.mjs && node scripts/patch-endpoint-homepage-identity-defaults.mjs && node scripts/patch-federation-unlisted-guards.mjs && node scripts/patch-endpoint-micropub-where-note-visibility.mjs && node scripts/patch-endpoint-posts-ai-fields.mjs && node scripts/patch-endpoint-posts-ai-cleanup.mjs && node scripts/patch-endpoint-podroll-opml-upload.mjs && node scripts/patch-preset-eleventy-ai-frontmatter.mjs && node scripts/patch-frontend-serviceworker-file.mjs && node scripts/patch-endpoint-comments-locales.mjs && node scripts/patch-conversations-collection-guards.mjs && node scripts/patch-conversations-mastodon-disconnect.mjs && node scripts/patch-indiekit-routes-rate-limits.mjs && node scripts/patch-indiekit-error-production-stack.mjs && node scripts/patch-indieauth-devmode-guard.mjs && node scripts/patch-listening-endpoint-runtime-guards.mjs && node scripts/patch-endpoint-github-changelog-categories.mjs", "serve": "export NODE_ENV=${NODE_ENV:-production} INDIEKIT_DEBUG=${INDIEKIT_DEBUG:-0} && node scripts/preflight-production-security.mjs && node scripts/preflight-mongo-connection.mjs && node scripts/preflight-activitypub-rsa-key.mjs && node scripts/preflight-activitypub-profile-urls.mjs && node scripts/patch-lightningcss.mjs && node scripts/patch-endpoint-media-scope.mjs && node scripts/patch-endpoint-media-sharp-runtime.mjs && node scripts/patch-frontend-sharp-runtime.mjs && node scripts/patch-endpoint-files-upload-route.mjs && node scripts/patch-endpoint-files-upload-locales.mjs && node scripts/patch-endpoint-activitypub-locales.mjs && node scripts/patch-endpoint-activitypub-docloader-loglevel.mjs && node scripts/patch-endpoint-activitypub-private-url-docloader.mjs && node scripts/patch-endpoint-activitypub-migrate-alias-clear.mjs && node scripts/patch-endpoint-homepage-locales.mjs && node scripts/patch-endpoint-homepage-identity-defaults.mjs && node scripts/patch-federation-unlisted-guards.mjs && node scripts/patch-endpoint-micropub-where-note-visibility.mjs && node scripts/patch-endpoint-posts-ai-fields.mjs && node scripts/patch-endpoint-posts-ai-cleanup.mjs && node scripts/patch-endpoint-podroll-opml-upload.mjs && node scripts/patch-preset-eleventy-ai-frontmatter.mjs && node scripts/patch-frontend-serviceworker-file.mjs && node scripts/patch-endpoint-comments-locales.mjs && node scripts/patch-conversations-collection-guards.mjs && node scripts/patch-conversations-mastodon-disconnect.mjs && node scripts/patch-indiekit-routes-rate-limits.mjs && node scripts/patch-indiekit-error-production-stack.mjs && node scripts/patch-indieauth-devmode-guard.mjs && node scripts/patch-listening-endpoint-runtime-guards.mjs && node scripts/patch-endpoint-github-changelog-categories.mjs && node node_modules/@indiekit/indiekit/bin/cli.js serve --config indiekit.config.mjs", "test": "echo \"Error: no test specified\" && exit 1" }, diff --git a/scripts/patch-preset-eleventy-ai-frontmatter.mjs b/scripts/patch-preset-eleventy-ai-frontmatter.mjs index af5e5790..f9369a95 100644 --- a/scripts/patch-preset-eleventy-ai-frontmatter.mjs +++ b/scripts/patch-preset-eleventy-ai-frontmatter.mjs @@ -8,7 +8,7 @@ const candidates = [ ]; const patchMarker = - "Normalize and sanitize AI disclosure metadata for articles and notes only."; + "Indiekit removes post-type before calling postTemplate; fall back to permalink-based detection."; const upstreamBlock = [ " // Convert url to Eleventy permalink so generated URL matches Indiekit's stored URL", @@ -252,6 +252,119 @@ const v3Block = [ "};", ].join("\n"); +// v4: fix post-type detection — Indiekit removes post-type before calling postTemplate, +// so fall back to permalink URL pattern to detect articles and notes. +const v4Block = [ + " // Convert url to Eleventy permalink so generated URL matches Indiekit's stored URL", + " // Add trailing slash to generate /path/index.html instead of /path.html", + " if (properties.url) {", + " const url = properties.url;", + " properties.permalink = url.endsWith(\"/\") ? url : `${url}/`;", + " }", + " delete properties.url;", + "", + " // Normalize and sanitize AI disclosure metadata for articles and notes only.", + " const aiSource =", + " properties.ai && typeof properties.ai === \"object\" && !Array.isArray(properties.ai)", + " ? properties.ai", + " : {};", + "", + " const normaliseString = (value) => {", + " if (value === undefined || value === null) {", + " return undefined;", + " }", + "", + " const text = String(value).trim();", + " return text === \"\" ? undefined : text;", + " };", + "", + " const normaliseLevel = (value, allowedValues, fallback = \"0\") => {", + " const candidate = normaliseString(value);", + "", + " if (!candidate) {", + " return fallback;", + " }", + "", + " return allowedValues.includes(candidate) ? candidate : fallback;", + " };", + "", + " const aiTextLevelRaw =", + " aiSource.textLevel ??", + " aiSource.aiTextLevel ??", + " properties.aiTextLevel ??", + " properties[\"ai-text-level\"] ??", + " \"0\";", + "", + " const aiCodeLevelRaw =", + " aiSource.codeLevel ??", + " aiSource.aiCodeLevel ??", + " properties.aiCodeLevel ??", + " properties[\"ai-code-level\"] ??", + " \"0\";", + "", + " const aiTextLevel = normaliseLevel(aiTextLevelRaw, [\"0\", \"1\", \"2\", \"3\"]);", + " // Legacy value \"3\" is folded into \"2\" for code-level taxonomy compatibility.", + " const aiCodeLevel = normaliseLevel(", + " aiCodeLevelRaw === \"3\" ? \"2\" : aiCodeLevelRaw,", + " [\"0\", \"1\", \"2\"],", + " );", + "", + " const aiTools = normaliseString(", + " aiSource.aiTools ?? aiSource.tools ?? properties.aiTools ?? properties[\"ai-tools\"],", + " );", + "", + " const aiDescription = normaliseString(", + " aiSource.aiDescription ??", + " aiSource.description ??", + " properties.aiDescription ??", + " properties[\"ai-description\"],", + " );", + "", + " delete properties.ai;", + " delete properties.aiTextLevel;", + " delete properties.aiCodeLevel;", + " delete properties.aiTools;", + " delete properties.aiDescription;", + " delete properties[\"ai-text-level\"];", + " delete properties[\"ai-code-level\"];", + " delete properties[\"ai-tools\"];", + " delete properties[\"ai-description\"];", + "", + " // Indiekit removes post-type before calling postTemplate; fall back to permalink-based detection.", + " const postType = String(", + " properties.postType ?? properties[\"post-type\"] ?? properties.type ?? \"\",", + " ).toLowerCase();", + " const permalink = String(properties.permalink ?? \"\");", + " const supportsAiDisclosure =", + " postType === \"article\" || postType === \"note\" ||", + " /\\/articles(?:\\/|$)/.test(permalink) || /\\/notes(?:\\/|$)/.test(permalink);", + "", + " const frontMatter = YAML.stringify(properties, { lineWidth: 0 });", + "", + " if (!supportsAiDisclosure) {", + " return `---\\n${frontMatter}---\\n`;", + " }", + "", + " let aiFrontMatter = `ai:\\n textLevel: \\\"${aiTextLevel}\\\"\\n codeLevel: \\\"${aiCodeLevel}\\\"\\n # aiTools: \\\"Claude, ChatGPT, Copilot\\\"\\n # aiDescription: \\\"Optional disclosure about how AI was used\\\"\\n`;", + "", + " if (aiTools) {", + " aiFrontMatter = aiFrontMatter.replace(", + " ' # aiTools: \\\"Claude, ChatGPT, Copilot\\\"\\n',", + " ` aiTools: ${JSON.stringify(aiTools)}\\n`,", + " );", + " }", + "", + " if (aiDescription) {", + " aiFrontMatter = aiFrontMatter.replace(", + " ' # aiDescription: \\\"Optional disclosure about how AI was used\\\"\\n',", + " ` aiDescription: ${JSON.stringify(aiDescription)}\\n`,", + " );", + " }", + "", + " return `---\\n${frontMatter}${aiFrontMatter}---\\n`;", + "};", +].join("\n"); + async function exists(filePath) { try { await access(filePath); @@ -279,12 +392,14 @@ for (const filePath of candidates) { let updated = source; - if (source.includes(v2PatchedBlock)) { - updated = source.replace(v2PatchedBlock, v3Block); + if (source.includes(v3Block)) { + updated = source.replace(v3Block, v4Block); + } else if (source.includes(v2PatchedBlock)) { + updated = source.replace(v2PatchedBlock, v4Block); } else if (source.includes(v1PatchedBlock)) { - updated = source.replace(v1PatchedBlock, v3Block); + updated = source.replace(v1PatchedBlock, v4Block); } else if (source.includes(upstreamBlock)) { - updated = source.replace(upstreamBlock, v3Block); + updated = source.replace(upstreamBlock, v4Block); } else { console.warn( `[postinstall] Skipping preset-eleventy AI frontmatter patch for ${filePath}: upstream format changed`,