create-typescript-app 2.26.5 → 2.26.7

package/lib/data/packageData.d.ts

@@ -1,5 +1,5 @@
 var name = "create-typescript-app";
-var version = "2.26.4";
+var version = "2.26.6";
 var description = "Quickstart-friendly TypeScript template with comprehensive, configurable, opinionated tooling. 🎁";
 var repository = {
 	type: "git",

package/lib/options/readReadmeAdditional.js

@@ -1,4 +1,4 @@
-import { indicatorTemplatedBy } from "./readReadmeFootnotes.js";
+import { indicatorsTemplatedBy } from "./readReadmeFootnotes.js";
 const indicatorAfterAllContributors = /<!--\s*ALL-CONTRIBUTORS-LIST:END\s*-->/;
 const indicatorAfterAllContributorsSpellCheck = /<!--\s*spellchecker:\s*enable\s*-->/;
 async function readReadmeAdditional(getReadme) {
@@ -10,10 +10,16 @@ async function readReadmeAdditional(getReadme) {
   if (!indexAfterContributors) {
     return void 0;
   }
-  const templatedByMatch = indicatorTemplatedBy.exec(readme);
+  const indexOfFirstTemplatedBy = indicatorsTemplatedBy.reduce(
+    (smallest, indicator) => {
+      const indexOf = indicator.exec(readme)?.index;
+      return indexOf ? Math.min(smallest, indexOf) : smallest;
+    },
+    readme.length
+  );
   return readme.slice(
     indexAfterContributors.index + indexAfterContributors[0].length,
-    templatedByMatch?.index
+    indexOfFirstTemplatedBy
   ).trim();
 }
 export {

package/lib/options/readReadmeExplainer.js

@@ -1,19 +1,18 @@
+const lastTagMatchers = [`">`, "/p>", "/>"];
 async function readReadmeExplainer(getReadme) {
   const readme = await getReadme();
-  const indexOfUsageH2 = /## Usage/.exec(readme)?.index ?? readme.indexOf("##");
-  if (indexOfUsageH2 === -1) {
-    return void 0;
-  }
-  const beforeUsageH2 = readme.slice(0, indexOfUsageH2);
-  const [indexOfLastTag, lastTagMatcher] = lastLastIndexOf(beforeUsageH2, [
-    `">`,
-    "/p>",
-    "/>"
-  ]);
+  const indexOfFirstH2 = readme.indexOf("##");
+  const indexOfUsageH2 = /## Usage/.exec(readme)?.index;
+  const beforeH2s = readme.slice(0, indexOfUsageH2 ?? indexOfFirstH2);
+  const [indexOfLastTag, lastTagMatcher] = lastLastIndexOf(
+    beforeH2s,
+    lastTagMatchers
+  );
   if (!lastTagMatcher) {
     return void 0;
   }
-  return readme.slice(indexOfLastTag + lastTagMatcher.length, indexOfUsageH2).trim();
+  const endingIndex = indexOfUsageH2 ?? /## (?:Contrib|Develop)/.exec(readme)?.index;
+  return readme.slice(indexOfLastTag + lastTagMatcher.length, endingIndex).trim();
 }
 function lastLastIndexOf(text, matchers) {
   let pair = [-1, void 0];

package/lib/options/readReadmeFootnotes.d.ts

@@ -1,4 +1,4 @@
-declare const indicatorTemplatedBy: RegExp;
+declare const indicatorsTemplatedBy: RegExp[];
 declare function readReadmeFootnotes(getReadme: () => Promise<string>): Promise<string | undefined>;
 
-export { indicatorTemplatedBy, readReadmeFootnotes };
+export { indicatorsTemplatedBy, readReadmeFootnotes };

package/lib/options/readReadmeFootnotes.js

@@ -1,17 +1,26 @@
-const indicatorTemplatedBy = /> .* This package (?:is|was) (?:based|build|templated) (?:on|with) |<!-- You can remove this notice/;
+const indicatorsTemplatedBy = [
+  /> .* This package (?:is|was) (?:based|build|templated) (?:on|with)/,
+  /<!-- You can remove this notice/
+];
 async function readReadmeFootnotes(getReadme) {
   const readme = await getReadme();
   if (!readme) {
     return void 0;
   }
-  const indexOfTemplatedBy = indicatorTemplatedBy.exec(readme)?.index;
-  if (!indexOfTemplatedBy) {
+  const indexOfLastTemplatedBy = indicatorsTemplatedBy.reduce(
+    (largest, indicator) => {
+      const indexOf = indicator.exec(readme)?.index;
+      return indexOf ? Math.max(largest, indexOf) : largest;
+    },
+    0
+  );
+  if (!indexOfLastTemplatedBy) {
     return void 0;
   }
-  const indexOfNextLine = readme.indexOf("\n", indexOfTemplatedBy);
+  const indexOfNextLine = readme.indexOf("\n", indexOfLastTemplatedBy);
   return readme.slice(indexOfNextLine).trim() || void 0;
 }
 export {
-  indicatorTemplatedBy,
+  indicatorsTemplatedBy,
   readReadmeFootnotes
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "create-typescript-app",
-	"version": "2.26.5",
+	"version": "2.26.7",
 	"description": "Quickstart-friendly TypeScript template with comprehensive, configurable, opinionated tooling. 🎁",
 	"repository": {
 		"type": "git",