@t8/docsgen 0.1.24 → 0.1.26

package/dist/bin.js

@@ -176,6 +176,7 @@ async function getConfig() {
     localConfig = JSON.parse(
       await fetchText("./docsgen.config.json")
     );
+    delete localConfig.$schema;
   } catch {
   }
   let targetId;
@@ -573,6 +574,12 @@ async function setContent(ctx) {
   let packageVersion = (await exec(`npm view ${packageName} version`)).stdout.trim().split(".").slice(0, 2).join(".");
   let packageUrl = `https://unpkg.com/${packageName}@${packageVersion}`;
   let rootAttrs = "";
+  let defaultCodeStyleContent = `
+<link rel="stylesheet" href="https://unpkg.com/@highlightjs/cdn-assets@11.11.1/styles/base16/material.min.css">
+<link rel="stylesheet" href="${packageUrl}/dist/css/code.css">
+<script src="https://unpkg.com/@highlightjs/cdn-assets@11.11.1/highlight.min.js"></script>
+<script>hljs.highlightAll()</script>
+  `.trim();
   if (theme) rootAttrs += ` data-theme="${escapeHTML(theme)}"`;
   if (baseColor) rootAttrs += ` style="--base-color: ${escapeHTML(baseColor)}"`;
   let icon = getIcon(ctx);
@@ -659,12 +666,7 @@ ${navContent.replace(
 </div>
 </div>
 
-${content.includes("<pre><code ") ? `
-<link rel="stylesheet" href="https://unpkg.com/@highlightjs/cdn-assets@11.11.1/styles/base16/material.min.css">
-<link rel="stylesheet" href="${packageUrl}/dist/css/code.css">
-<script src="https://unpkg.com/@highlightjs/cdn-assets@11.11.1/highlight.min.js"></script>
-<script>hljs.highlightAll()</script>
-`.trim() : ""}
+${content.includes("<pre><code ") ? getInjectedContent(ctx, "section", ":has-code") || defaultCodeStyleContent : ""}
 ${counterContent}
 ${getInjectedContent(ctx, "section", "body")}
 </body>
@@ -720,12 +722,7 @@ ${features ? `
 </main>
 </div>
 
-${[description, features].some((s) => s.includes("<pre><code ")) ? `
-<link rel="stylesheet" href="https://unpkg.com/@highlightjs/cdn-assets@11.11.1/styles/base16/material.min.css">
-<link rel="stylesheet" href="${packageUrl}/dist/css/code.css">
-<script src="https://unpkg.com/@highlightjs/cdn-assets@11.11.1/highlight.min.js"></script>
-<script>hljs.highlightAll()</script>
-`.trim() : ""}
+${[description, features].some((s) => s.includes("<pre><code ")) ? getInjectedContent(ctx, "index", ":has-code") || defaultCodeStyleContent : ""}
 ${counterContent}
 ${getInjectedContent(ctx, "index", "body")}
 </body>

package/dist/css/base.css

@@ -30,7 +30,6 @@
   --max-content-width: 64em;
   --content-padding-x: 1.75rem;
   --content-padding-y: 1.75rem;
-  --content-border-radius: 1rem;
   --space-x: var(--content-padding-x);
   --block-margin-y: 1em;
   --hr-border: 0.15rem solid var(--b1-medium);
@@ -207,7 +206,7 @@ pre,
 pre.highlight {
   line-height: 1.25;
   color: inherit;
-  border-radius: 1em;
+  border-radius: 0.5em;
   overflow: auto;
 }
 pre > code {

package/dist/css/section.css

@@ -18,7 +18,6 @@
   align-self: flex-start;
   font-size: 0.9em;
   background: var(--b1-light);
-  border-radius: var(--content-border-radius);
   padding: 0.5rem var(--content-padding-x) 0.65rem;
   margin: 0 0 0 var(--space-x);
   box-sizing: border-box;
@@ -28,7 +27,6 @@
     width: 100%;
     font-size: inherit;
     border-top: 0.35em solid var(--b1);
-    border-radius: 0;
     padding: 0.25rem var(--content-padding-x) 0.35rem;
     margin: 0;
   }

package/package.json

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

package/schema.json

@@ -1 +1 @@
-{"$ref":"#/definitions/Config","$schema":"http://json-schema.org/draft-07/schema#","definitions":{"Config":{"additionalProperties":false,"properties":{"append":{"$ref":"#/definitions/ContentInjectionMap%3C(%22head%22%7C%22body%22)%3E"},"backstory":{"description":"Backstory link URL to be added to the front page.","type":"string"},"baseColor":{"type":"string"},"cname":{"description":"Content of the './CNAME' file.","type":"string"},"contentDir":{"description":"Generated section content directory.","type":"string"},"description":{"type":"string"},"dir":{"type":"string"},"entries":{"items":{"$ref":"#/definitions/EntryConfig"},"type":"array"},"favicon":{"description":"Favicon URL.","type":"string"},"faviconType":{"type":"string"},"htmlTitle":{"type":"string"},"id":{"type":"string"},"jsorg":{"description":"As a boolean, it means whether to add the '<package_name>.js.org' domain to the './CNAME' file.\n\nAs a string, it sets the '<jsorg_value>.js.org' domain to the './CNAME' file.","type":["boolean","string"]},"mainBranch":{"type":"string"},"name":{"type":"string"},"nav":{"description":"URL of an HTML file inserted into the navigation bar.","type":"string"},"npm":{"type":"string"},"redirect":{"description":"Redirection URL.","type":"string"},"remove":{"description":"Whether to remove the GitHub Pages branch and quit.","type":"boolean"},"repo":{"type":"string"},"root":{"description":"Main page root path.","type":"string"},"scope":{"description":"Scope URL.","type":"string"},"singlePage":{"description":"Whether to show all sections on a single page.","type":"boolean"},"source":{"type":"string"},"targetBranch":{"description":"Target branch.","examples":["gh-pages"],"type":"string"},"targetId":{"type":"string"},"theme":{"type":"string"},"title":{"type":"string"},"version":{"type":"string"},"ymid":{"type":["number","string"]}},"type":"object"},"ContentInjectionMap<(\"head\"|\"body\")>":{"additionalProperties":false,"properties":{"body":{"anyOf":[{"type":"string"},{"additionalProperties":false,"properties":{"content":{"type":"string"},"pages":{"items":{"$ref":"#/definitions/Page"},"type":"array"}},"type":"object"},{"items":{"anyOf":[{"type":"string"},{"not":{}},{"additionalProperties":false,"properties":{"content":{"type":"string"},"pages":{"items":{"$ref":"#/definitions/Page"},"type":"array"}},"type":"object"}]},"type":"array"}]},"head":{"anyOf":[{"type":"string"},{"additionalProperties":false,"properties":{"content":{"type":"string"},"pages":{"items":{"$ref":"#/definitions/Page"},"type":"array"}},"type":"object"},{"items":{"anyOf":[{"type":"string"},{"not":{}},{"additionalProperties":false,"properties":{"content":{"type":"string"},"pages":{"items":{"$ref":"#/definitions/Page"},"type":"array"}},"type":"object"}]},"type":"array"}]}},"type":"object"},"EntryConfig":{"additionalProperties":false,"properties":{"append":{"$ref":"#/definitions/ContentInjectionMap%3C(%22head%22%7C%22body%22)%3E"},"backstory":{"description":"Backstory link URL to be added to the front page.","type":"string"},"baseColor":{"type":"string"},"cname":{"description":"Content of the './CNAME' file.","type":"string"},"contentDir":{"description":"Generated section content directory.","type":"string"},"description":{"type":"string"},"dir":{"type":"string"},"favicon":{"description":"Favicon URL.","type":"string"},"faviconType":{"type":"string"},"htmlTitle":{"type":"string"},"id":{"type":"string"},"jsorg":{"description":"As a boolean, it means whether to add the '<package_name>.js.org' domain to the './CNAME' file.\n\nAs a string, it sets the '<jsorg_value>.js.org' domain to the './CNAME' file.","type":["boolean","string"]},"mainBranch":{"type":"string"},"name":{"type":"string"},"nav":{"description":"URL of an HTML file inserted into the navigation bar.","type":"string"},"npm":{"type":"string"},"redirect":{"description":"Redirection URL.","type":"string"},"remove":{"description":"Whether to remove the GitHub Pages branch and quit.","type":"boolean"},"repo":{"type":"string"},"root":{"description":"Main page root path.","type":"string"},"scope":{"description":"Scope URL.","type":"string"},"singlePage":{"description":"Whether to show all sections on a single page.","type":"boolean"},"source":{"type":"string"},"targetBranch":{"description":"Target branch.","examples":["gh-pages"],"type":"string"},"theme":{"type":"string"},"title":{"type":"string"},"version":{"type":"string"},"ymid":{"type":["number","string"]}},"type":"object"},"Page":{"enum":["index","start","section","redirect"],"type":"string"}}}
+{"$ref":"#/definitions/Config","$schema":"http://json-schema.org/draft-07/schema#","definitions":{"Config":{"additionalProperties":false,"properties":{"$schema":{"type":"string"},"append":{"$ref":"#/definitions/ContentInjectionMap%3C(%22head%22%7C%22body%22%7C%22%3Ahas-code%22)%3E"},"backstory":{"description":"Backstory link URL to be added to the front page.","type":"string"},"baseColor":{"type":"string"},"cname":{"description":"Content of the './CNAME' file.","type":"string"},"contentDir":{"description":"Generated section content directory.","type":"string"},"description":{"type":"string"},"dir":{"type":"string"},"entries":{"items":{"$ref":"#/definitions/EntryConfig"},"type":"array"},"favicon":{"description":"Favicon URL.","type":"string"},"faviconType":{"type":"string"},"htmlTitle":{"type":"string"},"id":{"type":"string"},"jsorg":{"description":"As a boolean, it means whether to add the '<package_name>.js.org' domain to the './CNAME' file.\n\nAs a string, it sets the '<jsorg_value>.js.org' domain to the './CNAME' file.","type":["boolean","string"]},"mainBranch":{"type":"string"},"name":{"type":"string"},"nav":{"description":"URL of an HTML file inserted into the navigation bar.","type":"string"},"npm":{"type":"string"},"redirect":{"description":"Redirection URL.","type":"string"},"remove":{"description":"Whether to remove the GitHub Pages branch and quit.","type":"boolean"},"repo":{"type":"string"},"root":{"description":"Main page root path.","type":"string"},"scope":{"description":"Scope URL.","type":"string"},"singlePage":{"description":"Whether to show all sections on a single page.","type":"boolean"},"source":{"type":"string"},"targetBranch":{"description":"Target branch.","examples":["gh-pages"],"type":"string"},"targetId":{"type":"string"},"theme":{"type":"string"},"title":{"type":"string"},"version":{"type":"string"},"ymid":{"type":["number","string"]}},"type":"object"},"ContentInjectionMap<(\"head\"|\"body\"|\":has-code\")>":{"additionalProperties":false,"properties":{":has-code":{"anyOf":[{"type":"string"},{"additionalProperties":false,"properties":{"content":{"type":"string"},"pages":{"items":{"$ref":"#/definitions/Page"},"type":"array"}},"type":"object"},{"items":{"anyOf":[{"type":"string"},{"not":{}},{"additionalProperties":false,"properties":{"content":{"type":"string"},"pages":{"items":{"$ref":"#/definitions/Page"},"type":"array"}},"type":"object"}]},"type":"array"}]},"body":{"anyOf":[{"type":"string"},{"additionalProperties":false,"properties":{"content":{"type":"string"},"pages":{"items":{"$ref":"#/definitions/Page"},"type":"array"}},"type":"object"},{"items":{"anyOf":[{"type":"string"},{"not":{}},{"additionalProperties":false,"properties":{"content":{"type":"string"},"pages":{"items":{"$ref":"#/definitions/Page"},"type":"array"}},"type":"object"}]},"type":"array"}]},"head":{"anyOf":[{"type":"string"},{"additionalProperties":false,"properties":{"content":{"type":"string"},"pages":{"items":{"$ref":"#/definitions/Page"},"type":"array"}},"type":"object"},{"items":{"anyOf":[{"type":"string"},{"not":{}},{"additionalProperties":false,"properties":{"content":{"type":"string"},"pages":{"items":{"$ref":"#/definitions/Page"},"type":"array"}},"type":"object"}]},"type":"array"}]}},"type":"object"},"EntryConfig":{"additionalProperties":false,"properties":{"append":{"$ref":"#/definitions/ContentInjectionMap%3C(%22head%22%7C%22body%22%7C%22%3Ahas-code%22)%3E"},"backstory":{"description":"Backstory link URL to be added to the front page.","type":"string"},"baseColor":{"type":"string"},"cname":{"description":"Content of the './CNAME' file.","type":"string"},"contentDir":{"description":"Generated section content directory.","type":"string"},"description":{"type":"string"},"dir":{"type":"string"},"favicon":{"description":"Favicon URL.","type":"string"},"faviconType":{"type":"string"},"htmlTitle":{"type":"string"},"id":{"type":"string"},"jsorg":{"description":"As a boolean, it means whether to add the '<package_name>.js.org' domain to the './CNAME' file.\n\nAs a string, it sets the '<jsorg_value>.js.org' domain to the './CNAME' file.","type":["boolean","string"]},"mainBranch":{"type":"string"},"name":{"type":"string"},"nav":{"description":"URL of an HTML file inserted into the navigation bar.","type":"string"},"npm":{"type":"string"},"redirect":{"description":"Redirection URL.","type":"string"},"remove":{"description":"Whether to remove the GitHub Pages branch and quit.","type":"boolean"},"repo":{"type":"string"},"root":{"description":"Main page root path.","type":"string"},"scope":{"description":"Scope URL.","type":"string"},"singlePage":{"description":"Whether to show all sections on a single page.","type":"boolean"},"source":{"type":"string"},"targetBranch":{"description":"Target branch.","examples":["gh-pages"],"type":"string"},"theme":{"type":"string"},"title":{"type":"string"},"version":{"type":"string"},"ymid":{"type":["number","string"]}},"type":"object"},"Page":{"enum":["index","start","section","redirect"],"type":"string"}}}

package/src/bin/getConfig.ts

@@ -52,6 +52,8 @@ export async function getConfig(): Promise<Config> {
     localConfig = JSON.parse(
       await fetchText("./docsgen.config.json"),
     ) as Config;
+
+    delete localConfig.$schema;
   } catch {}
 
   let targetId: string | undefined;

package/src/bin/getInjectedContent.ts

@@ -14,7 +14,7 @@ export function getInjectedContent(
 
   return (
     Array.isArray(injectedContent) ? injectedContent : [injectedContent]
-  ).reduce((s, item) => {
+  ).reduce<string>((s, item) => {
     if (item === undefined) return s;
 
     if (typeof item === "string") return `${s}${s ? "\n" : ""}${item}`;

package/src/bin/setContent.ts

@@ -44,6 +44,13 @@ export async function setContent(ctx: Context) {
   let packageUrl = `https://unpkg.com/${packageName}@${packageVersion}`;
   let rootAttrs = "";
 
+  let defaultCodeStyleContent = `
+<link rel="stylesheet" href="https://unpkg.com/@highlightjs/cdn-assets@11.11.1/styles/base16/material.min.css">
+<link rel="stylesheet" href="${packageUrl}/dist/css/code.css">
+<script src="https://unpkg.com/@highlightjs/cdn-assets@11.11.1/highlight.min.js"></script>
+<script>hljs.highlightAll()</script>
+  `.trim();
+
   if (theme) rootAttrs += ` data-theme="${escapeHTML(theme)}"`;
 
   if (baseColor) rootAttrs += ` style="--base-color: ${escapeHTML(baseColor)}"`;
@@ -145,12 +152,7 @@ ${navContent.replace(
 
 ${
   content.includes("<pre><code ")
-    ? `
-<link rel="stylesheet" href="https://unpkg.com/@highlightjs/cdn-assets@11.11.1/styles/base16/material.min.css">
-<link rel="stylesheet" href="${packageUrl}/dist/css/code.css">
-<script src="https://unpkg.com/@highlightjs/cdn-assets@11.11.1/highlight.min.js"></script>
-<script>hljs.highlightAll()</script>
-`.trim()
+    ? (getInjectedContent(ctx, "section", ":has-code") || defaultCodeStyleContent)
     : ""
 }
 ${counterContent}
@@ -214,12 +216,7 @@ ${
 
 ${
   [description, features].some((s) => s.includes("<pre><code "))
-    ? `
-<link rel="stylesheet" href="https://unpkg.com/@highlightjs/cdn-assets@11.11.1/styles/base16/material.min.css">
-<link rel="stylesheet" href="${packageUrl}/dist/css/code.css">
-<script src="https://unpkg.com/@highlightjs/cdn-assets@11.11.1/highlight.min.js"></script>
-<script>hljs.highlightAll()</script>
-`.trim()
+    ? (getInjectedContent(ctx, "index", ":has-code") || defaultCodeStyleContent)
     : ""
 }
 ${counterContent}

package/src/css/base.css

@@ -30,7 +30,6 @@
   --max-content-width: 64em;
   --content-padding-x: 1.75rem;
   --content-padding-y: 1.75rem;
-  --content-border-radius: 1rem;
   --space-x: var(--content-padding-x);
   --block-margin-y: 1em;
   --hr-border: 0.15rem solid var(--b1-medium);
@@ -207,7 +206,7 @@ pre,
 pre.highlight {
   line-height: 1.25;
   color: inherit;
-  border-radius: 1em;
+  border-radius: 0.5em;
   overflow: auto;
 }
 pre > code {

package/src/css/section.css

@@ -18,7 +18,6 @@
   align-self: flex-start;
   font-size: 0.9em;
   background: var(--b1-light);
-  border-radius: var(--content-border-radius);
   padding: 0.5rem var(--content-padding-x) 0.65rem;
   margin: 0 0 0 var(--space-x);
   box-sizing: border-box;
@@ -28,7 +27,6 @@
     width: 100%;
     font-size: inherit;
     border-top: 0.35em solid var(--b1);
-    border-radius: 0;
     padding: 0.25rem var(--content-padding-x) 0.35rem;
     margin: 0;
   }

package/src/types/Config.ts

@@ -1,6 +1,7 @@
 import type { EntryConfig } from "./EntryConfig";
 
 export type Config = EntryConfig & {
+  $schema?: string;
   targetId?: string;
   entries?: EntryConfig[];
 };

package/src/types/ContentInjectionTarget.ts

@@ -1 +1 @@
-export type ContentInjectionTarget = "head" | "body";
+export type ContentInjectionTarget = "head" | "body" | ":has-code";

package/src/types/EntryConfig.ts

@@ -59,5 +59,5 @@ export type EntryConfig = {
    */
   jsorg?: boolean | string;
   ymid?: number | string;
-  append?: ContentInjectionMap<"head" | "body">;
+  append?: ContentInjectionMap<"head" | "body" | ":has-code">;
 };