@valbuild/react 0.21.1 → 0.22.0

package/jsx-dev-runtime/dist/valbuild-react-jsx-dev-runtime.cjs.dev.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _typeof = require('../../dist/typeof-1de657a3.cjs.dev.js');
-var slicedToArray = require('../../dist/slicedToArray-7b1713a7.cjs.dev.js');
+var _typeof = require('../../dist/typeof-b568f48f.cjs.dev.js');
+var slicedToArray = require('../../dist/slicedToArray-fb0bef7d.cjs.dev.js');
 var core = require('@valbuild/core');
 var jsxRuntimeDev = require('react/jsx-dev-runtime');
 

package/jsx-dev-runtime/dist/valbuild-react-jsx-dev-runtime.cjs.prod.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _typeof = require('../../dist/typeof-16c77f45.cjs.prod.js');
-var slicedToArray = require('../../dist/slicedToArray-5bddfa58.cjs.prod.js');
+var _typeof = require('../../dist/typeof-16428c61.cjs.prod.js');
+var slicedToArray = require('../../dist/slicedToArray-1fc98f25.cjs.prod.js');
 var core = require('@valbuild/core');
 var jsxRuntimeDev = require('react/jsx-dev-runtime');
 

package/jsx-dev-runtime/dist/valbuild-react-jsx-dev-runtime.esm.js

@@ -1,5 +1,5 @@
-import { _ as _typeof } from '../../dist/typeof-5c86a240.esm.js';
-import { a as _slicedToArray } from '../../dist/slicedToArray-b4fb91fa.esm.js';
+import { _ as _typeof } from '../../dist/typeof-a1531d8f.esm.js';
+import { a as _slicedToArray } from '../../dist/slicedToArray-5418adeb.esm.js';
 import { Internal } from '@valbuild/core';
 import * as jsxRuntimeDev from 'react/jsx-dev-runtime';
 export * from 'react/jsx-dev-runtime';

package/jsx-dev-runtime/dist/valbuild-react-jsx-dev-runtime.worker.esm.js

@@ -1,5 +1,5 @@
-import { _ as _typeof } from '../../dist/typeof-8854ace1.worker.esm.js';
-import { a as _slicedToArray } from '../../dist/slicedToArray-5a51fd33.worker.esm.js';
+import { _ as _typeof } from '../../dist/typeof-e0c837cc.worker.esm.js';
+import { a as _slicedToArray } from '../../dist/slicedToArray-4510c35a.worker.esm.js';
 import { Internal } from '@valbuild/core';
 import * as jsxRuntimeDev from 'react/jsx-dev-runtime';
 export * from 'react/jsx-dev-runtime';

package/jsx-runtime/dist/valbuild-react-jsx-runtime.browser.esm.js

@@ -1,5 +1,5 @@
-import { _ as _typeof } from '../../dist/typeof-52fabea9.browser.esm.js';
-import { a as _slicedToArray } from '../../dist/slicedToArray-0cbb3d34.browser.esm.js';
+import { _ as _typeof } from '../../dist/typeof-9915e135.browser.esm.js';
+import { a as _slicedToArray } from '../../dist/slicedToArray-964e1994.browser.esm.js';
 import { Internal } from '@valbuild/core';
 import * as ReactJSXRuntime from 'react/jsx-runtime';
 export * from 'react/jsx-runtime';

package/jsx-runtime/dist/valbuild-react-jsx-runtime.cjs.dev.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _typeof = require('../../dist/typeof-1de657a3.cjs.dev.js');
-var slicedToArray = require('../../dist/slicedToArray-7b1713a7.cjs.dev.js');
+var _typeof = require('../../dist/typeof-b568f48f.cjs.dev.js');
+var slicedToArray = require('../../dist/slicedToArray-fb0bef7d.cjs.dev.js');
 var core = require('@valbuild/core');
 var ReactJSXRuntime = require('react/jsx-runtime');
 

package/jsx-runtime/dist/valbuild-react-jsx-runtime.cjs.prod.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _typeof = require('../../dist/typeof-16c77f45.cjs.prod.js');
-var slicedToArray = require('../../dist/slicedToArray-5bddfa58.cjs.prod.js');
+var _typeof = require('../../dist/typeof-16428c61.cjs.prod.js');
+var slicedToArray = require('../../dist/slicedToArray-1fc98f25.cjs.prod.js');
 var core = require('@valbuild/core');
 var ReactJSXRuntime = require('react/jsx-runtime');
 

package/jsx-runtime/dist/valbuild-react-jsx-runtime.esm.js

@@ -1,5 +1,5 @@
-import { _ as _typeof } from '../../dist/typeof-5c86a240.esm.js';
-import { a as _slicedToArray } from '../../dist/slicedToArray-b4fb91fa.esm.js';
+import { _ as _typeof } from '../../dist/typeof-a1531d8f.esm.js';
+import { a as _slicedToArray } from '../../dist/slicedToArray-5418adeb.esm.js';
 import { Internal } from '@valbuild/core';
 import * as ReactJSXRuntime from 'react/jsx-runtime';
 export * from 'react/jsx-runtime';

package/jsx-runtime/dist/valbuild-react-jsx-runtime.worker.esm.js

@@ -1,5 +1,5 @@
-import { _ as _typeof } from '../../dist/typeof-8854ace1.worker.esm.js';
-import { a as _slicedToArray } from '../../dist/slicedToArray-5a51fd33.worker.esm.js';
+import { _ as _typeof } from '../../dist/typeof-e0c837cc.worker.esm.js';
+import { a as _slicedToArray } from '../../dist/slicedToArray-4510c35a.worker.esm.js';
 import { Internal } from '@valbuild/core';
 import * as ReactJSXRuntime from 'react/jsx-runtime';
 export * from 'react/jsx-runtime';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@valbuild/react",
-  "version": "0.21.1",
+  "version": "0.22.0",
   "private": false,
   "description": "Val - React internal helpers",
   "sideEffects": false,
@@ -9,8 +9,8 @@
     "test": "jest"
   },
   "dependencies": {
-    "@valbuild/core": "~0.21.1",
-    "@valbuild/ui": "~0.21.1",
+    "@valbuild/core": "~0.22.0",
+    "@valbuild/ui": "~0.22.0",
     "@vercel/stega": "^0.1.0",
     "base64-arraybuffer": "^1.0.2",
     "style-to-object": "^0.4.1"

package/src/ShadowRoot.tsx

@@ -35,7 +35,7 @@ export const ShadowRoot = ({
   }, []);
 
   return (
-    <div ref={node} style={style}>
+    <div ref={node} style={style} id="val-ui">
       {root && <ShadowContent root={root}>{children}</ShadowContent>}
     </div>
   );

package/src/ValProvider.tsx

@@ -29,13 +29,14 @@ export const ValContext = React.createContext<ValContext>({
 });
 
 export type ValProviderProps = {
-  host?: string;
+  // host?: string;
   children?: React.ReactNode;
 };
 const ValUI =
   typeof window !== "undefined" ? lazy(() => import("./ValUI")) : null;
 
-export function ValProvider({ host = "/api/val", children }: ValProviderProps) {
+export function ValProvider({ children }: ValProviderProps) {
+  const host = "/api/val";
   const valApi = useMemo(() => new ValApi(host), [host]);
   const valStore = useMemo(() => new ValStore(valApi), [valApi]);
   return (

package/src/ValStore.ts

@@ -1,11 +1,12 @@
 import { Json, ModuleId, ValApi } from "@valbuild/core";
 import { result } from "@valbuild/core/fp";
+import { IValStore } from "@valbuild/ui";
 
 type SubscriberId = string & {
   readonly _tag: unique symbol;
 };
 
-export class ValStore {
+export class ValStore implements IValStore {
   private readonly subscribers: Map<SubscriberId, Record<ModuleId, Json>>; // uncertain whether this is the optimal way of returning
   private readonly listeners: Record<SubscriberId, (() => void)[]>;
 
@@ -85,19 +86,16 @@ export class ValStore {
   };
 
   private emitChange(subscriberId: SubscriberId) {
-    console.log("emitChange");
     for (const listener of this.listeners[subscriberId]) {
       listener();
     }
   }
 
   getSnapshot = (moduleIds: ModuleId[]) => () => {
-    console.log("getSnapshot", moduleIds);
     return this.get(moduleIds);
   };
 
   getServerSnapshot = (moduleIds: ModuleId[]) => () => {
-    console.log("getServerSnapshot", moduleIds);
     return this.get(moduleIds);
   };
 

package/src/ValUI.tsx

@@ -5,7 +5,7 @@ import { Internal } from "@valbuild/core";
 import { Style, ValOverlay } from "@valbuild/ui";
 import { useEffect, useState } from "react";
 import { ShadowRoot } from "./ShadowRoot";
-import { useValApi } from "./ValProvider";
+import { useValApi, useValStore } from "./ValProvider";
 
 export default function ValUI() {
   const [isClient, setIsClient] = useState(false);
@@ -13,6 +13,7 @@ export default function ValUI() {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const [isDraftMode, setDraftMode] = useState(false); // TODO: if enabled, but not in draft mode: show something
   const api = useValApi();
+  const store = useValStore();
   useEffect(() => {
     setIsClient(true);
     try {
@@ -62,11 +63,15 @@ export default function ValUI() {
           crossOrigin="anonymous"
         />
         <link
-          href="https://fonts.googleapis.com/css2?family=JetBrains+Mono:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;1,400&family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,400;1,700&display=swap"
+          href="https://fonts.googleapis.com/css2?family=Space+Mono:ital,wght@0,400;0,700;1,400&display=swap"
+          rel="stylesheet"
+        />
+        <link
+          href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;1,100;1,300;1,400;1,500;1,700&family=Space+Mono:ital,wght@0,400;0,700;1,400&display=swap"
           rel="stylesheet"
         />
         <Style />
-        <ValOverlay api={api} />
+        <ValOverlay api={api} store={store} />
       </ShadowRoot>
     </>
   );

package/src/stega/stegaEncode.ts

@@ -12,6 +12,7 @@ import { FileSource, Source, SourceObject } from "@valbuild/core";
 import { JsonPrimitive } from "@valbuild/core";
 import { SourceArray } from "@valbuild/core";
 import { parseRichTextSource } from "@valbuild/ui";
+import { RawString } from "@valbuild/core/src/schema/string";
 
 declare const brand: unique symbol;
 
@@ -39,6 +40,8 @@ export type StegaOfSource<T extends Source> = Json extends T
     }
   : T extends SourceArray
   ? StegaOfSource<T[number]>[]
+  : T extends RawString
+  ? string
   : T extends string
   ? ValEncodedString
   : T extends JsonPrimitive

package/stega/dist/valbuild-react-stega.browser.esm.js

@@ -1,5 +1,5 @@
-import { a as _slicedToArray } from '../../dist/slicedToArray-0cbb3d34.browser.esm.js';
-import { _ as _typeof } from '../../dist/typeof-52fabea9.browser.esm.js';
+import { a as _slicedToArray } from '../../dist/slicedToArray-964e1994.browser.esm.js';
+import { _ as _typeof } from '../../dist/typeof-9915e135.browser.esm.js';
 import ReactJSXRuntime__default from 'react/jsx-runtime';
 import jsxRuntimeDev__default from 'react/jsx-dev-runtime';
 import React from 'react';
@@ -68,26 +68,26 @@ function autoTagJSX() {
   JsxPro.jsxDEV && ( /**/JsxPro.jsxDEV = WrapJsx(JsxPro.jsxDEV));
 }
 
-function ownKeys(object, enumerableOnly) {
-  var keys = Object.keys(object);
+function ownKeys(e, r) {
+  var t = Object.keys(e);
   if (Object.getOwnPropertySymbols) {
-    var symbols = Object.getOwnPropertySymbols(object);
-    enumerableOnly && (symbols = symbols.filter(function (sym) {
-      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-    })), keys.push.apply(keys, symbols);
+    var o = Object.getOwnPropertySymbols(e);
+    r && (o = o.filter(function (r) {
+      return Object.getOwnPropertyDescriptor(e, r).enumerable;
+    })), t.push.apply(t, o);
   }
-  return keys;
+  return t;
 }
-function _objectSpread2(target) {
-  for (var i = 1; i < arguments.length; i++) {
-    var source = null != arguments[i] ? arguments[i] : {};
-    i % 2 ? ownKeys(Object(source), !0).forEach(function (key) {
-      _defineProperty(target, key, source[key]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) {
-      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+function _objectSpread2(e) {
+  for (var r = 1; r < arguments.length; r++) {
+    var t = null != arguments[r] ? arguments[r] : {};
+    r % 2 ? ownKeys(Object(t), !0).forEach(function (r) {
+      _defineProperty(e, r, t[r]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) {
+      Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r));
     });
   }
-  return target;
+  return e;
 }
 
 /**

package/stega/dist/valbuild-react-stega.cjs.dev.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var slicedToArray = require('../../dist/slicedToArray-7b1713a7.cjs.dev.js');
-var _typeof = require('../../dist/typeof-1de657a3.cjs.dev.js');
+var slicedToArray = require('../../dist/slicedToArray-fb0bef7d.cjs.dev.js');
+var _typeof = require('../../dist/typeof-b568f48f.cjs.dev.js');
 var ReactJSXRuntime = require('react/jsx-runtime');
 var jsxRuntimeDev = require('react/jsx-dev-runtime');
 var React = require('react');
@@ -78,26 +78,26 @@ function autoTagJSX() {
   JsxPro.jsxDEV && ( /**/JsxPro.jsxDEV = WrapJsx(JsxPro.jsxDEV));
 }
 
-function ownKeys(object, enumerableOnly) {
-  var keys = Object.keys(object);
+function ownKeys(e, r) {
+  var t = Object.keys(e);
   if (Object.getOwnPropertySymbols) {
-    var symbols = Object.getOwnPropertySymbols(object);
-    enumerableOnly && (symbols = symbols.filter(function (sym) {
-      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-    })), keys.push.apply(keys, symbols);
+    var o = Object.getOwnPropertySymbols(e);
+    r && (o = o.filter(function (r) {
+      return Object.getOwnPropertyDescriptor(e, r).enumerable;
+    })), t.push.apply(t, o);
   }
-  return keys;
+  return t;
 }
-function _objectSpread2(target) {
-  for (var i = 1; i < arguments.length; i++) {
-    var source = null != arguments[i] ? arguments[i] : {};
-    i % 2 ? ownKeys(Object(source), !0).forEach(function (key) {
-      defineProperty._defineProperty(target, key, source[key]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) {
-      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+function _objectSpread2(e) {
+  for (var r = 1; r < arguments.length; r++) {
+    var t = null != arguments[r] ? arguments[r] : {};
+    r % 2 ? ownKeys(Object(t), !0).forEach(function (r) {
+      defineProperty._defineProperty(e, r, t[r]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) {
+      Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r));
     });
   }
-  return target;
+  return e;
 }
 
 /**

package/stega/dist/valbuild-react-stega.cjs.prod.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var slicedToArray = require('../../dist/slicedToArray-5bddfa58.cjs.prod.js');
-var _typeof = require('../../dist/typeof-16c77f45.cjs.prod.js');
+var slicedToArray = require('../../dist/slicedToArray-1fc98f25.cjs.prod.js');
+var _typeof = require('../../dist/typeof-16428c61.cjs.prod.js');
 var ReactJSXRuntime = require('react/jsx-runtime');
 var jsxRuntimeDev = require('react/jsx-dev-runtime');
 var React = require('react');
@@ -78,26 +78,26 @@ function autoTagJSX() {
   JsxPro.jsxDEV && ( /**/JsxPro.jsxDEV = WrapJsx(JsxPro.jsxDEV));
 }
 
-function ownKeys(object, enumerableOnly) {
-  var keys = Object.keys(object);
+function ownKeys(e, r) {
+  var t = Object.keys(e);
   if (Object.getOwnPropertySymbols) {
-    var symbols = Object.getOwnPropertySymbols(object);
-    enumerableOnly && (symbols = symbols.filter(function (sym) {
-      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-    })), keys.push.apply(keys, symbols);
+    var o = Object.getOwnPropertySymbols(e);
+    r && (o = o.filter(function (r) {
+      return Object.getOwnPropertyDescriptor(e, r).enumerable;
+    })), t.push.apply(t, o);
   }
-  return keys;
+  return t;
 }
-function _objectSpread2(target) {
-  for (var i = 1; i < arguments.length; i++) {
-    var source = null != arguments[i] ? arguments[i] : {};
-    i % 2 ? ownKeys(Object(source), !0).forEach(function (key) {
-      defineProperty._defineProperty(target, key, source[key]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) {
-      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+function _objectSpread2(e) {
+  for (var r = 1; r < arguments.length; r++) {
+    var t = null != arguments[r] ? arguments[r] : {};
+    r % 2 ? ownKeys(Object(t), !0).forEach(function (r) {
+      defineProperty._defineProperty(e, r, t[r]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) {
+      Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r));
     });
   }
-  return target;
+  return e;
 }
 
 /**

package/stega/dist/valbuild-react-stega.esm.js

@@ -1,5 +1,5 @@
-import { a as _slicedToArray } from '../../dist/slicedToArray-b4fb91fa.esm.js';
-import { _ as _typeof } from '../../dist/typeof-5c86a240.esm.js';
+import { a as _slicedToArray } from '../../dist/slicedToArray-5418adeb.esm.js';
+import { _ as _typeof } from '../../dist/typeof-a1531d8f.esm.js';
 import ReactJSXRuntime__default from 'react/jsx-runtime';
 import jsxRuntimeDev__default from 'react/jsx-dev-runtime';
 import React from 'react';
@@ -68,26 +68,26 @@ function autoTagJSX() {
   JsxPro.jsxDEV && ( /**/JsxPro.jsxDEV = WrapJsx(JsxPro.jsxDEV));
 }
 
-function ownKeys(object, enumerableOnly) {
-  var keys = Object.keys(object);
+function ownKeys(e, r) {
+  var t = Object.keys(e);
   if (Object.getOwnPropertySymbols) {
-    var symbols = Object.getOwnPropertySymbols(object);
-    enumerableOnly && (symbols = symbols.filter(function (sym) {
-      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-    })), keys.push.apply(keys, symbols);
+    var o = Object.getOwnPropertySymbols(e);
+    r && (o = o.filter(function (r) {
+      return Object.getOwnPropertyDescriptor(e, r).enumerable;
+    })), t.push.apply(t, o);
   }
-  return keys;
+  return t;
 }
-function _objectSpread2(target) {
-  for (var i = 1; i < arguments.length; i++) {
-    var source = null != arguments[i] ? arguments[i] : {};
-    i % 2 ? ownKeys(Object(source), !0).forEach(function (key) {
-      _defineProperty(target, key, source[key]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) {
-      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+function _objectSpread2(e) {
+  for (var r = 1; r < arguments.length; r++) {
+    var t = null != arguments[r] ? arguments[r] : {};
+    r % 2 ? ownKeys(Object(t), !0).forEach(function (r) {
+      _defineProperty(e, r, t[r]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) {
+      Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r));
     });
   }
-  return target;
+  return e;
 }
 
 /**

package/stega/dist/valbuild-react-stega.worker.esm.js

@@ -1,5 +1,5 @@
-import { a as _slicedToArray } from '../../dist/slicedToArray-5a51fd33.worker.esm.js';
-import { _ as _typeof } from '../../dist/typeof-8854ace1.worker.esm.js';
+import { a as _slicedToArray } from '../../dist/slicedToArray-4510c35a.worker.esm.js';
+import { _ as _typeof } from '../../dist/typeof-e0c837cc.worker.esm.js';
 import ReactJSXRuntime__default from 'react/jsx-runtime';
 import jsxRuntimeDev__default from 'react/jsx-dev-runtime';
 import React from 'react';
@@ -68,26 +68,26 @@ function autoTagJSX() {
   JsxPro.jsxDEV && ( /**/JsxPro.jsxDEV = WrapJsx(JsxPro.jsxDEV));
 }
 
-function ownKeys(object, enumerableOnly) {
-  var keys = Object.keys(object);
+function ownKeys(e, r) {
+  var t = Object.keys(e);
   if (Object.getOwnPropertySymbols) {
-    var symbols = Object.getOwnPropertySymbols(object);
-    enumerableOnly && (symbols = symbols.filter(function (sym) {
-      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-    })), keys.push.apply(keys, symbols);
+    var o = Object.getOwnPropertySymbols(e);
+    r && (o = o.filter(function (r) {
+      return Object.getOwnPropertyDescriptor(e, r).enumerable;
+    })), t.push.apply(t, o);
   }
-  return keys;
+  return t;
 }
-function _objectSpread2(target) {
-  for (var i = 1; i < arguments.length; i++) {
-    var source = null != arguments[i] ? arguments[i] : {};
-    i % 2 ? ownKeys(Object(source), !0).forEach(function (key) {
-      _defineProperty(target, key, source[key]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) {
-      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+function _objectSpread2(e) {
+  for (var r = 1; r < arguments.length; r++) {
+    var t = null != arguments[r] ? arguments[r] : {};
+    r % 2 ? ownKeys(Object(t), !0).forEach(function (r) {
+      _defineProperty(e, r, t[r]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) {
+      Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r));
     });
   }
-  return target;
+  return e;
 }
 
 /**