@ohos-ports/mermaid-js-mermaid-cli 11.16.0-beta.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017-2020 Tyler Long
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -0,0 +1,229 @@
+# mermaid-cli
+
+[![npm version](https://img.shields.io/npm/v/@mermaid-js/mermaid-cli)](https://www.npmjs.com/package/@mermaid-js/mermaid-cli)
+[![node-lts (scoped)](https://img.shields.io/node/v-lts/@mermaid-js/mermaid-cli)](https://www.npmjs.com/package/@mermaid-js/mermaid-cli)
+[![Docker Image Version (latest semver)](https://img.shields.io/docker/v/minlag/mermaid-cli?label=Dockerhub)](https://hub.docker.com/r/minlag/mermaid-cli)
+[![Build, test and deploy mermaid-cli Docker image](https://github.com/mermaid-js/mermaid-cli/actions/workflows/compile-mermaid.yml/badge.svg)](https://github.com/mermaid-js/mermaid-cli/actions/workflows/compile-mermaid.yml)
+[![This project is using Percy.io for visual regression testing.](https://percy.io/static/images/percy-badge.svg)](https://percy.io/Mermaid/mermaid-cli)
+[![Join our Slack!](https://img.shields.io/static/v1?message=join%20chat&color=9cf&logo=slack&label=slack)](https://join.slack.com/t/mermaid-talk/shared_invite/enQtNzc4NDIyNzk4OTAyLWVhYjQxOTI2OTg4YmE1ZmJkY2Y4MTU3ODliYmIwOTY3NDJlYjA0YjIyZTdkMDMyZTUwOGI0NjEzYmEwODcwOTE)
+
+This is a command-line interface (CLI) for [mermaid](https://mermaid.js.org/). It takes a mermaid definition file as input and generates an SVG/PNG/PDF file as output.
+
+## Installation
+
+```sh
+npm install -g @mermaid-js/mermaid-cli
+```
+
+## Usage
+
+Convert Mermaid mmd Diagram File To SVG
+
+```sh
+mmdc -i input.mmd -o output.svg
+```
+
+> **Note**
+>
+> See [Alternative installations](#alternative-installations) if you don't want to install the package globally.
+>
+> Locate how to call the mmdc executable for your preferred method
+> i.e. Docker, Yarn, NPM, local install, etc.
+
+## Examples
+
+### Create A PNG With A Dark Theme And Transparent Background
+
+```sh
+mmdc -i input.mmd -o output.png -t dark -b transparent
+```
+
+### Animating an SVG file with custom CSS
+
+The `--cssFile` option can be used to inline some custom CSS.
+
+Please see [./test-positive/flowchart1.css](test-positive/flowchart1.css) for an example of a CSS file that has animations.
+
+**Warning**: If you want to override `mermaid`'s [`themeCSS`](https://mermaid.js.org/config/schema-docs/config.html#themecss), we recommend instead adding `{"themeCSS": "..."})` to your mermaid `--configFile`. You may also need to use [`!important`](https://developer.mozilla.org/en-US/docs/Web/CSS/important) to override mermaid's `themeCSS`.
+
+**Warning**: Inline CSS files may be blocked by your browser, depending on the [HTTP Content-Security-Policy header](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy) of the website that hosts your SVG.
+
+```sh
+mmdc --input test-positive/flowchart1.mmd --cssFile test-positive/flowchart1.css -o docs/animated-flowchart.svg
+```
+
+<details>
+  <summary>Example output: docs/animated-flowchart.svg</summary>
+
+![docs/animated-flowchart.svg](docs/animated-flowchart.svg)
+
+</details>
+
+### Transform a markdown file with mermaid diagrams
+
+```sh
+mmdc -i readme.template.md -o readme.md
+```
+
+This command transforms a markdown file itself. The mermaid-cli will find the mermaid diagrams, create SVG files from them and refer to those in the markdown output.
+
+This:
+
+````md
+### Some markdown
+
+```mermaid
+graph
+   [....]
+```
+
+### Some more markdown
+
+```mermaid
+sequenceDiagram
+   [....]
+```
+
+### Mermaid with custom title/desc
+
+```mermaid
+graph
+   accTitle: My title here
+   accDescr: My description here
+   A-->B
+```
+````
+
+Becomes:
+
+```md
+### Some markdown
+
+![diagram](./readme-1.svg)
+
+### Some more markdown
+
+![diagram](./readme-2.svg)
+
+### Mermaid with custom title/desc
+
+![My description here](./readme-3.svg "My title here")
+```
+
+### Piping from stdin
+
+You can easily pipe input from stdin. This example shows how to use a heredoc to
+send a diagram as stdin to mermaid-cli (mmdc).
+
+```sh
+cat << EOF  | mmdc --input -
+    graph TD
+    A[Client] --> B[Load Balancer]
+EOF
+```
+
+### See All Available Options
+
+```sh
+mmdc -h
+```
+
+# Alternative installations
+
+## Use Docker/Podman:
+
+```sh
+docker pull minlag/mermaid-cli
+```
+
+or pull from Github Container Registry
+
+```sh
+docker pull ghcr.io/mermaid-js/mermaid-cli/mermaid-cli
+```
+
+or e.g. version 8.8.0
+
+```sh
+docker pull minlag/mermaid-cli:8.8.0
+```
+
+The container looks for input files in `/data`. So for example, if you have a
+diagram defined on your system in `/path/to/diagrams/diagram.mmd`, you can use
+the container to generate an SVG file as follows:
+
+```sh
+docker run --rm -u `id -u`:`id -g` -v /path/to/diagrams:/data minlag/mermaid-cli -i diagram.mmd
+```
+
+Or, if using [Podman](https://podman.io/), instead do:
+
+```sh
+podman run --userns keep-id --user ${UID} --rm -v /path/to/diagrams:/data:z ghcr.io/mermaid-js/mermaid-cli/mermaid-cli -i diagram.mmd
+```
+
+The key differences in the podman command versus the docker command are:
+
+- The addition of the `--userns keep-id` argument. This allows the container to keep the same UID as the current user's UID in the container namespace instead of mapping to a subuid. To learn more, see the [`userns=mode` documentation](https://docs.podman.io/en/v4.4/markdown/options/userns.container.html).
+- The addition of `:z` to the end of the volume mapping. This instructs podman to relabel the files in the volume with the SELinux label `container_file_t`, which allows processes in the container to access the files. See the "Labeling Volume Mounts" section of [podman-run (1)](https://docs.podman.io/en/latest/markdown/podman-run.1.html#volume-v-source-volume-host-dir-container-dir-options) for more info.
+
+In previous version, the input files were mounted in `/home/mermaidcli`. You can
+restore this behaviour with the `--workdir` option:
+
+```sh
+docker run [...] --workdir=/home/mermaidcli minlag/mermaid-cli [...]
+```
+
+## Use Node.JS API
+
+It's possible to call `mermaid-cli` via a Node.JS API.
+Please be aware that **the NodeJS API is not covered by semver**, as `mermaid-cli` follows
+`mermaid`'s versioning.
+
+```js
+import { run } from "@mermaid-js/mermaid-cli";
+
+await run(
+    "input.mmd",
+    "output.svg", // {optional options},
+);
+```
+
+## Install locally
+
+Some people are [having issues](https://github.com/mermaidjs/mermaid.cli/issues/15)
+installing this tool globally. Installing it locally is an alternative solution:
+
+```
+npm install @mermaid-js/mermaid-cli
+./node_modules/.bin/mmdc -h
+```
+
+### Run with npx
+
+[`npx`](https://www.npmjs.com/package/npx) is installed by default with NPM. It
+downloads and runs commands at the same time. To use Mermaid CLI with npx, you
+need to use the `-p` flag because the package name is different than the command
+it installs (`mmdc`). `npx -p @mermaid-js/mermaid-cli mmdc -h`
+
+## Install with [brew](https://brew.sh)
+
+> **Warning**
+>
+> This method of installation is no longer supported.
+> For more details, see the [discussion](https://github.com/mermaid-js/mermaid-cli/issues/288).
+> An old version of mermaid-cli can be installed with brew.
+>
+> ```sh
+> brew install mermaid-cli
+> ```
+
+## Known issues
+
+1. [Linux sandbox issue](docs/linux-sandbox-issue.md)
+2. [Docker permission denied issue](docs/docker-permission-denied.md)
+3. [How to setup up mermaid to use already installed chromium?](docs/already-installed-chromium.md)
+
+## For contributors
+
+Contributions are welcome. See the [contribution guide](CONTRIBUTING.md).

package/dist/index.html

@@ -0,0 +1,6 @@
+<!doctype html>
+<html>
+  <body>
+    <div id="container"></div>
+  </body>
+</html>

package/dist-types/src/cli.d.ts

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+export {};
+//# sourceMappingURL=cli.d.ts.map

package/dist-types/src/cli.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/cli.js"],"names":[],"mappings":""}

package/dist-types/src/index.d.ts

@@ -0,0 +1,131 @@
+/**
+ * Options to pass to {@link parseMMD}
+ */
+export type ParseMDDOptions = {
+    /**
+     * - Puppeteer viewport (e.g. `width`, `height`, `deviceScaleFactor`)
+     */
+    viewport?: import("puppeteer-core").Viewport | undefined;
+    /**
+     * - Background color.
+     */
+    backgroundColor?: string | undefined;
+    /**
+     * - Mermaid config.
+     */
+    mermaidConfig?: import("mermaid").MermaidConfig | undefined;
+    /**
+     * - Optional CSS text.
+     */
+    myCSS?: string | undefined;
+    /**
+     * - If set, scale PDF to fit chart.
+     */
+    pdfFit?: boolean | undefined;
+    /**
+     * - The id attribute for the SVG element to be rendered.
+     */
+    svgId?: string | undefined;
+    /**
+     * - Icon packages to use.
+     */
+    iconPacks?: string[] | undefined;
+    /**
+     * - IconPack Json file name and url to use.
+     *
+     * /**
+     * Render a mermaid diagram.
+     */
+    iconPacksNamesAndUrls?: string[] | undefined;
+};
+/**
+ * Markdown image properties
+ * Used to create a markdown image that looks like `![alt](url "title")`
+ */
+export type MarkdownImageProps = {
+    /**
+     * - Path to image.
+     */
+    url: string;
+    /**
+     * - Image alt text, required.
+     */
+    alt: string;
+    /**
+     * - Optional image title text.
+     */
+    title?: string | null | undefined;
+};
+/**
+ * - Adapted from `p-limit` package.
+ */
+export type Limiter = <Arguments extends unknown[], ReturnType>(function_: (...arguments_: Arguments) => Promise<ReturnType>, ...arguments_: Arguments) => Promise<ReturnType>;
+/**
+ * @typedef {<Arguments extends unknown[], ReturnType>(
+ *  function_: (...arguments_: Arguments) => Promise<ReturnType>,
+ *    ...arguments_: Arguments
+ * ) => Promise<ReturnType>} Limiter - Adapted from `p-limit` package.
+ */
+/**
+ * Renders a mermaid diagram or mermaid markdown file.
+ *
+ * @param {`${string}.${"md" | "markdown"}` | string | undefined} input - If this ends with `.md`/`.markdown`,
+ * path to a markdown file containing mermaid.
+ * If this is a string, loads the mermaid definition from the given file.
+ * If this is `undefined`, loads the mermaid definition from stdin.
+ * @param {`${string}.${"md" | "markdown" | "svg" | "png" | "pdf"}` | "/dev/stdout"} output - Path to the output file.
+ * @param {Object} [opts] - Options
+ * @param {import("puppeteer").LaunchOptions} [opts.puppeteerConfig] - Puppeteer launch options.
+ * @param {boolean} [opts.quiet] - If set, suppress log output.
+ * @param {"svg" | "png" | "pdf"} [opts.outputFormat] - Mermaid output format.
+ * @param {string} [opts.artefacts] - Path to the artefacts directory.
+ * Defaults to `output` extension. Overrides `output` extension if set.
+ * @param {import("puppeteer").Browser} [opts.browser] - If set, reuses the given puppeteer browser instance instead of creating a new one.
+ * This may leak cookies/cache between runs.
+ * @param {Limiter} [opts.limiter] - If set, limiter function to avoid rendering too many diagrams in parallel.
+ * @param {ParseMDDOptions} [opts.parseMMDOptions] - Options to pass to {@link parseMMDOptions}.
+ */
+export function run(input: `${string}.${"md" | "markdown"}` | string | undefined, output: `${string}.${"md" | "markdown" | "svg" | "png" | "pdf"}` | "/dev/stdout", { browser: userPassedBrowser, puppeteerConfig, quiet, outputFormat, parseMMDOptions, limiter, artefacts, }?: {
+    puppeteerConfig?: import("puppeteer-core").LaunchOptions | undefined;
+    quiet?: boolean | undefined;
+    outputFormat?: "svg" | "png" | "pdf" | undefined;
+    artefacts?: string | undefined;
+    browser?: import("puppeteer-core").Browser | undefined;
+    limiter?: Limiter | undefined;
+    parseMMDOptions?: ParseMDDOptions | undefined;
+}): Promise<void>;
+/**
+ * @typedef {Object} ParseMDDOptions Options to pass to {@link parseMMD}
+ * @property {import("puppeteer").Viewport} [viewport] - Puppeteer viewport (e.g. `width`, `height`, `deviceScaleFactor`)
+ * @property {string | "transparent"} [backgroundColor] - Background color.
+ * @property {Parameters<import("mermaid")["default"]["initialize"]>[0]} [mermaidConfig] - Mermaid config.
+ * @property {CSSStyleDeclaration["cssText"]} [myCSS] - Optional CSS text.
+ * @property {boolean} [pdfFit] - If set, scale PDF to fit chart.
+ * @property {string} [svgId] - The id attribute for the SVG element to be rendered.
+ * @property {string[]} [iconPacks] - Icon packages to use.
+ * @property {string[]} [iconPacksNamesAndUrls] - IconPack Json file name and url to use.
+
+/**
+ * Render a mermaid diagram.
+ *
+ * @param {import("puppeteer").Browser | import("puppeteer").BrowserContext} browser - Puppeteer Browser
+ * @param {string} definition - Mermaid diagram definition
+ * @param {"svg" | "png" | "pdf"} outputFormat - Mermaid output format.
+ * @param {ParseMDDOptions} [opt] - Options, see {@link ParseMDDOptions} for details.
+ * @returns {Promise<{title: string | null, desc: string | null, data: Uint8Array}>} The output file in bytes,
+ * with optional metadata.
+ */
+export function renderMermaid(browser: import("puppeteer").Browser | import("puppeteer").BrowserContext, definition: string, outputFormat: "svg" | "png" | "pdf", { viewport, backgroundColor, mermaidConfig, myCSS, pdfFit, svgId, iconPacks, iconPacksNamesAndUrls, }?: ParseMDDOptions): Promise<{
+    title: string | null;
+    desc: string | null;
+    data: Uint8Array;
+}>;
+export function cli(): Promise<void>;
+/**
+ * Prints an error to stderr, then closes with exit code 1
+ *
+ * @param {string} message - The message to print to `stderr`.
+ * @returns {never} Quits Node.JS, so never returns.
+ */
+export function error(message: string): never;
+//# sourceMappingURL=index.d.ts.map

package/dist-types/src/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAgqBc,MAAM;;;;SACN,MAAM;;;;;;;;;sBAsBP,CAAC,SAAS,SAAS,OAAO,EAAE,EAAE,UAAU,EACjD,SAAS,EAAE,CAAC,GAAG,UAAU,EAAE,SAAS,KAAK,OAAO,CAAC,UAAU,CAAC,EAC/D,GAAQ,UAAU,EAAE,SAAS,KACtB,OAAO,CAAC,UAAU,CAAC;AAJ3B;;;;;GAKG;AAEH;;;;;;;;;;;;;;;;;;GAkBG;AACH,2BAhBW,GAAG,MAAM,IAAI,IAAI,GAAG,UAAU,EAAE,GAAG,MAAM,GAAG,SAAS,UAIrD,GAAG,MAAM,IAAI,IAAI,GAAG,UAAU,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,EAAE,GAAG,aAAa,+GAEhF;IAAiD,eAAe;IACzC,KAAK;IACS,YAAY;IAC3B,SAAS;IAEY,OAAO;IAE3B,OAAO;IACC,eAAe;CAChD,iBAiKA;AAxeD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,uCAPW,OAAO,WAAW,EAAE,OAAO,GAAG,OAAO,WAAW,EAAE,cAAc,cAChE,MAAM,gBACN,KAAK,GAAG,KAAK,GAAG,KAAK,0GACrB,eAAe,GACb,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,IAAI,EAAE,UAAU,CAAA;CAAC,CAAC,CAiQlF;AAhfD,qCA2NC;AA/TD;;;;;GAKG;AACH,+BAHW,MAAM,GACJ,KAAK,CAKjB"}

package/dist-types/src/puppeteerIntercept.d.ts

@@ -0,0 +1,31 @@
+/**
+ * Puppeteer doesn't allow importing ESM modules from `file://` URLs.
+ * We don't want to create a dummy http server to serve ESM modules
+ * (since that would cause issues with ports/firewalls), so this module
+ * instead intercepts dummy `https://mermaid-cli-intercept.invalid` requests.
+ */
+export class Interceptor {
+    /**
+     * @param {URL | `file://${string}`} fileUrl - File URL
+     * @param {Object} [options] - Optional options.
+     * @param {number} [options.allowParentDirectoryLevel] - Number of parent directory levels to allow access to.
+     */
+    fileUrlToInterceptUrl(fileUrl: URL | `file://${string}`, { allowParentDirectoryLevel }?: {
+        allowParentDirectoryLevel?: number | undefined;
+    }): Promise<string>;
+    /**
+     *
+     * @param {URL | string} interceptUrl
+     * @throws {Error} If the URL is not a valid intercept URL
+     */
+    interceptUrlToFileUrl(interceptUrl: URL | string): Promise<URL>;
+    /**
+     * Intercepts requests to `https://mermaid-cli-intercept.invalid`
+     * and serves the corresponding file content.
+     *
+     * @return {import('puppeteer').Handler<import('puppeteer').HTTPRequest>}
+     */
+    get interceptRequestHandler(): import("puppeteer").Handler<import("puppeteer").HTTPRequest>;
+    #private;
+}
+//# sourceMappingURL=puppeteerIntercept.d.ts.map

package/dist-types/src/puppeteerIntercept.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"puppeteerIntercept.d.ts","sourceRoot":"","sources":["../../src/puppeteerIntercept.js"],"names":[],"mappings":"AAgCA;;;;;GAKG;AACH;IAcE;;;;OAIG;IACH,+BAJW,GAAG,GAAG,UAAU,MAAM,EAAE,kCAEhC;QAAyB,yBAAyB;KACpD,mBAYA;IAED;;;;OAIG;IACH,oCAHW,GAAG,GAAG,MAAM,gBAuBtB;IAiCD;;;;;OAKG;IACH,+BAFY,OAAO,WAAW,EAAE,OAAO,CAAC,OAAO,WAAW,EAAE,WAAW,CAAC,CAIvE;;CACF"}

package/dist-types/src/version.d.ts

@@ -0,0 +1,2 @@
+export const version: "11.16.0";
+//# sourceMappingURL=version.d.ts.map

package/dist-types/src/version.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.js"],"names":[],"mappings":"AAAA,sBAAuB,SAAS,CAAC"}

package/package.json

@@ -0,0 +1,76 @@
+{
+  "name": "@ohos-ports/mermaid-js-mermaid-cli",
+  "version": "11.16.0-beta.0",
+  "description": "Command-line interface for mermaid",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ohos-ports/ohos-ports.git",
+    "directory": "ports/mermaid-cli/11.16.0"
+  },
+  "type": "module",
+  "author": "Tyler Long <tyler4long@gmail.com>",
+  "bin": {
+    "mmdc": "./src/cli.js"
+  },
+  "engines": {
+    "node": "^18.19 || >=20.0"
+  },
+  "exports": {
+    ".": {
+      "types": "./dist-types/src/index.d.ts",
+      "default": "./src/index.js"
+    }
+  },
+  "types": "./dist-types/src/index.d.ts",
+  "scripts": {
+    "test": "cross-env-shell NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" npx jest",
+    "test:cli": "bash run-tests.sh test-positive",
+    "version": "node scripts/version.js",
+    "lint": "prettier --check . && eslint .",
+    "lint-fix": "prettier --write . && eslint --fix ."
+  },
+  "dependencies": {
+    "@fortawesome/fontawesome-free": "^6.0.0 || ^7.0.1",
+    "@mermaid-js/layout-elk": "^0.1.5 || ^0.2.0",
+    "@mermaid-js/mermaid-zenuml": "^0.2.0",
+    "chalk": "^5.0.1",
+    "commander": "^13.1.0",
+    "import-meta-resolve": "^4.1.0",
+    "katex": "^0.16.25",
+    "mermaid": "^11.14.0",
+    "p-limit": "^6.2.0"
+  },
+  "optionalDependencies": {
+    "@mermaid-js/layout-tidy-tree": "^0.2.1"
+  },
+  "peerDependencies": {
+    "@ohos-ports/puppeteer": "^25.6.0-beta.0"
+  },
+  "devDependencies": {
+    "@eslint/js": "^9.0.0",
+    "@tsconfig/node18": "^18.2.4",
+    "@types/node": "~18.19.31",
+    "cross-env": "^7.0.3",
+    "eslint": "^9.0.0",
+    "globals": "^17.6.0",
+    "jest": "^30.0.5",
+    "prettier": "^3.8.3",
+    "puppeteer": "^25.0.0",
+    "typescript": "^6.0.3",
+    "typescript-eslint": "^8.59.3",
+    "vite": "^6.0.2",
+    "yarn-upgrade-all": "^0.8.1"
+  },
+  "files": [
+    "src/",
+    "dist/",
+    "dist-types/"
+  ],
+  "jest": {
+    "moduleNameMapper": {
+      "#(.*)": "<rootDir>/node_modules/$1"
+    }
+  },
+  "packageManager": "npm@10.8.1"
+}

package/src/cli.js

@@ -0,0 +1,8 @@
+#!/usr/bin/env node
+
+import { cli, error } from "./index.js";
+
+process.title = "mmdc";
+cli().catch((exception) =>
+  error(exception instanceof Error ? exception.stack : exception),
+);