@cedarjs/cli 7.0.0 → 8.0.0-canary.3263

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

@@ -5,14 +5,15 @@ import { paramCase } from "change-case";
 import humanize from "humanize-string";
 import { Listr } from "listr2";
 import pascalcase from "pascalcase";
-import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { colors as c } from "@cedarjs/cli-helpers/colors";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import {
   addWorkspacePackages,
   removeWorkspacePackages
 } from "@cedarjs/cli-helpers/packageManager/packages";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { generate as generateTypes } from "@cedarjs/internal/dist/generate/generate";
-import { getConfig } from "@cedarjs/project-config";
+import { getConfig, getParsedScalars } from "@cedarjs/project-config";
 import { pluralize, singularize } from "@cedarjs/utils/cedarPluralize";
 import {
   generateTemplate,
@@ -189,6 +190,7 @@ const assetFiles = async (name, tailwind) => {
   }
   return fileList;
 };
+const isDateTimeParsed = () => getParsedScalars().DateTime === "Date";
 const formatters = async (name, isTypescript) => {
   const outputPath = path.join(
     getPaths().web.src,
@@ -210,7 +212,8 @@ const formatters = async (name, isTypescript) => {
       templatePath: path.join("lib", "formatters.tsx.template")
     }),
     {
-      name
+      name,
+      parsedDateTime: isDateTimeParsed()
     }
   );
   const templateTest = await generateTemplate(
@@ -220,7 +223,8 @@ const formatters = async (name, isTypescript) => {
       templatePath: path.join("lib", "formatters.test.tsx.template")
     }),
     {
-      name
+      name,
+      parsedDateTime: isDateTimeParsed()
     }
   );
   return {
@@ -340,7 +344,8 @@ const modelRelatedVariables = (model) => {
     fieldsToImport,
     editableColumns,
     listFormattersImports,
-    formattersImports
+    formattersImports,
+    parsedDateTime: isDateTimeParsed()
   };
 };
 const layoutFiles = async (name, force, generateTypescript, templateStrings) => {

package/dist/commands/generate/scaffold/templates/components/NameForm.tsx.template

@@ -12,17 +12,17 @@ import {
 
 <% if (fieldsToImport.includes('DatetimeLocalField')) { %>
 /**
- * Formats a DateTime string from the API, which is a UTC timestamp, for use as
+ * Formats a DateTime <%= parsedDateTime ? 'Date object' : 'string' %> from the API, which is a UTC timestamp, for use as
  * the value of a `datetime-local` input. The input takes `YYYY-MM-DDTHH:mm` in
  * the user's local time, with no seconds, milliseconds or timezone, and the
  * form reads its value back as local time when it is submitted.
  */
-function formatDatetime(value: string | undefined | null) {
+function formatDatetime(value: <%= parsedDateTime ? 'Date' : 'string' %> | undefined | null) {
   if (!value) {
     return undefined
   }
 
-  const date = new Date(value)
+  const date = <%= parsedDateTime ? 'value' : 'new Date(value)' %>
 
   if (Number.isNaN(date.getTime())) {
     return undefined

package/dist/commands/generate/scaffold/templates/lib/formatters.test.tsx.template

@@ -83,14 +83,25 @@ describe('jsonTruncate', () => {
 
 describe('timeTag', () => {
   it('renders a date', async () => {
+<% if (parsedDateTime) { %>
+    render(<div>{timeTag(new Date('1970-08-20'))}</div>)
+<% } else { %>
     render(<div>{timeTag(new Date('1970-08-20').toUTCString())}</div>)
+<% } %>
 
     await waitFor(() => screen.getByText(/1970.*00:00:00/))
   })
 
+<% if (parsedDateTime) { %>
+  it('can take an empty input', async () => {
+    expect(timeTag(null)).toEqual('')
+    expect(timeTag(undefined)).toEqual('')
+  })
+<% } else { %>
   it('can take an empty input string', async () => {
     expect(timeTag('')).toEqual('')
   })
+<% } %>
 })
 
 describe('jsonDisplay', () => {

package/dist/commands/generate/scaffold/templates/lib/formatters.tsx.template

@@ -39,15 +39,27 @@ export const jsonTruncate = (obj: unknown) => {
   return truncate(JSON.stringify(obj, null, 2))
 }
 
-export function timeTag(dateTime: string | undefined | null) {
+export function timeTag(dateTime: <%= parsedDateTime ? 'Date' : 'string' %> | undefined | null) {
   let output: string | React.JSX.Element = ''
 
   if (dateTime) {
+<% if (parsedDateTime) { %>
+    if (!Number.isNaN(dateTime.getTime())) {
+      const isoString = dateTime.toISOString()
+
+      output = (
+        <time dateTime={isoString} title={isoString}>
+          {dateTime.toUTCString()}
+        </time>
+      )
+    }
+<% } else { %>
     output = (
       <time dateTime={dateTime} title={dateTime}>
         {new Date(dateTime).toUTCString()}
       </time>
     )
+<% } %>
   }
 
   return output

package/dist/commands/generate/script/scriptHandler.js

@@ -1,7 +1,8 @@
 import fs from "node:fs";
 import path from "node:path";
 import { Listr } from "listr2";
-import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import {
   getPaths,

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

@@ -2,8 +2,9 @@ import ansis from "ansis";
 import boxen from "boxen";
 import camelcase from "camelcase";
 import { Listr } from "listr2";
-import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { colors as c } from "@cedarjs/cli-helpers/colors";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { generate as generateTypes } from "@cedarjs/internal/dist/generate/generate";
 import { getConfig } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";

package/dist/commands/generate/secret/secret.js

@@ -1,6 +1,6 @@
 import crypto from "node:crypto";
 import { terminalLink } from "termi-link";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 const DEFAULT_LENGTH = 32;
 const generateSecret = (length = DEFAULT_LENGTH) => {
   return crypto.randomBytes(Math.trunc(length)).toString("base64");

package/dist/commands/generate/service/serviceHandler.js

@@ -250,6 +250,10 @@ const getIdName = async (model) => {
   if (!isServiceModel(schemaResult)) {
     return void 0;
   }
+  if (schemaResult.primaryKey?.fields.length) {
+    const { fields, name } = schemaResult.primaryKey;
+    return { fields, whereArg: name || fields.join("_") };
+  }
   return schemaResult.fields.find((field) => field.isId)?.name;
 };
 const files = async ({
@@ -262,6 +266,11 @@ const files = async ({
   const componentName = camelcase(pluralize(name));
   const model = name;
   const idName = await getIdName(model);
+  if (tests && rest.crud && idName !== void 0 && typeof idName !== "string") {
+    throw new Error(
+      `Cannot generate CRUD tests for "${model}": it has a compound primary key (@@id([${idName.fields.join(", ")}])), which isn't supported by the generated test file yet. Re-run with \`--tests=false\`.`
+    );
+  }
   const prismaImportSource = "src/lib/db";
   let modelRelations;
   if (relations) {
@@ -286,46 +295,46 @@ const files = async ({
       ...rest
     }
   });
-  const testFile = await templateForFile({
-    name,
-    side: "api",
-    sidePathSection: "services",
-    generator: "service",
-    outputPath: path.join(componentName, componentName + ".test.ts"),
-    templatePath: "test.ts.template",
-    templateVars: {
-      relations: relations || [],
-      create: await fieldsToInput(model),
-      update: await fieldsToUpdate(model),
-      types: await fieldTypes(model),
-      prismaImport: (await parseSchema(model)).scalarFields.some(
-        (field) => field.type === "Decimal"
-      ),
-      prismaModel: model,
-      idName,
-      prismaImportSource,
-      ...rest
-    }
-  });
-  const scenariosFile = await templateForFile({
-    name,
-    side: "api",
-    sidePathSection: "services",
-    generator: "service",
-    outputPath: path.join(componentName, componentName + ".scenarios.ts"),
-    templatePath: "scenarios.ts.template",
-    templateVars: {
-      scenario: await buildScenario(model),
-      stringifiedScenario: await buildStringifiedScenario(model),
-      prismaModel: model,
-      idName,
-      relations: modelRelations,
-      prismaImportSource,
-      ...rest
-    }
-  });
   const files2 = [serviceFile];
   if (tests) {
+    const testFile = await templateForFile({
+      name,
+      side: "api",
+      sidePathSection: "services",
+      generator: "service",
+      outputPath: path.join(componentName, componentName + ".test.ts"),
+      templatePath: "test.ts.template",
+      templateVars: {
+        relations: relations || [],
+        create: await fieldsToInput(model),
+        update: await fieldsToUpdate(model),
+        types: await fieldTypes(model),
+        prismaImport: (await parseSchema(model)).scalarFields.some(
+          (field) => field.type === "Decimal"
+        ),
+        prismaModel: model,
+        idName,
+        prismaImportSource,
+        ...rest
+      }
+    });
+    const scenariosFile = await templateForFile({
+      name,
+      side: "api",
+      sidePathSection: "services",
+      generator: "service",
+      outputPath: path.join(componentName, componentName + ".scenarios.ts"),
+      templatePath: "scenarios.ts.template",
+      templateVars: {
+        scenario: await buildScenario(model),
+        stringifiedScenario: await buildStringifiedScenario(model),
+        prismaModel: model,
+        idName,
+        relations: modelRelations,
+        prismaImportSource,
+        ...rest
+      }
+    });
     files2.push(testFile);
     files2.push(scenariosFile);
   }

package/dist/commands/generate/service/templates/service.ts.template

@@ -1,14 +1,28 @@
 import type { QueryResolvers<% if (crud) { %>, MutationResolvers<% } %><% if (relations.length) { %>, ${singularPascalName}RelationResolvers<% } %> } from 'types/graphql'
 
 import { db } from 'src/lib/db'
-
+<%
+  // A compound `@@id([...])` key comes through as `{ fields, whereArg }`
+  // instead of a single field name -- build the destructure/where-clause
+  // snippets for both shapes here so the rest of the template can stay
+  // shape-agnostic.
+  const idIsComposite = idName != null && typeof idName === 'object'
+  const idFields = idIsComposite ? idName.fields : [idName]
+  const idArgs = idFields.join(', ')
+  const idWhere = idIsComposite
+    ? `${idName.whereArg}: { ${idFields.join(', ')} }`
+    : idName
+  const idWhereFromRoot = idIsComposite
+    ? `${idName.whereArg}: { ${idFields.map((f) => `${f}: root?.${f}`).join(', ')} }`
+    : `${idName}: root?.${idName}`
+%>
 export const ${pluralCamelName}: QueryResolvers['${pluralCamelName}'] = () => {
   return db.${singularCamelName}.findMany()
 }<% if (crud || relations.length) { %>
 
-export const ${singularCamelName}: QueryResolvers['${singularCamelName}'] = ({ ${idName} }) => {
+export const ${singularCamelName}: QueryResolvers['${singularCamelName}'] = ({ ${idArgs} }) => {
   return db.${singularCamelName}.findUnique({
-    where: { ${idName} },
+    where: { ${idWhere} },
   })
 }<% } %><% if (crud) { %>
 
@@ -18,21 +32,21 @@ export const create${singularPascalName}: MutationResolvers['create${singularPas
   })
 }
 
-export const update${singularPascalName}: MutationResolvers['update${singularPascalName}'] = ({ ${idName}, input }) => {
+export const update${singularPascalName}: MutationResolvers['update${singularPascalName}'] = ({ ${idArgs}, input }) => {
   return db.${singularCamelName}.update({
     data: input,
-    where: { ${idName} },
+    where: { ${idWhere} },
   })
 }
 
-export const delete${singularPascalName}: MutationResolvers['delete${singularPascalName}'] = ({ ${idName} }) => {
+export const delete${singularPascalName}: MutationResolvers['delete${singularPascalName}'] = ({ ${idArgs} }) => {
   return db.${singularCamelName}.delete({
-    where: { ${idName} },
+    where: { ${idWhere} },
   })
 }<% } %><% if (relations.length) { %>
 
 export const ${singularPascalName}: ${singularPascalName}RelationResolvers = {<% relations.forEach(relation => { %>
   ${relation}: (_obj, { root }) => {
-    return db.${singularCamelName}.findUnique({ where: { ${idName}: root?.${idName} } }).${relation}()
+    return db.${singularCamelName}.findUnique({ where: { ${idWhereFromRoot} } }).${relation}()
   },<% }) %>
 }<% } %>

package/dist/commands/generate/service/templates/test.ts.template

@@ -40,7 +40,7 @@ import type { StandardScenario } from './${pluralCamelName}.scenarios.js'
 // and can fail without adjustments, e.g. Float.
 //           Please refer to the RedwoodJS Testing Docs:
 //       https://cedarjs.com/docs/testing#testing-services
-// https://cedarjs.com/docs/testing#jest-expect-type-considerations
+// https://cedarjs.com/docs/testing#expect-type-considerations
 
 describe('${pluralCamelName}', () => {
   scenario('returns all ${pluralCamelName}', async (scenario: StandardScenario) => {

package/dist/commands/generate/yargsCommandHelpers.js

@@ -1,5 +1,5 @@
 import { terminalLink } from "termi-link";
-import { isTypeScriptProject } from "@cedarjs/cli-helpers";
+import { isTypeScriptProject } from "@cedarjs/cli-helpers/project";
 function getYargsDefaults() {
   return {
     force: {

package/dist/commands/generate/yargsHandlerHelpers.js

@@ -3,7 +3,8 @@ import path from "node:path";
 import { camelCase } from "change-case";
 import { Listr } from "listr2";
 import pascalcase from "pascalcase";
-import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { ensurePosixPath, getConfig } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { generateTemplate, getPaths, writeFilesTask } from "../../lib/index.js";

package/dist/commands/generate.js

@@ -1,6 +1,6 @@
 import { terminalLink } from "termi-link";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import * as generateCell from "./generate/cell/cell.js";
 import * as generateComponent from "./generate/component/component.js";
 import * as generateDataMigration from "./generate/dataMigration/dataMigration.js";

package/dist/commands/info.js

@@ -2,7 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import envinfo from "envinfo";
 import { terminalLink } from "termi-link";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { getConfigPath } from "@cedarjs/project-config";
 const command = "info";
 const description = "Print your system environment information";

package/dist/commands/lint.js

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import { terminalLink } from "termi-link";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { getPaths } from "@cedarjs/project-config";
 const command = "lint [paths..]";
 const description = "Lint your files";

package/dist/commands/prerenderHandler.js

@@ -1,9 +1,10 @@
 import fs from "node:fs";
 import path from "node:path";
 import { Listr } from "listr2";
-import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { colors as c } from "@cedarjs/cli-helpers/colors";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
-import { getConfig, getPaths, projectIsEsm } from "@cedarjs/project-config";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { getConfig, getParsedScalars, getPaths } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { runScriptFunction } from "../lib/exec.js";
 import { configureBabel } from "../lib/execBabel.js";
@@ -93,7 +94,7 @@ async function expandRouteParameters(route) {
   return [route];
 }
 const getTasks = async (dryrun, routerPathFilter = null) => {
-  const detector = projectIsEsm() ? await import("@cedarjs/prerender/detection") : await import("@cedarjs/prerender/cjs/detection");
+  const detector = await import("@cedarjs/prerender/detection");
   const detectedRoutes = detector.detectPrerenderRoutes();
   const prerenderRoutes = detectedRoutes.filter(hasPath).map(normalizeRoute);
   if (prerenderRoutes.length === 0) {
@@ -105,6 +106,12 @@ const getTasks = async (dryrun, routerPathFilter = null) => {
     );
     return [];
   }
+  const parsedScalars = Object.keys(getParsedScalars());
+  if (parsedScalars.length > 0) {
+    throw new Error(
+      "Prerendering does not support `graphql.parsedScalars` yet. A prerendered Cell gets the raw GraphQL response, so " + parsedScalars.join(", ") + " would be a string when prerendering and parsed in the browser. Either remove the `prerender` prop from your routes, or remove `graphql.parsedScalars` from cedar.toml."
+    );
+  }
   const indexHtmlPath = path.join(getPaths().web.dist, "index.html");
   if (!fs.existsSync(indexHtmlPath)) {
     console.error(
@@ -116,7 +123,7 @@ const getTasks = async (dryrun, routerPathFilter = null) => {
   const expandedRouteParameters = await Promise.all(
     prerenderRoutes.map((route) => expandRouteParameters(route))
   );
-  const prerenderer = projectIsEsm() ? await import("@cedarjs/prerender") : await import("@cedarjs/prerender/cjs");
+  const prerenderer = await import("@cedarjs/prerender");
   const listrTasks = expandedRouteParameters.flatMap((routesToPrerender) => {
     const queryCache = {};
     const shouldFold = routesToPrerender.length > 16;

package/dist/commands/prismaHandler.js

@@ -1,12 +1,13 @@
 import fs from "node:fs";
 import boxen from "boxen";
-import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { colors as c } from "@cedarjs/cli-helpers/colors";
 import {
   formatCedarCommand,
   formatRunBinCommand,
   formatRunTransitiveBinCommand
 } from "@cedarjs/cli-helpers/packageManager/display";
 import { runTransitiveBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths } from "../lib/index.js";
 const getErrorMessage = (error) => {
@@ -62,7 +63,11 @@ const handler = async ({
   try {
     runTransitiveBinSync("prisma", args, {
       cwd: cedarPaths.base,
-      stdio: "inherit"
+      stdio: [
+        process.stdin.isTTY && !process.env.CI ? "inherit" : "pipe",
+        "inherit",
+        "inherit"
+      ]
     });
     if (hasHelpOption || args.length === 0) {
       printWrapInfo();

package/dist/commands/record/init.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 const handler = async (_argv) => {
   recordTelemetryAttributes({
     command: "record"

package/dist/commands/serve.js

@@ -5,7 +5,8 @@ import { serve as serveSrvx } from "srvx";
 import { terminalLink } from "termi-link";
 import * as apiServerCLIConfig from "@cedarjs/api-server/apiCliConfig";
 import * as bothServerCLIConfig from "@cedarjs/api-server/bothCliConfig";
-import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import * as webServerCLIConfig from "@cedarjs/web-server";
 import { getPaths, getConfig } from "../lib/index.js";
 import { serverFileExists } from "../lib/project.js";

package/dist/commands/setup/auth/auth.js

@@ -1,11 +1,9 @@
 import fs from "node:fs";
 import path from "node:path";
 import { terminalLink } from "termi-link";
-import {
-  recordTelemetryAttributes,
-  standardAuthBuilder
-} from "@cedarjs/cli-helpers";
+import { standardAuthBuilder } from "@cedarjs/cli-helpers/auth/setupHelpers";
 import { addRootPackages } from "@cedarjs/cli-helpers/packageManager/packages";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { getPaths } from "../../../lib/index.js";
 const command = "auth <provider>";
 const description = "Set up an auth configuration";

package/dist/commands/setup/cache/cache.js

@@ -1,5 +1,5 @@
 import { terminalLink } from "termi-link";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 const command = "cache <client>";
 const description = "Sets up an init file for service caching";
 const builder = (yargs) => {

package/dist/commands/setup/cache/cacheHandler.js

@@ -2,7 +2,8 @@ import fs from "node:fs";
 import path from "path";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
-import { addEnvVarTask, colors as c } from "@cedarjs/cli-helpers";
+import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { addEnvVarTask } from "@cedarjs/cli-helpers/project";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { addPackagesTask, getPaths, writeFile } from "../../../lib/index.js";
 import { isTypeScriptProject } from "../../../lib/project.js";

package/dist/commands/setup/database/postgres.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 const command = "postgres";
 const description = "Switch your project from SQLite to PostgreSQL (schema, dependencies, and database adapter)";
 function builder(yargs) {

package/dist/commands/setup/database/postgresHandler.js

@@ -2,9 +2,11 @@ import fs from "node:fs";
 import path from "node:path";
 import execa from "execa";
 import { Listr } from "listr2";
-import { colors, getPaths, installPackages } from "@cedarjs/cli-helpers";
+import { colors } from "@cedarjs/cli-helpers/colors";
+import { installPackages } from "@cedarjs/cli-helpers/installHelpers";
 import { prettyPrintCedarCommand } from "@cedarjs/cli-helpers/packageManager";
 import { addWorkspacePackages } from "@cedarjs/cli-helpers/packageManager/packages";
+import { getPaths } from "@cedarjs/cli-helpers/paths";
 import { resolveFile } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 function checkProjectShape(cedarPaths) {

package/dist/commands/setup/deploy/providers/baremetalHandler.js

@@ -2,7 +2,8 @@ import fs from "node:fs";
 import path from "node:path";
 import { Listr } from "listr2";
 import prompts from "prompts";
-import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import {
   addPackagesTask,

package/dist/commands/setup/deploy/providers/coherence.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 const command = "coherence";
 const description = "Setup Coherence deploy";
 function builder(yargs) {

package/dist/commands/setup/deploy/providers/coherenceHandler.js

@@ -3,16 +3,17 @@ import path from "path";
 import prismaInternals from "@prisma/internals";
 import { Listr } from "listr2";
 import * as toml from "smol-toml";
-import {
-  colors as c,
-  isTypeScriptProject,
-  getConfigPath
-} from "@cedarjs/cli-helpers";
+import { colors as c } from "@cedarjs/cli-helpers/colors";
 import {
   formatCedarCommand,
   formatRunBinCommand
 } from "@cedarjs/cli-helpers/packageManager/display";
-import { getPaths, getPrismaSchemas } from "@cedarjs/project-config";
+import { isTypeScriptProject } from "@cedarjs/cli-helpers/project";
+import {
+  getConfigPath,
+  getPaths,
+  getPrismaSchemas
+} from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { printSetupNotes } from "../../../../lib/index.js";
 import { serverFileExists } from "../../../../lib/project.js";

package/dist/commands/setup/deploy/providers/flightcontrolHandler.js

@@ -3,8 +3,9 @@ import { EOL } from "os";
 import path from "path";
 import prismaInternals from "@prisma/internals";
 import { Listr } from "listr2";
-import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { colors as c } from "@cedarjs/cli-helpers/colors";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { getPaths, getPrismaSchemas } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { writeFilesTask, printSetupNotes } from "../../../../lib/index.js";

package/dist/commands/setup/deploy/providers/netlifyHandler.js

@@ -1,8 +1,9 @@
 import fs from "node:fs";
 import path from "path";
 import { Listr } from "listr2";
-import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { colors as c } from "@cedarjs/cli-helpers/colors";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import {
   addPackagesTask,

package/dist/commands/setup/deploy/providers/renderHandler.js

@@ -2,7 +2,8 @@ import path from "path";
 import prismaInternals from "@prisma/internals";
 import { Listr } from "listr2";
 import prompts from "prompts";
-import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { getPaths, getPrismaSchemas } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { writeFilesTask, printSetupNotes } from "../../../../lib/index.js";

package/dist/commands/setup/deploy/providers/serverlessHandler.js

@@ -1,7 +1,8 @@
 import fs from "node:fs";
 import path from "node:path";
 import { Listr } from "listr2";
-import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { getSchemaPath, getConfigPath } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import {