@eldrajs/theme-vue 0.1.0 → 0.2.0

package/CHANGELOG.md

@@ -5,6 +5,13 @@ Release-please writes the generated notes from commit messages and does not repl
 
 ## Unreleased
 
+- `getBlockSchemaApiId(entry)` returns the **bare** block id for an entry whose `schemaApiId` (or
+  `schema.apiId`) is Core's `<themeId>:<apiId>`, stripping the theme's own id (the manifest's
+  `theme.id`, from `virtual:eldra/manifest`) and nothing else, so `blockImports`,
+  `data-eldra-schema` and the slot catalog stay keyed by the id `block.json` declares. The preview's
+  `editor:content-update` draft schema ids are normalised the same way. `virtual:eldra/manifest`
+  now types `theme.id`; a test mock should carry one.
+
 - `EldraContext` gains `messages` (reactive `{ defaultLocale, locales }`, flat dotted keys): the
   theme's resolved message catalogue, defaulting to the fallback catalogue
   (`{ defaultLocale: 'en-US', locales: {} }`) in `provideEldra()` (a new optional `messages` option

package/dist/index.d.ts

@@ -224,7 +224,13 @@ export declare function useEldraLink(): (value: unknown) => ResolvedLink$1 | nul
 export declare function useEldraLocale(): EldraLocaleState;
 //#endregion
 //#region src/EldraBlockZone.d.ts
-/** Resolve the schema API id across both supported gateway response shapes. */
+/**
+ * Resolve a block entry's **bare** block apiId across both supported gateway
+ * response shapes. Core spells a theme's block schema `<themeId>:<apiId>` on
+ * the wire; the theme's own id is stripped here (and only its own), so
+ * `blockImports`, `data-eldra-schema`, the slot catalog and the overlay all
+ * keep speaking the bare id `block.json` declares.
+ */
 export declare function getBlockSchemaApiId(entry: EntryDoc): string | null;
 export declare const EldraBlockZone: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
   blocks: {

package/dist/index.js

@@ -1,6 +1,6 @@
 import { Fragment, computed, defineAsyncComponent, defineComponent, h, inject, nextTick, onBeforeUnmount, onMounted, onUpdated, provide, reactive, readonly, ref, shallowRef, toValue, watch, watchEffect } from "vue";
 import { EMPTY_THEME_MESSAGES, sanitizeLocaleMessages } from "@eldrajs/theme-core/i18n";
-import { DEFAULT_IMAGE_FRAMING, DEFAULT_LAYOUT_BREAKPOINTS, buildRichTextTree, buildRichTextTree as buildRichTextTree$1, buildTemplateBlockRenames, createLayoutRenderModel, createReusableLayoutRenderModel, createTemplateLayoutRenderModel, designTokenRevisionHash, generateDesignTokenCss, hiddenLayoutBreakpoints, imageFramingAttrs, imageFramingStyle, isBlockFieldLocalized, isBlockFieldLocalized as isBlockFieldLocalized$1, layoutIdentityOf, normalizeImageFraming, normalizeThemeDesignTokens, projectEntryDataLocale, registerBlockFields, restampRichTextPositions, safeHref } from "@eldrajs/theme-core";
+import { DEFAULT_IMAGE_FRAMING, DEFAULT_LAYOUT_BREAKPOINTS, blockApiIdOf, buildRichTextTree, buildRichTextTree as buildRichTextTree$1, buildTemplateBlockRenames, createLayoutRenderModel, createReusableLayoutRenderModel, createTemplateLayoutRenderModel, designTokenRevisionHash, generateDesignTokenCss, hiddenLayoutBreakpoints, imageFramingAttrs, imageFramingStyle, isBlockFieldLocalized, isBlockFieldLocalized as isBlockFieldLocalized$1, layoutIdentityOf, normalizeImageFraming, normalizeThemeDesignTokens, projectEntryDataLocale, registerBlockFields, restampRichTextPositions, safeHref } from "@eldrajs/theme-core";
 import { linkTargetKeys, resolveLink, resolveLink as resolveLink$1, safeLinkHref } from "@eldrajs/theme-core/links";
 import blockImports from "virtual:eldra/blocks";
 import themeManifest from "virtual:eldra/manifest";
@@ -151,12 +151,20 @@ function useEldraLocale() {
 const INERT = createEldraLocaleState();
 //#endregion
 //#region src/EldraBlockZone.ts
-/** Resolve the schema API id across both supported gateway response shapes. */
+/** This theme's own id, injected at build as the manifest's `theme.id`. */
+const THEME_ID = themeManifest.theme?.id;
+/**
+* Resolve a block entry's **bare** block apiId across both supported gateway
+* response shapes. Core spells a theme's block schema `<themeId>:<apiId>` on
+* the wire; the theme's own id is stripped here (and only its own), so
+* `blockImports`, `data-eldra-schema`, the slot catalog and the overlay all
+* keep speaking the bare id `block.json` declares.
+*/
 function getBlockSchemaApiId(entry) {
 	const direct = entry.schemaApiId;
-	if (typeof direct === "string") return direct;
+	if (typeof direct === "string") return blockApiIdOf(direct, THEME_ID);
 	const schema = entry.schema;
-	if (typeof schema === "object" && schema !== null && typeof schema.apiId === "string") return schema.apiId;
+	if (typeof schema === "object" && schema !== null && typeof schema.apiId === "string") return blockApiIdOf(schema.apiId, THEME_ID);
 	return null;
 }
 const componentCache = /* @__PURE__ */ new Map();
@@ -882,7 +890,7 @@ function startEldraPreview(context, opts) {
 					overlay.acceptExternalUpdate(entries.map(({ entryId }) => entryId));
 					for (const update of entries) {
 						context.preview.sourceDrafts[update.entryId] = update.draftDoc;
-						context.preview.draftSchemaApiIds[update.entryId] = update.schemaApiId;
+						context.preview.draftSchemaApiIds[update.entryId] = blockApiIdOf(update.schemaApiId, themeManifest.theme?.id);
 					}
 					projectDrafts(context);
 					context.preview.refreshRevision += 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eldrajs/theme-vue",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Vue 3 bindings for the Eldra theme SDK: block zones, layouts, rich text and the Studio preview composables over @eldrajs/theme-core.",
   "keywords": [
     "cms",
@@ -36,7 +36,7 @@
     "provenance": true
   },
   "dependencies": {
-    "@eldrajs/theme-core": "^0.1.0"
+    "@eldrajs/theme-core": "^0.2.0"
   },
   "devDependencies": {
     "@vue/test-utils": "^2.4.6",