@cedarjs/cli 7.0.0-canary.3237 → 7.0.0-canary.3238

package/dist/commands/generate/scaffold/scaffoldHandler.js

@@ -13,7 +13,7 @@ import {
 } from "@cedarjs/cli-helpers/packageManager/packages";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { generate as generateTypes } from "@cedarjs/internal/dist/generate/generate";
-import { getConfig } from "@cedarjs/project-config";
+import { getConfig, getParsedScalars } from "@cedarjs/project-config";
 import { pluralize, singularize } from "@cedarjs/utils/cedarPluralize";
 import {
   generateTemplate,
@@ -190,6 +190,7 @@ const assetFiles = async (name, tailwind) => {
   }
   return fileList;
 };
+const isDateTimeParsed = () => getParsedScalars().DateTime === "Date";
 const formatters = async (name, isTypescript) => {
   const outputPath = path.join(
     getPaths().web.src,
@@ -211,7 +212,8 @@ const formatters = async (name, isTypescript) => {
       templatePath: path.join("lib", "formatters.tsx.template")
     }),
     {
-      name
+      name,
+      parsedDateTime: isDateTimeParsed()
     }
   );
   const templateTest = await generateTemplate(
@@ -221,7 +223,8 @@ const formatters = async (name, isTypescript) => {
       templatePath: path.join("lib", "formatters.test.tsx.template")
     }),
     {
-      name
+      name,
+      parsedDateTime: isDateTimeParsed()
     }
   );
   return {
@@ -341,7 +344,8 @@ const modelRelatedVariables = (model) => {
     fieldsToImport,
     editableColumns,
     listFormattersImports,
-    formattersImports
+    formattersImports,
+    parsedDateTime: isDateTimeParsed()
   };
 };
 const layoutFiles = async (name, force, generateTypescript, templateStrings) => {

package/dist/commands/generate/scaffold/templates/components/NameForm.tsx.template

@@ -12,17 +12,17 @@ import {
 
 <% if (fieldsToImport.includes('DatetimeLocalField')) { %>
 /**
- * Formats a DateTime string from the API, which is a UTC timestamp, for use as
+ * Formats a DateTime <%= parsedDateTime ? 'Date object' : 'string' %> from the API, which is a UTC timestamp, for use as
  * the value of a `datetime-local` input. The input takes `YYYY-MM-DDTHH:mm` in
  * the user's local time, with no seconds, milliseconds or timezone, and the
  * form reads its value back as local time when it is submitted.
  */
-function formatDatetime(value: string | undefined | null) {
+function formatDatetime(value: <%= parsedDateTime ? 'Date' : 'string' %> | undefined | null) {
   if (!value) {
     return undefined
   }
 
-  const date = new Date(value)
+  const date = <%= parsedDateTime ? 'value' : 'new Date(value)' %>
 
   if (Number.isNaN(date.getTime())) {
     return undefined

package/dist/commands/generate/scaffold/templates/lib/formatters.test.tsx.template

@@ -83,14 +83,25 @@ describe('jsonTruncate', () => {
 
 describe('timeTag', () => {
   it('renders a date', async () => {
+<% if (parsedDateTime) { %>
+    render(<div>{timeTag(new Date('1970-08-20'))}</div>)
+<% } else { %>
     render(<div>{timeTag(new Date('1970-08-20').toUTCString())}</div>)
+<% } %>
 
     await waitFor(() => screen.getByText(/1970.*00:00:00/))
   })
 
+<% if (parsedDateTime) { %>
+  it('can take an empty input', async () => {
+    expect(timeTag(null)).toEqual('')
+    expect(timeTag(undefined)).toEqual('')
+  })
+<% } else { %>
   it('can take an empty input string', async () => {
     expect(timeTag('')).toEqual('')
   })
+<% } %>
 })
 
 describe('jsonDisplay', () => {

package/dist/commands/generate/scaffold/templates/lib/formatters.tsx.template

@@ -39,15 +39,27 @@ export const jsonTruncate = (obj: unknown) => {
   return truncate(JSON.stringify(obj, null, 2))
 }
 
-export function timeTag(dateTime: string | undefined | null) {
+export function timeTag(dateTime: <%= parsedDateTime ? 'Date' : 'string' %> | undefined | null) {
   let output: string | React.JSX.Element = ''
 
   if (dateTime) {
+<% if (parsedDateTime) { %>
+    if (!Number.isNaN(dateTime.getTime())) {
+      const isoString = dateTime.toISOString()
+
+      output = (
+        <time dateTime={isoString} title={isoString}>
+          {dateTime.toUTCString()}
+        </time>
+      )
+    }
+<% } else { %>
     output = (
       <time dateTime={dateTime} title={dateTime}>
         {new Date(dateTime).toUTCString()}
       </time>
     )
+<% } %>
   }
 
   return output

package/dist/commands/prerenderHandler.js

@@ -4,7 +4,7 @@ import { Listr } from "listr2";
 import { colors as c } from "@cedarjs/cli-helpers/colors";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
-import { getConfig, getPaths } from "@cedarjs/project-config";
+import { getConfig, getParsedScalars, getPaths } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { runScriptFunction } from "../lib/exec.js";
 import { configureBabel } from "../lib/execBabel.js";
@@ -106,6 +106,12 @@ const getTasks = async (dryrun, routerPathFilter = null) => {
     );
     return [];
   }
+  const parsedScalars = Object.keys(getParsedScalars());
+  if (parsedScalars.length > 0) {
+    throw new Error(
+      "Prerendering does not support `graphql.parsedScalars` yet. A prerendered Cell gets the raw GraphQL response, so " + parsedScalars.join(", ") + " would be a string when prerendering and parsed in the browser. Either remove the `prerender` prop from your routes, or remove `graphql.parsedScalars` from cedar.toml."
+    );
+  }
   const indexHtmlPath = path.join(getPaths().web.dist, "index.html");
   if (!fs.existsSync(indexHtmlPath)) {
     console.error(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "7.0.0-canary.3237",
+  "version": "7.0.0-canary.3238",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -36,17 +36,17 @@
     "@babel/preset-typescript": "7.29.7",
     "@babel/traverse": "7.29.8",
     "@babel/types": "7.29.8",
-    "@cedarjs/api-server": "7.0.0-canary.3237",
-    "@cedarjs/babel-config": "7.0.0-canary.3237",
-    "@cedarjs/cli-helpers": "7.0.0-canary.3237",
-    "@cedarjs/internal": "7.0.0-canary.3237",
-    "@cedarjs/prerender": "7.0.0-canary.3237",
-    "@cedarjs/project-config": "7.0.0-canary.3237",
-    "@cedarjs/structure": "7.0.0-canary.3237",
-    "@cedarjs/telemetry": "7.0.0-canary.3237",
-    "@cedarjs/utils": "7.0.0-canary.3237",
-    "@cedarjs/vite": "7.0.0-canary.3237",
-    "@cedarjs/web-server": "7.0.0-canary.3237",
+    "@cedarjs/api-server": "7.0.0-canary.3238",
+    "@cedarjs/babel-config": "7.0.0-canary.3238",
+    "@cedarjs/cli-helpers": "7.0.0-canary.3238",
+    "@cedarjs/internal": "7.0.0-canary.3238",
+    "@cedarjs/prerender": "7.0.0-canary.3238",
+    "@cedarjs/project-config": "7.0.0-canary.3238",
+    "@cedarjs/structure": "7.0.0-canary.3238",
+    "@cedarjs/telemetry": "7.0.0-canary.3238",
+    "@cedarjs/utils": "7.0.0-canary.3238",
+    "@cedarjs/vite": "7.0.0-canary.3238",
+    "@cedarjs/web-server": "7.0.0-canary.3238",
     "@listr2/prompt-adapter-enquirer": "4.3.2",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "2.11.0",
@@ -94,7 +94,7 @@
     "yargs": "17.7.3"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "7.0.0-canary.3237",
+    "@cedarjs/framework-tools": "7.0.0-canary.3238",
     "@prisma/dmmf": "7.10.0",
     "@types/archiver": "^7.0.0",
     "memfs": "4.78.1",