@cedarjs/cli-helpers 7.1.0 → 7.1.1-next.469

package/dist/auth/authFiles.d.ts

@@ -1,6 +1,14 @@
 interface FilesArgs {
     basedir: string;
     webAuthn: boolean;
+    /**
+     * Selects the `*.oauth.*` template variant, the same way `webAuthn` selects
+     * the `*.webAuthn.*` variant. When both are true, the most specific
+     * template available is preferred (`*.webAuthn.oauth.*`), falling back to
+     * a single-variant or the base template when a more specific one doesn't
+     * exist for a given template file.
+     */
+    oauth?: boolean;
 }
 /**
  * Get the api side file paths and file contents to write
@@ -14,7 +22,7 @@ interface FilesArgs {
  * }
  * ```
  */
-export declare const apiSideFiles: ({ basedir, webAuthn }: FilesArgs) => Promise<Record<string, string>>;
+export declare const apiSideFiles: ({ basedir, webAuthn, oauth, }: FilesArgs) => Promise<Record<string, string>>;
 /**
  * Loops through the keys in `filesRecord` and generates unique file paths if
  * they conflict with existing files

package/dist/auth/authFiles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"authFiles.d.ts","sourceRoot":"","sources":["../../src/auth/authFiles.ts"],"names":[],"mappings":"AASA,UAAU,SAAS;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,YAAY,GAAU,uBAAuB,SAAS,oCAmElE,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACnC,QAAQ,EAAE,MAAM,0BAwCjB"}
+{"version":3,"file":"authFiles.d.ts","sourceRoot":"","sources":["../../src/auth/authFiles.ts"],"names":[],"mappings":"AASA,UAAU,SAAS;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,OAAO,CAAA;IACjB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB;AA+DD;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,YAAY,GAAU,+BAIhC,SAAS,oCA4CX,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACnC,QAAQ,EAAE,MAAM,0BAwCjB"}

package/dist/auth/authFiles.js

@@ -4,37 +4,59 @@ import pascalcase from "pascalcase";
 import { transformTSToJS } from "../lib/index.js";
 import { getPaths } from "../lib/paths.js";
 import { isTypeScriptProject } from "../lib/project.js";
-const apiSideFiles = async ({ basedir, webAuthn }) => {
+const VARIANT_TAGS = ["webAuthn", "oauth"];
+function parseTemplateFileName(fileName) {
+  const parts = fileName.split(".");
+  const baseName = parts[0];
+  const ext = parts.at(-2);
+  const tags = parts.slice(1, -2).filter((part) => VARIANT_TAGS.includes(part));
+  return { baseName, tags, ext };
+}
+function pickTemplateVariants(templateFiles, activeTags) {
+  const candidatesByKey = /* @__PURE__ */ new Map();
+  for (const fileName of templateFiles) {
+    const { baseName, tags, ext } = parseTemplateFileName(fileName);
+    const key = `${baseName}.${ext}`;
+    const candidates = candidatesByKey.get(key) ?? [];
+    candidates.push({ fileName, tags });
+    candidatesByKey.set(key, candidates);
+  }
+  const picked = [];
+  for (const candidates of candidatesByKey.values()) {
+    const applicable = candidates.filter(
+      (candidate) => candidate.tags.every((tag) => activeTags.includes(tag))
+    );
+    const mostSpecific = applicable.reduce(
+      (best, candidate) => candidate.tags.length > best.tags.length ? candidate : best
+    );
+    picked.push(mostSpecific);
+  }
+  return picked;
+}
+const apiSideFiles = async ({
+  basedir,
+  webAuthn,
+  oauth = false
+}) => {
   const apiSrcPath = getPaths().api.src;
   const apiBaseTemplatePath = path.join(basedir, "templates", "api");
   const templateDirectories = fs.readdirSync(apiBaseTemplatePath);
   let filesRecord = {};
+  const activeTags = [
+    ...webAuthn ? ["webAuthn"] : [],
+    ...oauth ? ["oauth"] : []
+  ];
   for (const dir of templateDirectories) {
     const templateFiles = fs.readdirSync(path.join(apiBaseTemplatePath, dir));
-    const filePaths = templateFiles.filter((fileName) => {
-      const fileNameParts = fileName.split(".");
-      return fileNameParts.length <= 3 || fileNameParts.at(-3) !== "webAuthn";
-    }).map((fileName) => {
-      let outputFileName = fileName.replace(/\.template$/, "");
+    const pickedVariants = pickTemplateVariants(templateFiles, activeTags);
+    const filePaths = pickedVariants.map(({ fileName }) => {
+      const { baseName, ext } = parseTemplateFileName(fileName);
+      let outputFileName = `${baseName}.${ext}`;
       if (!isTypeScriptProject()) {
         outputFileName = outputFileName.replace(/\.ts(x?)$/, ".js$1");
       }
-      if (!webAuthn) {
-        return { templateFileName: fileName, outputFileName };
-      }
-      const webAuthnFileName = fileName.split(".").reverse().map((part, i) => i === 1 ? "webAuthn." + part : part).reverse().join(".");
-      if (templateFiles.includes(webAuthnFileName)) {
-        return { templateFileName: webAuthnFileName, outputFileName };
-      } else {
-        return { templateFileName: fileName, outputFileName };
-      }
-    }).map((f) => {
-      const templateFilePath = path.join(
-        apiBaseTemplatePath,
-        dir,
-        f.templateFileName
-      );
-      const outputFilePath = path.join(apiSrcPath, dir, f.outputFileName);
+      const templateFilePath = path.join(apiBaseTemplatePath, dir, fileName);
+      const outputFilePath = path.join(apiSrcPath, dir, outputFileName);
       return { templateFilePath, outputFilePath };
     });
     for (const paths of filePaths) {

package/dist/auth/authTasks.d.ts

@@ -1,4 +1,5 @@
 import type { ListrRenderer, ListrTask, ListrTaskWrapper } from 'listr2';
+import type { ExistingFiles } from '../lib/index.js';
 export declare const getWebAppPath: () => string;
 export declare const addApiConfig: ({ replaceExistingImport, authDecoderImport, }: {
     replaceExistingImport: boolean;
@@ -31,7 +32,15 @@ export declare const addConfigToRoutes: () => {
  *
  * @returns Listr task
  */
-export declare const generateAuthApiFiles: <Renderer extends typeof ListrRenderer>(basedir: string, webAuthn: boolean) => ListrTask<AuthGeneratorCtx, Renderer>;
+export declare const generateAuthApiFiles: <Renderer extends typeof ListrRenderer>(basedir: string, webAuthn: boolean, oauth?: boolean) => ListrTask<AuthGeneratorCtx, Renderer>;
+/**
+ * Exported for testing
+ *
+ * @returns `true` if writing `filesRecord` with the given `existingFiles`
+ *   strategy writes `api/src/lib/auth.{ts,js}`, which is where the auth
+ *   provider's `requireAuth` function lives
+ */
+export declare function writesApiAuthLib(filesRecord: Record<string, string>, existingFiles: ExistingFiles): boolean;
 export declare const addAuthConfigToGqlApi: <Renderer extends typeof ListrRenderer, FallbackRenderer extends typeof ListrRenderer>(authDecoderImport?: string) => {
     title: string;
     task: (ctx: AuthGeneratorCtx, _task: ListrTaskWrapper<AuthGeneratorCtx, Renderer, FallbackRenderer>) => void;
@@ -41,9 +50,36 @@ export interface AuthGeneratorCtx {
     setupMode: AuthSetupMode;
     provider: string;
     force: boolean;
+    /**
+     * Set by `generateAuthApiFiles`. `true` when setup writes the auth
+     * provider's `api/src/lib/auth.{ts,js}` file, replacing any existing
+     * `requireAuth` implementation
+     */
+    apiAuthLibWritten?: boolean;
 }
 export declare const setAuthSetupMode: <Renderer extends typeof ListrRenderer, FallbackRenderer extends typeof ListrRenderer>(force: boolean) => {
     title: string;
     task: (ctx: AuthGeneratorCtx, task: ListrTaskWrapper<AuthGeneratorCtx, Renderer, FallbackRenderer>) => Promise<void>;
 };
+/**
+ * Exported for testing
+ *
+ * @param content - The contents of requireAuth.test.{ts,js}
+ * @returns The content with the stub test case replaced, or `undefined` if
+ *   the unmodified stub test case isn't part of the content
+ */
+export declare const replaceStubRequireAuthTestCase: (content: string) => string | undefined;
+/**
+ * New Cedar apps ship with a test for the `requireAuth` directive that
+ * asserts the behavior of the stub `requireAuth` function. Setting up auth
+ * replaces that stub, so this task replaces the stub test case with test
+ * cases matching the real implementation. The test is only updated when
+ * setup writes `api/src/lib/auth.{ts,js}` (for example, not when the user
+ * declines overwriting existing files). Test files that don't contain the
+ * unmodified stub test case are left as they are.
+ */
+export declare const updateRequireAuthTest: <Renderer extends typeof ListrRenderer, FallbackRenderer extends typeof ListrRenderer>() => {
+    title: string;
+    task: (ctx: AuthGeneratorCtx, task: ListrTaskWrapper<AuthGeneratorCtx, Renderer, FallbackRenderer>) => void;
+};
 //# sourceMappingURL=authTasks.d.ts.map

package/dist/auth/authTasks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"authTasks.d.ts","sourceRoot":"","sources":["../../src/auth/authTasks.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAA;AA2BxE,eAAO,MAAM,aAAa,cAA2B,CAAA;AAwDrD,eAAO,MAAM,YAAY,GAAI,+CAG1B;IACD,qBAAqB,EAAE,OAAO,CAAA;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC3B,SAgDA,CAAA;AAmCD,eAAO,MAAM,eAAe,GAAI,SAAS,MAAM,YAE9C,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAAI,SAAS,MAAM,WA6CjD,CAAA;AAuED;;;GAGG;AACH,eAAO,MAAM,iBAAiB,GAC5B,QAAQ,SAAS,OAAO,aAAa,OAClC,SAAS,CAAC,gBAAgB,EAAE,QAAQ,CA8CxC,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,SAAS,MAAM,EAAE,UAAU,OAAO;;gBAgC1C,gBAAgB;CA0CrC,CAAA;AAED,eAAO,MAAM,iBAAiB;;;CAmB7B,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,GAAI,QAAQ,SAAS,OAAO,aAAa,EACxE,SAAS,MAAM,EACf,UAAU,OAAO,KAChB,SAAS,CAAC,gBAAgB,EAAE,QAAQ,CAgDtC,CAAA;AASD,eAAO,MAAM,qBAAqB,GAChC,QAAQ,SAAS,OAAO,aAAa,EACrC,gBAAgB,SAAS,OAAO,aAAa,EAE7C,oBAAoB,MAAM;;gBAInB,gBAAgB,SACd,gBAAgB,CAAC,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,CAAC;CAcvE,CAAA;AAEF,MAAM,MAAM,aAAa,GACrB,OAAO,GACP,SAAS,GACT,SAAS,GACT,SAAS,CAAA;AAEb,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,aAAa,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,OAAO,CAAA;CACf;AAED,eAAO,MAAM,gBAAgB,GAC3B,QAAQ,SAAS,OAAO,aAAa,EACrC,gBAAgB,SAAS,OAAO,aAAa,EAE7C,OAAO,OAAO;;gBAKL,gBAAgB,QACf,gBAAgB,CAAC,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,CAAC;CA2CzE,CAAA"}
+{"version":3,"file":"authTasks.d.ts","sourceRoot":"","sources":["../../src/auth/authTasks.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAA;AAKxE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAsBpD,eAAO,MAAM,aAAa,cAA2B,CAAA;AAwDrD,eAAO,MAAM,YAAY,GAAI,+CAG1B;IACD,qBAAqB,EAAE,OAAO,CAAA;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC3B,SAgDA,CAAA;AAmCD,eAAO,MAAM,eAAe,GAAI,SAAS,MAAM,YAE9C,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAAI,SAAS,MAAM,WA6CjD,CAAA;AAuED;;;GAGG;AACH,eAAO,MAAM,iBAAiB,GAC5B,QAAQ,SAAS,OAAO,aAAa,OAClC,SAAS,CAAC,gBAAgB,EAAE,QAAQ,CA8CxC,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,SAAS,MAAM,EAAE,UAAU,OAAO;;gBAgC1C,gBAAgB;CA0CrC,CAAA;AAED,eAAO,MAAM,iBAAiB;;;CAmB7B,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,GAAI,QAAQ,SAAS,OAAO,aAAa,EACxE,SAAS,MAAM,EACf,UAAU,OAAO,EACjB,eAAa,KACZ,SAAS,CAAC,gBAAgB,EAAE,QAAQ,CAkDtC,CAAA;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACnC,aAAa,EAAE,aAAa,WAW7B;AASD,eAAO,MAAM,qBAAqB,GAChC,QAAQ,SAAS,OAAO,aAAa,EACrC,gBAAgB,SAAS,OAAO,aAAa,EAE7C,oBAAoB,MAAM;;gBAInB,gBAAgB,SACd,gBAAgB,CAAC,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,CAAC;CAcvE,CAAA;AAEF,MAAM,MAAM,aAAa,GACrB,OAAO,GACP,SAAS,GACT,SAAS,GACT,SAAS,CAAA;AAEb,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,aAAa,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,OAAO,CAAA;IACd;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAC5B;AAED,eAAO,MAAM,gBAAgB,GAC3B,QAAQ,SAAS,OAAO,aAAa,EACrC,gBAAgB,SAAS,OAAO,aAAa,EAE7C,OAAO,OAAO;;gBAKL,gBAAgB,QACf,gBAAgB,CAAC,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,CAAC;CA2CzE,CAAA;AAmCD;;;;;;GAMG;AACH,eAAO,MAAM,8BAA8B,GAAI,SAAS,MAAM,uBAW7D,CAAA;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,qBAAqB,GAChC,QAAQ,SAAS,OAAO,aAAa,EACrC,gBAAgB,SAAS,OAAO,aAAa;;gBAItC,gBAAgB,QACf,gBAAgB,CAAC,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,CAAC;CAmCtE,CAAA"}

package/dist/auth/authTasks.js

@@ -264,7 +264,7 @@ const addConfigToRoutes = () => {
     }
   };
 };
-const generateAuthApiFiles = (basedir, webAuthn) => {
+const generateAuthApiFiles = (basedir, webAuthn, oauth = false) => {
   return {
     title: "Generating auth api side files...",
     task: async (ctx, task) => {
@@ -273,7 +273,7 @@ const generateAuthApiFiles = (basedir, webAuthn) => {
           "Could not find api/src directory. Cannot continue setup!"
         );
       }
-      let filesRecord = await apiSideFiles({ basedir, webAuthn });
+      let filesRecord = await apiSideFiles({ basedir, webAuthn, oauth });
       let existingFiles = "FAIL";
       if (ctx.setupMode === "FORCE") {
         existingFiles = "OVERWRITE";
@@ -294,12 +294,21 @@ const generateAuthApiFiles = (basedir, webAuthn) => {
         filesRecord = uniqueFilesRecord;
         existingFiles = "FAIL";
       }
+      ctx.apiAuthLibWritten = writesApiAuthLib(filesRecord, existingFiles);
       return writeFilesTask(filesRecord, {
         existingFiles
       });
     }
   };
 };
+function writesApiAuthLib(filesRecord, existingFiles) {
+  const authLibPaths = ["ts", "js"].map(
+    (ext) => path.join(getPaths().api.src, "lib", `auth.${ext}`)
+  );
+  return Object.keys(filesRecord).some(
+    (filePath) => authLibPaths.includes(filePath) && (existingFiles === "OVERWRITE" || !fs.existsSync(filePath))
+  );
+}
 function findExistingFiles(filesMap) {
   return Object.keys(filesMap).filter((filePath) => fs.existsSync(filePath)).map((filePath) => filePath.replace(getPaths().base, ""));
 }
@@ -338,6 +347,65 @@ const setAuthSetupMode = (force) => {
     }
   };
 };
+const STUB_REQUIRE_AUTH_TEST_CASE = `  it('requireAuth has stub implementation. Should not throw when current user', () => {
+    // If you want to set values in context, pass it through e.g.
+    // mockRedwoodDirective(requireAuth, { context: { currentUser: { id: 1, name: 'Lebron McGretzky' } }})
+    const mockExecution = mockRedwoodDirective(requireAuth, { context: {} })
+
+    expect(mockExecution).not.toThrowError()
+  })`;
+const REQUIRE_AUTH_TEST_CASES = `  it('throws when there is no current user', () => {
+    const mockExecution = mockRedwoodDirective(requireAuth, { context: {} })
+
+    expect(mockExecution).toThrowError("You don't have permission to do that.")
+  })
+
+  it('does not throw when there is a current user', () => {
+    // The mocked user should have the same shape as what getCurrentUser()
+    // in api/src/lib/auth returns
+    const mockExecution = mockRedwoodDirective(requireAuth, {
+      context: { currentUser: { id: 1 } },
+    })
+
+    expect(mockExecution).not.toThrowError()
+  })`;
+const replaceStubRequireAuthTestCase = (content) => {
+  const eol = content.includes("\r\n") ? "\r\n" : "\n";
+  const normalizedContent = content.replaceAll("\r\n", "\n");
+  if (!normalizedContent.includes(STUB_REQUIRE_AUTH_TEST_CASE)) {
+    return void 0;
+  }
+  return normalizedContent.replace(STUB_REQUIRE_AUTH_TEST_CASE, REQUIRE_AUTH_TEST_CASES).replaceAll("\n", eol);
+};
+const updateRequireAuthTest = () => ({
+  title: "Updating requireAuth directive test...",
+  task: (ctx, task) => {
+    if (!ctx.apiAuthLibWritten) {
+      task.skip(
+        "Keeping the requireAuth directive test as is, because the existing requireAuth implementation is kept"
+      );
+      return;
+    }
+    const testFilePath = ["ts", "js"].map(
+      (ext) => path.join(
+        getPaths().api.directives,
+        "requireAuth",
+        `requireAuth.test.${ext}`
+      )
+    ).find((filePath) => fs.existsSync(filePath));
+    if (!testFilePath) {
+      task.skip("No requireAuth directive test found");
+      return;
+    }
+    const content = fs.readFileSync(testFilePath, "utf-8");
+    const newContent = replaceStubRequireAuthTestCase(content);
+    if (newContent === void 0) {
+      task.skip("Keeping the customized requireAuth directive test as is");
+      return;
+    }
+    fs.writeFileSync(testFilePath, newContent);
+  }
+});
 export {
   addApiConfig,
   addAuthConfigToGqlApi,
@@ -348,5 +416,8 @@ export {
   getWebAppPath,
   hasAuthProvider,
   removeAuthProvider,
-  setAuthSetupMode
+  replaceStubRequireAuthTestCase,
+  setAuthSetupMode,
+  updateRequireAuthTest,
+  writesApiAuthLib
 };

package/dist/auth/setupHelpers.d.ts

@@ -13,6 +13,7 @@ export interface AuthHandlerArgs {
     provider: string;
     authDecoderImport?: string;
     webAuthn?: boolean;
+    oauth?: boolean;
     webPackages?: string[];
     apiPackages?: string[];
     extraTasks?: (ListrTask<AuthGeneratorCtx> | undefined)[];
@@ -23,5 +24,5 @@ export interface AuthHandlerArgs {
  * basedir assumes that you must have a templates folder in that directory.
  * See folder structure of auth providers in packages/auth-providers/<provider>/setup/src
  */
-export declare const standardAuthHandler: ({ basedir, forceArg, provider, authDecoderImport, webAuthn, webPackages, apiPackages, extraTasks, notes, verbose, }: AuthHandlerArgs) => Promise<void>;
+export declare const standardAuthHandler: ({ basedir, forceArg, provider, authDecoderImport, webAuthn, oauth, webPackages, apiPackages, extraTasks, notes, verbose, }: AuthHandlerArgs) => Promise<void>;
 //# sourceMappingURL=setupHelpers.d.ts.map

package/dist/auth/setupHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setupHelpers.d.ts","sourceRoot":"","sources":["../../src/auth/setupHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAGvC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAWjC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAUtD,YAAY,EAAE,gBAAgB,EAAE,CAAA;AAEhC,eAAO,MAAM,mBAAmB,GAAI,OAAO,IAAI;;;;EAoB9C,CAAA;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,OAAO,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;IACtB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;IACtB,UAAU,CAAC,EAAE,CAAC,SAAS,CAAC,gBAAgB,CAAC,GAAG,SAAS,CAAC,EAAE,CAAA;IACxD,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AASD;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAAU,qHAWvC,eAAe,kBAiFjB,CAAA"}
+{"version":3,"file":"setupHelpers.d.ts","sourceRoot":"","sources":["../../src/auth/setupHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAGvC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAWjC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAWtD,YAAY,EAAE,gBAAgB,EAAE,CAAA;AAEhC,eAAO,MAAM,mBAAmB,GAAI,OAAO,IAAI;;;;EAoB9C,CAAA;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,OAAO,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;IACtB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;IACtB,UAAU,CAAC,EAAE,CAAC,SAAS,CAAC,gBAAgB,CAAC,GAAG,SAAS,CAAC,EAAE,CAAA;IACxD,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AASD;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAAU,4HAYvC,eAAe,kBAkFjB,CAAA"}

package/dist/auth/setupHelpers.js

@@ -13,7 +13,8 @@ import {
   addConfigToWebApp,
   setAuthSetupMode,
   createWebAuth,
-  generateAuthApiFiles
+  generateAuthApiFiles,
+  updateRequireAuthTest
 } from "./authTasks.js";
 const standardAuthBuilder = (yargs) => {
   return yargs.option("force", {
@@ -42,6 +43,7 @@ const standardAuthHandler = async ({
   provider,
   authDecoderImport,
   webAuthn = false,
+  oauth = false,
   webPackages = [],
   apiPackages = [],
   extraTasks,
@@ -51,7 +53,8 @@ const standardAuthHandler = async ({
   const tasks = new Listr(
     [
       setAuthSetupMode(forceArg),
-      generateAuthApiFiles(basedir, webAuthn),
+      generateAuthApiFiles(basedir, webAuthn, oauth),
+      updateRequireAuthTest(),
       addConfigToWebApp(),
       createWebAuth(basedir, webAuthn),
       addConfigToRoutes(),

package/dist/lib/colors.d.ts

@@ -2,7 +2,7 @@
  * Canonical color/style palette for all Cedar CLI packages.
  *
  * Import from here rather than defining local copies:
- *   import { colors } from '@cedarjs/cli-helpers'
+ *   import { colors } from '@cedarjs/cli-helpers/colors'
  *
  * If you need a color that isn't here, add it here rather than
  * introducing a one-off in another package.

package/dist/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,gBAAgB,EAChB,aAAa,EAEd,MAAM,QAAQ,CAAA;AACf,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAU9B,eAAO,MAAM,eAAe,GAAI,UAAU,MAAM,EAAE,SAAS,MAAM,6BA8BhE,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,kBAAkB,oBAsB9B,CAAA;AAED,eAAO,MAAM,QAAQ,GACnB,kBAAkB,MAAM,EACxB,kBAAkB,MAAM,KACvB,OAAO,CAAC,MAAM,CAwBhB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,WAAW,GAAG,MAAM,GAAG,MAAM,CAAA;AAEzD,eAAO,MAAM,SAAS,GAAI,QAAQ,SAAS,OAAO,aAAa,EAC7D,QAAQ,MAAM,EACd,UAAU,MAAM,EAChB,oBAA4B;IAAE,aAAa,CAAC,EAAE,aAAa,CAAA;CAAO,EAGlE,OAAM,gBAAgB,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAI/C,SAoBF,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,cAAc,GAAI,QAAQ,SAAS,OAAO,aAAa,EAClE,OAAO,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,SAAS;IAAE,aAAa,EAAE,aAAa,CAAA;CAAE,qCAuB1C,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,gBAAgB,EAChB,aAAa,EAEd,MAAM,QAAQ,CAAA;AACf,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAW9B,eAAO,MAAM,eAAe,GAAI,UAAU,MAAM,EAAE,SAAS,MAAM,6BAgBhE,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,kBAAkB,oBAsB9B,CAAA;AAED,eAAO,MAAM,QAAQ,GACnB,kBAAkB,MAAM,EACxB,kBAAkB,MAAM,KACvB,OAAO,CAAC,MAAM,CAwBhB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,WAAW,GAAG,MAAM,GAAG,MAAM,CAAA;AAEzD,eAAO,MAAM,SAAS,GAAI,QAAQ,SAAS,OAAO,aAAa,EAC7D,QAAQ,MAAM,EACd,UAAU,MAAM,EAChB,oBAA4B;IAAE,aAAa,CAAC,EAAE,aAAa,CAAA;CAAO,EAGlE,OAAM,gBAAgB,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAI/C,SAoBF,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,cAAc,GAAI,QAAQ,SAAS,OAAO,aAAa,EAClE,OAAO,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,SAAS;IAAE,aAAa,EAAE,aAAa,CAAA;CAAE,qCAuB1C,CAAA"}

package/dist/lib/index.js

@@ -1,37 +1,23 @@
 import fs from "node:fs";
 import { pathToFileURL } from "node:url";
 import path from "path";
-import * as babel from "@babel/core";
 import { Listr } from "listr2";
 import { format } from "prettier";
 import { colors } from "./colors.js";
 import { getPaths } from "./paths.js";
+import { transpileTSToJS } from "./transpileTSToJS.js";
 const transformTSToJS = (filename, content) => {
   if (!content) {
     return content;
   }
-  const babelFileResult = babel.transform(content, {
-    filename,
-    // If you ran `yarn cedar generate` in `./web` transformSync would import the `.babelrc.js` file,
-    // in `./web`? despite us setting `configFile: false`.
-    cwd: process.env.NODE_ENV === "test" ? void 0 : getPaths().base,
-    configFile: false,
-    plugins: [
-      [
-        "@babel/plugin-transform-typescript",
-        {
-          isTSX: true,
-          allExtensions: true
-        }
-      ]
-    ],
-    retainLines: true
-  });
-  if (!babelFileResult?.code) {
-    console.error(colors.error(`Could not transform ${filename} to JS`));
+  let code;
+  try {
+    code = transpileTSToJS(filename, content);
+  } catch (e) {
+    console.error(colors.error(e instanceof Error ? e.message : String(e)));
     process.exit(1);
   }
-  return prettify(filename.replace(/\.ts(x)?$/, ".js$1"), babelFileResult.code);
+  return prettify(filename.replace(/\.ts(x)?$/, ".js$1"), code);
 };
 const getPrettierOptions = async () => {
   try {
@@ -39,10 +25,10 @@ const getPrettierOptions = async () => {
     const mjsPath = path.join(getPaths().base, "prettier.config.mjs");
     const prettierConfigPath = fs.existsSync(cjsPath) ? cjsPath : mjsPath;
     const { default: options } = await import(pathToFileURL(prettierConfigPath).href);
-    if (options.tailwindConfig?.startsWith(".")) {
-      options.tailwindConfig = path.join(
+    if (options.tailwindStylesheet?.startsWith(".")) {
+      options.tailwindStylesheet = path.join(
         process.env.CEDAR_CWD ?? process.env.RWJS_CWD ?? process.cwd(),
-        options.tailwindConfig
+        options.tailwindStylesheet
       );
     }
     return options;

package/dist/lib/transpileTSToJS.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Strips the TypeScript syntax from `content` and returns the resulting
+ * JavaScript source. Everything that is not TypeScript syntax, including JSX,
+ * comments, blank lines and indentation, is kept byte-for-byte, so the output
+ * only needs formatting.
+ *
+ * `import type` statements, `type` specifiers and imports whose bindings are
+ * only used as types are removed. Lines that only held removed syntax (for
+ * example an `import type` line or an `interface` body) are dropped so they
+ * do not turn into stray blank lines.
+ *
+ * `filename` is used for error messages. The content is always parsed as TSX
+ * because templates can contain JSX regardless of their extension.
+ *
+ * Throws when sucrase reports a syntax error.
+ */
+export declare function transpileTSToJS(filename: string, content: string): string;
+//# sourceMappingURL=transpileTSToJS.d.ts.map

package/dist/lib/transpileTSToJS.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"transpileTSToJS.d.ts","sourceRoot":"","sources":["../../src/lib/transpileTSToJS.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,UAwBhE"}

package/dist/lib/transpileTSToJS.js

@@ -0,0 +1,38 @@
+import { transform } from "sucrase";
+const BLANK_LINE_REGEX = /^[ \t]*$/;
+function transpileTSToJS(filename, content) {
+  let code;
+  try {
+    code = transform(content, {
+      // `jsx` is required to parse JSX at all. `jsxRuntime: 'preserve'` keeps
+      // the JSX untouched so the project's own build compiles it.
+      transforms: ["typescript", "jsx"],
+      jsxRuntime: "preserve",
+      // Keep modern ECMAScript syntax (optional chaining, class fields, ...)
+      // as written.
+      disableESTransforms: true,
+      keepUnusedImports: false,
+      filePath: filename
+    }).code;
+  } catch (e) {
+    const message = e instanceof Error ? e.message : String(e);
+    throw new Error(
+      `Could not transform ${filename} from TypeScript to JavaScript:
+${message}`
+    );
+  }
+  return dropEmptiedLines(content, code);
+}
+function dropEmptiedLines(input, output) {
+  const inputLines = input.split("\n");
+  const outputLines = output.split("\n");
+  if (inputLines.length !== outputLines.length) {
+    return output;
+  }
+  return outputLines.filter(
+    (line, index) => !BLANK_LINE_REGEX.test(line) || BLANK_LINE_REGEX.test(inputLines[index])
+  ).join("\n");
+}
+export {
+  transpileTSToJS
+};

package/dist/lib/tty.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Prompting libraries (e.g. `prompts`) hang indefinitely when stdin isn't a
+ * TTY - piped input, CI, or a backgrounded process never sends a keypress,
+ * so the prompt neither resolves nor throws.
+ *
+ * Call this immediately before any interactive confirm/prompt that's only
+ * reached when a flag was left unset, so a non-interactive invocation exits
+ * with a clear, actionable error instead of hanging.
+ */
+export declare function requireTTYOrExit(flagHint: string): void;
+//# sourceMappingURL=tty.d.ts.map

package/dist/lib/tty.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tty.d.ts","sourceRoot":"","sources":["../../src/lib/tty.ts"],"names":[],"mappings":"AAIA;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAYvD"}

package/dist/lib/tty.js

@@ -0,0 +1,16 @@
+import { errorTelemetry } from "@cedarjs/telemetry";
+import { colors } from "./colors.js";
+function requireTTYOrExit(flagHint) {
+  if (process.stdin.isTTY) {
+    return;
+  }
+  const error = new Error(
+    `Cannot prompt for confirmation in a non-interactive terminal. Please pass ${flagHint} explicitly.`
+  );
+  errorTelemetry(process.argv, error.message);
+  console.error(colors.error(error.message));
+  process.exit(1);
+}
+export {
+  requireTTYOrExit
+};

package/dist/lib/version.js

@@ -1,6 +1,6 @@
 import fs from "node:fs";
 import path from "path";
-import semver from "semver";
+import { rangesIntersect, sort, tryParse } from "verkit";
 import { getPaths } from "@cedarjs/project-config";
 function getCorrespondingTag(version, distTags) {
   return Object.entries(distTags).find(([_, v]) => v === version)?.[0];
@@ -12,7 +12,7 @@ async function getCompatibilityData(packageName, preferredVersionOrTag) {
     })
   );
   const projectRedwoodVersion = projectPackageJson.devDependencies["@cedarjs/core"];
-  const semverVersion = semver.parse(preferredVersionOrTag);
+  const semverVersion = tryParse(preferredVersionOrTag);
   const isUsingTag = semverVersion === null;
   const res = await fetch(`https://registry.npmjs.org/${packageName}`);
   const packument = await res.json();
@@ -34,7 +34,7 @@ async function getCompatibilityData(packageName, preferredVersionOrTag) {
   }
   const preferredVersion = isUsingTag ? packument["dist-tags"][preferredVersionOrTag] : preferredVersionOrTag;
   const packageRedwoodSpecification = packument.versions[preferredVersion].engines?.redwoodjs;
-  if (packageRedwoodSpecification !== void 0 && semver.intersects(projectRedwoodVersion, packageRedwoodSpecification)) {
+  if (packageRedwoodSpecification !== void 0 && rangesIntersect(projectRedwoodVersion, packageRedwoodSpecification)) {
     const tag = getCorrespondingTag(preferredVersion, packument["dist-tags"]);
     return {
       preferred: {
@@ -47,13 +47,13 @@ async function getCompatibilityData(packageName, preferredVersionOrTag) {
       }
     };
   }
-  const versions = semver.sort(Object.keys(packument.versions));
+  const versions = sort(Object.keys(packument.versions));
   for (let i = versions.length - 1; i >= 0; i--) {
     const redwoodVersionRequired = packument.versions[versions[i]].engines?.redwoodjs;
     if (redwoodVersionRequired === void 0) {
       continue;
     }
-    if (semver.intersects(projectRedwoodVersion, redwoodVersionRequired)) {
+    if (rangesIntersect(projectRedwoodVersion, redwoodVersionRequired)) {
       return {
         preferred: {
           tag: getCorrespondingTag(preferredVersion, packument["dist-tags"]),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli-helpers",
-  "version": "7.1.0",
+  "version": "7.1.1-next.469",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -9,12 +9,6 @@
   "license": "MIT",
   "type": "module",
   "exports": {
-    ".": {
-      "default": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      }
-    },
     "./loadEnvFiles": {
       "default": {
         "types": "./dist/lib/loadEnvFiles.d.ts",
@@ -56,9 +50,68 @@
         "types": "./dist/packageManager/workspaces.d.ts",
         "default": "./dist/packageManager/workspaces.js"
       }
+    },
+    "./fileHelpers": {
+      "default": {
+        "types": "./dist/lib/index.d.ts",
+        "default": "./dist/lib/index.js"
+      }
+    },
+    "./colors": {
+      "default": {
+        "types": "./dist/lib/colors.d.ts",
+        "default": "./dist/lib/colors.js"
+      }
+    },
+    "./paths": {
+      "default": {
+        "types": "./dist/lib/paths.d.ts",
+        "default": "./dist/lib/paths.js"
+      }
+    },
+    "./project": {
+      "default": {
+        "types": "./dist/lib/project.d.ts",
+        "default": "./dist/lib/project.js"
+      }
+    },
+    "./transpileTSToJS": {
+      "default": {
+        "types": "./dist/lib/transpileTSToJS.d.ts",
+        "default": "./dist/lib/transpileTSToJS.js"
+      }
+    },
+    "./tty": {
+      "default": {
+        "types": "./dist/lib/tty.d.ts",
+        "default": "./dist/lib/tty.js"
+      }
+    },
+    "./version": {
+      "default": {
+        "types": "./dist/lib/version.d.ts",
+        "default": "./dist/lib/version.js"
+      }
+    },
+    "./auth/setupHelpers": {
+      "default": {
+        "types": "./dist/auth/setupHelpers.d.ts",
+        "default": "./dist/auth/setupHelpers.js"
+      }
+    },
+    "./installHelpers": {
+      "default": {
+        "types": "./dist/lib/installHelpers.d.ts",
+        "default": "./dist/lib/installHelpers.js"
+      }
+    },
+    "./telemetry": {
+      "default": {
+        "types": "./dist/telemetry/index.d.ts",
+        "default": "./dist/telemetry/index.js"
+      }
     }
   },
-  "types": "./dist/index.d.ts",
   "files": [
     "dist"
   ],
@@ -72,10 +125,9 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@babel/core": "^7.26.10",
-    "@cedarjs/project-config": "7.1.0",
-    "@cedarjs/telemetry": "7.1.0",
-    "@listr2/prompt-adapter-enquirer": "4.3.2",
+    "@cedarjs/project-config": "7.1.1-next.469",
+    "@cedarjs/telemetry": "7.1.1-next.469",
+    "@listr2/prompt-adapter-enquirer": "4.3.3",
     "@opentelemetry/api": "1.9.1",
     "ansis": "4.4.0",
     "dotenv": "16.6.1",
@@ -85,19 +137,19 @@
     "listr2": "10.2.2",
     "lodash": "4.18.1",
     "pascalcase": "1.0.0",
-    "prettier": "3.9.8",
+    "prettier": "3.9.10",
     "prompts": "2.4.2",
-    "semver": "7.8.5",
-    "smol-toml": "1.8.0",
+    "smol-toml": "1.9.1",
+    "sucrase": "3.35.1",
     "termi-link": "1.1.0",
+    "verkit": "0.5.0",
     "yargs-parser": "21.1.1"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "7.1.0",
+    "@cedarjs/framework-tools": "7.1.1-next.469",
     "@types/dotenv-defaults": "^5.0.0",
-    "@types/lodash": "4.17.25",
+    "@types/lodash": "4.17.26",
     "@types/pascalcase": "1.0.3",
-    "@types/semver": "^7",
     "@types/yargs": "17.0.35",
     "@types/yargs-parser": "21.0.3",
     "prettier-plugin-tailwindcss": "0.8.1",

package/dist/index.d.ts

@@ -1,12 +0,0 @@
-export * from './lib/index.js';
-export * from './lib/colors.js';
-export { loadEnvFiles } from './lib/loadEnvFiles.js';
-export { loadDefaultEnvFiles, loadNodeEnvDerivedEnvFile, loadUserSpecifiedEnvFiles, } from './lib/loadEnvFiles.js';
-export * from './lib/paths.js';
-export * from './lib/project.js';
-export * from './lib/version.js';
-export * from './auth/setupHelpers.js';
-export type { AuthHandlerArgs, AuthGeneratorCtx } from './auth/setupHelpers.js';
-export * from './lib/installHelpers.js';
-export * from './telemetry/index.js';
-//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,iBAAiB,CAAA;AAC/B,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EACL,mBAAmB,EACnB,yBAAyB,EACzB,yBAAyB,GAC1B,MAAM,uBAAuB,CAAA;AAC9B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,kBAAkB,CAAA;AAChC,cAAc,kBAAkB,CAAA;AAChC,cAAc,wBAAwB,CAAA;AACtC,YAAY,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAE/E,cAAc,yBAAyB,CAAA;AAEvC,cAAc,sBAAsB,CAAA"}

package/dist/index.js

@@ -1,20 +0,0 @@
-export * from "./lib/index.js";
-export * from "./lib/colors.js";
-import { loadEnvFiles } from "./lib/loadEnvFiles.js";
-import {
-  loadDefaultEnvFiles,
-  loadNodeEnvDerivedEnvFile,
-  loadUserSpecifiedEnvFiles
-} from "./lib/loadEnvFiles.js";
-export * from "./lib/paths.js";
-export * from "./lib/project.js";
-export * from "./lib/version.js";
-export * from "./auth/setupHelpers.js";
-export * from "./lib/installHelpers.js";
-export * from "./telemetry/index.js";
-export {
-  loadDefaultEnvFiles,
-  loadEnvFiles,
-  loadNodeEnvDerivedEnvFile,
-  loadUserSpecifiedEnvFiles
-};