docusaurus-plugin-openapi-docs 1.4.2 → 1.4.4

package/lib/index.js

@@ -125,7 +125,7 @@ description: "{{{frontMatter.description}}}"
 sidebar_label: Introduction
 {{/api}}
 {{#api}}
-sidebar_label: {{{title}}}
+sidebar_label: "{{{title}}}"
 {{/api}}
 {{^api}}
 sidebar_position: 0
@@ -151,7 +151,7 @@ info_path: {{{infoPath}}}
 id: {{{id}}}
 title: "{{{title}}}"
 description: "{{{frontMatter.description}}}"
-sidebar_label: {{{title}}}
+sidebar_label: "{{{title}}}"
 hide_title: true
 custom_edit_url: null
 ---
@@ -259,7 +259,7 @@ import {useCurrentSidebarCategory} from '@docusaurus/theme-common';
     }
     async function cleanApiDocs(options) {
         const { outputDir } = options;
-        const apiDir = path_1.default.join(siteDir, outputDir);
+        const apiDir = (0, utils_1.posixPath)(path_1.default.join(siteDir, outputDir));
         const apiMdxFiles = await (0, utils_1.Globby)(["*.api.mdx", "*.info.mdx", "*.tag.mdx"], {
             cwd: path_1.default.resolve(apiDir),
             deep: 1,

package/lib/markdown/createRequestSchema.js

@@ -25,6 +25,9 @@ function mergeAllOf(allOf) {
             example: function () {
                 return true;
             },
+            "x-examples": function () {
+                return true;
+            },
             ignoreAdditionalProperties: true,
         },
     });

package/lib/markdown/createResponseSchema.js

@@ -26,6 +26,9 @@ function mergeAllOf(allOf) {
             example: function () {
                 return true;
             },
+            "x-examples": function () {
+                return true;
+            },
         },
         ignoreAdditionalProperties: true,
     });

package/lib/openapi/openapi.js

@@ -19,6 +19,7 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
 const kebabCase_1 = __importDefault(require("lodash/kebabCase"));
 const unionBy_1 = __importDefault(require("lodash/unionBy"));
+const uniq_1 = __importDefault(require("lodash/uniq"));
 const index_1 = require("../index");
 const createRequestExample_1 = require("./createRequestExample");
 const loadAndResolveSpec_1 = require("./utils/loadAndResolveSpec");
@@ -64,41 +65,9 @@ function createItems(openapiData, sidebarOptions) {
     // TODO: Find a better way to handle this
     let items = [];
     const infoId = (0, kebabCase_1.default)(openapiData.info.title);
-    if ((sidebarOptions === null || sidebarOptions === void 0 ? void 0 : sidebarOptions.categoryLinkSource) === "tag") {
-        // Only create an tag pages if categoryLinkSource set to tag.
-        const tags = (_a = openapiData.tags) !== null && _a !== void 0 ? _a : [];
-        // eslint-disable-next-line array-callback-return
-        tags
-            .filter((tag) => { var _a; return !((_a = tag.description) === null || _a === void 0 ? void 0 : _a.includes("SchemaDefinition")); })
-            // eslint-disable-next-line array-callback-return
-            .map((tag) => {
-            var _a;
-            const description = getTagDisplayName(tag.name, (_a = openapiData.tags) !== null && _a !== void 0 ? _a : []);
-            const tagId = (0, kebabCase_1.default)(tag.name);
-            const splitDescription = description.match(/[^\r\n]+/g);
-            const tagPage = {
-                type: "tag",
-                id: tagId,
-                unversionedId: tagId,
-                title: description !== null && description !== void 0 ? description : "",
-                description: description !== null && description !== void 0 ? description : "",
-                frontMatter: {
-                    description: splitDescription
-                        ? splitDescription[0]
-                            .replace(/((?:^|[^\\])(?:\\{2})*)"/g, "$1'")
-                            .replace(/\s+$/, "")
-                        : "",
-                },
-                tag: {
-                    ...tag,
-                },
-            };
-            items.push(tagPage);
-        });
-    }
     if (openapiData.info.description) {
         // Only create an info page if we have a description.
-        const infoDescription = (_b = openapiData.info) === null || _b === void 0 ? void 0 : _b.description;
+        const infoDescription = (_a = openapiData.info) === null || _a === void 0 ? void 0 : _a.description;
         let splitDescription;
         if (infoDescription) {
             splitDescription = infoDescription.match(/[^\r\n]+/g);
@@ -107,7 +76,9 @@ function createItems(openapiData, sidebarOptions) {
             type: "info",
             id: infoId,
             unversionedId: infoId,
-            title: openapiData.info.title,
+            title: openapiData.info.title
+                ? openapiData.info.title.replace(/((?:^|[^\\])(?:\\{2})*)"/g, "$1'")
+                : "",
             description: openapiData.info.description
                 ? openapiData.info.description.replace(/((?:^|[^\\])(?:\\{2})*)"/g, "$1'")
                 : "",
@@ -118,11 +89,11 @@ function createItems(openapiData, sidebarOptions) {
                         .replace(/\s+$/, "")
                     : "",
             },
-            securitySchemes: (_c = openapiData.components) === null || _c === void 0 ? void 0 : _c.securitySchemes,
+            securitySchemes: (_b = openapiData.components) === null || _b === void 0 ? void 0 : _b.securitySchemes,
             info: {
                 ...openapiData.info,
                 tags: openapiData.tags,
-                title: (_d = openapiData.info.title) !== null && _d !== void 0 ? _d : "Introduction",
+                title: (_c = openapiData.info.title) !== null && _c !== void 0 ? _c : "Introduction",
                 logo: openapiData.info["x-logo"],
                 darkLogo: openapiData.info["x-dark-logo"],
             },
@@ -132,18 +103,18 @@ function createItems(openapiData, sidebarOptions) {
     for (let [path, pathObject] of Object.entries(openapiData.paths)) {
         const { $ref, description, parameters, servers, summary, ...rest } = pathObject;
         for (let [method, operationObject] of Object.entries({ ...rest })) {
-            const title = (_f = (_e = operationObject.summary) !== null && _e !== void 0 ? _e : operationObject.operationId) !== null && _f !== void 0 ? _f : "Missing summary";
+            const title = (_e = (_d = operationObject.summary) !== null && _d !== void 0 ? _d : operationObject.operationId) !== null && _e !== void 0 ? _e : "Missing summary";
             if (operationObject.description === undefined) {
                 operationObject.description =
-                    (_h = (_g = operationObject.summary) !== null && _g !== void 0 ? _g : operationObject.operationId) !== null && _h !== void 0 ? _h : "";
+                    (_g = (_f = operationObject.summary) !== null && _f !== void 0 ? _f : operationObject.operationId) !== null && _g !== void 0 ? _g : "";
             }
             const baseId = operationObject.operationId
                 ? (0, kebabCase_1.default)(operationObject.operationId)
                 : (0, kebabCase_1.default)(operationObject.summary);
-            const servers = (_k = (_j = operationObject.servers) !== null && _j !== void 0 ? _j : pathObject.servers) !== null && _k !== void 0 ? _k : openapiData.servers;
-            const security = (_l = operationObject.security) !== null && _l !== void 0 ? _l : openapiData.security;
+            const servers = (_j = (_h = operationObject.servers) !== null && _h !== void 0 ? _h : pathObject.servers) !== null && _j !== void 0 ? _j : openapiData.servers;
+            const security = (_k = operationObject.security) !== null && _k !== void 0 ? _k : openapiData.security;
             // Add security schemes so we know how to handle security.
-            const securitySchemes = (_m = openapiData.components) === null || _m === void 0 ? void 0 : _m.securitySchemes;
+            const securitySchemes = (_l = openapiData.components) === null || _l === void 0 ? void 0 : _l.securitySchemes;
             // Make sure schemes are lowercase. See: https://github.com/cloud-annotations/docusaurus-plugin-openapi/issues/79
             if (securitySchemes) {
                 for (let securityScheme of Object.values(securitySchemes)) {
@@ -153,12 +124,12 @@ function createItems(openapiData, sidebarOptions) {
                 }
             }
             let jsonRequestBodyExample;
-            const body = (_p = (_o = operationObject.requestBody) === null || _o === void 0 ? void 0 : _o.content) === null || _p === void 0 ? void 0 : _p["application/json"];
+            const body = (_o = (_m = operationObject.requestBody) === null || _m === void 0 ? void 0 : _m.content) === null || _o === void 0 ? void 0 : _o["application/json"];
             if (body === null || body === void 0 ? void 0 : body.schema) {
                 jsonRequestBodyExample = (0, createRequestExample_1.sampleRequestFromSchema)(body.schema);
             }
             // Handle vendor JSON media types
-            const bodyContent = (_q = operationObject.requestBody) === null || _q === void 0 ? void 0 : _q.content;
+            const bodyContent = (_p = operationObject.requestBody) === null || _p === void 0 ? void 0 : _p.content;
             if (bodyContent) {
                 const firstBodyContentKey = Object.keys(bodyContent)[0];
                 if (firstBodyContentKey.endsWith("+json")) {
@@ -190,7 +161,7 @@ function createItems(openapiData, sidebarOptions) {
                 id: baseId,
                 infoId: infoId !== null && infoId !== void 0 ? infoId : "",
                 unversionedId: baseId,
-                title: title,
+                title: title ? title.replace(/((?:^|[^\\])(?:\\{2})*)"/g, "$1'") : "",
                 description: operationObject.description
                     ? operationObject.description.replace(/((?:^|[^\\])(?:\\{2})*)"/g, "$1'")
                     : "",
@@ -216,6 +187,45 @@ function createItems(openapiData, sidebarOptions) {
             items.push(apiPage);
         }
     }
+    if ((sidebarOptions === null || sidebarOptions === void 0 ? void 0 : sidebarOptions.categoryLinkSource) === "tag") {
+        // Get global tags
+        const tags = (_q = openapiData.tags) !== null && _q !== void 0 ? _q : [];
+        // Get operation tags
+        const apiItems = items.filter((item) => {
+            return item.type === "api";
+        });
+        const operationTags = (0, uniq_1.default)(apiItems
+            .flatMap((item) => item.api.tags)
+            .filter((item) => !!item));
+        // eslint-disable-next-line array-callback-return
+        tags
+            .filter((tag) => operationTags.includes(tag.name)) // include only tags referenced by operation
+            // eslint-disable-next-line array-callback-return
+            .map((tag) => {
+            var _a;
+            const description = getTagDisplayName(tag.name, (_a = openapiData.tags) !== null && _a !== void 0 ? _a : []);
+            const tagId = (0, kebabCase_1.default)(tag.name);
+            const splitDescription = description.match(/[^\r\n]+/g);
+            const tagPage = {
+                type: "tag",
+                id: tagId,
+                unversionedId: tagId,
+                title: description !== null && description !== void 0 ? description : "",
+                description: description !== null && description !== void 0 ? description : "",
+                frontMatter: {
+                    description: splitDescription
+                        ? splitDescription[0]
+                            .replace(/((?:^|[^\\])(?:\\{2})*)"/g, "$1'")
+                            .replace(/\s+$/, "")
+                        : "",
+                },
+                tag: {
+                    ...tag,
+                },
+            };
+            items.push(tagPage);
+        });
+    }
     return items;
 }
 /**
@@ -251,7 +261,7 @@ async function readOpenapiFiles(openapiPath, options) {
             const sources = allFiles.filter((x) => !x.includes("_category_")); // todo: regex exclude?
             return Promise.all(sources.map(async (source) => {
                 // TODO: make a function for this
-                const fullPath = path_1.default.join(openapiPath, source);
+                const fullPath = (0, utils_1.posixPath)(path_1.default.join(openapiPath, source));
                 const data = (await (0, loadAndResolveSpec_1.loadAndResolveSpec)(fullPath));
                 return {
                     source: fullPath,

package/lib/openapi/openapi.test.js

@@ -10,12 +10,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = __importDefault(require("path"));
+const utils_1 = require("@docusaurus/utils");
 const _1 = require(".");
 // npx jest packages/docusaurus-plugin-openapi/src/openapi/openapi.test.ts --watch
 describe("openapi", () => {
     describe("readOpenapiFiles", () => {
         it("readOpenapiFiles", async () => {
-            const results = await (0, _1.readOpenapiFiles)(path_1.default.join(__dirname, "__fixtures__/examples"), { specPath: "./", outputDir: "./" });
+            const results = await (0, _1.readOpenapiFiles)((0, utils_1.posixPath)(path_1.default.join(__dirname, "__fixtures__/examples")), { specPath: "./", outputDir: "./" });
             const categoryMeta = results.find((x) => x.source.endsWith("_category_.json"));
             expect(categoryMeta).toBeFalsy();
             // console.log(results);

package/lib/sidebars/index.js

@@ -10,6 +10,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = __importDefault(require("path"));
+const utils_1 = require("@docusaurus/utils");
 const clsx_1 = __importDefault(require("clsx"));
 const lodash_1 = require("lodash");
 const uniq_1 = __importDefault(require("lodash/uniq"));
@@ -37,9 +38,13 @@ function groupByTags(items, sidebarOptions, options, tags, docPath) {
         .flatMap((item) => item.api.tags)
         .filter((item) => !!item));
     // Combine globally defined tags with operation tags
+    // Only include global tag if referenced in operation tags
     let apiTags = [];
     tags.flat().forEach((tag) => {
-        apiTags.push(tag.name);
+        // Should we also check x-displayName?
+        if (operationTags.includes(tag.name)) {
+            apiTags.push(tag.name);
+        }
     });
     apiTags = (0, uniq_1.default)(apiTags.concat(operationTags));
     const basePath = docPath
@@ -106,8 +111,8 @@ function groupByTags(items, sidebarOptions, options, tags, docPath) {
                 type: "generated-index",
                 title: tag,
                 slug: label
-                    ? path_1.default.join("/category", basePath, (0, lodash_1.kebabCase)(label), (0, lodash_1.kebabCase)(tag))
-                    : path_1.default.join("/category", basePath, (0, lodash_1.kebabCase)(tag)),
+                    ? (0, utils_1.posixPath)(path_1.default.join("/category", basePath, (0, lodash_1.kebabCase)(label), (0, lodash_1.kebabCase)(tag)))
+                    : (0, utils_1.posixPath)(path_1.default.join("/category", basePath, (0, lodash_1.kebabCase)(tag))),
             };
         }
         return {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "docusaurus-plugin-openapi-docs",
   "description": "OpenAPI plugin for Docusaurus.",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "license": "MIT",
   "keywords": [
     "openapi",
@@ -28,8 +28,8 @@
     "watch": "tsc --watch"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "2.0.1",
-    "@docusaurus/types": "2.0.1",
+    "@docusaurus/module-type-aliases": "^2.0.1",
+    "@docusaurus/types": "^2.0.1",
     "@types/fs-extra": "^9.0.13",
     "@types/js-yaml": "^4.0.5",
     "@types/json-pointer": "^1.0.31",
@@ -68,5 +68,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "e5337f7fecf3b082c0781f798a479b2a63237432"
+  "gitHead": "05860ecc586244bcb84b5daa095a4110b807a95c"
 }

package/src/index.ts

@@ -9,7 +9,7 @@ import fs from "fs";
 import path from "path";
 
 import type { LoadContext, Plugin } from "@docusaurus/types";
-import { Globby } from "@docusaurus/utils";
+import { Globby, posixPath } from "@docusaurus/utils";
 import chalk from "chalk";
 import { render } from "mustache";
 
@@ -164,7 +164,7 @@ description: "{{{frontMatter.description}}}"
 sidebar_label: Introduction
 {{/api}}
 {{#api}}
-sidebar_label: {{{title}}}
+sidebar_label: "{{{title}}}"
 {{/api}}
 {{^api}}
 sidebar_position: 0
@@ -191,7 +191,7 @@ info_path: {{{infoPath}}}
 id: {{{id}}}
 title: "{{{title}}}"
 description: "{{{frontMatter.description}}}"
-sidebar_label: {{{title}}}
+sidebar_label: "{{{title}}}"
 hide_title: true
 custom_edit_url: null
 ---
@@ -338,7 +338,7 @@ import {useCurrentSidebarCategory} from '@docusaurus/theme-common';
 
   async function cleanApiDocs(options: APIOptions) {
     const { outputDir } = options;
-    const apiDir = path.join(siteDir, outputDir);
+    const apiDir = posixPath(path.join(siteDir, outputDir));
     const apiMdxFiles = await Globby(["*.api.mdx", "*.info.mdx", "*.tag.mdx"], {
       cwd: path.resolve(apiDir),
       deep: 1,

package/src/markdown/createRequestSchema.ts

@@ -26,6 +26,9 @@ export function mergeAllOf(allOf: SchemaObject[]) {
       example: function () {
         return true;
       },
+      "x-examples": function () {
+        return true;
+      },
       ignoreAdditionalProperties: true,
     },
   });

package/src/markdown/createResponseSchema.ts

@@ -31,6 +31,9 @@ export function mergeAllOf(allOf: SchemaObject[]) {
       example: function () {
         return true;
       },
+      "x-examples": function () {
+        return true;
+      },
     },
     ignoreAdditionalProperties: true,
   });

package/src/openapi/openapi.test.ts

@@ -7,6 +7,8 @@
 
 import path from "path";
 
+import { posixPath } from "@docusaurus/utils";
+
 import { readOpenapiFiles } from ".";
 
 // npx jest packages/docusaurus-plugin-openapi/src/openapi/openapi.test.ts --watch
@@ -15,7 +17,7 @@ describe("openapi", () => {
   describe("readOpenapiFiles", () => {
     it("readOpenapiFiles", async () => {
       const results = await readOpenapiFiles(
-        path.join(__dirname, "__fixtures__/examples"),
+        posixPath(path.join(__dirname, "__fixtures__/examples")),
         { specPath: "./", outputDir: "./" }
       );
       const categoryMeta = results.find((x) =>

package/src/openapi/openapi.ts

@@ -7,7 +7,7 @@
 
 import path from "path";
 
-import { Globby, GlobExcludeDefault } from "@docusaurus/utils";
+import { Globby, GlobExcludeDefault, posixPath } from "@docusaurus/utils";
 import Converter from "@paloaltonetworks/openapi-to-postmanv2";
 import sdk from "@paloaltonetworks/postman-collection";
 import Collection from "@paloaltonetworks/postman-collection";
@@ -16,6 +16,7 @@ import fs from "fs-extra";
 import cloneDeep from "lodash/cloneDeep";
 import kebabCase from "lodash/kebabCase";
 import unionBy from "lodash/unionBy";
+import uniq from "lodash/uniq";
 
 import { isURL } from "../index";
 import {
@@ -85,41 +86,6 @@ function createItems(
   let items: PartialPage<ApiMetadata>[] = [];
   const infoId = kebabCase(openapiData.info.title);
 
-  if (sidebarOptions?.categoryLinkSource === "tag") {
-    // Only create an tag pages if categoryLinkSource set to tag.
-    const tags: TagObject[] = openapiData.tags ?? [];
-    // eslint-disable-next-line array-callback-return
-    tags
-      .filter((tag) => !tag.description?.includes("SchemaDefinition"))
-      // eslint-disable-next-line array-callback-return
-      .map((tag) => {
-        const description = getTagDisplayName(
-          tag.name!,
-          openapiData.tags ?? []
-        );
-        const tagId = kebabCase(tag.name);
-        const splitDescription = description.match(/[^\r\n]+/g);
-        const tagPage: PartialPage<TagPageMetadata> = {
-          type: "tag",
-          id: tagId,
-          unversionedId: tagId,
-          title: description ?? "",
-          description: description ?? "",
-          frontMatter: {
-            description: splitDescription
-              ? splitDescription[0]
-                  .replace(/((?:^|[^\\])(?:\\{2})*)"/g, "$1'")
-                  .replace(/\s+$/, "")
-              : "",
-          },
-          tag: {
-            ...tag,
-          },
-        };
-        items.push(tagPage);
-      });
-  }
-
   if (openapiData.info.description) {
     // Only create an info page if we have a description.
     const infoDescription = openapiData.info?.description;
@@ -131,7 +97,9 @@ function createItems(
       type: "info",
       id: infoId,
       unversionedId: infoId,
-      title: openapiData.info.title,
+      title: openapiData.info.title
+        ? openapiData.info.title.replace(/((?:^|[^\\])(?:\\{2})*)"/g, "$1'")
+        : "",
       description: openapiData.info.description
         ? openapiData.info.description.replace(
             /((?:^|[^\\])(?:\\{2})*)"/g,
@@ -237,7 +205,7 @@ function createItems(
         id: baseId,
         infoId: infoId ?? "",
         unversionedId: baseId,
-        title: title,
+        title: title ? title.replace(/((?:^|[^\\])(?:\\{2})*)"/g, "$1'") : "",
         description: operationObject.description
           ? operationObject.description.replace(
               /((?:^|[^\\])(?:\\{2})*)"/g,
@@ -268,6 +236,52 @@ function createItems(
     }
   }
 
+  if (sidebarOptions?.categoryLinkSource === "tag") {
+    // Get global tags
+    const tags: TagObject[] = openapiData.tags ?? [];
+
+    // Get operation tags
+    const apiItems = items.filter((item) => {
+      return item.type === "api";
+    }) as ApiPageMetadata[];
+    const operationTags = uniq(
+      apiItems
+        .flatMap((item) => item.api.tags)
+        .filter((item): item is string => !!item)
+    );
+
+    // eslint-disable-next-line array-callback-return
+    tags
+      .filter((tag) => operationTags.includes(tag.name!)) // include only tags referenced by operation
+      // eslint-disable-next-line array-callback-return
+      .map((tag) => {
+        const description = getTagDisplayName(
+          tag.name!,
+          openapiData.tags ?? []
+        );
+        const tagId = kebabCase(tag.name);
+        const splitDescription = description.match(/[^\r\n]+/g);
+        const tagPage: PartialPage<TagPageMetadata> = {
+          type: "tag",
+          id: tagId,
+          unversionedId: tagId,
+          title: description ?? "",
+          description: description ?? "",
+          frontMatter: {
+            description: splitDescription
+              ? splitDescription[0]
+                  .replace(/((?:^|[^\\])(?:\\{2})*)"/g, "$1'")
+                  .replace(/\s+$/, "")
+              : "",
+          },
+          tag: {
+            ...tag,
+          },
+        };
+        items.push(tagPage);
+      });
+  }
+
   return items as ApiMetadata[];
 }
 
@@ -320,7 +334,7 @@ export async function readOpenapiFiles(
       return Promise.all(
         sources.map(async (source) => {
           // TODO: make a function for this
-          const fullPath = path.join(openapiPath, source);
+          const fullPath = posixPath(path.join(openapiPath, source));
           const data = (await loadAndResolveSpec(
             fullPath
           )) as unknown as OpenApiObject;

package/src/sidebars/index.ts

@@ -13,6 +13,7 @@ import {
   SidebarItemCategoryLinkConfig,
   SidebarItemDoc,
 } from "@docusaurus/plugin-content-docs/src/sidebars/types";
+import { posixPath } from "@docusaurus/utils";
 import clsx from "clsx";
 import { kebabCase } from "lodash";
 import uniq from "lodash/uniq";
@@ -67,9 +68,13 @@ function groupByTags(
   );
 
   // Combine globally defined tags with operation tags
+  // Only include global tag if referenced in operation tags
   let apiTags: string[] = [];
   tags.flat().forEach((tag) => {
-    apiTags.push(tag.name!);
+    // Should we also check x-displayName?
+    if (operationTags.includes(tag.name!)) {
+      apiTags.push(tag.name!);
+    }
   });
   apiTags = uniq(apiTags.concat(operationTags));
 
@@ -148,8 +153,15 @@ function groupByTags(
           type: "generated-index" as "generated-index",
           title: tag,
           slug: label
-            ? path.join("/category", basePath, kebabCase(label), kebabCase(tag))
-            : path.join("/category", basePath, kebabCase(tag)),
+            ? posixPath(
+                path.join(
+                  "/category",
+                  basePath,
+                  kebabCase(label),
+                  kebabCase(tag)
+                )
+              )
+            : posixPath(path.join("/category", basePath, kebabCase(tag))),
         } as SidebarItemCategoryLinkConfig;
       }