@cedarjs/cli 6.0.3-next.227 → 6.0.3-next.296

package/dist/commands/experimental/setupReactCompilerHandler.js

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import { Listr } from "listr2";
-import { coerce, isGreaterOrEqual } from "verkit";
+import { coerce, isGreaterThanOrEqual } from "verkit";
 import { colors as c } from "@cedarjs/cli-helpers/colors";
 import {
   addRootPackages,
@@ -40,7 +40,7 @@ const handler = async (options) => {
           );
           const reactVersion = webPkgJson["dependencies"]["react"];
           const coercedReactVersion = coerce(reactVersion);
-          if (!coercedReactVersion || !isGreaterOrEqual(coercedReactVersion, "19.0.0")) {
+          if (!coercedReactVersion || !isGreaterThanOrEqual(coercedReactVersion, "19.0.0")) {
             throw new Error(
               "You need to be using at least React version 19 to enable the React Compiler"
             );

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

@@ -11,10 +11,36 @@ import {
 } from '@cedarjs/forms'
 
 <% if (fieldsToImport.includes('DatetimeLocalField')) { %>
-const formatDatetime = (value) => {
-  if (value) {
-    return value.replace(/:\d{2}\.\d{3}\w/, '')
+/**
+ * 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: <%= parsedDateTime ? 'Date' : 'string' %> | undefined | null) {
+  if (!value) {
+    return undefined
   }
+
+  const date = <%= parsedDateTime ? 'value' : 'new Date(value)' %>
+
+  if (Number.isNaN(date.getTime())) {
+    return undefined
+  }
+
+  const pad = (n: number) => String(n).padStart(2, '0')
+
+  return (
+    date.getFullYear() +
+    '-' +
+    pad(date.getMonth() + 1) +
+    '-' +
+    pad(date.getDate()) +
+    'T' +
+    pad(date.getHours()) +
+    ':' +
+    pad(date.getMinutes())
+  )
 }
 <% } %>
 
@@ -30,6 +56,19 @@ interface ${singularPascalName}FormProps {
 const ${singularPascalName}Form = (props: ${singularPascalName}FormProps) => {
   const onSubmit = (data: Form${singularPascalName}) => {
   <% editableColumns.forEach(column => { %>
+    <% if (column.type === 'DateTime' && !column.isList) { %>
+      // The input only holds minutes, so an untouched field is sent back as the
+      // stored value, keeping its seconds, milliseconds and, when daylight
+      // saving time ends, which of the two repeated hours it was in
+      if (
+        data.${column.name} &&
+        props.${singularCamelName}?.${column.name} &&
+        formatDatetime(data.${column.name}) ===
+          formatDatetime(props.${singularCamelName}.${column.name})
+      ) {
+        data.${column.name} = props.${singularCamelName}.${column.name}
+      }
+    <% } %>
     <% if (column.isEnum && !column.isList && !column.isRequired) { %>
       if (data.${column.name} === '') {
         data.${column.name} = null

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 const timeTag = (dateTime?: string) => {
+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/dist/commands/setup/package/packageHandler.js

@@ -1,5 +1,5 @@
 import enq from "enquirer";
-import { isGreaterOrEqual, isLess, tryParse } from "verkit";
+import { isGreaterThanOrEqual, isLessThan, tryParse } from "verkit";
 import { dlx } from "@cedarjs/cli-helpers/packageManager/exec";
 import { getCompatibilityData } from "@cedarjs/cli-helpers/version";
 import { getPaths } from "@cedarjs/project-config";
@@ -16,7 +16,7 @@ async function handler({
     console.log(
       "No compatibility check will be performed because you used the --force flag."
     );
-    if (tryParse(packageVersion) !== null && isLess(packageVersion, "1.0.0")) {
+    if (tryParse(packageVersion) !== null && isLessThan(packageVersion, "1.0.0")) {
       console.log(
         "Be aware that this package is under version 1.0.0 and so should be considered experimental."
       );
@@ -86,7 +86,7 @@ The latest version compatible with your project is ${latestCompatibleVersionText
   await runPackage(packageName, versionToUse, additionalOptionsToForward);
 }
 async function showExperimentalWarning(version) {
-  if (version === void 0 || tryParse(version) === null || isGreaterOrEqual(version, "1.0.0")) {
+  if (version === void 0 || tryParse(version) === null || isGreaterThanOrEqual(version, "1.0.0")) {
     return;
   }
   const decision = await promptWithChoices(

package/dist/lib/updateCheck.js

@@ -3,7 +3,7 @@ import path from "path";
 import ansis from "ansis";
 import boxen from "boxen";
 import latestVersion from "latest-version";
-import { isGreater, isValid } from "verkit";
+import { isGreaterThan, isValid } from "verkit";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { getNodeRunnerArgs } from "@cedarjs/cli-helpers/packageManager/exec";
 import { getConfig } from "@cedarjs/project-config";
@@ -106,7 +106,7 @@ function shouldShow() {
   const data = readUpdateDataFile();
   let newerVersion = false;
   data.remoteVersions.forEach((version) => {
-    newerVersion ||= isGreater(version, localVersion);
+    newerVersion ||= isGreaterThan(version, localVersion);
   });
   return data.shownAt < (/* @__PURE__ */ new Date()).getTime() - SHOW_PERIOD && newerVersion;
 }
@@ -120,7 +120,7 @@ function getUpdateMessage() {
   let updateCount = 0;
   let message = ` New updates to Cedar are available via \`${formatCedarCommand(["upgrade#REPLACEME#"])}\` `;
   data.remoteVersions.forEach((version, tag) => {
-    if (isGreater(version, data.localVersion)) {
+    if (isGreaterThan(version, data.localVersion)) {
       updateCount += 1;
       if (tag === localTag) {
         message += `

package/dist/middleware/checkNodeVersion.js

@@ -1,4 +1,4 @@
-import { clean, isGreaterOrEqual } from "verkit";
+import { clean, isGreaterThanOrEqual } from "verkit";
 import { colors as c } from "@cedarjs/cli-helpers/colors";
 function checkNodeVersion() {
   const checks = { ok: true };
@@ -10,7 +10,7 @@ function checkNodeVersion() {
     checks.message = `Invalid Node.js version: ${pVersion}`;
     return checks;
   }
-  if (isGreaterOrEqual(pVersionC, LOWER_BOUND)) {
+  if (isGreaterThanOrEqual(pVersionC, LOWER_BOUND)) {
     return checks;
   }
   checks.ok = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "6.0.3-next.227",
+  "version": "6.0.3-next.296",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -32,21 +32,21 @@
   },
   "dependencies": {
     "@babel/core": "^7.26.10",
-    "@babel/parser": "7.29.8",
+    "@babel/parser": "7.29.9",
     "@babel/preset-typescript": "7.29.7",
     "@babel/traverse": "7.29.8",
     "@babel/types": "7.29.8",
-    "@cedarjs/api-server": "6.0.3-next.227",
-    "@cedarjs/babel-config": "6.0.3-next.227",
-    "@cedarjs/cli-helpers": "6.0.3-next.227",
-    "@cedarjs/internal": "6.0.3-next.227",
-    "@cedarjs/prerender": "6.0.3-next.227",
-    "@cedarjs/project-config": "6.0.3-next.227",
-    "@cedarjs/structure": "6.0.3-next.227",
-    "@cedarjs/telemetry": "6.0.3-next.227",
-    "@cedarjs/utils": "6.0.3-next.227",
-    "@cedarjs/vite": "6.0.3-next.227",
-    "@cedarjs/web-server": "6.0.3-next.227",
+    "@cedarjs/api-server": "6.0.3-next.296",
+    "@cedarjs/babel-config": "6.0.3-next.296",
+    "@cedarjs/cli-helpers": "6.0.3-next.296",
+    "@cedarjs/internal": "6.0.3-next.296",
+    "@cedarjs/prerender": "6.0.3-next.296",
+    "@cedarjs/project-config": "6.0.3-next.296",
+    "@cedarjs/structure": "6.0.3-next.296",
+    "@cedarjs/telemetry": "6.0.3-next.296",
+    "@cedarjs/utils": "6.0.3-next.296",
+    "@cedarjs/vite": "6.0.3-next.296",
+    "@cedarjs/web-server": "6.0.3-next.296",
     "@listr2/prompt-adapter-enquirer": "4.3.2",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "2.11.0",
@@ -55,7 +55,7 @@
     "@opentelemetry/sdk-trace-node": "2.11.0",
     "@opentelemetry/semantic-conventions": "1.43.0",
     "@prisma/internals": "7.10.0",
-    "ansis": "4.3.1",
+    "ansis": "4.4.0",
     "archiver": "7.0.1",
     "boxen": "5.1.2",
     "camel-case": "4.1.2",
@@ -79,25 +79,25 @@
     "pascalcase": "1.0.0",
     "pluralize": "8.0.0",
     "portfinder": "1.0.38",
-    "prettier": "3.9.6",
+    "prettier": "3.9.8",
     "prisma": "7.10.0",
     "prompts": "2.4.2",
     "smol-toml": "1.8.0",
     "srvx": "0.12.8",
     "string-env-interpolation": "1.0.1",
-    "systeminformation": "5.33.10",
+    "systeminformation": "5.33.13",
     "termi-link": "1.1.0",
     "title-case": "3.0.3",
     "unionfs": "4.6.0",
     "uuid": "11.1.1",
-    "verkit": "0.4.0",
+    "verkit": "0.5.0",
     "yargs": "17.7.3"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "6.0.3-next.227",
+    "@cedarjs/framework-tools": "6.0.3-next.296",
     "@prisma/dmmf": "7.10.0",
     "@types/archiver": "^7.0.0",
-    "memfs": "4.76.0",
+    "memfs": "4.79.0",
     "node-ssh": "13.2.1",
     "ts-dedent": "2.3.0",
     "typescript": "5.9.3",