@wpmoo/toolkit 0.9.0

package/dist/templates.js

@@ -0,0 +1,758 @@
+import { packageName, packageVersion } from './version.js';
+function fallbackPackageSpec() {
+    return `${packageName()}@${packageVersion()}`;
+}
+export function defaultCommunityAddons(product) {
+    return [product];
+}
+export function defaultProAddons(product) {
+    return [`${product}_pro`];
+}
+function titleizeProduct(product) {
+    return product
+        .split(/[_-]+/)
+        .filter(Boolean)
+        .map((part) => part.charAt(0).toUpperCase() + part.slice(1))
+        .join(' ');
+}
+function yamlList(items) {
+    return items.map((item) => `  - ${item}`).join('\n');
+}
+function allAddons(options) {
+    return options.sourceRepos.flatMap((repo) => repo.addons);
+}
+function hasSourceRepos(options) {
+    return options.sourceRepos.length > 0;
+}
+function sourceTypeOf(repo) {
+    return repo.sourceType ?? 'private';
+}
+function sourceRepoRelativePath(repo) {
+    return `odoo/custom/src/${sourceTypeOf(repo)}/${repo.path}`;
+}
+function repositoryLayout(options) {
+    const sourceRepoRows = hasSourceRepos(options)
+        ? options.sourceRepos
+            .map((repo, index) => {
+            const connector = index === options.sourceRepos.length - 1 ? '└──' : '├──';
+            return `│       │   │   ${connector} ${repo.path}/              # Project-owned addon source repository`;
+        })
+            .join('\n')
+        : '│       │   │   └── (add project-owned repos with ./moo add-repo)';
+    return `${options.devRepo}/                          # Development environment root
+├── compose.yaml                            # Base Docker Compose file
+├── compose/                                # Compose overlays for each workflow
+│   ├── dev.yaml                            # Local development services
+│   ├── debug.yaml                          # Debug tooling and debug-friendly settings
+│   ├── test.yaml                           # Test runner services and test database setup
+│   ├── stage.yaml                          # Staging-like deployment overlay
+│   ├── prod.yaml                           # Production deployment overlay
+│   ├── proxy.yaml                          # Reverse proxy / edge routing overlay
+│   └── tools.yaml                          # Optional maintenance and helper tools
+├── config/                                 # Runtime configuration mounted into containers
+│   ├── odoo/                               # Odoo server configuration
+│   │   ├── odoo.conf                       # Main Odoo configuration file
+│   │   └── requirements.txt                # Extra Python dependencies for the Odoo container
+│   └── logrotate/                          # Log rotation configuration
+│       └── odoo                            # Logrotate rules for Odoo logs
+├── resources/                              # Container-side helper resources
+│   └── odoo/                               # Resources specific to the Odoo service
+│       └── entrypoint.sh                   # Container startup script that discovers addons
+├── moo                                     # Local command hub shortcut
+├── scripts/                                # Shell scripts used by the local command hub
+├── odoo/                                   # Odoo workspace data and custom source tree
+│   └── custom/                             # Custom addon layer for this environment
+│       ├── src/                            # Source repository checkout root
+│       │   ├── private/                    # Project-owned/private addon repositories
+${sourceRepoRows}
+│       │   ├── oca/                        # OCA addon repositories
+│       │   └── external/                   # Non-OCA third-party addon repositories
+│       ├── patches/                        # Local patches for upstream repositories
+│       └── manifests/                      # Source manifests, locks, and pinned revisions
+├── docs/                                   # Project-specific documentation
+│   ├── appstore-release.md                 # Odoo App Store release checklist and notes
+│   └── compose.md                          # Compose layout and operations reference
+├── .env.example                            # Template for local environment variables
+├── README.md                               # This environment overview
+└── AGENTS.md                               # Agent instructions for this environment`;
+}
+function sourceRepoDocs(options) {
+    if (!hasSourceRepos(options)) {
+        return `This environment was scaffolded without source repository submodules.
+Add source repositories later from the cockpit or with \`npx @wpmoo/toolkit add-repo\`.
+They can be organized under:
+
+\`odoo/custom/src/private\` for project-owned/private addon repositories,
+\`odoo/custom/src/oca\` for OCA repositories, and
+\`odoo/custom/src/external\` for non-OCA third-party repositories.
+
+Pinned external manifests and local patches should live under
+\`odoo/custom/manifests\` and \`odoo/custom/patches\` respectively.`;
+    }
+    return options.sourceRepos
+        .map((repo) => `### ${repo.path}
+
+URL:
+
+\`\`\`text
+${repo.url}
+\`\`\`
+
+Submodule path:
+
+\`\`\`text
+${sourceRepoRelativePath(repo)}
+\`\`\`
+
+Source manifest entry:
+
+\`\`\`text
+odoo/custom/manifests/sources.yaml
+\`\`\`
+
+Expected addon layout:
+
+\`\`\`text
+${repo.path}/
+${repo.addons.map((addon) => `├── ${addon}/`).join('\n')}
+\`\`\``)
+        .join('\n\n');
+}
+function cloneDocs(options) {
+    if (!hasSourceRepos(options)) {
+        return `## Local Folder
+
+This environment is ready in this folder:
+
+\`\`\`bash
+cd ${options.devRepo}
+\`\`\`
+
+If you later connect it to Git, commit the generated files after reviewing them.
+`;
+    }
+    return `## Clone
+
+Clone with submodules:
+
+\`\`\`bash
+git clone --recurse-submodules ${options.devRepoUrl}
+cd ${options.devRepo}
+\`\`\`
+
+If already cloned:
+
+\`\`\`bash
+git submodule update --init --recursive
+\`\`\`
+`;
+}
+function optionalAgentSkillsReadme(options) {
+    if (!options.agentSkillsTemplateUrl)
+        return '';
+    return `
+## Agent Skills
+
+This environment is configured to install project-local Agent Skills from:
+
+\`\`\`text
+${options.agentSkillsTemplateUrl}${options.agentSkillsTemplateRef ? `#${options.agentSkillsTemplateRef}` : ''}
+\`\`\`
+
+After external resource installation, skills normally live under:
+
+\`\`\`text
+.agents/skills/
+\`\`\`
+
+Agents that support the Agent Skills standard can load them on demand.
+`;
+}
+function optionalAgentSkillsAgentsSection(options) {
+    if (!options.agentSkillsTemplateUrl)
+        return '';
+    return `
+## Active Agent Skills
+
+When using an agent that supports Agent Skills, prefer the project-local skills
+installed under \`.agents/skills/\`. They are sourced from:
+
+\`\`\`text
+${options.agentSkillsTemplateUrl}${options.agentSkillsTemplateRef ? `#${options.agentSkillsTemplateRef}` : ''}
+\`\`\`
+`;
+}
+function environmentKind() {
+    return 'Docker Compose';
+}
+function repoDuplicationNote() {
+    return 'Keep source repositories under the relevant source directory (`private`, `oca`, or `external`); the Compose entrypoint exposes discovered addons through `/mnt/wpmoo-addons`.';
+}
+function verificationCommand(options) {
+    const firstAddon = allAddons(options)[0] ?? options.product;
+    return `./moo test ${firstAddon}`;
+}
+function environmentUsageDocs(options) {
+    return `## Docker Compose Notes
+
+This environment uses the compact WPMoo Compose layout:
+
+\`\`\`text
+compose.yaml
+compose/dev.yaml
+compose/stage.yaml
+compose/prod.yaml
+config/odoo/odoo.conf
+resources/odoo/entrypoint.sh
+\`\`\`
+
+Development uses compose.yaml plus compose/dev.yaml by default.
+Set WPMOO_ENV=stage or WPMOO_ENV=prod only after providing production-grade secrets and volumes.
+
+If copied from the standalone resource, additional compose notes are in
+\`docs/compose.md\`.
+
+Source repositories stay under \`odoo/custom/src/{private,oca,external}\` when
+configured. At
+container startup, \`entrypoint.sh\` scans those repositories for addons and
+exposes them through \`/mnt/wpmoo-addons\`.
+
+## Daily Command Hub (\`./moo\`)
+
+\`./moo\` routes day-to-day service and module workflows to local scripts in
+\`./scripts/\` (for example \`start\`, \`logs\`, \`update\`, \`test\`, \`snapshot\`).
+\`./moo status\` and \`./moo doctor\` are package fallback commands that run via
+\`npx --yes ${fallbackPackageSpec()} ...\`.
+
+### Start And Inspect Services
+
+\`\`\`bash
+cp .env.example .env
+./moo start
+./moo logs odoo
+./moo shell
+./moo psql postgres
+./moo stop
+\`\`\`
+
+### Run, Update, And Test Modules
+
+\`\`\`bash
+./moo install ${allAddons(options)[0] ?? options.product}
+./moo update ${allAddons(options)[0] ?? options.product}
+./moo test ${allAddons(options)[0] ?? options.product}
+\`\`\`
+
+### Snapshot And Restore
+
+\`\`\`bash
+./moo snapshot devel before-update
+./moo restore-snapshot --dry-run before-update devel
+./moo restore-snapshot before-update devel
+\`\`\`
+
+### Lint
+
+\`\`\`bash
+./moo lint
+\`\`\`
+
+### Export Translations
+
+\`\`\`bash
+./moo pot ${allAddons(options)[0] ?? options.product} devel i18n/${allAddons(options)[0] ?? options.product}.pot
+\`\`\`
+
+### Recover / Reset
+
+\`\`\`bash
+./moo doctor
+./moo status
+./moo resetdb devel ${allAddons(options)[0] ?? options.product}
+\`\`\`
+`;
+}
+const BANNER_GRADIENT_START = [31, 151, 231];
+const BANNER_GRADIENT_END = [209, 95, 127];
+const ANSI_BOLD = '\u001B[1m';
+const ANSI_DIM = '\u001B[2m';
+const ANSI_INFO = '\u001B[38;2;139;166;190m';
+const ANSI_RESET = '\u001B[0m';
+const BANNER_DIVIDER_WIDTH = 40;
+function gradientColor(column, width) {
+    const ratio = width <= 1 ? 0 : column / (width - 1);
+    const [startR, startG, startB] = BANNER_GRADIENT_START;
+    const [endR, endG, endB] = BANNER_GRADIENT_END;
+    const r = Math.round(startR + (endR - startR) * ratio);
+    const g = Math.round(startG + (endG - startG) * ratio);
+    const b = Math.round(startB + (endB - startB) * ratio);
+    return `\u001B[38;2;${r};${g};${b}m`;
+}
+function applyBannerGradient(banner) {
+    const lines = banner.split('\n');
+    return lines
+        .map((line) => {
+        const width = line.length;
+        return Array.from(line)
+            .map((character, column) => `${gradientColor(column, width)}${character}`)
+            .join('');
+    })
+        .join('\n');
+}
+function renderDimInfo(value) {
+    return `${ANSI_DIM}${ANSI_INFO}${value}${ANSI_RESET}`;
+}
+export function renderBanner(details = [], options = {}) {
+    const title = `${applyBannerGradient('WPMoo Toolkit')}${options.version ? `  ${renderDimInfo(options.version)}` : ''}`;
+    const header = [
+        title,
+        applyBannerGradient('Workflow Platform · Micro Object Oriented'),
+        renderDimInfo('Development, staging, and production workflows for Odoo projects.'),
+        applyBannerGradient('─'.repeat(BANNER_DIVIDER_WIDTH)),
+    ].join('\n');
+    const detailsBlock = details.length > 0 ? `\n${details.map((line) => renderDimInfo(line)).join('\n')}` : '';
+    return `\n${ANSI_BOLD}${header}${ANSI_RESET}${detailsBlock}`;
+}
+export function renderGitignore() {
+    return `# macOS/editor noise
+.DS_Store
+.idea/
+.vscode/*.log
+
+# Node/local package files
+node_modules/
+dist/
+coverage/
+*.log
+
+# Python/cache files
+__pycache__/
+*.py[cod]
+.pytest_cache/
+.mypy_cache/
+.ruff_cache/
+
+# Local environment files
+.env
+.env.*
+!.env.example
+*.local
+
+# Local generated files
+*.code-workspace
+addons/
+auto/
+backups/
+data/
+filestore/
+postgresql/
+sessions/
+odoo/custom/auto/
+odoo/custom/src/*/.git-aggregate-cache/
+
+# Backups and archives
+*.bak
+*.backup
+*.dump
+*.sql
+*.zip
+*.tar
+*.tar.gz
+`;
+}
+export function renderMooDelegationScript() {
+    return `#!/usr/bin/env bash
+set -euo pipefail
+
+script_dir="$(cd -- "$(dirname -- "\${BASH_SOURCE[0]}")" && pwd)"
+cd "$script_dir"
+
+usage() {
+  case "$1" in
+    "start") echo "Usage: ./moo start" ;;
+    "stop") echo "Usage: ./moo stop" ;;
+    "logs") echo "Usage: ./moo logs [service]" ;;
+    "restart") echo "Usage: ./moo restart" ;;
+    "shell") echo "Usage: ./moo shell" ;;
+    "psql") echo "Usage: ./moo psql [db]" ;;
+    "install") echo "Usage: ./moo install <module[,module]> [db]" ;;
+    "update") echo "Usage: ./moo update <module[,module]> [db]" ;;
+    "test") echo "Usage: ./moo test <module[,module]> [--db <db>] [--mode init|update] [--tags <tags>]" ;;
+    "resetdb") echo "Usage: ./moo resetdb [db] [module[,module]]" ;;
+    "snapshot") echo "Usage: ./moo snapshot [db] [snapshot-name]" ;;
+    "restore-snapshot") echo "Usage: ./moo restore-snapshot [--dry-run] <snapshot-name> [db]" ;;
+    "lint") echo "Usage: ./moo lint" ;;
+    "pot") echo "Usage: ./moo pot <module[,module]> [db] [output]" ;;
+  esac
+}
+
+fail_usage() {
+  usage "$1" >&2
+  exit 2
+}
+
+require_no_args() {
+  local command="$1"
+  shift
+  if [[ "$#" -ne 0 ]]; then
+    fail_usage "$command"
+  fi
+}
+
+optional_single_arg() {
+  local command="$1"
+  local fallback="$2"
+  shift 2
+  if [[ "$#" -gt 1 ]]; then
+    fail_usage "$command"
+  fi
+  printf '%s\\n' "\${1:-$fallback}"
+}
+
+require_module_args() {
+  local command="$1"
+  shift
+  if [[ "$#" -lt 1 || "\${1:-}" == -* || "$#" -gt 2 ]]; then
+    fail_usage "$command"
+  fi
+}
+
+positional_args() {
+  local command="$1"
+  local min="$2"
+  local max="$3"
+  shift 3
+  if [[ "$#" -lt "$min" || "$#" -gt "$max" ]]; then
+    fail_usage "$command"
+  fi
+  for arg in "$@"; do
+    if [[ "$arg" == -* ]]; then
+      fail_usage "$command"
+    fi
+  done
+}
+
+validate_test_args() {
+  if [[ "$#" -lt 1 || "\${1:-}" == -* ]]; then
+    fail_usage "test"
+  fi
+
+  shift
+  while [[ "$#" -gt 0 ]]; do
+    case "$1" in
+      "--db"|"--tags")
+        if [[ "$#" -lt 2 || "\${2:-}" == --* ]]; then
+          echo "Missing value for $1" >&2
+          exit 2
+        fi
+        shift 2
+        ;;
+      "--mode")
+        if [[ "$#" -lt 2 || "\${2:-}" == --* ]]; then
+          echo "Missing value for --mode" >&2
+          exit 2
+        fi
+        if [[ "$2" != "init" && "$2" != "update" ]]; then
+          echo "Invalid value for --mode: expected init or update" >&2
+          exit 2
+        fi
+        shift 2
+        ;;
+      *)
+        echo "Unknown option for ./moo test: $1" >&2
+        exit 2
+        ;;
+    esac
+  done
+}
+
+run_script() {
+  local script="$1"
+  shift
+  if [[ ! -x "$script" ]]; then
+    echo "Missing daily action script: \${script#./}" >&2
+    exit 1
+  fi
+  exec "$script" "$@"
+}
+
+command="\${1:-}"
+case "$command" in
+  "start")
+    shift
+    require_no_args "$command" "$@"
+    run_script ./scripts/up.sh
+    ;;
+  "stop")
+    shift
+    require_no_args "$command" "$@"
+    run_script ./scripts/down.sh
+    ;;
+  "logs")
+    shift
+    service="$(optional_single_arg "$command" "odoo" "$@")"
+    run_script ./scripts/logs.sh "$service"
+    ;;
+  "restart")
+    shift
+    require_no_args "$command" "$@"
+    run_script ./scripts/restart.sh
+    ;;
+  "shell")
+    shift
+    require_no_args "$command" "$@"
+    run_script ./scripts/shell.sh
+    ;;
+  "psql")
+    shift
+    db="$(optional_single_arg "$command" "postgres" "$@")"
+    run_script ./scripts/psql.sh "$db"
+    ;;
+  "install")
+    shift
+    require_module_args "$command" "$@"
+    run_script ./scripts/install.sh "$@"
+    ;;
+  "update")
+    shift
+    require_module_args "$command" "$@"
+    run_script ./scripts/update.sh "$@"
+    ;;
+  "test")
+    shift
+    validate_test_args "$@"
+    run_script ./scripts/test.sh "$@"
+    ;;
+  "resetdb")
+    shift
+    positional_args "$command" 0 2 "$@"
+    run_script ./scripts/resetdb.sh "$@"
+    ;;
+  "snapshot")
+    shift
+    positional_args "$command" 0 2 "$@"
+    run_script ./scripts/snapshot.sh "$@"
+    ;;
+  "restore-snapshot")
+    shift
+    restore_args=()
+    if [[ "\${1:-}" == "--dry-run" ]]; then
+      restore_args+=("--dry-run")
+      shift
+    fi
+    positional_args "$command" 1 2 "$@"
+    restore_args+=("$@")
+    run_script ./scripts/restore-snapshot.sh "\${restore_args[@]}"
+    ;;
+  "lint")
+    shift
+    require_no_args "$command" "$@"
+    run_script ./scripts/lint.sh
+    ;;
+  "pot")
+    shift
+    positional_args "$command" 1 3 "$@"
+    run_script ./scripts/pot.sh "$@"
+    ;;
+  *)
+    exec npx --yes ${fallbackPackageSpec()} "$@"
+    ;;
+esac
+`;
+}
+export function renderAddonsYaml(options) {
+    return `# Addons activated from source submodules.
+#
+# Source repos are managed as Git submodules under odoo/custom/src/private.
+# Do not duplicate these same repos in repos.yaml.
+
+${options.sourceRepos.map((repo) => `${sourceTypeOf(repo)}/${repo.path}:\n${yamlList(repo.addons)}`).join('\n\n')}
+`;
+}
+export function renderReposYaml(options) {
+    return `# git-aggregator repositories.
+#
+# Project source repositories are intentionally not listed here because
+# they are pinned as Git submodules:
+#
+${options.sourceRepos.map((repo) => `# - ${sourceTypeOf(repo)}/${repo.path}`).join('\n')}
+#
+# Keep this file for upstream/OCA repositories that should be aggregated.
+
+odoo:
+  defaults:
+    depth: $DEPTH_MERGE
+  remotes:
+    origin: https://github.com/OCA/OCB.git
+    odoo: https://github.com/odoo/odoo.git
+  target: origin $ODOO_VERSION
+  merges:
+    - origin $ODOO_VERSION
+`;
+}
+export function renderReadme(options) {
+    const title = titleizeProduct(options.product);
+    return `# ${title} Development Environment
+
+Private ${environmentKind()} development environment for the ${title} product.
+
+This folder owns the development environment only. Product source code lives
+in source repository submodules under \`odoo/custom/src/private\`,
+\`odoo/custom/src/oca\`, or \`odoo/custom/src/external\` when source
+repositories are connected.
+
+## Repository Layout
+
+\`\`\`text
+${repositoryLayout(options)}
+\`\`\`
+
+${cloneDocs(options)}
+
+## WPMoo CLI Shortcut
+
+This environment includes a local \`moo\` shortcut script. From the repository
+root:
+
+\`\`\`bash
+./moo
+./moo start
+./moo stop
+./moo restart
+./moo doctor
+./moo add-module
+\`\`\`
+
+Optionally, if this repository root is on your \`PATH\`, you can run \`moo ...\`
+from anywhere and the script will return to this environment root first.
+${optionalAgentSkillsReadme(options)}
+## Source Repositories
+
+${sourceRepoDocs(options)}
+
+${environmentUsageDocs(options)}
+## Branching
+
+Use Odoo major-version branches in source repositories when you add them:
+
+\`\`\`text
+${options.odooVersion}
+\`\`\`
+
+If this environment is connected to Git, the dev repository can stay on \`main\`
+and pin exact source commits through submodule references.
+`;
+}
+export function renderAgents(options) {
+    const repoList = hasSourceRepos(options)
+        ? options.sourceRepos.map((repo) => `- \`${repo.path}\`: \`${repo.url}\``).join('\n')
+        : '- No source repositories are configured yet.';
+    const sourceLayout = hasSourceRepos(options)
+        ? `Product repositories are Git submodules. They are listed under the private
+source directory below for this environment:
+
+\`\`\`text
+${options.sourceRepos.map(sourceRepoRelativePath).join('\n')}
+\`\`\`
+
+${repoDuplicationNote()}`
+        : 'No source repositories are configured yet. Use `./moo add-repo` or the cockpit Repositories menu before module-specific work.';
+    const addonList = hasSourceRepos(options)
+        ? options.sourceRepos
+            .map((repo) => `\`${repo.path}\` addons:\n${repo.addons.map((addon) => `- \`${addon}\``).join('\n')}`)
+            .join('\n\n')
+        : 'No addon boundaries are known yet. Add source repositories before module-specific implementation.';
+    return `# AGENTS.md
+
+## Project
+
+Private ${environmentKind()} development environment for the ${titleizeProduct(options.product)} product.
+
+## Repository Roles
+
+- \`${options.devRepo}\`: environment/config only, private.
+${repoList}
+
+## Source Layout
+
+${sourceLayout}
+${optionalAgentSkillsAgentsSection(options)}
+## Addon Boundaries
+
+${addonList}
+
+Public/community addons must not depend on private paid addons. Private paid
+addons may depend on public/community addons.
+
+## Odoo 19 Rules
+
+- Use \`<list>\` instead of \`<tree>\`.
+- Use direct view expressions such as \`invisible="..."\` instead of \`attrs\`.
+- Use \`models.Constraint\` instead of \`_sql_constraints\`.
+- Use \`@api.ondelete(at_uninstall=False)\` for delete validation.
+- Avoid \`default_*\` field names in \`res.config.settings\`.
+- Keep core/community installable without any pro modules.
+
+## Verification
+
+Use the environment's addon test/update command:
+
+\`\`\`bash
+${verificationCommand(options)}
+\`\`\`
+
+Useful maintenance commands:
+
+\`\`\`bash
+./moo lint
+./moo resetdb [db] [module[,module]]
+./moo snapshot [db] [snapshot-name]
+./moo restore-snapshot [--dry-run] <snapshot-name> [db]
+./moo pot <module[,module]> [db] [output]
+\`\`\`
+
+Daily script delegation vs package fallback:
+- \`./moo start\`, \`logs\`, \`install\`, \`update\`, \`test\`, \`snapshot\`, and related runtime tasks delegate to local \`./scripts/*.sh\`.
+- \`./moo status\` and \`./moo doctor\` are package fallback commands routed to \`npx --yes ${fallbackPackageSpec()} ...\`.
+
+Only report completion after the relevant update/test/lint command exits cleanly.
+`;
+}
+export function renderAppstoreRelease(options) {
+    return `# Odoo Apps Release Notes
+
+Paid addons can live together in a private source repository during development.
+Each paid addon still needs its own App Store metadata.
+
+Per addon checklist:
+
+- \`__manifest__.py\` has correct \`name\`, \`summary\`, \`version\`, \`depends\`,
+  \`license\`, \`price\`, \`currency\`, and \`support\`.
+- \`license\` is appropriate for paid distribution, typically \`OPL-1\`.
+- \`static/description/icon.png\` exists.
+- \`static/description/index.html\` exists.
+- Screenshots are stored under \`static/description/\`.
+- Community dependency versions are compatible with the target Odoo major
+  version.
+
+Recommended release flow:
+
+1. Develop in the relevant private source repository.
+2. Update the addon manifest version.
+3. Run update/test commands in this dev environment.
+4. Tag the source commit.
+5. Prepare an App Store publish package or publish mirror per paid addon.
+6. Trigger Odoo Apps repository scan/update.
+
+If App Store scan coupling becomes a problem, create separate private publish
+mirror repositories for each paid addon. Keep development in
+\`odoo/custom/src/private\`; mirrors should be generated artifacts, not
+hand-edited source repositories.
+`;
+}
+export function renderPlaceholder(title, body) {
+    return `# ${title}
+
+${body}
+`;
+}