@cedarjs/auth-dbauth-setup 7.0.1-next.467 → 7.1.0-rc.32

package/dist/setup.d.ts

@@ -4,7 +4,6 @@ export declare const description = "Set up auth for for dbAuth";
 export declare function builder(yargs: Argv): void;
 export interface Args {
     webauthn: boolean | null;
-    oauth?: string | null;
     createUserModel: boolean | null;
     generateAuthPages: boolean | null;
     force: boolean;

package/dist/setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../src/setup.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAEjC,eAAO,MAAM,OAAO,WAAW,CAAA;AAC/B,eAAO,MAAM,WAAW,+BAA+B,CAAA;AAEvD,wBAAgB,OAAO,CAAC,KAAK,EAAE,IAAI,QAwClC;AAED,MAAM,WAAW,IAAI;IACnB,QAAQ,EAAE,OAAO,GAAG,IAAI,CAAA;IAKxB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB,eAAe,EAAE,OAAO,GAAG,IAAI,CAAA;IAC/B,iBAAiB,EAAE,OAAO,GAAG,IAAI,CAAA;IACjC,KAAK,EAAE,OAAO,CAAA;CACf;AAED,eAAO,MAAM,OAAO,GAAU,SAAS,IAAI,kBAG1C,CAAA"}
+{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../src/setup.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAEjC,eAAO,MAAM,OAAO,WAAW,CAAA;AAC/B,eAAO,MAAM,WAAW,+BAA+B,CAAA;AAEvD,wBAAgB,OAAO,CAAC,KAAK,EAAE,IAAI,QAgClC;AAED,MAAM,WAAW,IAAI;IACnB,QAAQ,EAAE,OAAO,GAAG,IAAI,CAAA;IACxB,eAAe,EAAE,OAAO,GAAG,IAAI,CAAA;IAC/B,iBAAiB,EAAE,OAAO,GAAG,IAAI,CAAA;IACjC,KAAK,EAAE,OAAO,CAAA;CACf;AAED,eAAO,MAAM,OAAO,GAAU,SAAS,IAAI,kBAG1C,CAAA"}

package/dist/setup.js

@@ -12,11 +12,6 @@ function builder(yargs) {
     default: null,
     description: "Include WebAuthn support (TouchID/FaceID)",
     type: "boolean"
-  }).option("oauth", {
-    alias: "o",
-    default: null,
-    description: "Include OAuth support for the given comma-separated providers (google, github), e.g. --oauth google,github",
-    type: "string"
   }).option("createUserModel", {
     alias: "u",
     default: null,

package/dist/setupData.d.ts

@@ -1,4 +1,4 @@
-import type { AuthGeneratorCtx } from '@cedarjs/cli-helpers/auth/setupHelpers';
+import type { AuthGeneratorCtx } from '@cedarjs/cli-helpers';
 export declare const extraTask: {
     title: string;
     task: () => void;

package/dist/setupData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setupData.d.ts","sourceRoot":"","sources":["../src/setupData.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAA;AAS9E,eAAO,MAAM,SAAS;;;CAKrB,CAAA;AAED,eAAO,MAAM,mBAAmB;;gBAEZ,gBAAgB;CAoBnC,CAAA;AAGD,eAAO,MAAM,KAAK,UAsDjB,CAAA;AAED,eAAO,MAAM,qBAAqB,UAwBjC,CAAA;AAED,eAAO,MAAM,YAAY,UAMxB,CAAA;AAED,eAAO,MAAM,cAAc,UAO1B,CAAA"}
+{"version":3,"file":"setupData.d.ts","sourceRoot":"","sources":["../src/setupData.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAM5D,eAAO,MAAM,SAAS;;;CAKrB,CAAA;AAED,eAAO,MAAM,mBAAmB;;gBAEZ,gBAAgB;CAoBnC,CAAA;AAGD,eAAO,MAAM,KAAK,UAsDjB,CAAA;AAED,eAAO,MAAM,qBAAqB,UAwBjC,CAAA;AAED,eAAO,MAAM,YAAY,UAMxB,CAAA;AAED,eAAO,MAAM,cAAc,UAO1B,CAAA"}

package/dist/setupData.js

@@ -1,8 +1,6 @@
 import crypto from "node:crypto";
 import path from "node:path";
-import { colors } from "@cedarjs/cli-helpers/colors";
-import { getPaths } from "@cedarjs/cli-helpers/paths";
-import { addEnvVarTask } from "@cedarjs/cli-helpers/project";
+import { getPaths, colors, addEnvVarTask } from "@cedarjs/cli-helpers";
 import { addModels, functionsPath, hasModel, libPath } from "./shared.js";
 const secret = crypto.randomBytes(32).toString("base64");
 const extraTask = addEnvVarTask(

package/dist/setupHandler.d.ts

@@ -1,5 +1,5 @@
 import type { Args } from './setup.js';
-export declare function handler({ webauthn, oauth, createUserModel, generateAuthPages, force: forceArg, }: Args): Promise<void>;
+export declare function handler({ webauthn, createUserModel, generateAuthPages, force: forceArg, }: Args): Promise<void>;
 export declare const createAuthDecoderFunction: {
     title: string;
     task: () => void;

package/dist/setupHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setupHandler.d.ts","sourceRoot":"","sources":["../src/setupHandler.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAwBtC,wBAAsB,OAAO,CAAC,EAC5B,QAAQ,EACR,KAAK,EACL,eAAe,EACf,iBAAiB,EACjB,KAAK,EAAE,QAAQ,GAChB,EAAE,IAAI,iBA0GN;AA4ED,eAAO,MAAM,yBAAyB;;;CAuCrC,CAAA"}
+{"version":3,"file":"setupHandler.d.ts","sourceRoot":"","sources":["../src/setupHandler.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAwBtC,wBAAsB,OAAO,CAAC,EAC5B,QAAQ,EACR,eAAe,EACf,iBAAiB,EACjB,KAAK,EAAE,QAAQ,GAChB,EAAE,IAAI,iBAyEN;AAsED,eAAO,MAAM,yBAAyB;;;CAuCrC,CAAA"}

package/dist/setupHandler.js

@@ -1,20 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import prompts from "prompts";
-import { standardAuthHandler } from "@cedarjs/cli-helpers/auth/setupHelpers";
-import { getGraphqlPath } from "@cedarjs/cli-helpers/project";
-import { requireTTYOrExit } from "@cedarjs/cli-helpers/tty";
-import {
-  apiPackages as oauthApiPackages,
-  configureOAuthProvidersTask,
-  createUserModelTask as oauthCreateUserModelTask,
-  envVarNotes as oauthEnvVarNotes,
-  noteGenerate as oauthNoteGenerate,
-  notes as oauthNotes,
-  parseOAuthProviders,
-  webAuthnCreateUserModelTask as webAuthnOauthCreateUserModelTask,
-  webAuthnOauthNotes
-} from "./oauth.setupData.js";
+import { getGraphqlPath, standardAuthHandler } from "@cedarjs/cli-helpers";
 import {
   notes,
   noteGenerate,
@@ -39,7 +26,6 @@ import {
 } from "./webAuthn.setupData.js";
 async function handler({
   webauthn,
-  oauth,
   createUserModel,
   generateAuthPages,
   force: forceArg
@@ -51,22 +37,10 @@ async function handler({
     )
   );
   const webAuthn = await shouldIncludeWebAuthn(webauthn);
-  const oauthProviders = parseOAuthProviders(oauth);
-  const includeOAuth = oauthProviders.length > 0;
   const createDbUserModel = await shouldCreateUserModel(createUserModel);
   const generateDbAuthPages = await shouldGenerateDbAuthPages(generateAuthPages);
   const oneMoreThing = [];
-  if (webAuthn && includeOAuth) {
-    if (createDbUserModel) {
-      oneMoreThing.push(...notesCreatedUserModel);
-    } else {
-      oneMoreThing.push(...webAuthnOauthNotes());
-    }
-    oneMoreThing.push(...oauthEnvVarNotes(oauthProviders));
-    if (!generateDbAuthPages) {
-      oneMoreThing.push(...webAuthnNoteGenerate);
-    }
-  } else if (webAuthn) {
+  if (webAuthn) {
     if (createDbUserModel) {
       oneMoreThing.push(...notesCreatedUserModel);
     } else {
@@ -75,16 +49,6 @@ async function handler({
     if (!generateDbAuthPages) {
       oneMoreThing.push(...webAuthnNoteGenerate);
     }
-  } else if (includeOAuth) {
-    if (createDbUserModel) {
-      oneMoreThing.push(...notesCreatedUserModel);
-    } else {
-      oneMoreThing.push(...oauthNotes());
-    }
-    oneMoreThing.push(...oauthEnvVarNotes(oauthProviders));
-    if (!generateDbAuthPages) {
-      oneMoreThing.push(...oauthNoteGenerate);
-    }
   } else {
     if (createDbUserModel) {
       oneMoreThing.push(...notesCreatedUserModel);
@@ -98,12 +62,8 @@ async function handler({
   oneMoreThing.push(...notePrivateSet);
   let createDbUserModelTask = void 0;
   if (createDbUserModel) {
-    if (webAuthn && includeOAuth) {
-      createDbUserModelTask = webAuthnOauthCreateUserModelTask;
-    } else if (webAuthn) {
+    if (webAuthn) {
       createDbUserModelTask = webAuthnCreateUserModelTask;
-    } else if (includeOAuth) {
-      createDbUserModelTask = oauthCreateUserModelTask;
     } else {
       createDbUserModelTask = createUserModelTask;
     }
@@ -114,21 +74,18 @@ async function handler({
     provider: "dbAuth",
     authDecoderImport: "import { createAuthDecoder } from '@cedarjs/auth-dbauth-api'",
     webAuthn,
-    oauth: includeOAuth,
     webPackages: [
       `@cedarjs/auth-dbauth-web@${version}`,
       ...webAuthn ? webAuthnWebPackages : []
     ],
     apiPackages: [
       `@cedarjs/auth-dbauth-api@${version}`,
-      ...webAuthn ? webAuthnApiPackages : [],
-      ...includeOAuth ? [`@cedarjs/auth-dbauth-oauth@${version}`, ...oauthApiPackages] : []
+      ...webAuthn ? webAuthnApiPackages : []
     ],
     extraTasks: [
       webAuthn ? webAuthnExtraTask : extraTask,
       createDbUserModelTask,
       createAuthDecoderFunction,
-      includeOAuth ? configureOAuthProvidersTask(oauthProviders) : void 0,
       generateDbAuthPages ? generateAuthPagesTask(createDbUserModel) : void 0
     ],
     notes: oneMoreThing
@@ -136,7 +93,6 @@ async function handler({
 }
 async function shouldIncludeWebAuthn(webauthn) {
   if (webauthn === null) {
-    requireTTYOrExit("--webauthn or --webauthn=false");
     const webAuthnResponse = await prompts({
       type: "confirm",
       name: "answer",
@@ -155,7 +111,6 @@ async function shouldCreateUserModel(createUserModel) {
     return true;
   }
   if (createUserModel === null && !hasUserModel) {
-    requireTTYOrExit("--createUserModel or --createUserModel=false");
     const createModelResponse = await prompts({
       type: "confirm",
       name: "answer",
@@ -168,7 +123,6 @@ async function shouldCreateUserModel(createUserModel) {
 }
 async function shouldGenerateDbAuthPages(generateAuthPages) {
   if (generateAuthPages === null && !hasAuthPages()) {
-    requireTTYOrExit("--generateAuthPages or --generateAuthPages=false");
     const generateAuthPagesResponse = await prompts({
       type: "confirm",
       name: "answer",

package/dist/shared.js

@@ -1,8 +1,8 @@
 import fs from "node:fs";
 import path from "node:path";
 import prismaInternals from "@prisma/internals";
+import { getPaths } from "@cedarjs/cli-helpers";
 import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
-import { getPaths } from "@cedarjs/cli-helpers/paths";
 import {
   processPagesDir,
   getSchemaPath,

package/dist/templates/api/functions/auth.ts.template

@@ -102,42 +102,6 @@ export const handler = async (
     },
   }
 
-  const changePasswordOptions: DbAuthHandlerOptions['changePassword'] = {
-    // handler() is invoked after a logged in user has entered their current
-    // password correctly and the new password has been saved to the database.
-    // This is a good place to let the user know, by email for example, that
-    // their password was changed.
-    //
-    // Returning anything truthy keeps the user logged in. Return `false` to
-    // log them out, and in the Change Password page redirect the user to the
-    // login page.
-    handler: (_user) => {
-      // TODO: Send an email/message to the user letting them know that their
-      // password was changed. When you implement this, change `_user` to
-      // `user` in the function arguments above.
-
-      return true
-    },
-
-    // If `false` then the new password MUST be different from the current one
-    allowReusedPassword: false,
-
-    errors: {
-      // the current password was not provided
-      currentPasswordRequired: 'Current password is required',
-      // the new password was not provided
-      newPasswordRequired: 'New password is required',
-      // the current password is not correct
-      incorrectCurrentPassword: 'Current password is incorrect',
-      // the user doesn't have a password yet (they signed up with a third
-      // party login provider, for example)
-      passwordNotSet:
-        'This account does not have a password. Use "Forgot password" to set one',
-      // new password is the same as the current password
-      reusedPassword: 'Must choose a new password',
-    },
-  }
-
   interface UserAttributes {
     name: string
   }
@@ -233,7 +197,6 @@ export const handler = async (
       name: cookieName,
     },
 
-    changePassword: changePasswordOptions,
     forgotPassword: forgotPasswordOptions,
     login: loginOptions,
     resetPassword: resetPasswordOptions,

package/dist/templates/api/functions/auth.webAuthn.ts.template

@@ -93,42 +93,6 @@ export const handler = async (
     },
   }
 
-  const changePasswordOptions: DbAuthHandlerOptions['changePassword'] = {
-    // handler() is invoked after a logged in user has entered their current
-    // password correctly and the new password has been saved to the database.
-    // This is a good place to let the user know, by email for example, that
-    // their password was changed.
-    //
-    // Returning anything truthy keeps the user logged in. Return `false` to
-    // log them out, and in the Change Password page redirect the user to the
-    // login page.
-    handler: (_user) => {
-      // TODO: Send an email/message to the user letting them know that their
-      // password was changed. When you implement this, change `_user` to
-      // `user` in the function arguments above.
-
-      return true
-    },
-
-    // If `false` then the new password MUST be different from the current one
-    allowReusedPassword: false,
-
-    errors: {
-      // the current password was not provided
-      currentPasswordRequired: 'Current password is required',
-      // the new password was not provided
-      newPasswordRequired: 'New password is required',
-      // the current password is not correct
-      incorrectCurrentPassword: 'Current password is incorrect',
-      // the user doesn't have a password yet (they signed up with a third
-      // party login provider, for example)
-      passwordNotSet:
-        'This account does not have a password. Use "Forgot password" to set one',
-      // new password is the same as the current password
-      reusedPassword: 'Must choose a new password',
-    },
-  }
-
   interface UserAttributes {
     name: string
   }
@@ -223,7 +187,6 @@ export const handler = async (
       name: cookieName,
     },
 
-    changePassword: changePasswordOptions,
     forgotPassword: forgotPasswordOptions,
     login: loginOptions,
     resetPassword: resetPasswordOptions,

package/dist/webAuthn.setupData.d.ts

@@ -1,4 +1,4 @@
-import type { AuthGeneratorCtx } from '@cedarjs/cli-helpers/auth/setupHelpers';
+import type { AuthGeneratorCtx } from '@cedarjs/cli-helpers';
 export { extraTask } from './setupData.js';
 export declare const webPackages: string[];
 export declare const apiPackages: string[];

package/dist/webAuthn.setupData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webAuthn.setupData.d.ts","sourceRoot":"","sources":["../src/webAuthn.setupData.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAA;AAO9E,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAG1C,eAAO,MAAM,WAAW,UAAkC,CAAA;AAG1D,eAAO,MAAM,WAAW,UAAiC,CAAA;AAEzD,eAAO,MAAM,mBAAmB;;gBAEZ,gBAAgB;CA+BnC,CAAA;AAGD,eAAO,MAAM,KAAK,UAoEjB,CAAA;AAED,eAAO,MAAM,YAAY,UAMxB,CAAA"}
+{"version":3,"file":"webAuthn.setupData.d.ts","sourceRoot":"","sources":["../src/webAuthn.setupData.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAK5D,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAG1C,eAAO,MAAM,WAAW,UAAkC,CAAA;AAG1D,eAAO,MAAM,WAAW,UAAiC,CAAA;AAEzD,eAAO,MAAM,mBAAmB;;gBAEZ,gBAAgB;CA+BnC,CAAA;AAGD,eAAO,MAAM,KAAK,UAoEjB,CAAA;AAED,eAAO,MAAM,YAAY,UAMxB,CAAA"}

package/dist/webAuthn.setupData.js

@@ -1,10 +1,9 @@
 import path from "node:path";
-import { colors } from "@cedarjs/cli-helpers/colors";
-import { getPaths } from "@cedarjs/cli-helpers/paths";
+import { getPaths, colors } from "@cedarjs/cli-helpers";
 import { addModels, functionsPath, hasModel, libPath } from "./shared.js";
 import { extraTask } from "./setupData.js";
-const webPackages = ["@simplewebauthn/browser@^13"];
-const apiPackages = ["@simplewebauthn/server@^13"];
+const webPackages = ["@simplewebauthn/browser@^10"];
+const apiPackages = ["@simplewebauthn/server@^10"];
 const createUserModelTask = {
   title: "Creating model `User`...",
   task: async (ctx) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/auth-dbauth-setup",
-  "version": "7.0.1-next.467",
+  "version": "7.1.0-rc.32",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -23,16 +23,16 @@
     "test:watch": "yarn test --watch"
   },
   "dependencies": {
-    "@cedarjs/cli-helpers": "7.0.1-next.467",
-    "@cedarjs/project-config": "7.0.1-next.467",
-    "@prisma/internals": "7.10.0",
+    "@cedarjs/cli-helpers": "7.1.0-rc.32",
+    "@cedarjs/project-config": "7.1.0-rc.32",
+    "@prisma/internals": "7.8.0",
     "prompts": "2.4.2",
     "termi-link": "1.1.0"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "7.0.1-next.467",
+    "@cedarjs/framework-tools": "7.1.0-rc.32",
     "@types/yargs": "17.0.35",
-    "memfs": "4.80.0",
+    "memfs": "4.78.1",
     "nodemon": "3.1.14",
     "ts-dedent": "2.3.0",
     "typescript": "5.9.3",

package/dist/oauth.setupData.d.ts

@@ -1,57 +0,0 @@
-import type { AuthGeneratorCtx } from '@cedarjs/cli-helpers/auth/setupHelpers';
-/**
- * The OAuth providers `cedar setup auth dbAuth --oauth` knows how to
- * configure out of the box. Anything else is served by implementing the
- * `OAuthStrategy` interface, documented at
- * https://cedarjs.com/docs/auth/dbauth#oauth-custom-strategies
- */
-export declare const KNOWN_OAUTH_PROVIDERS: readonly ["google", "github"];
-export type OAuthProviderName = (typeof KNOWN_OAUTH_PROVIDERS)[number];
-/**
- * Parses the comma-separated value of `--oauth` into a deduped list of
- * provider names, validating every entry against `KNOWN_OAUTH_PROVIDERS`.
- *
- * Returns an empty array when `oauth` is nullish (the flag wasn't passed).
- * Some callers pass `null` explicitly for "flag absent"; others invoke the
- * setup handler programmatically and simply omit the argument, which comes
- * through as `undefined`. Both mean "OAuth disabled".
- */
-export declare function parseOAuthProviders(oauth: string | null | undefined): OAuthProviderName[];
-export declare const apiPackages: string[];
-export declare const createUserModelTask: {
-    title: string;
-    task: (ctx: AuthGeneratorCtx) => Promise<void>;
-};
-export declare const webAuthnCreateUserModelTask: {
-    title: string;
-    task: (ctx: AuthGeneratorCtx) => Promise<void>;
-};
-export declare function envVarNotes(providers: OAuthProviderName[]): string[];
-export declare function notes(): string[];
-export declare function webAuthnOauthNotes(): string[];
-export declare const noteGenerate: string[];
-/**
- * Strips the config for every OAuth provider that wasn't selected out of the
- * `auth.oauth.ts`/`auth.webAuthn.oauth.ts` templates, and drops the marker
- * comments around the config for every provider that was.
- *
- * The templates carry every known provider so there's a single source of
- * truth for the generated file's shape; this function is what turns that
- * into a file that only configures the providers the user actually asked
- * for. It's a pure string transform, so re-running setup (which always
- * starts from a fresh copy of the template) produces byte-identical output.
- *
- * Exported for testing.
- */
-export declare function pruneOAuthProviders(content: string, providers: OAuthProviderName[]): string;
-/**
- * Rewrites the generated `functions/auth.ts` (or `.js`) in place so it only
- * configures the OAuth providers the user selected with `--oauth`. Runs
- * after `generateAuthApiFiles` has written the fresh, unpruned template, so
- * every run starts from the same source and produces the same result.
- */
-export declare function configureOAuthProvidersTask(providers: OAuthProviderName[]): {
-    title: string;
-    task: () => void;
-};
-//# sourceMappingURL=oauth.setupData.d.ts.map

package/dist/oauth.setupData.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"oauth.setupData.d.ts","sourceRoot":"","sources":["../src/oauth.setupData.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAA;AAO9E;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,+BAAgC,CAAA;AAElE,MAAM,MAAM,iBAAiB,GAAG,CAAC,OAAO,qBAAqB,CAAC,CAAC,MAAM,CAAC,CAAA;AAMtE;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAC/B,iBAAiB,EAAE,CAqCrB;AAGD,eAAO,MAAM,WAAW,UAAsB,CAAA;AAmB9C,eAAO,MAAM,mBAAmB;;gBAEZ,gBAAgB;CAqBnC,CAAA;AAED,eAAO,MAAM,2BAA2B;;gBAEpB,gBAAgB;CAgCnC,CAAA;AAOD,wBAAgB,WAAW,CAAC,SAAS,EAAE,iBAAiB,EAAE,YAWzD;AAuCD,wBAAgB,KAAK,aAkDpB;AAED,wBAAgB,kBAAkB,aAgEjC;AAED,eAAO,MAAM,YAAY,UAMxB,CAAA;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,iBAAiB,EAAE,UA2B/B;AAMD;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,SAAS,EAAE,iBAAiB,EAAE;;;EAsBzE"}