cx 24.11.4 → 25.1.1

package/src/data/StringTemplate.js

@@ -1,92 +1,92 @@
-import { expression } from "./Expression";
-
-import { quoteStr } from "../util/quote";
-
-function plus(str) {
-   return str.length ? str + " + " : str;
-}
-
-export function stringTemplate(str) {
-   let tplCache = getTplCache();
-   let expr = tplCache[str];
-   if (expr) return expr;
-
-   expr = "";
-
-   let termStart = -1,
-      quoteStart = 0,
-      term,
-      bracketsOpen = 0,
-      percentSign;
-
-   for (let i = 0; i < str.length; i++) {
-      let c = str[i];
-      switch (c) {
-         case "{":
-            if (termStart < 0) {
-               if (str[i + 1] == "{" && str[i - 1] != "%") {
-                  expr = plus(expr) + quoteStr(str.substring(quoteStart, i) + "{");
-                  i++;
-                  quoteStart = i + 1;
-               } else {
-                  termStart = i + 1;
-                  percentSign = str[i - 1] == "%";
-                  if (i > quoteStart) expr = plus(expr) + quoteStr(str.substring(quoteStart, percentSign ? i - 1 : i));
-                  bracketsOpen = 1;
-               }
-            } else bracketsOpen++;
-            break;
-
-         case "}":
-            if (termStart >= 0) {
-               if (--bracketsOpen == 0) {
-                  term = str.substring(termStart, i);
-                  if (term.indexOf(":") == -1) {
-                     let nullSepIndex = term.indexOf("|");
-                     if (nullSepIndex == -1) term += ":s";
-                     else term = term.substring(0, nullSepIndex) + ":s" + term.substring(nullSepIndex);
-                  }
-                  expr = plus(expr) + (percentSign ? "%{" : "{") + term + "}";
-                  termStart = -1;
-                  quoteStart = i + 1;
-                  bracketsOpen = 0;
-               }
-            } else if (str[i + 1] == "}") {
-               expr = plus(expr) + quoteStr(str.substring(quoteStart, i) + "}");
-               i++;
-               quoteStart = i + 1;
-            }
-            break;
-      }
-   }
-
-   if (quoteStart < str.length) expr = plus(expr) + quoteStr(str.substring(quoteStart));
-
-   return (tplCache[str] = expression(expr));
-}
-
-export const StringTemplate = {
-   get: function (str) {
-      return stringTemplate(str);
-   },
-
-   compile: function (str) {
-      return stringTemplate(str).memoize();
-   },
-
-   format: function (format, ...args) {
-      return stringTemplate(format)(args);
-   },
-};
-
-let tplCache = {};
-
-let getTplCache = () => tplCache;
-
-export function invalidateStringTemplateCache() {
-   tplCache = {};
-}
-
-export function setGetStringTemplateCacheCallback(callback) {
-   getTplCache = callback;
-}
+import { expression } from "./Expression";
+
+import { quoteStr } from "../util/quote";
+
+function plus(str) {
+   return str.length ? str + " + " : str;
+}
+
+export function stringTemplate(str) {
+   let tplCache = getTplCache();
+   let expr = tplCache[str];
+   if (expr) return expr;
+
+   expr = "";
+
+   let termStart = -1,
+      quoteStart = 0,
+      term,
+      bracketsOpen = 0,
+      percentSign;
+
+   for (let i = 0; i < str.length; i++) {
+      switch (str[i]) {
+         case "{":
+            if (termStart < 0) {
+               if (str[i + 1] == "{" && str[i - 1] != "%") {
+                  expr = plus(expr) + quoteStr(str.substring(quoteStart, i) + "{");
+                  i++;
+                  quoteStart = i + 1;
+               } else {
+                  termStart = i + 1;
+                  percentSign = str[i - 1] == "%";
+                  if (i > quoteStart) expr = plus(expr) + quoteStr(str.substring(quoteStart, percentSign ? i - 1 : i));
+                  bracketsOpen = 1;
+                  quoteStart = i; // for the case where the brackets are not closed
+               }
+            } else bracketsOpen++;
+            break;
+
+         case "}":
+            if (termStart >= 0) {
+               if (--bracketsOpen == 0) {
+                  term = str.substring(termStart, i);
+                  if (term.indexOf(":") == -1) {
+                     let nullSepIndex = term.indexOf("|");
+                     if (nullSepIndex == -1) term += ":s";
+                     else term = term.substring(0, nullSepIndex) + ":s" + term.substring(nullSepIndex);
+                  }
+                  expr = plus(expr) + (percentSign ? "%{" : "{") + term + "}";
+                  termStart = -1;
+                  quoteStart = i + 1;
+                  bracketsOpen = 0;
+               }
+            } else if (str[i + 1] == "}") {
+               expr = plus(expr) + quoteStr(str.substring(quoteStart, i) + "}");
+               i++;
+               quoteStart = i + 1;
+            }
+            break;
+      }
+   }
+
+   if (quoteStart < str.length) expr = plus(expr) + quoteStr(str.substring(quoteStart));
+
+   return (tplCache[str] = expression(expr));
+}
+
+export const StringTemplate = {
+   get: function (str) {
+      return stringTemplate(str);
+   },
+
+   compile: function (str) {
+      return stringTemplate(str).memoize();
+   },
+
+   format: function (format, ...args) {
+      return stringTemplate(format)(args);
+   },
+};
+
+let tplCache = {};
+
+let getTplCache = () => tplCache;
+
+export function invalidateStringTemplateCache() {
+   tplCache = {};
+}
+
+export function setGetStringTemplateCacheCallback(callback) {
+   getTplCache = callback;
+}

package/src/data/StringTemplate.spec.js

@@ -18,6 +18,11 @@ describe("StringTemplate", function () {
          assert.equal(e({}), 'It\'s "working"!');
       });
 
+      it("allows \\ before a binding", function () {
+         var e = StringTemplate.compile("t\\{person.name}");
+         assert.equal(e({ person: { name: "Ogi" } }), "t\\Ogi");
+      });
+
       it("supports multi-line strings", function () {
          var e = StringTemplate.compile("a\nb");
          assert.equal(e(), "a\nb");
@@ -47,6 +52,11 @@ describe("StringTemplate", function () {
          };
          assert.equal(e(state), "Hello {Jim}");
       });
+
+      it("open brackets are ignored", function () {
+         var e = StringTemplate.compile("B { A");
+         assert.equal(e({}), "B { A");
+      });
    });
 
    describe("supports formatting", function () {
@@ -71,6 +81,18 @@ describe("StringTemplate", function () {
       });
    });
 
+   describe("properly handles backslashes", function () {
+      it("in a string", function () {
+         var e = StringTemplate.compile("a\\b");
+         assert.equal(e(), "a\\b");
+      });
+
+      it.only("before a special character", function () {
+         var e = StringTemplate.compile("\\t");
+         assert.equal(e(), "\\t");
+      });
+   });
+
    describe("supports expressions", function () {
       it("using []", function () {
          var e = StringTemplate.compile("1 + 2 = {[1+2]}");

package/src/ui/Culture.d.ts

@@ -22,6 +22,8 @@ export class Culture {
    static getDefaultDateEncoding(): DateEncoding;
 
    static setDefaultDateEncoding(encoding: DateEncoding): void;
+
+   static invalidateCache(): void;
 }
 
 export interface CultureSpecs {

package/src/ui/Format.js

@@ -1,107 +1,108 @@
-import { Culture, getCurrentCultureCache } from "./Culture";
-import { Format as Fmt, resolveMinMaxFractionDigits, setGetFormatCacheCallback } from "../util/Format";
-import { GlobalCacheIdentifier } from "../util/GlobalCacheIdentifier";
-import { setGetExpressionCacheCallback } from "../data/Expression";
-import { setGetStringTemplateCacheCallback } from "../data/StringTemplate";
-
-export const Format = Fmt;
-
-let cultureSensitiveFormatsRegistered = false;
-
-export function resolveNumberFormattingFlags(flags) {
-   if (!flags) return null;
-   let result = {};
-   if (flags.indexOf("+") >= 0) result.signDisplay = "exceptZero";
-   if (flags.indexOf("c") >= 0) result.notation = "compact";
-   if (flags.indexOf("a") >= 0) result.currencySign = "accounting";
-   return result;
-}
-
-export function enableCultureSensitiveFormatting() {
-   if (cultureSensitiveFormatsRegistered) return;
-
-   cultureSensitiveFormatsRegistered = true;
-
-   Fmt.registerFactory(["number", "n"], (format, minimumFractionDigits, maximumFractionDigits, flags) => {
-      let culture = Culture.getNumberCulture();
-
-      let formatter = culture.getFormatter({
-         ...resolveMinMaxFractionDigits(minimumFractionDigits, maximumFractionDigits),
-         ...resolveNumberFormattingFlags(flags),
-      });
-
-      return (value) => formatter.format(value);
-   });
-
-   Fmt.registerFactory("currency", (format, currency, minimumFractionDigits, maximumFractionDigits, flags) => {
-      let culture = Culture.getNumberCulture();
-      currency = currency || Culture.defaultCurrency;
-
-      let formatter = culture.getFormatter({
-         style: "currency",
-         currency: currency,
-         ...resolveMinMaxFractionDigits(minimumFractionDigits, maximumFractionDigits),
-         ...resolveNumberFormattingFlags(flags),
-      });
-
-      return (value) => formatter.format(value);
-   });
-
-   Fmt.registerFactory(["percentage", "p", "%"], (format, minimumFractionDigits, maximumFractionDigits, flags) => {
-      let culture = Culture.getNumberCulture();
-      let formatter = culture.getFormatter({
-         style: "percent",
-         ...resolveMinMaxFractionDigits(minimumFractionDigits, maximumFractionDigits),
-         ...resolveNumberFormattingFlags(flags),
-      });
-      return (value) => formatter.format(value);
-   });
-
-   Fmt.registerFactory(["percentSign", "ps"], (format, minimumFractionDigits, maximumFractionDigits, flags) => {
-      let culture = Culture.getNumberCulture();
-      let formatter = culture.getFormatter({
-         style: "percent",
-         ...resolveMinMaxFractionDigits(minimumFractionDigits, maximumFractionDigits),
-         ...resolveNumberFormattingFlags(flags),
-      });
-      return (value) => formatter.format(value / 100);
-   });
-
-   Fmt.registerFactory(["date", "d"], (fmt, format = "yyyyMMdd") => {
-      let culture = Culture.getDateTimeCulture();
-      let formatter = culture.getFormatter(format);
-      return (value) => formatter.format(new Date(value));
-   });
-
-   Fmt.registerFactory(["time", "t"], (fmt, format = "hhmmss") => {
-      let culture = Culture.getDateTimeCulture();
-      let formatter = culture.getFormatter(format);
-      return (value) => formatter.format(new Date(value));
-   });
-
-   Fmt.registerFactory(["datetime", "dt"], (fmt, format = "yyyyMd hhmm") => {
-      let culture = Culture.getDateTimeCulture();
-      let formatter = culture.getFormatter(format);
-      return (value) => formatter.format(new Date(value));
-   });
-
-   setGetFormatCacheCallback(() => {
-      let cache = getCurrentCultureCache();
-      if (!cache.formatCache) cache.formatCache = {};
-      return cache.formatCache;
-   });
-
-   setGetExpressionCacheCallback(() => {
-      let cache = getCurrentCultureCache();
-      if (!cache.exprCache) cache.exprCache = {};
-      return cache.exprCache;
-   });
-
-   setGetStringTemplateCacheCallback(() => {
-      let cache = getCurrentCultureCache();
-      if (!cache.strTplCache) cache.strTplCache = {};
-      return cache.strTplCache;
-   });
-
-   GlobalCacheIdentifier.change();
-}
+import { Culture, getCurrentCultureCache } from "./Culture";
+import { Format as Fmt, resolveMinMaxFractionDigits, setGetFormatCacheCallback } from "../util/Format";
+import { setGetExpressionCacheCallback } from "../data/Expression";
+import { setGetStringTemplateCacheCallback } from "../data/StringTemplate";
+import { parseDateInvariant } from "../util";
+import { GlobalCacheIdentifier } from "../util/GlobalCacheIdentifier";
+
+export const Format = Fmt;
+
+let cultureSensitiveFormatsRegistered = false;
+
+export function resolveNumberFormattingFlags(flags) {
+   if (!flags) return null;
+   let result = {};
+   if (flags.indexOf("+") >= 0) result.signDisplay = "exceptZero";
+   if (flags.indexOf("c") >= 0) result.notation = "compact";
+   if (flags.indexOf("a") >= 0) result.currencySign = "accounting";
+   return result;
+}
+
+export function enableCultureSensitiveFormatting() {
+   if (cultureSensitiveFormatsRegistered) return;
+
+   cultureSensitiveFormatsRegistered = true;
+
+   Fmt.registerFactory(["number", "n"], (format, minimumFractionDigits, maximumFractionDigits, flags) => {
+      let culture = Culture.getNumberCulture();
+
+      let formatter = culture.getFormatter({
+         ...resolveMinMaxFractionDigits(minimumFractionDigits, maximumFractionDigits),
+         ...resolveNumberFormattingFlags(flags),
+      });
+
+      return (value) => formatter.format(value);
+   });
+
+   Fmt.registerFactory("currency", (format, currency, minimumFractionDigits, maximumFractionDigits, flags) => {
+      let culture = Culture.getNumberCulture();
+      currency = currency || Culture.defaultCurrency;
+
+      let formatter = culture.getFormatter({
+         style: "currency",
+         currency: currency,
+         ...resolveMinMaxFractionDigits(minimumFractionDigits, maximumFractionDigits),
+         ...resolveNumberFormattingFlags(flags),
+      });
+
+      return (value) => formatter.format(value);
+   });
+
+   Fmt.registerFactory(["percentage", "p", "%"], (format, minimumFractionDigits, maximumFractionDigits, flags) => {
+      let culture = Culture.getNumberCulture();
+      let formatter = culture.getFormatter({
+         style: "percent",
+         ...resolveMinMaxFractionDigits(minimumFractionDigits, maximumFractionDigits),
+         ...resolveNumberFormattingFlags(flags),
+      });
+      return (value) => formatter.format(value);
+   });
+
+   Fmt.registerFactory(["percentSign", "ps"], (format, minimumFractionDigits, maximumFractionDigits, flags) => {
+      let culture = Culture.getNumberCulture();
+      let formatter = culture.getFormatter({
+         style: "percent",
+         ...resolveMinMaxFractionDigits(minimumFractionDigits, maximumFractionDigits),
+         ...resolveNumberFormattingFlags(flags),
+      });
+      return (value) => formatter.format(value / 100);
+   });
+
+   Fmt.registerFactory(["date", "d"], (fmt, format = "yyyyMMdd") => {
+      let culture = Culture.getDateTimeCulture();
+      let formatter = culture.getFormatter(format);
+      return (value) => formatter.format(parseDateInvariant(value));
+   });
+
+   Fmt.registerFactory(["time", "t"], (fmt, format = "hhmmss") => {
+      let culture = Culture.getDateTimeCulture();
+      let formatter = culture.getFormatter(format);
+      return (value) => formatter.format(parseDateInvariant(value));
+   });
+
+   Fmt.registerFactory(["datetime", "dt"], (fmt, format = "yyyyMd hhmm") => {
+      let culture = Culture.getDateTimeCulture();
+      let formatter = culture.getFormatter(format);
+      return (value) => formatter.format(parseDateInvariant(value));
+   });
+
+   setGetFormatCacheCallback(() => {
+      let cache = getCurrentCultureCache();
+      if (!cache.formatCache) cache.formatCache = {};
+      return cache.formatCache;
+   });
+
+   setGetExpressionCacheCallback(() => {
+      let cache = getCurrentCultureCache();
+      if (!cache.exprCache) cache.exprCache = {};
+      return cache.exprCache;
+   });
+
+   setGetStringTemplateCacheCallback(() => {
+      let cache = getCurrentCultureCache();
+      if (!cache.strTplCache) cache.strTplCache = {};
+      return cache.strTplCache;
+   });
+
+   GlobalCacheIdentifier.change();
+}