@ancon/wildcat-utils 1.11.0 → 1.13.0

package/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./shared/enums.js"),r=require("./shared/isWithinFlag.js"),i=require("./shared/generateId.js"),t=require("./outlet/getListOutletOpeningHoursTable.js"),n=require("./versioning/isVersionALessThanB.js"),s=require("./versioning/cleanVersionString.js"),o=require("./api/getUrlAndParams.js"),l=require("./api/getEndpointWithVersion.js"),g=require("./string/slugify.js"),a=require("./color/lighten.js"),u=require("./color/brighten.js"),d=require("./color/darken.js"),c=require("./user/getFullName.js"),q=require("./user/getFullAddressString.js"),_=require("./logger/Logger.js"),h=require("./logger/types.js"),p=require("./printing/isValidPrinter.js"),V=require("./printing/isValidNetworkPrinter.js"),L=require("./printing/isValidStarCloudPrinter.js");require("moment");require("@ancon/wildcat-types");require("compare-versions");require("tinycolor2");exports.DayOfWeek=e.DayOfWeek;exports.IntervalState=e.IntervalState;exports.IntervalType=e.IntervalType;exports.OrderFormat=e.OrderFormat;exports.isWithinFlag=r;exports.generateId=i;exports.getListOutletOpeningHoursTable=t;exports.isVersionALessThanB=n;exports.cleanVersionString=s;exports.getUrlAndParams=o;exports.getEndpointWithVersion=l;exports.slugify=g;exports.lighten=a;exports.brighten=u;exports.darken=d;exports.getFullName=c;exports.getFullAddressString=q;exports.Logger=_;exports.LogLevel=h.LogLevel;exports.isValidPrinter=p;exports.isValidNetworkPrinter=V;exports.isValidStarCloudPrinter=L;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./shared/enums.js"),r=require("./shared/isWithinFlag.js"),i=require("./shared/generateId.js"),t=require("./outlet/getListOutletOpeningHoursTable.js"),n=require("./versioning/isVersionALessThanB.js"),s=require("./versioning/cleanVersionString.js"),o=require("./api/getUrlAndParams.js"),g=require("./api/getEndpointWithVersion.js"),l=require("./string/slugify.js"),a=require("./color/lighten.js"),u=require("./color/brighten.js"),c=require("./color/darken.js"),d=require("./user/getFullName.js"),q=require("./user/getFullAddressString.js"),_=require("./logger/Logger.js"),p=require("./logger/types.js"),h=require("./logger/sanitizeAsStringDict.js"),S=require("./printing/isValidPrinter.js"),V=require("./printing/isValidNetworkPrinter.js"),y=require("./printing/isValidStarCloudPrinter.js"),P=require("./printing/getPrinterType.js");require("moment");require("@ancon/wildcat-types");require("compare-versions");require("tinycolor2");require("@ancon/wildcat-printing");exports.DayOfWeek=e.DayOfWeek;exports.IntervalState=e.IntervalState;exports.IntervalType=e.IntervalType;exports.OrderFormat=e.OrderFormat;exports.isWithinFlag=r;exports.generateId=i;exports.getListOutletOpeningHoursTable=t;exports.isVersionALessThanB=n;exports.cleanVersionString=s;exports.getUrlAndParams=o;exports.getEndpointWithVersion=g;exports.slugify=l;exports.lighten=a;exports.brighten=u;exports.darken=c;exports.getFullName=d;exports.getFullAddressString=q;exports.Logger=_;exports.LogLevel=p.LogLevel;exports.sanitizeAsStringDict=h;exports.isValidPrinter=S;exports.isValidNetworkPrinter=V;exports.isValidStarCloudPrinter=y;exports.getPrinterType=P;

package/index.mjs

@@ -1,47 +1,52 @@
-import { DayOfWeek as l, IntervalState as s, IntervalType as i, OrderFormat as d } from "./shared/enums.mjs";
-import { default as p } from "./shared/isWithinFlag.mjs";
-import { default as n } from "./shared/generateId.mjs";
-import { default as g } from "./outlet/getListOutletOpeningHoursTable.mjs";
-import { default as h } from "./versioning/isVersionALessThanB.mjs";
-import { default as F } from "./versioning/cleanVersionString.mjs";
-import { default as P } from "./api/getUrlAndParams.mjs";
-import { default as k } from "./api/getEndpointWithVersion.mjs";
-import { default as y } from "./string/slugify.mjs";
+import { DayOfWeek as s, IntervalState as i, IntervalType as d, OrderFormat as p } from "./shared/enums.mjs";
+import { default as n } from "./shared/isWithinFlag.mjs";
+import { default as x } from "./shared/generateId.mjs";
+import { default as V } from "./outlet/getListOutletOpeningHoursTable.mjs";
+import { default as L } from "./versioning/isVersionALessThanB.mjs";
+import { default as S } from "./versioning/cleanVersionString.mjs";
+import { default as A } from "./api/getUrlAndParams.mjs";
+import { default as O } from "./api/getEndpointWithVersion.mjs";
+import { default as k } from "./string/slugify.mjs";
 import { default as I } from "./color/lighten.mjs";
-import { default as W } from "./color/brighten.mjs";
-import { default as N } from "./color/darken.mjs";
+import { default as b } from "./color/brighten.mjs";
+import { default as D } from "./color/darken.mjs";
 import { default as w } from "./user/getFullName.mjs";
-import { default as C } from "./user/getFullAddressString.mjs";
+import { default as B } from "./user/getFullAddressString.mjs";
 import { default as E } from "./logger/Logger.mjs";
 import { LogLevel as U } from "./logger/types.mjs";
-import { default as q } from "./printing/isValidPrinter.mjs";
-import { default as G } from "./printing/isValidNetworkPrinter.mjs";
-import { default as K } from "./printing/isValidStarCloudPrinter.mjs";
+import { default as q } from "./logger/sanitizeAsStringDict.mjs";
+import { default as J } from "./printing/isValidPrinter.mjs";
+import { default as M } from "./printing/isValidNetworkPrinter.mjs";
+import { default as R } from "./printing/isValidStarCloudPrinter.mjs";
+import { default as Y } from "./printing/getPrinterType.mjs";
 import "moment";
 import "@ancon/wildcat-types";
 import "compare-versions";
 import "tinycolor2";
+import "@ancon/wildcat-printing";
 export {
-  l as DayOfWeek,
-  s as IntervalState,
-  i as IntervalType,
+  s as DayOfWeek,
+  i as IntervalState,
+  d as IntervalType,
   U as LogLevel,
   E as Logger,
-  d as OrderFormat,
-  W as brighten,
-  F as cleanVersionString,
-  N as darken,
-  n as generateId,
-  k as getEndpointWithVersion,
-  C as getFullAddressString,
+  p as OrderFormat,
+  b as brighten,
+  S as cleanVersionString,
+  D as darken,
+  x as generateId,
+  O as getEndpointWithVersion,
+  B as getFullAddressString,
   w as getFullName,
-  g as getListOutletOpeningHoursTable,
-  P as getUrlAndParams,
-  G as isValidNetworkPrinter,
-  q as isValidPrinter,
-  K as isValidStarCloudPrinter,
-  h as isVersionALessThanB,
-  p as isWithinFlag,
+  V as getListOutletOpeningHoursTable,
+  Y as getPrinterType,
+  A as getUrlAndParams,
+  M as isValidNetworkPrinter,
+  J as isValidPrinter,
+  R as isValidStarCloudPrinter,
+  L as isVersionALessThanB,
+  n as isWithinFlag,
   I as lighten,
-  y as slugify
+  q as sanitizeAsStringDict,
+  k as slugify
 };

package/logger/Logger.d.ts

@@ -1,12 +1,14 @@
-import { LogProperties, LogStrategy } from './types';
-export default class Logger {
+import { LogStrategy } from './types';
+declare class Logger {
     private logStrategy;
     constructor(logStrategy: LogStrategy);
+    private sanitize;
     setLogStrategy(logStrategy: LogStrategy): void;
-    verbose(message: string, properties?: LogProperties): void;
-    debug(message: string, properties?: LogProperties): void;
-    info(message: string, properties?: LogProperties): void;
-    warn(message: string, properties?: LogProperties): void;
-    error(message: string, properties?: LogProperties): void;
-    fatal(message: string, properties?: LogProperties): void;
+    verbose<T = unknown>(message: string, data?: T): void;
+    debug<T = unknown>(message: string, data?: T): void;
+    info<T = unknown>(message: string, data?: T): void;
+    warn<T = unknown>(message: string, data?: T): void;
+    error<T = unknown>(message: string, data?: T): void;
+    fatal<T = unknown>(message: string, data?: T): void;
 }
+export default Logger;

package/logger/Logger.js

@@ -1 +1 @@
-"use strict";const g=require("./types.js");class o{constructor(e){this.logStrategy=e}setLogStrategy(e){this.logStrategy=e}verbose(e,t){this.logStrategy.execute(g.LogLevel.Verbose,e,t)}debug(e,t){this.logStrategy.execute(g.LogLevel.Debug,e,t)}info(e,t){this.logStrategy.execute(g.LogLevel.Information,e,t)}warn(e,t){this.logStrategy.execute(g.LogLevel.Warning,e,t)}error(e,t){this.logStrategy.execute(g.LogLevel.Error,e,t)}fatal(e,t){this.logStrategy.execute(g.LogLevel.Fatal,e,t)}}module.exports=o;
+"use strict";const i=require("./types.js");class s{constructor(e){this.logStrategy=e}sanitize(e){return this.logStrategy.sanitize?this.logStrategy.sanitize(e):e}setLogStrategy(e){this.logStrategy=e}verbose(e,t){this.logStrategy.execute(i.LogLevel.Verbose,e,this.sanitize(t))}debug(e,t){this.logStrategy.execute(i.LogLevel.Debug,e,this.sanitize(t))}info(e,t){this.logStrategy.execute(i.LogLevel.Information,e,this.sanitize(t))}warn(e,t){this.logStrategy.execute(i.LogLevel.Warning,e,this.sanitize(t))}error(e,t){this.logStrategy.execute(i.LogLevel.Error,e,this.sanitize(t))}fatal(e,t){this.logStrategy.execute(i.LogLevel.Fatal,e,this.sanitize(t))}}module.exports=s;

package/logger/Logger.mjs

@@ -1,28 +1,35 @@
-import { LogLevel as r } from "./types.mjs";
+import { LogLevel as i } from "./types.mjs";
 class a {
   constructor(t) {
     this.logStrategy = t;
   }
+  sanitize(t) {
+    return this.logStrategy.sanitize ? this.logStrategy.sanitize(t) : t;
+  }
   setLogStrategy(t) {
     this.logStrategy = t;
   }
   verbose(t, e) {
-    this.logStrategy.execute(r.Verbose, t, e);
+    this.logStrategy.execute(i.Verbose, t, this.sanitize(e));
   }
   debug(t, e) {
-    this.logStrategy.execute(r.Debug, t, e);
+    this.logStrategy.execute(i.Debug, t, this.sanitize(e));
   }
   info(t, e) {
-    this.logStrategy.execute(r.Information, t, e);
+    this.logStrategy.execute(
+      i.Information,
+      t,
+      this.sanitize(e)
+    );
   }
   warn(t, e) {
-    this.logStrategy.execute(r.Warning, t, e);
+    this.logStrategy.execute(i.Warning, t, this.sanitize(e));
   }
   error(t, e) {
-    this.logStrategy.execute(r.Error, t, e);
+    this.logStrategy.execute(i.Error, t, this.sanitize(e));
   }
   fatal(t, e) {
-    this.logStrategy.execute(r.Fatal, t, e);
+    this.logStrategy.execute(i.Fatal, t, this.sanitize(e));
   }
 }
 export {

package/logger/index.d.ts

@@ -1,4 +1,5 @@
 import Logger from './Logger';
-import type { LogProperties, LogStrategy } from './types';
+import type { LogStrategy } from './types';
 import { LogLevel } from './types';
-export { Logger, LogLevel, LogProperties, LogStrategy };
+import sanitizeAsStringDict from './sanitizeAsStringDict';
+export { Logger, LogLevel, LogStrategy, sanitizeAsStringDict };

package/logger/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./Logger.js"),g=require("./types.js");exports.Logger=e;exports.LogLevel=g.LogLevel;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./Logger.js"),r=require("./types.js"),g=require("./sanitizeAsStringDict.js");exports.Logger=e;exports.LogLevel=r.LogLevel;exports.sanitizeAsStringDict=g;

package/logger/index.mjs

@@ -1,6 +1,8 @@
 import { default as r } from "./Logger.mjs";
-import { LogLevel as g } from "./types.mjs";
+import { LogLevel as a } from "./types.mjs";
+import { default as g } from "./sanitizeAsStringDict.mjs";
 export {
-  g as LogLevel,
-  r as Logger
+  a as LogLevel,
+  r as Logger,
+  g as sanitizeAsStringDict
 };

package/logger/sanitizeAsStringDict.d.ts

@@ -0,0 +1,2 @@
+declare function sanitizeAsStringDict<T = unknown>(properties?: T): Record<string, string> | undefined;
+export default sanitizeAsStringDict;

package/logger/sanitizeAsStringDict.js

@@ -0,0 +1 @@
+"use strict";function s(n,t){return t?`${t}.${n}`:n}function o(n,t,u){return Object.entries(n).reduce((e,[i,r])=>{const f=s(i,u);return t[f]!==void 0?e:typeof r=="string"?(t[f]=r,e):typeof r=="number"?(t[f]=r.toString(),e):typeof r=="object"&&r?o(r,e,i):(t[f]=String(r),t)},t)}function b(n){if(n)return o(n,{})}module.exports=b;

package/logger/sanitizeAsStringDict.mjs

@@ -0,0 +1,19 @@
+function s(n, t) {
+  return t ? `${t}.${n}` : n;
+}
+function o(n, t, u) {
+  return Object.entries(n).reduce(
+    (e, [i, r]) => {
+      const f = s(i, u);
+      return t[f] !== void 0 ? e : typeof r == "string" ? (t[f] = r, e) : typeof r == "number" ? (t[f] = r.toString(), e) : typeof r == "object" && r ? o(r, e, i) : (t[f] = String(r), t);
+    },
+    t
+  );
+}
+function d(n) {
+  if (n)
+    return o(n, {});
+}
+export {
+  d as default
+};

package/logger/types.d.ts

@@ -6,7 +6,16 @@ export declare enum LogLevel {
     Error = 4,
     Fatal = 5
 }
-export declare type LogProperties = Record<string, unknown>;
 export interface LogStrategy {
-    execute: <T extends LogProperties>(logLevel: LogLevel, message: string, properties?: T) => void;
+    /**
+     * Method which should return a sanitized version of `data`.
+     * @param data Additional data from `execute()`
+     */
+    sanitize?(data?: unknown): unknown;
+    /**
+     * @param logLevel `LogLevel`
+     * @param message Message string
+     * @param data Any additional data to log. Sanitized if `sanitize()` method is implemented.
+     */
+    execute(logLevel: LogLevel, message: string, data?: unknown): void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ancon/wildcat-utils",
-  "version": "1.11.0",
+  "version": "1.13.0",
   "private": false,
   "main": "index.cjs",
   "module": "index.js",
@@ -56,6 +56,11 @@
       "require": "./logger/index.cjs",
       "types": "./logger/index.d.ts"
     },
+    "./logger/sanitizeAsStringDict": {
+      "import": "./logger/sanitizeAsStringDict.js",
+      "require": "./logger/sanitizeAsStringDict.cjs",
+      "types": "./logger/sanitizeAsStringDict.d.ts"
+    },
     "./logger/types": {
       "import": "./logger/types.js",
       "require": "./logger/types.cjs",
@@ -76,6 +81,11 @@
       "require": "./outlet/types.cjs",
       "types": "./outlet/types.d.ts"
     },
+    "./printing/getPrinterType": {
+      "import": "./printing/getPrinterType.js",
+      "require": "./printing/getPrinterType.cjs",
+      "types": "./printing/getPrinterType.d.ts"
+    },
     "./printing": {
       "import": "./printing/index.js",
       "require": "./printing/index.cjs",

package/printing/getPrinterType.d.ts

@@ -0,0 +1,8 @@
+import { PrinterType } from '@ancon/wildcat-printing';
+/**
+ * Get a `PrinterType` (EscPos/Star) enum from a printer's `connectionType`
+ * @param printer Printer object
+ * @returns PrinterType enum
+ */
+declare function getPrinterType(printer: unknown): PrinterType;
+export default getPrinterType;

package/printing/getPrinterType.js

@@ -0,0 +1 @@
+"use strict";const t=require("@ancon/wildcat-printing"),n=require("@ancon/wildcat-types");function i(r){const e=r;switch(e==null?void 0:e.connectionType){case n.PrinterConnectionType.StarCloudPrint:return t.PrinterType.Star;case n.PrinterConnectionType.HostAddress:default:return t.PrinterType.EscPos}}module.exports=i;

package/printing/getPrinterType.mjs

@@ -0,0 +1,15 @@
+import { PrinterType as r } from "@ancon/wildcat-printing";
+import { PrinterConnectionType as e } from "@ancon/wildcat-types";
+function c(n) {
+  const t = n;
+  switch (t == null ? void 0 : t.connectionType) {
+    case e.StarCloudPrint:
+      return r.Star;
+    case e.HostAddress:
+    default:
+      return r.EscPos;
+  }
+}
+export {
+  c as default
+};

package/printing/index.d.ts

@@ -1,4 +1,5 @@
 import isValidPrinter from './isValidPrinter';
 import isValidNetworkPrinter from './isValidNetworkPrinter';
 import isValidStarCloudPrinter from './isValidStarCloudPrinter';
-export { isValidPrinter, isValidNetworkPrinter, isValidStarCloudPrinter };
+import getPrinterType from './getPrinterType';
+export { getPrinterType, isValidPrinter, isValidNetworkPrinter, isValidStarCloudPrinter, };

package/printing/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("./isValidPrinter.js"),r=require("./isValidNetworkPrinter.js"),t=require("./isValidStarCloudPrinter.js");exports.isValidPrinter=i;exports.isValidNetworkPrinter=r;exports.isValidStarCloudPrinter=t;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("./isValidPrinter.js"),i=require("./isValidNetworkPrinter.js"),e=require("./isValidStarCloudPrinter.js"),t=require("./getPrinterType.js");require("@ancon/wildcat-printing");require("@ancon/wildcat-types");exports.isValidPrinter=r;exports.isValidNetworkPrinter=i;exports.isValidStarCloudPrinter=e;exports.getPrinterType=t;

package/printing/index.mjs

@@ -1,8 +1,12 @@
-import { default as a } from "./isValidPrinter.mjs";
-import { default as i } from "./isValidNetworkPrinter.mjs";
-import { default as d } from "./isValidStarCloudPrinter.mjs";
+import { default as i } from "./isValidPrinter.mjs";
+import { default as d } from "./isValidNetworkPrinter.mjs";
+import { default as l } from "./isValidStarCloudPrinter.mjs";
+import { default as s } from "./getPrinterType.mjs";
+import "@ancon/wildcat-printing";
+import "@ancon/wildcat-types";
 export {
-  i as isValidNetworkPrinter,
-  a as isValidPrinter,
-  d as isValidStarCloudPrinter
+  s as getPrinterType,
+  d as isValidNetworkPrinter,
+  i as isValidPrinter,
+  l as isValidStarCloudPrinter
 };