atriusmaps-node-sdk 3.3.917 → 3.3.919

package/dist/cjs/plugins/sdkServer/src/sdkHeadless.js

@@ -30,12 +30,7 @@ const headlessCommands = [
       { name: "from", type: "location" },
       { name: "to", type: "location" },
       { name: "accessible", type: "boolean", optional: true },
-      {
-        name: "queueTypes",
-        type: "list",
-        itemType: { type: "string" },
-        optional: true
-      }
+      { name: "queueTypes", type: "list", itemType: { type: "string" }, optional: true }
     ]
   },
   {
@@ -43,25 +38,14 @@ const headlessCommands = [
     args: [
       { name: "locations", type: "list", itemType: { type: "location" } },
       { name: "accessible", type: "boolean", optional: true },
-      {
-        name: "queueTypes",
-        type: "list",
-        itemType: { type: "string" },
-        optional: true
-      }
+      { name: "queueTypes", type: "list", itemType: { type: "string" }, optional: true }
     ]
   },
-  {
-    command: "getPOIDetails",
-    args: [{ name: "poiId", type: "integer", min: 0 }]
-  },
+  { command: "getPOIDetails", args: [{ name: "poiId", type: "integer", min: 0 }] },
   { command: "getAllPOIs" },
   { command: "getStructures" },
   { command: "getVenueData" },
-  {
-    command: "getSecurityWaitTimes",
-    args: [{ name: "isOpen", type: "boolean", optional: true }]
-  },
+  { command: "getSecurityWaitTimes", args: [{ name: "isOpen", type: "boolean", optional: true }] },
   {
     command: "search",
     args: [
@@ -78,7 +62,17 @@ const headlessCommands = [
   }
 ];
 function handleHeadless(app) {
-  app.bus.on("clientAPI/destroy", async () => app.destroy());
+  const pickRouteSummary = (route) => {
+    const routeRecord = route;
+    return {
+      distance: routeRecord.distance,
+      time: routeRecord.time,
+      steps: routeRecord.steps,
+      navline: routeRecord.navline,
+      waypoints: routeRecord.waypoints
+    };
+  };
+  app.bus.on("clientAPI/destroy", async () => app.destroy?.());
   app.bus.on("clientAPI/getDirections", async ({ from, to, accessible, queueTypes }) => {
     const fromEndpoint = await location.locationToEndpoint(app, from);
     const toEndpoint = await location.locationToEndpoint(app, to);
@@ -86,43 +80,49 @@ function handleHeadless(app) {
     if (queueTypes) {
       options.selectedSecurityLanes = { SecurityLane: queueTypes };
     }
-    return app.bus.get("wayfinder/getRoute", { fromEndpoint, toEndpoint, options }).then(R__namespace.pick(["distance", "time", "steps", "navline", "waypoints"]));
+    const route = await app.bus.get("wayfinder/getRoute", { fromEndpoint, toEndpoint, options });
+    return pickRouteSummary(route);
   });
-  app.bus.on("clientAPI/getDirectionsMultiple", async ({ locations, accessible, queueTypes }) => {
-    const endpoints = await Promise.all(locations.map(async (l) => location.locationToEndpoint(app, l)));
-    const options = { requiresAccessibility: !!accessible };
-    if (queueTypes) {
-      options.selectedSecurityLanes = { SecurityLane: queueTypes };
+  app.bus.on(
+    "clientAPI/getDirectionsMultiple",
+    async ({ locations, accessible, queueTypes }) => {
+      const endpoints = await Promise.all(locations.map(async (location$1) => location.locationToEndpoint(app, location$1)));
+      const options = { requiresAccessibility: !!accessible };
+      if (queueTypes) {
+        options.selectedSecurityLanes = { SecurityLane: queueTypes };
+      }
+      const routes = await Promise.all(
+        R__namespace.aperture(2, endpoints).map(
+          async (pair) => app.bus.get("wayfinder/getRoute", {
+            fromEndpoint: pair[0],
+            toEndpoint: pair[1],
+            options
+          })
+        )
+      );
+      const directions = routes.map(pickRouteSummary);
+      return {
+        total: {
+          distance: R__namespace.sum(directions.map((direction) => Number(direction.distance ?? 0))),
+          time: R__namespace.sum(directions.map((direction) => Number(direction.time ?? 0)))
+        },
+        directions
+      };
     }
-    const routes = await Promise.all(
-      R__namespace.aperture(2, endpoints).map(
-        async (a) => app.bus.get("wayfinder/getRoute", {
-          fromEndpoint: a[0],
-          toEndpoint: a[1],
-          options
-        })
-      )
-    );
-    const directions = R__namespace.map(R__namespace.pick(["distance", "time", "steps", "navline", "waypoints"]), routes);
-    return {
-      total: {
-        distance: R__namespace.sum(R__namespace.map((d) => d.distance, directions)),
-        time: R__namespace.sum(R__namespace.map((d) => d.time, directions))
-      },
-      directions
-    };
-  });
-  app.bus.on("clientAPI/getPOIDetails", async ({ poiId }) => app.bus.get("poi/getById", { id: poiId }));
+  );
+  app.bus.on(
+    "clientAPI/getPOIDetails",
+    async ({ poiId }) => app.bus.get("poi/getById", { id: poiId })
+  );
   app.bus.on("clientAPI/getAllPOIs", async () => app.bus.get("poi/getAll"));
   app.bus.on("clientAPI/getStructures", () => location.getStructures(app));
   app.bus.on(
     "clientAPI/getSecurityWaitTimes",
     async ({ isOpen }) => app.bus.get("dynamicPois/getSecurityWaitTimes", { isOpen })
   );
-  const isNotFunction = (o) => typeof o !== "function";
   app.bus.on("clientAPI/getVenueData", async () => {
-    const vd = await app.bus.get("venueData/getVenueData");
-    return R__namespace.filter(isNotFunction, vd);
+    const venueData = await app.bus.get("venueData/getVenueData");
+    return Object.fromEntries(Object.entries(venueData).filter(([, value]) => typeof value !== "function"));
   });
   app.bus.on(
     "clientAPI/search",

package/dist/cjs/plugins/sdkServer/src/sdkServer.js

@@ -14,17 +14,17 @@ function describeMessageRelation(senderOrigin, iframeOrigin) {
   }
   return senderOrigin === iframeOrigin ? "same-origin" : "cross-origin";
 }
-function logBrowserMessageTelemetry(bus, { messageType, senderOrigin, command, iframeOrigin }) {
+function logBrowserMessageTelemetry(bus, payload) {
   bus.send("appInsights/log", {
     name: "browserMessageObserved",
     properties: {
-      command,
+      command: payload.command,
       deploymentHost: window.location.host,
-      iframeOrigin,
-      messageType,
-      relation: describeMessageRelation(senderOrigin, iframeOrigin),
-      senderOrigin,
-      wouldRejectCrossOrigin: !isSameOriginBrowserMessage(senderOrigin, iframeOrigin)
+      iframeOrigin: payload.iframeOrigin,
+      messageType: payload.messageType,
+      relation: describeMessageRelation(payload.senderOrigin, payload.iframeOrigin),
+      senderOrigin: payload.senderOrigin,
+      wouldRejectCrossOrigin: !isSameOriginBrowserMessage(payload.senderOrigin, payload.iframeOrigin)
     }
   });
 }
@@ -32,61 +32,43 @@ function isSameOriginBrowserMessage(senderOrigin, iframeOrigin) {
   return senderOrigin === iframeOrigin;
 }
 function getBrowserCom(app) {
-  const clean = (ob) => JSON.parse(JSON.stringify(ob));
+  const clean = (value) => JSON.parse(JSON.stringify(value));
   const sendResponse = (payload, clientMsgId) => {
-    const ob = {
-      payload,
-      type: "LL-server"
-    };
-    if (clientMsgId) {
-      ob.clientMsgId = clientMsgId;
-    }
+    const message = { payload, type: "LL-server", clientMsgId };
     try {
-      window.postMessage(ob, "*");
+      window.postMessage(message, "*");
     } catch {
-      window.postMessage(clean(ob), "*");
+      window.postMessage(clean(message), "*");
     }
   };
   const sendError = (payload, clientMsgId) => {
-    const ob = {
-      error: true,
-      payload,
-      type: "LL-server"
-    };
-    if (clientMsgId) {
-      ob.clientMsgId = clientMsgId;
-    }
-    window.postMessage(ob, "*");
+    window.postMessage({ error: true, payload, type: "LL-server", clientMsgId }, "*");
   };
   const sendEvent = (event, payload) => {
-    const ob = {
-      event,
-      payload,
-      type: "LL-server"
-    };
-    window.postMessage(ob, "*");
+    window.postMessage({ event, payload, type: "LL-server" }, "*");
   };
-  function msgHandler(e) {
-    const d = e.data;
-    if (d && d.type === "LL-client") {
-      const iframeOrigin = window.location.origin;
-      logBrowserMessageTelemetry(app.bus, {
-        messageType: "LL-client",
-        senderOrigin: e.origin,
-        command: d.payload?.command,
-        iframeOrigin
-      });
-      if (!isSameOriginBrowserMessage(e.origin, iframeOrigin)) {
-        return;
-      }
-      app.bus.get("clientAPI/execute", d.payload).then((resOb) => sendResponse(resOb, d.msgId)).catch((er) => {
-        if (app.config.debug) {
-          console.error(er);
-        }
-        sendError(er.message, d.msgId);
-      });
+  const msgHandler = (event) => {
+    const data = event.data;
+    if (!data || data.type !== "LL-client") {
+      return;
     }
-  }
+    const iframeOrigin = window.location.origin;
+    logBrowserMessageTelemetry(app.bus, {
+      messageType: "LL-client",
+      senderOrigin: event.origin,
+      command: data.payload?.command,
+      iframeOrigin
+    });
+    if (!isSameOriginBrowserMessage(event.origin, iframeOrigin)) {
+      return;
+    }
+    app.bus.get("clientAPI/execute", data.payload).then((result) => sendResponse(result, data.msgId)).catch((error) => {
+      if (app.config.debug) {
+        console.error(error);
+      }
+      sendError(error.message, data.msgId);
+    });
+  };
   if (removePreviousListener) {
     removePreviousListener();
   }
@@ -101,103 +83,84 @@ function getNodeCom(app) {
   return sendEvent;
 }
 function registerCustomTypes(app) {
-  app.bus.send("clientAPI/registerCustomType", {
-    name: "latLngOrdLocation",
-    spec: {
-      type: "object",
-      props: [
-        { name: "lat", type: "float" },
-        { name: "lng", type: "float" },
-        { name: "ord", type: "integer" }
-      ]
-    }
-  });
-  app.bus.send("clientAPI/registerCustomType", {
-    name: "latLngFloorLocation",
-    spec: {
-      type: "object",
-      props: [
-        { name: "lat", type: "float" },
-        { name: "lng", type: "float" },
-        { name: "floorId", type: "string" }
-      ]
-    }
-  });
-  app.bus.send("clientAPI/registerCustomType", {
-    name: "poiIdLocation",
-    spec: {
-      type: "object",
-      props: [{ name: "poiId", type: "integer", min: 0 }]
-    }
-  });
-  app.bus.send("clientAPI/registerCustomType", {
-    name: "location",
-    spec: {
-      type: "multi",
-      types: [{ type: "poiIdLocation" }, { type: "latLngOrdLocation" }, { type: "latLngFloorLocation" }]
-    }
-  });
-  app.bus.send("clientAPI/registerCustomType", {
-    name: "viewSettings",
-    spec: {
-      type: "object",
-      props: [
-        { name: "zoom", type: "float", optional: true },
-        { name: "pitch", type: "float", optional: true },
-        { name: "bearing", type: "float", optional: true }
-      ]
+  const types = [
+    {
+      name: "latLngOrdLocation",
+      spec: {
+        type: "object",
+        props: [
+          { name: "lat", type: "float" },
+          { name: "lng", type: "float" },
+          { name: "ord", type: "integer" }
+        ]
+      }
+    },
+    {
+      name: "latLngFloorLocation",
+      spec: {
+        type: "object",
+        props: [
+          { name: "lat", type: "float" },
+          { name: "lng", type: "float" },
+          { name: "floorId", type: "string" }
+        ]
+      }
+    },
+    {
+      name: "poiIdLocation",
+      spec: { type: "object", props: [{ name: "poiId", type: "integer", min: 0 }] }
+    },
+    {
+      name: "location",
+      spec: {
+        type: "multi",
+        types: [{ type: "poiIdLocation" }, { type: "latLngOrdLocation" }, { type: "latLngFloorLocation" }]
+      }
+    },
+    {
+      name: "viewSettings",
+      spec: {
+        type: "object",
+        props: [
+          { name: "zoom", type: "float", optional: true },
+          { name: "pitch", type: "float", optional: true },
+          { name: "bearing", type: "float", optional: true }
+        ]
+      }
     }
+  ];
+  types.forEach((typeDefinition) => {
+    app.bus.send("clientAPI/registerCustomType", typeDefinition);
   });
 }
 function registerEvents(app, sendEvent) {
-  app.bus.monitor("map/userMoveStart", async ({ pitch, zoom, bearing }) => {
-    const { lat, lng, floorId, ordinal, structureId } = await app.bus.get("map/getMapCenter");
-    sendEvent("userMoveStart", {
-      lat,
-      lng,
-      floorId,
-      ord: ordinal,
-      structureId,
-      pitch,
-      zoom,
-      bearing
-    });
-  });
-  const userMoving = async ({ pitch, zoom, bearing }) => {
+  const forwardMapMoveEvent = async (eventName, payload) => {
     const { lat, lng, floorId, ordinal, structureId } = await app.bus.get("map/getMapCenter");
-    sendEvent("userMoving", {
-      lat,
-      lng,
-      floorId,
-      ord: ordinal,
-      structureId,
-      pitch,
-      zoom,
-      bearing
-    });
+    sendEvent(eventName, { lat, lng, floorId, ord: ordinal, structureId, ...payload });
   };
-  app.bus.monitor("map/userMoving", throttleDebounce.throttle(500, userMoving));
-  app.bus.monitor("map/moveEnd", async ({ pitch, zoom, bearing }) => {
-    const { lat, lng, floorId, ordinal, structureId } = await app.bus.get("map/getMapCenter");
-    sendEvent("moveEnd", {
-      lat,
-      lng,
-      floorId,
-      ord: ordinal,
-      structureId,
-      pitch,
-      zoom,
-      bearing
-    });
-  });
+  app.bus.monitor(
+    "map/userMoveStart",
+    (payload) => void forwardMapMoveEvent("userMoveStart", payload)
+  );
+  app.bus.monitor(
+    "map/userMoving",
+    throttleDebounce.throttle(
+      500,
+      (payload) => void forwardMapMoveEvent("userMoving", payload)
+    )
+  );
+  app.bus.monitor(
+    "map/moveEnd",
+    (payload) => void forwardMapMoveEvent("moveEnd", payload)
+  );
   app.bus.monitor(
     "map/floorChanged",
     ({ structure, floor }) => sendEvent("levelChange", {
-      floorId: floor ? floor.id : null,
-      floorName: floor ? floor.name : null,
-      ord: floor ? floor.ordinal : null,
-      structureId: structure ? structure.id : null,
-      structureName: structure ? structure.name : null
+      floorId: floor?.id ?? null,
+      floorName: floor?.name ?? null,
+      ord: floor?.ordinal ?? null,
+      structureId: structure?.id ?? null,
+      structureName: structure?.name ?? null
     })
   );
   app.bus.monitor("map/poiClicked", ({ poi }) => sendEvent("poiSelected", poi));
@@ -205,7 +168,14 @@ function registerEvents(app, sendEvent) {
   app.bus.monitor("map/click", async ({ lat, lng, ord }) => {
     const structures = await app.bus.get("venueData/getStructures");
     const mapviewBBox = await app.bus.get("map/getViewBBox");
-    const { building: structure, floor } = geom.getStructureAndFloorAtPoint(structures, lat, lng, ord, mapviewBBox, true);
+    const { building: structure, floor } = geom.getStructureAndFloorAtPoint(
+      structures,
+      lat,
+      lng,
+      ord,
+      mapviewBBox,
+      true
+    );
     sendEvent("mapClicked", { lat, lng, ord, building: structure, floor });
   });
 }
@@ -213,21 +183,23 @@ async function create(app, config) {
   const sendEvent = app.env.isBrowser ? getBrowserCom(app) : getNodeCom(app);
   const init = async () => {
     registerCustomTypes(app);
-    sdkHeadless.headlessCommands.forEach((cdef) => app.bus.send("clientAPI/registerCommand", cdef));
+    sdkHeadless.headlessCommands.forEach(
+      (commandDefinition) => app.bus.send("clientAPI/registerCommand", commandDefinition)
+    );
     sdkHeadless.handleHeadless(app);
     if (!config.headless) {
       await Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefaultOnly(require('../../../_virtual/_empty_module_placeholder.js')); }).then((sdkVisual) => {
-        sdkVisual.visualCommands.forEach((cdef) => app.bus.send("clientAPI/registerCommand", cdef));
+        sdkVisual.visualCommands.forEach(
+          (commandDefinition) => app.bus.send("clientAPI/registerCommand", commandDefinition)
+        );
         sdkVisual.handleVisual(app, sendEvent);
       });
     }
     const weReady = async () => {
       await app.bus.send("system/readywhenyouare");
       app.bus.get("clientAPI/execute", { command: "getCommandJSON" }).then((commandJSON) => sendEvent("ready", { commandJSON }));
-      if (!config.headless && app.config.uiHide && app.config.uiHide.sidebar && app.env.isDesktop()) {
-        app.bus.send("map/changePadding", {
-          padding: { left: 55, right: 55, top: 72, bottom: 22 }
-        });
+      if (!config.headless && app.config.uiHide?.sidebar && app.env.isDesktop()) {
+        app.bus.send("map/changePadding", { padding: { left: 55, right: 55, top: 72, bottom: 22 } });
       }
     };
     if (config.headless) {
@@ -238,12 +210,13 @@ async function create(app, config) {
     } else {
       app.bus.on("map/mapReadyToShow", weReady);
     }
-    app.bus.on("sdkServer/sendEvent", ({ eventName, ...props }) => sendEvent(eventName, props));
+    app.bus.on(
+      "sdkServer/sendEvent",
+      ({ eventName, ...props }) => sendEvent(eventName, props)
+    );
   };
   registerEvents(app, sendEvent);
-  return {
-    init
-  };
+  return { init };
 }
 
 exports.create = create;

package/dist/cjs/src/app.js

@@ -25,7 +25,11 @@ async function setupPlugin(app, id, config) {
       return null;
     }
   }
-  return import(`../plugins/${id}/src/index.js`).then((pluginModule) => {
+  const load = id.includes("/") ? (() => {
+    const [scope, shortName] = id.split("/");
+    return import(`../plugins/${scope}/${shortName}/src/index.js`);
+  })() : import(`../plugins/${id}/src/index.js`);
+  return load.then((pluginModule) => {
     app.log.info(`Creating plugin ${id}`);
     return pluginModule.create(app, config);
   });
@@ -86,8 +90,12 @@ async function create(rawConfig) {
   const appInstance = /* @__PURE__ */ Object.create(null);
   let config = rawConfig.extends ? await extendConfig(rawConfig, rawConfig.extends) : rawConfig;
   if (config.plugins?.monitoring) {
-    const monConfig = config.plugins.monitoring;
-    await Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefaultOnly(require('../_virtual/_empty_module_placeholder.js')); }).then((mon) => mon.activate(monConfig));
+    try {
+      const mon = await Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefaultOnly(require('../_virtual/_empty_module_placeholder.js')); });
+      await mon.activate(config.plugins.monitoring);
+    } catch (err) {
+      console.warn("Monitoring plugin failed to load (continuing without it):", err?.message || err);
+    }
   }
   config = await handleConfigPostProcess(config);
   const lang = getLang(config);

package/dist/cjs/src/configs/postproc-mol-url-parms.js

@@ -13,9 +13,7 @@ const parmToPlugin = {
   accountId: "venueDataLoader",
   search: "online/headerOnline",
   ho: ["online/getDirectionsFromTo", "analytics2"],
-  // handoff indicator (used in analytics)
   home: "online/homeView",
-  // doing a handoff to home view
   zoom: "mapRenderer",
   pitch: "mapRenderer",
   bearing: "mapRenderer",
@@ -28,34 +26,38 @@ const parmToPlugin = {
   refInstallId: "analytics2",
   disableZoomToExplorePopup: "levelIndicator"
 };
-function setDeepLinksForParms(config, parms, forceCreate) {
+function setDeepLinksForParms(config, parms, forceCreate = false) {
   if (parms.has("lldebug")) {
     try {
-      config.debug = JSON.parse(parms.get("lldebug"));
-      if (config.debug === null) {
+      const parsedDebug = JSON.parse(parms.get("lldebug") ?? "null");
+      if (parsedDebug === null) {
         config.debug = {};
+      } else {
+        config.debug = parsedDebug;
       }
     } catch {
       config.debug = true;
     }
   }
   Object.keys(parmToPlugin).forEach((key) => {
-    if (parms.has(key)) {
-      let plugins = parmToPlugin[key];
-      if (!Array.isArray(plugins)) {
-        plugins = [plugins];
-      }
-      plugins.forEach((plugin) => {
-        let pc = config.plugins[plugin];
-        if (!pc && forceCreate) {
-          pc = config.plugins[plugin] = {};
-        }
-        pc.deepLinkProps = { ...pc.deepLinkProps, [key]: parms.get(key) };
-      });
+    if (!parms.has(key)) {
+      return;
     }
+    const pluginNames = parmToPlugin[key];
+    const plugins = Array.isArray(pluginNames) ? pluginNames : [pluginNames];
+    plugins.forEach((plugin) => {
+      let pluginConfig = config.plugins[plugin];
+      if (!pluginConfig && forceCreate) {
+        pluginConfig = config.plugins[plugin] = {};
+      }
+      if (!pluginConfig) {
+        return;
+      }
+      pluginConfig.deepLinkProps = { ...pluginConfig.deepLinkProps, [key]: parms.get(key) };
+    });
   });
   if (parms.has("poiId") && parms.has("showNav")) {
-    delete config.plugins["online/poiView"].deepLinkProps.poiId;
+    delete config.plugins["online/poiView"]?.deepLinkProps?.poiId;
   }
   return config;
 }

package/dist/cjs/src/configs/postproc-stateTracking.js

@@ -22,22 +22,26 @@ function _interopNamespaceDefault(e) {
 
 var R__namespace = /*#__PURE__*/_interopNamespaceDefault(R);
 
-function setStateFromStateString(config, stateString, forceCreate) {
+function setStateFromStateString(config, stateString, forceCreate = false) {
   const state = JSON.parse(stateString);
   Object.keys(state).forEach((id) => {
-    const so = state[id];
-    let pluginConf = config.plugins[id];
-    if (!pluginConf && forceCreate) {
-      pluginConf = config.plugins[id] = {};
+    const stateObject = state[id];
+    let pluginConfig = config.plugins[id];
+    if (!pluginConfig && forceCreate) {
+      pluginConfig = config.plugins[id] = {};
     }
-    if (pluginConf) {
-      const curDLP = pluginConf.deepLinkProps;
-      if (!curDLP) {
-        pluginConf.deepLinkProps = so;
-      } else {
-        pluginConf.deepLinkProps = R__namespace.mergeDeepRight(curDLP, so);
-      }
+    if (!pluginConfig) {
+      return;
+    }
+    const currentDeepLinkProps = pluginConfig.deepLinkProps;
+    if (!currentDeepLinkProps) {
+      pluginConfig.deepLinkProps = stateObject;
+      return;
     }
+    pluginConfig.deepLinkProps = R__namespace.mergeDeepRight(
+      currentDeepLinkProps,
+      stateObject
+    );
   });
   return config;
 }

package/dist/cjs/src/utils/observable.js

@@ -1,13 +1,13 @@
 'use strict';
 
 function fire(...args) {
-  const ob = this._observers;
-  if (!ob) {
+  const observers = this._observers;
+  if (!observers) {
     return void 0;
   }
-  for (let x = 0; x < ob.length; x++) {
+  for (let x = 0; x < observers.length; x++) {
     try {
-      ob[x].apply(this, args);
+      observers[x].apply(this, args);
     } catch (err) {
       console.error(err);
     }
@@ -25,16 +25,16 @@ function observe(cb) {
   };
 }
 function detach(cb) {
-  this._observers.splice(this._observers.indexOf(cb), 1);
+  this._observers?.splice(this._observers.indexOf(cb), 1);
 }
 function filter(fn) {
-  const o2 = create();
+  const filteredObserver = create();
   this.observe(function(...args) {
     if (fn.apply(this, args)) {
-      o2.fire(...args);
+      filteredObserver.fire(...args);
     }
   });
-  return o2;
+  return filteredObserver;
 }
 function filterByName(eventName) {
   return filter.call(this, function(name) {
@@ -46,10 +46,7 @@ function on(value, cb) {
 }
 const observable = { detach, filter, fire, observe, on };
 function extend(to, from) {
-  for (const prop in from) {
-    to[prop] = from[prop];
-  }
-  return to;
+  return Object.assign(to, from);
 }
 function create(ob) {
   if (ob) {