@cedarjs/cli 7.0.1-next.467 → 7.1.0-rc.34

package/dist/commands/generate/dbAuth/dbAuth.js

@@ -1,13 +1,9 @@
 import { terminalLink } from "termi-link";
 import { getYargsDefaults, createHandler } from "../yargsCommandHelpers.js";
 const command = "dbAuth";
-const description = "Generate Login, Signup, Forgot Password, Reset Password and Change Password pages for dbAuth";
+const description = "Generate Login, Signup and Forgot Password pages for dbAuth";
 const builder = (yargs) => {
-  yargs.option("skip-change", {
-    description: "Skip generating the Change Password page",
-    type: "boolean",
-    default: false
-  }).option("skip-forgot", {
+  yargs.option("skip-forgot", {
     description: "Skip generating the Forgot Password page",
     type: "boolean",
     default: false

package/dist/commands/generate/dbAuth/dbAuthHandler.js

@@ -4,10 +4,9 @@ import { ListrEnquirerPromptAdapter } from "@listr2/prompt-adapter-enquirer";
 import { camelCase } from "camel-case";
 import { Listr } from "listr2";
 import { titleCase } from "title-case";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import {
   addRoutesToRouterTask,
   addScaffoldImport,
@@ -18,25 +17,12 @@ import {
 } from "../../../lib/index.js";
 import { prepareForRollback } from "../../../lib/rollback.js";
 import { templateForComponentFile } from "../yargsHandlerHelpers.js";
-function routesFor({
-  skipChange,
-  skipForgot,
-  skipLogin,
-  skipReset,
-  skipSignup
-}) {
-  return [
-    !skipLogin && `<Route path="/login" page={LoginPage} name="login" />`,
-    !skipSignup && `<Route path="/signup" page={SignupPage} name="signup" />`,
-    !skipForgot && `<Route path="/forgot-password" page={ForgotPasswordPage} name="forgotPassword" />`,
-    !skipReset && `<Route path="/reset-password" page={ResetPasswordPage} name="resetPassword" />`,
-    !skipChange && `<Route path="/change-password" page={ChangePasswordPage} name="changePassword" />`
-  ].filter((route) => typeof route === "string");
-}
-function pascalCase(str) {
-  const camelCased = camelCase(str);
-  return camelCased.charAt(0).toUpperCase() + camelCased.slice(1);
-}
+const ROUTES = [
+  `<Route path="/login" page={LoginPage} name="login" />`,
+  `<Route path="/signup" page={SignupPage} name="signup" />`,
+  `<Route path="/forgot-password" page={ForgotPasswordPage} name="forgotPassword" />`,
+  `<Route path="/reset-password" page={ResetPasswordPage} name="resetPassword" />`
+];
 function getPostInstallMessage(isDbAuthSetup2) {
   return [
     `   ${c.warning("Pages created! But you're not done yet:")}
@@ -48,11 +34,9 @@ function getPostInstallMessage(isDbAuthSetup2) {
     "       navigate(routes.home())",
     "     }\n",
     "   and change the route to where you want them to go if the user is already",
-    "   logged in. Also take a look in the onSubmit() functions in ForgotPasswordPage,",
-    "   ResetPasswordPage and ChangePasswordPage to change where the user redirects",
-    "   to after submitting those forms.\n",
-    "   ChangePasswordPage is for users who are already logged in. Link to it from",
-    "   wherever your app lets users manage their account.\n",
+    "   logged in. Also take a look in the onSubmit() functions in ForgotPasswordPage",
+    "   and ResetPasswordPage to change where the user redirects to after submitting",
+    "   those forms.\n",
     !isDbAuthSetup2 && `   Oh, and if you haven't already, add the necessary dbAuth functions and
    app setup by running:
 
@@ -73,11 +57,9 @@ function getPostInstallWebauthnMessage(isDbAuthSetup2) {
     "       navigate(routes.home())",
     "     }\n",
     "   and change the route to where you want them to go if the user is already",
-    "   logged in. Also take a look in the onSubmit() functions in ForgotPasswordPage,",
-    "   ResetPasswordPage and ChangePasswordPage to change where the user redirects",
-    "   to after submitting those forms.\n",
-    "   ChangePasswordPage is for users who are already logged in. Link to it from",
-    "   wherever your app lets users manage their account.\n",
+    "   logged in. Also take a look in the onSubmit() functions in ForgotPasswordPage",
+    "   and ResetPasswordPage to change where the user redirects to after submitting",
+    "   those forms.\n",
     !isDbAuthSetup2 && `   Oh, and if you haven't already, add the necessary dbAuth functions and
    app setup by running:
 
@@ -88,28 +70,24 @@ function getPostInstallWebauthnMessage(isDbAuthSetup2) {
 }
 const files = async ({
   typescript,
-  skipChange,
   skipForgot,
   skipLogin,
   skipReset,
   skipSignup,
   webauthn,
-  oauth,
   usernameLabel,
   passwordLabel
 }) => {
   const filesList = [];
   usernameLabel = usernameLabel || "username";
   passwordLabel = passwordLabel || "password";
-  const oauthEnabled = oauth ?? isOAuthEnabled();
   const templateVars = {
     usernameLowerCase: usernameLabel.toLowerCase(),
     usernameCamelCase: camelCase(usernameLabel),
     usernameTitleCase: titleCase(usernameLabel),
     passwordLowerCase: passwordLabel.toLowerCase(),
     passwordCamelCase: camelCase(passwordLabel),
-    passwordTitleCase: titleCase(passwordLabel),
-    passwordPascalCase: pascalCase(passwordLabel)
+    passwordTitleCase: titleCase(passwordLabel)
   };
   if (!skipForgot) {
     filesList.push(
@@ -132,7 +110,7 @@ const files = async ({
         extension: typescript ? ".tsx" : ".jsx",
         webPathSection: "pages",
         generator: "dbAuth",
-        templatePath: loginTemplatePath(webauthn, oauthEnabled),
+        templatePath: webauthn ? "login.webAuthn.tsx.template" : "login.tsx.template",
         templateVars
       })
     );
@@ -150,19 +128,6 @@ const files = async ({
       })
     );
   }
-  if (!skipChange) {
-    filesList.push(
-      await templateForComponentFile({
-        name: "ChangePassword",
-        suffix: "Page",
-        extension: typescript ? ".tsx" : ".jsx",
-        webPathSection: "pages",
-        generator: "dbAuth",
-        templatePath: "changePassword.tsx.template",
-        templateVars
-      })
-    );
-  }
   if (!skipSignup) {
     filesList.push(
       await templateForComponentFile({
@@ -171,7 +136,7 @@ const files = async ({
         extension: typescript ? ".tsx" : ".jsx",
         webPathSection: "pages",
         generator: "dbAuth",
-        templatePath: oauthEnabled ? "signup.oauth.tsx.template" : "signup.tsx.template",
+        templatePath: "signup.tsx.template",
         templateVars
       })
     );
@@ -211,7 +176,6 @@ const tasks = ({
   listr2,
   force,
   typescript,
-  skipChange,
   skipForgot,
   skipLogin,
   skipReset,
@@ -322,7 +286,6 @@ const tasks = ({
         task: async () => {
           const filesObj = await files({
             typescript,
-            skipChange,
             skipForgot,
             skipLogin,
             skipReset,
@@ -339,15 +302,7 @@ const tasks = ({
       {
         title: "Adding routes...",
         task: async () => {
-          addRoutesToRouterTask(
-            routesFor({
-              skipChange,
-              skipForgot,
-              skipLogin,
-              skipReset,
-              skipSignup
-            })
-          );
+          addRoutesToRouterTask(ROUTES);
         }
       },
       {
@@ -377,7 +332,6 @@ const tasks = ({
 const handler = async (yargs) => {
   recordTelemetryAttributes({
     command: "generate dbAuth",
-    skipChange: yargs.skipChange,
     skipForgot: yargs.skipForgot,
     skipLogin: yargs.skipLogin,
     skipReset: yargs.skipReset,
@@ -424,23 +378,6 @@ function isWebAuthnEnabled() {
   );
   return webPackageJson.includes('"@simplewebauthn/browser": ');
 }
-function isOAuthEnabled() {
-  const apiPackageJsonPath = path.join(getPaths().base, "api", "package.json");
-  if (!fs.existsSync(apiPackageJsonPath)) {
-    return false;
-  }
-  const apiPackageJson = fs.readFileSync(apiPackageJsonPath, "utf-8");
-  return apiPackageJson.includes('"@cedarjs/auth-dbauth-oauth": ');
-}
-function loginTemplatePath(webauthn, oauth) {
-  if (webauthn) {
-    return "login.webAuthn.tsx.template";
-  }
-  if (oauth) {
-    return "login.oauth.tsx.template";
-  }
-  return "login.tsx.template";
-}
 export {
   files,
   handler

package/dist/commands/generate/dbAuth/templates/login.webAuthn.tsx.template

@@ -17,7 +17,7 @@ import { useAuth } from 'src/auth'
 const WELCOME_MESSAGE = 'Welcome back!'
 const REDIRECT = routes.home()
 
-const LoginPage = ({ type }: { type?: string }) => {
+const LoginPage = ({ type }) => {
   const {
     isAuthenticated,
     client: webAuthn,
@@ -27,12 +27,12 @@ const LoginPage = ({ type }: { type?: string }) => {
   } = useAuth()
   const [shouldShowWebAuthn, setShouldShowWebAuthn] = useState(false)
   const [showWebAuthn, setShowWebAuthn] = useState(
-    !!webAuthn?.isEnabled() && type !== 'password'
+    webAuthn.isEnabled() && type !== 'password'
   )
 
   // should redirect right after login or wait to show the webAuthn prompts?
   useEffect(() => {
-    if (isAuthenticated && (!shouldShowWebAuthn || webAuthn?.isEnabled())) {
+    if (isAuthenticated && (!shouldShowWebAuthn || webAuthn.isEnabled())) {
       navigate(REDIRECT)
     }
   }, [isAuthenticated, shouldShowWebAuthn])
@@ -45,13 +45,13 @@ const LoginPage = ({ type }: { type?: string }) => {
   }, [loading, isAuthenticated])
 
   // focus on the ${usernameLowerCase} field as soon as the page loads
-  const ${usernameCamelCase}Ref = useRef<HTMLInputElement>(null)
+  const ${usernameCamelCase}Ref = useRef()
   useEffect(() => {
-    ${usernameCamelCase}Ref.current?.focus()
+    ${usernameCamelCase}Ref.current && ${usernameCamelCase}Ref.current.focus()
   }, [])
 
-  const onSubmit = async (data: Record<string, string>) => {
-    const webAuthnSupported = !!(await webAuthn?.isSupported())
+  const onSubmit = async (data) => {
+    const webAuthnSupported = await webAuthn.isSupported()
 
     if (webAuthnSupported) {
       setShouldShowWebAuthn(true)
@@ -75,38 +75,30 @@ const LoginPage = ({ type }: { type?: string }) => {
   }
 
   const onAuthenticate = async () => {
-    if (!webAuthn) {
-      return
-    }
-
     try {
       await webAuthn.authenticate()
       await reauthenticate()
       toast.success(WELCOME_MESSAGE)
       navigate(REDIRECT)
     } catch (e) {
-      if (e instanceof Error && e.name === 'WebAuthnDeviceNotFoundError') {
+      if (e.name === 'WebAuthnDeviceNotFoundError') {
         toast.error(
           'Device not found, log in with ${usernameTitleCase}/${passwordTitleCase} to continue'
         )
         setShowWebAuthn(false)
       } else {
-        toast.error(e instanceof Error ? e.message : String(e))
+        toast.error(e.message)
       }
     }
   }
 
   const onRegister = async () => {
-    if (!webAuthn) {
-      return
-    }
-
     try {
       await webAuthn.register()
       toast.success(WELCOME_MESSAGE)
       navigate(REDIRECT)
     } catch (e) {
-      toast.error(e instanceof Error ? e.message : String(e))
+      toast.error(e.message)
     }
   }
 
@@ -208,7 +200,7 @@ const LoginPage = ({ type }: { type?: string }) => {
 
   const formToRender = () => {
     if (showWebAuthn) {
-      if (webAuthn?.isEnabled()) {
+      if (webAuthn.isEnabled()) {
         return <AuthWebAuthnPrompt />
       } else {
         return <RegisterWebAuthnPrompt />
@@ -220,7 +212,7 @@ const LoginPage = ({ type }: { type?: string }) => {
 
   const linkToRender = () => {
     if (showWebAuthn) {
-      if (webAuthn?.isEnabled()) {
+      if (webAuthn.isEnabled()) {
         return (
           <div className="rw-login-link">
             <span>or login with </span>{' '}

package/dist/commands/generate/directive/directiveHandler.js

@@ -1,9 +1,8 @@
 import camelcase from "camelcase";
 import { Listr } from "listr2";
 import prompts from "prompts";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { getConfig } from "@cedarjs/project-config";
 import { writeFilesTask, transformTSToJSMap } from "../../../lib/index.js";
 import {

package/dist/commands/generate/function/functionHandler.js

@@ -1,7 +1,6 @@
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { transformTSToJSMap, writeFilesTask } from "../../../lib/index.js";
 import { prepareForRollback } from "../../../lib/rollback.js";

package/dist/commands/generate/helpers.js

@@ -37,33 +37,11 @@ const redactedModelFields = (fieldNames) => {
   }
   return sensitive;
 };
-const DEFAULT_IGNORE_FIELDS_FOR_INPUT = ["createdAt", "updatedAt"];
-const requiredFieldsInUpdateInput = (model) => {
-  return inputFields(model).filter((field) => {
-    return field.isRequired && !field.isList && !field.isId;
-  }).map((field) => field.name);
-};
-const nullableJsonFieldsInInput = (model) => {
-  return inputFields(model).filter((field) => {
-    return field.type === "Json" && !field.isRequired && !field.isList;
-  }).map((field) => field.name);
-};
-const inputFields = (model) => {
-  const redactedFields = redactedModelFields(
-    model.fields.map((field) => field.name)
-  );
-  return model.fields.filter((field) => {
-    return field.kind !== "object" && !DEFAULT_IGNORE_FIELDS_FOR_INPUT.includes(field.name) && !redactedFields.includes(field.name);
-  });
-};
 const relationsForModel = (model) => {
   return model?.fields.filter((f) => f.relationName).map((field) => {
     return field.name;
   });
 };
-const nullableRelationsForModel = (model) => {
-  return model.fields.filter((f) => f.kind === "object" && !f.isList && !f.isRequired).map((f) => f.name);
-};
 const intForeignKeysForModel = (model) => {
   return model.fields.filter((f) => f.name.match(/Id$/) && f.type === "Int").map((f) => f.name);
 };
@@ -96,18 +74,14 @@ const mapPrismaScalarToPagePropTsType = (scalarType) => {
   return prismaScalarToTsType[scalarType] || "unknown";
 };
 export {
-  DEFAULT_IGNORE_FIELDS_FOR_INPUT,
   SENSITIVE_FIELDS,
   forcePluralizeWord,
   intForeignKeysForModel,
   mapPrismaScalarToPagePropTsType,
   mapRouteParamTypeToTsType,
-  nullableJsonFieldsInInput,
-  nullableRelationsForModel,
   pathName,
   redactedModelFields,
   relationsForModel,
   removeGeneratorName,
-  requiredFieldsInUpdateInput,
   validateName
 };

package/dist/commands/generate/job/jobHandler.js

@@ -2,9 +2,8 @@ import path from "node:path";
 import { pathToFileURL } from "node:url";
 import * as changeCase from "change-case";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import {
   getPaths,

package/dist/commands/generate/model/modelHandler.js

@@ -1,7 +1,6 @@
 import path from "path";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import {
   getPaths,
   writeFilesTask,

package/dist/commands/generate/ogImage/ogImageHandler.js

@@ -2,8 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import fg from "fast-glob";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { ensurePosixPath } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import {

package/dist/commands/generate/ogImage/templates/ogImage.og.tsx.template

@@ -2,7 +2,7 @@ export const data = async () => {
   return new Date()
 }
 
-export const output = ({ data }: { data: Date }) => {
+export const output = ({ data }) => {
   return (
     <>
       <h1>${pageName} og:image</h1>

package/dist/commands/generate/package/filesTask.js

@@ -11,6 +11,7 @@ const files = async ({
   fileName,
   typescript,
   tests: generateTests = true,
+  esm = false,
   ...rest
 }) => {
   const extension = typescript ? ".ts" : ".js";
@@ -66,15 +67,17 @@ const files = async ({
       outputPath: path.join(folderName, "src", `${fileName}.test${extension}`)
     });
     outputFiles.push(testFile);
-    const vitestConfigFile = await templateForFile({
-      name,
-      side: "packages",
-      generator: "package",
-      templatePath: "vitest.config.ts.template",
-      templateVars: { folderName, ...rest },
-      outputPath: path.join(folderName, `vitest.config${extension}`)
-    });
-    outputFiles.push(vitestConfigFile);
+    if (esm) {
+      const vitestConfigFile = await templateForFile({
+        name,
+        side: "packages",
+        generator: "package",
+        templatePath: "vitest.config.ts.template",
+        templateVars: { folderName, ...rest },
+        outputPath: path.join(folderName, `vitest.config${extension}`)
+      });
+      outputFiles.push(vitestConfigFile);
+    }
   }
   return outputFiles.reduce(async (accP, [outputPath, content]) => {
     const acc = await accP;

package/dist/commands/generate/package/packageHandler.js

@@ -6,13 +6,12 @@ import { modify, applyEdits } from "jsonc-parser";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
 import ts from "typescript";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { workspacePackageSpecifier } from "@cedarjs/cli-helpers/packageManager";
 import { runScript, runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
 import { installPackages } from "@cedarjs/cli-helpers/packageManager/packages";
 import { addWorkspaceDir } from "@cedarjs/cli-helpers/packageManager/workspaces";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
-import { getConfig } from "@cedarjs/project-config";
+import { getConfig, projectIsEsm } from "@cedarjs/project-config";
 import { getPackageManager } from "@cedarjs/project-config/packageManager";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths, writeFilesTask } from "../../../lib/index.js";
@@ -343,6 +342,8 @@ const handler = async ({
         task: async (ctx) => {
           packageFiles = await files({
             ...ctx.nameVariants,
+            // Only Vitest projects get a config generated for them
+            esm: projectIsEsm(),
             ...rest
           });
           return writeFilesTask(packageFiles, { overwriteExisting: force });

package/dist/commands/generate/package/templates/tsconfig.json.template

@@ -4,7 +4,6 @@
     "target": "es2023",
     "module": "node20",
     "esModuleInterop": true,
-    "strict": true,
     "skipLibCheck": true,
     "baseUrl": ".",
     "rootDir": "src",

package/dist/commands/generate/page/pageHandler.js

@@ -2,8 +2,7 @@ import { execSync } from "child_process";
 import camelcase from "camelcase";
 import { Listr } from "listr2";
 import pascalcase from "pascalcase";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes, colors as c } 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";

package/dist/commands/generate/realtime/realtime.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "realtime <name>";
 const description = "Generate a subscription or live query used with RedwoodJS Realtime";
 function builder(yargs) {

package/dist/commands/generate/realtime/realtimeHandler.js

@@ -4,8 +4,9 @@ import { Listr } from "listr2";
 import pascalcase from "pascalcase";
 import pluralize from "pluralize";
 import prompts from "prompts";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { colors as c } from "@cedarjs/cli-helpers";
 import { generate as generateTypes } from "@cedarjs/internal/dist/generate/generate";
+import { projectIsEsm } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import {
   generateTemplate,
@@ -119,10 +120,16 @@ async function handler({
             exampleFile,
             exampleSubscriptionTemplateContent
           );
-          const blankTemplateContent = await generateTemplate(
+          let blankTemplateContent = await generateTemplate(
             setupScriptContent,
             templateVariables(name)
           );
+          if (projectIsEsm()) {
+            blankTemplateContent = blankTemplateContent.replace(
+              "import gql from 'graphql-tag'",
+              "import { gql } from 'graphql-tag'"
+            );
+          }
           return [
             writeFile(
               sdlFile,

package/dist/commands/generate/realtime/templates/liveQueries/blank/blank.service.ts.template

@@ -1,17 +1,9 @@
 // api/src/services/${name}s/${name}s.ts
-import type { ${typeName}ItemInput } from 'types/graphql'
-
 import type { LiveQueryStorageMechanism } from '@cedarjs/realtime'
 
 import { logger } from 'src/lib/logger'
 
-interface ${typeName}Data {
-  id: string
-  title: string
-  items: { amount: number }[]
-}
-
-const ${collectionName}: ${typeName}Data[] = [
+const ${collectionName} = [
   { id: '1', title: 'First ${modelName}', items: [{ amount: 11 }] },
   { id: '2', title: '2nd ${modelName}', items: [{ amount: 22 }] },
   { id: '3', title: 'Third ${modelName}',  items: [{ amount: 33 }] },
@@ -43,14 +35,14 @@ const ${collectionName}: ${typeName}Data[] = [
  *   }
  * }
  */
-export const ${liveQueryName} = async ({ id }: { id: string }) => {
+export const ${liveQueryName} = async ({ id }) => {
   const found${modelName} = ${collectionName}.find((a) => a.id === id)
   logger.debug({ id, ${name}: found${modelName} }, `${name} details`)
   return found${modelName}
 }
 
 export const create${typeName}Item = async (
-  { input }: { input: ${typeName}ItemInput },
+  { input },
   { context }: { context: { liveQueryStore: LiveQueryStorageMechanism } }
 ) => {
   const { ${camelName}Id, amount } = input
@@ -71,7 +63,7 @@ export const create${typeName}Item = async (
 }
 
 export const ${modelName} = {
-  largest${typeName}Item: (obj: unknown, { root }: { root: ${typeName}Data }) => {
+  largest${typeName}Item: (obj, { root }) => {
     const [largest] = root.items.sort((a, b) => b.amount - a.amount)
 
     logger.debug({ obj, root }, 'largest ${typeName}Item')

package/dist/commands/generate/realtime/templates/subscriptions/blank/blank.service.ts.template

@@ -1,9 +1,9 @@
 import type { ${subscriptionInputType} } from 'types/graphql'
 
 import { logger } from 'src/lib/logger'
-import type { Publish${typeName}ChannelType } from 'src/subscriptions/${name}/${name}.js'
+import type { Publish${typeName}ChannelType } from 'src/subscriptions/${name}/${name}.service.js'
 
-export const ${subscriptionQueryName} = ({ id }: { id: string }) => [id]
+export const ${subscriptionQueryName} = ({ id }) => [id]
 
 export const ${subscriptionServiceResolver} = async (
   { input }: { input: ${subscriptionInputType} },

package/dist/commands/generate/realtime/templates/subscriptions/blank/blank.ts.template

@@ -1,4 +1,4 @@
-import { gql } from 'graphql-tag'
+import gql from 'graphql-tag'
 
 import type { PubSub } from '@cedarjs/realtime'
 
@@ -39,15 +39,15 @@ export type Publish${typeName}ChannelType = PubSub<Publish${typeName}Channel>
 const ${subscriptionName}Subscription = {
   ${subscriptionName}: {
     subscribe: (
-      _: unknown,
-      { id }: { id: string },
+      _,
+      { id },
       { pubSub }: { pubSub: Publish${typeName}ChannelType }
     ) => {
       logger.debug({ id }, '${name} subscription')
 
       return pubSub.subscribe('${typeName}', id)
     },
-    resolve: (payload: Publish${typeName}Channel['${typeName}'][1]) => {
+    resolve: (payload) => {
       logger.debug({ payload }, '${name} subscription resolve')
 
       return payload

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

@@ -13,7 +13,7 @@ const builder = (yargs) => {
     description: "Generate test files",
     type: "boolean"
   }).option("tailwind", {
-    description: "Generate TailwindCSS version of scaffold.css (automatically set to `true` if the web side depends on `tailwindcss`)",
+    description: "Generate TailwindCSS version of scaffold.css (automatically set to `true` if TailwindCSS config exists)",
     type: "boolean"
   }).option("rollback", {
     description: "Revert all generator actions if an error occurs",