@signageos/lib 12.1.1 → 12.1.2-master.2135

package/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+### Fixed
+- `retryAsyncUntil` function. It should wait in each recursion call if the callback promise is resolved successfully but the predicate is not met.
+
 ## [12.1.1] - 2023-09-14
 ### Fixed
 - Service factory doesn't require uid

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@signageos/lib",
-  "version": "12.1.1",
+  "version": "12.1.2-master.2135",
   "main": "./dist",
   "files": [
     "tools",
@@ -18,7 +18,9 @@
     "build": "npm run build-es5 && npm run build-es6",
     "build-es5": "tsc --target es5 --outDir dist",
     "build-es6": "tsc --target es6 --outDir es6",
-    "lint": "tslint --config node_modules/@signageos/codestyle/tslint.json {src,tests}/**/*.{ts,tsx}",
+    "lint": "tsc --noEmit -p tsconfig.json && tslint --project tsconfig.json",
+    "lint:prettier": "prettier  \"**/*.+(ts|tsx|json|js)\" --check",
+    "lint:prettier:fix": "prettier  \"**/*.+(ts|tsx|json|js)\" --write",
     "prebuild": "rm -rf dist/*",
     "prepare": "npm run prebuild && npm run build",
     "test": "NODE_ENV=test mocha --opts mocha.opts",

package/tools/check-deps.js

@@ -30,7 +30,7 @@ try {
 const includeRegExp = new RegExp(process.argv[2] || '.+');
 const excludeRegExp = new RegExp(process.argv[3] || '^$');
 
-const deps = { ...package.dependencies || {}, ...package.devDependencies || {} };
+const deps = { ...(package.dependencies || {}), ...(package.devDependencies || {}) };
 
 const depNames = Object.keys(deps);
 
@@ -69,11 +69,7 @@ if (prereleaseDepNames.length > 0) {
 	prereleaseDepNames.forEach((depName) => {
 		prereleaseDeps[depName] = deps[depName];
 	});
-	console.error(
-		`Some packages has prerelease tags in version in package.json deps`,
-		prereleaseDepNames.join(', '),
-		prereleaseDeps,
-	);
+	console.error(`Some packages has prerelease tags in version in package.json deps`, prereleaseDepNames.join(', '), prereleaseDeps);
 }
 
 if (expectedRangeDepNames.length > 0) {
@@ -93,11 +89,7 @@ if (inexactDepNames.length > 0) {
 	inexactDepNames.forEach((depName) => {
 		inexactDeps[depName] = deps[depName];
 	});
-	console.error(
-		`Some packages has not exact version specified in package.json deps`,
-		inexactDepNames.join(', '),
-		inexactDeps,
-	);
+	console.error(`Some packages has not exact version specified in package.json deps`, inexactDepNames.join(', '), inexactDeps);
 }
 
 if (prereleaseDepNames.length > 0 || expectedRangeDepNames.length > 0 || inexactDepNames.length > 0) {

package/tools/detect-semver-level.js

@@ -1,14 +1,6 @@
-
 const { getPipedInput, getGroupedChangeLog } = require('./helper');
 
-const allChangeTypes = [
-	'Changed',
-	'Removed',
-	'Added',
-	'Fixed',
-	'Security',
-	'Deprecated',
-];
+const allChangeTypes = ['Changed', 'Removed', 'Added', 'Fixed', 'Security', 'Deprecated'];
 
 (async function () {
 	const changeLog = await getPipedInput();

package/tools/es6-mocha.js

@@ -1,11 +1,10 @@
-
 module.exports = exports = function (Mocha, co) {
 	Mocha.Runnable.prototype.run = function (fn) {
-		const self = this
-		const ms = this.timeout()
-		const start = new Date().valueOf()
-		const ctx = this.ctx
-		let finished
+		const self = this;
+		const ms = this.timeout();
+		const start = new Date().valueOf();
+		const ctx = this.ctx;
+		let finished;
 		let emitted;
 
 		if (ctx) ctx.runnable(this);
@@ -13,13 +12,10 @@ module.exports = exports = function (Mocha, co) {
 		// timeout
 		if (this.async) {
 			if (ms) {
-				this.timer = setTimeout(
-					function () {
-						done(new Error('timeout of ' + ms + 'ms exceeded'));
-						self.timedOut = true;
-					},
-					ms
-				);
+				this.timer = setTimeout(function () {
+					done(new Error('timeout of ' + ms + 'ms exceeded'));
+					self.timedOut = true;
+				}, ms);
 			}
 		}
 
@@ -47,7 +43,7 @@ module.exports = exports = function (Mocha, co) {
 		if (this.async) {
 			try {
 				this.fn.call(ctx, function (err) {
-					if (err instanceof Error || toString.call(err) === "[object Error]") return done(err);
+					if (err instanceof Error || toString.call(err) === '[object Error]') return done(err);
 					if (null != err) return done(new Error('done() invoked with non-Error: ' + err));
 					done();
 				});
@@ -65,7 +61,7 @@ module.exports = exports = function (Mocha, co) {
 			if (!this.pending) {
 				var result = this.fn.call(ctx);
 				// This is where we determine if the result is a generator
-				if (result && typeof(result.next) == 'function' && typeof(result.throw) == 'function') {
+				if (result && typeof result.next == 'function' && typeof result.throw == 'function') {
 					// Mocha timeout for async function
 					if (ms) {
 						this.timer = setTimeout(function () {
@@ -74,8 +70,7 @@ module.exports = exports = function (Mocha, co) {
 						}, ms);
 					}
 					// Use co to run generator to completion
-					co(result)
-					.then(
+					co(result).then(
 						function () {
 							this.duration = new Date().valueOf() - start;
 							done();
@@ -83,7 +78,7 @@ module.exports = exports = function (Mocha, co) {
 						function (err) {
 							this.duration = new Date().valueOf() - start;
 							done(err);
-						}
+						},
 					);
 				} else {
 					// Default Mocha handling of sync function
@@ -94,5 +89,5 @@ module.exports = exports = function (Mocha, co) {
 		} catch (err) {
 			fn(err);
 		}
-	}
-}
+	};
+};

package/tools/get-release-log.js

@@ -1,4 +1,3 @@
-
 const { getPipedInput, getGroupedChangeLog } = require('./helper');
 
 const version = process.argv[2] || 'Unreleased';
@@ -11,17 +10,11 @@ const outputType = process.argv[3] || 'text';
 	if (outputType === 'text') {
 		const changedTypes = Object.keys(groupedLog[version] || {});
 		const releaseNotes = changedTypes.reduce(
-			(notes, changeType) => [
-				...notes,
-				`${changeType}:`,
-				...groupedLog[version][changeType].map((note) => `- ${note}`),
-				'',
-			],
+			(notes, changeType) => [...notes, `${changeType}:`, ...groupedLog[version][changeType].map((note) => `- ${note}`), ''],
 			[],
 		);
 		output = releaseNotes.join('\n');
-	} else
-	if (outputType === 'groups') {
+	} else if (outputType === 'groups') {
 		output = typeof groupedLog[version] !== 'undefined' ? groupedLog[version] : {};
 	}
 	process.stdout.write(JSON.stringify(output));

package/tools/helper.js

@@ -7,11 +7,11 @@ exports.getPipedInput = function () {
 		let inputData;
 		process.stdin.resume();
 		process.stdin.setEncoding('utf8');
-		process.stdin.on('data', (chunk) => inputData += chunk);
+		process.stdin.on('data', (chunk) => (inputData += chunk));
 		process.stdin.on('end', () => resolve(inputData));
 		process.stdin.on('error', (error) => reject(error));
 	});
-}
+};
 
 exports.getGroupedChangeLog = function (changeLog) {
 	const newLines = changeLog
@@ -20,7 +20,10 @@ exports.getGroupedChangeLog = function (changeLog) {
 	const { groupedLog } = newLines.reduce(
 		(reduction, line) => {
 			if (line.startsWith(VERSION_HEADER)) {
-				const version = line.substring(VERSION_HEADER.length).match(/^\[?(([\d\w\.\-\+])+)\]?/)[1].trim();
+				const version = line
+					.substring(VERSION_HEADER.length)
+					.match(/^\[?(([\d\w\.\-\+])+)\]?/)[1]
+					.trim();
 				if (reduction.groupedLog[version] !== undefined) {
 					throw new Error(`The version "${version}" is duplicated in CHANGELOG`);
 				}
@@ -32,8 +35,7 @@ exports.getGroupedChangeLog = function (changeLog) {
 						[version]: reduction.groupedLog[version] || {},
 					},
 				};
-			} else
-			if (line.startsWith(CHANGES_HEADER)) {
+			} else if (line.startsWith(CHANGES_HEADER)) {
 				const type = line.substring(CHANGES_HEADER.length).trim();
 				if (reduction.groupedLog[reduction.lastVersion] === undefined) {
 					throw new Error(`The type "${type}" is not under any version section in CHANGELOG`);
@@ -68,4 +70,4 @@ exports.getGroupedChangeLog = function (changeLog) {
 		{ groupedLog: {}, lastType: null, lastVersion: null },
 	);
 	return groupedLog;
-}
+};

package/tools/nodeModulesHelper.js

@@ -1,13 +1,12 @@
-
 const fs = require('fs');
 
 function getNodeModulesExternals(rootDir) {
 	const nodeModules = {};
 	fs.readdirSync(rootDir + '/node_modules')
-		.filter(function(dirName) {
+		.filter(function (dirName) {
 			return ['.bin'].indexOf(dirName) === -1;
 		})
-		.forEach(function(moduleName) {
+		.forEach(function (moduleName) {
 			nodeModules[moduleName] = 'commonjs ' + moduleName;
 		});
 	return nodeModules;
@@ -19,5 +18,5 @@ function getNodeModulesNames() {
 
 exports = module.exports = {
 	getNodeModulesExternals,
-	getNodeModulesNames
+	getNodeModulesNames,
 };

package/tools/test.js

@@ -1,4 +1,3 @@
-
 const co = require('co');
 const Mocha = require('mocha');
 require('./es6-mocha')(Mocha, co);
@@ -17,10 +16,10 @@ const testPostfix = testType ? '-' + testType : '';
 const mocha = new Mocha({
 	fullTrace: true,
 	reporterOptions: {
-		"junit_report_name": "tests",
-		"junit_report_path": "dist/test" + testPostfix + "-report.xml",
-		"junit_report_stack": 1
-	}
+		junit_report_name: 'tests',
+		junit_report_path: 'dist/test' + testPostfix + '-report.xml',
+		junit_report_stack: 1,
+	},
 });
 mocha.addFile(testPath + '/test' + testPostfix + '.js');
 mocha.run((failures) => {

package/tools/version-upgrade.js

@@ -1,4 +1,3 @@
-
 const fs = require('fs');
 
 const packagePath = process.cwd() + '/package.json';
@@ -23,7 +22,7 @@ if (packageLock) {
 	}
 }
 
-fs.writeFileSync(packagePath, JSON.stringify(package, null, 2) + "\n");
+fs.writeFileSync(packagePath, JSON.stringify(package, null, 2) + '\n');
 if (packageLock) {
-	fs.writeFileSync(packageLockPath, JSON.stringify(packageLock, null, 2) + "\n");
+	fs.writeFileSync(packageLockPath, JSON.stringify(packageLock, null, 2) + '\n');
 }