penrose 0.2.46 → 0.3.0

package/lib/__tests__/penrose.test.js

@@ -217,54 +217,4 @@ describe('Penrose', () => {
       await fs.remove(path.join(dir, 'data/files/styles'));
     });
   });
-
-  describe('createMathFile', () => {
-    test('Should create math files', async () => {
-      await fs.remove(path.join(dir, 'data/files/math'));
-
-      const math = [
-        {
-          data: 'E = mc^2',
-          format: 'tex'
-        }
-      ];
-
-      const tasks = [];
-      const expected = [];
-
-      _.forEach(math, function (value) {
-        const outputFormat = 'svg';
-        const task = {
-          input: value.data,
-          inputFormat: value.format,
-          outputFormat: outputFormat
-        };
-        const filename = penrose.getMathFilename(task);
-        task.output = penrose.getMathPath(outputFormat, filename);
-
-        tasks.push(task);
-
-        expected.push(
-          path.join(config.schemes.public.path, 'math/svg', filename)
-        );
-      });
-
-      await Promise.mapSeries(tasks, function (task) {
-        return penrose.createMathFile(task);
-      });
-
-      const actual = await multiGlob(
-        _.map(config.schemes, function (scheme) {
-          return scheme.path + 'math/**/*';
-        }),
-        {
-          nodir: true
-        }
-      );
-
-      expect(actual).toEqual(expected);
-
-      await fs.remove(path.join(dir, 'data/files/math'));
-    });
-  });
 });

package/lib/penrose.js

@@ -1,15 +1,10 @@
 const _ = require('lodash');
 const chalk = require('chalk');
-const cheerio = require('cheerio');
-const crypto = require('crypto');
 const fs = require('fs-extra');
-const mathjax = require('mathjax-node/lib/mj-single.js');
 const path = require('path');
-const pkg = require('../package.json');
 const Promise = require('bluebird');
 const replaceExt = require('replace-ext');
 const sharp = require('sharp');
-const stringify = require('fast-json-stable-stringify');
 
 /**
  * Constants
@@ -20,10 +15,6 @@ const JPEG = 'jpeg';
 const PNG = 'png';
 const SVG = 'svg';
 const WEBP = 'webp';
-const TEX = 'tex';
-const INLINE_TEX = 'inline-tex';
-const ASCIIMATH = 'asciimath';
-const MATHML = 'mathml';
 const RESIZE = 'resize';
 
 const EXTNAME_FORMAT_MAP = {
@@ -39,13 +30,6 @@ const FORMAT_EXTNAME_MAP = {
   [WEBP]: 'webp'
 };
 
-const MATHJAX_FORMAT_MAP = {
-  [TEX]: 'TeX',
-  [INLINE_TEX]: 'inline-TeX',
-  [ASCIIMATH]: 'AsciiMath',
-  [MATHML]: 'MathML'
-};
-
 const JPEG_OPTIONS = [
   'quality',
   'progressive',
@@ -89,57 +73,6 @@ const RESIZE_OPTIONS = [
 
 Promise.promisifyAll(fs);
 
-/**
- *
- * @param   {string} value
- * @param   {number} ex
- * @returns {number}
- */
-function exToPx(value, ex) {
-  const match = value.match(/^(.+)ex$/i);
-
-  if (match) {
-    return Number(match[1]) * ex;
-  }
-
-  return Number(value);
-}
-
-/**
- *
- * @param   {Object} args
- * @returns {Promise}
- */
-function typesetMath(args) {
-  const format = MATHJAX_FORMAT_MAP[args.inputFormat];
-
-  if (_.isUndefined(format)) {
-    throw new Error('Input format `' + args.inputFormat + '` is not supported');
-  }
-
-  if (!~[SVG].indexOf(args.outputFormat)) {
-    throw new Error(
-      'Output format `' + args.outputFormat + '` is not supported'
-    );
-  }
-
-  return new Promise((resolve, reject) => {
-    const config = _.assign(_.pick(args, ['ex', 'width']), {
-      math: args.input,
-      format: format,
-      svg: true
-    });
-
-    mathjax.typeset(config, (result) => {
-      if (result.errors) {
-        reject(result.errors);
-      } else {
-        resolve(result);
-      }
-    });
-  });
-}
-
 /**
  *
  * @param   {Object} config
@@ -147,30 +80,8 @@ function typesetMath(args) {
  */
 function Penrose(config) {
   this.config = {
-    ...config,
-    math: {
-      displayErrors: false,
-      displayMessages: false,
-      undefinedCharError: false,
-      MathJax: {
-        SVG: {
-          font: 'TeX'
-        }
-      },
-      ex: 6, // ex-size in pixels
-      width: 100, // Width of container (in ex) for linebreaking and tags
-      ...config.math
-    }
+    ...config
   };
-
-  mathjax.config(
-    _.pick(this.config.math, [
-      'displayErrors',
-      'displayMessages',
-      'undefinedCharError',
-      'MathJax'
-    ])
-  );
 }
 
 Penrose.prototype = {
@@ -234,140 +145,7 @@ Penrose.prototype = {
       return transformer.toFile(distPath).then(() => distPath);
     });
   },
-  /**
-   *
-   * @param   {Object} args
-   * @returns {Promise}
-   */
-  createMath: function (args) {
-    console.log('Typesetting math', chalk.cyan(args.input));
-
-    const config = _.assign(
-      _.pick(this.config.math, ['ex', 'width']),
-      _.pick(args, ['input', 'inputFormat', 'outputFormat', 'ex', 'width'])
-    );
-
-    if (SVG === config.outputFormat) {
-      return typesetMath(config).then((result) => {
-        const $svg = cheerio.load(result.svg)('svg');
-        const width = Math.ceil(exToPx($svg.attr('width'), config.ex));
-        const height = Math.ceil(exToPx($svg.attr('height'), config.ex));
-
-        return Promise.resolve({
-          data: result.svg,
-          width: width,
-          height: height
-        });
-      });
-    }
-
-    throw new Error(
-      'Output format `' + config.outputFormat + '` is not supported'
-    );
-  },
-  /**
-   *
-   * @param   {Object} args
-   * @returns {Promise}
-   */
-  createMathDataURIBase64: function (args) {
-    console.log('Typesetting math', chalk.cyan(args.input));
-
-    const config = _.assign(
-      _.pick(this.config.math, ['ex', 'width']),
-      _.pick(args, ['input', 'inputFormat', 'outputFormat', 'ex', 'width'])
-    );
-
-    if (SVG === config.outputFormat) {
-      return typesetMath(config).then((result) => {
-        const buffer = Buffer.from(result.svg, 'utf-8');
 
-        return Promise.resolve(
-          'data:image/svg+xml;base64,' + buffer.toString('base64')
-        );
-      });
-    }
-
-    if (PNG === config.outputFormat) {
-      config.outputFormat = SVG;
-
-      return typesetMath(config)
-        .then((result) => {
-          const buffer = Buffer.from(result.svg, 'utf-8');
-          const $svg = cheerio.load(result.svg)('svg');
-          const width = Math.ceil(exToPx($svg.attr('width'), config.ex));
-          const height = Math.ceil(exToPx($svg.attr('height'), config.ex));
-          const resize = {
-            width: width,
-            height: height
-          };
-
-          return sharp(buffer).resize(resize).toBuffer();
-        })
-        .then((buffer) =>
-          Promise.resolve('data:image/png;base64,' + buffer.toString('base64'))
-        );
-    }
-
-    throw new Error(
-      'Output format `' + config.outputFormat + '` is not supported'
-    );
-  },
-  /**
-   *
-   * @param   {Object} args
-   * @returns {Promise}
-   */
-  createMathFile: function (args) {
-    console.log('Typesetting math', chalk.cyan(args.input));
-
-    const config = _.assign(
-      _.pick(this.config.math, ['ex', 'width']),
-      _.pick(args, [
-        'input',
-        'inputFormat',
-        'output',
-        'outputFormat',
-        'ex',
-        'width'
-      ])
-    );
-    const outputResolved = this.resolvePath(config.output);
-
-    if (SVG === config.outputFormat) {
-      return fs
-        .mkdirp(path.dirname(outputResolved))
-        .then(() => typesetMath(config))
-        .then((result) =>
-          fs.writeFileAsync(outputResolved, result.svg, 'utf-8')
-        );
-    }
-
-    if (PNG === config.outputFormat) {
-      config.outputFormat = SVG;
-
-      return fs
-        .mkdirp(path.dirname(outputResolved))
-        .then(() => typesetMath(config))
-        .then((result) => {
-          const buffer = Buffer.from(result.svg, 'utf-8');
-          const $svg = cheerio.load(result.svg)('svg');
-          const width = Math.ceil(exToPx($svg.attr('width'), config.ex));
-          const height = Math.ceil(exToPx($svg.attr('height'), config.ex));
-          const resize = {
-            width: width,
-            height: height
-          };
-
-          return sharp(buffer).resize(resize).toBuffer();
-        })
-        .then((buffer) => fs.writeFileAsync(outputResolved, buffer));
-    }
-
-    throw new Error(
-      'Output format `' + config.outputFormat + '` is not supported'
-    );
-  },
   /**
    *
    * @param   {string} uri
@@ -382,6 +160,7 @@ Penrose.prototype = {
 
     return uri.substring(0, index);
   },
+
   /**
    *
    * @param   {string} uri
@@ -391,6 +170,7 @@ Penrose.prototype = {
   setScheme: function (uri, scheme) {
     return scheme + '://' + this.getTarget(uri);
   },
+
   /**
    *
    * @param   {string} uri
@@ -405,6 +185,7 @@ Penrose.prototype = {
 
     return uri.substring(index + 3);
   },
+
   /**
    * Returns absolute URL.
    *
@@ -420,6 +201,7 @@ Penrose.prototype = {
 
     return uri;
   },
+
   /**
    *
    * @param   {string} uri
@@ -443,6 +225,7 @@ Penrose.prototype = {
 
     return schemePath + target;
   },
+
   /**
    *
    * @param   {string} styleName
@@ -467,6 +250,7 @@ Penrose.prototype = {
 
     return scheme + '://styles/' + styleName + '/' + target;
   },
+
   /**
    * Returns absolute URL to derivative image.
    *
@@ -483,75 +267,6 @@ Penrose.prototype = {
       return '/' + this.resolvePath(uri);
     }
 
-    throw new Error('Scheme `' + scheme + '` not supported');
-  },
-  /**
-   *
-   * @param   {Object} args
-   * @returns {string}
-   */
-  getMathDigest: function (args) {
-    const config = _.assign(
-      _.pick(this.config.math, ['ex', 'width']),
-      _.pick(args, ['ex', 'width'])
-    );
-
-    const data =
-      pkg.version + ';' + stringify(config) + ';' + args.input.trim();
-
-    return crypto.createHash('md5').update(data).digest('hex');
-  },
-  /**
-   *
-   * @param   {Object} args
-   * @returns {string}
-   */
-  getMathFilename: function (args) {
-    let ext;
-
-    if (SVG === args.outputFormat) {
-      ext = '.svg';
-    } else if (PNG === args.outputFormat) {
-      ext = '.png';
-    } else {
-      throw new Error('Format `' + args.outputFormat + '` is not supported');
-    }
-
-    return this.getMathDigest(args) + ext;
-  },
-  /**
-   *
-   * @param   {string} outputFormat
-   * @param   {string} uri
-   * @returns {string}
-   */
-  getMathPath: function (outputFormat, uri) {
-    let scheme = this.getScheme(uri);
-    let target;
-
-    if (_.isUndefined(scheme)) {
-      scheme = PUBLIC;
-      target = uri;
-    } else {
-      target = this.getTarget(uri);
-    }
-
-    return scheme + '://math/' + outputFormat + '/' + target;
-  },
-  /**
-   *
-   * @param   {string} outputFormat
-   * @param   {string} path
-   * @returns {string}
-   */
-  getMathURL: function (outputFormat, path) {
-    const uri = this.getMathPath(outputFormat, path);
-    const scheme = this.getScheme(uri);
-
-    if (PUBLIC === scheme || TEMPORARY === scheme) {
-      return '/' + this.resolvePath(uri);
-    }
-
     throw new Error('Scheme `' + scheme + '` not supported');
   }
 };
@@ -561,10 +276,6 @@ module.exports = {
   PNG,
   SVG,
   WEBP,
-  TEX,
-  INLINE_TEX,
-  ASCIIMATH,
-  MATHML,
   RESIZE,
   PUBLIC,
   TEMPORARY,

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "penrose",
-  "version": "0.2.46",
+  "version": "0.3.0",
   "description": "Build derivative images",
   "main": "lib/penrose.js",
   "repository": {
     "type": "git",
-    "url": "git://github.com/netbek/penrose"
+    "url": "git://github.com/netbek/penrose.git"
   },
   "scripts": {
     "test": "vitest run"
@@ -27,14 +27,10 @@
     "babel-plugin-transform-class-properties": "6.24.1",
     "bluebird": "3.7.2",
     "chalk": "4.1.2",
-    "cheerio": "1.2.0",
-    "fast-json-stable-stringify": "2.1.0",
     "fs-extra": "11.3.5",
     "glob-promise": "6.0.7",
     "lodash": "4.18.1",
     "lodash-webpack-plugin": "0.11.6",
-    "mathjax": "2.7.9",
-    "mathjax-node": "0.5.2",
     "phantomjs-prebuilt": "2.1.16",
     "prettier": "3.8.3",
     "replace-ext": "2.0.0",