@thi.ng/transclude 0.1.90 → 0.1.92

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2024-05-08T18:24:32Z
+- **Last updated**: 2024-06-29T09:28:36Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.
@@ -9,6 +9,13 @@ See [Conventional Commits](https://conventionalcommits.org/) for commit guidelin
 **Note:** Unlisted _patch_ versions only involve non-code or otherwise excluded changes
 and/or version bumps of transitive dependencies.
 
+### [0.1.91](https://github.com/thi-ng/umbrella/tree/@thi.ng/transclude@0.1.91) (2024-06-21)
+
+#### ♻️ Refactoring
+
+- rename various rest args to be more semantically meaningful ([8088a56](https://github.com/thi-ng/umbrella/commit/8088a56))
+- dedupe packageTemplates() internals ([31bbbdd](https://github.com/thi-ng/umbrella/commit/31bbbdd))
+
 ### [0.1.79](https://github.com/thi-ng/umbrella/tree/@thi.ng/transclude@0.1.79) (2024-03-18)
 
 #### ♻️ Refactoring

package/README.md

@@ -7,7 +7,7 @@
 [![Mastodon Follow](https://img.shields.io/mastodon/follow/109331703950160316?domain=https%3A%2F%2Fmastodon.thi.ng&style=social)](https://mastodon.thi.ng/@toxi)
 
 > [!NOTE]
-> This is one of 192 standalone projects, maintained as part
+> This is one of 189 standalone projects, maintained as part
 > of the [@thi.ng/umbrella](https://github.com/thi-ng/umbrella/) monorepo
 > and anti-framework.
 >

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/transclude",
-  "version": "0.1.90",
+  "version": "0.1.92",
   "description": "Extensible functional template engine for text document generation, incl. various high-level Markdown features",
   "type": "module",
   "module": "./index.js",
@@ -10,7 +10,7 @@
     "type": "git",
     "url": "https://github.com/thi-ng/umbrella.git"
   },
-  "homepage": "https://github.com/thi-ng/umbrella/tree/develop/packages/transclude#readme",
+  "homepage": "https://thi.ng/transclude",
   "funding": [
     {
       "type": "github",
@@ -36,19 +36,19 @@
     "tool:tangle": "../../node_modules/.bin/tangle src/**/*.ts"
   },
   "dependencies": {
-    "@thi.ng/api": "^8.11.2",
-    "@thi.ng/checks": "^3.6.4",
-    "@thi.ng/file-io": "^2.1.2",
-    "@thi.ng/logger": "^3.0.12",
-    "@thi.ng/strings": "^3.7.33",
-    "@thi.ng/transducers": "^9.0.5"
+    "@thi.ng/api": "^8.11.4",
+    "@thi.ng/checks": "^3.6.6",
+    "@thi.ng/file-io": "^2.1.4",
+    "@thi.ng/logger": "^3.0.14",
+    "@thi.ng/strings": "^3.7.35",
+    "@thi.ng/transducers": "^9.0.7"
   },
   "devDependencies": {
-    "@microsoft/api-extractor": "^7.43.2",
-    "@thi.ng/testament": "^0.4.29",
-    "esbuild": "^0.21.1",
+    "@microsoft/api-extractor": "^7.47.0",
+    "@thi.ng/testament": "^0.4.31",
+    "esbuild": "^0.21.5",
     "typedoc": "^0.25.13",
-    "typescript": "^5.4.5"
+    "typescript": "^5.5.2"
   },
   "keywords": [
     "engine",
@@ -110,5 +110,5 @@
     "status": "alpha",
     "year": 2022
   },
-  "gitHead": "df34b4a9e650cc7323575356de207d78933bdcf3\n"
+  "gitHead": "7b950c112fba0b2e7c450765b15624c3382f1354\n"
 }

package/tpl/pkg.js

@@ -126,47 +126,33 @@ const packageTemplates = (pkg, opts) => {
     "pkg.link": ({ user }) => link(pkg(user).name, pkg(user).homepage),
     "pkg.author": ({ user }) => author(pkg(user).author),
     "pkg.authorLink": ({ user }) => authorLink(pkg(user).author),
-    "pkg.contributors": ({ user, eol }) => {
-      const people = pkg(user).contributors;
-      return people ? $opts.hdContributors + contributors(people, eol) : "";
-    },
-    "pkg.contributorLinks": ({ user, eol }) => {
-      const people = pkg(user).contributors;
-      return people ? $opts.hdContributors + contributorLinks(people, eol) : "";
-    },
-    "pkg.allAuthors": ({ user, eol }) => {
-      const $pkg = pkg(user);
-      const $author = author($pkg.author);
-      const res = [];
-      if ($pkg.contributors) {
-        res.push(
-          $author + " (Main author)",
-          ...$pkg.contributors.map(author)
-        );
-      } else {
-        res.push($author);
-      }
-      return list(res, eol);
-    },
-    "pkg.allAuthorLinks": ({ user, eol }) => {
-      const $pkg = pkg(user);
-      const $author = authorLink($pkg.author);
-      const res = [];
-      if ($pkg.contributors) {
-        res.push(
-          $author + " (Main author)",
-          ...$pkg.contributors.map(authorLink)
-        );
-      } else {
-        res.push($author);
-      }
-      return list(res, eol);
-    },
+    "pkg.allAuthors": __allAuthors(pkg, author),
+    "pkg.allAuthorLinks": __allAuthors(pkg, authorLink),
+    "pkg.contributors": __allContribs(pkg, $opts, contributors),
+    "pkg.contributorLinks": __allContribs(pkg, $opts, contributorLinks),
     "pkg.license": ({ user }) => license(pkg(user).license),
     "pkg.licenseLink": ({ user }) => licenseLink(pkg(user).license)
   };
   return tpls;
 };
+const __allAuthors = (pkg, itemFn) => ({ user, eol }) => {
+  const $pkg = pkg(user);
+  const $author = itemFn($pkg.author);
+  const res = [];
+  if ($pkg.contributors) {
+    res.push(
+      $author + " (Main author)",
+      ...$pkg.contributors.map(itemFn)
+    );
+  } else {
+    res.push($author);
+  }
+  return list(res, eol);
+};
+const __allContribs = (pkg, opts, itemFn) => ({ user, eol }) => {
+  const people = pkg(user).contributors;
+  return people ? opts.hdContributors + itemFn(people, eol) : "";
+};
 export {
   LICENSES,
   author,

package/transclude.js

@@ -12,11 +12,11 @@ const transclude = (ctx, path) => {
     ...ctx
   };
   $ctx.pre.reduce((acc, fn) => $ctx.src = fn($ctx, [acc], path), $ctx.src);
-  $ctx.src = $ctx.src.replace($ctx.match, (...xs) => {
-    const [orig, id] = xs;
+  $ctx.src = $ctx.src.replace($ctx.match, (...args) => {
+    const [orig, id] = args;
     const tpl = $ctx.templates[id];
     if (tpl !== void 0) {
-      return typeof tpl === "function" ? tpl($ctx, xs, path) : tpl;
+      return typeof tpl === "function" ? tpl($ctx, args, path) : tpl;
     } else {
       $ctx.logger.warn(`skipping unknown tpl ID: "${id}"`);
       return orig;