@tblaisot/prez-as-adoc 0.0.2 → 0.0.3

package/README.adoc

@@ -19,12 +19,12 @@ prez-as-adoc --base_dir=./src --to_dir=./dist --slides-templates=./slide-templat
 [source,bash]
 ----
 // vite.config.js
-import { prezAsAdocPlugin } from '@tblaisot/prez-as-adoc/vitejs/plugins/prez-as-adoc-plugin.js'
+import { prezAsAdoc } from '@tblaisot/prez-as-adoc/vite-plugins'
 import { defineConfig } from 'vite'
 
 export default defineConfig({
     plugins: [
-        prezAsAdocPlugin({slidesTemplates: ['./slide-templates']})
+        prezAsAdoc({ slidesTemplates: ['./slide-templates'] })
     ]
 })
 ----

package/asciidoctor/extensions/index.js

@@ -0,0 +1,2 @@
+export * as slidesTreeprocessor from "./slides_treeprocessor.js";
+export * as speakerNotesTreeprocessor from "./speaker_notes_treeprocessor.js";

package/asciidoctor/templates/admonition.js

@@ -1,6 +1,5 @@
-const {HELPERS, TEMPLATES} = require("@tblaisot/asciidoctorjs-templates-js");
-const {admonition: admonition_template} = TEMPLATES;
-const {$aside} = HELPERS;
+const {admonition: admonition_template} = require("@tblaisot/asciidoctorjs-templates-js/templates");
+const {$aside} = require("@tblaisot/asciidoctorjs-templates-js/helpers");
 
 module.exports = function ({node}) {
     if (node.hasRole('speaker')) {

package/asciidoctor/templates/document.js

@@ -1,52 +1,51 @@
-const {HELPERS, TEMPLATES} = require("@tblaisot/asciidoctorjs-templates-js");
-const {$, $metaIf, toAttribute, toAttributes,isEmptyString} = HELPERS;
+const {$, $metaIf, toAttribute, toAttributes, isEmptyString} = require("@tblaisot/asciidoctorjs-templates-js/helpers");
 
 function getFavicon(node) {
-  let favicon = ''
-  if (node.document.hasAttribute('favicon')) {
-    let icon_href = node.document.getAttribute('favicon');
-    if (isEmptyString(icon_href)) {
-      icon_href = 'favicon.ico';
+    let favicon = ''
+    if (node.document.hasAttribute('favicon')) {
+        let icon_href = node.document.getAttribute('favicon');
+        if (isEmptyString(icon_href)) {
+            icon_href = 'favicon.ico';
+        }
+        const icon_ext = icon_href.split('.').pop();
+        const icon_type = icon_ext === 'ico' ? 'image/x-icon' : `image/${icon_ext}`;
+        favicon = $('link', {rel: "icon", type: icon_type, href: icon_href});
     }
-    const icon_ext = icon_href.split('.').pop();
-    const icon_type = icon_ext === 'ico' ? 'image/x-icon' : `image/${icon_ext}`;
-    favicon = $('link', {rel: "icon", type: icon_type, href: icon_href});
-  }
-  return favicon
+    return favicon
 }
 
 // false needs to be verbatim everything else is a string.
 // Calling side isn't responsible for quoting so we are doing it here
 function toValidSlideNumber(val) {
-  // corner case: empty is empty attribute which is true
-  if (val === "") {
-    return true;
-  }
-  // using toString here handles both the 'false' string and the false boolean
-  return val.toString() === 'false' ? false : `'${val}'`
+    // corner case: empty is empty attribute which is true
+    if (val === "") {
+        return true;
+    }
+    // using toString here handles both the 'false' string and the false boolean
+    return val.toString() === 'false' ? false : `'${val}'`
 }
 
 /**
  * Returns formatted style/link and script tags for header.
  */
 module.exports = function ({node}) {
-  const document_content = node.getContent();
-  let docinfo_content_header = node.getDocinfo('header', '.html');
-  let docinfo_content_head = node.getDocinfo('head', '.html');
-  let docinfo_content_footer = node.getDocinfo('footer', '.html');
+    const document_content = node.getContent();
+    let docinfo_content_header = node.getDocinfo('header', '.html');
+    let docinfo_content_head = node.getDocinfo('head', '.html');
+    let docinfo_content_footer = node.getDocinfo('footer', '.html');
 
 
-  if (node.getNoheader() || isEmptyString(docinfo_content_header)) {
-    docinfo_content_header = '';
-  }
-  if (isEmptyString(docinfo_content_footer)) {
-    docinfo_content_footer = '';
-  }
+    if (node.getNoheader() || isEmptyString(docinfo_content_header)) {
+        docinfo_content_header = '';
+    }
+    if (isEmptyString(docinfo_content_footer)) {
+        docinfo_content_footer = '';
+    }
 
-  const scripts=node.getAttribute('scripts', '').split(',').map(script => `<script type="module" src="${script}"></script>`)
-  const stylesheets=node.getAttribute('stylesheets', '').split(',').map(style => `<link rel="stylesheet" type="text/css" href="${style}">`)
+    const scripts = node.getAttribute('scripts', '').split(',').map(script => `<script type="module" src="${script}"></script>`)
+    const stylesheets = node.getAttribute('stylesheets', '').split(',').map(style => `<link rel="stylesheet" type="text/css" href="${style}">`)
 
-  return `
+    return `
 <!DOCTYPE html>
 <html ${toAttribute('lang', node.hasAttribute('nolang') ? '' : node.getAttribute('lang', 'en'))}>
 <head>
@@ -64,12 +63,12 @@ module.exports = function ({node}) {
     ${docinfo_content_head}
 </head>
 <body ${toAttributes({
-    id: node.getId(),
-    class: [
-      node.getAttribute('doctype'),
-      node.getAttribute('docrole') || node.getAttribute('role'),
-    ]
-  })}>
+        id: node.getId(),
+        class: [
+            node.getAttribute('doctype'),
+            node.getAttribute('docrole') || node.getAttribute('role'),
+        ]
+    })}>
 ${docinfo_content_header}
 <div class="slides">
         <!-- START CONTENT -->

package/asciidoctor/templates/index.cjs

@@ -0,0 +1,9 @@
+module.exports = {
+    admonition: require('./admonition.js'),
+    document: require('./document.js'),
+    preamble: require('./preamble.js'),
+    section: require('./section.js'),
+    slide: require('./slide.js'),
+    speaker_note: require('./speaker_note.js'),
+    title: require('./title.js'),
+}

package/asciidoctor/templates/preamble.js

@@ -1,11 +1,10 @@
-const {HELPERS, TEMPLATES} = require("@tblaisot/asciidoctorjs-templates-js");
-const {$section} = HELPERS;
+const {$section} = require("@tblaisot/asciidoctorjs-templates-js/helpers");
 
 module.exports = function ({node}) {
-  return $section({
-      id: 'preamble',
-      'aria-label': 'Preamble'
-    },
-    node.getContent()
-  );
+    return $section({
+            id: 'preamble',
+            'aria-label': 'Preamble'
+        },
+        node.getContent()
+    );
 }

package/asciidoctor/templates/section.js

@@ -1,29 +1,28 @@
-const {HELPERS, TEMPLATES} = require("@tblaisot/asciidoctor-js-templates");
-const {$h, $a, $section, sectionTitle,isDefined} = HELPERS;
+const {$h, $a, $section, sectionTitle, isDefined} = require("@tblaisot/asciidoctorjs-templates-js/helpers");
 
 module.exports = function ({node}) {
-  let content = '';
-  if (isDefined(node.getId())) {
-    if (node.document.hasAttribute('sectanchors')) {
-      content += $a({class: "anchor", href: `#${node.getId()}`, 'aria-hidden': "true"})
-    }
-    if (node.document.hasAttribute('sectlinks')) {
-      content += $a({class: "link", href: `#${node.getId()}`}, sectionTitle(node))
+    let content = '';
+    if (isDefined(node.getId())) {
+        if (node.document.hasAttribute('sectanchors')) {
+            content += $a({class: "anchor", href: `#${node.getId()}`, 'aria-hidden': "true"})
+        }
+        if (node.document.hasAttribute('sectlinks')) {
+            content += $a({class: "link", href: `#${node.getId()}`}, sectionTitle(node))
+        } else {
+            content += sectionTitle(node)
+        }
     } else {
-      content += sectionTitle(node)
+        content += sectionTitle(node)
     }
-  } else {
-    content += sectionTitle(node)
-  }
-  return $section({
-      class: ['doc-section', `level-${node.getLevel()}`, node.getRole()],
-    },
-    $h({
-        level: node.getLevel() + 1,
-        id: node.getId()
-      },
-      content
-    ),
-    node.getContent()
-  )
+    return $section({
+            class: ['doc-section', `level-${node.getLevel()}`, node.getRole()],
+        },
+        $h({
+                level: node.getLevel() + 1,
+                id: node.getId()
+            },
+            content
+        ),
+        node.getContent()
+    )
 }

package/asciidoctor/templates/slide.js

@@ -1,13 +1,12 @@
 const {resolve} = require("path");
 const {readFileSync, existsSync} = require("fs");
-const {HELPERS, TEMPLATES} = require("@tblaisot/asciidoctorjs-templates-js");
-const {$, isEmptyString} = HELPERS;
+const {$, isEmptyString} = require("@tblaisot/asciidoctorjs-templates-js/helpers");
 
 function resolveTemplate(paths, templateName) {
     // find in folders
-    for(let path of paths){
-        const templatePath = resolve(path,`${templateName}-slide.html`)
-        if(existsSync(templatePath)){
+    for (let path of paths) {
+        const templatePath = resolve(path, `${templateName}-slide.html`)
+        if (existsSync(templatePath)) {
             return readFileSync(templatePath, {encoding: 'utf-8'});
         }
     }

package/asciidoctor/templates/speaker_note.js

@@ -1,12 +1,11 @@
-const {HELPERS, TEMPLATES} = require("@tblaisot/asciidoctorjs-templates-js");
-const {$} = HELPERS;
+const {$} = require("@tblaisot/asciidoctorjs-templates-js/helpers");
 
 module.exports = function ({node}) {
-  return $('aside',
-    {
-      id: node.getId(),
-      class: ['speaker-notes'],
-    },
-    node.getBlocks().map(block => block.convert()).join('\n')
-  )
+    return $('aside',
+        {
+            id: node.getId(),
+            class: ['speaker-notes'],
+        },
+        node.getBlocks().map(block => block.convert()).join('\n')
+    )
 }

package/asciidoctor/templates/title.js

@@ -1,24 +1,20 @@
-const {HELPERS, TEMPLATES} = require("@tblaisot/asciidoctorjs-templates-js");
-const {$, $h, $a, isDefined, sectionTitle} = HELPERS;
+const {$h, $a, isDefined} = require("@tblaisot/asciidoctorjs-templates-js/helpers");
 
 module.exports = function ({node}) {
-  let content = '';
-  if (isDefined(node.getId())) {
-    if (node.document.hasAttribute('sectanchors')) {
-      content += $a({class: "anchor", href: `#${node.getId()}`, 'aria-hidden': "true"})
-    }
-    if (node.document.hasAttribute('sectlinks')) {
-      content += $a({class: "link", href: `#${node.getId()}`}, node.getContent())
+    let content = '';
+    if (isDefined(node.getId())) {
+        if (node.document.hasAttribute('sectanchors')) {
+            content += $a({class: "anchor", href: `#${node.getId()}`, 'aria-hidden': "true"})
+        }
+        if (node.document.hasAttribute('sectlinks')) {
+            content += $a({class: "link", href: `#${node.getId()}`}, node.getContent())
+        } else {
+            content += node.getContent()
+        }
     } else {
-      content += node.getContent()
+        content += node.getContent()
     }
-  } else {
-    content += node.getContent()
-  }
-  return $h({
-      level: node.getAttribute('level') + 1,
-      id: node.getId()
-    },
-    content
-  );
+    return $h({
+        level: node.getAttribute('level') + 1, id: node.getId()
+    }, content);
 }

package/bespoke-plugins/index.js

@@ -0,0 +1,9 @@
+export scale from './bespoke-scale.js';
+export nav from './bespoke-nav.js';
+export speaker from './bespoke-speaker.js';
+export classes from './bespoke-classes.js';
+export progress from './bespoke-progress.js';
+export debug from './bespoke-debug.js';
+export editor from './bespoke-editor.js';
+export hash from './bespoke-hash.js';
+export viewMode from './bespoke-view-mode.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tblaisot/prez-as-adoc",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "",
   "repository": {
     "type": "git",
@@ -11,11 +11,15 @@
     "prez-as-adoc": "bin/prez-as-adoc.js"
   },
   "exports": {
-    ".": {
-      "require": "./index.cjs",
-      "import": "./index.mjs"
+    "./asciidoctor-extensions": {
+      "import": "./asciidoctor/extensions/index.js"
     },
-    "./vitejs/plugins/prez-as-adoc-plugin.js": "./vitejs/plugins/prez-as-adoc-plugin.js"
+    "./vite-plugins": {
+      "import": "./vite-plugins/index.js"
+    },
+    "./bespoke-plugins": {
+      "import": "./bespoke-plugins/index.js"
+    }
   },
   "keywords": [
     "cli"
@@ -23,7 +27,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@tblaisot/asciidoctorjs-templates-js": "^0.0.1",
+    "@tblaisot/asciidoctorjs-templates-js": "^0.0.2",
     "arg": "^5.0.2",
     "node-html-parser": "^6.1.5",
     "vite": "^4.2.1"

package/vite-plugins/index.js

@@ -0,0 +1 @@
+export {prezAsAdoc} from './prez-as-adoc-plugin.js'

package/{vitejs/plugins → vite-plugins}/prez-as-adoc-plugin.js

@@ -2,12 +2,13 @@ import {HTMLElement, parse as parseHTML, TextNode} from 'node-html-parser';
 import {asciidoctor, BASE_OPTIONS, HELPERS, REGISTRY} from "@tblaisot/asciidoctorjs-templates-js";
 import * as path from "path";
 import * as url from 'url';
-import * as slidesTreeprocessor from "../../asciidoctor/extensions/slides_treeprocessor.js";
-import * as  speakerNotesTreeprocessor from "../../asciidoctor/extensions/speaker_notes_treeprocessor.js";
+import {slidesTreeprocessor, speakerNotesTreeprocessor} from "../asciidoctor/extensions/index.js";
 
 const {$, isEmptyString} = HELPERS;
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
 
+const ASCIIDOCTOR_TEMPLATES_PATH = '../asciidoctor/templates';
+
 slidesTreeprocessor.register(REGISTRY);
 speakerNotesTreeprocessor.register(REGISTRY);
 
@@ -53,7 +54,7 @@ function transformIndexHtml(
     const document = parseHTML(html);
 
 
-    const template_dirs = [...BASE_OPTIONS.template_dirs, path.resolve(__dirname, '../../asciidoctor/templates')]
+    const template_dirs = [...BASE_OPTIONS.template_dirs, path.resolve(__dirname, ASCIIDOCTOR_TEMPLATES_PATH)]
     if (asciidoctorTemplatesOverloads && asciidoctorTemplatesOverloads.length > 0) {
         asciidoctorTemplatesOverloads.forEach(overload => {
             template_dirs.push(path.resolve(process.cwd(), overload));
@@ -105,7 +106,7 @@ function transformIndexHtml(
     return document.toString();
 }
 
-export const prezAsAdocPlugin = (options) => {
+export const prezAsAdoc = (options) => {
     return {
         name: 'prez-as-adoc',
         transformIndexHtml: transformIndexHtml.bind(null, options),