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

package/dist/diagnostics.d.ts

@@ -33,17 +33,21 @@
  * the fallback box, labeled as a missing view rather than an unknown
  * component. Only reported when the host passed `unavailableComponents`.
  *
- * `'unknown-directive'` — a directive names no registered component and
- * rendered as the unknown-component fallback box. Reported by the terminal
- * engine only, so a host that wants a finding for every unknown directive
- * (the language server) can place it; the other engines draw the same
- * fallback and stay quiet.
+ * `'unknown-directive'` — a directive names no known component. Reported
+ * only by `validateNote`, for a host that places findings in the note's
+ * source (the language server). The renderers draw the unknown-component
+ * fallback box and report nothing for it.
  *
  * `'code-renderer-failed'` — a host's `renderCode` callback threw for an
  * ordinary fenced code block; the block rendered as usual. Carries no
  * directive or attribute.
+ *
+ * `'empty-inline'`: an inline component registered as inline received
+ * neither content nor attributes (`:badge[]`); it rendered as registered,
+ * with a quiet marker. A component given attributes, such as
+ * `:badge{variant=info}`, draws from them and is not flagged.
  */
-export type DiagnosticKind = 'invalid-attribute-value' | 'unsafe-image-src' | 'form-mismatch' | 'no-engine-view' | 'unknown-directive' | 'code-renderer-failed';
+export type DiagnosticKind = 'invalid-attribute-value' | 'unsafe-image-src' | 'form-mismatch' | 'no-engine-view' | 'unknown-directive' | 'code-renderer-failed' | 'empty-inline';
 /**
  * Where in the note's source an event happened: the directive's range, in
  * unist coordinates (1-based line, 1-based column, end exclusive). Present

package/dist/editor/index.d.ts

@@ -21,12 +21,9 @@
  */
 export type { CompletionContext, CompletionContextKind, CompletionItem, CompletionItemKind, ComponentDocumentation, HoverInfo, } from './complete/types.js';
 export { completionAt, componentDocumentation, formatComponentDocumentation, hoverAt, } from './complete/completion.js';
-export type { AttributeNameParseResult, AttributeValueParseResult, DirectiveForm, DirectiveNameParseResult, DirectiveNameToken, ParsedCompletionContext, } from './complete/directive-context.js';
-export { clampColumn, findDirectiveNameTokenAt, parseCompletionContext, } from './complete/directive-context.js';
 export type { EditorComponentAttribute, InsertableComponent, } from './insert/component-catalog.js';
 export { LAYOUT_WRAPPER_NAMES, standardComponentCatalog, } from './insert/component-catalog.js';
 export type { ComponentSkeleton, LineColumn, } from './insert/component-skeleton.js';
 export { componentSkeleton, offsetToLineColumn, } from './insert/component-skeleton.js';
-export { firstSentence } from './insert/first-sentence.js';
 export type { EnclosingContainerFence, FenceLineEdit, } from './fences/container-fences.js';
 export { closesOpenContainerFence, enclosingContainerFences, fenceExtensionEdits, insertedContainerColonCount, } from './fences/container-fences.js';

package/dist/editor/index.js

@@ -1,6 +1,4 @@
 export { completionAt, componentDocumentation, formatComponentDocumentation, hoverAt, } from './complete/completion.js';
-export { clampColumn, findDirectiveNameTokenAt, parseCompletionContext, } from './complete/directive-context.js';
 export { LAYOUT_WRAPPER_NAMES, standardComponentCatalog, } from './insert/component-catalog.js';
 export { componentSkeleton, offsetToLineColumn, } from './insert/component-skeleton.js';
-export { firstSentence } from './insert/first-sentence.js';
 export { closesOpenContainerFence, enclosingContainerFences, fenceExtensionEdits, insertedContainerColonCount, } from './fences/container-fences.js';

package/dist/index.d.ts

@@ -5,3 +5,4 @@ export { formatValue, isNumericLike, FORMAT_ATTRIBUTE, DECIMALS_ATTRIBUTE, type
 export { deriveTableShape, type TableShape } from './table-shape.js';
 export { reportDiagnostic, createUnavailableComponentLookup, type UnavailableComponent, type UnavailableComponentLookup, type DiagnosticEvent, type DiagnosticPosition, type DiagnosticKind, type OnDiagnostic, } from './diagnostics.js';
 export { INTERACTIVE_ATTRIBUTE } from './interactive.js';
+export { buildNoteCatalog, formMismatchMessage, invalidAttributeValueMessage, invalidEnumAttribute, standardNoteCatalog, unknownDirectiveMessage, unsafeImageSrcMessage, validateNote, type NoteCatalogAttribute, type NoteCatalogEntry, type NoteTreeNode, type ValidateNoteOptions, } from './validate-note.js';

package/dist/index.js

@@ -5,3 +5,4 @@ export { formatValue, isNumericLike, FORMAT_ATTRIBUTE, DECIMALS_ATTRIBUTE, } fro
 export { deriveTableShape } from './table-shape.js';
 export { reportDiagnostic, createUnavailableComponentLookup, } from './diagnostics.js';
 export { INTERACTIVE_ATTRIBUTE } from './interactive.js';
+export { buildNoteCatalog, formMismatchMessage, invalidAttributeValueMessage, invalidEnumAttribute, standardNoteCatalog, unknownDirectiveMessage, unsafeImageSrcMessage, validateNote, } from './validate-note.js';

package/dist/validate-note.d.ts

@@ -0,0 +1,96 @@
+import { type ComponentKind } from './contracts.js';
+import type { DiagnosticEvent } from './diagnostics.js';
+/**
+ * The part of an mdast node `validateNote` reads. Structural on purpose, so
+ * this package does not import `@markii/core` or `mdast`: the tree
+ * `parse` returns is assignable to it.
+ */
+export interface NoteTreeNode {
+    readonly type: string;
+    readonly name?: string;
+    readonly attributes?: Readonly<Record<string, string | null | undefined>> | null;
+    readonly children?: readonly NoteTreeNode[];
+    readonly position?: {
+        readonly start: {
+            readonly line: number;
+            readonly column: number;
+        };
+        readonly end: {
+            readonly line: number;
+            readonly column: number;
+        };
+    };
+}
+/** One attribute a catalog entry declares; the same shape as `EditorComponentAttribute`. */
+export interface NoteCatalogAttribute {
+    readonly name: string;
+    /** The closed set of allowed values, when the attribute is an enum. */
+    readonly values?: readonly string[];
+}
+/**
+ * One component a note may use. `InsertableComponent` (the editor
+ * catalog's entry, which `@markii/host` builds from each pack's
+ * `pack.json`) is assignable to it, so a host reuses that catalog.
+ */
+export interface NoteCatalogEntry {
+    /** The directive name an author writes, e.g. `callout` or `cat_card`. */
+    readonly directiveName: string;
+    readonly kind: ComponentKind;
+    /** False when `kind` is only a default (a pack component that declared none); no form check is made then. Omitted means `true`. */
+    readonly kindDeclared?: boolean;
+    readonly attributes?: readonly NoteCatalogAttribute[];
+}
+/** The standard set as catalog entries, with each enum attribute's allowed values. */
+export declare function standardNoteCatalog(): readonly NoteCatalogEntry[];
+/**
+ * The standard set followed by `extra` entries (a pack's components). An
+ * extra entry whose name is already taken is skipped, so the first claim on
+ * a name wins, as it does in the editor catalog.
+ */
+export declare function buildNoteCatalog(extra: readonly NoteCatalogEntry[]): readonly NoteCatalogEntry[];
+type DirectiveAttributes = Readonly<Record<string, string | null | undefined>>;
+/**
+ * Whether one of the standard component `name`'s contract attributes with a
+ * closed enum is present in `attributes` with a value outside it, such as
+ * `card{text="Hey"}`. Returns the first offending pair, or `undefined` when
+ * `name` is not a standard component or nothing is out of range. The
+ * renderers call this on the attributes a component received, after the
+ * reserved layout keys were removed.
+ */
+export declare function invalidEnumAttribute(name: string, attributes: DirectiveAttributes): {
+    attribute: string;
+    value: string;
+} | undefined;
+/** The diagnostic text for a directive that names no known component. */
+export declare function unknownDirectiveMessage(directive: string): string;
+/** The diagnostic text for a block component written as an inline directive. */
+export declare function formMismatchMessage(directive: string): string;
+/** The diagnostic text for an attribute value outside its closed set. */
+export declare function invalidAttributeValueMessage(directive: string, attribute: string, value: string): string;
+/** The diagnostic text for a component-built image whose source was refused as an unsafe URL. */
+export declare function unsafeImageSrcMessage(directive: string): string;
+/** What a caller may pass to `validateNote`. */
+export interface ValidateNoteOptions {
+    /**
+     * The URL scheme rule, normally `@markii/core`'s `isSafeUrl`. Given, a
+     * `figure` whose `src` it refuses yields an `'unsafe-image-src'`
+     * finding. Omitted, no source is checked. Only the scheme is judged: a
+     * relative path a host resolves is never a finding here.
+     */
+    readonly isSafeUrl?: (url: string) => boolean;
+}
+/**
+ * The findings in a note that need no renderer, in document order, each
+ * carrying the source range of its directive. Never throws: a node of an
+ * unexpected shape is skipped.
+ *
+ * A directive resolves against `catalog` by exact name. `:value[...]` is
+ * built into every renderer and is never reported. A form mismatch is
+ * reported only for an inline directive naming a catalog entry whose kind
+ * is declared and is not `inline`; the reverse is not a finding, since a
+ * renderer draws it. Attribute enums are checked on the attributes left
+ * after the reserved `width` and `align` keys are removed, as a renderer
+ * sees them.
+ */
+export declare function validateNote(tree: NoteTreeNode, catalog: readonly NoteCatalogEntry[], options?: ValidateNoteOptions): DiagnosticEvent[];
+export {};

package/dist/validate-note.js

@@ -0,0 +1,222 @@
+/**
+ * The one engine-independent check of a parsed note: what is wrong with its
+ * directives no matter which renderer draws them. A host that places
+ * findings in the note's source (a language server) calls `validateNote`
+ * with the tree `@markii/core`'s `parse` returns and a catalog of the
+ * components the note may use. Nothing here renders, runs a script, or
+ * loads pack code, and the module imports no parser: the tree is input.
+ *
+ * Three kinds of finding need no engine and are reported here:
+ * `'unknown-directive'` (a name no catalog entry matches),
+ * `'form-mismatch'` (a block component written inline), and
+ * `'invalid-attribute-value'` (a value outside a declared enum). The
+ * renderers report the last two themselves when they draw a note, through
+ * the same predicates (`invalidEnumAttribute` below). A fourth,
+ * `'unsafe-image-src'`, is reported only when the caller passes
+ * `isSafeUrl`, because the URL scheme rule belongs to `@markii/core`,
+ * which this package never imports. Engine-specific findings
+ * (`'no-engine-view'`, `'code-renderer-failed'`) stay in the engines.
+ *
+ * The messages are diagnostics-surface text. They match the wording each
+ * engine's failure-presentation module uses for the same finding, and
+ * each engine's drift test pins that.
+ */
+import { LAYOUT_ATTRIBUTE_KEYS } from './layout.js';
+import { getContract, STANDARD_COMPONENTS, } from './contracts.js';
+/** The directive name that no catalog needs: `:value[...]` is built into every renderer. */
+const VALUE_DIRECTIVE_NAME = 'value';
+/** The standard component whose `src` is a URL the renderers check. */
+const FIGURE_DIRECTIVE_NAME = 'figure';
+const DIRECTIVE_NODE_TYPES = new Set([
+    'textDirective',
+    'leafDirective',
+    'containerDirective',
+]);
+/** The standard set as catalog entries, with each enum attribute's allowed values. */
+export function standardNoteCatalog() {
+    return Object.values(STANDARD_COMPONENTS).map((contract) => ({
+        directiveName: contract.name,
+        kind: contract.kind,
+        kindDeclared: true,
+        attributes: Object.entries(contract.attributes).map(([name, schema]) => ({
+            name,
+            ...(schema.enum !== undefined ? { values: schema.enum } : {}),
+        })),
+    }));
+}
+/**
+ * The standard set followed by `extra` entries (a pack's components). An
+ * extra entry whose name is already taken is skipped, so the first claim on
+ * a name wins, as it does in the editor catalog.
+ */
+export function buildNoteCatalog(extra) {
+    const catalog = [...standardNoteCatalog()];
+    const taken = new Set(catalog.map((entry) => entry.directiveName));
+    for (const entry of extra) {
+        if (taken.has(entry.directiveName))
+            continue;
+        taken.add(entry.directiveName);
+        catalog.push(entry);
+    }
+    return catalog;
+}
+/**
+ * The first attribute in `declared` that is written with a value outside its
+ * closed set. An absent, bare, or empty value is never a violation. Shared
+ * by `invalidEnumAttribute` and `validateNote`, so the predicate has one
+ * home.
+ */
+function firstInvalidEnum(declared, attributes) {
+    for (const [attribute, values] of declared) {
+        if (!values)
+            continue;
+        if (!Object.hasOwn(attributes, attribute))
+            continue;
+        const value = attributes[attribute];
+        if (value === undefined || value === null || value === '')
+            continue;
+        if (!values.includes(value))
+            return { attribute, value };
+    }
+    return undefined;
+}
+/**
+ * Whether one of the standard component `name`'s contract attributes with a
+ * closed enum is present in `attributes` with a value outside it, such as
+ * `card{text="Hey"}`. Returns the first offending pair, or `undefined` when
+ * `name` is not a standard component or nothing is out of range. The
+ * renderers call this on the attributes a component received, after the
+ * reserved layout keys were removed.
+ */
+export function invalidEnumAttribute(name, attributes) {
+    const contract = getContract(name);
+    if (!contract)
+        return undefined;
+    return firstInvalidEnum(Object.entries(contract.attributes).map(([attribute, schema]) => [attribute, schema.enum]), attributes);
+}
+/** The diagnostic text for a directive that names no known component. */
+export function unknownDirectiveMessage(directive) {
+    return `${directive}: unknown component, shown as a placeholder`;
+}
+/** The diagnostic text for a block component written as an inline directive. */
+export function formMismatchMessage(directive) {
+    return `${directive}: block component was written inline and was not rendered`;
+}
+/** The diagnostic text for an attribute value outside its closed set. */
+export function invalidAttributeValueMessage(directive, attribute, value) {
+    return `${directive}: "${value}" is not a valid ${attribute} value (ignored)`;
+}
+/** The diagnostic text for a component-built image whose source was refused as an unsafe URL. */
+export function unsafeImageSrcMessage(directive) {
+    return `${directive}: image source was refused as unsafe and was not shown`;
+}
+function positionOf(node) {
+    const range = node.position;
+    if (range === undefined)
+        return undefined;
+    return {
+        startLine: range.start.line,
+        startColumn: range.start.column,
+        endLine: range.end.line,
+        endColumn: range.end.column,
+    };
+}
+function stripLayoutKeys(attributes) {
+    const rest = {};
+    for (const [key, value] of Object.entries(attributes)) {
+        if (LAYOUT_ATTRIBUTE_KEYS.includes(key))
+            continue;
+        rest[key] = value;
+    }
+    return rest;
+}
+/**
+ * The findings in a note that need no renderer, in document order, each
+ * carrying the source range of its directive. Never throws: a node of an
+ * unexpected shape is skipped.
+ *
+ * A directive resolves against `catalog` by exact name. `:value[...]` is
+ * built into every renderer and is never reported. A form mismatch is
+ * reported only for an inline directive naming a catalog entry whose kind
+ * is declared and is not `inline`; the reverse is not a finding, since a
+ * renderer draws it. Attribute enums are checked on the attributes left
+ * after the reserved `width` and `align` keys are removed, as a renderer
+ * sees them.
+ */
+export function validateNote(tree, catalog, options = {}) {
+    const isSafeUrl = options.isSafeUrl;
+    const byName = new Map();
+    for (const entry of catalog) {
+        if (!byName.has(entry.directiveName))
+            byName.set(entry.directiveName, entry);
+    }
+    const events = [];
+    const visit = (node) => {
+        if (node === null || typeof node !== 'object')
+            return;
+        if (typeof node.type === 'string' &&
+            DIRECTIVE_NODE_TYPES.has(node.type) &&
+            node.name !== VALUE_DIRECTIVE_NAME) {
+            check(node);
+        }
+        if (Array.isArray(node.children)) {
+            for (const child of node.children)
+                visit(child);
+        }
+    };
+    const check = (node) => {
+        const name = typeof node.name === 'string' && node.name !== '' ? node.name : '';
+        const position = positionOf(node);
+        const at = position === undefined ? {} : { position };
+        const entry = name === '' ? undefined : byName.get(name);
+        if (entry === undefined) {
+            const shown = name || '(unnamed)';
+            events.push({
+                kind: 'unknown-directive',
+                directive: shown,
+                message: unknownDirectiveMessage(shown),
+                ...at,
+            });
+            return;
+        }
+        if (node.type === 'textDirective' &&
+            entry.kindDeclared !== false &&
+            entry.kind !== 'inline') {
+            events.push({
+                kind: 'form-mismatch',
+                directive: name,
+                message: formMismatchMessage(name),
+                ...at,
+            });
+            return;
+        }
+        const attributes = stripLayoutKeys(node.attributes ?? {});
+        const src = Object.hasOwn(attributes, 'src')
+            ? attributes['src']
+            : undefined;
+        if (isSafeUrl !== undefined &&
+            name === FIGURE_DIRECTIVE_NAME &&
+            typeof src === 'string' &&
+            src !== '' &&
+            !isSafeUrl(src)) {
+            events.push({
+                kind: 'unsafe-image-src',
+                directive: name,
+                message: unsafeImageSrcMessage(name),
+                ...at,
+            });
+        }
+        const invalid = firstInvalidEnum((entry.attributes ?? []).map((a) => [a.name, a.values]), attributes);
+        if (invalid !== undefined) {
+            events.push({
+                kind: 'invalid-attribute-value',
+                directive: name,
+                attribute: invalid.attribute,
+                message: invalidAttributeValueMessage(name, invalid.attribute, invalid.value),
+                ...at,
+            });
+        }
+    };
+    visit(tree);
+    return events;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@markii/stdlib",
-  "version": "0.17.0-next.4",
+  "version": "0.17.0-next.6",
   "description": "Neutral, framework-agnostic standard component contracts for Mark (.mk.md) — the kind/attribute-schema seam every renderer (e.g. @markii/react) implements against. No React, zero dependencies.",
   "keywords": [
     "markdown",