@cedarjs/cli 7.0.1-next.467 → 7.1.0-rc.32

package/dist/commands/destroy/handlerHelpers.js

@@ -1,5 +1,5 @@
 import { Listr } from "listr2";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { deleteFilesTask } from "../../lib/index.js";
 function tasks({ componentName, filesFn, name }) {
   return new Listr(

package/dist/commands/destroy/page/pageHandler.js

@@ -1,7 +1,6 @@
 import camelcase from "camelcase";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import {
   deleteFilesTask,
   removeRoutesFromRouterTask

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

@@ -1,7 +1,7 @@
-import { parse } from "@babel/parser";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import pascalcase from "pascalcase";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { pluralize } from "@cedarjs/utils/cedarPluralize";
 import {
   deleteFilesTask,
   getPaths,
@@ -12,7 +12,6 @@ import {
 import { verifyModelName } from "../../../lib/schemaHelpers.js";
 import {
   files,
-  getScaffoldLayoutNames,
   routes as scaffoldRoutes,
   splitPathAndModel
 } from "../../generate/scaffold/scaffoldHandler.js";
@@ -23,83 +22,45 @@ const removeRoutesWithSet = async ({
 }) => {
   const routes = await scaffoldRoutes({ model, path, nestScaffoldByModel });
   const routeNames = routes.map(extractRouteName);
-  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 pluralPascalName = pascalcase(pluralize(model));
+  const layoutName = `${pluralPascalName}Layout`;
+  return removeRoutesFromRouterTask(routeNames, layoutName);
 };
 const removeSetImport = () => {
   const routesPath = getPaths().web.routes;
   const routesContent = readFile(routesPath).toString();
-  const unusedNames = ["Set", "PrivateSet"].filter(
-    (name) => !new RegExp(`<${name}\\b`).test(routesContent)
-  );
-  if (unusedNames.length === 0) {
+  if (routesContent.match("<Set")) {
     return "Skipping removal of Set import 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 cedarRouterImportMatch = routesContent.match(
+    /import {[^]*} from '@cedarjs\/router'/
+  );
+  if (!cedarRouterImportMatch) {
+    return "No @cedarjs/router 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 unused Set and PrivateSet imports in Routes.{jsx,tsx}";
+  return "Removed Set import in Routes.{jsx,tsx}";
 };
 const removeLayoutImport = ({
   model: name,
   path: scaffoldPath = ""
 }) => {
-  const { importName, importPath } = getScaffoldLayoutNames(name, 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 routesPath = getPaths().web.routes;
   const routesContent = readFile(routesPath).toString();
-  const importLayout = new RegExp(
-    `\\s*import ${importName} from (['"])${importPath}\\1;?`
+  const newRoutesContent = routesContent.replace(
+    new RegExp(`\\s*${importLayout}`),
+    ""
   );
-  const newRoutesContent = routesContent.replace(importLayout, "");
   writeFile(routesPath, newRoutesContent, { overwriteExisting: true });
   return "Removed layout import from Routes.{jsx,tsx}";
 };

package/dist/commands/destroy/sdl/sdlHandler.js

@@ -1,6 +1,5 @@
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { deleteFilesTask } from "../../../lib/index.js";
 import { verifyModelName } from "../../../lib/schemaHelpers.js";
 import { files } from "../../generate/sdl/sdlHandler.js";

package/dist/commands/dev/devHandler.js

@@ -3,9 +3,8 @@ import { createRequire } from "node:module";
 import path from "node:path";
 import { Writable } from "node:stream";
 import concurrently from "concurrently";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { formatRunBinCommand } from "@cedarjs/cli-helpers/packageManager/display";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { shutdownPort } from "@cedarjs/internal/dist/dev";
 import { generateGqlormArtifacts } from "@cedarjs/internal/dist/generate/gqlormSchema";
 import { getConfig, getConfigPath } from "@cedarjs/project-config";
@@ -257,13 +256,15 @@ const handler = async ({
     });
   } else {
     if (workspace.includes("api")) {
+      const isEsm = rootPackageJson.type === "module";
+      const serverWatchCommand = isEsm ? `cedarjs-api-server-watch` : `cedar-api-server-watch`;
       const cedarConfigPath = getConfigPath();
       jobs.push({
         name: "api",
         command: formatRunBinCommand("nodemon", [
           "--quiet",
           `--watch "${cedarConfigPath}"`,
-          `--exec "${formatRunBinCommand("cedar-api-server-watch")} --port ${apiAvailablePort} ${getApiDebugFlag(apiDebugPort, apiAvailablePort)} | ${formatRunBinCommand("cedar-log-formatter")}"`
+          `--exec "${formatRunBinCommand(serverWatchCommand)} --port ${apiAvailablePort} ${getApiDebugFlag(apiDebugPort, apiAvailablePort)} | ${formatRunBinCommand("cedar-log-formatter")}"`
         ]),
         env: {
           NODE_ENV: "development",

package/dist/commands/dev/packageWatchCommands.js

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { getConfig, importStatementPath } from "@cedarjs/project-config";
+import { colors as c } from "@cedarjs/cli-helpers";
+import { importStatementPath } from "@cedarjs/project-config";
 import { getPaths } from "../../lib/index.js";
 async function getPackageWatchCommands(packageWorkspaces) {
   const cedarPaths = getPaths();
@@ -17,7 +17,6 @@ async function getPackageWatchCommands(packageWorkspaces) {
     }
     return importStatementPath(workspacePath);
   });
-  const packagesWorkspaceConfig = getConfig().experimental.packagesWorkspace;
   const watchablePackages = [];
   const packagesWithoutWatch = [];
   for (const workspacePath of workspacePaths) {
@@ -30,11 +29,7 @@ async function getPackageWatchCommands(packageWorkspaces) {
     if (packageJson.scripts?.watch) {
       watchablePackages.push(workspacePath);
     } else {
-      const packageConfig = packageName && packagesWorkspaceConfig[packageName];
-      const skipWatchWarning = typeof packageConfig === "object" && packageConfig.skipWatchWarning;
-      if (!skipWatchWarning) {
-        packagesWithoutWatch.push(packageName);
-      }
+      packagesWithoutWatch.push(packageName);
     }
   }
   if (packagesWithoutWatch.length > 0) {

package/dist/commands/dev.js

@@ -1,5 +1,5 @@
 import { terminalLink } from "termi-link";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { colors as c } from "@cedarjs/cli-helpers";
 import { workspaces } from "../lib/project.js";
 import { checkNodeVersion } from "../middleware/checkNodeVersion.js";
 const command = "dev [workspace..]";

package/dist/commands/execHandler.js

@@ -4,8 +4,7 @@ import { context } from "@opentelemetry/api";
 import { suppressTracing } from "@opentelemetry/core";
 import { Listr } from "listr2";
 import { Parser } from "yargs/helpers";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { findScripts } from "@cedarjs/internal/dist/files";
 import { runScriptFunction } from "../lib/exec.js";
 import { generatePrismaClient } from "../lib/generatePrismaClient.js";

package/dist/commands/experimental/live-queries/liveQueries.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { getEpilogue } from "../util.js";
 const command = "setup-live-queries";
 const description = "Setup live query invalidation with Postgres notifications";

package/dist/commands/experimental/live-queries/liveQueriesHandler.js

@@ -1,11 +1,11 @@
 import fs from "node:fs";
 import path from "node:path";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
 import {
   addApiPackages,
-  addWebPackages
-} from "@cedarjs/cli-helpers/installHelpers";
+  addWebPackages,
+  colors as c
+} from "@cedarjs/cli-helpers";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import {
   getConfigPath,

package/dist/commands/experimental/setupInngest.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { getEpilogue } from "./util.js";
 const command = "setup-inngest";
 const description = "Setup Inngest for background, scheduled, delayed, multi-step, and fan-out jobs";

package/dist/commands/experimental/setupInngestHandler.js

@@ -1,5 +1,5 @@
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { colors as c } from "@cedarjs/cli-helpers";
 import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
 import { addRootPackages } from "@cedarjs/cli-helpers/packageManager/packages";
 import { errorTelemetry } from "@cedarjs/telemetry";

package/dist/commands/experimental/setupOpentelemetry.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { getEpilogue } from "./util.js";
 const command = "setup-opentelemetry";
 const description = "Setup OpenTelemetry within the API side";

package/dist/commands/experimental/setupOpentelemetryHandler.js

@@ -2,8 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import { ListrEnquirerPromptAdapter } from "@listr2/prompt-adapter-enquirer";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { addApiPackages } from "@cedarjs/cli-helpers/installHelpers";
+import { addApiPackages, colors as c } from "@cedarjs/cli-helpers";
 import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
 import {
   getConfigPath,

package/dist/commands/experimental/setupReactCompiler.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { getEpilogue } from "./util.js";
 const command = "setup-react-compiler";
 const description = "Enable the experimental React Compiler";

package/dist/commands/experimental/setupReactCompilerHandler.js

@@ -1,8 +1,8 @@
 import fs from "node:fs";
 import path from "node:path";
 import { Listr } from "listr2";
-import { coerce, isGreaterThanOrEqual } from "verkit";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import semver from "semver";
+import { colors as c } from "@cedarjs/cli-helpers";
 import {
   addRootPackages,
   addWorkspacePackages
@@ -39,8 +39,8 @@ const handler = async (options) => {
             )
           );
           const reactVersion = webPkgJson["dependencies"]["react"];
-          const coercedReactVersion = coerce(reactVersion);
-          if (!coercedReactVersion || !isGreaterThanOrEqual(coercedReactVersion, "19.0.0")) {
+          const coercedReactVersion = semver.coerce(reactVersion);
+          if (!coercedReactVersion || !semver.gte(coercedReactVersion, "19.0.0")) {
             throw new Error(
               "You need to be using at least React version 19 to enable the React Compiler"
             );

package/dist/commands/experimental/setupRsc.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { getEpilogue } from "./util.js";
 const command = "setup-rsc";
 const description = "Enable React Server Components (RSC)";

package/dist/commands/experimental/setupRscHandler.js

@@ -2,8 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import execa from "execa";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { prettify } from "@cedarjs/cli-helpers/fileHelpers";
+import { prettify, colors as c } from "@cedarjs/cli-helpers";
 import { install } from "@cedarjs/cli-helpers/packageManager";
 import { getConfig, getConfigPath } from "@cedarjs/project-config";
 import { getPackageManager } from "@cedarjs/project-config/packageManager";

package/dist/commands/experimental/setupStreamingSsr.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { getEpilogue } from "./util.js";
 const command = "setup-streaming-ssr";
 const description = "Enable React Streaming and Server Side Rendering (SSR)";

package/dist/commands/experimental/setupStreamingSsrHandler.js

@@ -2,8 +2,7 @@ import fs from "node:fs";
 import path from "path";
 import { ListrEnquirerPromptAdapter } from "@listr2/prompt-adapter-enquirer";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { addWebPackages } from "@cedarjs/cli-helpers/installHelpers";
+import { addWebPackages, colors as c } from "@cedarjs/cli-helpers";
 import { getConfigPath } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths, transformTSToJS, writeFile } from "../../lib/index.js";
@@ -184,7 +183,7 @@ You'll manually need to merge it with your existing entry.client${ext} file.`;
           fs.writeFileSync(pkgJsonPath, JSON.stringify(pkgJson, null, 2));
         }
       },
-      addWebPackages(["@apollo/client-react-streaming@0.14.5"]),
+      addWebPackages(["@apollo/client-react-streaming@0.10.0"]),
       {
         task: () => {
           printTaskEpilogue(command, description, EXPERIMENTAL_TOPIC_ID);

package/dist/commands/generate/cell/cell.js

@@ -22,26 +22,6 @@ const builder = createBuilder({
         default: "",
         description: "Use to enforce a specific query name within the generated cell - must be unique.",
         type: "string"
-      },
-      beforeQuery: {
-        default: false,
-        description: "Include a typed `beforeQuery` stub for configuring the query (e.g. variables, fetch policy).",
-        type: "boolean"
-      },
-      afterQuery: {
-        default: false,
-        description: "Include a typed `afterQuery` stub for sanitizing data returned from the query.",
-        type: "boolean"
-      },
-      isEmpty: {
-        default: false,
-        description: "Include a typed `isEmpty` stub for overriding the default check for the Empty component.",
-        type: "boolean"
-      },
-      fragment: {
-        default: "",
-        description: "Generate a fragment cell (exports FRAGMENT instead of QUERY) that reads its data from a parent Cell, given the GraphQL type it selects from - e.g. --fragment User.",
-        type: "string"
       }
     };
   }

package/dist/commands/generate/cell/cellHandler.js

@@ -26,11 +26,7 @@ const files = async ({
   list = false,
   query,
   stories,
-  tests,
-  beforeQuery = false,
-  afterQuery = false,
-  isEmpty = false,
-  fragment = ""
+  tests
 }) => {
   let cellName = removeGeneratorName(name, "cell");
   let idName = "id";
@@ -39,49 +35,22 @@ const files = async ({
   let model = null;
   let templateNameSuffix = "";
   let typeName = cellName;
-  if (fragment) {
-    if (list) {
-      throw new Error(
-        "The --list flag cannot be combined with --fragment; fragment cells always render a single item."
-      );
-    }
-    if (beforeQuery) {
-      throw new Error(
-        "The --before-query flag cannot be combined with --fragment; fragment cells never fire a query of their own."
-      );
-    }
-    if (query) {
-      throw new Error(
-        "The --query flag cannot be combined with --fragment; fragment cells don't have an operation name."
-      );
-    }
-  }
-  const shouldGenerateList = !fragment && ((isWordPluralizable(cellName) ? isPlural(cellName) : list) || list);
-  if (!fragment) {
-    try {
-      model = await getSchema(pascalcase(singularize(cellName)));
-      idName = getIdName(model);
-      idType = getIdType(model);
-      typeName = model.name;
-      mockIdValues = idType === "String" ? mockIdValues.map((value) => `'${value}'`) : mockIdValues;
-    } catch {
-      idType = "Int";
-    }
+  const shouldGenerateList = (isWordPluralizable(cellName) ? isPlural(cellName) : list) || list;
+  try {
+    model = await getSchema(pascalcase(singularize(cellName)));
+    idName = getIdName(model);
+    idType = getIdType(model);
+    typeName = model.name;
+    mockIdValues = idType === "String" ? mockIdValues.map((value) => `'${value}'`) : mockIdValues;
+  } catch {
+    idType = "Int";
   }
   if (shouldGenerateList) {
     cellName = forcePluralizeWord(cellName);
     templateNameSuffix = "List";
   }
   let operationName = query;
-  let fragmentName;
-  let fragmentOnType;
-  let fragmentPropName;
-  if (fragment) {
-    const fragmentTypeVariants = nameVariants(fragment);
-    fragmentOnType = fragmentTypeVariants.pascalName;
-    fragmentPropName = fragmentTypeVariants.camelName;
-    fragmentName = `${nameVariants(cellName).pascalName}Cell_${fragmentPropName}`;
-  } else if (operationName) {
+  if (operationName) {
     const userSpecifiedOperationNameIsUnique = await operationNameIsUnique(operationName);
     if (!userSpecifiedOperationNameIsUnique) {
       throw new Error(`Specified query name: "${operationName}" is not unique!`);
@@ -98,20 +67,11 @@ const files = async ({
     extension,
     webPathSection: CEDAR_WEB_PATH_NAME,
     generator: "cell",
-    templatePath: fragment ? "cellFragment.tsx.template" : `cell${templateNameSuffix}.tsx.template`,
-    templateVars: fragment ? {
-      fragmentName,
-      fragmentOnType,
-      camelName: fragmentPropName,
-      afterQuery,
-      isEmpty
-    } : {
+    templatePath: `cell${templateNameSuffix}.tsx.template`,
+    templateVars: {
       operationName,
       idName,
-      idType,
-      beforeQuery,
-      afterQuery,
-      isEmpty
+      idType
     }
   });
   const testFile = await templateForComponentFile({
@@ -120,8 +80,8 @@ const files = async ({
     extension: `.test${extension}`,
     webPathSection: CEDAR_WEB_PATH_NAME,
     generator: "cell",
-    templatePath: fragment ? "testFragment.js.template" : "test.js.template",
-    templateVars: fragment ? { camelName: fragmentPropName } : {
+    templatePath: "test.js.template",
+    templateVars: {
       idName: shouldGenerateList ? void 0 : idName,
       mockIdValues: shouldGenerateList ? void 0 : mockIdValues
     }
@@ -132,7 +92,7 @@ const files = async ({
     extension: `.stories${extension}`,
     webPathSection: CEDAR_WEB_PATH_NAME,
     generator: "cell",
-    templatePath: fragment ? "storiesFragment.tsx.template" : "stories.tsx.template"
+    templatePath: "stories.tsx.template"
   });
   const mockFile = await templateForComponentFile({
     name: cellName,
@@ -141,12 +101,7 @@ const files = async ({
     webPathSection: CEDAR_WEB_PATH_NAME,
     generator: "cell",
     templatePath: `mock${templateNameSuffix}.ts.template`,
-    templateVars: fragment ? {
-      idName,
-      mockIdValues,
-      typeName: fragmentOnType,
-      camelName: fragmentPropName
-    } : {
+    templateVars: {
       idName,
       mockIdValues,
       typeName
@@ -167,10 +122,7 @@ const files = async ({
 const handler = createHandler({
   componentName: "cell",
   filesFn: files,
-  includeAdditionalTasks: ({
-    name: cellName,
-    fragment
-  }) => {
+  includeAdditionalTasks: ({ name: cellName }) => {
     return [
       {
         title: `Generating types ...`,
@@ -178,7 +130,7 @@ const handler = createHandler({
           const queryFieldName = nameVariants(
             removeGeneratorName(cellName, "cell")
           ).camelName;
-          const projectHasSdl = Boolean(fragment) || await checkProjectForQueryField(queryFieldName);
+          const projectHasSdl = await checkProjectForQueryField(queryFieldName);
           if (projectHasSdl) {
             const { errors } = await generateTypes();
             for (const { message, error } of errors) {

package/dist/commands/generate/cell/templates/cell.tsx.template

@@ -6,9 +6,7 @@ import type {
 import type {
   CellSuccessProps,
   CellFailureProps,
-  TypedDocumentNode,<% if (beforeQuery) { %>
-  CellBeforeQueryResult,<% } %><% if (afterQuery || isEmpty) { %>
-  DataObject,<% } %>
+  TypedDocumentNode,
 } from '@cedarjs/web'
 
 export const QUERY: TypedDocumentNode<
@@ -21,24 +19,7 @@ export const QUERY: TypedDocumentNode<
     }
   }
 `
-<% if (beforeQuery) { %>
-export const beforeQuery = (
-  props: ${operationName}Variables,
-): CellBeforeQueryResult<${operationName}Variables> => {
-  return { variables: props, fetchPolicy: 'cache-and-network' }
-}
-<% } %><% if (isEmpty) { %>
-export const isEmpty = (
-  data: DataObject,
-  { isDataEmpty }: { isDataEmpty: (data: DataObject) => boolean },
-) => {
-  return isDataEmpty(data)
-}
-<% } %><% if (afterQuery) { %>
-export const afterQuery = (data: DataObject): DataObject => {
-  return data
-}
-<% } %>
+
 export const Loading = () => <div>Loading...</div>
 
 export const Empty = () => <div>Empty</div>

package/dist/commands/generate/cell/templates/cellList.tsx.template

@@ -3,9 +3,7 @@ import type { ${operationName}, ${operationName}Variables  } from 'types/graphql
 import type {
   CellSuccessProps,
   CellFailureProps,
-  TypedDocumentNode,<% if (beforeQuery) { %>
-  CellBeforeQueryResult,<% } %><% if (afterQuery || isEmpty) { %>
-  DataObject,<% } %>
+  TypedDocumentNode,
 } from '@cedarjs/web'
 
 export const QUERY: TypedDocumentNode<
@@ -18,24 +16,7 @@ export const QUERY: TypedDocumentNode<
     }
   }
 `
-<% if (beforeQuery) { %>
-export const beforeQuery = (
-  props: ${operationName}Variables,
-): CellBeforeQueryResult<${operationName}Variables> => {
-  return { variables: props, fetchPolicy: 'cache-and-network' }
-}
-<% } %><% if (isEmpty) { %>
-export const isEmpty = (
-  data: DataObject,
-  { isDataEmpty }: { isDataEmpty: (data: DataObject) => boolean },
-) => {
-  return isDataEmpty(data)
-}
-<% } %><% if (afterQuery) { %>
-export const afterQuery = (data: DataObject): DataObject => {
-  return data
-}
-<% } %>
+
 export const Loading = () => <div>Loading...</div>
 
 export const Empty = () => <div>Empty</div>

package/dist/commands/generate/cell/templates/test.js.template

@@ -7,7 +7,7 @@ import { standard } from './${pascalName}Cell.mock'
 // and can fail without adjustments, e.g. Float and DateTime types.
 //           Please refer to the RedwoodJS Testing Docs:
 //        https://cedarjs.com/docs/testing#testing-cells
-// https://cedarjs.com/docs/testing#expect-type-considerations
+// https://cedarjs.com/docs/testing#jest-expect-type-considerations
 
 describe('${pascalName}Cell', () => {
   it('renders Loading successfully', () => {

package/dist/commands/generate/dataMigration/dataMigration.js

@@ -2,9 +2,8 @@ import path from "node:path";
 import { paramCase } from "change-case";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { getDataMigrationsPath } from "@cedarjs/project-config";
 import {
   generateTemplate,