@cedarjs/internal 4.2.1-next.0 → 4.2.1-next.269

package/dist/generate/gqlormSchema.js

@@ -268,7 +268,9 @@ function buildBackendModelInfo(dmmf) {
         name: field.name,
         graphqlType: mapDmmfTypeToGraphql(field.type, field.kind),
         isRequired: field.isRequired,
-        isId: field.isId
+        isId: field.isId,
+        hasDefaultValue: field.hasDefaultValue,
+        isUpdatedAt: field.isUpdatedAt ?? false
       });
     }
     if (fields.length > 0) {
@@ -383,6 +385,46 @@ function generateGqlormBackendContent(models, config = DEFAULT_GQLORM_BACKEND_CO
       lines.push("      where: Record<string, unknown>");
       lines.push("    }): Promise<Record<string, unknown> | null>");
     }
+    lines.push("    create(args: {");
+    lines.push("      data: Record<string, unknown>");
+    lines.push(`      select: { ${selectType} }`);
+    lines.push("    }): Promise<{");
+    for (const field of model.fields) {
+      const tsType = graphqlTypeToTsInterfaceType(
+        field.graphqlType,
+        field.isRequired
+      );
+      lines.push(`      ${field.name}: ${tsType}`);
+    }
+    lines.push("    }>");
+    if (model.idField) {
+      const idTsType = graphqlTypeToTsType(model.idField.graphqlType);
+      lines.push("    update(args: {");
+      lines.push(`      where: { ${model.idField.name}: ${idTsType} }`);
+      lines.push("      data: Record<string, unknown>");
+      lines.push(`      select: { ${selectType} }`);
+      lines.push("    }): Promise<{");
+      for (const field of model.fields) {
+        const tsType = graphqlTypeToTsInterfaceType(
+          field.graphqlType,
+          field.isRequired
+        );
+        lines.push(`      ${field.name}: ${tsType}`);
+      }
+      lines.push("    }>");
+      lines.push("    delete(args: {");
+      lines.push(`      where: { ${model.idField.name}: ${idTsType} }`);
+      lines.push(`      select: { ${selectType} }`);
+      lines.push("    }): Promise<{");
+      for (const field of model.fields) {
+        const tsType = graphqlTypeToTsInterfaceType(
+          field.graphqlType,
+          field.isRequired
+        );
+        lines.push(`      ${field.name}: ${tsType}`);
+      }
+      lines.push("    }>");
+    }
     lines.push("  }");
   }
   const membershipAlreadyInModels = models.some(
@@ -414,6 +456,26 @@ function generateGqlormBackendContent(models, config = DEFAULT_GQLORM_BACKEND_CO
     }
     lines.push("  }");
     lines.push("");
+    if (!model.idField) {
+      continue;
+    }
+    const writableFields = model.fields.filter(
+      (field) => !field.isId && !field.isUpdatedAt && field.name !== config.membershipUserField
+    );
+    lines.push(`  input Create${model.modelName}Input {`);
+    for (const field of writableFields) {
+      const isClientRequired = field.isRequired && !field.hasDefaultValue;
+      const nullMark = isClientRequired ? "!" : "";
+      lines.push(`    ${field.name}: ${field.graphqlType}${nullMark}`);
+    }
+    lines.push("  }");
+    lines.push("");
+    lines.push(`  input Update${model.modelName}Input {`);
+    for (const field of writableFields) {
+      lines.push(`    ${field.name}: ${field.graphqlType}`);
+    }
+    lines.push("  }");
+    lines.push("");
   }
   lines.push("  type Query {");
   for (const model of models) {
@@ -437,6 +499,32 @@ function generateGqlormBackendContent(models, config = DEFAULT_GQLORM_BACKEND_CO
     }
   }
   lines.push("  }");
+  lines.push("");
+  lines.push("  type Mutation {");
+  for (const model of models) {
+    if (model.idField) {
+      const hasUserField = model.fields.some(
+        (f) => f.name === config.membershipUserField
+      );
+      const hasOrgField = model.fields.some(
+        (f) => f.name === config.membershipOrganizationField
+      );
+      const isMembershipModel = model.camelName === config.membershipModelCamel;
+      const needsAuth = hasUserField || hasOrgField && config.membershipModelExists && !isMembershipModel;
+      const authDirective = needsAuth ? "@requireAuth" : "@skipAuth";
+      const idNullMark = model.idField.isRequired ? "!" : "";
+      lines.push(
+        `    create${model.modelName}(input: Create${model.modelName}Input!): ${model.modelName}! ${authDirective}`
+      );
+      lines.push(
+        `    update${model.modelName}(${model.idField.name}: ${model.idField.graphqlType}${idNullMark}, input: Update${model.modelName}Input!): ${model.modelName}! ${authDirective}`
+      );
+      lines.push(
+        `    delete${model.modelName}(${model.idField.name}: ${model.idField.graphqlType}${idNullMark}): ${model.modelName}! ${authDirective}`
+      );
+    }
+  }
+  lines.push("  }");
   lines.push("`");
   lines.push("");
   lines.push(
@@ -585,6 +673,242 @@ function generateGqlormBackendContent(models, config = DEFAULT_GQLORM_BACKEND_CO
     }
   }
   lines.push("    },");
+  lines.push("    Mutation: {");
+  for (const model of models) {
+    if (!model.idField) {
+      continue;
+    }
+    const selectObj = model.fields.map((f) => `${f.name}: true`).join(", ");
+    const hasUserField = model.fields.some(
+      (f) => f.name === config.membershipUserField
+    );
+    const hasOrgField = model.fields.some(
+      (f) => f.name === config.membershipOrganizationField
+    );
+    const isMembershipModel = model.camelName === config.membershipModelCamel;
+    const useOrgScoping = hasOrgField && config.membershipModelExists && !isMembershipModel;
+    const idFieldName = model.idField.name;
+    const idTsType = graphqlTypeToTsType(model.idField.graphqlType);
+    lines.push(
+      `      create${model.modelName}: async (_root: unknown, { input }: { input: Record<string, unknown> }, ${hasUserField || useOrgScoping ? "context" : "_context"}: GqlormContext) => {`
+    );
+    if (hasUserField || useOrgScoping) {
+      lines.push("        if (!context.currentUser) {");
+      lines.push(
+        `          throw new AuthenticationError("You don't have permission to do that.")`
+      );
+      lines.push("        }");
+      lines.push("        const currentUserId = context.currentUser['id']");
+      lines.push(
+        "        if (currentUserId === undefined || currentUserId === null) {"
+      );
+      lines.push(
+        `          throw new AuthenticationError("Could not determine the current user's ID.")`
+      );
+      lines.push("        }");
+    }
+    lines.push("        const data: Record<string, unknown> = { ...input }");
+    if (hasUserField) {
+      lines.push(
+        `        data['${config.membershipUserField}'] = currentUserId`
+      );
+    }
+    if (useOrgScoping) {
+      lines.push(
+        `        const organizationId = data['${config.membershipOrganizationField}']`
+      );
+      lines.push(
+        "        if (organizationId === undefined || organizationId === null) {"
+      );
+      lines.push(
+        `          throw new ForbiddenError('Organization membership is required for this operation')`
+      );
+      lines.push("        }");
+      lines.push(
+        `        const membership = await db.${config.membershipModelCamel}.findFirst({`
+      );
+      lines.push("          where: {");
+      lines.push(`            ${config.membershipUserField}: currentUserId,`);
+      lines.push(
+        `            ${config.membershipOrganizationField}: organizationId,`
+      );
+      lines.push("          },");
+      lines.push("        })");
+      lines.push("        if (!membership) {");
+      lines.push(
+        `          throw new ForbiddenError('Not authorized to access this resource')`
+      );
+      lines.push("        }");
+    }
+    lines.push(`        return db.${model.camelName}.create({`);
+    lines.push("          data,");
+    lines.push(`          select: { ${selectObj} },`);
+    lines.push("        })");
+    lines.push("      },");
+    lines.push(
+      `      update${model.modelName}: async (_root: unknown, { ${idFieldName}, input }: { ${idFieldName}: ${idTsType}; input: Record<string, unknown> }, ${hasUserField || useOrgScoping ? "context" : "_context"}: GqlormContext) => {`
+    );
+    if (hasUserField || useOrgScoping) {
+      lines.push("        if (!context.currentUser) {");
+      lines.push(
+        `          throw new AuthenticationError("You don't have permission to do that.")`
+      );
+      lines.push("        }");
+      lines.push("        const currentUserId = context.currentUser['id']");
+      lines.push(
+        "        if (currentUserId === undefined || currentUserId === null) {"
+      );
+      lines.push(
+        `          throw new AuthenticationError("Could not determine the current user's ID.")`
+      );
+      lines.push("        }");
+      lines.push(
+        `        const existingRecord = await db.${model.camelName}.findUnique({`
+      );
+      lines.push(`          where: { ${idFieldName} },`);
+      lines.push(`          select: { ${selectObj} },`);
+      lines.push("        })");
+      lines.push("        if (!existingRecord) {");
+      lines.push(
+        `          throw new ForbiddenError('Not authorized to access this resource')`
+      );
+      lines.push("        }");
+      lines.push("        const data: Record<string, unknown> = { ...input }");
+      if (hasUserField) {
+        lines.push(
+          `        if (existingRecord.${config.membershipUserField} !== currentUserId) {`
+        );
+        lines.push(
+          `          throw new ForbiddenError('Not authorized to access this resource')`
+        );
+        lines.push("        }");
+        lines.push(`        delete data['${config.membershipUserField}']`);
+      }
+      if (useOrgScoping) {
+        lines.push(
+          `        const currentOrganizationId = existingRecord.${config.membershipOrganizationField}`
+        );
+        lines.push(
+          `        const currentOrganizationMembership = await db.${config.membershipModelCamel}.findFirst({`
+        );
+        lines.push("          where: {");
+        lines.push(`            ${config.membershipUserField}: currentUserId,`);
+        lines.push(
+          `            ${config.membershipOrganizationField}: currentOrganizationId,`
+        );
+        lines.push("          },");
+        lines.push("        })");
+        lines.push("        if (!currentOrganizationMembership) {");
+        lines.push(
+          `          throw new ForbiddenError('Not authorized to access this resource')`
+        );
+        lines.push("        }");
+        lines.push(
+          `        const requestedOrganizationId = input['${config.membershipOrganizationField}'] ?? currentOrganizationId`
+        );
+        lines.push(
+          `        const requestedOrganizationMembership = await db.${config.membershipModelCamel}.findFirst({`
+        );
+        lines.push("          where: {");
+        lines.push(`            ${config.membershipUserField}: currentUserId,`);
+        lines.push(
+          `            ${config.membershipOrganizationField}: requestedOrganizationId,`
+        );
+        lines.push("          },");
+        lines.push("        })");
+        lines.push("        if (!requestedOrganizationMembership) {");
+        lines.push(
+          `          throw new ForbiddenError('Not authorized to access this resource')`
+        );
+        lines.push("        }");
+      }
+    }
+    if (!(hasUserField || useOrgScoping)) {
+      lines.push(
+        `        const existingRecord = await db.${model.camelName}.findUnique({`
+      );
+      lines.push(`          where: { ${idFieldName} },`);
+      lines.push(`          select: { ${selectObj} },`);
+      lines.push("        })");
+      lines.push("        if (!existingRecord) {");
+      lines.push(
+        `          throw new ForbiddenError('Not authorized to access this resource')`
+      );
+      lines.push("        }");
+      lines.push("        const data: Record<string, unknown> = { ...input }");
+    }
+    lines.push(`        return db.${model.camelName}.update({`);
+    lines.push(`          where: { ${idFieldName} },`);
+    lines.push("          data,");
+    lines.push(`          select: { ${selectObj} },`);
+    lines.push("        })");
+    lines.push("      },");
+    lines.push(
+      `      delete${model.modelName}: async (_root: unknown, { ${idFieldName} }: { ${idFieldName}: ${idTsType} }, ${hasUserField || useOrgScoping ? "context" : "_context"}: GqlormContext) => {`
+    );
+    lines.push(
+      `        const existingRecord = await db.${model.camelName}.findUnique({`
+    );
+    lines.push(`          where: { ${idFieldName} },`);
+    lines.push(`          select: { ${selectObj} },`);
+    lines.push("        })");
+    lines.push("        if (!existingRecord) {");
+    lines.push(
+      `          throw new ForbiddenError('Not authorized to access this resource')`
+    );
+    lines.push("        }");
+    if (hasUserField || useOrgScoping) {
+      lines.push("        if (!context.currentUser) {");
+      lines.push(
+        `          throw new AuthenticationError("You don't have permission to do that.")`
+      );
+      lines.push("        }");
+      lines.push("        const currentUserId = context.currentUser['id']");
+      lines.push(
+        "        if (currentUserId === undefined || currentUserId === null) {"
+      );
+      lines.push(
+        `          throw new AuthenticationError("Could not determine the current user's ID.")`
+      );
+      lines.push("        }");
+      if (hasUserField) {
+        lines.push(
+          `        if (existingRecord.${config.membershipUserField} !== currentUserId) {`
+        );
+        lines.push(
+          `          throw new ForbiddenError('Not authorized to access this resource')`
+        );
+        lines.push("        }");
+      }
+      if (useOrgScoping) {
+        lines.push(
+          `        const membership = await db.${config.membershipModelCamel}.findFirst({`
+        );
+        lines.push("          where: {");
+        lines.push(`            ${config.membershipUserField}: currentUserId,`);
+        lines.push(
+          `            ${config.membershipOrganizationField}: existingRecord.${config.membershipOrganizationField},`
+        );
+        lines.push("          },");
+        lines.push("        })");
+        lines.push("        if (!membership) {");
+        lines.push(
+          `          throw new ForbiddenError('Not authorized to access this resource')`
+        );
+        lines.push("        }");
+      }
+    }
+    lines.push(`        return db.${model.camelName}.delete({`);
+    lines.push(`          where: { ${idFieldName} },`);
+    lines.push(`          select: { ${selectObj} },`);
+    lines.push("        })");
+    lines.push("      },");
+    lines.push("");
+  }
+  while (lines[lines.length - 1] === "") {
+    lines.pop();
+  }
+  lines.push("    },");
   lines.push("  }");
   lines.push("}");
   lines.push("");

package/dist/generate/plugins/rw-typescript-resolvers/visitor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"visitor.d.ts","sourceRoot":"","sources":["../../../../src/generate/plugins/rw-typescript-resolvers/visitor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,uCAAuC,CAAA;AAC5F,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAA;AAElF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAA;AACnF,OAAO,KAAK,EACV,mBAAmB,EACnB,aAAa,EACb,wBAAwB,EACzB,MAAM,SAAS,CAAA;AAEhB,qBAAa,4BAA6B,SAAQ,0BAA0B;gBAExE,YAAY,EAAE,+BAA+B,EAC7C,MAAM,EAAE,aAAa;IAMvB,eAAe,CACb,IAAI,EAAE,mBAAmB,EACzB,GAAG,EAAE,MAAM,GAAG,MAAM,EACpB,MAAM,EAAE,GAAG,GACV,qBAAqB;IAgCxB,oBAAoB,CAAC,IAAI,EAAE,wBAAwB,GAAG,MAAM,GAAG,IAAI;CA6FpE"}
+{"version":3,"file":"visitor.d.ts","sourceRoot":"","sources":["../../../../src/generate/plugins/rw-typescript-resolvers/visitor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,uCAAuC,CAAA;AAC5F,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAA;AAElF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAA;AACnF,OAAO,KAAK,EACV,mBAAmB,EACnB,aAAa,EACb,wBAAwB,EACzB,MAAM,SAAS,CAAA;AAEhB,qBAAa,4BAA6B,SAAQ,0BAA0B;gBAExE,YAAY,EAAE,+BAA+B,EAC7C,MAAM,EAAE,aAAa;IAMvB,eAAe,CACb,IAAI,EAAE,mBAAmB,EACzB,GAAG,EAAE,MAAM,GAAG,MAAM,EACpB,MAAM,EAAE,GAAG,GACV,qBAAqB;IAgCxB,oBAAoB,CAAC,IAAI,EAAE,wBAAwB,GAAG,MAAM,GAAG,IAAI;CA6FpE"}

package/dist/generate/typeDefinitions.js

@@ -280,9 +280,9 @@ const generateTypeDefGlobalContext = () => {
 };
 const generateViteClientTypesDirective = () => {
   const viteClientDirective = `/// <reference types="vite/client" />`;
-  const redwoodProjectPaths = getPaths();
+  const cedarProjectPaths = getPaths();
   const viteClientDirectivePath = path.join(
-    redwoodProjectPaths.generated.types.includes,
+    cedarProjectPaths.generated.types.includes,
     "web-vite-client.d.ts"
   );
   fs.writeFileSync(viteClientDirectivePath, viteClientDirective);
@@ -294,12 +294,9 @@ function generateStubStorybookTypes() {
   export type StoryObj<T = any> = any
 }
 `;
-  const redwoodProjectPaths = getPaths();
+  const cedarProjectPaths = getPaths();
   const packageJson = JSON.parse(
-    fs.readFileSync(
-      path.join(redwoodProjectPaths.base, "package.json"),
-      "utf-8"
-    )
+    fs.readFileSync(path.join(cedarProjectPaths.base, "package.json"), "utf-8")
   );
   const hasCliStorybookVite = Object.keys(
     packageJson["devDependencies"]
@@ -308,7 +305,7 @@ function generateStubStorybookTypes() {
     return [];
   }
   const stubStorybookTypesFilePath = path.join(
-    redwoodProjectPaths.generated.types.includes,
+    cedarProjectPaths.generated.types.includes,
     "web-storybook.d.ts"
   );
   fs.writeFileSync(stubStorybookTypesFilePath, stubStorybookTypesFileContent);

package/dist/validateSchema.js

@@ -52,11 +52,11 @@ function validateSchema(schemaDocumentNode, typesToCheck = ["Query", "Mutation"]
         for (const field of typeNode.fields || []) {
           const fieldName = field.name.value;
           const fieldTypeName = typeNode.name.value;
-          const isRedwoodQuery = fieldName === "redwood" && fieldTypeName === "Query";
+          const isLegacyRedwoodQuery = fieldName === "redwood" && fieldTypeName === "Query";
           const isCedarQuery = fieldName === "cedar" && fieldTypeName === "Query" || // TODO: Remove this when I remove the root schema
           fieldName === "cedarjs" && fieldTypeName === "Query";
           const isCurrentUserQuery = fieldName === "currentUser" && fieldTypeName === "Query";
-          if (!(isRedwoodQuery || isCedarQuery || isCurrentUserQuery)) {
+          if (!(isCedarQuery || isCurrentUserQuery || isLegacyRedwoodQuery)) {
             const hasDirective = field.directives?.length;
             if (!hasDirective) {
               validationOutput.push(`${fieldName} ${fieldTypeName}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/internal",
-  "version": "4.2.1-next.0",
+  "version": "4.2.1-next.269",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -140,13 +140,13 @@
     "dist"
   ],
   "scripts": {
-    "build": "tsx ./build.mts",
+    "build": "node ./build.mts",
     "build:clean-dist": "rimraf 'dist/**/*/__tests__' --glob",
     "build:pack": "yarn pack -o cedarjs-internal.tgz",
     "build:types": "tsc --build --verbose ./tsconfig.build.json",
     "build:types-cjs": "tsc --build --verbose ./tsconfig.cjs.json",
     "build:watch": "nodemon --watch src --ext \"js,jsx,ts,tsx\" --ignore dist --exec \"yarn build\"",
-    "check:attw": "yarn attw -P",
+    "check:attw": "yarn cedar-fwtools-attw",
     "check:package": "concurrently npm:check:attw yarn:publint",
     "fix:permissions": "chmod +x dist/generate/generate.js dist/generate/watch.js",
     "prepublishOnly": "NODE_ENV=production yarn build",
@@ -155,10 +155,10 @@
   },
   "dependencies": {
     "@babel/core": "^7.26.10",
-    "@babel/parser": "7.29.3",
-    "@babel/plugin-transform-react-jsx": "7.28.6",
+    "@babel/parser": "7.29.7",
+    "@babel/plugin-transform-react-jsx": "7.29.7",
     "@babel/plugin-transform-typescript": "^7.26.8",
-    "@babel/traverse": "7.29.0",
+    "@babel/traverse": "7.29.7",
     "@cedarjs/babel-config": "4.2.0",
     "@cedarjs/cli-helpers": "4.2.0",
     "@cedarjs/graphql-server": "4.2.0",
@@ -171,40 +171,46 @@
     "@graphql-codegen/client-preset": "5.3.0",
     "@graphql-codegen/core": "5.0.2",
     "@graphql-codegen/fragment-matcher": "6.0.1",
+    "@graphql-codegen/plugin-helpers": "6.3.0",
     "@graphql-codegen/schema-ast": "5.0.2",
     "@graphql-codegen/typed-document-node": "6.1.8",
     "@graphql-codegen/typescript": "5.0.10",
     "@graphql-codegen/typescript-operations": "5.1.0",
     "@graphql-codegen/typescript-react-apollo": "4.4.2",
     "@graphql-codegen/typescript-resolvers": "5.1.8",
+    "@graphql-codegen/visitor-plugin-common": "6.3.0",
+    "@graphql-tools/code-file-loader": "8.1.29",
     "@graphql-tools/documents": "1.0.1",
+    "@graphql-tools/graphql-file-loader": "8.1.12",
+    "@graphql-tools/load": "8.1.8",
+    "@graphql-tools/merge": "9.1.9",
     "@prisma/dmmf": "7.8.0",
     "@prisma/internals": "7.8.0",
     "@sdl-codegen/node": "2.0.1",
     "ansis": "4.2.0",
     "deepmerge": "4.3.1",
     "esbuild": "0.27.7",
+    "execa": "5.1.1",
     "fast-glob": "3.3.3",
-    "graphql": "16.13.2",
+    "graphql": "16.14.2",
     "kill-port": "1.6.1",
-    "prettier": "3.8.3",
+    "prettier": "3.8.4",
     "rimraf": "6.1.3",
     "source-map": "0.7.6",
     "string-env-interpolation": "1.0.1",
-    "systeminformation": "5.31.5",
+    "systeminformation": "5.31.7",
     "termi-link": "1.1.0",
     "ts-node": "10.9.2",
     "typescript": "5.9.3",
-    "vite": "7.3.2"
+    "vite": "7.3.5"
   },
   "devDependencies": {
-    "@arethetypeswrong/cli": "0.18.2",
+    "@arethetypeswrong/cli": "0.18.4",
     "@cedarjs/framework-tools": "4.2.0",
     "concurrently": "9.2.1",
     "graphql-tag": "2.12.6",
-    "publint": "0.3.20",
-    "tsx": "4.21.0",
-    "vitest": "3.2.4"
+    "publint": "0.3.21",
+    "vitest": "3.2.6"
   },
   "engines": {
     "node": ">=24"