@velastack/cms 0.6.1 → 0.6.3

package/dist/backend/factory.js

@@ -214,9 +214,9 @@ export const createCmsBackend = (options = {}) => {
                 if (!testReset) {
                     throw new Error('createCmsBackend({ testReset: true }) is required to call reset()');
                 }
-                store.__resetProjectForTests(projectId);
+                const filenames = store.__resetProjectForTests(projectId);
                 cache.clear();
-                await clearUploads(uploadDir);
+                await clearUploads(uploadDir, filenames);
                 const { layouts, pages } = normalizeSeed(seed);
                 if (Object.keys(layouts).length > 0 || Object.keys(pages).length > 0) {
                     store.seedPublishedDocs(projectId, layouts, pages);

package/dist/backend/routes/test-reset.d.ts

@@ -10,6 +10,9 @@ export declare const normalizeSeed: (seed: SeedInput) => {
     layouts: Record<string, Record<string, Tree>>;
     pages: Record<string, Record<string, PageEntry[]>>;
 };
-/** Remove only files this backend could have written. */
-export declare const clearUploads: (uploadDir: string) => Promise<void>;
+/**
+ * Unlink the given uploads (the reset project's media files), skipping any name
+ * this backend could not have generated. A file already gone is not an error.
+ */
+export declare const clearUploads: (uploadDir: string, filenames: string[]) => Promise<void>;
 export declare const postTestReset: (ctx: RouteCtx) => Promise<Response>;

package/dist/backend/routes/test-reset.js

@@ -8,11 +8,14 @@
  *
  * One deliberate change from the original: that version did
  * `rm(uploadDir(), { recursive: true, force: true })` — a recursive delete of a
- * host-configured directory, on an unauthenticated POST. Here only files whose
- * names this backend could have generated are unlinked, and never the directory
- * itself, so a misconfigured `uploadDir` cannot be destroyed.
+ * host-configured directory, on an unauthenticated POST. Here only the files of
+ * the project's own media rows are unlinked, and never the directory itself, so
+ * a misconfigured `uploadDir` cannot be destroyed and a reset of one project
+ * cannot delete another's uploads (several projects, or several test files
+ * running in parallel, share one `uploadDir`).
  */
-import { readdir, unlink } from 'node:fs/promises';
+import { unlink } from 'node:fs/promises';
+import { join } from 'node:path';
 import { DEFAULT_LOCALE } from '../store/queries.js';
 import { isSafeUploadFilename } from '../storage.js';
 import { badRequest, isObjectRecord, readJson } from './context.js';
@@ -86,24 +89,20 @@ export const normalizeSeed = (seed) => {
     }
     return { layouts, pages };
 };
-/** Remove only files this backend could have written. */
-export const clearUploads = async (uploadDir) => {
-    let names;
-    try {
-        names = await readdir(uploadDir);
-    }
-    catch {
-        return;
-    }
-    await Promise.all(names.filter(isSafeUploadFilename).map((n) => unlink(`${uploadDir}/${n}`).catch(() => { })));
+/**
+ * Unlink the given uploads (the reset project's media files), skipping any name
+ * this backend could not have generated. A file already gone is not an error.
+ */
+export const clearUploads = async (uploadDir, filenames) => {
+    await Promise.all(filenames.filter(isSafeUploadFilename).map((n) => unlink(join(uploadDir, n)).catch(() => { })));
 };
 export const postTestReset = async (ctx) => {
     const body = await readJson(ctx.event);
     if (body !== undefined && !isObjectRecord(body))
         return badRequest('invalid json');
-    ctx.store.__resetProjectForTests(ctx.projectId);
+    const filenames = ctx.store.__resetProjectForTests(ctx.projectId);
     ctx.cache.clear();
-    await clearUploads(ctx.storage.dir());
+    await clearUploads(ctx.storage.dir(), filenames);
     const { layouts, pages } = normalizeSeed((body ?? {}));
     if (Object.keys(layouts).length > 0 || Object.keys(pages).length > 0) {
         ctx.store.seedPublishedDocs(ctx.projectId, layouts, pages);

package/dist/backend/store/db.js

@@ -1,6 +1,6 @@
 import { dirname } from 'node:path';
 import { mkdirSync } from 'node:fs';
-import { loadDriver } from './sqlite.js';
+import { loadDriver, withoutReportNetwork } from './sqlite.js';
 import { runMigrations } from './migrate.js';
 import { MIGRATIONS } from './migrations/index.js';
 /**
@@ -16,7 +16,7 @@ export const openDatabase = (dbPath) => {
     if (dbPath !== ':memory:') {
         mkdirSync(dirname(dbPath), { recursive: true });
     }
-    const db = new Driver(dbPath);
+    const db = withoutReportNetwork(() => new Driver(dbPath));
     db.pragma('journal_mode = WAL');
     db.pragma('synchronous = NORMAL');
     db.pragma('cache_size = -65536');

package/dist/backend/store/queries.d.ts

@@ -21,7 +21,7 @@ export declare const generatePreviewKey: () => string;
  * The body is otherwise a verbatim move.
  */
 export declare const createStore: (db: SqliteDb) => {
-    __resetProjectForTests: (projectId: string) => void;
+    __resetProjectForTests: (projectId: string) => string[];
     addReleaseItems: (projectId: string, userId: string, inputs: AddReleaseItemInput[]) => OpenRelease;
     allPageRouteIds: (projectId: string) => string[];
     buildStateAtRelease: (projectId: string, releaseId: string) => {

package/dist/backend/store/queries.js

@@ -1138,18 +1138,26 @@ export const createStore = (db) => {
         });
     };
     let _truncators = null;
+    const mediaFilenamesStmt = () => db.prepare('SELECT filename FROM media_items WHERE project_id = ?');
     /** Wipe every CMS table for one project. Used by `__test_reset__`.
      * Also clears the in-process LRU — without this, the next test's first publish
      * would re-mint `cms_version=1` and collide with cached entries from the
-     * previous test run (production never resets, so version is monotonic). */
+     * previous test run (production never resets, so version is monotonic).
+     *
+     * Returns the filenames of the project's media rows it deleted, so the caller
+     * can unlink exactly those files and leave other projects' uploads alone. */
     const __resetProjectForTests = (projectId) => {
         if (!_truncators)
             _truncators = truncateProjectStmts();
         const tx = db.transaction(() => {
+            const filenames = mediaFilenamesStmt()
+                .all(projectId)
+                .map((r) => r.filename);
             for (const fn of _truncators)
                 fn(projectId);
+            return filenames;
         });
-        tx();
+        return tx();
     };
     /**
      * Seed published page/layout content for a project. Bypasses the release

package/dist/backend/store/sqlite.d.ts

@@ -20,3 +20,15 @@ export type SqliteDriver = new (path: string) => SqliteDb;
  * it — and never compiles a native module.
  */
 export declare const loadDriver: () => SqliteDriver;
+/**
+ * Run `fn` with Node's diagnostic report leaving out networking details.
+ *
+ * better-sqlite3 loads its native addon on the first `new Database`, and on
+ * Linux picks the prebuilt binary by calling `process.report.getReport()` to
+ * tell glibc from musl. The report's network section resolves the address of
+ * every open socket, synchronously, so in a server with live connections the
+ * first open could block the event loop for seconds (10s on a CI runner).
+ * Nothing in that check needs the network section. The setting is restored
+ * before returning; `fn` is synchronous, so nothing else sees it changed.
+ */
+export declare const withoutReportNetwork: <T>(fn: () => T) => T;

package/dist/backend/store/sqlite.js

@@ -27,3 +27,27 @@ export const loadDriver = () => {
             'dependency. Install it with `npm i better-sqlite3`.', { cause });
     }
 };
+/**
+ * Run `fn` with Node's diagnostic report leaving out networking details.
+ *
+ * better-sqlite3 loads its native addon on the first `new Database`, and on
+ * Linux picks the prebuilt binary by calling `process.report.getReport()` to
+ * tell glibc from musl. The report's network section resolves the address of
+ * every open socket, synchronously, so in a server with live connections the
+ * first open could block the event loop for seconds (10s on a CI runner).
+ * Nothing in that check needs the network section. The setting is restored
+ * before returning; `fn` is synchronous, so nothing else sees it changed.
+ */
+export const withoutReportNetwork = (fn) => {
+    // `excludeNetwork` exists from Node 20.13 / 22.0; older versions skip this.
+    const report = process.report;
+    if (!report || typeof report.excludeNetwork !== 'boolean' || report.excludeNetwork)
+        return fn();
+    report.excludeNetwork = true;
+    try {
+        return fn();
+    }
+    finally {
+        report.excludeNetwork = false;
+    }
+};

package/dist/server/load-cms.js

@@ -168,6 +168,24 @@ export const resolveCmsPayload = async (args) => {
         redirectTo: null
     };
 };
+/**
+ * A query parameter of the request, or null where the page cannot have one:
+ * while building, and on a prerendered page, where SvelteKit (3.0 in dev too,
+ * via `prerender_default`) replaces `url.search`/`url.searchParams` with a
+ * getter that throws `url_search_unavailable_prerender`. A prerendered page
+ * cannot vary by preview or version key, so null is the right answer, not an
+ * error that takes the whole page down in `vite dev`.
+ */
+const searchParam = (event, key) => {
+    if (building)
+        return null;
+    try {
+        return event.url.searchParams.get(key);
+    }
+    catch {
+        return null;
+    }
+};
 /**
  * Resolve the CMS payload for the current SvelteKit request.
  *
@@ -217,8 +235,8 @@ export const loadCms = (event, options) => {
         manifest: builtManifest,
         routeId: event.route.id,
         params: event.params,
-        previewKey: building ? null : event.url.searchParams.get('preview'),
-        versionKey: building ? null : event.url.searchParams.get('version'),
+        previewKey: searchParam(event, 'preview'),
+        versionKey: searchParam(event, 'version'),
         locale: options.locale,
         locales: options.locales,
         adapter: options.adapter,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@velastack/cms",
-	"version": "0.6.1",
+	"version": "0.6.3",
 	"description": "A scope-aware CMS for SvelteKit, for static or dynamic sites.",
 	"keywords": [
 		"svelte",