@heliosgraphics/epoque 0.0.1-alpha.2 → 0.0.1-alpha.4

package/package.json

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

package/src/cli.ts

@@ -2,15 +2,22 @@
 
 import { createInterface } from "node:readline/promises"
 import { stdin as input, stdout as output } from "node:process"
+import { resolve } from "node:path"
 import { EpoqueApi } from "./api"
 import { getApiKey, normalizeOrigin, readGlobalConfig, writeGlobalConfig } from "./config"
 import { syncFolder } from "./sync"
 
 const HELP = `Usage:
   epoque login
-  epoque sync [--dry-run]
+  epoque sync [folder] [--dry-run] [--collection id]
 `
 
+interface SyncArgs {
+	cwd: string
+	dryRun: boolean
+	collectionId?: string
+}
+
 const promptLine = async (question: string): Promise<string> => {
 	const readline = createInterface({ input, output })
 
@@ -68,7 +75,44 @@ const promptSecret = async (question: string): Promise<string> => {
 	})
 }
 
-const hasFlag = (args: Array<string>, name: string): boolean => args.includes(name)
+const parseSyncArgs = (args: Array<string>): SyncArgs => {
+	let target: string | undefined
+	let collectionId: string | undefined
+	let dryRun: boolean = false
+
+	for (let index = 0; index < args.length; index++) {
+		const arg = args[index]
+
+		if (arg === "--dry-run") {
+			dryRun = true
+			continue
+		}
+
+		if (arg === "--collection") {
+			collectionId = args[index + 1]?.trim()
+			if (!collectionId) throw new Error("--collection requires a collection id")
+			index += 1
+			continue
+		}
+
+		if (arg.startsWith("--collection=")) {
+			collectionId = arg.slice("--collection=".length).trim()
+			if (!collectionId) throw new Error("--collection requires a collection id")
+			continue
+		}
+
+		if (arg.startsWith("--")) throw new Error(`unknown option: ${arg}`)
+
+		if (target) throw new Error(`unexpected argument: ${arg}`)
+		target = arg
+	}
+
+	return {
+		collectionId,
+		cwd: target ? resolve(process.cwd(), target) : process.cwd(),
+		dryRun,
+	}
+}
 
 const login = async (): Promise<void> => {
 	const origin = normalizeOrigin(undefined)
@@ -85,7 +129,7 @@ const login = async (): Promise<void> => {
 }
 
 const sync = async (args: Array<string>): Promise<void> => {
-	const cwd = process.cwd()
+	const { collectionId, cwd, dryRun } = parseSyncArgs(args)
 	const origin = normalizeOrigin(undefined)
 	const apiKey = await getApiKey()
 
@@ -93,8 +137,9 @@ const sync = async (args: Array<string>): Promise<void> => {
 
 	const summary = await syncFolder({
 		api: new EpoqueApi({ apiKey, origin }),
+		collectionId,
 		cwd,
-		dryRun: hasFlag(args, "--dry-run"),
+		dryRun,
 		origin,
 		prompt: promptLine,
 	})

package/src/sync.ts

@@ -10,6 +10,7 @@ export interface SyncOptions {
 	cwd: string
 	origin: string
 	api: EpoqueApi
+	collectionId?: string
 	dryRun: boolean
 	prompt: Prompt
 }
@@ -35,10 +36,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> => {
@@ -82,12 +98,12 @@ const resolveCollectionId = async ({ api, prompt }: { api: EpoqueApi; prompt: Pr
 	return collection.id
 }
 
-const ensureProjectConfig = async ({ api, cwd, dryRun, origin, prompt }: SyncOptions): Promise<ProjectConfig> => {
+const ensureProjectConfig = async ({ api, collectionId, cwd, dryRun, origin, prompt }: SyncOptions): Promise<ProjectConfig> => {
 	const existing = await readProjectConfig(cwd)
-	if (existing) return { ...existing, origin }
+	if (existing && (!collectionId || collectionId === existing.collectionId)) return { ...existing, origin }
 
-	const collectionId = await resolveCollectionId({ api, prompt })
-	const config = createProjectConfig({ collectionId, origin })
+	const resolvedCollectionId = collectionId ?? (await resolveCollectionId({ api, prompt }))
+	const config = createProjectConfig({ collectionId: resolvedCollectionId, origin })
 
 	if (!dryRun) await writeProjectConfig(cwd, config)
 
@@ -286,6 +302,12 @@ export const syncFolder = async (options: SyncOptions): Promise<SyncSummary> =>
 		let articleId = localArticle.id
 		let remoteArticle = articleId ? remoteById.get(articleId) : undefined
 
+		if (articleId && !remoteArticle) {
+			delete config.articles[articleId]
+			articleId = null
+			if (!options.dryRun) localArticle.id = null
+		}
+
 		if (!articleId) {
 			summary.createdArticles += 1