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

package/dist/index.cjs

@@ -161,6 +161,15 @@ var ResponseSchema = import_zod4.z.object({
 // ../crouton-core/src/lib/create-schema.ts
 var import_zod6 = require("zod");
 
+// ../crouton-core/src/lib/schema.utils.ts
+var isNullableProperty = /* @__PURE__ */ __name((property) => {
+  const prop = property;
+  if (!prop) return false;
+  if (Array.isArray(prop["type"]) && prop["type"].includes("null")) return true;
+  const anyOf = prop["anyOf"];
+  return Array.isArray(anyOf) && anyOf.some((s) => s?.["type"] === "null");
+}, "isNullableProperty");
+
 // ../crouton-core/src/lib/layout/base.builder.ts
 var Builder = class {
   static {
@@ -1669,10 +1678,6 @@ var allowAdditionalProperties = /* @__PURE__ */ __name((schema) => {
     allowAdditionalProperties(schema["items"]);
   }
 }, "allowAdditionalProperties");
-var isNullableProperty = /* @__PURE__ */ __name((prop) => {
-  const anyOf = prop?.["anyOf"];
-  return Array.isArray(anyOf) && anyOf.some((s) => s?.["type"] === "null");
-}, "isNullableProperty");
 var dropNullableFromRequired = /* @__PURE__ */ __name((schema) => {
   if (schema["type"] !== "object") return;
   const props = schema["properties"];
@@ -1824,6 +1829,11 @@ var buildDetailLayout = /* @__PURE__ */ __name((detail) => {
 var defaultControlFormat = /* @__PURE__ */ __name((col) => {
   if (isObjectColumn(col)) return "object";
   if (isArrayColumn(col)) return "array";
+  const typeName = columnTypeName(col.type);
+  if (typeName === "number" || typeName === "integer") return typeName;
+  const format = columnTypeToJsonSchema(col.type).format;
+  if (format === "date") return "date";
+  if (format === "date-time") return "dateTime";
   return "text";
 }, "defaultControlFormat");
 var buildFormControl = /* @__PURE__ */ __name((col) => {
@@ -3755,7 +3765,10 @@ var isTableProcedureAction = /* @__PURE__ */ __name((action) => action.type !==
 var import_node_fs4 = require("fs");
 var import_node_module = require("module");
 var import_node_path5 = require("path");
+var import_node_url = require("url");
+var import_meta = {};
 var _require = (0, import_node_module.createRequire)(importMetaUrl ?? __filename);
+var IS_ESM = typeof import_meta !== "undefined" && typeof importMetaUrl === "string";
 var findModule = /* @__PURE__ */ __name((dir, name) => {
   for (const ext of [
     ".ts",
@@ -3773,6 +3786,9 @@ var importDefault = /* @__PURE__ */ __name(async (filePath, onError) => {
       const importPath = IS_DEV ? `${filePath}?t=${Date.now()}` : filePath;
       const mod = await import(importPath);
       return mod.default ?? mod;
+    } else if (IS_ESM) {
+      const mod = await import((0, import_node_url.pathToFileURL)(filePath).href);
+      return mod.default ?? mod;
     } else {
       const mod = _require(filePath);
       return mod.default;
@@ -5326,14 +5342,10 @@ function isZodSchema(schema) {
   return schema instanceof import_zod40.ZodObject;
 }
 __name(isZodSchema, "isZodSchema");
-var isNullableProperty2 = /* @__PURE__ */ __name((property) => {
-  const anyOf = property?.["anyOf"];
-  return Array.isArray(anyOf) && anyOf.some((s) => s?.["type"] === "null");
-}, "isNullableProperty");
 var dropNullableFromRequired2 = /* @__PURE__ */ __name((jsonSchema) => {
   const { properties, required } = jsonSchema;
   if (!properties || !Array.isArray(required)) return;
-  jsonSchema.required = required.filter((key) => !isNullableProperty2(properties[key]));
+  jsonSchema.required = required.filter((key) => !isNullableProperty(properties[key]));
 }, "dropNullableFromRequired");
 function toJsonSchema2(schema) {
   if (isZodSchema(schema)) {
@@ -8130,65 +8142,29 @@ var prismaGenerate = /* @__PURE__ */ __name(async (cwd, prismaConfig) => {
 ${stderr}`.trim()
   };
 }, "prismaGenerate");
-var fixZodImports = /* @__PURE__ */ __name(async (zodOutputDir) => {
-  let fixed = 0;
-  const walk = /* @__PURE__ */ __name(async (dir) => {
-    let entries;
-    try {
-      entries = await (0, import_promises7.readdir)(dir, {
-        withFileTypes: true
-      });
-    } catch {
-      return;
-    }
-    for (const entry of entries) {
-      const full = (0, import_node_path15.join)(dir, entry.name);
-      if (entry.isDirectory()) {
-        await walk(full);
-      } else if (entry.name.endsWith(".ts")) {
-        const src = await (0, import_promises7.readFile)(full, "utf-8");
-        if (src.includes("z.") && !src.includes("from 'zod'") && !src.includes('from "zod"')) {
-          await (0, import_promises7.writeFile)(full, `import { z } from 'zod';
-${src}`, "utf-8");
-          fixed++;
-        }
-      }
-    }
-  }, "walk");
-  await walk(zodOutputDir);
-  return fixed;
-}, "fixZodImports");
 var pullAndGenerate = /* @__PURE__ */ __name(async (input) => {
-  const { root, prismaConfigPath, schemaPath, zodOutputDir } = input;
+  const { root, prismaConfigPath, schemaPath } = input;
   loadDotenv(root);
   const backupPath = await backupSchema(schemaPath);
   const dbPull = await prismaDbPull(root, prismaConfigPath);
-  if (!dbPull.ok) {
-    return {
-      ok: false,
-      backupPath,
-      dbPull
-    };
-  }
+  if (!dbPull.ok) return {
+    ok: false,
+    backupPath,
+    dbPull
+  };
   const caseFormat = await prismaCaseFormat(root, schemaPath);
   const normalized = await normalizeSchema(schemaPath);
-  const normalizeResult = {
-    ok: true,
-    renamed: normalized.renamed
-  };
   const generate = await prismaGenerate(root, prismaConfigPath);
-  let zodImportsFixed;
-  if (generate.ok && zodOutputDir) {
-    zodImportsFixed = await fixZodImports(zodOutputDir);
-  }
   return {
     ok: true,
     backupPath,
     dbPull,
     caseFormat,
-    normalizeSchema: normalizeResult,
-    generate,
-    zodImportsFixed
+    normalizeSchema: {
+      ok: true,
+      renamed: normalized.renamed
+    },
+    generate
   };
 }, "pullAndGenerate");
 var normalizeSchema = /* @__PURE__ */ __name(async (schemaPath, configDir) => {
@@ -8889,6 +8865,8 @@ var injectEnumValues2 = /* @__PURE__ */ __name((columns, enums) => {
     };
     const options = col.fieldInput.options ?? {};
     if (!("values" in options)) options.values = values;
+    if (!("emitObject" in options)) options.emitObject = true;
+    if (!("displayKey" in options)) options.displayKey = "label";
     col.fieldInput.options = options;
   }
 }, "injectEnumValues");
@@ -9176,7 +9154,10 @@ var buildSubResources = /* @__PURE__ */ __name((columns, parentRoute, parentMode
       // A custom child has no Prisma model. Leave it empty rather than
       // falling back to the column id, which would produce a bogus
       // `prisma[<column>]` lookup at query time.
-      childModel: childKind === "custom" ? "" : c.id,
+      // Use the child resource's declared model name so plural column ids
+      // (e.g. "books") resolve to the correct Prisma delegate (prisma.book).
+      // ponytail: charAt toLowerCase is cheap; Prisma model names are always PascalCase
+      childModel: childKind === "custom" ? "" : childJson?.model ? childJson.model.charAt(0).toLowerCase() + childJson.model.slice(1) : c.id,
       foreignKey: c.fieldInput?.foreignKey ?? `${parentModel}Id`,
       name: childJson?.name ?? childRoute,
       title: childJson?.title ?? childJson?.tag ?? childRoute,
@@ -9624,12 +9605,12 @@ var FileSystemResourceConfigLoader = class extends ResourceConfigLoader2 {
 // src/lib/crud/status/status.service.ts
 var import_node_fs11 = require("fs");
 var import_node_path19 = require("path");
-var import_node_url = require("url");
+var import_node_url2 = require("url");
 var CONNECTION_STRING_PATTERN = /(?:postgresql|postgres|mysql|mongodb|sqlserver|sqlite):\/\/[^\s"')]+/gi;
 var stripConnectionStrings = /* @__PURE__ */ __name((message) => message.replace(CONNECTION_STRING_PATTERN, "[REDACTED]"), "stripConnectionStrings");
 var getCroutonVersion = /* @__PURE__ */ __name(() => {
   try {
-    const startDir = typeof __dirname !== "undefined" ? __dirname : (0, import_node_path19.dirname)((0, import_node_url.fileURLToPath)(importMetaUrl));
+    const startDir = typeof __dirname !== "undefined" ? __dirname : (0, import_node_path19.dirname)((0, import_node_url2.fileURLToPath)(importMetaUrl));
     let dir = startDir;
     while (dir !== (0, import_node_path19.dirname)(dir)) {
       const pkgPath = (0, import_node_path19.join)(dir, "package.json");
@@ -9954,7 +9935,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");
+var import_node_url3 = require("url");
 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") {
@@ -9992,7 +9973,7 @@ var CroutonApiModule = class _CroutonApiModule {
     const dataSourceRegistry = new DataSourceRegistry(dataSources);
     const guardRegistry = new SecurityGuardRegistry(security?.guards ?? {});
     const moduleDefaultSecurity = security?.default;
-    const startDir = typeof __dirname !== "undefined" ? __dirname : (0, import_node_path20.dirname)((0, import_node_url2.fileURLToPath)(importMetaUrl));
+    const startDir = typeof __dirname !== "undefined" ? __dirname : (0, import_node_path20.dirname)((0, import_node_url3.fileURLToPath)(importMetaUrl));
     const enumRegistry = loadEnumRegistry(startDir, config.enumsFile);
     const validConfigs = [];
     for (const c of configs) {