@contentrain/wp-import 0.11.24 → 0.11.26

package/dist/index.d.mts

@@ -114,6 +114,10 @@ interface ImportReport {
   acf_outside_choices: Record<string, number>;
   /** ACF date-times written without a zone because the source named none (`timezone_string` / `gmt_offset`). */
   acf_datetime_unzoned: number;
+  /** ACF image/file values that were an attachment id the export does not hold, left out (`field: count`). */
+  acf_media_unknown: Record<string, number>;
+  /** Self-closing (server-rendered) Gutenberg blocks dropped from post bodies with nothing to keep: `block name: count`. */
+  blocks_dynamic_dropped: Record<string, number>;
   skipped_types: string[];
   dropped_relations: number;
   models: Record<string, {

package/dist/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","names":[],"sources":["../src/wxr.ts","../src/rest.ts","../src/contentrain.ts","../src/comments.ts","../src/php-unserialize.ts","../src/core.ts","../src/delta.ts"],"mappings":"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"}
+{"version":3,"file":"index.d.mts","names":[],"sources":["../src/wxr.ts","../src/rest.ts","../src/contentrain.ts","../src/comments.ts","../src/php-unserialize.ts","../src/core.ts","../src/delta.ts"],"mappings":"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"}

package/dist/index.mjs

@@ -931,7 +931,16 @@ function acfValue(def, value, ctx = {}) {
 	switch (def.type) {
 		case "image":
 		case "file":
-		case "video": return isAttachment(value) ? value.url : typeof value === "string" ? value : void 0;
+		case "video": {
+			if (isAttachment(value)) return value.url;
+			const id = typeof value === "number" ? value : typeof value === "string" && /^\d+$/.test(value.trim()) ? Number(value) : null;
+			if (id !== null) {
+				const url = ctx.mediaUrl?.(id);
+				if (!url) ctx.unknownMedia?.(value);
+				return url;
+			}
+			return typeof value === "string" ? value : void 0;
+		}
 		case "date": return ymd(value) ?? (typeof value === "string" ? value : void 0);
 		case "datetime": {
 			const local = dt(value);
@@ -2115,6 +2124,24 @@ async function fetchRestRawIR(options) {
 	};
 }
 //#endregion
+//#region src/blocks.ts
+/**
+* A post body without Gutenberg's block delimiters (`<!-- wp:paragraph -->`, `<!-- /wp:paragraph -->`,
+* `<!-- wp:image {...} /-->`). Only the delimiters go (with the line break that ends them); the markup
+* inside every block stays, and so does any other comment. Block attributes are read from the delimiters
+* before this (menus, navigation), never from the stored body.
+*
+* A self-closing block (`<!-- wp:latest-posts /-->`, `<!-- wp:block {"ref":12} /-->`) holds no markup: WordPress
+* renders it on the server, so nothing of it survives. `onDynamic` hears its name (as written, `core/` omitted)
+* so the loss can be reported.
+*/
+function stripBlockDelimiters(content, onDynamic) {
+	return content.replace(new RegExp(`${BLOCK_TOKEN.source}\\r?\\n?`, "g"), (_all, closer, ns, local, _json, selfClose) => {
+		if (selfClose && !closer) onDynamic?.(`${ns ?? ""}${local}`);
+		return "";
+	});
+}
+//#endregion
 //#region src/contentrain.ts
 const utf8Length = (s) => new TextEncoder().encode(s).length;
 /** `s` cut on a code-point boundary to at most `max` UTF-8 bytes, without a trailing hyphen. */
@@ -2197,6 +2224,8 @@ function rawToContentrain(raw, opts) {
 		acf_options_renamed: {},
 		acf_outside_choices: {},
 		acf_datetime_unzoned: 0,
+		acf_media_unknown: {},
+		blocks_dynamic_dropped: {},
 		skipped_types: [],
 		dropped_relations: 0,
 		models: {},
@@ -2289,6 +2318,7 @@ function rawToContentrain(raw, opts) {
 			ref: hexId(identityOwner.get(key) === canonical ? key : `${mid}:wp:${canonical}`)
 		});
 	}
+	const attachmentUrl = new Map(raw.attachments.map((a) => [a.id, a.url]));
 	const mediaRef = (id) => raw.attachments.some((a) => a.id === id) ? hexId(`media:${id}`) : null;
 	const termById = new Map(raw.terms.map((t) => [t.id, t]));
 	const authorById = new Map(raw.authors.filter((a) => a.id !== null).map((a) => [a.id, a]));
@@ -2410,6 +2440,10 @@ function rawToContentrain(raw, opts) {
 			},
 			unzoned: () => {
 				report.acf_datetime_unzoned++;
+			},
+			mediaUrl: (id) => attachmentUrl.get(id) ?? void 0,
+			unknownMedia: () => {
+				report.acf_media_unknown[k] = (report.acf_media_unknown[k] ?? 0) + 1;
 			}
 		};
 		return plan.def ? acfValue(plan.def, plan.kind === "address" ? addressOf(value) : acfRows(acfScrub(value)), ctx) : acfRefs(plan, value);
@@ -2801,7 +2835,9 @@ function rawToContentrain(raw, opts) {
 				wp_id: p.id
 			};
 			if (fields.excerpt) e.excerpt = strip(p.excerpt);
-			if (fields.body) e.body = p.content;
+			if (fields.body) e.body = stripBlockDelimiters(p.content, (name) => {
+				report.blocks_dynamic_dropped[name] = (report.blocks_dynamic_dropped[name] ?? 0) + 1;
+			});
 			if (fields.published_at && p.date) e.published_at = p.date;
 			if (p.modified) e.modified_at = p.modified;
 			if (p.link) e.link = p.link;