@markii/ansi 0.17.0-next.4 → 0.17.0-next.6

package/dist/failure-presentation.d.ts

@@ -39,8 +39,6 @@ export declare function invalidAttributeValueTitle(directive: string, attribute:
 export declare function unsafeImageSrcTitle(directive: string): string;
 /** The diagnostic text for a host `renderCode` callback that threw; the code block rendered as usual. Wording identical to `@markii/html`'s `codeRendererFailedTitle`. */
 export declare function codeRendererFailedTitle(): string;
-/** The diagnostic text for a directive that names no registered component; the unknown-component box was shown. */
-export declare function unknownDirectiveTitle(directive: string): string;
 /** The diagnostic text for a registered block component written as an inline directive. Wording identical to `@markii/html`'s `formMismatchTitle`. */
 export declare function formMismatchTitle(directive: string): string;
 /**

package/dist/failure-presentation.js

@@ -103,10 +103,6 @@ export function unsafeImageSrcTitle(directive) {
 export function codeRendererFailedTitle() {
     return 'code block: the host code renderer failed, so the plain block was shown';
 }
-/** The diagnostic text for a directive that names no registered component; the unknown-component box was shown. */
-export function unknownDirectiveTitle(directive) {
-    return `${directive}: unknown component, shown as a placeholder`;
-}
 /** The diagnostic text for a registered block component written as an inline directive. Wording identical to `@markii/html`'s `formMismatchTitle`. */
 export function formMismatchTitle(directive) {
     return `${directive}: block component was written inline and was not rendered`;

package/dist/glyphs.d.ts

@@ -68,6 +68,8 @@ export interface GlyphSet {
     readonly emptyValue: string;
     /** The key legend on the live viewer's status line. */
     readonly keyLegend: string;
+    /** The same legend with the re-run key listed second, used only when the host supplies a re-run callback. */
+    readonly keyLegendRerun: string;
 }
 /** The glyph set for `style`; anything other than `'ascii'` gets the unicode set. */
 export declare function glyphsFor(style: BoxStyle | undefined): GlyphSet;

package/dist/glyphs.js

@@ -46,6 +46,7 @@ const UNICODE = {
     starEmpty: '☆',
     emptyValue: '—',
     keyLegend: 'q quit  ↑↓/jk focus  ←→/tab switch  enter open/close  space/pgdn scroll  g/G top/end',
+    keyLegendRerun: 'q quit  r run  ↑↓/jk focus  ←→/tab switch  enter open/close  space/pgdn scroll  g/G top/end',
 };
 const ASCII = {
     topLeft: '+',
@@ -77,6 +78,7 @@ const ASCII = {
     starEmpty: '.',
     emptyValue: '-',
     keyLegend: 'q quit  up/down/jk focus  left/right/tab switch  enter open/close  space/pgdn scroll  g/G top/end',
+    keyLegendRerun: 'q quit  r run  up/down/jk focus  left/right/tab switch  enter open/close  space/pgdn scroll  g/G top/end',
 };
 const GLYPHS = {
     unicode: UNICODE,

package/dist/index.d.ts

@@ -1,17 +1,11 @@
 export { renderMarkToAnsi, renderMarkNodeToAnsi, renderMarkInlineToAnsi, buildMarkElement, type RenderCode, type RenderCodeBlock, type RenderMarkOptions, } from './render.js';
-export { fg, colorize, bold, dim, italic, underline, inverse, hyperlink, detectColorLevel, resolveColorOption, type ColorLevel, type ColorOption, type AnsiColor, } from './ansi.js';
+export { detectColorLevel, resolveColorOption, type ColorLevel, type ColorOption, } from './ansi.js';
 export { defaultAnsiTheme, type AnsiTheme, type Tier1Token } from './theme.js';
-export { BOX_STYLES, isBoxStyle, glyphsFor, type BoxStyle, type FrameEdges, type GlyphSet, } from './glyphs.js';
-export { style } from './style.js';
-export { createAnsiRegistry, mergeAnsiRegistries, registryAliases, readRegistryComponent, resolveDirectiveAlias, childrenText, REGISTRY_ALIASES, type DirectiveAttributes, type AnsiRegistry, type AnsiRegistryEntry, type AnsiComponent, type AnsiComponentProps, type AnsiRenderContext, type RegistryAlias, type RegistryAliases, type ResolvedDirective, type ValueResolution, } from './registry.js';
-export { resolveStorePath, resolveScopedPath, VAULT_NAME_PREFIX, type StorePathResolution, type ValueScope, } from './resolve.js';
-export { failurePhrase, failureTitle, failureToken, dataStateSuffix, emptyInlineTitle, invalidAttributeValueLabel, invalidAttributeValueTitle, unsafeImageSrcLabel, unsafeImageSrcTitle, } from './failure-presentation.js';
-export { stringifyStoredValue } from './value-format.js';
-export { stripControlCharacters, sanitizeBlockText, sanitizeUrlText, BLOCK_TAB_WIDTH, } from './sanitize.js';
-export { resolveLayoutAttributes, applyLayout, LAYOUT_ATTRIBUTE_KEYS, type ResolvedLayoutAttributes, type ResolvedLayoutPresets, type WidthPreset, type AlignPreset, } from './layout.js';
+export type { BoxStyle, GlyphSet } from './glyphs.js';
+export type { DirectiveAttributes, AnsiRegistry, AnsiRegistryEntry, AnsiComponent, AnsiComponentProps, AnsiRenderContext, ValueResolution, } from './registry.js';
 export { type ResolveImageSrc } from './image-resolve.js';
 export { type ResolveHref } from './href-resolve.js';
 export type { AnsiValueStore, AnsiVaultStore, FailureKind, StoredValue, ValueStatus, } from './value-types.js';
 export { defaultAnsiRegistry } from './components/index.js';
-export { ANSI_ENGINE_ID, loadAnsiPack, installAnsiPacks, sanitizeValueForPack, type AnsiPackComponentModules, type AnsiPackToInstall, type LoadAnsiPackResult, type InstallAnsiPacksResult, } from './pack-loader.js';
+export { installAnsiPacks, type AnsiPackComponentModules, type AnsiPackToInstall, type InstallAnsiPacksResult, } from './pack-loader.js';
 export { loadTerminalPackScript, installTerminalPackGlobals, TERMINAL_REGISTER_GLOBAL, TERMINAL_REACT_GLOBAL, TERMINAL_INK_GLOBAL, type LoadTerminalPackScriptResult, } from './pack-script.js';

package/dist/index.js

@@ -4,17 +4,15 @@
 // wants text with no HTML runtime — plus, for a live viewer, the Ink element
 // tree itself (`buildMarkElement`). It is a third platform renderer alongside
 // @markii/html and @markii/react.
+//
+// This entry is the package's semver promise: the render entry points, the
+// registry and pack-loading seam, the types a pack's terminal view names, and
+// the `TERMINAL_*_GLOBAL` names that form the terminal pack ABI. The escape
+// helpers, failure wording, sanitizers and layout helpers stay inside the
+// package.
 export { renderMarkToAnsi, renderMarkNodeToAnsi, renderMarkInlineToAnsi, buildMarkElement, } from './render.js';
-export { fg, colorize, bold, dim, italic, underline, inverse, hyperlink, detectColorLevel, resolveColorOption, } from './ansi.js';
+export { detectColorLevel, resolveColorOption, } from './ansi.js';
 export { defaultAnsiTheme } from './theme.js';
-export { BOX_STYLES, isBoxStyle, glyphsFor, } from './glyphs.js';
-export { style } from './style.js';
-export { createAnsiRegistry, mergeAnsiRegistries, registryAliases, readRegistryComponent, resolveDirectiveAlias, childrenText, REGISTRY_ALIASES, } from './registry.js';
-export { resolveStorePath, resolveScopedPath, VAULT_NAME_PREFIX, } from './resolve.js';
-export { failurePhrase, failureTitle, failureToken, dataStateSuffix, emptyInlineTitle, invalidAttributeValueLabel, invalidAttributeValueTitle, unsafeImageSrcLabel, unsafeImageSrcTitle, } from './failure-presentation.js';
-export { stringifyStoredValue } from './value-format.js';
-export { stripControlCharacters, sanitizeBlockText, sanitizeUrlText, BLOCK_TAB_WIDTH, } from './sanitize.js';
-export { resolveLayoutAttributes, applyLayout, LAYOUT_ATTRIBUTE_KEYS, } from './layout.js';
 export { defaultAnsiRegistry } from './components/index.js';
-export { ANSI_ENGINE_ID, loadAnsiPack, installAnsiPacks, sanitizeValueForPack, } from './pack-loader.js';
+export { installAnsiPacks, } from './pack-loader.js';
 export { loadTerminalPackScript, installTerminalPackGlobals, TERMINAL_REGISTER_GLOBAL, TERMINAL_REACT_GLOBAL, TERMINAL_INK_GLOBAL, } from './pack-script.js';

package/dist/interactive.d.ts

@@ -55,6 +55,16 @@ export interface InteractiveRootProps {
     focusables: readonly FocusableDescriptor[];
     /** Called when the reader presses `q`. The engine owns no process state: it never calls `process.exit` itself. */
     onExit?: () => void;
+    /**
+     * Called when the reader presses `r`. The host runs whatever it runs and
+     * returns when it is done; the engine owns no run, process, or script
+     * state. While the returned promise is pending the status line reads
+     * "running" and further `r` presses are ignored. A rejection ends the
+     * wait like a resolution. Absent, `r` does nothing and the legend omits it.
+     */
+    onRerun?: () => void | Promise<void>;
+    /** The legend to show instead of `keyLegend` when `onRerun` is given: the render's `GlyphSet.keyLegendRerun`. */
+    rerunLegend?: string;
     color: ColorLevel;
     theme: AnsiTheme;
     /** The key legend on the status line, identical regardless of what is focused: the render's `GlyphSet.keyLegend`, so it follows the box style. */
@@ -81,4 +91,4 @@ export interface InteractiveRootProps {
  * default (uninteractive) value there, so a string render never sees a
  * focus marker, a glyph, or a status line.
  */
-export declare function InteractiveRoot({ focusables, onExit, color, theme, keyLegend, viewportRows, width, children, }: InteractiveRootProps): ReactNode;
+export declare function InteractiveRoot({ focusables, onExit, onRerun, rerunLegend, color, theme, keyLegend, viewportRows, width, children, }: InteractiveRootProps): ReactNode;

package/dist/interactive.js

@@ -86,7 +86,7 @@ export function useFocusAnchor(focusId) {
  * default (uninteractive) value there, so a string render never sees a
  * focus marker, a glyph, or a status line.
  */
-export function InteractiveRoot({ focusables, onExit, color, theme, keyLegend, viewportRows, width, children, }) {
+export function InteractiveRoot({ focusables, onExit, onRerun, rerunLegend, color, theme, keyLegend, viewportRows, width, children, }) {
     const focusableCount = focusables.length;
     const [focusIndex, setFocusIndex] = useState(0);
     // `focusId -> the label its last active-panel report carried`. Only a
@@ -119,11 +119,42 @@ export function InteractiveRoot({ focusables, onExit, color, theme, keyLegend, v
             return;
         setOffset(target === 'top' ? 0 : maxOffset());
     };
+    const [running, setRunning] = useState(false);
+    // A ref, not the state: two presses in one tick must start one run.
+    const runningRef = useRef(false);
+    const mounted = useRef(true);
+    useEffect(() => {
+        mounted.current = true;
+        return () => {
+            mounted.current = false;
+        };
+    }, []);
+    const startRerun = () => {
+        if (onRerun === undefined || runningRef.current)
+            return;
+        runningRef.current = true;
+        setRunning(true);
+        const finish = () => {
+            runningRef.current = false;
+            if (mounted.current)
+                setRunning(false);
+        };
+        try {
+            Promise.resolve(onRerun()).then(finish, finish);
+        }
+        catch {
+            finish();
+        }
+    };
     useInput((input, key) => {
         if (input === 'q') {
             onExit?.();
             return;
         }
+        if (input === 'r') {
+            startRerun();
+            return;
+        }
         if (viewport !== undefined) {
             const page = Math.max(1, viewport - 1);
             if (key.pageDown || input === ' ' || (key.ctrl && input === 'f')) {
@@ -222,13 +253,18 @@ export function InteractiveRoot({ focusables, onExit, color, theme, keyLegend, v
     const focusedLabel = focused && focusedId !== undefined
         ? (activeLabels[focusedId] ?? focused.label)
         : undefined;
-    const statusLabel = focused
-        ? `${focused.kind} "${focusedLabel}"`
-        : 'nothing focusable';
+    const statusLabel = running
+        ? 'running'
+        : focused
+            ? `${focused.kind} "${focusedLabel}"`
+            : 'nothing focusable';
+    const legend = onRerun !== undefined && rerunLegend !== undefined
+        ? rerunLegend
+        : keyLegend;
     // Cut to the width on plain text: the status line must stay one row (the
     // viewport math counts it as one), and a label or legend that wrapped
     // would push the document up.
-    const statusLine = dim(cutToWidth(`${statusLabel}  ${keyLegend}`, width), color);
+    const statusLine = dim(cutToWidth(`${statusLabel}  ${legend}`, width), color);
     const status = _jsx(Text, { children: statusLine });
     if (viewport === undefined) {
         return (_jsx(FocusContext.Provider, { value: api, children: _jsxs(Box, { flexDirection: "column", children: [children, status] }) }));

package/dist/render.d.ts

@@ -57,13 +57,6 @@ export interface RenderMarkOptions {
     readonly resolveImageSrc?: ResolveImageSrc;
     readonly resolveHref?: ResolveHref;
     readonly onDiagnostic?: OnDiagnostic;
-    /**
-     * Also report a directive that names no registered component as an
-     * `'unknown-directive'` event. Off by default: the fallback box already
-     * marks it in the output. A host that places findings in the note's
-     * source (a language server) turns it on.
-     */
-    readonly reportUnknownDirectives?: boolean;
     /**
      * Components of installed packs that this render cannot draw, as plain
      * data from the host. A directive named here renders the usual fallback
@@ -133,5 +126,7 @@ export declare function renderMarkInlineToAnsi(text: string, registry?: AnsiRegi
  */
 export declare function buildMarkElement(document: string | MarkNode | MarkRoot, registry?: AnsiRegistry, options?: RenderMarkOptions & {
     readonly onExit?: () => void;
+    /** Called when the reader presses `r`; see `InteractiveRoot`'s `onRerun`. The legend lists the key only when this is given. */
+    readonly onRerun?: () => void | Promise<void>;
 }): ReactElement;
 export {};

package/dist/render.js

@@ -15,8 +15,8 @@ import { sanitizeBlockText, sanitizeUrlText, stripControlCharacters, } from './s
 import { readRegistryComponent, registryLayoutAxis, registrySelfLayout, resolveDirectiveAlias, } from './registry.js';
 import { applyLayout, resolveLayoutAttributes, } from './layout.js';
 import { resolveScopedPath } from './resolve.js';
-import { dataStateSuffix, emptyInlineTitle, failureToken, codeRendererFailedTitle, formMismatchTitle, NO_ENGINE_VIEW_LABEL, noEngineViewTitle, packLoadFailedLabel, packLoadFailedTitle, invalidAttributeValueLabel, invalidAttributeValueTitle, unsafeImageSrcLabel, unknownDirectiveTitle, unsafeImageSrcTitle, } from './failure-presentation.js';
-import { createUnavailableComponentLookup, formatValue, getContract, reportDiagnostic, } from '@markii/stdlib';
+import { dataStateSuffix, emptyInlineTitle, failureToken, codeRendererFailedTitle, formMismatchTitle, NO_ENGINE_VIEW_LABEL, noEngineViewTitle, packLoadFailedLabel, packLoadFailedTitle, invalidAttributeValueLabel, invalidAttributeValueTitle, unsafeImageSrcLabel, unsafeImageSrcTitle, } from './failure-presentation.js';
+import { createUnavailableComponentLookup, formatValue, invalidEnumAttribute, reportDiagnostic, } from '@markii/stdlib';
 import { resolveImageAttribute, } from './image-resolve.js';
 import { resolveHrefAttribute } from './href-resolve.js';
 import { defaultAnsiRegistry } from './components/index.js';
@@ -289,23 +289,6 @@ function resolveDataAttribute(attributes, scope) {
         dataFailureKind: resolved.status === 'error' ? resolved.failureKind : undefined,
     };
 }
-/** Whether one of `name`'s `@markii/stdlib` contract attributes with a closed `enum` is present with a value outside it. */
-function invalidEnumAttribute(name, attributes) {
-    const contract = getContract(name);
-    if (!contract)
-        return undefined;
-    for (const [attribute, schema] of Object.entries(contract.attributes)) {
-        const enumValues = schema.enum;
-        if (!enumValues)
-            continue;
-        const value = attributes[attribute];
-        if (value === undefined || value === null || value === '')
-            continue;
-        if (!enumValues.includes(value))
-            return { attribute, value };
-    }
-    return undefined;
-}
 /** Resolves a `data=`/`:value[]` name against `scope`. Never throws. */
 function resolveValue(scope, name) {
     const trimmed = name.trim();
@@ -412,11 +395,6 @@ function renderDirectiveContentString(name, kind, isBlock, attributes, childrenT
             });
             return unknownDirective(name, inline, safeChildrenText(childrenText), missingView.loadFailed ? 'pack-load-failed' : 'no-engine-view', width, wctx.color, wctx.glyphs, missingView.pack);
         }
-        reportDiagnostic(wctx.onDiagnostic, {
-            kind: 'unknown-directive',
-            directive: name || '(unnamed)',
-            message: unknownDirectiveTitle(name || '(unnamed)'),
-        });
         return unknownDirective(name || '(unnamed)', inline, safeChildrenText(childrenText), 'unregistered', width, wctx.color, wctx.glyphs);
     }
     if (isFormMismatch(entry, kind)) {
@@ -458,8 +436,16 @@ function renderDirectiveContentString(name, kind, isBlock, attributes, childrenT
         const label = invalidAttributeValueLabel(name, invalidEnum.attribute);
         rendered = `${rendered}${markerSeparator}${dim(`[${label}]`, wctx.color)}`;
     }
+    // The same rule as the other engines: no content and no attributes. A
+    // component given attributes draws from them and is not flagged.
     if (isRegisteredInline(entry) &&
-        safeChildrenText(childrenText).trim() === '') {
+        safeChildrenText(childrenText).trim() === '' &&
+        Object.keys(attributes).length === 0) {
+        reportDiagnostic(wctx.onDiagnostic, {
+            kind: 'empty-inline',
+            directive: name,
+            message: emptyInlineTitle(name),
+        });
         rendered = `${rendered}${dim(` (${emptyInlineTitle(name)})`, wctx.color)}`;
     }
     return rendered;
@@ -1475,23 +1461,6 @@ function buildWalkContext(registry, scope, color, theme, glyphs, interactive, re
         focusables: undefined,
     };
 }
-/**
- * The `onDiagnostic` a render hands its walk: the caller's own, minus
- * `'unknown-directive'` events unless `reportUnknownDirectives` asked for
- * them. The fallback box already marks an unknown directive in the output,
- * so a host that does not place findings in a source (the viewer, an
- * export) keeps the quiet diagnostics surface it always had.
- */
-function diagnosticsFor(options) {
-    const downstream = options?.onDiagnostic;
-    if (downstream === undefined || options?.reportUnknownDirectives === true) {
-        return downstream;
-    }
-    return (event) => {
-        if (event.kind !== 'unknown-directive')
-            downstream(event);
-    };
-}
 /** The columns assumed when a caller supplies no `width` option. */
 const DEFAULT_WIDTH = 80;
 /** Builds the root Ink element for `root`, given every resolved render input. Exported for `buildMarkElement` (the live-viewer entry point) as well as this module's own three string-producing entry points. */
@@ -1525,7 +1494,7 @@ async function renderRootToString(root, registry, scope, color, theme, glyphs, i
 export async function renderMarkToAnsi(text, registry = defaultAnsiRegistry, store, vault, options) {
     const color = resolveColorOption(options?.color);
     try {
-        return await renderRootToString(toHast(text), registry, { store: options?.store ?? store, vault: options?.vault ?? vault }, color, options?.theme ?? defaultAnsiTheme, glyphsFor(options?.box), options?.interactive ?? false, options?.resolveImageSrc, options?.resolveHref, diagnosticsFor(options), createUnavailableComponentLookup(options?.unavailableComponents), options?.width ?? DEFAULT_WIDTH, options?.renderCode);
+        return await renderRootToString(toHast(text), registry, { store: options?.store ?? store, vault: options?.vault ?? vault }, color, options?.theme ?? defaultAnsiTheme, glyphsFor(options?.box), options?.interactive ?? false, options?.resolveImageSrc, options?.resolveHref, options?.onDiagnostic, createUnavailableComponentLookup(options?.unavailableComponents), options?.width ?? DEFAULT_WIDTH, options?.renderCode);
     }
     catch (error) {
         return renderFailureFallback(error, color);
@@ -1540,7 +1509,7 @@ export async function renderMarkToAnsi(text, registry = defaultAnsiRegistry, sto
 export async function renderMarkNodeToAnsi(node, registry = defaultAnsiRegistry, store, vault, options) {
     const color = resolveColorOption(options?.color);
     try {
-        return await renderRootToString(nodeOrRootToHast(node), registry, { store: options?.store ?? store, vault: options?.vault ?? vault }, color, options?.theme ?? defaultAnsiTheme, glyphsFor(options?.box), options?.interactive ?? false, options?.resolveImageSrc, options?.resolveHref, diagnosticsFor(options), createUnavailableComponentLookup(options?.unavailableComponents), options?.width ?? DEFAULT_WIDTH, options?.renderCode);
+        return await renderRootToString(nodeOrRootToHast(node), registry, { store: options?.store ?? store, vault: options?.vault ?? vault }, color, options?.theme ?? defaultAnsiTheme, glyphsFor(options?.box), options?.interactive ?? false, options?.resolveImageSrc, options?.resolveHref, options?.onDiagnostic, createUnavailableComponentLookup(options?.unavailableComponents), options?.width ?? DEFAULT_WIDTH, options?.renderCode);
     }
     catch (error) {
         return renderFailureFallback(error, color);
@@ -1604,7 +1573,7 @@ export function buildMarkElement(document, registry = defaultAnsiRegistry, optio
         root = { type: 'root', children: [] };
     }
     const unavailable = createUnavailableComponentLookup(options?.unavailableComponents);
-    const content = buildRootElement(root, registry, scope, color, theme, glyphs, interactive, options?.resolveImageSrc, options?.resolveHref, diagnosticsFor(options), unavailable, width, options?.renderCode);
+    const content = buildRootElement(root, registry, scope, color, theme, glyphs, interactive, options?.resolveImageSrc, options?.resolveHref, options?.onDiagnostic, unavailable, width, options?.renderCode);
     if (!interactive)
         return content;
     // The walk above already assigned every focusable component's `focusId`
@@ -1626,5 +1595,5 @@ export function buildMarkElement(document, registry = defaultAnsiRegistry, optio
     countingWctx.focusCounter = counter;
     countingWctx.focusables = focusables;
     renderBlocksElement(root.children, width, '', countingWctx);
-    return (_jsx(InteractiveRoot, { focusables: focusables, onExit: options?.onExit, color: color, theme: theme, keyLegend: glyphs.keyLegend, viewportRows: options?.viewportRows, width: width, children: content }));
+    return (_jsx(InteractiveRoot, { focusables: focusables, onExit: options?.onExit, onRerun: options?.onRerun, rerunLegend: glyphs.keyLegendRerun, color: color, theme: theme, keyLegend: glyphs.keyLegend, viewportRows: options?.viewportRows, width: width, children: content }));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@markii/ansi",
-  "version": "0.17.0-next.4",
+  "version": "0.17.0-next.6",
   "description": "The terminal renderer for Markii (.mk.md): a registry-driven hast-to-terminal engine built on Ink. Renders a note once as a string with optional color, for a pipe or a log, or as a live Ink tree a host can mount.",
   "keywords": [
     "markdown",
@@ -51,15 +51,15 @@
     "regenerate:fixtures": "npm run build:dist && node scripts/regenerate-ansi-fixtures.ts"
   },
   "dependencies": {
-    "@markii/core": "^0.17.0-next.4",
-    "@markii/pack": "^0.17.0-next.4",
-    "@markii/stdlib": "^0.17.0-next.4",
+    "@markii/core": "^0.17.0-next.6",
+    "@markii/pack": "^0.17.0-next.6",
+    "@markii/stdlib": "^0.17.0-next.6",
     "ink": "^7.1.1",
     "react": "^19.2.0"
   },
   "devDependencies": {
     "@types/hast": "^3.0.4",
-    "@markii/runtime": "^0.17.0-next.4",
+    "@markii/runtime": "^0.17.0-next.6",
     "@types/react": "^19.2.0"
   }
 }