@cedarjs/cli 8.0.0-canary.3395 → 8.0.0-canary.3396

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

@@ -1,8 +1,7 @@
+import { parse } from "@babel/parser";
 import { Listr } from "listr2";
-import pascalcase from "pascalcase";
 import { colors as c } from "@cedarjs/cli-helpers/colors";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
-import { pluralize } from "@cedarjs/utils/cedarPluralize";
 import {
   deleteFilesTask,
   getPaths,
@@ -13,6 +12,7 @@ import {
 import { verifyModelName } from "../../../lib/schemaHelpers.js";
 import {
   files,
+  getScaffoldLayoutNames,
   routes as scaffoldRoutes,
   splitPathAndModel
 } from "../../generate/scaffold/scaffoldHandler.js";
@@ -23,45 +23,83 @@ const removeRoutesWithSet = async ({
 }) => {
   const routes = await scaffoldRoutes({ model, path, nestScaffoldByModel });
   const routeNames = routes.map(extractRouteName);
-  const pluralPascalName = pascalcase(pluralize(model));
-  const layoutName = `${pluralPascalName}Layout`;
-  return removeRoutesFromRouterTask(routeNames, layoutName);
+  const { importName } = getScaffoldLayoutNames(model, path);
+  return removeRoutesFromRouterTask(routeNames, importName);
+};
+const removeNamedImport = (code, source, name) => {
+  const program = parse(code, {
+    sourceType: "module",
+    plugins: ["jsx", "typescript"]
+  }).program;
+  for (const statement of program.body) {
+    if (statement.type !== "ImportDeclaration" || statement.source.value !== source) {
+      continue;
+    }
+    const specifiers = statement.specifiers;
+    const index = specifiers.findIndex(
+      (specifier2) => specifier2.type === "ImportSpecifier" && specifier2.imported.type === "Identifier" && specifier2.imported.name === name && specifier2.local.name === name
+    );
+    if (index === -1) {
+      continue;
+    }
+    const specifier = specifiers[index];
+    let start;
+    let end;
+    if (specifiers.length === 1) {
+      start = statement.start ?? 0;
+      end = statement.end ?? 0;
+      if (code[end] === "\n") {
+        end++;
+      }
+    } else if (index === specifiers.length - 1) {
+      start = specifiers[index - 1].end ?? 0;
+      end = specifier.end ?? 0;
+    } else {
+      start = specifier.start ?? 0;
+      end = specifiers[index + 1].start ?? 0;
+    }
+    return code.slice(0, start) + code.slice(end);
+  }
+  return code;
 };
 const removeSetImport = () => {
   const routesPath = getPaths().web.routes;
   const routesContent = readFile(routesPath).toString();
-  if (routesContent.match("<Set")) {
+  const unusedNames = ["Set", "PrivateSet"].filter(
+    (name) => !new RegExp(`<${name}\\b`).test(routesContent)
+  );
+  if (unusedNames.length === 0) {
     return "Skipping removal of Set import in Routes.{jsx,tsx}";
   }
-  const cedarRouterImportMatch = routesContent.match(
-    /import {[^]*} from '@cedarjs\/router'/
-  );
-  if (!cedarRouterImportMatch) {
-    return "No @cedarjs/router import found in Routes.{jsx,tsx}";
+  let newRoutesContent = routesContent;
+  try {
+    for (const name of unusedNames) {
+      newRoutesContent = removeNamedImport(
+        newRoutesContent,
+        "@cedarjs/router",
+        name
+      );
+    }
+  } catch {
+    return "Skipping removal of Set import, Routes.{jsx,tsx} couldn't be parsed";
+  }
+  if (newRoutesContent === routesContent) {
+    return "No unused Set or PrivateSet import found in Routes.{jsx,tsx}";
   }
-  const [cedarRouterImport] = cedarRouterImportMatch;
-  const removedSetImport = cedarRouterImport.replace(/,*\s*Set,*/, "");
-  const newRoutesContent = routesContent.replace(
-    cedarRouterImport,
-    removedSetImport
-  );
   writeFile(routesPath, newRoutesContent, { overwriteExisting: true });
-  return "Removed Set import in Routes.{jsx,tsx}";
+  return "Removed unused Set and PrivateSet imports in Routes.{jsx,tsx}";
 };
 const removeLayoutImport = ({
   model: name,
   path: scaffoldPath = ""
 }) => {
-  const pluralPascalName = pascalcase(pluralize(name));
-  const pascalScaffoldPath = scaffoldPath === "" ? scaffoldPath : scaffoldPath.split("/").map(pascalcase).join("/") + "/";
-  const layoutName = `${pluralPascalName}Layout`;
-  const importLayout = `import ${pluralPascalName}Layout from 'src/layouts/${pascalScaffoldPath}${layoutName}'`;
+  const { importName, importPath } = getScaffoldLayoutNames(name, scaffoldPath);
   const routesPath = getPaths().web.routes;
   const routesContent = readFile(routesPath).toString();
-  const newRoutesContent = routesContent.replace(
-    new RegExp(`\\s*${importLayout}`),
-    ""
+  const importLayout = new RegExp(
+    `\\s*import ${importName} from (['"])${importPath}\\1;?`
   );
+  const newRoutesContent = routesContent.replace(importLayout, "");
   writeFile(routesPath, newRoutesContent, { overwriteExisting: true });
   return "Removed layout import from Routes.{jsx,tsx}";
 };

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

@@ -86,6 +86,18 @@ const getImportComponentNames = (name, scaffoldPath, nestScaffoldByModel = true)
     importLayoutNames: `src/layouts/ScaffoldLayout`
   };
 };
+const getScaffoldLayoutNames = (name, scaffoldPath = "") => {
+  const pluralPascalName = pascalcase(pluralize(name));
+  const directoryName = `${pluralPascalName}ScaffoldLayout`;
+  const pathParts = scaffoldPath === "" ? [] : scaffoldPath.split("/").map(pascalcase);
+  return {
+    directoryName,
+    pathParts,
+    // The name to import the layout as in Routes.{jsx,tsx}
+    importName: pascalcase(scaffoldPath) + directoryName,
+    importPath: ["src/layouts", ...pathParts, directoryName].join("/")
+  };
+};
 const getTemplateStrings = (name, scaffoldPath, nestScaffoldByModel = true) => {
   const nameVars = nameVariants(name);
   const camelScaffoldPath = camelcase(pascalcase(scaffoldPath));
@@ -160,7 +172,13 @@ const files = async ({
     }),
     ...await assetFiles(name, tailwind),
     ...await formatters(name, typescript),
-    ...await layoutFiles(name, force, typescript, templateStrings),
+    ...await layoutFiles(
+      name,
+      scaffoldPath,
+      force,
+      typescript,
+      templateStrings
+    ),
     ...await pageFiles(
       name,
       pascalScaffoldPath,
@@ -358,41 +376,57 @@ const modelRelatedVariables = (model) => {
     parsedDateTime: isDateTimeParsed()
   };
 };
-const layoutFiles = async (name, force, generateTypescript, templateStrings) => {
+const layoutFiles = async (name, scaffoldPath, force, generateTypescript, templateStrings) => {
   const fileList = {};
-  const layouts = fs.readdirSync(
+  const extension = generateTypescript ? ".tsx" : ".jsx";
+  const renderLayout = async (templateName, outputPath) => {
+    const template = await generateTemplate(
+      customOrDefaultTemplatePath({
+        side: "web",
+        generator: "scaffold",
+        templatePath: path.join("layouts", templateName)
+      }),
+      {
+        name,
+        pascalScaffoldPath: "",
+        ...templateStrings
+      }
+    );
+    fileList[outputPath] = generateTypescript || !outputPath.endsWith(".jsx") ? template : await transformTSToJS(outputPath, template);
+  };
+  const sharedLayoutDir = path.join(getPaths().web.layouts, "ScaffoldLayout");
+  const sharedLayoutTemplates = fs.readdirSync(
     customOrDefaultTemplatePath({
       side: "web",
       generator: "scaffold",
       templatePath: "layouts"
     })
-  );
-  for (const layout of layouts) {
-    const outputLayoutName = layout.replace(
-      /\.tsx\.template/,
-      generateTypescript ? ".tsx" : ".jsx"
-    );
-    const outputPath = path.join(
-      getPaths().web.layouts,
-      "ScaffoldLayout",
-      outputLayoutName
-    );
-    if (!fs.existsSync(outputPath) || force) {
-      const template = await generateTemplate(
-        customOrDefaultTemplatePath({
-          side: "web",
-          generator: "scaffold",
-          templatePath: path.join("layouts", layout)
-        }),
-        {
-          name,
-          pascalScaffoldPath: "",
-          ...templateStrings
-        }
-      );
-      fileList[outputPath] = generateTypescript ? template : await transformTSToJS(outputPath, template);
+  ).filter((template) => template !== "NamesScaffoldLayout.tsx.template");
+  for (const template of sharedLayoutTemplates) {
+    const isComponent = template.endsWith(".tsx.template");
+    const outputName = isComponent ? template.replace(/\.tsx\.template$/, extension) : template.replace(/\.template$/, "");
+    const exists = isComponent ? [".tsx", ".jsx", ".ts", ".js"].some(
+      (ext) => fs.existsSync(
+        path.join(sharedLayoutDir, outputName.replace(extension, ext))
+      )
+    ) : fs.existsSync(path.join(sharedLayoutDir, outputName));
+    if (!exists || force) {
+      await renderLayout(template, path.join(sharedLayoutDir, outputName));
     }
   }
+  const { directoryName, pathParts } = getScaffoldLayoutNames(
+    name,
+    scaffoldPath
+  );
+  await renderLayout(
+    "NamesScaffoldLayout.tsx.template",
+    path.join(
+      getPaths().web.layouts,
+      ...pathParts,
+      directoryName,
+      directoryName + extension
+    )
+  );
   return fileList;
 };
 const pageFiles = async (name, pascalScaffoldPath = "", generateTypescript, nestScaffoldByModel = true, templateStrings) => {
@@ -434,7 +468,7 @@ const pageFiles = async (name, pascalScaffoldPath = "", generateTypescript, nest
         ...modelRelatedVariables(model)
       }
     );
-    fileList[outputPath] = generateTypescript ? template : await transformTSToJS(outputPath, template);
+    fileList[outputPath] = generateTypescript || !outputPath.endsWith(".jsx") ? template : await transformTSToJS(outputPath, template);
   }
   return fileList;
 };
@@ -482,7 +516,7 @@ const componentFiles = async (name, pascalScaffoldPath = "", generateTypescript,
         ...modelRelatedVariables(model)
       }
     );
-    fileList[outputPath] = generateTypescript ? template : await transformTSToJS(outputPath, template);
+    fileList[outputPath] = generateTypescript || !outputPath.endsWith(".jsx") ? template : await transformTSToJS(outputPath, template);
   }
   return fileList;
 };
@@ -513,8 +547,9 @@ const routes = async ({
     `<Route path="/${paramScaffoldPath}${nameVars.pluralParamName}" page={${pageRoot}${nameVars.pluralPascalName}Page} name="${templateNames.pluralRouteName}" />`
   ];
 };
-const addLayoutImport = () => {
-  const importLayout = `import ScaffoldLayout from 'src/layouts/ScaffoldLayout'`;
+const addLayoutImport = (model, scaffoldPath) => {
+  const { importName, importPath } = getScaffoldLayoutNames(model, scaffoldPath);
+  const importLayout = `import ${importName} from '${importPath}'`;
   const routesPath = getPaths().web.routes;
   const routesContent = readFile(routesPath).toString();
   if (!routesContent.match(importLayout)) {
@@ -628,17 +663,10 @@ const addSetImport = (task) => {
   return `Added ${namesToImport.join(", ")} import to Routes.{jsx,tsx}`;
 };
 const addScaffoldSetToRouter = async (model, scaffoldPath) => {
-  const templateNames = getTemplateStrings(model, scaffoldPath);
-  const nameVars = nameVariants(model);
-  const title = nameVars.pluralPascalName;
-  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 },
+    getScaffoldLayoutNames(model, scaffoldPath).importName,
     unauthenticatedRoute ? { unauthenticated: unauthenticatedRoute } : void 0
   );
 };
@@ -679,7 +707,7 @@ const tasks = ({
       },
       {
         title: "Adding layout import...",
-        task: async () => addLayoutImport()
+        task: async () => addLayoutImport(model, path2)
       },
       {
         title: "Adding set import...",
@@ -795,6 +823,7 @@ const splitPathAndModel = (pathSlashModel) => {
 };
 export {
   files,
+  getScaffoldLayoutNames,
   getUnauthenticatedRedirectRoute,
   handler,
   hasLoginRoute,

package/dist/commands/generate/scaffold/templates/layouts/NamesScaffoldLayout.tsx.template

@@ -0,0 +1,18 @@
+import type { WrapperProps } from '@cedarjs/router'
+
+import ScaffoldLayout from '${importLayoutNames}'
+
+function ${pluralPascalName}ScaffoldLayout({ children }: WrapperProps) {
+  return (
+    <ScaffoldLayout
+      title="${pluralPascalName}"
+      titleTo="${pluralRouteName}"
+      buttonLabel="New ${singularPascalName}"
+      buttonTo="${newRouteName}"
+    >
+      {children}
+    </ScaffoldLayout>
+  )
+}
+
+export default ${pluralPascalName}ScaffoldLayout

package/dist/lib/index.js

@@ -286,18 +286,17 @@ const cleanupEmptyDirsTask = (files) => {
     })
   );
 };
-function wrapWithSet(routesContent, layout, routes, newLineAndIndent, props = {}, privateSetProps) {
+function wrapWithSet(routesContent, layout, routes, newLineAndIndent, privateSetProps) {
   const [_, indentOne, indentTwo] = routesContent.match(
     /([ \t]*)<Router.*?>[^<]*[\r\n]+([ \t]+)/
   ) || ["", "", ""];
   const oneLevelIndent = indentTwo.slice(0, indentTwo.length - indentOne.length);
-  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}>`,
+      `<Set wrap={${layout}}>`,
       ...newRoutesWithExtraIndent2,
       `</Set>`
     ].join(newLineAndIndent);
@@ -308,13 +307,13 @@ function wrapWithSet(routesContent, layout, routes, newLineAndIndent, props = {}
   );
   return [
     `<PrivateSet${privateSetPropsString && " " + privateSetPropsString}>`,
-    `${oneLevelIndent}<Set wrap={${layout}}${propsString && " " + propsString}>`,
+    `${oneLevelIndent}<Set wrap={${layout}}>`,
     ...newRoutesWithExtraIndent,
     `${oneLevelIndent}</Set>`,
     `</PrivateSet>`
   ].join(newLineAndIndent);
 }
-function addRoutesToRouterTask(routes, layout, setProps = {}, privateSetProps) {
+function addRoutesToRouterTask(routes, layout, privateSetProps) {
   const cedarPaths = getPaths();
   const routesContent = readFile(cedarPaths.web.routes).toString();
   let newRoutes = routes.filter((route) => !routesContent.match(route));
@@ -338,7 +337,6 @@ ${route}`);
       layout,
       newRoutes,
       newLineAndIndent,
-      setProps,
       privateSetProps
     ) : newRoutes.join(newLineAndIndent);
     const newRoutesContent = routesContent.replace(
@@ -377,6 +375,12 @@ function removeEmtpySet(routesContent, layout) {
   if (child.length > 0) {
     return routesContent;
   }
+  const privateSetWithLayoutReg = new RegExp(
+    `\\s*<PrivateSet[^>]*>\\s*<Set[^>]*wrap={${layout}}[^<]*>\\s*</Set>\\s*</PrivateSet>`
+  );
+  if (privateSetWithLayoutReg.test(routesContent)) {
+    return routesContent.replace(privateSetWithLayoutReg, "");
+  }
   return routesContent.replace(setWithLayoutReg, "");
 }
 function removeRoutesFromRouterTask(routes, layout) {

package/package.json

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