@cedarjs/cli 7.0.0-canary.3106 → 7.0.0-canary.3107

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

@@ -1,23 +1,26 @@
 import fs from "node:fs";
 import path from "node:path";
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 const WEB_AUTH_EXTENSIONS = ["ts", "tsx", "js", "jsx"];
 function hasWebAuthFile(webSrcPath) {
   return WEB_AUTH_EXTENSIONS.some(
     (extension) => fs.existsSync(path.join(webSrcPath, `auth.${extension}`))
   );
 }
-const AUTH_NOT_SET_UP_MESSAGE = [
-  "Auth is not set up in this project.",
-  "",
-  "Tenancy builds on your app's auth: it adds memberships to",
-  "`getCurrentUser`, and resolves the current organization from the",
-  "signed-in user's memberships. Set up auth first, then run this command",
-  "again:",
-  "",
-  "  yarn cedar setup auth dbAuth",
-  "",
-  "Any provider works. See https://cedarjs.com/docs/authentication"
-].join("\n");
+function authNotSetUpMessage() {
+  return [
+    "Auth is not set up in this project.",
+    "",
+    "Tenancy builds on your app's auth: it adds memberships to",
+    "`getCurrentUser`, and resolves the current organization from the",
+    "signed-in user's memberships. Set up auth first, then run this command",
+    "again:",
+    "",
+    `  ${formatCedarCommand(["setup", "auth", "dbAuth"])}`,
+    "",
+    "Any provider works. See https://cedarjs.com/docs/authentication"
+  ].join("\n");
+}
 function noUserModelMessage(schemaPath) {
   return [
     `No \`User\` model found in ${schemaPath}.`,
@@ -30,7 +33,7 @@ function noUserModelMessage(schemaPath) {
     "provider's id in a column beside it, so memberships keep working if you",
     "switch providers or add a second one.",
     "",
-    "Add a model like this one, run `yarn cedar prisma migrate dev`, then",
+    `Add a model like this one, run \`${formatCedarCommand(["prisma", "migrate", "dev"])}\`, then`,
     "run this command again:",
     "",
     "  model User {",
@@ -40,7 +43,7 @@ function noUserModelMessage(schemaPath) {
   ].join("\n");
 }
 export {
-  AUTH_NOT_SET_UP_MESSAGE,
+  authNotSetUpMessage,
   hasWebAuthFile,
   noUserModelMessage
 };

package/dist/commands/setup/tenancy/templates/ensureDefaultOrganizations.dataMigration.ts.template

@@ -10,8 +10,9 @@ const BATCH_SIZE = 100
  * dbAuth, the signup handler). Every user without a membership gets one, in
  * batches, using the same `ensureDefaultOrganization` new signups use.
  *
- * Run with `yarn cedar data-migrate up`, after `yarn cedar prisma migrate dev`
- * has applied the `Organization`/`Membership` migration.
+ * Run with `__DATA_MIGRATE_UP_COMMAND__`, after
+ * `__PRISMA_MIGRATE_DEV_COMMAND__` has applied the
+ * `Organization`/`Membership` migration.
  */
 export default async ({ db }: { db: PrismaClient }) => {
   let cursor: string | undefined

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

@@ -18,7 +18,7 @@ import { getPaths, transformTSToJS, writeFile } from "../../../lib/index.js";
 import { isTypeScriptProject } from "../../../lib/project.js";
 import { runTransform } from "../../../lib/runTransform.js";
 import {
-  AUTH_NOT_SET_UP_MESSAGE,
+  authNotSetUpMessage,
   hasWebAuthFile,
   noUserModelMessage
 } from "./preflight.js";
@@ -61,7 +61,7 @@ const SIGNUP_SNIPPET = `
 const handler = async ({ tenantField, force }) => {
   const paths = getPaths();
   if (!hasWebAuthFile(paths.web.src)) {
-    console.error(c.error(AUTH_NOT_SET_UP_MESSAGE));
+    console.error(c.error(authNotSetUpMessage()));
     process.exit(1);
   }
   const preflightSchemaPath = await getSchemaPath(paths.api.prismaConfig);
@@ -82,16 +82,13 @@ const handler = async ({ tenantField, force }) => {
   const graphqlPath = path.join(paths.api.functions, `graphql.${ext}`);
   const functionsAuthPath = path.join(paths.api.functions, `auth.${ext}`);
   const isDbAuthProject = fs.existsSync(functionsAuthPath) && fs.readFileSync(functionsAuthPath, "utf-8").includes("DbAuthHandler");
-  const writeTemplateFile = async (templateFile, outputPath) => {
-    const templatePath = path.resolve(
-      import.meta.dirname,
-      "templates",
-      templateFile
-    );
-    const templateContent = fs.readFileSync(templatePath, {
-      encoding: "utf8",
-      flag: "r"
-    });
+  const writeTemplateFile = async (templateFile, outputPath, replacements = {}) => {
+    const dirname = import.meta.dirname;
+    const templatePath = path.resolve(dirname, "templates", templateFile);
+    let templateContent = fs.readFileSync(templatePath, "utf-8");
+    for (const [token, value] of Object.entries(replacements)) {
+      templateContent = templateContent.replaceAll(token, value);
+    }
     const content = projectIsTypescript ? templateContent : await transformTSToJS(outputPath, templateContent);
     return writeFile(outputPath, content, { overwriteExisting: force });
   };
@@ -116,8 +113,10 @@ const handler = async ({ tenantField, force }) => {
           } catch (e) {
             const message = e instanceof Error ? e.message : String(e);
             if (message === "CEDAR_TENANCY_ERR_NO_USER_MODEL") {
+              const authSetup = formatCedarCommand(["setup", "auth", "dbAuth"]);
+              const tenancySetup = formatCedarCommand(["setup", "tenancy"]);
               throw new Error(
-                "No `User` model found in schema.prisma. Set up authentication first (e.g. `yarn cedar setup auth dbAuth`) before running `yarn cedar setup tenancy`."
+                `No \`User\` model found in schema.prisma. Set up authentication first (e.g. \`${authSetup}\`) before running \`${tenancySetup}\`.`
               );
             }
             if (message === "CEDAR_TENANCY_ERR_MODELS_EXIST") {
@@ -159,12 +158,13 @@ const handler = async ({ tenantField, force }) => {
           });
           if (transformResult.error) {
             if (transformResult.error === "CEDAR_CODEMOD_ERR_OLD_FORMAT") {
+              const tenancySetup = formatCedarCommand(["setup", "tenancy"]);
               throw new Error(
-                "It looks like your api/src/lib/db file is using the old format. Please update it as per the v8 upgrade guide, then run `yarn cedar setup tenancy` again."
+                `It looks like your api/src/lib/db file is using the old format. Please update it as per the v8 upgrade guide, then run \`${tenancySetup}\` again.`
               );
             }
             throw new Error(
-              "Could not add the tenancy Prisma extension. Please modify api/src/lib/db by hand: wrap the `db` export in `.$extends(createTenancyExtension({ models: { allExcept: ['user', 'organization', 'membership'] } }))`."
+              "Could not add the tenancy Prisma extension. Please modify `api/src/lib/db` by hand: wrap the `db` export in `.$extends(createTenancyExtension({ models: { allExcept: ['user', 'organization', 'membership'] } }))`."
             );
           }
         }
@@ -271,7 +271,18 @@ ${SIGNUP_SNIPPET}`;
             path.join(
               dataMigrationsPath,
               `${timestamp}-ensure-default-organizations.${ext}`
-            )
+            ),
+            {
+              __DATA_MIGRATE_UP_COMMAND__: formatCedarCommand([
+                "data-migrate",
+                "up"
+              ]),
+              __PRISMA_MIGRATE_DEV_COMMAND__: formatCedarCommand([
+                "prisma",
+                "migrate",
+                "dev"
+              ])
+            }
           );
         }
       },

package/package.json

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