@ghentcdh/create-crouton 0.0.1-alpha.26 → 0.0.1-alpha.28

package/dist/index.js

@@ -19069,7 +19069,7 @@ var SidebarGroupSchema = zod_default.object({
   /** Human-readable heading shown in the sidebar. Defaults to a title-cased version of the slug. */
   label: zod_default.string().optional(),
   /** Controls the order of this group among top-level sidebar items. */
-  position: zod_default.string().optional()
+  position: zod_default.number().optional()
 });
 var SidebarSchema = zod_default.object({
   hide: zod_default.boolean().default(false),
@@ -19243,7 +19243,9 @@ var RulesetSchema = external_exports.object({
   showRelationsInForm: external_exports.boolean().default(true),
   enumValueLabel: external_exports.boolean().default(true),
   sharedEnums: external_exports.boolean().default(true),
-  defaultOperations: JsonOperationsSchema.default(JsonOperationsSchema.parse({}))
+  defaultOperations: JsonOperationsSchema.default(
+    JsonOperationsSchema.parse({})
+  )
 });
 var CroutonConfigSchema = external_exports.object({
   /**
@@ -19262,7 +19264,7 @@ var CroutonConfigSchema = external_exports.object({
    */
   schemaExportName: external_exports.string().default("{Model}WithRelationsSchema"),
   /** Path to the shared enum registry, relative to project root. Default `crouton.enums.json`. */
-  enumsFile: external_exports.string().default("croutons.enums.json"),
+  enumsFile: external_exports.string().default("crouton.enums.json"),
   /** Optional overrides of the default visibility ruleset. */
   rules: RulesetSchema.default(RulesetSchema.parse({})),
   /**
@@ -19334,9 +19336,10 @@ var buildDatasourceFiles = (opts) => {
     urlEnv: opts.urlEnv,
     generatedTypesImport: opts.generatedTypesImport,
     zodOutput,
+    clientOutput,
     prismaConfig
   };
-  const clientImport = relImport(dsDir, clientOutput);
+  const clientImport = opts.generatedClientImport ?? relImport(dsDir, clientOutput);
   const indexTs = `import { PrismaClient } from '${clientImport}';
 import { PrismaPg } from '@prisma/adapter-pg';
 
@@ -19372,14 +19375,17 @@ datasource db {
   // url is provided by ${prismaConfig} (Prisma 7 forbids \`url\` here)
 }
 `;
+  const configDir = dirname4(prismaConfig);
+  const relSchema = relImport(configDir, prismaSchema);
+  const relMigrations = relImport(configDir, migrationsDir);
   const prismaConfigTs = `// Generated by \`crouton create-datasource\`.
 import 'dotenv/config';
 import { defineConfig, env } from 'prisma/config';
 
 export default defineConfig({
-  schema: '${prismaSchema}',
+  schema: '${relSchema}',
   migrations: {
-    path: '${migrationsDir}',
+    path: '${relMigrations}',
   },
   datasource: {
     url: env('${opts.urlEnv}'),
@@ -19433,7 +19439,24 @@ var writeFiles = async (files, opts = {}) => {
 var loadTemplate = async (templateDir, relativePath) => readFile4(`${templateDir}/${relativePath}`, "utf-8");
 
 // src/lib/pm.ts
-import { spawn } from "child_process";
+import { execSync, spawn } from "child_process";
+var MIN_PNPM_MAJOR = 11;
+var checkPnpmVersion = () => {
+  let raw;
+  try {
+    raw = execSync("pnpm --version", { stdio: "pipe" }).toString().trim();
+  } catch {
+    throw new Error("pnpm is not installed. Install it with: npm i -g pnpm@latest");
+  }
+  const major = parseInt(raw.split(".")[0], 10);
+  if (isNaN(major) || major < MIN_PNPM_MAJOR) {
+    throw new Error(
+      `pnpm ${raw} detected, but version ${MIN_PNPM_MAJOR}+ is required.
+Upgrade with: npm i -g pnpm@latest`
+    );
+  }
+  return raw;
+};
 var installDeps = (pm, cwd) => new Promise((resolve3, reject) => {
   const child = spawn(pm, ["install"], { cwd, stdio: "inherit" });
   child.on(
@@ -19469,7 +19492,7 @@ var render = (template, tokens) => {
 };
 
 // src/runner.ts
-import { execSync } from "child_process";
+import { execSync as execSync2 } from "child_process";
 import { existsSync } from "fs";
 import { readdir as readdir4 } from "fs/promises";
 import { resolve as resolve2 } from "path";
@@ -19489,7 +19512,9 @@ var runCreate = async (name, opts) => {
     if (existsSync(targetDir) && !opts.force) {
       const entries = await readdir4(targetDir);
       if (entries.length > 0) {
-        M2.error(`Directory "${name}" already exists and is not empty. Use --force to overwrite.`);
+        M2.error(
+          `Directory "${name}" already exists and is not empty. Use --force to overwrite.`
+        );
         throw new CancelledError();
       }
     }
@@ -19497,6 +19522,10 @@ var runCreate = async (name, opts) => {
     const frontend = await resolveFrontend(opts, layout);
     const prefix = layout === "nx" ? await resolvePrefix(opts) : void 0;
     const pm = await resolvePm(opts);
+    if (pm === "pnpm") {
+      const pnpmVersion = checkPnpmVersion();
+      M2.info(`Using pnpm ${pnpmVersion}`);
+    }
     const dbUrl = await resolveDbUrl(opts);
     const dbName = name.replace(/[^a-zA-Z0-9]/g, "_");
     const tokens = {
@@ -19516,12 +19545,16 @@ var runCreate = async (name, opts) => {
         tokens["prefix"] = prefix;
         tokens["appsRoot"] = `${prefix}/apps`;
         tokens["schemaPath"] = "../../../node_modules/nx/schemas/project-schema.json";
-        tokens["generatedTypesPath"] = `${prefix}/generated/types/src`;
+        tokens["tsconfigBase"] = "../../../tsconfig.base.json";
+        tokens["generatedTypesPath"] = `${prefix}/generated/default/types/src`;
+        tokens["generatedClientPath"] = `${prefix}/generated/default/client`;
       } else {
         tokens["noPrefix"] = "true";
         tokens["appsRoot"] = "apps";
         tokens["schemaPath"] = "../../node_modules/nx/schemas/project-schema.json";
-        tokens["generatedTypesPath"] = "generated/types/src";
+        tokens["tsconfigBase"] = "../../tsconfig.base.json";
+        tokens["generatedTypesPath"] = "generated/default/types/src";
+        tokens["generatedClientPath"] = "generated/default/client";
       }
     }
     if (frontend) {
@@ -19531,51 +19564,89 @@ var runCreate = async (name, opts) => {
     const skipPaths = !frontend ? ["apps/frontend"] : [];
     if (layout === "nx") {
       const rootTemplateDir = resolve2(templateRoot, "nx", "root");
-      const rootFiles = await loadAndRenderTemplates(rootTemplateDir, "", tokens, targetDir);
+      const rootFiles = await loadAndRenderTemplates(
+        rootTemplateDir,
+        "",
+        tokens,
+        targetDir
+      );
       const files = [...rootFiles];
       const workspaceTemplateDir = resolve2(templateRoot, "nx", "workspace");
       const workspaceTarget = prefix ? resolve2(targetDir, prefix) : targetDir;
-      const workspaceFiles = await loadAndRenderTemplates(workspaceTemplateDir, "", tokens, workspaceTarget, skipPaths);
+      const workspaceFiles = await loadAndRenderTemplates(
+        workspaceTemplateDir,
+        "",
+        tokens,
+        workspaceTarget,
+        skipPaths
+      );
       files.push(...workspaceFiles);
       if (opts.docker !== false) {
         const dockerDir = resolve2(templateRoot, "docker");
-        const dockerFiles = await loadAndRenderTemplates(dockerDir, "", tokens, targetDir);
+        const dockerFiles = await loadAndRenderTemplates(
+          dockerDir,
+          "",
+          tokens,
+          targetDir
+        );
         files.push(...dockerFiles);
       }
       const dataSourcesDir = "apps/backend/src/app/data-sources";
-      const generatedImport = `@${name}/generated/default`;
+      const generatedImport = `@${name}/generated-default-types`;
+      const generatedClientImport = `@${name}/generated-default-client`;
       const { files: dsFiles } = buildDatasourceFiles({
         name: "default",
         dataSourcesDir,
         urlEnv: "DATABASE_URL",
         generatedTypesImport: generatedImport,
+        generatedClientImport,
         type: "postgres",
-        default: true
+        default: true,
+        zodOutput: "generated/default/types/src",
+        clientOutput: "generated/default/client"
       });
       for (const f of dsFiles) {
-        files.push({ path: resolve2(workspaceTarget, f.path), contents: f.contents });
+        files.push({
+          path: resolve2(workspaceTarget, f.path),
+          contents: f.contents
+        });
       }
       const written = await writeFiles(files, { force: opts.force });
       M2.success(`Wrote ${written} file(s) to ${import_picocolors3.default.cyan(name)}/`);
       await postScaffold(opts, targetDir, pm, dbUrl, prefix);
     } else {
       const templateDir = resolve2(templateRoot, "regular");
-      const files = await loadAndRenderTemplates(templateDir, "", tokens, targetDir, skipPaths);
+      const files = await loadAndRenderTemplates(
+        templateDir,
+        "",
+        tokens,
+        targetDir,
+        skipPaths
+      );
       if (opts.docker !== false) {
         const dockerTokens = { ...tokens, regular: "true" };
         const dockerDir = resolve2(templateRoot, "docker");
-        const dockerFiles = await loadAndRenderTemplates(dockerDir, "", dockerTokens, targetDir);
+        const dockerFiles = await loadAndRenderTemplates(
+          dockerDir,
+          "",
+          dockerTokens,
+          targetDir
+        );
         files.push(...dockerFiles);
       }
       const dataSourcesDir = "src/data-sources";
-      const generatedImport = "@app/generated/default";
+      const generatedImport = "@app/generated/default/types";
+      const generatedClientImport = "@app/generated/default/client";
       const { files: dsFiles } = buildDatasourceFiles({
         name: "default",
         dataSourcesDir,
         urlEnv: "DATABASE_URL",
         generatedTypesImport: generatedImport,
+        generatedClientImport,
         type: "postgres",
-        default: true
+        default: true,
+        zodOutput: "generated/default/types/src",
+        clientOutput: "generated/default/client"
       });
       for (const f of dsFiles) {
         files.push({ path: resolve2(targetDir, f.path), contents: f.contents });
@@ -19585,11 +19656,12 @@ var runCreate = async (name, opts) => {
       await postScaffold(opts, targetDir, pm, dbUrl);
     }
     const pmRun = pm === "npm" ? "npm run" : pm;
+    const prefixFlag = prefix ? ` --prefix ${prefix}` : "";
     Me(
       [
         opts.docker !== false ? "docker compose up -d          # start postgres" : null,
         `${pmRun} prisma:migrate          # create initial migration`,
-        "crouton update resources        # generate resource CRUD",
+        `crouton update resources${prefixFlag}        # generate resource CRUD`,
         `${pmRun} dev                     # start dev server`
       ].filter(Boolean).join("\n"),
       "Next steps"
@@ -19608,7 +19680,7 @@ var postScaffold = async (opts, targetDir, pm, dbUrl, prefix) => {
     const s = Y2();
     s.start("Initializing git repository");
     try {
-      execSync('git init && git add -A && git commit -m "Initial commit"', {
+      execSync2('git init && git add -A && git commit -m "Initial commit"', {
         cwd: targetDir,
         stdio: "pipe"
       });
@@ -19629,22 +19701,26 @@ var postScaffold = async (opts, targetDir, pm, dbUrl, prefix) => {
     if (dbUrl) {
       try {
         const s2 = Y2();
-        s2.start("Running prisma generate");
-        const prismaConfigPath = prefix ? `${prefix}/prisma/default/prisma.config.ts` : "prisma/default/prisma.config.ts";
-        execSync(`npx prisma generate --config ${prismaConfigPath}`, {
-          cwd: targetDir,
-          stdio: "pipe"
+        s2.start("Running crouton update resources");
+        const croutonCwd = prefix ? resolve2(targetDir, prefix) : targetDir;
+        execSync2("npx crouton update resources --yes", {
+          cwd: croutonCwd,
+          stdio: "pipe",
+          env: { ...process.env, DATABASE_URL: dbUrl }
         });
-        s2.stop("Prisma client generated");
-      } catch {
-        M2.warn("prisma generate failed \u2014 run it manually after setting up your database.");
+        s2.stop("Resources updated");
+      } catch (err) {
+        const stderr = err instanceof Error && "stderr" in err ? String(err.stderr).trim() : "";
+        M2.warn(
+          "crouton update resources failed \u2014 run it manually after setting up your database." + (stderr ? `
+${import_picocolors3.default.dim(stderr)}` : "")
+        );
       }
-    } else {
-      M2.info("Skipping prisma generate \u2014 no database URL provided.");
     }
   }
 };
 var resolveLayout = async (opts) => {
+  if (opts.prefix) return "nx";
   if (opts.yes) return opts.nx ? "nx" : "regular";
   if (opts.nx) return "nx";
   const layout = assertNotCancel(
@@ -19652,7 +19728,10 @@ var resolveLayout = async (opts) => {
       message: "Project layout",
       options: [
         { value: "regular", label: "Regular (single NestJS app)" },
-        { value: "nx", label: "Nx monorepo (backend + frontend + shared libs)" }
+        {
+          value: "nx",
+          label: "Nx monorepo (backend + frontend + shared libs)"
+        }
       ]
     })
   );
@@ -19717,7 +19796,13 @@ var loadAndRenderTemplates = async (templateDir, subPath, tokens, targetDir, ski
     const relPath = subPath ? `${subPath}/${entry.name}` : entry.name;
     if (skipPaths.some((sp) => relPath.startsWith(sp))) continue;
     if (entry.isDirectory()) {
-      const nested = await loadAndRenderTemplates(templateDir, relPath, tokens, targetDir, skipPaths);
+      const nested = await loadAndRenderTemplates(
+        templateDir,
+        relPath,
+        tokens,
+        targetDir,
+        skipPaths
+      );
       files.push(...nested);
     } else if (entry.name.endsWith(".tmpl")) {
       const raw = await loadTemplate(templateDir, relPath);