@cedarjs/cli-helpers 7.0.0-canary.3073 → 7.0.0-canary.3075

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

@@ -31,7 +31,7 @@ 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>;
 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;

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;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,EACjB,eAAa,KACZ,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"}

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";

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;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,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,kBAiFjB,CAAA"}

package/dist/auth/setupHelpers.js

@@ -42,6 +42,7 @@ const standardAuthHandler = async ({
   provider,
   authDecoderImport,
   webAuthn = false,
+  oauth = false,
   webPackages = [],
   apiPackages = [],
   extraTasks,
@@ -51,7 +52,7 @@ const standardAuthHandler = async ({
   const tasks = new Listr(
     [
       setAuthSetupMode(forceArg),
-      generateAuthApiFiles(basedir, webAuthn),
+      generateAuthApiFiles(basedir, webAuthn, oauth),
       addConfigToWebApp(),
       createWebAuth(basedir, webAuthn),
       addConfigToRoutes(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli-helpers",
-  "version": "7.0.0-canary.3073",
+  "version": "7.0.0-canary.3075",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -72,8 +72,8 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@cedarjs/project-config": "7.0.0-canary.3073",
-    "@cedarjs/telemetry": "7.0.0-canary.3073",
+    "@cedarjs/project-config": "7.0.0-canary.3075",
+    "@cedarjs/telemetry": "7.0.0-canary.3075",
     "@listr2/prompt-adapter-enquirer": "4.3.1",
     "@opentelemetry/api": "1.9.1",
     "ansis": "4.3.1",
@@ -93,7 +93,7 @@
     "yargs-parser": "21.1.1"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "7.0.0-canary.3073",
+    "@cedarjs/framework-tools": "7.0.0-canary.3075",
     "@types/dotenv-defaults": "^5.0.0",
     "@types/lodash": "4.17.25",
     "@types/pascalcase": "1.0.3",