create-typescript-app 2.25.0 → 2.26.0

package/lib/base.js

@@ -116,7 +116,7 @@ const base = createBase({
     const getBin = lazyValue(async () => await readBin(getPackageData));
     const getEmoji = lazyValue(async () => await readEmoji(getDescription));
     const getDescription = lazyValue(
-      async () => await readDescription(getPackageData, getReadme)
+      async () => await readDescription(getPackageData, getReadme, getRepository)
     );
     const getDevelopmentDocumentation = lazyValue(
       async () => await readDevelopmentDocumentation(take)

package/lib/blocks/blockPackageJson.js

@@ -4,8 +4,8 @@ import sortPackageJson from "sort-package-json";
 import { z } from "zod";
 import { PackageJson } from "zod-package-json";
 import { base } from "../base.js";
+import { htmlToTextSafe } from "../utils/htmlToTextSafe.js";
 import { blockRemoveFiles } from "./blockRemoveFiles.js";
-import { htmlToTextSafe } from "./html/htmlToTextSafe.js";
 import { CommandPhase } from "./phases.js";
 const PackageJsonWithNullableScripts = PackageJson.partial().extend({
   scripts: z.record(z.string(), z.union([z.string(), z.undefined()])).optional()

package/lib/blocks/blockRepositorySettings.js

@@ -1,5 +1,5 @@
 import { base } from "../base.js";
-import { htmlToTextSafe } from "./html/htmlToTextSafe.js";
+import { htmlToTextSafe } from "../utils/htmlToTextSafe.js";
 const blockRepositorySettings = base.createBlock({
   about: {
     name: "Repository Settings"

package/lib/data/packageData.d.ts

@@ -1,5 +1,5 @@
 var name = "create-typescript-app";
-var version = "2.24.5";
+var version = "2.25.0";
 var description = "Quickstart-friendly TypeScript template with comprehensive, configurable, opinionated tooling. 🎁";
 var repository = {
 	type: "git",
@@ -50,6 +50,7 @@ var dependencies = {
 	json5: "^2.2.3",
 	"lazy-value": "^3.0.0",
 	lodash: "^4.17.21",
+	marked: "^15.0.7",
 	"npm-user": "^6.1.1",
 	"object-strings-deep": "^0.1.1",
 	"parse-author": "^2.0.0",

package/lib/options/readDescription.d.ts

@@ -1,5 +1,5 @@
 import { PartialPackageData } from '../types.js';
 
-declare function readDescription(getPackageData: () => Promise<PartialPackageData>, getReadme: () => Promise<string>): Promise<string | undefined>;
+declare function readDescription(getPackageData: () => Promise<PartialPackageData>, getReadme: () => Promise<string>, getRepository: () => Promise<string | undefined>): Promise<string | undefined>;
 
 export { readDescription };

package/lib/options/readDescription.js

@@ -1,16 +1,27 @@
+import { marked } from "marked";
 import { packageData } from "../data/packageData.js";
+import { htmlToTextSafe } from "../utils/htmlToTextSafe.js";
 import { readDescriptionFromReadme } from "./readDescriptionFromReadme.js";
-async function readDescription(getPackageData, getReadme) {
-  const { description: inferred } = await getPackageData();
-  if (!inferred) {
+async function readDescription(getPackageData, getReadme, getRepository) {
+  const { description: fromPackageJson } = await getPackageData();
+  if (!fromPackageJson) {
     return void 0;
   }
-  const { description: existing } = packageData;
   const fromReadme = await readDescriptionFromReadme(getReadme);
-  if (fromReadme?.replaceAll(/<\s*(?:\/\s*)?\w+\s*>/gu, "") === inferred) {
-    return fromReadme;
+  if (!fromReadme) {
+    return marked.parseInline(fromPackageJson);
   }
-  return existing === inferred ? void 0 : inferred;
+  if (await getRepository() !== "create-typescript-app" && fromPackageJson === packageData.description) {
+    return void 0;
+  }
+  const fromPackageJsonNormalized = htmlToTextSafe(
+    await marked.parseInline(fromPackageJson)
+  );
+  const fromReadmeNormalized = htmlToTextSafe(fromReadme);
+  if (fromReadmeNormalized !== fromPackageJsonNormalized) {
+    return await marked.parseInline(fromPackageJson);
+  }
+  return fromReadme;
 }
 export {
   readDescription

package/lib/utils/htmlToTextSafe.js

@@ -0,0 +1,15 @@
+import { convert } from "html-to-text";
+function htmlToTextSafe(raw) {
+  return convert(raw, {
+    selectors: [
+      {
+        options: { ignoreHref: true },
+        selector: "a"
+      }
+    ],
+    wordwrap: false
+  });
+}
+export {
+  htmlToTextSafe
+};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "create-typescript-app",
-	"version": "2.25.0",
+	"version": "2.26.0",
 	"description": "Quickstart-friendly TypeScript template with comprehensive, configurable, opinionated tooling. 🎁",
 	"repository": {
 		"type": "git",
@@ -54,6 +54,7 @@
 		"json5": "^2.2.3",
 		"lazy-value": "^3.0.0",
 		"lodash": "^4.17.21",
+		"marked": "^15.0.7",
 		"npm-user": "^6.1.1",
 		"object-strings-deep": "^0.1.1",
 		"parse-author": "^2.0.0",

package/lib/blocks/html/htmlToTextSafe.js

@@ -1,7 +0,0 @@
-import { convert } from "html-to-text";
-function htmlToTextSafe(raw) {
-  return convert(raw, { wordwrap: false });
-}
-export {
-  htmlToTextSafe
-};