From fd594f3ebfd633ea661751cef0f6a68abf337aa3 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Tue, 28 Jan 2025 08:09:24 -0500
Subject: [PATCH 01/60] first attempt: split FieldSchema

---
 packages/schema/lib/schemas/AppSchema.js      |  19 ++
 .../schema/lib/schemas/AuthFieldSchema.js     |  47 ++++
 .../schema/lib/schemas/AuthFieldsSchema.js    |  17 ++
 .../schema/lib/schemas/BaseFieldSchema.js     | 210 ++++++++++++++++++
 .../schema/lib/schemas/InputFieldSchema.js    |  52 +++++
 .../schema/lib/schemas/InputFieldsSchema.js   |  17 ++
 .../schema/lib/schemas/OutputFieldSchema.js   |  29 +++
 .../schema/lib/schemas/OutputFieldsSchema.js  |  17 ++
 8 files changed, 408 insertions(+)
 create mode 100644 packages/schema/lib/schemas/AuthFieldSchema.js
 create mode 100644 packages/schema/lib/schemas/AuthFieldsSchema.js
 create mode 100644 packages/schema/lib/schemas/BaseFieldSchema.js
 create mode 100644 packages/schema/lib/schemas/InputFieldSchema.js
 create mode 100644 packages/schema/lib/schemas/InputFieldsSchema.js
 create mode 100644 packages/schema/lib/schemas/OutputFieldSchema.js
 create mode 100644 packages/schema/lib/schemas/OutputFieldsSchema.js

diff --git a/packages/schema/lib/schemas/AppSchema.js b/packages/schema/lib/schemas/AppSchema.js
index ffb55c13f..e323ff6e9 100644
--- a/packages/schema/lib/schemas/AppSchema.js
+++ b/packages/schema/lib/schemas/AppSchema.js
@@ -106,6 +106,21 @@ module.exports = makeSchema(
         description: 'Top-level app options',
         $ref: AppFlagsSchema.id,
       },
+      // inputFields: {
+      //   description:
+      //     'An array or collection of input fields.',
+      //   $ref: InputFieldsSchema.id,
+      // },
+      // outputFields: {
+      //   description:
+      //     'An array or collection of output fields.',
+      //   $ref: OutputFieldsSchema.id,
+      // },
+      // authFields: {
+      //   description:
+      //     'An array or collection of auth input fields.',
+      //   $ref: AuthFieldsSchema.id,
+      // },
       throttle: {
         description: `Zapier uses this configuration to apply throttling when the limit for the window is exceeded. When set here, it is the default throttle configuration used on each action of the integration. And when set in an action's operation object, it gets overwritten for that action only.`,
         $ref: ThrottleObjectSchema.id,
@@ -143,6 +158,10 @@ module.exports = makeSchema(
   [
     AuthenticationSchema,
     FlatObjectSchema,
+    // OutputFieldsSchema,
+    // InputFieldsSchema,
+    // AuthFieldsSchema,
+    // BaseFieldSchema,
     ResourcesSchema,
     ReadBulksSchema,
     TriggersSchema,
diff --git a/packages/schema/lib/schemas/AuthFieldSchema.js b/packages/schema/lib/schemas/AuthFieldSchema.js
new file mode 100644
index 000000000..adfd6c11a
--- /dev/null
+++ b/packages/schema/lib/schemas/AuthFieldSchema.js
@@ -0,0 +1,47 @@
+'use strict';
+
+const makeSchema = require('../utils/makeSchema');
+const BaseFieldSchema = require('./BaseFieldSchema');
+const schema = makeSchema(
+  {
+    id: '/AuthFieldSchema',
+    description: 'Field schema specialized for auth fields (e.g., OAuth).',
+    type: 'object',
+    allOf: [
+      { $ref: BaseFieldSchema.id },
+      {
+        type: 'object',
+        properties: {
+          // New property
+          isSafe: {
+            description: 'Indicates if this auth field is safe (not secret).',
+            type: 'boolean',
+          },
+        },
+        additionalProperties: false,
+      },
+      // Forbid certain keys from having isSafe = true
+      {
+        not: {
+          properties: {
+            key: {
+              enum: [
+                'access_token',
+                'refresh_token',
+                'api_key',
+                'password',
+                'secret',
+              ],
+            },
+            isSafe: { const: true },
+          },
+          required: ['key', 'isSafe'],
+        },
+      },
+    ],
+  },
+  [BaseFieldSchema],
+);
+
+schema.dependencies = [BaseFieldSchema];
+module.exports = schema;
diff --git a/packages/schema/lib/schemas/AuthFieldsSchema.js b/packages/schema/lib/schemas/AuthFieldsSchema.js
new file mode 100644
index 000000000..ef05cd6d3
--- /dev/null
+++ b/packages/schema/lib/schemas/AuthFieldsSchema.js
@@ -0,0 +1,17 @@
+'use strict';
+
+const makeSchema = require('../utils/makeSchema');
+
+const AuthFieldSchema = require('./AuthFieldSchema');
+
+module.exports = makeSchema(
+  {
+    id: '/AuthFieldsSchema',
+    description: 'An array or collection of auth input fields.',
+    type: 'array',
+    items: { $ref: AuthFieldSchema.id },
+    examples: [[{ key: 'abc' }]],
+    antiExamples: [{ example: {}, reason: 'Must be an array' }],
+  },
+  [AuthFieldSchema],
+);
diff --git a/packages/schema/lib/schemas/BaseFieldSchema.js b/packages/schema/lib/schemas/BaseFieldSchema.js
new file mode 100644
index 000000000..5fe0ebd91
--- /dev/null
+++ b/packages/schema/lib/schemas/BaseFieldSchema.js
@@ -0,0 +1,210 @@
+'use strict';
+
+const makeSchema = require('../utils/makeSchema');
+
+const RefResourceSchema = require('./RefResourceSchema');
+
+const FieldChoicesSchema = require('./FieldChoicesSchema');
+
+const FieldMetaSchema = require('./FieldMetaSchema');
+
+const { INCOMPATIBLE_FIELD_SCHEMA_KEYS } = require('../constants');
+
+// the following takes an array of string arrays (string[][]) and returns the follwing string:
+// * `a` & `b`
+// * `c` & `d`
+// ... etc
+const wrapInBackticks = (s) => `\`${s}\``;
+const formatBullet = (f) => `* ${f.map(wrapInBackticks).join(' & ')}`;
+const incompatibleFieldsList =
+  INCOMPATIBLE_FIELD_SCHEMA_KEYS.map(formatBullet).join('\n');
+
+module.exports = makeSchema(
+  {
+    id: '/BaseFieldSchema',
+    description: `Defines a field an app either needs as input, or gives as output. In addition to the requirements below, the following keys are mutually exclusive:\n\n${incompatibleFieldsList}`,
+    type: 'object',
+    required: ['key'],
+    properties: {
+      key: {
+        description:
+          'A unique machine readable key for this value (IE: "fname").',
+        type: 'string',
+        minLength: 1,
+      },
+      label: {
+        description:
+          'A human readable label for this value (IE: "First Name").',
+        type: 'string',
+        minLength: 1,
+      },
+      helpText: {
+        description:
+          'A human readable description of this value (IE: "The first part of a full name."). You can use Markdown.',
+        type: 'string',
+        minLength: 1,
+        maxLength: 1000,
+      },
+      type: {
+        description:
+          'The type of this value. Use `string` for basic text input, `text` for a large, `<textarea>` style box, and `code` for a `<textarea>` with a fixed-width font. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.',
+        type: 'string',
+        // string == unicode
+        // text == a long textarea string
+        // integer == int
+        // number == float
+        enum: [
+          'string',
+          'text',
+          'integer',
+          'number',
+          'boolean',
+          'datetime',
+          'file',
+          'password',
+          'copy',
+          'code',
+        ],
+      },
+      required: {
+        description: 'If this value is required or not.',
+        type: 'boolean',
+      },
+      placeholder: {
+        description: 'An example value that is not saved.',
+        type: 'string',
+        minLength: 1,
+      },
+      default: {
+        description:
+          'A default value that is saved the first time a Zap is created.',
+        type: 'string',
+        minLength: 1,
+      },
+      primary: {
+        description:
+          'Use this field as part of the primary key for deduplication. You can set multiple fields as "primary", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`; it will be ignored if set in `inputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).',
+        type: 'boolean',
+      },
+      dynamic: {
+        description:
+          'A reference to a trigger that will power a dynamic dropdown.',
+        $ref: RefResourceSchema.id,
+      },
+      search: {
+        description:
+          'A reference to a search that will guide the user to add a search step to populate this field when creating a Zap.',
+        $ref: RefResourceSchema.id,
+      },
+      choices: {
+        description:
+          'An object of machine keys and human values to populate a static dropdown.',
+        $ref: FieldChoicesSchema.id,
+      },
+      list: {
+        description:
+          'Acts differently when used in inputFields vs. when used in outputFields. In inputFields: Can a user provide multiples of this field? In outputFields: Does this field return an array of items of type `type`?',
+        type: 'boolean',
+      },
+      children: {
+        type: 'array',
+        items: { $ref: '/BaseFieldSchema' },
+        description:
+          'An array of child fields that define the structure of a sub-object for this field. Usually used for line items.',
+        minItems: 1,
+      },
+      dict: {
+        description: 'Is this field a key/value input?',
+        type: 'boolean',
+      },
+      computed: {
+        description:
+          'Is this field automatically populated (and hidden from the user)? Note: Only OAuth and Session Auth support fields with this key.',
+        type: 'boolean',
+      },
+      altersDynamicFields: {
+        description:
+          'Does the value of this field affect the definitions of other fields in the set?',
+        type: 'boolean',
+      },
+      steadyState: {
+        description:
+          'Prevents triggering on new output until all values for fields with this property remain unchanged for 2 polls. It can be used to, e.g., not trigger on a new contact until the contact has completed typing their name. NOTE that this only applies to the `outputFields` of polling triggers.',
+        type: 'boolean',
+      },
+      inputFormat: {
+        description:
+          'Useful when you expect the input to be part of a longer string. Put "{{input}}" in place of the user\'s input (IE: "https://{{input}}.yourdomain.com").',
+        type: 'string',
+        // TODO: Check if it contains one and ONLY ONE '{{input}}'
+        pattern: '^.*{{input}}.*$',
+      },
+      meta: {
+        description:
+          'Allows for additional metadata to be stored on the field. Supports simple key-values only (no sub-objects or arrays).',
+        $ref: FieldMetaSchema.id,
+      },
+    },
+    examples: [
+      { key: 'abc' },
+      { key: 'abc', choices: { mobile: 'Mobile Phone' } },
+      { key: 'abc', choices: ['first', 'second', 'third'] },
+      {
+        key: 'abc',
+        choices: [{ label: 'Red', sample: '#f00', value: '#f00' }],
+      },
+      { key: 'abc', children: [{ key: 'abc' }] },
+      { key: 'abc', type: 'integer', helpText: 'neat' },
+      {
+        key: 'abc',
+        type: 'integer',
+        meta: {
+          internalType: 'numeric',
+          should_call_api: true,
+          display_order: 1,
+        },
+      },
+    ],
+    antiExamples: [
+      {
+        example: {},
+        reason: 'Missing required key: key',
+      },
+      {
+        example: { key: 'abc', type: 'loltype' },
+        reason: 'Invalid value for key: type',
+      },
+      {
+        example: { key: 'abc', choices: {} },
+        reason: 'Invalid value for key: choices (cannot be empty)',
+      },
+      {
+        example: { key: 'abc', choices: [] },
+        reason: 'Invalid value for key: choices (cannot be empty)',
+      },
+      {
+        example: { key: 'abc', choices: [3] },
+        reason:
+          'Invalid value for key: choices (if an array, must be of either string or FieldChoiceWithLabelSchema)',
+      },
+      {
+        example: { key: 'abc', choices: [{ label: 'Red', value: '#f00' }] },
+        reason:
+          'Invalid value for key: choices (if an array of FieldChoiceWithLabelSchema, must provide key `sample`)',
+      },
+      {
+        example: { key: 'abc', choices: 'mobile' },
+        reason:
+          'Invalid value for key: choices (must be either object or array)',
+      },
+
+      {
+        example: { key: 'abc', children: ['$func$2$f$'] },
+        reason:
+          'Invalid value for key: children (must be array of BaseFieldSchema)',
+      },
+    ],
+    additionalProperties: false,
+  },
+  [RefResourceSchema, FieldChoicesSchema, FieldMetaSchema],
+);
diff --git a/packages/schema/lib/schemas/InputFieldSchema.js b/packages/schema/lib/schemas/InputFieldSchema.js
new file mode 100644
index 000000000..a672526f6
--- /dev/null
+++ b/packages/schema/lib/schemas/InputFieldSchema.js
@@ -0,0 +1,52 @@
+'use strict';
+
+const makeSchema = require('../utils/makeSchema');
+const BaseFieldSchema = require('./BaseFieldSchema');
+
+module.exports = makeSchema(
+  {
+    id: '/InputFieldSchema',
+    description: 'Field schema specialized for input fields (simplified).',
+    type: 'object',
+    allOf: [
+      { $ref: BaseFieldSchema.id },
+      {
+        type: 'object',
+        properties: {
+          urlPatterns: {
+            description: 'A non-empty array of valid URL patterns (strings).',
+            type: 'array',
+            minItems: 1,
+            items: {
+              type: 'string',
+            },
+          },
+        },
+        additionalProperties: false,
+      },
+      {
+        // If urlPatterns is present, forbid certain properties & ensure type is 'string' or absent
+        if: { required: ['urlPatterns'] },
+        then: {
+          not: {
+            anyOf: [
+              { required: ['choices'] },
+              { required: ['list'] },
+              { required: ['children'] },
+              { required: ['dict'] },
+              { required: ['computed'] },
+              { required: ['altersDynamicFields'] },
+              { required: ['inputFormat'] },
+            ],
+          },
+          properties: {
+            type: {
+              enum: ['string', undefined],
+            },
+          },
+        },
+      },
+    ],
+  },
+  [BaseFieldSchema],
+);
diff --git a/packages/schema/lib/schemas/InputFieldsSchema.js b/packages/schema/lib/schemas/InputFieldsSchema.js
new file mode 100644
index 000000000..d270ff3fd
--- /dev/null
+++ b/packages/schema/lib/schemas/InputFieldsSchema.js
@@ -0,0 +1,17 @@
+'use strict';
+
+const makeSchema = require('../utils/makeSchema');
+
+const InputFieldSchema = require('./InputFieldSchema');
+
+module.exports = makeSchema(
+  {
+    id: '/InputFieldsSchema',
+    description: 'An array or collection of input fields.',
+    type: 'array',
+    items: { $ref: InputFieldSchema.id },
+    examples: [[{ key: 'abc' }]],
+    antiExamples: [{ example: {}, reason: 'Must be an array' }],
+  },
+  [InputFieldSchema],
+);
diff --git a/packages/schema/lib/schemas/OutputFieldSchema.js b/packages/schema/lib/schemas/OutputFieldSchema.js
new file mode 100644
index 000000000..f829350e6
--- /dev/null
+++ b/packages/schema/lib/schemas/OutputFieldSchema.js
@@ -0,0 +1,29 @@
+'use strict';
+
+const makeSchema = require('../utils/makeSchema');
+const BaseFieldSchema = require('./BaseFieldSchema');
+
+module.exports = makeSchema(
+  {
+    id: '/OutputFieldSchema',
+    description: 'Field schema specialized for output fields.',
+    type: 'object',
+    allOf: [
+      { $ref: BaseFieldSchema.id },
+      {
+        type: 'object',
+        properties: {
+          isCanonicalUrl: { type: 'boolean' },
+          isCanonicalFile: { type: 'boolean' },
+          isTitle: { type: 'boolean' },
+          fileType: {
+            type: 'string',
+            description: "A string indicating a file's MIME type, if relevant.",
+          },
+        },
+        additionalProperties: false,
+      },
+    ],
+  },
+  [BaseFieldSchema],
+);
diff --git a/packages/schema/lib/schemas/OutputFieldsSchema.js b/packages/schema/lib/schemas/OutputFieldsSchema.js
new file mode 100644
index 000000000..0bcc81bed
--- /dev/null
+++ b/packages/schema/lib/schemas/OutputFieldsSchema.js
@@ -0,0 +1,17 @@
+'use strict';
+
+const makeSchema = require('../utils/makeSchema');
+
+const OutputFieldSchema = require('./OutputFieldSchema');
+
+module.exports = makeSchema(
+  {
+    id: '/OutputFieldsSchema',
+    description: 'An array or collection of output fields.',
+    type: 'array',
+    items: { $ref: OutputFieldSchema.id },
+    examples: [[{ key: 'abc' }]],
+    antiExamples: [{ example: {}, reason: 'Must be an array' }],
+  },
+  [OutputFieldSchema],
+);

From 19b3125af6ad4883bc9a75717240c26bbdd8b14e Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Tue, 28 Jan 2025 14:35:37 -0500
Subject: [PATCH 02/60] PDE-5719 address PR comments

---
 packages/core/types/zapier.generated.d.ts     | 265 +++++++++++++----
 packages/schema/docs/build/schema.md          |  86 +++++-
 packages/schema/exported-schema.json          | 279 +++++++++++++-----
 packages/schema/lib/schemas/AppSchema.js      |  19 --
 ...FieldSchema.js => AuthInputFieldSchema.js} |  17 +-
 .../lib/schemas/AuthenticationSchema.js       |   4 +-
 .../schema/lib/schemas/BaseFieldSchema.js     | 210 -------------
 .../lib/schemas/BasicOperationSchema.js       |   5 +-
 ...ema.js => DynamicAuthInputFieldsSchema.js} |  10 +-
 ...sSchema.js => DynamicInputFieldsSchema.js} |   9 +-
 ...Schema.js => DynamicOutputFieldsSchema.js} |   9 +-
 .../schema/lib/schemas/InputFieldSchema.js    |  47 +--
 .../schema/lib/schemas/OutputFieldSchema.js   |  24 +-
 packages/schema/lib/schemas/ResourceSchema.js |   6 +-
 packages/schema/lib/utils/makeValidator.js    |   6 +
 packages/schema/test/index.js                 |   2 +-
 16 files changed, 539 insertions(+), 459 deletions(-)
 rename packages/schema/lib/schemas/{AuthFieldSchema.js => AuthInputFieldSchema.js} (67%)
 delete mode 100644 packages/schema/lib/schemas/BaseFieldSchema.js
 rename packages/schema/lib/schemas/{AuthFieldsSchema.js => DynamicAuthInputFieldsSchema.js} (59%)
 rename packages/schema/lib/schemas/{InputFieldsSchema.js => DynamicInputFieldsSchema.js} (60%)
 rename packages/schema/lib/schemas/{OutputFieldsSchema.js => DynamicOutputFieldsSchema.js} (60%)

diff --git a/packages/core/types/zapier.generated.d.ts b/packages/core/types/zapier.generated.d.ts
index c5c34e60b..6995572e9 100644
--- a/packages/core/types/zapier.generated.d.ts
+++ b/packages/core/types/zapier.generated.d.ts
@@ -135,6 +135,68 @@ export interface App {
   firehoseWebhooks?: { [k: string]: unknown };
 }
 
+/**
+ * A path to a file that might have content like `module.exports =
+ * (z, bundle) => [{id: 123}];`.
+ *
+ * [Docs: FunctionRequireSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#FunctionRequireSchema)
+ */
+export interface FunctionRequire {
+  require: string;
+}
+
+/**
+ * Source code like `{source: "return 1 + 2"}` which the system will
+ * wrap in a function for you.
+ *
+ * [Docs: FunctionSourceSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#FunctionSourceSchema)
+ */
+export interface FunctionSource {
+  /**
+   * JavaScript code for the function body. This must end with a
+   * `return` statement.
+   */
+  source: string;
+
+  /**
+   * Function signature. Defaults to `['z', 'bundle']` if not
+   * specified.
+   */
+  args?: string[];
+}
+
+/**
+ * An object whose values can only be primitives
+ *
+ * [Docs: FlatObjectSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#FlatObjectSchema)
+ */
+export interface FlatObject {
+  /**
+   * Any key may exist in this flat object as long as its values are
+   * simple.
+   *
+   * This interface was referenced by `FlatObjectSchema`'s JSON-Schema
+   * definition
+   * via the `patternProperty` "[^\s]+".
+   */
+  [k: string]: null | string | number | boolean;
+}
+
+/**
+ * Internal pointer to a function from the original source or the
+ * source code itself. Encodes arity and if `arguments` is used in
+ * the body. Note - just write normal functions and the system will
+ * encode the pointers for you. Or, provide {source: "return 1 + 2"}
+ * and the system will wrap in a function for you.
+ *
+ * [Docs: FunctionSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#FunctionSchema)
+ */
+export type Function =
+  | PerformFunction
+  | string
+  | FunctionRequire
+  | FunctionSource;
+
 /**
  * An object describing a labeled choice in a static dropdown.
  * Useful if the value a user picks isn't exactly what the zap uses.
@@ -347,68 +409,6 @@ export interface Field {
   meta?: FieldMeta;
 }
 
-/**
- * A path to a file that might have content like `module.exports =
- * (z, bundle) => [{id: 123}];`.
- *
- * [Docs: FunctionRequireSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#FunctionRequireSchema)
- */
-export interface FunctionRequire {
-  require: string;
-}
-
-/**
- * Source code like `{source: "return 1 + 2"}` which the system will
- * wrap in a function for you.
- *
- * [Docs: FunctionSourceSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#FunctionSourceSchema)
- */
-export interface FunctionSource {
-  /**
-   * JavaScript code for the function body. This must end with a
-   * `return` statement.
-   */
-  source: string;
-
-  /**
-   * Function signature. Defaults to `['z', 'bundle']` if not
-   * specified.
-   */
-  args?: string[];
-}
-
-/**
- * An object whose values can only be primitives
- *
- * [Docs: FlatObjectSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#FlatObjectSchema)
- */
-export interface FlatObject {
-  /**
-   * Any key may exist in this flat object as long as its values are
-   * simple.
-   *
-   * This interface was referenced by `FlatObjectSchema`'s JSON-Schema
-   * definition
-   * via the `patternProperty` "[^\s]+".
-   */
-  [k: string]: null | string | number | boolean;
-}
-
-/**
- * Internal pointer to a function from the original source or the
- * source code itself. Encodes arity and if `arguments` is used in
- * the body. Note - just write normal functions and the system will
- * encode the pointers for you. Or, provide {source: "return 1 + 2"}
- * and the system will wrap in a function for you.
- *
- * [Docs: FunctionSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#FunctionSchema)
- */
-export type Function =
-  | PerformFunction
-  | string
-  | FunctionRequire
-  | FunctionSource;
-
 /**
  * A representation of a HTTP request - you can use the `{{syntax}}`
  * to inject authentication, field or global variables.
@@ -1087,6 +1087,138 @@ export interface BasicActionOperation {
   throttle?: ThrottleObject;
 }
 
+/**
+ * Field schema specialized for output fields.
+ *
+ * [Docs: OutputFieldSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#OutputFieldSchema)
+ */
+export interface OutputField {
+  /** A unique machine readable key for this value (IE: "fname"). */
+  key: string;
+
+  /** A human readable label for this value (IE: "First Name"). */
+  label?: string;
+
+  /**
+   * A human readable description of this value (IE: "The first part
+   * of a full name."). You can use Markdown.
+   */
+  helpText?: string;
+
+  /**
+   * The type of this value. Use `string` for basic text input, `text`
+   * for a large, `<textarea>` style box, and `code` for a
+   * `<textarea>` with a fixed-width font. Field type of `file` will
+   * accept either a file object or a string. If a URL is provided in
+   * the string, Zapier will automatically make a GET for that file.
+   * Otherwise, a .txt file will be generated.
+   */
+  type?:
+    | 'string'
+    | 'text'
+    | 'integer'
+    | 'number'
+    | 'boolean'
+    | 'datetime'
+    | 'file'
+    | 'password'
+    | 'copy'
+    | 'code';
+
+  /** If this value is required or not. */
+  required?: boolean;
+
+  /** An example value that is not saved. */
+  placeholder?: string;
+
+  /**
+   * A default value that is saved the first time a Zap is created.
+   */
+  default?: string;
+
+  /**
+   * Use this field as part of the primary key for deduplication. You
+   * can set multiple fields as "primary", provided they are unique
+   * together. If no fields are set, Zapier will default to using the
+   * `id` field. `primary` only makes sense for `outputFields`; it
+   * will be ignored if set in `inputFields`. It only works in static
+   * `outputFields`; will not work in custom/dynamic `outputFields`.
+   * For more information, see [How deduplication works in
+   * Zapier](https://platform.zapier.com/build/deduplication).
+   */
+  primary?: boolean;
+
+  /**
+   * A reference to a trigger that will power a dynamic dropdown.
+   */
+  dynamic?: RefResource;
+
+  /**
+   * A reference to a search that will guide the user to add a search
+   * step to populate this field when creating a Zap.
+   */
+  search?: RefResource;
+
+  /**
+   * An object of machine keys and human values to populate a static
+   * dropdown.
+   */
+  choices?: FieldChoices;
+
+  /**
+   * Acts differently when used in inputFields vs. when used in
+   * outputFields. In inputFields: Can a user provide multiples of
+   * this field? In outputFields: Does this field return an array of
+   * items of type `type`?
+   */
+  list?: boolean;
+
+  /**
+   * An array of child fields that define the structure of a
+   * sub-object for this field. Usually used for line items.
+   *
+   * @minItems 1
+   */
+  children?: Field[];
+
+  /** Is this field a key/value input? */
+  dict?: boolean;
+
+  /**
+   * Is this field automatically populated (and hidden from the user)?
+   * Note: Only OAuth and Session Auth support fields with this key.
+   */
+  computed?: boolean;
+
+  /**
+   * Does the value of this field affect the definitions of other
+   * fields in the set?
+   */
+  altersDynamicFields?: boolean;
+
+  /**
+   * Prevents triggering on new output until all values for fields
+   * with this property remain unchanged for 2 polls. It can be used
+   * to, e.g., not trigger on a new contact until the contact has
+   * completed typing their name. NOTE that this only applies to the
+   * `outputFields` of polling triggers.
+   */
+  steadyState?: boolean;
+
+  /**
+   * Useful when you expect the input to be part of a longer string.
+   * Put "{{input}}" in place of the user's input (IE:
+   * "https://{{input}}.yourdomain.com").
+   */
+  inputFormat?: string;
+
+  /**
+   * Allows for additional metadata to be stored on the field.
+   * Supports simple key-values only (no sub-objects or arrays).
+   */
+  meta?: FieldMeta;
+}
+
 /**
  * How will we get a single object given a unique identifier/id?
  *
@@ -1160,6 +1292,13 @@ export interface ResourceMethodCreate {
   operation: BasicActionOperation;
 }
 
+/**
+ * An array or collection of output fields.
+ *
+ * [Docs: DynamicOutputFieldsSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#DynamicOutputFieldsSchema)
+ */
+export type DynamicOutputFields = (OutputField | Function)[];
+
 /**
  * Represents a resource, which will in turn power triggers,
  * searches, or creates.
@@ -1206,7 +1345,7 @@ export interface Resource {
   create?: ResourceMethodCreate;
 
   /** What fields of data will this return? */
-  outputFields?: DynamicFields;
+  outputFields?: DynamicOutputFields;
 
   /** What does a sample of data look like? */
   sample?: { [k: string]: unknown };
diff --git a/packages/schema/docs/build/schema.md b/packages/schema/docs/build/schema.md
index f65819296..017357069 100644
--- a/packages/schema/docs/build/schema.md
+++ b/packages/schema/docs/build/schema.md
@@ -30,6 +30,7 @@ This is automatically generated by the `npm run docs` command in `zapier-platfor
 * [/CreateSchema](#createschema)
 * [/CreatesSchema](#createsschema)
 * [/DynamicFieldsSchema](#dynamicfieldsschema)
+* [/DynamicOutputFieldsSchema](#dynamicoutputfieldsschema)
 * [/FieldChoiceWithLabelSchema](#fieldchoicewithlabelschema)
 * [/FieldChoicesSchema](#fieldchoicesschema)
 * [/FieldMetaSchema](#fieldmetaschema)
@@ -44,6 +45,7 @@ This is automatically generated by the `npm run docs` command in `zapier-platfor
 * [/KeySchema](#keyschema)
 * [/LockObjectSchema](#lockobjectschema)
 * [/MiddlewaresSchema](#middlewaresschema)
+* [/OutputFieldSchema](#outputfieldschema)
 * [/RedirectRequestSchema](#redirectrequestschema)
 * [/RefResourceSchema](#refresourceschema)
 * [/RequestSchema](#requestschema)
@@ -877,6 +879,26 @@ Like [/FieldsSchema](#fieldsschema) but you can provide functions to create dyna
 
 -----
 
+## /DynamicOutputFieldsSchema
+
+An array or collection of output fields.
+
+#### Details
+
+* **Type** - `array`[oneOf([/OutputFieldSchema](#outputfieldschema), [/FunctionSchema](#functionschema))]
+* [**Source Code**](https://github.com/zapier/zapier-platform/blob/zapier-platform-schema@16.2.0/packages/schema/lib/schemas/DynamicOutputFieldsSchema.js)
+
+
+#### Examples
+
+* `[ { key: 'abc' } ]`
+
+#### Anti-Examples
+
+* `{}` - _Must be an array_
+
+-----
+
 ## /FieldChoiceWithLabelSchema
 
 An object describing a labeled choice in a static dropdown. Useful if the value a user picks isn't exactly what the zap uses. For instance, when they click on a nickname, but the zap uses the user's full name ([image](https://cdn.zapier.com/storage/photos/8ed01ac5df3a511ce93ed2dc43c7fbbc.png)).
@@ -1288,6 +1310,68 @@ List of before or after middlewares. Can be an array of functions or a single fu
 
 -----
 
+## /OutputFieldSchema
+
+Field schema specialized for output fields.
+
+#### Details
+
+* **Type** - `object`
+* [**Source Code**](https://github.com/zapier/zapier-platform/blob/zapier-platform-schema@16.2.0/packages/schema/lib/schemas/OutputFieldSchema.js)
+
+#### Properties
+
+Key | Required | Type | Description
+--- | -------- | ---- | -----------
+`key` | **yes** | `string` | A unique machine readable key for this value (IE: "fname").
+`label` | no | `string` | A human readable label for this value (IE: "First Name").
+`helpText` | no | `string` | A human readable description of this value (IE: "The first part of a full name."). You can use Markdown.
+`type` | no | `string` in (`'string'`, `'text'`, `'integer'`, `'number'`, `'boolean'`, `'datetime'`, `'file'`, `'password'`, `'copy'`, `'code'`) | The type of this value. Use `string` for basic text input, `text` for a large, `<textarea>` style box, and `code` for a `<textarea>` with a fixed-width font. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.
+`required` | no | `boolean` | If this value is required or not.
+`placeholder` | no | `string` | An example value that is not saved.
+`default` | no | `string` | A default value that is saved the first time a Zap is created.
+`primary` | no | `boolean` | Use this field as part of the primary key for deduplication. You can set multiple fields as "primary", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`; it will be ignored if set in `inputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).
+`dynamic` | no | [/RefResourceSchema](#refresourceschema) | A reference to a trigger that will power a dynamic dropdown.
+`search` | no | [/RefResourceSchema](#refresourceschema) | A reference to a search that will guide the user to add a search step to populate this field when creating a Zap.
+`choices` | no | [/FieldChoicesSchema](#fieldchoicesschema) | An object of machine keys and human values to populate a static dropdown.
+`list` | no | `boolean` | Acts differently when used in inputFields vs. when used in outputFields. In inputFields: Can a user provide multiples of this field? In outputFields: Does this field return an array of items of type `type`?
+`children` | no | `array`[[/FieldSchema](#fieldschema)] | An array of child fields that define the structure of a sub-object for this field. Usually used for line items.
+`dict` | no | `boolean` | Is this field a key/value input?
+`computed` | no | `boolean` | Is this field automatically populated (and hidden from the user)? Note: Only OAuth and Session Auth support fields with this key.
+`altersDynamicFields` | no | `boolean` | Does the value of this field affect the definitions of other fields in the set?
+`steadyState` | no | `boolean` | Prevents triggering on new output until all values for fields with this property remain unchanged for 2 polls. It can be used to, e.g., not trigger on a new contact until the contact has completed typing their name. NOTE that this only applies to the `outputFields` of polling triggers.
+`inputFormat` | no | `string` | Useful when you expect the input to be part of a longer string. Put "{{input}}" in place of the user's input (IE: "https://{{input}}.yourdomain.com").
+`meta` | no | [/FieldMetaSchema](#fieldmetaschema) | Allows for additional metadata to be stored on the field. Supports simple key-values only (no sub-objects or arrays).
+
+#### Examples
+
+* `{ key: 'abc' }`
+* `{ key: 'abc', choices: { mobile: 'Mobile Phone' } }`
+* `{ key: 'abc', choices: [ 'first', 'second', 'third' ] }`
+* `{ key: 'abc', choices: [ { label: 'Red', sample: '#f00', value: '#f00' } ] }`
+* `{ key: 'abc', children: [ { key: 'abc' } ] }`
+* `{ key: 'abc', type: 'integer', helpText: 'neat' }`
+* ```
+  {
+    key: 'abc',
+    type: 'integer',
+    meta: { internalType: 'numeric', should_call_api: true, display_order: 1 }
+  }
+  ```
+
+#### Anti-Examples
+
+* `{}` - _Missing required key: key_
+* `{ key: 'abc', type: 'loltype' }` - _Invalid value for key: type_
+* `{ key: 'abc', choices: {} }` - _Invalid value for key: choices (cannot be empty)_
+* `{ key: 'abc', choices: [] }` - _Invalid value for key: choices (cannot be empty)_
+* `{ key: 'abc', choices: [ 3 ] }` - _Invalid value for key: choices (if an array, must be of either string or FieldChoiceWithLabelSchema)_
+* `{ key: 'abc', choices: [ { label: 'Red', value: '#f00' } ] }` - _Invalid value for key: choices (if an array of FieldChoiceWithLabelSchema, must provide key `sample`)_
+* `{ key: 'abc', choices: 'mobile' }` - _Invalid value for key: choices (must be either object or array)_
+* `{ key: 'abc', children: [ '$func$2$f$' ] }` - _Invalid value for key: children (must be array of FieldSchema)_
+
+-----
+
 ## /RedirectRequestSchema
 
 A representation of a HTTP redirect - you can use the `{{syntax}}` to inject authentication, field or global variables.
@@ -1639,7 +1723,7 @@ Key | Required | Type | Description
 `list` | no | [/ResourceMethodListSchema](#resourcemethodlistschema) | How will we get a list of new objects? Will be turned into a trigger automatically.
 `search` | no | [/ResourceMethodSearchSchema](#resourcemethodsearchschema) | How will we find a specific object given filters or search terms? Will be turned into a search automatically.
 `create` | no | [/ResourceMethodCreateSchema](#resourcemethodcreateschema) | How will we find create a specific object given inputs? Will be turned into a create automatically.
-`outputFields` | no | [/DynamicFieldsSchema](#dynamicfieldsschema) | What fields of data will this return?
+`outputFields` | no | [/DynamicOutputFieldsSchema](#dynamicoutputfieldsschema) | What fields of data will this return?
 `sample` | no | `object` | What does a sample of data look like?
 
 #### Examples
diff --git a/packages/schema/exported-schema.json b/packages/schema/exported-schema.json
index d68af061a..2d62bafff 100644
--- a/packages/schema/exported-schema.json
+++ b/packages/schema/exported-schema.json
@@ -96,6 +96,83 @@
       },
       "additionalProperties": false
     },
+    "FunctionRequireSchema": {
+      "id": "/FunctionRequireSchema",
+      "description": "A path to a file that might have content like `module.exports = (z, bundle) => [{id: 123}];`.",
+      "type": "object",
+      "required": ["require"],
+      "properties": {
+        "require": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    },
+    "FunctionSourceSchema": {
+      "id": "/FunctionSourceSchema",
+      "description": "Source code like `{source: \"return 1 + 2\"}` which the system will wrap in a function for you.",
+      "type": "object",
+      "required": ["source"],
+      "properties": {
+        "source": {
+          "type": "string",
+          "pattern": "return",
+          "description": "JavaScript code for the function body. This must end with a `return` statement."
+        },
+        "args": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Function signature. Defaults to `['z', 'bundle']` if not specified."
+        }
+      },
+      "additionalProperties": false
+    },
+    "FlatObjectSchema": {
+      "id": "/FlatObjectSchema",
+      "description": "An object whose values can only be primitives",
+      "type": "object",
+      "patternProperties": {
+        "[^\\s]+": {
+          "description": "Any key may exist in this flat object as long as its values are simple.",
+          "anyOf": [
+            {
+              "type": "null"
+            },
+            {
+              "type": "string"
+            },
+            {
+              "type": "integer"
+            },
+            {
+              "type": "number"
+            },
+            {
+              "type": "boolean"
+            }
+          ]
+        }
+      },
+      "additionalProperties": false
+    },
+    "FunctionSchema": {
+      "id": "/FunctionSchema",
+      "description": "Internal pointer to a function from the original source or the source code itself. Encodes arity and if `arguments` is used in the body. Note - just write normal functions and the system will encode the pointers for you. Or, provide {source: \"return 1 + 2\"} and the system will wrap in a function for you.",
+      "oneOf": [
+        {
+          "type": "string",
+          "pattern": "^\\$func\\$\\d+\\$[tf]\\$$"
+        },
+        {
+          "$ref": "/FunctionRequireSchema"
+        },
+        {
+          "$ref": "/FunctionSourceSchema"
+        }
+      ]
+    },
     "FieldChoiceWithLabelSchema": {
       "id": "/FieldChoiceWithLabelSchema",
       "description": "An object describing a labeled choice in a static dropdown. Useful if the value a user picks isn't exactly what the zap uses. For instance, when they click on a nickname, but the zap uses the user's full name ([image](https://cdn.zapier.com/storage/photos/8ed01ac5df3a511ce93ed2dc43c7fbbc.png)).",
@@ -278,83 +355,6 @@
       },
       "additionalProperties": false
     },
-    "FunctionRequireSchema": {
-      "id": "/FunctionRequireSchema",
-      "description": "A path to a file that might have content like `module.exports = (z, bundle) => [{id: 123}];`.",
-      "type": "object",
-      "required": ["require"],
-      "properties": {
-        "require": {
-          "type": "string"
-        }
-      },
-      "additionalProperties": false
-    },
-    "FunctionSourceSchema": {
-      "id": "/FunctionSourceSchema",
-      "description": "Source code like `{source: \"return 1 + 2\"}` which the system will wrap in a function for you.",
-      "type": "object",
-      "required": ["source"],
-      "properties": {
-        "source": {
-          "type": "string",
-          "pattern": "return",
-          "description": "JavaScript code for the function body. This must end with a `return` statement."
-        },
-        "args": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "description": "Function signature. Defaults to `['z', 'bundle']` if not specified."
-        }
-      },
-      "additionalProperties": false
-    },
-    "FlatObjectSchema": {
-      "id": "/FlatObjectSchema",
-      "description": "An object whose values can only be primitives",
-      "type": "object",
-      "patternProperties": {
-        "[^\\s]+": {
-          "description": "Any key may exist in this flat object as long as its values are simple.",
-          "anyOf": [
-            {
-              "type": "null"
-            },
-            {
-              "type": "string"
-            },
-            {
-              "type": "integer"
-            },
-            {
-              "type": "number"
-            },
-            {
-              "type": "boolean"
-            }
-          ]
-        }
-      },
-      "additionalProperties": false
-    },
-    "FunctionSchema": {
-      "id": "/FunctionSchema",
-      "description": "Internal pointer to a function from the original source or the source code itself. Encodes arity and if `arguments` is used in the body. Note - just write normal functions and the system will encode the pointers for you. Or, provide {source: \"return 1 + 2\"} and the system will wrap in a function for you.",
-      "oneOf": [
-        {
-          "type": "string",
-          "pattern": "^\\$func\\$\\d+\\$[tf]\\$$"
-        },
-        {
-          "$ref": "/FunctionRequireSchema"
-        },
-        {
-          "$ref": "/FunctionSourceSchema"
-        }
-      ]
-    },
     "RequestSchema": {
       "id": "/RequestSchema",
       "description": "A representation of a HTTP request - you can use the `{{syntax}}` to inject authentication, field or global variables.",
@@ -1080,6 +1080,114 @@
       },
       "additionalProperties": false
     },
+    "OutputFieldSchema": {
+      "id": "/OutputFieldSchema",
+      "description": "Field schema specialized for output fields.",
+      "type": "object",
+      "required": ["key"],
+      "properties": {
+        "key": {
+          "description": "A unique machine readable key for this value (IE: \"fname\").",
+          "type": "string",
+          "minLength": 1
+        },
+        "label": {
+          "description": "A human readable label for this value (IE: \"First Name\").",
+          "type": "string",
+          "minLength": 1
+        },
+        "helpText": {
+          "description": "A human readable description of this value (IE: \"The first part of a full name.\"). You can use Markdown.",
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 1000
+        },
+        "type": {
+          "description": "The type of this value. Use `string` for basic text input, `text` for a large, `<textarea>` style box, and `code` for a `<textarea>` with a fixed-width font. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.",
+          "type": "string",
+          "enum": [
+            "string",
+            "text",
+            "integer",
+            "number",
+            "boolean",
+            "datetime",
+            "file",
+            "password",
+            "copy",
+            "code"
+          ]
+        },
+        "required": {
+          "description": "If this value is required or not.",
+          "type": "boolean"
+        },
+        "placeholder": {
+          "description": "An example value that is not saved.",
+          "type": "string",
+          "minLength": 1
+        },
+        "default": {
+          "description": "A default value that is saved the first time a Zap is created.",
+          "type": "string",
+          "minLength": 1
+        },
+        "primary": {
+          "description": "Use this field as part of the primary key for deduplication. You can set multiple fields as \"primary\", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`; it will be ignored if set in `inputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).",
+          "type": "boolean"
+        },
+        "dynamic": {
+          "description": "A reference to a trigger that will power a dynamic dropdown.",
+          "$ref": "/RefResourceSchema"
+        },
+        "search": {
+          "description": "A reference to a search that will guide the user to add a search step to populate this field when creating a Zap.",
+          "$ref": "/RefResourceSchema"
+        },
+        "choices": {
+          "description": "An object of machine keys and human values to populate a static dropdown.",
+          "$ref": "/FieldChoicesSchema"
+        },
+        "list": {
+          "description": "Acts differently when used in inputFields vs. when used in outputFields. In inputFields: Can a user provide multiples of this field? In outputFields: Does this field return an array of items of type `type`?",
+          "type": "boolean"
+        },
+        "children": {
+          "type": "array",
+          "items": {
+            "$ref": "/FieldSchema"
+          },
+          "description": "An array of child fields that define the structure of a sub-object for this field. Usually used for line items.",
+          "minItems": 1
+        },
+        "dict": {
+          "description": "Is this field a key/value input?",
+          "type": "boolean"
+        },
+        "computed": {
+          "description": "Is this field automatically populated (and hidden from the user)? Note: Only OAuth and Session Auth support fields with this key.",
+          "type": "boolean"
+        },
+        "altersDynamicFields": {
+          "description": "Does the value of this field affect the definitions of other fields in the set?",
+          "type": "boolean"
+        },
+        "steadyState": {
+          "description": "Prevents triggering on new output until all values for fields with this property remain unchanged for 2 polls. It can be used to, e.g., not trigger on a new contact until the contact has completed typing their name. NOTE that this only applies to the `outputFields` of polling triggers.",
+          "type": "boolean"
+        },
+        "inputFormat": {
+          "description": "Useful when you expect the input to be part of a longer string. Put \"{{input}}\" in place of the user's input (IE: \"https://{{input}}.yourdomain.com\").",
+          "type": "string",
+          "pattern": "^.*{{input}}.*$"
+        },
+        "meta": {
+          "description": "Allows for additional metadata to be stored on the field. Supports simple key-values only (no sub-objects or arrays).",
+          "$ref": "/FieldMetaSchema"
+        }
+      },
+      "additionalProperties": false
+    },
     "ResourceMethodGetSchema": {
       "id": "/ResourceMethodGetSchema",
       "description": "How will we get a single object given a unique identifier/id?",
@@ -1165,6 +1273,21 @@
       },
       "additionalProperties": false
     },
+    "DynamicOutputFieldsSchema": {
+      "id": "/DynamicOutputFieldsSchema",
+      "description": "An array or collection of output fields.",
+      "type": "array",
+      "items": {
+        "oneOf": [
+          {
+            "$ref": "/OutputFieldSchema"
+          },
+          {
+            "$ref": "/FunctionSchema"
+          }
+        ]
+      }
+    },
     "ResourceSchema": {
       "id": "/ResourceSchema",
       "description": "Represents a resource, which will in turn power triggers, searches, or creates.",
@@ -1203,7 +1326,7 @@
         },
         "outputFields": {
           "description": "What fields of data will this return?",
-          "$ref": "/DynamicFieldsSchema"
+          "$ref": "/DynamicOutputFieldsSchema"
         },
         "sample": {
           "description": "What does a sample of data look like?",
diff --git a/packages/schema/lib/schemas/AppSchema.js b/packages/schema/lib/schemas/AppSchema.js
index e323ff6e9..ffb55c13f 100644
--- a/packages/schema/lib/schemas/AppSchema.js
+++ b/packages/schema/lib/schemas/AppSchema.js
@@ -106,21 +106,6 @@ module.exports = makeSchema(
         description: 'Top-level app options',
         $ref: AppFlagsSchema.id,
       },
-      // inputFields: {
-      //   description:
-      //     'An array or collection of input fields.',
-      //   $ref: InputFieldsSchema.id,
-      // },
-      // outputFields: {
-      //   description:
-      //     'An array or collection of output fields.',
-      //   $ref: OutputFieldsSchema.id,
-      // },
-      // authFields: {
-      //   description:
-      //     'An array or collection of auth input fields.',
-      //   $ref: AuthFieldsSchema.id,
-      // },
       throttle: {
         description: `Zapier uses this configuration to apply throttling when the limit for the window is exceeded. When set here, it is the default throttle configuration used on each action of the integration. And when set in an action's operation object, it gets overwritten for that action only.`,
         $ref: ThrottleObjectSchema.id,
@@ -158,10 +143,6 @@ module.exports = makeSchema(
   [
     AuthenticationSchema,
     FlatObjectSchema,
-    // OutputFieldsSchema,
-    // InputFieldsSchema,
-    // AuthFieldsSchema,
-    // BaseFieldSchema,
     ResourcesSchema,
     ReadBulksSchema,
     TriggersSchema,
diff --git a/packages/schema/lib/schemas/AuthFieldSchema.js b/packages/schema/lib/schemas/AuthInputFieldSchema.js
similarity index 67%
rename from packages/schema/lib/schemas/AuthFieldSchema.js
rename to packages/schema/lib/schemas/AuthInputFieldSchema.js
index adfd6c11a..a5064eb2b 100644
--- a/packages/schema/lib/schemas/AuthFieldSchema.js
+++ b/packages/schema/lib/schemas/AuthInputFieldSchema.js
@@ -1,24 +1,26 @@
 'use strict';
 
 const makeSchema = require('../utils/makeSchema');
-const BaseFieldSchema = require('./BaseFieldSchema');
+const FieldSchema = require('./FieldSchema');
+
 const schema = makeSchema(
   {
-    id: '/AuthFieldSchema',
-    description: 'Field schema specialized for auth fields (e.g., OAuth).',
+    id: '/AuthInputFieldSchema',
+    description:
+      'Field schema specialized for auth input fields (e.g., OAuth).',
     type: 'object',
     allOf: [
-      { $ref: BaseFieldSchema.id },
+      { $ref: FieldSchema.id },
       {
         type: 'object',
         properties: {
           // New property
           isSafe: {
-            description: 'Indicates if this auth field is safe (not secret).',
+            description:
+              'Indicates if this auth input field is safe (not secret).',
             type: 'boolean',
           },
         },
-        additionalProperties: false,
       },
       // Forbid certain keys from having isSafe = true
       {
@@ -40,8 +42,7 @@ const schema = makeSchema(
       },
     ],
   },
-  [BaseFieldSchema],
+  [FieldSchema],
 );
 
-schema.dependencies = [BaseFieldSchema];
 module.exports = schema;
diff --git a/packages/schema/lib/schemas/AuthenticationSchema.js b/packages/schema/lib/schemas/AuthenticationSchema.js
index 8e8cedb18..7076493ab 100644
--- a/packages/schema/lib/schemas/AuthenticationSchema.js
+++ b/packages/schema/lib/schemas/AuthenticationSchema.js
@@ -8,9 +8,9 @@ const AuthenticationDigestConfigSchema = require('./AuthenticationDigestConfigSc
 const AuthenticationOAuth1ConfigSchema = require('./AuthenticationOAuth1ConfigSchema.js');
 const AuthenticationOAuth2ConfigSchema = require('./AuthenticationOAuth2ConfigSchema.js');
 const AuthenticationSessionConfigSchema = require('./AuthenticationSessionConfigSchema.js');
-const FieldsSchema = require('./FieldsSchema');
 const FunctionSchema = require('./FunctionSchema');
 const RequestSchema = require('./RequestSchema');
+const FieldsSchema = require('./FieldsSchema');
 
 module.exports = makeSchema(
   {
@@ -105,9 +105,9 @@ module.exports = makeSchema(
     ],
   },
   [
-    FieldsSchema,
     FunctionSchema,
     RequestSchema,
+    FieldsSchema,
     AuthenticationBasicConfigSchema,
     AuthenticationCustomConfigSchema,
     AuthenticationDigestConfigSchema,
diff --git a/packages/schema/lib/schemas/BaseFieldSchema.js b/packages/schema/lib/schemas/BaseFieldSchema.js
deleted file mode 100644
index 5fe0ebd91..000000000
--- a/packages/schema/lib/schemas/BaseFieldSchema.js
+++ /dev/null
@@ -1,210 +0,0 @@
-'use strict';
-
-const makeSchema = require('../utils/makeSchema');
-
-const RefResourceSchema = require('./RefResourceSchema');
-
-const FieldChoicesSchema = require('./FieldChoicesSchema');
-
-const FieldMetaSchema = require('./FieldMetaSchema');
-
-const { INCOMPATIBLE_FIELD_SCHEMA_KEYS } = require('../constants');
-
-// the following takes an array of string arrays (string[][]) and returns the follwing string:
-// * `a` & `b`
-// * `c` & `d`
-// ... etc
-const wrapInBackticks = (s) => `\`${s}\``;
-const formatBullet = (f) => `* ${f.map(wrapInBackticks).join(' & ')}`;
-const incompatibleFieldsList =
-  INCOMPATIBLE_FIELD_SCHEMA_KEYS.map(formatBullet).join('\n');
-
-module.exports = makeSchema(
-  {
-    id: '/BaseFieldSchema',
-    description: `Defines a field an app either needs as input, or gives as output. In addition to the requirements below, the following keys are mutually exclusive:\n\n${incompatibleFieldsList}`,
-    type: 'object',
-    required: ['key'],
-    properties: {
-      key: {
-        description:
-          'A unique machine readable key for this value (IE: "fname").',
-        type: 'string',
-        minLength: 1,
-      },
-      label: {
-        description:
-          'A human readable label for this value (IE: "First Name").',
-        type: 'string',
-        minLength: 1,
-      },
-      helpText: {
-        description:
-          'A human readable description of this value (IE: "The first part of a full name."). You can use Markdown.',
-        type: 'string',
-        minLength: 1,
-        maxLength: 1000,
-      },
-      type: {
-        description:
-          'The type of this value. Use `string` for basic text input, `text` for a large, `<textarea>` style box, and `code` for a `<textarea>` with a fixed-width font. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.',
-        type: 'string',
-        // string == unicode
-        // text == a long textarea string
-        // integer == int
-        // number == float
-        enum: [
-          'string',
-          'text',
-          'integer',
-          'number',
-          'boolean',
-          'datetime',
-          'file',
-          'password',
-          'copy',
-          'code',
-        ],
-      },
-      required: {
-        description: 'If this value is required or not.',
-        type: 'boolean',
-      },
-      placeholder: {
-        description: 'An example value that is not saved.',
-        type: 'string',
-        minLength: 1,
-      },
-      default: {
-        description:
-          'A default value that is saved the first time a Zap is created.',
-        type: 'string',
-        minLength: 1,
-      },
-      primary: {
-        description:
-          'Use this field as part of the primary key for deduplication. You can set multiple fields as "primary", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`; it will be ignored if set in `inputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).',
-        type: 'boolean',
-      },
-      dynamic: {
-        description:
-          'A reference to a trigger that will power a dynamic dropdown.',
-        $ref: RefResourceSchema.id,
-      },
-      search: {
-        description:
-          'A reference to a search that will guide the user to add a search step to populate this field when creating a Zap.',
-        $ref: RefResourceSchema.id,
-      },
-      choices: {
-        description:
-          'An object of machine keys and human values to populate a static dropdown.',
-        $ref: FieldChoicesSchema.id,
-      },
-      list: {
-        description:
-          'Acts differently when used in inputFields vs. when used in outputFields. In inputFields: Can a user provide multiples of this field? In outputFields: Does this field return an array of items of type `type`?',
-        type: 'boolean',
-      },
-      children: {
-        type: 'array',
-        items: { $ref: '/BaseFieldSchema' },
-        description:
-          'An array of child fields that define the structure of a sub-object for this field. Usually used for line items.',
-        minItems: 1,
-      },
-      dict: {
-        description: 'Is this field a key/value input?',
-        type: 'boolean',
-      },
-      computed: {
-        description:
-          'Is this field automatically populated (and hidden from the user)? Note: Only OAuth and Session Auth support fields with this key.',
-        type: 'boolean',
-      },
-      altersDynamicFields: {
-        description:
-          'Does the value of this field affect the definitions of other fields in the set?',
-        type: 'boolean',
-      },
-      steadyState: {
-        description:
-          'Prevents triggering on new output until all values for fields with this property remain unchanged for 2 polls. It can be used to, e.g., not trigger on a new contact until the contact has completed typing their name. NOTE that this only applies to the `outputFields` of polling triggers.',
-        type: 'boolean',
-      },
-      inputFormat: {
-        description:
-          'Useful when you expect the input to be part of a longer string. Put "{{input}}" in place of the user\'s input (IE: "https://{{input}}.yourdomain.com").',
-        type: 'string',
-        // TODO: Check if it contains one and ONLY ONE '{{input}}'
-        pattern: '^.*{{input}}.*$',
-      },
-      meta: {
-        description:
-          'Allows for additional metadata to be stored on the field. Supports simple key-values only (no sub-objects or arrays).',
-        $ref: FieldMetaSchema.id,
-      },
-    },
-    examples: [
-      { key: 'abc' },
-      { key: 'abc', choices: { mobile: 'Mobile Phone' } },
-      { key: 'abc', choices: ['first', 'second', 'third'] },
-      {
-        key: 'abc',
-        choices: [{ label: 'Red', sample: '#f00', value: '#f00' }],
-      },
-      { key: 'abc', children: [{ key: 'abc' }] },
-      { key: 'abc', type: 'integer', helpText: 'neat' },
-      {
-        key: 'abc',
-        type: 'integer',
-        meta: {
-          internalType: 'numeric',
-          should_call_api: true,
-          display_order: 1,
-        },
-      },
-    ],
-    antiExamples: [
-      {
-        example: {},
-        reason: 'Missing required key: key',
-      },
-      {
-        example: { key: 'abc', type: 'loltype' },
-        reason: 'Invalid value for key: type',
-      },
-      {
-        example: { key: 'abc', choices: {} },
-        reason: 'Invalid value for key: choices (cannot be empty)',
-      },
-      {
-        example: { key: 'abc', choices: [] },
-        reason: 'Invalid value for key: choices (cannot be empty)',
-      },
-      {
-        example: { key: 'abc', choices: [3] },
-        reason:
-          'Invalid value for key: choices (if an array, must be of either string or FieldChoiceWithLabelSchema)',
-      },
-      {
-        example: { key: 'abc', choices: [{ label: 'Red', value: '#f00' }] },
-        reason:
-          'Invalid value for key: choices (if an array of FieldChoiceWithLabelSchema, must provide key `sample`)',
-      },
-      {
-        example: { key: 'abc', choices: 'mobile' },
-        reason:
-          'Invalid value for key: choices (must be either object or array)',
-      },
-
-      {
-        example: { key: 'abc', children: ['$func$2$f$'] },
-        reason:
-          'Invalid value for key: children (must be array of BaseFieldSchema)',
-      },
-    ],
-    additionalProperties: false,
-  },
-  [RefResourceSchema, FieldChoicesSchema, FieldMetaSchema],
-);
diff --git a/packages/schema/lib/schemas/BasicOperationSchema.js b/packages/schema/lib/schemas/BasicOperationSchema.js
index eab2e1089..0af0c025b 100644
--- a/packages/schema/lib/schemas/BasicOperationSchema.js
+++ b/packages/schema/lib/schemas/BasicOperationSchema.js
@@ -3,13 +3,15 @@
 const makeSchema = require('../utils/makeSchema');
 const { SKIP_KEY } = require('../constants');
 
-const DynamicFieldsSchema = require('./DynamicFieldsSchema');
 const FunctionSchema = require('./FunctionSchema');
 const RequestSchema = require('./RequestSchema');
 const ResultsSchema = require('./ResultsSchema');
 const KeySchema = require('./KeySchema');
 const LockObjectSchema = require('./LockObjectSchema');
 const ThrottleObjectSchema = require('./ThrottleObjectSchema');
+// const DynamicInputFieldsSchema = require('./DynamicInputFieldsSchema');
+// const DynamicOutputFieldsSchema = require('./DynamicOutputFieldsSchema');
+const DynamicFieldsSchema = require('./DynamicFieldsSchema');
 
 module.exports = makeSchema(
   {
@@ -83,6 +85,7 @@ module.exports = makeSchema(
   },
   [
     DynamicFieldsSchema,
+    // DynamicOutputFieldsSchema,
     FunctionSchema,
     KeySchema,
     LockObjectSchema,
diff --git a/packages/schema/lib/schemas/AuthFieldsSchema.js b/packages/schema/lib/schemas/DynamicAuthInputFieldsSchema.js
similarity index 59%
rename from packages/schema/lib/schemas/AuthFieldsSchema.js
rename to packages/schema/lib/schemas/DynamicAuthInputFieldsSchema.js
index ef05cd6d3..8d9e85169 100644
--- a/packages/schema/lib/schemas/AuthFieldsSchema.js
+++ b/packages/schema/lib/schemas/DynamicAuthInputFieldsSchema.js
@@ -2,16 +2,18 @@
 
 const makeSchema = require('../utils/makeSchema');
 
-const AuthFieldSchema = require('./AuthFieldSchema');
+const AuthInputFieldSchema = require('./AuthInputFieldSchema');
 
 module.exports = makeSchema(
   {
-    id: '/AuthFieldsSchema',
+    id: '/DynamicAuthInputFieldsSchema',
     description: 'An array or collection of auth input fields.',
     type: 'array',
-    items: { $ref: AuthFieldSchema.id },
+    items: {
+      oneOf: [{ $ref: AuthInputFieldSchema.id }],
+    },
     examples: [[{ key: 'abc' }]],
     antiExamples: [{ example: {}, reason: 'Must be an array' }],
   },
-  [AuthFieldSchema],
+  [AuthInputFieldSchema],
 );
diff --git a/packages/schema/lib/schemas/InputFieldsSchema.js b/packages/schema/lib/schemas/DynamicInputFieldsSchema.js
similarity index 60%
rename from packages/schema/lib/schemas/InputFieldsSchema.js
rename to packages/schema/lib/schemas/DynamicInputFieldsSchema.js
index d270ff3fd..95a06f84d 100644
--- a/packages/schema/lib/schemas/InputFieldsSchema.js
+++ b/packages/schema/lib/schemas/DynamicInputFieldsSchema.js
@@ -3,15 +3,18 @@
 const makeSchema = require('../utils/makeSchema');
 
 const InputFieldSchema = require('./InputFieldSchema');
+const FunctionSchema = require('./FunctionSchema');
 
 module.exports = makeSchema(
   {
-    id: '/InputFieldsSchema',
+    id: '/DynamicInputFieldsSchema',
     description: 'An array or collection of input fields.',
     type: 'array',
-    items: { $ref: InputFieldSchema.id },
+    items: {
+      oneOf: [{ $ref: InputFieldSchema.id }, { $ref: FunctionSchema.id }],
+    },
     examples: [[{ key: 'abc' }]],
     antiExamples: [{ example: {}, reason: 'Must be an array' }],
   },
-  [InputFieldSchema],
+  [InputFieldSchema, FunctionSchema],
 );
diff --git a/packages/schema/lib/schemas/OutputFieldsSchema.js b/packages/schema/lib/schemas/DynamicOutputFieldsSchema.js
similarity index 60%
rename from packages/schema/lib/schemas/OutputFieldsSchema.js
rename to packages/schema/lib/schemas/DynamicOutputFieldsSchema.js
index 0bcc81bed..744c687c8 100644
--- a/packages/schema/lib/schemas/OutputFieldsSchema.js
+++ b/packages/schema/lib/schemas/DynamicOutputFieldsSchema.js
@@ -3,15 +3,18 @@
 const makeSchema = require('../utils/makeSchema');
 
 const OutputFieldSchema = require('./OutputFieldSchema');
+const FunctionSchema = require('./FunctionSchema');
 
 module.exports = makeSchema(
   {
-    id: '/OutputFieldsSchema',
+    id: '/DynamicOutputFieldsSchema',
     description: 'An array or collection of output fields.',
     type: 'array',
-    items: { $ref: OutputFieldSchema.id },
+    items: {
+      oneOf: [{ $ref: OutputFieldSchema.id }, { $ref: FunctionSchema.id }],
+    },
     examples: [[{ key: 'abc' }]],
     antiExamples: [{ example: {}, reason: 'Must be an array' }],
   },
-  [OutputFieldSchema],
+  [OutputFieldSchema, FunctionSchema],
 );
diff --git a/packages/schema/lib/schemas/InputFieldSchema.js b/packages/schema/lib/schemas/InputFieldSchema.js
index a672526f6..7989032bf 100644
--- a/packages/schema/lib/schemas/InputFieldSchema.js
+++ b/packages/schema/lib/schemas/InputFieldSchema.js
@@ -1,52 +1,13 @@
 'use strict';
 
 const makeSchema = require('../utils/makeSchema');
-const BaseFieldSchema = require('./BaseFieldSchema');
+const FieldSchema = require('./FieldSchema');
 
 module.exports = makeSchema(
   {
+    ...FieldSchema.schema,
+    description: 'Field schema specialized for input fields.',
     id: '/InputFieldSchema',
-    description: 'Field schema specialized for input fields (simplified).',
-    type: 'object',
-    allOf: [
-      { $ref: BaseFieldSchema.id },
-      {
-        type: 'object',
-        properties: {
-          urlPatterns: {
-            description: 'A non-empty array of valid URL patterns (strings).',
-            type: 'array',
-            minItems: 1,
-            items: {
-              type: 'string',
-            },
-          },
-        },
-        additionalProperties: false,
-      },
-      {
-        // If urlPatterns is present, forbid certain properties & ensure type is 'string' or absent
-        if: { required: ['urlPatterns'] },
-        then: {
-          not: {
-            anyOf: [
-              { required: ['choices'] },
-              { required: ['list'] },
-              { required: ['children'] },
-              { required: ['dict'] },
-              { required: ['computed'] },
-              { required: ['altersDynamicFields'] },
-              { required: ['inputFormat'] },
-            ],
-          },
-          properties: {
-            type: {
-              enum: ['string', undefined],
-            },
-          },
-        },
-      },
-    ],
   },
-  [BaseFieldSchema],
+  [FieldSchema],
 );
diff --git a/packages/schema/lib/schemas/OutputFieldSchema.js b/packages/schema/lib/schemas/OutputFieldSchema.js
index f829350e6..8b3f46035 100644
--- a/packages/schema/lib/schemas/OutputFieldSchema.js
+++ b/packages/schema/lib/schemas/OutputFieldSchema.js
@@ -1,29 +1,13 @@
 'use strict';
 
 const makeSchema = require('../utils/makeSchema');
-const BaseFieldSchema = require('./BaseFieldSchema');
+const FieldSchema = require('./FieldSchema');
 
 module.exports = makeSchema(
   {
-    id: '/OutputFieldSchema',
+    ...FieldSchema.schema,
     description: 'Field schema specialized for output fields.',
-    type: 'object',
-    allOf: [
-      { $ref: BaseFieldSchema.id },
-      {
-        type: 'object',
-        properties: {
-          isCanonicalUrl: { type: 'boolean' },
-          isCanonicalFile: { type: 'boolean' },
-          isTitle: { type: 'boolean' },
-          fileType: {
-            type: 'string',
-            description: "A string indicating a file's MIME type, if relevant.",
-          },
-        },
-        additionalProperties: false,
-      },
-    ],
+    id: '/OutputFieldSchema',
   },
-  [BaseFieldSchema],
+  [FieldSchema],
 );
diff --git a/packages/schema/lib/schemas/ResourceSchema.js b/packages/schema/lib/schemas/ResourceSchema.js
index 5a000b83d..403824635 100644
--- a/packages/schema/lib/schemas/ResourceSchema.js
+++ b/packages/schema/lib/schemas/ResourceSchema.js
@@ -7,8 +7,8 @@ const ResourceMethodHookSchema = require('./ResourceMethodHookSchema');
 const ResourceMethodListSchema = require('./ResourceMethodListSchema');
 const ResourceMethodSearchSchema = require('./ResourceMethodSearchSchema');
 const ResourceMethodCreateSchema = require('./ResourceMethodCreateSchema');
-const DynamicFieldsSchema = require('./DynamicFieldsSchema');
 const KeySchema = require('./KeySchema');
+const DynamicOutputFieldsSchema = require('./DynamicOutputFieldsSchema');
 
 module.exports = makeSchema(
   {
@@ -52,7 +52,7 @@ module.exports = makeSchema(
       },
       outputFields: {
         description: 'What fields of data will this return?',
-        $ref: DynamicFieldsSchema.id,
+        $ref: DynamicOutputFieldsSchema.id,
       },
       sample: {
         description: 'What does a sample of data look like?',
@@ -162,7 +162,7 @@ module.exports = makeSchema(
     ResourceMethodListSchema,
     ResourceMethodSearchSchema,
     ResourceMethodCreateSchema,
-    DynamicFieldsSchema,
+    DynamicOutputFieldsSchema,
     KeySchema,
   ],
 );
diff --git a/packages/schema/lib/utils/makeValidator.js b/packages/schema/lib/utils/makeValidator.js
index 6b73e870a..e57391ab5 100644
--- a/packages/schema/lib/utils/makeValidator.js
+++ b/packages/schema/lib/utils/makeValidator.js
@@ -64,6 +64,12 @@ const processBaseError = (err, path) => {
  */
 const cleanError = (validationError, path, validator, definition) => {
   if (ambiguousTypes.includes(validationError.name)) {
+    // If argument is not an array, we can't do .every(...)
+    if (!Array.isArray(validationError.argument)) {
+      // fallback: treat it like a standard error
+      return processBaseError(validationError, path);
+    }
+
     // flatObjectSchema requires each property to be a type. instead of recursing down, it's more valuable to say "hey, it's not of these types"
     if (validationError.argument.every((s) => s.includes('subschema'))) {
       return processBaseError(validationError, path);
diff --git a/packages/schema/test/index.js b/packages/schema/test/index.js
index e8268b684..ca123c46e 100644
--- a/packages/schema/test/index.js
+++ b/packages/schema/test/index.js
@@ -9,7 +9,7 @@ const appDefinition = require('../examples/definition.json');
 
 const copy = (o) => JSON.parse(JSON.stringify(o));
 
-const NUM_SCHEMAS = 57; // changes regularly as we expand
+const NUM_SCHEMAS = 59; // changes regularly as we expand
 
 describe('app', () => {
   describe('validation', () => {

From 6ebe53c5453153e2998c45c593692edf9c5a2042 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Tue, 28 Jan 2025 14:45:37 -0500
Subject: [PATCH 03/60] PDE-5719 address commented out lines

---
 packages/core/types/zapier.generated.d.ts     | 440 +++++++++++-------
 packages/schema/docs/build/schema.md          | 126 +++--
 packages/schema/exported-schema.json          | 405 ++++++++++------
 .../lib/schemas/BasicOperationSchema.js       |  13 +-
 4 files changed, 621 insertions(+), 363 deletions(-)

diff --git a/packages/core/types/zapier.generated.d.ts b/packages/core/types/zapier.generated.d.ts
index 6995572e9..9f3fe780e 100644
--- a/packages/core/types/zapier.generated.d.ts
+++ b/packages/core/types/zapier.generated.d.ts
@@ -622,11 +622,268 @@ export interface AuthenticationSessionConfig {
 }
 
 /**
- * Represents an array of fields or functions.
+ * Field schema specialized for input fields.
  *
- * [Docs: FieldOrFunctionSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#FieldOrFunctionSchema)
+ * [Docs: InputFieldSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#InputFieldSchema)
  */
-export type FieldOrFunction = (Field | Function)[];
+export interface InputField {
+  /** A unique machine readable key for this value (IE: "fname"). */
+  key: string;
+
+  /** A human readable label for this value (IE: "First Name"). */
+  label?: string;
+
+  /**
+   * A human readable description of this value (IE: "The first part
+   * of a full name."). You can use Markdown.
+   */
+  helpText?: string;
+
+  /**
+   * The type of this value. Use `string` for basic text input, `text`
+   * for a large, `<textarea>` style box, and `code` for a
+   * `<textarea>` with a fixed-width font. Field type of `file` will
+   * accept either a file object or a string. If a URL is provided in
+   * the string, Zapier will automatically make a GET for that file.
+   * Otherwise, a .txt file will be generated.
+   */
+  type?:
+    | 'string'
+    | 'text'
+    | 'integer'
+    | 'number'
+    | 'boolean'
+    | 'datetime'
+    | 'file'
+    | 'password'
+    | 'copy'
+    | 'code';
+
+  /** If this value is required or not. */
+  required?: boolean;
+
+  /** An example value that is not saved. */
+  placeholder?: string;
+
+  /**
+   * A default value that is saved the first time a Zap is created.
+   */
+  default?: string;
+
+  /**
+   * Use this field as part of the primary key for deduplication. You
+   * can set multiple fields as "primary", provided they are unique
+   * together. If no fields are set, Zapier will default to using the
+   * `id` field. `primary` only makes sense for `outputFields`; it
+   * will be ignored if set in `inputFields`. It only works in static
+   * `outputFields`; will not work in custom/dynamic `outputFields`.
+   * For more information, see [How deduplication works in
+   * Zapier](https://platform.zapier.com/build/deduplication).
+   */
+  primary?: boolean;
+
+  /**
+   * A reference to a trigger that will power a dynamic dropdown.
+   */
+  dynamic?: RefResource;
+
+  /**
+   * A reference to a search that will guide the user to add a search
+   * step to populate this field when creating a Zap.
+   */
+  search?: RefResource;
+
+  /**
+   * An object of machine keys and human values to populate a static
+   * dropdown.
+   */
+  choices?: FieldChoices;
+
+  /**
+   * Acts differently when used in inputFields vs. when used in
+   * outputFields. In inputFields: Can a user provide multiples of
+   * this field? In outputFields: Does this field return an array of
+   * items of type `type`?
+   */
+  list?: boolean;
+
+  /**
+   * An array of child fields that define the structure of a
+   * sub-object for this field. Usually used for line items.
+   *
+   * @minItems 1
+   */
+  children?: Field[];
+
+  /** Is this field a key/value input? */
+  dict?: boolean;
+
+  /**
+   * Is this field automatically populated (and hidden from the user)?
+   * Note: Only OAuth and Session Auth support fields with this key.
+   */
+  computed?: boolean;
+
+  /**
+   * Does the value of this field affect the definitions of other
+   * fields in the set?
+   */
+  altersDynamicFields?: boolean;
+
+  /**
+   * Prevents triggering on new output until all values for fields
+   * with this property remain unchanged for 2 polls. It can be used
+   * to, e.g., not trigger on a new contact until the contact has
+   * completed typing their name. NOTE that this only applies to the
+   * `outputFields` of polling triggers.
+   */
+  steadyState?: boolean;
+
+  /**
+   * Useful when you expect the input to be part of a longer string.
+   * Put "{{input}}" in place of the user's input (IE:
+   * "https://{{input}}.yourdomain.com").
+   */
+  inputFormat?: string;
+
+  /**
+   * Allows for additional metadata to be stored on the field.
+   * Supports simple key-values only (no sub-objects or arrays).
+   */
+  meta?: FieldMeta;
+}
+
+/**
+ * Field schema specialized for output fields.
+ *
+ * [Docs: OutputFieldSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#OutputFieldSchema)
+ */
+export interface OutputField {
+  /** A unique machine readable key for this value (IE: "fname"). */
+  key: string;
+
+  /** A human readable label for this value (IE: "First Name"). */
+  label?: string;
+
+  /**
+   * A human readable description of this value (IE: "The first part
+   * of a full name."). You can use Markdown.
+   */
+  helpText?: string;
+
+  /**
+   * The type of this value. Use `string` for basic text input, `text`
+   * for a large, `<textarea>` style box, and `code` for a
+   * `<textarea>` with a fixed-width font. Field type of `file` will
+   * accept either a file object or a string. If a URL is provided in
+   * the string, Zapier will automatically make a GET for that file.
+   * Otherwise, a .txt file will be generated.
+   */
+  type?:
+    | 'string'
+    | 'text'
+    | 'integer'
+    | 'number'
+    | 'boolean'
+    | 'datetime'
+    | 'file'
+    | 'password'
+    | 'copy'
+    | 'code';
+
+  /** If this value is required or not. */
+  required?: boolean;
+
+  /** An example value that is not saved. */
+  placeholder?: string;
+
+  /**
+   * A default value that is saved the first time a Zap is created.
+   */
+  default?: string;
+
+  /**
+   * Use this field as part of the primary key for deduplication. You
+   * can set multiple fields as "primary", provided they are unique
+   * together. If no fields are set, Zapier will default to using the
+   * `id` field. `primary` only makes sense for `outputFields`; it
+   * will be ignored if set in `inputFields`. It only works in static
+   * `outputFields`; will not work in custom/dynamic `outputFields`.
+   * For more information, see [How deduplication works in
+   * Zapier](https://platform.zapier.com/build/deduplication).
+   */
+  primary?: boolean;
+
+  /**
+   * A reference to a trigger that will power a dynamic dropdown.
+   */
+  dynamic?: RefResource;
+
+  /**
+   * A reference to a search that will guide the user to add a search
+   * step to populate this field when creating a Zap.
+   */
+  search?: RefResource;
+
+  /**
+   * An object of machine keys and human values to populate a static
+   * dropdown.
+   */
+  choices?: FieldChoices;
+
+  /**
+   * Acts differently when used in inputFields vs. when used in
+   * outputFields. In inputFields: Can a user provide multiples of
+   * this field? In outputFields: Does this field return an array of
+   * items of type `type`?
+   */
+  list?: boolean;
+
+  /**
+   * An array of child fields that define the structure of a
+   * sub-object for this field. Usually used for line items.
+   *
+   * @minItems 1
+   */
+  children?: Field[];
+
+  /** Is this field a key/value input? */
+  dict?: boolean;
+
+  /**
+   * Is this field automatically populated (and hidden from the user)?
+   * Note: Only OAuth and Session Auth support fields with this key.
+   */
+  computed?: boolean;
+
+  /**
+   * Does the value of this field affect the definitions of other
+   * fields in the set?
+   */
+  altersDynamicFields?: boolean;
+
+  /**
+   * Prevents triggering on new output until all values for fields
+   * with this property remain unchanged for 2 polls. It can be used
+   * to, e.g., not trigger on a new contact until the contact has
+   * completed typing their name. NOTE that this only applies to the
+   * `outputFields` of polling triggers.
+   */
+  steadyState?: boolean;
+
+  /**
+   * Useful when you expect the input to be part of a longer string.
+   * Put "{{input}}" in place of the user's input (IE:
+   * "https://{{input}}.yourdomain.com").
+   */
+  inputFormat?: string;
+
+  /**
+   * Allows for additional metadata to be stored on the field.
+   * Supports simple key-values only (no sub-objects or arrays).
+   */
+  meta?: FieldMeta;
+}
 
 /**
  * EXPERIMENTAL: Overrides the original throttle configuration based
@@ -669,12 +926,18 @@ export interface ThrottleOverrideObject {
 }
 
 /**
- * Like [/FieldsSchema](#fieldsschema) but you can provide functions
- * to create dynamic or custom fields.
+ * An array or collection of input fields.
  *
- * [Docs: DynamicFieldsSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#DynamicFieldsSchema)
+ * [Docs: DynamicInputFieldsSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#DynamicInputFieldsSchema)
  */
-export type DynamicFields = (Field | Function)[];
+export type DynamicInputFields = (InputField | Function)[];
+
+/**
+ * An array or collection of output fields.
+ *
+ * [Docs: DynamicOutputFieldsSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#DynamicOutputFieldsSchema)
+ */
+export type DynamicOutputFields = (OutputField | Function)[];
 
 /**
  * A unique identifier for this item.
@@ -856,13 +1119,13 @@ export interface BasicOperation {
   perform: Request | Function;
 
   /** What should the form a user sees and configures look like? */
-  inputFields?: DynamicFields;
+  inputFields?: DynamicInputFields;
 
   /**
    * What fields of data will this return? Will use resource
    * outputFields if missing, will also use sample if available.
    */
-  outputFields?: DynamicFields;
+  outputFields?: DynamicOutputFields;
 
   /**
    * What does a sample of data look like? Will use resource sample if
@@ -951,13 +1214,13 @@ export interface BasicHookOperation {
   performUnsubscribe?: Request | Function;
 
   /** What should the form a user sees and configures look like? */
-  inputFields?: DynamicFields;
+  inputFields?: DynamicInputFields;
 
   /**
    * What fields of data will this return? Will use resource
    * outputFields if missing, will also use sample if available.
    */
-  outputFields?: DynamicFields;
+  outputFields?: DynamicOutputFields;
 
   /**
    * What does a sample of data look like? Will use resource sample if
@@ -1000,13 +1263,13 @@ export interface BasicPollingOperation {
   canPaginate?: boolean;
 
   /** What should the form a user sees and configures look like? */
-  inputFields?: DynamicFields;
+  inputFields?: DynamicInputFields;
 
   /**
    * What fields of data will this return? Will use resource
    * outputFields if missing, will also use sample if available.
    */
-  outputFields?: DynamicFields;
+  outputFields?: DynamicOutputFields;
 
   /**
    * What does a sample of data look like? Will use resource sample if
@@ -1059,13 +1322,13 @@ export interface BasicActionOperation {
   performGet?: Request | Function;
 
   /** What should the form a user sees and configures look like? */
-  inputFields?: DynamicFields;
+  inputFields?: DynamicInputFields;
 
   /**
    * What fields of data will this return? Will use resource
    * outputFields if missing, will also use sample if available.
    */
-  outputFields?: DynamicFields;
+  outputFields?: DynamicOutputFields;
 
   /**
    * What does a sample of data look like? Will use resource sample if
@@ -1087,138 +1350,6 @@ export interface BasicActionOperation {
   throttle?: ThrottleObject;
 }
 
-/**
- * Field schema specialized for output fields.
- *
- * [Docs: OutputFieldSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#OutputFieldSchema)
- */
-export interface OutputField {
-  /** A unique machine readable key for this value (IE: "fname"). */
-  key: string;
-
-  /** A human readable label for this value (IE: "First Name"). */
-  label?: string;
-
-  /**
-   * A human readable description of this value (IE: "The first part
-   * of a full name."). You can use Markdown.
-   */
-  helpText?: string;
-
-  /**
-   * The type of this value. Use `string` for basic text input, `text`
-   * for a large, `<textarea>` style box, and `code` for a
-   * `<textarea>` with a fixed-width font. Field type of `file` will
-   * accept either a file object or a string. If a URL is provided in
-   * the string, Zapier will automatically make a GET for that file.
-   * Otherwise, a .txt file will be generated.
-   */
-  type?:
-    | 'string'
-    | 'text'
-    | 'integer'
-    | 'number'
-    | 'boolean'
-    | 'datetime'
-    | 'file'
-    | 'password'
-    | 'copy'
-    | 'code';
-
-  /** If this value is required or not. */
-  required?: boolean;
-
-  /** An example value that is not saved. */
-  placeholder?: string;
-
-  /**
-   * A default value that is saved the first time a Zap is created.
-   */
-  default?: string;
-
-  /**
-   * Use this field as part of the primary key for deduplication. You
-   * can set multiple fields as "primary", provided they are unique
-   * together. If no fields are set, Zapier will default to using the
-   * `id` field. `primary` only makes sense for `outputFields`; it
-   * will be ignored if set in `inputFields`. It only works in static
-   * `outputFields`; will not work in custom/dynamic `outputFields`.
-   * For more information, see [How deduplication works in
-   * Zapier](https://platform.zapier.com/build/deduplication).
-   */
-  primary?: boolean;
-
-  /**
-   * A reference to a trigger that will power a dynamic dropdown.
-   */
-  dynamic?: RefResource;
-
-  /**
-   * A reference to a search that will guide the user to add a search
-   * step to populate this field when creating a Zap.
-   */
-  search?: RefResource;
-
-  /**
-   * An object of machine keys and human values to populate a static
-   * dropdown.
-   */
-  choices?: FieldChoices;
-
-  /**
-   * Acts differently when used in inputFields vs. when used in
-   * outputFields. In inputFields: Can a user provide multiples of
-   * this field? In outputFields: Does this field return an array of
-   * items of type `type`?
-   */
-  list?: boolean;
-
-  /**
-   * An array of child fields that define the structure of a
-   * sub-object for this field. Usually used for line items.
-   *
-   * @minItems 1
-   */
-  children?: Field[];
-
-  /** Is this field a key/value input? */
-  dict?: boolean;
-
-  /**
-   * Is this field automatically populated (and hidden from the user)?
-   * Note: Only OAuth and Session Auth support fields with this key.
-   */
-  computed?: boolean;
-
-  /**
-   * Does the value of this field affect the definitions of other
-   * fields in the set?
-   */
-  altersDynamicFields?: boolean;
-
-  /**
-   * Prevents triggering on new output until all values for fields
-   * with this property remain unchanged for 2 polls. It can be used
-   * to, e.g., not trigger on a new contact until the contact has
-   * completed typing their name. NOTE that this only applies to the
-   * `outputFields` of polling triggers.
-   */
-  steadyState?: boolean;
-
-  /**
-   * Useful when you expect the input to be part of a longer string.
-   * Put "{{input}}" in place of the user's input (IE:
-   * "https://{{input}}.yourdomain.com").
-   */
-  inputFormat?: string;
-
-  /**
-   * Allows for additional metadata to be stored on the field.
-   * Supports simple key-values only (no sub-objects or arrays).
-   */
-  meta?: FieldMeta;
-}
-
 /**
  * How will we get a single object given a unique identifier/id?
  *
@@ -1292,13 +1423,6 @@ export interface ResourceMethodCreate {
   operation: BasicActionOperation;
 }
 
-/**
- * An array or collection of output fields.
- *
- * [Docs: DynamicOutputFieldsSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#DynamicOutputFieldsSchema)
- */
-export type DynamicOutputFields = (OutputField | Function)[];
-
 /**
  * Represents a resource, which will in turn power triggers,
  * searches, or creates.
@@ -1407,13 +1531,13 @@ export interface BasicHookToPollOperation {
   performUnsubscribe: Request | Function;
 
   /** What should the form a user sees and configures look like? */
-  inputFields?: DynamicFields;
+  inputFields?: DynamicInputFields;
 
   /**
    * What fields of data will this return? Will use resource
    * outputFields if missing, will also use sample if available.
    */
-  outputFields?: DynamicFields;
+  outputFields?: DynamicOutputFields;
 
   /**
    * What does a sample of data look like? Will use resource sample if
@@ -1544,13 +1668,13 @@ export interface BasicCreateActionOperation {
   performGet?: Request | Function;
 
   /** What should the form a user sees and configures look like? */
-  inputFields?: DynamicFields;
+  inputFields?: DynamicInputFields;
 
   /**
    * What fields of data will this return? Will use resource
    * outputFields if missing, will also use sample if available.
    */
-  outputFields?: DynamicFields;
+  outputFields?: DynamicOutputFields;
 
   /**
    * What does a sample of data look like? Will use resource sample if
diff --git a/packages/schema/docs/build/schema.md b/packages/schema/docs/build/schema.md
index 017357069..dd44c1dbf 100644
--- a/packages/schema/docs/build/schema.md
+++ b/packages/schema/docs/build/schema.md
@@ -29,12 +29,11 @@ This is automatically generated by the `npm run docs` command in `zapier-platfor
 * [/BulkReadsSchema](#bulkreadsschema)
 * [/CreateSchema](#createschema)
 * [/CreatesSchema](#createsschema)
-* [/DynamicFieldsSchema](#dynamicfieldsschema)
+* [/DynamicInputFieldsSchema](#dynamicinputfieldsschema)
 * [/DynamicOutputFieldsSchema](#dynamicoutputfieldsschema)
 * [/FieldChoiceWithLabelSchema](#fieldchoicewithlabelschema)
 * [/FieldChoicesSchema](#fieldchoicesschema)
 * [/FieldMetaSchema](#fieldmetaschema)
-* [/FieldOrFunctionSchema](#fieldorfunctionschema)
 * [/FieldSchema](#fieldschema)
 * [/FieldsSchema](#fieldsschema)
 * [/FlatObjectSchema](#flatobjectschema)
@@ -42,6 +41,7 @@ This is automatically generated by the `npm run docs` command in `zapier-platfor
 * [/FunctionSchema](#functionschema)
 * [/FunctionSourceSchema](#functionsourceschema)
 * [/HydratorsSchema](#hydratorsschema)
+* [/InputFieldSchema](#inputfieldschema)
 * [/KeySchema](#keyschema)
 * [/LockObjectSchema](#lockobjectschema)
 * [/MiddlewaresSchema](#middlewaresschema)
@@ -393,8 +393,8 @@ Key | Required | Type | Description
 `perform` | **yes** | oneOf([/RequestSchema](#requestschema), [/FunctionSchema](#functionschema)) | How will Zapier get the data? This can be a function like `(z) => [{id: 123}]` or a request like `{url: 'http...'}`.
 `performResume` | no | [/FunctionSchema](#functionschema) | A function that parses data from a perform (which uses z.generateCallbackUrl()) and callback request to resume this action.
 `performGet` | no | oneOf([/RequestSchema](#requestschema), [/FunctionSchema](#functionschema)) | How will Zapier get a single record? If you find yourself reaching for this - consider resources and their built-in get methods.
-`inputFields` | no | [/DynamicFieldsSchema](#dynamicfieldsschema) | What should the form a user sees and configures look like?
-`outputFields` | no | [/DynamicFieldsSchema](#dynamicfieldsschema) | What fields of data will this return? Will use resource outputFields if missing, will also use sample if available.
+`inputFields` | no | [/DynamicInputFieldsSchema](#dynamicinputfieldsschema) | What should the form a user sees and configures look like?
+`outputFields` | no | [/DynamicOutputFieldsSchema](#dynamicoutputfieldsschema) | What fields of data will this return? Will use resource outputFields if missing, will also use sample if available.
 `sample` | **yes** (with exceptions, see description) | `object` | What does a sample of data look like? Will use resource sample if missing. Requirement waived if `display.hidden` is true or if this belongs to a resource that has a top-level sample
 `lock` | no | [/LockObjectSchema](#lockobjectschema) | **INTERNAL USE ONLY**. Zapier uses this configuration for internal operation locking.
 `throttle` | no | [/ThrottleObjectSchema](#throttleobjectschema) | Zapier uses this configuration to apply throttling when the limit for the window is exceeded.
@@ -426,8 +426,8 @@ Key | Required | Type | Description
 `perform` | no (with exceptions, see description) | oneOf([/RequestSchema](#requestschema), [/FunctionSchema](#functionschema)) | How will Zapier get the data? This can be a function like `(z) => [{id: 123}]` or a request like `{url: 'http...'}`. Exactly one of `perform` or `performBuffer` must be defined. If you choose to define `buffer` and `performBuffer`, you must omit `perform`.
 `performResume` | no | [/FunctionSchema](#functionschema) | A function that parses data from a perform (which uses z.generateCallbackUrl()) and callback request to resume this action.
 `performGet` | no | oneOf([/RequestSchema](#requestschema), [/FunctionSchema](#functionschema)) | How will Zapier get a single record? If you find yourself reaching for this - consider resources and their built-in get methods.
-`inputFields` | no | [/DynamicFieldsSchema](#dynamicfieldsschema) | What should the form a user sees and configures look like?
-`outputFields` | no | [/DynamicFieldsSchema](#dynamicfieldsschema) | What fields of data will this return? Will use resource outputFields if missing, will also use sample if available.
+`inputFields` | no | [/DynamicInputFieldsSchema](#dynamicinputfieldsschema) | What should the form a user sees and configures look like?
+`outputFields` | no | [/DynamicOutputFieldsSchema](#dynamicoutputfieldsschema) | What fields of data will this return? Will use resource outputFields if missing, will also use sample if available.
 `sample` | **yes** (with exceptions, see description) | `object` | What does a sample of data look like? Will use resource sample if missing. Requirement waived if `display.hidden` is true or if this belongs to a resource that has a top-level sample
 `lock` | no | [/LockObjectSchema](#lockobjectschema) | **INTERNAL USE ONLY**. Zapier uses this configuration for internal operation locking.
 `throttle` | no | [/ThrottleObjectSchema](#throttleobjectschema) | Zapier uses this configuration to apply throttling when the limit for the window is exceeded.
@@ -503,8 +503,8 @@ Key | Required | Type | Description
 `canPaginate` | no | `boolean` | Does this endpoint support pagination via temporary cursor storage?
 `performSubscribe` | **yes** (with exceptions, see description) | oneOf([/RequestSchema](#requestschema), [/FunctionSchema](#functionschema)) | Takes a URL and any necessary data from the user and subscribes. Note: this is required for public apps to ensure the best UX for the end-user. For private apps, this is strongly recommended for testing REST Hooks. Otherwise, you can ignore warnings about this property with the `--without-style` flag during `zapier push`.
 `performUnsubscribe` | **yes** (with exceptions, see description) | oneOf([/RequestSchema](#requestschema), [/FunctionSchema](#functionschema)) | Takes a URL and data from a previous subscribe call and unsubscribes. Note: this is required for public apps to ensure the best UX for the end-user. For private apps, this is strongly recommended for testing REST Hooks. Otherwise, you can ignore warnings about this property with the `--without-style` flag during `zapier push`.
-`inputFields` | no | [/DynamicFieldsSchema](#dynamicfieldsschema) | What should the form a user sees and configures look like?
-`outputFields` | no | [/DynamicFieldsSchema](#dynamicfieldsschema) | What fields of data will this return? Will use resource outputFields if missing, will also use sample if available.
+`inputFields` | no | [/DynamicInputFieldsSchema](#dynamicinputfieldsschema) | What should the form a user sees and configures look like?
+`outputFields` | no | [/DynamicOutputFieldsSchema](#dynamicoutputfieldsschema) | What fields of data will this return? Will use resource outputFields if missing, will also use sample if available.
 `sample` | **yes** (with exceptions, see description) | `object` | What does a sample of data look like? Will use resource sample if missing. Requirement waived if `display.hidden` is true or if this belongs to a resource that has a top-level sample
 
 #### Examples
@@ -550,8 +550,8 @@ Key | Required | Type | Description
 --- | -------- | ---- | -----------
 `resource` | no | [/KeySchema](#keyschema) | Optionally reference and extends a resource. Allows Zapier to automatically tie together samples, lists and hooks, greatly improving the UX. EG: if you had another trigger reusing a resource but filtering the results.
 `perform` | **yes** | oneOf([/RequestSchema](#requestschema), [/FunctionSchema](#functionschema)) | How will Zapier get the data? This can be a function like `(z) => [{id: 123}]` or a request like `{url: 'http...'}`.
-`inputFields` | no | [/DynamicFieldsSchema](#dynamicfieldsschema) | What should the form a user sees and configures look like?
-`outputFields` | no | [/DynamicFieldsSchema](#dynamicfieldsschema) | What fields of data will this return? Will use resource outputFields if missing, will also use sample if available.
+`inputFields` | no | [/DynamicInputFieldsSchema](#dynamicinputfieldsschema) | What should the form a user sees and configures look like?
+`outputFields` | no | [/DynamicOutputFieldsSchema](#dynamicoutputfieldsschema) | What fields of data will this return? Will use resource outputFields if missing, will also use sample if available.
 `sample` | **yes** (with exceptions, see description) | `object` | What does a sample of data look like? Will use resource sample if missing. Requirement waived if `display.hidden` is true or if this belongs to a resource that has a top-level sample
 `lock` | no | [/LockObjectSchema](#lockobjectschema) | **INTERNAL USE ONLY**. Zapier uses this configuration for internal operation locking.
 `throttle` | no | [/ThrottleObjectSchema](#throttleobjectschema) | Zapier uses this configuration to apply throttling when the limit for the window is exceeded.
@@ -583,8 +583,8 @@ Key | Required | Type | Description
 `resource` | no | [/KeySchema](#keyschema) | Optionally reference and extends a resource. Allows Zapier to automatically tie together samples, lists and hooks, greatly improving the UX. EG: if you had another trigger reusing a resource but filtering the results.
 `perform` | **yes** | oneOf([/RequestSchema](#requestschema), [/FunctionSchema](#functionschema)) | How will Zapier get the data? This can be a function like `(z) => [{id: 123}]` or a request like `{url: 'http...'}`.
 `canPaginate` | no | `boolean` | Does this endpoint support pagination via temporary cursor storage?
-`inputFields` | no | [/DynamicFieldsSchema](#dynamicfieldsschema) | What should the form a user sees and configures look like?
-`outputFields` | no | [/DynamicFieldsSchema](#dynamicfieldsschema) | What fields of data will this return? Will use resource outputFields if missing, will also use sample if available.
+`inputFields` | no | [/DynamicInputFieldsSchema](#dynamicinputfieldsschema) | What should the form a user sees and configures look like?
+`outputFields` | no | [/DynamicOutputFieldsSchema](#dynamicoutputfieldsschema) | What fields of data will this return? Will use resource outputFields if missing, will also use sample if available.
 `sample` | **yes** (with exceptions, see description) | `object` | What does a sample of data look like? Will use resource sample if missing. Requirement waived if `display.hidden` is true or if this belongs to a resource that has a top-level sample
 `throttle` | no | [/ThrottleObjectSchema](#throttleobjectschema) | Zapier uses this configuration to apply throttling when the limit for the window is exceeded.
 
@@ -854,28 +854,23 @@ Key | Required | Type | Description
 
 -----
 
-## /DynamicFieldsSchema
+## /DynamicInputFieldsSchema
 
-Like [/FieldsSchema](#fieldsschema) but you can provide functions to create dynamic or custom fields.
+An array or collection of input fields.
 
 #### Details
 
-* **Type** - [/FieldOrFunctionSchema](#fieldorfunctionschema)
-* [**Source Code**](https://github.com/zapier/zapier-platform/blob/zapier-platform-schema@16.2.0/packages/schema/lib/schemas/DynamicFieldsSchema.js)
+* **Type** - `array`[oneOf([/InputFieldSchema](#inputfieldschema), [/FunctionSchema](#functionschema))]
+* [**Source Code**](https://github.com/zapier/zapier-platform/blob/zapier-platform-schema@16.2.0/packages/schema/lib/schemas/DynamicInputFieldsSchema.js)
 
 
 #### Examples
 
-* `[]`
 * `[ { key: 'abc' } ]`
-* `[ { key: 'abc' }, '$func$2$f$' ]`
-* `[ '$func$2$f$', '$func$2$f$' ]`
 
 #### Anti-Examples
 
-* `[ {} ]` - _FieldSchema missing required key: key_
-* `[ { key: 'abc', choices: {} } ]` - _Invalid value for key in FieldSchema: choices (cannot be empty)_
-* `'$func$2$f$'` - _Must be an array_
+* `{}` - _Must be an array_
 
 -----
 
@@ -981,31 +976,6 @@ Key | Required | Type | Description
 
 -----
 
-## /FieldOrFunctionSchema
-
-Represents an array of fields or functions.
-
-#### Details
-
-* **Type** - `array`[oneOf([/FieldSchema](#fieldschema), [/FunctionSchema](#functionschema))]
-* [**Source Code**](https://github.com/zapier/zapier-platform/blob/zapier-platform-schema@16.2.0/packages/schema/lib/schemas/FieldOrFunctionSchema.js)
-
-
-#### Examples
-
-* `[]`
-* `[ { key: 'abc' } ]`
-* `[ { key: 'abc' }, '$func$2$f$' ]`
-* `[ '$func$2$f$', '$func$2$f$' ]`
-
-#### Anti-Examples
-
-* `[ {} ]` - _Array item not a valid FieldSchema or FunctionSchema_
-* `[ { key: 'abc', choices: {} } ]` - _Array item not a valid FieldSchema_
-* `'$func$2$f$'` - _Must be an array_
-
------
-
 ## /FieldSchema
 
 Defines a field an app either needs as input, or gives as output. In addition to the requirements below, the following keys are mutually exclusive:
@@ -1233,6 +1203,68 @@ Key | Required | Type | Description
 
 -----
 
+## /InputFieldSchema
+
+Field schema specialized for input fields.
+
+#### Details
+
+* **Type** - `object`
+* [**Source Code**](https://github.com/zapier/zapier-platform/blob/zapier-platform-schema@16.2.0/packages/schema/lib/schemas/InputFieldSchema.js)
+
+#### Properties
+
+Key | Required | Type | Description
+--- | -------- | ---- | -----------
+`key` | **yes** | `string` | A unique machine readable key for this value (IE: "fname").
+`label` | no | `string` | A human readable label for this value (IE: "First Name").
+`helpText` | no | `string` | A human readable description of this value (IE: "The first part of a full name."). You can use Markdown.
+`type` | no | `string` in (`'string'`, `'text'`, `'integer'`, `'number'`, `'boolean'`, `'datetime'`, `'file'`, `'password'`, `'copy'`, `'code'`) | The type of this value. Use `string` for basic text input, `text` for a large, `<textarea>` style box, and `code` for a `<textarea>` with a fixed-width font. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.
+`required` | no | `boolean` | If this value is required or not.
+`placeholder` | no | `string` | An example value that is not saved.
+`default` | no | `string` | A default value that is saved the first time a Zap is created.
+`primary` | no | `boolean` | Use this field as part of the primary key for deduplication. You can set multiple fields as "primary", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`; it will be ignored if set in `inputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).
+`dynamic` | no | [/RefResourceSchema](#refresourceschema) | A reference to a trigger that will power a dynamic dropdown.
+`search` | no | [/RefResourceSchema](#refresourceschema) | A reference to a search that will guide the user to add a search step to populate this field when creating a Zap.
+`choices` | no | [/FieldChoicesSchema](#fieldchoicesschema) | An object of machine keys and human values to populate a static dropdown.
+`list` | no | `boolean` | Acts differently when used in inputFields vs. when used in outputFields. In inputFields: Can a user provide multiples of this field? In outputFields: Does this field return an array of items of type `type`?
+`children` | no | `array`[[/FieldSchema](#fieldschema)] | An array of child fields that define the structure of a sub-object for this field. Usually used for line items.
+`dict` | no | `boolean` | Is this field a key/value input?
+`computed` | no | `boolean` | Is this field automatically populated (and hidden from the user)? Note: Only OAuth and Session Auth support fields with this key.
+`altersDynamicFields` | no | `boolean` | Does the value of this field affect the definitions of other fields in the set?
+`steadyState` | no | `boolean` | Prevents triggering on new output until all values for fields with this property remain unchanged for 2 polls. It can be used to, e.g., not trigger on a new contact until the contact has completed typing their name. NOTE that this only applies to the `outputFields` of polling triggers.
+`inputFormat` | no | `string` | Useful when you expect the input to be part of a longer string. Put "{{input}}" in place of the user's input (IE: "https://{{input}}.yourdomain.com").
+`meta` | no | [/FieldMetaSchema](#fieldmetaschema) | Allows for additional metadata to be stored on the field. Supports simple key-values only (no sub-objects or arrays).
+
+#### Examples
+
+* `{ key: 'abc' }`
+* `{ key: 'abc', choices: { mobile: 'Mobile Phone' } }`
+* `{ key: 'abc', choices: [ 'first', 'second', 'third' ] }`
+* `{ key: 'abc', choices: [ { label: 'Red', sample: '#f00', value: '#f00' } ] }`
+* `{ key: 'abc', children: [ { key: 'abc' } ] }`
+* `{ key: 'abc', type: 'integer', helpText: 'neat' }`
+* ```
+  {
+    key: 'abc',
+    type: 'integer',
+    meta: { internalType: 'numeric', should_call_api: true, display_order: 1 }
+  }
+  ```
+
+#### Anti-Examples
+
+* `{}` - _Missing required key: key_
+* `{ key: 'abc', type: 'loltype' }` - _Invalid value for key: type_
+* `{ key: 'abc', choices: {} }` - _Invalid value for key: choices (cannot be empty)_
+* `{ key: 'abc', choices: [] }` - _Invalid value for key: choices (cannot be empty)_
+* `{ key: 'abc', choices: [ 3 ] }` - _Invalid value for key: choices (if an array, must be of either string or FieldChoiceWithLabelSchema)_
+* `{ key: 'abc', choices: [ { label: 'Red', value: '#f00' } ] }` - _Invalid value for key: choices (if an array of FieldChoiceWithLabelSchema, must provide key `sample`)_
+* `{ key: 'abc', choices: 'mobile' }` - _Invalid value for key: choices (must be either object or array)_
+* `{ key: 'abc', children: [ '$func$2$f$' ] }` - _Invalid value for key: children (must be array of FieldSchema)_
+
+-----
+
 ## /KeySchema
 
 A unique identifier for this item.
diff --git a/packages/schema/exported-schema.json b/packages/schema/exported-schema.json
index 2d62bafff..36e271685 100644
--- a/packages/schema/exported-schema.json
+++ b/packages/schema/exported-schema.json
@@ -627,20 +627,221 @@
       },
       "additionalProperties": false
     },
-    "FieldOrFunctionSchema": {
-      "id": "/FieldOrFunctionSchema",
-      "description": "Represents an array of fields or functions.",
-      "type": "array",
-      "items": {
-        "oneOf": [
-          {
+    "InputFieldSchema": {
+      "id": "/InputFieldSchema",
+      "description": "Field schema specialized for input fields.",
+      "type": "object",
+      "required": ["key"],
+      "properties": {
+        "key": {
+          "description": "A unique machine readable key for this value (IE: \"fname\").",
+          "type": "string",
+          "minLength": 1
+        },
+        "label": {
+          "description": "A human readable label for this value (IE: \"First Name\").",
+          "type": "string",
+          "minLength": 1
+        },
+        "helpText": {
+          "description": "A human readable description of this value (IE: \"The first part of a full name.\"). You can use Markdown.",
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 1000
+        },
+        "type": {
+          "description": "The type of this value. Use `string` for basic text input, `text` for a large, `<textarea>` style box, and `code` for a `<textarea>` with a fixed-width font. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.",
+          "type": "string",
+          "enum": [
+            "string",
+            "text",
+            "integer",
+            "number",
+            "boolean",
+            "datetime",
+            "file",
+            "password",
+            "copy",
+            "code"
+          ]
+        },
+        "required": {
+          "description": "If this value is required or not.",
+          "type": "boolean"
+        },
+        "placeholder": {
+          "description": "An example value that is not saved.",
+          "type": "string",
+          "minLength": 1
+        },
+        "default": {
+          "description": "A default value that is saved the first time a Zap is created.",
+          "type": "string",
+          "minLength": 1
+        },
+        "primary": {
+          "description": "Use this field as part of the primary key for deduplication. You can set multiple fields as \"primary\", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`; it will be ignored if set in `inputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).",
+          "type": "boolean"
+        },
+        "dynamic": {
+          "description": "A reference to a trigger that will power a dynamic dropdown.",
+          "$ref": "/RefResourceSchema"
+        },
+        "search": {
+          "description": "A reference to a search that will guide the user to add a search step to populate this field when creating a Zap.",
+          "$ref": "/RefResourceSchema"
+        },
+        "choices": {
+          "description": "An object of machine keys and human values to populate a static dropdown.",
+          "$ref": "/FieldChoicesSchema"
+        },
+        "list": {
+          "description": "Acts differently when used in inputFields vs. when used in outputFields. In inputFields: Can a user provide multiples of this field? In outputFields: Does this field return an array of items of type `type`?",
+          "type": "boolean"
+        },
+        "children": {
+          "type": "array",
+          "items": {
             "$ref": "/FieldSchema"
           },
-          {
-            "$ref": "/FunctionSchema"
-          }
-        ]
-      }
+          "description": "An array of child fields that define the structure of a sub-object for this field. Usually used for line items.",
+          "minItems": 1
+        },
+        "dict": {
+          "description": "Is this field a key/value input?",
+          "type": "boolean"
+        },
+        "computed": {
+          "description": "Is this field automatically populated (and hidden from the user)? Note: Only OAuth and Session Auth support fields with this key.",
+          "type": "boolean"
+        },
+        "altersDynamicFields": {
+          "description": "Does the value of this field affect the definitions of other fields in the set?",
+          "type": "boolean"
+        },
+        "steadyState": {
+          "description": "Prevents triggering on new output until all values for fields with this property remain unchanged for 2 polls. It can be used to, e.g., not trigger on a new contact until the contact has completed typing their name. NOTE that this only applies to the `outputFields` of polling triggers.",
+          "type": "boolean"
+        },
+        "inputFormat": {
+          "description": "Useful when you expect the input to be part of a longer string. Put \"{{input}}\" in place of the user's input (IE: \"https://{{input}}.yourdomain.com\").",
+          "type": "string",
+          "pattern": "^.*{{input}}.*$"
+        },
+        "meta": {
+          "description": "Allows for additional metadata to be stored on the field. Supports simple key-values only (no sub-objects or arrays).",
+          "$ref": "/FieldMetaSchema"
+        }
+      },
+      "additionalProperties": false
+    },
+    "OutputFieldSchema": {
+      "id": "/OutputFieldSchema",
+      "description": "Field schema specialized for output fields.",
+      "type": "object",
+      "required": ["key"],
+      "properties": {
+        "key": {
+          "description": "A unique machine readable key for this value (IE: \"fname\").",
+          "type": "string",
+          "minLength": 1
+        },
+        "label": {
+          "description": "A human readable label for this value (IE: \"First Name\").",
+          "type": "string",
+          "minLength": 1
+        },
+        "helpText": {
+          "description": "A human readable description of this value (IE: \"The first part of a full name.\"). You can use Markdown.",
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 1000
+        },
+        "type": {
+          "description": "The type of this value. Use `string` for basic text input, `text` for a large, `<textarea>` style box, and `code` for a `<textarea>` with a fixed-width font. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.",
+          "type": "string",
+          "enum": [
+            "string",
+            "text",
+            "integer",
+            "number",
+            "boolean",
+            "datetime",
+            "file",
+            "password",
+            "copy",
+            "code"
+          ]
+        },
+        "required": {
+          "description": "If this value is required or not.",
+          "type": "boolean"
+        },
+        "placeholder": {
+          "description": "An example value that is not saved.",
+          "type": "string",
+          "minLength": 1
+        },
+        "default": {
+          "description": "A default value that is saved the first time a Zap is created.",
+          "type": "string",
+          "minLength": 1
+        },
+        "primary": {
+          "description": "Use this field as part of the primary key for deduplication. You can set multiple fields as \"primary\", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`; it will be ignored if set in `inputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).",
+          "type": "boolean"
+        },
+        "dynamic": {
+          "description": "A reference to a trigger that will power a dynamic dropdown.",
+          "$ref": "/RefResourceSchema"
+        },
+        "search": {
+          "description": "A reference to a search that will guide the user to add a search step to populate this field when creating a Zap.",
+          "$ref": "/RefResourceSchema"
+        },
+        "choices": {
+          "description": "An object of machine keys and human values to populate a static dropdown.",
+          "$ref": "/FieldChoicesSchema"
+        },
+        "list": {
+          "description": "Acts differently when used in inputFields vs. when used in outputFields. In inputFields: Can a user provide multiples of this field? In outputFields: Does this field return an array of items of type `type`?",
+          "type": "boolean"
+        },
+        "children": {
+          "type": "array",
+          "items": {
+            "$ref": "/FieldSchema"
+          },
+          "description": "An array of child fields that define the structure of a sub-object for this field. Usually used for line items.",
+          "minItems": 1
+        },
+        "dict": {
+          "description": "Is this field a key/value input?",
+          "type": "boolean"
+        },
+        "computed": {
+          "description": "Is this field automatically populated (and hidden from the user)? Note: Only OAuth and Session Auth support fields with this key.",
+          "type": "boolean"
+        },
+        "altersDynamicFields": {
+          "description": "Does the value of this field affect the definitions of other fields in the set?",
+          "type": "boolean"
+        },
+        "steadyState": {
+          "description": "Prevents triggering on new output until all values for fields with this property remain unchanged for 2 polls. It can be used to, e.g., not trigger on a new contact until the contact has completed typing their name. NOTE that this only applies to the `outputFields` of polling triggers.",
+          "type": "boolean"
+        },
+        "inputFormat": {
+          "description": "Useful when you expect the input to be part of a longer string. Put \"{{input}}\" in place of the user's input (IE: \"https://{{input}}.yourdomain.com\").",
+          "type": "string",
+          "pattern": "^.*{{input}}.*$"
+        },
+        "meta": {
+          "description": "Allows for additional metadata to be stored on the field. Supports simple key-values only (no sub-objects or arrays).",
+          "$ref": "/FieldMetaSchema"
+        }
+      },
+      "additionalProperties": false
     },
     "ThrottleOverrideObjectSchema": {
       "id": "/ThrottleOverrideObjectSchema",
@@ -668,10 +869,35 @@
       },
       "additionalProperties": false
     },
-    "DynamicFieldsSchema": {
-      "id": "/DynamicFieldsSchema",
-      "description": "Like [/FieldsSchema](#fieldsschema) but you can provide functions to create dynamic or custom fields.",
-      "$ref": "/FieldOrFunctionSchema"
+    "DynamicInputFieldsSchema": {
+      "id": "/DynamicInputFieldsSchema",
+      "description": "An array or collection of input fields.",
+      "type": "array",
+      "items": {
+        "oneOf": [
+          {
+            "$ref": "/InputFieldSchema"
+          },
+          {
+            "$ref": "/FunctionSchema"
+          }
+        ]
+      }
+    },
+    "DynamicOutputFieldsSchema": {
+      "id": "/DynamicOutputFieldsSchema",
+      "description": "An array or collection of output fields.",
+      "type": "array",
+      "items": {
+        "oneOf": [
+          {
+            "$ref": "/OutputFieldSchema"
+          },
+          {
+            "$ref": "/FunctionSchema"
+          }
+        ]
+      }
     },
     "KeySchema": {
       "id": "/KeySchema",
@@ -827,11 +1053,11 @@
         },
         "inputFields": {
           "description": "What should the form a user sees and configures look like?",
-          "$ref": "/DynamicFieldsSchema"
+          "$ref": "/DynamicInputFieldsSchema"
         },
         "outputFields": {
           "description": "What fields of data will this return? Will use resource outputFields if missing, will also use sample if available.",
-          "$ref": "/DynamicFieldsSchema"
+          "$ref": "/DynamicOutputFieldsSchema"
         },
         "sample": {
           "description": "What does a sample of data look like? Will use resource sample if missing. Requirement waived if `display.hidden` is true or if this belongs to a resource that has a top-level sample",
@@ -937,11 +1163,11 @@
         },
         "inputFields": {
           "description": "What should the form a user sees and configures look like?",
-          "$ref": "/DynamicFieldsSchema"
+          "$ref": "/DynamicInputFieldsSchema"
         },
         "outputFields": {
           "description": "What fields of data will this return? Will use resource outputFields if missing, will also use sample if available.",
-          "$ref": "/DynamicFieldsSchema"
+          "$ref": "/DynamicOutputFieldsSchema"
         },
         "sample": {
           "description": "What does a sample of data look like? Will use resource sample if missing. Requirement waived if `display.hidden` is true or if this belongs to a resource that has a top-level sample",
@@ -990,11 +1216,11 @@
         },
         "inputFields": {
           "description": "What should the form a user sees and configures look like?",
-          "$ref": "/DynamicFieldsSchema"
+          "$ref": "/DynamicInputFieldsSchema"
         },
         "outputFields": {
           "description": "What fields of data will this return? Will use resource outputFields if missing, will also use sample if available.",
-          "$ref": "/DynamicFieldsSchema"
+          "$ref": "/DynamicOutputFieldsSchema"
         },
         "sample": {
           "description": "What does a sample of data look like? Will use resource sample if missing. Requirement waived if `display.hidden` is true or if this belongs to a resource that has a top-level sample",
@@ -1052,11 +1278,11 @@
         },
         "inputFields": {
           "description": "What should the form a user sees and configures look like?",
-          "$ref": "/DynamicFieldsSchema"
+          "$ref": "/DynamicInputFieldsSchema"
         },
         "outputFields": {
           "description": "What fields of data will this return? Will use resource outputFields if missing, will also use sample if available.",
-          "$ref": "/DynamicFieldsSchema"
+          "$ref": "/DynamicOutputFieldsSchema"
         },
         "sample": {
           "description": "What does a sample of data look like? Will use resource sample if missing. Requirement waived if `display.hidden` is true or if this belongs to a resource that has a top-level sample",
@@ -1080,114 +1306,6 @@
       },
       "additionalProperties": false
     },
-    "OutputFieldSchema": {
-      "id": "/OutputFieldSchema",
-      "description": "Field schema specialized for output fields.",
-      "type": "object",
-      "required": ["key"],
-      "properties": {
-        "key": {
-          "description": "A unique machine readable key for this value (IE: \"fname\").",
-          "type": "string",
-          "minLength": 1
-        },
-        "label": {
-          "description": "A human readable label for this value (IE: \"First Name\").",
-          "type": "string",
-          "minLength": 1
-        },
-        "helpText": {
-          "description": "A human readable description of this value (IE: \"The first part of a full name.\"). You can use Markdown.",
-          "type": "string",
-          "minLength": 1,
-          "maxLength": 1000
-        },
-        "type": {
-          "description": "The type of this value. Use `string` for basic text input, `text` for a large, `<textarea>` style box, and `code` for a `<textarea>` with a fixed-width font. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.",
-          "type": "string",
-          "enum": [
-            "string",
-            "text",
-            "integer",
-            "number",
-            "boolean",
-            "datetime",
-            "file",
-            "password",
-            "copy",
-            "code"
-          ]
-        },
-        "required": {
-          "description": "If this value is required or not.",
-          "type": "boolean"
-        },
-        "placeholder": {
-          "description": "An example value that is not saved.",
-          "type": "string",
-          "minLength": 1
-        },
-        "default": {
-          "description": "A default value that is saved the first time a Zap is created.",
-          "type": "string",
-          "minLength": 1
-        },
-        "primary": {
-          "description": "Use this field as part of the primary key for deduplication. You can set multiple fields as \"primary\", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`; it will be ignored if set in `inputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).",
-          "type": "boolean"
-        },
-        "dynamic": {
-          "description": "A reference to a trigger that will power a dynamic dropdown.",
-          "$ref": "/RefResourceSchema"
-        },
-        "search": {
-          "description": "A reference to a search that will guide the user to add a search step to populate this field when creating a Zap.",
-          "$ref": "/RefResourceSchema"
-        },
-        "choices": {
-          "description": "An object of machine keys and human values to populate a static dropdown.",
-          "$ref": "/FieldChoicesSchema"
-        },
-        "list": {
-          "description": "Acts differently when used in inputFields vs. when used in outputFields. In inputFields: Can a user provide multiples of this field? In outputFields: Does this field return an array of items of type `type`?",
-          "type": "boolean"
-        },
-        "children": {
-          "type": "array",
-          "items": {
-            "$ref": "/FieldSchema"
-          },
-          "description": "An array of child fields that define the structure of a sub-object for this field. Usually used for line items.",
-          "minItems": 1
-        },
-        "dict": {
-          "description": "Is this field a key/value input?",
-          "type": "boolean"
-        },
-        "computed": {
-          "description": "Is this field automatically populated (and hidden from the user)? Note: Only OAuth and Session Auth support fields with this key.",
-          "type": "boolean"
-        },
-        "altersDynamicFields": {
-          "description": "Does the value of this field affect the definitions of other fields in the set?",
-          "type": "boolean"
-        },
-        "steadyState": {
-          "description": "Prevents triggering on new output until all values for fields with this property remain unchanged for 2 polls. It can be used to, e.g., not trigger on a new contact until the contact has completed typing their name. NOTE that this only applies to the `outputFields` of polling triggers.",
-          "type": "boolean"
-        },
-        "inputFormat": {
-          "description": "Useful when you expect the input to be part of a longer string. Put \"{{input}}\" in place of the user's input (IE: \"https://{{input}}.yourdomain.com\").",
-          "type": "string",
-          "pattern": "^.*{{input}}.*$"
-        },
-        "meta": {
-          "description": "Allows for additional metadata to be stored on the field. Supports simple key-values only (no sub-objects or arrays).",
-          "$ref": "/FieldMetaSchema"
-        }
-      },
-      "additionalProperties": false
-    },
     "ResourceMethodGetSchema": {
       "id": "/ResourceMethodGetSchema",
       "description": "How will we get a single object given a unique identifier/id?",
@@ -1273,21 +1391,6 @@
       },
       "additionalProperties": false
     },
-    "DynamicOutputFieldsSchema": {
-      "id": "/DynamicOutputFieldsSchema",
-      "description": "An array or collection of output fields.",
-      "type": "array",
-      "items": {
-        "oneOf": [
-          {
-            "$ref": "/OutputFieldSchema"
-          },
-          {
-            "$ref": "/FunctionSchema"
-          }
-        ]
-      }
-    },
     "ResourceSchema": {
       "id": "/ResourceSchema",
       "description": "Represents a resource, which will in turn power triggers, searches, or creates.",
@@ -1417,11 +1520,11 @@
         },
         "inputFields": {
           "description": "What should the form a user sees and configures look like?",
-          "$ref": "/DynamicFieldsSchema"
+          "$ref": "/DynamicInputFieldsSchema"
         },
         "outputFields": {
           "description": "What fields of data will this return? Will use resource outputFields if missing, will also use sample if available.",
-          "$ref": "/DynamicFieldsSchema"
+          "$ref": "/DynamicOutputFieldsSchema"
         },
         "sample": {
           "description": "What does a sample of data look like? Will use resource sample if missing. Requirement waived if `display.hidden` is true or if this belongs to a resource that has a top-level sample",
@@ -1569,11 +1672,11 @@
         },
         "inputFields": {
           "description": "What should the form a user sees and configures look like?",
-          "$ref": "/DynamicFieldsSchema"
+          "$ref": "/DynamicInputFieldsSchema"
         },
         "outputFields": {
           "description": "What fields of data will this return? Will use resource outputFields if missing, will also use sample if available.",
-          "$ref": "/DynamicFieldsSchema"
+          "$ref": "/DynamicOutputFieldsSchema"
         },
         "sample": {
           "description": "What does a sample of data look like? Will use resource sample if missing. Requirement waived if `display.hidden` is true or if this belongs to a resource that has a top-level sample",
diff --git a/packages/schema/lib/schemas/BasicOperationSchema.js b/packages/schema/lib/schemas/BasicOperationSchema.js
index 0af0c025b..64ca1dec0 100644
--- a/packages/schema/lib/schemas/BasicOperationSchema.js
+++ b/packages/schema/lib/schemas/BasicOperationSchema.js
@@ -9,9 +9,8 @@ const ResultsSchema = require('./ResultsSchema');
 const KeySchema = require('./KeySchema');
 const LockObjectSchema = require('./LockObjectSchema');
 const ThrottleObjectSchema = require('./ThrottleObjectSchema');
-// const DynamicInputFieldsSchema = require('./DynamicInputFieldsSchema');
-// const DynamicOutputFieldsSchema = require('./DynamicOutputFieldsSchema');
-const DynamicFieldsSchema = require('./DynamicFieldsSchema');
+const DynamicInputFieldsSchema = require('./DynamicInputFieldsSchema');
+const DynamicOutputFieldsSchema = require('./DynamicOutputFieldsSchema');
 
 module.exports = makeSchema(
   {
@@ -34,12 +33,12 @@ module.exports = makeSchema(
       inputFields: {
         description:
           'What should the form a user sees and configures look like?',
-        $ref: DynamicFieldsSchema.id,
+        $ref: DynamicInputFieldsSchema.id,
       },
       outputFields: {
         description:
           'What fields of data will this return? Will use resource outputFields if missing, will also use sample if available.',
-        $ref: DynamicFieldsSchema.id,
+        $ref: DynamicOutputFieldsSchema.id,
       },
       sample: {
         description:
@@ -84,8 +83,8 @@ module.exports = makeSchema(
     additionalProperties: false,
   },
   [
-    DynamicFieldsSchema,
-    // DynamicOutputFieldsSchema,
+    DynamicInputFieldsSchema,
+    DynamicOutputFieldsSchema,
     FunctionSchema,
     KeySchema,
     LockObjectSchema,

From 879dd06d628f2dea5b1cff6e8914024c41aeadb6 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Tue, 28 Jan 2025 15:15:58 -0500
Subject: [PATCH 04/60] PDE-5719 address commented out lines

---
 packages/core/types/zapier.generated.d.ts     | 143 +++++++++++++++++-
 packages/schema/docs/build/schema.md          | 108 ++++++++++---
 packages/schema/exported-schema.json          | 143 +++++++++++++++++-
 .../lib/schemas/AuthInputFieldSchema.js       |  65 ++++----
 .../lib/schemas/AuthenticationSchema.js       |   6 +-
 packages/schema/test/index.js                 |   2 +-
 6 files changed, 399 insertions(+), 68 deletions(-)

diff --git a/packages/core/types/zapier.generated.d.ts b/packages/core/types/zapier.generated.d.ts
index 9f3fe780e..521c7a42e 100644
--- a/packages/core/types/zapier.generated.d.ts
+++ b/packages/core/types/zapier.generated.d.ts
@@ -409,6 +409,141 @@ export interface Field {
   meta?: FieldMeta;
 }
 
+/**
+ * Field schema specialized for auth input fields (e.g., OAuth).
+ *
+ * [Docs: AuthInputFieldSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#AuthInputFieldSchema)
+ */
+export interface AuthInputField {
+  /** A unique machine readable key for this value (IE: "fname"). */
+  key: string;
+
+  /** A human readable label for this value (IE: "First Name"). */
+  label?: string;
+
+  /**
+   * A human readable description of this value (IE: "The first part
+   * of a full name."). You can use Markdown.
+   */
+  helpText?: string;
+
+  /**
+   * The type of this value. Use `string` for basic text input, `text`
+   * for a large, `<textarea>` style box, and `code` for a
+   * `<textarea>` with a fixed-width font. Field type of `file` will
+   * accept either a file object or a string. If a URL is provided in
+   * the string, Zapier will automatically make a GET for that file.
+   * Otherwise, a .txt file will be generated.
+   */
+  type?:
+    | 'string'
+    | 'text'
+    | 'integer'
+    | 'number'
+    | 'boolean'
+    | 'datetime'
+    | 'file'
+    | 'password'
+    | 'copy'
+    | 'code';
+
+  /** If this value is required or not. */
+  required?: boolean;
+
+  /** An example value that is not saved. */
+  placeholder?: string;
+
+  /**
+   * A default value that is saved the first time a Zap is created.
+   */
+  default?: string;
+
+  /**
+   * Use this field as part of the primary key for deduplication. You
+   * can set multiple fields as "primary", provided they are unique
+   * together. If no fields are set, Zapier will default to using the
+   * `id` field. `primary` only makes sense for `outputFields`; it
+   * will be ignored if set in `inputFields`. It only works in static
+   * `outputFields`; will not work in custom/dynamic `outputFields`.
+   * For more information, see [How deduplication works in
+   * Zapier](https://platform.zapier.com/build/deduplication).
+   */
+  primary?: boolean;
+
+  /**
+   * A reference to a trigger that will power a dynamic dropdown.
+   */
+  dynamic?: RefResource;
+
+  /**
+   * A reference to a search that will guide the user to add a search
+   * step to populate this field when creating a Zap.
+   */
+  search?: RefResource;
+
+  /**
+   * An object of machine keys and human values to populate a static
+   * dropdown.
+   */
+  choices?: FieldChoices;
+
+  /**
+   * Acts differently when used in inputFields vs. when used in
+   * outputFields. In inputFields: Can a user provide multiples of
+   * this field? In outputFields: Does this field return an array of
+   * items of type `type`?
+   */
+  list?: boolean;
+
+  /**
+   * An array of child fields that define the structure of a
+   * sub-object for this field. Usually used for line items.
+   *
+   * @minItems 1
+   */
+  children?: Field[];
+
+  /** Is this field a key/value input? */
+  dict?: boolean;
+
+  /**
+   * Is this field automatically populated (and hidden from the user)?
+   * Note: Only OAuth and Session Auth support fields with this key.
+   */
+  computed?: boolean;
+
+  /**
+   * Does the value of this field affect the definitions of other
+   * fields in the set?
+   */
+  altersDynamicFields?: boolean;
+
+  /**
+   * Prevents triggering on new output until all values for fields
+   * with this property remain unchanged for 2 polls. It can be used
+   * to, e.g., not trigger on a new contact until the contact has
+   * completed typing their name. NOTE that this only applies to the
+   * `outputFields` of polling triggers.
+   */
+  steadyState?: boolean;
+
+  /**
+   * Useful when you expect the input to be part of a longer string.
+   * Put "{{input}}" in place of the user's input (IE:
+   * "https://{{input}}.yourdomain.com").
+   */
+  inputFormat?: string;
+
+  /**
+   * Allows for additional metadata to be stored on the field.
+   * Supports simple key-values only (no sub-objects or arrays).
+   */
+  meta?: FieldMeta;
+
+  /** Indicates if this auth input field is safe (not secret). */
+  isSafe?: boolean;
+}
+
 /**
  * A representation of a HTTP request - you can use the `{{syntax}}`
  * to inject authentication, field or global variables.
@@ -507,11 +642,11 @@ export interface RedirectRequest {
 }
 
 /**
- * An array or collection of fields.
+ * An array or collection of auth input fields.
  *
- * [Docs: FieldsSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#FieldsSchema)
+ * [Docs: DynamicAuthInputFieldsSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#DynamicAuthInputFieldsSchema)
  */
-export type Fields = Field[];
+export type DynamicAuthInputFields = AuthInputField[];
 
 /**
  * Config for Basic Authentication. No extra properties are required
@@ -1816,7 +1951,7 @@ export interface Authentication {
    * Fields you can request from the user before they connect your app
    * to Zapier.
    */
-  fields?: Fields;
+  fields?: DynamicAuthInputFields;
 
   /**
    * A string with variables, function, or request that returns the
diff --git a/packages/schema/docs/build/schema.md b/packages/schema/docs/build/schema.md
index dd44c1dbf..f28031234 100644
--- a/packages/schema/docs/build/schema.md
+++ b/packages/schema/docs/build/schema.md
@@ -11,6 +11,7 @@ This is automatically generated by the `npm run docs` command in `zapier-platfor
 
 * [/AppFlagsSchema](#appflagsschema)
 * [/AppSchema](#appschema)
+* [/AuthInputFieldSchema](#authinputfieldschema)
 * [/AuthenticationBasicConfigSchema](#authenticationbasicconfigschema)
 * [/AuthenticationCustomConfigSchema](#authenticationcustomconfigschema)
 * [/AuthenticationDigestConfigSchema](#authenticationdigestconfigschema)
@@ -29,13 +30,13 @@ This is automatically generated by the `npm run docs` command in `zapier-platfor
 * [/BulkReadsSchema](#bulkreadsschema)
 * [/CreateSchema](#createschema)
 * [/CreatesSchema](#createsschema)
+* [/DynamicAuthInputFieldsSchema](#dynamicauthinputfieldsschema)
 * [/DynamicInputFieldsSchema](#dynamicinputfieldsschema)
 * [/DynamicOutputFieldsSchema](#dynamicoutputfieldsschema)
 * [/FieldChoiceWithLabelSchema](#fieldchoicewithlabelschema)
 * [/FieldChoicesSchema](#fieldchoicesschema)
 * [/FieldMetaSchema](#fieldmetaschema)
 * [/FieldSchema](#fieldschema)
-* [/FieldsSchema](#fieldsschema)
 * [/FlatObjectSchema](#flatobjectschema)
 * [/FunctionRequireSchema](#functionrequireschema)
 * [/FunctionSchema](#functionschema)
@@ -147,6 +148,69 @@ Key | Required | Type | Description
 
 -----
 
+## /AuthInputFieldSchema
+
+Field schema specialized for auth input fields (e.g., OAuth).
+
+#### Details
+
+* **Type** - `object`
+* [**Source Code**](https://github.com/zapier/zapier-platform/blob/zapier-platform-schema@16.2.0/packages/schema/lib/schemas/AuthInputFieldSchema.js)
+
+#### Properties
+
+Key | Required | Type | Description
+--- | -------- | ---- | -----------
+`key` | **yes** | `string` | A unique machine readable key for this value (IE: "fname").
+`label` | no | `string` | A human readable label for this value (IE: "First Name").
+`helpText` | no | `string` | A human readable description of this value (IE: "The first part of a full name."). You can use Markdown.
+`type` | no | `string` in (`'string'`, `'text'`, `'integer'`, `'number'`, `'boolean'`, `'datetime'`, `'file'`, `'password'`, `'copy'`, `'code'`) | The type of this value. Use `string` for basic text input, `text` for a large, `<textarea>` style box, and `code` for a `<textarea>` with a fixed-width font. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.
+`required` | no | `boolean` | If this value is required or not.
+`placeholder` | no | `string` | An example value that is not saved.
+`default` | no | `string` | A default value that is saved the first time a Zap is created.
+`primary` | no | `boolean` | Use this field as part of the primary key for deduplication. You can set multiple fields as "primary", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`; it will be ignored if set in `inputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).
+`dynamic` | no | [/RefResourceSchema](#refresourceschema) | A reference to a trigger that will power a dynamic dropdown.
+`search` | no | [/RefResourceSchema](#refresourceschema) | A reference to a search that will guide the user to add a search step to populate this field when creating a Zap.
+`choices` | no | [/FieldChoicesSchema](#fieldchoicesschema) | An object of machine keys and human values to populate a static dropdown.
+`list` | no | `boolean` | Acts differently when used in inputFields vs. when used in outputFields. In inputFields: Can a user provide multiples of this field? In outputFields: Does this field return an array of items of type `type`?
+`children` | no | `array`[[/FieldSchema](#fieldschema)] | An array of child fields that define the structure of a sub-object for this field. Usually used for line items.
+`dict` | no | `boolean` | Is this field a key/value input?
+`computed` | no | `boolean` | Is this field automatically populated (and hidden from the user)? Note: Only OAuth and Session Auth support fields with this key.
+`altersDynamicFields` | no | `boolean` | Does the value of this field affect the definitions of other fields in the set?
+`steadyState` | no | `boolean` | Prevents triggering on new output until all values for fields with this property remain unchanged for 2 polls. It can be used to, e.g., not trigger on a new contact until the contact has completed typing their name. NOTE that this only applies to the `outputFields` of polling triggers.
+`inputFormat` | no | `string` | Useful when you expect the input to be part of a longer string. Put "{{input}}" in place of the user's input (IE: "https://{{input}}.yourdomain.com").
+`meta` | no | [/FieldMetaSchema](#fieldmetaschema) | Allows for additional metadata to be stored on the field. Supports simple key-values only (no sub-objects or arrays).
+`isSafe` | no | `boolean` | Indicates if this auth input field is safe (not secret).
+
+#### Examples
+
+* `{ key: 'abc' }`
+* `{ key: 'abc', choices: { mobile: 'Mobile Phone' } }`
+* `{ key: 'abc', choices: [ 'first', 'second', 'third' ] }`
+* `{ key: 'abc', choices: [ { label: 'Red', sample: '#f00', value: '#f00' } ] }`
+* `{ key: 'abc', children: [ { key: 'abc' } ] }`
+* `{ key: 'abc', type: 'integer', helpText: 'neat' }`
+* ```
+  {
+    key: 'abc',
+    type: 'integer',
+    meta: { internalType: 'numeric', should_call_api: true, display_order: 1 }
+  }
+  ```
+
+#### Anti-Examples
+
+* `{}` - _Missing required key: key_
+* `{ key: 'abc', type: 'loltype' }` - _Invalid value for key: type_
+* `{ key: 'abc', choices: {} }` - _Invalid value for key: choices (cannot be empty)_
+* `{ key: 'abc', choices: [] }` - _Invalid value for key: choices (cannot be empty)_
+* `{ key: 'abc', choices: [ 3 ] }` - _Invalid value for key: choices (if an array, must be of either string or FieldChoiceWithLabelSchema)_
+* `{ key: 'abc', choices: [ { label: 'Red', value: '#f00' } ] }` - _Invalid value for key: choices (if an array of FieldChoiceWithLabelSchema, must provide key `sample`)_
+* `{ key: 'abc', choices: 'mobile' }` - _Invalid value for key: choices (must be either object or array)_
+* `{ key: 'abc', children: [ '$func$2$f$' ] }` - _Invalid value for key: children (must be array of FieldSchema)_
+
+-----
+
 ## /AuthenticationBasicConfigSchema
 
 Config for Basic Authentication. No extra properties are required to setup Basic Auth, so you can leave this empty if your app uses Basic Auth.
@@ -325,7 +389,7 @@ Key | Required | Type | Description
 --- | -------- | ---- | -----------
 `type` | **yes** | `string` in (`'basic'`, `'custom'`, `'digest'`, `'oauth1'`, `'oauth2'`, `'session'`) | Choose which scheme you want to use.
 `test` | **yes** | oneOf([/RequestSchema](#requestschema), [/FunctionSchema](#functionschema)) | A function or request that confirms the authentication is working.
-`fields` | no | [/FieldsSchema](#fieldsschema) | Fields you can request from the user before they connect your app to Zapier.
+`fields` | no | [/DynamicAuthInputFieldsSchema](#dynamicauthinputfieldsschema) | Fields you can request from the user before they connect your app to Zapier.
 `connectionLabel` | no | anyOf([/RequestSchema](#requestschema), [/FunctionSchema](#functionschema), `string`) | A string with variables, function, or request that returns the connection label for the authenticated user.
 `basicConfig` | no | [/AuthenticationBasicConfigSchema](#authenticationbasicconfigschema) | _No description given._
 `customConfig` | no | [/AuthenticationCustomConfigSchema](#authenticationcustomconfigschema) | _No description given._
@@ -854,6 +918,26 @@ Key | Required | Type | Description
 
 -----
 
+## /DynamicAuthInputFieldsSchema
+
+An array or collection of auth input fields.
+
+#### Details
+
+* **Type** - `array`[oneOf([/AuthInputFieldSchema](#authinputfieldschema))]
+* [**Source Code**](https://github.com/zapier/zapier-platform/blob/zapier-platform-schema@16.2.0/packages/schema/lib/schemas/DynamicAuthInputFieldsSchema.js)
+
+
+#### Examples
+
+* `[ { key: 'abc' } ]`
+
+#### Anti-Examples
+
+* `{}` - _Must be an array_
+
+-----
+
 ## /DynamicInputFieldsSchema
 
 An array or collection of input fields.
@@ -1048,26 +1132,6 @@ Key | Required | Type | Description
 
 -----
 
-## /FieldsSchema
-
-An array or collection of fields.
-
-#### Details
-
-* **Type** - `array`[[/FieldSchema](#fieldschema)]
-* [**Source Code**](https://github.com/zapier/zapier-platform/blob/zapier-platform-schema@16.2.0/packages/schema/lib/schemas/FieldsSchema.js)
-
-
-#### Examples
-
-* `[ { key: 'abc' } ]`
-
-#### Anti-Examples
-
-* `{}` - _Must be an array_
-
------
-
 ## /FlatObjectSchema
 
 An object whose values can only be primitives
diff --git a/packages/schema/exported-schema.json b/packages/schema/exported-schema.json
index 36e271685..8b9ad4ead 100644
--- a/packages/schema/exported-schema.json
+++ b/packages/schema/exported-schema.json
@@ -355,6 +355,135 @@
       },
       "additionalProperties": false
     },
+    "AuthInputFieldSchema": {
+      "id": "/AuthInputFieldSchema",
+      "description": "Field schema specialized for auth input fields (e.g., OAuth).",
+      "type": "object",
+      "required": ["key"],
+      "properties": {
+        "key": {
+          "description": "A unique machine readable key for this value (IE: \"fname\").",
+          "type": "string",
+          "minLength": 1
+        },
+        "label": {
+          "description": "A human readable label for this value (IE: \"First Name\").",
+          "type": "string",
+          "minLength": 1
+        },
+        "helpText": {
+          "description": "A human readable description of this value (IE: \"The first part of a full name.\"). You can use Markdown.",
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 1000
+        },
+        "type": {
+          "description": "The type of this value. Use `string` for basic text input, `text` for a large, `<textarea>` style box, and `code` for a `<textarea>` with a fixed-width font. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.",
+          "type": "string",
+          "enum": [
+            "string",
+            "text",
+            "integer",
+            "number",
+            "boolean",
+            "datetime",
+            "file",
+            "password",
+            "copy",
+            "code"
+          ]
+        },
+        "required": {
+          "description": "If this value is required or not.",
+          "type": "boolean"
+        },
+        "placeholder": {
+          "description": "An example value that is not saved.",
+          "type": "string",
+          "minLength": 1
+        },
+        "default": {
+          "description": "A default value that is saved the first time a Zap is created.",
+          "type": "string",
+          "minLength": 1
+        },
+        "primary": {
+          "description": "Use this field as part of the primary key for deduplication. You can set multiple fields as \"primary\", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`; it will be ignored if set in `inputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).",
+          "type": "boolean"
+        },
+        "dynamic": {
+          "description": "A reference to a trigger that will power a dynamic dropdown.",
+          "$ref": "/RefResourceSchema"
+        },
+        "search": {
+          "description": "A reference to a search that will guide the user to add a search step to populate this field when creating a Zap.",
+          "$ref": "/RefResourceSchema"
+        },
+        "choices": {
+          "description": "An object of machine keys and human values to populate a static dropdown.",
+          "$ref": "/FieldChoicesSchema"
+        },
+        "list": {
+          "description": "Acts differently when used in inputFields vs. when used in outputFields. In inputFields: Can a user provide multiples of this field? In outputFields: Does this field return an array of items of type `type`?",
+          "type": "boolean"
+        },
+        "children": {
+          "type": "array",
+          "items": {
+            "$ref": "/FieldSchema"
+          },
+          "description": "An array of child fields that define the structure of a sub-object for this field. Usually used for line items.",
+          "minItems": 1
+        },
+        "dict": {
+          "description": "Is this field a key/value input?",
+          "type": "boolean"
+        },
+        "computed": {
+          "description": "Is this field automatically populated (and hidden from the user)? Note: Only OAuth and Session Auth support fields with this key.",
+          "type": "boolean"
+        },
+        "altersDynamicFields": {
+          "description": "Does the value of this field affect the definitions of other fields in the set?",
+          "type": "boolean"
+        },
+        "steadyState": {
+          "description": "Prevents triggering on new output until all values for fields with this property remain unchanged for 2 polls. It can be used to, e.g., not trigger on a new contact until the contact has completed typing their name. NOTE that this only applies to the `outputFields` of polling triggers.",
+          "type": "boolean"
+        },
+        "inputFormat": {
+          "description": "Useful when you expect the input to be part of a longer string. Put \"{{input}}\" in place of the user's input (IE: \"https://{{input}}.yourdomain.com\").",
+          "type": "string",
+          "pattern": "^.*{{input}}.*$"
+        },
+        "meta": {
+          "description": "Allows for additional metadata to be stored on the field. Supports simple key-values only (no sub-objects or arrays).",
+          "$ref": "/FieldMetaSchema"
+        },
+        "isSafe": {
+          "description": "Indicates if this auth input field is safe (not secret).",
+          "type": "boolean"
+        }
+      },
+      "additionalProperties": false,
+      "not": {
+        "properties": {
+          "key": {
+            "enum": [
+              "access_token",
+              "refresh_token",
+              "api_key",
+              "password",
+              "secret"
+            ]
+          },
+          "isSafe": {
+            "const": true
+          }
+        },
+        "required": ["key", "isSafe"]
+      }
+    },
     "RequestSchema": {
       "id": "/RequestSchema",
       "description": "A representation of a HTTP request - you can use the `{{syntax}}` to inject authentication, field or global variables.",
@@ -466,12 +595,16 @@
       },
       "additionalProperties": false
     },
-    "FieldsSchema": {
-      "id": "/FieldsSchema",
-      "description": "An array or collection of fields.",
+    "DynamicAuthInputFieldsSchema": {
+      "id": "/DynamicAuthInputFieldsSchema",
+      "description": "An array or collection of auth input fields.",
       "type": "array",
       "items": {
-        "$ref": "/FieldSchema"
+        "oneOf": [
+          {
+            "$ref": "/AuthInputFieldSchema"
+          }
+        ]
       }
     },
     "AuthenticationBasicConfigSchema": {
@@ -1824,7 +1957,7 @@
         },
         "fields": {
           "description": "Fields you can request from the user before they connect your app to Zapier.",
-          "$ref": "/FieldsSchema"
+          "$ref": "/DynamicAuthInputFieldsSchema"
         },
         "connectionLabel": {
           "description": "A string with variables, function, or request that returns the connection label for the authenticated user.",
diff --git a/packages/schema/lib/schemas/AuthInputFieldSchema.js b/packages/schema/lib/schemas/AuthInputFieldSchema.js
index a5064eb2b..49851deaf 100644
--- a/packages/schema/lib/schemas/AuthInputFieldSchema.js
+++ b/packages/schema/lib/schemas/AuthInputFieldSchema.js
@@ -3,46 +3,45 @@
 const makeSchema = require('../utils/makeSchema');
 const FieldSchema = require('./FieldSchema');
 
-const schema = makeSchema(
+module.exports = makeSchema(
   {
+    // spread over base schema's top-level keys
+    ...FieldSchema.schema,
     id: '/AuthInputFieldSchema',
     description:
       'Field schema specialized for auth input fields (e.g., OAuth).',
-    type: 'object',
-    allOf: [
-      { $ref: FieldSchema.id },
-      {
-        type: 'object',
-        properties: {
-          // New property
-          isSafe: {
-            description:
-              'Indicates if this auth input field is safe (not secret).',
-            type: 'boolean',
-          },
-        },
+
+    // add or override the "properties" key
+    properties: {
+      // all properties from FieldSchema
+      ...FieldSchema.schema.properties,
+
+      isSafe: {
+        description: 'Indicates if this auth input field is safe (not secret).',
+        type: 'boolean',
       },
-      // Forbid certain keys from having isSafe = true
-      {
-        not: {
-          properties: {
-            key: {
-              enum: [
-                'access_token',
-                'refresh_token',
-                'api_key',
-                'password',
-                'secret',
-              ],
-            },
-            isSafe: { const: true },
-          },
-          required: ['key', 'isSafe'],
+    },
+
+    // if FieldSchema had required fields, keep them (like ["key"])
+    required: [...(FieldSchema.schema.required || [])],
+
+    // Do not allow certain isSafe = True if sensitive tokens exists
+    not: {
+      properties: {
+        key: {
+          enum: [
+            'access_token',
+            'refresh_token',
+            'api_key',
+            'password',
+            'secret',
+          ],
         },
+        isSafe: { const: true },
       },
-    ],
+      required: ['key', 'isSafe'],
+    },
   },
+
   [FieldSchema],
 );
-
-module.exports = schema;
diff --git a/packages/schema/lib/schemas/AuthenticationSchema.js b/packages/schema/lib/schemas/AuthenticationSchema.js
index 7076493ab..ad4a1d019 100644
--- a/packages/schema/lib/schemas/AuthenticationSchema.js
+++ b/packages/schema/lib/schemas/AuthenticationSchema.js
@@ -10,7 +10,7 @@ const AuthenticationOAuth2ConfigSchema = require('./AuthenticationOAuth2ConfigSc
 const AuthenticationSessionConfigSchema = require('./AuthenticationSessionConfigSchema.js');
 const FunctionSchema = require('./FunctionSchema');
 const RequestSchema = require('./RequestSchema');
-const FieldsSchema = require('./FieldsSchema');
+const DynamicAuthInputFieldsSchema = require('./DynamicAuthInputFieldsSchema');
 
 module.exports = makeSchema(
   {
@@ -32,7 +32,7 @@ module.exports = makeSchema(
       fields: {
         description:
           'Fields you can request from the user before they connect your app to Zapier.',
-        $ref: FieldsSchema.id,
+        $ref: DynamicAuthInputFieldsSchema.id,
       },
       connectionLabel: {
         description:
@@ -107,7 +107,7 @@ module.exports = makeSchema(
   [
     FunctionSchema,
     RequestSchema,
-    FieldsSchema,
+    DynamicAuthInputFieldsSchema,
     AuthenticationBasicConfigSchema,
     AuthenticationCustomConfigSchema,
     AuthenticationDigestConfigSchema,
diff --git a/packages/schema/test/index.js b/packages/schema/test/index.js
index ca123c46e..18df4f5dd 100644
--- a/packages/schema/test/index.js
+++ b/packages/schema/test/index.js
@@ -9,7 +9,7 @@ const appDefinition = require('../examples/definition.json');
 
 const copy = (o) => JSON.parse(JSON.stringify(o));
 
-const NUM_SCHEMAS = 59; // changes regularly as we expand
+const NUM_SCHEMAS = 60; // changes regularly as we expand
 
 describe('app', () => {
   describe('validation', () => {

From a834d5161a6fb081122e37f1a00289d16a5333b6 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Tue, 28 Jan 2025 15:19:12 -0500
Subject: [PATCH 05/60] PDE-5719 clean up

---
 packages/schema/lib/schemas/AuthInputFieldSchema.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/schema/lib/schemas/AuthInputFieldSchema.js b/packages/schema/lib/schemas/AuthInputFieldSchema.js
index 49851deaf..afb96d40f 100644
--- a/packages/schema/lib/schemas/AuthInputFieldSchema.js
+++ b/packages/schema/lib/schemas/AuthInputFieldSchema.js
@@ -5,17 +5,12 @@ const FieldSchema = require('./FieldSchema');
 
 module.exports = makeSchema(
   {
-    // spread over base schema's top-level keys
     ...FieldSchema.schema,
     id: '/AuthInputFieldSchema',
     description:
       'Field schema specialized for auth input fields (e.g., OAuth).',
-
-    // add or override the "properties" key
     properties: {
-      // all properties from FieldSchema
       ...FieldSchema.schema.properties,
-
       isSafe: {
         description: 'Indicates if this auth input field is safe (not secret).',
         type: 'boolean',

From de4d6a25f80fd9ef12a1bea486877e40aa09cf02 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Tue, 28 Jan 2025 23:03:10 -0500
Subject: [PATCH 06/60] PDE-5719 clean up

---
 packages/schema/lib/schemas/AuthInputFieldSchema.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/schema/lib/schemas/AuthInputFieldSchema.js b/packages/schema/lib/schemas/AuthInputFieldSchema.js
index afb96d40f..76b4dcd9e 100644
--- a/packages/schema/lib/schemas/AuthInputFieldSchema.js
+++ b/packages/schema/lib/schemas/AuthInputFieldSchema.js
@@ -17,9 +17,6 @@ module.exports = makeSchema(
       },
     },
 
-    // if FieldSchema had required fields, keep them (like ["key"])
-    required: [...(FieldSchema.schema.required || [])],
-
     // Do not allow certain isSafe = True if sensitive tokens exists
     not: {
       properties: {

From 215c3eadb6f9e878684447ad539bad97229100eb Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Wed, 29 Jan 2025 10:36:47 -0500
Subject: [PATCH 07/60] rename to AuthFieldSchema

---
 packages/core/types/zapier.generated.d.ts     |  6 +--
 packages/schema/docs/build/schema.md          | 44 +++++++++----------
 packages/schema/exported-schema.json          |  6 +--
 ...InputFieldSchema.js => AuthFieldSchema.js} |  0
 ...putFieldsSchema.js => AuthFieldsSchema.js} |  8 ++--
 .../lib/schemas/AuthenticationSchema.js       |  6 +--
 6 files changed, 35 insertions(+), 35 deletions(-)
 rename packages/schema/lib/schemas/{AuthInputFieldSchema.js => AuthFieldSchema.js} (100%)
 rename packages/schema/lib/schemas/{DynamicAuthInputFieldsSchema.js => AuthFieldsSchema.js} (63%)

diff --git a/packages/core/types/zapier.generated.d.ts b/packages/core/types/zapier.generated.d.ts
index 521c7a42e..934441e6c 100644
--- a/packages/core/types/zapier.generated.d.ts
+++ b/packages/core/types/zapier.generated.d.ts
@@ -644,9 +644,9 @@ export interface RedirectRequest {
 /**
  * An array or collection of auth input fields.
  *
- * [Docs: DynamicAuthInputFieldsSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#DynamicAuthInputFieldsSchema)
+ * [Docs: AuthFieldsSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#AuthFieldsSchema)
  */
-export type DynamicAuthInputFields = AuthInputField[];
+export type AuthFields = AuthInputField[];
 
 /**
  * Config for Basic Authentication. No extra properties are required
@@ -1951,7 +1951,7 @@ export interface Authentication {
    * Fields you can request from the user before they connect your app
    * to Zapier.
    */
-  fields?: DynamicAuthInputFields;
+  fields?: AuthFields;
 
   /**
    * A string with variables, function, or request that returns the
diff --git a/packages/schema/docs/build/schema.md b/packages/schema/docs/build/schema.md
index f28031234..1c2d34114 100644
--- a/packages/schema/docs/build/schema.md
+++ b/packages/schema/docs/build/schema.md
@@ -11,6 +11,7 @@ This is automatically generated by the `npm run docs` command in `zapier-platfor
 
 * [/AppFlagsSchema](#appflagsschema)
 * [/AppSchema](#appschema)
+* [/AuthFieldsSchema](#authfieldsschema)
 * [/AuthInputFieldSchema](#authinputfieldschema)
 * [/AuthenticationBasicConfigSchema](#authenticationbasicconfigschema)
 * [/AuthenticationCustomConfigSchema](#authenticationcustomconfigschema)
@@ -30,7 +31,6 @@ This is automatically generated by the `npm run docs` command in `zapier-platfor
 * [/BulkReadsSchema](#bulkreadsschema)
 * [/CreateSchema](#createschema)
 * [/CreatesSchema](#createsschema)
-* [/DynamicAuthInputFieldsSchema](#dynamicauthinputfieldsschema)
 * [/DynamicInputFieldsSchema](#dynamicinputfieldsschema)
 * [/DynamicOutputFieldsSchema](#dynamicoutputfieldsschema)
 * [/FieldChoiceWithLabelSchema](#fieldchoicewithlabelschema)
@@ -148,6 +148,26 @@ Key | Required | Type | Description
 
 -----
 
+## /AuthFieldsSchema
+
+An array or collection of auth input fields.
+
+#### Details
+
+* **Type** - `array`[oneOf([/AuthInputFieldSchema](#authinputfieldschema))]
+* [**Source Code**](https://github.com/zapier/zapier-platform/blob/zapier-platform-schema@16.2.0/packages/schema/lib/schemas/AuthFieldsSchema.js)
+
+
+#### Examples
+
+* `[ { key: 'abc' } ]`
+
+#### Anti-Examples
+
+* `{}` - _Must be an array_
+
+-----
+
 ## /AuthInputFieldSchema
 
 Field schema specialized for auth input fields (e.g., OAuth).
@@ -389,7 +409,7 @@ Key | Required | Type | Description
 --- | -------- | ---- | -----------
 `type` | **yes** | `string` in (`'basic'`, `'custom'`, `'digest'`, `'oauth1'`, `'oauth2'`, `'session'`) | Choose which scheme you want to use.
 `test` | **yes** | oneOf([/RequestSchema](#requestschema), [/FunctionSchema](#functionschema)) | A function or request that confirms the authentication is working.
-`fields` | no | [/DynamicAuthInputFieldsSchema](#dynamicauthinputfieldsschema) | Fields you can request from the user before they connect your app to Zapier.
+`fields` | no | [/AuthFieldsSchema](#authfieldsschema) | Fields you can request from the user before they connect your app to Zapier.
 `connectionLabel` | no | anyOf([/RequestSchema](#requestschema), [/FunctionSchema](#functionschema), `string`) | A string with variables, function, or request that returns the connection label for the authenticated user.
 `basicConfig` | no | [/AuthenticationBasicConfigSchema](#authenticationbasicconfigschema) | _No description given._
 `customConfig` | no | [/AuthenticationCustomConfigSchema](#authenticationcustomconfigschema) | _No description given._
@@ -918,26 +938,6 @@ Key | Required | Type | Description
 
 -----
 
-## /DynamicAuthInputFieldsSchema
-
-An array or collection of auth input fields.
-
-#### Details
-
-* **Type** - `array`[oneOf([/AuthInputFieldSchema](#authinputfieldschema))]
-* [**Source Code**](https://github.com/zapier/zapier-platform/blob/zapier-platform-schema@16.2.0/packages/schema/lib/schemas/DynamicAuthInputFieldsSchema.js)
-
-
-#### Examples
-
-* `[ { key: 'abc' } ]`
-
-#### Anti-Examples
-
-* `{}` - _Must be an array_
-
------
-
 ## /DynamicInputFieldsSchema
 
 An array or collection of input fields.
diff --git a/packages/schema/exported-schema.json b/packages/schema/exported-schema.json
index 8b9ad4ead..c530d2c97 100644
--- a/packages/schema/exported-schema.json
+++ b/packages/schema/exported-schema.json
@@ -595,8 +595,8 @@
       },
       "additionalProperties": false
     },
-    "DynamicAuthInputFieldsSchema": {
-      "id": "/DynamicAuthInputFieldsSchema",
+    "AuthFieldsSchema": {
+      "id": "/AuthFieldsSchema",
       "description": "An array or collection of auth input fields.",
       "type": "array",
       "items": {
@@ -1957,7 +1957,7 @@
         },
         "fields": {
           "description": "Fields you can request from the user before they connect your app to Zapier.",
-          "$ref": "/DynamicAuthInputFieldsSchema"
+          "$ref": "/AuthFieldsSchema"
         },
         "connectionLabel": {
           "description": "A string with variables, function, or request that returns the connection label for the authenticated user.",
diff --git a/packages/schema/lib/schemas/AuthInputFieldSchema.js b/packages/schema/lib/schemas/AuthFieldSchema.js
similarity index 100%
rename from packages/schema/lib/schemas/AuthInputFieldSchema.js
rename to packages/schema/lib/schemas/AuthFieldSchema.js
diff --git a/packages/schema/lib/schemas/DynamicAuthInputFieldsSchema.js b/packages/schema/lib/schemas/AuthFieldsSchema.js
similarity index 63%
rename from packages/schema/lib/schemas/DynamicAuthInputFieldsSchema.js
rename to packages/schema/lib/schemas/AuthFieldsSchema.js
index 8d9e85169..649025cd1 100644
--- a/packages/schema/lib/schemas/DynamicAuthInputFieldsSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldsSchema.js
@@ -2,18 +2,18 @@
 
 const makeSchema = require('../utils/makeSchema');
 
-const AuthInputFieldSchema = require('./AuthInputFieldSchema');
+const AuthFieldSchema = require('./AuthFieldSchema');
 
 module.exports = makeSchema(
   {
-    id: '/DynamicAuthInputFieldsSchema',
+    id: '/AuthFieldsSchema',
     description: 'An array or collection of auth input fields.',
     type: 'array',
     items: {
-      oneOf: [{ $ref: AuthInputFieldSchema.id }],
+      oneOf: [{ $ref: AuthFieldSchema.id }],
     },
     examples: [[{ key: 'abc' }]],
     antiExamples: [{ example: {}, reason: 'Must be an array' }],
   },
-  [AuthInputFieldSchema],
+  [AuthFieldSchema],
 );
diff --git a/packages/schema/lib/schemas/AuthenticationSchema.js b/packages/schema/lib/schemas/AuthenticationSchema.js
index ad4a1d019..25fabf753 100644
--- a/packages/schema/lib/schemas/AuthenticationSchema.js
+++ b/packages/schema/lib/schemas/AuthenticationSchema.js
@@ -10,7 +10,7 @@ const AuthenticationOAuth2ConfigSchema = require('./AuthenticationOAuth2ConfigSc
 const AuthenticationSessionConfigSchema = require('./AuthenticationSessionConfigSchema.js');
 const FunctionSchema = require('./FunctionSchema');
 const RequestSchema = require('./RequestSchema');
-const DynamicAuthInputFieldsSchema = require('./DynamicAuthInputFieldsSchema');
+const AuthFieldsSchema = require('./AuthFieldsSchema');
 
 module.exports = makeSchema(
   {
@@ -32,7 +32,7 @@ module.exports = makeSchema(
       fields: {
         description:
           'Fields you can request from the user before they connect your app to Zapier.',
-        $ref: DynamicAuthInputFieldsSchema.id,
+        $ref: AuthFieldsSchema.id,
       },
       connectionLabel: {
         description:
@@ -107,7 +107,7 @@ module.exports = makeSchema(
   [
     FunctionSchema,
     RequestSchema,
-    DynamicAuthInputFieldsSchema,
+    AuthFieldsSchema,
     AuthenticationBasicConfigSchema,
     AuthenticationCustomConfigSchema,
     AuthenticationDigestConfigSchema,

From ec60ed44956f54738e40d6b214379e48c1e9b903 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Wed, 29 Jan 2025 10:45:17 -0500
Subject: [PATCH 08/60] PR suggestions: remove cleanErrors addition

---
 packages/core/types/zapier.generated.d.ts     |  8 ++--
 packages/schema/docs/build/schema.md          | 48 +++++++++----------
 packages/schema/exported-schema.json          |  8 ++--
 .../schema/lib/schemas/AuthFieldSchema.js     |  5 +-
 packages/schema/lib/utils/makeValidator.js    |  6 ---
 5 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/packages/core/types/zapier.generated.d.ts b/packages/core/types/zapier.generated.d.ts
index 934441e6c..3a7dec94c 100644
--- a/packages/core/types/zapier.generated.d.ts
+++ b/packages/core/types/zapier.generated.d.ts
@@ -410,11 +410,11 @@ export interface Field {
 }
 
 /**
- * Field schema specialized for auth input fields (e.g., OAuth).
+ * Field schema specialized for auth input fields.
  *
- * [Docs: AuthInputFieldSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#AuthInputFieldSchema)
+ * [Docs: AuthFieldSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#AuthFieldSchema)
  */
-export interface AuthInputField {
+export interface AuthField {
   /** A unique machine readable key for this value (IE: "fname"). */
   key: string;
 
@@ -646,7 +646,7 @@ export interface RedirectRequest {
  *
  * [Docs: AuthFieldsSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#AuthFieldsSchema)
  */
-export type AuthFields = AuthInputField[];
+export type AuthFields = AuthField[];
 
 /**
  * Config for Basic Authentication. No extra properties are required
diff --git a/packages/schema/docs/build/schema.md b/packages/schema/docs/build/schema.md
index 1c2d34114..31adf2578 100644
--- a/packages/schema/docs/build/schema.md
+++ b/packages/schema/docs/build/schema.md
@@ -11,8 +11,8 @@ This is automatically generated by the `npm run docs` command in `zapier-platfor
 
 * [/AppFlagsSchema](#appflagsschema)
 * [/AppSchema](#appschema)
+* [/AuthFieldSchema](#authfieldschema)
 * [/AuthFieldsSchema](#authfieldsschema)
-* [/AuthInputFieldSchema](#authinputfieldschema)
 * [/AuthenticationBasicConfigSchema](#authenticationbasicconfigschema)
 * [/AuthenticationCustomConfigSchema](#authenticationcustomconfigschema)
 * [/AuthenticationDigestConfigSchema](#authenticationdigestconfigschema)
@@ -148,34 +148,14 @@ Key | Required | Type | Description
 
 -----
 
-## /AuthFieldsSchema
-
-An array or collection of auth input fields.
-
-#### Details
-
-* **Type** - `array`[oneOf([/AuthInputFieldSchema](#authinputfieldschema))]
-* [**Source Code**](https://github.com/zapier/zapier-platform/blob/zapier-platform-schema@16.2.0/packages/schema/lib/schemas/AuthFieldsSchema.js)
-
-
-#### Examples
-
-* `[ { key: 'abc' } ]`
-
-#### Anti-Examples
-
-* `{}` - _Must be an array_
-
------
-
-## /AuthInputFieldSchema
+## /AuthFieldSchema
 
-Field schema specialized for auth input fields (e.g., OAuth).
+Field schema specialized for auth input fields.
 
 #### Details
 
 * **Type** - `object`
-* [**Source Code**](https://github.com/zapier/zapier-platform/blob/zapier-platform-schema@16.2.0/packages/schema/lib/schemas/AuthInputFieldSchema.js)
+* [**Source Code**](https://github.com/zapier/zapier-platform/blob/zapier-platform-schema@16.2.0/packages/schema/lib/schemas/AuthFieldSchema.js)
 
 #### Properties
 
@@ -231,6 +211,26 @@ Key | Required | Type | Description
 
 -----
 
+## /AuthFieldsSchema
+
+An array or collection of auth input fields.
+
+#### Details
+
+* **Type** - `array`[oneOf([/AuthFieldSchema](#authfieldschema))]
+* [**Source Code**](https://github.com/zapier/zapier-platform/blob/zapier-platform-schema@16.2.0/packages/schema/lib/schemas/AuthFieldsSchema.js)
+
+
+#### Examples
+
+* `[ { key: 'abc' } ]`
+
+#### Anti-Examples
+
+* `{}` - _Must be an array_
+
+-----
+
 ## /AuthenticationBasicConfigSchema
 
 Config for Basic Authentication. No extra properties are required to setup Basic Auth, so you can leave this empty if your app uses Basic Auth.
diff --git a/packages/schema/exported-schema.json b/packages/schema/exported-schema.json
index c530d2c97..06f2ee414 100644
--- a/packages/schema/exported-schema.json
+++ b/packages/schema/exported-schema.json
@@ -355,9 +355,9 @@
       },
       "additionalProperties": false
     },
-    "AuthInputFieldSchema": {
-      "id": "/AuthInputFieldSchema",
-      "description": "Field schema specialized for auth input fields (e.g., OAuth).",
+    "AuthFieldSchema": {
+      "id": "/AuthFieldSchema",
+      "description": "Field schema specialized for auth input fields.",
       "type": "object",
       "required": ["key"],
       "properties": {
@@ -602,7 +602,7 @@
       "items": {
         "oneOf": [
           {
-            "$ref": "/AuthInputFieldSchema"
+            "$ref": "/AuthFieldSchema"
           }
         ]
       }
diff --git a/packages/schema/lib/schemas/AuthFieldSchema.js b/packages/schema/lib/schemas/AuthFieldSchema.js
index 76b4dcd9e..72781d122 100644
--- a/packages/schema/lib/schemas/AuthFieldSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldSchema.js
@@ -6,9 +6,8 @@ const FieldSchema = require('./FieldSchema');
 module.exports = makeSchema(
   {
     ...FieldSchema.schema,
-    id: '/AuthInputFieldSchema',
-    description:
-      'Field schema specialized for auth input fields (e.g., OAuth).',
+    id: '/AuthFieldSchema',
+    description: 'Field schema specialized for auth input fields.',
     properties: {
       ...FieldSchema.schema.properties,
       isSafe: {
diff --git a/packages/schema/lib/utils/makeValidator.js b/packages/schema/lib/utils/makeValidator.js
index e57391ab5..6b73e870a 100644
--- a/packages/schema/lib/utils/makeValidator.js
+++ b/packages/schema/lib/utils/makeValidator.js
@@ -64,12 +64,6 @@ const processBaseError = (err, path) => {
  */
 const cleanError = (validationError, path, validator, definition) => {
   if (ambiguousTypes.includes(validationError.name)) {
-    // If argument is not an array, we can't do .every(...)
-    if (!Array.isArray(validationError.argument)) {
-      // fallback: treat it like a standard error
-      return processBaseError(validationError, path);
-    }
-
     // flatObjectSchema requires each property to be a type. instead of recursing down, it's more valuable to say "hey, it's not of these types"
     if (validationError.argument.every((s) => s.includes('subschema'))) {
       return processBaseError(validationError, path);

From 3018bdec94ec931d030e23d352b09a85a4204949 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Wed, 29 Jan 2025 11:01:54 -0500
Subject: [PATCH 09/60] PR suggestions: add examples and anti-examples

---
 packages/core/types/zapier.generated.d.ts     |  6 +-
 packages/schema/docs/build/schema.md          | 52 ++++++++---------
 packages/schema/exported-schema.json          |  4 +-
 .../schema/lib/schemas/AuthFieldSchema.js     | 56 ++++++++++++++++++-
 .../schema/lib/schemas/AuthFieldsSchema.js    | 46 ++++++++++++++-
 5 files changed, 131 insertions(+), 33 deletions(-)

diff --git a/packages/core/types/zapier.generated.d.ts b/packages/core/types/zapier.generated.d.ts
index 3a7dec94c..624bb806a 100644
--- a/packages/core/types/zapier.generated.d.ts
+++ b/packages/core/types/zapier.generated.d.ts
@@ -410,7 +410,7 @@ export interface Field {
 }
 
 /**
- * Field schema specialized for auth input fields.
+ * Field schema specialized for authentication fields.
  *
  * [Docs: AuthFieldSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#AuthFieldSchema)
  */
@@ -540,7 +540,9 @@ export interface AuthField {
    */
   meta?: FieldMeta;
 
-  /** Indicates if this auth input field is safe (not secret). */
+  /**
+   * Indicates if this authentication field is safe (not secret).
+   */
   isSafe?: boolean;
 }
 
diff --git a/packages/schema/docs/build/schema.md b/packages/schema/docs/build/schema.md
index 31adf2578..b731bf686 100644
--- a/packages/schema/docs/build/schema.md
+++ b/packages/schema/docs/build/schema.md
@@ -150,7 +150,7 @@ Key | Required | Type | Description
 
 ## /AuthFieldSchema
 
-Field schema specialized for auth input fields.
+Field schema specialized for authentication fields.
 
 #### Details
 
@@ -180,34 +180,19 @@ Key | Required | Type | Description
 `steadyState` | no | `boolean` | Prevents triggering on new output until all values for fields with this property remain unchanged for 2 polls. It can be used to, e.g., not trigger on a new contact until the contact has completed typing their name. NOTE that this only applies to the `outputFields` of polling triggers.
 `inputFormat` | no | `string` | Useful when you expect the input to be part of a longer string. Put "{{input}}" in place of the user's input (IE: "https://{{input}}.yourdomain.com").
 `meta` | no | [/FieldMetaSchema](#fieldmetaschema) | Allows for additional metadata to be stored on the field. Supports simple key-values only (no sub-objects or arrays).
-`isSafe` | no | `boolean` | Indicates if this auth input field is safe (not secret).
+`isSafe` | no | `boolean` | Indicates if this authentication field is safe (not secret).
 
 #### Examples
 
-* `{ key: 'abc' }`
-* `{ key: 'abc', choices: { mobile: 'Mobile Phone' } }`
-* `{ key: 'abc', choices: [ 'first', 'second', 'third' ] }`
-* `{ key: 'abc', choices: [ { label: 'Red', sample: '#f00', value: '#f00' } ] }`
-* `{ key: 'abc', children: [ { key: 'abc' } ] }`
-* `{ key: 'abc', type: 'integer', helpText: 'neat' }`
-* ```
-  {
-    key: 'abc',
-    type: 'integer',
-    meta: { internalType: 'numeric', should_call_api: true, display_order: 1 }
-  }
-  ```
+* `{ key: 'email', type: 'string', isSafe: true, required: true }`
+* `{ key: 'password', type: 'string', isSafe: false, required: true }`
+* `{ key: 'api_key', type: 'string', isSafe: false, required: true }`
 
 #### Anti-Examples
 
-* `{}` - _Missing required key: key_
-* `{ key: 'abc', type: 'loltype' }` - _Invalid value for key: type_
-* `{ key: 'abc', choices: {} }` - _Invalid value for key: choices (cannot be empty)_
-* `{ key: 'abc', choices: [] }` - _Invalid value for key: choices (cannot be empty)_
-* `{ key: 'abc', choices: [ 3 ] }` - _Invalid value for key: choices (if an array, must be of either string or FieldChoiceWithLabelSchema)_
-* `{ key: 'abc', choices: [ { label: 'Red', value: '#f00' } ] }` - _Invalid value for key: choices (if an array of FieldChoiceWithLabelSchema, must provide key `sample`)_
-* `{ key: 'abc', choices: 'mobile' }` - _Invalid value for key: choices (must be either object or array)_
-* `{ key: 'abc', children: [ '$func$2$f$' ] }` - _Invalid value for key: children (must be array of FieldSchema)_
+* `{ key: 'password', type: 'string', isSafe: true, required: true }` - _A "password" field cannot have isSafe = true._
+* `{ key: 'api_key', isSafe: true }` - _Missing "type". Also "api_key" is a sensitive field and cannot have isSafe=true._
+* `{ type: 'string', isSafe: false }` - _Missing required key: key_
 
 -----
 
@@ -223,11 +208,28 @@ An array or collection of auth input fields.
 
 #### Examples
 
-* `[ { key: 'abc' } ]`
+* ```
+  [
+    { key: 'username', type: 'string', isSafe: true, required: true },
+    { key: 'password', type: 'string', isSafe: false, required: true }
+  ]
+  ```
+* `[ { key: 'api_key', type: 'string', isSafe: false, required: true } ]`
+* ```
+  [
+    { key: 'email', type: 'string', isSafe: true },
+    { key: 'password', type: 'string', required: true },
+    { key: 'mfa_token', type: 'string', isSafe: false }
+  ]
+  ```
 
 #### Anti-Examples
 
-* `{}` - _Must be an array_
+* `{}` - _Must be an array (currently an object)._
+* `[ { key: 'password', isSafe: true } ]` - _A password field cannot be marked as isSafe: true (violates AuthFieldSchema)._
+* `[ { key: 'api_key', isSafe: true } ]` - _api_key is considered sensitive and cannot have isSafe = true._
+* `[ { isSafe: false } ]` - _Missing required "key" property._
+* `[ { key: 'username', type: 'string', isSafe: true }, 12345 ]` - _An array item is not an object (must match AuthFieldSchema)._
 
 -----
 
diff --git a/packages/schema/exported-schema.json b/packages/schema/exported-schema.json
index 06f2ee414..6a50a3cb2 100644
--- a/packages/schema/exported-schema.json
+++ b/packages/schema/exported-schema.json
@@ -357,7 +357,7 @@
     },
     "AuthFieldSchema": {
       "id": "/AuthFieldSchema",
-      "description": "Field schema specialized for auth input fields.",
+      "description": "Field schema specialized for authentication fields.",
       "type": "object",
       "required": ["key"],
       "properties": {
@@ -461,7 +461,7 @@
           "$ref": "/FieldMetaSchema"
         },
         "isSafe": {
-          "description": "Indicates if this auth input field is safe (not secret).",
+          "description": "Indicates if this authentication field is safe (not secret).",
           "type": "boolean"
         }
       },
diff --git a/packages/schema/lib/schemas/AuthFieldSchema.js b/packages/schema/lib/schemas/AuthFieldSchema.js
index 72781d122..991a02a49 100644
--- a/packages/schema/lib/schemas/AuthFieldSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldSchema.js
@@ -7,11 +7,12 @@ module.exports = makeSchema(
   {
     ...FieldSchema.schema,
     id: '/AuthFieldSchema',
-    description: 'Field schema specialized for auth input fields.',
+    description: 'Field schema specialized for authentication fields.',
     properties: {
       ...FieldSchema.schema.properties,
       isSafe: {
-        description: 'Indicates if this auth input field is safe (not secret).',
+        description:
+          'Indicates if this authentication field is safe (not secret).',
         type: 'boolean',
       },
     },
@@ -32,6 +33,57 @@ module.exports = makeSchema(
       },
       required: ['key', 'isSafe'],
     },
+    // Add examples and anti-examples specifically for basic & custom auth
+    examples: [
+      // Basic Auth - email & password
+      {
+        key: 'email',
+        type: 'string',
+        isSafe: true,
+        required: true,
+      },
+      {
+        key: 'password',
+        type: 'string',
+        isSafe: false,
+        required: true,
+      },
+
+      // Custom Auth - api key
+      {
+        key: 'api_key',
+        type: 'string',
+        isSafe: false,
+        required: true,
+      },
+    ],
+
+    antiExamples: [
+      {
+        example: {
+          key: 'password',
+          type: 'string',
+          isSafe: true,
+          required: true,
+        },
+        reason: 'A "password" field cannot have isSafe = true.',
+      },
+      {
+        example: {
+          key: 'api_key',
+          isSafe: true,
+        },
+        reason:
+          'Missing "type". Also "api_key" is a sensitive field and cannot have isSafe=true.',
+      },
+      {
+        example: {
+          type: 'string',
+          isSafe: false,
+        },
+        reason: 'Missing required key: key',
+      },
+    ],
   },
 
   [FieldSchema],
diff --git a/packages/schema/lib/schemas/AuthFieldsSchema.js b/packages/schema/lib/schemas/AuthFieldsSchema.js
index 649025cd1..3756694f1 100644
--- a/packages/schema/lib/schemas/AuthFieldsSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldsSchema.js
@@ -12,8 +12,50 @@ module.exports = makeSchema(
     items: {
       oneOf: [{ $ref: AuthFieldSchema.id }],
     },
-    examples: [[{ key: 'abc' }]],
-    antiExamples: [{ example: {}, reason: 'Must be an array' }],
+    // Some complete examples
+    examples: [
+      // 1) Basic Auth: username (safe) + password (not safe)
+      [
+        { key: 'username', type: 'string', isSafe: true, required: true },
+        { key: 'password', type: 'string', isSafe: false, required: true },
+      ],
+
+      // 2) Just a single auth field for custom usage (e.g., api_key)
+      [{ key: 'api_key', type: 'string', isSafe: false, required: true }],
+
+      // 3) Mix of fields for extended usage
+      [
+        { key: 'email', type: 'string', isSafe: true },
+        { key: 'password', type: 'string', required: true },
+        { key: 'mfa_token', type: 'string', isSafe: false },
+      ],
+    ],
+
+    // Anti-examples showing invalid arrays or invalid field objects
+    antiExamples: [
+      {
+        example: {},
+        reason: 'Must be an array (currently an object).',
+      },
+      {
+        example: [{ key: 'password', isSafe: true }],
+        reason:
+          'A password field cannot be marked as isSafe: true (violates AuthFieldSchema).',
+      },
+      {
+        example: [{ key: 'api_key', isSafe: true }],
+        reason:
+          'api_key is considered sensitive and cannot have isSafe = true.',
+      },
+      {
+        example: [{ isSafe: false }],
+        reason: 'Missing required "key" property.',
+      },
+      {
+        example: [{ key: 'username', type: 'string', isSafe: true }, 12345],
+        reason: 'An array item is not an object (must match AuthFieldSchema).',
+      },
+    ],
   },
   [AuthFieldSchema],
 );

From 9354f506e0790181ab13dd8fdccd275746d1fd16 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Wed, 29 Jan 2025 11:03:01 -0500
Subject: [PATCH 10/60] fix description

---
 packages/core/types/zapier.generated.d.ts       | 2 +-
 packages/schema/docs/build/schema.md            | 2 +-
 packages/schema/exported-schema.json            | 2 +-
 packages/schema/lib/schemas/AuthFieldsSchema.js | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/core/types/zapier.generated.d.ts b/packages/core/types/zapier.generated.d.ts
index 624bb806a..2ef22d3d7 100644
--- a/packages/core/types/zapier.generated.d.ts
+++ b/packages/core/types/zapier.generated.d.ts
@@ -644,7 +644,7 @@ export interface RedirectRequest {
 }
 
 /**
- * An array or collection of auth input fields.
+ * An array or collection of authentication fields.
  *
  * [Docs: AuthFieldsSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#AuthFieldsSchema)
  */
diff --git a/packages/schema/docs/build/schema.md b/packages/schema/docs/build/schema.md
index b731bf686..49ec4a974 100644
--- a/packages/schema/docs/build/schema.md
+++ b/packages/schema/docs/build/schema.md
@@ -198,7 +198,7 @@ Key | Required | Type | Description
 
 ## /AuthFieldsSchema
 
-An array or collection of auth input fields.
+An array or collection of authentication fields.
 
 #### Details
 
diff --git a/packages/schema/exported-schema.json b/packages/schema/exported-schema.json
index 6a50a3cb2..3c3cc779c 100644
--- a/packages/schema/exported-schema.json
+++ b/packages/schema/exported-schema.json
@@ -597,7 +597,7 @@
     },
     "AuthFieldsSchema": {
       "id": "/AuthFieldsSchema",
-      "description": "An array or collection of auth input fields.",
+      "description": "An array or collection of authentication fields.",
       "type": "array",
       "items": {
         "oneOf": [
diff --git a/packages/schema/lib/schemas/AuthFieldsSchema.js b/packages/schema/lib/schemas/AuthFieldsSchema.js
index 3756694f1..d6a7d6b73 100644
--- a/packages/schema/lib/schemas/AuthFieldsSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldsSchema.js
@@ -7,7 +7,7 @@ const AuthFieldSchema = require('./AuthFieldSchema');
 module.exports = makeSchema(
   {
     id: '/AuthFieldsSchema',
-    description: 'An array or collection of auth input fields.',
+    description: 'An array or collection of authentication fields.',
     type: 'array',
     items: {
       oneOf: [{ $ref: AuthFieldSchema.id }],

From eee329e60e66af18d2705fcfffdf813f0a82b221 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Wed, 29 Jan 2025 11:05:46 -0500
Subject: [PATCH 11/60] remove FieldsSchema and DynamicFieldsSchema

---
 .../schema/lib/schemas/DynamicFieldsSchema.js | 36 -------------------
 packages/schema/lib/schemas/FieldsSchema.js   | 17 ---------
 2 files changed, 53 deletions(-)
 delete mode 100644 packages/schema/lib/schemas/DynamicFieldsSchema.js
 delete mode 100644 packages/schema/lib/schemas/FieldsSchema.js

diff --git a/packages/schema/lib/schemas/DynamicFieldsSchema.js b/packages/schema/lib/schemas/DynamicFieldsSchema.js
deleted file mode 100644
index e6a384e23..000000000
--- a/packages/schema/lib/schemas/DynamicFieldsSchema.js
+++ /dev/null
@@ -1,36 +0,0 @@
-'use strict';
-
-const makeSchema = require('../utils/makeSchema');
-
-const FieldOrFunctionSchema = require('./FieldOrFunctionSchema');
-
-module.exports = makeSchema(
-  {
-    id: '/DynamicFieldsSchema',
-    description:
-      'Like [/FieldsSchema](#fieldsschema) but you can provide functions to create dynamic or custom fields.',
-    $ref: FieldOrFunctionSchema.id,
-    examples: [
-      [],
-      [{ key: 'abc' }],
-      [{ key: 'abc' }, '$func$2$f$'],
-      ['$func$2$f$', '$func$2$f$'],
-    ],
-    antiExamples: [
-      {
-        example: [{}],
-        reason: 'FieldSchema missing required key: key',
-      },
-      {
-        example: [{ key: 'abc', choices: {} }],
-        reason:
-          'Invalid value for key in FieldSchema: choices (cannot be empty)',
-      },
-      {
-        example: '$func$2$f$',
-        reason: 'Must be an array',
-      },
-    ],
-  },
-  [FieldOrFunctionSchema],
-);
diff --git a/packages/schema/lib/schemas/FieldsSchema.js b/packages/schema/lib/schemas/FieldsSchema.js
deleted file mode 100644
index 987a8c3a7..000000000
--- a/packages/schema/lib/schemas/FieldsSchema.js
+++ /dev/null
@@ -1,17 +0,0 @@
-'use strict';
-
-const makeSchema = require('../utils/makeSchema');
-
-const FieldSchema = require('./FieldSchema');
-
-module.exports = makeSchema(
-  {
-    id: '/FieldsSchema',
-    description: 'An array or collection of fields.',
-    type: 'array',
-    items: { $ref: FieldSchema.id },
-    examples: [[{ key: 'abc' }]],
-    antiExamples: [{ example: {}, reason: 'Must be an array' }],
-  },
-  [FieldSchema],
-);

From 833bd10a9a3fa9b8e6a01f4511bb1bedc4c892d2 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Wed, 29 Jan 2025 11:14:09 -0500
Subject: [PATCH 12/60] add unit tests

---
 packages/schema/test/index.js | 64 +++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/packages/schema/test/index.js b/packages/schema/test/index.js
index 18df4f5dd..f74423c7e 100644
--- a/packages/schema/test/index.js
+++ b/packages/schema/test/index.js
@@ -225,6 +225,70 @@ describe('app', () => {
       const results = schema.validateAppDefinition(appCopy);
       results.errors.should.eql([]);
     });
+
+    it('should validate safe/unsafe auth fields', () => {
+      const appCopy = copy(appDefinition);
+
+      // Set up a "custom" auth that has two fields:
+      //   - "username" which is safe
+      //   - "password" which is not safe
+      appCopy.authentication = {
+        type: 'custom',
+        test: {
+          url: 'https://example.com',
+        },
+        fields: [
+          {
+            key: 'username',
+            type: 'string',
+            isSafe: true, // allowed
+            required: true,
+          },
+          {
+            key: 'password',
+            type: 'string',
+            isSafe: false, // password is not safe
+            required: true,
+          },
+        ],
+      };
+
+      const results = schema.validateAppDefinition(appCopy);
+
+      // Expect zero errors
+      results.errors.should.have.length(0);
+      should(results.valid).eql(true);
+    });
+
+    it('should invalidate a "safe" password field', () => {
+      const appCopy = copy(appDefinition);
+
+      // Same "custom" auth but now marking "password" as isSafe=true
+      appCopy.authentication = {
+        type: 'custom',
+        test: {
+          url: 'https://example.com',
+        },
+        fields: [
+          {
+            key: 'password',
+            type: 'string',
+            isSafe: true, // invalid: password cannot be safe
+            required: true,
+          },
+        ],
+      };
+
+      const results = schema.validateAppDefinition(appCopy);
+
+      // Expect at least one error because "password" can't have isSafe = true
+      results.errors.should.have.length(1);
+      should(results.valid).eql(false);
+
+      const [error] = results.errors;
+      // Check that the error specifically complains about a "not" rule or something similar
+      error.name.should.equal('not');
+    });
   });
 
   describe('export', () => {

From e89a3b8e70a368c49f8f16a70b34bc8fc76e4a28 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Wed, 29 Jan 2025 11:24:50 -0500
Subject: [PATCH 13/60] update unit test

---
 packages/cli/src/tests/utils/build.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/src/tests/utils/build.js b/packages/cli/src/tests/utils/build.js
index d71818ce0..8a7fe27de 100644
--- a/packages/cli/src/tests/utils/build.js
+++ b/packages/cli/src/tests/utils/build.js
@@ -57,7 +57,7 @@ describe('build (runs slowly)', function () {
     smartPaths.filter((p) => p.endsWith('.ts')).length.should.equal(0);
     smartPaths.should.not.containEql('tsconfig.json');
 
-    smartPaths.length.should.be.within(200, 301);
+    smartPaths.length.should.be.within(200, 303);
   });
 
   it('should list all the files', () => {

From eb2c904269936a9fea1a47f55dbd16dfcfc0313e Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Wed, 29 Jan 2025 11:49:51 -0500
Subject: [PATCH 14/60] Update packages/schema/lib/schemas/AuthFieldSchema.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>
---
 packages/schema/lib/schemas/AuthFieldSchema.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schema/lib/schemas/AuthFieldSchema.js b/packages/schema/lib/schemas/AuthFieldSchema.js
index 991a02a49..99e02d58a 100644
--- a/packages/schema/lib/schemas/AuthFieldSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldSchema.js
@@ -44,7 +44,7 @@ module.exports = makeSchema(
       },
       {
         key: 'password',
-        type: 'string',
+        type: 'password',
         isSafe: false,
         required: true,
       },

From 0fa07cfd4ae307393ba89ef318b6829affeba901 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Wed, 29 Jan 2025 11:50:00 -0500
Subject: [PATCH 15/60] Update packages/schema/lib/schemas/AuthFieldSchema.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>
---
 packages/schema/lib/schemas/AuthFieldSchema.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schema/lib/schemas/AuthFieldSchema.js b/packages/schema/lib/schemas/AuthFieldSchema.js
index 99e02d58a..896090cf1 100644
--- a/packages/schema/lib/schemas/AuthFieldSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldSchema.js
@@ -62,7 +62,7 @@ module.exports = makeSchema(
       {
         example: {
           key: 'password',
-          type: 'string',
+          type: 'password',
           isSafe: true,
           required: true,
         },

From c121fc91c8ce8d1663c74d85535ca2688b3741eb Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Wed, 29 Jan 2025 12:01:03 -0500
Subject: [PATCH 16/60] Update packages/schema/lib/schemas/AuthFieldSchema.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>
---
 packages/schema/lib/schemas/AuthFieldSchema.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schema/lib/schemas/AuthFieldSchema.js b/packages/schema/lib/schemas/AuthFieldSchema.js
index 896090cf1..04b4a5d18 100644
--- a/packages/schema/lib/schemas/AuthFieldSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldSchema.js
@@ -74,7 +74,7 @@ module.exports = makeSchema(
           isSafe: true,
         },
         reason:
-          'Missing "type". Also "api_key" is a sensitive field and cannot have isSafe=true.',
+          '"api_key" is a sensitive field and cannot have isSafe set as true.',
       },
       {
         example: {

From 3ffcfa86d839b37605e4c6f48112582e4eb59379 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Wed, 29 Jan 2025 12:01:33 -0500
Subject: [PATCH 17/60] Update packages/schema/lib/schemas/AuthFieldsSchema.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>
---
 packages/schema/lib/schemas/AuthFieldsSchema.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schema/lib/schemas/AuthFieldsSchema.js b/packages/schema/lib/schemas/AuthFieldsSchema.js
index d6a7d6b73..793ed4feb 100644
--- a/packages/schema/lib/schemas/AuthFieldsSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldsSchema.js
@@ -45,7 +45,7 @@ module.exports = makeSchema(
       {
         example: [{ key: 'api_key', isSafe: true }],
         reason:
-          'api_key is considered sensitive and cannot have isSafe = true.',
+          '"api_key" is a sensitive field and cannot have isSafe set as true.',
       },
       {
         example: [{ isSafe: false }],

From e0651f1cf6b80b96e21e97305db97d33e8e3aede Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Wed, 29 Jan 2025 12:01:52 -0500
Subject: [PATCH 18/60] Update packages/schema/lib/schemas/AuthFieldsSchema.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>
---
 packages/schema/lib/schemas/AuthFieldsSchema.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schema/lib/schemas/AuthFieldsSchema.js b/packages/schema/lib/schemas/AuthFieldsSchema.js
index 793ed4feb..5bd578c9b 100644
--- a/packages/schema/lib/schemas/AuthFieldsSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldsSchema.js
@@ -53,7 +53,7 @@ module.exports = makeSchema(
       },
       {
         example: [{ key: 'username', type: 'string', isSafe: true }, 12345],
-        reason: 'An array item is not an object (must match AuthFieldSchema).',
+        reason: 'Array item 12345 is not an object (must match AuthFieldSchema).',
       },
     ],
   },

From c371dc40392c5adf86a6e98060e159a5abc59376 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Wed, 29 Jan 2025 12:02:03 -0500
Subject: [PATCH 19/60] Update packages/schema/lib/schemas/AuthFieldsSchema.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>
---
 packages/schema/lib/schemas/AuthFieldsSchema.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schema/lib/schemas/AuthFieldsSchema.js b/packages/schema/lib/schemas/AuthFieldsSchema.js
index 5bd578c9b..aedd99e92 100644
--- a/packages/schema/lib/schemas/AuthFieldsSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldsSchema.js
@@ -26,7 +26,7 @@ module.exports = makeSchema(
       // 3) Mix of fields for extended usage
       [
         { key: 'email', type: 'string', isSafe: true },
-        { key: 'password', type: 'string', required: true },
+        { key: 'password', type: 'password', required: true },
         { key: 'mfa_token', type: 'string', isSafe: false },
       ],
     ],

From 3f50efea63284f510908350bfc0f3d3236a49d9d Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Wed, 29 Jan 2025 12:02:15 -0500
Subject: [PATCH 20/60] Update packages/schema/lib/schemas/AuthFieldsSchema.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>
---
 packages/schema/lib/schemas/AuthFieldsSchema.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schema/lib/schemas/AuthFieldsSchema.js b/packages/schema/lib/schemas/AuthFieldsSchema.js
index aedd99e92..c349d7aac 100644
--- a/packages/schema/lib/schemas/AuthFieldsSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldsSchema.js
@@ -17,7 +17,7 @@ module.exports = makeSchema(
       // 1) Basic Auth: username (safe) + password (not safe)
       [
         { key: 'username', type: 'string', isSafe: true, required: true },
-        { key: 'password', type: 'string', isSafe: false, required: true },
+        { key: 'password', type: 'password', isSafe: false, required: true },
       ],
 
       // 2) Just a single auth field for custom usage (e.g., api_key)

From 7260e55674ca4f3318422108e4ce7f8d4e8afc0f Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Wed, 29 Jan 2025 12:02:43 -0500
Subject: [PATCH 21/60] Update packages/schema/lib/schemas/AuthFieldsSchema.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>
---
 packages/schema/lib/schemas/AuthFieldsSchema.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schema/lib/schemas/AuthFieldsSchema.js b/packages/schema/lib/schemas/AuthFieldsSchema.js
index c349d7aac..0d525fa26 100644
--- a/packages/schema/lib/schemas/AuthFieldsSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldsSchema.js
@@ -40,7 +40,7 @@ module.exports = makeSchema(
       {
         example: [{ key: 'password', isSafe: true }],
         reason:
-          'A password field cannot be marked as isSafe: true (violates AuthFieldSchema).',
+          '"password" is a sensitive field and cannot have isSafe set as true.',
       },
       {
         example: [{ key: 'api_key', isSafe: true }],

From 09e53fd9e2b146eccb2bf12833de5296fb305cf9 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Wed, 29 Jan 2025 12:03:14 -0500
Subject: [PATCH 22/60] run yarn build

---
 packages/schema/docs/build/schema.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/schema/docs/build/schema.md b/packages/schema/docs/build/schema.md
index 49ec4a974..41d4504e6 100644
--- a/packages/schema/docs/build/schema.md
+++ b/packages/schema/docs/build/schema.md
@@ -185,13 +185,13 @@ Key | Required | Type | Description
 #### Examples
 
 * `{ key: 'email', type: 'string', isSafe: true, required: true }`
-* `{ key: 'password', type: 'string', isSafe: false, required: true }`
+* `{ key: 'password', type: 'password', isSafe: false, required: true }`
 * `{ key: 'api_key', type: 'string', isSafe: false, required: true }`
 
 #### Anti-Examples
 
-* `{ key: 'password', type: 'string', isSafe: true, required: true }` - _A "password" field cannot have isSafe = true._
-* `{ key: 'api_key', isSafe: true }` - _Missing "type". Also "api_key" is a sensitive field and cannot have isSafe=true._
+* `{ key: 'password', type: 'password', isSafe: true, required: true }` - _A "password" field cannot have isSafe = true._
+* `{ key: 'api_key', isSafe: true }` - _"api_key" is a sensitive field and cannot have isSafe set as true._
 * `{ type: 'string', isSafe: false }` - _Missing required key: key_
 
 -----
@@ -211,14 +211,14 @@ An array or collection of authentication fields.
 * ```
   [
     { key: 'username', type: 'string', isSafe: true, required: true },
-    { key: 'password', type: 'string', isSafe: false, required: true }
+    { key: 'password', type: 'password', isSafe: false, required: true }
   ]
   ```
 * `[ { key: 'api_key', type: 'string', isSafe: false, required: true } ]`
 * ```
   [
     { key: 'email', type: 'string', isSafe: true },
-    { key: 'password', type: 'string', required: true },
+    { key: 'password', type: 'password', required: true },
     { key: 'mfa_token', type: 'string', isSafe: false }
   ]
   ```
@@ -226,10 +226,10 @@ An array or collection of authentication fields.
 #### Anti-Examples
 
 * `{}` - _Must be an array (currently an object)._
-* `[ { key: 'password', isSafe: true } ]` - _A password field cannot be marked as isSafe: true (violates AuthFieldSchema)._
-* `[ { key: 'api_key', isSafe: true } ]` - _api_key is considered sensitive and cannot have isSafe = true._
+* `[ { key: 'password', isSafe: true } ]` - _"password" is a sensitive field and cannot have isSafe set as true._
+* `[ { key: 'api_key', isSafe: true } ]` - _"api_key" is a sensitive field and cannot have isSafe set as true._
 * `[ { isSafe: false } ]` - _Missing required "key" property._
-* `[ { key: 'username', type: 'string', isSafe: true }, 12345 ]` - _An array item is not an object (must match AuthFieldSchema)._
+* `[ { key: 'username', type: 'string', isSafe: true }, 12345 ]` - _Array item 12345 is not an object (must match AuthFieldSchema)._
 
 -----
 

From 6ed5ac88d9827e6bdc4d9f9451c4fe9cc6f311f6 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Wed, 29 Jan 2025 16:31:05 -0500
Subject: [PATCH 23/60] PR suggestion: move isSafe check as a
 functional-contsraint

---
 packages/schema/exported-schema.json          | 19 +-----
 .../functional-constraints/AuthFieldisSafe.js | 64 +++++++++++++++++++
 .../lib/functional-constraints/index.js       |  1 +
 .../schema/lib/schemas/AuthFieldSchema.js     | 16 -----
 packages/schema/lib/utils/makeValidator.js    |  1 +
 packages/schema/test/index.js                 |  6 +-
 6 files changed, 72 insertions(+), 35 deletions(-)
 create mode 100644 packages/schema/lib/functional-constraints/AuthFieldisSafe.js

diff --git a/packages/schema/exported-schema.json b/packages/schema/exported-schema.json
index 3c3cc779c..c28873d2b 100644
--- a/packages/schema/exported-schema.json
+++ b/packages/schema/exported-schema.json
@@ -465,24 +465,7 @@
           "type": "boolean"
         }
       },
-      "additionalProperties": false,
-      "not": {
-        "properties": {
-          "key": {
-            "enum": [
-              "access_token",
-              "refresh_token",
-              "api_key",
-              "password",
-              "secret"
-            ]
-          },
-          "isSafe": {
-            "const": true
-          }
-        },
-        "required": ["key", "isSafe"]
-      }
+      "additionalProperties": false
     },
     "RequestSchema": {
       "id": "/RequestSchema",
diff --git a/packages/schema/lib/functional-constraints/AuthFieldisSafe.js b/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
new file mode 100644
index 000000000..ebdee40c6
--- /dev/null
+++ b/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
@@ -0,0 +1,64 @@
+'use strict';
+
+const jsonschema = require('jsonschema');
+
+const AUTH_FIELD_ID = '/AuthFieldSchema';
+const AUTH_FIELDS_ID = '/AuthFieldsSchema';
+
+const FORBIDDEN_KEYS = [
+  'access_token',
+  'refresh_token',
+  'api_key',
+  'password',
+  'secret',
+];
+
+const checkAuthField = (field) => {
+  const errors = [];
+
+  if (FORBIDDEN_KEYS.includes(field.key) && field.isSafe === true) {
+    errors.push(
+      new jsonschema.ValidationError(
+        `Cannot set isSafe=true for the sensitive key "${field.key}".`,
+        field,
+        '/AuthFieldSchema',
+        'instance.key',
+        'sensitive',
+        'key',
+      ),
+    );
+  }
+
+  return errors;
+};
+
+module.exports = (definition, mainSchema) => {
+  const errors = [];
+  // Done to validate anti-examples declaratively defined in the schema
+  if ([AUTH_FIELD_ID, AUTH_FIELDS_ID].includes(mainSchema.id)) {
+    const definitions = Array.isArray(definition) ? definition : [definition];
+
+    definitions.forEach((field, index) => {
+      checkAuthField(field).forEach((err) => {
+        err.property = `instance[${index}]`;
+        err.stack = err.stack.replace('instance.key', `instance[${index}].key`);
+        errors.push(err);
+      });
+    });
+  }
+
+  // If there's no authentication or no fields, we have nothing to check
+  if (!definition.authentication || !definition.authentication.fields) {
+    return errors;
+  }
+
+  definition.authentication.fields.forEach((field, index) => {
+    checkAuthField(field).forEach((err) => {
+      err.property = `instance[${index}]`;
+      err.stack = err.stack.replace('instance.key', `instance[${index}].key`);
+      errors.push(err);
+    });
+  });
+
+  return errors;
+};
diff --git a/packages/schema/lib/functional-constraints/index.js b/packages/schema/lib/functional-constraints/index.js
index 838d5f3f9..6ebb73cae 100644
--- a/packages/schema/lib/functional-constraints/index.js
+++ b/packages/schema/lib/functional-constraints/index.js
@@ -21,6 +21,7 @@ const checks = [
   require('./bufferedCreateConstraints'),
   require('./requirePerformConditionally'),
   require('./pollingThrottle'),
+  require('./AuthFieldisSafe'),
 ];
 
 const runFunctionalConstraints = (definition, mainSchema) => {
diff --git a/packages/schema/lib/schemas/AuthFieldSchema.js b/packages/schema/lib/schemas/AuthFieldSchema.js
index 04b4a5d18..8a0715ab7 100644
--- a/packages/schema/lib/schemas/AuthFieldSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldSchema.js
@@ -17,22 +17,6 @@ module.exports = makeSchema(
       },
     },
 
-    // Do not allow certain isSafe = True if sensitive tokens exists
-    not: {
-      properties: {
-        key: {
-          enum: [
-            'access_token',
-            'refresh_token',
-            'api_key',
-            'password',
-            'secret',
-          ],
-        },
-        isSafe: { const: true },
-      },
-      required: ['key', 'isSafe'],
-    },
     // Add examples and anti-examples specifically for basic & custom auth
     examples: [
       // Basic Auth - email & password
diff --git a/packages/schema/lib/utils/makeValidator.js b/packages/schema/lib/utils/makeValidator.js
index 6b73e870a..8f9938ca9 100644
--- a/packages/schema/lib/utils/makeValidator.js
+++ b/packages/schema/lib/utils/makeValidator.js
@@ -64,6 +64,7 @@ const processBaseError = (err, path) => {
  */
 const cleanError = (validationError, path, validator, definition) => {
   if (ambiguousTypes.includes(validationError.name)) {
+    console.log(validationError, 'hereeeee');
     // flatObjectSchema requires each property to be a type. instead of recursing down, it's more valuable to say "hey, it's not of these types"
     if (validationError.argument.every((s) => s.includes('subschema'))) {
       return processBaseError(validationError, path);
diff --git a/packages/schema/test/index.js b/packages/schema/test/index.js
index f74423c7e..64effe7ed 100644
--- a/packages/schema/test/index.js
+++ b/packages/schema/test/index.js
@@ -282,12 +282,16 @@ describe('app', () => {
       const results = schema.validateAppDefinition(appCopy);
 
       // Expect at least one error because "password" can't have isSafe = true
+      console.log(results);
       results.errors.should.have.length(1);
       should(results.valid).eql(false);
 
       const [error] = results.errors;
       // Check that the error specifically complains about a "not" rule or something similar
-      error.name.should.equal('not');
+      error.name.should.equal('sensitive');
+      error.message.should.equal(
+        'Cannot set isSafe=true for the sensitive key "password".',
+      );
     });
   });
 

From 387a7f5da6e629cd10d96fb00ac316b9614822a6 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Wed, 29 Jan 2025 16:49:48 -0500
Subject: [PATCH 24/60] update test

---
 packages/cli/src/tests/utils/build.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/src/tests/utils/build.js b/packages/cli/src/tests/utils/build.js
index 8a7fe27de..fabbf2dfb 100644
--- a/packages/cli/src/tests/utils/build.js
+++ b/packages/cli/src/tests/utils/build.js
@@ -57,7 +57,7 @@ describe('build (runs slowly)', function () {
     smartPaths.filter((p) => p.endsWith('.ts')).length.should.equal(0);
     smartPaths.should.not.containEql('tsconfig.json');
 
-    smartPaths.length.should.be.within(200, 303);
+    smartPaths.length.should.be.within(200, 304);
   });
 
   it('should list all the files', () => {

From 78c1d796b0a85c1f76180c29dbe2e982ccdec773 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Thu, 30 Jan 2025 07:32:32 -0500
Subject: [PATCH 25/60] Update packages/schema/test/index.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>
---
 packages/schema/test/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/schema/test/index.js b/packages/schema/test/index.js
index 64effe7ed..86903c839 100644
--- a/packages/schema/test/index.js
+++ b/packages/schema/test/index.js
@@ -287,7 +287,6 @@ describe('app', () => {
       should(results.valid).eql(false);
 
       const [error] = results.errors;
-      // Check that the error specifically complains about a "not" rule or something similar
       error.name.should.equal('sensitive');
       error.message.should.equal(
         'Cannot set isSafe=true for the sensitive key "password".',

From e5f22b3bceb3b22968c5b23689b96e0d10ad0372 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Thu, 30 Jan 2025 07:32:43 -0500
Subject: [PATCH 26/60] Update packages/schema/test/index.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>
---
 packages/schema/test/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/schema/test/index.js b/packages/schema/test/index.js
index 86903c839..6cf0c791c 100644
--- a/packages/schema/test/index.js
+++ b/packages/schema/test/index.js
@@ -288,8 +288,8 @@ describe('app', () => {
 
       const [error] = results.errors;
       error.name.should.equal('sensitive');
-      error.message.should.equal(
-        'Cannot set isSafe=true for the sensitive key "password".',
+      error.stack.should.eql(
+        'instance.authentication.fields[0] cannot set isSafe as true for the sensitive key "password".',
       );
     });
   });

From 03cdb16f06c3e7940ca6c4b6cd60cb18da161f56 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Thu, 30 Jan 2025 07:32:52 -0500
Subject: [PATCH 27/60] Update packages/schema/test/index.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>
---
 packages/schema/test/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/schema/test/index.js b/packages/schema/test/index.js
index 6cf0c791c..641006e95 100644
--- a/packages/schema/test/index.js
+++ b/packages/schema/test/index.js
@@ -282,7 +282,6 @@ describe('app', () => {
       const results = schema.validateAppDefinition(appCopy);
 
       // Expect at least one error because "password" can't have isSafe = true
-      console.log(results);
       results.errors.should.have.length(1);
       should(results.valid).eql(false);
 

From e02fa4cf47a652875b70bc3d3da6ebbe4bc65f5e Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Thu, 30 Jan 2025 07:33:15 -0500
Subject: [PATCH 28/60] Update packages/schema/lib/utils/makeValidator.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>
---
 packages/schema/lib/utils/makeValidator.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/schema/lib/utils/makeValidator.js b/packages/schema/lib/utils/makeValidator.js
index 8f9938ca9..6b73e870a 100644
--- a/packages/schema/lib/utils/makeValidator.js
+++ b/packages/schema/lib/utils/makeValidator.js
@@ -64,7 +64,6 @@ const processBaseError = (err, path) => {
  */
 const cleanError = (validationError, path, validator, definition) => {
   if (ambiguousTypes.includes(validationError.name)) {
-    console.log(validationError, 'hereeeee');
     // flatObjectSchema requires each property to be a type. instead of recursing down, it's more valuable to say "hey, it's not of these types"
     if (validationError.argument.every((s) => s.includes('subschema'))) {
       return processBaseError(validationError, path);

From a844f035660ce5b76879066c9a2384426c6d7d08 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Thu, 30 Jan 2025 07:33:26 -0500
Subject: [PATCH 29/60] Update
 packages/schema/lib/functional-constraints/AuthFieldisSafe.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>
---
 packages/schema/lib/functional-constraints/AuthFieldisSafe.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schema/lib/functional-constraints/AuthFieldisSafe.js b/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
index ebdee40c6..546ebca34 100644
--- a/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
+++ b/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
@@ -55,7 +55,7 @@ module.exports = (definition, mainSchema) => {
   definition.authentication.fields.forEach((field, index) => {
     checkAuthField(field).forEach((err) => {
       err.property = `instance[${index}]`;
-      err.stack = err.stack.replace('instance.key', `instance[${index}].key`);
+      err.stack = err.stack.replace('instance.field', err.property);
       errors.push(err);
     });
   });

From a6d3e905a074b63a25a9bd0234cdd74698dc657f Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Thu, 30 Jan 2025 07:33:40 -0500
Subject: [PATCH 30/60] Update
 packages/schema/lib/functional-constraints/AuthFieldisSafe.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>
---
 packages/schema/lib/functional-constraints/AuthFieldisSafe.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schema/lib/functional-constraints/AuthFieldisSafe.js b/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
index 546ebca34..bdeef0706 100644
--- a/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
+++ b/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
@@ -54,7 +54,7 @@ module.exports = (definition, mainSchema) => {
 
   definition.authentication.fields.forEach((field, index) => {
     checkAuthField(field).forEach((err) => {
-      err.property = `instance[${index}]`;
+      err.property = `instance.authentication.fields[${index}]`;
       err.stack = err.stack.replace('instance.field', err.property);
       errors.push(err);
     });

From 6c75d363ff79076210fae8690f7ca6d14140003b Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Thu, 30 Jan 2025 07:33:58 -0500
Subject: [PATCH 31/60] Update
 packages/schema/lib/functional-constraints/AuthFieldisSafe.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>
---
 packages/schema/lib/functional-constraints/AuthFieldisSafe.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schema/lib/functional-constraints/AuthFieldisSafe.js b/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
index bdeef0706..440ed2ddf 100644
--- a/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
+++ b/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
@@ -24,7 +24,7 @@ const checkAuthField = (field) => {
         '/AuthFieldSchema',
         'instance.key',
         'sensitive',
-        'key',
+        'field',
       ),
     );
   }

From 91622cd380d6534b3ba7521fc88c324b845d22d0 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Thu, 30 Jan 2025 07:34:39 -0500
Subject: [PATCH 32/60] Update
 packages/schema/lib/functional-constraints/AuthFieldisSafe.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>
---
 packages/schema/lib/functional-constraints/AuthFieldisSafe.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schema/lib/functional-constraints/AuthFieldisSafe.js b/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
index 440ed2ddf..89d8c91fe 100644
--- a/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
+++ b/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
@@ -19,7 +19,7 @@ const checkAuthField = (field) => {
   if (FORBIDDEN_KEYS.includes(field.key) && field.isSafe === true) {
     errors.push(
       new jsonschema.ValidationError(
-        `Cannot set isSafe=true for the sensitive key "${field.key}".`,
+        `cannot set isSafe as true for the sensitive key "${field.key}".`,
         field,
         '/AuthFieldSchema',
         'instance.key',

From 81ba9ce5b154f3a0bb7029fa318b8aa746f19748 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Thu, 30 Jan 2025 07:34:57 -0500
Subject: [PATCH 33/60] Update
 packages/schema/lib/functional-constraints/AuthFieldisSafe.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>
---
 packages/schema/lib/functional-constraints/AuthFieldisSafe.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schema/lib/functional-constraints/AuthFieldisSafe.js b/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
index 89d8c91fe..1e8d79f89 100644
--- a/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
+++ b/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
@@ -22,7 +22,7 @@ const checkAuthField = (field) => {
         `cannot set isSafe as true for the sensitive key "${field.key}".`,
         field,
         '/AuthFieldSchema',
-        'instance.key',
+        'instance.field',
         'sensitive',
         'field',
       ),

From 298e148b7030ecbcfb9140b5536d265b402025f5 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Thu, 30 Jan 2025 07:35:15 -0500
Subject: [PATCH 34/60] Update
 packages/schema/lib/functional-constraints/AuthFieldisSafe.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>
---
 packages/schema/lib/functional-constraints/AuthFieldisSafe.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schema/lib/functional-constraints/AuthFieldisSafe.js b/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
index 1e8d79f89..ba29707b5 100644
--- a/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
+++ b/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
@@ -41,7 +41,7 @@ module.exports = (definition, mainSchema) => {
     definitions.forEach((field, index) => {
       checkAuthField(field).forEach((err) => {
         err.property = `instance[${index}]`;
-        err.stack = err.stack.replace('instance.key', `instance[${index}].key`);
+        err.stack = err.stack.replace('instance.field', err.property);
         errors.push(err);
       });
     });

From dc34ca28b552760fc96ec59a027005bc0311eb95 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Thu, 30 Jan 2025 09:11:42 -0500
Subject: [PATCH 35/60] update FORBIDDEN_KEYS to match secret scrubber

---
 .../lib/functional-constraints/AuthFieldisSafe.js     | 11 ++++++++++-
 packages/schema/test/index.js                         |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/schema/lib/functional-constraints/AuthFieldisSafe.js b/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
index ba29707b5..21d5b7bf3 100644
--- a/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
+++ b/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
@@ -7,10 +7,19 @@ const AUTH_FIELDS_ID = '/AuthFieldsSchema';
 
 const FORBIDDEN_KEYS = [
   'access_token',
-  'refresh_token',
   'api_key',
+  'apikey',
+  'api-key',
+  'auth',
+  'jwt',
+  'passwd',
   'password',
+  'pswd',
+  'refresh_token',
   'secret',
+  'set-cookie',
+  'signature',
+  'token',
 ];
 
 const checkAuthField = (field) => {
diff --git a/packages/schema/test/index.js b/packages/schema/test/index.js
index 641006e95..a1b3b6058 100644
--- a/packages/schema/test/index.js
+++ b/packages/schema/test/index.js
@@ -286,6 +286,7 @@ describe('app', () => {
       should(results.valid).eql(false);
 
       const [error] = results.errors;
+      console.log(error);
       error.name.should.equal('sensitive');
       error.stack.should.eql(
         'instance.authentication.fields[0] cannot set isSafe as true for the sensitive key "password".',

From 128f8e931710411c82717a76ff272361f4d517a1 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Fri, 31 Jan 2025 14:16:58 -0500
Subject: [PATCH 36/60] PR suggestions: tailor fields to not inherit from
 FieldSchema

---
 packages/schema/docs/build/schema.md          | 162 ++-----
 packages/schema/exported-schema.json          | 398 +++++-------------
 .../functional-constraints/AuthFieldisSafe.js |  13 +-
 .../schema/lib/schemas/AuthFieldSchema.js     | 184 +++++---
 .../schema/lib/schemas/AuthFieldsSchema.js    |  25 +-
 .../schema/lib/schemas/InputFieldSchema.js    | 174 +++++++-
 .../schema/lib/schemas/OutputFieldSchema.js   | 125 +++++-
 packages/schema/test/index.js                 |  14 +-
 8 files changed, 574 insertions(+), 521 deletions(-)

diff --git a/packages/schema/docs/build/schema.md b/packages/schema/docs/build/schema.md
index 41d4504e6..9fd1034af 100644
--- a/packages/schema/docs/build/schema.md
+++ b/packages/schema/docs/build/schema.md
@@ -36,7 +36,6 @@ This is automatically generated by the `npm run docs` command in `zapier-platfor
 * [/FieldChoiceWithLabelSchema](#fieldchoicewithlabelschema)
 * [/FieldChoicesSchema](#fieldchoicesschema)
 * [/FieldMetaSchema](#fieldmetaschema)
-* [/FieldSchema](#fieldschema)
 * [/FlatObjectSchema](#flatobjectschema)
 * [/FunctionRequireSchema](#functionrequireschema)
 * [/FunctionSchema](#functionschema)
@@ -162,37 +161,28 @@ Field schema specialized for authentication fields.
 Key | Required | Type | Description
 --- | -------- | ---- | -----------
 `key` | **yes** | `string` | A unique machine readable key for this value (IE: "fname").
+`isSecret` | no | `boolean` | Indicates if this authentication field is safe (not secret).
 `label` | no | `string` | A human readable label for this value (IE: "First Name").
 `helpText` | no | `string` | A human readable description of this value (IE: "The first part of a full name."). You can use Markdown.
-`type` | no | `string` in (`'string'`, `'text'`, `'integer'`, `'number'`, `'boolean'`, `'datetime'`, `'file'`, `'password'`, `'copy'`, `'code'`) | The type of this value. Use `string` for basic text input, `text` for a large, `<textarea>` style box, and `code` for a `<textarea>` with a fixed-width font. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.
-`required` | no | `boolean` | If this value is required or not.
+`type` | no | `string` in (`'string'`, `'number'`, `'boolean'`, `'datetime'`, `'password'`, `'copy'`, `'code'`) | The type of this value. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.
+`required` | no | `boolean` | If this value is required or not. This defaults to True.
 `placeholder` | no | `string` | An example value that is not saved.
-`default` | no | `string` | A default value that is saved the first time a Zap is created.
-`primary` | no | `boolean` | Use this field as part of the primary key for deduplication. You can set multiple fields as "primary", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`; it will be ignored if set in `inputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).
-`dynamic` | no | [/RefResourceSchema](#refresourceschema) | A reference to a trigger that will power a dynamic dropdown.
-`search` | no | [/RefResourceSchema](#refresourceschema) | A reference to a search that will guide the user to add a search step to populate this field when creating a Zap.
-`choices` | no | [/FieldChoicesSchema](#fieldchoicesschema) | An object of machine keys and human values to populate a static dropdown.
-`list` | no | `boolean` | Acts differently when used in inputFields vs. when used in outputFields. In inputFields: Can a user provide multiples of this field? In outputFields: Does this field return an array of items of type `type`?
-`children` | no | `array`[[/FieldSchema](#fieldschema)] | An array of child fields that define the structure of a sub-object for this field. Usually used for line items.
+`list` | no | `boolean` | Can a user provide multiples of this field?
+`children` | no | `array`[[/AuthFieldSchema](#authfieldschema)] | An array of child fields that define the structure of a sub-object for this field. Usually used for line items.
 `dict` | no | `boolean` | Is this field a key/value input?
-`computed` | no | `boolean` | Is this field automatically populated (and hidden from the user)? Note: Only OAuth and Session Auth support fields with this key.
-`altersDynamicFields` | no | `boolean` | Does the value of this field affect the definitions of other fields in the set?
-`steadyState` | no | `boolean` | Prevents triggering on new output until all values for fields with this property remain unchanged for 2 polls. It can be used to, e.g., not trigger on a new contact until the contact has completed typing their name. NOTE that this only applies to the `outputFields` of polling triggers.
 `inputFormat` | no | `string` | Useful when you expect the input to be part of a longer string. Put "{{input}}" in place of the user's input (IE: "https://{{input}}.yourdomain.com").
-`meta` | no | [/FieldMetaSchema](#fieldmetaschema) | Allows for additional metadata to be stored on the field. Supports simple key-values only (no sub-objects or arrays).
-`isSafe` | no | `boolean` | Indicates if this authentication field is safe (not secret).
 
 #### Examples
 
-* `{ key: 'email', type: 'string', isSafe: true, required: true }`
-* `{ key: 'password', type: 'password', isSafe: false, required: true }`
-* `{ key: 'api_key', type: 'string', isSafe: false, required: true }`
+* `{ key: 'email', type: 'string', isSecret: true, required: true }`
+* `{ key: 'password', type: 'password', isSecret: false, required: true }`
+* `{ key: 'api_key', type: 'string', isSecret: false, required: true }`
 
 #### Anti-Examples
 
-* `{ key: 'password', type: 'password', isSafe: true, required: true }` - _A "password" field cannot have isSafe = true._
-* `{ key: 'api_key', isSafe: true }` - _"api_key" is a sensitive field and cannot have isSafe set as true._
-* `{ type: 'string', isSafe: false }` - _Missing required key: key_
+* `{ key: 'password', type: 'password', isSecret: true, required: true }` - _A "password" field cannot have isSafe = true._
+* `{ key: 'api_key', isSecret: true }` - _"api_key" is a sensitive field and cannot have isSafe set as true._
+* `{ type: 'string', isSecret: false }` - _Missing required key: key_
 
 -----
 
@@ -210,26 +200,26 @@ An array or collection of authentication fields.
 
 * ```
   [
-    { key: 'username', type: 'string', isSafe: true, required: true },
-    { key: 'password', type: 'password', isSafe: false, required: true }
+    { key: 'username', type: 'string', isSecret: true, required: true },
+    { key: 'password', type: 'password', isSecret: false, required: true }
   ]
   ```
-* `[ { key: 'api_key', type: 'string', isSafe: false, required: true } ]`
+* `[ { key: 'api_key', type: 'string', isSecret: false, required: true } ]`
 * ```
   [
-    { key: 'email', type: 'string', isSafe: true },
+    { key: 'email', type: 'string', isSecret: true },
     { key: 'password', type: 'password', required: true },
-    { key: 'mfa_token', type: 'string', isSafe: false }
+    { key: 'mfa_token', type: 'string', isSecret: false }
   ]
   ```
 
 #### Anti-Examples
 
 * `{}` - _Must be an array (currently an object)._
-* `[ { key: 'password', isSafe: true } ]` - _"password" is a sensitive field and cannot have isSafe set as true._
-* `[ { key: 'api_key', isSafe: true } ]` - _"api_key" is a sensitive field and cannot have isSafe set as true._
-* `[ { isSafe: false } ]` - _Missing required "key" property._
-* `[ { key: 'username', type: 'string', isSafe: true }, 12345 ]` - _Array item 12345 is not an object (must match AuthFieldSchema)._
+* `[ { key: 'password', isSecret: true } ]` - _"password" is a sensitive field and cannot have isSecret set as true._
+* `[ { key: 'api_key', isSecret: true } ]` - _"api_key" is a sensitive field and cannot have isSecret set as true._
+* `[ { isSecret: false } ]` - _Missing required "key" property._
+* `[ { key: 'username', type: 'string', isSecret: true }, 12345 ]` - _Array item 12345 is not an object (must match AuthFieldSchema)._
 
 -----
 
@@ -1062,78 +1052,6 @@ Key | Required | Type | Description
 
 -----
 
-## /FieldSchema
-
-Defines a field an app either needs as input, or gives as output. In addition to the requirements below, the following keys are mutually exclusive:
-
-* `children` & `list`
-* `children` & `dict`
-* `children` & `type`
-* `children` & `placeholder`
-* `children` & `helpText`
-* `children` & `default`
-* `dict` & `list`
-* `dynamic` & `dict`
-* `dynamic` & `choices`
-
-#### Details
-
-* **Type** - `object`
-* [**Source Code**](https://github.com/zapier/zapier-platform/blob/zapier-platform-schema@16.2.0/packages/schema/lib/schemas/FieldSchema.js)
-
-#### Properties
-
-Key | Required | Type | Description
---- | -------- | ---- | -----------
-`key` | **yes** | `string` | A unique machine readable key for this value (IE: "fname").
-`label` | no | `string` | A human readable label for this value (IE: "First Name").
-`helpText` | no | `string` | A human readable description of this value (IE: "The first part of a full name."). You can use Markdown.
-`type` | no | `string` in (`'string'`, `'text'`, `'integer'`, `'number'`, `'boolean'`, `'datetime'`, `'file'`, `'password'`, `'copy'`, `'code'`) | The type of this value. Use `string` for basic text input, `text` for a large, `<textarea>` style box, and `code` for a `<textarea>` with a fixed-width font. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.
-`required` | no | `boolean` | If this value is required or not.
-`placeholder` | no | `string` | An example value that is not saved.
-`default` | no | `string` | A default value that is saved the first time a Zap is created.
-`primary` | no | `boolean` | Use this field as part of the primary key for deduplication. You can set multiple fields as "primary", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`; it will be ignored if set in `inputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).
-`dynamic` | no | [/RefResourceSchema](#refresourceschema) | A reference to a trigger that will power a dynamic dropdown.
-`search` | no | [/RefResourceSchema](#refresourceschema) | A reference to a search that will guide the user to add a search step to populate this field when creating a Zap.
-`choices` | no | [/FieldChoicesSchema](#fieldchoicesschema) | An object of machine keys and human values to populate a static dropdown.
-`list` | no | `boolean` | Acts differently when used in inputFields vs. when used in outputFields. In inputFields: Can a user provide multiples of this field? In outputFields: Does this field return an array of items of type `type`?
-`children` | no | `array`[[/FieldSchema](#fieldschema)] | An array of child fields that define the structure of a sub-object for this field. Usually used for line items.
-`dict` | no | `boolean` | Is this field a key/value input?
-`computed` | no | `boolean` | Is this field automatically populated (and hidden from the user)? Note: Only OAuth and Session Auth support fields with this key.
-`altersDynamicFields` | no | `boolean` | Does the value of this field affect the definitions of other fields in the set?
-`steadyState` | no | `boolean` | Prevents triggering on new output until all values for fields with this property remain unchanged for 2 polls. It can be used to, e.g., not trigger on a new contact until the contact has completed typing their name. NOTE that this only applies to the `outputFields` of polling triggers.
-`inputFormat` | no | `string` | Useful when you expect the input to be part of a longer string. Put "{{input}}" in place of the user's input (IE: "https://{{input}}.yourdomain.com").
-`meta` | no | [/FieldMetaSchema](#fieldmetaschema) | Allows for additional metadata to be stored on the field. Supports simple key-values only (no sub-objects or arrays).
-
-#### Examples
-
-* `{ key: 'abc' }`
-* `{ key: 'abc', choices: { mobile: 'Mobile Phone' } }`
-* `{ key: 'abc', choices: [ 'first', 'second', 'third' ] }`
-* `{ key: 'abc', choices: [ { label: 'Red', sample: '#f00', value: '#f00' } ] }`
-* `{ key: 'abc', children: [ { key: 'abc' } ] }`
-* `{ key: 'abc', type: 'integer', helpText: 'neat' }`
-* ```
-  {
-    key: 'abc',
-    type: 'integer',
-    meta: { internalType: 'numeric', should_call_api: true, display_order: 1 }
-  }
-  ```
-
-#### Anti-Examples
-
-* `{}` - _Missing required key: key_
-* `{ key: 'abc', type: 'loltype' }` - _Invalid value for key: type_
-* `{ key: 'abc', choices: {} }` - _Invalid value for key: choices (cannot be empty)_
-* `{ key: 'abc', choices: [] }` - _Invalid value for key: choices (cannot be empty)_
-* `{ key: 'abc', choices: [ 3 ] }` - _Invalid value for key: choices (if an array, must be of either string or FieldChoiceWithLabelSchema)_
-* `{ key: 'abc', choices: [ { label: 'Red', value: '#f00' } ] }` - _Invalid value for key: choices (if an array of FieldChoiceWithLabelSchema, must provide key `sample`)_
-* `{ key: 'abc', choices: 'mobile' }` - _Invalid value for key: choices (must be either object or array)_
-* `{ key: 'abc', children: [ '$func$2$f$' ] }` - _Invalid value for key: children (must be array of FieldSchema)_
-
------
-
 ## /FlatObjectSchema
 
 An object whose values can only be primitives
@@ -1288,17 +1206,14 @@ Key | Required | Type | Description
 `type` | no | `string` in (`'string'`, `'text'`, `'integer'`, `'number'`, `'boolean'`, `'datetime'`, `'file'`, `'password'`, `'copy'`, `'code'`) | The type of this value. Use `string` for basic text input, `text` for a large, `<textarea>` style box, and `code` for a `<textarea>` with a fixed-width font. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.
 `required` | no | `boolean` | If this value is required or not.
 `placeholder` | no | `string` | An example value that is not saved.
-`default` | no | `string` | A default value that is saved the first time a Zap is created.
-`primary` | no | `boolean` | Use this field as part of the primary key for deduplication. You can set multiple fields as "primary", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`; it will be ignored if set in `inputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).
 `dynamic` | no | [/RefResourceSchema](#refresourceschema) | A reference to a trigger that will power a dynamic dropdown.
 `search` | no | [/RefResourceSchema](#refresourceschema) | A reference to a search that will guide the user to add a search step to populate this field when creating a Zap.
 `choices` | no | [/FieldChoicesSchema](#fieldchoicesschema) | An object of machine keys and human values to populate a static dropdown.
-`list` | no | `boolean` | Acts differently when used in inputFields vs. when used in outputFields. In inputFields: Can a user provide multiples of this field? In outputFields: Does this field return an array of items of type `type`?
-`children` | no | `array`[[/FieldSchema](#fieldschema)] | An array of child fields that define the structure of a sub-object for this field. Usually used for line items.
+`list` | no | `boolean` | Can a user provide multiples of this field?
+`children` | no | `array`[[/InputFieldSchema](#inputfieldschema)] | An array of child fields that define the structure of a sub-object for this field. Usually used for line items.
 `dict` | no | `boolean` | Is this field a key/value input?
-`computed` | no | `boolean` | Is this field automatically populated (and hidden from the user)? Note: Only OAuth and Session Auth support fields with this key.
 `altersDynamicFields` | no | `boolean` | Does the value of this field affect the definitions of other fields in the set?
-`steadyState` | no | `boolean` | Prevents triggering on new output until all values for fields with this property remain unchanged for 2 polls. It can be used to, e.g., not trigger on a new contact until the contact has completed typing their name. NOTE that this only applies to the `outputFields` of polling triggers.
+`default` | no | `string` | A default value that is saved the first time a Zap is created.
 `inputFormat` | no | `string` | Useful when you expect the input to be part of a longer string. Put "{{input}}" in place of the user's input (IE: "https://{{input}}.yourdomain.com").
 `meta` | no | [/FieldMetaSchema](#fieldmetaschema) | Allows for additional metadata to be stored on the field. Supports simple key-values only (no sub-objects or arrays).
 
@@ -1423,39 +1338,22 @@ Key | Required | Type | Description
 --- | -------- | ---- | -----------
 `key` | **yes** | `string` | A unique machine readable key for this value (IE: "fname").
 `label` | no | `string` | A human readable label for this value (IE: "First Name").
-`helpText` | no | `string` | A human readable description of this value (IE: "The first part of a full name."). You can use Markdown.
-`type` | no | `string` in (`'string'`, `'text'`, `'integer'`, `'number'`, `'boolean'`, `'datetime'`, `'file'`, `'password'`, `'copy'`, `'code'`) | The type of this value. Use `string` for basic text input, `text` for a large, `<textarea>` style box, and `code` for a `<textarea>` with a fixed-width font. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.
+`type` | no | `string` in (`'string'`, `'number'`, `'boolean'`, `'integer'`, `'datetime'`, `'file'`, `'password'`) | The type of this value. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.
 `required` | no | `boolean` | If this value is required or not.
 `placeholder` | no | `string` | An example value that is not saved.
-`default` | no | `string` | A default value that is saved the first time a Zap is created.
-`primary` | no | `boolean` | Use this field as part of the primary key for deduplication. You can set multiple fields as "primary", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`; it will be ignored if set in `inputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).
+`primary` | no | `boolean` | Use this field as part of the primary key for deduplication. You can set multiple fields as "primary", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).
 `dynamic` | no | [/RefResourceSchema](#refresourceschema) | A reference to a trigger that will power a dynamic dropdown.
 `search` | no | [/RefResourceSchema](#refresourceschema) | A reference to a search that will guide the user to add a search step to populate this field when creating a Zap.
-`choices` | no | [/FieldChoicesSchema](#fieldchoicesschema) | An object of machine keys and human values to populate a static dropdown.
-`list` | no | `boolean` | Acts differently when used in inputFields vs. when used in outputFields. In inputFields: Can a user provide multiples of this field? In outputFields: Does this field return an array of items of type `type`?
-`children` | no | `array`[[/FieldSchema](#fieldschema)] | An array of child fields that define the structure of a sub-object for this field. Usually used for line items.
-`dict` | no | `boolean` | Is this field a key/value input?
-`computed` | no | `boolean` | Is this field automatically populated (and hidden from the user)? Note: Only OAuth and Session Auth support fields with this key.
-`altersDynamicFields` | no | `boolean` | Does the value of this field affect the definitions of other fields in the set?
-`steadyState` | no | `boolean` | Prevents triggering on new output until all values for fields with this property remain unchanged for 2 polls. It can be used to, e.g., not trigger on a new contact until the contact has completed typing their name. NOTE that this only applies to the `outputFields` of polling triggers.
-`inputFormat` | no | `string` | Useful when you expect the input to be part of a longer string. Put "{{input}}" in place of the user's input (IE: "https://{{input}}.yourdomain.com").
-`meta` | no | [/FieldMetaSchema](#fieldmetaschema) | Allows for additional metadata to be stored on the field. Supports simple key-values only (no sub-objects or arrays).
+`list` | no | `boolean` | Can a user provide multiples of this field?
+`children` | no | `array`[[/OutputFieldSchema](#outputfieldschema)] | An array of child fields that define the structure of a sub-object for this field. Usually used for line items.
+`dict` | no | `boolean` | Is this field a key/value output?
 
 #### Examples
 
 * `{ key: 'abc' }`
-* `{ key: 'abc', choices: { mobile: 'Mobile Phone' } }`
-* `{ key: 'abc', choices: [ 'first', 'second', 'third' ] }`
-* `{ key: 'abc', choices: [ { label: 'Red', sample: '#f00', value: '#f00' } ] }`
 * `{ key: 'abc', children: [ { key: 'abc' } ] }`
-* `{ key: 'abc', type: 'integer', helpText: 'neat' }`
-* ```
-  {
-    key: 'abc',
-    type: 'integer',
-    meta: { internalType: 'numeric', should_call_api: true, display_order: 1 }
-  }
-  ```
+* `{ key: 'abc', type: 'integer', placeholder: 'neat' }`
+* `{ key: 'abc', type: 'integer' }`
 
 #### Anti-Examples
 
diff --git a/packages/schema/exported-schema.json b/packages/schema/exported-schema.json
index c28873d2b..ecc20bc0b 100644
--- a/packages/schema/exported-schema.json
+++ b/packages/schema/exported-schema.json
@@ -173,199 +173,21 @@
         }
       ]
     },
-    "FieldChoiceWithLabelSchema": {
-      "id": "/FieldChoiceWithLabelSchema",
-      "description": "An object describing a labeled choice in a static dropdown. Useful if the value a user picks isn't exactly what the zap uses. For instance, when they click on a nickname, but the zap uses the user's full name ([image](https://cdn.zapier.com/storage/photos/8ed01ac5df3a511ce93ed2dc43c7fbbc.png)).",
-      "type": "object",
-      "required": ["value", "sample", "label"],
-      "properties": {
-        "value": {
-          "description": "The actual value that is sent into the Zap. This is displayed as light grey text in the editor. Should match sample exactly.",
-          "type": "string",
-          "minLength": 1
-        },
-        "sample": {
-          "description": "A legacy field that is no longer used by the editor, but it is still required for now and should match the value.",
-          "type": "string",
-          "minLength": 1
-        },
-        "label": {
-          "description": "A human readable label for this value.",
-          "type": "string",
-          "minLength": 1
-        }
-      }
-    },
-    "RefResourceSchema": {
-      "id": "/RefResourceSchema",
-      "description": "Reference a resource by key and the data it returns. In the format of: `{resource_key}.{foreign_key}(.{human_label_key})`.",
-      "type": "string",
-      "pattern": "^[a-zA-Z0-9_]+\\.[a-zA-Z0-9_\\s\\[\\]]+(\\.[a-zA-Z0-9_\\s\\[\\]]+(,[a-zA-Z0-9_\\s\\[\\]]+)*)?$"
-    },
-    "FieldChoicesSchema": {
-      "id": "/FieldChoicesSchema",
-      "description": "A static dropdown of options. Which you use depends on your order and label requirements:\n\nNeed a Label? | Does Order Matter? | Type to Use\n---|---|---\nYes | No | Object of value -> label\nNo | Yes | Array of Strings\nYes | Yes | Array of [FieldChoiceWithLabel](#fieldchoicewithlabelschema)",
-      "oneOf": [
-        {
-          "type": "object",
-          "minProperties": 1
-        },
-        {
-          "type": "array",
-          "minItems": 1,
-          "items": {
-            "oneOf": [
-              {
-                "type": "string"
-              },
-              {
-                "$ref": "/FieldChoiceWithLabelSchema"
-              }
-            ]
-          }
-        }
-      ]
-    },
-    "FieldMetaSchema": {
-      "id": "/FieldMetaSchema",
-      "type": "object",
-      "description": "Allows for additional metadata to be stored on the field.",
-      "patternProperties": {
-        "[^\\s]+": {
-          "description": "Only string, integer or boolean values are allowed.",
-          "anyOf": [
-            {
-              "type": "string"
-            },
-            {
-              "type": "integer"
-            },
-            {
-              "type": "boolean"
-            }
-          ]
-        }
-      }
-    },
-    "FieldSchema": {
-      "id": "/FieldSchema",
-      "description": "Defines a field an app either needs as input, or gives as output. In addition to the requirements below, the following keys are mutually exclusive:\n\n* `children` & `list`\n* `children` & `dict`\n* `children` & `type`\n* `children` & `placeholder`\n* `children` & `helpText`\n* `children` & `default`\n* `dict` & `list`\n* `dynamic` & `dict`\n* `dynamic` & `choices`",
-      "type": "object",
-      "required": ["key"],
-      "properties": {
-        "key": {
-          "description": "A unique machine readable key for this value (IE: \"fname\").",
-          "type": "string",
-          "minLength": 1
-        },
-        "label": {
-          "description": "A human readable label for this value (IE: \"First Name\").",
-          "type": "string",
-          "minLength": 1
-        },
-        "helpText": {
-          "description": "A human readable description of this value (IE: \"The first part of a full name.\"). You can use Markdown.",
-          "type": "string",
-          "minLength": 1,
-          "maxLength": 1000
-        },
-        "type": {
-          "description": "The type of this value. Use `string` for basic text input, `text` for a large, `<textarea>` style box, and `code` for a `<textarea>` with a fixed-width font. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.",
-          "type": "string",
-          "enum": [
-            "string",
-            "text",
-            "integer",
-            "number",
-            "boolean",
-            "datetime",
-            "file",
-            "password",
-            "copy",
-            "code"
-          ]
-        },
-        "required": {
-          "description": "If this value is required or not.",
-          "type": "boolean"
-        },
-        "placeholder": {
-          "description": "An example value that is not saved.",
-          "type": "string",
-          "minLength": 1
-        },
-        "default": {
-          "description": "A default value that is saved the first time a Zap is created.",
-          "type": "string",
-          "minLength": 1
-        },
-        "primary": {
-          "description": "Use this field as part of the primary key for deduplication. You can set multiple fields as \"primary\", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`; it will be ignored if set in `inputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).",
-          "type": "boolean"
-        },
-        "dynamic": {
-          "description": "A reference to a trigger that will power a dynamic dropdown.",
-          "$ref": "/RefResourceSchema"
-        },
-        "search": {
-          "description": "A reference to a search that will guide the user to add a search step to populate this field when creating a Zap.",
-          "$ref": "/RefResourceSchema"
-        },
-        "choices": {
-          "description": "An object of machine keys and human values to populate a static dropdown.",
-          "$ref": "/FieldChoicesSchema"
-        },
-        "list": {
-          "description": "Acts differently when used in inputFields vs. when used in outputFields. In inputFields: Can a user provide multiples of this field? In outputFields: Does this field return an array of items of type `type`?",
-          "type": "boolean"
-        },
-        "children": {
-          "type": "array",
-          "items": {
-            "$ref": "/FieldSchema"
-          },
-          "description": "An array of child fields that define the structure of a sub-object for this field. Usually used for line items.",
-          "minItems": 1
-        },
-        "dict": {
-          "description": "Is this field a key/value input?",
-          "type": "boolean"
-        },
-        "computed": {
-          "description": "Is this field automatically populated (and hidden from the user)? Note: Only OAuth and Session Auth support fields with this key.",
-          "type": "boolean"
-        },
-        "altersDynamicFields": {
-          "description": "Does the value of this field affect the definitions of other fields in the set?",
-          "type": "boolean"
-        },
-        "steadyState": {
-          "description": "Prevents triggering on new output until all values for fields with this property remain unchanged for 2 polls. It can be used to, e.g., not trigger on a new contact until the contact has completed typing their name. NOTE that this only applies to the `outputFields` of polling triggers.",
-          "type": "boolean"
-        },
-        "inputFormat": {
-          "description": "Useful when you expect the input to be part of a longer string. Put \"{{input}}\" in place of the user's input (IE: \"https://{{input}}.yourdomain.com\").",
-          "type": "string",
-          "pattern": "^.*{{input}}.*$"
-        },
-        "meta": {
-          "description": "Allows for additional metadata to be stored on the field. Supports simple key-values only (no sub-objects or arrays).",
-          "$ref": "/FieldMetaSchema"
-        }
-      },
-      "additionalProperties": false
-    },
     "AuthFieldSchema": {
       "id": "/AuthFieldSchema",
       "description": "Field schema specialized for authentication fields.",
-      "type": "object",
       "required": ["key"],
+      "type": "object",
       "properties": {
         "key": {
           "description": "A unique machine readable key for this value (IE: \"fname\").",
           "type": "string",
           "minLength": 1
         },
+        "isSecret": {
+          "description": "Indicates if this authentication field is safe (not secret).",
+          "type": "boolean"
+        },
         "label": {
           "description": "A human readable label for this value (IE: \"First Name\").",
           "type": "string",
@@ -378,23 +200,20 @@
           "maxLength": 1000
         },
         "type": {
-          "description": "The type of this value. Use `string` for basic text input, `text` for a large, `<textarea>` style box, and `code` for a `<textarea>` with a fixed-width font. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.",
+          "description": "The type of this value. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.",
           "type": "string",
           "enum": [
             "string",
-            "text",
-            "integer",
             "number",
             "boolean",
             "datetime",
-            "file",
             "password",
             "copy",
             "code"
           ]
         },
         "required": {
-          "description": "If this value is required or not.",
+          "description": "If this value is required or not. This defaults to True.",
           "type": "boolean"
         },
         "placeholder": {
@@ -402,35 +221,14 @@
           "type": "string",
           "minLength": 1
         },
-        "default": {
-          "description": "A default value that is saved the first time a Zap is created.",
-          "type": "string",
-          "minLength": 1
-        },
-        "primary": {
-          "description": "Use this field as part of the primary key for deduplication. You can set multiple fields as \"primary\", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`; it will be ignored if set in `inputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).",
-          "type": "boolean"
-        },
-        "dynamic": {
-          "description": "A reference to a trigger that will power a dynamic dropdown.",
-          "$ref": "/RefResourceSchema"
-        },
-        "search": {
-          "description": "A reference to a search that will guide the user to add a search step to populate this field when creating a Zap.",
-          "$ref": "/RefResourceSchema"
-        },
-        "choices": {
-          "description": "An object of machine keys and human values to populate a static dropdown.",
-          "$ref": "/FieldChoicesSchema"
-        },
         "list": {
-          "description": "Acts differently when used in inputFields vs. when used in outputFields. In inputFields: Can a user provide multiples of this field? In outputFields: Does this field return an array of items of type `type`?",
+          "description": "Can a user provide multiples of this field?",
           "type": "boolean"
         },
         "children": {
           "type": "array",
           "items": {
-            "$ref": "/FieldSchema"
+            "$ref": "/AuthFieldSchema"
           },
           "description": "An array of child fields that define the structure of a sub-object for this field. Usually used for line items.",
           "minItems": 1
@@ -439,33 +237,12 @@
           "description": "Is this field a key/value input?",
           "type": "boolean"
         },
-        "computed": {
-          "description": "Is this field automatically populated (and hidden from the user)? Note: Only OAuth and Session Auth support fields with this key.",
-          "type": "boolean"
-        },
-        "altersDynamicFields": {
-          "description": "Does the value of this field affect the definitions of other fields in the set?",
-          "type": "boolean"
-        },
-        "steadyState": {
-          "description": "Prevents triggering on new output until all values for fields with this property remain unchanged for 2 polls. It can be used to, e.g., not trigger on a new contact until the contact has completed typing their name. NOTE that this only applies to the `outputFields` of polling triggers.",
-          "type": "boolean"
-        },
         "inputFormat": {
           "description": "Useful when you expect the input to be part of a longer string. Put \"{{input}}\" in place of the user's input (IE: \"https://{{input}}.yourdomain.com\").",
           "type": "string",
           "pattern": "^.*{{input}}.*$"
-        },
-        "meta": {
-          "description": "Allows for additional metadata to be stored on the field. Supports simple key-values only (no sub-objects or arrays).",
-          "$ref": "/FieldMetaSchema"
-        },
-        "isSafe": {
-          "description": "Indicates if this authentication field is safe (not secret).",
-          "type": "boolean"
         }
-      },
-      "additionalProperties": false
+      }
     },
     "RequestSchema": {
       "id": "/RequestSchema",
@@ -743,9 +520,83 @@
       },
       "additionalProperties": false
     },
+    "FieldChoiceWithLabelSchema": {
+      "id": "/FieldChoiceWithLabelSchema",
+      "description": "An object describing a labeled choice in a static dropdown. Useful if the value a user picks isn't exactly what the zap uses. For instance, when they click on a nickname, but the zap uses the user's full name ([image](https://cdn.zapier.com/storage/photos/8ed01ac5df3a511ce93ed2dc43c7fbbc.png)).",
+      "type": "object",
+      "required": ["value", "sample", "label"],
+      "properties": {
+        "value": {
+          "description": "The actual value that is sent into the Zap. This is displayed as light grey text in the editor. Should match sample exactly.",
+          "type": "string",
+          "minLength": 1
+        },
+        "sample": {
+          "description": "A legacy field that is no longer used by the editor, but it is still required for now and should match the value.",
+          "type": "string",
+          "minLength": 1
+        },
+        "label": {
+          "description": "A human readable label for this value.",
+          "type": "string",
+          "minLength": 1
+        }
+      }
+    },
+    "RefResourceSchema": {
+      "id": "/RefResourceSchema",
+      "description": "Reference a resource by key and the data it returns. In the format of: `{resource_key}.{foreign_key}(.{human_label_key})`.",
+      "type": "string",
+      "pattern": "^[a-zA-Z0-9_]+\\.[a-zA-Z0-9_\\s\\[\\]]+(\\.[a-zA-Z0-9_\\s\\[\\]]+(,[a-zA-Z0-9_\\s\\[\\]]+)*)?$"
+    },
+    "FieldChoicesSchema": {
+      "id": "/FieldChoicesSchema",
+      "description": "A static dropdown of options. Which you use depends on your order and label requirements:\n\nNeed a Label? | Does Order Matter? | Type to Use\n---|---|---\nYes | No | Object of value -> label\nNo | Yes | Array of Strings\nYes | Yes | Array of [FieldChoiceWithLabel](#fieldchoicewithlabelschema)",
+      "oneOf": [
+        {
+          "type": "object",
+          "minProperties": 1
+        },
+        {
+          "type": "array",
+          "minItems": 1,
+          "items": {
+            "oneOf": [
+              {
+                "type": "string"
+              },
+              {
+                "$ref": "/FieldChoiceWithLabelSchema"
+              }
+            ]
+          }
+        }
+      ]
+    },
+    "FieldMetaSchema": {
+      "id": "/FieldMetaSchema",
+      "type": "object",
+      "description": "Allows for additional metadata to be stored on the field.",
+      "patternProperties": {
+        "[^\\s]+": {
+          "description": "Only string, integer or boolean values are allowed.",
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "integer"
+            },
+            {
+              "type": "boolean"
+            }
+          ]
+        }
+      }
+    },
     "InputFieldSchema": {
-      "id": "/InputFieldSchema",
       "description": "Field schema specialized for input fields.",
+      "id": "/InputFieldSchema",
       "type": "object",
       "required": ["key"],
       "properties": {
@@ -790,15 +641,6 @@
           "type": "string",
           "minLength": 1
         },
-        "default": {
-          "description": "A default value that is saved the first time a Zap is created.",
-          "type": "string",
-          "minLength": 1
-        },
-        "primary": {
-          "description": "Use this field as part of the primary key for deduplication. You can set multiple fields as \"primary\", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`; it will be ignored if set in `inputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).",
-          "type": "boolean"
-        },
         "dynamic": {
           "description": "A reference to a trigger that will power a dynamic dropdown.",
           "$ref": "/RefResourceSchema"
@@ -812,13 +654,13 @@
           "$ref": "/FieldChoicesSchema"
         },
         "list": {
-          "description": "Acts differently when used in inputFields vs. when used in outputFields. In inputFields: Can a user provide multiples of this field? In outputFields: Does this field return an array of items of type `type`?",
+          "description": "Can a user provide multiples of this field?",
           "type": "boolean"
         },
         "children": {
           "type": "array",
           "items": {
-            "$ref": "/FieldSchema"
+            "$ref": "/InputFieldSchema"
           },
           "description": "An array of child fields that define the structure of a sub-object for this field. Usually used for line items.",
           "minItems": 1
@@ -827,17 +669,14 @@
           "description": "Is this field a key/value input?",
           "type": "boolean"
         },
-        "computed": {
-          "description": "Is this field automatically populated (and hidden from the user)? Note: Only OAuth and Session Auth support fields with this key.",
-          "type": "boolean"
-        },
         "altersDynamicFields": {
           "description": "Does the value of this field affect the definitions of other fields in the set?",
           "type": "boolean"
         },
-        "steadyState": {
-          "description": "Prevents triggering on new output until all values for fields with this property remain unchanged for 2 polls. It can be used to, e.g., not trigger on a new contact until the contact has completed typing their name. NOTE that this only applies to the `outputFields` of polling triggers.",
-          "type": "boolean"
+        "default": {
+          "description": "A default value that is saved the first time a Zap is created.",
+          "type": "string",
+          "minLength": 1
         },
         "inputFormat": {
           "description": "Useful when you expect the input to be part of a longer string. Put \"{{input}}\" in place of the user's input (IE: \"https://{{input}}.yourdomain.com\").",
@@ -852,8 +691,8 @@
       "additionalProperties": false
     },
     "OutputFieldSchema": {
-      "id": "/OutputFieldSchema",
       "description": "Field schema specialized for output fields.",
+      "id": "/OutputFieldSchema",
       "type": "object",
       "required": ["key"],
       "properties": {
@@ -867,26 +706,17 @@
           "type": "string",
           "minLength": 1
         },
-        "helpText": {
-          "description": "A human readable description of this value (IE: \"The first part of a full name.\"). You can use Markdown.",
-          "type": "string",
-          "minLength": 1,
-          "maxLength": 1000
-        },
         "type": {
-          "description": "The type of this value. Use `string` for basic text input, `text` for a large, `<textarea>` style box, and `code` for a `<textarea>` with a fixed-width font. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.",
+          "description": "The type of this value. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.",
           "type": "string",
           "enum": [
             "string",
-            "text",
-            "integer",
             "number",
             "boolean",
+            "integer",
             "datetime",
             "file",
-            "password",
-            "copy",
-            "code"
+            "password"
           ]
         },
         "required": {
@@ -898,13 +728,8 @@
           "type": "string",
           "minLength": 1
         },
-        "default": {
-          "description": "A default value that is saved the first time a Zap is created.",
-          "type": "string",
-          "minLength": 1
-        },
         "primary": {
-          "description": "Use this field as part of the primary key for deduplication. You can set multiple fields as \"primary\", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`; it will be ignored if set in `inputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).",
+          "description": "Use this field as part of the primary key for deduplication. You can set multiple fields as \"primary\", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).",
           "type": "boolean"
         },
         "dynamic": {
@@ -915,46 +740,21 @@
           "description": "A reference to a search that will guide the user to add a search step to populate this field when creating a Zap.",
           "$ref": "/RefResourceSchema"
         },
-        "choices": {
-          "description": "An object of machine keys and human values to populate a static dropdown.",
-          "$ref": "/FieldChoicesSchema"
-        },
         "list": {
-          "description": "Acts differently when used in inputFields vs. when used in outputFields. In inputFields: Can a user provide multiples of this field? In outputFields: Does this field return an array of items of type `type`?",
+          "description": "Can a user provide multiples of this field?",
           "type": "boolean"
         },
         "children": {
           "type": "array",
           "items": {
-            "$ref": "/FieldSchema"
+            "$ref": "/OutputFieldSchema"
           },
           "description": "An array of child fields that define the structure of a sub-object for this field. Usually used for line items.",
           "minItems": 1
         },
         "dict": {
-          "description": "Is this field a key/value input?",
-          "type": "boolean"
-        },
-        "computed": {
-          "description": "Is this field automatically populated (and hidden from the user)? Note: Only OAuth and Session Auth support fields with this key.",
-          "type": "boolean"
-        },
-        "altersDynamicFields": {
-          "description": "Does the value of this field affect the definitions of other fields in the set?",
+          "description": "Is this field a key/value output?",
           "type": "boolean"
-        },
-        "steadyState": {
-          "description": "Prevents triggering on new output until all values for fields with this property remain unchanged for 2 polls. It can be used to, e.g., not trigger on a new contact until the contact has completed typing their name. NOTE that this only applies to the `outputFields` of polling triggers.",
-          "type": "boolean"
-        },
-        "inputFormat": {
-          "description": "Useful when you expect the input to be part of a longer string. Put \"{{input}}\" in place of the user's input (IE: \"https://{{input}}.yourdomain.com\").",
-          "type": "string",
-          "pattern": "^.*{{input}}.*$"
-        },
-        "meta": {
-          "description": "Allows for additional metadata to be stored on the field. Supports simple key-values only (no sub-objects or arrays).",
-          "$ref": "/FieldMetaSchema"
         }
       },
       "additionalProperties": false
diff --git a/packages/schema/lib/functional-constraints/AuthFieldisSafe.js b/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
index 21d5b7bf3..45d0df8f6 100644
--- a/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
+++ b/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
@@ -22,13 +22,20 @@ const FORBIDDEN_KEYS = [
   'token',
 ];
 
+const isSensitiveKey = (key = '') =>
+  FORBIDDEN_KEYS.some((forbidden) =>
+    key.toLowerCase().includes(forbidden.toLowerCase()),
+  );
+
 const checkAuthField = (field) => {
   const errors = [];
 
-  if (FORBIDDEN_KEYS.includes(field.key) && field.isSafe === true) {
+  // if the field key contains any forbidden substring (case-insensitive),
+  // AND 'isSecret' is true, throw a validation error
+  if (isSensitiveKey(field.key) && field.isSecret === true) {
     errors.push(
       new jsonschema.ValidationError(
-        `cannot set isSafe as true for the sensitive key "${field.key}".`,
+        `cannot set isSecret as true for the sensitive key "${field.key}".`,
         field,
         '/AuthFieldSchema',
         'instance.field',
@@ -46,7 +53,6 @@ module.exports = (definition, mainSchema) => {
   // Done to validate anti-examples declaratively defined in the schema
   if ([AUTH_FIELD_ID, AUTH_FIELDS_ID].includes(mainSchema.id)) {
     const definitions = Array.isArray(definition) ? definition : [definition];
-
     definitions.forEach((field, index) => {
       checkAuthField(field).forEach((err) => {
         err.property = `instance[${index}]`;
@@ -60,7 +66,6 @@ module.exports = (definition, mainSchema) => {
   if (!definition.authentication || !definition.authentication.fields) {
     return errors;
   }
-
   definition.authentication.fields.forEach((field, index) => {
     checkAuthField(field).forEach((err) => {
       err.property = `instance.authentication.fields[${index}]`;
diff --git a/packages/schema/lib/schemas/AuthFieldSchema.js b/packages/schema/lib/schemas/AuthFieldSchema.js
index 8a0715ab7..d7978187d 100644
--- a/packages/schema/lib/schemas/AuthFieldSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldSchema.js
@@ -1,74 +1,136 @@
 'use strict';
 
 const makeSchema = require('../utils/makeSchema');
-const FieldSchema = require('./FieldSchema');
 
-module.exports = makeSchema(
-  {
-    ...FieldSchema.schema,
-    id: '/AuthFieldSchema',
-    description: 'Field schema specialized for authentication fields.',
-    properties: {
-      ...FieldSchema.schema.properties,
-      isSafe: {
-        description:
-          'Indicates if this authentication field is safe (not secret).',
-        type: 'boolean',
-      },
+module.exports = makeSchema({
+  id: '/AuthFieldSchema',
+  description: 'Field schema specialized for authentication fields.',
+  required: ['key'],
+  type: 'object',
+  properties: {
+    key: {
+      description:
+        'A unique machine readable key for this value (IE: "fname").',
+      type: 'string',
+      minLength: 1,
+    },
+    isSecret: {
+      description:
+        'Indicates if this authentication field is safe (not secret).',
+      type: 'boolean',
+    },
+    label: {
+      description: 'A human readable label for this value (IE: "First Name").',
+      type: 'string',
+      minLength: 1,
+    },
+    helpText: {
+      description:
+        'A human readable description of this value (IE: "The first part of a full name."). You can use Markdown.',
+      type: 'string',
+      minLength: 1,
+      maxLength: 1000,
+    },
+    type: {
+      description:
+        'The type of this value. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.',
+      type: 'string',
+      // string == unicode
+      // text == a long textarea string
+      // integer == int
+      // number == float
+      enum: [
+        'string',
+        'number',
+        'boolean',
+        'datetime',
+        'password',
+        'copy',
+        'code',
+      ],
+    },
+    required: {
+      description: 'If this value is required or not. This defaults to True.',
+      type: 'boolean',
+    },
+    placeholder: {
+      description: 'An example value that is not saved.',
+      type: 'string',
+      minLength: 1,
+    },
+    list: {
+      description: 'Can a user provide multiples of this field?',
+      type: 'boolean',
     },
+    children: {
+      type: 'array',
+      items: { $ref: '/AuthFieldSchema' },
+      description:
+        'An array of child fields that define the structure of a sub-object for this field. Usually used for line items.',
+      minItems: 1,
+    },
+    dict: {
+      description: 'Is this field a key/value input?',
+      type: 'boolean',
+    },
+    inputFormat: {
+      description:
+        'Useful when you expect the input to be part of a longer string. Put "{{input}}" in place of the user\'s input (IE: "https://{{input}}.yourdomain.com").',
+      type: 'string',
+      // TODO: Check if it contains one and ONLY ONE '{{input}}'
+      pattern: '^.*{{input}}.*$',
+    },
+  },
 
-    // Add examples and anti-examples specifically for basic & custom auth
-    examples: [
-      // Basic Auth - email & password
-      {
-        key: 'email',
-        type: 'string',
-        isSafe: true,
-        required: true,
-      },
-      {
+  // Add examples and anti-examples specifically for basic & custom auth
+  examples: [
+    // Basic Auth - email & password
+    {
+      key: 'email',
+      type: 'string',
+      isSecret: true,
+      required: true,
+    },
+    {
+      key: 'password',
+      type: 'password',
+      isSecret: false,
+      required: true,
+    },
+
+    // Custom Auth - api key
+    {
+      key: 'api_key',
+      type: 'string',
+      isSecret: false,
+      required: true,
+    },
+  ],
+
+  antiExamples: [
+    {
+      example: {
         key: 'password',
         type: 'password',
-        isSafe: false,
+        isSecret: true,
         required: true,
       },
-
-      // Custom Auth - api key
-      {
+      reason: 'A "password" field cannot have isSafe = true.',
+    },
+    {
+      example: {
         key: 'api_key',
-        type: 'string',
-        isSafe: false,
-        required: true,
+        isSecret: true,
       },
-    ],
-
-    antiExamples: [
-      {
-        example: {
-          key: 'password',
-          type: 'password',
-          isSafe: true,
-          required: true,
-        },
-        reason: 'A "password" field cannot have isSafe = true.',
-      },
-      {
-        example: {
-          key: 'api_key',
-          isSafe: true,
-        },
-        reason:
-          '"api_key" is a sensitive field and cannot have isSafe set as true.',
-      },
-      {
-        example: {
-          type: 'string',
-          isSafe: false,
-        },
-        reason: 'Missing required key: key',
+      reason:
+        '"api_key" is a sensitive field and cannot have isSafe set as true.',
+    },
+    {
+      example: {
+        type: 'string',
+        isSecret: false,
       },
-    ],
-  },
-
-  [FieldSchema],
-);
+      reason: 'Missing required key: key',
+    },
+  ],
+});
diff --git a/packages/schema/lib/schemas/AuthFieldsSchema.js b/packages/schema/lib/schemas/AuthFieldsSchema.js
index 0d525fa26..bec4f5fb3 100644
--- a/packages/schema/lib/schemas/AuthFieldsSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldsSchema.js
@@ -16,18 +16,18 @@ module.exports = makeSchema(
     examples: [
       // 1) Basic Auth: username (safe) + password (not safe)
       [
-        { key: 'username', type: 'string', isSafe: true, required: true },
-        { key: 'password', type: 'password', isSafe: false, required: true },
+        { key: 'username', type: 'string', isSecret: true, required: true },
+        { key: 'password', type: 'password', isSecret: false, required: true },
       ],
 
       // 2) Just a single auth field for custom usage (e.g., api_key)
-      [{ key: 'api_key', type: 'string', isSafe: false, required: true }],
+      [{ key: 'api_key', type: 'string', isSecret: false, required: true }],
 
       // 3) Mix of fields for extended usage
       [
-        { key: 'email', type: 'string', isSafe: true },
+        { key: 'email', type: 'string', isSecret: true },
         { key: 'password', type: 'password', required: true },
-        { key: 'mfa_token', type: 'string', isSafe: false },
+        { key: 'mfa_token', type: 'string', isSecret: false },
       ],
     ],
 
@@ -38,22 +38,23 @@ module.exports = makeSchema(
         reason: 'Must be an array (currently an object).',
       },
       {
-        example: [{ key: 'password', isSafe: true }],
+        example: [{ key: 'password', isSecret: true }],
         reason:
-          '"password" is a sensitive field and cannot have isSafe set as true.',
+          '"password" is a sensitive field and cannot have isSecret set as true.',
       },
       {
-        example: [{ key: 'api_key', isSafe: true }],
+        example: [{ key: 'api_key', isSecret: true }],
         reason:
-          '"api_key" is a sensitive field and cannot have isSafe set as true.',
+          '"api_key" is a sensitive field and cannot have isSecret set as true.',
       },
       {
-        example: [{ isSafe: false }],
+        example: [{ isSecret: false }],
         reason: 'Missing required "key" property.',
       },
       {
-        example: [{ key: 'username', type: 'string', isSafe: true }, 12345],
-        reason: 'Array item 12345 is not an object (must match AuthFieldSchema).',
+        example: [{ key: 'username', type: 'string', isSecret: true }, 12345],
+        reason:
+          'Array item 12345 is not an object (must match AuthFieldSchema).',
       },
     ],
   },
diff --git a/packages/schema/lib/schemas/InputFieldSchema.js b/packages/schema/lib/schemas/InputFieldSchema.js
index 7989032bf..66d4fb949 100644
--- a/packages/schema/lib/schemas/InputFieldSchema.js
+++ b/packages/schema/lib/schemas/InputFieldSchema.js
@@ -1,13 +1,181 @@
 'use strict';
 
 const makeSchema = require('../utils/makeSchema');
-const FieldSchema = require('./FieldSchema');
+const RefResourceSchema = require('./RefResourceSchema');
+const FieldChoicesSchema = require('./FieldChoicesSchema');
+const FieldMetaSchema = require('./FieldMetaSchema');
 
 module.exports = makeSchema(
   {
-    ...FieldSchema.schema,
     description: 'Field schema specialized for input fields.',
     id: '/InputFieldSchema',
+
+    type: 'object',
+    required: ['key'],
+    properties: {
+      key: {
+        description:
+          'A unique machine readable key for this value (IE: "fname").',
+        type: 'string',
+        minLength: 1,
+      },
+      label: {
+        description:
+          'A human readable label for this value (IE: "First Name").',
+        type: 'string',
+        minLength: 1,
+      },
+      helpText: {
+        description:
+          'A human readable description of this value (IE: "The first part of a full name."). You can use Markdown.',
+        type: 'string',
+        minLength: 1,
+        maxLength: 1000,
+      },
+      type: {
+        description:
+          'The type of this value. Use `string` for basic text input, `text` for a large, `<textarea>` style box, and `code` for a `<textarea>` with a fixed-width font. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.',
+        type: 'string',
+        // string == unicode
+        // text == a long textarea string
+        // integer == int
+        // number == float
+        enum: [
+          'string',
+          'text',
+          'integer',
+          'number',
+          'boolean',
+          'datetime',
+          'file',
+          'password',
+          'copy',
+          'code',
+        ],
+      },
+      required: {
+        description: 'If this value is required or not.',
+        type: 'boolean',
+      },
+      placeholder: {
+        description: 'An example value that is not saved.',
+        type: 'string',
+        minLength: 1,
+      },
+      dynamic: {
+        description:
+          'A reference to a trigger that will power a dynamic dropdown.',
+        $ref: RefResourceSchema.id,
+      },
+      search: {
+        description:
+          'A reference to a search that will guide the user to add a search step to populate this field when creating a Zap.',
+        $ref: RefResourceSchema.id,
+      },
+      choices: {
+        description:
+          'An object of machine keys and human values to populate a static dropdown.',
+        $ref: FieldChoicesSchema.id,
+      },
+      list: {
+        description: 'Can a user provide multiples of this field?',
+        type: 'boolean',
+      },
+      children: {
+        type: 'array',
+        items: { $ref: '/InputFieldSchema' },
+        description:
+          'An array of child fields that define the structure of a sub-object for this field. Usually used for line items.',
+        minItems: 1,
+      },
+      dict: {
+        description: 'Is this field a key/value input?',
+        type: 'boolean',
+      },
+      altersDynamicFields: {
+        description:
+          'Does the value of this field affect the definitions of other fields in the set?',
+        type: 'boolean',
+      },
+      default: {
+        description:
+          'A default value that is saved the first time a Zap is created.',
+        type: 'string',
+        minLength: 1,
+      },
+      inputFormat: {
+        description:
+          'Useful when you expect the input to be part of a longer string. Put "{{input}}" in place of the user\'s input (IE: "https://{{input}}.yourdomain.com").',
+        type: 'string',
+        // TODO: Check if it contains one and ONLY ONE '{{input}}'
+        pattern: '^.*{{input}}.*$',
+      },
+      meta: {
+        description:
+          'Allows for additional metadata to be stored on the field. Supports simple key-values only (no sub-objects or arrays).',
+        $ref: FieldMetaSchema.id,
+      },
+    },
+    examples: [
+      { key: 'abc' },
+      { key: 'abc', choices: { mobile: 'Mobile Phone' } },
+      { key: 'abc', choices: ['first', 'second', 'third'] },
+      {
+        key: 'abc',
+        choices: [{ label: 'Red', sample: '#f00', value: '#f00' }],
+      },
+      { key: 'abc', children: [{ key: 'abc' }] },
+      { key: 'abc', type: 'integer', helpText: 'neat' },
+      {
+        key: 'abc',
+        type: 'integer',
+        meta: {
+          internalType: 'numeric',
+          should_call_api: true,
+          display_order: 1,
+        },
+      },
+    ],
+    antiExamples: [
+      {
+        example: {},
+        reason: 'Missing required key: key',
+      },
+      {
+        example: { key: 'abc', type: 'loltype' },
+        reason: 'Invalid value for key: type',
+      },
+      {
+        example: { key: 'abc', choices: {} },
+        reason: 'Invalid value for key: choices (cannot be empty)',
+      },
+      {
+        example: { key: 'abc', choices: [] },
+        reason: 'Invalid value for key: choices (cannot be empty)',
+      },
+      {
+        example: { key: 'abc', choices: [3] },
+        reason:
+          'Invalid value for key: choices (if an array, must be of either string or FieldChoiceWithLabelSchema)',
+      },
+      {
+        example: { key: 'abc', choices: [{ label: 'Red', value: '#f00' }] },
+        reason:
+          'Invalid value for key: choices (if an array of FieldChoiceWithLabelSchema, must provide key `sample`)',
+      },
+      {
+        example: { key: 'abc', choices: 'mobile' },
+        reason:
+          'Invalid value for key: choices (must be either object or array)',
+      },
+
+      {
+        example: { key: 'abc', children: ['$func$2$f$'] },
+        reason:
+          'Invalid value for key: children (must be array of FieldSchema)',
+      },
+    ],
+    additionalProperties: false,
   },
-  [FieldSchema],
+  [RefResourceSchema, FieldChoicesSchema, FieldMetaSchema],
 );
diff --git a/packages/schema/lib/schemas/OutputFieldSchema.js b/packages/schema/lib/schemas/OutputFieldSchema.js
index 8b3f46035..c9fa86bd7 100644
--- a/packages/schema/lib/schemas/OutputFieldSchema.js
+++ b/packages/schema/lib/schemas/OutputFieldSchema.js
@@ -1,13 +1,132 @@
 'use strict';
 
 const makeSchema = require('../utils/makeSchema');
-const FieldSchema = require('./FieldSchema');
+const RefResourceSchema = require('./RefResourceSchema');
+const FieldChoicesSchema = require('./FieldChoicesSchema');
+const FieldMetaSchema = require('./FieldMetaSchema');
 
 module.exports = makeSchema(
   {
-    ...FieldSchema.schema,
     description: 'Field schema specialized for output fields.',
     id: '/OutputFieldSchema',
+    type: 'object',
+    required: ['key'],
+    properties: {
+      key: {
+        description:
+          'A unique machine readable key for this value (IE: "fname").',
+        type: 'string',
+        minLength: 1,
+      },
+      label: {
+        description:
+          'A human readable label for this value (IE: "First Name").',
+        type: 'string',
+        minLength: 1,
+      },
+      type: {
+        description:
+          'The type of this value. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.',
+        type: 'string',
+        // string == unicode
+        // integer == int
+        // number == float
+        enum: [
+          'string',
+          'number',
+          'boolean',
+          'integer',
+          'datetime',
+          'file',
+          'password',
+        ],
+      },
+      required: {
+        description: 'If this value is required or not.',
+        type: 'boolean',
+      },
+      placeholder: {
+        description: 'An example value that is not saved.',
+        type: 'string',
+        minLength: 1,
+      },
+      primary: {
+        description:
+          'Use this field as part of the primary key for deduplication. You can set multiple fields as "primary", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).',
+        type: 'boolean',
+      },
+      dynamic: {
+        description:
+          'A reference to a trigger that will power a dynamic dropdown.',
+        $ref: RefResourceSchema.id,
+      },
+      search: {
+        description:
+          'A reference to a search that will guide the user to add a search step to populate this field when creating a Zap.',
+        $ref: RefResourceSchema.id,
+      },
+      list: {
+        description: 'Can a user provide multiples of this field?',
+        type: 'boolean',
+      },
+      children: {
+        type: 'array',
+        items: { $ref: '/OutputFieldSchema' },
+        description:
+          'An array of child fields that define the structure of a sub-object for this field. Usually used for line items.',
+        minItems: 1,
+      },
+      dict: {
+        description: 'Is this field a key/value output?',
+        type: 'boolean',
+      },
+    },
+    examples: [
+      { key: 'abc' },
+      { key: 'abc', children: [{ key: 'abc' }] },
+      { key: 'abc', type: 'integer', placeholder: 'neat' },
+      { key: 'abc', type: 'integer' },
+    ],
+    antiExamples: [
+      {
+        example: {},
+        reason: 'Missing required key: key',
+      },
+      {
+        example: { key: 'abc', type: 'loltype' },
+        reason: 'Invalid value for key: type',
+      },
+      {
+        example: { key: 'abc', choices: {} },
+        reason: 'Invalid value for key: choices (cannot be empty)',
+      },
+      {
+        example: { key: 'abc', choices: [] },
+        reason: 'Invalid value for key: choices (cannot be empty)',
+      },
+      {
+        example: { key: 'abc', choices: [3] },
+        reason:
+          'Invalid value for key: choices (if an array, must be of either string or FieldChoiceWithLabelSchema)',
+      },
+      {
+        example: { key: 'abc', choices: [{ label: 'Red', value: '#f00' }] },
+        reason:
+          'Invalid value for key: choices (if an array of FieldChoiceWithLabelSchema, must provide key `sample`)',
+      },
+      {
+        example: { key: 'abc', choices: 'mobile' },
+        reason:
+          'Invalid value for key: choices (must be either object or array)',
+      },
+
+      {
+        example: { key: 'abc', children: ['$func$2$f$'] },
+        reason:
+          'Invalid value for key: children (must be array of FieldSchema)',
+      },
+    ],
+    additionalProperties: false,
   },
-  [FieldSchema],
+  [RefResourceSchema, FieldChoicesSchema, FieldMetaSchema],
 );
diff --git a/packages/schema/test/index.js b/packages/schema/test/index.js
index a1b3b6058..947ac3b88 100644
--- a/packages/schema/test/index.js
+++ b/packages/schema/test/index.js
@@ -9,7 +9,7 @@ const appDefinition = require('../examples/definition.json');
 
 const copy = (o) => JSON.parse(JSON.stringify(o));
 
-const NUM_SCHEMAS = 60; // changes regularly as we expand
+const NUM_SCHEMAS = 59; // changes regularly as we expand
 
 describe('app', () => {
   describe('validation', () => {
@@ -241,13 +241,13 @@ describe('app', () => {
           {
             key: 'username',
             type: 'string',
-            isSafe: true, // allowed
+            isSecret: true, // allowed
             required: true,
           },
           {
             key: 'password',
             type: 'string',
-            isSafe: false, // password is not safe
+            isSecret: false, // password is not safe
             required: true,
           },
         ],
@@ -263,7 +263,7 @@ describe('app', () => {
     it('should invalidate a "safe" password field', () => {
       const appCopy = copy(appDefinition);
 
-      // Same "custom" auth but now marking "password" as isSafe=true
+      // Same "custom" auth but now marking "password" as isSecret=true
       appCopy.authentication = {
         type: 'custom',
         test: {
@@ -273,7 +273,7 @@ describe('app', () => {
           {
             key: 'password',
             type: 'string',
-            isSafe: true, // invalid: password cannot be safe
+            isSecret: true, // invalid: password cannot be safe
             required: true,
           },
         ],
@@ -281,7 +281,7 @@ describe('app', () => {
 
       const results = schema.validateAppDefinition(appCopy);
 
-      // Expect at least one error because "password" can't have isSafe = true
+      // Expect at least one error because "password" can't have isSecret = true
       results.errors.should.have.length(1);
       should(results.valid).eql(false);
 
@@ -289,7 +289,7 @@ describe('app', () => {
       console.log(error);
       error.name.should.equal('sensitive');
       error.stack.should.eql(
-        'instance.authentication.fields[0] cannot set isSafe as true for the sensitive key "password".',
+        'instance.authentication.fields[0] cannot set isSecret as true for the sensitive key "password".',
       );
     });
   });

From 55284c08723da1fcdf500c7a345aa02febf31bf9 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Fri, 31 Jan 2025 14:19:50 -0500
Subject: [PATCH 37/60] run yarn build

---
 packages/core/types/zapier.generated.d.ts | 503 +++++-----------------
 1 file changed, 98 insertions(+), 405 deletions(-)

diff --git a/packages/core/types/zapier.generated.d.ts b/packages/core/types/zapier.generated.d.ts
index 2ef22d3d7..d66242114 100644
--- a/packages/core/types/zapier.generated.d.ts
+++ b/packages/core/types/zapier.generated.d.ts
@@ -197,218 +197,6 @@ export type Function =
   | FunctionRequire
   | FunctionSource;
 
-/**
- * An object describing a labeled choice in a static dropdown.
- * Useful if the value a user picks isn't exactly what the zap uses.
- * For instance, when they click on a nickname, but the zap uses the
- * user's full name
- * ([image](https://cdn.zapier.com/storage/photos/8ed01ac5df3a511ce93ed2dc43c7fbbc.png)).
- *
- * [Docs: FieldChoiceWithLabelSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#FieldChoiceWithLabelSchema)
- */
-export interface FieldChoiceWithLabel {
-  /**
-   * The actual value that is sent into the Zap. This is displayed as
-   * light grey text in the editor. Should match sample exactly.
-   */
-  value: string;
-
-  /**
-   * A legacy field that is no longer used by the editor, but it is
-   * still required for now and should match the value.
-   */
-  sample: string;
-
-  /** A human readable label for this value. */
-  label: string;
-  [k: string]: unknown;
-}
-
-/**
- * Reference a resource by key and the data it returns. In the
- * format of: `{resource_key}.{foreign_key}(.{human_label_key})`.
- *
- * [Docs: RefResourceSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#RefResourceSchema)
- */
-export type RefResource = string;
-
-/**
- * A static dropdown of options. Which you use depends on your order
- * and label requirements:
- *
- * Need a Label? | Does Order Matter? | Type to Use
- * ---|---|---
- * Yes | No | Object of value -> label
- * No | Yes | Array of Strings
- * Yes | Yes | Array of
- * [FieldChoiceWithLabel](#fieldchoicewithlabelschema)
- *
- * [Docs: FieldChoicesSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#FieldChoicesSchema)
- */
-export type FieldChoices =
-  | { [k: string]: unknown }
-  | (string | FieldChoiceWithLabel)[];
-
-/**
- * Allows for additional metadata to be stored on the field.
- *
- * [Docs: FieldMetaSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#FieldMetaSchema)
- */
-export interface FieldMeta {
-  /**
-   * Only string, integer or boolean values are allowed.
-   *
-   * This interface was referenced by `FieldMetaSchema`'s JSON-Schema
-   * definition
-   * via the `patternProperty` "[^\s]+".
-   */
-  [k: string]: string | number | boolean;
-}
-
-/**
- * Defines a field an app either needs as input, or gives as output.
- * In addition to the requirements below, the following keys are
- * mutually exclusive:
- *
- * * `children` & `list`
- * * `children` & `dict`
- * * `children` & `type`
- * * `children` & `placeholder`
- * * `children` & `helpText`
- * * `children` & `default`
- * * `dict` & `list`
- * * `dynamic` & `dict`
- * * `dynamic` & `choices`
- *
- * [Docs: FieldSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#FieldSchema)
- */
-export interface Field {
-  /** A unique machine readable key for this value (IE: "fname"). */
-  key: string;
-
-  /** A human readable label for this value (IE: "First Name"). */
-  label?: string;
-
-  /**
-   * A human readable description of this value (IE: "The first part
-   * of a full name."). You can use Markdown.
-   */
-  helpText?: string;
-
-  /**
-   * The type of this value. Use `string` for basic text input, `text`
-   * for a large, `<textarea>` style box, and `code` for a
-   * `<textarea>` with a fixed-width font. Field type of `file` will
-   * accept either a file object or a string. If a URL is provided in
-   * the string, Zapier will automatically make a GET for that file.
-   * Otherwise, a .txt file will be generated.
-   */
-  type?:
-    | 'string'
-    | 'text'
-    | 'integer'
-    | 'number'
-    | 'boolean'
-    | 'datetime'
-    | 'file'
-    | 'password'
-    | 'copy'
-    | 'code';
-
-  /** If this value is required or not. */
-  required?: boolean;
-
-  /** An example value that is not saved. */
-  placeholder?: string;
-
-  /**
-   * A default value that is saved the first time a Zap is created.
-   */
-  default?: string;
-
-  /**
-   * Use this field as part of the primary key for deduplication. You
-   * can set multiple fields as "primary", provided they are unique
-   * together. If no fields are set, Zapier will default to using the
-   * `id` field. `primary` only makes sense for `outputFields`; it
-   * will be ignored if set in `inputFields`. It only works in static
-   * `outputFields`; will not work in custom/dynamic `outputFields`.
-   * For more information, see [How deduplication works in
-   * Zapier](https://platform.zapier.com/build/deduplication).
-   */
-  primary?: boolean;
-
-  /**
-   * A reference to a trigger that will power a dynamic dropdown.
-   */
-  dynamic?: RefResource;
-
-  /**
-   * A reference to a search that will guide the user to add a search
-   * step to populate this field when creating a Zap.
-   */
-  search?: RefResource;
-
-  /**
-   * An object of machine keys and human values to populate a static
-   * dropdown.
-   */
-  choices?: FieldChoices;
-
-  /**
-   * Acts differently when used in inputFields vs. when used in
-   * outputFields. In inputFields: Can a user provide multiples of
-   * this field? In outputFields: Does this field return an array of
-   * items of type `type`?
-   */
-  list?: boolean;
-
-  /**
-   * An array of child fields that define the structure of a
-   * sub-object for this field. Usually used for line items.
-   *
-   * @minItems 1
-   */
-  children?: Field[];
-
-  /** Is this field a key/value input? */
-  dict?: boolean;
-
-  /**
-   * Is this field automatically populated (and hidden from the user)?
-   * Note: Only OAuth and Session Auth support fields with this key.
-   */
-  computed?: boolean;
-
-  /**
-   * Does the value of this field affect the definitions of other
-   * fields in the set?
-   */
-  altersDynamicFields?: boolean;
-
-  /**
-   * Prevents triggering on new output until all values for fields
-   * with this property remain unchanged for 2 polls. It can be used
-   * to, e.g., not trigger on a new contact until the contact has
-   * completed typing their name. NOTE that this only applies to the
-   * `outputFields` of polling triggers.
-   */
-  steadyState?: boolean;
-
-  /**
-   * Useful when you expect the input to be part of a longer string.
-   * Put "{{input}}" in place of the user's input (IE:
-   * "https://{{input}}.yourdomain.com").
-   */
-  inputFormat?: string;
-
-  /**
-   * Allows for additional metadata to be stored on the field.
-   * Supports simple key-values only (no sub-objects or arrays).
-   */
-  meta?: FieldMeta;
-}
-
 /**
  * Field schema specialized for authentication fields.
  *
@@ -418,6 +206,11 @@ export interface AuthField {
   /** A unique machine readable key for this value (IE: "fname"). */
   key: string;
 
+  /**
+   * Indicates if this authentication field is safe (not secret).
+   */
+  isSecret?: boolean;
+
   /** A human readable label for this value (IE: "First Name"). */
   label?: string;
 
@@ -428,71 +221,27 @@ export interface AuthField {
   helpText?: string;
 
   /**
-   * The type of this value. Use `string` for basic text input, `text`
-   * for a large, `<textarea>` style box, and `code` for a
-   * `<textarea>` with a fixed-width font. Field type of `file` will
-   * accept either a file object or a string. If a URL is provided in
-   * the string, Zapier will automatically make a GET for that file.
-   * Otherwise, a .txt file will be generated.
+   * The type of this value. Field type of `file` will accept either a
+   * file object or a string. If a URL is provided in the string,
+   * Zapier will automatically make a GET for that file. Otherwise, a
+   * .txt file will be generated.
    */
   type?:
     | 'string'
-    | 'text'
-    | 'integer'
     | 'number'
     | 'boolean'
     | 'datetime'
-    | 'file'
     | 'password'
     | 'copy'
     | 'code';
 
-  /** If this value is required or not. */
+  /** If this value is required or not. This defaults to True. */
   required?: boolean;
 
   /** An example value that is not saved. */
   placeholder?: string;
 
-  /**
-   * A default value that is saved the first time a Zap is created.
-   */
-  default?: string;
-
-  /**
-   * Use this field as part of the primary key for deduplication. You
-   * can set multiple fields as "primary", provided they are unique
-   * together. If no fields are set, Zapier will default to using the
-   * `id` field. `primary` only makes sense for `outputFields`; it
-   * will be ignored if set in `inputFields`. It only works in static
-   * `outputFields`; will not work in custom/dynamic `outputFields`.
-   * For more information, see [How deduplication works in
-   * Zapier](https://platform.zapier.com/build/deduplication).
-   */
-  primary?: boolean;
-
-  /**
-   * A reference to a trigger that will power a dynamic dropdown.
-   */
-  dynamic?: RefResource;
-
-  /**
-   * A reference to a search that will guide the user to add a search
-   * step to populate this field when creating a Zap.
-   */
-  search?: RefResource;
-
-  /**
-   * An object of machine keys and human values to populate a static
-   * dropdown.
-   */
-  choices?: FieldChoices;
-
-  /**
-   * Acts differently when used in inputFields vs. when used in
-   * outputFields. In inputFields: Can a user provide multiples of
-   * this field? In outputFields: Does this field return an array of
-   * items of type `type`?
-   */
+  /** Can a user provide multiples of this field? */
   list?: boolean;
 
   /**
@@ -501,49 +250,18 @@ export interface AuthField {
    *
    * @minItems 1
    */
-  children?: Field[];
+  children?: AuthField[];
 
   /** Is this field a key/value input? */
   dict?: boolean;
 
-  /**
-   * Is this field automatically populated (and hidden from the user)?
-   * Note: Only OAuth and Session Auth support fields with this key.
-   */
-  computed?: boolean;
-
-  /**
-   * Does the value of this field affect the definitions of other
-   * fields in the set?
-   */
-  altersDynamicFields?: boolean;
-
-  /**
-   * Prevents triggering on new output until all values for fields
-   * with this property remain unchanged for 2 polls. It can be used
-   * to, e.g., not trigger on a new contact until the contact has
-   * completed typing their name. NOTE that this only applies to the
-   * `outputFields` of polling triggers.
-   */
-  steadyState?: boolean;
-
   /**
    * Useful when you expect the input to be part of a longer string.
    * Put "{{input}}" in place of the user's input (IE:
    * "https://{{input}}.yourdomain.com").
    */
   inputFormat?: string;
-
-  /**
-   * Allows for additional metadata to be stored on the field.
-   * Supports simple key-values only (no sub-objects or arrays).
-   */
-  meta?: FieldMeta;
-
-  /**
-   * Indicates if this authentication field is safe (not secret).
-   */
-  isSafe?: boolean;
+  [k: string]: unknown;
 }
 
 /**
@@ -758,6 +476,74 @@ export interface AuthenticationSessionConfig {
   perform: Request | Function;
 }
 
+/**
+ * An object describing a labeled choice in a static dropdown.
+ * Useful if the value a user picks isn't exactly what the zap uses.
+ * For instance, when they click on a nickname, but the zap uses the
+ * user's full name
+ * ([image](https://cdn.zapier.com/storage/photos/8ed01ac5df3a511ce93ed2dc43c7fbbc.png)).
+ *
+ * [Docs: FieldChoiceWithLabelSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#FieldChoiceWithLabelSchema)
+ */
+export interface FieldChoiceWithLabel {
+  /**
+   * The actual value that is sent into the Zap. This is displayed as
+   * light grey text in the editor. Should match sample exactly.
+   */
+  value: string;
+
+  /**
+   * A legacy field that is no longer used by the editor, but it is
+   * still required for now and should match the value.
+   */
+  sample: string;
+
+  /** A human readable label for this value. */
+  label: string;
+  [k: string]: unknown;
+}
+
+/**
+ * Reference a resource by key and the data it returns. In the
+ * format of: `{resource_key}.{foreign_key}(.{human_label_key})`.
+ *
+ * [Docs: RefResourceSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#RefResourceSchema)
+ */
+export type RefResource = string;
+
+/**
+ * A static dropdown of options. Which you use depends on your order
+ * and label requirements:
+ *
+ * Need a Label? | Does Order Matter? | Type to Use
+ * ---|---|---
+ * Yes | No | Object of value -> label
+ * No | Yes | Array of Strings
+ * Yes | Yes | Array of
+ * [FieldChoiceWithLabel](#fieldchoicewithlabelschema)
+ *
+ * [Docs: FieldChoicesSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#FieldChoicesSchema)
+ */
+export type FieldChoices =
+  | { [k: string]: unknown }
+  | (string | FieldChoiceWithLabel)[];
+
+/**
+ * Allows for additional metadata to be stored on the field.
+ *
+ * [Docs: FieldMetaSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#FieldMetaSchema)
+ */
+export interface FieldMeta {
+  /**
+   * Only string, integer or boolean values are allowed.
+   *
+   * This interface was referenced by `FieldMetaSchema`'s JSON-Schema
+   * definition
+   * via the `patternProperty` "[^\s]+".
+   */
+  [k: string]: string | number | boolean;
+}
+
 /**
  * Field schema specialized for input fields.
  *
@@ -802,23 +588,6 @@ export interface InputField {
   /** An example value that is not saved. */
   placeholder?: string;
 
-  /**
-   * A default value that is saved the first time a Zap is created.
-   */
-  default?: string;
-
-  /**
-   * Use this field as part of the primary key for deduplication. You
-   * can set multiple fields as "primary", provided they are unique
-   * together. If no fields are set, Zapier will default to using the
-   * `id` field. `primary` only makes sense for `outputFields`; it
-   * will be ignored if set in `inputFields`. It only works in static
-   * `outputFields`; will not work in custom/dynamic `outputFields`.
-   * For more information, see [How deduplication works in
-   * Zapier](https://platform.zapier.com/build/deduplication).
-   */
-  primary?: boolean;
-
   /**
    * A reference to a trigger that will power a dynamic dropdown.
    */
@@ -836,12 +605,7 @@ export interface InputField {
    */
   choices?: FieldChoices;
 
-  /**
-   * Acts differently when used in inputFields vs. when used in
-   * outputFields. In inputFields: Can a user provide multiples of
-   * this field? In outputFields: Does this field return an array of
-   * items of type `type`?
-   */
+  /** Can a user provide multiples of this field? */
   list?: boolean;
 
   /**
@@ -850,17 +614,11 @@ export interface InputField {
    *
    * @minItems 1
    */
-  children?: Field[];
+  children?: InputField[];
 
   /** Is this field a key/value input? */
   dict?: boolean;
 
-  /**
-   * Is this field automatically populated (and hidden from the user)?
-   * Note: Only OAuth and Session Auth support fields with this key.
-   */
-  computed?: boolean;
-
   /**
    * Does the value of this field affect the definitions of other
    * fields in the set?
@@ -868,13 +626,9 @@ export interface InputField {
   altersDynamicFields?: boolean;
 
   /**
-   * Prevents triggering on new output until all values for fields
-   * with this property remain unchanged for 2 polls. It can be used
-   * to, e.g., not trigger on a new contact until the contact has
-   * completed typing their name. NOTE that this only applies to the
-   * `outputFields` of polling triggers.
+   * A default value that is saved the first time a Zap is created.
    */
-  steadyState?: boolean;
+  default?: string;
 
   /**
    * Useful when you expect the input to be part of a longer string.
@@ -903,30 +657,19 @@ export interface OutputField {
   label?: string;
 
   /**
-   * A human readable description of this value (IE: "The first part
-   * of a full name."). You can use Markdown.
-   */
-  helpText?: string;
-
-  /**
-   * The type of this value. Use `string` for basic text input, `text`
-   * for a large, `<textarea>` style box, and `code` for a
-   * `<textarea>` with a fixed-width font. Field type of `file` will
-   * accept either a file object or a string. If a URL is provided in
-   * the string, Zapier will automatically make a GET for that file.
-   * Otherwise, a .txt file will be generated.
+   * The type of this value. Field type of `file` will accept either a
+   * file object or a string. If a URL is provided in the string,
+   * Zapier will automatically make a GET for that file. Otherwise, a
+   * .txt file will be generated.
    */
   type?:
     | 'string'
-    | 'text'
-    | 'integer'
     | 'number'
     | 'boolean'
+    | 'integer'
     | 'datetime'
     | 'file'
-    | 'password'
-    | 'copy'
-    | 'code';
+    | 'password';
 
   /** If this value is required or not. */
   required?: boolean;
@@ -934,19 +677,14 @@ export interface OutputField {
   /** An example value that is not saved. */
   placeholder?: string;
 
-  /**
-   * A default value that is saved the first time a Zap is created.
-   */
-  default?: string;
-
   /**
    * Use this field as part of the primary key for deduplication. You
    * can set multiple fields as "primary", provided they are unique
    * together. If no fields are set, Zapier will default to using the
-   * `id` field. `primary` only makes sense for `outputFields`; it
-   * will be ignored if set in `inputFields`. It only works in static
-   * `outputFields`; will not work in custom/dynamic `outputFields`.
-   * For more information, see [How deduplication works in
+   * `id` field. `primary` only makes sense for `outputFields`. It
+   * only works in static `outputFields`; will not work in
+   * custom/dynamic `outputFields`. For more information, see [How
+   * deduplication works in
    * Zapier](https://platform.zapier.com/build/deduplication).
    */
   primary?: boolean;
@@ -962,18 +700,7 @@ export interface OutputField {
    */
   search?: RefResource;
 
-  /**
-   * An object of machine keys and human values to populate a static
-   * dropdown.
-   */
-  choices?: FieldChoices;
-
-  /**
-   * Acts differently when used in inputFields vs. when used in
-   * outputFields. In inputFields: Can a user provide multiples of
-   * this field? In outputFields: Does this field return an array of
-   * items of type `type`?
-   */
+  /** Can a user provide multiples of this field? */
   list?: boolean;
 
   /**
@@ -982,44 +709,10 @@ export interface OutputField {
    *
    * @minItems 1
    */
-  children?: Field[];
+  children?: OutputField[];
 
-  /** Is this field a key/value input? */
+  /** Is this field a key/value output? */
   dict?: boolean;
-
-  /**
-   * Is this field automatically populated (and hidden from the user)?
-   * Note: Only OAuth and Session Auth support fields with this key.
-   */
-  computed?: boolean;
-
-  /**
-   * Does the value of this field affect the definitions of other
-   * fields in the set?
-   */
-  altersDynamicFields?: boolean;
-
-  /**
-   * Prevents triggering on new output until all values for fields
-   * with this property remain unchanged for 2 polls. It can be used
-   * to, e.g., not trigger on a new contact until the contact has
-   * completed typing their name. NOTE that this only applies to the
-   * `outputFields` of polling triggers.
-   */
-  steadyState?: boolean;
-
-  /**
-   * Useful when you expect the input to be part of a longer string.
-   * Put "{{input}}" in place of the user's input (IE:
-   * "https://{{input}}.yourdomain.com").
-   */
-  inputFormat?: string;
-
-  /**
-   * Allows for additional metadata to be stored on the field.
-   * Supports simple key-values only (no sub-objects or arrays).
-   */
-  meta?: FieldMeta;
 }
 
 /**

From 449486ee272372b8e686a4fe0876503735943415 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Fri, 31 Jan 2025 14:38:35 -0500
Subject: [PATCH 38/60] PR suggestions: remove uneeded fields and fix tests

---
 packages/core/types/zapier.generated.d.ts     | 28 ------------------
 packages/schema/docs/build/schema.md          | 10 ++-----
 packages/schema/exported-schema.json          | 29 -------------------
 .../schema/lib/schemas/InputFieldSchema.js    | 20 +------------
 .../schema/lib/schemas/OutputFieldSchema.js   | 17 +----------
 packages/schema/test/readability.js           |  4 +--
 6 files changed, 6 insertions(+), 102 deletions(-)

diff --git a/packages/core/types/zapier.generated.d.ts b/packages/core/types/zapier.generated.d.ts
index d66242114..f9006b92f 100644
--- a/packages/core/types/zapier.generated.d.ts
+++ b/packages/core/types/zapier.generated.d.ts
@@ -556,12 +556,6 @@ export interface InputField {
   /** A human readable label for this value (IE: "First Name"). */
   label?: string;
 
-  /**
-   * A human readable description of this value (IE: "The first part
-   * of a full name."). You can use Markdown.
-   */
-  helpText?: string;
-
   /**
    * The type of this value. Use `string` for basic text input, `text`
    * for a large, `<textarea>` style box, and `code` for a
@@ -585,9 +579,6 @@ export interface InputField {
   /** If this value is required or not. */
   required?: boolean;
 
-  /** An example value that is not saved. */
-  placeholder?: string;
-
   /**
    * A reference to a trigger that will power a dynamic dropdown.
    */
@@ -625,11 +616,6 @@ export interface InputField {
    */
   altersDynamicFields?: boolean;
 
-  /**
-   * A default value that is saved the first time a Zap is created.
-   */
-  default?: string;
-
   /**
    * Useful when you expect the input to be part of a longer string.
    * Put "{{input}}" in place of the user's input (IE:
@@ -674,9 +660,6 @@ export interface OutputField {
   /** If this value is required or not. */
   required?: boolean;
 
-  /** An example value that is not saved. */
-  placeholder?: string;
-
   /**
    * Use this field as part of the primary key for deduplication. You
    * can set multiple fields as "primary", provided they are unique
@@ -689,17 +672,6 @@ export interface OutputField {
    */
   primary?: boolean;
 
-  /**
-   * A reference to a trigger that will power a dynamic dropdown.
-   */
-  dynamic?: RefResource;
-
-  /**
-   * A reference to a search that will guide the user to add a search
-   * step to populate this field when creating a Zap.
-   */
-  search?: RefResource;
-
   /** Can a user provide multiples of this field? */
   list?: boolean;
 
diff --git a/packages/schema/docs/build/schema.md b/packages/schema/docs/build/schema.md
index 9fd1034af..aa11e9778 100644
--- a/packages/schema/docs/build/schema.md
+++ b/packages/schema/docs/build/schema.md
@@ -1202,10 +1202,8 @@ Key | Required | Type | Description
 --- | -------- | ---- | -----------
 `key` | **yes** | `string` | A unique machine readable key for this value (IE: "fname").
 `label` | no | `string` | A human readable label for this value (IE: "First Name").
-`helpText` | no | `string` | A human readable description of this value (IE: "The first part of a full name."). You can use Markdown.
 `type` | no | `string` in (`'string'`, `'text'`, `'integer'`, `'number'`, `'boolean'`, `'datetime'`, `'file'`, `'password'`, `'copy'`, `'code'`) | The type of this value. Use `string` for basic text input, `text` for a large, `<textarea>` style box, and `code` for a `<textarea>` with a fixed-width font. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.
 `required` | no | `boolean` | If this value is required or not.
-`placeholder` | no | `string` | An example value that is not saved.
 `dynamic` | no | [/RefResourceSchema](#refresourceschema) | A reference to a trigger that will power a dynamic dropdown.
 `search` | no | [/RefResourceSchema](#refresourceschema) | A reference to a search that will guide the user to add a search step to populate this field when creating a Zap.
 `choices` | no | [/FieldChoicesSchema](#fieldchoicesschema) | An object of machine keys and human values to populate a static dropdown.
@@ -1213,7 +1211,6 @@ Key | Required | Type | Description
 `children` | no | `array`[[/InputFieldSchema](#inputfieldschema)] | An array of child fields that define the structure of a sub-object for this field. Usually used for line items.
 `dict` | no | `boolean` | Is this field a key/value input?
 `altersDynamicFields` | no | `boolean` | Does the value of this field affect the definitions of other fields in the set?
-`default` | no | `string` | A default value that is saved the first time a Zap is created.
 `inputFormat` | no | `string` | Useful when you expect the input to be part of a longer string. Put "{{input}}" in place of the user's input (IE: "https://{{input}}.yourdomain.com").
 `meta` | no | [/FieldMetaSchema](#fieldmetaschema) | Allows for additional metadata to be stored on the field. Supports simple key-values only (no sub-objects or arrays).
 
@@ -1224,7 +1221,7 @@ Key | Required | Type | Description
 * `{ key: 'abc', choices: [ 'first', 'second', 'third' ] }`
 * `{ key: 'abc', choices: [ { label: 'Red', sample: '#f00', value: '#f00' } ] }`
 * `{ key: 'abc', children: [ { key: 'abc' } ] }`
-* `{ key: 'abc', type: 'integer', helpText: 'neat' }`
+* `{ key: 'abc', type: 'integer' }`
 * ```
   {
     key: 'abc',
@@ -1340,10 +1337,7 @@ Key | Required | Type | Description
 `label` | no | `string` | A human readable label for this value (IE: "First Name").
 `type` | no | `string` in (`'string'`, `'number'`, `'boolean'`, `'integer'`, `'datetime'`, `'file'`, `'password'`) | The type of this value. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.
 `required` | no | `boolean` | If this value is required or not.
-`placeholder` | no | `string` | An example value that is not saved.
 `primary` | no | `boolean` | Use this field as part of the primary key for deduplication. You can set multiple fields as "primary", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).
-`dynamic` | no | [/RefResourceSchema](#refresourceschema) | A reference to a trigger that will power a dynamic dropdown.
-`search` | no | [/RefResourceSchema](#refresourceschema) | A reference to a search that will guide the user to add a search step to populate this field when creating a Zap.
 `list` | no | `boolean` | Can a user provide multiples of this field?
 `children` | no | `array`[[/OutputFieldSchema](#outputfieldschema)] | An array of child fields that define the structure of a sub-object for this field. Usually used for line items.
 `dict` | no | `boolean` | Is this field a key/value output?
@@ -1352,7 +1346,7 @@ Key | Required | Type | Description
 
 * `{ key: 'abc' }`
 * `{ key: 'abc', children: [ { key: 'abc' } ] }`
-* `{ key: 'abc', type: 'integer', placeholder: 'neat' }`
+* `{ key: 'abc', type: 'integer', label: 'neat' }`
 * `{ key: 'abc', type: 'integer' }`
 
 #### Anti-Examples
diff --git a/packages/schema/exported-schema.json b/packages/schema/exported-schema.json
index ecc20bc0b..34a89d2e6 100644
--- a/packages/schema/exported-schema.json
+++ b/packages/schema/exported-schema.json
@@ -610,12 +610,6 @@
           "type": "string",
           "minLength": 1
         },
-        "helpText": {
-          "description": "A human readable description of this value (IE: \"The first part of a full name.\"). You can use Markdown.",
-          "type": "string",
-          "minLength": 1,
-          "maxLength": 1000
-        },
         "type": {
           "description": "The type of this value. Use `string` for basic text input, `text` for a large, `<textarea>` style box, and `code` for a `<textarea>` with a fixed-width font. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.",
           "type": "string",
@@ -636,11 +630,6 @@
           "description": "If this value is required or not.",
           "type": "boolean"
         },
-        "placeholder": {
-          "description": "An example value that is not saved.",
-          "type": "string",
-          "minLength": 1
-        },
         "dynamic": {
           "description": "A reference to a trigger that will power a dynamic dropdown.",
           "$ref": "/RefResourceSchema"
@@ -673,11 +662,6 @@
           "description": "Does the value of this field affect the definitions of other fields in the set?",
           "type": "boolean"
         },
-        "default": {
-          "description": "A default value that is saved the first time a Zap is created.",
-          "type": "string",
-          "minLength": 1
-        },
         "inputFormat": {
           "description": "Useful when you expect the input to be part of a longer string. Put \"{{input}}\" in place of the user's input (IE: \"https://{{input}}.yourdomain.com\").",
           "type": "string",
@@ -723,23 +707,10 @@
           "description": "If this value is required or not.",
           "type": "boolean"
         },
-        "placeholder": {
-          "description": "An example value that is not saved.",
-          "type": "string",
-          "minLength": 1
-        },
         "primary": {
           "description": "Use this field as part of the primary key for deduplication. You can set multiple fields as \"primary\", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).",
           "type": "boolean"
         },
-        "dynamic": {
-          "description": "A reference to a trigger that will power a dynamic dropdown.",
-          "$ref": "/RefResourceSchema"
-        },
-        "search": {
-          "description": "A reference to a search that will guide the user to add a search step to populate this field when creating a Zap.",
-          "$ref": "/RefResourceSchema"
-        },
         "list": {
           "description": "Can a user provide multiples of this field?",
           "type": "boolean"
diff --git a/packages/schema/lib/schemas/InputFieldSchema.js b/packages/schema/lib/schemas/InputFieldSchema.js
index 66d4fb949..f26f086fa 100644
--- a/packages/schema/lib/schemas/InputFieldSchema.js
+++ b/packages/schema/lib/schemas/InputFieldSchema.js
@@ -25,13 +25,6 @@ module.exports = makeSchema(
         type: 'string',
         minLength: 1,
       },
-      helpText: {
-        description:
-          'A human readable description of this value (IE: "The first part of a full name."). You can use Markdown.',
-        type: 'string',
-        minLength: 1,
-        maxLength: 1000,
-      },
       type: {
         description:
           'The type of this value. Use `string` for basic text input, `text` for a large, `<textarea>` style box, and `code` for a `<textarea>` with a fixed-width font. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.',
@@ -57,11 +50,6 @@ module.exports = makeSchema(
         description: 'If this value is required or not.',
         type: 'boolean',
       },
-      placeholder: {
-        description: 'An example value that is not saved.',
-        type: 'string',
-        minLength: 1,
-      },
       dynamic: {
         description:
           'A reference to a trigger that will power a dynamic dropdown.',
@@ -97,12 +85,6 @@ module.exports = makeSchema(
           'Does the value of this field affect the definitions of other fields in the set?',
         type: 'boolean',
       },
-      default: {
-        description:
-          'A default value that is saved the first time a Zap is created.',
-        type: 'string',
-        minLength: 1,
-      },
       inputFormat: {
         description:
           'Useful when you expect the input to be part of a longer string. Put "{{input}}" in place of the user\'s input (IE: "https://{{input}}.yourdomain.com").',
@@ -125,7 +107,7 @@ module.exports = makeSchema(
         choices: [{ label: 'Red', sample: '#f00', value: '#f00' }],
       },
       { key: 'abc', children: [{ key: 'abc' }] },
-      { key: 'abc', type: 'integer', helpText: 'neat' },
+      { key: 'abc', type: 'integer' },
       {
         key: 'abc',
         type: 'integer',
diff --git a/packages/schema/lib/schemas/OutputFieldSchema.js b/packages/schema/lib/schemas/OutputFieldSchema.js
index c9fa86bd7..1738b3168 100644
--- a/packages/schema/lib/schemas/OutputFieldSchema.js
+++ b/packages/schema/lib/schemas/OutputFieldSchema.js
@@ -45,26 +45,11 @@ module.exports = makeSchema(
         description: 'If this value is required or not.',
         type: 'boolean',
       },
-      placeholder: {
-        description: 'An example value that is not saved.',
-        type: 'string',
-        minLength: 1,
-      },
       primary: {
         description:
           'Use this field as part of the primary key for deduplication. You can set multiple fields as "primary", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).',
         type: 'boolean',
       },
-      dynamic: {
-        description:
-          'A reference to a trigger that will power a dynamic dropdown.',
-        $ref: RefResourceSchema.id,
-      },
-      search: {
-        description:
-          'A reference to a search that will guide the user to add a search step to populate this field when creating a Zap.',
-        $ref: RefResourceSchema.id,
-      },
       list: {
         description: 'Can a user provide multiples of this field?',
         type: 'boolean',
@@ -84,7 +69,7 @@ module.exports = makeSchema(
     examples: [
       { key: 'abc' },
       { key: 'abc', children: [{ key: 'abc' }] },
-      { key: 'abc', type: 'integer', placeholder: 'neat' },
+      { key: 'abc', type: 'integer', label: 'neat' },
       { key: 'abc', type: 'integer' },
     ],
     antiExamples: [
diff --git a/packages/schema/test/readability.js b/packages/schema/test/readability.js
index 8e7647c8b..1ede52200 100644
--- a/packages/schema/test/readability.js
+++ b/packages/schema/test/readability.js
@@ -86,13 +86,13 @@ describe('readability', () => {
       operation: {
         perform: '$func$2$f$',
         sample: { id: 1 },
-        inputFields: [{ key: 'field', type: 'string', default: '' }],
+        inputFields: [{ key: 'field', type: 'string', children: [] }],
       },
     });
     results.errors.should.have.length(1);
     should(results.errors[0].property.endsWith('instance')).be.false();
     results.errors[0].property.should.eql(
-      'instance.operation.inputFields[0].default',
+      'instance.operation.inputFields[0].children',
     );
     results.errors[0].message.should.eql('does not meet minimum length of 1');
   });

From 7016f01df43c0508b2064c5fbd77f6be3abfc01c Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Fri, 31 Jan 2025 15:19:50 -0500
Subject: [PATCH 39/60] PR suggestion:rename to isNotSecret

---
 packages/core/types/zapier.generated.d.ts     |  2 +-
 packages/schema/docs/build/schema.md          | 32 +++++++++----------
 packages/schema/exported-schema.json          |  2 +-
 .../functional-constraints/AuthFieldisSafe.js |  4 +--
 .../schema/lib/schemas/AuthFieldSchema.js     | 14 ++++----
 .../schema/lib/schemas/AuthFieldsSchema.js    | 30 ++++++++++-------
 packages/schema/test/index.js                 | 14 ++++----
 7 files changed, 53 insertions(+), 45 deletions(-)

diff --git a/packages/core/types/zapier.generated.d.ts b/packages/core/types/zapier.generated.d.ts
index f9006b92f..824c037a3 100644
--- a/packages/core/types/zapier.generated.d.ts
+++ b/packages/core/types/zapier.generated.d.ts
@@ -209,7 +209,7 @@ export interface AuthField {
   /**
    * Indicates if this authentication field is safe (not secret).
    */
-  isSecret?: boolean;
+  isNotSecret?: boolean;
 
   /** A human readable label for this value (IE: "First Name"). */
   label?: string;
diff --git a/packages/schema/docs/build/schema.md b/packages/schema/docs/build/schema.md
index aa11e9778..67bde04d0 100644
--- a/packages/schema/docs/build/schema.md
+++ b/packages/schema/docs/build/schema.md
@@ -161,7 +161,7 @@ Field schema specialized for authentication fields.
 Key | Required | Type | Description
 --- | -------- | ---- | -----------
 `key` | **yes** | `string` | A unique machine readable key for this value (IE: "fname").
-`isSecret` | no | `boolean` | Indicates if this authentication field is safe (not secret).
+`isNotSecret` | no | `boolean` | Indicates if this authentication field is safe (not secret).
 `label` | no | `string` | A human readable label for this value (IE: "First Name").
 `helpText` | no | `string` | A human readable description of this value (IE: "The first part of a full name."). You can use Markdown.
 `type` | no | `string` in (`'string'`, `'number'`, `'boolean'`, `'datetime'`, `'password'`, `'copy'`, `'code'`) | The type of this value. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.
@@ -174,15 +174,15 @@ Key | Required | Type | Description
 
 #### Examples
 
-* `{ key: 'email', type: 'string', isSecret: true, required: true }`
-* `{ key: 'password', type: 'password', isSecret: false, required: true }`
-* `{ key: 'api_key', type: 'string', isSecret: false, required: true }`
+* `{ key: 'email', type: 'string', isNotSecret: true, required: true }`
+* `{ key: 'password', type: 'password', isNotSecret: false, required: true }`
+* `{ key: 'api_key', type: 'string', isNotSecret: false, required: true }`
 
 #### Anti-Examples
 
-* `{ key: 'password', type: 'password', isSecret: true, required: true }` - _A "password" field cannot have isSafe = true._
-* `{ key: 'api_key', isSecret: true }` - _"api_key" is a sensitive field and cannot have isSafe set as true._
-* `{ type: 'string', isSecret: false }` - _Missing required key: key_
+* `{ key: 'password', type: 'password', isNotSecret: true, required: true }` - _A "password" field cannot have isSafe = true._
+* `{ key: 'api_key', isNotSecret: true }` - _"api_key" is a sensitive field and cannot have isSafe set as true._
+* `{ type: 'string', isNotSecret: false }` - _Missing required key: key_
 
 -----
 
@@ -200,26 +200,26 @@ An array or collection of authentication fields.
 
 * ```
   [
-    { key: 'username', type: 'string', isSecret: true, required: true },
-    { key: 'password', type: 'password', isSecret: false, required: true }
+    { key: 'username', type: 'string', isNotSecret: true, required: true },
+    { key: 'password', type: 'password', isNotSecret: false, required: true }
   ]
   ```
-* `[ { key: 'api_key', type: 'string', isSecret: false, required: true } ]`
+* `[ { key: 'api_key', type: 'string', isNotSecret: false, required: true } ]`
 * ```
   [
-    { key: 'email', type: 'string', isSecret: true },
+    { key: 'email', type: 'string', isNotSecret: true },
     { key: 'password', type: 'password', required: true },
-    { key: 'mfa_token', type: 'string', isSecret: false }
+    { key: 'mfa_token', type: 'string', isNotSecret: false }
   ]
   ```
 
 #### Anti-Examples
 
 * `{}` - _Must be an array (currently an object)._
-* `[ { key: 'password', isSecret: true } ]` - _"password" is a sensitive field and cannot have isSecret set as true._
-* `[ { key: 'api_key', isSecret: true } ]` - _"api_key" is a sensitive field and cannot have isSecret set as true._
-* `[ { isSecret: false } ]` - _Missing required "key" property._
-* `[ { key: 'username', type: 'string', isSecret: true }, 12345 ]` - _Array item 12345 is not an object (must match AuthFieldSchema)._
+* `[ { key: 'password', isNotSecret: true } ]` - _"password" is a sensitive field and cannot have isNotSecret set as true._
+* `[ { key: 'api_key', isNotSecret: true } ]` - _"api_key" is a sensitive field and cannot have isNotSecret set as true._
+* `[ { isNotSecret: false } ]` - _Missing required "key" property._
+* `[ { key: 'username', type: 'string', isNotSecret: true }, 12345 ]` - _Array item 12345 is not an object (must match AuthFieldSchema)._
 
 -----
 
diff --git a/packages/schema/exported-schema.json b/packages/schema/exported-schema.json
index 34a89d2e6..cd765c530 100644
--- a/packages/schema/exported-schema.json
+++ b/packages/schema/exported-schema.json
@@ -184,7 +184,7 @@
           "type": "string",
           "minLength": 1
         },
-        "isSecret": {
+        "isNotSecret": {
           "description": "Indicates if this authentication field is safe (not secret).",
           "type": "boolean"
         },
diff --git a/packages/schema/lib/functional-constraints/AuthFieldisSafe.js b/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
index 45d0df8f6..add6ad520 100644
--- a/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
+++ b/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
@@ -32,10 +32,10 @@ const checkAuthField = (field) => {
 
   // if the field key contains any forbidden substring (case-insensitive),
   // AND 'isSecret' is true, throw a validation error
-  if (isSensitiveKey(field.key) && field.isSecret === true) {
+  if (isSensitiveKey(field.key) && field.isNotSecret === true) {
     errors.push(
       new jsonschema.ValidationError(
-        `cannot set isSecret as true for the sensitive key "${field.key}".`,
+        `cannot set isNotSecret as true for the sensitive key "${field.key}".`,
         field,
         '/AuthFieldSchema',
         'instance.field',
diff --git a/packages/schema/lib/schemas/AuthFieldSchema.js b/packages/schema/lib/schemas/AuthFieldSchema.js
index d7978187d..48d7348b7 100644
--- a/packages/schema/lib/schemas/AuthFieldSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldSchema.js
@@ -14,7 +14,7 @@ module.exports = makeSchema({
       type: 'string',
       minLength: 1,
     },
-    isSecret: {
+    isNotSecret: {
       description:
         'Indicates if this authentication field is safe (not secret).',
       type: 'boolean',
@@ -88,13 +88,13 @@ module.exports = makeSchema({
     {
       key: 'email',
       type: 'string',
-      isSecret: true,
+      isNotSecret: true,
       required: true,
     },
     {
       key: 'password',
       type: 'password',
-      isSecret: false,
+      isNotSecret: false,
       required: true,
     },
 
@@ -102,7 +102,7 @@ module.exports = makeSchema({
     {
       key: 'api_key',
       type: 'string',
-      isSecret: false,
+      isNotSecret: false,
       required: true,
     },
   ],
@@ -112,7 +112,7 @@ module.exports = makeSchema({
       example: {
         key: 'password',
         type: 'password',
-        isSecret: true,
+        isNotSecret: true,
         required: true,
       },
       reason: 'A "password" field cannot have isSafe = true.',
@@ -120,7 +120,7 @@ module.exports = makeSchema({
     {
       example: {
         key: 'api_key',
-        isSecret: true,
+        isNotSecret: true,
       },
       reason:
         '"api_key" is a sensitive field and cannot have isSafe set as true.',
@@ -128,7 +128,7 @@ module.exports = makeSchema({
     {
       example: {
         type: 'string',
-        isSecret: false,
+        isNotSecret: false,
       },
       reason: 'Missing required key: key',
     },
diff --git a/packages/schema/lib/schemas/AuthFieldsSchema.js b/packages/schema/lib/schemas/AuthFieldsSchema.js
index bec4f5fb3..fb8fd62da 100644
--- a/packages/schema/lib/schemas/AuthFieldsSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldsSchema.js
@@ -16,18 +16,23 @@ module.exports = makeSchema(
     examples: [
       // 1) Basic Auth: username (safe) + password (not safe)
       [
-        { key: 'username', type: 'string', isSecret: true, required: true },
-        { key: 'password', type: 'password', isSecret: false, required: true },
+        { key: 'username', type: 'string', isNotSecret: true, required: true },
+        {
+          key: 'password',
+          type: 'password',
+          isNotSecret: false,
+          required: true,
+        },
       ],
 
       // 2) Just a single auth field for custom usage (e.g., api_key)
-      [{ key: 'api_key', type: 'string', isSecret: false, required: true }],
+      [{ key: 'api_key', type: 'string', isNotSecret: false, required: true }],
 
       // 3) Mix of fields for extended usage
       [
-        { key: 'email', type: 'string', isSecret: true },
+        { key: 'email', type: 'string', isNotSecret: true },
         { key: 'password', type: 'password', required: true },
-        { key: 'mfa_token', type: 'string', isSecret: false },
+        { key: 'mfa_token', type: 'string', isNotSecret: false },
       ],
     ],
 
@@ -38,21 +43,24 @@ module.exports = makeSchema(
         reason: 'Must be an array (currently an object).',
       },
       {
-        example: [{ key: 'password', isSecret: true }],
+        example: [{ key: 'password', isNotSecret: true }],
         reason:
-          '"password" is a sensitive field and cannot have isSecret set as true.',
+          '"password" is a sensitive field and cannot have isNotSecret set as true.',
       },
       {
-        example: [{ key: 'api_key', isSecret: true }],
+        example: [{ key: 'api_key', isNotSecret: true }],
         reason:
-          '"api_key" is a sensitive field and cannot have isSecret set as true.',
+          '"api_key" is a sensitive field and cannot have isNotSecret set as true.',
       },
       {
-        example: [{ isSecret: false }],
+        example: [{ isNotSecret: false }],
         reason: 'Missing required "key" property.',
       },
       {
-        example: [{ key: 'username', type: 'string', isSecret: true }, 12345],
+        example: [
+          { key: 'username', type: 'string', isNotSecret: true },
+          12345,
+        ],
         reason:
           'Array item 12345 is not an object (must match AuthFieldSchema).',
       },
diff --git a/packages/schema/test/index.js b/packages/schema/test/index.js
index 947ac3b88..af678876b 100644
--- a/packages/schema/test/index.js
+++ b/packages/schema/test/index.js
@@ -241,13 +241,13 @@ describe('app', () => {
           {
             key: 'username',
             type: 'string',
-            isSecret: true, // allowed
+            isNotSecret: true, // allowed
             required: true,
           },
           {
             key: 'password',
-            type: 'string',
-            isSecret: false, // password is not safe
+            type: 'password',
+            isNotSecret: false, // password is not safe
             required: true,
           },
         ],
@@ -263,7 +263,7 @@ describe('app', () => {
     it('should invalidate a "safe" password field', () => {
       const appCopy = copy(appDefinition);
 
-      // Same "custom" auth but now marking "password" as isSecret=true
+      // Same "custom" auth but now marking "password" as isNotSecret=true
       appCopy.authentication = {
         type: 'custom',
         test: {
@@ -273,7 +273,7 @@ describe('app', () => {
           {
             key: 'password',
             type: 'string',
-            isSecret: true, // invalid: password cannot be safe
+            isNotSecret: true, // invalid: password cannot be safe
             required: true,
           },
         ],
@@ -281,7 +281,7 @@ describe('app', () => {
 
       const results = schema.validateAppDefinition(appCopy);
 
-      // Expect at least one error because "password" can't have isSecret = true
+      // Expect at least one error because "password" can't have isNotSecret = true
       results.errors.should.have.length(1);
       should(results.valid).eql(false);
 
@@ -289,7 +289,7 @@ describe('app', () => {
       console.log(error);
       error.name.should.equal('sensitive');
       error.stack.should.eql(
-        'instance.authentication.fields[0] cannot set isSecret as true for the sensitive key "password".',
+        'instance.authentication.fields[0] cannot set isNotSecret as true for the sensitive key "password".',
       );
     });
   });

From 8065bcf9a3dfe9e2c404c3b1fea72c439cb337f6 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Sun, 2 Feb 2025 19:56:32 -0500
Subject: [PATCH 40/60] PDE-5719 add helpText back to inputField

---
 packages/core/types/zapier.generated.d.ts       | 6 ++++++
 packages/schema/docs/build/schema.md            | 1 +
 packages/schema/exported-schema.json            | 6 ++++++
 packages/schema/lib/schemas/InputFieldSchema.js | 7 +++++++
 4 files changed, 20 insertions(+)

diff --git a/packages/core/types/zapier.generated.d.ts b/packages/core/types/zapier.generated.d.ts
index 77c152e52..0deefaeed 100644
--- a/packages/core/types/zapier.generated.d.ts
+++ b/packages/core/types/zapier.generated.d.ts
@@ -556,6 +556,12 @@ export interface InputField {
   /** A human readable label for this value (IE: "First Name"). */
   label?: string;
 
+  /**
+   * A human readable description of this value (IE: "The first part
+   * of a full name."). You can use Markdown.
+   */
+  helpText?: string;
+
   /**
    * The type of this value. Use `string` for basic text input, `text`
    * for a large, `<textarea>` style box, and `code` for a
diff --git a/packages/schema/docs/build/schema.md b/packages/schema/docs/build/schema.md
index daa4f1d1d..315d24790 100644
--- a/packages/schema/docs/build/schema.md
+++ b/packages/schema/docs/build/schema.md
@@ -1202,6 +1202,7 @@ Key | Required | Type | Description
 --- | -------- | ---- | -----------
 `key` | **yes** | `string` | A unique machine readable key for this value (IE: "fname").
 `label` | no | `string` | A human readable label for this value (IE: "First Name").
+`helpText` | no | `string` | A human readable description of this value (IE: "The first part of a full name."). You can use Markdown.
 `type` | no | `string` in (`'string'`, `'text'`, `'integer'`, `'number'`, `'boolean'`, `'datetime'`, `'file'`, `'password'`, `'copy'`, `'code'`) | The type of this value. Use `string` for basic text input, `text` for a large, `<textarea>` style box, and `code` for a `<textarea>` with a fixed-width font. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.
 `required` | no | `boolean` | If this value is required or not.
 `dynamic` | no | [/RefResourceSchema](#refresourceschema) | A reference to a trigger that will power a dynamic dropdown.
diff --git a/packages/schema/exported-schema.json b/packages/schema/exported-schema.json
index 5923de271..2c60a82cf 100644
--- a/packages/schema/exported-schema.json
+++ b/packages/schema/exported-schema.json
@@ -610,6 +610,12 @@
           "type": "string",
           "minLength": 1
         },
+        "helpText": {
+          "description": "A human readable description of this value (IE: \"The first part of a full name.\"). You can use Markdown.",
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 1000
+        },
         "type": {
           "description": "The type of this value. Use `string` for basic text input, `text` for a large, `<textarea>` style box, and `code` for a `<textarea>` with a fixed-width font. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.",
           "type": "string",
diff --git a/packages/schema/lib/schemas/InputFieldSchema.js b/packages/schema/lib/schemas/InputFieldSchema.js
index f26f086fa..7c0bc3207 100644
--- a/packages/schema/lib/schemas/InputFieldSchema.js
+++ b/packages/schema/lib/schemas/InputFieldSchema.js
@@ -25,6 +25,13 @@ module.exports = makeSchema(
         type: 'string',
         minLength: 1,
       },
+      helpText: {
+        description:
+          'A human readable description of this value (IE: "The first part of a full name."). You can use Markdown.',
+        type: 'string',
+        minLength: 1,
+        maxLength: 1000,
+      },
       type: {
         description:
           'The type of this value. Use `string` for basic text input, `text` for a large, `<textarea>` style box, and `code` for a `<textarea>` with a fixed-width font. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.',

From 6437724461ea7579be296dc59f863dc588666410 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Sun, 2 Feb 2025 20:39:46 -0500
Subject: [PATCH 41/60] update type enums for better fit

---
 packages/core/types/zapier.generated.d.ts      | 18 ++----------------
 packages/schema/docs/build/schema.md           |  8 ++++----
 packages/schema/exported-schema.json           |  4 +---
 packages/schema/lib/schemas/AuthFieldSchema.js | 10 +---------
 .../schema/lib/schemas/OutputFieldSchema.js    | 15 +++------------
 5 files changed, 11 insertions(+), 44 deletions(-)

diff --git a/packages/core/types/zapier.generated.d.ts b/packages/core/types/zapier.generated.d.ts
index 0deefaeed..376081c92 100644
--- a/packages/core/types/zapier.generated.d.ts
+++ b/packages/core/types/zapier.generated.d.ts
@@ -226,14 +226,7 @@ export interface AuthField {
    * Zapier will automatically make a GET for that file. Otherwise, a
    * .txt file will be generated.
    */
-  type?:
-    | 'string'
-    | 'number'
-    | 'boolean'
-    | 'datetime'
-    | 'password'
-    | 'copy'
-    | 'code';
+  type?: 'string' | 'number' | 'boolean' | 'datetime' | 'password' | 'copy';
 
   /** If this value is required or not. This defaults to True. */
   required?: boolean;
@@ -654,14 +647,7 @@ export interface OutputField {
    * Zapier will automatically make a GET for that file. Otherwise, a
    * .txt file will be generated.
    */
-  type?:
-    | 'string'
-    | 'number'
-    | 'boolean'
-    | 'integer'
-    | 'datetime'
-    | 'file'
-    | 'password';
+  type?: 'string' | 'number' | 'boolean' | 'datetime' | 'file' | 'password';
 
   /** If this value is required or not. */
   required?: boolean;
diff --git a/packages/schema/docs/build/schema.md b/packages/schema/docs/build/schema.md
index 315d24790..71918c550 100644
--- a/packages/schema/docs/build/schema.md
+++ b/packages/schema/docs/build/schema.md
@@ -164,7 +164,7 @@ Key | Required | Type | Description
 `isNotSecret` | no | `boolean` | Indicates if this authentication field is safe (not secret).
 `label` | no | `string` | A human readable label for this value (IE: "First Name").
 `helpText` | no | `string` | A human readable description of this value (IE: "The first part of a full name."). You can use Markdown.
-`type` | no | `string` in (`'string'`, `'number'`, `'boolean'`, `'datetime'`, `'password'`, `'copy'`, `'code'`) | The type of this value. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.
+`type` | no | `string` in (`'string'`, `'number'`, `'boolean'`, `'datetime'`, `'password'`, `'copy'`) | The type of this value. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.
 `required` | no | `boolean` | If this value is required or not. This defaults to True.
 `placeholder` | no | `string` | An example value that is not saved.
 `list` | no | `boolean` | Can a user provide multiples of this field?
@@ -1336,7 +1336,7 @@ Key | Required | Type | Description
 --- | -------- | ---- | -----------
 `key` | **yes** | `string` | A unique machine readable key for this value (IE: "fname").
 `label` | no | `string` | A human readable label for this value (IE: "First Name").
-`type` | no | `string` in (`'string'`, `'number'`, `'boolean'`, `'integer'`, `'datetime'`, `'file'`, `'password'`) | The type of this value. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.
+`type` | no | `string` in (`'string'`, `'number'`, `'boolean'`, `'datetime'`, `'file'`, `'password'`) | The type of this value. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.
 `required` | no | `boolean` | If this value is required or not.
 `primary` | no | `boolean` | Use this field as part of the primary key for deduplication. You can set multiple fields as "primary", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).
 `list` | no | `boolean` | Can a user provide multiples of this field?
@@ -1347,8 +1347,8 @@ Key | Required | Type | Description
 
 * `{ key: 'abc' }`
 * `{ key: 'abc', children: [ { key: 'abc' } ] }`
-* `{ key: 'abc', type: 'integer', label: 'neat' }`
-* `{ key: 'abc', type: 'integer' }`
+* `{ key: 'abc', type: 'number', label: 'neat' }`
+* `{ key: 'abc', type: 'number' }`
 
 #### Anti-Examples
 
diff --git a/packages/schema/exported-schema.json b/packages/schema/exported-schema.json
index 2c60a82cf..d9d04423a 100644
--- a/packages/schema/exported-schema.json
+++ b/packages/schema/exported-schema.json
@@ -208,8 +208,7 @@
             "boolean",
             "datetime",
             "password",
-            "copy",
-            "code"
+            "copy"
           ]
         },
         "required": {
@@ -703,7 +702,6 @@
             "string",
             "number",
             "boolean",
-            "integer",
             "datetime",
             "file",
             "password"
diff --git a/packages/schema/lib/schemas/AuthFieldSchema.js b/packages/schema/lib/schemas/AuthFieldSchema.js
index 48d7348b7..e811768e1 100644
--- a/packages/schema/lib/schemas/AuthFieldSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldSchema.js
@@ -39,15 +39,7 @@ module.exports = makeSchema({
       // text == a long textarea string
       // integer == int
       // number == float
-      enum: [
-        'string',
-        'number',
-        'boolean',
-        'datetime',
-        'password',
-        'copy',
-        'code',
-      ],
+      enum: ['string', 'number', 'boolean', 'datetime', 'password', 'copy'],
     },
     required: {
       description: 'If this value is required or not. This defaults to True.',
diff --git a/packages/schema/lib/schemas/OutputFieldSchema.js b/packages/schema/lib/schemas/OutputFieldSchema.js
index 1738b3168..c4d0535bf 100644
--- a/packages/schema/lib/schemas/OutputFieldSchema.js
+++ b/packages/schema/lib/schemas/OutputFieldSchema.js
@@ -29,17 +29,8 @@ module.exports = makeSchema(
           'The type of this value. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.',
         type: 'string',
         // string == unicode
-        // integer == int
         // number == float
-        enum: [
-          'string',
-          'number',
-          'boolean',
-          'integer',
-          'datetime',
-          'file',
-          'password',
-        ],
+        enum: ['string', 'number', 'boolean', 'datetime', 'file', 'password'],
       },
       required: {
         description: 'If this value is required or not.',
@@ -69,8 +60,8 @@ module.exports = makeSchema(
     examples: [
       { key: 'abc' },
       { key: 'abc', children: [{ key: 'abc' }] },
-      { key: 'abc', type: 'integer', label: 'neat' },
-      { key: 'abc', type: 'integer' },
+      { key: 'abc', type: 'number', label: 'neat' },
+      { key: 'abc', type: 'number' },
     ],
     antiExamples: [
       {

From ea1ef6c2e57e29a310916bdda65fbd73b0fc17c6 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Mon, 3 Feb 2025 10:01:47 -0500
Subject: [PATCH 42/60] apply PR suggestions

---
 packages/core/types/zapier.generated.d.ts     | 19 ++++++++++---------
 packages/schema/docs/build/schema.md          |  7 ++++---
 packages/schema/exported-schema.json          | 13 +++++++++----
 .../functional-constraints/AuthFieldisSafe.js |  7 +++++--
 .../schema/lib/schemas/AuthFieldSchema.js     | 17 ++++++++++-------
 5 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/packages/core/types/zapier.generated.d.ts b/packages/core/types/zapier.generated.d.ts
index 376081c92..1287b6bcd 100644
--- a/packages/core/types/zapier.generated.d.ts
+++ b/packages/core/types/zapier.generated.d.ts
@@ -207,9 +207,10 @@ export interface AuthField {
   key: string;
 
   /**
-   * Indicates if this authentication field is safe (not secret).
+   * Indicates if this authentication field is safe to e.g. be stored
+   * without encryption or displayed (not a secret).
    */
-  isNotSecret?: boolean;
+  isNoSecret?: boolean;
 
   /** A human readable label for this value (IE: "First Name"). */
   label?: string;
@@ -220,20 +221,20 @@ export interface AuthField {
    */
   helpText?: string;
 
-  /**
-   * The type of this value. Field type of `file` will accept either a
-   * file object or a string. If a URL is provided in the string,
-   * Zapier will automatically make a GET for that file. Otherwise, a
-   * .txt file will be generated.
-   */
+  /** The type of this value used to be. */
   type?: 'string' | 'number' | 'boolean' | 'datetime' | 'password' | 'copy';
 
-  /** If this value is required or not. This defaults to True. */
+  /** If this value is required or not. This defaults to `true`. */
   required?: boolean;
 
   /** An example value that is not saved. */
   placeholder?: string;
 
+  /**
+   * A default value that is saved the first time a Zap is created.
+   */
+  default?: string;
+
   /** Can a user provide multiples of this field? */
   list?: boolean;
 
diff --git a/packages/schema/docs/build/schema.md b/packages/schema/docs/build/schema.md
index 71918c550..ff6829eea 100644
--- a/packages/schema/docs/build/schema.md
+++ b/packages/schema/docs/build/schema.md
@@ -161,12 +161,13 @@ Field schema specialized for authentication fields.
 Key | Required | Type | Description
 --- | -------- | ---- | -----------
 `key` | **yes** | `string` | A unique machine readable key for this value (IE: "fname").
-`isNotSecret` | no | `boolean` | Indicates if this authentication field is safe (not secret).
+`isNoSecret` | no | `boolean` | Indicates if this authentication field is safe to e.g. be stored without encryption or displayed (not a secret).
 `label` | no | `string` | A human readable label for this value (IE: "First Name").
 `helpText` | no | `string` | A human readable description of this value (IE: "The first part of a full name."). You can use Markdown.
-`type` | no | `string` in (`'string'`, `'number'`, `'boolean'`, `'datetime'`, `'password'`, `'copy'`) | The type of this value. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.
-`required` | no | `boolean` | If this value is required or not. This defaults to True.
+`type` | no | `string` in (`'string'`, `'number'`, `'boolean'`, `'datetime'`, `'password'`, `'copy'`) | The type of this value used to be.
+`required` | no | `boolean` | If this value is required or not. This defaults to `true`.
 `placeholder` | no | `string` | An example value that is not saved.
+`default` | no | `string` | A default value that is saved the first time a Zap is created.
 `list` | no | `boolean` | Can a user provide multiples of this field?
 `children` | no | `array`[[/AuthFieldSchema](#authfieldschema)] | An array of child fields that define the structure of a sub-object for this field. Usually used for line items.
 `dict` | no | `boolean` | Is this field a key/value input?
diff --git a/packages/schema/exported-schema.json b/packages/schema/exported-schema.json
index d9d04423a..e2cc5a0e5 100644
--- a/packages/schema/exported-schema.json
+++ b/packages/schema/exported-schema.json
@@ -184,8 +184,8 @@
           "type": "string",
           "minLength": 1
         },
-        "isNotSecret": {
-          "description": "Indicates if this authentication field is safe (not secret).",
+        "isNoSecret": {
+          "description": "Indicates if this authentication field is safe to e.g. be stored without encryption or displayed (not a secret).",
           "type": "boolean"
         },
         "label": {
@@ -200,7 +200,7 @@
           "maxLength": 1000
         },
         "type": {
-          "description": "The type of this value. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.",
+          "description": "The type of this value used to be.",
           "type": "string",
           "enum": [
             "string",
@@ -212,7 +212,7 @@
           ]
         },
         "required": {
-          "description": "If this value is required or not. This defaults to True.",
+          "description": "If this value is required or not. This defaults to `true`.",
           "type": "boolean"
         },
         "placeholder": {
@@ -220,6 +220,11 @@
           "type": "string",
           "minLength": 1
         },
+        "default": {
+          "description": "A default value that is saved the first time a Zap is created.",
+          "type": "string",
+          "minLength": 1
+        },
         "list": {
           "description": "Can a user provide multiples of this field?",
           "type": "boolean"
diff --git a/packages/schema/lib/functional-constraints/AuthFieldisSafe.js b/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
index add6ad520..dc95ab217 100644
--- a/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
+++ b/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
@@ -31,8 +31,11 @@ const checkAuthField = (field) => {
   const errors = [];
 
   // if the field key contains any forbidden substring (case-insensitive),
-  // AND 'isSecret' is true, throw a validation error
-  if (isSensitiveKey(field.key) && field.isNotSecret === true) {
+  // AND 'isNoSecret' is true, throw a validation error
+  if (
+    (field.key === 'password' || isSensitiveKey(field.key)) &&
+    field.isNotSecret === true
+  ) {
     errors.push(
       new jsonschema.ValidationError(
         `cannot set isNotSecret as true for the sensitive key "${field.key}".`,
diff --git a/packages/schema/lib/schemas/AuthFieldSchema.js b/packages/schema/lib/schemas/AuthFieldSchema.js
index e811768e1..6c39cd24d 100644
--- a/packages/schema/lib/schemas/AuthFieldSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldSchema.js
@@ -14,9 +14,9 @@ module.exports = makeSchema({
       type: 'string',
       minLength: 1,
     },
-    isNotSecret: {
+    isNoSecret: {
       description:
-        'Indicates if this authentication field is safe (not secret).',
+        'Indicates if this authentication field is safe to e.g. be stored without encryption or displayed (not a secret).',
       type: 'boolean',
     },
     label: {
@@ -32,17 +32,14 @@ module.exports = makeSchema({
       maxLength: 1000,
     },
     type: {
-      description:
-        'The type of this value. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.',
+      description: 'The type of this value used to be.',
       type: 'string',
       // string == unicode
-      // text == a long textarea string
-      // integer == int
       // number == float
       enum: ['string', 'number', 'boolean', 'datetime', 'password', 'copy'],
     },
     required: {
-      description: 'If this value is required or not. This defaults to True.',
+      description: 'If this value is required or not. This defaults to `true`.',
       type: 'boolean',
     },
     placeholder: {
@@ -50,6 +47,12 @@ module.exports = makeSchema({
       type: 'string',
       minLength: 1,
     },
+    default: {
+      description:
+        'A default value that is saved the first time a Zap is created.',
+      type: 'string',
+      minLength: 1,
+    },
     list: {
       description: 'Can a user provide multiples of this field?',
       type: 'boolean',

From e8e8db5c2964cb50cfc189b34be10f1af09419f8 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Mon, 3 Feb 2025 10:04:17 -0500
Subject: [PATCH 43/60] apply PR suggestions

---
 packages/schema/docs/build/schema.md          | 30 +++++++++----------
 .../functional-constraints/AuthFieldisSafe.js |  4 +--
 .../schema/lib/schemas/AuthFieldSchema.js     | 12 ++++----
 .../schema/lib/schemas/AuthFieldsSchema.js    | 25 +++++++---------
 packages/schema/test/index.js                 | 12 ++++----
 5 files changed, 40 insertions(+), 43 deletions(-)

diff --git a/packages/schema/docs/build/schema.md b/packages/schema/docs/build/schema.md
index ff6829eea..9a2473192 100644
--- a/packages/schema/docs/build/schema.md
+++ b/packages/schema/docs/build/schema.md
@@ -175,15 +175,15 @@ Key | Required | Type | Description
 
 #### Examples
 
-* `{ key: 'email', type: 'string', isNotSecret: true, required: true }`
-* `{ key: 'password', type: 'password', isNotSecret: false, required: true }`
-* `{ key: 'api_key', type: 'string', isNotSecret: false, required: true }`
+* `{ key: 'email', type: 'string', isNoSecret: true, required: true }`
+* `{ key: 'password', type: 'password', isNoSecret: false, required: true }`
+* `{ key: 'api_key', type: 'string', isNoSecret: false, required: true }`
 
 #### Anti-Examples
 
-* `{ key: 'password', type: 'password', isNotSecret: true, required: true }` - _A "password" field cannot have isSafe = true._
-* `{ key: 'api_key', isNotSecret: true }` - _"api_key" is a sensitive field and cannot have isSafe set as true._
-* `{ type: 'string', isNotSecret: false }` - _Missing required key: key_
+* `{ key: 'password', type: 'password', isNoSecret: true, required: true }` - _A "password" field cannot have isSafe = true._
+* `{ key: 'api_key', isNoSecret: true }` - _"api_key" is a sensitive field and cannot have isSafe set as true._
+* `{ type: 'string', isNoSecret: false }` - _Missing required key: key_
 
 -----
 
@@ -201,26 +201,26 @@ An array or collection of authentication fields.
 
 * ```
   [
-    { key: 'username', type: 'string', isNotSecret: true, required: true },
-    { key: 'password', type: 'password', isNotSecret: false, required: true }
+    { key: 'username', type: 'string', isNoSecret: true, required: true },
+    { key: 'password', type: 'password', isNoSecret: false, required: true }
   ]
   ```
-* `[ { key: 'api_key', type: 'string', isNotSecret: false, required: true } ]`
+* `[ { key: 'api_key', type: 'string', isNoSecret: false, required: true } ]`
 * ```
   [
-    { key: 'email', type: 'string', isNotSecret: true },
+    { key: 'email', type: 'string', isNoSecret: true },
     { key: 'password', type: 'password', required: true },
-    { key: 'mfa_token', type: 'string', isNotSecret: false }
+    { key: 'mfa_token', type: 'string', isNoSecret: false }
   ]
   ```
 
 #### Anti-Examples
 
 * `{}` - _Must be an array (currently an object)._
-* `[ { key: 'password', isNotSecret: true } ]` - _"password" is a sensitive field and cannot have isNotSecret set as true._
-* `[ { key: 'api_key', isNotSecret: true } ]` - _"api_key" is a sensitive field and cannot have isNotSecret set as true._
-* `[ { isNotSecret: false } ]` - _Missing required "key" property._
-* `[ { key: 'username', type: 'string', isNotSecret: true }, 12345 ]` - _Array item 12345 is not an object (must match AuthFieldSchema)._
+* `[ { key: 'password', isNoSecret: true } ]` - _"password" is a sensitive field and cannot have isNoSecret set as true._
+* `[ { key: 'api_key', isNoSecret: true } ]` - _"api_key" is a sensitive field and cannot have isNoSecret set as true._
+* `[ { isNoSecret: false } ]` - _Missing required "key" property._
+* `[ { key: 'username', type: 'string', isNoSecret: true }, 12345 ]` - _Array item 12345 is not an object (must match AuthFieldSchema)._
 
 -----
 
diff --git a/packages/schema/lib/functional-constraints/AuthFieldisSafe.js b/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
index dc95ab217..7f9e9bed8 100644
--- a/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
+++ b/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
@@ -34,11 +34,11 @@ const checkAuthField = (field) => {
   // AND 'isNoSecret' is true, throw a validation error
   if (
     (field.key === 'password' || isSensitiveKey(field.key)) &&
-    field.isNotSecret === true
+    field.isNoSecret === true
   ) {
     errors.push(
       new jsonschema.ValidationError(
-        `cannot set isNotSecret as true for the sensitive key "${field.key}".`,
+        `cannot set isNoSecret as true for the sensitive key "${field.key}".`,
         field,
         '/AuthFieldSchema',
         'instance.field',
diff --git a/packages/schema/lib/schemas/AuthFieldSchema.js b/packages/schema/lib/schemas/AuthFieldSchema.js
index 6c39cd24d..b6eafeeb6 100644
--- a/packages/schema/lib/schemas/AuthFieldSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldSchema.js
@@ -83,13 +83,13 @@ module.exports = makeSchema({
     {
       key: 'email',
       type: 'string',
-      isNotSecret: true,
+      isNoSecret: true,
       required: true,
     },
     {
       key: 'password',
       type: 'password',
-      isNotSecret: false,
+      isNoSecret: false,
       required: true,
     },
 
@@ -97,7 +97,7 @@ module.exports = makeSchema({
     {
       key: 'api_key',
       type: 'string',
-      isNotSecret: false,
+      isNoSecret: false,
       required: true,
     },
   ],
@@ -107,7 +107,7 @@ module.exports = makeSchema({
       example: {
         key: 'password',
         type: 'password',
-        isNotSecret: true,
+        isNoSecret: true,
         required: true,
       },
       reason: 'A "password" field cannot have isSafe = true.',
@@ -115,7 +115,7 @@ module.exports = makeSchema({
     {
       example: {
         key: 'api_key',
-        isNotSecret: true,
+        isNoSecret: true,
       },
       reason:
         '"api_key" is a sensitive field and cannot have isSafe set as true.',
@@ -123,7 +123,7 @@ module.exports = makeSchema({
     {
       example: {
         type: 'string',
-        isNotSecret: false,
+        isNoSecret: false,
       },
       reason: 'Missing required key: key',
     },
diff --git a/packages/schema/lib/schemas/AuthFieldsSchema.js b/packages/schema/lib/schemas/AuthFieldsSchema.js
index fb8fd62da..d4dbbaf31 100644
--- a/packages/schema/lib/schemas/AuthFieldsSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldsSchema.js
@@ -16,23 +16,23 @@ module.exports = makeSchema(
     examples: [
       // 1) Basic Auth: username (safe) + password (not safe)
       [
-        { key: 'username', type: 'string', isNotSecret: true, required: true },
+        { key: 'username', type: 'string', isNoSecret: true, required: true },
         {
           key: 'password',
           type: 'password',
-          isNotSecret: false,
+          isNoSecret: false,
           required: true,
         },
       ],
 
       // 2) Just a single auth field for custom usage (e.g., api_key)
-      [{ key: 'api_key', type: 'string', isNotSecret: false, required: true }],
+      [{ key: 'api_key', type: 'string', isNoSecret: false, required: true }],
 
       // 3) Mix of fields for extended usage
       [
-        { key: 'email', type: 'string', isNotSecret: true },
+        { key: 'email', type: 'string', isNoSecret: true },
         { key: 'password', type: 'password', required: true },
-        { key: 'mfa_token', type: 'string', isNotSecret: false },
+        { key: 'mfa_token', type: 'string', isNoSecret: false },
       ],
     ],
 
@@ -43,24 +43,21 @@ module.exports = makeSchema(
         reason: 'Must be an array (currently an object).',
       },
       {
-        example: [{ key: 'password', isNotSecret: true }],
+        example: [{ key: 'password', isNoSecret: true }],
         reason:
-          '"password" is a sensitive field and cannot have isNotSecret set as true.',
+          '"password" is a sensitive field and cannot have isNoSecret set as true.',
       },
       {
-        example: [{ key: 'api_key', isNotSecret: true }],
+        example: [{ key: 'api_key', isNoSecret: true }],
         reason:
-          '"api_key" is a sensitive field and cannot have isNotSecret set as true.',
+          '"api_key" is a sensitive field and cannot have isNoSecret set as true.',
       },
       {
-        example: [{ isNotSecret: false }],
+        example: [{ isNoSecret: false }],
         reason: 'Missing required "key" property.',
       },
       {
-        example: [
-          { key: 'username', type: 'string', isNotSecret: true },
-          12345,
-        ],
+        example: [{ key: 'username', type: 'string', isNoSecret: true }, 12345],
         reason:
           'Array item 12345 is not an object (must match AuthFieldSchema).',
       },
diff --git a/packages/schema/test/index.js b/packages/schema/test/index.js
index af678876b..bc519aae9 100644
--- a/packages/schema/test/index.js
+++ b/packages/schema/test/index.js
@@ -241,13 +241,13 @@ describe('app', () => {
           {
             key: 'username',
             type: 'string',
-            isNotSecret: true, // allowed
+            isNoSecret: true, // allowed
             required: true,
           },
           {
             key: 'password',
             type: 'password',
-            isNotSecret: false, // password is not safe
+            isNoSecret: false, // password is not safe
             required: true,
           },
         ],
@@ -263,7 +263,7 @@ describe('app', () => {
     it('should invalidate a "safe" password field', () => {
       const appCopy = copy(appDefinition);
 
-      // Same "custom" auth but now marking "password" as isNotSecret=true
+      // Same "custom" auth but now marking "password" as isNoSecret=true
       appCopy.authentication = {
         type: 'custom',
         test: {
@@ -273,7 +273,7 @@ describe('app', () => {
           {
             key: 'password',
             type: 'string',
-            isNotSecret: true, // invalid: password cannot be safe
+            isNoSecret: true, // invalid: password cannot be safe
             required: true,
           },
         ],
@@ -281,7 +281,7 @@ describe('app', () => {
 
       const results = schema.validateAppDefinition(appCopy);
 
-      // Expect at least one error because "password" can't have isNotSecret = true
+      // Expect at least one error because "password" can't have isNoSecret = true
       results.errors.should.have.length(1);
       should(results.valid).eql(false);
 
@@ -289,7 +289,7 @@ describe('app', () => {
       console.log(error);
       error.name.should.equal('sensitive');
       error.stack.should.eql(
-        'instance.authentication.fields[0] cannot set isNotSecret as true for the sensitive key "password".',
+        'instance.authentication.fields[0] cannot set isNoSecret as true for the sensitive key "password".',
       );
     });
   });

From e8fa2dfb6d1ed3685ba9b44a7c55593c02c42a11 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Mon, 3 Feb 2025 10:15:37 -0500
Subject: [PATCH 44/60] remove copy from auth types

---
 packages/core/types/zapier.generated.d.ts      | 2 +-
 packages/schema/docs/build/schema.md           | 2 +-
 packages/schema/exported-schema.json           | 9 +--------
 packages/schema/lib/schemas/AuthFieldSchema.js | 2 +-
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/packages/core/types/zapier.generated.d.ts b/packages/core/types/zapier.generated.d.ts
index 1287b6bcd..0ffa259f0 100644
--- a/packages/core/types/zapier.generated.d.ts
+++ b/packages/core/types/zapier.generated.d.ts
@@ -222,7 +222,7 @@ export interface AuthField {
   helpText?: string;
 
   /** The type of this value used to be. */
-  type?: 'string' | 'number' | 'boolean' | 'datetime' | 'password' | 'copy';
+  type?: 'string' | 'number' | 'boolean' | 'datetime' | 'password';
 
   /** If this value is required or not. This defaults to `true`. */
   required?: boolean;
diff --git a/packages/schema/docs/build/schema.md b/packages/schema/docs/build/schema.md
index 9a2473192..5e4bd090f 100644
--- a/packages/schema/docs/build/schema.md
+++ b/packages/schema/docs/build/schema.md
@@ -164,7 +164,7 @@ Key | Required | Type | Description
 `isNoSecret` | no | `boolean` | Indicates if this authentication field is safe to e.g. be stored without encryption or displayed (not a secret).
 `label` | no | `string` | A human readable label for this value (IE: "First Name").
 `helpText` | no | `string` | A human readable description of this value (IE: "The first part of a full name."). You can use Markdown.
-`type` | no | `string` in (`'string'`, `'number'`, `'boolean'`, `'datetime'`, `'password'`, `'copy'`) | The type of this value used to be.
+`type` | no | `string` in (`'string'`, `'number'`, `'boolean'`, `'datetime'`, `'password'`) | The type of this value used to be.
 `required` | no | `boolean` | If this value is required or not. This defaults to `true`.
 `placeholder` | no | `string` | An example value that is not saved.
 `default` | no | `string` | A default value that is saved the first time a Zap is created.
diff --git a/packages/schema/exported-schema.json b/packages/schema/exported-schema.json
index e2cc5a0e5..8643ec39a 100644
--- a/packages/schema/exported-schema.json
+++ b/packages/schema/exported-schema.json
@@ -202,14 +202,7 @@
         "type": {
           "description": "The type of this value used to be.",
           "type": "string",
-          "enum": [
-            "string",
-            "number",
-            "boolean",
-            "datetime",
-            "password",
-            "copy"
-          ]
+          "enum": ["string", "number", "boolean", "datetime", "password"]
         },
         "required": {
           "description": "If this value is required or not. This defaults to `true`.",
diff --git a/packages/schema/lib/schemas/AuthFieldSchema.js b/packages/schema/lib/schemas/AuthFieldSchema.js
index b6eafeeb6..75e37222d 100644
--- a/packages/schema/lib/schemas/AuthFieldSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldSchema.js
@@ -36,7 +36,7 @@ module.exports = makeSchema({
       type: 'string',
       // string == unicode
       // number == float
-      enum: ['string', 'number', 'boolean', 'datetime', 'password', 'copy'],
+      enum: ['string', 'number', 'boolean', 'datetime', 'password'],
     },
     required: {
       description: 'If this value is required or not. This defaults to `true`.',

From 2dbcbb1dbaeb11061a89a80dcda21cb301b8e821 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Mon, 3 Feb 2025 10:26:25 -0500
Subject: [PATCH 45/60] add default back to input and output schema

---
 packages/core/types/zapier.generated.d.ts        | 10 ++++++++++
 packages/schema/docs/build/schema.md             |  2 ++
 packages/schema/exported-schema.json             | 10 ++++++++++
 packages/schema/lib/schemas/AuthFieldSchema.js   |  2 --
 packages/schema/lib/schemas/InputFieldSchema.js  |  6 ++++++
 packages/schema/lib/schemas/OutputFieldSchema.js |  6 ++++++
 6 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/packages/core/types/zapier.generated.d.ts b/packages/core/types/zapier.generated.d.ts
index 0ffa259f0..265bd488e 100644
--- a/packages/core/types/zapier.generated.d.ts
+++ b/packages/core/types/zapier.generated.d.ts
@@ -607,6 +607,11 @@ export interface InputField {
    */
   children?: InputField[];
 
+  /**
+   * A default value that is saved the first time a Zap is created.
+   */
+  default?: string;
+
   /** Is this field a key/value input? */
   dict?: boolean;
 
@@ -665,6 +670,11 @@ export interface OutputField {
    */
   primary?: boolean;
 
+  /**
+   * A default value that is saved the first time a Zap is created.
+   */
+  default?: string;
+
   /** Can a user provide multiples of this field? */
   list?: boolean;
 
diff --git a/packages/schema/docs/build/schema.md b/packages/schema/docs/build/schema.md
index 5e4bd090f..b1d6dedff 100644
--- a/packages/schema/docs/build/schema.md
+++ b/packages/schema/docs/build/schema.md
@@ -1211,6 +1211,7 @@ Key | Required | Type | Description
 `choices` | no | [/FieldChoicesSchema](#fieldchoicesschema) | An object of machine keys and human values to populate a static dropdown.
 `list` | no | `boolean` | Can a user provide multiples of this field?
 `children` | no | `array`[[/InputFieldSchema](#inputfieldschema)] | An array of child fields that define the structure of a sub-object for this field. Usually used for line items.
+`default` | no | `string` | A default value that is saved the first time a Zap is created.
 `dict` | no | `boolean` | Is this field a key/value input?
 `altersDynamicFields` | no | `boolean` | Does the value of this field affect the definitions of other fields in the set?
 `inputFormat` | no | `string` | Useful when you expect the input to be part of a longer string. Put "{{input}}" in place of the user's input (IE: "https://{{input}}.yourdomain.com").
@@ -1340,6 +1341,7 @@ Key | Required | Type | Description
 `type` | no | `string` in (`'string'`, `'number'`, `'boolean'`, `'datetime'`, `'file'`, `'password'`) | The type of this value. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.
 `required` | no | `boolean` | If this value is required or not.
 `primary` | no | `boolean` | Use this field as part of the primary key for deduplication. You can set multiple fields as "primary", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).
+`default` | no | `string` | A default value that is saved the first time a Zap is created.
 `list` | no | `boolean` | Can a user provide multiples of this field?
 `children` | no | `array`[[/OutputFieldSchema](#outputfieldschema)] | An array of child fields that define the structure of a sub-object for this field. Usually used for line items.
 `dict` | no | `boolean` | Is this field a key/value output?
diff --git a/packages/schema/exported-schema.json b/packages/schema/exported-schema.json
index 8643ec39a..941151021 100644
--- a/packages/schema/exported-schema.json
+++ b/packages/schema/exported-schema.json
@@ -657,6 +657,11 @@
           "description": "An array of child fields that define the structure of a sub-object for this field. Usually used for line items.",
           "minItems": 1
         },
+        "default": {
+          "description": "A default value that is saved the first time a Zap is created.",
+          "type": "string",
+          "minLength": 1
+        },
         "dict": {
           "description": "Is this field a key/value input?",
           "type": "boolean"
@@ -713,6 +718,11 @@
           "description": "Use this field as part of the primary key for deduplication. You can set multiple fields as \"primary\", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).",
           "type": "boolean"
         },
+        "default": {
+          "description": "A default value that is saved the first time a Zap is created.",
+          "type": "string",
+          "minLength": 1
+        },
         "list": {
           "description": "Can a user provide multiples of this field?",
           "type": "boolean"
diff --git a/packages/schema/lib/schemas/AuthFieldSchema.js b/packages/schema/lib/schemas/AuthFieldSchema.js
index 75e37222d..b9dd1542f 100644
--- a/packages/schema/lib/schemas/AuthFieldSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldSchema.js
@@ -34,8 +34,6 @@ module.exports = makeSchema({
     type: {
       description: 'The type of this value used to be.',
       type: 'string',
-      // string == unicode
-      // number == float
       enum: ['string', 'number', 'boolean', 'datetime', 'password'],
     },
     required: {
diff --git a/packages/schema/lib/schemas/InputFieldSchema.js b/packages/schema/lib/schemas/InputFieldSchema.js
index 7c0bc3207..e4026fb8b 100644
--- a/packages/schema/lib/schemas/InputFieldSchema.js
+++ b/packages/schema/lib/schemas/InputFieldSchema.js
@@ -83,6 +83,12 @@ module.exports = makeSchema(
           'An array of child fields that define the structure of a sub-object for this field. Usually used for line items.',
         minItems: 1,
       },
+      default: {
+        description:
+          'A default value that is saved the first time a Zap is created.',
+        type: 'string',
+        minLength: 1,
+      },
       dict: {
         description: 'Is this field a key/value input?',
         type: 'boolean',
diff --git a/packages/schema/lib/schemas/OutputFieldSchema.js b/packages/schema/lib/schemas/OutputFieldSchema.js
index c4d0535bf..06dbd63fa 100644
--- a/packages/schema/lib/schemas/OutputFieldSchema.js
+++ b/packages/schema/lib/schemas/OutputFieldSchema.js
@@ -41,6 +41,12 @@ module.exports = makeSchema(
           'Use this field as part of the primary key for deduplication. You can set multiple fields as "primary", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).',
         type: 'boolean',
       },
+      default: {
+        description:
+          'A default value that is saved the first time a Zap is created.',
+        type: 'string',
+        minLength: 1,
+      },
       list: {
         description: 'Can a user provide multiples of this field?',
         type: 'boolean',

From 83e6d7dd6eaad8aa7367b43e55bb068fb0dfa794 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Mon, 3 Feb 2025 10:30:42 -0500
Subject: [PATCH 46/60] update docs

---
 packages/core/types/zapier.generated.d.ts        | 8 ++------
 packages/schema/docs/build/schema.md             | 4 ++--
 packages/schema/exported-schema.json             | 4 ++--
 packages/schema/lib/schemas/AuthFieldSchema.js   | 3 +--
 packages/schema/lib/schemas/OutputFieldSchema.js | 3 +--
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/packages/core/types/zapier.generated.d.ts b/packages/core/types/zapier.generated.d.ts
index 265bd488e..dc6b2140a 100644
--- a/packages/core/types/zapier.generated.d.ts
+++ b/packages/core/types/zapier.generated.d.ts
@@ -230,9 +230,7 @@ export interface AuthField {
   /** An example value that is not saved. */
   placeholder?: string;
 
-  /**
-   * A default value that is saved the first time a Zap is created.
-   */
+  /** A default value for authentication field. */
   default?: string;
 
   /** Can a user provide multiples of this field? */
@@ -670,9 +668,7 @@ export interface OutputField {
    */
   primary?: boolean;
 
-  /**
-   * A default value that is saved the first time a Zap is created.
-   */
+  /** A default value for an output field. */
   default?: string;
 
   /** Can a user provide multiples of this field? */
diff --git a/packages/schema/docs/build/schema.md b/packages/schema/docs/build/schema.md
index b1d6dedff..864ab03da 100644
--- a/packages/schema/docs/build/schema.md
+++ b/packages/schema/docs/build/schema.md
@@ -167,7 +167,7 @@ Key | Required | Type | Description
 `type` | no | `string` in (`'string'`, `'number'`, `'boolean'`, `'datetime'`, `'password'`) | The type of this value used to be.
 `required` | no | `boolean` | If this value is required or not. This defaults to `true`.
 `placeholder` | no | `string` | An example value that is not saved.
-`default` | no | `string` | A default value that is saved the first time a Zap is created.
+`default` | no | `string` | A default value for authentication field.
 `list` | no | `boolean` | Can a user provide multiples of this field?
 `children` | no | `array`[[/AuthFieldSchema](#authfieldschema)] | An array of child fields that define the structure of a sub-object for this field. Usually used for line items.
 `dict` | no | `boolean` | Is this field a key/value input?
@@ -1341,7 +1341,7 @@ Key | Required | Type | Description
 `type` | no | `string` in (`'string'`, `'number'`, `'boolean'`, `'datetime'`, `'file'`, `'password'`) | The type of this value. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.
 `required` | no | `boolean` | If this value is required or not.
 `primary` | no | `boolean` | Use this field as part of the primary key for deduplication. You can set multiple fields as "primary", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).
-`default` | no | `string` | A default value that is saved the first time a Zap is created.
+`default` | no | `string` | A default value for an output field.
 `list` | no | `boolean` | Can a user provide multiples of this field?
 `children` | no | `array`[[/OutputFieldSchema](#outputfieldschema)] | An array of child fields that define the structure of a sub-object for this field. Usually used for line items.
 `dict` | no | `boolean` | Is this field a key/value output?
diff --git a/packages/schema/exported-schema.json b/packages/schema/exported-schema.json
index 941151021..75ee9a73f 100644
--- a/packages/schema/exported-schema.json
+++ b/packages/schema/exported-schema.json
@@ -214,7 +214,7 @@
           "minLength": 1
         },
         "default": {
-          "description": "A default value that is saved the first time a Zap is created.",
+          "description": "A default value for authentication field.",
           "type": "string",
           "minLength": 1
         },
@@ -719,7 +719,7 @@
           "type": "boolean"
         },
         "default": {
-          "description": "A default value that is saved the first time a Zap is created.",
+          "description": "A default value for an output field.",
           "type": "string",
           "minLength": 1
         },
diff --git a/packages/schema/lib/schemas/AuthFieldSchema.js b/packages/schema/lib/schemas/AuthFieldSchema.js
index b9dd1542f..50b80deef 100644
--- a/packages/schema/lib/schemas/AuthFieldSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldSchema.js
@@ -46,8 +46,7 @@ module.exports = makeSchema({
       minLength: 1,
     },
     default: {
-      description:
-        'A default value that is saved the first time a Zap is created.',
+      description: 'A default value for authentication field.',
       type: 'string',
       minLength: 1,
     },
diff --git a/packages/schema/lib/schemas/OutputFieldSchema.js b/packages/schema/lib/schemas/OutputFieldSchema.js
index 06dbd63fa..4141b4602 100644
--- a/packages/schema/lib/schemas/OutputFieldSchema.js
+++ b/packages/schema/lib/schemas/OutputFieldSchema.js
@@ -42,8 +42,7 @@ module.exports = makeSchema(
         type: 'boolean',
       },
       default: {
-        description:
-          'A default value that is saved the first time a Zap is created.',
+        description: 'A default value for an output field.',
         type: 'string',
         minLength: 1,
       },

From 51bc727f09c76cab59900ff558a7971108431ee7 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Mon, 3 Feb 2025 10:41:43 -0500
Subject: [PATCH 47/60] apply PR suggestions

---
 packages/core/types/zapier.generated.d.ts     | 103 ++++----
 packages/schema/docs/build/schema.md          |   3 +
 packages/schema/exported-schema.json          | 107 ++++----
 .../schema/lib/schemas/AuthFieldSchema.js     | 244 ++++++++++--------
 .../schema/lib/schemas/InputFieldSchema.js    |   5 +
 5 files changed, 257 insertions(+), 205 deletions(-)

diff --git a/packages/core/types/zapier.generated.d.ts b/packages/core/types/zapier.generated.d.ts
index dc6b2140a..4e641059e 100644
--- a/packages/core/types/zapier.generated.d.ts
+++ b/packages/core/types/zapier.generated.d.ts
@@ -197,6 +197,50 @@ export type Function =
   | FunctionRequire
   | FunctionSource;
 
+/**
+ * An object describing a labeled choice in a static dropdown.
+ * Useful if the value a user picks isn't exactly what the zap uses.
+ * For instance, when they click on a nickname, but the zap uses the
+ * user's full name
+ * ([image](https://cdn.zapier.com/storage/photos/8ed01ac5df3a511ce93ed2dc43c7fbbc.png)).
+ *
+ * [Docs: FieldChoiceWithLabelSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#FieldChoiceWithLabelSchema)
+ */
+export interface FieldChoiceWithLabel {
+  /**
+   * The actual value that is sent into the Zap. This is displayed as
+   * light grey text in the editor. Should match sample exactly.
+   */
+  value: string;
+
+  /**
+   * A legacy field that is no longer used by the editor, but it is
+   * still required for now and should match the value.
+   */
+  sample: string;
+
+  /** A human readable label for this value. */
+  label: string;
+  [k: string]: unknown;
+}
+
+/**
+ * A static dropdown of options. Which you use depends on your order
+ * and label requirements:
+ *
+ * Need a Label? | Does Order Matter? | Type to Use
+ * ---|---|---
+ * Yes | No | Object of value -> label
+ * No | Yes | Array of Strings
+ * Yes | Yes | Array of
+ * [FieldChoiceWithLabel](#fieldchoicewithlabelschema)
+ *
+ * [Docs: FieldChoicesSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#FieldChoicesSchema)
+ */
+export type FieldChoices =
+  | { [k: string]: unknown }
+  | (string | FieldChoiceWithLabel)[];
+
 /**
  * Field schema specialized for authentication fields.
  *
@@ -215,6 +259,18 @@ export interface AuthField {
   /** A human readable label for this value (IE: "First Name"). */
   label?: string;
 
+  /**
+   * An object of machine keys and human values to populate a static
+   * dropdown.
+   */
+  choices?: FieldChoices;
+
+  /**
+   * Is this field automatically populated (and hidden from the user)?
+   * Note: Only OAuth and Session Auth support fields with this key.
+   */
+  computed?: boolean;
+
   /**
    * A human readable description of this value (IE: "The first part
    * of a full name."). You can use Markdown.
@@ -468,33 +524,6 @@ export interface AuthenticationSessionConfig {
   perform: Request | Function;
 }
 
-/**
- * An object describing a labeled choice in a static dropdown.
- * Useful if the value a user picks isn't exactly what the zap uses.
- * For instance, when they click on a nickname, but the zap uses the
- * user's full name
- * ([image](https://cdn.zapier.com/storage/photos/8ed01ac5df3a511ce93ed2dc43c7fbbc.png)).
- *
- * [Docs: FieldChoiceWithLabelSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#FieldChoiceWithLabelSchema)
- */
-export interface FieldChoiceWithLabel {
-  /**
-   * The actual value that is sent into the Zap. This is displayed as
-   * light grey text in the editor. Should match sample exactly.
-   */
-  value: string;
-
-  /**
-   * A legacy field that is no longer used by the editor, but it is
-   * still required for now and should match the value.
-   */
-  sample: string;
-
-  /** A human readable label for this value. */
-  label: string;
-  [k: string]: unknown;
-}
-
 /**
  * Reference a resource by key and the data it returns. In the
  * format of: `{resource_key}.{foreign_key}(.{human_label_key})`.
@@ -503,23 +532,6 @@ export interface FieldChoiceWithLabel {
  */
 export type RefResource = string;
 
-/**
- * A static dropdown of options. Which you use depends on your order
- * and label requirements:
- *
- * Need a Label? | Does Order Matter? | Type to Use
- * ---|---|---
- * Yes | No | Object of value -> label
- * No | Yes | Array of Strings
- * Yes | Yes | Array of
- * [FieldChoiceWithLabel](#fieldchoicewithlabelschema)
- *
- * [Docs: FieldChoicesSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#FieldChoicesSchema)
- */
-export type FieldChoices =
-  | { [k: string]: unknown }
-  | (string | FieldChoiceWithLabel)[];
-
 /**
  * Allows for additional metadata to be stored on the field.
  *
@@ -594,6 +606,9 @@ export interface InputField {
    */
   choices?: FieldChoices;
 
+  /** An example value that is not saved. */
+  placeholder?: string;
+
   /** Can a user provide multiples of this field? */
   list?: boolean;
 
diff --git a/packages/schema/docs/build/schema.md b/packages/schema/docs/build/schema.md
index 864ab03da..4953cc1ec 100644
--- a/packages/schema/docs/build/schema.md
+++ b/packages/schema/docs/build/schema.md
@@ -163,6 +163,8 @@ Key | Required | Type | Description
 `key` | **yes** | `string` | A unique machine readable key for this value (IE: "fname").
 `isNoSecret` | no | `boolean` | Indicates if this authentication field is safe to e.g. be stored without encryption or displayed (not a secret).
 `label` | no | `string` | A human readable label for this value (IE: "First Name").
+`choices` | no | [/FieldChoicesSchema](#fieldchoicesschema) | An object of machine keys and human values to populate a static dropdown.
+`computed` | no | `boolean` | Is this field automatically populated (and hidden from the user)? Note: Only OAuth and Session Auth support fields with this key.
 `helpText` | no | `string` | A human readable description of this value (IE: "The first part of a full name."). You can use Markdown.
 `type` | no | `string` in (`'string'`, `'number'`, `'boolean'`, `'datetime'`, `'password'`) | The type of this value used to be.
 `required` | no | `boolean` | If this value is required or not. This defaults to `true`.
@@ -1209,6 +1211,7 @@ Key | Required | Type | Description
 `dynamic` | no | [/RefResourceSchema](#refresourceschema) | A reference to a trigger that will power a dynamic dropdown.
 `search` | no | [/RefResourceSchema](#refresourceschema) | A reference to a search that will guide the user to add a search step to populate this field when creating a Zap.
 `choices` | no | [/FieldChoicesSchema](#fieldchoicesschema) | An object of machine keys and human values to populate a static dropdown.
+`placeholder` | no | `string` | An example value that is not saved.
 `list` | no | `boolean` | Can a user provide multiples of this field?
 `children` | no | `array`[[/InputFieldSchema](#inputfieldschema)] | An array of child fields that define the structure of a sub-object for this field. Usually used for line items.
 `default` | no | `string` | A default value that is saved the first time a Zap is created.
diff --git a/packages/schema/exported-schema.json b/packages/schema/exported-schema.json
index 75ee9a73f..c4b1ca90e 100644
--- a/packages/schema/exported-schema.json
+++ b/packages/schema/exported-schema.json
@@ -173,6 +173,53 @@
         }
       ]
     },
+    "FieldChoiceWithLabelSchema": {
+      "id": "/FieldChoiceWithLabelSchema",
+      "description": "An object describing a labeled choice in a static dropdown. Useful if the value a user picks isn't exactly what the zap uses. For instance, when they click on a nickname, but the zap uses the user's full name ([image](https://cdn.zapier.com/storage/photos/8ed01ac5df3a511ce93ed2dc43c7fbbc.png)).",
+      "type": "object",
+      "required": ["value", "sample", "label"],
+      "properties": {
+        "value": {
+          "description": "The actual value that is sent into the Zap. This is displayed as light grey text in the editor. Should match sample exactly.",
+          "type": "string",
+          "minLength": 1
+        },
+        "sample": {
+          "description": "A legacy field that is no longer used by the editor, but it is still required for now and should match the value.",
+          "type": "string",
+          "minLength": 1
+        },
+        "label": {
+          "description": "A human readable label for this value.",
+          "type": "string",
+          "minLength": 1
+        }
+      }
+    },
+    "FieldChoicesSchema": {
+      "id": "/FieldChoicesSchema",
+      "description": "A static dropdown of options. Which you use depends on your order and label requirements:\n\nNeed a Label? | Does Order Matter? | Type to Use\n---|---|---\nYes | No | Object of value -> label\nNo | Yes | Array of Strings\nYes | Yes | Array of [FieldChoiceWithLabel](#fieldchoicewithlabelschema)",
+      "oneOf": [
+        {
+          "type": "object",
+          "minProperties": 1
+        },
+        {
+          "type": "array",
+          "minItems": 1,
+          "items": {
+            "oneOf": [
+              {
+                "type": "string"
+              },
+              {
+                "$ref": "/FieldChoiceWithLabelSchema"
+              }
+            ]
+          }
+        }
+      ]
+    },
     "AuthFieldSchema": {
       "id": "/AuthFieldSchema",
       "description": "Field schema specialized for authentication fields.",
@@ -193,6 +240,14 @@
           "type": "string",
           "minLength": 1
         },
+        "choices": {
+          "description": "An object of machine keys and human values to populate a static dropdown.",
+          "$ref": "/FieldChoicesSchema"
+        },
+        "computed": {
+          "description": "Is this field automatically populated (and hidden from the user)? Note: Only OAuth and Session Auth support fields with this key.",
+          "type": "boolean"
+        },
         "helpText": {
           "description": "A human readable description of this value (IE: \"The first part of a full name.\"). You can use Markdown.",
           "type": "string",
@@ -517,59 +572,12 @@
       },
       "additionalProperties": false
     },
-    "FieldChoiceWithLabelSchema": {
-      "id": "/FieldChoiceWithLabelSchema",
-      "description": "An object describing a labeled choice in a static dropdown. Useful if the value a user picks isn't exactly what the zap uses. For instance, when they click on a nickname, but the zap uses the user's full name ([image](https://cdn.zapier.com/storage/photos/8ed01ac5df3a511ce93ed2dc43c7fbbc.png)).",
-      "type": "object",
-      "required": ["value", "sample", "label"],
-      "properties": {
-        "value": {
-          "description": "The actual value that is sent into the Zap. This is displayed as light grey text in the editor. Should match sample exactly.",
-          "type": "string",
-          "minLength": 1
-        },
-        "sample": {
-          "description": "A legacy field that is no longer used by the editor, but it is still required for now and should match the value.",
-          "type": "string",
-          "minLength": 1
-        },
-        "label": {
-          "description": "A human readable label for this value.",
-          "type": "string",
-          "minLength": 1
-        }
-      }
-    },
     "RefResourceSchema": {
       "id": "/RefResourceSchema",
       "description": "Reference a resource by key and the data it returns. In the format of: `{resource_key}.{foreign_key}(.{human_label_key})`.",
       "type": "string",
       "pattern": "^[a-zA-Z0-9_]+\\.[a-zA-Z0-9_\\s\\[\\]]+(\\.[a-zA-Z0-9_\\s\\[\\]]+(,[a-zA-Z0-9_\\s\\[\\]]+)*)?$"
     },
-    "FieldChoicesSchema": {
-      "id": "/FieldChoicesSchema",
-      "description": "A static dropdown of options. Which you use depends on your order and label requirements:\n\nNeed a Label? | Does Order Matter? | Type to Use\n---|---|---\nYes | No | Object of value -> label\nNo | Yes | Array of Strings\nYes | Yes | Array of [FieldChoiceWithLabel](#fieldchoicewithlabelschema)",
-      "oneOf": [
-        {
-          "type": "object",
-          "minProperties": 1
-        },
-        {
-          "type": "array",
-          "minItems": 1,
-          "items": {
-            "oneOf": [
-              {
-                "type": "string"
-              },
-              {
-                "$ref": "/FieldChoiceWithLabelSchema"
-              }
-            ]
-          }
-        }
-      ]
-    },
     "FieldMetaSchema": {
       "id": "/FieldMetaSchema",
       "type": "object",
@@ -645,6 +653,11 @@
           "description": "An object of machine keys and human values to populate a static dropdown.",
           "$ref": "/FieldChoicesSchema"
         },
+        "placeholder": {
+          "description": "An example value that is not saved.",
+          "type": "string",
+          "minLength": 1
+        },
         "list": {
           "description": "Can a user provide multiples of this field?",
           "type": "boolean"
diff --git a/packages/schema/lib/schemas/AuthFieldSchema.js b/packages/schema/lib/schemas/AuthFieldSchema.js
index 50b80deef..a6a846bac 100644
--- a/packages/schema/lib/schemas/AuthFieldSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldSchema.js
@@ -1,128 +1,144 @@
 'use strict';
 
 const makeSchema = require('../utils/makeSchema');
+const FieldChoicesSchema = require('./FieldChoicesSchema');
 
-module.exports = makeSchema({
-  id: '/AuthFieldSchema',
-  description: 'Field schema specialized for authentication fields.',
-  required: ['key'],
-  type: 'object',
-  properties: {
-    key: {
-      description:
-        'A unique machine readable key for this value (IE: "fname").',
-      type: 'string',
-      minLength: 1,
-    },
-    isNoSecret: {
-      description:
-        'Indicates if this authentication field is safe to e.g. be stored without encryption or displayed (not a secret).',
-      type: 'boolean',
-    },
-    label: {
-      description: 'A human readable label for this value (IE: "First Name").',
-      type: 'string',
-      minLength: 1,
-    },
-    helpText: {
-      description:
-        'A human readable description of this value (IE: "The first part of a full name."). You can use Markdown.',
-      type: 'string',
-      minLength: 1,
-      maxLength: 1000,
-    },
-    type: {
-      description: 'The type of this value used to be.',
-      type: 'string',
-      enum: ['string', 'number', 'boolean', 'datetime', 'password'],
-    },
-    required: {
-      description: 'If this value is required or not. This defaults to `true`.',
-      type: 'boolean',
-    },
-    placeholder: {
-      description: 'An example value that is not saved.',
-      type: 'string',
-      minLength: 1,
-    },
-    default: {
-      description: 'A default value for authentication field.',
-      type: 'string',
-      minLength: 1,
-    },
-    list: {
-      description: 'Can a user provide multiples of this field?',
-      type: 'boolean',
-    },
-    children: {
-      type: 'array',
-      items: { $ref: '/AuthFieldSchema' },
-      description:
-        'An array of child fields that define the structure of a sub-object for this field. Usually used for line items.',
-      minItems: 1,
-    },
-    dict: {
-      description: 'Is this field a key/value input?',
-      type: 'boolean',
-    },
-    inputFormat: {
-      description:
-        'Useful when you expect the input to be part of a longer string. Put "{{input}}" in place of the user\'s input (IE: "https://{{input}}.yourdomain.com").',
-      type: 'string',
-      // TODO: Check if it contains one and ONLY ONE '{{input}}'
-      pattern: '^.*{{input}}.*$',
-    },
-  },
-
-  // Add examples and anti-examples specifically for basic & custom auth
-  examples: [
-    // Basic Auth - email & password
-    {
-      key: 'email',
-      type: 'string',
-      isNoSecret: true,
-      required: true,
-    },
-    {
-      key: 'password',
-      type: 'password',
-      isNoSecret: false,
-      required: true,
-    },
-
-    // Custom Auth - api key
-    {
-      key: 'api_key',
-      type: 'string',
-      isNoSecret: false,
-      required: true,
+module.exports = makeSchema(
+  {
+    id: '/AuthFieldSchema',
+    description: 'Field schema specialized for authentication fields.',
+    required: ['key'],
+    type: 'object',
+    properties: {
+      key: {
+        description:
+          'A unique machine readable key for this value (IE: "fname").',
+        type: 'string',
+        minLength: 1,
+      },
+      isNoSecret: {
+        description:
+          'Indicates if this authentication field is safe to e.g. be stored without encryption or displayed (not a secret).',
+        type: 'boolean',
+      },
+      label: {
+        description:
+          'A human readable label for this value (IE: "First Name").',
+        type: 'string',
+        minLength: 1,
+      },
+      choices: {
+        description:
+          'An object of machine keys and human values to populate a static dropdown.',
+        $ref: FieldChoicesSchema.id,
+      },
+      computed: {
+        description:
+          'Is this field automatically populated (and hidden from the user)? Note: Only OAuth and Session Auth support fields with this key.',
+        type: 'boolean',
+      },
+      helpText: {
+        description:
+          'A human readable description of this value (IE: "The first part of a full name."). You can use Markdown.',
+        type: 'string',
+        minLength: 1,
+        maxLength: 1000,
+      },
+      type: {
+        description: 'The type of this value used to be.',
+        type: 'string',
+        enum: ['string', 'number', 'boolean', 'datetime', 'password'],
+      },
+      required: {
+        description:
+          'If this value is required or not. This defaults to `true`.',
+        type: 'boolean',
+      },
+      placeholder: {
+        description: 'An example value that is not saved.',
+        type: 'string',
+        minLength: 1,
+      },
+      default: {
+        description: 'A default value for authentication field.',
+        type: 'string',
+        minLength: 1,
+      },
+      list: {
+        description: 'Can a user provide multiples of this field?',
+        type: 'boolean',
+      },
+      children: {
+        type: 'array',
+        items: { $ref: '/AuthFieldSchema' },
+        description:
+          'An array of child fields that define the structure of a sub-object for this field. Usually used for line items.',
+        minItems: 1,
+      },
+      dict: {
+        description: 'Is this field a key/value input?',
+        type: 'boolean',
+      },
+      inputFormat: {
+        description:
+          'Useful when you expect the input to be part of a longer string. Put "{{input}}" in place of the user\'s input (IE: "https://{{input}}.yourdomain.com").',
+        type: 'string',
+        // TODO: Check if it contains one and ONLY ONE '{{input}}'
+        pattern: '^.*{{input}}.*$',
+      },
     },
-  ],
 
-  antiExamples: [
-    {
-      example: {
+    // Add examples and anti-examples specifically for basic & custom auth
+    examples: [
+      // Basic Auth - email & password
+      {
+        key: 'email',
+        type: 'string',
+        isNoSecret: true,
+        required: true,
+      },
+      {
         key: 'password',
         type: 'password',
-        isNoSecret: true,
+        isNoSecret: false,
         required: true,
       },
-      reason: 'A "password" field cannot have isSafe = true.',
-    },
-    {
-      example: {
+
+      // Custom Auth - api key
+      {
         key: 'api_key',
-        isNoSecret: true,
-      },
-      reason:
-        '"api_key" is a sensitive field and cannot have isSafe set as true.',
-    },
-    {
-      example: {
         type: 'string',
         isNoSecret: false,
+        required: true,
       },
-      reason: 'Missing required key: key',
-    },
-  ],
-});
+    ],
+
+    antiExamples: [
+      {
+        example: {
+          key: 'password',
+          type: 'password',
+          isNoSecret: true,
+          required: true,
+        },
+        reason: 'A "password" field cannot have isSafe = true.',
+      },
+      {
+        example: {
+          key: 'api_key',
+          isNoSecret: true,
+        },
+        reason:
+          '"api_key" is a sensitive field and cannot have isSafe set as true.',
+      },
+      {
+        example: {
+          type: 'string',
+          isNoSecret: false,
+        },
+        reason: 'Missing required key: key',
+      },
+    ],
+  },
+  [FieldChoicesSchema],
+);
diff --git a/packages/schema/lib/schemas/InputFieldSchema.js b/packages/schema/lib/schemas/InputFieldSchema.js
index e4026fb8b..b399e2203 100644
--- a/packages/schema/lib/schemas/InputFieldSchema.js
+++ b/packages/schema/lib/schemas/InputFieldSchema.js
@@ -72,6 +72,11 @@ module.exports = makeSchema(
           'An object of machine keys and human values to populate a static dropdown.',
         $ref: FieldChoicesSchema.id,
       },
+      placeholder: {
+        description: 'An example value that is not saved.',
+        type: 'string',
+        minLength: 1,
+      },
       list: {
         description: 'Can a user provide multiples of this field?',
         type: 'boolean',

From 04aa8e64bdbc6b76256132a9b1b4272df2bc26a4 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Mon, 3 Feb 2025 10:52:34 -0500
Subject: [PATCH 48/60] apply PR suggestions

---
 packages/core/types/zapier.generated.d.ts        | 9 +++++++++
 packages/schema/docs/build/schema.md             | 1 +
 packages/schema/exported-schema.json             | 4 ++++
 packages/schema/lib/schemas/OutputFieldSchema.js | 5 +++++
 4 files changed, 19 insertions(+)

diff --git a/packages/core/types/zapier.generated.d.ts b/packages/core/types/zapier.generated.d.ts
index 4e641059e..f3f9a6030 100644
--- a/packages/core/types/zapier.generated.d.ts
+++ b/packages/core/types/zapier.generated.d.ts
@@ -686,6 +686,15 @@ export interface OutputField {
   /** A default value for an output field. */
   default?: string;
 
+  /**
+   * Prevents triggering on new output until all values for fields
+   * with this property remain unchanged for 2 polls. It can be used
+   * to, e.g., not trigger on a new contact until the contact has
+   * completed typing their name. NOTE that this only applies to the
+   * `outputFields` of polling triggers.
+   */
+  steadyState?: boolean;
+
   /** Can a user provide multiples of this field? */
   list?: boolean;
 
diff --git a/packages/schema/docs/build/schema.md b/packages/schema/docs/build/schema.md
index 4953cc1ec..6de309567 100644
--- a/packages/schema/docs/build/schema.md
+++ b/packages/schema/docs/build/schema.md
@@ -1345,6 +1345,7 @@ Key | Required | Type | Description
 `required` | no | `boolean` | If this value is required or not.
 `primary` | no | `boolean` | Use this field as part of the primary key for deduplication. You can set multiple fields as "primary", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).
 `default` | no | `string` | A default value for an output field.
+`steadyState` | no | `boolean` | Prevents triggering on new output until all values for fields with this property remain unchanged for 2 polls. It can be used to, e.g., not trigger on a new contact until the contact has completed typing their name. NOTE that this only applies to the `outputFields` of polling triggers.
 `list` | no | `boolean` | Can a user provide multiples of this field?
 `children` | no | `array`[[/OutputFieldSchema](#outputfieldschema)] | An array of child fields that define the structure of a sub-object for this field. Usually used for line items.
 `dict` | no | `boolean` | Is this field a key/value output?
diff --git a/packages/schema/exported-schema.json b/packages/schema/exported-schema.json
index c4b1ca90e..392951d95 100644
--- a/packages/schema/exported-schema.json
+++ b/packages/schema/exported-schema.json
@@ -736,6 +736,10 @@
           "type": "string",
           "minLength": 1
         },
+        "steadyState": {
+          "description": "Prevents triggering on new output until all values for fields with this property remain unchanged for 2 polls. It can be used to, e.g., not trigger on a new contact until the contact has completed typing their name. NOTE that this only applies to the `outputFields` of polling triggers.",
+          "type": "boolean"
+        },
         "list": {
           "description": "Can a user provide multiples of this field?",
           "type": "boolean"
diff --git a/packages/schema/lib/schemas/OutputFieldSchema.js b/packages/schema/lib/schemas/OutputFieldSchema.js
index 4141b4602..393a4ad76 100644
--- a/packages/schema/lib/schemas/OutputFieldSchema.js
+++ b/packages/schema/lib/schemas/OutputFieldSchema.js
@@ -46,6 +46,11 @@ module.exports = makeSchema(
         type: 'string',
         minLength: 1,
       },
+      steadyState: {
+        description:
+          'Prevents triggering on new output until all values for fields with this property remain unchanged for 2 polls. It can be used to, e.g., not trigger on a new contact until the contact has completed typing their name. NOTE that this only applies to the `outputFields` of polling triggers.',
+        type: 'boolean',
+      },
       list: {
         description: 'Can a user provide multiples of this field?',
         type: 'boolean',

From 34ec8731909413b50619bdd7431cee48f5bca83b Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Mon, 3 Feb 2025 13:06:03 -0500
Subject: [PATCH 49/60] PR suggestion: use common fields and update schemas

---
 packages/core/types/zapier.generated.d.ts     | 223 ++++++++----
 packages/schema/docs/build/schema.md          |  32 +-
 packages/schema/exported-schema.json          | 193 +++++++----
 .../schema/lib/schemas/AuthFieldSchema.js     |  41 +--
 .../lib/schemas/FieldOrFunctionSchema.js      |  40 ---
 packages/schema/lib/schemas/FieldSchema.js    | 322 +++++++-----------
 .../schema/lib/schemas/InputFieldSchema.js    |  63 +---
 .../schema/lib/schemas/OutputFieldSchema.js   |  43 +--
 packages/schema/test/index.js                 |   2 +-
 9 files changed, 439 insertions(+), 520 deletions(-)
 delete mode 100644 packages/schema/lib/schemas/FieldOrFunctionSchema.js

diff --git a/packages/core/types/zapier.generated.d.ts b/packages/core/types/zapier.generated.d.ts
index f3f9a6030..09bde3bae 100644
--- a/packages/core/types/zapier.generated.d.ts
+++ b/packages/core/types/zapier.generated.d.ts
@@ -242,54 +242,106 @@ export type FieldChoices =
   | (string | FieldChoiceWithLabel)[];
 
 /**
- * Field schema specialized for authentication fields.
+ * Defines a field an app either needs as input, or gives as output.
+ * In addition to the requirements below, the following keys are
+ * mutually exclusive:
  *
- * [Docs: AuthFieldSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#AuthFieldSchema)
+ * * `children` & `list`
+ * * `children` & `dict`
+ * * `children` & `type`
+ * * `children` & `placeholder`
+ * * `children` & `helpText`
+ * * `children` & `default`
+ * * `dict` & `list`
+ * * `dynamic` & `dict`
+ * * `dynamic` & `choices`
+ *
+ * [Docs: FieldSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#FieldSchema)
  */
-export interface AuthField {
+export interface Field {
   /** A unique machine readable key for this value (IE: "fname"). */
   key: string;
 
+  /** A human readable label for this value (IE: "First Name"). */
+  label?: string;
+
   /**
-   * Indicates if this authentication field is safe to e.g. be stored
-   * without encryption or displayed (not a secret).
+   * The type of this value. Use `string` for basic text input, `text`
+   * for a large, `<textarea>` style box, and `code` for a
+   * `<textarea>` with a fixed-width font. Field type of `file` will
+   * accept either a file object or a string. If a URL is provided in
+   * the string, Zapier will automatically make a GET for that file.
+   * Otherwise, a .txt file will be generated.
    */
-  isNoSecret?: boolean;
+  type?:
+    | 'string'
+    | 'text'
+    | 'integer'
+    | 'number'
+    | 'boolean'
+    | 'datetime'
+    | 'file'
+    | 'password'
+    | 'copy'
+    | 'code';
 
-  /** A human readable label for this value (IE: "First Name"). */
-  label?: string;
+  /** If this value is required or not. */
+  required?: boolean;
 
   /**
-   * An object of machine keys and human values to populate a static
-   * dropdown.
+   * A default value that is saved the first time a Zap is created.
    */
-  choices?: FieldChoices;
+  default?: string;
 
   /**
-   * Is this field automatically populated (and hidden from the user)?
-   * Note: Only OAuth and Session Auth support fields with this key.
+   * Acts differently when used in inputFields vs. when used in
+   * outputFields. In inputFields: Can a user provide multiples of
+   * this field? In outputFields: Does this field return an array of
+   * items of type `type`?
    */
-  computed?: boolean;
+  list?: boolean;
 
   /**
-   * A human readable description of this value (IE: "The first part
-   * of a full name."). You can use Markdown.
+   * An array of child fields that define the structure of a
+   * sub-object for this field. Usually used for line items.
+   *
+   * @minItems 1
    */
-  helpText?: string;
+  children?: Field[];
+
+  /** Is this field a key/value input? */
+  dict?: boolean;
+}
+
+/**
+ * Field schema specialized for authentication fields.
+ *
+ * [Docs: AuthFieldSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#AuthFieldSchema)
+ */
+export interface AuthField {
+  /** A unique machine readable key for this value (IE: "fname"). */
+  key: string;
+
+  /** A human readable label for this value (IE: "First Name"). */
+  label?: string;
 
   /** The type of this value used to be. */
   type?: 'string' | 'number' | 'boolean' | 'datetime' | 'password';
 
-  /** If this value is required or not. This defaults to `true`. */
+  /** If this value is required or not. */
   required?: boolean;
 
-  /** An example value that is not saved. */
-  placeholder?: string;
-
-  /** A default value for authentication field. */
+  /**
+   * A default value that is saved the first time a Zap is created.
+   */
   default?: string;
 
-  /** Can a user provide multiples of this field? */
+  /**
+   * Acts differently when used in inputFields vs. when used in
+   * outputFields. In inputFields: Can a user provide multiples of
+   * this field? In outputFields: Does this field return an array of
+   * items of type `type`?
+   */
   list?: boolean;
 
   /**
@@ -298,11 +350,38 @@ export interface AuthField {
    *
    * @minItems 1
    */
-  children?: AuthField[];
+  children?: Field[];
 
   /** Is this field a key/value input? */
   dict?: boolean;
 
+  /**
+   * Indicates if this authentication field is safe to e.g. be stored
+   * without encryption or displayed (not a secret).
+   */
+  isNoSecret?: boolean;
+
+  /**
+   * An object of machine keys and human values to populate a static
+   * dropdown.
+   */
+  choices?: FieldChoices;
+
+  /**
+   * Is this field automatically populated (and hidden from the user)?
+   * Note: Only OAuth and Session Auth support fields with this key.
+   */
+  computed?: boolean;
+
+  /**
+   * A human readable description of this value (IE: "The first part
+   * of a full name."). You can use Markdown.
+   */
+  helpText?: string;
+
+  /** An example value that is not saved. */
+  placeholder?: string;
+
   /**
    * Useful when you expect the input to be part of a longer string.
    * Put "{{input}}" in place of the user's input (IE:
@@ -560,12 +639,6 @@ export interface InputField {
   /** A human readable label for this value (IE: "First Name"). */
   label?: string;
 
-  /**
-   * A human readable description of this value (IE: "The first part
-   * of a full name."). You can use Markdown.
-   */
-  helpText?: string;
-
   /**
    * The type of this value. Use `string` for basic text input, `text`
    * for a large, `<textarea>` style box, and `code` for a
@@ -589,6 +662,36 @@ export interface InputField {
   /** If this value is required or not. */
   required?: boolean;
 
+  /**
+   * A default value that is saved the first time a Zap is created.
+   */
+  default?: string;
+
+  /**
+   * Acts differently when used in inputFields vs. when used in
+   * outputFields. In inputFields: Can a user provide multiples of
+   * this field? In outputFields: Does this field return an array of
+   * items of type `type`?
+   */
+  list?: boolean;
+
+  /**
+   * An array of child fields that define the structure of a
+   * sub-object for this field. Usually used for line items.
+   *
+   * @minItems 1
+   */
+  children?: Field[];
+
+  /** Is this field a key/value input? */
+  dict?: boolean;
+
+  /**
+   * A human readable description of this value (IE: "The first part
+   * of a full name."). You can use Markdown.
+   */
+  helpText?: string;
+
   /**
    * A reference to a trigger that will power a dynamic dropdown.
    */
@@ -609,25 +712,6 @@ export interface InputField {
   /** An example value that is not saved. */
   placeholder?: string;
 
-  /** Can a user provide multiples of this field? */
-  list?: boolean;
-
-  /**
-   * An array of child fields that define the structure of a
-   * sub-object for this field. Usually used for line items.
-   *
-   * @minItems 1
-   */
-  children?: InputField[];
-
-  /**
-   * A default value that is saved the first time a Zap is created.
-   */
-  default?: string;
-
-  /** Is this field a key/value input? */
-  dict?: boolean;
-
   /**
    * Does the value of this field affect the definitions of other
    * fields in the set?
@@ -671,6 +755,30 @@ export interface OutputField {
   /** If this value is required or not. */
   required?: boolean;
 
+  /**
+   * A default value that is saved the first time a Zap is created.
+   */
+  default?: string;
+
+  /**
+   * Acts differently when used in inputFields vs. when used in
+   * outputFields. In inputFields: Can a user provide multiples of
+   * this field? In outputFields: Does this field return an array of
+   * items of type `type`?
+   */
+  list?: boolean;
+
+  /**
+   * An array of child fields that define the structure of a
+   * sub-object for this field. Usually used for line items.
+   *
+   * @minItems 1
+   */
+  children?: Field[];
+
+  /** Is this field a key/value input? */
+  dict?: boolean;
+
   /**
    * Use this field as part of the primary key for deduplication. You
    * can set multiple fields as "primary", provided they are unique
@@ -683,9 +791,6 @@ export interface OutputField {
    */
   primary?: boolean;
 
-  /** A default value for an output field. */
-  default?: string;
-
   /**
    * Prevents triggering on new output until all values for fields
    * with this property remain unchanged for 2 polls. It can be used
@@ -694,20 +799,6 @@ export interface OutputField {
    * `outputFields` of polling triggers.
    */
   steadyState?: boolean;
-
-  /** Can a user provide multiples of this field? */
-  list?: boolean;
-
-  /**
-   * An array of child fields that define the structure of a
-   * sub-object for this field. Usually used for line items.
-   *
-   * @minItems 1
-   */
-  children?: OutputField[];
-
-  /** Is this field a key/value output? */
-  dict?: boolean;
 }
 
 /**
diff --git a/packages/schema/docs/build/schema.md b/packages/schema/docs/build/schema.md
index 6de309567..8faa62786 100644
--- a/packages/schema/docs/build/schema.md
+++ b/packages/schema/docs/build/schema.md
@@ -161,18 +161,18 @@ Field schema specialized for authentication fields.
 Key | Required | Type | Description
 --- | -------- | ---- | -----------
 `key` | **yes** | `string` | A unique machine readable key for this value (IE: "fname").
-`isNoSecret` | no | `boolean` | Indicates if this authentication field is safe to e.g. be stored without encryption or displayed (not a secret).
 `label` | no | `string` | A human readable label for this value (IE: "First Name").
+`type` | no | `string` in (`'string'`, `'number'`, `'boolean'`, `'datetime'`, `'password'`) | The type of this value used to be.
+`required` | no | `boolean` | If this value is required or not.
+`default` | no | `string` | A default value that is saved the first time a Zap is created.
+`list` | no | `boolean` | Acts differently when used in inputFields vs. when used in outputFields. In inputFields: Can a user provide multiples of this field? In outputFields: Does this field return an array of items of type `type`?
+`children` | no | `array`[undefined] | An array of child fields that define the structure of a sub-object for this field. Usually used for line items.
+`dict` | no | `boolean` | Is this field a key/value input?
+`isNoSecret` | no | `boolean` | Indicates if this authentication field is safe to e.g. be stored without encryption or displayed (not a secret).
 `choices` | no | [/FieldChoicesSchema](#fieldchoicesschema) | An object of machine keys and human values to populate a static dropdown.
 `computed` | no | `boolean` | Is this field automatically populated (and hidden from the user)? Note: Only OAuth and Session Auth support fields with this key.
 `helpText` | no | `string` | A human readable description of this value (IE: "The first part of a full name."). You can use Markdown.
-`type` | no | `string` in (`'string'`, `'number'`, `'boolean'`, `'datetime'`, `'password'`) | The type of this value used to be.
-`required` | no | `boolean` | If this value is required or not. This defaults to `true`.
 `placeholder` | no | `string` | An example value that is not saved.
-`default` | no | `string` | A default value for authentication field.
-`list` | no | `boolean` | Can a user provide multiples of this field?
-`children` | no | `array`[[/AuthFieldSchema](#authfieldschema)] | An array of child fields that define the structure of a sub-object for this field. Usually used for line items.
-`dict` | no | `boolean` | Is this field a key/value input?
 `inputFormat` | no | `string` | Useful when you expect the input to be part of a longer string. Put "{{input}}" in place of the user's input (IE: "https://{{input}}.yourdomain.com").
 
 #### Examples
@@ -1205,17 +1205,17 @@ Key | Required | Type | Description
 --- | -------- | ---- | -----------
 `key` | **yes** | `string` | A unique machine readable key for this value (IE: "fname").
 `label` | no | `string` | A human readable label for this value (IE: "First Name").
-`helpText` | no | `string` | A human readable description of this value (IE: "The first part of a full name."). You can use Markdown.
 `type` | no | `string` in (`'string'`, `'text'`, `'integer'`, `'number'`, `'boolean'`, `'datetime'`, `'file'`, `'password'`, `'copy'`, `'code'`) | The type of this value. Use `string` for basic text input, `text` for a large, `<textarea>` style box, and `code` for a `<textarea>` with a fixed-width font. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.
 `required` | no | `boolean` | If this value is required or not.
+`default` | no | `string` | A default value that is saved the first time a Zap is created.
+`list` | no | `boolean` | Acts differently when used in inputFields vs. when used in outputFields. In inputFields: Can a user provide multiples of this field? In outputFields: Does this field return an array of items of type `type`?
+`children` | no | `array`[undefined] | An array of child fields that define the structure of a sub-object for this field. Usually used for line items.
+`dict` | no | `boolean` | Is this field a key/value input?
+`helpText` | no | `string` | A human readable description of this value (IE: "The first part of a full name."). You can use Markdown.
 `dynamic` | no | [/RefResourceSchema](#refresourceschema) | A reference to a trigger that will power a dynamic dropdown.
 `search` | no | [/RefResourceSchema](#refresourceschema) | A reference to a search that will guide the user to add a search step to populate this field when creating a Zap.
 `choices` | no | [/FieldChoicesSchema](#fieldchoicesschema) | An object of machine keys and human values to populate a static dropdown.
 `placeholder` | no | `string` | An example value that is not saved.
-`list` | no | `boolean` | Can a user provide multiples of this field?
-`children` | no | `array`[[/InputFieldSchema](#inputfieldschema)] | An array of child fields that define the structure of a sub-object for this field. Usually used for line items.
-`default` | no | `string` | A default value that is saved the first time a Zap is created.
-`dict` | no | `boolean` | Is this field a key/value input?
 `altersDynamicFields` | no | `boolean` | Does the value of this field affect the definitions of other fields in the set?
 `inputFormat` | no | `string` | Useful when you expect the input to be part of a longer string. Put "{{input}}" in place of the user's input (IE: "https://{{input}}.yourdomain.com").
 `meta` | no | [/FieldMetaSchema](#fieldmetaschema) | Allows for additional metadata to be stored on the field. Supports simple key-values only (no sub-objects or arrays).
@@ -1343,12 +1343,12 @@ Key | Required | Type | Description
 `label` | no | `string` | A human readable label for this value (IE: "First Name").
 `type` | no | `string` in (`'string'`, `'number'`, `'boolean'`, `'datetime'`, `'file'`, `'password'`) | The type of this value. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.
 `required` | no | `boolean` | If this value is required or not.
+`default` | no | `string` | A default value that is saved the first time a Zap is created.
+`list` | no | `boolean` | Acts differently when used in inputFields vs. when used in outputFields. In inputFields: Can a user provide multiples of this field? In outputFields: Does this field return an array of items of type `type`?
+`children` | no | `array`[undefined] | An array of child fields that define the structure of a sub-object for this field. Usually used for line items.
+`dict` | no | `boolean` | Is this field a key/value input?
 `primary` | no | `boolean` | Use this field as part of the primary key for deduplication. You can set multiple fields as "primary", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).
-`default` | no | `string` | A default value for an output field.
 `steadyState` | no | `boolean` | Prevents triggering on new output until all values for fields with this property remain unchanged for 2 polls. It can be used to, e.g., not trigger on a new contact until the contact has completed typing their name. NOTE that this only applies to the `outputFields` of polling triggers.
-`list` | no | `boolean` | Can a user provide multiples of this field?
-`children` | no | `array`[[/OutputFieldSchema](#outputfieldschema)] | An array of child fields that define the structure of a sub-object for this field. Usually used for line items.
-`dict` | no | `boolean` | Is this field a key/value output?
 
 #### Examples
 
diff --git a/packages/schema/exported-schema.json b/packages/schema/exported-schema.json
index 392951d95..969fcac9d 100644
--- a/packages/schema/exported-schema.json
+++ b/packages/schema/exported-schema.json
@@ -220,39 +220,84 @@
         }
       ]
     },
-    "AuthFieldSchema": {
-      "id": "/AuthFieldSchema",
-      "description": "Field schema specialized for authentication fields.",
-      "required": ["key"],
+    "FieldSchema": {
+      "id": "/FieldSchema",
+      "description": "Defines a field an app either needs as input, or gives as output. In addition to the requirements below, the following keys are mutually exclusive:\n\n* `children` & `list`\n* `children` & `dict`\n* `children` & `type`\n* `children` & `placeholder`\n* `children` & `helpText`\n* `children` & `default`\n* `dict` & `list`\n* `dynamic` & `dict`\n* `dynamic` & `choices`",
       "type": "object",
+      "required": ["key"],
+      "docAnnotation": {
+        "hide": true
+      },
       "properties": {
         "key": {
           "description": "A unique machine readable key for this value (IE: \"fname\").",
           "type": "string",
           "minLength": 1
         },
-        "isNoSecret": {
-          "description": "Indicates if this authentication field is safe to e.g. be stored without encryption or displayed (not a secret).",
-          "type": "boolean"
-        },
         "label": {
           "description": "A human readable label for this value (IE: \"First Name\").",
           "type": "string",
           "minLength": 1
         },
-        "choices": {
-          "description": "An object of machine keys and human values to populate a static dropdown.",
-          "$ref": "/FieldChoicesSchema"
+        "type": {
+          "description": "The type of this value. Use `string` for basic text input, `text` for a large, `<textarea>` style box, and `code` for a `<textarea>` with a fixed-width font. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.",
+          "type": "string",
+          "enum": [
+            "string",
+            "text",
+            "integer",
+            "number",
+            "boolean",
+            "datetime",
+            "file",
+            "password",
+            "copy",
+            "code"
+          ]
         },
-        "computed": {
-          "description": "Is this field automatically populated (and hidden from the user)? Note: Only OAuth and Session Auth support fields with this key.",
+        "required": {
+          "description": "If this value is required or not.",
           "type": "boolean"
         },
-        "helpText": {
-          "description": "A human readable description of this value (IE: \"The first part of a full name.\"). You can use Markdown.",
+        "default": {
+          "description": "A default value that is saved the first time a Zap is created.",
           "type": "string",
-          "minLength": 1,
-          "maxLength": 1000
+          "minLength": 1
+        },
+        "list": {
+          "description": "Acts differently when used in inputFields vs. when used in outputFields. In inputFields: Can a user provide multiples of this field? In outputFields: Does this field return an array of items of type `type`?",
+          "type": "boolean"
+        },
+        "children": {
+          "type": "array",
+          "items": {
+            "$ref": "/FieldSchema"
+          },
+          "description": "An array of child fields that define the structure of a sub-object for this field. Usually used for line items.",
+          "minItems": 1
+        },
+        "dict": {
+          "description": "Is this field a key/value input?",
+          "type": "boolean"
+        }
+      },
+      "additionalProperties": false
+    },
+    "AuthFieldSchema": {
+      "id": "/AuthFieldSchema",
+      "description": "Field schema specialized for authentication fields.",
+      "required": ["key"],
+      "type": "object",
+      "properties": {
+        "key": {
+          "description": "A unique machine readable key for this value (IE: \"fname\").",
+          "type": "string",
+          "minLength": 1
+        },
+        "label": {
+          "description": "A human readable label for this value (IE: \"First Name\").",
+          "type": "string",
+          "minLength": 1
         },
         "type": {
           "description": "The type of this value used to be.",
@@ -260,27 +305,22 @@
           "enum": ["string", "number", "boolean", "datetime", "password"]
         },
         "required": {
-          "description": "If this value is required or not. This defaults to `true`.",
+          "description": "If this value is required or not.",
           "type": "boolean"
         },
-        "placeholder": {
-          "description": "An example value that is not saved.",
-          "type": "string",
-          "minLength": 1
-        },
         "default": {
-          "description": "A default value for authentication field.",
+          "description": "A default value that is saved the first time a Zap is created.",
           "type": "string",
           "minLength": 1
         },
         "list": {
-          "description": "Can a user provide multiples of this field?",
+          "description": "Acts differently when used in inputFields vs. when used in outputFields. In inputFields: Can a user provide multiples of this field? In outputFields: Does this field return an array of items of type `type`?",
           "type": "boolean"
         },
         "children": {
           "type": "array",
           "items": {
-            "$ref": "/AuthFieldSchema"
+            "$ref": "/FieldSchema"
           },
           "description": "An array of child fields that define the structure of a sub-object for this field. Usually used for line items.",
           "minItems": 1
@@ -289,6 +329,29 @@
           "description": "Is this field a key/value input?",
           "type": "boolean"
         },
+        "isNoSecret": {
+          "description": "Indicates if this authentication field is safe to e.g. be stored without encryption or displayed (not a secret).",
+          "type": "boolean"
+        },
+        "choices": {
+          "description": "An object of machine keys and human values to populate a static dropdown.",
+          "$ref": "/FieldChoicesSchema"
+        },
+        "computed": {
+          "description": "Is this field automatically populated (and hidden from the user)? Note: Only OAuth and Session Auth support fields with this key.",
+          "type": "boolean"
+        },
+        "helpText": {
+          "description": "A human readable description of this value (IE: \"The first part of a full name.\"). You can use Markdown.",
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 1000
+        },
+        "placeholder": {
+          "description": "An example value that is not saved.",
+          "type": "string",
+          "minLength": 1
+        },
         "inputFormat": {
           "description": "Useful when you expect the input to be part of a longer string. Put \"{{input}}\" in place of the user's input (IE: \"https://{{input}}.yourdomain.com\").",
           "type": "string",
@@ -615,12 +678,6 @@
           "type": "string",
           "minLength": 1
         },
-        "helpText": {
-          "description": "A human readable description of this value (IE: \"The first part of a full name.\"). You can use Markdown.",
-          "type": "string",
-          "minLength": 1,
-          "maxLength": 1000
-        },
         "type": {
           "description": "The type of this value. Use `string` for basic text input, `text` for a large, `<textarea>` style box, and `code` for a `<textarea>` with a fixed-width font. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.",
           "type": "string",
@@ -641,44 +698,50 @@
           "description": "If this value is required or not.",
           "type": "boolean"
         },
-        "dynamic": {
-          "description": "A reference to a trigger that will power a dynamic dropdown.",
-          "$ref": "/RefResourceSchema"
-        },
-        "search": {
-          "description": "A reference to a search that will guide the user to add a search step to populate this field when creating a Zap.",
-          "$ref": "/RefResourceSchema"
-        },
-        "choices": {
-          "description": "An object of machine keys and human values to populate a static dropdown.",
-          "$ref": "/FieldChoicesSchema"
-        },
-        "placeholder": {
-          "description": "An example value that is not saved.",
+        "default": {
+          "description": "A default value that is saved the first time a Zap is created.",
           "type": "string",
           "minLength": 1
         },
         "list": {
-          "description": "Can a user provide multiples of this field?",
+          "description": "Acts differently when used in inputFields vs. when used in outputFields. In inputFields: Can a user provide multiples of this field? In outputFields: Does this field return an array of items of type `type`?",
           "type": "boolean"
         },
         "children": {
           "type": "array",
           "items": {
-            "$ref": "/InputFieldSchema"
+            "$ref": "/FieldSchema"
           },
           "description": "An array of child fields that define the structure of a sub-object for this field. Usually used for line items.",
           "minItems": 1
         },
-        "default": {
-          "description": "A default value that is saved the first time a Zap is created.",
-          "type": "string",
-          "minLength": 1
-        },
         "dict": {
           "description": "Is this field a key/value input?",
           "type": "boolean"
         },
+        "helpText": {
+          "description": "A human readable description of this value (IE: \"The first part of a full name.\"). You can use Markdown.",
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 1000
+        },
+        "dynamic": {
+          "description": "A reference to a trigger that will power a dynamic dropdown.",
+          "$ref": "/RefResourceSchema"
+        },
+        "search": {
+          "description": "A reference to a search that will guide the user to add a search step to populate this field when creating a Zap.",
+          "$ref": "/RefResourceSchema"
+        },
+        "choices": {
+          "description": "An object of machine keys and human values to populate a static dropdown.",
+          "$ref": "/FieldChoicesSchema"
+        },
+        "placeholder": {
+          "description": "An example value that is not saved.",
+          "type": "string",
+          "minLength": 1
+        },
         "altersDynamicFields": {
           "description": "Does the value of this field affect the definitions of other fields in the set?",
           "type": "boolean"
@@ -727,33 +790,33 @@
           "description": "If this value is required or not.",
           "type": "boolean"
         },
-        "primary": {
-          "description": "Use this field as part of the primary key for deduplication. You can set multiple fields as \"primary\", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).",
-          "type": "boolean"
-        },
         "default": {
-          "description": "A default value for an output field.",
+          "description": "A default value that is saved the first time a Zap is created.",
           "type": "string",
           "minLength": 1
         },
-        "steadyState": {
-          "description": "Prevents triggering on new output until all values for fields with this property remain unchanged for 2 polls. It can be used to, e.g., not trigger on a new contact until the contact has completed typing their name. NOTE that this only applies to the `outputFields` of polling triggers.",
-          "type": "boolean"
-        },
         "list": {
-          "description": "Can a user provide multiples of this field?",
+          "description": "Acts differently when used in inputFields vs. when used in outputFields. In inputFields: Can a user provide multiples of this field? In outputFields: Does this field return an array of items of type `type`?",
           "type": "boolean"
         },
         "children": {
           "type": "array",
           "items": {
-            "$ref": "/OutputFieldSchema"
+            "$ref": "/FieldSchema"
           },
           "description": "An array of child fields that define the structure of a sub-object for this field. Usually used for line items.",
           "minItems": 1
         },
         "dict": {
-          "description": "Is this field a key/value output?",
+          "description": "Is this field a key/value input?",
+          "type": "boolean"
+        },
+        "primary": {
+          "description": "Use this field as part of the primary key for deduplication. You can set multiple fields as \"primary\", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).",
+          "type": "boolean"
+        },
+        "steadyState": {
+          "description": "Prevents triggering on new output until all values for fields with this property remain unchanged for 2 polls. It can be used to, e.g., not trigger on a new contact until the contact has completed typing their name. NOTE that this only applies to the `outputFields` of polling triggers.",
           "type": "boolean"
         }
       },
diff --git a/packages/schema/lib/schemas/AuthFieldSchema.js b/packages/schema/lib/schemas/AuthFieldSchema.js
index a6a846bac..5801b4f77 100644
--- a/packages/schema/lib/schemas/AuthFieldSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldSchema.js
@@ -2,6 +2,7 @@
 
 const makeSchema = require('../utils/makeSchema');
 const FieldChoicesSchema = require('./FieldChoicesSchema');
+const FieldSchema = require('./FieldSchema');
 
 module.exports = makeSchema(
   {
@@ -10,23 +11,12 @@ module.exports = makeSchema(
     required: ['key'],
     type: 'object',
     properties: {
-      key: {
-        description:
-          'A unique machine readable key for this value (IE: "fname").',
-        type: 'string',
-        minLength: 1,
-      },
+      ...FieldSchema.schema.properties,
       isNoSecret: {
         description:
           'Indicates if this authentication field is safe to e.g. be stored without encryption or displayed (not a secret).',
         type: 'boolean',
       },
-      label: {
-        description:
-          'A human readable label for this value (IE: "First Name").',
-        type: 'string',
-        minLength: 1,
-      },
       choices: {
         description:
           'An object of machine keys and human values to populate a static dropdown.',
@@ -49,36 +39,11 @@ module.exports = makeSchema(
         type: 'string',
         enum: ['string', 'number', 'boolean', 'datetime', 'password'],
       },
-      required: {
-        description:
-          'If this value is required or not. This defaults to `true`.',
-        type: 'boolean',
-      },
       placeholder: {
         description: 'An example value that is not saved.',
         type: 'string',
         minLength: 1,
       },
-      default: {
-        description: 'A default value for authentication field.',
-        type: 'string',
-        minLength: 1,
-      },
-      list: {
-        description: 'Can a user provide multiples of this field?',
-        type: 'boolean',
-      },
-      children: {
-        type: 'array',
-        items: { $ref: '/AuthFieldSchema' },
-        description:
-          'An array of child fields that define the structure of a sub-object for this field. Usually used for line items.',
-        minItems: 1,
-      },
-      dict: {
-        description: 'Is this field a key/value input?',
-        type: 'boolean',
-      },
       inputFormat: {
         description:
           'Useful when you expect the input to be part of a longer string. Put "{{input}}" in place of the user\'s input (IE: "https://{{input}}.yourdomain.com").',
@@ -140,5 +105,5 @@ module.exports = makeSchema(
       },
     ],
   },
-  [FieldChoicesSchema],
+  [FieldChoicesSchema, FieldSchema],
 );
diff --git a/packages/schema/lib/schemas/FieldOrFunctionSchema.js b/packages/schema/lib/schemas/FieldOrFunctionSchema.js
deleted file mode 100644
index 8ce2d6040..000000000
--- a/packages/schema/lib/schemas/FieldOrFunctionSchema.js
+++ /dev/null
@@ -1,40 +0,0 @@
-'use strict';
-
-const makeSchema = require('../utils/makeSchema');
-
-const FieldSchema = require('./FieldSchema');
-const FunctionSchema = require('./FunctionSchema');
-
-// This schema was created to improve readability on errors.
-
-module.exports = makeSchema(
-  {
-    id: '/FieldOrFunctionSchema',
-    description: 'Represents an array of fields or functions.',
-    type: 'array',
-    items: {
-      oneOf: [{ $ref: FieldSchema.id }, { $ref: FunctionSchema.id }],
-    },
-    examples: [
-      [],
-      [{ key: 'abc' }],
-      [{ key: 'abc' }, '$func$2$f$'],
-      ['$func$2$f$', '$func$2$f$'],
-    ],
-    antiExamples: [
-      {
-        example: [{}],
-        reason: 'Array item not a valid FieldSchema or FunctionSchema',
-      },
-      {
-        example: [{ key: 'abc', choices: {} }],
-        reason: 'Array item not a valid FieldSchema',
-      },
-      {
-        example: '$func$2$f$',
-        reason: 'Must be an array',
-      },
-    ],
-  },
-  [FieldSchema, FunctionSchema],
-);
diff --git a/packages/schema/lib/schemas/FieldSchema.js b/packages/schema/lib/schemas/FieldSchema.js
index 91d832c82..daea14542 100644
--- a/packages/schema/lib/schemas/FieldSchema.js
+++ b/packages/schema/lib/schemas/FieldSchema.js
@@ -2,12 +2,6 @@
 
 const makeSchema = require('../utils/makeSchema');
 
-const RefResourceSchema = require('./RefResourceSchema');
-
-const FieldChoicesSchema = require('./FieldChoicesSchema');
-
-const FieldMetaSchema = require('./FieldMetaSchema');
-
 const { INCOMPATIBLE_FIELD_SCHEMA_KEYS } = require('../constants');
 
 // the following takes an array of string arrays (string[][]) and returns the follwing string:
@@ -19,192 +13,132 @@ const formatBullet = (f) => `* ${f.map(wrapInBackticks).join(' & ')}`;
 const incompatibleFieldsList =
   INCOMPATIBLE_FIELD_SCHEMA_KEYS.map(formatBullet).join('\n');
 
-module.exports = makeSchema(
-  {
-    id: '/FieldSchema',
-    description: `Defines a field an app either needs as input, or gives as output. In addition to the requirements below, the following keys are mutually exclusive:\n\n${incompatibleFieldsList}`,
-    type: 'object',
-    required: ['key'],
-    properties: {
-      key: {
-        description:
-          'A unique machine readable key for this value (IE: "fname").',
-        type: 'string',
-        minLength: 1,
-      },
-      label: {
-        description:
-          'A human readable label for this value (IE: "First Name").',
-        type: 'string',
-        minLength: 1,
-      },
-      helpText: {
-        description:
-          'A human readable description of this value (IE: "The first part of a full name."). You can use Markdown.',
-        type: 'string',
-        minLength: 1,
-        maxLength: 1000,
-      },
-      type: {
-        description:
-          'The type of this value. Use `string` for basic text input, `text` for a large, `<textarea>` style box, and `code` for a `<textarea>` with a fixed-width font. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.',
-        type: 'string',
-        // string == unicode
-        // text == a long textarea string
-        // integer == int
-        // number == float
-        enum: [
-          'string',
-          'text',
-          'integer',
-          'number',
-          'boolean',
-          'datetime',
-          'file',
-          'password',
-          'copy',
-          'code',
-        ],
-      },
-      required: {
-        description: 'If this value is required or not.',
-        type: 'boolean',
-      },
-      placeholder: {
-        description: 'An example value that is not saved.',
-        type: 'string',
-        minLength: 1,
-      },
-      default: {
-        description:
-          'A default value that is saved the first time a Zap is created.',
-        type: 'string',
-        minLength: 1,
-      },
-      primary: {
-        description:
-          'Use this field as part of the primary key for deduplication. You can set multiple fields as "primary", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`; it will be ignored if set in `inputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).',
-        type: 'boolean',
-      },
-      dynamic: {
-        description:
-          'A reference to a trigger that will power a dynamic dropdown.',
-        $ref: RefResourceSchema.id,
-      },
-      search: {
-        description:
-          'A reference to a search that will guide the user to add a search step to populate this field when creating a Zap.',
-        $ref: RefResourceSchema.id,
-      },
-      choices: {
-        description:
-          'An object of machine keys and human values to populate a static dropdown.',
-        $ref: FieldChoicesSchema.id,
-      },
-      list: {
-        description:
-          'Acts differently when used in inputFields vs. when used in outputFields. In inputFields: Can a user provide multiples of this field? In outputFields: Does this field return an array of items of type `type`?',
-        type: 'boolean',
-      },
-      children: {
-        type: 'array',
-        items: { $ref: '/FieldSchema' },
-        description:
-          'An array of child fields that define the structure of a sub-object for this field. Usually used for line items.',
-        minItems: 1,
-      },
-      dict: {
-        description: 'Is this field a key/value input?',
-        type: 'boolean',
-      },
-      computed: {
-        description:
-          'Is this field automatically populated (and hidden from the user)? Note: Only OAuth and Session Auth support fields with this key.',
-        type: 'boolean',
-      },
-      altersDynamicFields: {
-        description:
-          'Does the value of this field affect the definitions of other fields in the set?',
-        type: 'boolean',
-      },
-      steadyState: {
-        description:
-          'Prevents triggering on new output until all values for fields with this property remain unchanged for 2 polls. It can be used to, e.g., not trigger on a new contact until the contact has completed typing their name. NOTE that this only applies to the `outputFields` of polling triggers.',
-        type: 'boolean',
-      },
-      inputFormat: {
-        description:
-          'Useful when you expect the input to be part of a longer string. Put "{{input}}" in place of the user\'s input (IE: "https://{{input}}.yourdomain.com").',
-        type: 'string',
-        // TODO: Check if it contains one and ONLY ONE '{{input}}'
-        pattern: '^.*{{input}}.*$',
-      },
-      meta: {
-        description:
-          'Allows for additional metadata to be stored on the field. Supports simple key-values only (no sub-objects or arrays).',
-        $ref: FieldMetaSchema.id,
-      },
-    },
-    examples: [
-      { key: 'abc' },
-      { key: 'abc', choices: { mobile: 'Mobile Phone' } },
-      { key: 'abc', choices: ['first', 'second', 'third'] },
-      {
-        key: 'abc',
-        choices: [{ label: 'Red', sample: '#f00', value: '#f00' }],
-      },
-      { key: 'abc', children: [{ key: 'abc' }] },
-      { key: 'abc', type: 'integer', helpText: 'neat' },
-      {
-        key: 'abc',
-        type: 'integer',
-        meta: {
-          internalType: 'numeric',
-          should_call_api: true,
-          display_order: 1,
-        },
-      },
-    ],
-    antiExamples: [
-      {
-        example: {},
-        reason: 'Missing required key: key',
-      },
-      {
-        example: { key: 'abc', type: 'loltype' },
-        reason: 'Invalid value for key: type',
-      },
-      {
-        example: { key: 'abc', choices: {} },
-        reason: 'Invalid value for key: choices (cannot be empty)',
-      },
-      {
-        example: { key: 'abc', choices: [] },
-        reason: 'Invalid value for key: choices (cannot be empty)',
-      },
-      {
-        example: { key: 'abc', choices: [3] },
-        reason:
-          'Invalid value for key: choices (if an array, must be of either string or FieldChoiceWithLabelSchema)',
-      },
-      {
-        example: { key: 'abc', choices: [{ label: 'Red', value: '#f00' }] },
-        reason:
-          'Invalid value for key: choices (if an array of FieldChoiceWithLabelSchema, must provide key `sample`)',
-      },
-      {
-        example: { key: 'abc', choices: 'mobile' },
-        reason:
-          'Invalid value for key: choices (must be either object or array)',
-      },
-
-      {
-        example: { key: 'abc', children: ['$func$2$f$'] },
-        reason:
-          'Invalid value for key: children (must be array of FieldSchema)',
-      },
-    ],
-    additionalProperties: false,
+module.exports = makeSchema({
+  id: '/FieldSchema',
+  description: `Defines a field an app either needs as input, or gives as output. In addition to the requirements below, the following keys are mutually exclusive:\n\n${incompatibleFieldsList}`,
+  type: 'object',
+  required: ['key'],
+  docAnnotation: { hide: true },
+  properties: {
+    key: {
+      description:
+        'A unique machine readable key for this value (IE: "fname").',
+      type: 'string',
+      minLength: 1,
+    },
+    label: {
+      description: 'A human readable label for this value (IE: "First Name").',
+      type: 'string',
+      minLength: 1,
+    },
+    type: {
+      description:
+        'The type of this value. Use `string` for basic text input, `text` for a large, `<textarea>` style box, and `code` for a `<textarea>` with a fixed-width font. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.',
+      type: 'string',
+      // string == unicode
+      // text == a long textarea string
+      // integer == int
+      // number == float
+      enum: [
+        'string',
+        'text',
+        'integer',
+        'number',
+        'boolean',
+        'datetime',
+        'file',
+        'password',
+        'copy',
+        'code',
+      ],
+    },
+    required: {
+      description: 'If this value is required or not.',
+      type: 'boolean',
+    },
+    default: {
+      description:
+        'A default value that is saved the first time a Zap is created.',
+      type: 'string',
+      minLength: 1,
+    },
+    list: {
+      description:
+        'Acts differently when used in inputFields vs. when used in outputFields. In inputFields: Can a user provide multiples of this field? In outputFields: Does this field return an array of items of type `type`?',
+      type: 'boolean',
+    },
+    children: {
+      type: 'array',
+      items: { $ref: '/FieldSchema' },
+      description:
+        'An array of child fields that define the structure of a sub-object for this field. Usually used for line items.',
+      minItems: 1,
+    },
+    dict: {
+      description: 'Is this field a key/value input?',
+      type: 'boolean',
+    },
   },
-  [RefResourceSchema, FieldChoicesSchema, FieldMetaSchema],
-);
+  examples: [
+    // 1. Minimal valid example
+    { key: 'abc' },
+
+    // 2. Has a label
+    { key: 'abc_label', label: 'First Name' },
+
+    // 3. Has a type and required
+    { key: 'abc_required', type: 'boolean', required: true },
+
+    // 4. Has a default
+    { key: 'abc_default', default: 'some default' },
+
+    // 5. Children array referencing FieldSchema
+    { key: 'parent', children: [{ key: 'child' }] },
+
+    // 6. A field with type=integer
+    { key: 'abc_int', type: 'integer' },
+  ],
+  antiExamples: [
+    {
+      example: {},
+      reason: 'Missing required key: key',
+    },
+    {
+      example: { key: 'abc', type: 'loltype' },
+      reason: 'Invalid value for key: type',
+    },
+    {
+      // If someone tries to add a "choices" property, it's invalid
+      example: { key: 'abc', choices: { mobile: 'Mobile Phone' } },
+      reason: 'Invalid extra property: choices (not in schema)',
+    },
+    {
+      // default must be at least 1 character long
+      example: { key: 'abc', default: '' },
+      reason: 'Invalid value for key: default (cannot be empty string)',
+    },
+    {
+      // key must be at least 1 character long
+      example: { key: '' },
+      reason: 'Invalid value for key: key (cannot be empty string)',
+    },
+    {
+      // children array must have at least one valid item
+      example: { key: 'abc', children: [] },
+      reason:
+        'Invalid value for key: children (array must have at least 1 item)',
+    },
+    {
+      // children must be objects that match the FieldSchema
+      example: { key: 'abc', children: ['$func$2$f$'] },
+      reason:
+        'Invalid value for key: children (each item must be a valid FieldSchema object)',
+    },
+    {
+      // Another example of an invalid extra property
+      example: { key: 'abc', helpText: 'Not allowed' },
+      reason: 'Invalid extra property: helpText',
+    },
+  ],
+  additionalProperties: false,
+});
diff --git a/packages/schema/lib/schemas/InputFieldSchema.js b/packages/schema/lib/schemas/InputFieldSchema.js
index b399e2203..a1947f8a9 100644
--- a/packages/schema/lib/schemas/InputFieldSchema.js
+++ b/packages/schema/lib/schemas/InputFieldSchema.js
@@ -3,28 +3,17 @@
 const makeSchema = require('../utils/makeSchema');
 const RefResourceSchema = require('./RefResourceSchema');
 const FieldChoicesSchema = require('./FieldChoicesSchema');
+const FieldSchema = require('./FieldSchema');
 const FieldMetaSchema = require('./FieldMetaSchema');
 
 module.exports = makeSchema(
   {
     description: 'Field schema specialized for input fields.',
     id: '/InputFieldSchema',
-
     type: 'object',
     required: ['key'],
     properties: {
-      key: {
-        description:
-          'A unique machine readable key for this value (IE: "fname").',
-        type: 'string',
-        minLength: 1,
-      },
-      label: {
-        description:
-          'A human readable label for this value (IE: "First Name").',
-        type: 'string',
-        minLength: 1,
-      },
+      ...FieldSchema.schema.properties,
       helpText: {
         description:
           'A human readable description of this value (IE: "The first part of a full name."). You can use Markdown.',
@@ -32,31 +21,6 @@ module.exports = makeSchema(
         minLength: 1,
         maxLength: 1000,
       },
-      type: {
-        description:
-          'The type of this value. Use `string` for basic text input, `text` for a large, `<textarea>` style box, and `code` for a `<textarea>` with a fixed-width font. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.',
-        type: 'string',
-        // string == unicode
-        // text == a long textarea string
-        // integer == int
-        // number == float
-        enum: [
-          'string',
-          'text',
-          'integer',
-          'number',
-          'boolean',
-          'datetime',
-          'file',
-          'password',
-          'copy',
-          'code',
-        ],
-      },
-      required: {
-        description: 'If this value is required or not.',
-        type: 'boolean',
-      },
       dynamic: {
         description:
           'A reference to a trigger that will power a dynamic dropdown.',
@@ -77,27 +41,6 @@ module.exports = makeSchema(
         type: 'string',
         minLength: 1,
       },
-      list: {
-        description: 'Can a user provide multiples of this field?',
-        type: 'boolean',
-      },
-      children: {
-        type: 'array',
-        items: { $ref: '/InputFieldSchema' },
-        description:
-          'An array of child fields that define the structure of a sub-object for this field. Usually used for line items.',
-        minItems: 1,
-      },
-      default: {
-        description:
-          'A default value that is saved the first time a Zap is created.',
-        type: 'string',
-        minLength: 1,
-      },
-      dict: {
-        description: 'Is this field a key/value input?',
-        type: 'boolean',
-      },
       altersDynamicFields: {
         description:
           'Does the value of this field affect the definitions of other fields in the set?',
@@ -177,5 +120,5 @@ module.exports = makeSchema(
     ],
     additionalProperties: false,
   },
-  [RefResourceSchema, FieldChoicesSchema, FieldMetaSchema],
+  [RefResourceSchema, FieldChoicesSchema, FieldMetaSchema, FieldSchema],
 );
diff --git a/packages/schema/lib/schemas/OutputFieldSchema.js b/packages/schema/lib/schemas/OutputFieldSchema.js
index 393a4ad76..9539f27f4 100644
--- a/packages/schema/lib/schemas/OutputFieldSchema.js
+++ b/packages/schema/lib/schemas/OutputFieldSchema.js
@@ -1,9 +1,7 @@
 'use strict';
 
 const makeSchema = require('../utils/makeSchema');
-const RefResourceSchema = require('./RefResourceSchema');
-const FieldChoicesSchema = require('./FieldChoicesSchema');
-const FieldMetaSchema = require('./FieldMetaSchema');
+const FieldSchema = require('./FieldSchema');
 
 module.exports = makeSchema(
   {
@@ -12,18 +10,7 @@ module.exports = makeSchema(
     type: 'object',
     required: ['key'],
     properties: {
-      key: {
-        description:
-          'A unique machine readable key for this value (IE: "fname").',
-        type: 'string',
-        minLength: 1,
-      },
-      label: {
-        description:
-          'A human readable label for this value (IE: "First Name").',
-        type: 'string',
-        minLength: 1,
-      },
+      ...FieldSchema.schema.properties,
       type: {
         description:
           'The type of this value. Field type of `file` will accept either a file object or a string. If a URL is provided in the string, Zapier will automatically make a GET for that file. Otherwise, a .txt file will be generated.',
@@ -32,40 +19,16 @@ module.exports = makeSchema(
         // number == float
         enum: ['string', 'number', 'boolean', 'datetime', 'file', 'password'],
       },
-      required: {
-        description: 'If this value is required or not.',
-        type: 'boolean',
-      },
       primary: {
         description:
           'Use this field as part of the primary key for deduplication. You can set multiple fields as "primary", provided they are unique together. If no fields are set, Zapier will default to using the `id` field. `primary` only makes sense for `outputFields`. It only works in static `outputFields`; will not work in custom/dynamic `outputFields`. For more information, see [How deduplication works in Zapier](https://platform.zapier.com/build/deduplication).',
         type: 'boolean',
       },
-      default: {
-        description: 'A default value for an output field.',
-        type: 'string',
-        minLength: 1,
-      },
       steadyState: {
         description:
           'Prevents triggering on new output until all values for fields with this property remain unchanged for 2 polls. It can be used to, e.g., not trigger on a new contact until the contact has completed typing their name. NOTE that this only applies to the `outputFields` of polling triggers.',
         type: 'boolean',
       },
-      list: {
-        description: 'Can a user provide multiples of this field?',
-        type: 'boolean',
-      },
-      children: {
-        type: 'array',
-        items: { $ref: '/OutputFieldSchema' },
-        description:
-          'An array of child fields that define the structure of a sub-object for this field. Usually used for line items.',
-        minItems: 1,
-      },
-      dict: {
-        description: 'Is this field a key/value output?',
-        type: 'boolean',
-      },
     },
     examples: [
       { key: 'abc' },
@@ -114,5 +77,5 @@ module.exports = makeSchema(
     ],
     additionalProperties: false,
   },
-  [RefResourceSchema, FieldChoicesSchema, FieldMetaSchema],
+  [FieldSchema],
 );
diff --git a/packages/schema/test/index.js b/packages/schema/test/index.js
index bc519aae9..39905ad07 100644
--- a/packages/schema/test/index.js
+++ b/packages/schema/test/index.js
@@ -9,7 +9,7 @@ const appDefinition = require('../examples/definition.json');
 
 const copy = (o) => JSON.parse(JSON.stringify(o));
 
-const NUM_SCHEMAS = 59; // changes regularly as we expand
+const NUM_SCHEMAS = 60; // changes regularly as we expand
 
 describe('app', () => {
   describe('validation', () => {

From a94f3ac1722dc2704fd4ef959fdfa6556a292e83 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Tue, 4 Feb 2025 07:04:46 -0500
Subject: [PATCH 50/60] Update
 packages/schema/lib/functional-constraints/AuthFieldisSafe.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>
---
 packages/schema/lib/functional-constraints/AuthFieldisSafe.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schema/lib/functional-constraints/AuthFieldisSafe.js b/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
index 7f9e9bed8..0e455b936 100644
--- a/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
+++ b/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
@@ -24,7 +24,7 @@ const FORBIDDEN_KEYS = [
 
 const isSensitiveKey = (key = '') =>
   FORBIDDEN_KEYS.some((forbidden) =>
-    key.toLowerCase().includes(forbidden.toLowerCase()),
+    key.toLowerCase().includes(forbidden),
   );
 
 const checkAuthField = (field) => {

From ec31b8f3efd5dec0aa19701f541da79bae3cba29 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Tue, 4 Feb 2025 07:05:50 -0500
Subject: [PATCH 51/60] Update packages/schema/lib/schemas/AuthFieldSchema.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>
---
 packages/schema/lib/schemas/AuthFieldSchema.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schema/lib/schemas/AuthFieldSchema.js b/packages/schema/lib/schemas/AuthFieldSchema.js
index 5801b4f77..b15a7554e 100644
--- a/packages/schema/lib/schemas/AuthFieldSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldSchema.js
@@ -7,7 +7,7 @@ const FieldSchema = require('./FieldSchema');
 module.exports = makeSchema(
   {
     id: '/AuthFieldSchema',
-    description: 'Field schema specialized for authentication fields.',
+    description: 'Field schema specialized for authentication fields. ${FieldSchema.schema.description}',
     required: ['key'],
     type: 'object',
     properties: {

From edae9ea2df28490e528cd79c94384092bdb4a142 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Tue, 4 Feb 2025 07:05:58 -0500
Subject: [PATCH 52/60] Update packages/schema/lib/schemas/OutputFieldSchema.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>
---
 packages/schema/lib/schemas/OutputFieldSchema.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schema/lib/schemas/OutputFieldSchema.js b/packages/schema/lib/schemas/OutputFieldSchema.js
index 9539f27f4..f5ab79066 100644
--- a/packages/schema/lib/schemas/OutputFieldSchema.js
+++ b/packages/schema/lib/schemas/OutputFieldSchema.js
@@ -5,7 +5,7 @@ const FieldSchema = require('./FieldSchema');
 
 module.exports = makeSchema(
   {
-    description: 'Field schema specialized for output fields.',
+    description: 'Field schema specialized for output fields. ${FieldSchema.schema.description}',
     id: '/OutputFieldSchema',
     type: 'object',
     required: ['key'],

From f6ca550ebf9d2809970ce656f23b81695df26ca7 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Tue, 4 Feb 2025 07:16:33 -0500
Subject: [PATCH 53/60] Update packages/schema/test/index.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>
---
 packages/schema/test/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/schema/test/index.js b/packages/schema/test/index.js
index 39905ad07..24ad7cf0f 100644
--- a/packages/schema/test/index.js
+++ b/packages/schema/test/index.js
@@ -286,7 +286,6 @@ describe('app', () => {
       should(results.valid).eql(false);
 
       const [error] = results.errors;
-      console.log(error);
       error.name.should.equal('sensitive');
       error.stack.should.eql(
         'instance.authentication.fields[0] cannot set isNoSecret as true for the sensitive key "password".',

From 8a6387e8e70cc856877ac3cd0a89548aeb715587 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Tue, 4 Feb 2025 07:16:53 -0500
Subject: [PATCH 54/60] Update packages/schema/lib/schemas/FieldSchema.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>
---
 packages/schema/lib/schemas/FieldSchema.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schema/lib/schemas/FieldSchema.js b/packages/schema/lib/schemas/FieldSchema.js
index daea14542..e61082e37 100644
--- a/packages/schema/lib/schemas/FieldSchema.js
+++ b/packages/schema/lib/schemas/FieldSchema.js
@@ -15,7 +15,7 @@ const incompatibleFieldsList =
 
 module.exports = makeSchema({
   id: '/FieldSchema',
-  description: `Defines a field an app either needs as input, or gives as output. In addition to the requirements below, the following keys are mutually exclusive:\n\n${incompatibleFieldsList}`,
+  description: `In addition to the requirements below, the following keys are mutually exclusive:\n\n${incompatibleFieldsList}`,
   type: 'object',
   required: ['key'],
   docAnnotation: { hide: true },

From de4e20986493d0825175bfd4145cd3e00c311672 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Tue, 4 Feb 2025 07:17:27 -0500
Subject: [PATCH 55/60] Update packages/schema/lib/schemas/AuthFieldSchema.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>
---
 packages/schema/lib/schemas/AuthFieldSchema.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schema/lib/schemas/AuthFieldSchema.js b/packages/schema/lib/schemas/AuthFieldSchema.js
index b15a7554e..60839405c 100644
--- a/packages/schema/lib/schemas/AuthFieldSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldSchema.js
@@ -86,7 +86,7 @@ module.exports = makeSchema(
           isNoSecret: true,
           required: true,
         },
-        reason: 'A "password" field cannot have isSafe = true.',
+        reason: '"password" is a sensitive field and cannot have isNoSecret set as true.',
       },
       {
         example: {

From 7bfc4a053bdbfeb611ffcc4544632c352a13f154 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Tue, 4 Feb 2025 07:17:38 -0500
Subject: [PATCH 56/60] Update packages/schema/lib/schemas/AuthFieldSchema.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>
---
 packages/schema/lib/schemas/AuthFieldSchema.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schema/lib/schemas/AuthFieldSchema.js b/packages/schema/lib/schemas/AuthFieldSchema.js
index 60839405c..f2013cb31 100644
--- a/packages/schema/lib/schemas/AuthFieldSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldSchema.js
@@ -94,7 +94,7 @@ module.exports = makeSchema(
           isNoSecret: true,
         },
         reason:
-          '"api_key" is a sensitive field and cannot have isSafe set as true.',
+          '"api_key" is a sensitive field and cannot have isNoSecret set as true.',
       },
       {
         example: {

From ca8c94fba06c4d4c700b4d890d8430a3a71f7b0c Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Tue, 4 Feb 2025 07:17:48 -0500
Subject: [PATCH 57/60] Update packages/schema/lib/schemas/InputFieldSchema.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>
---
 packages/schema/lib/schemas/InputFieldSchema.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schema/lib/schemas/InputFieldSchema.js b/packages/schema/lib/schemas/InputFieldSchema.js
index a1947f8a9..b931b4fe0 100644
--- a/packages/schema/lib/schemas/InputFieldSchema.js
+++ b/packages/schema/lib/schemas/InputFieldSchema.js
@@ -8,7 +8,7 @@ const FieldMetaSchema = require('./FieldMetaSchema');
 
 module.exports = makeSchema(
   {
-    description: 'Field schema specialized for input fields.',
+    description: 'Field schema specialized for input fields. ${FieldSchema.schema.description}',
     id: '/InputFieldSchema',
     type: 'object',
     required: ['key'],

From 58ceac28b4f706f8b77963bd2c37674efa71b6c5 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Tue, 4 Feb 2025 08:15:34 -0500
Subject: [PATCH 58/60] Split FieldSchema into AuthFieldSchema,
 InputFieldSchema, OutputFieldSchema

---
 packages/core/types/zapier.generated.d.ts     | 67 ++++++++++++++-----
 packages/schema/docs/build/schema.md          | 48 ++++++++++---
 packages/schema/exported-schema.json          | 34 +++++-----
 .../functional-constraints/AuthFieldisSafe.js | 10 ++-
 .../schema/lib/schemas/AuthFieldSchema.js     | 41 +++++++-----
 packages/schema/lib/schemas/FieldSchema.js    | 61 -----------------
 .../schema/lib/schemas/InputFieldSchema.js    |  2 +-
 .../schema/lib/schemas/OutputFieldSchema.js   |  2 +-
 packages/schema/test/readability.js           |  4 +-
 9 files changed, 141 insertions(+), 128 deletions(-)

diff --git a/packages/core/types/zapier.generated.d.ts b/packages/core/types/zapier.generated.d.ts
index 09bde3bae..640929075 100644
--- a/packages/core/types/zapier.generated.d.ts
+++ b/packages/core/types/zapier.generated.d.ts
@@ -242,7 +242,6 @@ export type FieldChoices =
   | (string | FieldChoiceWithLabel)[];
 
 /**
- * Defines a field an app either needs as input, or gives as output.
  * In addition to the requirements below, the following keys are
  * mutually exclusive:
  *
@@ -314,7 +313,19 @@ export interface Field {
 }
 
 /**
- * Field schema specialized for authentication fields.
+ * Field schema specialized for authentication fields. In addition
+ * to the requirements below, the following keys are mutually
+ * exclusive:
+ *
+ * * `children` & `list`
+ * * `children` & `dict`
+ * * `children` & `type`
+ * * `children` & `placeholder`
+ * * `children` & `helpText`
+ * * `children` & `default`
+ * * `dict` & `list`
+ * * `dynamic` & `dict`
+ * * `dynamic` & `choices`
  *
  * [Docs: AuthFieldSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#AuthFieldSchema)
  */
@@ -328,7 +339,7 @@ export interface AuthField {
   /** The type of this value used to be. */
   type?: 'string' | 'number' | 'boolean' | 'datetime' | 'password';
 
-  /** If this value is required or not. */
+  /** If this value is required or not. This defaults to `true`. */
   required?: boolean;
 
   /**
@@ -356,10 +367,13 @@ export interface AuthField {
   dict?: boolean;
 
   /**
-   * Indicates if this authentication field is safe to e.g. be stored
-   * without encryption or displayed (not a secret).
+   * A human readable description of this value (IE: "The first part
+   * of a full name."). You can use Markdown.
    */
-  isNoSecret?: boolean;
+  helpText?: string;
+
+  /** An example value that is not saved. */
+  placeholder?: string;
 
   /**
    * An object of machine keys and human values to populate a static
@@ -373,21 +387,18 @@ export interface AuthField {
    */
   computed?: boolean;
 
-  /**
-   * A human readable description of this value (IE: "The first part
-   * of a full name."). You can use Markdown.
-   */
-  helpText?: string;
-
-  /** An example value that is not saved. */
-  placeholder?: string;
-
   /**
    * Useful when you expect the input to be part of a longer string.
    * Put "{{input}}" in place of the user's input (IE:
    * "https://{{input}}.yourdomain.com").
    */
   inputFormat?: string;
+
+  /**
+   * Indicates if this authentication field is safe to e.g. be stored
+   * without encryption or displayed (not a secret).
+   */
+  isNoSecret?: boolean;
   [k: string]: unknown;
 }
 
@@ -628,7 +639,18 @@ export interface FieldMeta {
 }
 
 /**
- * Field schema specialized for input fields.
+ * Field schema specialized for input fields. In addition to the
+ * requirements below, the following keys are mutually exclusive:
+ *
+ * * `children` & `list`
+ * * `children` & `dict`
+ * * `children` & `type`
+ * * `children` & `placeholder`
+ * * `children` & `helpText`
+ * * `children` & `default`
+ * * `dict` & `list`
+ * * `dynamic` & `dict`
+ * * `dynamic` & `choices`
  *
  * [Docs: InputFieldSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#InputFieldSchema)
  */
@@ -733,7 +755,18 @@ export interface InputField {
 }
 
 /**
- * Field schema specialized for output fields.
+ * Field schema specialized for output fields. In addition to the
+ * requirements below, the following keys are mutually exclusive:
+ *
+ * * `children` & `list`
+ * * `children` & `dict`
+ * * `children` & `type`
+ * * `children` & `placeholder`
+ * * `children` & `helpText`
+ * * `children` & `default`
+ * * `dict` & `list`
+ * * `dynamic` & `dict`
+ * * `dynamic` & `choices`
  *
  * [Docs: OutputFieldSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#OutputFieldSchema)
  */
diff --git a/packages/schema/docs/build/schema.md b/packages/schema/docs/build/schema.md
index 8faa62786..051b2c9c0 100644
--- a/packages/schema/docs/build/schema.md
+++ b/packages/schema/docs/build/schema.md
@@ -149,7 +149,17 @@ Key | Required | Type | Description
 
 ## /AuthFieldSchema
 
-Field schema specialized for authentication fields.
+Field schema specialized for authentication fields. In addition to the requirements below, the following keys are mutually exclusive:
+
+* `children` & `list`
+* `children` & `dict`
+* `children` & `type`
+* `children` & `placeholder`
+* `children` & `helpText`
+* `children` & `default`
+* `dict` & `list`
+* `dynamic` & `dict`
+* `dynamic` & `choices`
 
 #### Details
 
@@ -163,17 +173,17 @@ Key | Required | Type | Description
 `key` | **yes** | `string` | A unique machine readable key for this value (IE: "fname").
 `label` | no | `string` | A human readable label for this value (IE: "First Name").
 `type` | no | `string` in (`'string'`, `'number'`, `'boolean'`, `'datetime'`, `'password'`) | The type of this value used to be.
-`required` | no | `boolean` | If this value is required or not.
+`required` | no | `boolean` | If this value is required or not. This defaults to `true`.
 `default` | no | `string` | A default value that is saved the first time a Zap is created.
 `list` | no | `boolean` | Acts differently when used in inputFields vs. when used in outputFields. In inputFields: Can a user provide multiples of this field? In outputFields: Does this field return an array of items of type `type`?
 `children` | no | `array`[undefined] | An array of child fields that define the structure of a sub-object for this field. Usually used for line items.
 `dict` | no | `boolean` | Is this field a key/value input?
-`isNoSecret` | no | `boolean` | Indicates if this authentication field is safe to e.g. be stored without encryption or displayed (not a secret).
-`choices` | no | [/FieldChoicesSchema](#fieldchoicesschema) | An object of machine keys and human values to populate a static dropdown.
-`computed` | no | `boolean` | Is this field automatically populated (and hidden from the user)? Note: Only OAuth and Session Auth support fields with this key.
 `helpText` | no | `string` | A human readable description of this value (IE: "The first part of a full name."). You can use Markdown.
 `placeholder` | no | `string` | An example value that is not saved.
+`choices` | no | [/FieldChoicesSchema](#fieldchoicesschema) | An object of machine keys and human values to populate a static dropdown.
+`computed` | no | `boolean` | Is this field automatically populated (and hidden from the user)? Note: Only OAuth and Session Auth support fields with this key.
 `inputFormat` | no | `string` | Useful when you expect the input to be part of a longer string. Put "{{input}}" in place of the user's input (IE: "https://{{input}}.yourdomain.com").
+`isNoSecret` | no | `boolean` | Indicates if this authentication field is safe to e.g. be stored without encryption or displayed (not a secret).
 
 #### Examples
 
@@ -183,8 +193,8 @@ Key | Required | Type | Description
 
 #### Anti-Examples
 
-* `{ key: 'password', type: 'password', isNoSecret: true, required: true }` - _A "password" field cannot have isSafe = true._
-* `{ key: 'api_key', isNoSecret: true }` - _"api_key" is a sensitive field and cannot have isSafe set as true._
+* `{ key: 'password', type: 'password', isNoSecret: true, required: true }` - _"password" is a sensitive field and cannot have isNoSecret set as true._
+* `{ key: 'api_key', isNoSecret: true }` - _"api_key" is a sensitive field and cannot have isNoSecret set as true._
 * `{ type: 'string', isNoSecret: false }` - _Missing required key: key_
 
 -----
@@ -1192,7 +1202,17 @@ Key | Required | Type | Description
 
 ## /InputFieldSchema
 
-Field schema specialized for input fields.
+Field schema specialized for input fields. In addition to the requirements below, the following keys are mutually exclusive:
+
+* `children` & `list`
+* `children` & `dict`
+* `children` & `type`
+* `children` & `placeholder`
+* `children` & `helpText`
+* `children` & `default`
+* `dict` & `list`
+* `dynamic` & `dict`
+* `dynamic` & `choices`
 
 #### Details
 
@@ -1328,7 +1348,17 @@ List of before or after middlewares. Can be an array of functions or a single fu
 
 ## /OutputFieldSchema
 
-Field schema specialized for output fields.
+Field schema specialized for output fields. In addition to the requirements below, the following keys are mutually exclusive:
+
+* `children` & `list`
+* `children` & `dict`
+* `children` & `type`
+* `children` & `placeholder`
+* `children` & `helpText`
+* `children` & `default`
+* `dict` & `list`
+* `dynamic` & `dict`
+* `dynamic` & `choices`
 
 #### Details
 
diff --git a/packages/schema/exported-schema.json b/packages/schema/exported-schema.json
index 969fcac9d..d38ccf3ba 100644
--- a/packages/schema/exported-schema.json
+++ b/packages/schema/exported-schema.json
@@ -222,7 +222,7 @@
     },
     "FieldSchema": {
       "id": "/FieldSchema",
-      "description": "Defines a field an app either needs as input, or gives as output. In addition to the requirements below, the following keys are mutually exclusive:\n\n* `children` & `list`\n* `children` & `dict`\n* `children` & `type`\n* `children` & `placeholder`\n* `children` & `helpText`\n* `children` & `default`\n* `dict` & `list`\n* `dynamic` & `dict`\n* `dynamic` & `choices`",
+      "description": "In addition to the requirements below, the following keys are mutually exclusive:\n\n* `children` & `list`\n* `children` & `dict`\n* `children` & `type`\n* `children` & `placeholder`\n* `children` & `helpText`\n* `children` & `default`\n* `dict` & `list`\n* `dynamic` & `dict`\n* `dynamic` & `choices`",
       "type": "object",
       "required": ["key"],
       "docAnnotation": {
@@ -285,7 +285,7 @@
     },
     "AuthFieldSchema": {
       "id": "/AuthFieldSchema",
-      "description": "Field schema specialized for authentication fields.",
+      "description": "Field schema specialized for authentication fields. In addition to the requirements below, the following keys are mutually exclusive:\n\n* `children` & `list`\n* `children` & `dict`\n* `children` & `type`\n* `children` & `placeholder`\n* `children` & `helpText`\n* `children` & `default`\n* `dict` & `list`\n* `dynamic` & `dict`\n* `dynamic` & `choices`",
       "required": ["key"],
       "type": "object",
       "properties": {
@@ -305,7 +305,7 @@
           "enum": ["string", "number", "boolean", "datetime", "password"]
         },
         "required": {
-          "description": "If this value is required or not.",
+          "description": "If this value is required or not. This defaults to `true`.",
           "type": "boolean"
         },
         "default": {
@@ -329,18 +329,6 @@
           "description": "Is this field a key/value input?",
           "type": "boolean"
         },
-        "isNoSecret": {
-          "description": "Indicates if this authentication field is safe to e.g. be stored without encryption or displayed (not a secret).",
-          "type": "boolean"
-        },
-        "choices": {
-          "description": "An object of machine keys and human values to populate a static dropdown.",
-          "$ref": "/FieldChoicesSchema"
-        },
-        "computed": {
-          "description": "Is this field automatically populated (and hidden from the user)? Note: Only OAuth and Session Auth support fields with this key.",
-          "type": "boolean"
-        },
         "helpText": {
           "description": "A human readable description of this value (IE: \"The first part of a full name.\"). You can use Markdown.",
           "type": "string",
@@ -352,10 +340,22 @@
           "type": "string",
           "minLength": 1
         },
+        "choices": {
+          "description": "An object of machine keys and human values to populate a static dropdown.",
+          "$ref": "/FieldChoicesSchema"
+        },
+        "computed": {
+          "description": "Is this field automatically populated (and hidden from the user)? Note: Only OAuth and Session Auth support fields with this key.",
+          "type": "boolean"
+        },
         "inputFormat": {
           "description": "Useful when you expect the input to be part of a longer string. Put \"{{input}}\" in place of the user's input (IE: \"https://{{input}}.yourdomain.com\").",
           "type": "string",
           "pattern": "^.*{{input}}.*$"
+        },
+        "isNoSecret": {
+          "description": "Indicates if this authentication field is safe to e.g. be stored without encryption or displayed (not a secret).",
+          "type": "boolean"
         }
       }
     },
@@ -663,7 +663,7 @@
       }
     },
     "InputFieldSchema": {
-      "description": "Field schema specialized for input fields.",
+      "description": "Field schema specialized for input fields. In addition to the requirements below, the following keys are mutually exclusive:\n\n* `children` & `list`\n* `children` & `dict`\n* `children` & `type`\n* `children` & `placeholder`\n* `children` & `helpText`\n* `children` & `default`\n* `dict` & `list`\n* `dynamic` & `dict`\n* `dynamic` & `choices`",
       "id": "/InputFieldSchema",
       "type": "object",
       "required": ["key"],
@@ -759,7 +759,7 @@
       "additionalProperties": false
     },
     "OutputFieldSchema": {
-      "description": "Field schema specialized for output fields.",
+      "description": "Field schema specialized for output fields. In addition to the requirements below, the following keys are mutually exclusive:\n\n* `children` & `list`\n* `children` & `dict`\n* `children` & `type`\n* `children` & `placeholder`\n* `children` & `helpText`\n* `children` & `default`\n* `dict` & `list`\n* `dynamic` & `dict`\n* `dynamic` & `choices`",
       "id": "/OutputFieldSchema",
       "type": "object",
       "required": ["key"],
diff --git a/packages/schema/lib/functional-constraints/AuthFieldisSafe.js b/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
index 0e455b936..6a5820a05 100644
--- a/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
+++ b/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
@@ -7,6 +7,8 @@ const AUTH_FIELDS_ID = '/AuthFieldsSchema';
 
 const FORBIDDEN_KEYS = [
   'access_token',
+  'access-token',
+  'accesstoken',
   'api_key',
   'apikey',
   'api-key',
@@ -16,16 +18,18 @@ const FORBIDDEN_KEYS = [
   'password',
   'pswd',
   'refresh_token',
+  'refresh-token',
+  'refreshtoken',
   'secret',
   'set-cookie',
+  'set_cookie',
+  'setcookie',
   'signature',
   'token',
 ];
 
 const isSensitiveKey = (key = '') =>
-  FORBIDDEN_KEYS.some((forbidden) =>
-    key.toLowerCase().includes(forbidden),
-  );
+  FORBIDDEN_KEYS.some((forbidden) => key.toLowerCase().includes(forbidden));
 
 const checkAuthField = (field) => {
   const errors = [];
diff --git a/packages/schema/lib/schemas/AuthFieldSchema.js b/packages/schema/lib/schemas/AuthFieldSchema.js
index f2013cb31..383e02932 100644
--- a/packages/schema/lib/schemas/AuthFieldSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldSchema.js
@@ -7,26 +7,11 @@ const FieldSchema = require('./FieldSchema');
 module.exports = makeSchema(
   {
     id: '/AuthFieldSchema',
-    description: 'Field schema specialized for authentication fields. ${FieldSchema.schema.description}',
+    description: `Field schema specialized for authentication fields. ${FieldSchema.schema.description}`,
     required: ['key'],
     type: 'object',
     properties: {
       ...FieldSchema.schema.properties,
-      isNoSecret: {
-        description:
-          'Indicates if this authentication field is safe to e.g. be stored without encryption or displayed (not a secret).',
-        type: 'boolean',
-      },
-      choices: {
-        description:
-          'An object of machine keys and human values to populate a static dropdown.',
-        $ref: FieldChoicesSchema.id,
-      },
-      computed: {
-        description:
-          'Is this field automatically populated (and hidden from the user)? Note: Only OAuth and Session Auth support fields with this key.',
-        type: 'boolean',
-      },
       helpText: {
         description:
           'A human readable description of this value (IE: "The first part of a full name."). You can use Markdown.',
@@ -39,11 +24,27 @@ module.exports = makeSchema(
         type: 'string',
         enum: ['string', 'number', 'boolean', 'datetime', 'password'],
       },
+      required: {
+        description:
+          'If this value is required or not. This defaults to `true`.',
+        type: 'boolean',
+      },
+
       placeholder: {
         description: 'An example value that is not saved.',
         type: 'string',
         minLength: 1,
       },
+      choices: {
+        description:
+          'An object of machine keys and human values to populate a static dropdown.',
+        $ref: FieldChoicesSchema.id,
+      },
+      computed: {
+        description:
+          'Is this field automatically populated (and hidden from the user)? Note: Only OAuth and Session Auth support fields with this key.',
+        type: 'boolean',
+      },
       inputFormat: {
         description:
           'Useful when you expect the input to be part of a longer string. Put "{{input}}" in place of the user\'s input (IE: "https://{{input}}.yourdomain.com").',
@@ -51,6 +52,11 @@ module.exports = makeSchema(
         // TODO: Check if it contains one and ONLY ONE '{{input}}'
         pattern: '^.*{{input}}.*$',
       },
+      isNoSecret: {
+        description:
+          'Indicates if this authentication field is safe to e.g. be stored without encryption or displayed (not a secret).',
+        type: 'boolean',
+      },
     },
 
     // Add examples and anti-examples specifically for basic & custom auth
@@ -86,7 +92,8 @@ module.exports = makeSchema(
           isNoSecret: true,
           required: true,
         },
-        reason: '"password" is a sensitive field and cannot have isNoSecret set as true.',
+        reason:
+          '"password" is a sensitive field and cannot have isNoSecret set as true.',
       },
       {
         example: {
diff --git a/packages/schema/lib/schemas/FieldSchema.js b/packages/schema/lib/schemas/FieldSchema.js
index e61082e37..8bc9600e1 100644
--- a/packages/schema/lib/schemas/FieldSchema.js
+++ b/packages/schema/lib/schemas/FieldSchema.js
@@ -79,66 +79,5 @@ module.exports = makeSchema({
       type: 'boolean',
     },
   },
-  examples: [
-    // 1. Minimal valid example
-    { key: 'abc' },
-
-    // 2. Has a label
-    { key: 'abc_label', label: 'First Name' },
-
-    // 3. Has a type and required
-    { key: 'abc_required', type: 'boolean', required: true },
-
-    // 4. Has a default
-    { key: 'abc_default', default: 'some default' },
-
-    // 5. Children array referencing FieldSchema
-    { key: 'parent', children: [{ key: 'child' }] },
-
-    // 6. A field with type=integer
-    { key: 'abc_int', type: 'integer' },
-  ],
-  antiExamples: [
-    {
-      example: {},
-      reason: 'Missing required key: key',
-    },
-    {
-      example: { key: 'abc', type: 'loltype' },
-      reason: 'Invalid value for key: type',
-    },
-    {
-      // If someone tries to add a "choices" property, it's invalid
-      example: { key: 'abc', choices: { mobile: 'Mobile Phone' } },
-      reason: 'Invalid extra property: choices (not in schema)',
-    },
-    {
-      // default must be at least 1 character long
-      example: { key: 'abc', default: '' },
-      reason: 'Invalid value for key: default (cannot be empty string)',
-    },
-    {
-      // key must be at least 1 character long
-      example: { key: '' },
-      reason: 'Invalid value for key: key (cannot be empty string)',
-    },
-    {
-      // children array must have at least one valid item
-      example: { key: 'abc', children: [] },
-      reason:
-        'Invalid value for key: children (array must have at least 1 item)',
-    },
-    {
-      // children must be objects that match the FieldSchema
-      example: { key: 'abc', children: ['$func$2$f$'] },
-      reason:
-        'Invalid value for key: children (each item must be a valid FieldSchema object)',
-    },
-    {
-      // Another example of an invalid extra property
-      example: { key: 'abc', helpText: 'Not allowed' },
-      reason: 'Invalid extra property: helpText',
-    },
-  ],
   additionalProperties: false,
 });
diff --git a/packages/schema/lib/schemas/InputFieldSchema.js b/packages/schema/lib/schemas/InputFieldSchema.js
index b931b4fe0..0717de4d7 100644
--- a/packages/schema/lib/schemas/InputFieldSchema.js
+++ b/packages/schema/lib/schemas/InputFieldSchema.js
@@ -8,7 +8,7 @@ const FieldMetaSchema = require('./FieldMetaSchema');
 
 module.exports = makeSchema(
   {
-    description: 'Field schema specialized for input fields. ${FieldSchema.schema.description}',
+    description: `Field schema specialized for input fields. ${FieldSchema.schema.description}`,
     id: '/InputFieldSchema',
     type: 'object',
     required: ['key'],
diff --git a/packages/schema/lib/schemas/OutputFieldSchema.js b/packages/schema/lib/schemas/OutputFieldSchema.js
index f5ab79066..70d312aa7 100644
--- a/packages/schema/lib/schemas/OutputFieldSchema.js
+++ b/packages/schema/lib/schemas/OutputFieldSchema.js
@@ -5,7 +5,7 @@ const FieldSchema = require('./FieldSchema');
 
 module.exports = makeSchema(
   {
-    description: 'Field schema specialized for output fields. ${FieldSchema.schema.description}',
+    description: `Field schema specialized for output fields. ${FieldSchema.schema.description}`,
     id: '/OutputFieldSchema',
     type: 'object',
     required: ['key'],
diff --git a/packages/schema/test/readability.js b/packages/schema/test/readability.js
index 1ede52200..8e7647c8b 100644
--- a/packages/schema/test/readability.js
+++ b/packages/schema/test/readability.js
@@ -86,13 +86,13 @@ describe('readability', () => {
       operation: {
         perform: '$func$2$f$',
         sample: { id: 1 },
-        inputFields: [{ key: 'field', type: 'string', children: [] }],
+        inputFields: [{ key: 'field', type: 'string', default: '' }],
       },
     });
     results.errors.should.have.length(1);
     should(results.errors[0].property.endsWith('instance')).be.false();
     results.errors[0].property.should.eql(
-      'instance.operation.inputFields[0].children',
+      'instance.operation.inputFields[0].default',
     );
     results.errors[0].message.should.eql('does not meet minimum length of 1');
   });

From dfc3dc54011cb4c7b9a71788b9e92e2fa22006f9 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@zapier.com>
Date: Tue, 4 Feb 2025 08:58:27 -0500
Subject: [PATCH 59/60] add examples/anti-examples back for FieldSchema

---
 packages/schema/lib/schemas/FieldSchema.js | 61 ++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/packages/schema/lib/schemas/FieldSchema.js b/packages/schema/lib/schemas/FieldSchema.js
index 8bc9600e1..e61082e37 100644
--- a/packages/schema/lib/schemas/FieldSchema.js
+++ b/packages/schema/lib/schemas/FieldSchema.js
@@ -79,5 +79,66 @@ module.exports = makeSchema({
       type: 'boolean',
     },
   },
+  examples: [
+    // 1. Minimal valid example
+    { key: 'abc' },
+
+    // 2. Has a label
+    { key: 'abc_label', label: 'First Name' },
+
+    // 3. Has a type and required
+    { key: 'abc_required', type: 'boolean', required: true },
+
+    // 4. Has a default
+    { key: 'abc_default', default: 'some default' },
+
+    // 5. Children array referencing FieldSchema
+    { key: 'parent', children: [{ key: 'child' }] },
+
+    // 6. A field with type=integer
+    { key: 'abc_int', type: 'integer' },
+  ],
+  antiExamples: [
+    {
+      example: {},
+      reason: 'Missing required key: key',
+    },
+    {
+      example: { key: 'abc', type: 'loltype' },
+      reason: 'Invalid value for key: type',
+    },
+    {
+      // If someone tries to add a "choices" property, it's invalid
+      example: { key: 'abc', choices: { mobile: 'Mobile Phone' } },
+      reason: 'Invalid extra property: choices (not in schema)',
+    },
+    {
+      // default must be at least 1 character long
+      example: { key: 'abc', default: '' },
+      reason: 'Invalid value for key: default (cannot be empty string)',
+    },
+    {
+      // key must be at least 1 character long
+      example: { key: '' },
+      reason: 'Invalid value for key: key (cannot be empty string)',
+    },
+    {
+      // children array must have at least one valid item
+      example: { key: 'abc', children: [] },
+      reason:
+        'Invalid value for key: children (array must have at least 1 item)',
+    },
+    {
+      // children must be objects that match the FieldSchema
+      example: { key: 'abc', children: ['$func$2$f$'] },
+      reason:
+        'Invalid value for key: children (each item must be a valid FieldSchema object)',
+    },
+    {
+      // Another example of an invalid extra property
+      example: { key: 'abc', helpText: 'Not allowed' },
+      reason: 'Invalid extra property: helpText',
+    },
+  ],
   additionalProperties: false,
 });

From fb88e82fd72c44ec6c16a6193d7bd92018e062c7 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Tue, 4 Feb 2025 08:59:58 -0500
Subject: [PATCH 60/60] Update packages/schema/lib/schemas/AuthFieldSchema.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>
---
 packages/schema/lib/schemas/AuthFieldSchema.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/schema/lib/schemas/AuthFieldSchema.js b/packages/schema/lib/schemas/AuthFieldSchema.js
index 383e02932..92507f485 100644
--- a/packages/schema/lib/schemas/AuthFieldSchema.js
+++ b/packages/schema/lib/schemas/AuthFieldSchema.js
@@ -29,7 +29,6 @@ module.exports = makeSchema(
           'If this value is required or not. This defaults to `true`.',
         type: 'boolean',
       },
-
       placeholder: {
         description: 'An example value that is not saved.',
         type: 'string',