From a6f4867cdbd0f3bd20eaa9ab95b90e2779e98642 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Tue, 4 Feb 2025 09:05:08 -0500
Subject: [PATCH] feat(schema): PDE-5719 split FieldSchema into
 InputFieldSchema, OutputFieldSchema, and AuthFieldSchema (#957)

* first attempt: split FieldSchema

* PDE-5719 address PR comments

* PDE-5719 address commented out lines

* PDE-5719 address commented out lines

* PDE-5719 clean up

* PDE-5719 clean up

* rename to AuthFieldSchema

* PR suggestions: remove cleanErrors addition

* PR suggestions: add examples and anti-examples

* fix description

* remove FieldsSchema and DynamicFieldsSchema

* add unit tests

* update unit test

* Update packages/schema/lib/schemas/AuthFieldSchema.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>

* Update packages/schema/lib/schemas/AuthFieldSchema.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>

* Update packages/schema/lib/schemas/AuthFieldSchema.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>

* Update packages/schema/lib/schemas/AuthFieldsSchema.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>

* Update packages/schema/lib/schemas/AuthFieldsSchema.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>

* Update packages/schema/lib/schemas/AuthFieldsSchema.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>

* Update packages/schema/lib/schemas/AuthFieldsSchema.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>

* Update packages/schema/lib/schemas/AuthFieldsSchema.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>

* run yarn build

* PR suggestion: move isSafe check as a functional-contsraint

* update test

* Update packages/schema/test/index.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>

* Update packages/schema/test/index.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>

* Update packages/schema/test/index.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>

* Update packages/schema/lib/utils/makeValidator.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>

* Update packages/schema/lib/functional-constraints/AuthFieldisSafe.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>

* Update packages/schema/lib/functional-constraints/AuthFieldisSafe.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>

* Update packages/schema/lib/functional-constraints/AuthFieldisSafe.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>

* Update packages/schema/lib/functional-constraints/AuthFieldisSafe.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>

* Update packages/schema/lib/functional-constraints/AuthFieldisSafe.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>

* Update packages/schema/lib/functional-constraints/AuthFieldisSafe.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>

* update FORBIDDEN_KEYS to match secret scrubber

* PR suggestions: tailor fields to not inherit from FieldSchema

* run yarn build

* PR suggestions: remove uneeded fields and fix tests

* PR suggestion:rename to isNotSecret

* PDE-5719 add helpText back to inputField

* update type enums for better fit

* apply PR suggestions

* apply PR suggestions

* remove copy from auth types

* add default back to input and output schema

* update docs

* apply PR suggestions

* apply PR suggestions

* PR suggestion: use common fields and update schemas

* Update packages/schema/lib/functional-constraints/AuthFieldisSafe.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>

* Update packages/schema/lib/schemas/AuthFieldSchema.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>

* Update packages/schema/lib/schemas/OutputFieldSchema.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>

* Update packages/schema/test/index.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>

* Update packages/schema/lib/schemas/FieldSchema.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>

* Update packages/schema/lib/schemas/AuthFieldSchema.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>

* Update packages/schema/lib/schemas/AuthFieldSchema.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>

* Update packages/schema/lib/schemas/InputFieldSchema.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>

* Split FieldSchema into AuthFieldSchema, InputFieldSchema, OutputFieldSchema

* add examples/anti-examples back for FieldSchema

* Update packages/schema/lib/schemas/AuthFieldSchema.js

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>

---------

Co-authored-by: Kola Erinoso <kola-er@users.noreply.github.com>
---
 packages/cli/src/tests/utils/build.js         |   2 +-
 packages/core/types/zapier.generated.d.ts     | 520 +++++++++++-----
 packages/schema/docs/build/schema.md          | 398 ++++++++-----
 packages/schema/exported-schema.json          | 553 ++++++++++++------
 .../functional-constraints/AuthFieldisSafe.js |  85 +++
 .../lib/functional-constraints/index.js       |   1 +
 .../schema/lib/schemas/AuthFieldSchema.js     | 115 ++++
 .../schema/lib/schemas/AuthFieldsSchema.js    |  67 +++
 .../lib/schemas/AuthenticationSchema.js       |   6 +-
 .../lib/schemas/BasicOperationSchema.js       |  10 +-
 .../schema/lib/schemas/DynamicFieldsSchema.js |  36 --
 .../lib/schemas/DynamicInputFieldsSchema.js   |  20 +
 .../lib/schemas/DynamicOutputFieldsSchema.js  |  20 +
 .../lib/schemas/FieldOrFunctionSchema.js      |  40 --
 packages/schema/lib/schemas/FieldSchema.js    | 322 ++++------
 packages/schema/lib/schemas/FieldsSchema.js   |  17 -
 .../schema/lib/schemas/InputFieldSchema.js    | 124 ++++
 .../schema/lib/schemas/OutputFieldSchema.js   |  81 +++
 packages/schema/lib/schemas/ResourceSchema.js |   6 +-
 packages/schema/test/index.js                 |  68 ++-
 20 files changed, 1721 insertions(+), 770 deletions(-)
 create mode 100644 packages/schema/lib/functional-constraints/AuthFieldisSafe.js
 create mode 100644 packages/schema/lib/schemas/AuthFieldSchema.js
 create mode 100644 packages/schema/lib/schemas/AuthFieldsSchema.js
 delete mode 100644 packages/schema/lib/schemas/DynamicFieldsSchema.js
 create mode 100644 packages/schema/lib/schemas/DynamicInputFieldsSchema.js
 create mode 100644 packages/schema/lib/schemas/DynamicOutputFieldsSchema.js
 delete mode 100644 packages/schema/lib/schemas/FieldOrFunctionSchema.js
 delete mode 100644 packages/schema/lib/schemas/FieldsSchema.js
 create mode 100644 packages/schema/lib/schemas/InputFieldSchema.js
 create mode 100644 packages/schema/lib/schemas/OutputFieldSchema.js

diff --git a/packages/cli/src/tests/utils/build.js b/packages/cli/src/tests/utils/build.js
index d908cd7ac..033261551 100644
--- a/packages/cli/src/tests/utils/build.js
+++ b/packages/cli/src/tests/utils/build.js
@@ -59,7 +59,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, 304);
   });
 
   it('should list all the files', () => {
diff --git a/packages/core/types/zapier.generated.d.ts b/packages/core/types/zapier.generated.d.ts
index 094ff5c06..640929075 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.
@@ -162,14 +224,6 @@ export interface FieldChoiceWithLabel {
   [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:
@@ -188,23 +242,6 @@ export type FieldChoices =
   | (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:
  *
@@ -227,12 +264,6 @@ export interface Field {
   /** 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
@@ -256,42 +287,65 @@ export interface Field {
   /** 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).
+   * 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`?
    */
-  primary?: boolean;
+  list?: boolean;
 
   /**
-   * A reference to a trigger that will power a dynamic dropdown.
+   * An array of child fields that define the structure of a
+   * sub-object for this field. Usually used for line items.
+   *
+   * @minItems 1
    */
-  dynamic?: RefResource;
+  children?: Field[];
 
-  /**
-   * 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;
+  /** Is this field a key/value input? */
+  dict?: boolean;
+}
+
+/**
+ * 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)
+ */
+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`. */
+  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;
 
   /**
    * Acts differently when used in inputFields vs. when used in
@@ -313,25 +367,25 @@ export interface Field {
   dict?: boolean;
 
   /**
-   * Is this field automatically populated (and hidden from the user)?
-   * Note: Only OAuth and Session Auth support fields with this key.
+   * A human readable description of this value (IE: "The first part
+   * of a full name."). You can use Markdown.
    */
-  computed?: boolean;
+  helpText?: string;
+
+  /** An example value that is not saved. */
+  placeholder?: string;
 
   /**
-   * Does the value of this field affect the definitions of other
-   * fields in the set?
+   * An object of machine keys and human values to populate a static
+   * dropdown.
    */
-  altersDynamicFields?: boolean;
+  choices?: FieldChoices;
 
   /**
-   * 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.
+   * Is this field automatically populated (and hidden from the user)?
+   * Note: Only OAuth and Session Auth support fields with this key.
    */
-  steadyState?: boolean;
+  computed?: boolean;
 
   /**
    * Useful when you expect the input to be part of a longer string.
@@ -341,74 +395,13 @@ export interface Field {
   inputFormat?: string;
 
   /**
-   * Allows for additional metadata to be stored on the field.
-   * Supports simple key-values only (no sub-objects or arrays).
-   */
-  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]+".
+   * Indicates if this authentication field is safe to e.g. be stored
+   * without encryption or displayed (not a secret).
    */
-  [k: string]: null | string | number | boolean;
+  isNoSecret?: boolean;
+  [k: string]: unknown;
 }
 
-/**
- * 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.
@@ -507,11 +500,11 @@ export interface RedirectRequest {
 }
 
 /**
- * An array or collection of fields.
+ * An array or collection of authentication fields.
  *
- * [Docs: FieldsSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#FieldsSchema)
+ * [Docs: AuthFieldsSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#AuthFieldsSchema)
  */
-export type Fields = Field[];
+export type AuthFields = AuthField[];
 
 /**
  * Config for Basic Authentication. No extra properties are required
@@ -622,11 +615,224 @@ export interface AuthenticationSessionConfig {
 }
 
 /**
- * Represents an array of fields or functions.
+ * 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;
+
+/**
+ * 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. 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)
+ */
+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;
+
+  /**
+   * 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;
+
+  /**
+   * 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.
+   */
+  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;
+
+  /** An example value that is not saved. */
+  placeholder?: string;
+
+  /**
+   * Does the value of this field affect the definitions of other
+   * fields in the set?
+   */
+  altersDynamicFields?: 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. In addition to the
+ * requirements below, the following keys are mutually exclusive:
  *
- * [Docs: FieldOrFunctionSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#FieldOrFunctionSchema)
+ * * `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)
  */
-export type FieldOrFunction = (Field | Function)[];
+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;
+
+  /**
+   * 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' | 'number' | 'boolean' | 'datetime' | 'file' | 'password';
+
+  /** 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
+   * 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).
+   */
+  primary?: 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;
+}
 
 /**
  * EXPERIMENTAL: Overrides the original throttle configuration based
@@ -669,12 +875,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: DynamicInputFieldsSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#DynamicInputFieldsSchema)
+ */
+export type DynamicInputFields = (InputField | Function)[];
+
+/**
+ * An array or collection of output fields.
  *
- * [Docs: DynamicFieldsSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#DynamicFieldsSchema)
+ * [Docs: DynamicOutputFieldsSchema](https://github.com/zapier/zapier-platform/blob/main/packages/schema/docs/build/schema.md#DynamicOutputFieldsSchema)
  */
-export type DynamicFields = (Field | Function)[];
+export type DynamicOutputFields = (OutputField | Function)[];
 
 /**
  * A unique identifier for this item.
@@ -856,13 +1068,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 +1163,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 +1212,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 +1271,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
@@ -1206,7 +1418,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 };
@@ -1268,13 +1480,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
@@ -1405,13 +1617,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
@@ -1553,7 +1765,7 @@ export interface Authentication {
    * Fields you can request from the user before they connect your app
    * to Zapier.
    */
-  fields?: Fields;
+  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 656a3214a..051b2c9c0 100644
--- a/packages/schema/docs/build/schema.md
+++ b/packages/schema/docs/build/schema.md
@@ -11,6 +11,8 @@ This is automatically generated by the `npm run docs` command in `zapier-platfor
 
 * [/AppFlagsSchema](#appflagsschema)
 * [/AppSchema](#appschema)
+* [/AuthFieldSchema](#authfieldschema)
+* [/AuthFieldsSchema](#authfieldsschema)
 * [/AuthenticationBasicConfigSchema](#authenticationbasicconfigschema)
 * [/AuthenticationCustomConfigSchema](#authenticationcustomconfigschema)
 * [/AuthenticationDigestConfigSchema](#authenticationdigestconfigschema)
@@ -29,21 +31,21 @@ 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)
 * [/FunctionRequireSchema](#functionrequireschema)
 * [/FunctionSchema](#functionschema)
 * [/FunctionSourceSchema](#functionsourceschema)
 * [/HydratorsSchema](#hydratorsschema)
+* [/InputFieldSchema](#inputfieldschema)
 * [/KeySchema](#keyschema)
 * [/LockObjectSchema](#lockobjectschema)
 * [/MiddlewaresSchema](#middlewaresschema)
+* [/OutputFieldSchema](#outputfieldschema)
 * [/RedirectRequestSchema](#redirectrequestschema)
 * [/RefResourceSchema](#refresourceschema)
 * [/RequestSchema](#requestschema)
@@ -145,6 +147,95 @@ Key | Required | Type | Description
 
 -----
 
+## /AuthFieldSchema
+
+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
+
+* **Type** - `object`
+* [**Source Code**](https://github.com/zapier/zapier-platform/blob/zapier-platform-schema@16.3.0/packages/schema/lib/schemas/AuthFieldSchema.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").
+`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`.
+`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.
+`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
+
+* `{ 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', 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_
+
+-----
+
+## /AuthFieldsSchema
+
+An array or collection of authentication fields.
+
+#### Details
+
+* **Type** - `array`[oneOf([/AuthFieldSchema](#authfieldschema))]
+* [**Source Code**](https://github.com/zapier/zapier-platform/blob/zapier-platform-schema@16.3.0/packages/schema/lib/schemas/AuthFieldsSchema.js)
+
+
+#### Examples
+
+* ```
+  [
+    { key: 'username', type: 'string', isNoSecret: true, required: true },
+    { key: 'password', type: 'password', isNoSecret: false, required: true }
+  ]
+  ```
+* `[ { key: 'api_key', type: 'string', isNoSecret: false, required: true } ]`
+* ```
+  [
+    { key: 'email', type: 'string', isNoSecret: true },
+    { key: 'password', type: 'password', required: true },
+    { key: 'mfa_token', type: 'string', isNoSecret: false }
+  ]
+  ```
+
+#### Anti-Examples
+
+* `{}` - _Must be an array (currently an object)._
+* `[ { 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)._
+
+-----
+
 ## /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.
@@ -323,7 +414,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 | [/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._
@@ -391,8 +482,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.
@@ -424,8 +515,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.
@@ -501,8 +592,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
@@ -548,8 +639,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.
@@ -581,8 +672,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.
 
@@ -852,28 +943,43 @@ 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.3.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.3.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_
+
+-----
+
+## /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.3.0/packages/schema/lib/schemas/DynamicOutputFieldsSchema.js)
+
+
+#### Examples
+
+* `[ { key: 'abc' } ]`
+
+#### Anti-Examples
+
+* `{}` - _Must be an array_
 
 -----
 
@@ -959,123 +1065,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.3.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:
-
-* `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.3.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)_
-
------
-
-## /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.3.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
@@ -1211,6 +1200,75 @@ Key | Required | Type | Description
 
 -----
 
+## /InputFieldSchema
+
+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
+
+* **Type** - `object`
+* [**Source Code**](https://github.com/zapier/zapier-platform/blob/zapier-platform-schema@16.3.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").
+`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.
+`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).
+
+#### 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' }`
+* ```
+  {
+    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.
@@ -1288,6 +1346,60 @@ List of before or after middlewares. Can be an array of functions or a single fu
 
 -----
 
+## /OutputFieldSchema
+
+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
+
+* **Type** - `object`
+* [**Source Code**](https://github.com/zapier/zapier-platform/blob/zapier-platform-schema@16.3.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").
+`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).
+`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.
+
+#### Examples
+
+* `{ key: 'abc' }`
+* `{ key: 'abc', children: [ { key: 'abc' } ] }`
+* `{ key: 'abc', type: 'number', label: 'neat' }`
+* `{ key: 'abc', type: 'number' }`
+
+#### 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 +1751,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 b5ae5a21c..d38ccf3ba 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)).",
@@ -119,12 +196,6 @@
         }
       }
     },
-    "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)",
@@ -149,32 +220,14 @@
         }
       ]
     },
-    "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`",
+      "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": {
+        "hide": true
+      },
       "properties": {
         "key": {
           "description": "A unique machine readable key for this value (IE: \"fname\").",
@@ -186,12 +239,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",
@@ -212,31 +259,59 @@
           "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).",
+        "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"
         },
-        "dynamic": {
-          "description": "A reference to a trigger that will power a dynamic dropdown.",
-          "$ref": "/RefResourceSchema"
+        "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
         },
-        "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"
+        "dict": {
+          "description": "Is this field a key/value input?",
+          "type": "boolean"
+        }
+      },
+      "additionalProperties": false
+    },
+    "AuthFieldSchema": {
+      "id": "/AuthFieldSchema",
+      "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": {
+        "key": {
+          "description": "A unique machine readable key for this value (IE: \"fname\").",
+          "type": "string",
+          "minLength": 1
         },
-        "choices": {
-          "description": "An object of machine keys and human values to populate a static dropdown.",
-          "$ref": "/FieldChoicesSchema"
+        "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.",
+          "type": "string",
+          "enum": ["string", "number", "boolean", "datetime", "password"]
+        },
+        "required": {
+          "description": "If this value is required or not. This defaults to `true`.",
+          "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`?",
@@ -254,16 +329,23 @@
           "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"
+        "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
         },
-        "altersDynamicFields": {
-          "description": "Does the value of this field affect the definitions of other fields in the set?",
-          "type": "boolean"
+        "placeholder": {
+          "description": "An example value that is not saved.",
+          "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.",
+        "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": {
@@ -271,89 +353,11 @@
           "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
-    },
-    "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"
+        "isNoSecret": {
+          "description": "Indicates if this authentication field is safe to e.g. be stored without encryption or displayed (not a secret).",
+          "type": "boolean"
         }
-      ]
+      }
     },
     "RequestSchema": {
       "id": "/RequestSchema",
@@ -466,12 +470,16 @@
       },
       "additionalProperties": false
     },
-    "FieldsSchema": {
-      "id": "/FieldsSchema",
-      "description": "An array or collection of fields.",
+    "AuthFieldsSchema": {
+      "id": "/AuthFieldsSchema",
+      "description": "An array or collection of authentication fields.",
       "type": "array",
       "items": {
-        "$ref": "/FieldSchema"
+        "oneOf": [
+          {
+            "$ref": "/AuthFieldSchema"
+          }
+        ]
       }
     },
     "AuthenticationBasicConfigSchema": {
@@ -627,20 +635,192 @@
       },
       "additionalProperties": false
     },
-    "FieldOrFunctionSchema": {
-      "id": "/FieldOrFunctionSchema",
-      "description": "Represents an array of fields or functions.",
-      "type": "array",
-      "items": {
-        "oneOf": [
-          {
+    "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\\[\\]]+)*)?$"
+    },
+    "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": {
+      "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"],
+      "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",
+          "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"
           },
-          {
-            "$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"
+        },
+        "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"
+        },
+        "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": {
+      "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"],
+      "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",
+          "enum": [
+            "string",
+            "number",
+            "boolean",
+            "datetime",
+            "file",
+            "password"
+          ]
+        },
+        "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"
+        },
+        "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"
+        }
+      },
+      "additionalProperties": false
     },
     "ThrottleOverrideObjectSchema": {
       "id": "/ThrottleOverrideObjectSchema",
@@ -668,10 +848,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 +1032,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 +1142,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 +1195,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 +1257,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",
@@ -1203,7 +1408,7 @@
         },
         "outputFields": {
           "description": "What fields of data will this return?",
-          "$ref": "/DynamicFieldsSchema"
+          "$ref": "/DynamicOutputFieldsSchema"
         },
         "sample": {
           "description": "What does a sample of data look like?",
@@ -1294,11 +1499,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",
@@ -1446,11 +1651,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",
@@ -1598,7 +1803,7 @@
         },
         "fields": {
           "description": "Fields you can request from the user before they connect your app to Zapier.",
-          "$ref": "/FieldsSchema"
+          "$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/functional-constraints/AuthFieldisSafe.js b/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
new file mode 100644
index 000000000..6a5820a05
--- /dev/null
+++ b/packages/schema/lib/functional-constraints/AuthFieldisSafe.js
@@ -0,0 +1,85 @@
+'use strict';
+
+const jsonschema = require('jsonschema');
+
+const AUTH_FIELD_ID = '/AuthFieldSchema';
+const AUTH_FIELDS_ID = '/AuthFieldsSchema';
+
+const FORBIDDEN_KEYS = [
+  'access_token',
+  'access-token',
+  'accesstoken',
+  'api_key',
+  'apikey',
+  'api-key',
+  'auth',
+  'jwt',
+  'passwd',
+  '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));
+
+const checkAuthField = (field) => {
+  const errors = [];
+
+  // if the field key contains any forbidden substring (case-insensitive),
+  // AND 'isNoSecret' is true, throw a validation error
+  if (
+    (field.key === 'password' || isSensitiveKey(field.key)) &&
+    field.isNoSecret === true
+  ) {
+    errors.push(
+      new jsonschema.ValidationError(
+        `cannot set isNoSecret as true for the sensitive key "${field.key}".`,
+        field,
+        '/AuthFieldSchema',
+        'instance.field',
+        'sensitive',
+        'field',
+      ),
+    );
+  }
+
+  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.field', err.property);
+        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.authentication.fields[${index}]`;
+      err.stack = err.stack.replace('instance.field', err.property);
+      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
new file mode 100644
index 000000000..92507f485
--- /dev/null
+++ b/packages/schema/lib/schemas/AuthFieldSchema.js
@@ -0,0 +1,115 @@
+'use strict';
+
+const makeSchema = require('../utils/makeSchema');
+const FieldChoicesSchema = require('./FieldChoicesSchema');
+const FieldSchema = require('./FieldSchema');
+
+module.exports = makeSchema(
+  {
+    id: '/AuthFieldSchema',
+    description: `Field schema specialized for authentication fields. ${FieldSchema.schema.description}`,
+    required: ['key'],
+    type: 'object',
+    properties: {
+      ...FieldSchema.schema.properties,
+      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,
+      },
+      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").',
+        type: 'string',
+        // 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
+    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,
+      },
+    ],
+
+    antiExamples: [
+      {
+        example: {
+          key: 'password',
+          type: 'password',
+          isNoSecret: true,
+          required: true,
+        },
+        reason:
+          '"password" is a sensitive field and cannot have isNoSecret set as true.',
+      },
+      {
+        example: {
+          key: 'api_key',
+          isNoSecret: true,
+        },
+        reason:
+          '"api_key" is a sensitive field and cannot have isNoSecret set as true.',
+      },
+      {
+        example: {
+          type: 'string',
+          isNoSecret: false,
+        },
+        reason: 'Missing required key: key',
+      },
+    ],
+  },
+  [FieldChoicesSchema, FieldSchema],
+);
diff --git a/packages/schema/lib/schemas/AuthFieldsSchema.js b/packages/schema/lib/schemas/AuthFieldsSchema.js
new file mode 100644
index 000000000..d4dbbaf31
--- /dev/null
+++ b/packages/schema/lib/schemas/AuthFieldsSchema.js
@@ -0,0 +1,67 @@
+'use strict';
+
+const makeSchema = require('../utils/makeSchema');
+
+const AuthFieldSchema = require('./AuthFieldSchema');
+
+module.exports = makeSchema(
+  {
+    id: '/AuthFieldsSchema',
+    description: 'An array or collection of authentication fields.',
+    type: 'array',
+    items: {
+      oneOf: [{ $ref: AuthFieldSchema.id }],
+    },
+    // Some complete examples
+    examples: [
+      // 1) Basic Auth: username (safe) + password (not safe)
+      [
+        { key: 'username', type: 'string', isNoSecret: true, required: true },
+        {
+          key: 'password',
+          type: 'password',
+          isNoSecret: false,
+          required: true,
+        },
+      ],
+
+      // 2) Just a single auth field for custom usage (e.g., api_key)
+      [{ key: 'api_key', type: 'string', isNoSecret: false, required: true }],
+
+      // 3) Mix of fields for extended usage
+      [
+        { key: 'email', type: 'string', isNoSecret: true },
+        { key: 'password', type: 'password', required: true },
+        { key: 'mfa_token', type: 'string', isNoSecret: false },
+      ],
+    ],
+
+    // Anti-examples showing invalid arrays or invalid field objects
+    antiExamples: [
+      {
+        example: {},
+        reason: 'Must be an array (currently an object).',
+      },
+      {
+        example: [{ key: 'password', isNoSecret: true }],
+        reason:
+          '"password" is a sensitive field and cannot have isNoSecret set as true.',
+      },
+      {
+        example: [{ key: 'api_key', isNoSecret: true }],
+        reason:
+          '"api_key" is a sensitive field and cannot have isNoSecret set as true.',
+      },
+      {
+        example: [{ isNoSecret: false }],
+        reason: 'Missing required "key" property.',
+      },
+      {
+        example: [{ key: 'username', type: 'string', isNoSecret: true }, 12345],
+        reason:
+          'Array item 12345 is not an object (must match AuthFieldSchema).',
+      },
+    ],
+  },
+  [AuthFieldSchema],
+);
diff --git a/packages/schema/lib/schemas/AuthenticationSchema.js b/packages/schema/lib/schemas/AuthenticationSchema.js
index 8e8cedb18..25fabf753 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 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: FieldsSchema.id,
+        $ref: AuthFieldsSchema.id,
       },
       connectionLabel: {
         description:
@@ -105,9 +105,9 @@ module.exports = makeSchema(
     ],
   },
   [
-    FieldsSchema,
     FunctionSchema,
     RequestSchema,
+    AuthFieldsSchema,
     AuthenticationBasicConfigSchema,
     AuthenticationCustomConfigSchema,
     AuthenticationDigestConfigSchema,
diff --git a/packages/schema/lib/schemas/BasicOperationSchema.js b/packages/schema/lib/schemas/BasicOperationSchema.js
index eab2e1089..64ca1dec0 100644
--- a/packages/schema/lib/schemas/BasicOperationSchema.js
+++ b/packages/schema/lib/schemas/BasicOperationSchema.js
@@ -3,13 +3,14 @@
 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');
 
 module.exports = makeSchema(
   {
@@ -32,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:
@@ -82,7 +83,8 @@ module.exports = makeSchema(
     additionalProperties: false,
   },
   [
-    DynamicFieldsSchema,
+    DynamicInputFieldsSchema,
+    DynamicOutputFieldsSchema,
     FunctionSchema,
     KeySchema,
     LockObjectSchema,
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/DynamicInputFieldsSchema.js b/packages/schema/lib/schemas/DynamicInputFieldsSchema.js
new file mode 100644
index 000000000..95a06f84d
--- /dev/null
+++ b/packages/schema/lib/schemas/DynamicInputFieldsSchema.js
@@ -0,0 +1,20 @@
+'use strict';
+
+const makeSchema = require('../utils/makeSchema');
+
+const InputFieldSchema = require('./InputFieldSchema');
+const FunctionSchema = require('./FunctionSchema');
+
+module.exports = makeSchema(
+  {
+    id: '/DynamicInputFieldsSchema',
+    description: 'An array or collection of input fields.',
+    type: 'array',
+    items: {
+      oneOf: [{ $ref: InputFieldSchema.id }, { $ref: FunctionSchema.id }],
+    },
+    examples: [[{ key: 'abc' }]],
+    antiExamples: [{ example: {}, reason: 'Must be an array' }],
+  },
+  [InputFieldSchema, FunctionSchema],
+);
diff --git a/packages/schema/lib/schemas/DynamicOutputFieldsSchema.js b/packages/schema/lib/schemas/DynamicOutputFieldsSchema.js
new file mode 100644
index 000000000..744c687c8
--- /dev/null
+++ b/packages/schema/lib/schemas/DynamicOutputFieldsSchema.js
@@ -0,0 +1,20 @@
+'use strict';
+
+const makeSchema = require('../utils/makeSchema');
+
+const OutputFieldSchema = require('./OutputFieldSchema');
+const FunctionSchema = require('./FunctionSchema');
+
+module.exports = makeSchema(
+  {
+    id: '/DynamicOutputFieldsSchema',
+    description: 'An array or collection of output fields.',
+    type: 'array',
+    items: {
+      oneOf: [{ $ref: OutputFieldSchema.id }, { $ref: FunctionSchema.id }],
+    },
+    examples: [[{ key: 'abc' }]],
+    antiExamples: [{ example: {}, reason: 'Must be an array' }],
+  },
+  [OutputFieldSchema, FunctionSchema],
+);
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..e61082e37 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: `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/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],
-);
diff --git a/packages/schema/lib/schemas/InputFieldSchema.js b/packages/schema/lib/schemas/InputFieldSchema.js
new file mode 100644
index 000000000..0717de4d7
--- /dev/null
+++ b/packages/schema/lib/schemas/InputFieldSchema.js
@@ -0,0 +1,124 @@
+'use strict';
+
+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. ${FieldSchema.schema.description}`,
+    id: '/InputFieldSchema',
+    type: 'object',
+    required: ['key'],
+    properties: {
+      ...FieldSchema.schema.properties,
+      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.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,
+      },
+      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',
+      },
+      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' },
+      {
+        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,
+  },
+  [RefResourceSchema, FieldChoicesSchema, FieldMetaSchema, FieldSchema],
+);
diff --git a/packages/schema/lib/schemas/OutputFieldSchema.js b/packages/schema/lib/schemas/OutputFieldSchema.js
new file mode 100644
index 000000000..70d312aa7
--- /dev/null
+++ b/packages/schema/lib/schemas/OutputFieldSchema.js
@@ -0,0 +1,81 @@
+'use strict';
+
+const makeSchema = require('../utils/makeSchema');
+const FieldSchema = require('./FieldSchema');
+
+module.exports = makeSchema(
+  {
+    description: `Field schema specialized for output fields. ${FieldSchema.schema.description}`,
+    id: '/OutputFieldSchema',
+    type: 'object',
+    required: ['key'],
+    properties: {
+      ...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.',
+        type: 'string',
+        // string == unicode
+        // number == float
+        enum: ['string', 'number', 'boolean', 'datetime', 'file', 'password'],
+      },
+      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',
+      },
+    },
+    examples: [
+      { key: 'abc' },
+      { key: 'abc', children: [{ key: 'abc' }] },
+      { key: 'abc', type: 'number', label: 'neat' },
+      { key: 'abc', type: 'number' },
+    ],
+    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],
+);
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/test/index.js b/packages/schema/test/index.js
index e8268b684..24ad7cf0f 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 = 60; // changes regularly as we expand
 
 describe('app', () => {
   describe('validation', () => {
@@ -225,6 +225,72 @@ 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',
+            isNoSecret: true, // allowed
+            required: true,
+          },
+          {
+            key: 'password',
+            type: 'password',
+            isNoSecret: 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 isNoSecret=true
+      appCopy.authentication = {
+        type: 'custom',
+        test: {
+          url: 'https://example.com',
+        },
+        fields: [
+          {
+            key: 'password',
+            type: 'string',
+            isNoSecret: true, // invalid: password cannot be safe
+            required: true,
+          },
+        ],
+      };
+
+      const results = schema.validateAppDefinition(appCopy);
+
+      // Expect at least one error because "password" can't have isNoSecret = true
+      results.errors.should.have.length(1);
+      should(results.valid).eql(false);
+
+      const [error] = results.errors;
+      error.name.should.equal('sensitive');
+      error.stack.should.eql(
+        'instance.authentication.fields[0] cannot set isNoSecret as true for the sensitive key "password".',
+      );
+    });
   });
 
   describe('export', () => {