@ecsplico/editor 3.5.1 → 4.0.0

package/dist/features/composites/meta-display.js.map

@@ -1 +1 @@
-{"version":3,"file":"meta-display.js","names":[],"sources":["../../../src/features/composites/meta-display.ts"],"sourcesContent":["import type { Node as PMNode } from '@tiptap/pm/model'\nimport { findBlockById } from '../../core/schema/block-ids'\nimport type { Translate } from '../../i18n'\nimport { type CslItem, citeShort } from './bibliography'\nimport type { Derivation } from './derivation'\nimport { derivationMethodLabel } from './derived-chrome'\nimport { type CompositeKind, type CompositeMetaField, compositeKind } from './kinds'\nimport type { CompositeRow } from './rows'\n\n/**\n * The stored value of a meta field as text (`''` when unset). An array (`multiselect`) reads as its entries joined by\n * `, `: the labels of the matching `options`, else the stored values.\n */\nexport function metaText(row: Pick<CompositeRow, 'meta'>, field: Pick<CompositeMetaField, 'key'> & { options?: CompositeMetaField['options'] }): string {\n  const value = row.meta[field.key]\n  if (Array.isArray(value)) return value.filter((item): item is string => typeof item === 'string').map(item => field.options?.find(option => option.value === item)?.label ?? item).join(', ')\n  return typeof value === 'string' || typeof value === 'number' ? String(value) : ''\n}\n\nconst dateFormat = new Intl.DateTimeFormat('de-DE', { day: '2-digit', month: '2-digit', year: 'numeric' })\n\n/** `2026-05-01` → `01.05.2026`; parsed by hand because `new Date('2026-05-01')` is UTC and can show the previous day. */\nexport function formatDate(value: string): string {\n  const match = /^(\\d{4})-(\\d{2})-(\\d{2})/.exec(value)\n  const date = match ? new Date(Number(match[1]), Number(match[2]) - 1, Number(match[3])) : new Date(value)\n  return Number.isNaN(date.getTime()) ? value : dateFormat.format(date)\n}\n\n/**\n * The text a field's value stands for in a table cell: `reference` the title of the Baustein it points to (its kind label\n * when untitled, `''` when it is gone or `doc` is unknown), `bibliography` the short citation, `derivation`\n * `method · date` (the method as words when `t` is given, else its stored id); every other type its stored text.\n */\nexport function fieldDisplay(row: Pick<CompositeRow, 'meta' | 'title'>, field: Pick<CompositeMetaField, 'key' | 'type' | 'options'>, doc: PMNode | null, kinds: readonly CompositeKind[], t?: Translate): string {\n  const value = row.meta[field.key]\n  if (field.type === 'reference') {\n    if (typeof value !== 'string' || !value || !doc) return ''\n    const target = findBlockById(doc, value)?.node\n    if (target?.type.name !== 'composite') return ''\n    return target.child(0).textContent.trim() || compositeKind(kinds, String(target.attrs.kind)).label\n  }\n  if (field.type === 'bibliography') {\n    const bib = value as Partial<CslItem> | null | undefined\n    return bib && typeof bib === 'object' && typeof bib.type === 'string' ? citeShort(bib, row.title) : ''\n  }\n  if (field.type === 'derivation') {\n    const derivation = value as Partial<Derivation> | null | undefined\n    if (!derivation || typeof derivation !== 'object' || typeof derivation.method !== 'string') return ''\n    return [t ? derivationMethodLabel(t, derivation.method) : derivation.method, derivation.createdAt ? formatDate(derivation.createdAt) : ''].filter(Boolean).join(' · ')\n  }\n  return metaText(row, field)\n}\n\n/** Icon and color class of the known status values; unknown values read as neutral. */\nconst STATUS_STYLE: Record<string, { icon: string, color: string }> = {\n  open: { icon: 'i-lucide-circle', color: 'text-[var(--sk-muted)]' },\n  doing: { icon: 'i-lucide-circle-dot', color: 'text-[var(--sk-info)]' },\n  done: { icon: 'i-lucide-circle-check', color: 'text-[var(--sk-success)]' },\n}\nconst STATUS_UNSET = { icon: 'i-lucide-circle-dashed', color: 'text-[var(--sk-fg-dimmed)]' }\nconst STATUS_OTHER = { icon: 'i-lucide-circle', color: 'text-[var(--sk-muted)]' }\n\nexport const statusStyle = (value: string) => STATUS_STYLE[value] ?? (value ? STATUS_OTHER : STATUS_UNSET)\n\n/** A row's `status` field with its current value. */\nexport interface RowStatus {\n  field: CompositeMetaField\n  value: string\n  label: string\n  icon: string\n  color: string\n}\n\n/** The row's `status` select field with its current value, `null` for a kind without one; `t` words an unset status. */\nexport function rowStatus(row: CompositeRow, t: Translate): RowStatus | null {\n  const field = row.fields.find(candidate => candidate.key === 'status' && candidate.type === 'select')\n  if (!field) return null\n  const value = metaText(row, field)\n  return { field, value, label: field.options?.find(option => option.value === value)?.label ?? (value || t('composites.status.none')), ...statusStyle(value) }\n}\n"],"mappings":";;;;;;;;;AAaA,SAAgB,SAAS,KAAiC,OAA8F;CACtJ,MAAM,QAAQ,IAAI,KAAK,MAAM;CAC7B,IAAI,MAAM,QAAQ,KAAK,GAAG,OAAO,MAAM,QAAQ,SAAyB,OAAO,SAAS,QAAQ,CAAC,CAAC,KAAI,SAAQ,MAAM,SAAS,MAAK,WAAU,OAAO,UAAU,IAAI,CAAC,EAAE,SAAS,IAAI,CAAC,CAAC,KAAK,IAAI;CAC5L,OAAO,OAAO,UAAU,YAAY,OAAO,UAAU,WAAW,OAAO,KAAK,IAAI;AAClF;AAEA,MAAM,aAAa,IAAI,KAAK,eAAe,SAAS;CAAE,KAAK;CAAW,OAAO;CAAW,MAAM;AAAU,CAAC;;AAGzG,SAAgB,WAAW,OAAuB;CAChD,MAAM,QAAQ,2BAA2B,KAAK,KAAK;CACnD,MAAM,OAAO,QAAQ,IAAI,KAAK,OAAO,MAAM,EAAE,GAAG,OAAO,MAAM,EAAE,IAAI,GAAG,OAAO,MAAM,EAAE,CAAC,IAAI,IAAI,KAAK,KAAK;CACxG,OAAO,OAAO,MAAM,KAAK,QAAQ,CAAC,IAAI,QAAQ,WAAW,OAAO,IAAI;AACtE;;;;;;AAOA,SAAgB,aAAa,KAA2C,OAA6D,KAAoB,OAAiC,GAAuB;CAC/M,MAAM,QAAQ,IAAI,KAAK,MAAM;CAC7B,IAAI,MAAM,SAAS,aAAa;EAC9B,IAAI,OAAO,UAAU,YAAY,CAAC,SAAS,CAAC,KAAK,OAAO;EACxD,MAAM,SAAS,cAAc,KAAK,KAAK,CAAC,EAAE;EAC1C,IAAI,QAAQ,KAAK,SAAS,aAAa,OAAO;EAC9C,OAAO,OAAO,MAAM,CAAC,CAAC,CAAC,YAAY,KAAK,KAAK,cAAc,OAAO,OAAO,OAAO,MAAM,IAAI,CAAC,CAAC,CAAC;CAC/F;CACA,IAAI,MAAM,SAAS,gBAAgB;EACjC,MAAM,MAAM;EACZ,OAAO,OAAO,OAAO,QAAQ,YAAY,OAAO,IAAI,SAAS,WAAW,UAAU,KAAK,IAAI,KAAK,IAAI;CACtG;CACA,IAAI,MAAM,SAAS,cAAc;EAC/B,MAAM,aAAa;EACnB,IAAI,CAAC,cAAc,OAAO,eAAe,YAAY,OAAO,WAAW,WAAW,UAAU,OAAO;EACnG,OAAO,CAAC,IAAI,sBAAsB,GAAG,WAAW,MAAM,IAAI,WAAW,QAAQ,WAAW,YAAY,WAAW,WAAW,SAAS,IAAI,EAAE,CAAC,CAAC,OAAO,OAAO,CAAC,CAAC,KAAK,KAAK;CACvK;CACA,OAAO,SAAS,KAAK,KAAK;AAC5B;;AAGA,MAAM,eAAgE;CACpE,MAAM;EAAE,MAAM;EAAmB,OAAO;CAAyB;CACjE,OAAO;EAAE,MAAM;EAAuB,OAAO;CAAwB;CACrE,MAAM;EAAE,MAAM;EAAyB,OAAO;CAA2B;AAC3E;AACA,MAAM,eAAe;CAAE,MAAM;CAA0B,OAAO;AAA6B;AAC3F,MAAM,eAAe;CAAE,MAAM;CAAmB,OAAO;AAAyB;AAEhF,MAAa,eAAe,UAAkB,aAAa,WAAW,QAAQ,eAAe;;AAY7F,SAAgB,UAAU,KAAmB,GAAgC;CAC3E,MAAM,QAAQ,IAAI,OAAO,MAAK,cAAa,UAAU,QAAQ,YAAY,UAAU,SAAS,QAAQ;CACpG,IAAI,CAAC,OAAO,OAAO;CACnB,MAAM,QAAQ,SAAS,KAAK,KAAK;CACjC,OAAO;EAAE;EAAO;EAAO,OAAO,MAAM,SAAS,MAAK,WAAU,OAAO,UAAU,KAAK,CAAC,EAAE,UAAU,SAAS,EAAE,wBAAwB;EAAI,GAAG,YAAY,KAAK;CAAE;AAC9J"}
+{"version":3,"file":"meta-display.js","names":[],"sources":["../../../src/features/composites/meta-display.ts"],"sourcesContent":["import type { Node as PMNode } from '@tiptap/pm/model'\nimport { findBlockById } from '../../core/schema/block-ids'\nimport type { Translate } from '../../i18n'\nimport { type CslItem, citeShort } from './bibliography'\nimport type { Derivation } from '../../core/derivation'\nimport { derivationMethodLabel } from './derived-chrome'\nimport { type BlockType, blockTypeOf } from './block-types'\nimport type { PropertyDefinition } from '../../core/properties'\nimport type { BlockProperties } from './properties'\nimport type { CompositeRow } from './rows'\n\n/**\n * The stored value of a meta field as text (`''` when unset). An array (`multiselect`) reads as its entries joined by\n * `, `: the labels of the matching `options`, else the stored values.\n */\nexport function metaText(row: Pick<BlockProperties, 'meta'>, field: Pick<PropertyDefinition, 'key'> & { options?: PropertyDefinition['options'] }): string {\n  const value = row.meta[field.key]\n  if (Array.isArray(value)) return value.filter((item): item is string => typeof item === 'string').map(item => field.options?.find(option => option.value === item)?.label ?? item).join(', ')\n  return typeof value === 'string' || typeof value === 'number' ? String(value) : ''\n}\n\nconst dateFormat = new Intl.DateTimeFormat('de-DE', { day: '2-digit', month: '2-digit', year: 'numeric' })\n\n/** `2026-05-01` → `01.05.2026`; parsed by hand because `new Date('2026-05-01')` is UTC and can show the previous day. */\nexport function formatDate(value: string): string {\n  const match = /^(\\d{4})-(\\d{2})-(\\d{2})/.exec(value)\n  const date = match ? new Date(Number(match[1]), Number(match[2]) - 1, Number(match[3])) : new Date(value)\n  return Number.isNaN(date.getTime()) ? value : dateFormat.format(date)\n}\n\n/**\n * The text a field's value stands for in a table cell: `reference` the title of the Typed block it points to (its Block type label\n * when untitled, `''` when it is gone or `doc` is unknown), `bibliography` the short citation, `derivation`\n * `method · date` (the method as words when `t` is given, else its stored id); every other type its stored text.\n */\nexport function fieldDisplay(row: Pick<CompositeRow, 'meta' | 'title'>, field: Pick<PropertyDefinition, 'key' | 'type' | 'options'>, doc: PMNode | null, kinds: readonly BlockType[], t?: Translate): string {\n  const value = row.meta[field.key]\n  if (field.type === 'reference') {\n    if (typeof value !== 'string' || !value || !doc) return ''\n    const target = findBlockById(doc, value)?.node\n    if (target?.type.name !== 'typedBlock') return ''\n    return target.child(0).textContent.trim() || blockTypeOf(kinds, String(target.attrs.blockType)).label\n  }\n  if (field.type === 'bibliography') {\n    const bib = value as Partial<CslItem> | null | undefined\n    return bib && typeof bib === 'object' && typeof bib.type === 'string' ? citeShort(bib, row.title) : ''\n  }\n  if (field.type === 'derivation') {\n    const derivation = value as Partial<Derivation> | null | undefined\n    if (!derivation || typeof derivation !== 'object' || typeof derivation.method !== 'string') return ''\n    return [t ? derivationMethodLabel(t, derivation.method) : derivation.method, derivation.createdAt ? formatDate(derivation.createdAt) : ''].filter(Boolean).join(' · ')\n  }\n  return metaText(row, field)\n}\n\n/** Icon and color class of the known status values; unknown values read as neutral. */\nconst STATUS_STYLE: Record<string, { icon: string, color: string }> = {\n  open: { icon: 'i-lucide-circle', color: 'text-[var(--sk-muted)]' },\n  doing: { icon: 'i-lucide-circle-dot', color: 'text-[var(--sk-info)]' },\n  done: { icon: 'i-lucide-circle-check', color: 'text-[var(--sk-success)]' },\n}\nconst STATUS_UNSET = { icon: 'i-lucide-circle-dashed', color: 'text-[var(--sk-fg-dimmed)]' }\nconst STATUS_OTHER = { icon: 'i-lucide-circle', color: 'text-[var(--sk-muted)]' }\n\nexport const statusStyle = (value: string) => STATUS_STYLE[value] ?? (value ? STATUS_OTHER : STATUS_UNSET)\n\n/** A row's `status` field with its current value. */\nexport interface RowStatus {\n  field: PropertyDefinition\n  value: string\n  label: string\n  icon: string\n  color: string\n}\n\n/** The row's `status` select field with its current value, `null` for a kind without one; `t` words an unset status. */\nexport function rowStatus(row: CompositeRow, t: Translate): RowStatus | null {\n  const field = row.definitions.find(candidate => candidate.key === 'status' && candidate.type === 'select')\n  if (!field) return null\n  const value = metaText(row, field)\n  return { field, value, label: field.options?.find(option => option.value === value)?.label ?? (value || t('composites.status.none')), ...statusStyle(value) }\n}\n"],"mappings":";;;;;;;;;AAeA,SAAgB,SAAS,KAAoC,OAA8F;CACzJ,MAAM,QAAQ,IAAI,KAAK,MAAM;CAC7B,IAAI,MAAM,QAAQ,KAAK,GAAG,OAAO,MAAM,QAAQ,SAAyB,OAAO,SAAS,QAAQ,CAAC,CAAC,KAAI,SAAQ,MAAM,SAAS,MAAK,WAAU,OAAO,UAAU,IAAI,CAAC,EAAE,SAAS,IAAI,CAAC,CAAC,KAAK,IAAI;CAC5L,OAAO,OAAO,UAAU,YAAY,OAAO,UAAU,WAAW,OAAO,KAAK,IAAI;AAClF;AAEA,MAAM,aAAa,IAAI,KAAK,eAAe,SAAS;CAAE,KAAK;CAAW,OAAO;CAAW,MAAM;AAAU,CAAC;;AAGzG,SAAgB,WAAW,OAAuB;CAChD,MAAM,QAAQ,2BAA2B,KAAK,KAAK;CACnD,MAAM,OAAO,QAAQ,IAAI,KAAK,OAAO,MAAM,EAAE,GAAG,OAAO,MAAM,EAAE,IAAI,GAAG,OAAO,MAAM,EAAE,CAAC,IAAI,IAAI,KAAK,KAAK;CACxG,OAAO,OAAO,MAAM,KAAK,QAAQ,CAAC,IAAI,QAAQ,WAAW,OAAO,IAAI;AACtE;;;;;;AAOA,SAAgB,aAAa,KAA2C,OAA6D,KAAoB,OAA6B,GAAuB;CAC3M,MAAM,QAAQ,IAAI,KAAK,MAAM;CAC7B,IAAI,MAAM,SAAS,aAAa;EAC9B,IAAI,OAAO,UAAU,YAAY,CAAC,SAAS,CAAC,KAAK,OAAO;EACxD,MAAM,SAAS,cAAc,KAAK,KAAK,CAAC,EAAE;EAC1C,IAAI,QAAQ,KAAK,SAAS,cAAc,OAAO;EAC/C,OAAO,OAAO,MAAM,CAAC,CAAC,CAAC,YAAY,KAAK,KAAK,YAAY,OAAO,OAAO,OAAO,MAAM,SAAS,CAAC,CAAC,CAAC;CAClG;CACA,IAAI,MAAM,SAAS,gBAAgB;EACjC,MAAM,MAAM;EACZ,OAAO,OAAO,OAAO,QAAQ,YAAY,OAAO,IAAI,SAAS,WAAW,UAAU,KAAK,IAAI,KAAK,IAAI;CACtG;CACA,IAAI,MAAM,SAAS,cAAc;EAC/B,MAAM,aAAa;EACnB,IAAI,CAAC,cAAc,OAAO,eAAe,YAAY,OAAO,WAAW,WAAW,UAAU,OAAO;EACnG,OAAO,CAAC,IAAI,sBAAsB,GAAG,WAAW,MAAM,IAAI,WAAW,QAAQ,WAAW,YAAY,WAAW,WAAW,SAAS,IAAI,EAAE,CAAC,CAAC,OAAO,OAAO,CAAC,CAAC,KAAK,KAAK;CACvK;CACA,OAAO,SAAS,KAAK,KAAK;AAC5B;;AAGA,MAAM,eAAgE;CACpE,MAAM;EAAE,MAAM;EAAmB,OAAO;CAAyB;CACjE,OAAO;EAAE,MAAM;EAAuB,OAAO;CAAwB;CACrE,MAAM;EAAE,MAAM;EAAyB,OAAO;CAA2B;AAC3E;AACA,MAAM,eAAe;CAAE,MAAM;CAA0B,OAAO;AAA6B;AAC3F,MAAM,eAAe;CAAE,MAAM;CAAmB,OAAO;AAAyB;AAEhF,MAAa,eAAe,UAAkB,aAAa,WAAW,QAAQ,eAAe;;AAY7F,SAAgB,UAAU,KAAmB,GAAgC;CAC3E,MAAM,QAAQ,IAAI,YAAY,MAAK,cAAa,UAAU,QAAQ,YAAY,UAAU,SAAS,QAAQ;CACzG,IAAI,CAAC,OAAO,OAAO;CACnB,MAAM,QAAQ,SAAS,KAAK,KAAK;CACjC,OAAO;EAAE;EAAO;EAAO,OAAO,MAAM,SAAS,MAAK,WAAU,OAAO,UAAU,KAAK,CAAC,EAAE,UAAU,SAAS,EAAE,wBAAwB;EAAI,GAAG,YAAY,KAAK;CAAE;AAC9J"}

package/dist/features/composites/meta-keys.d.ts

@@ -1,11 +1,11 @@
+import "../../core/capabilities.js";
+import { DERIVATION_KEY } from "../../core/derivation.js";
 //#region src/features/composites/meta-keys.d.ts
-/** Key of the derivation (provenance) in a composite's `meta`. */
-export declare const DERIVATION_KEY = "derivation";
-/** Key of the bibliographic record (`CslItem`) in a composite's `meta`. */
+/** Key of the bibliographic record (`CslItem`) in a block's `meta`. */
 export declare const BIB_KEY = "bib";
-/** Key of the hidden-title flag in a composite's `meta`: `true` while the title is hidden, absent otherwise. */
+/** Key of the hidden-title flag in a block's `meta`: `true` while the title is hidden, absent otherwise. */
 export declare const TITLE_HIDDEN_KEY = "titleHidden";
-/** Key of the colour basket in a composite's `meta`: the id of one of the editor's baskets. */
+/** Key of the colour basket in a block's `meta`: the id of one of the editor's baskets. */
 export declare const BASKET_KEY = "basket";
 //#endregion
 //# sourceMappingURL=meta-keys.d.ts.map

package/dist/features/composites/meta-keys.js

@@ -1,21 +1,21 @@
+import { DERIVATION_KEY } from "../../core/derivation.js";
+import { propertiesOf } from "./block-types.js";
 //#region src/features/composites/meta-keys.ts
-/** Key of the derivation (provenance) in a composite's `meta`. */
-const DERIVATION_KEY = "derivation";
-/** Key of the bibliographic record (`CslItem`) in a composite's `meta`. */
+/** Key of the bibliographic record (`CslItem`) in a block's `meta`. */
 const BIB_KEY = "bib";
-/** Key of the hidden-title flag in a composite's `meta`: `true` while the title is hidden, absent otherwise. */
+/** Key of the hidden-title flag in a block's `meta`: `true` while the title is hidden, absent otherwise. */
 const TITLE_HIDDEN_KEY = "titleHidden";
-/** Key of the colour basket in a composite's `meta`: the id of one of the editor's baskets. */
+/** Key of the colour basket in a block's `meta`: the id of one of the editor's baskets. */
 const BASKET_KEY = "basket";
 /**
-* Whether a composite of `kind` keeps the `meta` entry `key`: the fields the kind declares, plus provenance
+* Whether a block of Block type `kind` keeps the `meta` entry `key`: the fields the kind declares, plus provenance
 * (`derivation`), the bibliographic record (`bib`), the hidden-title flag (`titleHidden`) and the basket (`basket`),
 * which any kind may carry (a kind switch, a conversion and a Markdown round trip must not drop them).
 */
 function keepsMetaKey(kind, key) {
-	return key === "derivation" || key === "bib" || key === "titleHidden" || key === "basket" || kind.fields.some((field) => field.key === key);
+	return key === "derivation" || key === "bib" || key === "titleHidden" || key === "basket" || propertiesOf(kind).some((field) => field.key === key);
 }
-/** `meta` reduced to the entries a composite of `kind` keeps (`keepsMetaKey`). */
+/** `meta` reduced to the entries a block of Block type `kind` keeps (`keepsMetaKey`). */
 function keptMeta(kind, meta) {
 	return Object.fromEntries(Object.entries(meta).filter(([key]) => keepsMetaKey(kind, key)));
 }

package/dist/features/composites/meta-keys.js.map

@@ -1 +1 @@
-{"version":3,"file":"meta-keys.js","names":[],"sources":["../../../src/features/composites/meta-keys.ts"],"sourcesContent":["// Vue-free and server-importable: the `meta` keys a Baustein of any kind may carry, and which meta keys a kind keeps.\nimport type { CompositeKind } from './kinds'\n\n/** Key of the derivation (provenance) in a composite's `meta`. */\nexport const DERIVATION_KEY = 'derivation'\n\n/** Key of the bibliographic record (`CslItem`) in a composite's `meta`. */\nexport const BIB_KEY = 'bib'\n\n/** Key of the hidden-title flag in a composite's `meta`: `true` while the title is hidden, absent otherwise. */\nexport const TITLE_HIDDEN_KEY = 'titleHidden'\n\n/** Key of the colour basket in a composite's `meta`: the id of one of the editor's baskets. */\nexport const BASKET_KEY = 'basket'\n\n/**\n * Whether a composite of `kind` keeps the `meta` entry `key`: the fields the kind declares, plus provenance\n * (`derivation`), the bibliographic record (`bib`), the hidden-title flag (`titleHidden`) and the basket (`basket`),\n * which any kind may carry (a kind switch, a conversion and a Markdown round trip must not drop them).\n */\nexport function keepsMetaKey(kind: Pick<CompositeKind, 'fields'>, key: string): boolean {\n  return key === DERIVATION_KEY || key === BIB_KEY || key === TITLE_HIDDEN_KEY || key === BASKET_KEY || kind.fields.some(field => field.key === key)\n}\n\n/** `meta` reduced to the entries a composite of `kind` keeps (`keepsMetaKey`). */\nexport function keptMeta(kind: Pick<CompositeKind, 'fields'>, meta: Record<string, unknown>): Record<string, unknown> {\n  return Object.fromEntries(Object.entries(meta).filter(([key]) => keepsMetaKey(kind, key)))\n}\n"],"mappings":";;AAIA,MAAa,iBAAiB;;AAG9B,MAAa,UAAU;;AAGvB,MAAa,mBAAmB;;AAGhC,MAAa,aAAa;;;;;;AAO1B,SAAgB,aAAa,MAAqC,KAAsB;CACtF,OAAO,QAAA,gBAA0B,QAAA,SAAmB,QAAA,iBAA4B,QAAA,YAAsB,KAAK,OAAO,MAAK,UAAS,MAAM,QAAQ,GAAG;AACnJ;;AAGA,SAAgB,SAAS,MAAqC,MAAwD;CACpH,OAAO,OAAO,YAAY,OAAO,QAAQ,IAAI,CAAC,CAAC,QAAQ,CAAC,SAAS,aAAa,MAAM,GAAG,CAAC,CAAC;AAC3F"}
+{"version":3,"file":"meta-keys.js","names":[],"sources":["../../../src/features/composites/meta-keys.ts"],"sourcesContent":["// Vue-free and server-importable: the `meta` keys a Typed block of any Block type may carry, and which meta keys a Block type keeps.\nimport type { BlockTypeData } from '../../core/capabilities'\nimport { DERIVATION_KEY } from '../../core/derivation'\nimport { propertiesOf } from './block-types'\n\nexport { DERIVATION_KEY }\n\n/** Key of the bibliographic record (`CslItem`) in a block's `meta`. */\nexport const BIB_KEY = 'bib'\n\n/** Key of the hidden-title flag in a block's `meta`: `true` while the title is hidden, absent otherwise. */\nexport const TITLE_HIDDEN_KEY = 'titleHidden'\n\n/** Key of the colour basket in a block's `meta`: the id of one of the editor's baskets. */\nexport const BASKET_KEY = 'basket'\n\n/**\n * Whether a block of Block type `kind` keeps the `meta` entry `key`: the fields the kind declares, plus provenance\n * (`derivation`), the bibliographic record (`bib`), the hidden-title flag (`titleHidden`) and the basket (`basket`),\n * which any kind may carry (a kind switch, a conversion and a Markdown round trip must not drop them).\n */\nexport function keepsMetaKey(kind: BlockTypeData, key: string): boolean {\n  return key === DERIVATION_KEY || key === BIB_KEY || key === TITLE_HIDDEN_KEY || key === BASKET_KEY || propertiesOf(kind).some(field => field.key === key)\n}\n\n/** `meta` reduced to the entries a block of Block type `kind` keeps (`keepsMetaKey`). */\nexport function keptMeta(kind: BlockTypeData, meta: Record<string, unknown>): Record<string, unknown> {\n  return Object.fromEntries(Object.entries(meta).filter(([key]) => keepsMetaKey(kind, key)))\n}\n"],"mappings":";;;;AAQA,MAAa,UAAU;;AAGvB,MAAa,mBAAmB;;AAGhC,MAAa,aAAa;;;;;;AAO1B,SAAgB,aAAa,MAAqB,KAAsB;CACtE,OAAO,QAAA,gBAA0B,QAAA,SAAmB,QAAA,iBAA4B,QAAA,YAAsB,aAAa,IAAI,CAAC,CAAC,MAAK,UAAS,MAAM,QAAQ,GAAG;AAC1J;;AAGA,SAAgB,SAAS,MAAqB,MAAwD;CACpG,OAAO,OAAO,YAAY,OAAO,QAAQ,IAAI,CAAC,CAAC,QAAQ,CAAC,SAAS,aAAa,MAAM,GAAG,CAAC,CAAC;AAC3F"}

package/dist/features/composites/node-views.d.ts

@@ -1,15 +1,15 @@
-import { CompositeOptions, CompositeStorage } from "./nodes.js";
 import { ReferenceOptions } from "./reference.js";
+import { CompositeOptions, CompositeStorage } from "./nodes.js";
 import { NodeViewRenderer } from "@tiptap/core";
 //#region src/features/composites/node-views.d.ts
 /** The node view renderers a framework binding supplies for the composite block and the reference chip. */
 export interface CompositeNodeViews {
-  composite: NodeViewRenderer;
+  typedBlock: NodeViewRenderer;
   reference: NodeViewRenderer;
 }
 /**
  * The composite node with the node view of a framework binding, the tags row (data: hidden, `CompositeChrome`
- * shows and edits it, so it needs no node view) and the reference chip. Configure the kinds with `Composite.configure({ kinds: [...defaultCompositeKinds(t), myKind] })`.
+ * shows and edits it, so it needs no node view) and the reference chip. Configure the Block types with `Composite.configure({ blockTypes: [...defaultBlockTypes(t), myType] })`.
  */
 export declare function compositeNodes(nodeViews: CompositeNodeViews): {
   Composite: import("@tiptap/core").Node<CompositeOptions, CompositeStorage>;

package/dist/features/composites/node-views.js

@@ -3,12 +3,12 @@ import { ReferenceNode } from "./reference.js";
 //#region src/features/composites/node-views.ts
 /**
 * The composite node with the node view of a framework binding, the tags row (data: hidden, `CompositeChrome`
-* shows and edits it, so it needs no node view) and the reference chip. Configure the kinds with `Composite.configure({ kinds: [...defaultCompositeKinds(t), myKind] })`.
+* shows and edits it, so it needs no node view) and the reference chip. Configure the Block types with `Composite.configure({ blockTypes: [...defaultBlockTypes(t), myType] })`.
 */
 function compositeNodes(nodeViews) {
 	return {
 		Composite: CompositeNode.extend({ addNodeView() {
-			return nodeViews.composite;
+			return nodeViews.typedBlock;
 		} }),
 		CompositeTags: CompositeTagsNode,
 		Reference: ReferenceNode.extend({ addNodeView() {

package/dist/features/composites/node-views.js.map

@@ -1 +1 @@
-{"version":3,"file":"node-views.js","names":[],"sources":["../../../src/features/composites/node-views.ts"],"sourcesContent":["import type { NodeViewRenderer } from '@tiptap/core'\nimport { CompositeNode, CompositeTagsNode } from './nodes'\nimport { ReferenceNode } from './reference'\n\n/** The node view renderers a framework binding supplies for the composite block and the reference chip. */\nexport interface CompositeNodeViews {\n  composite: NodeViewRenderer\n  reference: NodeViewRenderer\n}\n\n/**\n * The composite node with the node view of a framework binding, the tags row (data: hidden, `CompositeChrome`\n * shows and edits it, so it needs no node view) and the reference chip. Configure the kinds with `Composite.configure({ kinds: [...defaultCompositeKinds(t), myKind] })`.\n */\nexport function compositeNodes(nodeViews: CompositeNodeViews) {\n  return {\n    // Explicit return type: the node views import `compositeKindsOf`, so inference would otherwise be circular.\n    Composite: CompositeNode.extend({\n      addNodeView(): NodeViewRenderer {\n        return nodeViews.composite\n      },\n    }),\n    CompositeTags: CompositeTagsNode,\n    Reference: ReferenceNode.extend({\n      addNodeView(): NodeViewRenderer {\n        return nodeViews.reference\n      },\n    }),\n  }\n}\n"],"mappings":";;;;;;;AAcA,SAAgB,eAAe,WAA+B;CAC5D,OAAO;EAEL,WAAW,cAAc,OAAO,EAC9B,cAAgC;GAC9B,OAAO,UAAU;EACnB,EACF,CAAC;EACD,eAAe;EACf,WAAW,cAAc,OAAO,EAC9B,cAAgC;GAC9B,OAAO,UAAU;EACnB,EACF,CAAC;CACH;AACF"}
+{"version":3,"file":"node-views.js","names":[],"sources":["../../../src/features/composites/node-views.ts"],"sourcesContent":["import type { NodeViewRenderer } from '@tiptap/core'\nimport { CompositeNode, CompositeTagsNode } from './nodes'\nimport { ReferenceNode } from './reference'\n\n/** The node view renderers a framework binding supplies for the composite block and the reference chip. */\nexport interface CompositeNodeViews {\n  typedBlock: NodeViewRenderer\n  reference: NodeViewRenderer\n}\n\n/**\n * The composite node with the node view of a framework binding, the tags row (data: hidden, `CompositeChrome`\n * shows and edits it, so it needs no node view) and the reference chip. Configure the Block types with `Composite.configure({ blockTypes: [...defaultBlockTypes(t), myType] })`.\n */\nexport function compositeNodes(nodeViews: CompositeNodeViews) {\n  return {\n    // Explicit return type: the node views import `blockTypesOf`, so inference would otherwise be circular.\n    Composite: CompositeNode.extend({\n      addNodeView(): NodeViewRenderer {\n        return nodeViews.typedBlock\n      },\n    }),\n    CompositeTags: CompositeTagsNode,\n    Reference: ReferenceNode.extend({\n      addNodeView(): NodeViewRenderer {\n        return nodeViews.reference\n      },\n    }),\n  }\n}\n"],"mappings":";;;;;;;AAcA,SAAgB,eAAe,WAA+B;CAC5D,OAAO;EAEL,WAAW,cAAc,OAAO,EAC9B,cAAgC;GAC9B,OAAO,UAAU;EACnB,EACF,CAAC;EACD,eAAe;EACf,WAAW,cAAc,OAAO,EAC9B,cAAgC;GAC9B,OAAO,UAAU;EACnB,EACF,CAAC;CACH;AACF"}

package/dist/features/composites/nodes.d.ts

@@ -1,24 +1,24 @@
 import { Store } from "../../core/store.js";
 import { HeadingConversionScope } from "../../settings/values.js";
 import "../../settings/index.js";
-import { CompositeKind } from "./kinds.js";
 import { Basket } from "./baskets.js";
+import { BlockType } from "./block-types.js";
 import { Editor, JSONContent, Node } from "@tiptap/core";
 import { EditorState } from "@tiptap/pm/state";
 import { Node as Node$1, ResolvedPos } from "@tiptap/pm/model";
 //#region src/features/composites/nodes.d.ts
-/** Options of the `composite` node: the kinds its `kind` attribute selects from and the baskets its `meta.basket` selects from. */
+/** Options of the `typedBlock` node: the Block types its `blockType` attribute selects from and the baskets its `meta.basket` selects from. */
 export interface CompositeOptions {
-  kinds: readonly CompositeKind[];
+  blockTypes: readonly BlockType[];
   baskets: readonly Basket[];
 }
-/** Storage of the `composite` node: mirrors `options.kinds` and `options.baskets` for code that only has the editor. */
+/** Storage of the `typedBlock` node: mirrors `options.blockTypes` and `options.baskets` for code that only has the editor. */
 export interface CompositeStorage {
-  kinds: readonly CompositeKind[];
+  blockTypes: readonly BlockType[];
   baskets: readonly Basket[];
-  /** Ids of the Bausteine with a hidden title (`meta.titleHidden`) whose title the caret entered; they show it for the rest of the editor session. */
+  /** Ids of the Typed blocks with a hidden title (`meta.titleHidden`) whose title the caret entered; they show it for the rest of the editor session. */
   revealedTitles: Store<ReadonlySet<string>>;
-  /** Ids of the derived Bausteine (those with a `meta.derivation`) the user opened; every other derived Baustein shows collapsed. */
+  /** Ids of the derived Typed blocks (those with a `meta.derivation`) the user opened; every other derived Typed block shows collapsed. */
   expanded: Store<ReadonlySet<string>>;
 }
 declare module '@tiptap/core' {
@@ -41,9 +41,9 @@ declare module '@tiptap/core' {
         recursive: boolean;
         scope: HeadingConversionScope;
       }) => ReturnType;
-      /** Switch the composite at `pos` (default: the caret's innermost composite) to `kind`; `meta` keeps the target kind's fields plus `derivation` and `bib`. */
-      setCompositeKind: (kind: string, pos?: number) => ReturnType;
-      /** Open the derived Baustein with block id `id` if it is collapsed, collapse it if it is open. */
+      /** Switch the composite at `pos` (default: the caret's innermost composite) to the Block type `blockTypeId`; `meta` keeps the new Block type's properties plus `derivation` and `bib`. */
+      changeBlockType: (blockTypeId: string, pos?: number) => ReturnType;
+      /** Open the derived Typed block with block id `id` if it is collapsed, collapse it if it is open. */
       toggleCompositeExpanded: (id: string) => ReturnType;
       /** Put the composite at `pos` (default: the caret's innermost composite) into the basket `basket` (an id of the editor's baskets; false for an unknown id), or take it out with `null`. */
       setCompositeBasket: (basket: string | null, pos?: number) => ReturnType;
@@ -52,16 +52,16 @@ declare module '@tiptap/core' {
     };
   }
   interface Storage {
-    composite: CompositeStorage;
+    typedBlock: CompositeStorage;
   }
 }
 /** Title, description and tags: the fixed children in front of a composite's body. */
 export declare const COMPOSITE_CHROME_COUNT = 3;
 /**
- * Composite kinds `editor` was configured with. An editor without the composite node gets the built-in kinds in the
+ * Block types `editor` was configured with. An editor without the composite node gets the built-in Block types in the
  * language of its surface (the default language without one).
  */
-export declare function compositeKindsOf(editor: Editor): readonly CompositeKind[];
+export declare function blockTypesOf(editor: Editor): readonly BlockType[];
 /** Baskets `editor` was configured with (the built-in ones in the default language for an editor without the composite node). */
 export declare function compositeBasketsOf(editor: Editor): readonly Basket[];
 /** JSON of a fresh composite of `kind` (empty title/description/tags, hidden meta) with `body`. */

package/dist/features/composites/nodes.js

@@ -1,38 +1,39 @@
 import { ABILITY, TEXT_ABILITIES } from "../../core/schema/abilities.js";
-import { editorEntryOf } from "../../core/editor-ui.js";
 import { isChromeNode } from "../../core/schema/node-flags.js";
+import { OLD_HTML, TYPED_BLOCK, TYPED_BLOCK_DESCRIPTION, TYPED_BLOCK_TAGS, TYPED_BLOCK_TITLE } from "../../core/schema/persisted-names.js";
+import { editorEntryOf } from "../../core/editor-ui.js";
+import { derivationOf } from "../../core/derivation.js";
 import { createStore } from "../../core/store.js";
-import { compositeKind, defaultCompositeKinds, fallbackCompositeKinds } from "./kinds.js";
+import { blockTypeOf, defaultBlockTypes, fallbackBlockTypes } from "./block-types.js";
 import { BASKET_KEY, TITLE_HIDDEN_KEY, keptMeta } from "./meta-keys.js";
 import { compositeFence, withReferencedFenceIds } from "./fences.js";
 import { basketById, defaultBaskets, fallbackBaskets, titleHiddenOf } from "./baskets.js";
-import { derivationOf } from "./derivation.js";
 import { flattenCompositesToHeadings, groupHeadingsIntoComposites, headingGroupRange } from "./heading-composites.js";
 import { Node, mergeAttributes } from "@tiptap/core";
 import { Selection, TextSelection } from "@tiptap/pm/state";
 //#region src/features/composites/nodes.ts
-const COMPOSITE = "composite";
-const TITLE = "compositeTitle";
-const DESCRIPTION = "compositeDescription";
-const TAGS = "compositeTags";
+/** The `data-type` of the chrome elements of a Typed block (title, description, tags) in the HTML the nodes render and parse. */
+const TITLE_DATA_TYPE = "typed-block-title";
+const DESCRIPTION_DATA_TYPE = "typed-block-description";
+const TAGS_DATA_TYPE = "typed-block-tags";
 /** Kind of a composite created without an explicit one (also the attribute default). */
 const DEFAULT_KIND = "section";
 /** Title, description and tags: the fixed children in front of a composite's body. */
 const COMPOSITE_CHROME_COUNT = 3;
 const CHROME_COUNT = 3;
 /**
-* Composite kinds `editor` was configured with. An editor without the composite node gets the built-in kinds in the
+* Block types `editor` was configured with. An editor without the composite node gets the built-in Block types in the
 * language of its surface (the default language without one).
 */
-function compositeKindsOf(editor) {
-	const configured = editor.storage.composite?.kinds;
+function blockTypesOf(editor) {
+	const configured = editor.storage.typedBlock?.blockTypes;
 	if (configured) return configured;
 	const entry = editorEntryOf(editor);
-	return entry ? defaultCompositeKinds(entry.ctx.t) : fallbackCompositeKinds();
+	return entry ? defaultBlockTypes(entry.ctx.t) : fallbackBlockTypes();
 }
 /** Baskets `editor` was configured with (the built-in ones in the default language for an editor without the composite node). */
 function compositeBasketsOf(editor) {
-	const configured = editor.storage.composite?.baskets;
+	const configured = editor.storage.typedBlock?.baskets;
 	if (configured) return configured;
 	const entry = editorEntryOf(editor);
 	return entry ? defaultBaskets(entry.ctx.t) : fallbackBaskets();
@@ -40,12 +41,12 @@ function compositeBasketsOf(editor) {
 /** JSON of a fresh composite of `kind` (empty title/description/tags, hidden meta) with `body`. */
 function compositeJSON(kind, body = [{ type: "paragraph" }]) {
 	return {
-		type: COMPOSITE,
-		attrs: { kind },
+		type: TYPED_BLOCK,
+		attrs: { blockType: kind },
 		content: [
-			{ type: TITLE },
-			{ type: DESCRIPTION },
-			{ type: TAGS },
+			{ type: TYPED_BLOCK_TITLE },
+			{ type: TYPED_BLOCK_DESCRIPTION },
+			{ type: TYPED_BLOCK_TAGS },
 			...body
 		]
 	};
@@ -54,7 +55,7 @@ function compositeJSON(kind, body = [{ type: "paragraph" }]) {
 function compositeAround($pos) {
 	for (let depth = $pos.depth; depth > 0; depth--) {
 		const node = $pos.node(depth);
-		if (node.type.name === COMPOSITE) return {
+		if (node.type.name === "typedBlock") return {
 			depth,
 			pos: $pos.before(depth),
 			node
@@ -66,7 +67,7 @@ function compositeAround($pos) {
 function compositeAt(state, pos) {
 	if (pos === void 0) return compositeAround(state.selection.$head);
 	const node = state.doc.nodeAt(pos);
-	return node?.type.name === COMPOSITE ? {
+	return node?.type.name === "typedBlock" ? {
 		pos,
 		node
 	} : null;
@@ -82,7 +83,7 @@ const isEmptyParagraph = (node) => node.type.name === "paragraph" && node.conten
 function inTrailingEmptyParagraph($head) {
 	if ($head.depth < 2 || !isEmptyParagraph($head.parent)) return false;
 	const composite = $head.node($head.depth - 1);
-	return composite.type.name === COMPOSITE && $head.index($head.depth - 1) === composite.childCount - 1 && composite.childCount > 4;
+	return composite.type.name === "typedBlock" && $head.index($head.depth - 1) === composite.childCount - 1 && composite.childCount > 4;
 }
 /** Nothing typed yet: empty title and description, no tags, body is one empty paragraph. */
 function isEmptyComposite(composite) {
@@ -93,10 +94,10 @@ function isEmptyComposite(composite) {
 function structureRange(state, scope, direction) {
 	const { $from, $to, $head, empty } = state.selection;
 	if (!empty) {
-		const range = $from.blockRange($to, (node) => node.type.name === "doc" || node.type.name === COMPOSITE);
+		const range = $from.blockRange($to, (node) => node.type.name === "doc" || node.type.name === "typedBlock");
 		if (!range) return null;
 		const parent = range.parent;
-		const fromIndex = Math.max(range.startIndex, parent.type.name === COMPOSITE ? CHROME_COUNT : 0);
+		const fromIndex = Math.max(range.startIndex, parent.type.name === "typedBlock" ? CHROME_COUNT : 0);
 		const toIndex = range.endIndex;
 		if (fromIndex >= toIndex) return null;
 		return {
@@ -139,10 +140,10 @@ function structureRange(state, scope, direction) {
 			};
 		}
 		let depth = $head.depth;
-		while (depth > 0 && !["doc", COMPOSITE].includes($head.node(depth - 1).type.name)) depth--;
+		while (depth > 0 && !["doc", "typedBlock"].includes($head.node(depth - 1).type.name)) depth--;
 		if (depth === 0) return null;
 		const parent = $head.node(depth - 1);
-		const minIndex = parent.type.name === COMPOSITE ? CHROME_COUNT : 0;
+		const minIndex = parent.type.name === "typedBlock" ? CHROME_COUNT : 0;
 		let index = $head.index(depth - 1);
 		while (index >= minIndex && parent.child(index).type.name !== "heading") index--;
 		if (index < minIndex) return null;
@@ -194,10 +195,10 @@ const CHROME_REVOKES = [
 	ABILITY.blockDuplicate
 ];
 const CompositeNode = Node.create({
-	name: COMPOSITE,
+	name: TYPED_BLOCK,
 	priority: 101,
 	group: "block",
-	content: `${TITLE} ${DESCRIPTION} ${TAGS} block+`,
+	content: `${TYPED_BLOCK_TITLE} ${TYPED_BLOCK_DESCRIPTION} ${TYPED_BLOCK_TAGS} block+`,
 	isolating: true,
 	defining: true,
 	editorBlockContainer: true,
@@ -208,12 +209,12 @@ const CompositeNode = Node.create({
 		ABILITY.compositeDerive
 	] },
 	addOptions: () => ({
-		kinds: fallbackCompositeKinds(),
+		blockTypes: fallbackBlockTypes(),
 		baskets: fallbackBaskets()
 	}),
 	addStorage() {
 		return {
-			kinds: this.options.kinds,
+			blockTypes: this.options.blockTypes,
 			baskets: this.options.baskets,
 			expanded: createStore(/* @__PURE__ */ new Set()),
 			revealedTitles: createStore(/* @__PURE__ */ new Set())
@@ -226,22 +227,22 @@ const CompositeNode = Node.create({
 		for (let depth = $head.depth; depth > 0; depth--) {
 			const node = $head.node(depth);
 			const id = node.attrs.id;
-			if (node.type.name !== COMPOSITE || typeof id !== "string" || !id || $head.index(depth) < CHROME_COUNT) continue;
+			if (node.type.name !== "typedBlock" || typeof id !== "string" || !id || $head.index(depth) < CHROME_COUNT) continue;
 			if (derivationOf(node) && !expanded.get().has(id)) (open ??= new Set(expanded.get())).add(id);
 		}
 		if (open) expanded.set(open);
-		if ($head.parent.type.name === TITLE && $head.depth > 0) {
+		if ($head.parent.type.name === "typedBlockTitle" && $head.depth > 0) {
 			const composite = $head.node($head.depth - 1);
 			const id = composite.attrs.id;
-			if (composite.type.name === COMPOSITE && typeof id === "string" && id && titleHiddenOf(composite) && !revealedTitles.get().has(id)) revealedTitles.set(new Set(revealedTitles.get()).add(id));
+			if (composite.type.name === "typedBlock" && typeof id === "string" && id && titleHiddenOf(composite) && !revealedTitles.get().has(id)) revealedTitles.set(new Set(revealedTitles.get()).add(id));
 		}
 	},
-	markdownPrepare: (json, editor) => withReferencedFenceIds(json, compositeKindsOf(editor)),
+	markdownPrepare: (json, editor) => withReferencedFenceIds(json, blockTypesOf(editor)),
 	addAttributes: () => ({
-		kind: {
+		blockType: {
 			default: DEFAULT_KIND,
-			parseHTML: (el) => el.getAttribute("data-kind") || null,
-			renderHTML: (attrs) => ({ "data-kind": attrs.kind })
+			parseHTML: (el) => el.getAttribute("data-block-type") || el.getAttribute(OLD_HTML.blockTypeAttr) || null,
+			renderHTML: (attrs) => ({ "data-block-type": attrs.blockType })
 		},
 		meta: {
 			default: {},
@@ -256,14 +257,18 @@ const CompositeNode = Node.create({
 			renderHTML: (attrs) => ({ "data-meta": JSON.stringify(attrs.meta) })
 		}
 	}),
-	parseHTML: () => [{ tag: "section[data-type=\"composite\"]" }, { tag: "section[data-type=\"section\"]" }],
+	parseHTML: () => [
+		{ tag: `section[data-type="${TYPED_BLOCK}"]` },
+		{ tag: `section[data-type="${OLD_HTML.typedBlock}"]` },
+		{ tag: `section[data-type="${OLD_HTML.earliestBlock}"]` }
+	],
 	renderHTML: ({ HTMLAttributes }) => [
 		"section",
-		mergeAttributes(HTMLAttributes, { "data-type": COMPOSITE }),
+		mergeAttributes(HTMLAttributes, { "data-type": TYPED_BLOCK }),
 		0
 	],
 	renderMarkdown: (node, h) => {
-		const kind = typeof node.attrs?.kind === "string" && node.attrs.kind ? node.attrs.kind : DEFAULT_KIND;
+		const kind = typeof node.attrs?.blockType === "string" && node.attrs.blockType ? node.attrs.blockType : DEFAULT_KIND;
 		const meta = node.attrs?.meta;
 		const body = (node.content ?? []).map((child, index) => h.renderChild?.(child, index) ?? h.renderChildren([child])).filter(Boolean).join("\n\n");
 		const id = node.attrs?.id;
@@ -319,7 +324,7 @@ const CompositeNode = Node.create({
 			insertComposite: (kind = DEFAULT_KIND) => ({ state, tr, dispatch }) => {
 				const { $head } = state.selection;
 				let depth = $head.depth;
-				while (depth > 0 && !["doc", COMPOSITE].includes($head.node(depth - 1).type.name)) depth--;
+				while (depth > 0 && !["doc", "typedBlock"].includes($head.node(depth - 1).type.name)) depth--;
 				let from = $head.pos;
 				let to = from;
 				if (depth > 0) {
@@ -341,16 +346,16 @@ const CompositeNode = Node.create({
 			},
 			wrapInComposite: (kind = DEFAULT_KIND) => ({ state, tr, dispatch }) => {
 				const { $from, $to } = state.selection;
-				const range = $from.blockRange($to, (node) => node.type.name === "doc" || node.type.name === COMPOSITE);
+				const range = $from.blockRange($to, (node) => node.type.name === "doc" || node.type.name === "typedBlock");
 				if (!range) return false;
-				if (range.parent.type.name === COMPOSITE && range.startIndex < CHROME_COUNT) return false;
+				if (range.parent.type.name === "typedBlock" && range.startIndex < CHROME_COUNT) return false;
 				if (!range.parent.canReplaceWith(range.startIndex, range.endIndex, this.type)) return false;
 				if (dispatch) {
 					const { nodes } = state.schema;
-					const composite = this.type.create({ kind }, [
-						nodes[TITLE].create(),
-						nodes[DESCRIPTION].create(),
-						nodes[TAGS].create(),
+					const composite = this.type.create({ blockType: kind }, [
+						nodes[TYPED_BLOCK_TITLE].create(),
+						nodes[TYPED_BLOCK_DESCRIPTION].create(),
+						nodes[TYPED_BLOCK_TAGS].create(),
 						...state.doc.slice(range.start, range.end).content.content
 					]);
 					tr.replaceWith(range.start, range.end, composite);
@@ -358,14 +363,14 @@ const CompositeNode = Node.create({
 				}
 				return true;
 			},
-			setCompositeKind: (kind, pos) => ({ state, tr, dispatch }) => {
+			changeBlockType: (blockTypeId, pos) => ({ state, tr, dispatch }) => {
 				const found = compositeAt(state, pos);
 				if (!found) return false;
 				if (dispatch) {
-					const meta = keptMeta(compositeKind(this.options.kinds, kind), found.node.attrs.meta);
+					const meta = keptMeta(blockTypeOf(this.options.blockTypes, blockTypeId), found.node.attrs.meta);
 					tr.setNodeMarkup(found.pos, void 0, {
 						...found.node.attrs,
-						kind,
+						blockType: blockTypeId,
 						meta
 					});
 				}
@@ -400,9 +405,9 @@ const CompositeNode = Node.create({
 				if (!range) return false;
 				const $pos = state.selection.empty ? state.selection.$head : state.selection.$from;
 				let level = 1;
-				for (let depth = 1; depth <= range.parentDepth; depth++) if ($pos.node(depth).type.name === COMPOSITE) level++;
+				for (let depth = 1; depth <= range.parentDepth; depth++) if ($pos.node(depth).type.name === "typedBlock") level++;
 				const { blocks, from, to } = rangeBlocks(range.parent, range.parentStart, range.fromIndex, range.toIndex);
-				const result = flattenCompositesToHeadings(state.schema, blocks, recursive, level, this.options.kinds);
+				const result = flattenCompositesToHeadings(state.schema, blocks, recursive, level, this.options.blockTypes);
 				if (!result) return false;
 				if (dispatch) {
 					tr.replaceWith(from, to, result);
@@ -417,7 +422,7 @@ const CompositeNode = Node.create({
 			Enter: () => {
 				const { $head } = this.editor.state.selection;
 				const type = $head.parent.type.name;
-				if (type === TITLE || type === DESCRIPTION) {
+				if (type === "typedBlockTitle" || type === "typedBlockDescription") {
 					const depth = $head.depth - 1;
 					const composite = $head.node(depth);
 					const start = $head.start(depth);
@@ -437,14 +442,14 @@ const CompositeNode = Node.create({
 				if (!selection.empty || !$head.parent.isTextblock || $head.parentOffset !== 0 || $head.depth < 2) return false;
 				const depth = $head.depth - 1;
 				const composite = $head.node(depth);
-				if (composite.type.name !== COMPOSITE) return false;
+				if (composite.type.name !== "typedBlock") return false;
 				const titleEnd = $head.start(depth) + composite.child(0).nodeSize - 1;
 				const type = $head.parent.type.name;
-				if (type === DESCRIPTION) return this.editor.commands.command(({ tr }) => {
+				if (type === "typedBlockDescription") return this.editor.commands.command(({ tr }) => {
 					tr.setSelection(TextSelection.create(tr.doc, titleEnd));
 					return true;
 				});
-				if (type === TITLE) {
+				if (type === "typedBlockTitle") {
 					if (!isEmptyComposite(composite)) return true;
 					return this.editor.commands.command(({ tr, state }) => {
 						const from = $head.before(depth);
@@ -464,30 +469,37 @@ const CompositeNode = Node.create({
 				const { selection } = this.editor.state;
 				const { $head } = selection;
 				const type = $head.parent.type.name;
-				return selection.empty && (type === TITLE || type === DESCRIPTION) && $head.parentOffset === $head.parent.content.size;
+				return selection.empty && (type === "typedBlockTitle" || type === "typedBlockDescription") && $head.parentOffset === $head.parent.content.size;
 			},
 			"Mod-Shift-a": () => this.editor.commands.insertComposite(DEFAULT_KIND)
 		};
 	}
 });
 const CompositeTitleNode = Node.create({
-	name: TITLE,
+	name: TYPED_BLOCK_TITLE,
 	priority: 101,
 	content: "inline*",
 	defining: true,
 	editorChrome: true,
 	abilities: { revokes: CHROME_REVOKES },
-	parseHTML: () => [{
-		tag: "h2[data-type=\"composite-title\"]",
-		priority: 60
-	}, {
-		tag: "h2[data-type=\"section-title\"]",
-		priority: 60
-	}],
+	parseHTML: () => [
+		{
+			tag: `h2[data-type="${TITLE_DATA_TYPE}"]`,
+			priority: 60
+		},
+		{
+			tag: `h2[data-type="${OLD_HTML.title}"]`,
+			priority: 60
+		},
+		{
+			tag: `h2[data-type="${OLD_HTML.earliestTitle}"]`,
+			priority: 60
+		}
+	],
 	renderHTML: ({ HTMLAttributes }) => [
 		"h2",
 		mergeAttributes(HTMLAttributes, {
-			"data-type": "composite-title",
+			"data-type": TITLE_DATA_TYPE,
 			class: "composite-title"
 		}),
 		0
@@ -498,22 +510,29 @@ const CompositeTitleNode = Node.create({
 	}
 });
 const CompositeDescriptionNode = Node.create({
-	name: DESCRIPTION,
+	name: TYPED_BLOCK_DESCRIPTION,
 	content: "inline*",
 	defining: true,
 	editorChrome: true,
 	abilities: { revokes: CHROME_REVOKES },
-	parseHTML: () => [{
-		tag: "p[data-type=\"composite-description\"]",
-		priority: 60
-	}, {
-		tag: "p[data-type=\"section-summary\"]",
-		priority: 60
-	}],
+	parseHTML: () => [
+		{
+			tag: `p[data-type="${DESCRIPTION_DATA_TYPE}"]`,
+			priority: 60
+		},
+		{
+			tag: `p[data-type="${OLD_HTML.description}"]`,
+			priority: 60
+		},
+		{
+			tag: `p[data-type="${OLD_HTML.earliestDescription}"]`,
+			priority: 60
+		}
+	],
 	renderHTML: ({ HTMLAttributes }) => [
 		"p",
 		mergeAttributes(HTMLAttributes, {
-			"data-type": "composite-description",
+			"data-type": DESCRIPTION_DATA_TYPE,
 			class: "composite-description"
 		}),
 		0
@@ -524,7 +543,7 @@ const CompositeDescriptionNode = Node.create({
 	}
 });
 const CompositeTagsNode = Node.create({
-	name: TAGS,
+	name: TYPED_BLOCK_TAGS,
 	atom: true,
 	selectable: false,
 	draggable: false,
@@ -547,9 +566,13 @@ const CompositeTagsNode = Node.create({
 		},
 		renderHTML: (attrs) => ({ "data-tags": JSON.stringify(attrs.tags) })
 	} }),
-	parseHTML: () => [{ tag: "div[data-type=\"composite-tags\"]" }, { tag: "div[data-type=\"section-tags\"]" }],
+	parseHTML: () => [
+		{ tag: `div[data-type="${TAGS_DATA_TYPE}"]` },
+		{ tag: `div[data-type="${OLD_HTML.tags}"]` },
+		{ tag: `div[data-type="${OLD_HTML.earliestTags}"]` }
+	],
 	renderHTML: ({ HTMLAttributes }) => ["div", mergeAttributes(HTMLAttributes, {
-		"data-type": "composite-tags",
+		"data-type": TAGS_DATA_TYPE,
 		class: "composite-tags"
 	})],
 	renderMarkdown: (node) => {
@@ -558,6 +581,6 @@ const CompositeTagsNode = Node.create({
 	}
 });
 //#endregion
-export { COMPOSITE_CHROME_COUNT, CompositeDescriptionNode, CompositeNode, CompositeTagsNode, CompositeTitleNode, compositeAround, compositeAt, compositeBasketsOf, compositeJSON, compositeKindsOf };
+export { COMPOSITE_CHROME_COUNT, CompositeDescriptionNode, CompositeNode, CompositeTagsNode, CompositeTitleNode, blockTypesOf, compositeAround, compositeAt, compositeBasketsOf, compositeJSON };
 
 //# sourceMappingURL=nodes.js.map