@t8/docsgen 0.2.30 → 0.2.32

package/dist/bin.js

@@ -590,7 +590,6 @@ async function getParsedContent(ctx) {
   let badges = "";
   let title = "";
   let description = [];
-  let descriptionNote = [];
   let intro = [];
   let features = [];
   let note = [];
@@ -616,22 +615,31 @@ async function getParsedContent(ctx) {
       }
     }
     let { outerHTML } = element;
-    if (indexComplete) section.push(outerHTML);
-    else if (!hasFeatures) {
-      if (element.matches("ul")) {
-        hasFeatures = true;
-        features.push(outerHTML);
-      } else {
-        let installationCode = getInstallationCode(element);
-        if (installationCode) installation = installationCode;
-        else if (description.length === 0) description.push(outerHTML);
-        else intro.push(outerHTML);
-      }
-    } else {
-      let installationCode = getInstallationCode(element);
-      if (installationCode) installation = installationCode;
+    if (indexComplete) {
+      section.push(outerHTML);
+      continue;
+    }
+    if (hasFeatures) {
+      let installationCode2 = getInstallationCode(element);
+      if (installationCode2) installation = installationCode2;
       else note.push(outerHTML);
+      continue;
+    }
+    if (element.matches("ul")) {
+      hasFeatures = true;
+      features.push(outerHTML);
+      continue;
+    }
+    let installationCode = getInstallationCode(element);
+    if (installationCode) {
+      installation = installationCode;
+      continue;
     }
+    if (element.matches("p") && description.length === 0) {
+      description.push(outerHTML);
+      continue;
+    }
+    intro.push(outerHTML);
   }
   if (section.length !== 0) sections.push(joinLines(section));
   let postprocess = getSectionPostprocess({
@@ -643,10 +651,6 @@ async function getParsedContent(ctx) {
     description = [];
   }
   if (intro.at(-1) === "<hr>") intro.pop();
-  if (intro.length === 1) {
-    descriptionNote = intro;
-    intro = [];
-  }
   for (let i = 0; i < intro.length; i++) {
     if (intro[i].includes("<br>") && intro[i].startsWith("<p>") && intro[i].endsWith("</p>")) {
       let s = intro[i].slice(3, -4).replace(/<br>(\r?\n)?(\s*)/g, '</span><br>$1$2<span class="li">');
@@ -658,7 +662,6 @@ async function getParsedContent(ctx) {
     // postprocessBadges(joinLines(badges)),
     title,
     description: joinLines(description),
-    descriptionNote: joinLines(descriptionNote),
     intro: joinLines(intro),
     features: joinLines(features),
     note: joinLines(note),
@@ -693,7 +696,7 @@ function getDefaultCodeStyleContent(cssRoot) {
     `.trim();
 }
 function tweakTypography(s = "") {
-  return s.replace(/\b(for|in|on|at|with|a|an|the)\s+/gi, "$1\xA0").replace(/\b(React)\s+(apps?)\b/gi, "$1\xA0$2");
+  return s.replace(/\b(for|in|on|at|to|with|a|an|the|its)\s+/gi, "$1\xA0").replace(/\b(React)\s+(apps?)\b/gi, "$1\xA0$2");
 }
 async function setContent(ctx) {
   let {
@@ -765,17 +768,8 @@ ${getInjectedContent(ctx, "redirect", "body")}
     );
     return;
   }
-  let {
-    description,
-    descriptionNote,
-    intro,
-    features,
-    note,
-    installation,
-    sections,
-    nav
-  } = await getParsedContent(ctx);
-  let descriptionContent = tweakTypography(description) || (escapedPackageDescription ? `<p><em>${tweakTypography(escapedPackageDescription)}</em><p>` : "");
+  let { description, intro, features, note, installation, sections, nav } = await getParsedContent(ctx);
+  let descriptionContent = tweakTypography(description) || (escapedPackageDescription ? `<p>${tweakTypography(escapedPackageDescription)}<p>` : "");
   let navContent = await getNav(ctx, nav);
   let dirs = [contentDir];
   await Promise.all(
@@ -866,7 +860,6 @@ ${getInjectedContent(ctx, "section", "body")}
     <h1>${getTitle(ctx, { cover: true })}</h1>
     <div class="description">
       ${descriptionContent}
-      ${descriptionNote}
     </div>
     <p class="actions">
       <a href="${root}start" class="primary">Docs</a>

package/dist/css/base.css

@@ -36,6 +36,9 @@
   --overlay-border-color: hsl(from var(--b1) h s 60% / 0.7);
 
   font: normal 100% / 1.45 sans-serif;
+  font-family:
+    -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu",
+    "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
 }
 html {
   color: var(--c0);

package/dist/css/index.css

@@ -64,7 +64,6 @@ header {
   padding: 0 var(--content-padding-x);
 }
 .description {
-  font-size: 1.15em;
   margin: 0;
 }
 .description p {
@@ -73,6 +72,9 @@ header {
 .description p + p {
   margin-top: 0.75em;
 }
+.description em {
+  font-style: normal;
+}
 .actions {
   --r: 1em;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@t8/docsgen",
-  "version": "0.2.30",
+  "version": "0.2.32",
   "description": "",
   "main": "dist/bin.js",
   "bin": {

package/src/bin/parsing/getParsedContent.ts

@@ -27,7 +27,6 @@ export async function getParsedContent(ctx: Context) {
   let badges = "";
   let title = "";
   let description: string[] = [];
-  let descriptionNote: string[] = [];
   let intro: string[] = [];
   let features: string[] = [];
   let note: string[] = [];
@@ -61,24 +60,39 @@ export async function getParsedContent(ctx: Context) {
 
     let { outerHTML } = element;
 
-    if (indexComplete) section.push(outerHTML);
-    else if (!hasFeatures) {
-      if (element.matches("ul")) {
-        hasFeatures = true;
-        features.push(outerHTML);
-      } else {
-        let installationCode = getInstallationCode(element);
-
-        if (installationCode) installation = installationCode;
-        else if (description.length === 0) description.push(outerHTML);
-        else intro.push(outerHTML);
-      }
-    } else {
+    if (indexComplete) {
+      section.push(outerHTML);
+      continue;
+    }
+
+    if (hasFeatures) {
       let installationCode = getInstallationCode(element);
 
       if (installationCode) installation = installationCode;
       else note.push(outerHTML);
+
+      continue;
     }
+
+    if (element.matches("ul")) {
+      hasFeatures = true;
+      features.push(outerHTML);
+      continue;
+    }
+
+    let installationCode = getInstallationCode(element);
+
+    if (installationCode) {
+      installation = installationCode;
+      continue;
+    }
+
+    if (element.matches("p") && description.length === 0) {
+      description.push(outerHTML);
+      continue;
+    }
+
+    intro.push(outerHTML);
   }
 
   if (section.length !== 0) sections.push(joinLines(section));
@@ -99,11 +113,6 @@ export async function getParsedContent(ctx: Context) {
 
   if (intro.at(-1) === "<hr>") intro.pop();
 
-  if (intro.length === 1) {
-    descriptionNote = intro;
-    intro = [];
-  }
-
   for (let i = 0; i < intro.length; i++) {
     if (
       intro[i].includes("<br>") &&
@@ -122,7 +131,6 @@ export async function getParsedContent(ctx: Context) {
     badges, // postprocessBadges(joinLines(badges)),
     title,
     description: joinLines(description),
-    descriptionNote: joinLines(descriptionNote),
     intro: joinLines(intro),
     features: joinLines(features),
     note: joinLines(note),

package/src/bin/setContent.ts

@@ -30,7 +30,7 @@ function getDefaultCodeStyleContent(cssRoot: string) {
 
 function tweakTypography(s = "") {
   return s
-    .replace(/\b(for|in|on|at|with|a|an|the)\s+/gi, "$1\xa0")
+    .replace(/\b(for|in|on|at|to|with|a|an|the|its)\s+/gi, "$1\xa0")
     .replace(/\b(React)\s+(apps?)\b/gi, "$1\xa0$2");
 }
 
@@ -125,21 +125,13 @@ ${getInjectedContent(ctx, "redirect", "body")}
     return;
   }
 
-  let {
-    description,
-    descriptionNote,
-    intro,
-    features,
-    note,
-    installation,
-    sections,
-    nav,
-  } = await getParsedContent(ctx);
+  let { description, intro, features, note, installation, sections, nav } =
+    await getParsedContent(ctx);
 
   let descriptionContent =
     tweakTypography(description) ||
     (escapedPackageDescription
-      ? `<p><em>${tweakTypography(escapedPackageDescription)}</em><p>`
+      ? `<p>${tweakTypography(escapedPackageDescription)}<p>`
       : "");
 
   let navContent = await getNav(ctx, nav);
@@ -240,7 +232,6 @@ ${getInjectedContent(ctx, "section", "body")}
     <h1>${getTitle(ctx, { cover: true })}</h1>
     <div class="description">
       ${descriptionContent}
-      ${descriptionNote}
     </div>
     <p class="actions">
       <a href="${root}start" class="primary">Docs</a>

package/src/css/base.css

@@ -36,6 +36,9 @@
   --overlay-border-color: hsl(from var(--b1) h s 60% / 0.7);
 
   font: normal 100% / 1.45 sans-serif;
+  font-family:
+    -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu",
+    "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
 }
 html {
   color: var(--c0);

package/src/css/index.css

@@ -64,7 +64,6 @@ header {
   padding: 0 var(--content-padding-x);
 }
 .description {
-  font-size: 1.15em;
   margin: 0;
 }
 .description p {
@@ -73,6 +72,9 @@ header {
 .description p + p {
   margin-top: 0.75em;
 }
+.description em {
+  font-style: normal;
+}
 .actions {
   --r: 1em;