cx 24.4.6 → 24.4.8

package/src/data/StringTemplate.spec.js

@@ -1,105 +1,105 @@
-import { StringTemplate } from "./StringTemplate";
-import assert from "assert";
-
-describe("StringTemplate", function () {
-   describe("#compile()", function () {
-      it("returns a selector", function () {
-         var e = StringTemplate.compile("Hello {person.name}");
-         var state = {
-            person: {
-               name: "Jim",
-            },
-         };
-         assert.equal(e(state), "Hello Jim");
-      });
-
-      it("properly encodes ' and \"", function () {
-         var e = StringTemplate.compile('It\'s "working"!');
-         assert.equal(e({}), 'It\'s "working"!');
-      });
-
-      it("supports multi-line strings", function () {
-         var e = StringTemplate.compile("a\nb");
-         assert.equal(e(), "a\nb");
-
-         var e = StringTemplate.compile("a\r\nb");
-         assert.equal(e(), "a\r\nb");
-      });
-   });
-
-   describe("double brackets are used to escape brackets", function () {
-      it("double brackets are preserved", function () {
-         var e = StringTemplate.compile("Hello {{person.name}}");
-         var state = {
-            person: {
-               name: "Jim",
-            },
-         };
-         assert.equal(e(state), "Hello {person.name}");
-      });
-
-      it("triple brackets are converted to single brackets and a binding", function () {
-         var e = StringTemplate.compile("Hello {{{person.name}}}");
-         var state = {
-            person: {
-               name: "Jim",
-            },
-         };
-         assert.equal(e(state), "Hello {Jim}");
-      });
-   });
-
-   describe("supports formatting", function () {
-      it("with colon", function () {
-         var e = StringTemplate.compile("{str:suffix;kg}");
-         assert.equal(e({ str: "5" }), "5kg");
-      });
-
-      it("with multiple formats", function () {
-         var e = StringTemplate.compile("{str:suffix;kg:wrap;(;)}");
-         assert.equal(e({ str: "5" }), "(5kg)");
-      });
-
-      it("with null values", function () {
-         var e = StringTemplate.compile("{str:suffix;kg:|N/A}");
-         assert.equal(e({ str: null }), "N/A");
-      });
-
-      it("of null values", function () {
-         var e = StringTemplate.compile("{str|N/A}");
-         assert.equal(e({ str: null }), "N/A");
-      });
-   });
-
-   describe("supports expressions", function () {
-      it("using []", function () {
-         var e = StringTemplate.compile("1 + 2 = {[1+2]}");
-         assert.equal(e(), "1 + 2 = 3");
-      });
-
-      it("using %", function () {
-         var e = StringTemplate.compile("1 + 2 = %{1+2}");
-         assert.equal(e(), "1 + 2 = 3");
-      });
-
-      it("with subexpressions", function () {
-         var e = StringTemplate.compile("1 + 2 = {[%{1+2}]}");
-         assert.equal(e(), "1 + 2 = 3");
-      });
-
-      it("with a conditional operator", function () {
-         var e = StringTemplate.compile("1 + 2 = {[true ? 3 : 2]:s}");
-         assert.equal(e(), "1 + 2 = 3");
-      });
-
-      it("with sub-expression formatting", function () {
-         var e = StringTemplate.compile("{[!!{person.age} ? {person.age:suffix; years old} : 'Age unknown']}");
-         var state = {
-            person: {
-               age: 32,
-            },
-         };
-         assert.equal(e(state), "32 years old");
-      });
-   });
-});
+import { StringTemplate } from "./StringTemplate";
+import assert from "assert";
+
+describe("StringTemplate", function () {
+   describe("#compile()", function () {
+      it("returns a selector", function () {
+         var e = StringTemplate.compile("Hello {person.name}");
+         var state = {
+            person: {
+               name: "Jim",
+            },
+         };
+         assert.equal(e(state), "Hello Jim");
+      });
+
+      it("properly encodes ' and \"", function () {
+         var e = StringTemplate.compile('It\'s "working"!');
+         assert.equal(e({}), 'It\'s "working"!');
+      });
+
+      it("supports multi-line strings", function () {
+         var e = StringTemplate.compile("a\nb");
+         assert.equal(e(), "a\nb");
+
+         var e = StringTemplate.compile("a\r\nb");
+         assert.equal(e(), "a\r\nb");
+      });
+   });
+
+   describe("double brackets are used to escape brackets", function () {
+      it("double brackets are preserved", function () {
+         var e = StringTemplate.compile("Hello {{person.name}}");
+         var state = {
+            person: {
+               name: "Jim",
+            },
+         };
+         assert.equal(e(state), "Hello {person.name}");
+      });
+
+      it("triple brackets are converted to single brackets and a binding", function () {
+         var e = StringTemplate.compile("Hello {{{person.name}}}");
+         var state = {
+            person: {
+               name: "Jim",
+            },
+         };
+         assert.equal(e(state), "Hello {Jim}");
+      });
+   });
+
+   describe("supports formatting", function () {
+      it("with colon", function () {
+         var e = StringTemplate.compile("{str:suffix;kg}");
+         assert.equal(e({ str: "5" }), "5kg");
+      });
+
+      it("with multiple formats", function () {
+         var e = StringTemplate.compile("{str:suffix;kg:wrap;(;)}");
+         assert.equal(e({ str: "5" }), "(5kg)");
+      });
+
+      it("with null values", function () {
+         var e = StringTemplate.compile("{str:suffix;kg:|N/A}");
+         assert.equal(e({ str: null }), "N/A");
+      });
+
+      it("of null values", function () {
+         var e = StringTemplate.compile("{str|N/A}");
+         assert.equal(e({ str: null }), "N/A");
+      });
+   });
+
+   describe("supports expressions", function () {
+      it("using []", function () {
+         var e = StringTemplate.compile("1 + 2 = {[1+2]}");
+         assert.equal(e(), "1 + 2 = 3");
+      });
+
+      it("using %", function () {
+         var e = StringTemplate.compile("1 + 2 = %{1+2}");
+         assert.equal(e(), "1 + 2 = 3");
+      });
+
+      it("with subexpressions", function () {
+         var e = StringTemplate.compile("1 + 2 = {[%{1+2}]}");
+         assert.equal(e(), "1 + 2 = 3");
+      });
+
+      it("with a conditional operator", function () {
+         var e = StringTemplate.compile("1 + 2 = {[true ? 3 : 2]:s}");
+         assert.equal(e(), "1 + 2 = 3");
+      });
+
+      it("with sub-expression formatting", function () {
+         var e = StringTemplate.compile("{[!!{person.age} ? {person.age:suffix; years old} : 'Age unknown']}");
+         var state = {
+            person: {
+               age: 32,
+            },
+         };
+         assert.equal(e(state), "32 years old");
+      });
+   });
+});

package/src/data/StructuredDataAccessor.d.ts

@@ -1,7 +1,7 @@
-export interface StructuredDataAccessor {
-   getSelector(): (data: Cx.Record) => Cx.Record;
-   get(): Cx.Record;
-   setItem(key: string, value: any): boolean;
-   containsKey(key): string;
-   getKeys(): string[];
-}
+export interface StructuredDataAccessor {
+   getSelector(): (data: Cx.Record) => Cx.Record;
+   get(): Cx.Record;
+   setItem(key: string, value: any): boolean;
+   containsKey(key): string;
+   getKeys(): string[];
+}

package/src/data/StructuredSelector.d.ts

@@ -1,17 +1,17 @@
-import { StructuredProp, Record, Selector } from "../core";
-import { View } from "./View";
-
-interface StructuredSelectorConfig {
-   props: StructuredProp;
-   values: Record;
-}
-
-export class StructuredSelector {
-   constructor(config: StructuredSelectorConfig);
-
-   init(store: View);
-
-   create(memoize: boolean = true): Selector<Record>;
-
-   createStoreSelector(): (store: View) => Record;
-}
+import { StructuredProp, Record, Selector } from "../core";
+import { View } from "./View";
+
+interface StructuredSelectorConfig {
+   props: StructuredProp;
+   values: Record;
+}
+
+export class StructuredSelector {
+   constructor(config: StructuredSelectorConfig);
+
+   init(store: View);
+
+   create(memoize: boolean = true): Selector<Record>;
+
+   createStoreSelector(): (store: View) => Record;
+}

package/src/data/StructuredSelector.js

@@ -1,131 +1,131 @@
-import { Binding } from "./Binding";
-import { Expression } from "./Expression";
-import { StringTemplate } from "./StringTemplate";
-import { createStructuredSelector } from "../data/createStructuredSelector";
-import { getSelector } from "../data/getSelector";
-import { isFunction } from "../util/isFunction";
-import { isUndefined } from "../util/isUndefined";
-import { isDefined } from "../util/isDefined";
-import { isArray } from "../util/isArray";
-import { isAccessorChain } from "./createAccessorModelProxy";
-
-function defaultValue(pv) {
-   if (typeof pv == "object" && pv && pv.structured) return pv.defaultValue;
-
-   return pv;
-}
-
-function getSelectorConfig(props, values, nameMap) {
-   let functions = {},
-      structures = {},
-      defaultValues = {},
-      constants,
-      p,
-      v,
-      pv,
-      constant = true;
-
-   for (p in props) {
-      v = values[p];
-      pv = props[p];
-
-      if (isUndefined(v) && pv && (pv.bind || pv.tpl || pv.expr)) v = pv;
-
-      if (v === null) {
-         if (!constants) constants = {};
-         constants[p] = null;
-      } else if (typeof v == "object") {
-         if (v.bind) {
-            if (isUndefined(v.defaultValue) && v != pv) v.defaultValue = defaultValue(pv);
-            if (isDefined(v.defaultValue)) defaultValues[v.bind] = v.defaultValue;
-            nameMap[p] = v.bind;
-            functions[p] = Binding.get(v.bind).value;
-            constant = false;
-         } else if (v.expr) {
-            functions[p] = Expression.get(v.expr);
-            constant = false;
-         } else if (v.get) {
-            functions[p] = v.get;
-            constant = false;
-         } else if (v.tpl) {
-            functions[p] = StringTemplate.get(v.tpl);
-            constant = false;
-         } else if (pv && typeof pv == "object" && pv.structured) {
-            if (isArray(v)) functions[p] = getSelector(v);
-            else {
-               let s = getSelectorConfig(v, v, {});
-               structures[p] = s;
-               Object.assign(defaultValues, s.defaultValues);
-            }
-            constant = false;
-         } else {
-            if (!constants) constants = {};
-            constants[p] = v;
-         }
-      } else if (isFunction(v)) {
-         if (isAccessorChain(v)) {
-            let path = v.toString();
-            nameMap[p] = path;
-            functions[p] = Binding.get(path).value;
-         } else functions[p] = v;
-         constant = false;
-      } else {
-         if (isUndefined(v)) {
-            if (isUndefined(pv)) continue;
-            v = defaultValue(pv);
-         }
-
-         if (isUndefined(v)) continue;
-
-         if (!constants) constants = {};
-
-         constants[p] = v;
-      }
-   }
-
-   return {
-      functions,
-      structures,
-      defaultValues,
-      constants,
-      constant,
-   };
-}
-
-function createSelector({ functions, structures, constants, defaultValues }) {
-   let selector = {};
-
-   for (let n in functions) {
-      selector[n] = functions[n];
-   }
-
-   for (let n in structures) selector[n] = createSelector(structures[n]);
-
-   return createStructuredSelector(selector, constants);
-}
-
-export class StructuredSelector {
-   constructor({ props, values }) {
-      this.nameMap = {};
-      this.config = getSelectorConfig(props, values, this.nameMap);
-   }
-
-   init(store) {
-      store.init(this.config.defaultValues);
-   }
-
-   create(memoize = true) {
-      let selector = createSelector(this.config);
-      if (memoize && selector.memoize) return selector.memoize();
-      return selector;
-   }
-
-   createStoreSelector() {
-      if (this.config.constant) {
-         let result = { ...this.config.constants };
-         return () => result;
-      }
-      let selector = this.create();
-      return (store) => selector(store.getData());
-   }
-}
+import { Binding } from "./Binding";
+import { Expression } from "./Expression";
+import { StringTemplate } from "./StringTemplate";
+import { createStructuredSelector } from "../data/createStructuredSelector";
+import { getSelector } from "../data/getSelector";
+import { isFunction } from "../util/isFunction";
+import { isUndefined } from "../util/isUndefined";
+import { isDefined } from "../util/isDefined";
+import { isArray } from "../util/isArray";
+import { isAccessorChain } from "./createAccessorModelProxy";
+
+function defaultValue(pv) {
+   if (typeof pv == "object" && pv && pv.structured) return pv.defaultValue;
+
+   return pv;
+}
+
+function getSelectorConfig(props, values, nameMap) {
+   let functions = {},
+      structures = {},
+      defaultValues = {},
+      constants,
+      p,
+      v,
+      pv,
+      constant = true;
+
+   for (p in props) {
+      v = values[p];
+      pv = props[p];
+
+      if (isUndefined(v) && pv && (pv.bind || pv.tpl || pv.expr)) v = pv;
+
+      if (v === null) {
+         if (!constants) constants = {};
+         constants[p] = null;
+      } else if (typeof v == "object") {
+         if (v.bind) {
+            if (isUndefined(v.defaultValue) && v != pv) v.defaultValue = defaultValue(pv);
+            if (isDefined(v.defaultValue)) defaultValues[v.bind] = v.defaultValue;
+            nameMap[p] = v.bind;
+            functions[p] = Binding.get(v.bind).value;
+            constant = false;
+         } else if (v.expr) {
+            functions[p] = Expression.get(v.expr);
+            constant = false;
+         } else if (v.get) {
+            functions[p] = v.get;
+            constant = false;
+         } else if (v.tpl) {
+            functions[p] = StringTemplate.get(v.tpl);
+            constant = false;
+         } else if (pv && typeof pv == "object" && pv.structured) {
+            if (isArray(v)) functions[p] = getSelector(v);
+            else {
+               let s = getSelectorConfig(v, v, {});
+               structures[p] = s;
+               Object.assign(defaultValues, s.defaultValues);
+            }
+            constant = false;
+         } else {
+            if (!constants) constants = {};
+            constants[p] = v;
+         }
+      } else if (isFunction(v)) {
+         if (isAccessorChain(v)) {
+            let path = v.toString();
+            nameMap[p] = path;
+            functions[p] = Binding.get(path).value;
+         } else functions[p] = v;
+         constant = false;
+      } else {
+         if (isUndefined(v)) {
+            if (isUndefined(pv)) continue;
+            v = defaultValue(pv);
+         }
+
+         if (isUndefined(v)) continue;
+
+         if (!constants) constants = {};
+
+         constants[p] = v;
+      }
+   }
+
+   return {
+      functions,
+      structures,
+      defaultValues,
+      constants,
+      constant,
+   };
+}
+
+function createSelector({ functions, structures, constants, defaultValues }) {
+   let selector = {};
+
+   for (let n in functions) {
+      selector[n] = functions[n];
+   }
+
+   for (let n in structures) selector[n] = createSelector(structures[n]);
+
+   return createStructuredSelector(selector, constants);
+}
+
+export class StructuredSelector {
+   constructor({ props, values }) {
+      this.nameMap = {};
+      this.config = getSelectorConfig(props, values, this.nameMap);
+   }
+
+   init(store) {
+      store.init(this.config.defaultValues);
+   }
+
+   create(memoize = true) {
+      let selector = createSelector(this.config);
+      if (memoize && selector.memoize) return selector.memoize();
+      return selector;
+   }
+
+   createStoreSelector() {
+      if (this.config.constant) {
+         let result = { ...this.config.constants };
+         return () => result;
+      }
+      let selector = this.create();
+      return (store) => selector(store.getData());
+   }
+}