@mulmoclaude/core 1.0.1 → 1.2.1

package/dist/google/index.js

@@ -1,34 +1,26 @@
-import { t as errorMessage } from "../errors-eid6Mes3.js";
+import { t as errorMessage } from "../dist-Cwk0e12G.js";
 import { t as truncate } from "../text-CjDbP2O1.js";
-import { et as getWorkspaceRoot, n as discoverCollections, u as storeFor } from "../discovery-BYIsLqag.js";
-import path, { join } from "node:path";
+import { t as writeFileAtomic } from "../atomic-DPpdrJzO.js";
+import { fetchWithTimeout } from "../utils/fetch.js";
+import { J as getWorkspaceRoot, d as storeFor, et as createForwardingLogger, n as discoverCollections, tt as createHostSlot } from "../discovery-CKR4TOX3.js";
 import { promises } from "node:fs";
-import { constants, copyFile, mkdir, readFile, readdir, rm, stat } from "node:fs/promises";
+import path, { join } from "node:path";
 import { randomBytes } from "node:crypto";
+import { constants, copyFile, mkdir, readFile, readdir, rm, stat } from "node:fs/promises";
 import { homedir } from "node:os";
 import { MISSED_RUN_POLICIES, SCHEDULE_TYPES } from "@receptron/task-scheduler";
 import http from "node:http";
 import { CodeChallengeMethod, OAuth2Client } from "google-auth-library";
 //#region src/google/host.ts
-var hostLog = {
-	error: () => void 0,
-	warn: () => void 0,
-	info: () => void 0,
-	debug: () => void 0
-};
+var hostSlot = createHostSlot("@mulmoclaude/core/google: configureGoogleHost()");
 function configureGoogleHost(binding) {
-	hostLog = binding.log;
+	hostSlot.set(binding.log);
 }
-var log = {
-	error: (prefix, message, data) => hostLog.error(prefix, message, data),
-	warn: (prefix, message, data) => hostLog.warn(prefix, message, data),
-	info: (prefix, message, data) => hostLog.info(prefix, message, data),
-	debug: (prefix, message, data) => hostLog.debug(prefix, message, data)
-};
+var log = createForwardingLogger(() => hostSlot.peek());
 //#endregion
 //#region src/google/datetime.ts
 var ISO_DATE_TIME_WITH_OFFSET_RE = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(?:Z|[+-](\d{2}):(\d{2}))$/;
-var FRACTIONAL_SECONDS_RE = /\.\d+(?=Z|[+-])/;
+var FRACTIONAL_SECONDS_RE$1 = /\.\d+(?=Z|[+-])/;
 var MAX_HOUR = 23;
 var MAX_MINUTE = 59;
 var MAX_SECOND = 59;
@@ -37,7 +29,7 @@ var isRealCalendarDate = (year, month, day) => {
 	return roundTrip.getUTCFullYear() === year && roundTrip.getUTCMonth() === month - 1 && roundTrip.getUTCDate() === day;
 };
 var isIsoDateTimeWithOffset = (value) => {
-	const match = ISO_DATE_TIME_WITH_OFFSET_RE.exec(value.replace(FRACTIONAL_SECONDS_RE, ""));
+	const match = ISO_DATE_TIME_WITH_OFFSET_RE.exec(value.replace(FRACTIONAL_SECONDS_RE$1, ""));
 	if (!match) return false;
 	const [year = 0, month = 0, day = 0, hour = 0, minute = 0, second = 0] = match.slice(1, 7).map(Number);
 	const timeInRange = hour <= MAX_HOUR && minute <= MAX_MINUTE && second <= MAX_SECOND;
@@ -114,6 +106,7 @@ async function loadClientSecret(home) {
 }
 //#endregion
 //#region src/google/fsJson.ts
+var JSON_INDENT = 2;
 async function readJsonOrNull(filePath) {
 	try {
 		const raw = await promises.readFile(filePath, "utf-8");
@@ -122,39 +115,14 @@ async function readJsonOrNull(filePath) {
 		return null;
 	}
 }
-var IS_WINDOWS = process.platform === "win32";
-var RENAME_RETRY_DELAYS_MS = [
-	30,
-	100,
-	300
-];
-var hasErrnoCode = (err) => typeof err === "object" && err !== null && "code" in err && typeof err.code === "string";
-var isTransientRenameError = (err) => IS_WINDOWS && hasErrnoCode(err) && (err.code === "EPERM" || err.code === "EBUSY" || err.code === "EACCES");
-async function renameWithWindowsRetry(fromPath, toPath) {
-	for (const delayMs of RENAME_RETRY_DELAYS_MS) try {
-		await promises.rename(fromPath, toPath);
-		return;
-	} catch (err) {
-		if (!isTransientRenameError(err)) throw err;
-		await new Promise((resolve) => setTimeout(resolve, delayMs));
-	}
-	await promises.rename(fromPath, toPath);
-}
-/** tmp-write + rename so readers never see a half-written file; `mode`
-*  applies to the tmp file and survives the rename. */
+/** tmp-write + rename so readers never see a half-written file; `mode` applies
+*  to the tmp file and survives the rename. A single-writer token file, so the
+*  staging name is stable (`uniqueTmp: false`). */
 async function writeJsonAtomicWithMode(filePath, data, mode) {
-	const tmp = `${filePath}.tmp`;
-	await promises.mkdir(path.dirname(filePath), { recursive: true });
-	try {
-		await promises.writeFile(tmp, JSON.stringify(data, null, 2), {
-			encoding: "utf-8",
-			mode
-		});
-		await renameWithWindowsRetry(tmp, filePath);
-	} catch (err) {
-		await promises.unlink(tmp).catch(() => void 0);
-		throw err;
-	}
+	await writeFileAtomic(filePath, JSON.stringify(data, null, JSON_INDENT), {
+		mode,
+		uniqueTmp: false
+	});
 }
 //#endregion
 //#region src/google/tokenStore.ts
@@ -196,36 +164,6 @@ async function deleteGoogleTokens(home) {
 	await rm(googleTokenPath(home), { force: true });
 }
 //#endregion
-//#region src/google/fetch.ts
-var DEFAULT_FETCH_TIMEOUT_MS = 10 * ONE_SECOND_MS;
-/** `fetch` with a finite timeout. Rejects with a `TimeoutError` once
-*  `timeoutMs` elapses. Composes with a caller-supplied `signal` so external
-*  cancellation still works. */
-async function fetchWithTimeout(url, init = {}) {
-	const { timeoutMs = DEFAULT_FETCH_TIMEOUT_MS, signal: callerSignal, ...rest } = init;
-	if (callerSignal?.aborted) throw callerSignal.reason ?? new DOMException("Aborted", "AbortError");
-	const controller = new AbortController();
-	const timer = setTimeout(() => {
-		controller.abort(new DOMException(`fetch timed out after ${timeoutMs}ms`, "TimeoutError"));
-	}, timeoutMs);
-	const unsubscribeCaller = bridgeExternalSignal(callerSignal, controller);
-	try {
-		return await fetch(url, {
-			...rest,
-			signal: controller.signal
-		});
-	} finally {
-		clearTimeout(timer);
-		unsubscribeCaller?.();
-	}
-}
-function bridgeExternalSignal(external, controller) {
-	if (!external) return null;
-	const onAbort = () => controller.abort(external.reason);
-	external.addEventListener("abort", onAbort, { once: true });
-	return () => external.removeEventListener("abort", onAbort);
-}
-//#endregion
 //#region src/google/broker.ts
 var DEFAULT_BROKER_BASE_URL = "https://asia-northeast1-mulmoserver.cloudfunctions.net";
 var BROKER_TIMEOUT_MS = 20 * ONE_SECOND_MS;
@@ -844,15 +782,49 @@ async function clearCalendarSyncToken(calendarId, workspaceRoot) {
 	await updateState((tokens) => Object.fromEntries(Object.entries(tokens).filter(([key]) => key !== dropped)), workspaceRoot);
 }
 //#endregion
+//#region src/google/collectionDateTime.ts
+/** All-day events carry no clock; midnight is where the day view places them. */
+var ALL_DAY_CLOCK = "00:00";
+var DATE_ONLY_RE = /^\d{4}-\d{2}-\d{2}$/;
+/** RFC3339 zone designator: `Z`, `+09:00`, `-0500`. */
+var ZONE_SUFFIX_RE = /(?:Z|[+-]\d{2}:?\d{2})$/;
+/** Fractional seconds have no place in the collection datetime shape. */
+var FRACTIONAL_SECONDS_RE = /\.\d+$/;
+/** Normalise one Google Calendar time value for storage in a `datetime` field.
+*  Anything that isn't a recognisable Google shape (empty string, non-string,
+*  free text) is returned untouched — the record lint should report it rather
+*  than have this function invent a value. */
+function toCollectionDateTime(value) {
+	if (typeof value !== "string") return value;
+	const trimmed = value.trim();
+	if (DATE_ONLY_RE.test(trimmed)) return `${trimmed}T${ALL_DAY_CLOCK}`;
+	if (!trimmed.includes("T")) return value;
+	return trimmed.replace(ZONE_SUFFIX_RE, "").replace(FRACTIONAL_SECONDS_RE, "");
+}
+//#endregion
 //#region src/google/collectionSync.ts
 var GOOGLE_CALENDAR_SYNC_TASK_ID = "system:google-calendar-sync";
 var DEFAULT_SYNC_INTERVAL_MS = 3600 * 1e3;
 var CANCELLED_STATUS = "cancelled";
+var DATETIME_FIELD_TYPE = "datetime";
+/** Own-property lookup, mirroring what the record lint reads: a spec reachable
+*  only through the prototype chain is not a DECLARED field, so it must not
+*  decide how a value is stored. */
+function declaredSpec(fields, field) {
+	return Object.hasOwn(fields, field) ? fields[field] : void 0;
+}
+/** Google's raw value is normalised only into a field the schema declares as
+*  `datetime` — that is the type whose stored shape the record lint, the
+*  calendar grid and the day view all parse (#2310). A user who maps `start`
+*  onto a `string` field asked for Google's value verbatim and keeps it. */
+function projectValue(fields, field, value) {
+	return declaredSpec(fields, field)?.type === DATETIME_FIELD_TYPE ? toCollectionDateTime(value) : value;
+}
 /** Project one Google event onto the collection's own field names. The
 *  primary field always takes the event id — upsert-by-id is what keeps the
 *  sync idempotent, so it is deliberately not remappable. */
-function toCollectionRecord(event, map, primaryKey) {
-	const mapped = Object.entries(map).map(([field, source]) => [field, event[source]]);
+function toCollectionRecord(event, map, primaryKey, fields) {
+	const mapped = Object.entries(map).map(([field, source]) => [field, projectValue(fields, field, event[source])]);
 	return {
 		...Object.fromEntries(mapped),
 		[primaryKey]: event.id
@@ -893,7 +865,7 @@ async function applyEvent(collection, event, workspaceRoot) {
 			const deleted = await store.delete(event.id);
 			return classifyDelete(event.id, deleted.kind);
 		}
-		const record = toCollectionRecord(event, schema.googleCalendar?.map ?? {}, schema.primaryKey);
+		const record = toCollectionRecord(event, schema.googleCalendar?.map ?? {}, schema.primaryKey, schema.fields);
 		const written = await store.write(event.id, record);
 		return classifyWrite(event.id, written.kind);
 	} catch (error) {
@@ -1161,6 +1133,6 @@ async function deleteDriveFile(accessToken, input) {
 	await googleRequest(DRIVE_API_LABEL, accessToken, `${DRIVE_FILES_URL}/${encodeURIComponent(input.fileId)}`, { method: "DELETE" });
 }
 //#endregion
-export { DEFAULT_LIST_MAX_RESULTS, GOOGLE_AUTH_CANCELLED, GOOGLE_CALENDARLIST_SCOPE, GOOGLE_CALENDAR_SCOPE, GOOGLE_CALENDAR_SYNC_TASK_ID, GOOGLE_DRIVE_FILE_SCOPE, GOOGLE_SCOPES, GOOGLE_TASKS_SCOPE, GoogleApiError, MAX_LIST_RESULTS, assertSafeMimeType, authorizeGoogle, brokerBaseUrl, brokerExchange, brokerRefresh, brokerStart, buildMultipartBody, calendarApiError, calendarSyncStatePath, canonicalCalendarId, classifyDelete, classifyWrite, clearCalendarSyncToken, clientSecretPresence, collectCalendarPages, commitLinkedTokens, completeTask, configureGoogleHost, createCalendarEvent, createDriveFile, createGoogleAuthFlow, createTask, deleteDriveFile, deleteGoogleTokens, deleteTask, findClientSecretPath, getCalendarColors, getGoogleAccessToken, googleApiError, googleAuthFlow, googleCalendarSyncTaskDef, googleConfigDir, googleSecretsDir, googleTokenPath, groupByCalendar, isGoogleApiError, isIsoDateTimeWithOffset, isTextMimeType, legacyGoogleTokenPath, listCalendarEvents, listCalendars, listDriveFiles, listTaskLists, listTasks, loadCalendarSyncToken, loadClientSecret, loadGoogleTokens, mergeGoogleTokens, pickBoundary, readDriveFile, saveCalendarSyncToken, saveGoogleTokens, syncCalendarEvents, syncCalendarGroup, syncDueCalendarCollections, toCalendarSummary, toCollectionRecord, toDriveFileSummary, toEventSummary, toTaskListSummary, toTaskSummary, unlinkGoogle, waitForAuthCode };
+export { DEFAULT_LIST_MAX_RESULTS, GOOGLE_AUTH_CANCELLED, GOOGLE_CALENDARLIST_SCOPE, GOOGLE_CALENDAR_SCOPE, GOOGLE_CALENDAR_SYNC_TASK_ID, GOOGLE_DRIVE_FILE_SCOPE, GOOGLE_SCOPES, GOOGLE_TASKS_SCOPE, GoogleApiError, MAX_LIST_RESULTS, assertSafeMimeType, authorizeGoogle, brokerBaseUrl, brokerExchange, brokerRefresh, brokerStart, buildMultipartBody, calendarApiError, calendarSyncStatePath, canonicalCalendarId, classifyDelete, classifyWrite, clearCalendarSyncToken, clientSecretPresence, collectCalendarPages, commitLinkedTokens, completeTask, configureGoogleHost, createCalendarEvent, createDriveFile, createGoogleAuthFlow, createTask, deleteDriveFile, deleteGoogleTokens, deleteTask, findClientSecretPath, getCalendarColors, getGoogleAccessToken, googleApiError, googleAuthFlow, googleCalendarSyncTaskDef, googleConfigDir, googleSecretsDir, googleTokenPath, groupByCalendar, isGoogleApiError, isIsoDateTimeWithOffset, isTextMimeType, legacyGoogleTokenPath, listCalendarEvents, listCalendars, listDriveFiles, listTaskLists, listTasks, loadCalendarSyncToken, loadClientSecret, loadGoogleTokens, mergeGoogleTokens, pickBoundary, readDriveFile, saveCalendarSyncToken, saveGoogleTokens, syncCalendarEvents, syncCalendarGroup, syncDueCalendarCollections, toCalendarSummary, toCollectionDateTime, toCollectionRecord, toDriveFileSummary, toEventSummary, toTaskListSummary, toTaskSummary, unlinkGoogle, waitForAuthCode };
 
 //# sourceMappingURL=index.js.map