@heliosgraphics/epoque 0.0.1-alpha.1 → 0.0.1-alpha.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@heliosgraphics/epoque",
-	"version": "0.0.1-alpha.1",
+	"version": "0.0.1-alpha.3",
 	"author": "Chris Puska <chris@puska.org>",
 	"description": "sync a local folder",
 	"type": "module",

package/src/sync.ts

@@ -35,10 +35,25 @@ const EMPTY_SUMMARY: SyncSummary = {
 const isUuid = (value: string): boolean =>
 	/^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(value)
 
+const TIMEZONE_PATTERN: RegExp = /[zZ]|[+-]\d{2}:?\d{2}$/
+const TIME_PATTERN: RegExp = /T|\d{2}:\d{2}/
+
+const parseRemoteTime = (value: string | null | undefined): number | null => {
+	const trimmed = value?.trim()
+	if (!trimmed) return null
+
+	const normalized = TIME_PATTERN.test(trimmed) ? trimmed.replace(" ", "T") : `${trimmed}T00:00:00`
+	const withTimezone = TIMEZONE_PATTERN.test(normalized) ? normalized : `${normalized}Z`
+	const parsed = Date.parse(withTimezone)
+
+	return Number.isNaN(parsed) ? null : parsed
+}
+
 const isAfter = (left: string | null | undefined, right: string | null | undefined): boolean => {
-	if (!left || !right) return false
+	const leftTime = parseRemoteTime(left)
+	const rightTime = parseRemoteTime(right)
 
-	return new Date(left).getTime() > new Date(right).getTime()
+	return leftTime !== null && rightTime !== null && leftTime > rightTime
 }
 
 const getCollectionSearchTerms = (input: string): Array<string> => {
@@ -107,7 +122,7 @@ const getLocalById = (articles: Array<LocalArticle>): Map<string, LocalArticle>
 const getRemoteById = (archive: RemoteArchive): Map<string, RemoteArticle> =>
 	new Map(archive.articles.map((article) => [article.id, article]))
 
-const assertNoUpstreamChanges = ({
+const getUpstreamConflicts = ({
 	archive,
 	config,
 	localArticles,
@@ -115,7 +130,7 @@ const assertNoUpstreamChanges = ({
 	archive: RemoteArchive
 	config: ProjectConfig
 	localArticles: Array<LocalArticle>
-}): void => {
+}): Array<string> => {
 	const conflicts: Array<string> = []
 	const localById = getLocalById(localArticles)
 
@@ -147,9 +162,24 @@ const assertNoUpstreamChanges = ({
 		}
 	}
 
-	if (conflicts.length) {
-		throw new Error(`sync aborted because upstream is newer:\n${conflicts.map((conflict) => `- ${conflict}`).join("\n")}`)
-	}
+	return conflicts
+}
+
+const formatUpstreamConflicts = (conflicts: Array<string>): string =>
+	`remote has newer changes:\n${conflicts.map((conflict) => `- ${conflict}`).join("\n")}`
+
+const isConfirmed = (value: string): boolean => ["y", "yes"].includes(value.trim().toLowerCase())
+
+const confirmUpstreamOverride = async ({ dryRun, prompt }: SyncOptions, conflicts: Array<string>): Promise<boolean> => {
+	if (!conflicts.length) return false
+
+	const question = dryRun
+		? `${formatUpstreamConflicts(conflicts)}\nContinue dry run using local folder as source of truth? [y/N] `
+		: `${formatUpstreamConflicts(conflicts)}\nOverride remote changes with local folder? [y/N] `
+
+	if (isConfirmed(await prompt(question))) return true
+
+	throw new Error(`sync aborted because upstream is newer`)
 }
 
 const getUpdateBody = (article: LocalArticle): Record<string, unknown> => ({
@@ -176,18 +206,32 @@ const syncAttachments = async ({
 	api,
 	article,
 	dryRun,
+	overwriteUpstream,
+	remoteArticle,
 	state,
 	summary,
 }: {
 	api: EpoqueApi
 	article: LocalArticle
 	dryRun: boolean
+	overwriteUpstream: boolean
+	remoteArticle: RemoteArticle | undefined
 	state: ArticleSyncState
 	summary: SyncSummary
 }): Promise<ArticleSyncState> => {
 	const nextState: ArticleSyncState = { ...state, attachments: {} }
 	const localPaths = new Set(article.attachments.map((attachment) => attachment.relativePath))
 	const imageIds: Array<string> = []
+	const trackedImageIds = new Set(Object.values(state.attachments).map((attachment) => attachment.id))
+
+	if (overwriteUpstream && remoteArticle) {
+		for (const image of remoteArticle.images) {
+			if (trackedImageIds.has(image.id)) continue
+
+			summary.deletedAttachments += 1
+			if (!dryRun) await api.deleteAttachment(image.url)
+		}
+	}
 
 	for (const attachment of article.attachments) {
 		const existing = state.attachments[attachment.relativePath]
@@ -236,14 +280,20 @@ export const syncFolder = async (options: SyncOptions): Promise<SyncSummary> =>
 	const remoteById = getRemoteById(archive)
 	const localById = getLocalById(localArticles)
 	const summary: SyncSummary = { ...EMPTY_SUMMARY }
+	const overwriteUpstream = await confirmUpstreamOverride(options, getUpstreamConflicts({ archive, config, localArticles }))
+
+	for (const remoteArticle of archive.articles) {
+		if (localById.has(remoteArticle.id)) continue
+		if (!overwriteUpstream && !config.articles[remoteArticle.id]) continue
 
-	assertNoUpstreamChanges({ archive, config, localArticles })
+		summary.deletedArticles += 1
+		if (!options.dryRun) await options.api.deleteArticle(remoteArticle.id)
+		delete config.articles[remoteArticle.id]
+	}
 
 	for (const articleId of Object.keys(config.articles)) {
-		if (localById.has(articleId) || !remoteById.has(articleId)) continue
+		if (localById.has(articleId) || remoteById.has(articleId)) continue
 
-		summary.deletedArticles += 1
-		if (!options.dryRun) await options.api.deleteArticle(articleId)
 		delete config.articles[articleId]
 	}
 
@@ -281,6 +331,8 @@ export const syncFolder = async (options: SyncOptions): Promise<SyncSummary> =>
 			api: options.api,
 			article: localArticle,
 			dryRun: options.dryRun,
+			overwriteUpstream,
+			remoteArticle,
 			state: { ...state, file: localArticle.file, remoteUpdatedAt: remoteArticle?.updatedAt ?? state.remoteUpdatedAt },
 			summary,
 		})