@cedarjs/internal 8.0.0-canary.3582 → 8.0.0-canary.3587

package/dist/generate/typeDefinitions.js

@@ -129,7 +129,7 @@ const generateMirrorCell = (p, rwjsPaths = getPaths()) => {
   const cellQuery = getCellGqlQuery(fileContents);
   const cellFragment = hasQuery ? void 0 : getCellGqlFragment(fileContents);
   const cellFragmentName = cellFragment ? parseGqlFragmentName(cellFragment) : void 0;
-  const cellFragmentPropName = cellFragment ? parseGqlFragmentPropName(cellFragment) : void 0;
+  const cellFragmentPropName = cellFragment ? parseGqlFragmentPropName(cellFragment, name) : void 0;
   let typeDefContents;
   if (cellQuery) {
     const gqlDoc = parseGqlQueryToAst(cellQuery)[0];

package/dist/gql.d.ts

@@ -11,8 +11,8 @@ export declare const parseGqlQueryToAst: (gqlQuery: string) => Operation[];
 export declare const parseDocumentAST: (document: DocumentNode) => Operation[];
 /**
  * Returns the name of the first fragment definition in the given GraphQL
- * source, e.g. `AuthorCell_author` for
- * `fragment AuthorCell_author on User { fullName }`
+ * source, e.g. `AuthorCellFragment` for
+ * `fragment AuthorCellFragment on User { fullName }`
  */
 export declare const parseGqlFragmentName: (gqlFragment: string) => string | undefined;
 /**
@@ -20,15 +20,25 @@ export declare const parseGqlFragmentName: (gqlFragment: string) => string | und
  * parent Cell passes the fragment data in with, and the prop `Success`
  * receives the data as.
  *
- * For a fragment named with an underscore, like `AuthorCell_author`, the part
- * after the last underscore is used (`author`). Otherwise the type the
- * fragment is defined on is used, camelCased (`on User` -> `user`).
+ * The first of these rules that applies picks the name:
+ *
+ * 1. For a fragment named with an underscore, like `AuthorCell_author`, the
+ *    part after the last underscore is used (`author`).
+ * 2. For a fragment named after the Cell, followed by `Fragment` and a
+ *    PascalCased prop name, like `PostCellFragmentAuthor` in `PostCell`, the
+ *    camelCased prop name is used (`author`).
+ * 3. Otherwise the type the fragment is defined on is used, camelCased
+ *    (`fragment AuthorCellFragment on User` -> `user`).
+ *
+ * `cellName` is the Cell's file name without the extension, like
+ * `PostCell`. It's the same name the Cell transforms pass to `createCell` as
+ * `displayName`.
  *
  * Keep this in sync with getFragmentPropName in
  * packages/web/src/components/cell/createFragmentCell.tsx, which is what the
  * fragment Cell runtime uses.
  */
-export declare const parseGqlFragmentPropName: (gqlFragment: string) => string | undefined;
+export declare const parseGqlFragmentPropName: (gqlFragment: string, cellName: string) => string | undefined;
 export declare const listQueryTypeFieldsInProject: () => Promise<string[]>;
 export {};
 //# sourceMappingURL=gql.d.ts.map

package/dist/gql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gql.d.ts","sourceRoot":"","sources":["../src/gql.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,YAAY,EAKZ,iBAAiB,EAClB,MAAM,SAAS,CAAA;AAMhB,UAAU,SAAS;IACjB,SAAS,EAAE,iBAAiB,CAAA;IAC5B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAA;IACxB,MAAM,EAAE,CAAC,MAAM,GAAG,KAAK,CAAC,EAAE,CAAA;CAC3B;AAED,UAAU,KAAK;IACb,MAAM,EAAE,CAAC,MAAM,GAAG,KAAK,CAAC,EAAE,CAAA;CAC3B;AAED,eAAO,MAAM,kBAAkB,GAAI,UAAU,MAAM,gBAGlD,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAI,UAAU,YAAY,gBAoBtD,CAAA;AAyCD;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,GAAI,aAAa,MAAM,uBAEvD,CAAA;AAED;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,wBAAwB,GAAI,aAAa,MAAM,uBAiB3D,CAAA;AAED,eAAO,MAAM,4BAA4B,yBA8BxC,CAAA"}
+{"version":3,"file":"gql.d.ts","sourceRoot":"","sources":["../src/gql.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,YAAY,EAKZ,iBAAiB,EAClB,MAAM,SAAS,CAAA;AAMhB,UAAU,SAAS;IACjB,SAAS,EAAE,iBAAiB,CAAA;IAC5B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAA;IACxB,MAAM,EAAE,CAAC,MAAM,GAAG,KAAK,CAAC,EAAE,CAAA;CAC3B;AAED,UAAU,KAAK;IACb,MAAM,EAAE,CAAC,MAAM,GAAG,KAAK,CAAC,EAAE,CAAA;CAC3B;AAED,eAAO,MAAM,kBAAkB,GAAI,UAAU,MAAM,gBAGlD,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAI,UAAU,YAAY,gBAoBtD,CAAA;AAyCD;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,GAAI,aAAa,MAAM,uBAEvD,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,eAAO,MAAM,wBAAwB,GACnC,aAAa,MAAM,EACnB,UAAU,MAAM,uBAkCjB,CAAA;AAED,eAAO,MAAM,4BAA4B,yBA8BxC,CAAA"}

package/dist/gql.js

@@ -57,7 +57,7 @@ const parseGqlFragmentDefinition = (gqlFragment) => {
 const parseGqlFragmentName = (gqlFragment) => {
   return parseGqlFragmentDefinition(gqlFragment)?.name.value;
 };
-const parseGqlFragmentPropName = (gqlFragment) => {
+const parseGqlFragmentPropName = (gqlFragment, cellName) => {
   const fragmentDefinition = parseGqlFragmentDefinition(gqlFragment);
   if (!fragmentDefinition) {
     return void 0;
@@ -67,6 +67,11 @@ const parseGqlFragmentPropName = (gqlFragment) => {
   if (underscoreIndex > 0 && underscoreIndex < fragmentName.length - 1) {
     return fragmentName.slice(underscoreIndex + 1);
   }
+  const cellFragmentPrefix = cellName + "Fragment";
+  const propNameSuffix = fragmentName.slice(cellFragmentPrefix.length);
+  if (fragmentName.startsWith(cellFragmentPrefix) && /^[A-Z]/.test(propNameSuffix)) {
+    return propNameSuffix.charAt(0).toLowerCase() + propNameSuffix.slice(1);
+  }
   const typename = fragmentDefinition.typeCondition.name.value;
   return typename.charAt(0).toLowerCase() + typename.slice(1);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/internal",
-  "version": "8.0.0-canary.3582",
+  "version": "8.0.0-canary.3587",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -124,16 +124,16 @@
   },
   "dependencies": {
     "@babel/core": "^7.26.10",
-    "@babel/parser": "7.29.11",
-    "@babel/traverse": "7.29.10",
-    "@cedarjs/api": "8.0.0-canary.3582",
-    "@cedarjs/babel-config": "8.0.0-canary.3582",
-    "@cedarjs/cli-helpers": "8.0.0-canary.3582",
-    "@cedarjs/graphql-server": "8.0.0-canary.3582",
-    "@cedarjs/project-config": "8.0.0-canary.3582",
-    "@cedarjs/router": "8.0.0-canary.3582",
-    "@cedarjs/structure": "8.0.0-canary.3582",
-    "@cedarjs/utils": "8.0.0-canary.3582",
+    "@babel/parser": "7.29.12",
+    "@babel/traverse": "7.29.12",
+    "@cedarjs/api": "8.0.0-canary.3587",
+    "@cedarjs/babel-config": "8.0.0-canary.3587",
+    "@cedarjs/cli-helpers": "8.0.0-canary.3587",
+    "@cedarjs/graphql-server": "8.0.0-canary.3587",
+    "@cedarjs/project-config": "8.0.0-canary.3587",
+    "@cedarjs/router": "8.0.0-canary.3587",
+    "@cedarjs/structure": "8.0.0-canary.3587",
+    "@cedarjs/utils": "8.0.0-canary.3587",
     "@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.3582",
+    "@cedarjs/framework-tools": "8.0.0-canary.3587",
     "@jridgewell/trace-mapping": "0.3.31",
     "@oxc-project/types": "^0.155.0",
     "concurrently": "9.2.5",