@cedarjs/internal 8.0.0-canary.3483 → 8.0.0-canary.3489

package/dist/generate/templates/mirror-typed-cell.d.ts.template

@@ -0,0 +1,14 @@
+import * as Cell from './${name}.js'
+import type { CellProps } from '@cedarjs/web'
+import type { CellQueryTypes } from '@cedarjs/web/cellTypes'
+
+type SuccessType = typeof Cell.Success
+type QueryTypes = CellQueryTypes<typeof Cell.QUERY>
+
+export * from './${name}.js'
+
+type CellInputs = CellProps<SuccessType, QueryTypes[0], typeof Cell, QueryTypes[1]>
+
+export default function (props: CellInputs): ReturnType<SuccessType>
+
+//# sourceMappingURL=index.d.ts.map

package/dist/generate/templates.d.ts

@@ -2,5 +2,5 @@
  * Write the contents of the template to the destination and interpolate the variables.
  * The template is a string that uses standard es6 template literals which allow embded expression.
  */
-export declare const writeTemplate: (templatePath: string, destination: string, templateValues?: Record<string, unknown>) => void;
+export declare const writeTemplate: (templatePath: string, destination: string, templateValues?: Record<string, unknown>) => string;
 //# sourceMappingURL=templates.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../../src/generate/templates.ts"],"names":[],"mappings":"AAKA;;;GAGG;AACH,eAAO,MAAM,aAAa,GACxB,cAAc,MAAM,EACpB,aAAa,MAAM,EACnB,iBAAgB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,SAY7C,CAAA"}
+{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../../src/generate/templates.ts"],"names":[],"mappings":"AAKA;;;GAGG;AACH,eAAO,MAAM,aAAa,GACxB,cAAc,MAAM,EACpB,aAAa,MAAM,EACnB,iBAAgB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,WAa7C,CAAA"}

package/dist/generate/templates.js

@@ -6,11 +6,9 @@ const writeTemplate = (templatePath, destination, templateValues = {}) => {
     path.join(___dirname, templatePath),
     "utf-8"
   );
-  const template = templatized(templateString, templateValues);
-  fs.writeFileSync(
-    destination,
-    "// This file was generated by CedarJS\n" + template
-  );
+  const contents = "// This file was generated by CedarJS\n" + templatized(templateString, templateValues);
+  fs.writeFileSync(destination, contents);
+  return contents;
 };
 const templatized = (template, vars = {}) => {
   const handler = new Function(

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;;;;;;EA0B5B,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,WAiFnE,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,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;;;;;;EA0B5B,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,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

@@ -119,32 +119,56 @@ const generateMirrorCell = (p, rwjsPaths = getPaths()) => {
   const typeDefPath = path.join(mirrorDir, typeDef);
   const { name } = path.parse(p);
   const fileContents = fileToAst(p);
+  const exportedComponents = getNamedExports(fileContents);
+  const hasQuery = exportedComponents.some(
+    (component) => component.name === "QUERY"
+  );
   const cellQuery = getCellGqlQuery(fileContents);
-  const cellFragment = cellQuery ? void 0 : getCellGqlFragment(fileContents);
+  const cellFragment = hasQuery ? void 0 : getCellGqlFragment(fileContents);
   const cellFragmentName = cellFragment ? parseGqlFragmentName(cellFragment) : void 0;
   const cellFragmentPropName = cellFragment ? parseGqlFragmentPropName(cellFragment) : void 0;
+  let typeDefContents;
   if (cellQuery) {
     const gqlDoc = parseGqlQueryToAst(cellQuery)[0];
-    writeTemplate("templates/mirror-cell.d.ts.template", typeDefPath, {
-      name,
-      queryResultType: `${gqlDoc?.name}`,
-      queryVariablesType: `${gqlDoc?.name}Variables`
-    });
+    typeDefContents = writeTemplate(
+      "templates/mirror-cell.d.ts.template",
+      typeDefPath,
+      {
+        name,
+        queryResultType: `${gqlDoc?.name}`,
+        queryVariablesType: `${gqlDoc?.name}Variables`
+      }
+    );
   } else if (cellFragmentName && cellFragmentPropName) {
-    writeTemplate("templates/mirror-cell-fragment.d.ts.template", typeDefPath, {
-      name,
-      fragmentType: cellFragmentName,
-      fragmentPropName: cellFragmentPropName
-    });
+    typeDefContents = writeTemplate(
+      "templates/mirror-cell-fragment.d.ts.template",
+      typeDefPath,
+      {
+        name,
+        fragmentType: cellFragmentName,
+        fragmentPropName: cellFragmentPropName
+      }
+    );
+  } else if (hasQuery) {
+    typeDefContents = writeTemplate(
+      "templates/mirror-typed-cell.d.ts.template",
+      typeDefPath,
+      {
+        name
+      }
+    );
   } else {
-    writeTemplate("templates/mirror-cell.d.ts.template", typeDefPath, {
-      name,
-      queryResultType: "any",
-      queryVariablesType: "any"
-    });
+    typeDefContents = writeTemplate(
+      "templates/mirror-cell.d.ts.template",
+      typeDefPath,
+      {
+        name,
+        queryResultType: "any",
+        queryVariablesType: "any"
+      }
+    );
   }
   try {
-    const exportedComponents = getNamedExports(fileContents);
     const successComponent = exportedComponents.find(
       (x) => x.name === "Success"
     );
@@ -154,9 +178,14 @@ const generateMirrorCell = (p, rwjsPaths = getPaths()) => {
     const map = new SourceMapGenerator({
       file: "index.d.ts"
     });
+    const defaultExportIndex = typeDefContents.split("\n").findIndex((line) => line.startsWith("export default function"));
+    if (defaultExportIndex === -1) {
+      throw new Error("No default export found in the generated mirror type");
+    }
     map.addMapping({
       generated: {
-        line: 12,
+        // Source map lines are 1-based
+        line: defaultExportIndex + 1,
         column: 0
       },
       source: path.relative(path.dirname(typeDefPath), p),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/internal",
-  "version": "8.0.0-canary.3483",
+  "version": "8.0.0-canary.3489",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -120,14 +120,14 @@
     "@babel/core": "^7.26.10",
     "@babel/parser": "7.29.9",
     "@babel/traverse": "7.29.10",
-    "@cedarjs/api": "8.0.0-canary.3483",
-    "@cedarjs/babel-config": "8.0.0-canary.3483",
-    "@cedarjs/cli-helpers": "8.0.0-canary.3483",
-    "@cedarjs/graphql-server": "8.0.0-canary.3483",
-    "@cedarjs/project-config": "8.0.0-canary.3483",
-    "@cedarjs/router": "8.0.0-canary.3483",
-    "@cedarjs/structure": "8.0.0-canary.3483",
-    "@cedarjs/utils": "8.0.0-canary.3483",
+    "@cedarjs/api": "8.0.0-canary.3489",
+    "@cedarjs/babel-config": "8.0.0-canary.3489",
+    "@cedarjs/cli-helpers": "8.0.0-canary.3489",
+    "@cedarjs/graphql-server": "8.0.0-canary.3489",
+    "@cedarjs/project-config": "8.0.0-canary.3489",
+    "@cedarjs/router": "8.0.0-canary.3489",
+    "@cedarjs/structure": "8.0.0-canary.3489",
+    "@cedarjs/utils": "8.0.0-canary.3489",
     "@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.3483",
+    "@cedarjs/framework-tools": "8.0.0-canary.3489",
     "@jridgewell/trace-mapping": "0.3.31",
     "@oxc-project/types": "^0.154.0",
     "concurrently": "9.2.5",