Convert a few small files to TS

Author: camdecoster

src/lib/clean_number.js

@@ -0,0 +1,20 @@
+'use strict';
+
+import isNumeric from 'fast-isnumeric';
+import { BADNUM } from '../constants/numerical';
+
+// precompile for speed
+const JUNK = /^['"%,$#\s']+|[, ]|['"%,$#\s']+$/g;
+
+/**
+ * cleanNumber: remove common leading and trailing cruft
+ * Always returns either a number or BADNUM.
+ */
+function cleanNumber(v: any): number | undefined {
+    if (typeof v === 'string') v = v.replace(JUNK, '');
+    if (isNumeric(v)) return Number(v);
+
+    return BADNUM;
+}
+
+export default cleanNumber;

src/lib/clean_number.ts

@@ -4,22 +4,15 @@
  * sanitized modulus function that always returns in the range [0, d)
  * rather than (-d, 0] if v is negative
  */
-function mod(v, d) {
-    var out = v % d;
+export function mod(v: number, d: number) {
+    const out = v % d;
     return out < 0 ? out + d : out;
 }
 
 /**
  * sanitized modulus function that always returns in the range [-d/2, d/2]
  * rather than (-d, 0] if v is negative
  */
-function modHalf(v, d) {
-    return Math.abs(v) > (d / 2) ?
-        v - Math.round(v / d) * d :
-        v;
+export function modHalf(v: number, d: number) {
+    return Math.abs(v) > d / 2 ? v - Math.round(v / d) * d : v;
 }
-
-module.exports = {
-    mod: mod,
-    modHalf: modHalf
-};

src/lib/mod.js src/lib/mod.tssrc/lib/mod.js renamed to src/lib/mod.ts

@@ -0,0 +1,21 @@
+'use strict';
+
+const NUMBER_REGEX = '([2-9]|[1-9][0-9]+)?';
+
+/**
+ * make a regex for matching counter ids/names ie xaxis, xaxis2, xaxis10...
+ *
+ * @param head: the head of the pattern, eg 'x' matches 'x', 'x2', 'x10' etc.
+ *      'xy' is a special case for cartesian subplots: it matches 'x2y3' etc
+ * @param tail: a fixed piece after the id
+ *      eg counterRegex('scene', '.annotations') for scene2.annotations etc.
+ * @param openEnded: if true, the string may continue past the match.
+ * @param matchBeginning: if false, the string may start before the match.
+ */
+export function counter(head: string, tail: string = '', openEnded: boolean, matchBeginning: boolean) {
+    const fullTail = tail + (openEnded ? '' : '$');
+    const startWithPrefix = matchBeginning === false ? '' : '^';
+    return head === 'xy'
+        ? new RegExp(startWithPrefix + 'x' + NUMBER_REGEX + 'y' + NUMBER_REGEX + fullTail)
+        : new RegExp(startWithPrefix + head + NUMBER_REGEX + fullTail);
+}

src/lib/regex.js

@@ -0,0 +1,7 @@
+'use strict';
+
+function sortObjectKeys(obj: Record<string, any>) {
+    return Object.keys(obj).sort();
+}
+
+export default sortObjectKeys;