@coffer-org/plugin-transit 1.4.0 → 1.5.0

package/dist/bus_route/index.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("@coffer-org/sdk/module").ModuleDef;
+declare const _default: import("@coffer-org/sdk/shelf").ShelfDef;
 export default _default;

package/dist/bus_route/index.js

@@ -1,8 +1,8 @@
-import { defineModule } from '@coffer-org/sdk/module';
+import { defineShelf } from '@coffer-org/sdk/shelf';
 import { field } from '@coffer-org/sdk/fields';
-export default defineModule({
-    module: 'bus_route',
-    vault: 'transit',
+export default defineShelf({
+    shelf: 'bus_route',
+    library: 'transit',
     label: 'transit.bus_route.label',
     icon: 'lucide:bus',
     views: {

package/dist/index.js

@@ -1,4 +1,4 @@
-import { defineVault } from '@coffer-org/sdk/vault';
+import { defineLibrary } from '@coffer-org/sdk/library';
 import { definePlugin } from '@coffer-org/sdk/plugin';
 import { field } from '@coffer-org/sdk/fields';
 import { defineSettings } from '@coffer-org/sdk/settings';
@@ -7,10 +7,10 @@ export default definePlugin({
     id: 'transit',
     version: '1.0.0',
     dependsOn: [],
-    vaults: [
+    libraries: [
         {
-            meta: defineVault({ id: 'transit', label: 'transit.vault.label', icon: 'lucide:bus' }),
-            modules: [bus_route],
+            meta: defineLibrary({ id: 'transit', label: 'transit.library.label', icon: 'lucide:bus', agent: 'Local bus routes and their departure schedules (bus_route).' }),
+            shelves: [bus_route],
         },
     ],
     settings: defineSettings({

package/dist/runtime/index.d.ts

@@ -1,4 +1,4 @@
 import type { PluginHooks } from '@coffer-org/server/plugin-hooks';
-export { startSync, stopSync } from './sync.ts';
+export { runOnce } from './sync.ts';
 export type { BusRouteRecord } from './sync.ts';
 export declare const serverHooks: PluginHooks;

package/dist/runtime/index.js

@@ -1,17 +1,18 @@
-import { startSync, stopSync } from "./sync.js";
-import { getLogger } from '@coffer-org/sdk/logger';
-const log = getLogger('transit');
-export { startSync, stopSync } from "./sync.js";
+import { runOnce } from "./sync.js";
+export { runOnce } from "./sync.js";
+const SYNC_INTERVAL_MS = Number(process.env['TRANSIT_SYNC_INTERVAL_MS']) || 6 * 60 * 60 * 1000;
 export const serverHooks = {
-    init: () => {
-        void startSync().catch((e) => log.warn(`sync failed to start: ${e.message}`));
-    },
-    teardown: () => {
-        stopSync();
-    },
+    backgroundTasks: [
+        {
+            name: 'transit-sync',
+            intervalMs: SYNC_INTERVAL_MS,
+            run: async () => {
+                await runOnce();
+            },
+        },
+    ],
     agent: {
-        instructions: 'Vault transit — bus routes (bus_route): route_number, from/to, stop, ' +
-            'weekday_times/saturday_times/sunday_times — departure schedule.' +
+        instructions: 'bus_route: weekday_times/saturday_times/sunday_times — departure schedule.' +
             ' When the schedule changes, update *_times via update_record.',
     },
 };

package/dist/runtime/sync.d.ts

@@ -12,5 +12,4 @@ export interface BusRouteRecord {
     notes: string | null;
 }
 export declare function buildBusEvents(records: BusRouteRecord[]): IcsFile[];
-export declare function startSync(): Promise<void>;
-export declare function stopSync(): void;
+export declare function runOnce(): Promise<void>;

package/dist/runtime/sync.js

@@ -1,6 +1,6 @@
 import { getEm } from '@coffer-org/server/db';
 import { getPluginSettings } from '@coffer-org/server/plugin-runtime';
-import { resolveDavSettings, WebDavClient, CalDavCollection, buildVEvent, buildRRule, } from '@coffer-org/dav';
+import { syncIcs, buildVEvent, buildRRule } from '@coffer-org/dav';
 import { getLogger } from '@coffer-org/sdk/logger';
 const log = getLogger('transit');
 const REF_DATE = { weekday: '20240101', saturday: '20240106', sunday: '20240107' };
@@ -55,7 +55,7 @@ export function buildBusEvents(records) {
     }
     return files;
 }
-async function runOnce() {
+export async function runOnce() {
     const fork = getEm().fork();
     const rows = (await fork.find('transit__bus_route', {}));
     const icsFiles = buildBusEvents(rows);
@@ -63,34 +63,9 @@ async function runOnce() {
     const calendar = pluginSettings['caldav_calendar'];
     if (!calendar)
         throw new Error('[transit-sync] caldav_calendar is required but not set');
-    const principal = pluginSettings['caldav_username'] ?? '';
-    const password = pluginSettings['caldav_password'] ?? '';
-    const settings = resolveDavSettings(calendar, { principal, password });
-    const ops = new WebDavClient({
-        collectionUrl: settings.collectionUrl,
-        username: settings.principal,
-        password: settings.password,
-    });
-    const coll = new CalDavCollection(ops);
-    const result = await coll.syncEvents('bus-route-', icsFiles);
+    const result = await syncIcs(calendar, {
+        principal: pluginSettings['caldav_username'],
+        password: pluginSettings['caldav_password'],
+    }, 'bus-route-', icsFiles);
     log.debug(`synced: ${result.written.length} written, ${result.deleted.length} deleted, ${result.failed.length} failed`);
 }
-const INTERVAL_MS = Number(process.env['TRANSIT_SYNC_INTERVAL_MS'] ?? 0) || 6 * 60 * 60 * 1000;
-let timer;
-export async function startSync() {
-    try {
-        await runOnce();
-    }
-    catch (e) {
-        log.error(`initial sync failed: ${e.message}`);
-    }
-    timer = setInterval(() => {
-        void runOnce().catch((e) => log.error(`sync error: ${e.message}`));
-    }, INTERVAL_MS);
-}
-export function stopSync() {
-    if (timer !== undefined) {
-        clearInterval(timer);
-        timer = undefined;
-    }
-}

package/dist/schema.js

@@ -21,8 +21,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	enumerable: true
 }) : target, mod));
 //#endregion
-//#region ../sdk/src/vault.ts
-function defineVault(v) {
+//#region ../sdk/src/library.ts
+function defineLibrary(v) {
 	return v;
 }
 //#endregion
@@ -154,7 +154,10 @@ function assignProp(target, prop, value) {
 }
 function mergeDefs(...defs) {
 	const mergedDescriptors = {};
-	for (const def of defs) Object.assign(mergedDescriptors, Object.getOwnPropertyDescriptors(def));
+	for (const def of defs) {
+		const descriptors = Object.getOwnPropertyDescriptors(def);
+		Object.assign(mergedDescriptors, descriptors);
+	}
 	return Object.defineProperties({}, mergedDescriptors);
 }
 function esc(str) {
@@ -476,7 +479,7 @@ var _parse = (_Err) => (schema, value, _ctx, _params) => {
 	}, ctx);
 	if (result instanceof Promise) throw new $ZodAsyncError();
 	if (result.issues.length) {
-		const e = new (_params?.Err ?? _Err)(result.issues.map((iss) => finalizeIssue(iss, ctx, config())));
+		const e = new ((_params?.Err) ?? _Err)(result.issues.map((iss) => finalizeIssue(iss, ctx, config())));
 		captureStackTrace(e, _params?.callee);
 		throw e;
 	}
@@ -493,7 +496,7 @@ var _parseAsync = (_Err) => async (schema, value, _ctx, params) => {
 	}, ctx);
 	if (result instanceof Promise) result = await result;
 	if (result.issues.length) {
-		const e = new (params?.Err ?? _Err)(result.issues.map((iss) => finalizeIssue(iss, ctx, config())));
+		const e = new ((params?.Err) ?? _Err)(result.issues.map((iss) => finalizeIssue(iss, ctx, config())));
 		captureStackTrace(e, params?.callee);
 		throw e;
 	}
@@ -1945,7 +1948,7 @@ var $ZodOptional = /*@__PURE__*/ $constructor("$ZodOptional", (inst, def) => {
 	inst._zod.optin = "optional";
 	inst._zod.optout = "optional";
 	defineLazy(inst._zod, "values", () => {
-		return def.innerType._zod.values ? new Set([...def.innerType._zod.values, void 0]) : void 0;
+		return def.innerType._zod.values ? /* @__PURE__ */ new Set([...def.innerType._zod.values, void 0]) : void 0;
 	});
 	defineLazy(inst._zod, "pattern", () => {
 		const pattern = def.innerType._zod.pattern;
@@ -1979,7 +1982,7 @@ var $ZodNullable = /*@__PURE__*/ $constructor("$ZodNullable", (inst, def) => {
 		return pattern ? new RegExp(`^(${cleanRegex(pattern.source)}|null)$`) : void 0;
 	});
 	defineLazy(inst._zod, "values", () => {
-		return def.innerType._zod.values ? new Set([...def.innerType._zod.values, null]) : void 0;
+		return def.innerType._zod.values ? /* @__PURE__ */ new Set([...def.innerType._zod.values, null]) : void 0;
 	});
 	inst._zod.parse = (payload, ctx) => {
 		if (payload.value === null) return payload;
@@ -4587,7 +4590,7 @@ function password(raw) {
 * Internal API-token list — keyValue-shaped collection (name + write-only
 * token + timestamps), custom renderer (`kind:'internalApiToken'`, own
 * create/revoke UI — same trick as url()/perWeekday()). "Internal" = not a
-* general-purpose field type for plugin modules, only for the core account
+* general-purpose field type for plugin shelves, only for the core account
 * settings page. `token` is `kind:'password'` so maskSecrets/preserveTree
 * already mask/preserve it for free.
 */
@@ -4686,7 +4689,7 @@ var TEL_RE = /^\+?[\d\s()-]{4,}$/;
 /** Loose URL: будь-який scheme:// АБО host-з-крапкою (+опц. порт/шлях). Без пробілів. */
 var LINK_RE = /^([a-z][a-z0-9+.-]*:\/\/\S+|[\w-]+(\.[\w-]+)+(:\d+)?(\/\S*)?)$/i;
 /** CSS named colors (CSS Color Module L4) — для f.colorname. */
-var CSS_COLOR_NAMES = new Set([
+var CSS_COLOR_NAMES = /* @__PURE__ */ new Set([
 	"aliceblue",
 	"antiquewhite",
 	"aqua",
@@ -5147,7 +5150,7 @@ var require_data = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		},
 		cs: {
 			name: "Czech",
-			nativeName: "Čeština"
+			nativeName: "čeština"
 		},
 		cu: {
 			name: "Old Church Slavonic",
@@ -5611,7 +5614,7 @@ var require_data = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		},
 		sk: {
 			name: "Slovak",
-			nativeName: "Slovenčina"
+			nativeName: "slovenčtina"
 		},
 		sl: {
 			name: "Slovenian",
@@ -5992,6 +5995,34 @@ function wrapKey(opts, meta) {
 			noEditControl: true
 		}
 	};
+	if (opts.emphasis) m = {
+		...m,
+		hints: {
+			...m.hints,
+			emphasis: opts.emphasis
+		}
+	};
+	if (opts.noLabel) m = {
+		...m,
+		hints: {
+			...m.hints,
+			noLabel: true
+		}
+	};
+	if (opts.role) m = {
+		...m,
+		hints: {
+			...m.hints,
+			role: opts.role
+		}
+	};
+	if (opts.pinned) m = {
+		...m,
+		hints: {
+			...m.hints,
+			pinned: true
+		}
+	};
 	if (opts.default !== void 0) m = {
 		...m,
 		default: opts.default
@@ -6355,8 +6386,8 @@ function relation(raw) {
 			displayKey: o.displayKey ?? "name"
 		},
 		relation: {
-			vault: raw.options.vault,
-			type: raw.options.module
+			library: raw.options.library,
+			type: raw.options.shelf
 		},
 		...multi && { json: true },
 		zod: optionalize(s, required)
@@ -7681,7 +7712,7 @@ var createDefaultQueryTester = function(query, options) {
 };
 createDefaultQueryTester.createEqualsOperation;
 //#endregion
-//#region ../sdk/src/module.ts
+//#region ../sdk/src/shelf.ts
 /** Flat [storageKey, FieldMeta] pairs of the parent table's columns.
 *  layout group → flattened; embedded group → prefix `key__`; collection → skipped. */
 function fieldEntries(items) {
@@ -7694,11 +7725,11 @@ function fieldEntries(items) {
 	}
 	return out;
 }
-function defineModule(m) {
+function defineShelf(m) {
 	const keys = fieldEntries(m.fields).map(([k]) => k);
 	const dup = keys.find((k, i) => keys.indexOf(k) !== i);
-	if (dup) throw new Error(`[module] ${m.vault}/${m.module}: duplicate key '${dup}'`);
-	if (m.standalone !== false && !m.views?.table?.length) console.warn(`[module] ${m.vault}/${m.module}: standalone module without an explicit views.table`);
+	if (dup) throw new Error(`[shelf] ${m.library}/${m.shelf}: duplicate key '${dup}'`);
+	if (m.standalone !== false && !m.views?.table?.length) console.warn(`[shelf] ${m.library}/${m.shelf}: standalone shelf without an explicit views.table`);
 	return m;
 }
 //#endregion
@@ -7709,9 +7740,9 @@ function defineModule(m) {
 *           48 Кишинів→Чореску, 48 Чореску→Кишинів.
 * Час відправлень зберігається як JSON-масиви рядків "HH:MM".
 */
-var bus_route_default = defineModule({
-	module: "bus_route",
-	vault: "transit",
+var bus_route_default = defineShelf({
+	shelf: "bus_route",
+	library: "transit",
 	label: "transit.bus_route.label",
 	icon: "lucide:bus",
 	views: { table: [
@@ -7775,13 +7806,14 @@ var src_default = definePlugin({
 	id: "transit",
 	version: "1.0.0",
 	dependsOn: [],
-	vaults: [{
-		meta: defineVault({
+	libraries: [{
+		meta: defineLibrary({
 			id: "transit",
-			label: "transit.vault.label",
-			icon: "lucide:bus"
+			label: "transit.library.label",
+			icon: "lucide:bus",
+			agent: "Local bus routes and their departure schedules (bus_route)."
 		}),
-		modules: [bus_route_default]
+		shelves: [bus_route_default]
 	}],
 	settings: defineSettings({
 		label: "transit.settings.label",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coffer-org/plugin-transit",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "type": "module",
   "engines": {
     "node": ">=24"
@@ -25,9 +25,9 @@
     "test": "node --import tsx/esm --test 'src/runtime/*.test.ts'"
   },
   "dependencies": {
-    "@coffer-org/sdk": "^1.4.0",
-    "@coffer-org/server": "^1.6.0",
-    "@coffer-org/dav": "^1.4.0"
+    "@coffer-org/sdk": "^1.5.0",
+    "@coffer-org/server": "^1.8.0",
+    "@coffer-org/dav": "^1.5.0"
   },
   "coffer": {
     "schema": "dist/schema.js"