xcraft-core-utils 4.3.6 → 4.3.7

package/lib/prop-types.js

@@ -1,154 +1,154 @@
-'use strict';
-
-const PropTypes = require('prop-types');
-
-/******************************************************************************/
-
-function getType(type) {
-  switch (type.type) {
-    case 'any':
-      return PropTypes.any;
-    case 'string':
-    case 'color':
-    case 'richColor':
-    case 'background':
-    case 'shortcut':
-    case 'angle':
-    case 'percentage':
-    case 'fontWeight':
-    case 'shape':
-    case 'horizontalSpacing':
-    case 'verticalSpacing':
-    case 'fontStyle':
-    case 'cursor':
-    case 'textTransform':
-    case 'justify':
-    case 'textJustify':
-    case 'date':
-    case 'time':
-    case 'datetime':
-    case 'price':
-    case 'weight':
-    case 'length':
-    case 'pixel':
-    case 'volume':
-    case 'percent':
-    case 'delay':
-    case 'place':
-    case 'transition':
-      return PropTypes.string;
-    case 'number':
-      return PropTypes.number;
-    case 'nabu':
-      return (props, propName, componentName) => {
-        const prop = props[propName];
-        if (prop !== null && prop !== undefined) {
-          if (typeof prop === 'object') {
-            let isNabu =
-              'nabuId' in prop ||
-              ('_type' in prop &&
-                (prop['_type'] === 'translatableString' ||
-                  prop['_type'] === 'translatableMarkdown'));
-            // Handle Map or OrderedMap
-            if (prop.get) {
-              isNabu = prop.get('nabuId') ? true : false;
-              if (!isNabu) {
-                isNabu =
-                  prop.get('_type') === 'translatableString' ||
-                  prop.get('_type') === 'translatableMarkdown';
-              }
-            }
-            if (!isNabu) {
-              return new Error(
-                'Invalid prop `' +
-                  propName +
-                  ' of value "' +
-                  prop +
-                  '" supplied to' +
-                  ' `' +
-                  componentName +
-                  '`. Validation failed. Missing nabuId !'
-              );
-            }
-          } else if (typeof prop !== 'string' && typeof prop !== 'number') {
-            return new Error(
-              'Invalid prop `' +
-                propName +
-                ' of value "' +
-                prop +
-                '" supplied to' +
-                ' `' +
-                componentName +
-                '`. Validation failed.'
-            );
-          }
-        }
-      };
-    case 'glyph':
-      return PropTypes.oneOfType([
-        PropTypes.string,
-        PropTypes.shape({
-          glyph: PropTypes.string,
-          color: PropTypes.string,
-        }),
-      ]);
-    case 'bool':
-      return PropTypes.oneOf([false, true]);
-    case 'enum':
-      return PropTypes.oneOf(type.values);
-    case 'component':
-      return PropTypes.node;
-    case 'function':
-      return PropTypes.func;
-    case 'grow':
-      return PropTypes.oneOfType([PropTypes.number, PropTypes.string]);
-    case 'oneOfType':
-      // eslint-disable-next-line no-case-declarations
-      const types = type.types.map((t) => getType(t));
-      return PropTypes.oneOfType(types);
-    default:
-      throw new Error(`Unknown prop type: '${type.type}'`);
-  }
-}
-
-function getPropType(prop) {
-  let propType = prop.type.propType || getType(prop.type);
-  if (prop.required && propType !== undefined) {
-    propType = propType.isRequired;
-  }
-  return propType;
-}
-
-function getDefaultProp(prop) {
-  if (prop.defaultValue !== undefined) {
-    return prop.defaultValue;
-  } else {
-    return null;
-  }
-}
-
-/******************************************************************************/
-
-function makePropTypes(props) {
-  const propTypes = {};
-  for (const prop of props) {
-    propTypes[prop.name] = getPropType(prop);
-  }
-  return propTypes;
-}
-
-function makeDefaultProps(props) {
-  const defaultProps = {};
-  for (const prop of props) {
-    const d = getDefaultProp(prop);
-    if (d !== null) {
-      defaultProps[prop.name] = d;
-    }
-  }
-  return defaultProps;
-}
-
-module.exports = {
-  makePropTypes,
-  makeDefaultProps,
-};
+'use strict';
+
+const PropTypes = require('prop-types');
+
+/******************************************************************************/
+
+function getType(type) {
+  switch (type.type) {
+    case 'any':
+      return PropTypes.any;
+    case 'string':
+    case 'color':
+    case 'richColor':
+    case 'background':
+    case 'shortcut':
+    case 'angle':
+    case 'percentage':
+    case 'fontWeight':
+    case 'shape':
+    case 'horizontalSpacing':
+    case 'verticalSpacing':
+    case 'fontStyle':
+    case 'cursor':
+    case 'textTransform':
+    case 'justify':
+    case 'textJustify':
+    case 'date':
+    case 'time':
+    case 'datetime':
+    case 'price':
+    case 'weight':
+    case 'length':
+    case 'pixel':
+    case 'volume':
+    case 'percent':
+    case 'delay':
+    case 'place':
+    case 'transition':
+      return PropTypes.string;
+    case 'number':
+      return PropTypes.number;
+    case 'nabu':
+      return (props, propName, componentName) => {
+        const prop = props[propName];
+        if (prop !== null && prop !== undefined) {
+          if (typeof prop === 'object') {
+            let isNabu =
+              'nabuId' in prop ||
+              ('_type' in prop &&
+                (prop['_type'] === 'translatableString' ||
+                  prop['_type'] === 'translatableMarkdown'));
+            // Handle Map or OrderedMap
+            if (prop.get) {
+              isNabu = prop.get('nabuId') ? true : false;
+              if (!isNabu) {
+                isNabu =
+                  prop.get('_type') === 'translatableString' ||
+                  prop.get('_type') === 'translatableMarkdown';
+              }
+            }
+            if (!isNabu) {
+              return new Error(
+                'Invalid prop `' +
+                  propName +
+                  ' of value "' +
+                  prop +
+                  '" supplied to' +
+                  ' `' +
+                  componentName +
+                  '`. Validation failed. Missing nabuId !'
+              );
+            }
+          } else if (typeof prop !== 'string' && typeof prop !== 'number') {
+            return new Error(
+              'Invalid prop `' +
+                propName +
+                ' of value "' +
+                prop +
+                '" supplied to' +
+                ' `' +
+                componentName +
+                '`. Validation failed.'
+            );
+          }
+        }
+      };
+    case 'glyph':
+      return PropTypes.oneOfType([
+        PropTypes.string,
+        PropTypes.shape({
+          glyph: PropTypes.string,
+          color: PropTypes.string,
+        }),
+      ]);
+    case 'bool':
+      return PropTypes.oneOf([false, true]);
+    case 'enum':
+      return PropTypes.oneOf(type.values);
+    case 'component':
+      return PropTypes.node;
+    case 'function':
+      return PropTypes.func;
+    case 'grow':
+      return PropTypes.oneOfType([PropTypes.number, PropTypes.string]);
+    case 'oneOfType':
+      // eslint-disable-next-line no-case-declarations
+      const types = type.types.map((t) => getType(t));
+      return PropTypes.oneOfType(types);
+    default:
+      throw new Error(`Unknown prop type: '${type.type}'`);
+  }
+}
+
+function getPropType(prop) {
+  let propType = prop.type.propType || getType(prop.type);
+  if (prop.required && propType !== undefined) {
+    propType = propType.isRequired;
+  }
+  return propType;
+}
+
+function getDefaultProp(prop) {
+  if (prop.defaultValue !== undefined) {
+    return prop.defaultValue;
+  } else {
+    return null;
+  }
+}
+
+/******************************************************************************/
+
+function makePropTypes(props) {
+  const propTypes = {};
+  for (const prop of props) {
+    propTypes[prop.name] = getPropType(prop);
+  }
+  return propTypes;
+}
+
+function makeDefaultProps(props) {
+  const defaultProps = {};
+  for (const prop of props) {
+    const d = getDefaultProp(prop);
+    if (d !== null) {
+      defaultProps[prop.name] = d;
+    }
+  }
+  return defaultProps;
+}
+
+module.exports = {
+  makePropTypes,
+  makeDefaultProps,
+};

package/lib/reflect.js

@@ -1,12 +1,12 @@
-'use strict';
-
-const STRIP_COMMENTS = /(\/\/.*$)|(\/\*[\s\S]*?\*\/)|(\s*=[^,\)]*(('(?:\\'|[^'\r\n])*')|("(?:\\"|[^"\r\n])*"))|(\s*=[^,\)]*))/gm;
-const ARGUMENT_NAMES = /([^\s,]+)/g;
-
-exports.funcParams = (func) => {
-  const fnStr = func.toString().replace(STRIP_COMMENTS, '');
-  const result = fnStr
-    .slice(fnStr.indexOf('(') + 1, fnStr.indexOf(')'))
-    .match(ARGUMENT_NAMES);
-  return result || [];
-};
+'use strict';
+
+const STRIP_COMMENTS = /(\/\/.*$)|(\/\*[\s\S]*?\*\/)|(\s*=[^,\)]*(('(?:\\'|[^'\r\n])*')|("(?:\\"|[^"\r\n])*"))|(\s*=[^,\)]*))/gm;
+const ARGUMENT_NAMES = /([^\s,]+)/g;
+
+exports.funcParams = (func) => {
+  const fnStr = func.toString().replace(STRIP_COMMENTS, '');
+  const result = fnStr
+    .slice(fnStr.indexOf('(') + 1, fnStr.indexOf(')'))
+    .match(ARGUMENT_NAMES);
+  return result || [];
+};

package/lib/regex.js

@@ -1,24 +1,24 @@
-'use strict';
-
-const escape = require('escape-regexp');
-
-exports.toRegexp = function (value) {
-  if (value instanceof RegExp) {
-    return value;
-  }
-
-  var escapeStringRegexp = require('escape-string-regexp');
-  return new RegExp('^' + escapeStringRegexp(value) + '$');
-};
-
-exports.toAxonRegExpStr = function (str) {
-  str = escape(str).replace(/\\\*/g, '(.+)');
-  return '^' + str + '$';
-};
-
-exports.toXcraftRegExpStr = function (str) {
-  str = escape(str)
-    .replace(/\\\((.+)\\\)/g, (m) => m.replace(/\\/g, ''))
-    .replace(/\\\*/g, '(.+)');
-  return '^' + str + '$';
-};
+'use strict';
+
+const escape = require('escape-regexp');
+
+exports.toRegexp = function (value) {
+  if (value instanceof RegExp) {
+    return value;
+  }
+
+  var escapeStringRegexp = require('escape-string-regexp');
+  return new RegExp('^' + escapeStringRegexp(value) + '$');
+};
+
+exports.toAxonRegExpStr = function (str) {
+  str = escape(str).replace(/\\\*/g, '(.+)');
+  return '^' + str + '$';
+};
+
+exports.toXcraftRegExpStr = function (str) {
+  str = escape(str)
+    .replace(/\\\((.+)\\\)/g, (m) => m.replace(/\\/g, ''))
+    .replace(/\\\*/g, '(.+)');
+  return '^' + str + '$';
+};

package/lib/runnerInstance.js

@@ -1,134 +1,135 @@
-'use strict';
-
-// create a unique, global symbol name
-// -----------------------------------
-const RUNNER_INSTANCE_KEY = Symbol.for('xcraft-core-utils.runnerInstance');
-const watt = require('gigawatts');
-
-class Runner {
-  constructor() {
-    this.totalRunning = 0;
-    this.runningsGroups = [];
-    this.runnings = {};
-    this.run = this.run.bind(this);
-    watt.wrapAll(this);
-  }
-
-  run(jobQueue) {
-    //must be postponed?
-    if (jobQueue.waitOn.length > 0) {
-      const mustWait = this.runningsGroups.some((q) =>
-        jobQueue.waitOn.includes(q)
-      );
-      if (mustWait) {
-        if (!jobQueue.maxAttemptReached) {
-          jobQueue.attempt++;
-          setTimeout(this.run, jobQueue.waitDelay, jobQueue);
-          return;
-        } else {
-          jobQueue.attempt = 0;
-        }
-      }
-    }
-
-    //queue is draining?
-    if (jobQueue.running > 0 && jobQueue.waiting.size === 0) {
-      return;
-    }
-
-    //jobqueue releasing
-    for (let x = jobQueue.running; x < jobQueue.parallelLimit; x++) {
-      const nextEntry = jobQueue.waiting.entries().next();
-      if (nextEntry.done) {
-        //we can leave, nothing is waiting us
-        break;
-      }
-
-      //remove the jobEntry from queue
-      const jobEntry = Object.assign({}, nextEntry.value);
-      jobQueue.waiting.delete(jobEntry[0]);
-
-      //log for journal inspections
-      if (this.totalRunning === 0 && jobQueue.parallelLimit > 1) {
-        jobQueue._dbg(`system are running new jobs`);
-      }
-
-      //priority tracking
-      if (jobQueue.priorityGroup !== 'default' && jobQueue.running === 0) {
-        if (!this.runnings[jobQueue.priorityGroup]) {
-          this.runnings[jobQueue.priorityGroup] = {};
-        }
-        this.runnings[jobQueue.priorityGroup][jobQueue.name] = true;
-        //update runnings group
-        this.runningsGroups = Object.entries(this.runnings)
-          .filter((e) => Object.values(e[1]).some((r) => r === true))
-          .map((e) => e[0]);
-      }
-
-      //update counters
-      this.totalRunning++;
-
-      //trigger job start on queue runner
-      jobQueue.runner(jobEntry[1], (err) => {
-        if (err) {
-          jobQueue.err(err);
-        }
-        //end callback
-
-        jobQueue.notify(jobQueue.runningSamples);
-
-        //update counter
-        jobQueue.running--;
-        this.totalRunning--;
-
-        //priority tracking
-        if (jobQueue.priorityGroup !== 'default' && jobQueue.running === 0) {
-          this.runnings[jobQueue.priorityGroup][jobQueue.name] = false;
-          //update runnings group
-          this.runningsGroups = Object.entries(this.runnings)
-            .filter((e) => Object.values(e[1]).some((r) => r === true))
-            .map((e) => e[0]);
-        }
-
-        //log
-        if (this.totalRunning === 0 && jobQueue.waiting.size === 0) {
-          jobQueue._dbg(`no more jobs running`);
-        }
-
-        //schedule a new run for this queue if needed
-        if (jobQueue.waiting.size > 0) {
-          setTimeout(this.run, 0, jobQueue);
-        }
-      });
-    }
-  }
-}
-
-// check if the global object has this symbol
-// add it if it does not have the symbol, yet
-// ------------------------------------------
-const globalSymbols = Object.getOwnPropertySymbols(global);
-const hasInstance = globalSymbols.indexOf(RUNNER_INSTANCE_KEY) > -1;
-if (!hasInstance) {
-  global[RUNNER_INSTANCE_KEY] = new Runner();
-}
-
-// define the singleton API
-// ------------------------
-
-const singleton = {};
-
-Object.defineProperty(singleton, 'instance', {
-  get: function () {
-    return global[RUNNER_INSTANCE_KEY];
-  },
-});
-
-// ensure the API is never changed
-// -------------------------------
-
-Object.freeze(singleton);
-
-// export the singleton API only
-// -----------------------------
-module.exports = singleton;
+'use strict';
+
+// create a unique, global symbol name
+// -----------------------------------
+const RUNNER_INSTANCE_KEY = Symbol.for('xcraft-core-utils.runnerInstance');
+const watt = require('gigawatts');
+
+class Runner {
+  constructor() {
+    this.totalRunning = 0;
+    this.runningsGroups = [];
+    this.runnings = {};
+    this.run = this.run.bind(this);
+    watt.wrapAll(this);
+  }
+
+  run(jobQueue) {
+    //must be postponed?
+    if (jobQueue.waitOn.length > 0) {
+      const mustWait = this.runningsGroups.some((q) =>
+        jobQueue.waitOn.includes(q)
+      );
+      if (mustWait) {
+        if (!jobQueue.maxAttemptReached) {
+          jobQueue.attempt++;
+          setTimeout(this.run, jobQueue.waitDelay, jobQueue);
+          return;
+        } else {
+          jobQueue.attempt = 0;
+        }
+      }
+    }
+
+    //queue is draining?
+    if (jobQueue.running > 0 && jobQueue.waiting.size === 0) {
+      return;
+    }
+
+    //jobqueue releasing
+    for (let x = jobQueue.running; x < jobQueue.parallelLimit; x++) {
+      const nextEntry = jobQueue.waiting.entries().next();
+      if (nextEntry.done) {
+        //we can leave, nothing is waiting us
+        break;
+      }
+
+      //remove the jobEntry from queue
+      const jobEntry = Object.assign({}, nextEntry.value);
+      jobQueue.waiting.delete(jobEntry[0]);
+
+      //log for journal inspections
+      if (this.totalRunning === 0 && jobQueue.parallelLimit > 1) {
+        jobQueue._dbg(`system are running new jobs`);
+      }
+
+      //priority tracking
+      if (jobQueue.priorityGroup !== 'default' && jobQueue.running === 0) {
+        if (!this.runnings[jobQueue.priorityGroup]) {
+          this.runnings[jobQueue.priorityGroup] = {};
+        }
+        this.runnings[jobQueue.priorityGroup][jobQueue.name] = true;
+        //update runnings group
+        this.runningsGroups = Object.entries(this.runnings)
+          .filter((e) => Object.values(e[1]).some((r) => r === true))
+          .map((e) => e[0]);
+      }
+
+      //update counters
+      jobQueue.running++;
+      this.totalRunning++;
+
+      //trigger job start on queue runner
+      jobQueue.runner(jobEntry[1], (err) => {
+        if (err) {
+          jobQueue.err(err);
+        }
+        //end callback
+
+        jobQueue.notify(jobQueue.runningSamples);
+
+        //update counter
+        jobQueue.running--;
+        this.totalRunning--;
+
+        //priority tracking
+        if (jobQueue.priorityGroup !== 'default' && jobQueue.running === 0) {
+          this.runnings[jobQueue.priorityGroup][jobQueue.name] = false;
+          //update runnings group
+          this.runningsGroups = Object.entries(this.runnings)
+            .filter((e) => Object.values(e[1]).some((r) => r === true))
+            .map((e) => e[0]);
+        }
+
+        //log
+        if (this.totalRunning === 0 && jobQueue.waiting.size === 0) {
+          jobQueue._dbg(`no more jobs running`);
+        }
+
+        //schedule a new run for this queue if needed
+        if (jobQueue.waiting.size > 0) {
+          setTimeout(this.run, 0, jobQueue);
+        }
+      });
+    }
+  }
+}
+
+// check if the global object has this symbol
+// add it if it does not have the symbol, yet
+// ------------------------------------------
+const globalSymbols = Object.getOwnPropertySymbols(global);
+const hasInstance = globalSymbols.indexOf(RUNNER_INSTANCE_KEY) > -1;
+if (!hasInstance) {
+  global[RUNNER_INSTANCE_KEY] = new Runner();
+}
+
+// define the singleton API
+// ------------------------
+
+const singleton = {};
+
+Object.defineProperty(singleton, 'instance', {
+  get: function () {
+    return global[RUNNER_INSTANCE_KEY];
+  },
+});
+
+// ensure the API is never changed
+// -------------------------------
+
+Object.freeze(singleton);
+
+// export the singleton API only
+// -----------------------------
+module.exports = singleton;