@cedarjs/internal 8.0.0-canary.3567 → 8.0.0-canary.3568

package/dist/generate/gqlormSchema.d.ts

@@ -30,13 +30,6 @@ export interface GqlormBackendConfig {
     membershipUserField: string;
     membershipOrganizationField: string;
     membershipModelExists: boolean;
-    /**
-     * Whether `cedar setup tenancy` replaced `@requireAuth` with
-     * `@requireUserAuth` and `@requirePermission`. 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;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"}
+{"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"}

package/dist/generate/gqlormSchema.js

@@ -477,7 +477,6 @@ 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(
@@ -488,7 +487,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 ? requireAuthDirective : "@skipAuth";
+    const authDirective = needsAuth ? "@requireAuth" : "@skipAuth";
     lines.push(
       `    ${model.pluralName}: [${model.modelName}!]! ${authDirective}`
     );
@@ -512,7 +511,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 ? requireAuthDirective : "@skipAuth";
+      const authDirective = needsAuth ? "@requireAuth" : "@skipAuth";
       const idNullMark = model.idField.isRequired ? "!" : "";
       lines.push(
         `    create${model.modelName}(input: Create${model.modelName}Input!): ${model.modelName}! ${authDirective}`
@@ -975,10 +974,7 @@ async function generateGqlormArtifacts() {
       membershipModelCamel,
       membershipUserField,
       membershipOrganizationField,
-      membershipModelExists,
-      tenancyAuthDirectives: fs.existsSync(
-        path.join(getPaths().api.directives, "requireUserAuth")
-      )
+      membershipModelExists
     };
     const gqlormModels = allModels.filter(
       (m) => !existingTypes.has(m.modelName)

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

@@ -1,9 +1,7 @@
 import '@cedarjs/auth'
 
-// This app has tenancy, so every check says which kind it is:
-// useAuth().hasUserRole for currentUser.roles, and useAuth().hasPermission or
-// <PrivateSet orgPermission> for what the user may do in the organization.
-// No useAuth().hasRole or <PrivateSet roles>.
+// This app has tenancy, so the Router takes tenancy, and <PrivateSet> takes
+// orgPermission for what the user may do in the organization
 declare module '@cedarjs/auth' {
   interface AuthTenancy {
     enabled: true

package/dist/generate/typeDefinitions.d.ts

@@ -34,8 +34,8 @@ export declare const generateTypeDefPermissions: () => string[];
 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.
+ * on `@cedarjs/tenancy` (`cedar setup tenancy` adds it), which gives the
+ * Router `tenancy` and `<PrivateSet>` `orgPermission` in the app's types.
  * None otherwise, and a stale file goes.
  */
 export declare const generateTypeDefTenancy: () => string[];

package/dist/routes.d.ts

@@ -29,7 +29,6 @@ export interface RWRouteManifestItem {
     unauthenticated: string | null;
     roles: string | string[] | null;
     unauthorized?: string | null;
-    userRoles?: string | string[] | null;
     orgPermission?: string | null;
     pageIdentifier: string | null;
 }

package/dist/routes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../src/routes.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,gBAAgB,EAAE,CAyBvD;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,WAgBxC;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAA;IACZ,cAAc,EAAE,MAAM,CAAA;IACtB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAA;IAC/B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;IACzB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB,SAAS,EAAE,OAAO,CAAA;IAClB,gBAAgB,EAAE,MAAM,CAAA;IACxB,QAAQ,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAA;IACnD,SAAS,EAAE,OAAO,CAAA;IAClB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAAA;IAC/B,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC5B,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAAA;IACpC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC7B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;CAE9B;AAED,MAAM,WAAW,SAAU,SAAQ,mBAAmB;IACpD,EAAE,EAAE,MAAM,CAAA;IACV,UAAU,EAAE,OAAO,CAAA;IACnB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,SAAS,EAAE,OAAO,CAAA;IAClB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,gBAAgB,EAAE,MAAM,CAAA;CACzB;AAED,eAAO,MAAM,gBAAgB,QAAO,SAAS,EAsC5C,CAAA"}
+{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../src/routes.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,gBAAgB,EAAE,CAyBvD;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,WAgBxC;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAA;IACZ,cAAc,EAAE,MAAM,CAAA;IACtB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAA;IAC/B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;IACzB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB,SAAS,EAAE,OAAO,CAAA;IAClB,gBAAgB,EAAE,MAAM,CAAA;IACxB,QAAQ,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAA;IACnD,SAAS,EAAE,OAAO,CAAA;IAClB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAAA;IAC/B,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC5B,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC7B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;CAE9B;AAED,MAAM,WAAW,SAAU,SAAQ,mBAAmB;IACpD,EAAE,EAAE,MAAM,CAAA;IACV,UAAU,EAAE,OAAO,CAAA;IACnB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,SAAS,EAAE,OAAO,CAAA;IAClB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,gBAAgB,EAAE,MAAM,CAAA;CACzB;AAED,eAAO,MAAM,gBAAgB,QAAO,SAAS,EAqC5C,CAAA"}

package/dist/routes.js

@@ -65,7 +65,6 @@ const getProjectRoutes = () => {
       unauthenticated: route.unauthenticated,
       roles: route.roles,
       unauthorized: route.unauthorized,
-      userRoles: route.userRoles,
       orgPermission: route.orgPermission,
       pageIdentifier: route.page_identifier_str
     };

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;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"}
+{"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"}

package/dist/validateSchema.js

@@ -7,7 +7,6 @@ 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", "requireUserAuth"];
 const RESERVED_TYPES = [
   "Int",
   "Float",
@@ -63,7 +62,7 @@ function validateSchema(schemaDocumentNode, typesToCheck = ["Query", "Mutation"]
               validationOutput.push(`${fieldName} ${fieldTypeName}`);
             }
             field.directives?.forEach((directive) => {
-              if (ROLES_DIRECTIVES.includes(directive.name.value)) {
+              if (directive.name.value === "requireAuth") {
                 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.3567",
+  "version": "8.0.0-canary.3568",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -126,14 +126,14 @@
     "@babel/core": "^7.26.10",
     "@babel/parser": "7.29.11",
     "@babel/traverse": "7.29.10",
-    "@cedarjs/api": "8.0.0-canary.3567",
-    "@cedarjs/babel-config": "8.0.0-canary.3567",
-    "@cedarjs/cli-helpers": "8.0.0-canary.3567",
-    "@cedarjs/graphql-server": "8.0.0-canary.3567",
-    "@cedarjs/project-config": "8.0.0-canary.3567",
-    "@cedarjs/router": "8.0.0-canary.3567",
-    "@cedarjs/structure": "8.0.0-canary.3567",
-    "@cedarjs/utils": "8.0.0-canary.3567",
+    "@cedarjs/api": "8.0.0-canary.3568",
+    "@cedarjs/babel-config": "8.0.0-canary.3568",
+    "@cedarjs/cli-helpers": "8.0.0-canary.3568",
+    "@cedarjs/graphql-server": "8.0.0-canary.3568",
+    "@cedarjs/project-config": "8.0.0-canary.3568",
+    "@cedarjs/router": "8.0.0-canary.3568",
+    "@cedarjs/structure": "8.0.0-canary.3568",
+    "@cedarjs/utils": "8.0.0-canary.3568",
     "@graphql-codegen/add": "6.0.1",
     "@graphql-codegen/cli": "6.3.1",
     "@graphql-codegen/client-preset": "5.3.0",
@@ -171,7 +171,7 @@
     "vite-tsconfig-paths": "6.1.1"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "8.0.0-canary.3567",
+    "@cedarjs/framework-tools": "8.0.0-canary.3568",
     "@jridgewell/trace-mapping": "0.3.31",
     "@oxc-project/types": "^0.155.0",
     "concurrently": "9.2.5",