@cedarjs/cli 7.0.0-canary.3260 → 7.0.0-rc.123

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "7.0.0-canary.3260",
+  "version": "7.0.0-rc.123",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -36,17 +36,17 @@
     "@babel/preset-typescript": "7.29.7",
     "@babel/traverse": "7.29.8",
     "@babel/types": "7.29.8",
-    "@cedarjs/api-server": "7.0.0-canary.3260",
-    "@cedarjs/babel-config": "7.0.0-canary.3260",
-    "@cedarjs/cli-helpers": "7.0.0-canary.3260",
-    "@cedarjs/internal": "7.0.0-canary.3260",
-    "@cedarjs/prerender": "7.0.0-canary.3260",
-    "@cedarjs/project-config": "7.0.0-canary.3260",
-    "@cedarjs/structure": "7.0.0-canary.3260",
-    "@cedarjs/telemetry": "7.0.0-canary.3260",
-    "@cedarjs/utils": "7.0.0-canary.3260",
-    "@cedarjs/vite": "7.0.0-canary.3260",
-    "@cedarjs/web-server": "7.0.0-canary.3260",
+    "@cedarjs/api-server": "7.0.0-rc.123",
+    "@cedarjs/babel-config": "7.0.0-rc.123",
+    "@cedarjs/cli-helpers": "7.0.0-rc.123",
+    "@cedarjs/internal": "7.0.0-rc.123",
+    "@cedarjs/prerender": "7.0.0-rc.123",
+    "@cedarjs/project-config": "7.0.0-rc.123",
+    "@cedarjs/structure": "7.0.0-rc.123",
+    "@cedarjs/telemetry": "7.0.0-rc.123",
+    "@cedarjs/utils": "7.0.0-rc.123",
+    "@cedarjs/vite": "7.0.0-rc.123",
+    "@cedarjs/web-server": "7.0.0-rc.123",
     "@listr2/prompt-adapter-enquirer": "4.3.2",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "2.11.0",
@@ -54,7 +54,7 @@
     "@opentelemetry/resources": "2.11.0",
     "@opentelemetry/sdk-trace-node": "2.11.0",
     "@opentelemetry/semantic-conventions": "1.43.0",
-    "@prisma/internals": "7.10.0",
+    "@prisma/internals": "7.8.0",
     "ansis": "4.4.0",
     "archiver": "7.0.1",
     "boxen": "5.1.2",
@@ -79,9 +79,10 @@
     "pascalcase": "1.0.0",
     "pluralize": "8.0.0",
     "portfinder": "1.0.38",
-    "prettier": "3.9.9",
+    "prettier": "3.9.8",
     "prisma": "7.10.0",
     "prompts": "2.4.2",
+    "semver": "7.8.5",
     "smol-toml": "1.8.0",
     "srvx": "0.12.8",
     "string-env-interpolation": "1.0.1",
@@ -90,14 +91,13 @@
     "title-case": "3.0.3",
     "unionfs": "4.6.0",
     "uuid": "11.1.1",
-    "verkit": "0.5.0",
     "yargs": "17.7.3"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "7.0.0-canary.3260",
-    "@prisma/dmmf": "7.10.0",
+    "@cedarjs/framework-tools": "7.0.0-rc.123",
+    "@prisma/dmmf": "7.8.0",
     "@types/archiver": "^7.0.0",
-    "memfs": "4.79.0",
+    "memfs": "4.78.1",
     "node-ssh": "13.2.1",
     "ts-dedent": "2.3.0",
     "typescript": "5.9.3",

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

@@ -1,43 +0,0 @@
-import type { ${fragmentName} } from 'types/graphql'
-
-import type {
-  CellSuccessProps,<% if (afterQuery || isEmpty) { %>
-  DataObject,<% } %>
-} from '@cedarjs/web'
-
-// A parent Cell spreads this fragment by name in its own QUERY, and passes
-// the matching field down as the `${camelName}` prop - no import needed,
-// just render <${pascalName}Cell />:
-//
-//   query FindSomething($id: Int!) {
-//     something(id: $id) {
-//       id
-//       ...${fragmentName}
-//     }
-//   }
-//
-//   <${pascalName}Cell ${camelName}={something} />
-export const FRAGMENT = gql`
-  fragment ${fragmentName} on ${fragmentOnType} {
-    id
-  }
-`
-<% 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 Empty = () => <div>Empty</div>
-
-export const Success = ({
-  ${camelName},
-}: CellSuccessProps<{ ${camelName}: ${fragmentName} }>) => {
-  return <div>{JSON.stringify(${camelName})}</div>
-}

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

@@ -1,23 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/react'
-
-import { Empty, Success } from './${pascalName}Cell'
-import { standard } from './${pascalName}Cell.mock'
-
-const meta: Meta = {
-  title: 'Cells/${pascalName}Cell',
-  tags: ['autodocs']
-}
-
-export default meta
-
-export const empty: StoryObj<typeof Empty> = {
-  render: () => {
-    return Empty ? <Empty /> : <></>
-  }
-}
-
-export const success: StoryObj<typeof Success> = {
-  render: (args) => {
-    return Success ? <Success {...standard()} {...args} /> : <></>
-  }
-}

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

@@ -1,30 +0,0 @@
-import { render } from '@cedarjs/testing/web'
-
-import { Empty, Success } from './${pascalName}Cell'
-import { standard } from './${pascalName}Cell.mock'
-
-// Generated boilerplate tests do not account for all circumstances
-// 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
-
-describe('${pascalName}Cell', () => {
-  it('renders Empty successfully', async () => {
-    expect(() => {
-      render(<Empty />)
-    }).not.toThrow()
-  })
-
-  // When you're ready to test the actual output of your component render
-  // you could test that, for example, certain text is present:
-  //
-  // 1. import { screen } from '@cedarjs/testing/web'
-  // 2. Add test: expect(screen.getByText('Hello, world')).toBeInTheDocument()
-
-  it('renders Success successfully', async () => {
-    expect(() => {
-      render(<Success ${camelName}={standard().${camelName}} />)
-    }).not.toThrow()
-  })
-})

package/dist/commands/generate/dbAuth/templates/login.oauth.tsx.template

@@ -1,164 +0,0 @@
-import { useEffect, useRef } from 'react'
-
-import {
-  Form,
-  Label,
-  TextField,
-  PasswordField,
-  Submit,
-  FieldError,
-} from '@cedarjs/forms'
-import { Link, navigate, routes } from '@cedarjs/router'
-import { Metadata } from '@cedarjs/web'
-import { toast, Toaster } from '@cedarjs/web/toast'
-
-import { getOAuthUrl, getOAuthError } from '@cedarjs/auth-dbauth-web/oauth'
-
-import { useAuth } from 'src/auth'
-
-const LoginPage = () => {
-  const { isAuthenticated, logIn } = useAuth()
-
-  useEffect(() => {
-    if (isAuthenticated) {
-      navigate(routes.home())
-    }
-  }, [isAuthenticated])
-
-  // Surface an error that the OAuth provider redirect sent back, e.g.
-  // after the user cancels the provider's consent screen.
-  useEffect(() => {
-    const oauthError = getOAuthError(window.location.search)
-
-    if (oauthError) {
-      toast.error('Could not log in: ' + oauthError)
-    }
-  }, [])
-
-  const ${usernameCamelCase}Ref = useRef<HTMLInputElement>(null)
-  useEffect(() => {
-    ${usernameCamelCase}Ref.current?.focus()
-  }, [])
-
-  const onSubmit = async (data: Record<string, string>) => {
-    const response = await logIn({ username: data.${usernameCamelCase}, password: data.${passwordCamelCase} })
-
-    if (response.message) {
-      toast(response.message)
-    } else if (response.error) {
-      toast.error(response.error)
-    } else {
-      toast.success('Welcome back!')
-    }
-  }
-
-  return (
-    <>
-      <Metadata title="Login" />
-
-      <main className="rw-main">
-        <Toaster toastOptions={{ className: 'rw-toast', duration: 6000 }} />
-        <div className="rw-scaffold rw-login-container">
-          <div className="rw-segment">
-            <header className="rw-segment-header">
-              <h2 className="rw-heading rw-heading-secondary">Login</h2>
-            </header>
-
-            <div className="rw-segment-main">
-              <div className="rw-form-wrapper">
-                <Form onSubmit={onSubmit} className="rw-form-wrapper">
-                  <Label
-                    name="${usernameCamelCase}"
-                    className="rw-label"
-                    errorClassName="rw-label rw-label-error"
-                  >
-                    ${usernameTitleCase}
-                  </Label>
-                  <TextField
-                    name="${usernameCamelCase}"
-                    className="rw-input"
-                    errorClassName="rw-input rw-input-error"
-                    ref={${usernameCamelCase}Ref}
-                    validation={{
-                      required: {
-                        value: true,
-                        message: '${usernameTitleCase} is required',
-                      },
-                    }}
-                  />
-
-                  <FieldError name="${usernameCamelCase}" className="rw-field-error" />
-
-                  <Label
-                    name="${passwordCamelCase}"
-                    className="rw-label"
-                    errorClassName="rw-label rw-label-error"
-                  >
-                    ${passwordTitleCase}
-                  </Label>
-                  <PasswordField
-                    name="${passwordCamelCase}"
-                    className="rw-input"
-                    errorClassName="rw-input rw-input-error"
-                    autoComplete="current-password"
-                    validation={{
-                      required: {
-                        value: true,
-                        message: '${passwordTitleCase} is required',
-                      },
-                    }}
-                  />
-
-                  <div className="rw-forgot-link">
-                    <Link
-                      to={routes.forgotPassword()}
-                      className="rw-forgot-link"
-                    >
-                      Forgot ${passwordTitleCase}?
-                    </Link>
-                  </div>
-
-                  <FieldError name="${passwordCamelCase}" className="rw-field-error" />
-
-                  <div className="rw-button-group">
-                    <Submit className="rw-button rw-button-blue">Login</Submit>
-                  </div>
-                </Form>
-
-                {/*
-                 * OAuth login buttons. Delete the ones for providers you
-                 * haven't configured in `cedar setup auth dbAuth --oauth`.
-                 * Each link is a full-page navigation to the provider's
-                 * authorize route — it must not be turned into a fetch/XHR
-                 * call.
-                 */}
-                <div className="rw-button-group">
-                  <a
-                    href={getOAuthUrl('google', { flow: 'login' })}
-                    className="rw-button rw-button-blue"
-                  >
-                    Continue with Google
-                  </a>
-                  <a
-                    href={getOAuthUrl('github', { flow: 'login' })}
-                    className="rw-button rw-button-blue"
-                  >
-                    Continue with GitHub
-                  </a>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div className="rw-login-link">
-            <span>Don&apos;t have an account?</span>{' '}
-            <Link to={routes.signup()} className="rw-link">
-              Sign up!
-            </Link>
-          </div>
-        </div>
-      </main>
-    </>
-  )
-}
-
-export default LoginPage

package/dist/commands/generate/dbAuth/templates/signup.oauth.tsx.template

@@ -1,147 +0,0 @@
-import { useEffect, useRef } from 'react'
-
-import {
-  Form,
-  Label,
-  TextField,
-  PasswordField,
-  FieldError,
-  Submit,
-} from '@cedarjs/forms'
-import { Link, navigate, routes } from '@cedarjs/router'
-import { Metadata } from '@cedarjs/web'
-import { toast, Toaster } from '@cedarjs/web/toast'
-
-import { getOAuthUrl } from '@cedarjs/auth-dbauth-web/oauth'
-
-import { useAuth } from 'src/auth'
-
-const SignupPage = () => {
-  const { isAuthenticated, signUp } = useAuth()
-
-  useEffect(() => {
-    if (isAuthenticated) {
-      navigate(routes.home())
-    }
-  }, [isAuthenticated])
-
-  // focus on ${usernameLowerCase} box on page load
-  const ${usernameCamelCase}Ref = useRef<HTMLInputElement>(null)
-  useEffect(() => {
-    ${usernameCamelCase}Ref.current?.focus()
-  }, [])
-
-  const onSubmit = async (data: Record<string, string>) => {
-    const response = await signUp({ username: data.${usernameCamelCase}, password: data.${passwordCamelCase} })
-
-    if (response.message) {
-      toast(response.message)
-    } else if (response.error) {
-      toast.error(response.error)
-    } else {
-      // user is signed in automatically
-      toast.success('Welcome!')
-    }
-  }
-
-  return (
-    <>
-      <Metadata title="Signup" />
-
-      <main className="rw-main">
-        <Toaster toastOptions={{ className: 'rw-toast', duration: 6000 }} />
-        <div className="rw-scaffold rw-login-container">
-          <div className="rw-segment">
-            <header className="rw-segment-header">
-              <h2 className="rw-heading rw-heading-secondary">Signup</h2>
-            </header>
-
-            <div className="rw-segment-main">
-              <div className="rw-form-wrapper">
-                <Form onSubmit={onSubmit} className="rw-form-wrapper">
-                  <Label
-                    name="${usernameCamelCase}"
-                    className="rw-label"
-                    errorClassName="rw-label rw-label-error"
-                  >
-                    ${usernameTitleCase}
-                  </Label>
-                  <TextField
-                    name="${usernameCamelCase}"
-                    className="rw-input"
-                    errorClassName="rw-input rw-input-error"
-                    ref={${usernameCamelCase}Ref}
-                    validation={{
-                      required: {
-                        value: true,
-                        message: '${usernameTitleCase} is required',
-                      },
-                    }}
-                  />
-                  <FieldError name="${usernameCamelCase}" className="rw-field-error" />
-
-                  <Label
-                    name="${passwordCamelCase}"
-                    className="rw-label"
-                    errorClassName="rw-label rw-label-error"
-                  >
-                    ${passwordTitleCase}
-                  </Label>
-                  <PasswordField
-                    name="${passwordCamelCase}"
-                    className="rw-input"
-                    errorClassName="rw-input rw-input-error"
-                    autoComplete="current-password"
-                    validation={{
-                      required: {
-                        value: true,
-                        message: '${passwordTitleCase} is required',
-                      },
-                    }}
-                  />
-                  <FieldError name="${passwordCamelCase}" className="rw-field-error" />
-
-                  <div className="rw-button-group">
-                    <Submit className="rw-button rw-button-blue">
-                      Sign Up
-                    </Submit>
-                  </div>
-                </Form>
-
-                {/*
-                 * OAuth signup buttons. Delete the ones for providers you
-                 * haven't configured in `cedar setup auth dbAuth --oauth`.
-                 * Each link is a full-page navigation to the provider's
-                 * authorize route — it must not be turned into a fetch/XHR
-                 * call.
-                 */}
-                <div className="rw-button-group">
-                  <a
-                    href={getOAuthUrl('google', { flow: 'signup' })}
-                    className="rw-button rw-button-blue"
-                  >
-                    Continue with Google
-                  </a>
-                  <a
-                    href={getOAuthUrl('github', { flow: 'signup' })}
-                    className="rw-button rw-button-blue"
-                  >
-                    Continue with GitHub
-                  </a>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div className="rw-login-link">
-            <span>Already have an account?</span>{' '}
-            <Link to={routes.login()} className="rw-link">
-              Log in!
-            </Link>
-          </div>
-        </div>
-      </main>
-    </>
-  )
-}
-
-export default SignupPage

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

@@ -1,66 +0,0 @@
-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

@@ -1,64 +0,0 @@
-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
-};