@contentrain/wp-import 0.9.4 → 0.10.0

package/README.md

@@ -231,6 +231,16 @@ result's `gaps` contains `acf_partial`: groups without REST exposure, options
 pages and fields on post types outside REST are not visible to REST — the
 Bridge reads those.
 
+Options pages arrive from the Bridge as `RawIR.acf_options`. Their fields go to
+the `site` entry, typed and resolved like a post's ACF fields. A name that is a
+core `site` field (`title`, `tagline`, `url`, `language`) or sits on more than
+one options page takes the page's slug as a prefix, without ACF's default
+`acf-options-` (`acf-options-footer` gives `footer_phone`), so no page overwrites
+another. A name that is still taken, say a field literally called `footer_phone`
+on another page, gets a counter (`footer_phone_2`) rather than being dropped; the
+report's `acf_options_renamed` lists each one with its page and field. The
+report's `acf_options` lists each field written.
+
 With an Application Password, post types are read with `context=edit` so their
 `viewable` flag is known: a type that is in REST but not publicly queryable (a
 testimonial post type, say) keeps its content but gets no address (`link` is

package/dist/index.d.mts

@@ -90,6 +90,10 @@ interface ImportReport {
   title_fallback: number;
   meta_fields: Record<string, string>;
   acf_fields: Record<string, string>;
+  /** ACF Options Page fields written to the `site` entry (`field: type`), prefixed `<page>_` on a name clash. */
+  acf_options: Record<string, string>;
+  /** ACF Options Page fields whose name was already taken, written under a counter (`new name: <page slug>.<field>`). */
+  acf_options_renamed: Record<string, string>;
   /** ACF select/checkbox values outside their field's stated choices, left out (`field: count`). */
   acf_outside_choices: Record<string, number>;
   /** ACF date-times written without a zone because the source named none (`timezone_string` / `gmt_offset`). */

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":";;;;UA2BiB,QAAA;EACf,UAAA;IAAc,QAAA;IAAkB,OAAA;IAAiB,MAAA;IAAgB,IAAA;EAAA;EACjE,UAAA;EACA,gBAAA;EACA,MAAA,EAAQ,MAAA;AAAA;AAAA,UAGO,cAAA;EACf,GAAA,EAAK,KAAA;EACL,KAAA,EAAO,QAAA;AAAA;AAAA,iBAiBa,QAAA,CAAS,KAAA,WAAgB,QAAA,EAAU,IAAA;EAAS,IAAA;AAAA,IAAkB,OAAA,CAAQ,cAAA;;;UCnC3E,iBAAA;EACf,MAAA;;EAEA,SAAA,UAAmB,KAAA;EDMI;;;;;;;;ECGvB,IAAA;IAAS,IAAA;IAAc,WAAA;EAAA;EACvB,OAAA;EDAc;AAGhB;;;;ECGE,WAAA;EDFK;;;;ECOL,QAAA;EACA,IAAA;AAAA;AAAA,UAGe,gBAAA;EACf,GAAA,EAAK,KAAA;EACL,QAAA;EDKkF;;;;;;;;ECIlF,UAAA;IAAc,MAAA;IAA0C,SAAA;EAAA;;;AAvC1D;;;;;;;;;;EAoDE,IAAA;AAAA;AAAA,iBA2EoB,cAAA,CAAe,OAAA,EAAS,iBAAA,GAAoB,OAAA,CAAQ,gBAAA;;;UCrHzD,YAAA;EACf,cAAA;EACA,aAAA;EACA,cAAA;EACA,WAAA,EAAa,MAAA;EACb,UAAA,EAAY,MAAA;EFFE;EEId,mBAAA,EAAqB,MAAA;EFPP;EESd,oBAAA;EACA,aAAA;EACA,iBAAA;EACA,MAAA,EAAQ,MAAA;IAAiB,IAAA;IAAc,MAAA;IAAgB,MAAA;IAAgB,OAAA;EAAA;EFNxD;EEQf,OAAA;;EAEA,kBAAA;EFTA;;;;;;EEgBA,yBAAA;EFE4B;;;;EEG5B,kBAAA;AAAA;AAAA,UAGe,iBAAA;EACf,KAAA,EAAO,MAAA;EACP,gBAAA,EAAkB,cAAA;EAClB,MAAA,EAAQ,YAAA;AAAA;AAAA,iBA0CM,gBAAA,CAAiB,GAAA,EAAK,KAAA,EAAO,IAAA;EAAS,SAAA;AAAA,IAAuB,iBAAA;;;;;;AF7E7E;;;iBGbgB,cAAA,CAAe,GAAA,EAAK,KAAA;EAAU,QAAA,EAAU,UAAA;EAAc,QAAA,EAAU,WAAA,CAAY,cAAA;AAAA;AAAA,iBAgB5E,mBAAA,CAAoB,GAAA,EAAK,KAAA,EAAO,OAAA,EAAS,cAAA,EAAgB,IAAA;EAAS,YAAA;AAAA,IAA0B,cAAA;;iBAiB5F,iBAAA,CAAkB,GAAA,EAAK,cAAA,GAAiB,eAAA;;;UC3CvC,iBAAA;EACf,EAAA;EACA,UAAA;EACA,KAAA;EACA,KAAA;AAAA;AAAA,iBAGc,eAAA,CAAgB,CAAA,YAAa,CAAA;AAAA,iBAI7B,cAAA,CAAe,GAAA;;iBAyFf,cAAA,CAAe,CAAA,WAAY,iBAAA;;;cC9F9B,KAAA,GAAS,CAAA;;cAST,KAAA,GAAS,CAAA;;cAcT,KAAA,GAAS,CAAA;;;;;;;;;ALCtB;cK8Ba,UAAA,EAAU,MAAA;;cAIV,WAAA,EAAW,MAAA;;cAOX,UAAA,GAAc,CAAA;AAAA,cAGd,OAAA,GAAW,CAAA;;;;UC3DP,UAAA;EACf,KAAA,EAAO,MAAA;EACP,gBAAA,EAAkB,cAAA;AAAA;AAAA,UAGH,oBAAA;ENOD;EMLd,KAAA,EAAO,eAAA;ENEO;EMAd,KAAA,EAAO,UAAA;ENA0C;EMEjD,QAAA,GAAW,UAAA;ENDX;;;;;EMOA,UAAA;ENFe;;;;EMOf,SAAA;AAAA;AAAA,cAGW,kBAAA;AAAA,cACA,iBAAA;;;ANQb;;;;;;;;;;iBM8NgB,eAAA,CAAgB,KAAA,EAAO,oBAAA,GAAuB,eAAA;;iBAkC9C,uBAAA,CAAwB,IAAA,EAAM,eAAA"}
+{"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

@@ -2135,6 +2135,8 @@ function rawToContentrain(raw, opts) {
 		title_fallback: 0,
 		meta_fields: {},
 		acf_fields: {},
+		acf_options: {},
+		acf_options_renamed: {},
 		acf_outside_choices: {},
 		acf_datetime_unzoned: 0,
 		skipped_types: [],
@@ -2295,6 +2297,20 @@ function rawToContentrain(raw, opts) {
 		const t = postById.get(v);
 		return t && t.status === "publish" && !t.password ? t.link ?? void 0 : void 0;
 	};
+	/** An ACF value as the store holds it: typed by the plan, references resolved; `undefined` = nothing to write. */
+	const acfEntryValue = (k, plan, value) => {
+		const ctx = {
+			timeZone: raw.site.timezone,
+			gmtOffset: raw.site.gmt_offset,
+			dropped: () => {
+				report.acf_outside_choices[k] = (report.acf_outside_choices[k] ?? 0) + 1;
+			},
+			unzoned: () => {
+				report.acf_datetime_unzoned++;
+			}
+		};
+		return plan.def ? acfValue(plan.def, plan.kind === "address" ? addressOf(value) : acfRows(acfScrub(value)), ctx) : acfRefs(plan, value);
+	};
 	const titleOf = (p) => {
 		const t = strip(p.title);
 		if (t) return t;
@@ -2711,17 +2727,7 @@ function rawToContentrain(raw, opts) {
 			for (const [k, acf] of Object.entries(p.acf ?? {})) {
 				const plan = acfFields.get(k);
 				if (!plan || k in e) continue;
-				const ctx = {
-					timeZone: raw.site.timezone,
-					gmtOffset: raw.site.gmt_offset,
-					dropped: () => {
-						report.acf_outside_choices[k] = (report.acf_outside_choices[k] ?? 0) + 1;
-					},
-					unzoned: () => {
-						report.acf_datetime_unzoned++;
-					}
-				};
-				const v = plan.def ? acfValue(plan.def, plan.kind === "address" ? addressOf(acf.value) : acfRows(acfScrub(acf.value)), ctx) : acfRefs(plan, acf.value);
+				const v = acfEntryValue(k, plan, acf.value);
 				if (v !== void 0) e[k] = v;
 			}
 			contentBucket[id] = e;
@@ -2987,6 +2993,58 @@ function rawToContentrain(raw, opts) {
 			metas.comments[cRef(c.id)] = importMeta(c.approved === "1" ? "published" : c.approved === "spam" || c.approved === "trash" ? "archived" : "in_review");
 		}
 	}
+	const siteFields = {
+		title: {
+			type: "string",
+			required: true,
+			label: "Site title",
+			order: 10
+		},
+		tagline: {
+			type: "string",
+			label: "Tagline",
+			order: 20
+		},
+		url: {
+			type: "url",
+			label: "URL",
+			order: 30
+		},
+		language: {
+			type: "string",
+			label: "Language",
+			order: 40
+		}
+	};
+	const optionPages = raw.acf_options ?? [];
+	const pagesOf = /* @__PURE__ */ new Map();
+	for (const page of optionPages) for (const k of Object.keys(page.fields)) pagesOf.set(k, (pagesOf.get(k) ?? 0) + 1);
+	const optionFields = {};
+	const claim = (page, k, want) => {
+		let name = want;
+		for (let n = 2; siteFields[name] || name in optionFields; n++) name = `${want}_${n}`;
+		if (name !== want) report.acf_options_renamed[name] = `${page.slug}.${k}`;
+		optionFields[name] = page.fields[k];
+	};
+	const prefixed = [];
+	for (const page of optionPages) for (const k of Object.keys(page.fields)) if (siteFields[k] || pagesOf.get(k) > 1) prefixed.push([page, k]);
+	else claim(page, k, k);
+	for (const [page, k] of prefixed) claim(page, k, `${page.slug.replace(/^acf-options-(?=.)/, "").replace(/-/g, "_")}_${k}`);
+	const optionPlan = acfPlan([{ acf: optionFields }], (k) => !!siteFields[k]);
+	let so = 40;
+	for (const [k, plan] of optionPlan) {
+		const def = plan.def ?? {
+			type: plan.multiple ? "relations" : "relation",
+			model: plan.models.size > 1 ? [...plan.models].toSorted() : [...plan.models][0]
+		};
+		siteFields[k] = {
+			...def,
+			...def.label ? {} : { label: k },
+			description: def.description ?? "ACF",
+			order: so += 10
+		};
+		report.acf_options[k] = plan.def ? plan.def.type : `${def.type}:${[...plan.models].toSorted().join("|")}`;
+	}
 	addModel({
 		id: "site",
 		name: "Site",
@@ -2994,29 +3052,7 @@ function rawToContentrain(raw, opts) {
 		domain: "site",
 		i18n: false,
 		title_field: "title",
-		fields: {
-			title: {
-				type: "string",
-				required: true,
-				label: "Site title",
-				order: 10
-			},
-			tagline: {
-				type: "string",
-				label: "Tagline",
-				order: 20
-			},
-			url: {
-				type: "url",
-				label: "URL",
-				order: 30
-			},
-			language: {
-				type: "string",
-				label: "Language",
-				order: 40
-			}
-		}
+		fields: siteFields
 	});
 	siteEntry = pick({
 		title: strip(raw.site.title),
@@ -3029,6 +3065,10 @@ function rawToContentrain(raw, opts) {
 		"url",
 		"language"
 	]));
+	for (const [k, plan] of optionPlan) {
+		const v = acfEntryValue(k, plan, optionFields[k].value);
+		if (v !== void 0) siteEntry[k] = v;
+	}
 	siteMeta = importMeta("published");
 	report.site_title_missing = !siteEntry.title;
 	const vocabTerms = {};