@ninetailed/experience.js-gatsby 4.2.5 → 4.2.6-beta.1

package/{serialize.js → _tslib.js}

@@ -37,44 +37,5 @@ function __awaiter(thisArg, _arguments, P, generator) {
     });
 }
 
-const createFunctionBody = serializedFunction => {
-  return '"use strict";\n return ' + serializedFunction + ';';
-};
-const deserializeFunction = serializedFunction => {
-  return new Function(createFunctionBody(serializedFunction))();
-};
-const deserializePluginOptionFns = options => {
-  var _a;
-  return (_a = options.serializedFunctionNames) === null || _a === void 0 ? void 0 : _a.reduce((acc, currFuncName) => {
-    const currentFunction = options[currFuncName];
-    if (currentFunction && typeof currentFunction === 'string') {
-      return Object.assign(Object.assign({}, acc), {
-        [currFuncName]: deserializeFunction(currentFunction)
-      });
-    }
-    return acc;
-  }, {});
-};
-const serializePluginOptionFns = pluginOptions => {
-  const serializedFunctionNames = [];
-  const serializedFunctions = Object.keys(pluginOptions).reduce((acc, optionKey) => {
-    const optionValue = pluginOptions[optionKey];
-    if (optionValue && typeof optionValue === 'function') {
-      const serializedFunction = optionValue.toString();
-      serializedFunctionNames.push(optionKey);
-      return Object.assign(Object.assign({}, acc), {
-        [optionKey]: serializedFunction
-      });
-    }
-    return acc;
-  }, {});
-  return {
-    serializedFunctions,
-    serializedFunctionNames
-  };
-};
-
 exports.__awaiter = __awaiter;
 exports.__rest = __rest;
-exports.deserializePluginOptionFns = deserializePluginOptionFns;
-exports.serializePluginOptionFns = serializePluginOptionFns;

package/gatsby-browser.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var serialize = require('./serialize.js');
+var _tslib = require('./_tslib.js');
 var React = require('react');
 var experience_js = require('@ninetailed/experience.js');
 var experience_jsReact = require('@ninetailed/experience.js-react');
@@ -16,25 +16,49 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
+const createFunctionBody = serializedFunction => {
+  return '"use strict";\n return ' + serializedFunction + ';';
+};
+const deserializeFunction = serializedFunction => {
+  return new Function(createFunctionBody(serializedFunction))();
+};
+const deserializePluginOptionFunctions = options => {
+  var _a;
+  return (_a = options.serializedFunctionNames) === null || _a === void 0 ? void 0 : _a.reduce((acc, currFuncName) => {
+    const currentFunction = options[currFuncName];
+    if (currentFunction && typeof currentFunction === 'string') {
+      return Object.assign(Object.assign({}, acc), {
+        [currFuncName]: deserializeFunction(currentFunction)
+      });
+    }
+    return acc;
+  }, {});
+};
+
 let ninetailed;
+const isSerializedPreviewPlugin = options => {
+  return !!(options.customOptions && options.serializedFunctionNames && options.customOptions.serializedFunctionNames);
+};
 const WrapRootElement = _a => {
   var {
       children
     } = _a,
-    options = serialize.__rest(_a, ["children"]);
+    options = _tslib.__rest(_a, ["children"]);
   if (!ninetailed) {
     const resolvedPlugins = loaders_ninetailedPlugins.plugins.map(({
       PluginCtor,
       options
     }) => {
-      if (!options) {
-        return new PluginCtor();
+      if (isSerializedPreviewPlugin(options)) {
+        const updatedOptions = Object.assign(Object.assign(Object.assign({}, options), deserializePluginOptionFunctions(options)), {
+          customOptions: Object.assign(Object.assign({}, options.customOptions), deserializePluginOptionFunctions(options.customOptions))
+        });
+        return new PluginCtor(updatedOptions);
       }
-      if (options && !options.serializedFunctionNames) {
+      if (options) {
         return new PluginCtor(options);
       }
-      const updatedOptions = Object.assign(Object.assign({}, options), serialize.deserializePluginOptionFns(options));
-      return new PluginCtor(updatedOptions);
+      return new PluginCtor();
     });
     const {
       clientId,

package/gatsby-node.js

@@ -2,13 +2,52 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var serialize = require('./serialize.js');
+var _tslib = require('./_tslib.js');
 var require$$0 = require('path');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);
 
+/**
+ * Constructs an object/context holding serialized functions along with an  array of their names
+ * @param objectToSerialize - The object to serialize
+ */
+const constructSerializationContext = objectToSerialize => {
+  return Object.keys(objectToSerialize).reduce((acc, key) => {
+    const optionValue = objectToSerialize[key];
+    if (optionValue && typeof optionValue === 'function') {
+      const serializedFunction = optionValue.toString();
+      // Storing the keys of the serialized functions in a separate array in the context object
+      acc['serializedFunctionsNames'].push(key);
+      return Object.assign(Object.assign({}, acc), {
+        [key]: serializedFunction
+      });
+    }
+    return acc;
+  }, {
+    serializedFunctionsNames: []
+  });
+};
+const serializePluginOptionFunctions = pluginOptions => {
+  const serializedOptionsContext = constructSerializationContext(pluginOptions);
+  const serializedCustomOptionsContext = constructSerializationContext(pluginOptions.customOptions);
+  const {
+      serializedFunctionsNames: serializedOptionFunctionNames
+    } = serializedOptionsContext,
+    serializedOptionFunctions = _tslib.__rest(serializedOptionsContext, ["serializedFunctionsNames"]);
+  const {
+      serializedFunctionsNames: serializedCustomOptionFunctionNames
+    } = serializedCustomOptionsContext,
+    serializedCustomOptionFunctions = _tslib.__rest(serializedCustomOptionsContext, ["serializedFunctionsNames"]);
+  return {
+    serializedOptionFunctions,
+    serializedOptionFunctionNames,
+    serializedCustomOptionFunctions,
+    serializedCustomOptionFunctionNames
+  };
+};
+
 const pluginOptionsSchema = ({
   Joi
 }) => {
@@ -52,7 +91,7 @@ const createPages = ({
   actions,
   store,
   graphql
-}) => serialize.__awaiter(void 0, void 0, void 0, function* () {
+}) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
   const ninetailedGatsbyPlugin = store.getState().flattenedPlugins.find(plugin => plugin.name === '@ninetailed/experience.js-gatsby');
   if (!ninetailedGatsbyPlugin) {
     return;
@@ -110,17 +149,27 @@ const createPages = ({
     if (!pluginOptions) {
       return plugin;
     }
-    const {
-      serializedFunctions,
-      serializedFunctionNames
-    } = serialize.serializePluginOptionFns(pluginOptions);
+    if (plugin.name === '@ninetailed/experience.js-plugin-preview') {
+      const _pluginOptions = plugin.options;
+      const {
+        serializedOptionFunctions,
+        serializedOptionFunctionNames,
+        serializedCustomOptionFunctions,
+        serializedCustomOptionFunctionNames
+      } = serializePluginOptionFunctions(_pluginOptions);
+      return Object.assign(Object.assign({}, plugin), {
+        options: Object.assign(Object.assign(Object.assign({}, _pluginOptions), serializedOptionFunctions), {
+          serializedFunctionNames: serializedOptionFunctionNames,
+          customOptions: Object.assign(Object.assign(Object.assign({}, _pluginOptions.customOptions), serializedCustomOptionFunctions), {
+            serializedFunctionNames: serializedCustomOptionFunctionNames
+          }),
+          audiences,
+          experiences
+        })
+      });
+    }
     return Object.assign(Object.assign({}, plugin), {
-      options: Object.assign(Object.assign(Object.assign(Object.assign({}, plugin.options), serializedFunctions), {
-        serializedFunctionNames
-      }), plugin.name === '@ninetailed/experience.js-plugin-preview' && {
-        audiences,
-        experiences
-      })
+      options: Object.assign({}, plugin.options)
     });
   });
   ninetailedGatsbyPlugin.pluginOptions = Object.assign(Object.assign({}, ninetailedGatsbyPlugin.pluginOptions), {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ninetailed/experience.js-gatsby",
-  "version": "4.2.5",
+  "version": "4.2.6-beta.1",
   "keywords": [
     "gatsby",
     "gatsby-plugin",
@@ -18,8 +18,8 @@
   "type": "commonjs",
   "types": "./index.d.ts",
   "dependencies": {
-    "@ninetailed/experience.js": "4.2.5",
-    "@ninetailed/experience.js-react": "4.2.5",
+    "@ninetailed/experience.js": "4.2.6-beta.1",
+    "@ninetailed/experience.js-react": "4.2.6-beta.1",
     "gatsby-plugin-utils": "3.19.0"
   }
 }

package/plugin-options.d.ts

@@ -6,12 +6,25 @@ export type PluginOptions = GatsbyPluginOptions & NinetailedProviderInstantiatio
         options: unknown;
     }[];
 };
-export type NinetailedPluginOptions = Record<string, unknown>;
 export type SerializedFunctions = {
     serializedFunctionNames: string[];
 };
-export type ResolvedPluginOptions = Record<string, unknown> & SerializedFunctions;
+type PreviewPluginCustomOptions = {
+    audienceQuery: string;
+    audienceMapper: string;
+    experienceQuery: string;
+    experienceMapper: string;
+};
+export type NinetailedPreviewPluginOptions = Record<string, unknown> & {
+    customOptions: PreviewPluginCustomOptions & SerializedFunctions;
+};
+export type NinetailedPluginOptions = Record<string, unknown> | NinetailedPreviewPluginOptions;
+export type ResolvedPreviewPluginOptions = Record<string, unknown> & SerializedFunctions & {
+    customOptions: PreviewPluginCustomOptions & SerializedFunctions;
+};
+export type ResolvedPluginOptions = Record<string, unknown> | ResolvedPreviewPluginOptions;
 export type ResolvedPlugin = {
     PluginCtor: any;
     options?: ResolvedPluginOptions;
 };
+export {};

package/utils/deserialize.d.ts

@@ -0,0 +1,3 @@
+export declare const deserializePluginOptionFunctions: (options: Record<string, unknown> & {
+    serializedFunctionNames: string[];
+}) => Record<string, (...args: unknown[]) => void>;

package/utils/serialize.d.ts

@@ -1,6 +1,7 @@
-import { NinetailedPluginOptions, ResolvedPluginOptions } from '../plugin-options';
-export declare const deserializePluginOptionFns: (options: ResolvedPluginOptions) => Record<string, (...args: unknown[]) => void>;
-export declare const serializePluginOptionFns: (pluginOptions: NinetailedPluginOptions) => {
-    serializedFunctions: {};
-    serializedFunctionNames: string[];
+import { NinetailedPreviewPluginOptions } from '../plugin-options';
+export declare const serializePluginOptionFunctions: (pluginOptions: NinetailedPreviewPluginOptions) => {
+    serializedOptionFunctions: {};
+    serializedOptionFunctionNames: string[];
+    serializedCustomOptionFunctions: {};
+    serializedCustomOptionFunctionNames: string[];
 };