@coffer-org/server 3.3.0 → 3.4.0

package/dist/records-api.d.ts

@@ -1,4 +1,5 @@
 import type { ShelfDef } from '@coffer-org/sdk/shelf';
+import { type PartMemo } from './part-injection.ts';
 export declare class UnknownShelfError extends Error {
 }
 export declare class SingleShelfError extends Error {
@@ -20,12 +21,15 @@ export type RecordListOpts = {
 };
 export declare const MAX_PAGE = 500;
 export declare function coerceFilter(v: string, column: string): unknown;
-export declare function withExtends(record: Record<string, unknown>, library: string, shelf: string): Promise<Record<string, unknown>>;
+export declare function withExtends(record: Record<string, unknown>, library: string, shelf: string, memo?: PartMemo): Promise<Record<string, unknown>>;
 export declare function withExtendsMany(rows: Record<string, unknown>[], library: string, shelf: string): Promise<Record<string, unknown>[]>;
 export declare function rowMatch(mdef: ShelfDef, row: Record<string, unknown>, tokens: string[]): {
     score: number;
     snippet: string;
 } | null;
+export declare class FilterError extends Error {
+    constructor(message: string);
+}
 export declare function recordCount(library: string, shelf: string, query?: RecordListQuery, opts?: Pick<RecordListOpts, 'deleted' | 'where'>): Promise<number>;
 export declare function recordList(library: string, shelf: string, query?: RecordListQuery, opts?: RecordListOpts): Promise<Record<string, unknown>[]>;
 export declare function isPagedRequest(limit?: string, offset?: string): boolean;

package/dist/records-api.js

@@ -1,4 +1,4 @@
-import { fieldMap, textSearchKeys, titleKey, recordTitle, listKeys, storageColumnsFor } from '@coffer-org/sdk/shelf';
+import { fieldMap, textSearchKeys, titleKey, recordTitle, listKeys, storageColumnsFor, magnitudeSub, } from '@coffer-org/sdk/shelf';
 import { tokenize, matchScoreFolded, foldText } from '@coffer-org/core/search';
 import { getActiveRegistry, getShelf, getExtendsFor } from "./registry-context.js";
 import { selectRows } from "./read-rows.js";
@@ -8,6 +8,7 @@ import { getEm } from "./db.js";
 import { decodeTemporal, dtStringToDate } from "./temporal.js";
 import { splitBody, saveExtends, deleteExtends, validateExtends, readExtends } from "./extend-io.js";
 import { createRecord, updateRecord, getRecord, deleteRecord, restoreRecord, purgeRecord } from "./mutate.js";
+import { newPartMemo } from "./part-injection.js";
 import { deleteRecordActivity } from "./record-activity.js";
 export class UnknownShelfError extends Error {
 }
@@ -42,13 +43,13 @@ export function coerceFilter(v, column) {
         return dtStringToDate(v);
     return v;
 }
-export async function withExtends(record, library, shelf) {
+export async function withExtends(record, library, shelf, memo) {
     const matchedExtends = getExtendsFor(library, shelf);
     if (!matchedExtends.length)
         return record;
     const _extends = {};
     await Promise.all(matchedExtends.map(async (e) => {
-        _extends[e.id] = (await getExtendRecord(e, record.id)) ?? null;
+        _extends[e.id] = (await getExtendRecord(e, record.id, undefined, memo)) ?? null;
     }));
     return { ...record, _extends };
 }
@@ -85,15 +86,45 @@ export function rowMatch(mdef, row, tokens) {
     const snippet = raw.length > 120 ? raw.slice(0, 120) + '…' : raw;
     return { score, snippet };
 }
+export class FilterError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = 'FilterError';
+    }
+}
+function resolveFilterKey(m, fm, k) {
+    const direct = fm[k];
+    if (direct) {
+        if (direct.virtual)
+            return undefined;
+        if (!direct.columns)
+            return { column: k, type: direct.column };
+        const sub = magnitudeSub(direct);
+        if (sub === undefined)
+            throw new FilterError(`${m.library}/${m.shelf}: '${k}' is a composite whose parts are all computed or pinned — it owns no column to filter on`);
+        return { column: `${k}__${sub}`, type: direct.columns[sub] };
+    }
+    const cut = k.lastIndexOf('__');
+    if (cut <= 0)
+        return undefined;
+    const base = fm[k.slice(0, cut)];
+    if (!base?.columns)
+        return undefined;
+    const part = k.slice(cut + 2);
+    const type = base.columns[part];
+    if (type === undefined)
+        throw new FilterError(`${m.library}/${m.shelf}: '${k}' names no part of composite '${k.slice(0, cut)}' (parts: ${Object.keys(base.columns).join(', ')})`);
+    return { column: k, type };
+}
 function buildWhere(m, filterParams) {
     const where = {};
     const fm = fieldMap(m.fields);
     for (const [k, v] of Object.entries(filterParams)) {
         if (k === 'id' || v === undefined)
             continue;
-        const fieldDef = fm[k];
-        if (fieldDef && !fieldDef.virtual)
-            where[k] = coerceFilter(String(v), fieldDef.column);
+        const target = resolveFilterKey(m, fm, k);
+        if (target)
+            where[target.column] = coerceFilter(String(v), target.type);
     }
     if (filterParams['id']) {
         const ids = String(filterParams['id'])
@@ -197,11 +228,12 @@ async function createOne(library, shelf, body, actor = 'gui') {
     const { m, ename } = resolve(library, shelf);
     const { base, extData } = splitBody(body);
     validateExtends(library, shelf, extData);
+    const memo = newPartMemo();
     const row = await createRecord(m, ename, base, { actor }, async (tx, id) => {
-        await saveExtends(tx, library, shelf, id, extData);
-        return readExtends(tx, library, shelf, id);
+        await saveExtends(tx, library, shelf, id, extData, memo);
+        return readExtends(tx, library, shelf, id, memo);
     });
-    return withExtends(row, library, shelf);
+    return withExtends(row, library, shelf, memo);
 }
 export async function recordCreate(library, shelf, body, actor = 'gui') {
     const { m } = resolve(library, shelf);
@@ -238,11 +270,12 @@ export async function recordUpdate(library, shelf, id, body, actor = 'gui') {
     const { m, ename } = resolve(library, shelf);
     const { base, extData } = splitBody(body);
     validateExtends(library, shelf, extData);
+    const memo = newPartMemo();
     const row = await updateRecord(m, ename, id, base, { actor }, async (tx) => {
-        await saveExtends(tx, library, shelf, id, extData);
-        return readExtends(tx, library, shelf, id);
+        await saveExtends(tx, library, shelf, id, extData, memo);
+        return readExtends(tx, library, shelf, id, memo);
     });
-    return withExtends(row, library, shelf);
+    return withExtends(row, library, shelf, memo);
 }
 export async function recordDelete(library, shelf, id, actor = 'gui') {
     const { m, ename } = resolve(library, shelf);
@@ -252,7 +285,8 @@ export async function recordDelete(library, shelf, id, actor = 'gui') {
 }
 export async function recordRestore(library, shelf, id, actor = 'gui') {
     const { m, ename } = resolve(library, shelf);
-    await restoreRecord(m, ename, id, { actor }, (tx, recordId) => readExtends(tx, library, shelf, recordId));
+    const memo = newPartMemo();
+    await restoreRecord(m, ename, id, { actor }, (tx, recordId) => readExtends(tx, library, shelf, recordId, memo));
 }
 export async function recordPurge(library, shelf, id, actor = 'gui') {
     const { m, ename } = resolve(library, shelf);

package/dist/rename-guard.d.ts

@@ -0,0 +1 @@
+export declare function disableColumnRenameDetection(): void;

package/dist/rename-guard.js

@@ -0,0 +1,9 @@
+import { SchemaComparator } from '@mikro-orm/sqlite';
+let applied = false;
+export function disableColumnRenameDetection() {
+    if (applied)
+        return;
+    SchemaComparator.prototype['detectColumnRenamings'] = function noop() {
+    };
+    applied = true;
+}

package/dist/schema-sync.js

@@ -1,4 +1,41 @@
-import { getOrm } from "./db.js";
+import { getOrm, getEm } from "./db.js";
+import { introspectAllColumns, isColumnHandedOver } from "./migrations.js";
+import { getLogger } from '@coffer-org/sdk/logger';
+const log = getLogger('schema-sync');
+const q = (id) => `"${id.replace(/"/g, '""')}"`;
+async function warnAboutColumnsToBeDropped() {
+    try {
+        const orm = getOrm();
+        const em = getEm().fork();
+        const metas = [...orm.getMetadata().getAll().values()].filter((m) => !m.virtual && !m.pivotTable && m.tableName);
+        const live = await introspectAllColumns(em, [...new Set(metas.map((m) => m.tableName))]);
+        for (const meta of metas) {
+            const tableName = meta.tableName;
+            const columns = live.get(tableName);
+            if (!columns)
+                continue;
+            const known = new Set();
+            for (const prop of meta.props)
+                for (const f of prop.fieldNames ?? [])
+                    known.add(f);
+            const droppable = [...columns].filter((c) => !known.has(c) && !isColumnHandedOver(tableName, c));
+            if (!droppable.length)
+                continue;
+            const conn = em.getConnection();
+            for (const col of droppable) {
+                const rows = (await conn.execute(`SELECT COUNT(*) AS n FROM ${q(tableName)} WHERE ${q(col)} IS NOT NULL`));
+                const n = rows[0]?.n ?? 0;
+                if (n > 0) {
+                    log.warn(`schema sync is about to DROP ${tableName}.${col} — it still holds ${n} row(s) of data. Add a migration (TableOps.convert/renameColumn/changeType) before the next start, or the data is lost.`);
+                }
+            }
+        }
+    }
+    catch (e) {
+        log.error('drop-warning check failed (diagnostic only, sync continues)', e);
+    }
+}
 export async function syncSchema() {
+    await warnAboutColumnsToBeDropped();
     await getOrm().schema.update({ safe: false, dropTables: false });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coffer-org/server",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "type": "module",
   "engines": {
     "node": ">=24"
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@coffer-org/core": "^3.3.0",
-    "@coffer-org/sdk": "^3.3.0",
+    "@coffer-org/sdk": "^3.4.0",
     "@extractus/oembed-extractor": "^4.1.0",
     "@fastify/cors": "^11.2.0",
     "@fastify/multipart": "^10.0.0",