@searchspring/snap-toolbox 0.73.5 → 0.73.7

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

@@ -1,6 +1,6 @@
 type ContextVariables = {
     [variable: string]: any;
 };
-export declare function getContext(evaluate?: string[], script?: HTMLScriptElement | string): ContextVariables;
+export declare function getContext(evaluate?: string[], scriptOrSelector?: HTMLScriptElement | string): ContextVariables;
 export {};
 //# sourceMappingURL=getContext.d.ts.map

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,KAAK,gBAAgB,GAAG;IACvB,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,CAAC;CACxB,CAAC;AAgDF,wBAAgB,UAAU,CAAC,QAAQ,GAAE,MAAM,EAAO,EAAE,MAAM,CAAC,EAAE,iBAAiB,GAAG,MAAM,GAAG,gBAAgB,CAsGzG"}
+{"version":3,"file":"getContext.d.ts","sourceRoot":"","sources":["../../../src/getContext/getContext.ts"],"names":[],"mappings":"AAAA,KAAK,gBAAgB,GAAG;IACvB,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,CAAC;CACxB,CAAC;AAgDF,wBAAgB,UAAU,CAAC,QAAQ,GAAE,MAAM,EAAO,EAAE,gBAAgB,CAAC,EAAE,iBAAiB,GAAG,MAAM,GAAG,gBAAgB,CAsGnH"}

package/dist/cjs/getContext/getContext.js

@@ -57,11 +57,12 @@ var JAVASCRIPT_KEYWORDS = new Set([
     'private',
     'public',
 ]);
-function getContext(evaluate, script) {
-    var _a, _b, _c, _d, _e;
+function getContext(evaluate, scriptOrSelector) {
+    var _a, _b, _c, _d;
     if (evaluate === void 0) { evaluate = []; }
-    if (!script || typeof script === 'string') {
-        var scripts = Array.from(document.querySelectorAll(script || 'script[id^=searchspring], script[src*="snapui.searchspring.io"]'));
+    var script;
+    if (!scriptOrSelector || typeof scriptOrSelector === 'string') {
+        var scripts = Array.from(document.querySelectorAll(scriptOrSelector || 'script[id^=searchspring], script[src*="snapui.searchspring.io"]'));
         script = scripts
             .sort(function (a, b) {
             // order them by innerHTML (so that popped script has innerHTML)
@@ -69,15 +70,15 @@ function getContext(evaluate, script) {
         })
             .pop();
     }
-    if (!script || typeof script !== 'object' || script.tagName !== 'SCRIPT') {
+    else if (scriptOrSelector && scriptOrSelector.tagName === 'SCRIPT') {
+        // script is a 'script element'
+        script = scriptOrSelector;
+    }
+    if (!script) {
         throw new Error('getContext: did not find a script tag');
     }
-    var scriptElem = script;
-    // check script type
-    if (!((_a = scriptElem.getAttribute('type')) === null || _a === void 0 ? void 0 : _a.match(/^searchspring/i)) &&
-        !((_b = scriptElem.id) === null || _b === void 0 ? void 0 : _b.match(/^searchspring/i)) &&
-        !((_c = scriptElem.src) === null || _c === void 0 ? void 0 : _c.match(/\/\/snapui.searchspring.io/i))) {
-        throw new Error('getContext: did not find a script from Snap CDN or with attribute (type, id) starting with "searchspring"');
+    if (!scriptOrSelector && !((_a = script.id) === null || _a === void 0 ? void 0 : _a.match(/^searchspring/i)) && !((_b = script.src) === null || _b === void 0 ? void 0 : _b.match(/\/\/snapui.searchspring.io/i))) {
+        throw new Error('getContext: did not find a script from Snap CDN or with attribute \'id\' starting with "searchspring"');
     }
     if ((evaluate && !Array.isArray(evaluate)) || (evaluate && !evaluate.reduce(function (accu, name) { return accu && typeof name === 'string'; }, true))) {
         throw new Error('getContext: first parameter must be an array of strings');
@@ -85,20 +86,20 @@ function getContext(evaluate, script) {
     var siteIdString = 'siteId';
     var attributeVariables = {};
     // grab element attributes and put into variables
-    Object.values(scriptElem.attributes).map(function (attr) {
+    Object.values(script === null || script === void 0 ? void 0 : script.attributes).map(function (attr) {
         var name = attr.nodeName;
         if (evaluate.includes(name)) {
-            attributeVariables[name] = scriptElem.getAttribute(name);
+            attributeVariables[name] = script === null || script === void 0 ? void 0 : script.getAttribute(name);
         }
     });
     var scriptVariables = {};
-    var scriptInnerHTML = scriptElem.innerHTML;
+    var scriptInnerHTML = script === null || script === void 0 ? void 0 : script.innerHTML;
     // attempt to grab inner HTML variables
-    var scriptInnerVars = (_d = scriptInnerHTML
+    var scriptInnerVars = (_c = scriptInnerHTML
         // first remove all string literals (including template literals) to avoid false matches
         .replace(/`(?:\\[\s\S]|[^`\\])*`|'(?:\\[\s\S]|[^'\\])*'|"(?:\\[\s\S]|[^"\\])*"/g, '')
         // then find variable assignments
-        .match(/([a-zA-Z_$][a-zA-Z_$0-9]*)\s*=/g)) === null || _d === void 0 ? void 0 : _d.map(function (match) { return match.replace(/[\s=]/g, ''); });
+        .match(/([a-zA-Z_$][a-zA-Z_$0-9]*)\s*=/g)) === null || _c === void 0 ? void 0 : _c.map(function (match) { return match.replace(/[\s=]/g, ''); });
     var combinedVars = evaluate.concat(scriptInnerVars || []);
     // de-dupe vars
     var evaluateVars = combinedVars.filter(function (item, index) {
@@ -129,7 +130,7 @@ function getContext(evaluate, script) {
     if (evaluate.includes(siteIdString)) {
         // if we didnt find a siteId in the context, lets grab the id from the src url.
         if (!variables[siteIdString]) {
-            var siteId = (_e = script.getAttribute('src')) === null || _e === void 0 ? void 0 : _e.match(/.*snapui.searchspring.io\/([a-zA-Z0-9]{6})\//);
+            var siteId = (_d = script.getAttribute('src')) === null || _d === void 0 ? void 0 : _d.match(/.*snapui.searchspring.io\/([a-zA-Z0-9]{6})\//);
             if (siteId && siteId.length > 1) {
                 variables.siteId = siteId[1];
             }

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

@@ -1,6 +1,6 @@
 type ContextVariables = {
     [variable: string]: any;
 };
-export declare function getContext(evaluate?: string[], script?: HTMLScriptElement | string): ContextVariables;
+export declare function getContext(evaluate?: string[], scriptOrSelector?: HTMLScriptElement | string): ContextVariables;
 export {};
 //# sourceMappingURL=getContext.d.ts.map

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,KAAK,gBAAgB,GAAG;IACvB,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,CAAC;CACxB,CAAC;AAgDF,wBAAgB,UAAU,CAAC,QAAQ,GAAE,MAAM,EAAO,EAAE,MAAM,CAAC,EAAE,iBAAiB,GAAG,MAAM,GAAG,gBAAgB,CAsGzG"}
+{"version":3,"file":"getContext.d.ts","sourceRoot":"","sources":["../../../src/getContext/getContext.ts"],"names":[],"mappings":"AAAA,KAAK,gBAAgB,GAAG;IACvB,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,CAAC;CACxB,CAAC;AAgDF,wBAAgB,UAAU,CAAC,QAAQ,GAAE,MAAM,EAAO,EAAE,gBAAgB,CAAC,EAAE,iBAAiB,GAAG,MAAM,GAAG,gBAAgB,CAsGnH"}

package/dist/esm/getContext/getContext.js

@@ -43,9 +43,10 @@ const JAVASCRIPT_KEYWORDS = new Set([
     'private',
     'public',
 ]);
-export function getContext(evaluate = [], script) {
-    if (!script || typeof script === 'string') {
-        const scripts = Array.from(document.querySelectorAll(script || 'script[id^=searchspring], script[src*="snapui.searchspring.io"]'));
+export function getContext(evaluate = [], scriptOrSelector) {
+    let script;
+    if (!scriptOrSelector || typeof scriptOrSelector === 'string') {
+        const scripts = Array.from(document.querySelectorAll(scriptOrSelector || 'script[id^=searchspring], script[src*="snapui.searchspring.io"]'));
         script = scripts
             .sort((a, b) => {
             // order them by innerHTML (so that popped script has innerHTML)
@@ -53,15 +54,15 @@ export function getContext(evaluate = [], script) {
         })
             .pop();
     }
-    if (!script || typeof script !== 'object' || script.tagName !== 'SCRIPT') {
+    else if (scriptOrSelector && scriptOrSelector.tagName === 'SCRIPT') {
+        // script is a 'script element'
+        script = scriptOrSelector;
+    }
+    if (!script) {
         throw new Error('getContext: did not find a script tag');
     }
-    const scriptElem = script;
-    // check script type
-    if (!scriptElem.getAttribute('type')?.match(/^searchspring/i) &&
-        !scriptElem.id?.match(/^searchspring/i) &&
-        !scriptElem.src?.match(/\/\/snapui.searchspring.io/i)) {
-        throw new Error('getContext: did not find a script from Snap CDN or with attribute (type, id) starting with "searchspring"');
+    if (!scriptOrSelector && !script.id?.match(/^searchspring/i) && !script.src?.match(/\/\/snapui.searchspring.io/i)) {
+        throw new Error('getContext: did not find a script from Snap CDN or with attribute \'id\' starting with "searchspring"');
     }
     if ((evaluate && !Array.isArray(evaluate)) || (evaluate && !evaluate.reduce((accu, name) => accu && typeof name === 'string', true))) {
         throw new Error('getContext: first parameter must be an array of strings');
@@ -69,14 +70,14 @@ export function getContext(evaluate = [], script) {
     const siteIdString = 'siteId';
     const attributeVariables = {};
     // grab element attributes and put into variables
-    Object.values(scriptElem.attributes).map((attr) => {
+    Object.values(script?.attributes).map((attr) => {
         const name = attr.nodeName;
         if (evaluate.includes(name)) {
-            attributeVariables[name] = scriptElem.getAttribute(name);
+            attributeVariables[name] = script?.getAttribute(name);
         }
     });
     const scriptVariables = {};
-    const scriptInnerHTML = scriptElem.innerHTML;
+    const scriptInnerHTML = script?.innerHTML;
     // attempt to grab inner HTML variables
     const scriptInnerVars = scriptInnerHTML
         // first remove all string literals (including template literals) to avoid false matches

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@searchspring/snap-toolbox",
-	"version": "0.73.5",
+	"version": "0.73.7",
 	"description": "Snap Toolbox",
 	"main": "dist/cjs/index.js",
 	"module": "dist/esm/index.js",
@@ -23,5 +23,5 @@
 	"files": [
 		"dist/**/*"
 	],
-	"gitHead": "3052c4ea9cc631b0b398c72ea0f155084e15b7ee"
+	"gitHead": "8da3a6b990f69a5cea07aa4570db108a83952f4c"
 }