@rindo/core 1.17.4 → 2.5.2

package/screenshot/index.js

@@ -1,20 +1,22 @@
 'use strict';
 
-function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
 
-var fs = _interopDefault(require('fs'));
-var path = require('path');
-var path__default = _interopDefault(path);
-var os = require('os');
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+const fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
+const path__default = /*#__PURE__*/_interopDefaultLegacy(path);
 
 function fileExists(filePath) {
     return new Promise(resolve => {
-        fs.access(filePath, (err) => resolve(!err));
+        fs__default['default'].access(filePath, (err) => resolve(!err));
     });
 }
 function readFile(filePath) {
     return new Promise((resolve, reject) => {
-        fs.readFile(filePath, 'utf-8', (err, data) => {
+        fs__default['default'].readFile(filePath, 'utf-8', (err, data) => {
             if (err) {
                 reject(err);
             }
@@ -26,7 +28,7 @@ function readFile(filePath) {
 }
 function readFileBuffer(filePath) {
     return new Promise((resolve, reject) => {
-        fs.readFile(filePath, (err, data) => {
+        fs__default['default'].readFile(filePath, (err, data) => {
             if (err) {
                 reject(err);
             }
@@ -38,7 +40,7 @@ function readFileBuffer(filePath) {
 }
 function writeFile(filePath, data) {
     return new Promise((resolve, reject) => {
-        fs.writeFile(filePath, data, (err) => {
+        fs__default['default'].writeFile(filePath, data, (err) => {
             if (err) {
                 reject(err);
             }
@@ -50,14 +52,14 @@ function writeFile(filePath, data) {
 }
 function mkDir(filePath) {
     return new Promise(resolve => {
-        fs.mkdir(filePath, () => {
+        fs__default['default'].mkdir(filePath, () => {
             resolve();
         });
     });
 }
 function rmDir(filePath) {
     return new Promise(resolve => {
-        fs.rmdir(filePath, () => {
+        fs__default['default'].rmdir(filePath, () => {
             resolve();
         });
     });
@@ -65,7 +67,7 @@ function rmDir(filePath) {
 async function emptyDir(dir) {
     const files = await readDir(dir);
     const promises = files.map(async (fileName) => {
-        const filePath = path__default.join(dir, fileName);
+        const filePath = path__default['default'].join(dir, fileName);
         const isDirFile = await isFile(filePath);
         if (isDirFile) {
             await unlink(filePath);
@@ -75,7 +77,7 @@ async function emptyDir(dir) {
 }
 async function readDir(dir) {
     return new Promise(resolve => {
-        fs.readdir(dir, (err, files) => {
+        fs__default['default'].readdir(dir, (err, files) => {
             if (err) {
                 resolve([]);
             }
@@ -87,7 +89,7 @@ async function readDir(dir) {
 }
 async function isFile(itemPath) {
     return new Promise(resolve => {
-        fs.stat(itemPath, (err, stat) => {
+        fs__default['default'].stat(itemPath, (err, stat) => {
             if (err) {
                 resolve(false);
             }
@@ -99,7 +101,7 @@ async function isFile(itemPath) {
 }
 async function unlink(filePath) {
     return new Promise(resolve => {
-        fs.unlink(filePath, () => {
+        fs__default['default'].unlink(filePath, () => {
             resolve();
         });
     });
@@ -120,7 +122,8 @@ class ScreenshotConnector {
         this.buildAuthor = opts.buildAuthor;
         this.buildUrl = opts.buildUrl;
         this.previewUrl = opts.previewUrl;
-        (this.buildTimestamp = typeof opts.buildTimestamp === 'number' ? opts.buildTimestamp : Date.now()), (this.cacheDir = opts.cacheDir);
+        (this.buildTimestamp = typeof opts.buildTimestamp === 'number' ? opts.buildTimestamp : Date.now()),
+            (this.cacheDir = opts.cacheDir);
         this.packageDir = opts.packageDir;
         this.rootDir = opts.rootDir;
         this.appNamespace = opts.appNamespace;
@@ -168,7 +171,12 @@ class ScreenshotConnector {
         this.logger.debug(`currentBuildDir: ${this.currentBuildDir}`);
         this.logger.debug(`cacheDir: ${this.cacheDir}`);
         await mkDir(this.screenshotDir);
-        await Promise.all([mkDir(this.imagesDir), mkDir(this.buildsDir), mkDir(this.currentBuildDir), mkDir(this.cacheDir)]);
+        await Promise.all([
+            mkDir(this.imagesDir),
+            mkDir(this.buildsDir),
+            mkDir(this.currentBuildDir),
+            mkDir(this.cacheDir),
+        ]);
     }
     async pullMasterBuild() {
         /**/
@@ -182,7 +190,9 @@ class ScreenshotConnector {
         return masterBuild;
     }
     async completeBuild(masterBuild) {
-        const filePaths = (await readDir(this.currentBuildDir)).map(f => path.join(this.currentBuildDir, f)).filter(f => f.endsWith('.json'));
+        const filePaths = (await readDir(this.currentBuildDir))
+            .map(f => path.join(this.currentBuildDir, f))
+            .filter(f => f.endsWith('.json'));
         const screenshots = await Promise.all(filePaths.map(async (f) => JSON.parse(await readFile(f))));
         this.sortScreenshots(screenshots);
         if (!masterBuild) {
@@ -441,7 +451,11 @@ const normalizePath = (path) => {
     if (normalized === '') {
         return '.';
     }
-    if (rootPart === '' && secondPart && path.includes('/') && !secondPart.startsWith('.') && !secondPart.startsWith('@')) {
+    if (rootPart === '' &&
+        secondPart &&
+        path.includes('/') &&
+        !secondPart.startsWith('.') &&
+        !secondPart.startsWith('@')) {
         return './' + normalized;
     }
     return normalized;
@@ -512,7 +526,9 @@ const getEncodedRootLength = (path) => {
             // special case interpreted as "the machine from which the URL is being interpreted".
             const scheme = path.slice(0, schemeEnd);
             const authority = path.slice(authorityStart, authorityEnd);
-            if (scheme === 'file' && (authority === '' || authority === 'localhost') && isVolumeCharacter(path.charCodeAt(authorityEnd + 1))) {
+            if (scheme === 'file' &&
+                (authority === '' || authority === 'localhost') &&
+                isVolumeCharacter(path.charCodeAt(authorityEnd + 1))) {
                 const volumeSeparatorEnd = getFileUrlVolumeSeparatorEnd(path, authorityEnd + 2);
                 if (volumeSeparatorEnd !== -1) {
                     if (path.charCodeAt(volumeSeparatorEnd) === 47 /* slash */) {
@@ -533,7 +549,8 @@ const getEncodedRootLength = (path) => {
     // relative
     return 0;
 };
-const isVolumeCharacter = (charCode) => (charCode >= 97 /* a */ && charCode <= 122 /* z */) || (charCode >= 65 /* A */ && charCode <= 90 /* Z */);
+const isVolumeCharacter = (charCode) => (charCode >= 97 /* a */ && charCode <= 122 /* z */) ||
+    (charCode >= 65 /* A */ && charCode <= 90 /* Z */);
 const getFileUrlVolumeSeparatorEnd = (url, start) => {
     const ch0 = url.charCodeAt(start);
     if (ch0 === 58 /* colon */)
@@ -610,31 +627,31 @@ class ScreenshotLocalConnector extends ScreenshotConnector {
     }
 }
 function createLocalCompareApp(namespace, appSrcUrl, imagesUrl, jsonpUrl, a, b) {
-    return `<!doctype html>
-<html dir="ltr" lang="en">
-<head>
-  <meta charset="utf-8">
-  <title>Local ${namespace || ''} - Rindo Screenshot Visual Diff</title>
-  <meta name="viewport" content="viewport-fit=cover, width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <meta http-equiv="x-ua-compatible" content="IE=Edge">
-  <link href="${appSrcUrl}/build/app.css" rel="stylesheet">
-  <script type="module" src="${appSrcUrl}/build/app.esm.js"></script>
-  <script nomodule src="${appSrcUrl}/build/app.js"></script>
-  <link rel="icon" type="image/x-icon" href="${appSrcUrl}/assets/favicon.ico">
-</head>
-<body>
-  <script>
-    (function() {
-      var app = document.createElement('screenshot-compare');
-      app.appSrcUrl = '${appSrcUrl}';
-      app.imagesUrl = '${imagesUrl}/';
-      app.jsonpUrl = '${jsonpUrl}/';
-      app.a = ${JSON.stringify(a)};
-      app.b = ${JSON.stringify(b)};
-      document.body.appendChild(app);
-    })();
-  </script>
-</body>
+    return `<!doctype html>
+<html dir="ltr" lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>Local ${namespace || ''} - Rindo Screenshot Visual Diff</title>
+  <meta name="viewport" content="viewport-fit=cover, width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
+  <meta http-equiv="x-ua-compatible" content="IE=Edge">
+  <link href="${appSrcUrl}/build/app.css" rel="stylesheet">
+  <script type="module" src="${appSrcUrl}/build/app.esm.js"></script>
+  <script nomodule src="${appSrcUrl}/build/app.js"></script>
+  <link rel="icon" type="image/x-icon" href="${appSrcUrl}/assets/favicon.ico">
+</head>
+<body>
+  <script>
+    (function() {
+      var app = document.createElement('screenshot-compare');
+      app.appSrcUrl = '${appSrcUrl}';
+      app.imagesUrl = '${imagesUrl}/';
+      app.jsonpUrl = '${jsonpUrl}/';
+      app.a = ${JSON.stringify(a)};
+      app.b = ${JSON.stringify(b)};
+      document.body.appendChild(app);
+    })();
+  </script>
+</body>
 </html>`;
 }
 

package/screenshot/package.json

@@ -1,8 +1,15 @@
 {
   "name": "@rindo/core/screenshot",
-  "version": "0.0.0-dev.20221104122636",
+  "version": "2.5.2",
   "description": "Rindo Screenshot.",
-  "main": "index.js",
-  "types": "index.d.ts",
+  "main": "./index.js",
+  "types": "./index.d.ts",
+  "files": [
+    "compare/",
+    "index.js",
+    "connector.js",
+    "local-connector.js",
+    "pixel-match.js"
+  ],
   "private": true
 }

package/screenshot/pixel-match.js

@@ -1,13 +1,20 @@
 'use strict';
 
-function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
-
-var fs = _interopDefault(require('fs'));
-var util = _interopDefault(require('util'));
-var stream = _interopDefault(require('stream'));
-var zlib = _interopDefault(require('zlib'));
-var assert = _interopDefault(require('assert'));
-var buffer = _interopDefault(require('buffer'));
+var fs = require('fs');
+var util = require('util');
+var Stream = require('stream');
+var zlib = require('zlib');
+var require$$0 = require('assert');
+var require$$1 = require('buffer');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
+var util__default = /*#__PURE__*/_interopDefaultLegacy(util);
+var Stream__default = /*#__PURE__*/_interopDefaultLegacy(Stream);
+var zlib__default = /*#__PURE__*/_interopDefaultLegacy(zlib);
+var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);
+var require$$1__default = /*#__PURE__*/_interopDefaultLegacy(require$$1);
 
 var pixelmatch_1 = pixelmatch;
 
@@ -168,11 +175,11 @@ function grayPixel(img, i) {
 
 function createCommonjsModule(fn, basedir, module) {
 	return module = {
-	  path: basedir,
-	  exports: {},
-	  require: function (path, base) {
-      return commonjsRequire(path, (base === undefined || base === null) ? module.path : base);
-    }
+		path: basedir,
+		exports: {},
+		require: function (path, base) {
+			return commonjsRequire(path, (base === undefined || base === null) ? module.path : base);
+		}
 	}, fn(module, module.exports), module.exports;
 }
 
@@ -188,7 +195,7 @@ var chunkstream = createCommonjsModule(function (module) {
 
 
 var ChunkStream = module.exports = function() {
-  stream.call(this);
+  Stream__default['default'].call(this);
 
   this._buffers = [];
   this._buffered = 0;
@@ -199,7 +206,7 @@ var ChunkStream = module.exports = function() {
   this._encoding = 'utf8';
   this.writable = true;
 };
-util.inherits(ChunkStream, stream);
+util__default['default'].inherits(ChunkStream, Stream__default['default']);
 
 
 ChunkStream.prototype.read = function(length, callback) {
@@ -695,7 +702,7 @@ var FilterAsync = module.exports = function(bitmapInfo) {
 
   this._filter.start();
 };
-util.inherits(FilterAsync, chunkstream);
+util__default['default'].inherits(FilterAsync, chunkstream);
 });
 
 var constants = {
@@ -1450,7 +1457,7 @@ var ParserAsync = module.exports = function(options) {
 
   this._parser.start();
 };
-util.inherits(ParserAsync, chunkstream);
+util__default['default'].inherits(ParserAsync, chunkstream);
 
 
 ParserAsync.prototype._handleError = function(err) {
@@ -1479,7 +1486,7 @@ ParserAsync.prototype._handleError = function(err) {
 ParserAsync.prototype._inflateData = function(data) {
   if (!this._inflate) {
     if (this._bitmapInfo.interlace) {
-      this._inflate = zlib.createInflate();
+      this._inflate = zlib__default['default'].createInflate();
 
       this._inflate.on('error', this.emit.bind(this, 'error'));
       this._filter.on('complete', this._complete.bind(this));
@@ -1489,9 +1496,9 @@ ParserAsync.prototype._inflateData = function(data) {
     else {
       var rowSize = ((this._bitmapInfo.width * this._bitmapInfo.bpp * this._bitmapInfo.depth + 7) >> 3) + 1;
       var imageSize = rowSize * this._bitmapInfo.height;
-      var chunkSize = Math.max(imageSize, zlib.Z_MIN_CHUNK);
+      var chunkSize = Math.max(imageSize, zlib__default['default'].Z_MIN_CHUNK);
 
-      this._inflate = zlib.createInflate({ chunkSize: chunkSize });
+      this._inflate = zlib__default['default'].createInflate({ chunkSize: chunkSize });
       var leftToInflate = imageSize;
 
       var emitError = this.emit.bind(this, 'error');
@@ -1928,7 +1935,7 @@ var Packer = module.exports = function(options) {
   options.deflateLevel = options.deflateLevel != null ? options.deflateLevel : 9;
   options.deflateStrategy = options.deflateStrategy != null ? options.deflateStrategy : 3;
   options.inputHasAlpha = options.inputHasAlpha != null ? options.inputHasAlpha : true;
-  options.deflateFactory = options.deflateFactory || zlib.createDeflate;
+  options.deflateFactory = options.deflateFactory || zlib__default['default'].createDeflate;
   options.bitDepth = options.bitDepth || 8;
   // This is outputColorType
   options.colorType = (typeof options.colorType === 'number') ? options.colorType : constants.COLORTYPE_COLOR_ALPHA;
@@ -2030,7 +2037,7 @@ var packerAsync = createCommonjsModule(function (module) {
 
 
 var PackerAsync = module.exports = function(opt) {
-  stream.call(this);
+  Stream__default['default'].call(this);
 
   var options = opt || {};
 
@@ -2039,7 +2046,7 @@ var PackerAsync = module.exports = function(opt) {
 
   this.readable = true;
 };
-util.inherits(PackerAsync, stream);
+util__default['default'].inherits(PackerAsync, Stream__default['default']);
 
 
 PackerAsync.prototype.pack = function(data, width, height, gamma) {
@@ -2071,22 +2078,22 @@ PackerAsync.prototype.pack = function(data, width, height, gamma) {
 
 var syncInflate = createCommonjsModule(function (module, exports) {
 
-var assert$1 = assert.ok;
+var assert = require$$0__default['default'].ok;
 
 
 
-var kMaxLength = buffer.kMaxLength;
+var kMaxLength = require$$1__default['default'].kMaxLength;
 
 function Inflate(opts) {
   if (!(this instanceof Inflate)) {
     return new Inflate(opts);
   }
 
-  if (opts && opts.chunkSize < zlib.Z_MIN_CHUNK) {
-    opts.chunkSize = zlib.Z_MIN_CHUNK;
+  if (opts && opts.chunkSize < zlib__default['default'].Z_MIN_CHUNK) {
+    opts.chunkSize = zlib__default['default'].Z_MIN_CHUNK;
   }
 
-  zlib.Inflate.call(this, opts);
+  zlib__default['default'].Inflate.call(this, opts);
 
   // Node 8 --> 9 compatibility check
   this._offset = this._offset === undefined ? this._outOffset : this._offset;
@@ -2117,7 +2124,7 @@ function _close(engine, callback) {
 
 Inflate.prototype._processChunk = function(chunk, flushFlag, asyncCb) {
   if (typeof asyncCb === 'function') {
-    return zlib.Inflate._processChunk.call(this, chunk, flushFlag, asyncCb);
+    return zlib__default['default'].Inflate._processChunk.call(this, chunk, flushFlag, asyncCb);
   }
 
   var self = this;
@@ -2141,7 +2148,7 @@ Inflate.prototype._processChunk = function(chunk, flushFlag, asyncCb) {
     }
 
     var have = availOutBefore - availOutAfter;
-    assert$1(have >= 0, 'have should not go down');
+    assert(have >= 0, 'have should not go down');
 
     if (have > 0) {
       var out = self._buffer.slice(self._offset, self._offset + have);
@@ -2176,7 +2183,7 @@ Inflate.prototype._processChunk = function(chunk, flushFlag, asyncCb) {
     return false;
   }
 
-  assert$1(this._handle, 'zlib binding closed');
+  assert(this._handle, 'zlib binding closed');
   do {
     var res = this._handle.writeSync(flushFlag,
       chunk, // in
@@ -2204,7 +2211,7 @@ Inflate.prototype._processChunk = function(chunk, flushFlag, asyncCb) {
   return buf;
 };
 
-util.inherits(Inflate, zlib.Inflate);
+util__default['default'].inherits(Inflate, zlib__default['default'].Inflate);
 
 function zlibBufferSync(engine, buffer) {
   if (typeof buffer === 'string') {
@@ -2216,7 +2223,7 @@ function zlibBufferSync(engine, buffer) {
 
   var flushFlag = engine._finishFlushFlag;
   if (flushFlag == null) {
-    flushFlag = zlib.Z_FINISH;
+    flushFlag = zlib__default['default'].Z_FINISH;
   }
 
   return engine._processChunk(buffer, flushFlag);
@@ -2231,9 +2238,6 @@ exports.Inflate = Inflate;
 exports.createInflate = createInflate;
 exports.inflateSync = inflateSync;
 });
-var syncInflate_1 = syncInflate.Inflate;
-var syncInflate_2 = syncInflate.createInflate;
-var syncInflate_3 = syncInflate.inflateSync;
 
 var syncReader = createCommonjsModule(function (module) {
 
@@ -2311,11 +2315,11 @@ var filterParseSync = {
 	process: process_1
 };
 
-var hasSyncZlib = true;
+var hasSyncZlib$1 = true;
 
 
-if (!zlib.deflateSync) {
-  hasSyncZlib = false;
+if (!zlib__default['default'].deflateSync) {
+  hasSyncZlib$1 = false;
 }
 
 
@@ -2326,7 +2330,7 @@ if (!zlib.deflateSync) {
 
 var parserSync = function(buffer, options) {
 
-  if (!hasSyncZlib) {
+  if (!hasSyncZlib$1) {
     throw new Error('To use the sync capability of this library in old node versions, please pin pngjs to v2.3.0');
   }
 
@@ -2388,7 +2392,7 @@ var parserSync = function(buffer, options) {
 
   var inflatedData;
   if (metaData.interlace) {
-    inflatedData = zlib.inflateSync(inflateData);
+    inflatedData = zlib__default['default'].inflateSync(inflateData);
   }
   else {
     var rowSize = ((metaData.width * metaData.bpp * metaData.depth + 7) >> 3) + 1;
@@ -2415,17 +2419,17 @@ var parserSync = function(buffer, options) {
   return metaData;
 };
 
-var hasSyncZlib$1 = true;
+var hasSyncZlib = true;
 
-if (!zlib.deflateSync) {
-  hasSyncZlib$1 = false;
+if (!zlib__default['default'].deflateSync) {
+  hasSyncZlib = false;
 }
 
 
 
 var packerSync = function(metaData, opt) {
 
-  if (!hasSyncZlib$1) {
+  if (!hasSyncZlib) {
     throw new Error('To use the sync capability of this library in old node versions, please pin pngjs to v2.3.0');
   }
 
@@ -2448,7 +2452,7 @@ var packerSync = function(metaData, opt) {
   var filteredData = packer$1.filterData(metaData.data, metaData.width, metaData.height);
 
   // compress it
-  var compressedData = zlib.deflateSync(filteredData, packer$1.getDeflateOptions());
+  var compressedData = zlib__default['default'].deflateSync(filteredData, packer$1.getDeflateOptions());
   filteredData = null;
 
   if (!compressedData || !compressedData.length) {
@@ -2487,7 +2491,7 @@ var png = createCommonjsModule(function (module, exports) {
 
 
 var PNG = exports.PNG = function(options) {
-  stream.call(this);
+  Stream__default['default'].call(this);
 
   options = options || {}; // eslint-disable-line no-param-reassign
 
@@ -2523,7 +2527,7 @@ var PNG = exports.PNG = function(options) {
   this._packer.on('error', this.emit.bind(this, 'error'));
 
 };
-util.inherits(PNG, stream);
+util__default['default'].inherits(PNG, Stream__default['default']);
 
 PNG.sync = pngSync;
 
@@ -2651,17 +2655,10 @@ PNG.prototype.adjustGamma = function() {
   PNG.adjustGamma(this);
 };
 });
-var png_1 = png.PNG;
 
 function getMismatchedPixels(pixelMatchInput) {
-    const imgA = fs
-        .createReadStream(pixelMatchInput.imageAPath)
-        .pipe(new png_1())
-        .on('parsed', doneReading);
-    const imgB = fs
-        .createReadStream(pixelMatchInput.imageBPath)
-        .pipe(new png_1())
-        .on('parsed', doneReading);
+    const imgA = fs__default['default'].createReadStream(pixelMatchInput.imageAPath).pipe(new png.PNG()).on('parsed', doneReading);
+    const imgB = fs__default['default'].createReadStream(pixelMatchInput.imageBPath).pipe(new png.PNG()).on('parsed', doneReading);
     let filesRead = 0;
     function doneReading() {
         if (++filesRead < 2)

package/screenshot/screenshot-compare.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="node" />
-import * as d from '@rindo/core/internal';
+import type * as d from '@rindo/core/internal';
 export declare function compareScreenshot(emulateConfig: d.EmulateConfig, screenshotBuildData: d.ScreenshotBuildData, currentScreenshotBuf: Buffer, desc: string, width: number, height: number, testPath: string, pixelmatchThreshold: number): Promise<d.ScreenshotDiff>;

package/screenshot/screenshot-fs.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import * as d from '@rindo/core/internal';
+import type * as d from '@rindo/core/internal';
 export declare function writeScreenshotImage(imagePath: string, screenshotBuf: Buffer): Promise<void>;
 export declare function writeScreenshotData(dataDir: string, screenshotData: d.Screenshot): Promise<void>;
 export declare function readScreenshotData(dataDir: string, screenshotId: string): Promise<d.Screenshot>;