@cedarjs/cli 2.7.1-next.0 → 2.8.0-rc.37

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

@@ -1,7 +1,7 @@
 import { Listr } from "listr2";
 import pascalcase from "pascalcase";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
-import { pluralize } from "../../../lib/cedarPluralize.js";
+import { pluralize } from "@cedarjs/utils/cedarPluralize";
 import c from "../../../lib/colors.js";
 import {
   deleteFilesTask,

package/dist/commands/generate/cell/cellHandler.js

@@ -1,6 +1,6 @@
 import pascalcase from "pascalcase";
 import { generate as generateTypes } from "@cedarjs/internal/dist/generate/generate";
-import { isPlural, singularize } from "../../../lib/cedarPluralize.js";
+import { isPlural, singularize } from "@cedarjs/utils/cedarPluralize";
 import { nameVariants, transformTSToJS } from "../../../lib/index.js";
 import { isWordPluralizable } from "../../../lib/pluralHelpers.js";
 import { addFunctionToRollback } from "../../../lib/rollback.js";

package/dist/commands/generate/helpers.js

@@ -1,6 +1,6 @@
 import { paramCase } from "change-case";
 import pascalcase from "pascalcase";
-import { pluralize, isPlural, isSingular } from "../../lib/cedarPluralize.js";
+import { pluralize, isPlural, isSingular } from "@cedarjs/utils/cedarPluralize";
 const pathName = (path, name) => {
   let routePath = path;
   if (path && path.startsWith("{") && path.endsWith("}")) {

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

@@ -9,7 +9,7 @@ import pascalcase from "pascalcase";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { generate as generateTypes } from "@cedarjs/internal/dist/generate/generate";
 import { getConfig } from "@cedarjs/project-config";
-import { pluralize, singularize } from "../../../lib/cedarPluralize.js";
+import { pluralize, singularize } from "@cedarjs/utils/cedarPluralize";
 import c from "../../../lib/colors.js";
 import {
   generateTemplate,

package/dist/commands/generate/sdl/sdlHandler.js

@@ -6,7 +6,7 @@ import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { generate as generateTypes } from "@cedarjs/internal/dist/generate/generate";
 import { getConfig } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
-import { pluralize } from "../../../lib/cedarPluralize.js";
+import { pluralize } from "@cedarjs/utils/cedarPluralize";
 import c from "../../../lib/colors.js";
 import { transformTSToJS, writeFilesTask } from "../../../lib/index.js";
 import {

package/dist/commands/generate/service/serviceHandler.js

@@ -1,7 +1,7 @@
 import path from "node:path";
 import camelcase from "camelcase";
 import { dbReexportsPrismaClient } from "@cedarjs/internal/dist/project";
-import { pluralize, singularize } from "../../../lib/cedarPluralize.js";
+import { pluralize, singularize } from "@cedarjs/utils/cedarPluralize";
 import { transformTSToJS } from "../../../lib/index.js";
 import { getSchema, verifyModelName } from "../../../lib/schemaHelpers.js";
 import { relationsForModel } from "../helpers.js";

package/dist/commands/setup/live-queries/liveQueriesHandler.js

@@ -117,8 +117,12 @@ const addLiveQueryListenerToGraphqlHandler = ({ force }) => {
     };
   }
   if (!hasImport) {
+    const loggerImportIndex = contentLines.findIndex(
+      (line) => /import { logger } from ['"]src\/lib\/logger['"]/.test(line)
+    );
+    const insertIndex = loggerImportIndex >= 0 ? loggerImportIndex : lastImportIndex + 1;
     contentLines.splice(
-      lastImportIndex + 1,
+      insertIndex,
       0,
       "import { startLiveQueryListener } from 'src/lib/liveQueriesListener'"
     );
@@ -128,8 +132,11 @@ const addLiveQueryListenerToGraphqlHandler = ({ force }) => {
     contentLines.splice(
       handlerIndexAfterImport,
       0,
-      "",
-      "void startLiveQueryListener()"
+      "// Fire-and-forget: we intentionally don't await this so it doesn't block the",
+      "// GraphQL handler from being registered. The listener doesn't need to be ready",
+      "// before the first request is handled.",
+      "void startLiveQueryListener()",
+      ""
     );
   }
   fs.writeFileSync(graphqlHandlerPath, contentLines.join("\n"));
@@ -259,8 +266,8 @@ const handler = async ({ force }) => {
           Apply the migration to activate Postgres notifications:
           ${c.highlight("\n\xA0\xA0yarn cedar prisma migrate dev\n")}
 
-          Then run the API server and use @live queries with invalidation keys
-          based on your GraphQL types and fields.
+          You're then ready to use @live queries to get real-time updates as
+          soon as something in your database changes.
         `;
         }
       }

package/dist/commands/setup/live-queries/templates/liveQueriesListener.ts.template

@@ -1,6 +1,7 @@
 import { Client } from 'pg'
 
 import { liveQueryStore } from '@cedarjs/realtime'
+import { pluralize } from '@cedarjs/utils/cedarPluralize'
 
 import { logger } from 'src/lib/logger'
 
@@ -18,10 +19,14 @@ interface GetKeysToInvalidateArgs {
 }
 
 function getKeysToInvalidate({ table, recordId }: GetKeysToInvalidateArgs) {
+  // Using `toLowerCase()` rather than `toLocaleLowerCase()` because we want
+  // consistent casing across all locales.
+  const typeName = table.charAt(0).toLowerCase() + table.slice(1)
+
   const keys = [
-    `Query.${table}`,
-    `Query.${table.toLocaleLowerCase()}`,
-    `${table}:${recordId}`
+    `Query.${typeName}`,
+    `Query.${pluralize(typeName)}`,
+    `${typeName}:${recordId}`,
   ]
 
   return keys

package/dist/commands/upgrade/upgradeHandler.js

@@ -188,7 +188,7 @@ const handler = async ({
   }
   if (preUpgradeMessage) {
     console.log("");
-    console.log(`  \u{1F4E3} ${c.info("Pre-upgrade Message:")}`);
+    console.log(`  \u{1F4E3} ${c.info("Pre-upgrade Script Messages:")}`);
     console.log("  " + preUpgradeMessage.replace(/\n/g, "\n  "));
   }
 };

package/dist/lib/index.js

@@ -18,7 +18,7 @@ import {
   resolveFile as internalResolveFile,
   findUp
 } from "@cedarjs/project-config";
-import { pluralize, singularize } from "./cedarPluralize.js";
+import { pluralize, singularize } from "@cedarjs/utils/cedarPluralize";
 import c from "./colors.js";
 import { addFileToRollback } from "./rollback.js";
 const nameVariants = (name) => {

package/dist/lib/pluralHelpers.js

@@ -1,5 +1,9 @@
 import prompts from "prompts";
-import { isSingular, isPlural, addSingularPlural } from "./cedarPluralize.js";
+import {
+  isSingular,
+  isPlural,
+  addSingularPlural
+} from "@cedarjs/utils/cedarPluralize";
 const isWordPluralizable = (word) => {
   return isPlural(word) !== isSingular(word);
 };

package/dist/lib/schemaHelpers.js

@@ -1,6 +1,6 @@
 import prismaInternals from "@prisma/internals";
 import { getSchemaPath } from "@cedarjs/project-config";
-import { singularize, isPlural } from "./cedarPluralize.js";
+import { singularize, isPlural } from "@cedarjs/utils/cedarPluralize";
 import { ensureUniquePlural } from "./pluralHelpers.js";
 import { getPaths } from "./index.js";
 const { getConfig, getDMMF, getSchemaWithPath } = prismaInternals;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "2.7.1-next.0+ef2bf2525",
+  "version": "2.8.0-rc.37",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -34,16 +34,17 @@
     "@babel/parser": "7.29.0",
     "@babel/preset-typescript": "7.28.5",
     "@babel/runtime-corejs3": "7.29.0",
-    "@cedarjs/api-server": "2.7.1-next.0+ef2bf2525",
-    "@cedarjs/cli-helpers": "2.7.1-next.0+ef2bf2525",
-    "@cedarjs/fastify-web": "2.7.1-next.0+ef2bf2525",
-    "@cedarjs/internal": "2.7.1-next.0+ef2bf2525",
-    "@cedarjs/prerender": "2.7.1-next.0+ef2bf2525",
-    "@cedarjs/project-config": "2.7.1-next.0+ef2bf2525",
-    "@cedarjs/structure": "2.7.1-next.0+ef2bf2525",
-    "@cedarjs/telemetry": "2.7.1-next.0+ef2bf2525",
-    "@cedarjs/web-server": "2.7.1-next.0+ef2bf2525",
-    "@listr2/prompt-adapter-enquirer": "2.0.16",
+    "@cedarjs/api-server": "2.8.0-rc.37",
+    "@cedarjs/cli-helpers": "2.8.0-rc.37",
+    "@cedarjs/fastify-web": "2.8.0-rc.37",
+    "@cedarjs/internal": "2.8.0-rc.37",
+    "@cedarjs/prerender": "2.8.0-rc.37",
+    "@cedarjs/project-config": "2.8.0-rc.37",
+    "@cedarjs/structure": "2.8.0-rc.37",
+    "@cedarjs/telemetry": "2.8.0-rc.37",
+    "@cedarjs/utils": "2.8.0-rc.37",
+    "@cedarjs/web-server": "2.8.0-rc.37",
+    "@listr2/prompt-adapter-enquirer": "4.2.1",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/core": "1.30.1",
     "@opentelemetry/exporter-trace-otlp-http": "0.57.2",
@@ -68,10 +69,10 @@
     "execa": "5.1.1",
     "fast-glob": "3.3.3",
     "humanize-string": "2.1.0",
-    "jscodeshift": "17.0.0",
+    "jscodeshift": "17.3.0",
     "jsonc-parser": "3.3.1",
     "latest-version": "9.0.0",
-    "listr2": "7.0.2",
+    "listr2": "10.2.1",
     "lodash": "4.17.23",
     "pascalcase": "1.0.0",
     "pluralize": "8.0.0",
@@ -84,7 +85,7 @@
     "semver": "7.7.4",
     "smol-toml": "1.6.0",
     "string-env-interpolation": "1.0.1",
-    "systeminformation": "5.31.1",
+    "systeminformation": "5.31.2",
     "termi-link": "1.1.0",
     "title-case": "3.0.3",
     "unionfs": "4.6.0",
@@ -106,5 +107,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ef2bf2525e8fbeada576b4bab5d1b4b358354ae0"
+  "gitHead": "e57be2b0c6a75810c0a1af5e4e935fd07d08dec8"
 }

package/dist/lib/cedarPluralize.js

@@ -1,56 +0,0 @@
-import plurals from "pluralize";
-const mappings = {
-  toSingular: {},
-  toPlural: {}
-};
-function lastWord(str) {
-  const capitals = str.match(/[A-Z]/g);
-  const lastIndex = str.lastIndexOf(capitals?.slice(-1)[0]);
-  return lastIndex >= 0 ? str.slice(lastIndex) : str;
-}
-function pluralize(word) {
-  if (mappings.toPlural[word]) {
-    return mappings.toPlural[word];
-  }
-  const singular = lastWord(word);
-  const base = word.slice(0, word.length - singular.length);
-  if (mappings.toPlural[singular]) {
-    return base + mappings.toPlural[singular];
-  }
-  return base + plurals.plural(singular);
-}
-function singularize(word) {
-  if (mappings.toSingular[word]) {
-    return mappings.toSingular[word];
-  }
-  const plural = lastWord(word);
-  const base = word.slice(0, word.length - plural.length);
-  if (mappings.toSingular[plural]) {
-    return base + mappings.toSingular[plural];
-  }
-  return base + plurals.singular(plural);
-}
-function isPlural(word) {
-  return plurals.isPlural(lastWord(word));
-}
-function isSingular(word) {
-  return plurals.isSingular(lastWord(word));
-}
-function addSingularPlural(singular, plural) {
-  const existingPlural = Object.keys(mappings.toSingular).find(
-    (key) => mappings.toSingular[key] === singular
-  );
-  delete mappings.toSingular[existingPlural];
-  delete mappings.toPlural[existingPlural];
-  mappings.toPlural[singular] = plural;
-  mappings.toPlural[plural] = plural;
-  mappings.toSingular[plural] = singular;
-  mappings.toSingular[singular] = singular;
-}
-export {
-  addSingularPlural,
-  isPlural,
-  isSingular,
-  pluralize,
-  singularize
-};