@searchspring/snap-toolbox 0.46.0 → 0.47.0

package/dist/cjs/getContext/getContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getContext.d.ts","sourceRoot":"","sources":["../../../src/getContext/getContext.ts"],"names":[],"mappings":"AAAA,aAAK,gBAAgB,GAAG;IACvB,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,CAAC;CACxB,CAAC;AAEF,wBAAgB,UAAU,CAAC,QAAQ,GAAE,MAAM,EAAO,EAAE,MAAM,CAAC,EAAE,iBAAiB,GAAG,MAAM,GAAG,gBAAgB,CAsEzG"}
+{"version":3,"file":"getContext.d.ts","sourceRoot":"","sources":["../../../src/getContext/getContext.ts"],"names":[],"mappings":"AAAA,aAAK,gBAAgB,GAAG;IACvB,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,CAAC;CACxB,CAAC;AAEF,wBAAgB,UAAU,CAAC,QAAQ,GAAE,MAAM,EAAO,EAAE,MAAM,CAAC,EAAE,iBAAiB,GAAG,MAAM,GAAG,gBAAgB,CAwEzG"}

package/dist/cjs/getContext/getContext.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getContext = void 0;
 function getContext(evaluate, script) {
@@ -27,24 +38,21 @@ function getContext(evaluate, script) {
         throw new Error('getContext: first parameter must be an array of strings');
     }
     var siteIdString = 'siteId';
-    var variables = {};
-    // evaluate text and put into variables
-    evaluate === null || evaluate === void 0 ? void 0 : evaluate.forEach(function (name) {
-        var fn = new Function("\n\t\t\tvar ".concat(evaluate.join(', '), ";\n\t\t\t").concat(scriptElem.innerHTML, "\n\t\t\treturn ").concat(name, ";\n\t\t"));
-        variables[name] = fn();
-    });
+    var attributeVariables = {};
     // grab element attributes and put into variables
     Object.values(scriptElem.attributes).map(function (attr) {
         var name = attr.nodeName;
         if (evaluate.includes(name)) {
-            variables[name] = scriptElem.getAttribute(name);
+            attributeVariables[name] = scriptElem.getAttribute(name);
         }
     });
-    // remove undefined entries
-    Object.keys(variables).forEach(function (key) {
-        if (typeof variables[key] === 'undefined')
-            delete variables[key];
+    var scriptVariables = {};
+    // evaluate text and put into variables
+    evaluate === null || evaluate === void 0 ? void 0 : evaluate.forEach(function (name) {
+        var fn = new Function("\n\t\t\tvar ".concat(evaluate.join(', '), ";\n\t\t\t").concat(scriptElem.innerHTML, "\n\t\t\treturn ").concat(name, ";\n\t\t"));
+        scriptVariables[name] = fn();
     });
+    var variables = __assign(__assign({}, removeUndefined(attributeVariables)), removeUndefined(scriptVariables));
     if (evaluate.includes(siteIdString)) {
         // if we didnt find a siteId in the context, lets grab the id from the src url.
         if (!variables[siteIdString]) {
@@ -57,3 +65,10 @@ function getContext(evaluate, script) {
     return variables;
 }
 exports.getContext = getContext;
+function removeUndefined(variables) {
+    Object.keys(variables).forEach(function (key) {
+        if (typeof variables[key] === 'undefined')
+            delete variables[key];
+    });
+    return variables;
+}

package/dist/esm/getContext/getContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getContext.d.ts","sourceRoot":"","sources":["../../../src/getContext/getContext.ts"],"names":[],"mappings":"AAAA,aAAK,gBAAgB,GAAG;IACvB,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,CAAC;CACxB,CAAC;AAEF,wBAAgB,UAAU,CAAC,QAAQ,GAAE,MAAM,EAAO,EAAE,MAAM,CAAC,EAAE,iBAAiB,GAAG,MAAM,GAAG,gBAAgB,CAsEzG"}
+{"version":3,"file":"getContext.d.ts","sourceRoot":"","sources":["../../../src/getContext/getContext.ts"],"names":[],"mappings":"AAAA,aAAK,gBAAgB,GAAG;IACvB,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,CAAC;CACxB,CAAC;AAEF,wBAAgB,UAAU,CAAC,QAAQ,GAAE,MAAM,EAAO,EAAE,MAAM,CAAC,EAAE,iBAAiB,GAAG,MAAM,GAAG,gBAAgB,CAwEzG"}

package/dist/esm/getContext/getContext.js

@@ -22,7 +22,15 @@ export function getContext(evaluate = [], script) {
         throw new Error('getContext: first parameter must be an array of strings');
     }
     const siteIdString = 'siteId';
-    const variables = {};
+    const attributeVariables = {};
+    // grab element attributes and put into variables
+    Object.values(scriptElem.attributes).map((attr) => {
+        const name = attr.nodeName;
+        if (evaluate.includes(name)) {
+            attributeVariables[name] = scriptElem.getAttribute(name);
+        }
+    });
+    const scriptVariables = {};
     // evaluate text and put into variables
     evaluate?.forEach((name) => {
         const fn = new Function(`
@@ -30,20 +38,12 @@ export function getContext(evaluate = [], script) {
 			${scriptElem.innerHTML}
 			return ${name};
 		`);
-        variables[name] = fn();
-    });
-    // grab element attributes and put into variables
-    Object.values(scriptElem.attributes).map((attr) => {
-        const name = attr.nodeName;
-        if (evaluate.includes(name)) {
-            variables[name] = scriptElem.getAttribute(name);
-        }
-    });
-    // remove undefined entries
-    Object.keys(variables).forEach((key) => {
-        if (typeof variables[key] === 'undefined')
-            delete variables[key];
+        scriptVariables[name] = fn();
     });
+    const variables = {
+        ...removeUndefined(attributeVariables),
+        ...removeUndefined(scriptVariables),
+    };
     if (evaluate.includes(siteIdString)) {
         // if we didnt find a siteId in the context, lets grab the id from the src url.
         if (!variables[siteIdString]) {
@@ -55,3 +55,10 @@ export function getContext(evaluate = [], script) {
     }
     return variables;
 }
+function removeUndefined(variables) {
+    Object.keys(variables).forEach((key) => {
+        if (typeof variables[key] === 'undefined')
+            delete variables[key];
+    });
+    return variables;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@searchspring/snap-toolbox",
-	"version": "0.46.0",
+	"version": "0.47.0",
 	"description": "Snap Toolbox",
 	"main": "dist/cjs/index.js",
 	"module": "dist/esm/index.js",
@@ -23,5 +23,5 @@
 	"files": [
 		"dist/**/*"
 	],
-	"gitHead": "b92fc5fe0dd848d4ccdd6242dce7a70be53cb99c"
+	"gitHead": "a63e30a2be1a74dabf22063eddb28e81ef1b1aa1"
 }