Migrate html

lib/fs.js → lib/fs.mjs

@@ -1,19 +1,15 @@
 'use strict';
 
-var fs = require('fs');
-var path = require('path');
-var util = require('./utils/handlebarsUtils');
-var number = require('./number');
-var helpers = module.exports;
-const kindOf = require('kind-of');
-const isGlob = require('is-glob');
-const micromatch = require('micromatch');
+import { readFileSync, readdirSync, statSync } from 'fs';
+import { join } from 'path';
+import { isOptions } from './utils/handlebarsUtils';
+import { bytes } from './number';
 
-/**
- * Helper `fileSize` is deprecated. Use `helper.prettyBytes` instead.
- */
+import kindOf from 'kind-of';
+import isGlob from 'is-glob';
+import { matcher } from 'micromatch';
 
-helpers.fileSize = number.bytes;
+export const fileSize = bytes;
 
 /**
  * Read a file from the file system. This is useful in composing
@@ -28,9 +24,9 @@ helpers.fileSize = number.bytes;
  * @api public
  */
 
-helpers.read = function(filepath, options) {
-  return fs.readFileSync(filepath, 'utf8');
-};
+export function read(filepath, options) {
+  return readFileSync(filepath, 'utf8');
+}
 
 /**
  * Return an array of files from the given
@@ -41,12 +37,12 @@ helpers.read = function(filepath, options) {
  * @api public
  */
 
-helpers.readdir = function(dir, filter) {
-  var files = fs.readdirSync(dir);
+export function readdir(dir, filter) {
+  var files = readdirSync(dir);
   files = files.map(function(fp) {
-    return path.join(dir, fp);
+    return join(dir, fp);
   });
-  if (util.isOptions(filter)) {
+  if (isOptions(filter)) {
     return files;
   }
   if (typeof filter === 'function') {
@@ -58,13 +54,13 @@ helpers.readdir = function(dir, filter) {
     });
   }
   if (isGlob(filter)) {
-    return files.filter(micromatch.matcher(filter));
+    return files.filter(matcher(filter));
   }
   if (['isFile', 'isDirectory'].indexOf(filter) !== -1) {
     return files.filter(function(fp) {
-      var stat = fs.statSync(fp);
+      var stat = statSync(fp);
       return stat[filter]();
     });
   }
   return files;
-};
+}

lib/html.js → lib/html.mjs

@@ -1,11 +1,13 @@
 'use strict';
 
-var path = require('path');
-var util = require('./utils/handlebarsUtils');
-var html = require('./utils/html');
-var parseAttr = html.parseAttributes;
-var helpers = module.exports;
-const htmlTag = require('html-tag');
+import { extname, posix } from 'path';
+import handlebarsUtils from './utils/handlebarsUtils.js';
+import { parseAttributes, sanitize as htmlSanitize } from './utils/html.js';
+var parseAttr = parseAttributes;
+
+import htmlTag from 'html-tag';
+
+const { arrayify } = handlebarsUtils;
 
 /**
  * Stringify attributes on the options `hash`.
@@ -20,10 +22,10 @@ const htmlTag = require('html-tag');
  * @api public
  */
 
-helpers.attr = function(options) {
+export function attr(options) {
   var val = parseAttr((options && options.hash) || {});
   return val.trim() ? ' ' + val : '';
-};
+}
 
 /**
  * Add an array of `<link>` tags. Automatically resolves
@@ -42,37 +44,37 @@ helpers.attr = function(options) {
  * @api public
  */
 
-helpers.css = function(list, options) {
+export function css(list, options) {
   if (arguments.length < 2) {
     options = list;
     list = [];
   }
 
-  var styles = util.arrayify(list);
+  var styles = arrayify(list);
   var assets = '';
 
   if (this && this.options) {
     assets = this.options.assets || '';
   }
 
   if (options.hash.href) {
-    styles = util.arrayify(options.hash.href);
+    styles = arrayify(options.hash.href);
   }
 
   return styles.map(function(item) {
-    var ext = path.extname(item);
+    var ext = extname(item);
     var fp = item;
 
     if (!/(^\/\/)|(:\/\/)/.test(item)) {
-      fp = path.posix.join(assets, item);
+      fp = posix.join(assets, item);
     }
 
     if (ext === '.less') {
       return `<link type="text/css" rel="stylesheet/less" href="${fp}">`;
     }
     return `<link type="text/css" rel="stylesheet" href="${fp}">`;
   }).join('\n');
-};
+}
 
 /**
  * Generate one or more `<script></script>` tags with paths/urls to
@@ -86,7 +88,7 @@ helpers.css = function(list, options) {
  * @api public
  */
 
-helpers.js = function(context) {
+export function js(context) {
   if (typeof context === 'object' && context.hash) {
     var attr = parseAttr(context.hash);
     return `<script${attr ? ' ' + attr : ''}></script>`;
@@ -96,13 +98,13 @@ helpers.js = function(context) {
     return `<script src="${context}"></script>`;
   }
 
-  context = util.arrayify(context);
+  context = arrayify(context);
   return context.map(function(fp) {
-    return (path.extname(fp) === '.coffee')
+    return (extname(fp) === '.coffee')
       ? htmlTag('script', { type: 'text/coffeescript', src: fp })
       : htmlTag('script', { src: fp });
   }).join('\n');
-};
+}
 
 /**
  * Strip HTML tags from a string, so that only the text nodes
@@ -118,9 +120,9 @@ helpers.js = function(context) {
  * @api public
  */
 
-helpers.sanitize = function(str) {
-  return html.sanitize(str);
-};
+export function sanitize(str) {
+  return htmlSanitize(str);
+}
 
 /**
  * Block helper for creating unordered lists (`<ul></ul>`)
@@ -132,14 +134,14 @@ helpers.sanitize = function(str) {
  * @api public
  */
 
-helpers.ul = function(context, options) {
+export function ul(context, options) {
   return ('<ul ' + (parseAttr(options.hash)) + '>') + context.map(function(item) {
     if (typeof item !== 'string') {
       item = options.fn(item);
     }
     return '<li>' + item + '</li>';
   }).join('\n') + '</ul>';
-};
+}
 
 /**
  * Block helper for creating ordered lists  (`<ol></ol>`)
@@ -151,14 +153,14 @@ helpers.ul = function(context, options) {
  * @api public
  */
 
-helpers.ol = function(context, options) {
+export function ol(context, options) {
   return ('<ol ' + (parseAttr(options.hash)) + '>') + context.map(function(item) {
     if (typeof item !== 'string') {
       item = options.fn(item);
     }
     return '<li>' + item + '</li>';
   }).join('\n') + '</ol>';
-};
+}
 
 /**
  * Returns a `<figure>` with a thumbnail linked to a full picture
@@ -173,7 +175,7 @@ helpers.ol = function(context, options) {
  * @api public
  */
 
-helpers.thumbnailImage = function(context) {
+export function thumbnailImage(context) {
   var figure = '';
   var image = '';
 
@@ -215,4 +217,4 @@ helpers.thumbnailImage = function(context) {
 
   figure += '</figure>';
   return figure;
-};
+}

lib/index.mjs

@@ -4,7 +4,7 @@ import * as array from './array.mjs';
 import * as code from './code.mjs';
 import * as collection from './collection.mjs';
 import * as comparison from './comparison.mjs';
-import html from './html.js';
+import * as html from './html.mjs';
 import * as i18n from './i18n.mjs';
 import inflection from './inflection.js';
 import match from './match.js';