@ghentcdh/crouton-api 0.0.1-alpha.60 → 0.0.1-alpha.67

package/dist/index.cjs

@@ -70,7 +70,7 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 
-// ../../node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.58.8_@types+node@26.4.0__@swc+core@1.16.1_@swc+he_53e7170f1cd8909962d4b3404cf3712f/node_modules/tsup/assets/cjs_shims.js
+// ../../node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.58.8_@types+node@26.4.0__@swc+core@1.16.1_@swc+he_9a17c50ee76d0369ad0c28a18d209a0d/node_modules/tsup/assets/cjs_shims.js
 var getImportMetaUrl = /* @__PURE__ */ __name(() => typeof document === "undefined" ? new URL(`file:${__filename}`).href : document.currentScript && document.currentScript.tagName.toUpperCase() === "SCRIPT" ? document.currentScript.src : new URL("main.js", document.baseURI).href, "getImportMetaUrl");
 var importMetaUrl = /* @__PURE__ */ getImportMetaUrl();
 
@@ -98,7 +98,8 @@ var RequestSchema = import_zod2.z.object({
   sort: import_zod2.z.string().optional().default("id"),
   sortDir: SortDirEnum.optional().default("asc"),
   // Filter is of the format key:value:operator (e.g. name:john:eq) operator is optional
-  filter: StringOrArray().optional().default([])
+  filter: StringOrArray().optional().default([]),
+  q: import_zod2.z.string().optional()
 });
 var RequestSchemaWithOffset = RequestSchema.transform((schema) => {
   const { page, pageSize, sort } = schema;
@@ -773,7 +774,7 @@ var FieldInputSchema = import_zod9.z.object({
   * Supports dynamic default tokens evaluated at form-open time:
   * - `"$now"` — current datetime ISO string
   * - `"$today"` — current date ISO string (date only, e.g. `"2025-03-14"`)
-  * - `"$user.id"` — current user id (requires `user` on `CroutonPlugin` config)
+  * - `"$user"` — current user object (requires `defaults: { '$user': ... }` on `CroutonPlugin` config, or `useCrouton().setDefault('$user', ...)`)
   */
   defaultValue: import_zod9.z.unknown().optional(),
   options: import_zod9.z.union([
@@ -2846,7 +2847,7 @@ var resolveLanguage = /* @__PURE__ */ __name((acceptLanguage, supported, default
 }, "resolveLanguage");
 
 // src/lib/crouton-api.module.ts
-var import_common26 = require("@nestjs/common");
+var import_common27 = require("@nestjs/common");
 var import_core2 = require("@nestjs/core");
 
 // src/lib/crud/app-layout/app-layout.types.ts
@@ -3172,6 +3173,28 @@ var patchViewTitles = /* @__PURE__ */ __name((views, columnLabels) => {
         } : vc;
       });
     }
+    const patchUiElements = /* @__PURE__ */ __name((elements) => {
+      for (const el of elements) {
+        if (!el || typeof el !== "object") continue;
+        const element = el;
+        const scope = element.scope;
+        if (scope) {
+          const match = /^#\/properties\/([^/]+)/.exec(scope);
+          if (match) {
+            const translated = columnLabels.get(match[1]);
+            if (translated) {
+              const opts = element.options;
+              if (opts && typeof opts === "object") opts.label = translated;
+            }
+          }
+        }
+        const nested = element.elements;
+        if (Array.isArray(nested)) patchUiElements(nested);
+      }
+    }, "patchUiElements");
+    const uiSchema = patchedView.ui_schema;
+    const uiElements = uiSchema?.elements;
+    if (Array.isArray(uiElements)) patchUiElements(uiElements);
     patched[viewName] = patchedView;
   }
   return patched;
@@ -4373,8 +4396,16 @@ var ReadRepository = class {
     const subResources = this.config.subResources ?? [];
     const projection = this.projection("findAll");
     const vlCols = await resolveValueLabelColumns(this.config.route, this.config.valueLabelColumns, this.configRegistry);
+    const filterWhere = this.buildWhere(params.filter);
+    const searchWhere = this.buildSearchOrWhere(params.q);
+    const where = filterWhere && searchWhere ? {
+      AND: [
+        filterWhere,
+        searchWhere
+      ]
+    } : filterWhere ?? searchWhere;
     const query = {
-      where: this.buildWhere(params.filter),
+      where,
       take: params.pageSize,
       skip: offsetOf(params),
       orderBy: this.safeSort(sanitizeValueLabelSort(params.sort, vlCols), params.sortDir)
@@ -4432,10 +4463,30 @@ var ReadRepository = class {
     const withCalc = await mergeCalculatedColumnsForRows(mapped, this.config.calculatedColumns ?? [], this.tableName, this.prisma, this.config.idField ?? "id");
     return withCalc;
   }
-  /** Count records matching the given filter strings. */
-  count(filter) {
+  buildSearchOrWhere(q) {
+    const lookup = this.config.lookup;
+    const labels = lookup?.labels?.length ? lookup.labels : lookup?.label ? [
+      lookup.label
+    ] : void 0;
+    if (!q || !labels?.length) return void 0;
+    return {
+      OR: labels.map((path) => buildNestedPath(path.split("."), {
+        contains: q
+      }))
+    };
+  }
+  /** Count records matching the given filter strings and optional free-text search. */
+  count(filter, q) {
+    const filterWhere = this.buildWhere(filter);
+    const searchWhere = this.buildSearchOrWhere(q);
+    const where = filterWhere && searchWhere ? {
+      AND: [
+        filterWhere,
+        searchWhere
+      ]
+    } : filterWhere ?? searchWhere;
     return this.prismaModel.count({
-      where: this.buildWhere(filter)
+      where
     });
   }
   /**
@@ -4946,7 +4997,7 @@ var PrismaDataSourceAdapter = class {
     const reader = new ReadRepository(prismaModel, this, ctx.config, ctx.listSelect, ctx.oneSelect, ctx.configRegistry);
     const [data, count] = await Promise.all([
       reader.findAll(params, ctx.request),
-      reader.count(params.filter ?? [])
+      reader.count(params.filter ?? [], params.q)
     ]);
     return {
       data,
@@ -4955,7 +5006,7 @@ var PrismaDataSourceAdapter = class {
   }
   async count(model, filter, ctx) {
     const reader = new ReadRepository(this.prismaModel(model), this, ctx.config, void 0, void 0, ctx.configRegistry);
-    return reader.count(filter);
+    return reader.count(filter, ctx.q);
   }
   async findOne(model, id, ctx) {
     const prismaModel = this.prismaModel(model);
@@ -5438,7 +5489,10 @@ function createCrudRepository(prisma, config, dataSources, configRegistry) {
         });
         return decorateFindAll2(data, request);
       }, "findAll"),
-      count: /* @__PURE__ */ __name((filter) => resolvedAdapter.count(adapterModelKey, filter, baseCtx), "count"),
+      count: /* @__PURE__ */ __name((filter, q) => resolvedAdapter.count(adapterModelKey, filter, {
+        ...baseCtx,
+        q
+      }), "count"),
       findOne: /* @__PURE__ */ __name(async (id, request) => {
         const row = await resolvedAdapter.findOne(adapterModelKey, id, ctx(request, "findOne", id));
         if (row === null || row === void 0) throw new import_common10.NotFoundException(`${config.name} with id ${id} not found`);
@@ -6172,19 +6226,10 @@ var ZodValidationPipe = class {
 };
 
 // src/lib/crud/operations/register-findall.ts
-var _findAll = /* @__PURE__ */ __name(async (repo, params, q, lookupLabel, request) => {
-  const effectiveParams = {
-    ...params
-  };
-  if (q && lookupLabel) {
-    effectiveParams.filter = [
-      ...params.filter ?? [],
-      `${lookupLabel}:${q}`
-    ];
-  }
-  const { data, count } = repo.findAllWithCount ? await repo.findAllWithCount(effectiveParams, request) : await Promise.all([
-    repo.findAll(effectiveParams, request),
-    repo.count(effectiveParams.filter)
+var _findAll = /* @__PURE__ */ __name(async (repo, params, request) => {
+  const { data, count } = repo.findAllWithCount ? await repo.findAllWithCount(params, request) : await Promise.all([
+    repo.findAll(params, request),
+    repo.count(params.filter ?? [], params.q)
   ]).then(([data2, count2]) => ({
     data: data2,
     count: count2
@@ -6223,9 +6268,8 @@ var defaultFindAll = /* @__PURE__ */ __name((ctx) => {
   if (!isOperationEnabled2(ctx.definition, "findAll")) return;
   if (isOperationExternal2(ctx.definition, "findAll")) return;
   const { config } = ctx;
-  const lookupLabel = config.lookup?.label;
-  const findAll = /* @__PURE__ */ __name(async function(params, q, req) {
-    return _findAll(this.repo, params, q, lookupLabel, req);
+  const findAll = /* @__PURE__ */ __name(async function(params, req) {
+    return _findAll(this.repo, params, req);
   }, "findAll");
   return {
     route: "",
@@ -6241,12 +6285,12 @@ var childFindAll = /* @__PURE__ */ __name((sub) => (ctx) => {
   if (!isOperationEnabled2(sub.operations, "findAll")) return;
   const { cls } = ctx;
   const methodName = `findAllBy_${sub.childRoute}`;
-  const findAll = /* @__PURE__ */ __name(async function(params, q, id, req) {
+  const findAll = /* @__PURE__ */ __name(async function(params, id, req) {
     return findAllByParent(this.repo, id, sub.childRoute, params, req);
   }, "findAll");
   const decorators = /* @__PURE__ */ __name(() => {
-    (0, import_common17.Param)("id")(cls.prototype, methodName, 2);
-    (0, import_common17.Req)()(cls.prototype, methodName, 3);
+    (0, import_common17.Param)("id")(cls.prototype, methodName, 1);
+    (0, import_common17.Req)()(cls.prototype, methodName, 2);
   }, "decorators");
   return {
     name: sub.childRoute,
@@ -6267,8 +6311,7 @@ var registerFindAll = /* @__PURE__ */ __name((ctx, sub) => {
   const d = desc(cls, methodName);
   (0, import_common17.Get)(route)(cls.prototype, methodName, d);
   (0, import_common17.Query)(new ZodValidationPipe(RequestDtoNoOffset.schema))(cls.prototype, methodName, 0);
-  (0, import_common17.Query)("q")(cls.prototype, methodName, 1);
-  if (!sub) (0, import_common17.Req)()(cls.prototype, methodName, 2);
+  if (!sub) (0, import_common17.Req)()(cls.prototype, methodName, 1);
   (0, import_swagger5.ApiOperation)({
     summary: `List all ${name}s`
   })(cls.prototype, methodName, d);
@@ -6950,12 +6993,23 @@ var defaultSchemas = /* @__PURE__ */ __name((ctx) => {
 var childSchemas = /* @__PURE__ */ __name((sub) => (ctx) => {
   if (!sub.views) return null;
   const { config, baseUrl } = ctx;
+  const { route } = config;
   const schemasPayload = buildSubResourceViewsPayload(config, sub, baseUrl);
   return {
     route: `${sub.childRoute}/schemas`,
     methodName: `getSchemas_${sub.childRoute}`,
     name: sub.childRoute,
     schemasFn: /* @__PURE__ */ __name(async function() {
+      const language = getRequestLanguage();
+      if (IS_DEV || language) {
+        const localizedParent = await this.configRegistry.getByRoute(route, language);
+        if (localizedParent) {
+          const localizedSub = (localizedParent.subResources ?? []).find((s) => s.childRoute === sub.childRoute);
+          if (localizedSub) {
+            return buildSubResourceViewsPayload(localizedParent, localizedSub, baseUrl) ?? schemasPayload;
+          }
+        }
+      }
       return schemasPayload;
     }, "schemasFn"),
     decorators: /* @__PURE__ */ __name(() => {
@@ -8839,6 +8893,38 @@ var injectEnumValues2 = /* @__PURE__ */ __name((columns, enums) => {
   }
 }, "injectEnumValues");
 
+// src/lib/crud/interceptors/no-cache.interceptor.ts
+var import_common25 = require("@nestjs/common");
+function _ts_decorate9(decorators, target, key, desc2) {
+  var c = arguments.length, r = c < 3 ? target : desc2 === null ? desc2 = Object.getOwnPropertyDescriptor(target, key) : desc2, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function") {
+    r = Reflect.decorate(decorators, target, key, desc2);
+  } else {
+    for (var i = decorators.length - 1; i >= 0; i--) {
+      if (d = decorators[i]) {
+        r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+      }
+    }
+  }
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+__name(_ts_decorate9, "_ts_decorate");
+var NoCacheInterceptor = class {
+  static {
+    __name(this, "NoCacheInterceptor");
+  }
+  intercept(context, next) {
+    const response = context.switchToHttp().getResponse();
+    response.setHeader("Cache-Control", "no-cache, no-store, must-revalidate");
+    response.setHeader("Pragma", "no-cache");
+    response.setHeader("Expires", "0");
+    return next.handle();
+  }
+};
+NoCacheInterceptor = _ts_decorate9([
+  (0, import_common25.Injectable)()
+], NoCacheInterceptor);
+
 // src/lib/crud/builder/schema.helpers.ts
 var pickByColumns = /* @__PURE__ */ __name((schema, columns, filter) => {
   if (!schema) return void 0;
@@ -9171,7 +9257,7 @@ var fromJson = /* @__PURE__ */ __name((json, schema, hooks, dirPath, baseUrl, ac
       };
     }
   }
-  const lookup = buildLookup(enrichedColumns);
+  const lookup = buildLookup(enrichedColumns, dirPath);
   const enrichedInclude = enrichIncludeWithSort2(json.include, enrichedColumns);
   const definition = buildResourceDefinitions2(schema, json.operations, enrichedColumns);
   return {
@@ -9228,15 +9314,26 @@ var fromJson = /* @__PURE__ */ __name((json, schema, hooks, dirPath, baseUrl, ac
     ...pickExtensions2(json)
   };
 }, "fromJson");
-var buildLookup = /* @__PURE__ */ __name((columns) => {
+var buildLookup = /* @__PURE__ */ __name((columns, dirPath) => {
   if (!columns) return void 0;
   const keyCol = columns.find((c) => c.idField);
-  const labelCol = columns.find((c) => c.showInLookup) ?? columns.find((c) => c.searchable);
-  if (!keyCol && !labelCol) return void 0;
+  const searchCols = columns.filter((c) => c.showInLookup || c.searchable);
+  if (!keyCol && !searchCols.length) return void 0;
+  const labels = searchCols.map((col) => {
+    if (col.fieldInput?.relationType === "manyToOne" && col.fieldInput?.resource && dirPath) {
+      const relationName = col.id.replace(/Id$/, "");
+      const child = resolveChildResource(col.fieldInput.resource, dirPath);
+      const childColumns = child ? expandExtendColumns(child.json.columns, dirPath) : void 0;
+      const displayCol = childColumns?.find((c) => !c.idField && !c.hiddenInTable);
+      if (displayCol) return `${relationName}.${displayCol.id}`;
+    }
+    return col.id;
+  });
   return {
     key: keyCol?.id ?? "id",
-    ...labelCol && {
-      label: labelCol.id
+    ...labels.length && {
+      label: labels[0],
+      labels
     }
   };
 }, "buildLookup");
@@ -9788,9 +9885,9 @@ var buildStatus = /* @__PURE__ */ __name(async (registry2, loadedConfigs, enumRe
 }, "buildStatus");
 
 // src/lib/crud/status/status.controller.ts
-var import_common25 = require("@nestjs/common");
+var import_common26 = require("@nestjs/common");
 var import_swagger13 = require("@nestjs/swagger");
-function _ts_decorate9(decorators, target, key, desc2) {
+function _ts_decorate10(decorators, target, key, desc2) {
   var c = arguments.length, r = c < 3 ? target : desc2 === null ? desc2 = Object.getOwnPropertyDescriptor(target, key) : desc2, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") {
     r = Reflect.decorate(decorators, target, key, desc2);
@@ -9803,7 +9900,7 @@ function _ts_decorate9(decorators, target, key, desc2) {
   }
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name(_ts_decorate9, "_ts_decorate");
+__name(_ts_decorate10, "_ts_decorate");
 function _ts_metadata9(metadataKey, metadataValue) {
   if (typeof Reflect === "object" && typeof Reflect.metadata === "function") {
     return Reflect.metadata(metadataKey, metadataValue);
@@ -9826,8 +9923,8 @@ var createStatusController = /* @__PURE__ */ __name((enumRegistry, translationRe
       return buildStatus(this.dataSourceRegistry, configs, enumRegistry, translationRegistry);
     }
   };
-  _ts_decorate9([
-    (0, import_common25.Get)("status.json"),
+  _ts_decorate10([
+    (0, import_common26.Get)("status.json"),
     (0, import_swagger13.ApiOperation)({
       summary: "Crouton system status (db, resources, version)"
     }),
@@ -9839,8 +9936,8 @@ var createStatusController = /* @__PURE__ */ __name((enumRegistry, translationRe
     _ts_metadata9("design:paramtypes", []),
     _ts_metadata9("design:returntype", Promise)
   ], StatusController.prototype, "getStatus", null);
-  StatusController = _ts_decorate9([
-    (0, import_common25.Controller)(prefix ? `${prefix}/crouton` : "crouton"),
+  StatusController = _ts_decorate10([
+    (0, import_common26.Controller)(prefix ? `${prefix}/crouton` : "crouton"),
     (0, import_swagger13.ApiTags)("Status"),
     _ts_metadata9("design:type", Function),
     _ts_metadata9("design:paramtypes", [
@@ -9858,7 +9955,7 @@ var createStatusController = /* @__PURE__ */ __name((enumRegistry, translationRe
 // src/lib/crouton-api.module.ts
 var import_node_path20 = require("path");
 var import_node_url2 = require("url");
-function _ts_decorate10(decorators, target, key, desc2) {
+function _ts_decorate11(decorators, target, key, desc2) {
   var c = arguments.length, r = c < 3 ? target : desc2 === null ? desc2 = Object.getOwnPropertyDescriptor(target, key) : desc2, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") {
     r = Reflect.decorate(decorators, target, key, desc2);
@@ -9871,7 +9968,7 @@ function _ts_decorate10(decorators, target, key, desc2) {
   }
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name(_ts_decorate10, "_ts_decorate");
+__name(_ts_decorate11, "_ts_decorate");
 var CroutonApiModule = class _CroutonApiModule {
   static {
     __name(this, "CroutonApiModule");
@@ -9980,6 +10077,10 @@ var CroutonApiModule = class _CroutonApiModule {
         ResourceConfigRegistry
       ],
       providers: [
+        {
+          provide: import_core2.APP_INTERCEPTOR,
+          useClass: NoCacheInterceptor
+        },
         {
           provide: import_core2.APP_FILTER,
           useClass: CroutonValidationExceptionFilter
@@ -10028,8 +10129,8 @@ var CroutonApiModule = class _CroutonApiModule {
     return _CroutonApiModule.forResources(configs, dataSources, loader, appConfig, config);
   }
 };
-CroutonApiModule = _ts_decorate10([
-  (0, import_common26.Module)({
+CroutonApiModule = _ts_decorate11([
+  (0, import_common27.Module)({
     controllers: [],
     providers: [],
     exports: []