@paneljs/paneljs 0.1.0 → 0.2.1

package/dist/listQuery.js

@@ -37,15 +37,7 @@ function parseFilterValue(field, value) {
             throw new RequestValidationError(`Filter "${field.name}" is not supported.`);
     }
 }
-export function buildListWhere(scope, filters, search) {
-    const conditions = [scope, filters, search].filter((condition) => condition !== undefined && Object.keys(condition).length > 0);
-    if (conditions.length === 0)
-        return {};
-    if (conditions.length === 1)
-        return conditions[0] ?? {};
-    return { AND: conditions };
-}
-export function parseListQuery(query, meta, model, databaseProvider) {
+export function parseListQuery(query, meta, model) {
     const pageValue = Number(getQueryValue(query, "page") ?? 1);
     if (!Number.isInteger(pageValue) || pageValue < 1)
         throw new RequestValidationError("Query parameter \"page\" must be a positive integer.");
@@ -79,12 +71,15 @@ export function parseListQuery(query, meta, model, databaseProvider) {
             if (field.type !== "datetime")
                 throw new RequestValidationError(`Filter "${parameterName}" is only supported for date-time fields.`);
             const operator = rangeMatch[2];
-            if (!operator)
+            if (operator !== "gte" && operator !== "lte")
                 throw new RequestValidationError(`Filter "${parameterName}" is invalid.`);
-            filters[fieldName] = { ...filters[fieldName], [operator]: parseFilterValue(field, rawValue) };
+            const existing = filters[fieldName];
+            const range = existing && !("equals" in existing) && !("in" in existing) ? { ...existing } : {};
+            range[operator] = parseFilterValue(field, rawValue);
+            filters[fieldName] = range;
         }
         else {
-            filters[fieldName] = parseFilterValue(field, rawValue);
+            filters[fieldName] = { equals: parseFilterValue(field, rawValue) };
         }
     }
     const searchValue = getQueryValue(query, "search")?.trim();
@@ -94,13 +89,11 @@ export function parseListQuery(query, meta, model, databaseProvider) {
         const field = fieldsByName.get(fieldName);
         return field?.type === "string" && isFieldVisible(field, model.raw);
     });
-    const search = searchValue ? {
-        OR: searchFields.map((fieldName) => ({
-            [fieldName]: { contains: searchValue, ...(databaseProvider === "postgresql" ? { mode: "insensitive" } : {}) },
-        })),
-    } : undefined;
     if (searchValue && searchFields.length === 0)
         throw new RequestValidationError(`Model "${meta.name}" has no searchable fields.`);
+    const search = searchValue
+        ? { text: searchValue, fields: searchFields }
+        : undefined;
     return { page: pageValue, sort, dir, filters, search };
 }
 //# sourceMappingURL=listQuery.js.map

package/dist/listQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"listQuery.js","sourceRoot":"","sources":["../src/listQuery.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAKzE,SAAS,aAAa,CAAC,KAAe,EAAE,IAAY;IACjD,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1B,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC1C,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,MAAM,IAAI,sBAAsB,CAAC,oBAAoB,IAAI,kCAAkC,CAAC,CAAC;IAC5H,OAAO,KAAK,CAAC;AAChB,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAqB,EAAE,KAAa;IAC3D,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,QAAQ,CAAC;QACd,KAAK,OAAO;YACT,OAAO,KAAK,CAAC;QAChB,KAAK,QAAQ,CAAC,CAAC,CAAC;YACb,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YAC7B,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAAE,MAAM,IAAI,sBAAsB,CAAC,WAAW,KAAK,CAAC,IAAI,4BAA4B,CAAC,CAAC;YAClH,OAAO,MAAM,CAAC;QACjB,CAAC;QACD,KAAK,SAAS;YACX,IAAI,KAAK,KAAK,MAAM,IAAI,KAAK,KAAK,OAAO;gBAAE,MAAM,IAAI,sBAAsB,CAAC,WAAW,KAAK,CAAC,IAAI,8BAA8B,CAAC,CAAC;YACjI,OAAO,KAAK,KAAK,MAAM,CAAC;QAC3B,KAAK,UAAU,CAAC,CAAC,CAAC;YACf,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;YAC7B,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAAE,MAAM,IAAI,sBAAsB,CAAC,WAAW,KAAK,CAAC,IAAI,mCAAmC,CAAC,CAAC;YAC7H,OAAO,IAAI,CAAC;QACf,CAAC;QACD,KAAK,MAAM;YACR,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,KAAK,CAAC;gBAAE,MAAM,IAAI,sBAAsB,CAAC,WAAW,KAAK,CAAC,IAAI,qBAAqB,KAAK,CAAC,UAAU,SAAS,CAAC,CAAC;YAC9I,OAAO,KAAK,CAAC;QAChB,KAAK,MAAM,CAAC;QACZ,KAAK,UAAU;YACZ,MAAM,IAAI,sBAAsB,CAAC,WAAW,KAAK,CAAC,IAAI,qBAAqB,CAAC,CAAC;IACnF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,KAA8B,EAAE,OAAgC,EAAE,MAA2C;IACzI,MAAM,UAAU,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,SAAS,EAAwC,EAAE,CAAC,SAAS,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACtK,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IACvC,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,UAAU,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACxD,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC;AAC9B,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,KAAe,EAAE,IAAoB,EAAE,KAA0B,EAAE,gBAAyB;IACxH,MAAM,SAAS,GAAG,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5D,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,SAAS,GAAG,CAAC;QAAE,MAAM,IAAI,sBAAsB,CAAC,sDAAsD,CAAC,CAAC;IAC5I,IAAI,SAAS,GAAG,MAAM;QAAE,MAAM,IAAI,sBAAsB,CAAC,mDAAmD,CAAC,CAAC;IAE9G,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC;IAC9E,MAAM,GAAG,GAAG,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC;IAChF,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,IAAI,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IACxJ,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC;QAAE,MAAM,IAAI,sBAAsB,CAAC,UAAU,IAAI,+BAA+B,CAAC,CAAC;IAC/G,IAAI,GAAG,KAAK,KAAK,IAAI,GAAG,KAAK,MAAM;QAAE,MAAM,IAAI,sBAAsB,CAAC,6DAA6D,CAAC,CAAC;IAErI,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IAC9E,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE;QAC7E,MAAM,KAAK,GAAG,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC1C,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,IAAI,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAC/F,CAAC,CAAC,CAAC,CAAC;IACJ,MAAM,OAAO,GAA4B,EAAE,CAAC;IAC5C,MAAM,oBAAoB,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;IAExE,KAAK,MAAM,CAAC,aAAa,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7D,IAAI,oBAAoB,CAAC,GAAG,CAAC,aAAa,CAAC;YAAE,SAAS;QACtD,IAAI,OAAO,QAAQ,KAAK,QAAQ;YAAE,MAAM,IAAI,sBAAsB,CAAC,oBAAoB,aAAa,kCAAkC,CAAC,CAAC;QAExI,MAAM,UAAU,GAAG,kBAAkB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC1D,MAAM,SAAS,GAAG,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,aAAa,CAAC;QACnD,MAAM,KAAK,GAAG,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC1C,IAAI,CAAC,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC;YAAE,MAAM,IAAI,sBAAsB,CAAC,WAAW,aAAa,kCAAkC,CAAC,CAAC;QAE7I,IAAI,UAAU,EAAE,CAAC;YACd,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU;gBAAE,MAAM,IAAI,sBAAsB,CAAC,WAAW,aAAa,2CAA2C,CAAC,CAAC;YACrI,MAAM,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;YAC/B,IAAI,CAAC,QAAQ;gBAAE,MAAM,IAAI,sBAAsB,CAAC,WAAW,aAAa,eAAe,CAAC,CAAC;YACzF,OAAO,CAAC,SAAS,CAAC,GAAG,EAAE,GAAI,OAAO,CAAC,SAAS,CAAyC,EAAE,CAAC,QAAQ,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC1I,CAAC;aAAM,CAAC;YACL,OAAO,CAAC,SAAS,CAAC,GAAG,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC1D,CAAC;IACJ,CAAC;IAED,MAAM,WAAW,GAAG,aAAa,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC;IAC3D,IAAI,WAAW,IAAI,WAAW,CAAC,MAAM,GAAG,GAAG;QAAE,MAAM,IAAI,sBAAsB,CAAC,6DAA6D,CAAC,CAAC;IAC7I,MAAM,YAAY,GAAG,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE;QACnE,MAAM,KAAK,GAAG,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC1C,OAAO,KAAK,EAAE,IAAI,KAAK,QAAQ,IAAI,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC;QAC1B,EAAE,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;YAClC,CAAC,SAAS,CAAC,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,CAAC,gBAAgB,KAAK,YAAY,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE;SAC/G,CAAC,CAAC;KACL,CAAC,CAAC,CAAC,SAAS,CAAC;IACd,IAAI,WAAW,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;QAAE,MAAM,IAAI,sBAAsB,CAAC,UAAU,IAAI,CAAC,IAAI,6BAA6B,CAAC,CAAC;IAEjI,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;AAC1D,CAAC"}
+{"version":3,"file":"listQuery.js","sourceRoot":"","sources":["../src/listQuery.ts"],"names":[],"mappings":"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"}

package/dist/query.d.ts

@@ -0,0 +1,65 @@
+/** Field equality used by `scope()` and as the base of every query. */
+export type EqualityFilter = Record<string, unknown>;
+/** One list/query constraint on a single field. Not a Prisma `where` object. */
+export type FieldFilter = {
+    equals: string | number | boolean | Date | null;
+} | {
+    in: Array<string | number>;
+} | {
+    gte?: Date | number;
+    lte?: Date | number;
+};
+export type FieldFilters = Record<string, FieldFilter>;
+export type SearchQuery = {
+    text: string;
+    fields: string[];
+};
+export type RelationSelect = {
+    field: string;
+    displayField: string;
+};
+export type FieldSelect = {
+    fields: string[];
+    relations: RelationSelect[];
+};
+export type FindManyQuery = {
+    scope: EqualityFilter;
+    filters: FieldFilters;
+    search?: SearchQuery;
+    ids?: Array<string | number>;
+    sort?: {
+        field: string;
+        direction: "asc" | "desc";
+    };
+    skip?: number;
+    take?: number;
+    select: FieldSelect;
+};
+export type CountQuery = Pick<FindManyQuery, "scope" | "filters" | "search" | "ids">;
+export type FindFirstQuery = {
+    scope: EqualityFilter;
+    id: string | number;
+    select: FieldSelect;
+};
+export type CreateQuery = {
+    data: Record<string, unknown>;
+    select: FieldSelect;
+};
+export type UpdateManyQuery = {
+    scope: EqualityFilter;
+    id?: string | number;
+    ids?: Array<string | number>;
+    data: Record<string, unknown>;
+};
+export type DeleteManyQuery = {
+    scope: EqualityFilter;
+    id?: string | number;
+    ids?: Array<string | number>;
+};
+/** Custom action `where`: scope plus the selected row ids. Not a Prisma `where`. */
+export type ActionWhere = {
+    scope: EqualityFilter;
+    ids: Array<string | number>;
+};
+export declare function idSelect(idField: string): FieldSelect;
+export declare function withSelectFields(select: FieldSelect, fieldNames: string[]): FieldSelect;

package/dist/query.js

@@ -0,0 +1,12 @@
+export function idSelect(idField) {
+    return { fields: [idField], relations: [] };
+}
+export function withSelectFields(select, fieldNames) {
+    const fields = [...select.fields];
+    for (const name of fieldNames) {
+        if (!fields.includes(name))
+            fields.push(name);
+    }
+    return { fields, relations: select.relations };
+}
+//# sourceMappingURL=query.js.map

package/dist/query.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAqEA,MAAM,UAAU,QAAQ,CAAC,OAAe;IACrC,OAAO,EAAE,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,MAAmB,EAAE,UAAoB;IACvE,MAAM,MAAM,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IAClC,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;QAC7B,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjD,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC;AAClD,CAAC"}

package/dist/recordSelection.d.ts

@@ -1,13 +1,10 @@
 import type { DataAdapter } from "./adapter.js";
 import type { FullRegisteredModel } from "./registry.js";
+import type { FieldSelect } from "./query.js";
 import type { AdminModelMeta, AdminUser } from "./types.js";
 /** Build the safe select used by detail and edit endpoints. */
-export declare function buildRecordSelect(meta: AdminModelMeta, model: FullRegisteredModel): Record<string, true | {
-    select: Record<string, true>;
-}>;
+export declare function buildRecordSelect(meta: AdminModelMeta, model: FullRegisteredModel): FieldSelect;
 /** Only return columns the list is configured to display, plus the primary key. */
-export declare function buildListRecordSelect(meta: AdminModelMeta, model: FullRegisteredModel): Record<string, true | {
-    select: Record<string, true>;
-}>;
+export declare function buildListRecordSelect(meta: AdminModelMeta, model: FullRegisteredModel): FieldSelect;
 /** Verify submitted belongs-to IDs are visible under the related model's own access rules. */
 export declare function assertSelectedRelationsAreVisible(data: Record<string, unknown>, model: FullRegisteredModel, models: Map<string, FullRegisteredModel>, adapter: DataAdapter, adminUser: AdminUser): Promise<void>;

package/dist/recordSelection.js

@@ -1,12 +1,14 @@
 import { hasModelPermission } from "./permissions.js";
-import { buildScopedRecordWhere, resolveScope } from "./scope.js";
+import { idSelect } from "./query.js";
+import { resolveScope } from "./scope.js";
 import { parseRecordId } from "./ids.js";
 import { isFieldVisible, isSensitiveFieldName, RequestValidationError } from "./validation.js";
 import { PermissionDeniedError } from "./errors.js";
-/** Build the safe select used by detail and edit endpoints. */
-export function buildRecordSelect(meta, model) {
-    const select = Object.fromEntries(meta.fields.filter((field) => field.type !== "relation" && isFieldVisible(field, model.raw)).map((field) => [field.name, true]));
+function relationSelects(meta, model, allowedNames) {
+    const relations = [];
     for (const fieldName of model.resolved.listDisplay) {
+        if (allowedNames && !allowedNames.has(fieldName))
+            continue;
         const field = meta.fields.find((candidate) => candidate.name === fieldName);
         if (!field?.relation || !isFieldVisible(field, model.raw))
             continue;
@@ -14,25 +16,28 @@ export function buildRecordSelect(meta, model) {
             continue;
         if (isSensitiveFieldName(field.relation.displayField))
             continue;
-        select[field.name] = { select: { [field.relation.displayField]: true } };
+        relations.push({ field: field.name, displayField: field.relation.displayField });
     }
-    return select;
+    return relations;
+}
+/** Build the safe select used by detail and edit endpoints. */
+export function buildRecordSelect(meta, model) {
+    const fields = meta.fields
+        .filter((field) => field.type !== "relation" && isFieldVisible(field, model.raw))
+        .map((field) => field.name);
+    if (!fields.includes(meta.idField))
+        fields.unshift(meta.idField);
+    return { fields, relations: relationSelects(meta, model) };
 }
 /** Only return columns the list is configured to display, plus the primary key. */
 export function buildListRecordSelect(meta, model) {
     const allowed = new Set([meta.idField, ...model.resolved.listDisplay]);
-    const select = Object.fromEntries(meta.fields.filter((field) => field.type !== "relation" && allowed.has(field.name) && isFieldVisible(field, model.raw)).map((field) => [field.name, true]));
-    select[meta.idField] = true;
-    for (const fieldName of model.resolved.listDisplay) {
-        const field = meta.fields.find((candidate) => candidate.name === fieldName);
-        if (!field?.relation || !isFieldVisible(field, model.raw))
-            continue;
-        if (field.relation.kind !== "belongsTo" && field.relation.kind !== "hasOne")
-            continue;
-        if (!isSensitiveFieldName(field.relation.displayField))
-            select[field.name] = { select: { [field.relation.displayField]: true } };
-    }
-    return select;
+    const fields = meta.fields
+        .filter((field) => field.type !== "relation" && allowed.has(field.name) && isFieldVisible(field, model.raw))
+        .map((field) => field.name);
+    if (!fields.includes(meta.idField))
+        fields.unshift(meta.idField);
+    return { fields, relations: relationSelects(meta, model, allowed) };
 }
 /** Verify submitted belongs-to IDs are visible under the related model's own access rules. */
 export async function assertSelectedRelationsAreVisible(data, model, models, adapter, adminUser) {
@@ -55,8 +60,9 @@ export async function assertSelectedRelationsAreVisible(data, model, models, ada
             throw new PermissionDeniedError();
         const relatedScope = await resolveScope(relatedModel.raw, adminUser);
         const relatedRecord = await adapter.resource(relatedModel.meta).findFirst({
-            where: buildScopedRecordWhere(relatedScope, relatedModel.meta.idField, parseRecordId(relatedModel.meta, String(selectedId))),
-            select: { [relatedModel.meta.idField]: true },
+            scope: relatedScope,
+            id: parseRecordId(relatedModel.meta, String(selectedId)),
+            select: idSelect(relatedModel.meta.idField),
         });
         if (!relatedRecord)
             throw new RequestValidationError(`The selected ${relation.model} record is unavailable.`);

package/dist/recordSelection.js.map

@@ -1 +1 @@
-{"version":3,"file":"recordSelection.js","sourceRoot":"","sources":["../src/recordSelection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"recordSelection.js","sourceRoot":"","sources":["../src/recordSelection.ts"],"names":[],"mappings":"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"}

package/dist/scope.d.ts

@@ -1,5 +1,5 @@
 import type { AdminUser, ModelConfig } from "./types.js";
-/** A Prisma-compatible where fragment returned by a model scope function. */
+/** Equality (and historically nested) filter returned by a model scope function. */
 export type ScopeFilter = Record<string, unknown>;
 /**
  * Resolve a model's tenant or ownership scope for an authenticated admin.

package/dist/types.d.ts

@@ -1,4 +1,6 @@
 import type { DataAdapter } from "./adapter.js";
+import type { ActionWhere } from "./query.js";
+import type { AdminAuthStore } from "./authStore.js";
 export type AdminFieldType = "string" | "number" | "boolean" | "datetime" | "json" | "enum" | "relation" | "bytes";
 export type RelationKind = "belongsTo" | "hasMany" | "manyToMany" | "hasOne";
 export interface AdminFieldMeta {
@@ -56,7 +58,7 @@ export interface AdminAction {
         ids: Array<string | number>;
         adminUser: AdminUser;
         client: unknown;
-        where: Record<string, unknown>;
+        where: ActionWhere;
     }) => Promise<{
         message: string;
     }>;
@@ -119,6 +121,8 @@ export interface BuiltInAuthConfig {
         windowMs?: number;
         maxAttempts?: number;
     };
+    /** Optional override. Prisma adapters supply a store via `createAuthStore`. */
+    store?: AdminAuthStore;
 }
 export type AuthConfig = ExternalAuthConfig | BuiltInAuthConfig;
 export interface AdminAuditEvent {
@@ -142,6 +146,7 @@ export interface AdminConfig {
     audit?: AuditConfig;
     basePath?: string;
     siteName?: string;
+    /** @deprecated Ignored. The Prisma adapter reads the datasource provider from `schema.prisma`. */
     databaseProvider?: "postgresql" | "mysql" | "sqlite" | "sqlserver" | "mongodb";
 }
 export interface PaginatedResponse<T> {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@paneljs/paneljs",
-  "version": "0.1.0",
-  "description": "Schema-driven admin panel core. Register models, serve a guarded operations UI.",
+  "version": "0.2.1",
+  "description": "Django-style, schema-driven Prisma admin panel for Express and Node.js applications.",
   "license": "MIT",
   "type": "module",
   "author": "Divinesta",
@@ -15,10 +15,15 @@
   },
   "homepage": "https://github.com/divinesta/paneljs",
   "keywords": [
-    "admin",
-    "admin-panel",
+    "prisma-admin",
+    "prisma-admin-panel",
     "express",
     "prisma",
+    "express-admin",
+    "nodejs-admin",
+    "django-admin-alternative",
+    "typescript-admin",
+    "schema-driven",
     "crud"
   ],
   "exports": {
@@ -33,6 +38,7 @@
     "dist",
     "ui/dist",
     "README.md",
+    "CHANGELOG.md",
     "LICENSE"
   ],
   "engines": {
@@ -41,14 +47,17 @@
   "publishConfig": {
     "access": "public"
   },
-  "devDependencies": {
-    "@types/node": "^22.15.3",
-    "typescript": "5.9.2"
-  },
   "scripts": {
     "build": "pnpm --dir ui build && tsc -p tsconfig.build.json",
     "dev": "pnpm --dir ui dev",
     "lint": "echo \"paneljs: no lint yet\"",
-    "check-types": "tsc --noEmit -p tsconfig.json"
+    "check-types": "tsc --noEmit -p tsconfig.json",
+    "test": "vitest run --passWithNoTests",
+    "test:unit": "vitest run --passWithNoTests",
+    "prepublishOnly": "pnpm run build"
+  },
+  "devDependencies": {
+    "@types/node": "^22.15.3",
+    "typescript": "5.9.2"
   }
-}
+}