@ghentcdh/create-crouton 0.0.1-alpha.42 → 0.0.1-alpha.46

package/dist/index.js

@@ -18854,25 +18854,38 @@ var transformDataSource = (data) => {
 };
 var DataSourceSchema = DataSourceShape.transform(transformDataSource);
 
+// ../crouton-core/src/lib/data-source/Security.schema.ts
+var SecuritySchema = external_exports.union([
+  external_exports.object({ public: external_exports.literal(true) }),
+  external_exports.object({ guard: external_exports.union([external_exports.string(), external_exports.array(external_exports.string()).min(1)]) })
+]);
+
 // ../crouton-core/src/lib/data-source/Operations.schema.ts
+var OpEntry = external_exports.union([
+  external_exports.boolean(),
+  external_exports.object({ security: SecuritySchema.optional() })
+]);
 var BoolOrUpsertSchema = external_exports.union([
   external_exports.boolean(),
-  external_exports.object({ upsertOn: external_exports.union([external_exports.string(), external_exports.array(external_exports.string())]) })
+  external_exports.object({
+    upsertOn: external_exports.union([external_exports.string(), external_exports.array(external_exports.string())]),
+    security: SecuritySchema.optional()
+  })
 ]);
 var JsonOperationsSchema = external_exports.object({
-  findAll: external_exports.boolean().default(true),
+  findAll: OpEntry.default(true),
   // default: true — only explicit `false` disables it
-  findOne: external_exports.boolean().default(true),
+  findOne: OpEntry.default(true),
   // default: true
-  create: external_exports.boolean().default(true),
+  create: OpEntry.default(true),
   // default: true
-  update: external_exports.boolean().default(true),
+  update: OpEntry.default(true),
   // default: true
-  patch: external_exports.boolean().default(true),
+  patch: OpEntry.default(true),
   // default: true
   upsert: BoolOrUpsertSchema.default(false),
   // default: disabled; `true` throws at load time — must be `{ upsertOn }`
-  delete: external_exports.boolean().default(true)
+  delete: OpEntry.default(true)
   // default: true
 });
 
@@ -19374,6 +19387,8 @@ var ResourceJsonShape = external_exports.object({
   // default: shown, alphabetically ordered, ungrouped
   display: JsonDisplaySchema.default(JsonDisplaySchema.parse({})),
   // default: { mode: 'modal', customComponent: null }
+  /** Global security block — applies to every operation unless overridden per-operation. */
+  security: SecuritySchema.optional(),
   operations: JsonOperationsSchema,
   // required key — but every sub-field defaults to enabled
   columns: ColumnsSchema.default(ColumnsSchema.parse({})),
@@ -19523,11 +19538,17 @@ var ViewColumnConfigSchema = external_exports.object({
   fieldInput: FieldInputSchema.optional()
 });
 var ViewConfigSchema = external_exports.object({
-  json_schema: external_exports.record(external_exports.string(), external_exports.unknown()),
-  ui_schema: external_exports.record(external_exports.string(), external_exports.unknown()),
+  // TODO why we have both?
+  json_schema: external_exports.record(external_exports.string(), external_exports.unknown()).optional(),
+  ui_schema: external_exports.record(external_exports.string(), external_exports.unknown()).optional(),
+  // TODO why we have both?
+  ui: external_exports.record(external_exports.string(), external_exports.unknown()).optional(),
+  data: external_exports.record(external_exports.string(), external_exports.unknown()).optional(),
   columns: external_exports.array(ViewColumnConfigSchema),
   defaultSort: external_exports.string().optional()
 });
+var viewDefList = ["table", "view", "form"];
+var ViewDefEnum = external_exports.enum(viewDefList);
 
 // ../crouton-core/src/lib/i18n/Translations.schema.ts
 var NestedStringRecord = external_exports.lazy(
@@ -19816,21 +19837,30 @@ var runCreate = async (name, opts) => {
       M2.info(`Using pnpm ${pnpmVersion}`);
     }
     const dbUrl = await resolveDbUrl(opts);
+    const postgres = opts.docker !== false ? await resolvePostgres(opts) : false;
     const dbName = name.replace(/[^a-zA-Z0-9]/g, "_");
+    const appName = prefix || name;
     const tokens = {
       name,
       Name: toTitle(name),
-      version: true ? "0.0.1-alpha.42" : "latest",
+      version: true ? "0.0.1-alpha.46" : "latest",
       year: String((/* @__PURE__ */ new Date()).getFullYear()),
       pmRun: pm === "npm" ? "npm run" : pm,
       urlEnv: "DATABASE_URL",
       dbUrl: dbUrl || `postgresql://crouton:crouton@localhost:5432/${dbName}?schema=public`,
-      dbName
+      dbName,
+      appName,
+      frontendPort: "4200",
+      backendPort: "3000"
     };
     if (layout === "nx") {
       tokens["nx"] = "true";
-      tokens["backendApp"] = "backend";
-      tokens["frontendApp"] = "frontend";
+      tokens["backendApp"] = `${appName}-backend`;
+      tokens["frontendApp"] = `${appName}-frontend`;
+      tokens["workspaceRoot"] = prefix || ".";
+      tokens["dockerfileDev"] = prefix ? `${prefix}/Dockerfile.dev` : "Dockerfile.dev";
+      tokens["envFile"] = prefix ? `${prefix}/.env` : ".env";
+      tokens["generatedGlob"] = prefix ? `${prefix}/generated/default` : "generated/default";
       if (prefix) {
         tokens["prefix"] = prefix;
         tokens["appsRoot"] = `${prefix}/apps`;
@@ -19846,10 +19876,23 @@ var runCreate = async (name, opts) => {
         tokens["generatedTypesPath"] = "generated/default/types/src";
         tokens["generatedClientPath"] = "generated/default/client";
       }
+    } else {
+      tokens["regular"] = "true";
+      tokens["dockerfileDev"] = "Dockerfile.dev";
+      tokens["envFile"] = ".env";
     }
     if (frontend) {
       tokens["frontend"] = "true";
     }
+    if (layout === "nx" && frontend) {
+      tokens["nxFrontend"] = "true";
+    }
+    if (layout === "nx" && !frontend) {
+      tokens["nxBackendOnly"] = "true";
+    }
+    if (postgres) {
+      tokens["postgres"] = "true";
+    }
     const templateRoot = resolveTemplateDir();
     const skipPaths = !frontend ? ["apps/frontend"] : [];
     if (layout === "nx") {
@@ -19872,12 +19915,12 @@ var runCreate = async (name, opts) => {
       );
       files.push(...workspaceFiles);
       if (opts.docker !== false) {
-        const dockerDir = resolve2(templateRoot, "docker");
-        const dockerFiles = await loadAndRenderTemplates(
-          dockerDir,
-          "",
+        const dockerFiles = await renderDockerTemplates(
+          templateRoot,
           tokens,
-          targetDir
+          targetDir,
+          workspaceTarget,
+          { postgres }
         );
         files.push(...dockerFiles);
       }
@@ -19914,13 +19957,12 @@ var runCreate = async (name, opts) => {
         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 renderDockerTemplates(
+          templateRoot,
+          tokens,
+          targetDir,
+          targetDir,
+          { postgres }
         );
         files.push(...dockerFiles);
       }
@@ -19949,7 +19991,7 @@ var runCreate = async (name, opts) => {
     const prefixFlag = prefix ? ` --prefix ${prefix}` : "";
     Me(
       [
-        opts.docker !== false ? "docker compose up -d          # start postgres" : null,
+        opts.docker !== false && postgres ? "docker compose up -d          # start postgres" : null,
         `${pmRun} prisma:migrate          # create initial migration`,
         `crouton update resources${prefixFlag}        # generate resource CRUD`,
         `${pmRun} dev                     # start dev server`
@@ -19965,6 +20007,78 @@ var runCreate = async (name, opts) => {
     throw err;
   }
 };
+var renderDockerTemplates = async (templateRoot, tokens, targetDir, workspaceTarget, opts) => {
+  const dockerDir = resolve2(templateRoot, "docker");
+  const files = [];
+  const composeYml = render(
+    await loadTemplate(dockerDir, "compose.yml.tmpl"),
+    tokens
+  );
+  files.push({ path: resolve2(targetDir, "compose.yml"), contents: composeYml });
+  const composeApp = render(
+    await loadTemplate(dockerDir, "compose.app.tmpl"),
+    tokens
+  );
+  files.push({
+    path: resolve2(targetDir, `compose.app.${tokens["appName"]}.yml`),
+    contents: composeApp
+  });
+  if (opts.postgres) {
+    const composeInfra = render(
+      await loadTemplate(dockerDir, "compose.infra.yml.tmpl"),
+      tokens
+    );
+    files.push({
+      path: resolve2(targetDir, "compose.infra.yml"),
+      contents: composeInfra
+    });
+    const envInfra = render(
+      await loadTemplate(dockerDir, ".env.infra.tmpl"),
+      tokens
+    );
+    files.push({
+      path: resolve2(targetDir, ".env.infra"),
+      contents: envInfra
+    });
+    const envInfraExample = render(
+      await loadTemplate(dockerDir, ".env.infra.example.tmpl"),
+      tokens
+    );
+    files.push({
+      path: resolve2(targetDir, ".env.infra.example"),
+      contents: envInfraExample
+    });
+    files.push({
+      path: resolve2(targetDir, "docker/init-data/.gitkeep"),
+      contents: ""
+    });
+  }
+  const dockerfileDev = render(
+    await loadTemplate(dockerDir, "Dockerfile.dev.tmpl"),
+    tokens
+  );
+  files.push({
+    path: resolve2(workspaceTarget, "Dockerfile.dev"),
+    contents: dockerfileDev
+  });
+  const dockerfileProd = render(
+    await loadTemplate(dockerDir, "Dockerfile.prod.tmpl"),
+    tokens
+  );
+  files.push({
+    path: resolve2(workspaceTarget, "Dockerfile.prod"),
+    contents: dockerfileProd
+  });
+  const dockerignore = render(
+    await loadTemplate(dockerDir, ".dockerignore.tmpl"),
+    tokens
+  );
+  files.push({
+    path: resolve2(targetDir, ".dockerignore"),
+    contents: dockerignore
+  });
+  return files;
+};
 var postScaffold = async (opts, targetDir, pm, dbUrl, prefix) => {
   if (opts.git !== false) {
     const s = Y2();
@@ -20077,6 +20191,16 @@ var resolveDbUrl = async (opts) => {
   );
   return url2.trim();
 };
+var resolvePostgres = async (opts) => {
+  if (opts.yes) return opts.postgres;
+  if (!opts.postgres) return false;
+  return assertNotCancel(
+    await ye({
+      message: "Run PostgreSQL in Docker?",
+      initialValue: true
+    })
+  );
+};
 var loadAndRenderTemplates = async (templateDir, subPath, tokens, targetDir, skipPaths = []) => {
   const files = [];
   const dir = subPath ? resolve2(templateDir, subPath) : templateDir;
@@ -20105,7 +20229,7 @@ var loadAndRenderTemplates = async (templateDir, subPath, tokens, targetDir, ski
 };
 
 // src/index.ts
-var program2 = new Command("create-crouton").description("Scaffold a new crouton project").version("0.0.1").argument("[name]", "project name", "my-crouton-app").option("--nx", "use Nx monorepo layout").option("--no-nx", "use regular (non-Nx) layout").option("--no-frontend", "skip frontend app generation").option("--sample", "include sample resource").option("--pm <manager>", "package manager (pnpm | npm | yarn | bun)").option("--no-install", "skip dependency installation").option("--no-git", "skip git init").option("--prefix <name>", "nest apps/config under a subfolder (Nx only)").option("--no-docker", "skip Docker file generation").option("-y, --yes", "accept all defaults (non-interactive)").option("--force", "overwrite existing files").option("--db-url <url>", "database connection URL (e.g. postgresql://user:pass@localhost:5432/db)").action(async (name, opts) => {
+var program2 = new Command("create-crouton").description("Scaffold a new crouton project").version("0.0.1").argument("[name]", "project name", "my-crouton-app").option("--nx", "use Nx monorepo layout").option("--no-nx", "use regular (non-Nx) layout").option("--no-frontend", "skip frontend app generation").option("--sample", "include sample resource").option("--pm <manager>", "package manager (pnpm | npm | yarn | bun)").option("--no-install", "skip dependency installation").option("--no-git", "skip git init").option("--prefix <name>", "nest apps/config under a subfolder (Nx only)").option("--no-docker", "skip Docker file generation").option("--no-postgres", "skip PostgreSQL in Docker (use external DB)").option("-y, --yes", "accept all defaults (non-interactive)").option("--force", "overwrite existing files").option("--db-url <url>", "database connection URL (e.g. postgresql://user:pass@localhost:5432/db)").action(async (name, opts) => {
   try {
     await runCreate(name, opts);
   } catch (err) {