@cedarjs/cli 6.0.0-canary.2839 → 6.0.0-canary.2841

package/dist/commands/generate/scaffold/scaffoldHandler.js

@@ -42,6 +42,7 @@ import { files as serviceFiles } from "../service/serviceHandler.js";
 import { customOrDefaultTemplatePath } from "../yargsHandlerHelpers.js";
 const SKIPPABLE_ASSETS = ["scaffold.css"];
 const PACKAGE_SET = "Set";
+const PACKAGE_PRIVATE_SET = "PrivateSet";
 const getIdType = (model) => {
   return model.fields.find((field) => field.isId)?.type;
 };
@@ -512,6 +513,65 @@ const addHelperPackages = async (task) => {
     await removeWorkspacePackages("web", ["humanize-string"]);
   });
 };
+const isAuthSetup = () => {
+  const extensions = ["ts", "js", "tsx", "jsx"];
+  return extensions.some(
+    (ext) => fs.existsSync(path.join(getPaths().web.src, "auth." + ext))
+  );
+};
+const ROUTE_TAG_RE = /<Route\s+([^>]*?)\/?>/g;
+const extractRouteAttr = (tagAttrs, attrName) => tagAttrs.match(new RegExp(`\\b${attrName}=["']([^"']+)["']`))?.[1];
+const getRoutesFileContent = () => {
+  const routesPath = getPaths().web.routes;
+  if (!fs.existsSync(routesPath)) {
+    return void 0;
+  }
+  return readFile(routesPath).toString();
+};
+const hasLoginRoute = () => {
+  const content = getRoutesFileContent();
+  if (!content) {
+    return false;
+  }
+  return Array.from(content.matchAll(ROUTE_TAG_RE)).some(
+    ([, attrs]) => extractRouteAttr(attrs, "name") === "login"
+  );
+};
+const findUnprotectedLandingPageRouteName = () => {
+  const content = getRoutesFileContent();
+  if (!content) {
+    return void 0;
+  }
+  const privateSetRanges = Array.from(
+    content.matchAll(/<PrivateSet\b[^>]*>([\s\S]*?)<\/PrivateSet>/g)
+  ).map((match) => ({
+    start: match.index ?? 0,
+    end: (match.index ?? 0) + match[0].length
+  }));
+  for (const match of content.matchAll(ROUTE_TAG_RE)) {
+    const [, attrs] = match;
+    if (extractRouteAttr(attrs, "path") !== "/") {
+      continue;
+    }
+    const tagStart = match.index ?? 0;
+    const isProtected = privateSetRanges.some(
+      (range) => tagStart >= range.start && tagStart < range.end
+    );
+    if (!isProtected) {
+      return extractRouteAttr(attrs, "name");
+    }
+  }
+  return void 0;
+};
+const getUnauthenticatedRedirectRoute = () => {
+  if (!isAuthSetup()) {
+    return void 0;
+  }
+  if (hasLoginRoute()) {
+    return "login";
+  }
+  return findUnprotectedLandingPageRouteName();
+};
 const addSetImport = (task) => {
   const routesPath = getPaths().web.routes;
   const routesContent = readFile(routesPath).toString();
@@ -525,15 +585,19 @@ const addSetImport = (task) => {
     return void 0;
   }
   const routerImports = importContent.replace(/\s/g, "").split(",");
-  if (routerImports.includes(PACKAGE_SET)) {
+  const namesToImport = [
+    PACKAGE_SET,
+    ...getUnauthenticatedRedirectRoute() ? [PACKAGE_PRIVATE_SET] : []
+  ].filter((name) => !routerImports.includes(name));
+  if (!namesToImport.length) {
     return "Skipping Set import";
   }
   const newRoutesContent = routesContent.replace(
     cedarRouterImport,
-    importStart + spacing + PACKAGE_SET + `,` + spacing + importContent + importEnd
+    importStart + spacing + namesToImport.join("," + spacing) + `,` + spacing + importContent + importEnd
   );
   writeFile(routesPath, newRoutesContent, { overwriteExisting: true });
-  return "Added Set import to Routes.{jsx,tsx}";
+  return `Added ${namesToImport.join(", ")} import to Routes.{jsx,tsx}`;
 };
 const addScaffoldSetToRouter = async (model, scaffoldPath) => {
   const templateNames = getTemplateStrings(model, scaffoldPath);
@@ -542,10 +606,12 @@ const addScaffoldSetToRouter = async (model, scaffoldPath) => {
   const titleTo = templateNames.pluralRouteName;
   const buttonLabel = `New ${nameVars.singularPascalName}`;
   const buttonTo = templateNames.newRouteName;
+  const unauthenticatedRoute = getUnauthenticatedRedirectRoute();
   return addRoutesToRouterTask(
     await routes({ model, path: scaffoldPath }),
     "ScaffoldLayout",
-    { title, titleTo, buttonLabel, buttonTo }
+    { title, titleTo, buttonLabel, buttonTo },
+    unauthenticatedRoute ? { unauthenticated: unauthenticatedRoute } : void 0
   );
 };
 const tasks = ({
@@ -664,7 +730,10 @@ const splitPathAndModel = (pathSlashModel) => {
 };
 export {
   files,
+  getUnauthenticatedRedirectRoute,
   handler,
+  hasLoginRoute,
+  isAuthSetup,
   routes,
   shouldUseTailwindCSS,
   splitPathAndModel,

package/dist/lib/index.js

@@ -305,20 +305,35 @@ const cleanupEmptyDirsTask = (files) => {
     })
   );
 };
-function wrapWithSet(routesContent, layout, routes, newLineAndIndent, props = {}) {
+function wrapWithSet(routesContent, layout, routes, newLineAndIndent, props = {}, privateSetProps) {
   const [_, indentOne, indentTwo] = routesContent.match(
     /([ \t]*)<Router.*?>[^<]*[\r\n]+([ \t]+)/
   ) || ["", "", ""];
   const oneLevelIndent = indentTwo.slice(0, indentTwo.length - indentOne.length);
-  const newRoutesWithExtraIndent = routes.map((route) => oneLevelIndent + route);
   const propsString = Object.entries(props).map((values) => `${values[0]}="${values[1]}"`).join(" ");
+  if (!privateSetProps) {
+    const newRoutesWithExtraIndent2 = routes.map(
+      (route) => oneLevelIndent + route
+    );
+    return [
+      `<Set wrap={${layout}}${propsString && " " + propsString}>`,
+      ...newRoutesWithExtraIndent2,
+      `</Set>`
+    ].join(newLineAndIndent);
+  }
+  const privateSetPropsString = Object.entries(privateSetProps).map((values) => `${values[0]}="${values[1]}"`).join(" ");
+  const newRoutesWithExtraIndent = routes.map(
+    (route) => oneLevelIndent + oneLevelIndent + route
+  );
   return [
-    `<Set wrap={${layout}}${propsString && " " + propsString}>`,
+    `<PrivateSet${privateSetPropsString && " " + privateSetPropsString}>`,
+    `${oneLevelIndent}<Set wrap={${layout}}${propsString && " " + propsString}>`,
     ...newRoutesWithExtraIndent,
-    `</Set>`
+    `${oneLevelIndent}</Set>`,
+    `</PrivateSet>`
   ].join(newLineAndIndent);
 }
-function addRoutesToRouterTask(routes, layout, setProps = {}) {
+function addRoutesToRouterTask(routes, layout, setProps = {}, privateSetProps) {
   const cedarPaths = getPaths();
   const routesContent = readFile(cedarPaths.web.routes).toString();
   let newRoutes = routes.filter((route) => !routesContent.match(route));
@@ -342,7 +357,8 @@ ${route}`);
       layout,
       newRoutes,
       newLineAndIndent,
-      setProps
+      setProps,
+      privateSetProps
     ) : newRoutes.join(newLineAndIndent);
     const newRoutesContent = routesContent.replace(
       routerStart,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "6.0.0-canary.2839",
+  "version": "6.0.0-canary.2841",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -36,17 +36,17 @@
     "@babel/preset-typescript": "7.29.7",
     "@babel/traverse": "7.29.7",
     "@babel/types": "7.29.7",
-    "@cedarjs/api-server": "6.0.0-canary.2839",
-    "@cedarjs/babel-config": "6.0.0-canary.2839",
-    "@cedarjs/cli-helpers": "6.0.0-canary.2839",
-    "@cedarjs/internal": "6.0.0-canary.2839",
-    "@cedarjs/prerender": "6.0.0-canary.2839",
-    "@cedarjs/project-config": "6.0.0-canary.2839",
-    "@cedarjs/structure": "6.0.0-canary.2839",
-    "@cedarjs/telemetry": "6.0.0-canary.2839",
-    "@cedarjs/utils": "6.0.0-canary.2839",
-    "@cedarjs/vite": "6.0.0-canary.2839",
-    "@cedarjs/web-server": "6.0.0-canary.2839",
+    "@cedarjs/api-server": "6.0.0-canary.2841",
+    "@cedarjs/babel-config": "6.0.0-canary.2841",
+    "@cedarjs/cli-helpers": "6.0.0-canary.2841",
+    "@cedarjs/internal": "6.0.0-canary.2841",
+    "@cedarjs/prerender": "6.0.0-canary.2841",
+    "@cedarjs/project-config": "6.0.0-canary.2841",
+    "@cedarjs/structure": "6.0.0-canary.2841",
+    "@cedarjs/telemetry": "6.0.0-canary.2841",
+    "@cedarjs/utils": "6.0.0-canary.2841",
+    "@cedarjs/vite": "6.0.0-canary.2841",
+    "@cedarjs/web-server": "6.0.0-canary.2841",
     "@listr2/prompt-adapter-enquirer": "4.3.0",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "1.30.1",
@@ -94,7 +94,7 @@
     "yargs": "17.7.3"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "6.0.0-canary.2839",
+    "@cedarjs/framework-tools": "6.0.0-canary.2841",
     "@prisma/dmmf": "7.8.0",
     "@types/archiver": "^7.0.0",
     "memfs": "4.64.0",