cx 25.1.2 → 25.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "cx",
-   "version": "25.1.2",
+   "version": "25.2.0",
    "description": "Advanced JavaScript UI framework for admin and dashboard applications with ready to use grid, form and chart components.",
    "main": "index.js",
    "jsnext:main": "src/index.js",

package/src/data/StringTemplate.js

@@ -60,7 +60,7 @@ export function stringTemplate(str) {
       }
    }
 
-   if (quoteStart < str.length) expr = plus(expr) + quoteStr(str.substring(quoteStart));
+   if (quoteStart < str.length || expr.length == 0) expr = plus(expr) + quoteStr(str.substring(quoteStart));
 
    return (tplCache[str] = expression(expr));
 }

package/src/data/StringTemplate.spec.js

@@ -13,6 +13,11 @@ describe("StringTemplate", function () {
          assert.equal(e(state), "Hello Jim");
       });
 
+      it("allows empty strings", function () {
+         let e = StringTemplate.compile("");
+         assert.equal(e(), "");
+      });
+
       it("properly encodes ' and \"", function () {
          var e = StringTemplate.compile('It\'s "working"!');
          assert.equal(e({}), 'It\'s "working"!');
@@ -87,7 +92,7 @@ describe("StringTemplate", function () {
          assert.equal(e(), "a\\b");
       });
 
-      it.only("before a special character", function () {
+      it("before a special character", function () {
          var e = StringTemplate.compile("\\t");
          assert.equal(e(), "\\t");
       });

package/src/data/StructuredSelector.js

@@ -1,131 +1,132 @@
-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";
+import { isString } from "../util/isString";
+
+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 (isString(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());
+   }
+}

package/src/data/getSelector.js

@@ -1,48 +1,49 @@
-import { Binding } from "./Binding";
-import { Expression } from "./Expression";
-import { StringTemplate } from "./StringTemplate";
-import { isArray } from "../util/isArray";
-import { createStructuredSelector } from "./createStructuredSelector";
-import { isSelector } from "./isSelector";
-import { isAccessorChain } from "./createAccessorModelProxy";
-
-var undefinedF = () => undefined;
-var nullF = () => null;
-
-export function getSelector(config) {
-   if (config === undefined) return undefinedF;
-   if (config === null) return nullF;
-
-   switch (typeof config) {
-      case "object":
-         if (isArray(config)) {
-            let selectors = config.map((x) => getSelector(x));
-            return (data) => selectors.map((elementSelector) => elementSelector(data));
-         }
-
-         //toString converts accessor chains to binding paths
-         if (config.bind) return Binding.get(config.bind.toString()).value;
-
-         if (config.tpl) return StringTemplate.get(config.tpl);
-
-         if (config.expr) return Expression.get(config.expr);
-
-         if (config.get) return config.get;
-
-         let selectors = {};
-         let constants = {};
-
-         for (let key in config) {
-            if (isSelector(config[key])) selectors[key] = getSelector(config[key]);
-            else constants[key] = config[key];
-         }
-         return createStructuredSelector(selectors, constants);
-
-      case "function":
-         if (isAccessorChain(config)) return Binding.get(config.toString()).value;
-         return config;
-
-      default:
-         return () => config;
-   }
-}
+import { Binding } from "./Binding";
+import { Expression } from "./Expression";
+import { StringTemplate } from "./StringTemplate";
+import { isArray } from "../util/isArray";
+import { createStructuredSelector } from "./createStructuredSelector";
+import { isSelector } from "./isSelector";
+import { isAccessorChain } from "./createAccessorModelProxy";
+import { isString } from "../util/isString";
+
+var undefinedF = () => undefined;
+var nullF = () => null;
+
+export function getSelector(config) {
+   if (config === undefined) return undefinedF;
+   if (config === null) return nullF;
+
+   switch (typeof config) {
+      case "object":
+         if (isArray(config)) {
+            let selectors = config.map((x) => getSelector(x));
+            return (data) => selectors.map((elementSelector) => elementSelector(data));
+         }
+
+         //toString converts accessor chains to binding paths
+         if (config.bind) return Binding.get(config.bind.toString()).value;
+
+         if (isString(config.tpl)) return StringTemplate.get(config.tpl);
+
+         if (config.expr) return Expression.get(config.expr);
+
+         if (config.get) return config.get;
+
+         let selectors = {};
+         let constants = {};
+
+         for (let key in config) {
+            if (isSelector(config[key])) selectors[key] = getSelector(config[key]);
+            else constants[key] = config[key];
+         }
+         return createStructuredSelector(selectors, constants);
+
+      case "function":
+         if (isAccessorChain(config)) return Binding.get(config.toString()).value;
+         return config;
+
+      default:
+         return () => config;
+   }
+}