@acms-subir/core 0.3.4 → 0.3.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @acms-subir/core
 
+## 0.3.5
+
+### Patch Changes
+
+- Require an old-site address or content ZIP for Ghost exports with relative asset references. Failed copies retain only absolute source URLs; unavailable sources leave empty references and named failures in the import report instead of broken URLs on the new site. Correct the import warnings to describe these outcomes.
+
 ## 0.3.4
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acms-subir/core",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "publishConfig": {
     "access": "public"
   },

package/src/components/import/ImportExport.tsx

@@ -98,7 +98,7 @@ function ImportTab({ onFinished, openHistory }: { onFinished: () => void; openHi
   const key = planKeyFor(options);
   const stale = !!plan && planKey !== key;
   const assetFiles = bundle ? bundle.assets.filter((a) => a.kind !== 'media').length : 0;
-  const needsFiles = isGhost && assetFiles > 0 && !siteUrl.trim() && !contentZip && !source?.zip;
+  const needsFiles = isGhost && !!bundle?.assets.some((a) => !/^https?:\/\//i.test(a.url)) && !siteUrl.trim() && !contentZip && !source?.zip;
   const resumable = source ? readJournal(source.hash) : null;
   const toImport = plan ? plan.counts.posts.create + plan.counts.posts.update + plan.counts.pages.create + plan.counts.pages.update : 0;
 
@@ -198,7 +198,7 @@ function ImportTab({ onFinished, openHistory }: { onFinished: () => void; openHi
                   <span className="btn sm">{contentZip ? 'Change ZIP' : 'Add content folder ZIP'}</span>
                   <span className="hint">{contentZip ? `${contentZip.name} · ${plural(contentZip.zip.names.length, 'file')}` : 'Optional. Used first; the address is the fallback.'}</span>
                 </label>
-                {needsFiles && <p className="imp-mark warn">Without an address or ZIP, images will point at the old site and break when it goes away.</p>}
+                {needsFiles && <p className="imp-mark warn">Enter the old site’s address or add its content folder ZIP before importing. Missing files without a source URL are left empty and listed in the report.</p>}
               </div>
             )}
 
@@ -252,7 +252,7 @@ function ImportTab({ onFinished, openHistory }: { onFinished: () => void; openHi
             <div className="imp-actions">
               <button type="button" className="btn" disabled={!!busy} onClick={check}>{busy === 'plan' ? 'Checking…' : plan ? 'Check again' : 'Check import'}</button>
               {plan && (
-                <button type="button" className="btn primary" disabled={!!busy || stale || toImport === 0} onClick={run} title={stale ? 'Options changed: check again first' : ''}>
+                <button type="button" className="btn primary" disabled={!!busy || stale || needsFiles || toImport === 0} onClick={run} title={stale ? 'Options changed: check again first' : ''}>
                   {busy === 'run' ? 'Importing…' : resumable?.runId ? `Resume import` : `Import ${plural(toImport, 'item')}`}
                 </button>
               )}
@@ -341,7 +341,7 @@ function Done({ report, reset, openHistory }: { report: Report; reset: () => voi
       )}
       {!!report.failedAssets?.length && (
         <>
-          <p className="imp-mark warn">{plural(report.failedAssets.length, 'file')} couldn’t be copied and still point at the old site</p>
+          <p className="imp-mark warn">{plural(report.failedAssets.length, 'file')} couldn’t be copied. Source URLs are kept when available; otherwise the references are left empty.</p>
           <ul className="imp-list">{report.failedAssets.map((f, i) => <li key={i}>{f.url}<small>{f.error}</small></li>)}</ul>
         </>
       )}

package/src/components/import/runner.ts

@@ -101,8 +101,14 @@ export function findInZip(zip: ZipIndex, path: string): string | null {
 }
 
 export function sourceAssetUrl(bundle: ImportBundle, asset: ImportAsset): string {
-  if (/^https?:\/\//.test(asset.url)) return asset.url;
-  return bundle.source.siteUrl ? `${bundle.source.siteUrl.replace(/\/+$/, '')}/${asset.url}` : `/${asset.url}`;
+  // A ZIP path is not a URL on the destination site. Only an absolute
+  // source URL is safe to retain when copying fails.
+  try {
+    const url = /^[a-z][a-z\d+.-]*:/i.test(asset.url)
+      ? new URL(asset.url)
+      : new URL(asset.url.replace(/^\/+/, ''), `${bundle.source.siteUrl.replace(/\/+$/, '')}/`);
+    return ['http:', 'https:'].includes(url.protocol) ? url.href : '';
+  } catch { return ''; }
 }
 
 async function fetchAsset(bundle: ImportBundle, asset: ImportAsset, contentZip: ZipIndex | null): Promise<File> {
@@ -170,6 +176,10 @@ export async function runImport(
   const journal: Journal = readJournal(hash) ?? { runId: '', assets: {}, failed: {}, done: [], authorIds: {} };
   const save = () => writeJournal(hash, journal);
 
+  if (source.kind === 'ghost' && !files && bundle.assets.some((a) => !journal.assets[a.ref] && !sourceAssetUrl(bundle, a))) {
+    throw new Error('This Ghost export references images or files. Enter the old site’s address or add its content folder ZIP before importing.');
+  }
+
   // 1. files → media library
   const assets = bundle.assets.filter((a) => a.kind !== 'media');
   const total = assets.length + bundle.media.length;
@@ -214,6 +224,13 @@ export async function runImport(
 
   const resolved = new Map(Object.entries(journal.assets).map(([ref, r]) => [ref, r]));
   const fallback = new Map(bundle.assets.map((a) => [a.ref, sourceAssetUrl(bundle, a)]));
+  // Video/audio are not copied yet, but missing source URLs still need to
+  // be reported instead of quietly turning into destination-relative URLs.
+  for (const a of bundle.assets.filter((a) => a.kind === 'media')) {
+    if (!resolved.has(a.ref) && !fallback.get(a.ref)) {
+      journal.failed[a.ref] = 'Video/audio cannot be copied yet. Enter the old site’s address to keep its source URL.';
+    } else delete journal.failed[a.ref];
+  }
   const fix = (v: string) => resolveAssets(v, resolved, fallback);
 
   // 2. run + authors + tags; only people with a byline become authors
@@ -261,7 +278,7 @@ export async function runImport(
   const identity = Object.fromEntries(Object.entries(bundle.identity).map(([k, v]) => [k, typeof v === 'string' ? fix(v) : v]));
   const failedAssets = Object.entries(journal.failed).map(([ref, error]) => {
     const a = bundle.assets.find((x) => x.ref === ref);
-    return { url: a ? sourceAssetUrl(bundle, a) : ref.replace(/^m-/, 'media '), error };
+    return { url: a ? sourceAssetUrl(bundle, a) || a.url : ref.replace(/^m-/, 'media '), error };
   });
   const { report } = await api<{ report: Record<string, unknown> }>({
     op: 'finish', runId: journal.runId, options, identity,

package/src/lib/import/bundle.ts

@@ -146,7 +146,8 @@ export const assetPlaceholder = (ref: string) => `${ASSET_SCHEME}${ref}`;
 // Swap every acms-asset:<ref> for its re-hosted URL. <img> tags built by the
 // importers carry only src/alt/width/height, so images that gained responsive
 // variants get srcset/sizes added here. Unresolved refs (a failed download)
-// fall back to the original URL, which is reported separately.
+// fall back to an absolute source URL, or an empty string if none is known.
+// Copy failures are reported separately by the runner.
 export interface ResolvedAsset { url: string; srcset?: string; sizes?: string }
 const PLACEHOLDER_RE = /acms-asset:([a-z0-9-]{1,40})/g;
 export function resolveAssets(value: string, resolved: Map<string, ResolvedAsset>, fallback: Map<string, string>): string {