navigation-stack 0.5.3 → 0.6.0

package/lib/esm/session/WebBrowserSession.js

@@ -1,13 +0,0 @@
-import Session from './Session';
-import WebBrowserEnvironment from '../environment/WebBrowserEnvironment';
-import WebBrowserSessionLifecycle from './lifecycle/WebBrowserSessionLifecycle';
-import WebBrowserNavigation from './navigation/WebBrowserNavigation';
-export default class WebBrowserSession extends Session {
-  constructor() {
-    super({
-      navigation: new WebBrowserNavigation()
-    });
-    this.environment = new WebBrowserEnvironment();
-    this.lifecycle = new WebBrowserSessionLifecycle();
-  }
-}

package/lib/redux/index.d.ts

@@ -1,90 +0,0 @@
-import { InputLocation, Session } from '../index.d.js';
-
-export interface CreateMiddlewaresOptions {
-  basePath?: string;
-}
-
-export function createMiddlewares(
-  session: Session,
-  options?: CreateMiddlewaresOptions,
-): Middleware[];
-
-export const ActionTypes: {
-  INIT: '@@navigation-stack/INIT';
-  PUSH: '@@navigation-stack/PUSH';
-  REPLACE: '@@navigation-stack/REPLACE';
-  NAVIGATE: '@@navigation-stack/NAVIGATE';
-  SHIFT: '@@navigation-stack/SHIFT';
-  UPDATE: '@@navigation-stack/UPDATE';
-  STOP: '@@navigation-stack/STOP';
-};
-
-export interface InitAction {
-  type: (typeof ActionTypes)['INIT'];
-  payload?: InputLocation;
-}
-
-export interface PushAction {
-  type: (typeof ActionTypes)['PUSH'];
-  payload: InputLocation;
-}
-
-export interface ReplaceAction {
-  type: (typeof ActionTypes)['REPLACE'];
-  payload: InputLocation;
-}
-
-export interface ShiftAction {
-  type: (typeof ActionTypes)['SHIFT'];
-  payload: number;
-}
-
-export interface DisposeAction {
-  type: (typeof ActionTypes)['STOP'];
-}
-
-export type Action =
-  | InitAction
-  | PushAction
-  | ReplaceAction
-  | ShiftAction
-  | DisposeAction;
-
-export const Actions: {
-  init(initialLocation?: InputLocation): InitAction;
-  push(location: InputLocation): PushAction;
-  replace(location: InputLocation): ReplaceAction;
-  shift(delta: number): ShiftAction;
-  stop(): DisposeAction;
-};
-
-export const locationReducer: Reducer<Location, Action>;
-
-// The following types are copy-pasted from `redux`.
-
-interface ReduxAction<T = any> {
-  type: T;
-}
-
-interface AnyAction extends ReduxAction {
-  // Allows any extra properties to be defined in an action.
-  [extraProps: string]: any;
-}
-
-interface Dispatch<A extends Action = AnyAction> {
-  <T extends A>(action: T): T;
-}
-
-interface MiddlewareAPI<D extends Dispatch = Dispatch, S = any> {
-  dispatch: D;
-  getState(): S;
-}
-
-interface Middleware<S = any, D extends Dispatch = Dispatch> {
-  (api: MiddlewareAPI<D, S>): (next: Dispatch) => (action: any) => any;
-}
-
-type Reducer<S = any, A extends Action = AnyAction> = (
-  state: S | undefined,
-  action: A,
-) => S;

package/lib/scroll-position/index.d.ts

@@ -1,107 +0,0 @@
-// TypeScript Version: 3.0
-
-import { EnvironmentScrollPosition, Location, Session } from '../index.d.js';
-
-export { EnvironmentScrollPosition, Location, Session } from '../index.d.js';
-
-export {};
-
-export class ScrollPositionRestoration<
-  ScrollableContainer = any,
-  Anchor = any,
-> {
-  constructor(
-    session: Session<ScrollableContainer, Anchor>,
-
-    // `_options` are currently only used in tests.
-    _options?: {
-      // `_options._shouldSetPageScrollPositionOnLocationChange`
-      // isn't used in real life and is not part of the public API.
-      // It's only used in tests.
-      _shouldSetPageScrollPositionOnLocationChange?: (
-        location: Location,
-        prevLocation: Location | undefined,
-      ) => boolean;
-
-      // `_options._getSavedPageScrollPositionOnLocationChange`
-      // isn't used in real life and is not part of the public API.
-      // It's only used in tests.
-      _getSavedPageScrollPositionOnLocationChange?: (
-        location: Location,
-        prevLocation: Location | undefined,
-      ) => [number, number] | undefined;
-
-      // Using this option, a developer could theoretically provide their own implementation
-      // of setting a scroll position. For example, it could use "smooth" (animated) scrolling, etc.
-      // This could be part of the public API if anyone provided a sensible real-world use case for it.
-      _pageScrollPositionSetter?: ScrollPositionSetter<
-        ScrollableContainer,
-        Anchor
-      >;
-    },
-  );
-
-  addScrollableContainer(
-    scrollableContainerKey: string,
-    scrollableContainer: ScrollableContainer,
-
-    // `_options` are currently only used in tests.
-    _options?: {
-      // `_options._shouldSetScrollPositionOnLocationChange`
-      // isn't used in real life and is not part of the public API.
-      // It's only used in tests.
-      _shouldSetScrollPositionOnLocationChange?: (
-        location: Location,
-        prevLocation: Location | undefined,
-      ) => boolean;
-
-      // `_options._getSavedScrollPositionOnLocationChange`
-      // isn't used in real life and is not part of the public API.
-      // It's only used in tests.
-      _getSavedScrollPositionOnLocationChange?: (
-        location: Location,
-        prevLocation: Location | undefined,
-      ) => [number, number] | undefined;
-
-      // Using this option, a developer could theoretically provide their own implementation
-      // of setting a scroll position. For example, it could use "smooth" (animated) scrolling, etc.
-      // This could be part of the public API if anyone provided a sensible real-world use case for it.
-      _scrollPositionSetter: ScrollPositionSetter<ScrollableContainer, Anchor>;
-    },
-  ): () => void;
-
-  locationRendered: (location: Location) => Promise<void>;
-
-  stop(): void;
-
-  // `_enableSavingScrollPosition()` and `_disableSavingScrollPosition()`
-  // aren't used in real life and are not part of the public API.
-  // They're only used in tests.
-  _enableSavingScrollPosition(): void;
-
-  // `_enableSavingScrollPosition()` and `_disableSavingScrollPosition()`
-  // aren't used in real life and are not part of the public API.
-  // They're only used in tests.
-  _disableSavingScrollPosition(): void;
-}
-
-// Theoretically, a developer could pass their own `ScrollPositionSetter` implementation
-// when calling `.addScrollableContainer()` or
-export interface ScrollPositionSetter<ScrollableContainer, Anchor> {
-  // Sets scroll position of a page or a scrollable element.
-  // Returns a `Promise` that resolves when it has finished setting the scroll position.
-  set(
-    // When setting page scroll position, `scrollableContainer` is `undefined`.
-    // When setting scrollable element scroll position, `scrollableContainer` is the scrollable element.
-    scrollableContainer: ScrollableContainer,
-    // When setting page scroll position, it could be either an anchor or numeric coordinates.
-    // When setting scrollable element scroll position, it could only be numeric coordinates.
-    scrollPositionOrAnchor: Anchor | [number, number],
-    // `scrollPosition` provides the API for setting scroll position according to the environment.
-    // For example, `WebBrowserScrollPosition` provides the methods for setting scroll position in a web browser.
-    scrollPosition: EnvironmentScrollPosition<ScrollableContainer, Anchor>,
-  ): Promise<void>;
-
-  // Cancels any pending (or in-progress) setting of scroll position.
-  cancel(): void;
-}

package/redux/package.json

@@ -1,7 +0,0 @@
-{
-  "private": true,
-  "name": "navigation-stack/redux",
-  "main": "./../lib/cjs/redux/index.js",
-  "module": "./../lib/esm/redux/index.js",
-  "types": "./../lib/redux/index.d.ts"
-}

package/scroll-position/package.json

@@ -1,7 +0,0 @@
-{
-  "private": true,
-  "name": "navigation-stack/scroll-position",
-  "main": "./../lib/cjs/scroll-position/index.js",
-  "module": "./../lib/esm/scroll-position/index.js",
-  "types": "./../lib/scroll-position/index.d.ts"
-}

package/src/createSearchFromQuery.js

@@ -1,9 +0,0 @@
-import { stringify as stringifyQuery } from 'query-string';
-
-export default function createSearchFromQuery(query) {
-  const queryString = stringifyQuery(query);
-  if (queryString) {
-    return `?${queryString}`;
-  }
-  return undefined;
-}

package/src/debug.js

@@ -1,8 +0,0 @@
-const DEBUG = false;
-
-export default function debug(...args) {
-  if (DEBUG) {
-    // eslint-disable-next-line no-console
-    console.log(...args);
-  }
-}

package/src/redux/ActionTypes.js

@@ -1,9 +0,0 @@
-export default {
-  INIT: '@@navigation-stack/INIT',
-  PUSH: '@@navigation-stack/PUSH',
-  REPLACE: '@@navigation-stack/REPLACE',
-  NAVIGATE: '@@navigation-stack/NAVIGATE',
-  SHIFT: '@@navigation-stack/SHIFT',
-  UPDATE: '@@navigation-stack/UPDATE',
-  STOP: '@@navigation-stack/STOP',
-};

package/src/redux/ActionTypesInternal.js

@@ -1,3 +0,0 @@
-export default {
-  INTERNAL_LOCATION_UPDATE: '@@navigation-stack/INTERNAL_LOCATION_UPDATE',
-};

package/src/redux/Actions.js

@@ -1,27 +0,0 @@
-import ActionTypes from './ActionTypes';
-
-export default {
-  init: (initialLocation) => ({
-    type: ActionTypes.INIT,
-    payload: initialLocation,
-  }),
-
-  push: (location) => ({
-    type: ActionTypes.PUSH,
-    payload: location,
-  }),
-
-  replace: (location) => ({
-    type: ActionTypes.REPLACE,
-    payload: location,
-  }),
-
-  shift: (delta) => ({
-    type: ActionTypes.SHIFT,
-    payload: delta,
-  }),
-
-  stop: () => ({
-    type: ActionTypes.STOP,
-  }),
-};

package/src/redux/createMiddlewares.js

@@ -1,65 +0,0 @@
-import createAddInputLocationBasePathMiddleware from './middleware/createAddInputLocationBasePathMiddleware';
-import createNonProgrammaticNavigationBlockerMiddleware from './middleware/createNonProgrammaticNavigationBlockerMiddleware';
-import createProgrammaticNavigationBlockerMiddleware from './middleware/createProgrammaticNavigationBlockerMiddleware';
-import createRemoveOutputLocationBasePathMiddleware from './middleware/createRemoveOutputLocationBasePathMiddleware';
-import createUpdateInternalLocationMiddleware from './middleware/createUpdateInternalLocationMiddleware';
-import navigationActionMiddleware from './middleware/navigationOperationMiddleware';
-import parseInputLocationMiddleware from './middleware/parseInputLocationMiddleware';
-import updateLocationMiddleware from './middleware/updateLocationMiddleware';
-
-export default function createMiddlewares(session, options) {
-  // Allows temporarily ignoring location update events.
-  let shouldIgnoreNavigationLocationSubscriptionEvents = false;
-  const ignoreNavigationLocationSubscriptionEvents = (func) => {
-    shouldIgnoreNavigationLocationSubscriptionEvents = true;
-    func();
-    shouldIgnoreNavigationLocationSubscriptionEvents = false;
-  };
-
-  const middlewares = [
-    // Validates that the action "payload" (input location) is a proper `NormalizedInputLocation`.
-    parseInputLocationMiddleware,
-
-    // Transforms a "PUSH" / "REPLACE" action into a "NAVIGATE" action.
-    navigationActionMiddleware,
-
-    // If a website is hosted under a certain path (`basePath`)
-    // then this middleware will automatically hide that starting segment from the `pathname` of `location`s.
-    createAddInputLocationBasePathMiddleware(options && options.basePath),
-
-    // Allows blocking navigation.
-    // Handles `NAVIGATE` actions dispatched by the application itself.
-    createProgrammaticNavigationBlockerMiddleware(session),
-
-    // This "middleware" performs the actual navigation according to the `session` being used.
-    // For example, when `WebBrowserSession` is used, it calls methods of the `history` object.
-    createUpdateInternalLocationMiddleware(session, {
-      shouldIgnoreNavigationLocationSubscriptionEvents: () =>
-        shouldIgnoreNavigationLocationSubscriptionEvents,
-    }),
-
-    // If a website is hosted under a certain path (`basePath`)
-    // then this middleware will automatically hide that starting segment from the `pathname` of `location`s.
-    createRemoveOutputLocationBasePathMiddleware(options && options.basePath),
-
-    // Allows blocking navigation.
-    // Handles location `UPDATE` actions dispatched in response to location update events.
-    createNonProgrammaticNavigationBlockerMiddleware(session, {
-      ignoreNavigationLocationSubscriptionEvents,
-    }),
-  ];
-
-  // Add `updateLocationMiddleware()`.
-  // It dispatches an `UPDATE` action with the new location
-  // so that the reducer could update it in global state.
-  //
-  // If `_internalLocationReducer` option is passed,
-  // it will not add this middleware. This is only used in tests.
-  //
-  // eslint-disable-next-line no-underscore-dangle
-  if (!(options && options._internalLocationReducer)) {
-    middlewares.push(updateLocationMiddleware);
-  }
-
-  return middlewares;
-}

package/src/redux/index.js

@@ -1,4 +0,0 @@
-export Actions from './Actions';
-export ActionTypes from './ActionTypes';
-export createMiddlewares from './createMiddlewares';
-export locationReducer from './locationReducer';

package/src/redux/internalLocationReducer.js

@@ -1,9 +0,0 @@
-import ActionTypesInternal from './ActionTypesInternal';
-
-export default function internalLocationReducer(state, action) {
-  // eslint-disable-next-line no-underscore-dangle
-  if (action.type === ActionTypesInternal.INTERNAL_LOCATION_UPDATE) {
-    return action.payload;
-  }
-  return state;
-}

package/src/redux/locationReducer.js

@@ -1,8 +0,0 @@
-import ActionTypes from './ActionTypes';
-
-export default function locationReducer(state, action) {
-  if (action.type === ActionTypes.UPDATE) {
-    return action.payload;
-  }
-  return state;
-}

package/src/redux/middleware/createAddInputLocationBasePathMiddleware.js

@@ -1,27 +0,0 @@
-import { addBasePath } from '../../basePath';
-import ActionTypes from '../ActionTypes';
-
-// Creates a "middleware" that, when a website is hosted under a certain path (`basePath`),
-// automatically hides that starting segment from the `pathname` of `location`s.
-export default function createAddInputLocationBasePathMiddleware(basePath) {
-  return function addInputLocationBasePathMiddleware() {
-    return (next) => (action) => {
-      const { type, payload } = action;
-
-      switch (type) {
-        // Transforms `NAVIGATE` action payload (`location`).
-        case ActionTypes.NAVIGATE:
-          return next({
-            type,
-            payload: {
-              ...payload,
-              location: addBasePath(payload.location, basePath),
-            },
-          });
-
-        default:
-          return next(action);
-      }
-    };
-  };
-}

package/src/redux/middleware/createNonProgrammaticNavigationBlockerMiddleware.js

@@ -1,119 +0,0 @@
-import getLocationFromInternalLocation from '../../getLocationFromInternalLocation';
-import isPromise from '../../isPromise';
-import {
-  getNavigationBlockers,
-  runNavigationBlockers,
-} from '../../navigationBlockers';
-import NavigationOperations from '../../session/navigation/operation/operations';
-import ActionTypesInternal from '../ActionTypesInternal';
-import { createNavigationBlockersEvaluationStatus } from './createProgrammaticNavigationBlockerMiddleware';
-
-// Creates a "middleware" that applies navigation blockers for non-programmatic navigation,
-// i.e. the navigation that wasn't triggered by the application code and was triggered, say, by the user.
-// It also handles programmatic `SHIFT` navigation because it doesn't know the new location until
-// the environment performs the `delta` navigation and then tells the new location to `navigation-stack`.
-export default function createNonProgrammaticNavigationBlockerMiddleware(
-  session,
-  { ignoreNavigationLocationSubscriptionEvents },
-) {
-  return function nonProgrammaticNavigationBlockerMiddleware() {
-    return (next) => (action) => {
-      const { type, payload } = action;
-
-      // Declaring `result` variable here fixes ESLint error:
-      // "Unexpected lexical declaration in case block".
-      let result;
-
-      switch (type) {
-        // One could ask: Why run navigation blockers on `UPDATE` Redux action?
-        // Why not just run navigation blockers on `NAVIGATE` and `SHIFT` Redux action?
-        // The reason why it handles `UPDATE` Redux actions here is because
-        // `NAVIGATE` Redux actions are only emitted for programmatic "push" or "replace" navigation
-        // initiated by the application code, and there're other cases of navigation such as
-        // programmatic "shift" navigation or when the user manually clicks "Back" or "Forward" button
-        // in a web browser. And even if a "shift" navigation is initiated by the application code,
-        // it still doesn't know yet what the new location is gonna be cause it only knows the `delta`.
-        // Such "other" cases could only be handled by reacting to an `UPDATE` Redux action
-        // which is only emitted after the URL in the browser's address bar has changed.
-        //
-        // There's no real drawback in reacting to an `UPDATE` Redux action "post factum" because
-        // from the application's point of view the address bar doesn't matter and even doesn't exist.
-        // All that exists from the application's point of view is the `location` object in the Redux state.
-        // Until the `location` object in the Redux state is updated, the old page is still rendered.
-        // The appliation is only concerned with the updates of the `location` object in the Redux state
-        // and completely ignores any updates to the URL in the web browser's address bar.
-        //
-        // So here, the "middleware" attempts to prevent or allow navigation that has already happened
-        // in the web browser's address bar but hasn't yet happened in Redux state.
-        // For example, it could be a user clicking a "Back"/"Forward" button in their web browser.
-        // If such navigation should've been blocked, it will simply not update the `locaiton` object in Redux state,
-        // and it will also "rewind" the change of the URL in the web browser's address bar so that it's consistent
-        // with the `location` in Redux state.
-        //
-        // eslint-disable-next-line no-underscore-dangle
-        case ActionTypesInternal.INTERNAL_LOCATION_UPDATE:
-          // Programmatic `PUSH`/`REPLACE` actions are handled in another middleware.
-          if (
-            payload.operation === NavigationOperations.PUSH ||
-            payload.operation === NavigationOperations.REPLACE
-          ) {
-            return next(action);
-          }
-
-          // If no navigation blockers to run, don't do anything.
-          if (getNavigationBlockers(session).length === 0) {
-            return next(action);
-          }
-
-          // If it was the initial page load or a redirect,
-          // it's not really a navigation that could be rolled back.
-          if (payload.delta === 0) {
-            return next(action);
-          }
-
-          result = runNavigationBlockers(
-            getNavigationBlockers(session),
-            // Here `getLocationFromInternalLocation(payload)` is `Location`.
-            getLocationFromInternalLocation(payload),
-          );
-
-          if (isPromise(result)) {
-            const status = createNavigationBlockersEvaluationStatus(session);
-
-            // While location blockers are running, rewind to the previous location.
-            ignoreNavigationLocationSubscriptionEvents(() => {
-              session.shift(-payload.delta);
-            });
-
-            result.then((promiseResult) => {
-              if (promiseResult) {
-                // Navigation blocked.
-                // Already rewound to a previous location.
-              } else if (!status.cancelled) {
-                // Navigation not blocked.
-                // Rewind back to the new location.
-                ignoreNavigationLocationSubscriptionEvents(() => {
-                  session.shift(payload.delta);
-                });
-                // Update the location.
-                next(action);
-              }
-            });
-          } else if (result) {
-            // Prevent the navigation: rewind to the previous location.
-            ignoreNavigationLocationSubscriptionEvents(() => {
-              session.shift(-payload.delta);
-            });
-          } else {
-            // Update the location.
-            return next(action);
-          }
-          // eslint-disable-next-line consistent-return
-          return;
-
-        default:
-          return next(action);
-      }
-    };
-  };
-}

package/src/redux/middleware/createProgrammaticNavigationBlockerMiddleware.js

@@ -1,94 +0,0 @@
-import isPromise from '../../isPromise';
-import {
-  getNavigationBlockers,
-  removeAllNavigationBlockers,
-  runNavigationBlockers,
-} from '../../navigationBlockers';
-import ActionTypes from '../ActionTypes';
-
-export function createNavigationBlockersEvaluationStatus(session) {
-  /* eslint-disable no-underscore-dangle */
-  if (session._navigationBlockersEvaluationStatus) {
-    session._navigationBlockersEvaluationStatus.cancelled = true;
-  }
-  session._navigationBlockersEvaluationStatus = { cancelled: false };
-  return session._navigationBlockersEvaluationStatus;
-}
-
-// Creates a "middleware" that applies navigation blockers for programmatic navigation,
-// i.e. the navigation that was triggered by the application code.
-// This only includes `PUSH` and `REPLACE` navigation, and other programmatic types of navigation
-// such as `SHIFT` aren't able to be handled here due to not yet having `location` info,
-// so they're handled in a different middleware.
-export default function createProgrammaticNavigationBlockerMiddleware(
-  session,
-) {
-  return function programmaticNavigationBlockerMiddleware() {
-    return (next) => (action) => {
-      const { type, payload } = action;
-
-      // Declaring `result` variable here fixes ESLint error:
-      // "Unexpected lexical declaration in case block".
-      let result;
-
-      switch (type) {
-        // Prevent or allow navigation that was initiated by the application
-        // by dispatching a `.push()` or `.replace()` action.
-        //
-        // It doesn't handle `.shift()` navigation actions because it doesn't yet know
-        // the `location` that it's gonna `shift` to. Instead, it waits for the web browser
-        // to "shift" to that `location` and then reads it and rewinds the "shift"
-        // if it should've been blocked. That is handled by another "navigation blocker" middleware.
-        //
-        // This type of "shifting" and then rewinding the "shift" doesn't really matter to the application at all.
-        // From the application's point of view, all of that doesn't matter and even doesn't exist.
-        // All that exists from the application's point of view is the `location` object in the Redux state.
-        // Until the `location` object in the Redux state is updated, the old page is still rendered.
-        // The appliation is only concerned with the updates of the `location` object in the Redux state
-        // and completely ignores any updates to the URL in the web browser's address bar.
-        //
-        case ActionTypes.NAVIGATE:
-          // `resultValue` variable name works around a stupid javascript error:
-          // "Cannot redeclare block-scoped variable 'result'".
-          result = runNavigationBlockers(
-            getNavigationBlockers(session),
-            // Here `payload.location` is `LocationBase`.
-            payload.location,
-          );
-          if (isPromise(result)) {
-            const status = createNavigationBlockersEvaluationStatus(session);
-            // eslint-disable-next-line consistent-return
-            result.then((resultValue) => {
-              if (!status.cancelled) {
-                if (!resultValue) {
-                  return next(action);
-                }
-              }
-            });
-          } else if (!result) {
-            return next(action);
-          }
-          // eslint-disable-next-line consistent-return
-          return;
-
-        // Programmatic SHIFT actions aren't handled here.
-        // Instead, they're handled in non-programmatic navigation blocker middleware.
-        // The rationale is that there's no `location` argument on "SHIFT" actions,
-        // so the navigation blockers don't know yet what is the new location gonna be.
-        // They have to wait for the environment to restore the new location
-        // and then tell it to `navigation-stack` by calling a listener.
-        case ActionTypes.SHIFT:
-          // New `location` isn't known yet. Proceed without blocking anything.
-          return next(action);
-
-        // Remove any navigation blockers on `STOP` event.
-        case ActionTypes.STOP:
-          removeAllNavigationBlockers(session);
-          return next(action);
-
-        default:
-          return next(action);
-      }
-    };
-  };
-}

package/src/redux/middleware/createRemoveOutputLocationBasePathMiddleware.js

@@ -1,26 +0,0 @@
-import { removeBasePath } from '../../basePath';
-import ActionTypesInternal from '../ActionTypesInternal';
-
-// Creates a "middleware" that, when a website is hosted under a certain path (`basePath`),
-// automatically hides that starting segment from the `pathname` of `location`s.
-export default function createRemoveOutputLocationBasePathMiddleware(
-  basePath,
-) {
-  return function removeOutputLocationBasePathMiddleware() {
-    return (next) => (action) => {
-      const { type, payload } = action;
-
-      switch (type) {
-        // Transforms `UPDATE` action payload (input `location`).
-        case ActionTypesInternal.INTERNAL_LOCATION_UPDATE:
-          return next({
-            type,
-            payload: removeBasePath(payload, basePath),
-          });
-
-        default:
-          return next(action);
-      }
-    };
-  };
-}