@cedarjs/internal 8.0.0-canary.3538 → 8.0.0-canary.3539

package/dist/generate/gqlormSchema.d.ts

@@ -30,6 +30,13 @@ export interface GqlormBackendConfig {
     membershipUserField: string;
     membershipOrganizationField: string;
     membershipModelExists: boolean;
+    /**
+     * Whether `cedar setup tenancy` replaced `@requireAuth` with
+     * `@requireOrgAuth` and `@requireUserAuth`. Fields then use
+     * `@requireUserAuth`, which checks what `@requireAuth` did: gqlorm does
+     * its own scoping to the user's organizations.
+     */
+    tenancyAuthDirectives?: boolean;
 }
 /**
  * Map a DMMF field type to its GraphQL SDL equivalent.

package/dist/generate/gqlormSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gqlormSchema.d.ts","sourceRoot":"","sources":["../../src/generate/gqlormSchema.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,KAAK,IAAI,MAAM,cAAc,CAAA;AA8BzC,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;AAE3C,UAAU,iBAAiB;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;CACf;AAED,UAAU,iBAAiB;IACzB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,iBAAiB,EAAE,CAAA;CAC5B;AAMD,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,OAAO,CAAA;IACnB,IAAI,EAAE,OAAO,CAAA;IACb,eAAe,EAAE,OAAO,CAAA;IACxB,WAAW,EAAE,OAAO,CAAA;CACrB;AAED,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,gBAAgB,EAAE,CAAA;IAC1B,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAA;CACtC;AAED,MAAM,WAAW,mBAAmB;IAClC,eAAe,EAAE,MAAM,CAAA;IACvB,oBAAoB,EAAE,MAAM,CAAA;IAC5B,mBAAmB,EAAE,MAAM,CAAA;IAC3B,2BAA2B,EAAE,MAAM,CAAA;IACnC,qBAAqB,EAAE,OAAO,CAAA;CAC/B;AA6DD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAMvE;AAoGD,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,CAAC,QAAQ,GAClB,iBAAiB,EAAE,CAiDrB;AAED,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,iBAAiB,EAAE,GAC1B,MAAM,CA2CR;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,GAAG,WAAW,CAkDjE;AAMD;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,GAAG,gBAAgB,EAAE,CA6D7E;AAkBD;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CA6BvE;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,gBAAgB,EAAE,EAC1B,MAAM,GAAE,mBAAmD,GAC1D,MAAM,CA+rBR;AAMD;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC;IACvD,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,EAAE,CAAA;CAC9C,CAAC,CAkID"}
+{"version":3,"file":"gqlormSchema.d.ts","sourceRoot":"","sources":["../../src/generate/gqlormSchema.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,KAAK,IAAI,MAAM,cAAc,CAAA;AA8BzC,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;AAE3C,UAAU,iBAAiB;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;CACf;AAED,UAAU,iBAAiB;IACzB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,iBAAiB,EAAE,CAAA;CAC5B;AAMD,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,OAAO,CAAA;IACnB,IAAI,EAAE,OAAO,CAAA;IACb,eAAe,EAAE,OAAO,CAAA;IACxB,WAAW,EAAE,OAAO,CAAA;CACrB;AAED,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,gBAAgB,EAAE,CAAA;IAC1B,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAA;CACtC;AAED,MAAM,WAAW,mBAAmB;IAClC,eAAe,EAAE,MAAM,CAAA;IACvB,oBAAoB,EAAE,MAAM,CAAA;IAC5B,mBAAmB,EAAE,MAAM,CAAA;IAC3B,2BAA2B,EAAE,MAAM,CAAA;IACnC,qBAAqB,EAAE,OAAO,CAAA;IAC9B;;;;;OAKG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAA;CAChC;AA6DD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAMvE;AAoGD,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,CAAC,QAAQ,GAClB,iBAAiB,EAAE,CAiDrB;AAED,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,iBAAiB,EAAE,GAC1B,MAAM,CA2CR;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,GAAG,WAAW,CAkDjE;AAMD;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,GAAG,gBAAgB,EAAE,CA6D7E;AAkBD;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CA6BvE;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,gBAAgB,EAAE,EAC1B,MAAM,GAAE,mBAAmD,GAC1D,MAAM,CAmsBR;AAMD;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC;IACvD,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,EAAE,CAAA;CAC9C,CAAC,CAqID"}

package/dist/generate/gqlormSchema.js

@@ -477,6 +477,7 @@ function generateGqlormBackendContent(models, config = DEFAULT_GQLORM_BACKEND_CO
     lines.push("  }");
     lines.push("");
   }
+  const requireAuthDirective = config.tenancyAuthDirectives ? "@requireUserAuth" : "@requireAuth";
   lines.push("  type Query {");
   for (const model of models) {
     const hasUserField = model.fields.some(
@@ -487,7 +488,7 @@ function generateGqlormBackendContent(models, config = DEFAULT_GQLORM_BACKEND_CO
     );
     const isMembershipModel = model.camelName === config.membershipModelCamel;
     const needsAuth = hasUserField || hasOrgField && config.membershipModelExists && !isMembershipModel;
-    const authDirective = needsAuth ? "@requireAuth" : "@skipAuth";
+    const authDirective = needsAuth ? requireAuthDirective : "@skipAuth";
     lines.push(
       `    ${model.pluralName}: [${model.modelName}!]! ${authDirective}`
     );
@@ -511,7 +512,7 @@ function generateGqlormBackendContent(models, config = DEFAULT_GQLORM_BACKEND_CO
       );
       const isMembershipModel = model.camelName === config.membershipModelCamel;
       const needsAuth = hasUserField || hasOrgField && config.membershipModelExists && !isMembershipModel;
-      const authDirective = needsAuth ? "@requireAuth" : "@skipAuth";
+      const authDirective = needsAuth ? requireAuthDirective : "@skipAuth";
       const idNullMark = model.idField.isRequired ? "!" : "";
       lines.push(
         `    create${model.modelName}(input: Create${model.modelName}Input!): ${model.modelName}! ${authDirective}`
@@ -974,7 +975,10 @@ async function generateGqlormArtifacts() {
       membershipModelCamel,
       membershipUserField,
       membershipOrganizationField,
-      membershipModelExists
+      membershipModelExists,
+      tenancyAuthDirectives: fs.existsSync(
+        path.join(getPaths().api.directives, "requireOrgAuth")
+      )
     };
     const gqlormModels = allModels.filter(
       (m) => !existingTypes.has(m.modelName)

package/dist/generate/templates/web-tenancy.d.ts.template

@@ -0,0 +1,11 @@
+import '@cedarjs/auth'
+
+// This app has tenancy, so every role check says which kind it is:
+// useAuth().hasUserRole for currentUser.roles, and
+// useCurrentOrg().hasOrgRole or OrgScope's roles for the role in the
+// organization. No useAuth().hasRole or <PrivateSet roles>.
+declare module '@cedarjs/auth' {
+  interface AuthTenancy {
+    enabled: true
+  }
+}

package/dist/generate/typeDefinitions.d.ts

@@ -25,6 +25,13 @@ export declare const generateTypeDefGqlorm: () => string[];
  * otherwise, and a stale file goes.
  */
 export declare const generateTypeDefRealtime: () => string[];
+/**
+ * Marks `@cedarjs/auth`'s `AuthTenancy` as enabled when the web side depends
+ * on `@cedarjs/tenancy` (`cedar setup tenancy` adds it), which takes
+ * `useAuth().hasRole` and `<PrivateSet roles>` away from the app's types.
+ * None otherwise, and a stale file goes.
+ */
+export declare const generateTypeDefTenancy: () => string[];
 export declare const generateTypeDefScenarios: () => string[];
 export declare const generateTypeDefTestMocks: () => string[];
 export declare const generateTypeDefGlobImports: () => string[];

package/dist/generate/typeDefinitions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typeDefinitions.d.ts","sourceRoot":"","sources":["../../src/generate/typeDefinitions.ts"],"names":[],"mappings":"AA8CA;;;GAGG;AACH,eAAO,MAAM,gBAAgB;;;;;;EA2B5B,CAAA;AAED,eAAO,MAAM,mCAAmC,gBAK/C,CAAA;AAED,eAAO,MAAM,kCAAkC,GAC7C,GAAG,MAAM,EACT,mDAAsB,aASvB,CAAA;AAED,eAAO,MAAM,kCAAkC,GAC7C,GAAG,MAAM,EACT,mDAAsB,WAoDvB,CAAA;AAED,eAAO,MAAM,mBAAmB,gBAG/B,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAI,GAAG,MAAM,EAAE,mDAAsB,aAQlE,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAI,GAAG,MAAM,EAAE,mDAAsB,WAmHnE,CAAA;AAiBD,eAAO,MAAM,2BAA2B,gBAmEvC,CAAA;AAED,eAAO,MAAM,0BAA0B,gBA8CtC,CAAA;AAED,eAAO,MAAM,0BAA0B,gBAEtC,CAAA;AAED,eAAO,MAAM,qBAAqB,gBAEjC,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,gBA8BnC,CAAA;AAED,eAAO,MAAM,wBAAwB,gBAEpC,CAAA;AAED,eAAO,MAAM,wBAAwB,gBAKpC,CAAA;AAED,eAAO,MAAM,0BAA0B,gBAEtC,CAAA;AAED,eAAO,MAAM,4BAA4B,gBAExC,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,gCAAgC,gBAW5C,CAAA"}
+{"version":3,"file":"typeDefinitions.d.ts","sourceRoot":"","sources":["../../src/generate/typeDefinitions.ts"],"names":[],"mappings":"AA8CA;;;GAGG;AACH,eAAO,MAAM,gBAAgB;;;;;;EA4B5B,CAAA;AAED,eAAO,MAAM,mCAAmC,gBAK/C,CAAA;AAED,eAAO,MAAM,kCAAkC,GAC7C,GAAG,MAAM,EACT,mDAAsB,aASvB,CAAA;AAED,eAAO,MAAM,kCAAkC,GAC7C,GAAG,MAAM,EACT,mDAAsB,WAoDvB,CAAA;AAED,eAAO,MAAM,mBAAmB,gBAG/B,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAI,GAAG,MAAM,EAAE,mDAAsB,aAQlE,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAI,GAAG,MAAM,EAAE,mDAAsB,WAmHnE,CAAA;AAiBD,eAAO,MAAM,2BAA2B,gBAmEvC,CAAA;AAED,eAAO,MAAM,0BAA0B,gBA8CtC,CAAA;AAED,eAAO,MAAM,0BAA0B,gBAEtC,CAAA;AAED,eAAO,MAAM,qBAAqB,gBAEjC,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,gBA8BnC,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,gBA8BlC,CAAA;AAED,eAAO,MAAM,wBAAwB,gBAEpC,CAAA;AAED,eAAO,MAAM,wBAAwB,gBAKpC,CAAA;AAED,eAAO,MAAM,0BAA0B,gBAEtC,CAAA;AAED,eAAO,MAAM,4BAA4B,gBAExC,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,gCAAgC,gBAW5C,CAAA"}

package/dist/generate/typeDefinitions.js

@@ -32,6 +32,7 @@ const generateTypeDefs = async () => {
       ...generateTypeDefCurrentUser(),
       ...generateTypeDefGqlorm(),
       ...generateTypeDefRealtime(),
+      ...generateTypeDefTenancy(),
       ...generateTypeDefRouterRoutes(),
       ...generateTypeDefGlobImports(),
       ...generateTypeDefGlobalContext(),
@@ -328,6 +329,27 @@ const generateTypeDefRealtime = () => {
   }
   return writeTypeDefIncludeFile("api-realtime.d.ts.template");
 };
+const generateTypeDefTenancy = () => {
+  const paths = getPaths();
+  const typeDefPath = path.join(
+    paths.generated.types.includes,
+    "web-tenancy.d.ts"
+  );
+  let packageJson;
+  try {
+    packageJson = JSON.parse(
+      fs.readFileSync(path.join(paths.web.base, "package.json"), "utf-8")
+    );
+  } catch {
+    fs.rmSync(typeDefPath, { force: true });
+    return [];
+  }
+  if (!packageJson.dependencies?.["@cedarjs/tenancy"] && !packageJson.devDependencies?.["@cedarjs/tenancy"]) {
+    fs.rmSync(typeDefPath, { force: true });
+    return [];
+  }
+  return writeTypeDefIncludeFile("web-tenancy.d.ts.template");
+};
 const generateTypeDefScenarios = () => {
   return writeTypeDefIncludeFile("api-scenarios.d.ts.template");
 };
@@ -397,6 +419,7 @@ export {
   generateTypeDefRouterPages,
   generateTypeDefRouterRoutes,
   generateTypeDefScenarios,
+  generateTypeDefTenancy,
   generateTypeDefTestMocks,
   generateTypeDefs,
   generateViteClientTypesDirective,

package/dist/validateSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validateSchema.d.ts","sourceRoot":"","sources":["../src/validateSchema.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAA4B,MAAM,SAAS,CAAA;AAQrE,eAAO,MAAM,gCAAgC,0EAC4B,CAAA;AAEzE,eAAO,MAAM,0CAA0C,gFACwB,CAAA;AAE/E;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,UAS1B,CAAA;AAED,wBAAgB,cAAc,CAC5B,kBAAkB,EAAE,YAAY,EAChC,YAAY,GAAE,MAAM,EAA0B,QAwI/C;AAED,eAAO,MAAM,mBAAmB,qBAkC/B,CAAA"}
+{"version":3,"file":"validateSchema.d.ts","sourceRoot":"","sources":["../src/validateSchema.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAA4B,MAAM,SAAS,CAAA;AAQrE,eAAO,MAAM,gCAAgC,0EAC4B,CAAA;AAEzE,eAAO,MAAM,0CAA0C,gFACwB,CAAA;AAQ/E;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,UAS1B,CAAA;AAED,wBAAgB,cAAc,CAC5B,kBAAkB,EAAE,YAAY,EAChC,YAAY,GAAE,MAAM,EAA0B,QAwI/C;AAED,eAAO,MAAM,mBAAmB,qBAkC/B,CAAA"}

package/dist/validateSchema.js

@@ -7,6 +7,7 @@ import { getPaths } from "@cedarjs/project-config";
 import { isServerFileSetup, isRealtimeSetup } from "./project.js";
 const DIRECTIVE_REQUIRED_ERROR_MESSAGE = "You must specify one of @requireAuth, @skipAuth or a custom directive";
 const DIRECTIVE_INVALID_ROLE_TYPES_ERROR_MESSAGE = "Please check that the requireAuth roles is a string or an array of strings.";
+const ROLES_DIRECTIVES = ["requireAuth", "requireOrgAuth", "requireUserAuth"];
 const RESERVED_TYPES = [
   "Int",
   "Float",
@@ -62,7 +63,7 @@ function validateSchema(schemaDocumentNode, typesToCheck = ["Query", "Mutation"]
               validationOutput.push(`${fieldName} ${fieldTypeName}`);
             }
             field.directives?.forEach((directive) => {
-              if (directive.name.value === "requireAuth") {
+              if (ROLES_DIRECTIVES.includes(directive.name.value)) {
                 directive.arguments?.forEach((arg) => {
                   if (arg.name.value === "roles") {
                     if (arg.value.kind !== Kind.STRING && arg.value.kind !== Kind.LIST) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/internal",
-  "version": "8.0.0-canary.3538",
+  "version": "8.0.0-canary.3539",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -120,14 +120,14 @@
     "@babel/core": "^7.26.10",
     "@babel/parser": "7.29.11",
     "@babel/traverse": "7.29.10",
-    "@cedarjs/api": "8.0.0-canary.3538",
-    "@cedarjs/babel-config": "8.0.0-canary.3538",
-    "@cedarjs/cli-helpers": "8.0.0-canary.3538",
-    "@cedarjs/graphql-server": "8.0.0-canary.3538",
-    "@cedarjs/project-config": "8.0.0-canary.3538",
-    "@cedarjs/router": "8.0.0-canary.3538",
-    "@cedarjs/structure": "8.0.0-canary.3538",
-    "@cedarjs/utils": "8.0.0-canary.3538",
+    "@cedarjs/api": "8.0.0-canary.3539",
+    "@cedarjs/babel-config": "8.0.0-canary.3539",
+    "@cedarjs/cli-helpers": "8.0.0-canary.3539",
+    "@cedarjs/graphql-server": "8.0.0-canary.3539",
+    "@cedarjs/project-config": "8.0.0-canary.3539",
+    "@cedarjs/router": "8.0.0-canary.3539",
+    "@cedarjs/structure": "8.0.0-canary.3539",
+    "@cedarjs/utils": "8.0.0-canary.3539",
     "@graphql-codegen/add": "6.0.1",
     "@graphql-codegen/cli": "6.3.1",
     "@graphql-codegen/client-preset": "5.3.0",
@@ -165,7 +165,7 @@
     "vite-tsconfig-paths": "6.1.1"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "8.0.0-canary.3538",
+    "@cedarjs/framework-tools": "8.0.0-canary.3539",
     "@jridgewell/trace-mapping": "0.3.31",
     "@oxc-project/types": "^0.155.0",
     "concurrently": "9.2.5",