freestruct 1.0.0 → 1.2.0

package/engine/urls.js

@@ -16,7 +16,14 @@ const _norm = s => '/' + String(s).replace(/^\/+/, '');
 
 export function pageUrlFor(config, slug) {
   const base = canonicalBase(config);
-  const basePath = config.basePath ? _norm(config.basePath) : '';
+  // Trailing slashes on a CONSUMER-PROVIDED basePath normalize away
+  // (Pass 26.13): '/myproject/' joined onto a lead-slash slug doubled the
+  // junction ('/myproject//guide/') through every injected URL class
+  // (canonical, sitemap, feed, hreflang). Directory SLUGS keep theirs -
+  // a directory page's trailing slash is canonical - only basePath strips.
+  const basePath = config.basePath
+    ? _norm(config.basePath).replace(/\/+$/, '')
+    : '';
   const slugPath = _norm(slug);
 
   // rel path already carries the deploy directory (e.g. tree nests docs/) -
@@ -26,3 +33,43 @@ export function pageUrlFor(config, slug) {
   }
   return base + basePath + slugPath;
 }
+
+// ---------- slug/glob matching (issues #25 + follow-on) ----------
+// The scoping contracts (jsonLd map keys, og.scoped keys) key on page slugs,
+// NOT raw urls - the engine keys pages by slug and never knows a deploy host.
+//   '/'        exact root
+//   '/faq'     exact page (trailing slashes normalized away)
+//   '/blog/*'  exactly one segment under /blog
+//   '/blog/**' /blog itself AND anything below it ('**' at the end only)
+// Specificity ranks exact > literal-heavy glob > '**'; callers use it to
+// pick the winning pattern when one value is decided (images).
+
+function _forMatch(s) {
+  return _norm(s).replace(/\/+$/, '') || '/';
+}
+
+export function slugMatchesGlob(pattern, slug) {
+  const p = _forMatch(pattern);
+  const s = _forMatch(slug);
+  // '**' (with or without the root slash) means everything
+  if (p === '**' || p === '/**') return true;
+  if (!p.includes('*')) return p === s;
+  // trailing '**' covers the stem directory itself AND everything below
+  if (p.endsWith('/**')) {
+    const stem = _forMatch(p.replace(/\/\*\*$/, ''));
+    return s === stem || s.startsWith(stem + '/');
+  }
+  // single '*' (and mid-pattern '**' degrading the same way): one segment
+  const re = new RegExp('^' + p
+    .split('*').map((seg) => seg.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'))
+    .join('[^/]+') + '$');
+  return re.test(s);
+}
+
+// Higher number wins: exact match outranks every glob; between globs the
+// one carrying more literal path characters is the more specific contract.
+export function globSpecificity(pattern) {
+  const p = _forMatch(pattern);
+  if (!p.includes('*')) return 100000 + p.length;
+  return p.replace(/\*+/g, '').length;
+}

package/engine/xmllike.js

@@ -8,6 +8,7 @@
 import fs from 'fs';
 import path from 'path';
 import { pageUrlFor } from './urls.js';
+import { extractTitle, extractDescription } from './scan.js';
 
 /** Escape a value for XML text/attribute contexts. */
 export function escXml(value) {
@@ -85,10 +86,12 @@ export function generateFeed(pages, config, outputDir) {
   let items = '';
   for (const page of pages) {
     const html = fs.readFileSync(page.file, 'utf8');
-    const titleMatch = html.match(/<title>([^<]+)<\/title>/i);
-    const descMatch = html.match(/<meta[^>]*name="description"[^>]*content="([^"]+)"/i);
-    const title = titleMatch ? titleMatch[1].split(' | ')[0] : path.basename(page.file, '.html');
-    const desc = descMatch ? descMatch[1] : '';
+    // Entity-DECODED extraction: the SSG's '&amp;' must reach escXml as a raw
+    // '&' so it escapes ONCE. Reading the raw match and re-escaping double-
+    // encoded the text ('&amp;amp;', which renders literally as '&amp;').
+    const extracted = extractTitle(html);
+    const title = extracted || path.basename(page.file).replace(/\.html?$/i, '');
+    const desc = extractDescription(html) || '';
     const pageUrl = pageUrlFor(config, page.slug);
     const pubDate = page.mtime.toUTCString();
     items += '\n<item>\n'

package/init/README.md

@@ -1,10 +1,6 @@
 # Freestruct init kit
 
-This is the consumer scaffold kit (prestruct's `init/` pattern, sized to
-Freestruct): the minimum a brand-new project copies in to be Freestruct-ready
-in minutes. Freestruct runs AFTER your static site generator builds, so the
-kit is deliberately SSG-agnostic - your Jekyll/Hugo/Docusaurus/MkDocs setup
-stays untouched.
+This is the consumer scaffold kit (prestruct's `init/` pattern, sized to Freestruct): the minimum a brand-new project copies in to be Freestruct-ready in minutes. Freestruct runs AFTER your static site generator builds, so the kit is deliberately SSG-agnostic - your Jekyll/Hugo/Docusaurus/MkDocs setup stays untouched.
 
 ## What's in the kit
 
@@ -28,21 +24,11 @@ cp -r node_modules/freestruct/init/docs .
 
 Then:
 
-1. Edit `docs/freestruct.config.yml`: `site.name` and `site.url` are required;
-   adjust `site.description` to fit.
-2. Let your SSG build. `npx freestruct` discovers the output dir
-   (default `docs/_site`; override via the `outputDir` config key or a
-   positional CLI argument).
-3. Verify: `docs/_site` gains `sitemap.xml`, `robots.txt`, `feed.xml` and
-   (when missing) a `404.html`; injected pages carry canonical/OG tags and a
-   `freestruct-build` marker.
-4. Customize templates only if you need to: the packaged engine templates are
-   used automatically when no staged copy exists. To customize, edit
-   `docs/_freestruct/` copies (which you just copied in) - a staged template
-   always wins over the package-shipped one.
+1. Edit `docs/freestruct.config.yml`: `site.name` and `site.url` are required; adjust `site.description` to fit. The starter also seeds the family identity - an `author` block (the Creadev.org founder) and a `jsonLd` maintainer Person - so scaffolded ports ship ownership from birth; set the maintainer handle to your own.
+2. Let your SSG build. `npx freestruct` discovers the output dir (default `docs/_site`; override via the `outputDir` config key or a positional CLI argument).
+3. Verify: `docs/_site` gains `sitemap.xml`, `robots.txt`, `feed.xml` and (when missing) a `404.html`; injected pages carry canonical/OG tags and a `freestruct-build` marker.
+4. Customize templates only if you need to: the packaged engine templates are used automatically when no staged copy exists. To customize, edit `docs/_freestruct/` copies (which you just copied in) - a staged template always wins over the package-shipped one.
 
 ## Why a kit (not a lucky guess)
 
-Copying this kit means your first run exercises the exact shape the test
-battery and the tarball e2e verify: staged config + staged templates next to
-the docs folder, discovered by walking up from your project root.
+Copying this kit means your first run exercises the exact shape the test battery and the tarball e2e verify: staged config + staged templates next to the docs folder, discovered by walking up from your project root.

package/init/VERSION

@@ -1 +1 @@
-1.0.0
+1.2.0

package/init/docs/_freestruct/inject-brand.html

@@ -38,11 +38,7 @@
   "@context": "https://schema.org",
   "@type": "WebSite",
   "name": "{{siteNameJson}}",
-  "url": "{{siteUrlJson}}",
-  "potentialAction": {
-    "@type": "SearchAction",
-    "target": "{{siteUrlJson}}/?s={search_term_string}"
-  }
+  "url": "{{siteUrlJson}}"{{searchActionJson}}
 }
 </script>
 

package/init/docs/freestruct.config.yml

@@ -7,6 +7,22 @@ site:
   url: https://example.com/docs
   description: My documentation
 
+# Family JSON-LD identity (owner standard): the founder ships as a schema.org
+# Person under "founder" on the injected Organization block, and a maintainer
+# Person is appended after the built-in Organization + WebSite blocks
+# (missing-only, so pages that arrive with their own ld+json stay untouched).
+# Fill in the maintainer handle for your repo; the author block is the family
+# default and needs no edit.
+author:
+  name: Creadev.org
+  url: https://creadev.org
+
+jsonLd:
+  - "@type": Person
+    name: your-github-handle
+    url: https://github.com/your-github-handle
+    jobTitle: My Docs maintainer
+
 # The rest is optional; see the README Configuration table for the list.
 # basePath: /project-docs      # when the output tree is served under a prefix
 # searchIndex: true            # opt-in: generate search.json

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "freestruct",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "Post-build SEO layer for static doc sites - works with any SSG",
   "homepage": "https://github.com/dhaupin/freestruct#readme",
   "bugs": "https://github.com/dhaupin/freestruct/issues",
@@ -31,7 +31,11 @@
     "test": "node test/run.js",
     "e2e": "node scripts/e2e-install.cjs",
     "lint:docs": "node scripts/run-docs-audit.cjs",
-    "packs:selftest": "node scripts/packs-selftest.cjs"
+    "lint:claims": "node scripts/check-fiction-signatures.cjs",
+    "packs:selftest": "node scripts/packs-selftest.cjs",
+    "check": "npm test && npm run lint:docs && npm run lint:claims && npm run packs:selftest",
+    "gate": "npm run sync:check && npm run check",
+    "prepublishOnly": "npm run gate"
   },
   "repository": {
     "type": "git",
@@ -54,5 +58,8 @@
   },
   "dependencies": {
     "js-yaml": "^5.5.0"
+  },
+  "devDependencies": {
+    "@resvg/resvg-js": "^2.6.2"
   }
 }