From e001291e0720b8414346a5e30e674b3d1846793a Mon Sep 17 00:00:00 2001
From: mshanemc <shane.mclaughlin@salesforce.com>
Date: Fri, 3 May 2024 08:47:08 -0500
Subject: [PATCH 1/3] fix: use new salesforce/types

---
 package.json                                  |  14 +-
 src/commands/schema/generate/field.ts         |   5 +-
 src/commands/schema/generate/platformevent.ts |   4 +-
 src/commands/schema/generate/sobject.ts       |   2 +-
 src/commands/schema/generate/tab.ts           |   4 +-
 src/shared/convert.ts                         |   2 +-
 src/shared/fs.ts                              |   2 +-
 src/shared/prompts/apiName.ts                 |   2 +-
 src/shared/prompts/description.ts             |   2 +-
 src/shared/prompts/fields/number.ts           |   2 +-
 src/shared/prompts/nameField.ts               |   5 +-
 src/shared/prompts/picklist.ts                |   4 +-
 src/shared/prompts/plural.ts                  |   2 +-
 src/shared/prompts/relationshipField.ts       |   6 +-
 src/shared/types.ts                           |  17 +-
 test/shared/convert.test.ts                   |   2 +-
 test/shared/prompts.test.ts                   |   2 +-
 yarn.lock                                     | 363 ++++++------------
 18 files changed, 147 insertions(+), 293 deletions(-)

diff --git a/package.json b/package.json
index 4e8da3e4..a5c7e263 100644
--- a/package.json
+++ b/package.json
@@ -5,13 +5,13 @@
   "author": "Salesforce",
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "dependencies": {
-    "@inquirer/confirm": "^2.0.17",
-    "@inquirer/input": "^1.2.16",
-    "@inquirer/select": "^1.3.3",
-    "@oclif/core": "^3.26.3",
-    "@salesforce/core": "^7.3.1",
+    "@inquirer/confirm": "^3.1.6",
+    "@inquirer/input": "^2.1.6",
+    "@inquirer/select": "^2.3.2",
+    "@oclif/core": "^3.26.5",
+    "@salesforce/core": "^7.3.3",
     "@salesforce/kit": "^3.1.0",
-    "@salesforce/sf-plugins-core": "^9.0.5",
+    "@salesforce/sf-plugins-core": "^9.0.7",
     "fast-glob": "^3.3.2",
     "fast-xml-parser": "^4.3.6",
     "js2xmlparser": "^4.0.2"
@@ -21,7 +21,7 @@
     "@salesforce/cli-plugins-testkit": "^5.3.1",
     "@salesforce/dev-scripts": "^9.0.0",
     "@salesforce/plugin-command-reference": "^3.0.82",
-    "@types/inquirer": "^8.2.0",
+    "@salesforce/types": "^1.1.0",
     "eslint-plugin-sf-plugin": "^1.18.2",
     "oclif": "^4.9.0",
     "ts-node": "^10.9.2",
diff --git a/src/commands/schema/generate/field.ts b/src/commands/schema/generate/field.ts
index 8873a512..b1cbc9d0 100644
--- a/src/commands/schema/generate/field.ts
+++ b/src/commands/schema/generate/field.ts
@@ -14,7 +14,7 @@ import confirm from '@inquirer/confirm';
 import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
 import { Messages } from '@salesforce/core';
 import type { AnyJson } from '@salesforce/ts-types';
-import type { CustomField } from '@jsforce/jsforce-node/lib/api/metadata.js';
+import type { CustomField } from '@salesforce/types/metadata';
 import { convertJsonToXml } from '../../../shared/convert.js';
 import { picklistPrompts } from '../../../shared/prompts/picklist.js';
 import { integerValidation } from '../../../shared/prompts/functions.js';
@@ -73,9 +73,8 @@ type SaveableCustomField = Pick<
   | 'startingNumber'
   | 'defaultValue'
   | 'securityClassification'
+  | 'displayLocationInDecimal'
 > & {
-  // TODO: get displayLocationInDecimal into jsforce2 typings
-  displayLocationInDecimal?: boolean;
   type: (typeof supportedFieldTypesCustomObject)[number];
 };
 
diff --git a/src/commands/schema/generate/platformevent.ts b/src/commands/schema/generate/platformevent.ts
index 33c09c27..42a40c66 100644
--- a/src/commands/schema/generate/platformevent.ts
+++ b/src/commands/schema/generate/platformevent.ts
@@ -6,7 +6,7 @@
  */
 import { dirname } from 'node:path';
 import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
-import { Messages } from '@salesforce/core';
+import { Messages } from '@salesforce/core/messages';
 import select from '@inquirer/select';
 import type { AnyJson } from '@salesforce/ts-types';
 import { apiNamePrompt } from '../../../shared/prompts/apiName.js';
@@ -54,7 +54,7 @@ export default class PlatformEventGenerate extends SfCommand<PlatformEventGenera
       description: await descriptionPrompt(),
       publishBehavior: await select({
         message: messages.getMessage('prompts.publishBehavior'),
-        choices: ['PublishImmediately', 'PublishAfterCommit'].map(toSelectOption),
+        choices: (['PublishImmediately', 'PublishAfterCommit'] as const).map(toSelectOption),
       }),
       deploymentStatus: 'Deployed',
       eventType: 'HighVolume',
diff --git a/src/commands/schema/generate/sobject.ts b/src/commands/schema/generate/sobject.ts
index 0f0ba3c2..837df674 100644
--- a/src/commands/schema/generate/sobject.ts
+++ b/src/commands/schema/generate/sobject.ts
@@ -8,7 +8,7 @@ import { dirname } from 'node:path';
 import select from '@inquirer/select';
 import confirm from '@inquirer/confirm';
 import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
-import { Messages } from '@salesforce/core';
+import { Messages } from '@salesforce/core/messages';
 import { nameFieldPrompts } from '../../../shared/prompts/nameField.js';
 import { apiNamePrompt } from '../../../shared/prompts/apiName.js';
 import { pluralPrompt } from '../../../shared/prompts/plural.js';
diff --git a/src/commands/schema/generate/tab.ts b/src/commands/schema/generate/tab.ts
index b1f449dd..e446b647 100644
--- a/src/commands/schema/generate/tab.ts
+++ b/src/commands/schema/generate/tab.ts
@@ -9,8 +9,8 @@ import fs from 'node:fs';
 import path from 'node:path';
 
 import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
-import { Messages } from '@salesforce/core';
-import type { CustomTab } from '@jsforce/jsforce-node/lib/api/metadata.js';
+import { Messages } from '@salesforce/core/messages';
+import type { CustomTab } from '@salesforce/types/metadata';
 import { isTabsFolder } from '../../../shared/flags.js';
 import { convertJsonToXml } from '../../../shared/convert.js';
 
diff --git a/src/shared/convert.ts b/src/shared/convert.ts
index 774e0de2..d05f24b4 100644
--- a/src/shared/convert.ts
+++ b/src/shared/convert.ts
@@ -7,7 +7,7 @@
 import * as jsToXml from 'js2xmlparser';
 import { XMLParser } from 'fast-xml-parser';
 import type { IOptions } from 'js2xmlparser/lib/options.js';
-import type { CustomObject, CustomField } from '@jsforce/jsforce-node/lib/api/metadata.js';
+import type { CustomObject, CustomField } from '@salesforce/types/metadata';
 import type { JsonMap } from '@salesforce/ts-types';
 
 const standardOptions: IOptions = {
diff --git a/src/shared/fs.ts b/src/shared/fs.ts
index 48dbb5a8..77aaaa80 100644
--- a/src/shared/fs.ts
+++ b/src/shared/fs.ts
@@ -7,7 +7,7 @@
 import path from 'node:path';
 import fs from 'node:fs';
 import fg from 'fast-glob';
-import type { CustomObject } from '@jsforce/jsforce-node/lib/api/metadata.js';
+import type { CustomObject } from '@salesforce/types/metadata';
 import { convertJsonToXml, parseXml } from './convert.js';
 import { SaveableCustomObject, SaveablePlatformEvent } from './types.js';
 
diff --git a/src/shared/prompts/apiName.ts b/src/shared/prompts/apiName.ts
index 47fd12ef..c6981d9c 100644
--- a/src/shared/prompts/apiName.ts
+++ b/src/shared/prompts/apiName.ts
@@ -6,7 +6,7 @@
  */
 
 import input from '@inquirer/input';
-import { Messages } from '@salesforce/core';
+import { Messages } from '@salesforce/core/messages';
 import { makeNameApiCompatible } from './functions.js';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
diff --git a/src/shared/prompts/description.ts b/src/shared/prompts/description.ts
index dd9111c8..b07e0997 100644
--- a/src/shared/prompts/description.ts
+++ b/src/shared/prompts/description.ts
@@ -4,7 +4,7 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import { Messages } from '@salesforce/core';
+import { Messages } from '@salesforce/core/messages';
 import input from '@inquirer/input';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
diff --git a/src/shared/prompts/fields/number.ts b/src/shared/prompts/fields/number.ts
index 010c7ef6..d8f18288 100644
--- a/src/shared/prompts/fields/number.ts
+++ b/src/shared/prompts/fields/number.ts
@@ -5,7 +5,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 import input from '@inquirer/input';
-import { Messages } from '@salesforce/core';
+import { Messages } from '@salesforce/core/messages';
 import { integerValidation } from '../functions.js';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
diff --git a/src/shared/prompts/nameField.ts b/src/shared/prompts/nameField.ts
index 5eb2ad1d..428b6d0f 100644
--- a/src/shared/prompts/nameField.ts
+++ b/src/shared/prompts/nameField.ts
@@ -5,10 +5,11 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import { Messages } from '@salesforce/core';
+import { Messages } from '@salesforce/core/messages';
 import input from '@inquirer/input';
 import select from '@inquirer/select';
 
+import { FieldType } from '@salesforce/types/metadata';
 import { NameField } from '../types.js';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
@@ -21,7 +22,7 @@ export const nameFieldPrompts = async (objectLabel: string): Promise<NameField>
     default: `${objectLabel} Name`,
   });
 
-  const type = await select({
+  const type = await select<FieldType>({
     message: messages.getMessage('nameFieldPrompts.type'),
     default: 'Text',
     choices: [{ value: 'Text' }, { value: 'AutoNumber' }],
diff --git a/src/shared/prompts/picklist.ts b/src/shared/prompts/picklist.ts
index d22e88ed..a832ea66 100644
--- a/src/shared/prompts/picklist.ts
+++ b/src/shared/prompts/picklist.ts
@@ -4,9 +4,9 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import type { ValueSet, CustomValue } from '@jsforce/jsforce-node/lib/api/metadata.js';
+import type { ValueSet, CustomValue } from '@salesforce/types/metadata';
 import input from '@inquirer/input';
-import { Messages } from '@salesforce/core';
+import { Messages } from '@salesforce/core/messages';
 
 /**
  * recursively keep adding picklist values until the user says to stop
diff --git a/src/shared/prompts/plural.ts b/src/shared/prompts/plural.ts
index 00e07398..3a90de37 100644
--- a/src/shared/prompts/plural.ts
+++ b/src/shared/prompts/plural.ts
@@ -5,7 +5,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 import input from '@inquirer/input';
-import { Messages } from '@salesforce/core';
+import { Messages } from '@salesforce/core/messages';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 export const messages = Messages.loadMessages('@salesforce/plugin-sobject', 'prompts.shared');
diff --git a/src/shared/prompts/relationshipField.ts b/src/shared/prompts/relationshipField.ts
index 3690e684..617a3f1a 100644
--- a/src/shared/prompts/relationshipField.ts
+++ b/src/shared/prompts/relationshipField.ts
@@ -8,7 +8,7 @@ import path from 'node:path';
 import input from '@inquirer/input';
 import confirm from '@inquirer/confirm';
 import select from '@inquirer/select';
-import type { CustomField } from '@jsforce/jsforce-node/lib/api/metadata.js';
+import type { CustomField, DeleteConstraint } from '@salesforce/types/metadata';
 import { Messages, type NamedPackageDir } from '@salesforce/core';
 import { getObjectXmlByFolderAsJson } from '../fs.js';
 import { objectPrompt } from './object.js';
@@ -68,10 +68,10 @@ const masterDetailPrompts = async (): Promise<
   }),
 });
 
-const deleteConstraintPrompt = async (): Promise<string> =>
+const deleteConstraintPrompt = async (): Promise<DeleteConstraint> =>
   select({
     message: messages.getMessage('lookupDeleteConstraint'),
-    default: 'setNull',
+    default: 'SetNull',
     choices: [
       {
         value: 'SetNull',
diff --git a/src/shared/types.ts b/src/shared/types.ts
index 7642336d..b7d0d4e5 100644
--- a/src/shared/types.ts
+++ b/src/shared/types.ts
@@ -5,27 +5,18 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import type { CustomObject, CustomField } from '@jsforce/jsforce-node/lib/api/metadata.js';
+import type { CustomObject, CustomField } from '@salesforce/types/metadata';
 
 /** Used by classical CustomObject */
 export type NameField = Pick<CustomField, 'label' | 'type' | 'displayFormat'>;
 
-/**
- * There are a lot of properties that we don't, and some that jsforce thinks are mandatory that aren't.
- * Many apply to the various sub-species (mdt, external, events)
- *
- * This type represents a PlatformEvent that can deploy.
- */ export type SaveablePlatformEvent = Pick<
+/** This type represents a PlatformEvent that can deploy.*/
+export type SaveablePlatformEvent = Pick<
   CustomObject,
   'fullName' | 'label' | 'deploymentStatus' | 'description' | 'pluralLabel' | 'eventType' | 'publishBehavior'
 >;
 
-/**
- * There are a lot of properties that we don't, and some that jsforce thinks are mandatory that aren't.
- * Many apply to the various sub-species (mdt, external, events)
- *
- * This type represents a "classical" CustomObject subset that can deploy.
- */
+/** This type represents a "classical" CustomObject subset that can deploy. */
 export type SaveableCustomObject = Pick<
   CustomObject,
   | 'label'
diff --git a/test/shared/convert.test.ts b/test/shared/convert.test.ts
index 64a61f47..72d71080 100644
--- a/test/shared/convert.test.ts
+++ b/test/shared/convert.test.ts
@@ -5,7 +5,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 import { expect } from 'chai';
-import type { CustomObject } from '@jsforce/jsforce-node/lib/api/metadata.js';
+import type { CustomObject } from '@salesforce/types/metadata';
 import { parseXml } from '../../src/shared/convert.js';
 
 // tests configurations of the xml parser
diff --git a/test/shared/prompts.test.ts b/test/shared/prompts.test.ts
index 3ec7dfb2..2140f245 100644
--- a/test/shared/prompts.test.ts
+++ b/test/shared/prompts.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { expect } from 'chai';
-import { Messages } from '@salesforce/core';
+import { Messages } from '@salesforce/core/messages';
 import { integerValidation, makeNameApiCompatible } from '../../src/shared/prompts/functions.js';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
diff --git a/yarn.lock b/yarn.lock
index ee2119e0..8cb827bb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1319,13 +1319,13 @@
     "@inquirer/type" "^1.1.6"
     chalk "^4.1.2"
 
-"@inquirer/confirm@^3.1.5":
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/@inquirer/confirm/-/confirm-3.1.5.tgz#21856f937bc8292eca4146c052271107f8ac949a"
-  integrity sha512-6+dwZrpko5vr5EFEQmUbfBVhtu6IsnB8lQNsLHgO9S9fbfS5J6MuUj+NY0h98pPpYZXEazLR7qzypEDqVzf6aQ==
+"@inquirer/confirm@^3.1.5", "@inquirer/confirm@^3.1.6":
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/@inquirer/confirm/-/confirm-3.1.6.tgz#e2b6bdfb2bf307a93024dc5325080b7b750c6c3f"
+  integrity sha512-Mj4TU29g6Uy+37UtpA8UpEOI2icBfpCwSW1QDtfx60wRhUy90s/kHPif2OXSSvuwDQT1lhAYRWUfkNf9Tecxvg==
   dependencies:
-    "@inquirer/core" "^8.0.1"
-    "@inquirer/type" "^1.3.0"
+    "@inquirer/core" "^8.1.0"
+    "@inquirer/type" "^1.3.1"
 
 "@inquirer/core@^6.0.0":
   version "6.0.0"
@@ -1347,13 +1347,13 @@
     strip-ansi "^6.0.1"
     wrap-ansi "^6.2.0"
 
-"@inquirer/core@^8.0.1":
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/@inquirer/core/-/core-8.0.1.tgz#ac3d9a34a6826dc193791b2feec19061a9c250ca"
-  integrity sha512-qJRk1y51Os2ARc11Bg2N6uIwiQ9qBSrmZeuMonaQ/ntFpb4+VlcQ8Gl1TFH67mJLz3HA2nvuave0nbv6Lu8pbg==
+"@inquirer/core@^8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@inquirer/core/-/core-8.1.0.tgz#ec8d298dbac1b850ffef8d918f8fe4f0848af91a"
+  integrity sha512-kfx0SU9nWgGe1f03ao/uXc85SFH1v2w3vQVH7QDGjKxdtJz+7vPitFtG++BTyJMYyYgH8MpXigutcXJeiQwVRw==
   dependencies:
     "@inquirer/figures" "^1.0.1"
-    "@inquirer/type" "^1.3.0"
+    "@inquirer/type" "^1.3.1"
     "@types/mute-stream" "^0.0.4"
     "@types/node" "^20.12.7"
     "@types/wrap-ansi" "^3.0.0"
@@ -1371,22 +1371,13 @@
   resolved "https://registry.yarnpkg.com/@inquirer/figures/-/figures-1.0.1.tgz#d65f0bd0e9511a90b4d3543ee6a3ce7211f29417"
   integrity sha512-mtup3wVKia3ZwULPHcbs4Mor8Voi+iIXEWD7wCNbIO6lYR62oPCTQyrddi5OMYVXHzeCSoneZwJuS8sBvlEwDw==
 
-"@inquirer/input@^1.2.16":
-  version "1.2.16"
-  resolved "https://registry.yarnpkg.com/@inquirer/input/-/input-1.2.16.tgz#94d8765a47689e799fd55ed0361dedc8f554341b"
-  integrity sha512-Ou0LaSWvj1ni+egnyQ+NBtfM1885UwhRCMtsRt2bBO47DoC1dwtCa+ZUNgrxlnCHHF0IXsbQHYtIIjFGAavI4g==
+"@inquirer/input@^2.1.1", "@inquirer/input@^2.1.6":
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/@inquirer/input/-/input-2.1.6.tgz#6f0bc5659252015ce75155c92831252c7b90cfe3"
+  integrity sha512-M8bUFOlcn/kQcVYskl4kkB6dYrHtymJJ1S4nSg/khXT3W3l71u2qhSzfo6PdBG3jUe6ILJZ0gUh4Kef2uJ5pxw==
   dependencies:
-    "@inquirer/core" "^6.0.0"
-    "@inquirer/type" "^1.1.6"
-    chalk "^4.1.2"
-
-"@inquirer/input@^2.1.1":
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/@inquirer/input/-/input-2.1.5.tgz#5d841b1afa821ceae8ef6e7cadebffbe84305958"
-  integrity sha512-z4l1ISps86JZXo1OsWt8IAh4nnyXjXwcu/na2pKFkDud6DC9TLxvDPWxHmq25T40/WZCULhMQuCMDV+VccVG+A==
-  dependencies:
-    "@inquirer/core" "^8.0.1"
-    "@inquirer/type" "^1.3.0"
+    "@inquirer/core" "^8.1.0"
+    "@inquirer/type" "^1.3.1"
 
 "@inquirer/password@^1.1.16":
   version "1.1.16"
@@ -1398,37 +1389,21 @@
     ansi-escapes "^4.3.2"
     chalk "^4.1.2"
 
-"@inquirer/select@^1.3.3":
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/@inquirer/select/-/select-1.3.3.tgz#7d832ee603c15b706148e47cda29cdf6634cd94b"
-  integrity sha512-RzlRISXWqIKEf83FDC9ZtJ3JvuK1l7aGpretf41BCWYrvla2wU8W8MTRNMiPrPJ+1SIqrRC1nZdZ60hD9hRXLg==
-  dependencies:
-    "@inquirer/core" "^6.0.0"
-    "@inquirer/type" "^1.1.6"
-    ansi-escapes "^4.3.2"
-    chalk "^4.1.2"
-    figures "^3.2.0"
-
-"@inquirer/select@^2.2.1":
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/@inquirer/select/-/select-2.3.1.tgz#dea077284bc29217d712e44672fd906be42d91af"
-  integrity sha512-UagbSdmSjeoukHLXqkDQi2ewiGEogUyxaOeKeH34Ngmc/2z+S8u4JsJWToMJNKIHjEtoTFdlYpFrxCxapp06nQ==
+"@inquirer/select@^2.2.1", "@inquirer/select@^2.3.2":
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/@inquirer/select/-/select-2.3.2.tgz#3c4768a223a38aea57b694cfd7d1c283df320570"
+  integrity sha512-VzLHVpaobBpI3o/CWSG2sCDqrjHZEYAfT1bowbR8Q72fEi0WfBO3Fnh595QqBit9kQhI1uJbVHaaovg1I7eE7Q==
   dependencies:
-    "@inquirer/core" "^8.0.1"
+    "@inquirer/core" "^8.1.0"
     "@inquirer/figures" "^1.0.1"
-    "@inquirer/type" "^1.3.0"
+    "@inquirer/type" "^1.3.1"
     ansi-escapes "^4.3.2"
     chalk "^4.1.2"
 
-"@inquirer/type@^1.1.6":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@inquirer/type/-/type-1.2.1.tgz#fbc7ab3a2e5050d0c150642d5e8f5e88faa066b8"
-  integrity sha512-xwMfkPAxeo8Ji/IxfUSqzRi0/+F2GIqJmpc5/thelgMGsjNZcjDDRBO9TLXT1s/hdx/mK5QbVIvgoLIFgXhTMQ==
-
-"@inquirer/type@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@inquirer/type/-/type-1.3.0.tgz#9dcb4e0e8bbec03063aff7806072cc90eea2c61d"
-  integrity sha512-RW4Zf6RCTnInRaOZuRHTqAUl+v6VJuQGglir7nW2BkT3OXOphMhkIFhvFRjorBx2l0VwtC/M4No8vYR65TdN9Q==
+"@inquirer/type@^1.1.6", "@inquirer/type@^1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@inquirer/type/-/type-1.3.1.tgz#afb95ff78f44fff7e8a00e17d5820db6add2a076"
+  integrity sha512-Pe3PFccjPVJV1vtlfVvm9OnlbxqdnP5QcscFEFEnK5quChf1ufZtM0r8mR5ToWHMxZOh0s8o/qp9ANGRTo/DAw==
 
 "@isaacs/cliui@^8.0.2":
   version "8.0.2"
@@ -1498,10 +1473,10 @@
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
 
-"@jsforce/jsforce-node@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@jsforce/jsforce-node/-/jsforce-node-3.1.0.tgz#7f1b4ba60c0c84b870af8e43d713907b10ed8152"
-  integrity sha512-xsn6Qj36YyhG7uCL9DOswZhqN/OVIpXm5s8AWD7V9hSJfp5ReebEsjT7a52ztEMmkUAYjWvZC5alBJr7jJCJig==
+"@jsforce/jsforce-node@^3.2.0":
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/@jsforce/jsforce-node/-/jsforce-node-3.2.0.tgz#4b104613fc9bb74e0e38d2c00936ea2b228ba73a"
+  integrity sha512-3GjWNgWs0HFajVhIhwvBPb0B45o500wTBNEBYxy8XjeeRra+qw8A9xUrfVU7TAGev8kXuKhjJwaTiSzThpEnew==
   dependencies:
     "@sindresorhus/is" "^4"
     "@types/node" "^18.15.3"
@@ -1539,7 +1514,7 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@oclif/core@3.26.4", "@oclif/core@^3.21.0", "@oclif/core@^3.26.0", "@oclif/core@^3.26.2", "@oclif/core@^3.26.3", "@oclif/core@^3.26.4":
+"@oclif/core@3.26.4":
   version "3.26.4"
   resolved "https://registry.yarnpkg.com/@oclif/core/-/core-3.26.4.tgz#ab0c6d06f699abaf0fa6186466f64f02a8435c61"
   integrity sha512-ntfo2ut7enNtAn/jB/dryMUPBM2Fh8Fydmi3k/Ybo6lCGU/hmsPFkBRjCEJAQMyNkK2yVZARaWogdOrcVgFz+w==
@@ -1573,6 +1548,40 @@
     wordwrap "^1.0.0"
     wrap-ansi "^7.0.0"
 
+"@oclif/core@^3.21.0", "@oclif/core@^3.26.0", "@oclif/core@^3.26.2", "@oclif/core@^3.26.4", "@oclif/core@^3.26.5":
+  version "3.26.5"
+  resolved "https://registry.yarnpkg.com/@oclif/core/-/core-3.26.5.tgz#6a1962971fcaa4e235c0d6a83d50681ccb2bd0e4"
+  integrity sha512-uRmAujGJjLhhgpLylbiuHuPt9Ec7u6aJ72utuSPNTRw47+W5vbQSGnLGPiil1Mt5YDL+zFOyTVH6Uv3NSP2SaQ==
+  dependencies:
+    "@types/cli-progress" "^3.11.5"
+    ansi-escapes "^4.3.2"
+    ansi-styles "^4.3.0"
+    cardinal "^2.1.1"
+    chalk "^4.1.2"
+    clean-stack "^3.0.1"
+    cli-progress "^3.12.0"
+    color "^4.2.3"
+    debug "^4.3.4"
+    ejs "^3.1.10"
+    get-package-type "^0.1.0"
+    globby "^11.1.0"
+    hyperlinker "^1.0.0"
+    indent-string "^4.0.0"
+    is-wsl "^2.2.0"
+    js-yaml "^3.14.1"
+    minimatch "^9.0.4"
+    natural-orderby "^2.0.3"
+    object-treeify "^1.1.33"
+    password-prompt "^1.1.3"
+    slice-ansi "^4.0.0"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+    supports-color "^8.1.1"
+    supports-hyperlinks "^2.2.0"
+    widest-line "^3.1.0"
+    wordwrap "^1.0.0"
+    wrap-ansi "^7.0.0"
+
 "@oclif/plugin-command-snapshot@^5.1.7":
   version "5.1.7"
   resolved "https://registry.yarnpkg.com/@oclif/plugin-command-snapshot/-/plugin-command-snapshot-5.1.7.tgz#b62da4c6cf20fa38af139ca2e9ba75d2b49d4050"
@@ -1637,12 +1646,12 @@
     strip-ansi "6.0.1"
     ts-retry-promise "^0.8.0"
 
-"@salesforce/core@^7.3.0", "@salesforce/core@^7.3.1":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-7.3.1.tgz#cda324f7a5ff1be6d7381943b15b23dbe3cd5dec"
-  integrity sha512-jdc0GOUlV4xvyF9dPbBKNPDvQc06uj5YHFEHvdhCAFtCvqgtubpDzlyDppac2kdKujh4c7UH2KreboNvJ3LsoQ==
+"@salesforce/core@^7.3.0", "@salesforce/core@^7.3.1", "@salesforce/core@^7.3.3":
+  version "7.3.3"
+  resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-7.3.3.tgz#4b84aba806264dd13716f4c4774bd5a417259662"
+  integrity sha512-THjYnOrfj0vW+qvlm70NDasH3RHD03cm884yi1+1axA4ugS4FFxXrPDPWAEU5ve5B4vnT7CJfuD/Q56l67ug8w==
   dependencies:
-    "@jsforce/jsforce-node" "^3.1.0"
+    "@jsforce/jsforce-node" "^3.2.0"
     "@salesforce/kit" "^3.1.1"
     "@salesforce/schemas" "^1.7.0"
     "@salesforce/ts-types" "^2.0.9"
@@ -1653,7 +1662,7 @@
     js2xmlparser "^4.0.1"
     jsonwebtoken "9.0.2"
     jszip "3.10.1"
-    pino "^8.19.0"
+    pino "^8.21.0"
     pino-abstract-transport "^1.1.0"
     pino-pretty "^10.3.1"
     proper-lockfile "^4.1.2"
@@ -1729,15 +1738,15 @@
   resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.7.0.tgz#b7e0af3ee414ae7160bce351c0184d77ccb98fe3"
   integrity sha512-Z0PiCEV55khm0PG+DsnRYCjaDmacNe3HDmsoSm/CSyYvJJm+D5vvkHKN9/PKD/gaRe8XAU836yfamIYFblLINw==
 
-"@salesforce/sf-plugins-core@^9.0.5":
-  version "9.0.5"
-  resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-9.0.5.tgz#34732af855a6b3205e89765a446ea01024cad227"
-  integrity sha512-il3/mKhmoDMbTdlX5G2YJw3LaJd1D3FlsPEr4gg8sXK1/gxRz0SCqcaXsjWa4Fo6i12zkW8Qgsd5vQ3N6ojiXA==
+"@salesforce/sf-plugins-core@^9.0.5", "@salesforce/sf-plugins-core@^9.0.7":
+  version "9.0.7"
+  resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-9.0.7.tgz#77ffc67df994e0cec205827462811f521e3086ba"
+  integrity sha512-5F6/ax7welNZrizpl9QSQmGADqlCzFDB8t8I5P/n2LplMb3CwJRrZPcOZxJNnhlfXNlLrYtoShv2C+yrxgqYUA==
   dependencies:
     "@inquirer/confirm" "^2.0.17"
     "@inquirer/password" "^1.1.16"
-    "@oclif/core" "^3.26.2"
-    "@salesforce/core" "^7.3.0"
+    "@oclif/core" "^3.26.5"
+    "@salesforce/core" "^7.3.3"
     "@salesforce/kit" "^3.1.0"
     "@salesforce/ts-types" "^2.0.9"
     chalk "^5.3.0"
@@ -1749,6 +1758,11 @@
   dependencies:
     tslib "^2.6.2"
 
+"@salesforce/types@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@salesforce/types/-/types-1.1.0.tgz#22d13c84c22c036e20188c54e679e1710d4ae398"
+  integrity sha512-nYxyX9cR9A+ltELXHDJNKTjOgGrLj3URVUpAfpPlmEMjTYXkitz/4bJchIsN2r1Ud2kBcxUYtjvPOvKBnP9eiQ==
+
 "@sindresorhus/is@^4":
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f"
@@ -1856,21 +1870,7 @@
     "@smithy/util-middleware" "^2.2.0"
     tslib "^2.6.2"
 
-"@smithy/core@^1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@smithy/core/-/core-1.4.0.tgz#5f9f86b681b9cbf23904041dad6f0531efe8375e"
-  integrity sha512-uu9ZDI95Uij4qk+L6kyFjdk11zqBkcJ3Lv0sc6jZrqHvLyr0+oeekD3CnqMafBn/5PRI6uv6ulW3kNLRBUHeVw==
-  dependencies:
-    "@smithy/middleware-endpoint" "^2.5.0"
-    "@smithy/middleware-retry" "^2.2.0"
-    "@smithy/middleware-serde" "^2.3.0"
-    "@smithy/protocol-http" "^3.3.0"
-    "@smithy/smithy-client" "^2.5.0"
-    "@smithy/types" "^2.12.0"
-    "@smithy/util-middleware" "^2.2.0"
-    tslib "^2.6.2"
-
-"@smithy/core@^1.4.2":
+"@smithy/core@^1.4.0", "@smithy/core@^1.4.2":
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/@smithy/core/-/core-1.4.2.tgz#1c3ed886d403041ce5bd2d816448420c57baa19c"
   integrity sha512-2fek3I0KZHWJlRLvRTqxTEri+qV0GRHrJIoLFuBMZB4EMg4WgeBGfF0X6abnrNYpq55KJ6R4D6x4f0vLnhzinA==
@@ -2013,20 +2013,7 @@
     "@smithy/types" "^2.12.0"
     tslib "^2.6.2"
 
-"@smithy/middleware-endpoint@^2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-2.5.0.tgz#9f1459e9b4cbf00fadfd99e98f88d4b1a2aeb987"
-  integrity sha512-OBhI9ZEAG8Xen0xsFJwwNOt44WE2CWkfYIxTognC8x42Lfsdf0VN/wCMqpdkySMDio/vts10BiovAxQp0T0faA==
-  dependencies:
-    "@smithy/middleware-serde" "^2.3.0"
-    "@smithy/node-config-provider" "^2.3.0"
-    "@smithy/shared-ini-file-loader" "^2.4.0"
-    "@smithy/types" "^2.12.0"
-    "@smithy/url-parser" "^2.2.0"
-    "@smithy/util-middleware" "^2.2.0"
-    tslib "^2.6.2"
-
-"@smithy/middleware-endpoint@^2.5.1":
+"@smithy/middleware-endpoint@^2.5.0", "@smithy/middleware-endpoint@^2.5.1":
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-2.5.1.tgz#1333c58304aff4d843e8ef4b85c8cb88975dd5ad"
   integrity sha512-1/8kFp6Fl4OsSIVTWHnNjLnTL8IqpIb/D3sTSczrKFnrE9VMNWxnrRKNvpUHOJ6zpGD5f62TPm7+17ilTJpiCQ==
@@ -2039,22 +2026,7 @@
     "@smithy/util-middleware" "^2.2.0"
     tslib "^2.6.2"
 
-"@smithy/middleware-retry@^2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-2.2.0.tgz#ff48ac01ad57394eeea15a0146a86079cf6364b7"
-  integrity sha512-PsjDOLpbevgn37yJbawmfVoanru40qVA8UEf2+YA1lvOefmhuhL6ZbKtGsLAWDRnE1OlAmedsbA/htH6iSZjNA==
-  dependencies:
-    "@smithy/node-config-provider" "^2.3.0"
-    "@smithy/protocol-http" "^3.3.0"
-    "@smithy/service-error-classification" "^2.1.5"
-    "@smithy/smithy-client" "^2.5.0"
-    "@smithy/types" "^2.12.0"
-    "@smithy/util-middleware" "^2.2.0"
-    "@smithy/util-retry" "^2.2.0"
-    tslib "^2.6.2"
-    uuid "^8.3.2"
-
-"@smithy/middleware-retry@^2.3.1":
+"@smithy/middleware-retry@^2.2.0", "@smithy/middleware-retry@^2.3.1":
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-2.3.1.tgz#d6fdce94f2f826642c01b4448e97a509c4556ede"
   integrity sha512-P2bGufFpFdYcWvqpyqqmalRtwFUNUA8vHjJR5iGqbfR6mp65qKOLcUd6lTr4S9Gn/enynSrSf3p3FVgVAf6bXA==
@@ -2154,21 +2126,7 @@
     "@smithy/types" "^2.12.0"
     tslib "^2.6.2"
 
-"@smithy/signature-v4@^2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-2.2.0.tgz#8fe6a574188b71fba6056111b88d50c84babb060"
-  integrity sha512-+B5TNzj/fRZzVW3z8UUJOkNx15+4E0CLuvJmJUA1JUIZFp3rdJ/M2H5r2SqltaVPXL0oIxv/6YK92T9TsFGbFg==
-  dependencies:
-    "@smithy/eventstream-codec" "^2.2.0"
-    "@smithy/is-array-buffer" "^2.2.0"
-    "@smithy/types" "^2.12.0"
-    "@smithy/util-hex-encoding" "^2.2.0"
-    "@smithy/util-middleware" "^2.2.0"
-    "@smithy/util-uri-escape" "^2.2.0"
-    "@smithy/util-utf8" "^2.3.0"
-    tslib "^2.6.2"
-
-"@smithy/signature-v4@^2.3.0":
+"@smithy/signature-v4@^2.2.0", "@smithy/signature-v4@^2.3.0":
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-2.3.0.tgz#c30dd4028ae50c607db99459981cce8cdab7a3fd"
   integrity sha512-ui/NlpILU+6HAQBfJX8BBsDXuKSNrjTSuOYArRblcrErwKFutjrCNb/OExfVRyj9+26F9J+ZmfWT+fKWuDrH3Q==
@@ -2181,19 +2139,7 @@
     "@smithy/util-utf8" "^2.3.0"
     tslib "^2.6.2"
 
-"@smithy/smithy-client@^2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-2.5.0.tgz#8de4fff221d232dda34a8e706d6a4f2911dffe2e"
-  integrity sha512-DDXWHWdimtS3y/Kw1Jo46KQ0ZYsDKcldFynQERUGBPDpkW1lXOTHy491ALHjwfiBQvzsVKVxl5+ocXNIgJuX4g==
-  dependencies:
-    "@smithy/middleware-endpoint" "^2.5.0"
-    "@smithy/middleware-stack" "^2.2.0"
-    "@smithy/protocol-http" "^3.3.0"
-    "@smithy/types" "^2.12.0"
-    "@smithy/util-stream" "^2.2.0"
-    tslib "^2.6.2"
-
-"@smithy/smithy-client@^2.5.1":
+"@smithy/smithy-client@^2.5.0", "@smithy/smithy-client@^2.5.1":
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-2.5.1.tgz#0fd2efff09dc65500d260e590f7541f8a387eae3"
   integrity sha512-jrbSQrYCho0yDaaf92qWgd+7nAeap5LtHTI51KXqmpIFCceKU3K9+vIVTUH72bOJngBMqa4kyu1VJhRcSrk/CQ==
@@ -2259,18 +2205,7 @@
   dependencies:
     tslib "^2.6.2"
 
-"@smithy/util-defaults-mode-browser@^2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.2.0.tgz#963a9d3c3351272764dd1c5dc07c26f2c8abcb02"
-  integrity sha512-2okTdZaCBvOJszAPU/KSvlimMe35zLOKbQpHhamFJmR7t95HSe0K3C92jQPjKY3PmDBD+7iMkOnuW05F5OlF4g==
-  dependencies:
-    "@smithy/property-provider" "^2.2.0"
-    "@smithy/smithy-client" "^2.5.0"
-    "@smithy/types" "^2.12.0"
-    bowser "^2.11.0"
-    tslib "^2.6.2"
-
-"@smithy/util-defaults-mode-browser@^2.2.1":
+"@smithy/util-defaults-mode-browser@^2.2.0", "@smithy/util-defaults-mode-browser@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.2.1.tgz#9db31416daf575d2963c502e0528cfe8055f0c4e"
   integrity sha512-RtKW+8j8skk17SYowucwRUjeh4mCtnm5odCL0Lm2NtHQBsYKrNW0od9Rhopu9wF1gHMfHeWF7i90NwBz/U22Kw==
@@ -2281,20 +2216,7 @@
     bowser "^2.11.0"
     tslib "^2.6.2"
 
-"@smithy/util-defaults-mode-node@^2.3.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.3.0.tgz#5005058ca0a299f0948b47c288f7c3d4f36cb26e"
-  integrity sha512-hfKXnNLmsW9cmLb/JXKIvtuO6Cf4SuqN5PN1C2Ru/TBIws+m1wSgb+A53vo0r66xzB6E82inKG2J7qtwdi+Kkw==
-  dependencies:
-    "@smithy/config-resolver" "^2.2.0"
-    "@smithy/credential-provider-imds" "^2.3.0"
-    "@smithy/node-config-provider" "^2.3.0"
-    "@smithy/property-provider" "^2.2.0"
-    "@smithy/smithy-client" "^2.5.0"
-    "@smithy/types" "^2.12.0"
-    tslib "^2.6.2"
-
-"@smithy/util-defaults-mode-node@^2.3.1":
+"@smithy/util-defaults-mode-node@^2.3.0", "@smithy/util-defaults-mode-node@^2.3.1":
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.3.1.tgz#4613210a3d107aadb3f85bd80cb71c796dd8bf0a"
   integrity sha512-vkMXHQ0BcLFysBMWgSBLSk3+leMpFSyyFj8zQtv5ZyUBx8/owVh1/pPEkzmW/DR/Gy/5c8vjLDD9gZjXNKbrpA==
@@ -2430,20 +2352,7 @@
   resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz#b979ebad3919799c979b17c72621c0bc0a31c6c4"
   integrity sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==
 
-"@types/inquirer@^8.2.0":
-  version "8.2.10"
-  resolved "https://registry.yarnpkg.com/@types/inquirer/-/inquirer-8.2.10.tgz#9444dce2d764c35bc5bb4d742598aaa4acb6561b"
-  integrity sha512-IdD5NmHyVjWM8SHWo/kPBgtzXatwPkfwzyP3fN1jF2g9BWt5WO+8hL2F4o2GKIYsU40PpqeevuUWvkS/roXJkA==
-  dependencies:
-    "@types/through" "*"
-    rxjs "^7.2.0"
-
-"@types/json-schema@^7.0.12":
-  version "7.0.14"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.14.tgz#74a97a5573980802f32c8e47b663530ab3b6b7d1"
-  integrity sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw==
-
-"@types/json-schema@^7.0.15":
+"@types/json-schema@^7.0.12", "@types/json-schema@^7.0.15":
   version "7.0.15"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
   integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
@@ -2487,10 +2396,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/node@*", "@types/node@^20.10.7":
-  version "20.11.30"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.30.tgz#9c33467fc23167a347e73834f788f4b9f399d66f"
-  integrity sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==
+"@types/node@*", "@types/node@^20.10.7", "@types/node@^20.12.7":
+  version "20.12.7"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.7.tgz#04080362fa3dd6c5822061aa3124f5c152cff384"
+  integrity sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==
   dependencies:
     undici-types "~5.26.4"
 
@@ -2506,13 +2415,6 @@
   dependencies:
     undici-types "~5.26.4"
 
-"@types/node@^20.12.7":
-  version "20.12.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.7.tgz#04080362fa3dd6c5822061aa3124f5c152cff384"
-  integrity sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==
-  dependencies:
-    undici-types "~5.26.4"
-
 "@types/normalize-package-data@^2.4.0":
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.3.tgz#291c243e4b94dbfbc0c0ee26b7666f1d5c030e2c"
@@ -2543,13 +2445,6 @@
   resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.4.tgz#663bb44e01f6bae4eaae3719d8b037411217c992"
   integrity sha512-GDV68H0mBSN449sa5HEj51E0wfpVQb8xNSMzxf/PrypMFcLTMwJMOM/cgXiv71Mq5drkOQmUGvL1okOZcu6RrQ==
 
-"@types/through@*":
-  version "0.0.32"
-  resolved "https://registry.yarnpkg.com/@types/through/-/through-0.0.32.tgz#1c4c8a29140221c1b29c2874dea1f4a1f2092c6a"
-  integrity sha512-7XsfXIsjdfJM2wFDRAtEWp3zb2aVPk5QeyZxGlVK57q4u26DczMHhJmlhr0Jqv0THwxam/L8REXkj8M2I/lcvw==
-  dependencies:
-    "@types/node" "*"
-
 "@types/wrap-ansi@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@types/wrap-ansi/-/wrap-ansi-3.0.0.tgz#18b97a972f94f60a679fd5c796d96421b9abb9fd"
@@ -6162,10 +6057,10 @@ picomatch@^3.0.1:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-3.0.1.tgz#817033161def55ec9638567a2f3bbc876b3e7516"
   integrity sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag==
 
-pino-abstract-transport@^1.0.0, pino-abstract-transport@^1.1.0, pino-abstract-transport@v1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/pino-abstract-transport/-/pino-abstract-transport-1.1.0.tgz#083d98f966262164504afb989bccd05f665937a8"
-  integrity sha512-lsleG3/2a/JIWUtf9Q5gUNErBqwIu1tUKTT3dUzaf5DySw9ra1wcqKjJjLX1VTY64Wk1eEOYsVGSaGfCK85ekA==
+pino-abstract-transport@^1.0.0, pino-abstract-transport@^1.1.0, pino-abstract-transport@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/pino-abstract-transport/-/pino-abstract-transport-1.2.0.tgz#97f9f2631931e242da531b5c66d3079c12c9d1b5"
+  integrity sha512-Guhh8EZfPCfH+PMXAb6rKOjGQEoy0xlAIn+irODG5kgfYV+BQ0rGYYWTIel3P5mmyXqkYkPmdIkywsn6QKUR1Q==
   dependencies:
     readable-stream "^4.0.0"
     split2 "^4.0.0"
@@ -6195,22 +6090,22 @@ pino-std-serializers@^6.0.0:
   resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-6.2.2.tgz#d9a9b5f2b9a402486a5fc4db0a737570a860aab3"
   integrity sha512-cHjPPsE+vhj/tnhCy/wiMh3M3z3h/j15zHQX+S9GkTBgqJuTuJzYJ4gUyACLhDaJ7kk9ba9iRDmbH2tJU03OiA==
 
-pino@^8.19.0:
-  version "8.19.0"
-  resolved "https://registry.yarnpkg.com/pino/-/pino-8.19.0.tgz#ccc15ef736f103ec02cfbead0912bc436dc92ce4"
-  integrity sha512-oswmokxkav9bADfJ2ifrvfHUwad6MLp73Uat0IkQWY3iAw5xTRoznXbXksZs8oaOUMpmhVWD+PZogNzllWpJaA==
+pino@^8.21.0:
+  version "8.21.0"
+  resolved "https://registry.yarnpkg.com/pino/-/pino-8.21.0.tgz#e1207f3675a2722940d62da79a7a55a98409f00d"
+  integrity sha512-ip4qdzjkAyDDZklUaZkcRFb2iA118H9SgRh8yzTkSQK8HilsOJF7rSY8HoW5+I0M46AZgX/pxbprf2vvzQCE0Q==
   dependencies:
     atomic-sleep "^1.0.0"
     fast-redact "^3.1.1"
     on-exit-leak-free "^2.1.0"
-    pino-abstract-transport v1.1.0
+    pino-abstract-transport "^1.2.0"
     pino-std-serializers "^6.0.0"
     process-warning "^3.0.0"
     quick-format-unescaped "^4.0.3"
     real-require "^0.2.0"
     safe-stable-stringify "^2.3.1"
     sonic-boom "^3.7.0"
-    thread-stream "^2.0.0"
+    thread-stream "^2.6.0"
 
 pkg-dir@^4.1.0:
   version "4.2.0"
@@ -6534,13 +6429,6 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-rxjs@^7.2.0:
-  version "7.8.1"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
-  integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
-  dependencies:
-    tslib "^2.1.0"
-
 safe-array-concat@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.1.tgz#91686a63ce3adbea14d61b14c99572a8ff84754c"
@@ -6884,16 +6772,7 @@ srcset@^5.0.0:
   resolved "https://registry.yarnpkg.com/srcset/-/srcset-5.0.0.tgz#9df6c3961b5b44a02532ce6ae4544832609e2e3f"
   integrity sha512-SqEZaAEhe0A6ETEa9O1IhSPC7MdvehZtCnTR0AftXk3QhY2UNgb+NApFOUPZILXk/YTDfFxMTNJOBpzrJsEdIA==
 
-"string-width-cjs@npm:string-width@^4.2.0":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -6952,14 +6831,7 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -7058,10 +6930,10 @@ text-table@^0.2.0:
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
 
-thread-stream@^2.0.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/thread-stream/-/thread-stream-2.4.1.tgz#6d588b14f0546e59d3f306614f044bc01ce43351"
-  integrity sha512-d/Ex2iWd1whipbT681JmTINKw0ZwOUBZm7+Gjs64DHuX34mmw8vJL2bFAaNacaW72zYiTJxSHi5abUuOi5nsfg==
+thread-stream@^2.6.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/thread-stream/-/thread-stream-2.7.0.tgz#d8a8e1b3fd538a6cca8ce69dbe5d3d097b601e11"
+  integrity sha512-qQiRWsU/wvNolI6tbbCKd9iKaTnCXsTwVxhhKM6nctPdujTyztjlbUkUTUymidWcMnZ5pWR0ej4a0tjsW021vw==
   dependencies:
     real-require "^0.2.0"
 
@@ -7171,7 +7043,7 @@ tslib@^1.11.1:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1, tslib@^2.5.0, tslib@^2.6.2:
+tslib@^2.0.3, tslib@^2.3.1, tslib@^2.5.0, tslib@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
   integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
@@ -7497,7 +7369,7 @@ workerpool@6.2.1:
   resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343"
   integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -7515,15 +7387,6 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

From cc142ba8449423997d93a2cba4228217d57e022d Mon Sep 17 00:00:00 2001
From: mshanemc <shane.mclaughlin@salesforce.com>
Date: Fri, 3 May 2024 09:22:05 -0500
Subject: [PATCH 2/3] chore: lockfile

---
 yarn.lock | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 8cb827bb..2daa90e3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4307,15 +4307,15 @@ glob@8.1.0, glob@^8.0.3:
     once "^1.3.0"
 
 glob@^10.3.10:
-  version "10.3.10"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b"
-  integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==
+  version "10.3.12"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.12.tgz#3a65c363c2e9998d220338e88a5f6ac97302960b"
+  integrity sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==
   dependencies:
     foreground-child "^3.1.0"
-    jackspeak "^2.3.5"
+    jackspeak "^2.3.6"
     minimatch "^9.0.1"
-    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
-    path-scurry "^1.10.1"
+    minipass "^7.0.4"
+    path-scurry "^1.10.2"
 
 glob@^7.0.0, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.2.3"
@@ -4964,7 +4964,7 @@ istanbul-reports@^3.0.2:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
-jackspeak@^2.3.5:
+jackspeak@^2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8"
   integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==
@@ -5375,6 +5375,11 @@ lowercase-keys@^3.0.0:
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-3.0.0.tgz#c5e7d442e37ead247ae9db117a9d0a467c89d4f2"
   integrity sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==
 
+lru-cache@^10.2.0:
+  version "10.2.2"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.2.tgz#48206bc114c1252940c41b25b41af5b545aca878"
+  integrity sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==
+
 lru-cache@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
@@ -5389,11 +5394,6 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-"lru-cache@^9.1.1 || ^10.0.0":
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.1.tgz#0a3be479df549cca0e5d693ac402ff19537a6b7a"
-  integrity sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==
-
 lunr@^2.3.9:
   version "2.3.9"
   resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.9.tgz#18b123142832337dd6e964df1a5a7707b25d35e1"
@@ -5564,7 +5564,7 @@ minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
-"minipass@^5.0.0 || ^6.0.2 || ^7.0.0":
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.4:
   version "7.0.4"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c"
   integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==
@@ -6007,12 +6007,12 @@ path-parse@^1.0.7:
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
-path-scurry@^1.10.1:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698"
-  integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==
+path-scurry@^1.10.2:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.2.tgz#8f6357eb1239d5fa1da8b9f70e9c080675458ba7"
+  integrity sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==
   dependencies:
-    lru-cache "^9.1.1 || ^10.0.0"
+    lru-cache "^10.2.0"
     minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
 
 path-to-regexp@^1.7.0:

From 7749c36eb4a28cb976071ac7edf34f6ce48ee151 Mon Sep 17 00:00:00 2001
From: mshanemc <shane.mclaughlin@salesforce.com>
Date: Mon, 6 May 2024 12:25:49 -0500
Subject: [PATCH 3/3] chore: use new types library

---
 schemas/schema-generate-field.json         | 73 +++++++++++++-----
 schemas/schema-generate-platformevent.json | 28 +++++--
 schemas/schema-generate-sobject.json       | 89 +++++++++++++++++-----
 schemas/schema-generate-tab.json           |  4 +-
 src/commands/schema/generate/field.ts      |  2 +-
 src/commands/schema/generate/tab.ts        |  2 +-
 src/shared/convert.ts                      |  2 +-
 src/shared/fs.ts                           |  2 +-
 src/shared/prompts/nameField.ts            |  2 +-
 src/shared/prompts/picklist.ts             |  2 +-
 src/shared/prompts/relationshipField.ts    |  2 +-
 src/shared/types.ts                        |  2 +-
 test/shared/convert.test.ts                |  2 +-
 13 files changed, 156 insertions(+), 56 deletions(-)

diff --git a/schemas/schema-generate-field.json b/schemas/schema-generate-field.json
index ba228e99..5560e8bb 100644
--- a/schemas/schema-generate-field.json
+++ b/schemas/schema-generate-field.json
@@ -9,56 +9,56 @@
           "type": "object",
           "additionalProperties": false,
           "properties": {
-            "displayLocationInDecimal": {
-              "type": "boolean"
-            },
             "type": {
-              "type": ["string", "null"]
+              "$ref": "#/definitions/FieldType"
             },
             "label": {
-              "type": ["string", "null"]
+              "type": "string"
             },
             "description": {
-              "type": ["string", "null"]
+              "type": "string"
             },
             "trackHistory": {
-              "type": ["boolean", "null"]
+              "type": "boolean"
             },
             "inlineHelpText": {
-              "type": ["string", "null"]
+              "type": "string"
             },
             "required": {
-              "type": ["boolean", "null"]
+              "type": "boolean"
             },
             "fullName": {
-              "type": ["string", "null"]
+              "type": "string"
             },
             "scale": {
-              "type": ["number", "null"]
+              "type": "number"
             },
             "precision": {
-              "type": ["number", "null"]
+              "type": "number"
             },
             "visibleLines": {
-              "type": ["number", "null"]
+              "type": "number"
             },
             "length": {
-              "type": ["number", "null"]
+              "type": "number"
             },
             "unique": {
-              "type": ["boolean", "null"]
+              "type": "boolean"
             },
             "externalId": {
-              "type": ["boolean", "null"]
+              "type": "boolean"
             },
             "startingNumber": {
-              "type": ["number", "null"]
+              "type": "number"
             },
             "defaultValue": {
-              "type": ["string", "null"]
+              "type": "string"
             },
             "securityClassification": {
-              "type": ["string", "null"]
+              "type": "string"
+            },
+            "displayLocationInDecimal": {
+              "type": "boolean"
             }
           },
           "required": ["type"]
@@ -69,6 +69,41 @@
       },
       "required": ["field", "path"],
       "additionalProperties": false
+    },
+    "FieldType": {
+      "type": "string",
+      "enum": [
+        "AutoNumber",
+        "Lookup",
+        "MasterDetail",
+        "Checkbox",
+        "Currency",
+        "Date",
+        "DateTime",
+        "Email",
+        "Number",
+        "Percent",
+        "Phone",
+        "Picklist",
+        "MultiselectPicklist",
+        "Text",
+        "TextArea",
+        "LongTextArea",
+        "Html",
+        "Url",
+        "EncryptedText",
+        "Summary",
+        "Hierarchy",
+        "File",
+        "MetadataRelationship",
+        "Location",
+        "ExternalLookup",
+        "IndirectLookup",
+        "CustomDataType",
+        "Time",
+        "Address",
+        "Array"
+      ]
     }
   }
 }
diff --git a/schemas/schema-generate-platformevent.json b/schemas/schema-generate-platformevent.json
index 36bccd83..f65bdc3e 100644
--- a/schemas/schema-generate-platformevent.json
+++ b/schemas/schema-generate-platformevent.json
@@ -19,29 +19,41 @@
       "type": "object",
       "properties": {
         "fullName": {
-          "type": ["string", "null"]
+          "type": "string"
         },
         "label": {
-          "type": ["string", "null"]
+          "type": "string"
         },
         "deploymentStatus": {
-          "type": ["string", "null"]
+          "$ref": "#/definitions/DeploymentStatus"
         },
         "description": {
-          "type": ["string", "null"]
+          "type": "string"
         },
         "pluralLabel": {
-          "type": ["string", "null"]
+          "type": "string"
         },
         "eventType": {
-          "type": ["string", "null"]
+          "$ref": "#/definitions/PlatformEventType"
         },
         "publishBehavior": {
-          "type": ["string", "null"]
+          "$ref": "#/definitions/PlatformEventPublishBehavior"
         }
       },
       "additionalProperties": false,
-      "description": "There are a lot of properties that we don't, and some that jsforce thinks are mandatory that aren't. Many apply to the various sub-species (mdt, external, events)\n\nThis type represents a PlatformEvent that can deploy."
+      "description": "This type represents a PlatformEvent that can deploy."
+    },
+    "DeploymentStatus": {
+      "type": "string",
+      "enum": ["InDevelopment", "Deployed"]
+    },
+    "PlatformEventType": {
+      "type": "string",
+      "enum": ["HighVolume", "StandardVolume", "ExternalEvent"]
+    },
+    "PlatformEventPublishBehavior": {
+      "type": "string",
+      "enum": ["PublishAfterCommit", "PublishImmediately"]
     }
   }
 }
diff --git a/schemas/schema-generate-sobject.json b/schemas/schema-generate-sobject.json
index 2963e395..16c88358 100644
--- a/schemas/schema-generate-sobject.json
+++ b/schemas/schema-generate-sobject.json
@@ -23,66 +23,119 @@
           "$ref": "#/definitions/NameField"
         },
         "label": {
-          "type": ["string", "null"]
+          "type": "string"
         },
         "deploymentStatus": {
-          "type": ["string", "null"]
+          "$ref": "#/definitions/DeploymentStatus"
         },
         "description": {
-          "type": ["string", "null"]
+          "type": "string"
         },
         "enableHistory": {
-          "type": ["boolean", "null"]
+          "type": "boolean"
         },
         "enableActivities": {
-          "type": ["boolean", "null"]
+          "type": "boolean"
         },
         "enableBulkApi": {
-          "type": ["boolean", "null"]
+          "type": "boolean"
         },
         "enableFeeds": {
-          "type": ["boolean", "null"]
+          "type": "boolean"
         },
         "enableReports": {
-          "type": ["boolean", "null"]
+          "type": "boolean"
         },
         "enableSearch": {
-          "type": ["boolean", "null"]
+          "type": "boolean"
         },
         "enableStreamingApi": {
-          "type": ["boolean", "null"]
+          "type": "boolean"
         },
         "enableSharing": {
-          "type": ["boolean", "null"]
+          "type": "boolean"
         },
         "pluralLabel": {
-          "type": ["string", "null"]
+          "type": "string"
         },
         "sharingModel": {
-          "type": ["string", "null"]
+          "$ref": "#/definitions/SharingModel"
         },
         "fullName": {
-          "type": ["string", "null"]
+          "type": "string"
         }
       },
       "required": ["nameField"],
-      "description": "There are a lot of properties that we don't, and some that jsforce thinks are mandatory that aren't. Many apply to the various sub-species (mdt, external, events)\n\nThis type represents a \"classical\" CustomObject subset that can deploy."
+      "description": "This type represents a \"classical\" CustomObject subset that can deploy."
     },
     "NameField": {
       "type": "object",
       "properties": {
         "label": {
-          "type": ["string", "null"]
+          "type": "string"
         },
         "type": {
-          "type": ["string", "null"]
+          "$ref": "#/definitions/FieldType"
         },
         "displayFormat": {
-          "type": ["string", "null"]
+          "type": "string"
         }
       },
       "additionalProperties": false,
       "description": "Used by classical CustomObject"
+    },
+    "FieldType": {
+      "type": "string",
+      "enum": [
+        "AutoNumber",
+        "Lookup",
+        "MasterDetail",
+        "Checkbox",
+        "Currency",
+        "Date",
+        "DateTime",
+        "Email",
+        "Number",
+        "Percent",
+        "Phone",
+        "Picklist",
+        "MultiselectPicklist",
+        "Text",
+        "TextArea",
+        "LongTextArea",
+        "Html",
+        "Url",
+        "EncryptedText",
+        "Summary",
+        "Hierarchy",
+        "File",
+        "MetadataRelationship",
+        "Location",
+        "ExternalLookup",
+        "IndirectLookup",
+        "CustomDataType",
+        "Time",
+        "Address",
+        "Array"
+      ]
+    },
+    "DeploymentStatus": {
+      "type": "string",
+      "enum": ["InDevelopment", "Deployed"]
+    },
+    "SharingModel": {
+      "type": "string",
+      "enum": [
+        "Private",
+        "Read",
+        "ReadSelect",
+        "ReadWrite",
+        "ReadWriteTransfer",
+        "FullAccess",
+        "ControlledByParent",
+        "ControlledByLeadOrContact",
+        "ControlledByCampaign"
+      ]
     }
   }
 }
diff --git a/schemas/schema-generate-tab.json b/schemas/schema-generate-tab.json
index ebb735e2..3b9404ff 100644
--- a/schemas/schema-generate-tab.json
+++ b/schemas/schema-generate-tab.json
@@ -9,10 +9,10 @@
           "type": "object",
           "properties": {
             "customObject": {
-              "type": ["boolean", "null"]
+              "type": "boolean"
             },
             "motif": {
-              "type": ["string", "null"]
+              "type": "string"
             }
           },
           "additionalProperties": false
diff --git a/src/commands/schema/generate/field.ts b/src/commands/schema/generate/field.ts
index b1cbc9d0..338e4313 100644
--- a/src/commands/schema/generate/field.ts
+++ b/src/commands/schema/generate/field.ts
@@ -14,7 +14,7 @@ import confirm from '@inquirer/confirm';
 import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
 import { Messages } from '@salesforce/core';
 import type { AnyJson } from '@salesforce/ts-types';
-import type { CustomField } from '@salesforce/types/metadata';
+import type { CustomField } from '../../../../node_modules/@salesforce/types/lib/metadata.js';
 import { convertJsonToXml } from '../../../shared/convert.js';
 import { picklistPrompts } from '../../../shared/prompts/picklist.js';
 import { integerValidation } from '../../../shared/prompts/functions.js';
diff --git a/src/commands/schema/generate/tab.ts b/src/commands/schema/generate/tab.ts
index e446b647..04fb29a4 100644
--- a/src/commands/schema/generate/tab.ts
+++ b/src/commands/schema/generate/tab.ts
@@ -10,7 +10,7 @@ import path from 'node:path';
 
 import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
 import { Messages } from '@salesforce/core/messages';
-import type { CustomTab } from '@salesforce/types/metadata';
+import type { CustomTab } from '../../../../node_modules/@salesforce/types/lib/metadata.js';
 import { isTabsFolder } from '../../../shared/flags.js';
 import { convertJsonToXml } from '../../../shared/convert.js';
 
diff --git a/src/shared/convert.ts b/src/shared/convert.ts
index d05f24b4..2cbf85c2 100644
--- a/src/shared/convert.ts
+++ b/src/shared/convert.ts
@@ -7,8 +7,8 @@
 import * as jsToXml from 'js2xmlparser';
 import { XMLParser } from 'fast-xml-parser';
 import type { IOptions } from 'js2xmlparser/lib/options.js';
-import type { CustomObject, CustomField } from '@salesforce/types/metadata';
 import type { JsonMap } from '@salesforce/ts-types';
+import type { CustomObject, CustomField } from '../../node_modules/@salesforce/types/lib/metadata.js';
 
 const standardOptions: IOptions = {
   declaration: {
diff --git a/src/shared/fs.ts b/src/shared/fs.ts
index 77aaaa80..21f5f089 100644
--- a/src/shared/fs.ts
+++ b/src/shared/fs.ts
@@ -7,7 +7,7 @@
 import path from 'node:path';
 import fs from 'node:fs';
 import fg from 'fast-glob';
-import type { CustomObject } from '@salesforce/types/metadata';
+import type { CustomObject } from '../../node_modules/@salesforce/types/lib/metadata.js';
 import { convertJsonToXml, parseXml } from './convert.js';
 import { SaveableCustomObject, SaveablePlatformEvent } from './types.js';
 
diff --git a/src/shared/prompts/nameField.ts b/src/shared/prompts/nameField.ts
index 428b6d0f..27b00cf2 100644
--- a/src/shared/prompts/nameField.ts
+++ b/src/shared/prompts/nameField.ts
@@ -9,7 +9,7 @@ import { Messages } from '@salesforce/core/messages';
 import input from '@inquirer/input';
 import select from '@inquirer/select';
 
-import { FieldType } from '@salesforce/types/metadata';
+import { FieldType } from '../../../node_modules/@salesforce/types/lib/metadata.js';
 import { NameField } from '../types.js';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
diff --git a/src/shared/prompts/picklist.ts b/src/shared/prompts/picklist.ts
index a832ea66..7c2b2bf0 100644
--- a/src/shared/prompts/picklist.ts
+++ b/src/shared/prompts/picklist.ts
@@ -4,9 +4,9 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import type { ValueSet, CustomValue } from '@salesforce/types/metadata';
 import input from '@inquirer/input';
 import { Messages } from '@salesforce/core/messages';
+import type { ValueSet, CustomValue } from '../../../node_modules/@salesforce/types/lib/metadata.js';
 
 /**
  * recursively keep adding picklist values until the user says to stop
diff --git a/src/shared/prompts/relationshipField.ts b/src/shared/prompts/relationshipField.ts
index 617a3f1a..00a82f94 100644
--- a/src/shared/prompts/relationshipField.ts
+++ b/src/shared/prompts/relationshipField.ts
@@ -8,8 +8,8 @@ import path from 'node:path';
 import input from '@inquirer/input';
 import confirm from '@inquirer/confirm';
 import select from '@inquirer/select';
-import type { CustomField, DeleteConstraint } from '@salesforce/types/metadata';
 import { Messages, type NamedPackageDir } from '@salesforce/core';
+import type { CustomField, DeleteConstraint } from '../../../node_modules/@salesforce/types/lib/metadata.js';
 import { getObjectXmlByFolderAsJson } from '../fs.js';
 import { objectPrompt } from './object.js';
 import { makeNameApiCompatible } from './functions.js';
diff --git a/src/shared/types.ts b/src/shared/types.ts
index b7d0d4e5..7966faf1 100644
--- a/src/shared/types.ts
+++ b/src/shared/types.ts
@@ -5,7 +5,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import type { CustomObject, CustomField } from '@salesforce/types/metadata';
+import type { CustomObject, CustomField } from '../../node_modules/@salesforce/types/lib/metadata.js';
 
 /** Used by classical CustomObject */
 export type NameField = Pick<CustomField, 'label' | 'type' | 'displayFormat'>;
diff --git a/test/shared/convert.test.ts b/test/shared/convert.test.ts
index 72d71080..d4fdd279 100644
--- a/test/shared/convert.test.ts
+++ b/test/shared/convert.test.ts
@@ -5,7 +5,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 import { expect } from 'chai';
-import type { CustomObject } from '@salesforce/types/metadata';
+import type { CustomObject } from '../../node_modules/@salesforce/types/lib/metadata.js';
 import { parseXml } from '../../src/shared/convert.js';
 
 // tests configurations of the xml parser