@stacksjs/actions 0.59.10 → 0.61.0

package/dist/types.js

@@ -0,0 +1,21 @@
+// @bun
+// src/types.ts
+import process from "process";
+import {NpmScript} from "@stacksjs/enums";
+import {log} from "@stacksjs/logging";
+import {runNpmScript} from "@stacksjs/utils";
+async function invoke(options) {
+  const results = await runNpmScript(NpmScript.TypesFix, options);
+  if (results.isErr()) {
+    log.error("There was an error fixing your types.", results.error);
+    process.exit();
+  }
+  log.success("Types are set");
+}
+async function types(options) {
+  return invoke(options);
+}
+export {
+  types,
+  invoke
+};

package/dist/upgrade/dependencies.js

@@ -0,0 +1,6 @@
+// @bun
+// src/upgrade/dependencies.ts
+var dependencies_default = undefined;
+export {
+  dependencies_default as default
+};

package/dist/upgrade/framework.js

@@ -0,0 +1 @@
+// @bun

package/dist/upgrade/index.js

@@ -0,0 +1,78 @@
+// @bun
+// src/helpers/utils.ts
+import {buddyOptions, runCommand, runCommands} from "@stacksjs/cli";
+import {err} from "@stacksjs/error-handling";
+import {log} from "@stacksjs/logging";
+import * as p from "@stacksjs/path";
+import {glob} from "@stacksjs/storage";
+var {Glob } = globalThis.Bun;
+async function runAction(action, options) {
+  const glob2 = new Glob("**/*.ts");
+  const scanOptions = { cwd: p.userActionsPath(), onlyFiles: true };
+  for await (const file of glob2.scan(scanOptions)) {
+    log.debug("file", file);
+    if (file === `${action}.ts` || file.endsWith(`${action}.ts`))
+      return (await import(p.userActionsPath(file))).default.handle();
+    const a = await import(p.userActionsPath(file));
+    if (a.name === action)
+      return await a.handle();
+  }
+  const opts = buddyOptions();
+  const path = p.relativeActionsPath(`src/${action}.ts`);
+  const cmd = `bun --bun ${path} ${opts}`.trimEnd();
+  const optionsWithCwd = {
+    cwd: options?.cwd || p.projectPath(),
+    ...options
+  };
+  log.debug("runAction:", cmd);
+  log.debug("action options:", optionsWithCwd);
+  return await runCommand(cmd, optionsWithCwd);
+}
+async function runActions(actions, options) {
+  log.debug("runActions:", actions, options);
+  if (!actions.length)
+    return err("No actions were specified");
+  for (const action of actions) {
+    log.debug(`running action "${action}"`);
+    if (!hasAction(action))
+      return err(`The specified action "${action}" does not exist`);
+  }
+  const opts = buddyOptions();
+  const o = {
+    cwd: options?.cwd || p.projectPath(),
+    ...options
+  };
+  const commands = actions.map((action) => `bun --bun ${p.relativeActionsPath(`src/${action}.ts`)} ${opts}`);
+  log.debug("commands:", commands);
+  return await runCommands(commands, o);
+}
+function hasAction(action) {
+  const userActionPatterns = [
+    `${action}.ts`,
+    `${action}`,
+    `Dashboard/${action}.ts`,
+    `Dashboard/${action}`,
+    `Buddy/${action}.ts`,
+    `Buddy/${action}`
+  ];
+  const actionPatterns = [`src/${action}.ts`, `src/${action}`, `${action}.ts`, `${action}`];
+  const userActionFiles = glob.sync(userActionPatterns.map((pattern) => p.userActionsPath(pattern)));
+  const actionFiles = glob.sync(actionPatterns.map((pattern) => p.actionsPath(pattern)));
+  return userActionFiles.length > 0 || actionFiles.length > 0;
+}
+
+// src/upgrade/index.ts
+import process from "process";
+import {parseArgs} from "@stacksjs/cli";
+import {Action} from "@stacksjs/enums";
+import {ExitCode} from "@stacksjs/types";
+var options = parseArgs();
+if (options?.dependencies || options?.all)
+  await runAction(Action.UpgradeDeps, options);
+if (options?.bun || options?.all)
+  await runAction(Action.UpgradeBun, options);
+if (options?.shell || options?.all)
+  await runAction(Action.UpgradeShell, options);
+if (options?.binary || options?.all)
+  await runAction(Action.UpgradeBinary, options);
+process.exit(ExitCode.InvalidArgument);

package/dist/upgrade.js

@@ -0,0 +1,46 @@
+// @bun
+// src/upgrade.ts
+import process from "process";
+import {intro, outro, runCommand} from "@stacksjs/cli";
+import {NpmScript} from "@stacksjs/enums";
+import {log} from "@stacksjs/logging";
+import {projectPath} from "@stacksjs/path";
+import * as storage from "@stacksjs/storage";
+// package.json
+var version = "0.61.0";
+
+// src/upgrade.ts
+function checkForUncommittedChanges(options) {
+  try {
+  } catch (error) {
+  }
+}
+async function downloadFrameworkUpdate(options) {
+  const tempFolderName = "updates";
+  const tempUpdatePath = projectPath(tempFolderName);
+  if (storage.doesFolderExist(tempUpdatePath))
+    await storage.deleteFolder(tempUpdatePath);
+  log.info("Downloading framework updates...");
+  await runCommand(`giget stacks ${tempFolderName}`, options);
+  log.success(`Your framework updated correctly to version: v${version}`);
+}
+async function updateDependencies() {
+  const perf = await intro("buddy upgrade:dependencies");
+  const result = await runCommand(NpmScript.UpgradeDependencies, {
+    cwd: projectPath()
+  });
+  if (result.isErr()) {
+    await outro("While running the upgrade:dependencies command, there was an issue", { startTime: perf, useSeconds: true }, result.error);
+    process.exit();
+  }
+  await outro("Freshly updated your dependencies.", {
+    startTime: perf,
+    useSeconds: true
+  });
+  process.exit();
+}
+export {
+  updateDependencies,
+  downloadFrameworkUpdate,
+  checkForUncommittedChanges
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/actions",
   "type": "module",
-  "version": "0.59.10",
+  "version": "0.61.0",
   "description": "The Stacks actions.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -67,8 +67,8 @@
     "@stacksjs/types": "latest",
     "@stacksjs/utils": "latest",
     "@stacksjs/validation": "latest",
-    "markdown-it": "^14.0.0",
-    "vue-component-meta": "^2.0.5"
+    "markdown-it": "^14.1.0",
+    "vue-component-meta": "^2.0.19"
   },
   "dependencies": {
     "@stacksjs/cli": "latest",
@@ -85,8 +85,8 @@
     "@stacksjs/strings": "latest",
     "@stacksjs/utils": "latest",
     "@stacksjs/validation": "latest",
-    "markdown-it": "^14.0.0",
-    "vue-component-meta": "^2.0.5"
+    "markdown-it": "^14.1.0",
+    "vue-component-meta": "^2.0.19"
   },
   "devDependencies": {
     "@stacksjs/development": "latest"

package/src/action.ts

@@ -18,6 +18,7 @@ interface Request {
 interface ActionOptions {
   name?: string
   description?: string
+  apiResponse?: boolean
   fields?: Record<FieldKey, FieldValue>
   path?: string
   rate?: JobOptions['rate']

package/src/actions.ts

@@ -1,2 +1,2 @@
-export * from './helpers'
-export * as actions from './helpers'
+export * from './helpers/utils'
+export * as actions from './helpers/utils'

package/src/add.ts

@@ -2,11 +2,9 @@ import { installPackage } from '@stacksjs/cli'
 import type { AddOptions } from '@stacksjs/types'
 
 export async function invoke(options: AddOptions) {
-  if (options?.table)
-    await addTable()
+  if (options?.table) await addTable()
 
-  if (options?.calendar)
-    await addCalendar()
+  if (options?.calendar) await addCalendar()
 }
 
 export async function add(options: AddOptions) {
@@ -22,6 +20,5 @@ export async function addCalendar() {
 }
 
 export async function installPackages(names: string[]) {
-  for (const name of names)
-    await installPackage(name)
+  for (const name of names) await installPackage(name)
 }

package/src/ai/request-model-access.ts

@@ -1,11 +1,11 @@
 import process from 'node:process'
 import * as AWS4 from 'aws4'
 
-// todo: Remove axios and use the AWS SDK instead if possible, but I couldn't get it to work. At least, move to our own fetch wrapper
-import axios from 'axios'
-import { config } from 'aws-sdk'
 import { log } from '@stacksjs/cli'
 import { ai } from '@stacksjs/config'
+import { config } from 'aws-sdk'
+// todo: Remove axios and use the AWS SDK instead if possible, but I couldn't get it to work. At least, move to our own fetch wrapper
+import axios from 'axios'
 
 // Specify the AWS profile
 // process.env.AWS_PROFILE = 'your-profile-name' -> no need to define this because of our .env file
@@ -14,8 +14,7 @@ process.env.AWS_REGION = 'us-east-1'
 config.getCredentials((err) => {
   if (err) {
     log.info(err.stack)
-  }
-  else if (config.credentials) {
+  } else if (config.credentials) {
     const { accessKeyId, secretAccessKey, sessionToken } = config.credentials
     log.info('AWS credentials are set', accessKeyId, secretAccessKey, sessionToken)
 
@@ -39,7 +38,7 @@ config.getCredentials((err) => {
         path: '/foundation-model-entitlement',
         headers: {
           'Content-Type': 'application/json',
-          'authority': 'http://bedrock.us-east-1.amazonaws.com',
+          authority: 'http://bedrock.us-east-1.amazonaws.com',
         },
         body: JSON.stringify({ modelId: model }), // use the current model in the loop
         service,
@@ -47,7 +46,11 @@ config.getCredentials((err) => {
       }
 
       // Sign the request
-      const signedRequest = AWS4.sign(request, { accessKeyId, secretAccessKey, sessionToken })
+      const signedRequest = AWS4.sign(request, {
+        accessKeyId,
+        secretAccessKey,
+        sessionToken,
+      })
 
       // Convert headers to the correct type
       const axiosHeaders = Object.fromEntries(

package/src/build/component-libs.ts

@@ -1,5 +1,8 @@
-import { frameworkPath } from '@stacksjs/path'
 import { runCommand } from '@stacksjs/cli'
 import { NpmScript } from '@stacksjs/enums'
+import { frameworkPath } from '@stacksjs/path'
 
-await runCommand(NpmScript.BuildComponents, { cwd: frameworkPath(), verbose: true })
+await runCommand(NpmScript.BuildComponents, {
+  cwd: frameworkPath(),
+  verbose: true,
+})

package/src/build/core.ts

@@ -1,7 +1,7 @@
 import process from 'node:process'
-import { glob } from '@stacksjs/storage'
 import { dim, italic, log } from '@stacksjs/cli'
 import { corePath } from '@stacksjs/path'
+import { glob } from '@stacksjs/storage'
 import { ExitCode } from '@stacksjs/types'
 import { $ } from 'bun'
 
@@ -21,7 +21,6 @@ for (const folder of dirs) {
   await $`bun run build`
   log.success(`${italic(dim(folder))} built`)
 
-  // eslint-disable-next-line no-console
   console.log(``)
 }
 

package/src/build/stacks.ts

@@ -1,7 +1,10 @@
-import { frameworkPath } from '@stacksjs/path'
 import { runCommands } from '@stacksjs/cli'
+import { frameworkPath } from '@stacksjs/path'
 
-await runCommands([
-  'bun build:cli', // command to build the Buddy CLI
-  'bun build:core', // command to build the Stacks Core
-], { verbose: true, cwd: frameworkPath() })
+await runCommands(
+  [
+    'bun build:cli', // command to build the Buddy CLI
+    'bun build:core', // command to build the Stacks Core
+  ],
+  { verbose: true, cwd: frameworkPath() },
+)

package/src/build.ts

@@ -1,28 +1,17 @@
+import { NpmScript } from '@stacksjs/enums'
 import { log } from '@stacksjs/logging'
 import { hasComponents, hasFunctions } from '@stacksjs/storage'
-import { runNpmScript } from '@stacksjs/utils'
 import type { BuildOptions } from '@stacksjs/types'
-import { NpmScript } from '@stacksjs/enums'
+import { runNpmScript } from '@stacksjs/utils'
 import { generateTypes } from './generate'
 
 export async function invoke(options: BuildOptions) {
-  if (options.components)
-    await componentLibraries(options)
-
-  else if (options.vueComponents)
-    await vueComponentLibrary(options)
-
-  else if (options.webComponents || options.elements)
-    await webComponentLibrary(options)
-
-  else if (options.functions)
-    await functionsLibrary(options)
-
-  else if (options.docs)
-    await docs(options)
-
-  else if (options.stacks)
-    await stacks(options)
+  if (options.components) await componentLibraries(options)
+  else if (options.vueComponents) await vueComponentLibrary(options)
+  else if (options.webComponents || options.elements) await webComponentLibrary(options)
+  else if (options.functions) await functionsLibrary(options)
+  else if (options.docs) await docs(options)
+  else if (options.stacks) await stacks(options)
 
   await generateTypes()
 }
@@ -42,8 +31,7 @@ export async function vueComponentLibrary(options: BuildOptions) {
     log.info('Building your component library...')
     await runNpmScript(NpmScript.BuildComponents, options)
     log.success('Your component library was built successfully')
-  }
-  else {
+  } else {
     // todo: throw custom error here
     log.warn('No components found.')
     log.info('Before you can build components,')
@@ -57,8 +45,7 @@ export async function webComponentLibrary(options: BuildOptions) {
   if (hasComponents()) {
     await runNpmScript(NpmScript.BuildWebComponents, options)
     log.success('Your Web Component library was built successfully')
-  }
-  else {
+  } else {
     // todo: throw custom error here
     log.info('No components found.')
   }
@@ -82,8 +69,7 @@ export async function functionsLibrary(options: BuildOptions) {
     log.info('Production usages include: manual npm distribution and/or CDN distribution')
     await runNpmScript(NpmScript.BuildFunctions, options)
     log.success('Functions library built successfully')
-  }
-  else {
+  } else {
     log.info('No functions found')
   }
 }

package/src/bump.ts

@@ -12,9 +12,7 @@ const bumpCommand = options?.dryRun
   ? 'bunx bumpp ./package.json ./**/package.json ../ide/vscode/package.json --no-push'
   : 'bunx bumpp ./package.json ./**/package.json ../ide/vscode/package.json --all'
 
-// eslint-disable-next-line no-console
 console.log(`Running: ${bumpCommand}`)
-// eslint-disable-next-line no-console
 console.log(`In frameworkPath: ${p.frameworkPath()}`)
 
 await runCommand(bumpCommand, {

package/src/check/ports.ts

@@ -1,7 +1,7 @@
 import process from 'node:process'
-import { $ } from 'bun'
-import { findStacksProjects } from '@stacksjs/utils'
 import { log } from '@stacksjs/logging'
+import { findStacksProjects } from '@stacksjs/utils'
+import { $ } from 'bun'
 
 const projects = await findStacksProjects(undefined, { quiet: true })
 
@@ -18,7 +18,6 @@ for (const project of projects) {
   $.cwd(project)
   const ports = await $`./buddy ports --project ${project} --quiet`.text()
 
-  // eslint-disable-next-line no-console
   console.log('ports', ports)
 }
 

package/src/commit.ts

@@ -1,7 +1,7 @@
+import { NpmScript } from '@stacksjs/enums'
 import { log } from '@stacksjs/logging'
-import { runNpmScript } from '@stacksjs/utils'
 import type { CleanOptions } from '@stacksjs/types'
-import { NpmScript } from '@stacksjs/enums'
+import { runNpmScript } from '@stacksjs/utils'
 
 export async function invoke(options: CleanOptions) {
   log.info('Committing...')

package/src/copy-types.ts

@@ -18,5 +18,5 @@ destinations.forEach(([src, dest]) => {
   // const srcPath = resolve(__filename, '..', src)
   // const destPath = resolve(__filename, '..', dest)
 
-  copyFolder(src!, dest!)
+  copyFolder(src as string, dest as string)
 })

package/src/database/seed.ts

@@ -1,4 +1,8 @@
-// import { database } from '@stacksjs/config'
-// import { seed } from '@stacksjs/database'
-//
-// await seed()
+import process from 'node:process'
+import { log } from '@stacksjs/cli'
+import { seed } from '@stacksjs/database'
+
+log.info('Seeding database...')
+await seed()
+
+process.exit(0)

package/src/deploy/create-receipt-rule.ts

@@ -1,7 +1,7 @@
 import process from 'node:process'
-import { log } from '@stacksjs/cli'
 import { S3 } from '@aws-sdk/client-s3'
 import { SES } from '@aws-sdk/client-ses'
+import { log } from '@stacksjs/cli'
 import { ExitCode } from '@stacksjs/types'
 
 const ses = new SES({ apiVersion: '2010-12-01' })
@@ -16,14 +16,11 @@ const s3 = new S3({ apiVersion: '2006-03-01' })
 let bucketName: string | undefined
 const data = await s3.listBuckets({})
 
-if (data.Buckets)
-  bucketName = data.Buckets.find(bucket => bucket.Name && bucket.Name.includes('-email-'))?.Name
+if (data.Buckets) bucketName = data.Buckets.find((bucket) => bucket.Name?.includes('-email-'))?.Name
 
-// eslint-disable-next-line no-console
 console.log('Bucket Name:', bucketName)
 
 if (!bucketName) {
-  // eslint-disable-next-line no-console
   console.log('Stacks Email Bucket not found')
   process.exit(ExitCode.FatalError)
 }
@@ -49,7 +46,6 @@ const params: any = {
 try {
   const data = await ses.createReceiptRule(params)
   log.info('Success', data)
-}
-catch (error) {
+} catch (error) {
   console.error(error)
 }

package/src/deploy/index.ts

@@ -14,7 +14,8 @@ if (storage.hasFiles(p.projectPath('docs'))) {
   })
 }
 
-if (config.app.docMode !== true) { // when in docMode, we can disregard building views
+if (config.app.docMode !== true) {
+  // when in docMode, we can disregard building views
   await runCommand('bun run build', {
     cwd: p.frameworkPath('views'),
   })

package/src/dev/api.ts

@@ -1,18 +1,18 @@
-import { path as p } from '@stacksjs/path'
 import { log, parseOptions, runCommand } from '@stacksjs/cli'
-import { serve } from '@stacksjs/router'
 import { config } from '@stacksjs/config'
+import { path as p } from '@stacksjs/path'
+import { serve } from '@stacksjs/router'
 
 const options = parseOptions()
 
-log.debug('Running API dev server via', `bunx vite --config ${p.vitePath('src/api.ts')}`, options)
+log.debug('Running API dev server via', `bunx vite --config ${p.viteConfigPath('src/api.ts')}`, options)
 
 serve({
   port: config.ports?.api, // defaults to 3008
 })
 
 // the reason we start a Vite dev server next is because we need the Bun server proxied by vite
-await runCommand(`bunx vite --config ${p.vitePath('src/api.ts')}`, {
+await runCommand(`bunx vite --config ${p.viteConfigPath('src/api.ts')}`, {
   // ...options,
   cwd: p.frameworkPath(),
 })

package/src/dev/components.ts

@@ -1,14 +1,12 @@
-import { frameworkPath, vitePath } from '@stacksjs/path'
 import { parseOptions, runCommand } from '@stacksjs/cli'
+import { frameworkPath, viteConfigPath } from '@stacksjs/path'
 import type { DeployOptions } from '@stacksjs/types'
 
 const options: DeployOptions = parseOptions()
 
-if (options.verbose)
-// eslint-disable-next-line no-console
-  console.log('dev components options', options)
+if (options.verbose) console.log('dev components options', options)
 
-await runCommand(`bunx vite --config ${vitePath('src/components.ts')}`, {
+await runCommand(`bunx vite --config ${viteConfigPath('src/components.ts')}`, {
   ...options,
   cwd: frameworkPath(),
 })

package/src/dev/index.ts

@@ -1,7 +1,7 @@
+import { Action } from '@stacksjs/enums'
 import { log } from '@stacksjs/logging'
 import type { DevOptions } from '@stacksjs/types'
-import { Action } from '@stacksjs/enums'
-import { runAction } from '../helpers/utils'
+import { runAction } from '../helpers'
 
 export async function runDevServer(options: DevOptions) {
   log.info('Starting your Frontend Engine...')

package/src/domains/add.ts

@@ -1,16 +1,19 @@
 import process from 'node:process'
-import { createHostedZone, getNameservers, updateNameservers } from '@stacksjs/dns'
-import { app } from '@stacksjs/config'
 import { italic, log, parseOptions, runCommand } from '@stacksjs/cli'
-import { whois } from '@stacksjs/whois'
+import { app } from '@stacksjs/config'
+import { createHostedZone, getNameservers, updateNameservers } from '@stacksjs/dns'
+import { handleError } from '@stacksjs/error-handling'
 import { logger } from '@stacksjs/logging'
 import { projectConfigPath } from '@stacksjs/path'
+import { whois } from '@stacksjs/whois'
 
 const options = parseOptions()
 const domain = (options.domain as string | undefined) ?? app.url
 
 if (!domain) {
-  log.error('There was no Domain or App URL provided. Please provide a domain using the --domain flag or add a url to your app config.')
+  log.error(
+    'There was no Domain or App URL provided. Please provide a domain using the --domain flag or add a url to your app config.',
+  )
   process.exit(1)
 }
 
@@ -38,8 +41,7 @@ const registrar: string = (await whois(domain, true)).parsedData.Registrar
 if (registrar.includes('Amazon')) {
   if (options.deploy) {
     await runCommand('buddy deploy')
-  }
-  else {
+  } else {
     logger.log('')
     logger.log('You can now continue your deployment process by re-running:')
     logger.log('')

package/src/domains/purchase.ts

@@ -1,4 +1,6 @@
 import process from 'node:process'
+import type { CountryCode } from '@aws-sdk/client-route-53-domains'
+import { ContactType } from '@aws-sdk/client-route-53-domains'
 import { log, parseOptions } from '@stacksjs/cli'
 import type { PurchaseOptions } from '@stacksjs/cloud'
 import { purchaseDomain } from '@stacksjs/cloud'
@@ -24,36 +26,36 @@ const defaultOptions: PurchaseOptions = {
   registrantAddressLine2: c.addressLine2 as string,
   registrantCity: c.city as string,
   registrantState: c.state as string,
-  registrantCountry: c.countryCode as string,
+  registrantCountry: c.countryCode as CountryCode,
   registrantZip: c.zip as string,
   registrantPhone: c.phoneNumber as string,
   registrantEmail: c.email as string,
-  adminFirstName: c.admin?.firstName || c.firstName as string,
-  adminLastName: c.admin?.lastName || c.lastName as string,
-  adminOrganization: c.admin?.organizationName || c.organizationName as string,
-  adminAddressLine1: c.admin?.addressLine1 || c.addressLine1 as string,
-  adminAddressLine2: c.admin?.addressLine2 || c.addressLine2 as string,
-  adminCity: c.admin?.city || c.city as string,
-  adminState: c.admin?.state || c.state as string,
-  adminCountry: c.admin?.countryCode || c.countryCode as string,
-  adminZip: c.admin?.zip || c.zip as string,
-  adminPhone: c.admin?.phoneNumber as string || c.phoneNumber as string,
-  adminEmail: c.admin?.email || c.email as string,
-  techFirstName: c.tech?.firstName || c.firstName as string,
-  techLastName: c.tech?.lastName || c.lastName as string,
-  techOrganization: c.tech?.organizationName || c.organizationName as string,
-  techAddressLine1: c.tech?.addressLine1 || c.addressLine1 as string,
-  techAddressLine2: c.tech?.addressLine2 || c.addressLine2 as string,
-  techCity: c.tech?.city || c.city as string,
-  techState: c.tech?.state || c.state as string,
-  techCountry: c.tech?.countryCode || c.countryCode as string,
-  techZip: c.tech?.zip || c.zip as string,
-  techPhone: c.tech?.phoneNumber as string || c.phoneNumber as string,
-  techEmail: c.tech?.email || c.email as string,
+  adminFirstName: c.admin?.firstName || (c.firstName as string),
+  adminLastName: c.admin?.lastName || (c.lastName as string),
+  adminOrganization: c.admin?.organizationName || (c.organizationName as string),
+  adminAddressLine1: c.admin?.addressLine1 || (c.addressLine1 as string),
+  adminAddressLine2: c.admin?.addressLine2 || (c.addressLine2 as string),
+  adminCity: c.admin?.city || (c.city as string),
+  adminState: c.admin?.state || (c.state as string),
+  adminCountry: (c.admin?.countryCode as CountryCode) || (c.countryCode as string),
+  adminZip: c.admin?.zip || (c.zip as string),
+  adminPhone: (c.admin?.phoneNumber as string) || (c.phoneNumber as string),
+  adminEmail: c.admin?.email || (c.email as string),
+  techFirstName: c.tech?.firstName || (c.firstName as string),
+  techLastName: c.tech?.lastName || (c.lastName as string),
+  techOrganization: c.tech?.organizationName || (c.organizationName as string),
+  techAddressLine1: c.tech?.addressLine1 || (c.addressLine1 as string),
+  techAddressLine2: c.tech?.addressLine2 || (c.addressLine2 as string),
+  techCity: c.tech?.city || (c.city as string),
+  techState: c.tech?.state || (c.state as string),
+  techCountry: (c.tech?.countryCode as CountryCode) || (c.countryCode as string),
+  techZip: c.tech?.zip || (c.zip as string),
+  techPhone: (c.tech?.phoneNumber as string) || (c.phoneNumber as string),
+  techEmail: c.tech?.email || (c.email as string),
   privacyAdmin: c.privacyAdmin || c.privacy || true,
   privacyTech: c.privacyTech || c.privacy || true,
   privacyRegistrant: c.privacyRegistrant || c.privacy || true,
-  contactType: 'person',
+  contactType: ContactType.PERSON,
   verbose: false,
 }