druxt-router 0.25.0 → 0.27.0

package/dist/components/DruxtRouter.vue

@@ -6,12 +6,9 @@ import DruxtModule from 'druxt/dist/components/DruxtModule.vue'
  * The DruxtRouter component renders a Drupal decoupled route, or path, using
  * the appropriate Druxt component.
  *
- * `<DruxtRouter path="/" />`
+ * For instance, using the path `/node/1` would render a DruxtEntity component.
  *
- * If no Path is specified, the Vue router path will be used by default.
- *
- * For instance, using the `/node/1` route would result in a DruxtRouter
- * component for the content in Drupal with the Node ID of 1.
+ * The Vue router path will be used if not path is defined.
  *
  * @example <caption>Render using the Vue router path</caption> @lang vue
  * <DruxtRouter />
@@ -22,10 +19,22 @@ import DruxtModule from 'druxt/dist/components/DruxtModule.vue'
  * @example <caption>Render the result of the model, bypasses Drupal backend</caption> @lang vue
  * <DruxtRouter v-model="route" />
  *
- * @example <caption>Render via a template</caption> @lang vue
+ * @example <caption>DruxtRouter Wrapper component boilerplate</caption> @lang vue
+ * <template>
+ *   <DruxtDebug :json="route" />
+ * </template>
+ *
+ * <script>
+ * import { DruxtRouterMixin } from 'druxt-router'
+ * export default {
+ *   mixins: [DruxtRouterMixin]
+ * }
+ *
+ * @example <caption>DruxtRouter with template injection</caption> @lang vue
  * <DruxtRouter>
  *   <template #default="{ route }">
- *     <DruxtRouter v-bind="route.props" />
+ *     <!-- Do whatever you want here -->
+ *     <DruxtDebug :json="route" open />
  *   </template>
  * </DruxtRouter>
  */
@@ -99,6 +108,9 @@ export default {
    * @property {object} model - The model object.
    */
   data: ({ value }) => ({
+    debug: {
+      path: undefined,
+    },
     model: value,
   }),
 
@@ -163,6 +175,13 @@ export default {
 
   /** */
   watch: {
+    $route() {
+      const path = this.$route.fullPath
+      if (this.$store.state.druxtRouter.routes[path] && this.$store.state.druxtRouter.route !== this.$store.state.druxtRouter.routes[path]) {
+        this.$store.commit('druxtRouter/setRoute', path)
+      }
+    },
+
     /**
      * Re-fetch on update to Path prop.
      */
@@ -197,7 +216,7 @@ export default {
       // Get the route from the Drupal decoupled router module via the
       // druxtRouter store.
       // Use the Path prop or the Vue Router as the route to lookup.
-      const path = this.path || this.$route.fullPath
+      const path = this.debug.path || this.path || this.$route.fullPath
       const route = await this.$store.dispatch('druxtRouter/getRoute', path)
       this.model = route
 
@@ -219,7 +238,37 @@ export default {
     propsData: ({ $route, path, model }) => ({
       path: path || $route.fullPath,
       route: model
-    })
+    }),
+
+    /**
+     * Provides the scoped slots object for the Module render function.
+     *
+     * - **debug**: A Debug component with a Path override field.
+     * - **default**: Default error handling.
+     *
+     * @example <caption>DruxtRouter**Module**.vue</caption> @lang vue
+     * <template>
+     *   <div>
+     *     <slot name="debug" />
+     *     {{ route.props }}
+     *   </div>
+     * </template>
+     *
+     * @return {ScopedSlots} The Scoped slots object.
+     */
+    slots(h) {
+      const scopedSlots = {}
+
+      // Provide defualt error message.
+      if (this.model.error) {
+        scopedSlots.default = () => h('div', [
+          h('h1', [`Error ${this.model.error.statusCode}`]),
+          h('p', [this.model.error.message]),
+        ])
+      }
+
+      return scopedSlots
+    }
   }
 }
 
@@ -230,16 +279,22 @@ export default {
  *
  * @example @lang js
  * [
+ *   'DruxtRouter[Module][IsFront?][Langcode]',
  *   'DruxtRouter[Module][IsFront?]',
- *   'DruxtRouterDefault',
+ *   'DruxtRouter[Module][Langcode]',
+ *   'DruxtRouter[Module]',
+ *   'DruxtRouter[Default][Langcode]',
+ *   'DruxtRouter[Default]',
  * ]
  *
  * @example <caption>Entity route</caption> @lang js
  * [
+ *   'DruxtRouterEntityFrontEn',
  *   'DruxtRouterEntityFront',
+ *   'DruxtRouterEntityEn',
  *   'DruxtRouterEntity',
- *   'DruxtRouterDefault',
- *   '',
+ *   'DruxtRouterDefaultEn',
+ *   'DruxtRouterDefault'
  * ]
  */
 
@@ -267,4 +322,20 @@ export default {
  *   }
  * }
  */
+
+/**
+ * Provides scoped slots for use in the Wrapper component.
+ *
+ * @typedef {object} ScopedSlots
+ * @param {function} debug - A Debug component with a Path override field.
+ * @param {function} default - Default error handling.
+ *
+ * @example <caption>DruxtRouter**Module**.vue</caption> @lang vue
+ * <template>
+ *   <div>
+ *     <slot name="debug" />
+ *     {{ route.props }}
+ *   </div>
+ * </template>
+ */
 </script>

package/dist/components/index.mjs

@@ -4,7 +4,7 @@
  * @type {object}
  * @exports DruxtRouterComponent
  * @name DruxtRouterComponent
- * @see {@link ./components/DruxtRouter.html|DruxtRouterComponent}
+ * @see {@link ./components/DruxtRouter|DruxtRouterComponent}
  *
  * @example
  * <script>

package/dist/druxt-router.esm.js

@@ -1,5 +1,6 @@
 import { DruxtClient } from 'druxt';
 import Url from 'url-parse';
+import Vue from 'vue';
 import { mapState, mapActions } from 'vuex';
 
 class DruxtRouter {
@@ -12,6 +13,7 @@ class DruxtRouter {
           component: "druxt-entity",
           property: "entity",
           props: (route) => ({
+            langcode: route.entity.langcode,
             type: route.jsonapi.resourceName,
             uuid: route.entity.uuid
           })
@@ -23,6 +25,7 @@ class DruxtRouter {
           property: "view",
           props: (route) => ({
             displayId: route.view.display_id,
+            langcode: route.view.langcode || void 0,
             type: route.jsonapi.resourceName,
             uuid: route.view.uuid,
             viewId: route.view.view_id
@@ -60,13 +63,15 @@ class DruxtRouter {
     return this.index;
   }
   getRedirect(path, route = {}) {
+    const prefix = (route.props || {}).langcode || "";
     if (((route.redirect || [])[0] || {}).to) {
       return route.redirect[0].to;
     }
     const url = Url(path);
     if (route.isHomePath) {
-      if (url.pathname !== "/") {
-        return "/";
+      const homePath = prefix ? `/${prefix}` : "/";
+      if (!(url.pathname === homePath || url.pathname === `${homePath}/`)) {
+        return homePath;
       }
       return false;
     }
@@ -99,10 +104,10 @@ class DruxtRouter {
     return resources.data || false;
   }
   async getResourceByRoute(route) {
-    const resource = await this.druxt.getResource(route.jsonapi.resourceName, route.entity.uuid);
+    const resource = await this.druxt.getResource(route.jsonapi.resourceName, route.entity.uuid, route.prefix);
     return resource.data || false;
   }
-  async getRoute(path) {
+  async getRoute(path = "/") {
     const url = `/router/translate-path?path=${path}`;
     const response = await this.druxt.get(url, {
       validateStatus: (status) => status < 500
@@ -124,7 +129,8 @@ class DruxtRouter {
       label: data.label,
       props: false,
       redirect: data.redirect,
-      resolvedPath: Url(data.resolved).pathname
+      resolvedPath: Url(data.resolved).pathname,
+      entity: data.entity
     };
     for (const key in this.options.types) {
       const type = {
@@ -190,7 +196,7 @@ const DruxtRouterStore = ({ store }) => {
         if (typeof path !== "string" || typeof route === "undefined") {
           return;
         }
-        state.routes[path] = route;
+        Vue.set(state.routes, path, route);
       },
       setRoute(state, path) {
         if (typeof path !== "string" || typeof state.routes[path] === "undefined") {
@@ -289,6 +295,10 @@ const DruxtRouterEntityMixin = {
 
 const DruxtRouterMixin = {
   props: {
+    langcode: {
+      type: String,
+      default: void 0
+    },
     path: {
       type: String,
       default: void 0

package/dist/druxt-router.ssr.js

@@ -4,11 +4,13 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 const druxt = require('druxt');
 const Url = require('url-parse');
+const Vue = require('vue');
 const vuex = require('vuex');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 const Url__default = /*#__PURE__*/_interopDefaultLegacy(Url);
+const Vue__default = /*#__PURE__*/_interopDefaultLegacy(Vue);
 
 class DruxtRouter {
   constructor(baseUrl, options = {}) {
@@ -20,6 +22,7 @@ class DruxtRouter {
           component: "druxt-entity",
           property: "entity",
           props: (route) => ({
+            langcode: route.entity.langcode,
             type: route.jsonapi.resourceName,
             uuid: route.entity.uuid
           })
@@ -31,6 +34,7 @@ class DruxtRouter {
           property: "view",
           props: (route) => ({
             displayId: route.view.display_id,
+            langcode: route.view.langcode || void 0,
             type: route.jsonapi.resourceName,
             uuid: route.view.uuid,
             viewId: route.view.view_id
@@ -68,18 +72,20 @@ class DruxtRouter {
     return this.index;
   }
   getRedirect(path, route = {}) {
+    const prefix = (route.props || {}).langcode || "";
     if (((route.redirect || [])[0] || {}).to) {
       return route.redirect[0].to;
     }
-    const url = Url__default['default'](path);
+    const url = Url__default["default"](path);
     if (route.isHomePath) {
-      if (url.pathname !== "/") {
-        return "/";
+      const homePath = prefix ? `/${prefix}` : "/";
+      if (!(url.pathname === homePath || url.pathname === `${homePath}/`)) {
+        return homePath;
       }
       return false;
     }
     if (typeof route.canonical === "string") {
-      const canonicalUrl = new Url__default['default'](route.canonical);
+      const canonicalUrl = new Url__default["default"](route.canonical);
       if (url.pathname !== canonicalUrl.pathname) {
         return canonicalUrl.pathname;
       }
@@ -107,10 +113,10 @@ class DruxtRouter {
     return resources.data || false;
   }
   async getResourceByRoute(route) {
-    const resource = await this.druxt.getResource(route.jsonapi.resourceName, route.entity.uuid);
+    const resource = await this.druxt.getResource(route.jsonapi.resourceName, route.entity.uuid, route.prefix);
     return resource.data || false;
   }
-  async getRoute(path) {
+  async getRoute(path = "/") {
     const url = `/router/translate-path?path=${path}`;
     const response = await this.druxt.get(url, {
       validateStatus: (status) => status < 500
@@ -132,7 +138,8 @@ class DruxtRouter {
       label: data.label,
       props: false,
       redirect: data.redirect,
-      resolvedPath: Url__default['default'](data.resolved).pathname
+      resolvedPath: Url__default["default"](data.resolved).pathname,
+      entity: data.entity
     };
     for (const key in this.options.types) {
       const type = {
@@ -198,7 +205,7 @@ const DruxtRouterStore = ({ store }) => {
         if (typeof path !== "string" || typeof route === "undefined") {
           return;
         }
-        state.routes[path] = route;
+        Vue__default["default"].set(state.routes, path, route);
       },
       setRoute(state, path) {
         if (typeof path !== "string" || typeof state.routes[path] === "undefined") {
@@ -297,6 +304,10 @@ const DruxtRouterEntityMixin = {
 
 const DruxtRouterMixin = {
   props: {
+    langcode: {
+      type: String,
+      default: void 0
+    },
     path: {
       type: String,
       default: void 0

package/nuxt/index.d.ts

@@ -27,4 +27,4 @@ declare namespace DruxtRouterNuxtModule {
     const meta: any;
 }
 
-export default DruxtRouterNuxtModule;
+export { DruxtRouterNuxtModule as default };

package/nuxt/index.js

@@ -4,6 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 const fs = require('fs');
 const path = require('path');
+const drupalJsonapiParams = require('drupal-jsonapi-params');
+const druxt = require('druxt');
 
 const DruxtRouterNuxtModule = async function(moduleOptions = {}) {
   const options = {
@@ -20,23 +22,39 @@ const DruxtRouterNuxtModule = async function(moduleOptions = {}) {
     dirs.push({ path: path.join(__dirname, "../dist/components") });
   });
   if (options.router.wildcard) {
+    if (!options.router.pages) {
+      this.nuxt.hook("build:before", () => this.nuxt.options.build.createRoutes = () => []);
+    }
     this.addTemplate({
       src: path.resolve(__dirname, "../templates/component.js"),
       fileName: "components/druxt-router.js",
       options
     });
-    this.extendRoutes((routes, resolve2) => {
+    const druxt$1 = new druxt.DruxtClient(options.baseUrl, {
+      ...options,
+      proxy: { ...options.proxy || {}, api: false }
+    });
+    const resourceType = "configurable_language--configurable_language";
+    const query = new drupalJsonapiParams.DrupalJsonApiParams().addFields(resourceType, ["drupal_internal__id"]);
+    const languages = (await druxt$1.getCollectionAll(resourceType, query) || []).map((o) => o.data).flat().filter((o) => !["und", "zxx"].includes(o.attributes.drupal_internal__id));
+    this.extendRoutes((routes) => {
+      languages.forEach((o) => {
+        routes.push({
+          name: `druxt-router__${o.attributes.drupal_internal__id}`,
+          path: `/${o.attributes.drupal_internal__id}*`,
+          component: path.resolve(this.options.buildDir, "components/druxt-router.js"),
+          chunkName: "druxt-router",
+          meta: { langcode: o.attributes.drupal_internal__id }
+        });
+      });
       routes.push({
         name: "druxt-router",
         path: "*",
-        component: resolve2(this.options.buildDir, "components/druxt-router.js"),
+        component: path.resolve(this.options.buildDir, "components/druxt-router.js"),
         chunkName: "druxt-router"
       });
     });
   }
-  if (options.router.wildcard && !options.router.pages) {
-    this.nuxt.hook("build:before", () => this.nuxt.options.build.createRoutes = () => []);
-  }
   this.addPlugin({
     src: path.resolve(__dirname, "../templates/plugin.js"),
     fileName: "druxt-router.js",
@@ -49,9 +67,14 @@ const DruxtRouterNuxtModule = async function(moduleOptions = {}) {
     options
   });
   this.nuxt.hook("storybook:config", async ({ stories }) => {
-    stories.push("druxt-router/dist/components/*.stories.mjs");
+    this.addTemplate({
+      src: path.resolve(__dirname, "../templates/druxt-router.stories.js"),
+      fileName: "stories/druxt-router.stories.js",
+      options: {}
+    });
+    stories.push(path.resolve(this.options.buildDir, "./stories/druxt-router.stories.js"));
   });
 };
 DruxtRouterNuxtModule.meta = require("../package.json");
 
-exports.default = DruxtRouterNuxtModule;
+exports["default"] = DruxtRouterNuxtModule;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "druxt-router",
-  "version": "0.25.0",
+  "version": "0.27.0",
   "description": "Drupal router for Nuxt, powered by the Drupal Decoupled Router module.",
   "keywords": [
     "cms",
@@ -42,8 +42,14 @@
     "templates"
   ],
   "dependencies": {
-    "druxt": "^0.16.0",
-    "url-parse": "^1.4.7"
+    "druxt": "^0.19.0",
+    "url-parse": "^1.5.10"
+  },
+  "devDependencies": {
+    "vue-router": "^3.5.4"
+  },
+  "peerDependencies": {
+    "drupal-jsonapi-params": "*"
   },
   "optionalDependencies": {
     "vue": "^2.6.14",

package/templates/druxt-router.stories.js

@@ -0,0 +1,65 @@
+import DruxtRouter from 'druxt-router/dist/components/DruxtRouter.vue'
+
+export default {
+  title: 'Druxt/Router/DruxtRouter',
+  component: DruxtRouter
+}
+
+// Default story.
+export const Default = (args, { argTypes }) => ({
+  components: { DruxtRouter },
+  props: Object.keys(argTypes),
+  template: `<DruxtRouter v-bind="$props" />`
+})
+Default.args = { path: '/' }
+
+let code
+
+// Wrapper story.
+code = `<template>
+  <DruxtDebug :json="route" />
+</template>
+
+<script>
+import { DruxtRouterMixin } from 'druxt-router'
+export default {
+  mixins: [DruxtRouterMixin]
+}
+</script>`
+export const Wrapper = (args, { argTypes }) => ({
+  components: { DruxtRouter },
+  props: Object.keys(argTypes),
+  template: `<DruxtRouter v-bind="$props" ref="module">
+  <template #default>
+    Component options:
+    <ul>
+      <li v-for="option of $refs.module.getModuleComponents()" :key="option.name">{{ option.name }}</li>
+    </ul>
+  </template>
+</DruxtRouter>`
+})
+Wrapper.parameters = {
+  docs: {
+    storyDescription: 'The DruxtRouter component can be themed by using a Druxt Wrapper component.\n\nCreate an appropriately named component, using the relevant component option, with the following boilerplate:\n\n```jsx\n' + code + '\n```',
+    source: { code }
+  }
+}
+
+// Template injection story.
+code = `<DruxtRouter path="">
+  <template #default="{ route }">
+    <!-- Do whatever you want here -->
+    <DruxtDebug :json="route" open />
+  </template>
+</DruxtRouter>`
+export const TemplateInjection = (args, { argTypes }) => ({
+  components: { DruxtRouter },
+  props: Object.keys(argTypes),
+  template: code.replace('path=""', 'v-bind="$props"')
+})
+TemplateInjection.parameters = {
+  docs: {
+    storyDescription: 'The DruxtRouter component can be themed by injecting the default template into the compomnent.\n\n```jsx\n' + code + '\n```',
+    source: { code }
+  }
+}

package/CHANGELOG.md

@@ -1,311 +0,0 @@
-# druxt-router
-
-## 0.25.0
-
-### Minor Changes
-
-- 7b749bd: Added improved error handling.
-
-### Patch Changes
-
-- Updated dependencies [7b749bd]
-  - druxt@0.16.0
-
-## 0.24.2
-
-### Patch Changes
-
-- Updated dependencies [2ae1d6d]
-  - druxt@0.15.0
-
-## 0.24.1
-
-### Patch Changes
-
-- Updated dependencies [45bc0b9]
-  - druxt@0.14.0
-
-## 0.24.0
-
-### Minor Changes
-
-- 9161b38: Added Storybook integration for the DruxtRouter component.
-- 9161b38: Added ability to render a specific route using the Path property.
-
-  ```jsx
-  <DruxtRouter path="/node/1" />
-  ```
-
-- 9161b38: Added fetch hook to DruxtRouter component.
-- 9161b38: Added option to disable the DruxtRouter page middleware.
-
-  ```js
-  export default {
-    druxt: {
-      router: {
-        middleware: false
-      }
-    }
-  };
-  ```
-
-  Note: This is experimental and your results may vary.
-
-## 0.23.0
-
-### Minor Changes
-
-- 77ab204: Added support for API Proxy
-
-### Patch Changes
-
-- Updated dependencies [77ab204]
-  - druxt@0.13.0
-
-## 0.22.0
-
-### Minor Changes
-
-- c7b267a: Throw Error on router errors
-
-### Patch Changes
-
-- Updated dependencies [4504a2f]
-  - druxt@0.12.0
-
-## 0.21.0
-
-### Minor Changes
-
-- 9d905e8: Set router `pages` option default based on presence of `pages/` directory.
-- 9d905e8: Moved Nuxt module to `druxt-router/nuxt`
-
-  ⚠ Potential breaking change
-
-  ```diff
-  -modules: ['druxt-router']
-  +modules: ['druxt-router/nuxt']
-  ```
-
-- dae345e: Added module level options
-
-### Patch Changes
-
-- Updated dependencies [dae345e]
-  - druxt@0.11.0
-
-## 0.20.0
-
-### Minor Changes
-
-- 1ab762c: Enabled Nuxt Vuex store by default
-- ecefef5: Added option to disable wildcard route
-- 715e5ef: Updated component registration method to use the Nuxt `components:dirs` hook
-- cbc66cd: Added option to disable `pages/` routes
-
-### Patch Changes
-
-- Updated dependencies [715e5ef]
-  - druxt@0.10.0
-
-## 0.19.1
-
-### Patch Changes
-
-- c4616df: Fixed dependencies
-
-## 0.19.0
-
-### Minor Changes
-
-- 21170fb: Moved Vue components out of bundle
-
-  ⚠ Potential breaking change
-
-  _**Note:** This only effects custom Druxt modules and implementations._
-
-  ```diff
-  -import { DruxtRouter } from 'druxt-router'
-  +import DruxtRouter from 'druxt-router/dist/components/DruxtRouter.vue'
-  ```
-
-### Patch Changes
-
-- Updated dependencies [21170fb]
-  - druxt@0.9.0
-
-## 0.18.1
-
-### Patch Changes
-
-- Added `hid` to canonical meta tag
-- Fixed issue with metatags
-
-## 0.18.0
-
-### Minor Changes
-
-- Deprecated client methods in favour of DruxtClient
-
-## 0.17.3
-
-### Patch Changes
-
-- Fixed issue with querystring and getRedirect()
-
-## 0.17.2
-
-### Patch Changes
-
-- Updated dependencies
-
-## 0.17.1
-
-### Patch Changes
-
-- Fixed issue with permission check
-
-## 0.17.0
-
-### Minor Changes
-
-- Added support for DruxtComponentMixin
-
-## 0.16.1
-
-### Patch Changes
-
-- Updated Nuxt module
-- Updated dependencies
-
-## 0.16.0
-
-### Minor Changes
-
-- Added documentation
-- Updated dependencies
-
-## 0.15.0
-
-### Minor Changes
-
-- Added resolved path to router information
-- Added `all` option to getResources
-
-## 0.14.0
-
-### Minor Changes
-
-- Added support for Drupal JSON:API Params
-- Added addHeaders() method
-
-## 0.13.0
-
-### Minor Changes
-
-- Added resource index
-- Added support for remapped resources
-- Added getResources method
-
-## 0.12.0
-
-### Minor Changes
-
-- Added support for customisable endpoint
-- Added type and uuid data
-- Fixed hydration issue
-
-## 0.11.1
-
-### Patch Changes
-
-- Fixed hydration issue
-
-## 0.11.0
-
-### Minor Changes
-
-- Added support for additional router types
-- Added support for JSON:API Views routes
-
-## 0.10.1
-
-### Patch Changes
-
-- Fixed router WSOD error
-
-## 0.10.0
-
-### Minor Changes
-
-- Add configurable Router component
-- Refactored DruxtRouterEntityMixin
-- Removed support for JSON API Deserializer
-
-## 0.9.0
-
-### Minor Changes
-
-- Updated module to use shared Druxt configruation
-
-## 0.8.0
-
-### Minor Changes
-
-- Improved error handling for missing routes
-
-## 0.7.0
-
-### Minor Changes
-
-- Added getRoute action to Vuex store
-- Refactored Nuxt plugin
-
-## 0.6.0
-
-### Minor Changes
-
-- Added Axios settings support
-
-## 0.5.0
-
-### Minor Changes
-
-- Added support for redirects
-- Added support for JSON API resourceName
-
-## 0.4.2
-
-### Patch Changes
-
-- Fixed various issues
-
-## 0.4.1
-
-### Patch Changes
-
-- Fixed various issues
-
-## 0.4.0
-
-### Minor Changes
-
-## 0.3.0
-
-### Minor Changes
-
-## 0.2.2
-
-### Patch Changes
-
-## 0.2.1
-
-### Patch Changes
-
-## 0.2.0
-
-### Minor Changes
-
-## 0.1.0
-
-### Initial release

package/dist/components/DruxtRouter.stories.mjs

@@ -1,16 +0,0 @@
-import DruxtRouter from './DruxtRouter.vue'
-
-export default {
-  title: 'Druxt/Router/DruxtRouter',
-  component: DruxtRouter
-}
-
-const Template = (args, { argTypes }) => ({
-  components: { DruxtRouter },
-  props: Object.keys(argTypes),
-  template: `<DruxtRouter v-bind="$props" />`
-})
-
-export const Default = Template.bind({})
-Default.storyName = 'DruxtRouter'
-Default.args = { path: '/' }