@canopycanopycanopy/b-ber-grammar-audio-video 1.2.16 → 2.0.2

package/dist/helpers.js

@@ -1,13 +1,10 @@
 "use strict";
 
 var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
-
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 _Object$defineProperty(exports, "__esModule", {
   value: true
 });
-
 exports.createIFrame = createIFrame;
 exports.createLocalMediaSources = void 0;
 exports.createMedia = createMedia;
@@ -15,83 +12,52 @@ exports.createMediaInline = createMediaInline;
 exports.getMediaType = exports.createRemoteMediaSource = void 0;
 exports.getWebOnlyAttributesString = getWebOnlyAttributesString;
 exports.validatePosterImage = exports.validateLocalMediaSource = exports.isHostedRemotely = exports.isHostedBySupportedThirdParty = void 0;
-
 var _indexOf = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/index-of"));
-
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
-
 var _reduce = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/reduce"));
-
 var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
-
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
 var _path = _interopRequireDefault(require("path"));
-
 var _mimeTypes = _interopRequireDefault(require("mime-types"));
-
 var _bBerLib = require("@canopycanopycanopy/b-ber-lib");
-
 var _bBerLogger = _interopRequireDefault(require("@canopycanopycanopy/b-ber-logger"));
-
 var _State = _interopRequireDefault(require("@canopycanopycanopy/b-ber-lib/State"));
-
 var _bBerGrammarAttributes = require("@canopycanopycanopy/b-ber-grammar-attributes");
-
 // import { getVideoAspectRatio } from '@canopycanopycanopy/b-ber-lib/utils'
+
 const getMediaType = type => {
   const index = (0, _indexOf.default)(type).call(type, '-');
   return index > -1 ? type.substring(0, index) : type;
 };
-
 exports.getMediaType = getMediaType;
-
 const isHostedRemotely = asset => /^http/.test(asset);
-
 exports.isHostedRemotely = isHostedRemotely;
-
 const isHostedBySupportedThirdParty = asset => asset.match(/(vimeo|youtube)\.com/);
-
 exports.isHostedBySupportedThirdParty = isHostedBySupportedThirdParty;
-
 const validatePosterImage = (_asset, type) => {
   const asset = _State.default.src.images(_asset);
-
   if (!_fsExtra.default.existsSync(asset)) {
     _bBerLogger.default.error(`bber-directives: Poster image for [${type}] does not exist`);
   }
-
   return asset;
 };
-
 exports.validatePosterImage = validatePosterImage;
-
 const validateLocalMediaSource = (asset, mediaType) => {
   var _context;
-
   const media = (0, _map.default)(_context = [..._State.default[mediaType]]).call(_context, file => (0, _bBerGrammarAttributes.toAlias)(file));
-
   if (!asset.length || (0, _indexOf.default)(media).call(media, asset) < 0) {
     _bBerLogger.default.error(`Could not find [${mediaType}] matching [${asset}], make sure it's included in the [_media] directory`);
   }
-
   return asset;
 };
-
 exports.validateLocalMediaSource = validateLocalMediaSource;
-
 const createLocalMediaSources = sources => (0, _reduce.default)(sources).call(sources, (acc, curr) => (0, _concat.default)(acc).call(acc, `<source src="../media/${_path.default.basename(curr)}" type="${_mimeTypes.default.lookup(curr)}"/>`), '');
-
 exports.createLocalMediaSources = createLocalMediaSources;
-
 const createRemoteMediaSource = sources => `<source src="${sources[0]}" type="${_mimeTypes.default.lookup(sources[0])}"/>`;
-
 exports.createRemoteMediaSource = createRemoteMediaSource;
-
 function getWebOnlyAttributesString() {
   return _State.default.build === 'web' || _State.default.build === 'reader' ? ' webkit-playsinline="webkit-playsinline" playsinline="playsinline"' : '';
 }
-
 function createMedia({
   id,
   href,
@@ -106,7 +72,6 @@ function createMedia({
       </figure>
     </div>`;
 }
-
 function createIFrame({
   commentStart,
   commentEnd,
@@ -123,7 +88,6 @@ function createIFrame({
       </section>
     ${commentEnd}`;
 }
-
 function createMediaInline({
   commentStart,
   commentEnd,

package/dist/index.js

@@ -1,42 +1,25 @@
 "use strict";
 
 var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
-
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 _Object$defineProperty(exports, "__esModule", {
   value: true
 });
-
 exports.default = void 0;
-
 var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
-
 var _trim = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/trim"));
-
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
-
 var _path = _interopRequireDefault(require("path"));
-
 var _lodash = _interopRequireDefault(require("lodash.has"));
-
 var _bBerLib = require("@canopycanopycanopy/b-ber-lib");
-
 var _State = _interopRequireDefault(require("@canopycanopycanopy/b-ber-lib/State"));
-
 var _bBerLogger = _interopRequireDefault(require("@canopycanopycanopy/b-ber-logger"));
-
 var _bBerShapesDirectives = require("@canopycanopycanopy/b-ber-shapes-directives");
-
 var _bBerParserFigure = _interopRequireDefault(require("@canopycanopycanopy/b-ber-parser-figure"));
-
 var _bBerGrammarAttributes = require("@canopycanopycanopy/b-ber-grammar-attributes");
-
 var _helpers = require("./helpers");
-
 const MARKER_RE = /^(video|audio)/;
 const DIRECTIVE_RE = /(audio(?:-inline)?|video(?:-inline)?)(?::([^\s]+)(\s+.*)?)?$/;
-
 function prepare({
   token,
   marker,
@@ -58,60 +41,48 @@ function prepare({
   let sourceElements = '';
   let err = null;
   let poster = '';
-  let provider = null; // eslint-disable-line no-unused-vars
-
+  // let provider = null
   let aspectRatio = '16x9';
   let aspectRatioClassName = '';
-
   if (attrsObject.poster) {
     poster = (0, _helpers.validatePosterImage)(attrsObject.poster, type);
     poster = `../images/${encodeURIComponent(_path.default.basename(poster))}`;
     attrsObject.poster = poster;
   }
-
   const {
     source
   } = attrsObject;
   if (!source) _bBerLogger.default.error(`Directive [${type}] requires a [source] attribute at [${fileName}:${lineNumber}]`);
-
   if (!(0, _lodash.default)(attrsObject, 'controls')) {
     // Add controls attr by default for audio and video
     attrsObject.controls = 'controls';
-  } // Allow for custom controls for reader and web builds where the value is a
+  }
+
+  // Allow for custom controls for reader and web builds where the value is a
   // string, all other builds set to `controls=controls` for epub validation.
   // The value `controls=no` gets stripped out in b-ber-grammar-attributes.
-
-
   if (_State.default.build !== 'reader' && _State.default.build !== 'web') {
     attrsObject.controls = attrsObject.controls === 'no' ? attrsObject.controls : 'controls';
   }
-
   if ((0, _helpers.isHostedRemotely)(source)) {
     const supportedThirdParty = (0, _helpers.isHostedBySupportedThirdParty)(source);
-
     if (supportedThirdParty) {
-      ;
-      [, provider] = supportedThirdParty;
+      // ;[, provider] = supportedThirdParty
       type = type.replace(/(audio|video)/, 'iframe'); // iframe, iframe-inline
     } else {
       sources = [source];
       sourceElements = (0, _helpers.createRemoteMediaSource)(sources);
     }
-
     _State.default.add('remoteAssets', source);
   } else if ((0, _helpers.validateLocalMediaSource)(source, mediaType)) {
     sources = (0, _filter.default)(media).call(media, a => (0, _bBerGrammarAttributes.toAlias)(a) === source);
     sourceElements = (0, _helpers.createLocalMediaSources)(sources);
   }
-
   if (!sources.length && type !== 'iframe' && type !== 'iframe-inline') {
     err = new Error(`bber-directives: Could not find matching [${mediaType}] with the basename [${source}]`);
-
     _bBerLogger.default.error(err);
   }
-
   delete attrsObject.source; // otherwise we get a `src` tag on our video element
-
   if (mediaType === 'audio') {
     delete attrsObject.poster; // invalid attr for audio elements
   }
@@ -123,6 +94,7 @@ function prepare({
     // const aspectRatioClassName = isHostedRemotely(source)
     //     ? getVideoAspectRatio()
     //     : getVideoAspectRatio(path.resolve(state.src.media(head(sources))))
+
     // Ensure an aspect ratio is set, default to 16:9
     const {
       aspectratio
@@ -131,15 +103,11 @@ function prepare({
     aspectRatioClassName = `video--${aspectRatio}`;
     delete attrsObject.aspectratio;
   }
-
   const figureId = (0, _bBerGrammarAttributes.htmlId)(id);
   const attrString = (0, _bBerGrammarAttributes.attributesString)(attrsObject);
   const webOnlyAttrString = (0, _helpers.getWebOnlyAttributesString)();
-
   const commentStart = _bBerLib.Html.comment(`START: ${mediaType}:${type}#${figureId};`);
-
   const commentEnd = _bBerLib.Html.comment(`END: ${mediaType}:${type}#${figureId};`);
-
   const page = `figure-${figureId}.xhtml`;
   const href = _State.default.build === 'reader' ? 'figures-titlepage.xhtml' : page;
   return {
@@ -164,13 +132,11 @@ function prepare({
     controls: attrsObject.controls
   };
 }
-
 const render = ({
   instance,
   context
 }) => (tokens, index) => {
   var _context;
-
   const token = tokens[index];
   const marker = (0, _trim.default)(_context = token.info).call(_context).match(DIRECTIVE_RE);
   if (!marker) return '';
@@ -185,28 +151,22 @@ const render = ({
     fileName,
     lineNumber
   });
-
   switch (type) {
     case 'iframe':
     case 'audio':
     case 'video':
       // Add it to state so that it's rendered as a `figure`
       _State.default.add('figures', args);
-
       return (0, _helpers.createMedia)(args);
-
     case 'iframe-inline':
       return (0, _helpers.createIFrame)(args);
-
     case 'audio-inline':
     case 'video-inline':
       return (0, _helpers.createMediaInline)(args);
-
     default:
       throw new Error(`Something went wrong parsing [${args.source}] in [${context.fileName}]`);
   }
 };
-
 var _default = {
   plugin: _bBerParserFigure.default,
   name: 'audio-video',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canopycanopycanopy/b-ber-grammar-audio-video",
-  "version": "1.2.16",
+  "version": "2.0.2",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -20,15 +20,16 @@
     "@babel/cli": "^7.10.5",
     "@babel/core": "^7.10.5",
     "@babel/preset-env": "^7.10.4",
+    "browserslist": "^4.17.4",
     "jest": "^26.6.3",
-    "rimraf": "^2.6.3"
+    "rimraf": "^2.7.1"
   },
   "dependencies": {
-    "@canopycanopycanopy/b-ber-grammar-attributes": "1.2.16",
-    "@canopycanopycanopy/b-ber-lib": "1.2.16",
-    "@canopycanopycanopy/b-ber-logger": "1.2.16",
-    "@canopycanopycanopy/b-ber-parser-figure": "1.2.16",
-    "@canopycanopycanopy/b-ber-shapes-directives": "1.2.16",
+    "@canopycanopycanopy/b-ber-grammar-attributes": "2.0.2",
+    "@canopycanopycanopy/b-ber-lib": "2.0.2",
+    "@canopycanopycanopy/b-ber-logger": "2.0.2",
+    "@canopycanopycanopy/b-ber-parser-figure": "2.0.2",
+    "@canopycanopycanopy/b-ber-shapes-directives": "2.0.2",
     "fs-extra": "^8.1.0",
     "lodash": "^4.17.21",
     "lodash.has": "latest",
@@ -52,5 +53,5 @@
       "url": "https://maxwellsimmer.com"
     }
   ],
-  "gitHead": "b4d9c563beb349a32c19e0f65447f7c7dbc8ea52"
+  "gitHead": "9b13185f21f602f8a2bf3a4cf503b1fd644d6432"
 }