@cedarjs/cli 8.0.0-canary.3275 → 8.0.0-canary.3286

package/dist/commands/deploy/baremetal/baremetalHandler.js

@@ -14,6 +14,8 @@ const CONFIG_FILENAME = "deploy.toml";
 const SYMLINK_FLAGS = "-nsf";
 const CURRENT_RELEASE_SYMLINK_NAME = "current";
 const LIFECYCLE_HOOKS = ["before", "after"];
+const RELEASE_DIR_PATTERN = "^[0-9]{14}$";
+const releaseDirRegExp = new RegExp(RELEASE_DIR_PATTERN);
 const DEFAULT_SERVER_CONFIG = {
   port: 22,
   branch: "main",
@@ -141,8 +143,13 @@ const rollbackTasks = (count, ssh, serverConfig) => {
       title: `Rolling back ${rollbackCount} release(s)...`,
       task: async () => {
         const currentLink = (await ssh.exec(serverConfig.path, "readlink", ["-f", "current"])).stdout.split("/").pop();
-        const dirs = (await ssh.exec(serverConfig.path, "ls", ["-t"])).stdout.split("\n").filter((dirs2) => !dirs2.match(/current/));
+        const dirs = (await ssh.exec(serverConfig.path, "ls", ["-t"])).stdout.split("\n").filter((dir) => releaseDirRegExp.test(dir));
         const deployedIndex = dirs.indexOf(currentLink ?? "");
+        if (deployedIndex === -1) {
+          throw new Error(
+            `Cannot rollback: \`current\` points to "${currentLink}", which is not a timestamp-named release directory`
+          );
+        }
         const rollbackIndex = deployedIndex + rollbackCount;
         if (dirs[rollbackIndex]) {
           console.info("Setting symlink");
@@ -153,7 +160,7 @@ const rollbackTasks = (count, ssh, serverConfig) => {
           );
         } else {
           throw new Error(
-            `Cannot rollback ${rollbackCount} release(s): ${dirs.length - dirs.indexOf(currentLink ?? "") - 1} previous release(s) available`
+            `Cannot rollback ${rollbackCount} release(s): ${dirs.length - deployedIndex - 1} previous release(s) available`
           );
         }
       }
@@ -425,10 +432,10 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
       command: {
         title: `Cleaning up old deploys...`,
         task: async () => {
-          const fileStartIndex = serverConfig.keepReleases + 2;
+          const fileStartIndex = serverConfig.keepReleases + 1;
           await ssh.exec(
             serverConfig.path,
-            `ls -t | tail -n +${fileStartIndex} | xargs rm -rf`
+            `ls -t | grep -E '${RELEASE_DIR_PATTERN}' | tail -n +${fileStartIndex} | xargs -r rm -rf`
           );
         }
       }
@@ -587,6 +594,7 @@ const handler = async (yargs) => {
 };
 export {
   DEFAULT_SERVER_CONFIG,
+  RELEASE_DIR_PATTERN,
   commandWithLifecycleEvents,
   commands,
   deployTasks,

package/dist/commands/generate/dbAuth/dbAuth.js

@@ -1,9 +1,13 @@
 import { terminalLink } from "termi-link";
 import { getYargsDefaults, createHandler } from "../yargsCommandHelpers.js";
 const command = "dbAuth";
-const description = "Generate Login, Signup and Forgot Password pages for dbAuth";
+const description = "Generate Login, Signup, Forgot Password, Reset Password and Change Password pages for dbAuth";
 const builder = (yargs) => {
-  yargs.option("skip-forgot", {
+  yargs.option("skip-change", {
+    description: "Skip generating the Change Password page",
+    type: "boolean",
+    default: false
+  }).option("skip-forgot", {
     description: "Skip generating the Forgot Password page",
     type: "boolean",
     default: false

package/dist/commands/generate/dbAuth/dbAuthHandler.js

@@ -18,12 +18,25 @@ import {
 } from "../../../lib/index.js";
 import { prepareForRollback } from "../../../lib/rollback.js";
 import { templateForComponentFile } from "../yargsHandlerHelpers.js";
-const ROUTES = [
-  `<Route path="/login" page={LoginPage} name="login" />`,
-  `<Route path="/signup" page={SignupPage} name="signup" />`,
-  `<Route path="/forgot-password" page={ForgotPasswordPage} name="forgotPassword" />`,
-  `<Route path="/reset-password" page={ResetPasswordPage} name="resetPassword" />`
-];
+function routesFor({
+  skipChange,
+  skipForgot,
+  skipLogin,
+  skipReset,
+  skipSignup
+}) {
+  return [
+    !skipLogin && `<Route path="/login" page={LoginPage} name="login" />`,
+    !skipSignup && `<Route path="/signup" page={SignupPage} name="signup" />`,
+    !skipForgot && `<Route path="/forgot-password" page={ForgotPasswordPage} name="forgotPassword" />`,
+    !skipReset && `<Route path="/reset-password" page={ResetPasswordPage} name="resetPassword" />`,
+    !skipChange && `<Route path="/change-password" page={ChangePasswordPage} name="changePassword" />`
+  ].filter((route) => typeof route === "string");
+}
+function pascalCase(str) {
+  const camelCased = camelCase(str);
+  return camelCased.charAt(0).toUpperCase() + camelCased.slice(1);
+}
 function getPostInstallMessage(isDbAuthSetup2) {
   return [
     `   ${c.warning("Pages created! But you're not done yet:")}
@@ -35,9 +48,11 @@ function getPostInstallMessage(isDbAuthSetup2) {
     "       navigate(routes.home())",
     "     }\n",
     "   and change the route to where you want them to go if the user is already",
-    "   logged in. Also take a look in the onSubmit() functions in ForgotPasswordPage",
-    "   and ResetPasswordPage to change where the user redirects to after submitting",
-    "   those forms.\n",
+    "   logged in. Also take a look in the onSubmit() functions in ForgotPasswordPage,",
+    "   ResetPasswordPage and ChangePasswordPage to change where the user redirects",
+    "   to after submitting those forms.\n",
+    "   ChangePasswordPage is for users who are already logged in. Link to it from",
+    "   wherever your app lets users manage their account.\n",
     !isDbAuthSetup2 && `   Oh, and if you haven't already, add the necessary dbAuth functions and
    app setup by running:
 
@@ -58,9 +73,11 @@ function getPostInstallWebauthnMessage(isDbAuthSetup2) {
     "       navigate(routes.home())",
     "     }\n",
     "   and change the route to where you want them to go if the user is already",
-    "   logged in. Also take a look in the onSubmit() functions in ForgotPasswordPage",
-    "   and ResetPasswordPage to change where the user redirects to after submitting",
-    "   those forms.\n",
+    "   logged in. Also take a look in the onSubmit() functions in ForgotPasswordPage,",
+    "   ResetPasswordPage and ChangePasswordPage to change where the user redirects",
+    "   to after submitting those forms.\n",
+    "   ChangePasswordPage is for users who are already logged in. Link to it from",
+    "   wherever your app lets users manage their account.\n",
     !isDbAuthSetup2 && `   Oh, and if you haven't already, add the necessary dbAuth functions and
    app setup by running:
 
@@ -71,6 +88,7 @@ function getPostInstallWebauthnMessage(isDbAuthSetup2) {
 }
 const files = async ({
   typescript,
+  skipChange,
   skipForgot,
   skipLogin,
   skipReset,
@@ -90,7 +108,8 @@ const files = async ({
     usernameTitleCase: titleCase(usernameLabel),
     passwordLowerCase: passwordLabel.toLowerCase(),
     passwordCamelCase: camelCase(passwordLabel),
-    passwordTitleCase: titleCase(passwordLabel)
+    passwordTitleCase: titleCase(passwordLabel),
+    passwordPascalCase: pascalCase(passwordLabel)
   };
   if (!skipForgot) {
     filesList.push(
@@ -131,6 +150,19 @@ const files = async ({
       })
     );
   }
+  if (!skipChange) {
+    filesList.push(
+      await templateForComponentFile({
+        name: "ChangePassword",
+        suffix: "Page",
+        extension: typescript ? ".tsx" : ".jsx",
+        webPathSection: "pages",
+        generator: "dbAuth",
+        templatePath: "changePassword.tsx.template",
+        templateVars
+      })
+    );
+  }
   if (!skipSignup) {
     filesList.push(
       await templateForComponentFile({
@@ -179,6 +211,7 @@ const tasks = ({
   listr2,
   force,
   typescript,
+  skipChange,
   skipForgot,
   skipLogin,
   skipReset,
@@ -289,6 +322,7 @@ const tasks = ({
         task: async () => {
           const filesObj = await files({
             typescript,
+            skipChange,
             skipForgot,
             skipLogin,
             skipReset,
@@ -305,7 +339,15 @@ const tasks = ({
       {
         title: "Adding routes...",
         task: async () => {
-          addRoutesToRouterTask(ROUTES);
+          addRoutesToRouterTask(
+            routesFor({
+              skipChange,
+              skipForgot,
+              skipLogin,
+              skipReset,
+              skipSignup
+            })
+          );
         }
       },
       {
@@ -335,6 +377,7 @@ const tasks = ({
 const handler = async (yargs) => {
   recordTelemetryAttributes({
     command: "generate dbAuth",
+    skipChange: yargs.skipChange,
     skipForgot: yargs.skipForgot,
     skipLogin: yargs.skipLogin,
     skipReset: yargs.skipReset,

package/dist/commands/generate/dbAuth/templates/changePassword.tsx.template

@@ -0,0 +1,131 @@
+import { useEffect, useRef } from 'react'
+
+import {
+  Form,
+  Label,
+  PasswordField,
+  Submit,
+  FieldError,
+} from '@cedarjs/forms'
+import { navigate, routes } from '@cedarjs/router'
+import { Metadata } from '@cedarjs/web'
+import { toast, Toaster } from '@cedarjs/web/toast'
+
+import { useAuth } from 'src/auth'
+
+const ChangePasswordPage = () => {
+  const { loading, isAuthenticated, reauthenticate, changePassword } =
+    useAuth()
+
+  // Only a logged in user can change their password
+  useEffect(() => {
+    if (!loading && !isAuthenticated) {
+      navigate(routes.login())
+    }
+  }, [loading, isAuthenticated])
+
+  const current${passwordPascalCase}Ref = useRef<HTMLInputElement>(null)
+  useEffect(() => {
+    current${passwordPascalCase}Ref.current?.focus()
+  }, [])
+
+  const onSubmit = async (data: Record<string, string>) => {
+    const response = await changePassword({
+      currentPassword: data.current${passwordPascalCase},
+      newPassword: data.new${passwordPascalCase},
+    })
+
+    if (response.error) {
+      toast.error(response.error)
+    } else {
+      // The function `changePassword.handler` in api/src/functions/auth.js
+      // decides if the user stays logged in. `reauthenticate()` picks up
+      // whichever it was
+      toast.success('${passwordTitleCase} changed!')
+      await reauthenticate()
+      navigate(routes.home())
+    }
+  }
+
+  return (
+    <>
+      <Metadata title="Change ${passwordTitleCase}" />
+
+      <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">
+                Change ${passwordTitleCase}
+              </h2>
+            </header>
+
+            <div className="rw-segment-main">
+              <div className="rw-form-wrapper">
+                <Form onSubmit={onSubmit} className="rw-form-wrapper">
+                  <Label
+                    name="current${passwordPascalCase}"
+                    className="rw-label"
+                    errorClassName="rw-label rw-label-error"
+                  >
+                    Current ${passwordTitleCase}
+                  </Label>
+                  <PasswordField
+                    name="current${passwordPascalCase}"
+                    autoComplete="current-password"
+                    className="rw-input"
+                    errorClassName="rw-input rw-input-error"
+                    ref={current${passwordPascalCase}Ref}
+                    validation={{
+                      required: {
+                        value: true,
+                        message: 'Current ${passwordTitleCase} is required',
+                      },
+                    }}
+                  />
+
+                  <FieldError
+                    name="current${passwordPascalCase}"
+                    className="rw-field-error"
+                  />
+
+                  <Label
+                    name="new${passwordPascalCase}"
+                    className="rw-label"
+                    errorClassName="rw-label rw-label-error"
+                  >
+                    New ${passwordTitleCase}
+                  </Label>
+                  <PasswordField
+                    name="new${passwordPascalCase}"
+                    autoComplete="new-password"
+                    className="rw-input"
+                    errorClassName="rw-input rw-input-error"
+                    validation={{
+                      required: {
+                        value: true,
+                        message: 'New ${passwordTitleCase} is required',
+                      },
+                    }}
+                  />
+
+                  <FieldError
+                    name="new${passwordPascalCase}"
+                    className="rw-field-error"
+                  />
+
+                  <div className="rw-button-group">
+                    <Submit className="rw-button rw-button-blue">Submit</Submit>
+                  </div>
+                </Form>
+              </div>
+            </div>
+          </div>
+        </div>
+      </main>
+    </>
+  )
+}
+
+export default ChangePasswordPage

package/dist/commands/generate/directive/directive.js

@@ -1,11 +1,24 @@
 import {
   createBuilder,
   createCommand,
-  createHandler
+  createHandler,
+  getYargsDefaults
 } from "../yargsCommandHelpers.js";
 const command = createCommand("directive");
 const description = "Generate a new GraphQL directive";
-const builder = createBuilder({ componentName: "directive" });
+const builder = createBuilder({
+  componentName: "directive",
+  optionsObj: () => ({
+    ...getYargsDefaults(),
+    // No default value, so the handler prompts for a type when the option is
+    // omitted
+    type: {
+      description: "Directive type. If omitted, the generator prompts for one",
+      type: "string",
+      choices: ["validator", "transformer"]
+    }
+  })
+});
 const handler = createHandler("directive");
 export {
   builder,

package/dist/commands/setup/uploads/serverFile.js

@@ -1,3 +1,4 @@
+import { isBuiltin } from "node:module";
 const START_LINE = /^([ \t]*)await server\.start\(\)/m;
 const FACTORY_IMPORT = /import\s*\{[^}]*\bcreateAuthDecoder\b[^}]*\}\s*from\s*['"](@cedarjs\/auth-[a-z0-9-]+-api)['"]/;
 const DECODER_IMPORT = /import\s*\{[^}]*\bauthDecoder\b[^}]*\}\s*from\s*['"](@cedarjs\/auth-[a-z0-9-]+-api)['"]/;
@@ -48,21 +49,20 @@ function hasBinding(source, name) {
   return importedBindings(source).has(name) || declared.test(source);
 }
 function uploadsServerImports(source, auth) {
-  const packageSpecs = [];
-  const srcSpecs = [];
+  const specs = [];
   if (auth) {
     if (auth.usesFactory) {
       if (!hasBinding(source, "authDecoder")) {
-        packageSpecs.push({
+        specs.push({
           names: ["createAuthDecoder"],
           from: auth.decoderPackage
         });
       }
     } else {
-      packageSpecs.push({ names: ["authDecoder"], from: auth.decoderPackage });
+      specs.push({ names: ["authDecoder"], from: auth.decoderPackage });
     }
   }
-  packageSpecs.push({
+  specs.push({
     names: auth ? ["cedarUploadsPlugin", "createUploadAuthenticator"] : ["cedarUploadsPlugin"],
     from: "@cedarjs/uploads"
   });
@@ -71,20 +71,97 @@ function uploadsServerImports(source, auth) {
     if (auth.usesFactory && !hasBinding(source, "authDecoder")) {
       authNames.unshift("cookieName");
     }
-    srcSpecs.push({ names: authNames, from: "src/lib/auth" });
+    specs.push({ names: authNames, from: "src/lib/auth" });
   }
-  srcSpecs.push({ names: ["db"], from: "src/lib/db" });
-  srcSpecs.push({ names: ["targets"], from: "src/lib/uploads" });
-  const render = (specs) => specs.map((spec) => ({
+  specs.push({ names: ["db"], from: "src/lib/db" });
+  specs.push({ names: ["targets"], from: "src/lib/uploads" });
+  return specs.map((spec) => ({
     ...spec,
     names: spec.names.filter((name) => !hasBinding(source, name))
-  })).filter((spec) => spec.names.length > 0).map((spec) => `import { ${spec.names.join(", ")} } from '${spec.from}'`);
-  const packageLines = render(packageSpecs);
-  const srcLines = render(srcSpecs);
-  if (packageLines.length > 0 && srcLines.length > 0) {
-    return [...packageLines, "", ...srcLines];
+  })).filter((spec) => spec.names.length > 0).map((spec) => ({
+    line: `import { ${spec.names.join(", ")} } from '${spec.from}'`,
+    from: spec.from
+  }));
+}
+function findImports(lines) {
+  const imports = [];
+  for (let start = 0; start < lines.length; start++) {
+    if (!/^import\b/.test(lines[start])) {
+      continue;
+    }
+    const sideEffect = /^import\s*['"]([^'"]+)['"]/.exec(lines[start]);
+    if (sideEffect) {
+      imports.push({ start, end: start, from: sideEffect[1] });
+      continue;
+    }
+    for (let end = start; end < lines.length; end++) {
+      const from = /\bfrom\s*['"]([^'"]+)['"]/.exec(lines[end]);
+      if (from) {
+        imports.push({ start, end, from: from[1] });
+        start = end;
+        break;
+      }
+    }
+  }
+  return imports;
+}
+function importGroup(from) {
+  if (isBuiltin(from)) {
+    return 0;
+  }
+  if (from === "react") {
+    return 1;
+  }
+  if (from.startsWith("@cedarjs/")) {
+    return 3;
+  }
+  if (from.startsWith("src/")) {
+    return /^src\/[^/]+\/.+\.(?:sdl\.)?(?:js|ts)$/.test(from) ? 4 : 5;
   }
-  return [...packageLines, ...srcLines];
+  if (from === ".." || from.startsWith("../")) {
+    return 6;
+  }
+  if (/^\.\/?(?:index(?:\.[jt]sx?)?)?$/.test(from)) {
+    return 8;
+  }
+  if (from.startsWith("./")) {
+    return 7;
+  }
+  return 2;
+}
+function compareSpecifiers(a, b) {
+  const segmentsA = a.toLowerCase().split("/");
+  const segmentsB = b.toLowerCase().split("/");
+  for (let i = 0; i < Math.min(segmentsA.length, segmentsB.length); i++) {
+    if (segmentsA[i] !== segmentsB[i]) {
+      return segmentsA[i] < segmentsB[i] ? -1 : 1;
+    }
+  }
+  return segmentsA.length - segmentsB.length;
+}
+function insertImport(lines, serverImport) {
+  const imports = findImports(lines);
+  const group = importGroup(serverImport.from);
+  const sameGroup = imports.filter((i) => importGroup(i.from) === group);
+  if (sameGroup.length > 0) {
+    const next = sameGroup.find(
+      (i) => compareSpecifiers(i.from, serverImport.from) > 0
+    );
+    const at2 = next ? next.start : sameGroup[sameGroup.length - 1].end + 1;
+    return [...lines.slice(0, at2), serverImport.line, ...lines.slice(at2)];
+  }
+  const earlier = imports.filter((i) => importGroup(i.from) < group);
+  if (earlier.length > 0) {
+    const at2 = Math.max(...earlier.map((i) => i.end)) + 1;
+    const inserted = ["", serverImport.line];
+    if (at2 < lines.length && lines[at2].trim() !== "") {
+      inserted.push("");
+    }
+    return [...lines.slice(0, at2), ...inserted, ...lines.slice(at2)];
+  }
+  const later = imports.find((i) => importGroup(i.from) > group);
+  const at = later ? later.start : 0;
+  return [...lines.slice(0, at), serverImport.line, "", ...lines.slice(at)];
 }
 function uploadsServerRegistration(source, auth) {
   if (!auth) {
@@ -122,18 +199,7 @@ function addUploadsPlugin(source, { auth = null } = {}) {
   if (!start) {
     throw new Error("CEDAR_UPLOADS_ERR_NO_START");
   }
-  const lines = source.split("\n");
-  let lastImport = -1;
-  for (const [index, line] of lines.entries()) {
-    if (/^import\s/.test(line)) {
-      lastImport = index;
-    }
-  }
-  const withImports = [
-    ...lines.slice(0, lastImport + 1),
-    ...uploadsServerImports(source, auth),
-    ...lines.slice(lastImport + 1)
-  ].join("\n");
+  const withImports = uploadsServerImports(source, auth).reduce(insertImport, source.split("\n")).join("\n");
   return withImports.replace(
     START_LINE,
     (line) => `${uploadsServerRegistration(source, auth)}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "8.0.0-canary.3275",
+  "version": "8.0.0-canary.3286",
   "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": "8.0.0-canary.3275",
-    "@cedarjs/babel-config": "8.0.0-canary.3275",
-    "@cedarjs/cli-helpers": "8.0.0-canary.3275",
-    "@cedarjs/internal": "8.0.0-canary.3275",
-    "@cedarjs/prerender": "8.0.0-canary.3275",
-    "@cedarjs/project-config": "8.0.0-canary.3275",
-    "@cedarjs/structure": "8.0.0-canary.3275",
-    "@cedarjs/telemetry": "8.0.0-canary.3275",
-    "@cedarjs/utils": "8.0.0-canary.3275",
-    "@cedarjs/vite": "8.0.0-canary.3275",
-    "@cedarjs/web-server": "8.0.0-canary.3275",
+    "@cedarjs/api-server": "8.0.0-canary.3286",
+    "@cedarjs/babel-config": "8.0.0-canary.3286",
+    "@cedarjs/cli-helpers": "8.0.0-canary.3286",
+    "@cedarjs/internal": "8.0.0-canary.3286",
+    "@cedarjs/prerender": "8.0.0-canary.3286",
+    "@cedarjs/project-config": "8.0.0-canary.3286",
+    "@cedarjs/structure": "8.0.0-canary.3286",
+    "@cedarjs/telemetry": "8.0.0-canary.3286",
+    "@cedarjs/utils": "8.0.0-canary.3286",
+    "@cedarjs/vite": "8.0.0-canary.3286",
+    "@cedarjs/web-server": "8.0.0-canary.3286",
     "@listr2/prompt-adapter-enquirer": "4.3.2",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "2.11.0",
@@ -94,7 +94,7 @@
     "yargs": "17.7.3"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "8.0.0-canary.3275",
+    "@cedarjs/framework-tools": "8.0.0-canary.3286",
     "@prisma/dmmf": "7.10.0",
     "@types/archiver": "^7.0.0",
     "memfs": "4.79.0",