@cedarjs/cli 7.1.0 → 7.1.1-next.469

package/dist/commands/setup/monitoring/sentry/sentryHandler.js

@@ -1,16 +1,17 @@
 import fs from "node:fs";
 import path from "path";
 import { Listr } from "listr2";
+import { colors } from "@cedarjs/cli-helpers/colors";
+import { prettify, writeFilesTask } from "@cedarjs/cli-helpers/fileHelpers";
 import {
   addApiPackages,
+  addWebPackages
+} from "@cedarjs/cli-helpers/installHelpers";
+import { getPaths } from "@cedarjs/cli-helpers/paths";
+import {
   addEnvVarTask,
-  addWebPackages,
-  colors,
-  getPaths,
-  isTypeScriptProject,
-  prettify,
-  writeFilesTask
-} from "@cedarjs/cli-helpers";
+  isTypeScriptProject
+} from "@cedarjs/cli-helpers/project";
 import { getConfigPath } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 const rwPaths = getPaths();
@@ -75,7 +76,6 @@ const handler = async ({ force }) => {
           "export const handler = createGraphQLHandler({",
           "extraPlugins: [useSentry({",
           "  includeRawResult: true,",
-          "  includeResolverArgs: true,",
           "  includeExecuteVariables: true,",
           "})],"
         );
@@ -111,7 +111,11 @@ const handler = async ({ force }) => {
         contentLines.splice(
           boundaryOpenIndex,
           1,
-          "<Sentry.ErrorBoundary fallback={FatalErrorPage}>"
+          "<Sentry.ErrorBoundary",
+          "  fallback={({ error }) => (",
+          "    <FatalErrorPage error={error instanceof Error ? error : undefined} />",
+          "  )}",
+          ">"
         );
         const boundaryCloseIndex = contentLines.findLastIndex(
           (line) => line.includes("</FatalErrorBoundary>")

package/dist/commands/setup/monitoring/sentry/templates/sentryApi.ts.template

@@ -3,10 +3,7 @@ import * as Sentry from '@sentry/node'
 Sentry.init({
   dsn: process.env.SENTRY_DSN,
   environment: process.env.NODE_ENV,
-  integrations: [
-    Sentry.prismaIntegration(),
-    Sentry.httpIntegration(),
-  ],
+  integrations: [Sentry.prismaIntegration(), Sentry.httpIntegration()],
   tracesSampleRate: 1.0,
 })
 

package/dist/commands/setup/monitoring/sentry/templates/sentryWeb.ts.template

@@ -1,9 +1,12 @@
 import * as Sentry from '@sentry/react'
 
+const sentryDsn =
+  typeof process === 'undefined' ? undefined : process.env?.SENTRY_DSN
+
 let dsn = ''
 let environment = 'development'
 
-if (typeof process === 'undefined' || !process.env?.SENTRY_DSN) {
+if (!sentryDsn) {
   console.error(
     'Missing SENTRY_DSN environment variable. Did you forget to add it to ' +
       'your cedar.toml (or redwood.toml) in `includeEnvironmentVariables`?'
@@ -17,14 +20,14 @@ if (typeof process === 'undefined' || !process.env?.SENTRY_DSN) {
   `)
   console.error('Sentry is disabled for now')
 } else {
-  dsn = process.env.SENTRY_DSN
-  environment = process.env.NODE_ENV
+  dsn = sentryDsn
+  environment = process.env.NODE_ENV ?? 'development'
 }
 
 Sentry.init({
   dsn,
   environment,
-  integrations: [ Sentry.browserTracingIntegration() ],
+  integrations: [Sentry.browserTracingIntegration()],
   tracesSampleRate: 1.0,
 })
 

package/dist/commands/setup/neon/neon.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 const command = "neon";
 const description = "Provision a Neon Postgres database and configure your project";
 function builder(yargs) {

package/dist/commands/setup/neon/neonHandler.js

@@ -3,8 +3,11 @@ import path from "node:path";
 import execa from "execa";
 import { Listr } from "listr2";
 import prompts from "prompts";
-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 { getPaths } from "@cedarjs/cli-helpers/paths";
+import { requireTTYOrExit } from "@cedarjs/cli-helpers/tty";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import {
   checkProjectShape,
@@ -54,14 +57,7 @@ async function handler({ force, migrations, verbose }) {
   }
   let runMigrations = migrations;
   if (!skipProvisioning && runMigrations === void 0) {
-    if (!process.stdin.isTTY) {
-      const error = new Error(
-        "Cannot prompt for confirmation in a non-interactive terminal. Please pass --migrations or --no-migrations explicitly."
-      );
-      errorTelemetry(process.argv, error.message);
-      console.error(colors.error(error.message));
-      process.exit(1);
-    }
+    requireTTYOrExit("--migrations or --no-migrations");
     const response = await prompts({
       type: "toggle",
       name: "runMigrations",

package/dist/commands/setup/package/package.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 = "package <npm-package>";
 const description = "Run a bin from an NPM package with version compatibility checks";
 const builder = (yargs) => {

package/dist/commands/setup/package/packageHandler.js

@@ -1,7 +1,7 @@
 import enq from "enquirer";
-import semver from "semver";
-import { getCompatibilityData } from "@cedarjs/cli-helpers";
+import { isGreaterThanOrEqual, isLessThan, tryParse } from "verkit";
 import { dlx } from "@cedarjs/cli-helpers/packageManager/exec";
+import { getCompatibilityData } from "@cedarjs/cli-helpers/version";
 import { getPaths } from "@cedarjs/project-config";
 async function handler({
   npmPackage,
@@ -16,7 +16,7 @@ async function handler({
     console.log(
       "No compatibility check will be performed because you used the --force flag."
     );
-    if (semver.parse(packageVersion) !== null && semver.lt(packageVersion, "1.0.0")) {
+    if (tryParse(packageVersion) !== null && isLessThan(packageVersion, "1.0.0")) {
       console.log(
         "Be aware that this package is under version 1.0.0 and so should be considered experimental."
       );
@@ -86,7 +86,7 @@ The latest version compatible with your project is ${latestCompatibleVersionText
   await runPackage(packageName, versionToUse, additionalOptionsToForward);
 }
 async function showExperimentalWarning(version) {
-  if (version === void 0 || semver.parse(version) === null || semver.gte(version, "1.0.0")) {
+  if (version === void 0 || tryParse(version) === null || isGreaterThanOrEqual(version, "1.0.0")) {
     return;
   }
   const decision = await promptWithChoices(

package/dist/commands/setup/realtime/addRealtimeToGraphql.js

@@ -1,6 +1,6 @@
 import fs from "node:fs";
 import path from "node:path";
-import { isTypeScriptProject } from "@cedarjs/cli-helpers";
+import { isTypeScriptProject } from "@cedarjs/cli-helpers/project";
 import { getPaths } from "@cedarjs/project-config";
 function addRealtimeToGraphqlHandler(ctx, task, force) {
   const graphqlHandlerPath = path.join(

package/dist/commands/setup/realtime/realtime.js

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

package/dist/commands/setup/realtime/realtimeHandler.js

@@ -2,10 +2,10 @@ import fs from "node:fs";
 import path from "path";
 import { Listr } from "listr2";
 import prompts from "prompts";
-import { addApiPackages, colors as c } from "@cedarjs/cli-helpers";
+import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { addApiPackages } from "@cedarjs/cli-helpers/installHelpers";
 import { runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
 import { generate as generateTypes } from "@cedarjs/internal/dist/generate/generate";
-import { projectIsEsm } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths, transformTSToJS, writeFile } from "../../../lib/index.js";
 import { isTypeScriptProject, serverFileExists } from "../../../lib/project.js";
@@ -77,7 +77,7 @@ async function handler(args) {
         title: "Adding Countdown example subscription...",
         enabled: () => includeExamples,
         task: async () => {
-          let exampleSubscriptionTemplateContent = fs.readFileSync(
+          const exampleSubscriptionTemplateContent = fs.readFileSync(
             path.resolve(
               import.meta.dirname,
               "templates",
@@ -87,12 +87,6 @@ async function handler(args) {
             ),
             "utf-8"
           );
-          if (projectIsEsm()) {
-            exampleSubscriptionTemplateContent = exampleSubscriptionTemplateContent.replace(
-              "import gql from 'graphql-tag'",
-              "import { gql } from 'graphql-tag'"
-            );
-          }
           const exampleFile = path.join(
             cedarPaths.api.subscriptions,
             "countdown",
@@ -144,7 +138,7 @@ async function handler(args) {
             `rooms.${isTypeScriptProject() ? "ts" : "js"}`
           );
           const serviceContent = ts ? exampleServiceTemplateContent : await transformTSToJS(serviceFile, exampleServiceTemplateContent);
-          let exampleSubscriptionTemplateContent = fs.readFileSync(
+          const exampleSubscriptionTemplateContent = fs.readFileSync(
             path.resolve(
               import.meta.dirname,
               "templates",
@@ -154,12 +148,6 @@ async function handler(args) {
             ),
             "utf-8"
           );
-          if (projectIsEsm()) {
-            exampleSubscriptionTemplateContent = exampleSubscriptionTemplateContent.replace(
-              "import gql from 'graphql-tag'",
-              "import { gql } from 'graphql-tag'"
-            );
-          }
           const exampleFile = path.join(
             cedarPaths.api.subscriptions,
             "newMessage",

package/dist/commands/setup/realtime/templates/defer/fastAndSlowFields/fastAndSlowFields.ts.template

@@ -7,7 +7,10 @@ export const fastField = async () => {
   return 'I am fast'
 }
 
-export const slowField = async (_, { waitFor = 5000 }) => {
+export const slowField = async (
+  _: unknown,
+  { waitFor = 5000 }: { waitFor?: number }
+) => {
   logger.debug('waiting on slowField')
   await wait(waitFor)
   return 'I am slow'

package/dist/commands/setup/realtime/templates/liveQueries/auctions/auctions.ts.template

@@ -1,8 +1,16 @@
+import type { BidInput } from 'types/graphql'
+
 import type { LiveQueryStorageMechanism } from '@cedarjs/realtime'
 
 import { logger } from 'src/lib/logger'
 
-const auctions = [
+interface AuctionData {
+  id: string
+  title: string
+  bids: { amount: number }[]
+}
+
+const auctions: AuctionData[] = [
   { id: '1', title: 'RedwoodJS Logo Shirt', bids: [{ amount: 20 }] },
   { id: '2', title: 'RedwoodJS Lapel Pin', bids: [{ amount: 5 }] },
   { id: '3', title: 'RedwoodJS Beanie', bids: [{ amount: 15 }] },
@@ -34,14 +42,14 @@ const auctions = [
  *   }
  * }
  */
-export const auction = async ({ id }) => {
+export const auction = async ({ id }: { id: string }) => {
   const foundAuction = auctions.find((a) => a.id === id)
   logger.debug({ id, auction: foundAuction }, 'auction')
   return foundAuction
 }
 
 export const bid = async (
-  { input },
+  { input }: { input: BidInput },
   { context }: { context: { liveQueryStore: LiveQueryStorageMechanism } }
 ) => {
   const { auctionId, amount } = input
@@ -62,7 +70,7 @@ export const bid = async (
 }
 
 export const Auction = {
-  highestBid: (obj, { root }) => {
+  highestBid: (obj: unknown, { root }: { root: AuctionData }) => {
     const [max] = root.bids.sort((a, b) => b.amount - a.amount)
 
     logger.debug({ obj, root }, 'highestBid')

package/dist/commands/setup/realtime/templates/subscriptions/countdown/countdown.ts.template

@@ -1,4 +1,4 @@
-import gql from 'graphql-tag'
+import { gql } from 'graphql-tag'
 
 import { Repeater } from '@cedarjs/realtime'
 

package/dist/commands/setup/realtime/templates/subscriptions/newMessage/newMessage.ts.template

@@ -1,4 +1,4 @@
-import gql from 'graphql-tag'
+import { gql } from 'graphql-tag'
 
 import type { PubSub } from '@cedarjs/realtime'
 
@@ -48,7 +48,7 @@ const newMessage = {
 
       return pubSub.subscribe('newMessage', roomId)
     },
-    resolve: (payload) => {
+    resolve: (payload: NewMessageChannel['newMessage'][1]) => {
       logger.debug({ payload }, 'newMessage subscription resolve')
 
       return payload

package/dist/commands/setup/server-file/serverFile.js

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

package/dist/commands/setup/server-file/serverFileHandler.js

@@ -1,7 +1,8 @@
 import fs from "node:fs";
 import path from "path";
 import { Listr } from "listr2";
-import { addApiPackages, colors as c } from "@cedarjs/cli-helpers";
+import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { addApiPackages } from "@cedarjs/cli-helpers/installHelpers";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths, transformTSToJS, writeFile } from "../../../lib/index.js";
 import { isTypeScriptProject } from "../../../lib/project.js";

package/dist/commands/setup/tenancy/authCodemod.js

@@ -0,0 +1,66 @@
+import j from "jscodeshift";
+function buildMembershipsSelectProperty() {
+  const snippet = `
+    const __tenancySnippet = {
+      memberships: {
+        select: {
+          id: true,
+          organizationId: true,
+          role: true,
+          organization: { select: { id: true, slug: true, name: true } },
+        },
+      },
+    }
+  `;
+  const property = j.withParser("ts")(snippet).find(j.ObjectProperty, { key: { name: "memberships" } }).nodes()[0];
+  if (!property) {
+    throw new Error("CEDAR_CODEMOD_ERR_AUTH_SHAPE_NOT_FOUND");
+  }
+  return property;
+}
+function transform(fileInfo) {
+  const root = j.withParser("tsx")(fileInfo.source);
+  let selectFound = false;
+  root.find(j.CallExpression, {
+    callee: {
+      type: "MemberExpression",
+      object: {
+        type: "MemberExpression",
+        object: { name: "db" },
+        property: { name: "user" }
+      },
+      property: { name: "findUnique" }
+    }
+  }).forEach((path) => {
+    const [args] = path.node.arguments;
+    if (!j.ObjectExpression.check(args)) {
+      return;
+    }
+    const selectProperty = args.properties.find(
+      (prop) => j.ObjectProperty.check(prop) && j.Identifier.check(prop.key) && prop.key.name === "select"
+    );
+    if (!selectProperty || !j.ObjectProperty.check(selectProperty) || !j.ObjectExpression.check(selectProperty.value)) {
+      return;
+    }
+    const alreadyHasMemberships = selectProperty.value.properties.some(
+      (prop) => j.ObjectProperty.check(prop) && j.Identifier.check(prop.key) && prop.key.name === "memberships"
+    );
+    if (!alreadyHasMemberships) {
+      selectProperty.value.properties.push(buildMembershipsSelectProperty());
+    }
+    selectFound = true;
+  });
+  if (!selectFound) {
+    throw new Error("CEDAR_CODEMOD_ERR_AUTH_SHAPE_NOT_FOUND");
+  }
+  const tenancyExportSnippet = `export { hasOrgRole, requireMembership } from '@cedarjs/tenancy'
+`;
+  const tenancyExport = j.withParser("ts")(tenancyExportSnippet).find(j.ExportNamedDeclaration).nodes()[0];
+  root.find(j.Program).forEach((path) => {
+    path.node.body.push(tenancyExport);
+  });
+  return root.toSource();
+}
+export {
+  transform as default
+};

package/dist/commands/setup/tenancy/dbCodemod.js

@@ -0,0 +1,64 @@
+import j from "jscodeshift";
+const DEFAULT_GLOBAL_MODELS = ["user", "organization", "membership"];
+function transform(fileInfo, _api, options) {
+  const root = j.withParser("tsx")(fileInfo.source);
+  const tenantField = typeof options.tenantField === "string" ? options.tenantField : void 0;
+  const imports = root.find(j.ImportDeclaration);
+  imports.at(-1).insertAfter(
+    j.importDeclaration(
+      [j.importSpecifier(j.identifier("createTenancyExtension"))],
+      j.literal("@cedarjs/tenancy")
+    )
+  );
+  const configProperties = [
+    ...tenantField ? [
+      j.objectProperty(
+        j.identifier("tenantField"),
+        j.stringLiteral(tenantField)
+      )
+    ] : [],
+    j.objectProperty(
+      j.identifier("models"),
+      j.objectExpression([
+        j.objectProperty(
+          j.identifier("allExcept"),
+          j.arrayExpression(
+            DEFAULT_GLOBAL_MODELS.map((name) => j.stringLiteral(name))
+          )
+        )
+      ])
+    )
+  ];
+  let found = false;
+  root.find(j.VariableDeclaration, { declarations: [{ id: { name: "db" } }] }).forEach((path) => {
+    const dbDeclaration = path.node.declarations[0];
+    if (!j.VariableDeclarator.check(dbDeclaration)) {
+      return;
+    }
+    if (j.NewExpression.check(dbDeclaration.init)) {
+      throw new Error("CEDAR_CODEMOD_ERR_OLD_FORMAT");
+    }
+    if (!j.Expression.check(dbDeclaration.init)) {
+      return;
+    }
+    found = true;
+    const extensionCall = j.callExpression(
+      j.identifier("createTenancyExtension"),
+      [j.objectExpression(configProperties)]
+    );
+    dbDeclaration.init = j.callExpression(
+      j.memberExpression(dbDeclaration.init, j.identifier("$extends")),
+      [extensionCall]
+    );
+  });
+  if (!found) {
+    throw new Error("CEDAR_CODEMOD_ERR_DB_SHAPE_NOT_FOUND");
+  }
+  return root.toSource().replace(
+    "createTenancyExtension(",
+    "createTenancyExtension<typeof prismaClient>("
+  );
+}
+export {
+  transform as default
+};

package/dist/commands/setup/tenancy/graphqlCodemod.js

@@ -0,0 +1,88 @@
+import j from "jscodeshift";
+function buildContextProperty() {
+  const snippet = `
+    const __tenancySnippet = {
+      context: async ({ context: gqlContext }) => {
+        const { currentUser, event, request, params } = gqlContext
+
+        // A user whose getCurrentUser result doesn't carry memberships
+        // can't be matched to an organization, so the request runs with
+        // no current organization set.
+        if (!isUserWithMemberships(currentUser)) {
+          return {}
+        }
+
+        // Yoga can populate either \`event\` (Lambda-style deployments) or
+        // \`request\` (Fetch-API-style deployments); resolveCurrentOrg reads
+        // the organization header off either.
+        const requestEvent = event ?? request
+
+        if (!requestEvent) {
+          return {}
+        }
+
+        const currentOrg = await resolveCurrentOrg({
+          event: requestEvent,
+          variables: params.variables,
+          currentUser,
+          lookupOrg: async (idOrSlug) =>
+            (await db.organization.findUnique({
+              where: { id: idOrSlug },
+              select: { id: true, slug: true },
+            })) ??
+            db.organization.findUnique({
+              where: { slug: idOrSlug },
+              select: { id: true, slug: true },
+            }),
+        })
+
+        return { currentOrg }
+      },
+    }
+  `;
+  const property = j.withParser("ts")(snippet).find(j.ObjectProperty, { key: { name: "context" } }).nodes()[0];
+  if (!property) {
+    throw new Error("CEDAR_CODEMOD_ERR_GRAPHQL_HANDLER_NOT_FOUND");
+  }
+  return property;
+}
+function addNamedImport(root, names, source) {
+  const imports = root.find(j.ImportDeclaration);
+  imports.at(-1).insertAfter(
+    j.importDeclaration(
+      names.map((name) => j.importSpecifier(j.identifier(name))),
+      j.literal(source)
+    )
+  );
+}
+function transform(fileInfo) {
+  const root = j.withParser("tsx")(fileInfo.source);
+  const handlerCalls = root.find(j.CallExpression, {
+    callee: { name: "createGraphQLHandler" }
+  });
+  if (handlerCalls.length === 0) {
+    throw new Error("CEDAR_CODEMOD_ERR_GRAPHQL_HANDLER_NOT_FOUND");
+  }
+  handlerCalls.forEach((path) => {
+    const [config] = path.node.arguments;
+    if (!j.ObjectExpression.check(config)) {
+      throw new Error("CEDAR_CODEMOD_ERR_GRAPHQL_HANDLER_NOT_FOUND");
+    }
+    const hasContext = config.properties.some(
+      (prop) => j.ObjectProperty.check(prop) && j.Identifier.check(prop.key) && prop.key.name === "context"
+    );
+    if (hasContext) {
+      throw new Error("CEDAR_CODEMOD_ERR_GRAPHQL_CONTEXT_EXISTS");
+    }
+    config.properties.push(buildContextProperty());
+  });
+  addNamedImport(
+    root,
+    ["isUserWithMemberships", "resolveCurrentOrg"],
+    "@cedarjs/tenancy"
+  );
+  return root.toSource();
+}
+export {
+  transform as default
+};

package/dist/commands/setup/tenancy/preflight.js

@@ -0,0 +1,49 @@
+import fs from "node:fs";
+import path from "node:path";
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
+const WEB_AUTH_EXTENSIONS = ["ts", "tsx", "js", "jsx"];
+function hasWebAuthFile(webSrcPath) {
+  return WEB_AUTH_EXTENSIONS.some(
+    (extension) => fs.existsSync(path.join(webSrcPath, `auth.${extension}`))
+  );
+}
+function authNotSetUpMessage() {
+  return [
+    "Auth is not set up in this project.",
+    "",
+    "Tenancy builds on your app's auth: it adds memberships to",
+    "`getCurrentUser`, and resolves the current organization from the",
+    "signed-in user's memberships. Set up auth first, then run this command",
+    "again:",
+    "",
+    `  ${formatCedarCommand(["setup", "auth", "dbAuth"])}`,
+    "",
+    "Any provider works. See https://cedarjs.com/docs/authentication"
+  ].join("\n");
+}
+function noUserModelMessage(schemaPath) {
+  return [
+    `No \`User\` model found in ${schemaPath}.`,
+    "",
+    "Tenancy hangs memberships off your app's `User` model, so it needs one",
+    "before it can add `Organization` and `Membership`.",
+    "",
+    "dbAuth adds this model for you. Providers that authenticate against an",
+    "external service leave it to you: give `User` its own id and store the",
+    "provider's id in a column beside it, so memberships keep working if you",
+    "switch providers or add a second one.",
+    "",
+    `Add a model like this one, run \`${formatCedarCommand(["prisma", "migrate", "dev"])}\`, then`,
+    "run this command again:",
+    "",
+    "  model User {",
+    "    id    String @id @default(cuid())",
+    "    email String @unique",
+    "  }"
+  ].join("\n");
+}
+export {
+  authNotSetUpMessage,
+  hasWebAuthFile,
+  noUserModelMessage
+};