zapier-platform-cli 17.6.0 → 17.7.1

package/oclif.manifest.json

@@ -652,6 +652,13 @@
           "multiple": false,
           "type": "option"
         },
+        "paging-token": {
+          "description": "Set bundle.meta.paging_token. Used for search pagination or bulk reads. When used in production, this indicates which page of items you should fetch.",
+          "name": "paging-token",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "debug": {
           "char": "d",
           "description": "Show extra debugging output.",
@@ -1150,7 +1157,7 @@
     "pull": {
       "aliases": [],
       "args": {},
-      "description": "Retrieve and update your local integration files with the latest version.\n\nThis command updates your local integration files with the latest version. You will be prompted with a confirmation dialog before continuing if there any destructive file changes.\n\nZapier may release new versions of your integration with bug fixes or new features. In the event this occurs, you will be unable to do the following until your local files are updated by running `zapier pull`:\n\n* push to the promoted version\n* promote a new version\n* migrate users from one version to another",
+      "description": "Retrieve and update your local integration files with the promoted version (or latest version if not public).\n\nThis command updates your local integration files with the promoted version (or latest version if not public). You will be prompted with a confirmation dialog before continuing if there any destructive file changes.\n\nZapier may release new versions of your integration with bug fixes or new features. In the event this occurs, you will be unable to do the following until your local files are updated by running `zapier pull`:\n\n* push to the promoted version\n* promote a new version\n* migrate users from one version to another",
       "flags": {
         "debug": {
           "char": "d",
@@ -1542,6 +1549,7 @@
       "examples": [
         "zapier validate",
         "zapier validate --without-style",
+        "zapier validate --skip-build",
         "zapier validate --format json"
       ],
       "flags": {
@@ -1551,6 +1559,12 @@
           "allowNo": false,
           "type": "boolean"
         },
+        "skip-build": {
+          "description": "Skip running the _zapier-build script before validation.",
+          "name": "skip-build",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "debug": {
           "char": "d",
           "description": "Show extra debugging output.",
@@ -1705,88 +1719,6 @@
         "clear.js"
       ]
     },
-    "delete:integration": {
-      "aliases": [
-        "delete:app"
-      ],
-      "args": {},
-      "description": "Delete your integration (including all versions).\n\nThis only works if there are no active users or Zaps on any version. If you only want to delete certain versions, use the `zapier delete:version` command instead. It's unlikely that you'll be able to run this on an app that you've pushed publicly, since there are usually still users.",
-      "flags": {
-        "debug": {
-          "char": "d",
-          "description": "Show extra debugging output.",
-          "name": "debug",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "invokedFromAnotherCommand": {
-          "hidden": true,
-          "name": "invokedFromAnotherCommand",
-          "allowNo": false,
-          "type": "boolean"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "delete:integration",
-      "pluginAlias": "zapier-platform-cli",
-      "pluginName": "zapier-platform-cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "skipValidInstallCheck": true,
-      "isESM": false,
-      "relativePath": [
-        "src",
-        "oclif",
-        "commands",
-        "delete",
-        "integration.js"
-      ]
-    },
-    "delete:version": {
-      "aliases": [],
-      "args": {
-        "version": {
-          "description": "Specify the version to delete. It must have no users or Zaps.",
-          "name": "version",
-          "required": true
-        }
-      },
-      "description": "Delete a specific version of your integration.\n\nThis only works if there are no users or Zaps on that version. You will probably need to have run `zapier migrate` and `zapier deprecate` before this command will work.",
-      "flags": {
-        "debug": {
-          "char": "d",
-          "description": "Show extra debugging output.",
-          "name": "debug",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "invokedFromAnotherCommand": {
-          "hidden": true,
-          "name": "invokedFromAnotherCommand",
-          "allowNo": false,
-          "type": "boolean"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "delete:version",
-      "pluginAlias": "zapier-platform-cli",
-      "pluginName": "zapier-platform-cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "skipValidInstallCheck": true,
-      "isESM": false,
-      "relativePath": [
-        "src",
-        "oclif",
-        "commands",
-        "delete",
-        "version.js"
-      ]
-    },
     "canary:create": {
       "aliases": [],
       "args": {
@@ -1975,6 +1907,88 @@
         "list.js"
       ]
     },
+    "delete:integration": {
+      "aliases": [
+        "delete:app"
+      ],
+      "args": {},
+      "description": "Delete your integration (including all versions).\n\nThis only works if there are no active users or Zaps on any version. If you only want to delete certain versions, use the `zapier delete:version` command instead. It's unlikely that you'll be able to run this on an app that you've pushed publicly, since there are usually still users.",
+      "flags": {
+        "debug": {
+          "char": "d",
+          "description": "Show extra debugging output.",
+          "name": "debug",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "invokedFromAnotherCommand": {
+          "hidden": true,
+          "name": "invokedFromAnotherCommand",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "delete:integration",
+      "pluginAlias": "zapier-platform-cli",
+      "pluginName": "zapier-platform-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "skipValidInstallCheck": true,
+      "isESM": false,
+      "relativePath": [
+        "src",
+        "oclif",
+        "commands",
+        "delete",
+        "integration.js"
+      ]
+    },
+    "delete:version": {
+      "aliases": [],
+      "args": {
+        "version": {
+          "description": "Specify the version to delete. It must have no users or Zaps.",
+          "name": "version",
+          "required": true
+        }
+      },
+      "description": "Delete a specific version of your integration.\n\nThis only works if there are no users or Zaps on that version. You will probably need to have run `zapier migrate` and `zapier deprecate` before this command will work.",
+      "flags": {
+        "debug": {
+          "char": "d",
+          "description": "Show extra debugging output.",
+          "name": "debug",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "invokedFromAnotherCommand": {
+          "hidden": true,
+          "name": "invokedFromAnotherCommand",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "delete:version",
+      "pluginAlias": "zapier-platform-cli",
+      "pluginName": "zapier-platform-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "skipValidInstallCheck": true,
+      "isESM": false,
+      "relativePath": [
+        "src",
+        "oclif",
+        "commands",
+        "delete",
+        "version.js"
+      ]
+    },
     "env:get": {
       "aliases": [],
       "args": {
@@ -2151,9 +2165,9 @@
         "unset.js"
       ]
     },
-    "users:add": {
+    "team:add": {
       "aliases": [
-        "users:invite"
+        "team:invite"
       ],
       "args": {
         "email": {
@@ -2161,24 +2175,28 @@
           "name": "email",
           "required": true
         },
-        "version": {
-          "description": "A version string (like 1.2.3). Optional, used only if you want to invite a user to a specific version instead of all versions.",
-          "name": "version"
+        "role": {
+          "description": "The level the invited team member should be at. Admins can edit everything and get email updates. Collaborators have read-access to the app and get email updates. Subscribers only get email updates.",
+          "name": "role",
+          "options": [
+            "admin",
+            "collaborator",
+            "subscriber"
+          ],
+          "required": true
+        },
+        "message": {
+          "description": "A message sent in the email to your team member, if you need to provide context. Wrap the message in quotes to ensure spaces get saved.",
+          "name": "message"
         }
       },
-      "description": "Add a user to some or all versions of your integration.\n\nWhen this command is run, we'll send an email to the user inviting them to try your integration. You can track the status of that invite using the `zapier users:get` command.\n\nInvited users will be able to see your integration's name, logo, and description. They'll also be able to create Zaps using any available triggers and actions.",
+      "description": "Add a team member to your integration.\n\nThese users come in three levels:\n\n  * `admin`, who can edit everything about the integration\n  * `collaborator`, who has read-only access for the app, and will receive periodic email updates. These updates include quarterly health scores and more.\n  * `subscriber`, who can't directly access the app, but will receive periodic email updates. These updates include quarterly health scores and more.\n\nTeam members can be freely added and removed.",
       "examples": [
-        "zapier users:add bruce@wayne.com",
-        "zapier users:add alfred@wayne.com 1.2.3"
+        "zapier team:add bruce@wayne.com admin",
+        "zapier team:add robin@wayne.com collaborator \"Hey Robin, check out this app.\"",
+        "zapier team:add alfred@wayne.com subscriber \"Hey Alfred, check out this app.\""
       ],
       "flags": {
-        "force": {
-          "char": "f",
-          "description": "Skip confirmation. Useful for running programatically.",
-          "name": "force",
-          "allowNo": false,
-          "type": "boolean"
-        },
         "debug": {
           "char": "d",
           "description": "Show extra debugging output.",
@@ -2195,7 +2213,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "users:add",
+      "id": "team:add",
       "pluginAlias": "zapier-platform-cli",
       "pluginName": "zapier-platform-cli",
       "pluginType": "core",
@@ -2207,16 +2225,16 @@
         "src",
         "oclif",
         "commands",
-        "users",
+        "team",
         "add.js"
       ]
     },
-    "users:get": {
+    "team:get": {
       "aliases": [
-        "users:list"
+        "team:list"
       ],
       "args": {},
-      "description": "Get a list of users who have been invited to your integration.\n\nNote that this list of users is NOT a comprehensive list of everyone who is using your integration. It only includes users who were invited directly by email (using the `\u001b[36mzapier users:add\u001b[39m` command or the web UI). Users who joined by clicking links generated using the `\u001b[36mzapier user:links\u001b[39m` command won't show up here.",
+      "description": "Get team members involved with your integration.\n\nThese users come in three levels:\n\n  * `admin`, who can edit everything about the integration\n  * `collaborator`, who has read-only access for the app, and will receive periodic email updates. These updates include quarterly health scores and more.\n  * `subscriber`, who can't directly access the app, but will receive periodic email updates. These updates include quarterly health scores and more.\n\nUse the `zapier team:add` and `zapier team:remove` commands to modify your team.\n",
       "flags": {
         "debug": {
           "char": "d",
@@ -2250,7 +2268,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "users:get",
+      "id": "team:get",
       "pluginAlias": "zapier-platform-cli",
       "pluginName": "zapier-platform-cli",
       "pluginType": "core",
@@ -2262,14 +2280,16 @@
         "src",
         "oclif",
         "commands",
-        "users",
+        "team",
         "get.js"
       ]
     },
-    "users:links": {
-      "aliases": [],
+    "team:remove": {
+      "aliases": [
+        "team:delete"
+      ],
       "args": {},
-      "description": "Get a list of links that are used to invite users to your integration.",
+      "description": "Remove a team member from all versions of your integration.\n\nAdmins will immediately lose write access to the integration.\nCollaborators will immediately lose read access to the integration.\nSubscribers won't receive future email updates.",
       "flags": {
         "debug": {
           "char": "d",
@@ -2278,22 +2298,6 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "format": {
-          "char": "f",
-          "description": "Change the way structured data is presented. If \"json\" or \"raw\", you can pipe the output of the command into other tools, such as jq.",
-          "name": "format",
-          "default": "table",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "options": [
-            "plain",
-            "json",
-            "raw",
-            "row",
-            "table"
-          ],
-          "type": "option"
-        },
         "invokedFromAnotherCommand": {
           "hidden": true,
           "name": "invokedFromAnotherCommand",
@@ -2303,7 +2307,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "users:links",
+      "id": "team:remove",
       "pluginAlias": "zapier-platform-cli",
       "pluginName": "zapier-platform-cli",
       "pluginType": "core",
@@ -2315,26 +2319,34 @@
         "src",
         "oclif",
         "commands",
-        "users",
-        "links.js"
+        "team",
+        "remove.js"
       ]
     },
-    "users:remove": {
+    "users:add": {
       "aliases": [
-        "users:delete"
+        "users:invite"
       ],
       "args": {
         "email": {
-          "description": "The user to be removed.",
+          "description": "The user to be invited. If they don't have a Zapier account, they'll be prompted to create one.",
           "name": "email",
           "required": true
+        },
+        "version": {
+          "description": "A version string (like 1.2.3). Optional, used only if you want to invite a user to a specific version instead of all versions.",
+          "name": "version"
         }
       },
-      "description": "Remove a user from all versions of your integration.\n\nWhen this command is run, their Zaps will immediately turn off. They won't be able to use your app again until they're re-invited or it has gone public. In practice, this command isn't run often as it's very disruptive to users.",
+      "description": "Add a user to some or all versions of your integration.\n\nWhen this command is run, we'll send an email to the user inviting them to try your integration. You can track the status of that invite using the `zapier users:get` command.\n\nInvited users will be able to see your integration's name, logo, and description. They'll also be able to create Zaps using any available triggers and actions.",
+      "examples": [
+        "zapier users:add bruce@wayne.com",
+        "zapier users:add alfred@wayne.com 1.2.3"
+      ],
       "flags": {
         "force": {
           "char": "f",
-          "description": "Skips confirmation. Useful for running programatically.",
+          "description": "Skip confirmation. Useful for running programatically.",
           "name": "force",
           "allowNo": false,
           "type": "boolean"
@@ -2355,7 +2367,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "users:remove",
+      "id": "users:add",
       "pluginAlias": "zapier-platform-cli",
       "pluginName": "zapier-platform-cli",
       "pluginType": "core",
@@ -2368,40 +2380,15 @@
         "oclif",
         "commands",
         "users",
-        "remove.js"
+        "add.js"
       ]
     },
-    "team:add": {
+    "users:get": {
       "aliases": [
-        "team:invite"
-      ],
-      "args": {
-        "email": {
-          "description": "The user to be invited. If they don't have a Zapier account, they'll be prompted to create one.",
-          "name": "email",
-          "required": true
-        },
-        "role": {
-          "description": "The level the invited team member should be at. Admins can edit everything and get email updates. Collaborators have read-access to the app and get email updates. Subscribers only get email updates.",
-          "name": "role",
-          "options": [
-            "admin",
-            "collaborator",
-            "subscriber"
-          ],
-          "required": true
-        },
-        "message": {
-          "description": "A message sent in the email to your team member, if you need to provide context. Wrap the message in quotes to ensure spaces get saved.",
-          "name": "message"
-        }
-      },
-      "description": "Add a team member to your integration.\n\nThese users come in three levels:\n\n  * `admin`, who can edit everything about the integration\n  * `collaborator`, who has read-only access for the app, and will receive periodic email updates. These updates include quarterly health scores and more.\n  * `subscriber`, who can't directly access the app, but will receive periodic email updates. These updates include quarterly health scores and more.\n\nTeam members can be freely added and removed.",
-      "examples": [
-        "zapier team:add bruce@wayne.com admin",
-        "zapier team:add robin@wayne.com collaborator \"Hey Robin, check out this app.\"",
-        "zapier team:add alfred@wayne.com subscriber \"Hey Alfred, check out this app.\""
+        "users:list"
       ],
+      "args": {},
+      "description": "Get a list of users who have been invited to your integration.\n\nNote that this list of users is NOT a comprehensive list of everyone who is using your integration. It only includes users who were invited directly by email (using the `\u001b[36mzapier users:add\u001b[39m` command or the web UI). Users who joined by clicking links generated using the `\u001b[36mzapier user:links\u001b[39m` command won't show up here.",
       "flags": {
         "debug": {
           "char": "d",
@@ -2410,6 +2397,22 @@
           "allowNo": false,
           "type": "boolean"
         },
+        "format": {
+          "char": "f",
+          "description": "Change the way structured data is presented. If \"json\" or \"raw\", you can pipe the output of the command into other tools, such as jq.",
+          "name": "format",
+          "default": "table",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "options": [
+            "plain",
+            "json",
+            "raw",
+            "row",
+            "table"
+          ],
+          "type": "option"
+        },
         "invokedFromAnotherCommand": {
           "hidden": true,
           "name": "invokedFromAnotherCommand",
@@ -2419,7 +2422,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "team:add",
+      "id": "users:get",
       "pluginAlias": "zapier-platform-cli",
       "pluginName": "zapier-platform-cli",
       "pluginType": "core",
@@ -2431,16 +2434,14 @@
         "src",
         "oclif",
         "commands",
-        "team",
-        "add.js"
+        "users",
+        "get.js"
       ]
     },
-    "team:get": {
-      "aliases": [
-        "team:list"
-      ],
+    "users:links": {
+      "aliases": [],
       "args": {},
-      "description": "Get team members involved with your integration.\n\nThese users come in three levels:\n\n  * `admin`, who can edit everything about the integration\n  * `collaborator`, who has read-only access for the app, and will receive periodic email updates. These updates include quarterly health scores and more.\n  * `subscriber`, who can't directly access the app, but will receive periodic email updates. These updates include quarterly health scores and more.\n\nUse the `zapier team:add` and `zapier team:remove` commands to modify your team.\n",
+      "description": "Get a list of links that are used to invite users to your integration.",
       "flags": {
         "debug": {
           "char": "d",
@@ -2474,7 +2475,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "team:get",
+      "id": "users:links",
       "pluginAlias": "zapier-platform-cli",
       "pluginName": "zapier-platform-cli",
       "pluginType": "core",
@@ -2486,17 +2487,30 @@
         "src",
         "oclif",
         "commands",
-        "team",
-        "get.js"
+        "users",
+        "links.js"
       ]
     },
-    "team:remove": {
+    "users:remove": {
       "aliases": [
-        "team:delete"
+        "users:delete"
       ],
-      "args": {},
-      "description": "Remove a team member from all versions of your integration.\n\nAdmins will immediately lose write access to the integration.\nCollaborators will immediately lose read access to the integration.\nSubscribers won't receive future email updates.",
+      "args": {
+        "email": {
+          "description": "The user to be removed.",
+          "name": "email",
+          "required": true
+        }
+      },
+      "description": "Remove a user from all versions of your integration.\n\nWhen this command is run, their Zaps will immediately turn off. They won't be able to use your app again until they're re-invited or it has gone public. In practice, this command isn't run often as it's very disruptive to users.",
       "flags": {
+        "force": {
+          "char": "f",
+          "description": "Skips confirmation. Useful for running programatically.",
+          "name": "force",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "debug": {
           "char": "d",
           "description": "Show extra debugging output.",
@@ -2513,7 +2527,7 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "team:remove",
+      "id": "users:remove",
       "pluginAlias": "zapier-platform-cli",
       "pluginName": "zapier-platform-cli",
       "pluginType": "core",
@@ -2525,10 +2539,10 @@
         "src",
         "oclif",
         "commands",
-        "team",
+        "users",
         "remove.js"
       ]
     }
   },
-  "version": "17.6.0"
+  "version": "17.7.1"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zapier-platform-cli",
-  "version": "17.6.0",
+  "version": "17.7.1",
   "description": "The CLI for managing integrations in Zapier Developer Platform.",
   "repository": "zapier/zapier-platform",
   "homepage": "https://platform.zapier.com/",
@@ -25,16 +25,16 @@
     "docs": "ZAPIER_BASE_ENDPOINT='' node scripts/docs.js",
     "preversion": "git pull && yarn validate",
     "prepack": "oclif manifest",
-    "postpack": "rm -f oclif.manifest.json",
+    "postpack": "rimraf oclif.manifest.json",
     "precommit": "yarn docs && git add docs",
     "version": "yarn docs && git add docs/*",
     "postversion": "git push && git push --tags",
     "lint": "eslint src",
     "lint:fix": "eslint --fix src",
-    "test": "cross-env NODE_ENV=test mocha -t 50s --recursive src/tests --exit",
-    "test:debug": "cross-env NODE_ENV=test node inspect ../../node_modules/.bin/mocha -t 50s --recursive src/tests --exit",
-    "smoke-test": "cross-env NODE_ENV=test mocha -t 2m --recursive src/smoke-tests --exit",
-    "smoke-test:debug": "cross-env NODE_ENV=test node inspect ../../node_modules/.bin/mocha -t 2m --recursive src/smoke-tests --exit",
+    "test": "cross-env NODE_ENV=test mocha -t 200s --recursive src/tests --exit",
+    "test:debug": "cross-env NODE_ENV=test node inspect ../../node_modules/.bin/mocha -t 200s --recursive src/tests --exit",
+    "smoke-test": "cross-env NODE_ENV=test mocha -t 6m --recursive src/smoke-tests --exit",
+    "smoke-test:debug": "cross-env NODE_ENV=test node inspect ../../node_modules/.bin/mocha -t 6m --recursive src/smoke-tests --exit",
     "validate-templates": "./scripts/validate-app-templates.js",
     "set-template-versions": "./scripts/set-app-template-versions.js",
     "validate": "yarn test && yarn smoke-test && yarn lint"
@@ -46,12 +46,12 @@
     "@oclif/plugin-not-found": "3.2.51",
     "@oclif/plugin-version": "2.2.28",
     "adm-zip": "0.5.16",
-    "decompress": "4.2.1",
     "archiver": "7.0.1",
     "chrono-node": "2.8.0",
     "cli-table3": "0.6.5",
     "colors": "1.4.0",
     "debug": "4.4.0",
+    "decompress": "4.2.1",
     "dotenv": "16.5.0",
     "esbuild": "0.25.4",
     "fs-extra": "11.2.0",
@@ -73,7 +73,7 @@
     "semver": "7.7.1",
     "string-length": "4.0.2",
     "through2": "4.0.2",
-    "tmp": "0.2.3",
+    "tmp": "0.2.4",
     "traverse": "0.6.11",
     "update-notifier": "5.1.0",
     "yeoman-environment": "3.19.3",
@@ -87,6 +87,7 @@
     "mock-fs": "^5.5.0",
     "nock": "^14.0.4",
     "oclif": "^4.17.46",
+    "rimraf": "^5.0.10",
     "typescript": "^5.8.3",
     "yamljs": "0.3.0"
   },

package/src/generators/index.js

@@ -79,6 +79,7 @@ const writeGenericTypeScriptPackageJson = (gen, packageJsonExtension) => {
           test: 'npm run build && vitest --run',
           clean: 'rimraf ./dist ./build',
           build: 'npm run clean && tsc',
+          dev: 'npm run build -- --watch',
           '_zapier-build': 'npm run build',
         },
         dependencies: {
@@ -252,13 +253,26 @@ class ProjectGenerator extends Generator {
 
   async prompting() {
     if (!this.options.template) {
+      // Filter template choices based on language and module type
+      let templateChoices = TEMPLATE_CHOICES;
+      let defaultTemplate = 'minimal';
+
+      // TypeScript filtering takes precedence over ESM filtering
+      if (this.options.language === 'typescript') {
+        templateChoices = TS_SUPPORTED_TEMPLATES;
+        defaultTemplate = 'basic-auth';
+      } else if (this.options.module === 'esm') {
+        templateChoices = ESM_SUPPORTED_TEMPLATES;
+        defaultTemplate = 'minimal'; // minimal is the only ESM template
+      }
+
       this.answers = await this.prompt([
         {
           type: 'list',
           name: 'template',
-          choices: TEMPLATE_CHOICES,
+          choices: templateChoices,
           message: 'Choose a project template to start with:',
-          default: 'minimal',
+          default: defaultTemplate,
         },
       ]);
       this.options.template = this.answers.template;
@@ -320,6 +334,8 @@ class ProjectGenerator extends Generator {
 
 module.exports = {
   TEMPLATE_CHOICES,
+  ESM_SUPPORTED_TEMPLATES,
+  TS_SUPPORTED_TEMPLATES,
   PullGenerator,
   ProjectGenerator,
 };

package/src/oclif/ZapierBaseCommand.js

@@ -90,9 +90,14 @@ class ZapierBaseCommand extends Command {
 
   // validate that user input looks like a semver version
   throwForInvalidVersion(version) {
-    if (!version.match(/^\d+\.\d+\.\d+$/g)) {
+    if (
+      !version.match(
+        // this is mirrored in schemas/VersionSchema.js and developer_cli/constants.py
+        /^(?:0|[1-9]\d{0,2})\.(?:0|[1-9]\d{0,2})\.(?:0|[1-9]\d{0,2})(?:-(?=.{1,12}$)[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*)?$/g,
+      )
+    ) {
       throw new Error(
-        `${version} is an invalid version str. Try something like \`1.2.3\``,
+        `${version} is an invalid version str. Try something like \`1.2.3\` or \`0.0.0-TICKET\``,
       );
     }
   }

package/src/oclif/commands/invoke.js

@@ -59,7 +59,14 @@ const loadAuthDataFromEnv = () => {
     .filter(([k, v]) => k.startsWith(AUTH_FIELD_ENV_PREFIX))
     .reduce((authData, [k, v]) => {
       const fieldKey = k.substr(AUTH_FIELD_ENV_PREFIX.length);
-      authData[fieldKey] = v;
+      // Try to parse as JSON if it looks like JSON, otherwise keep as string
+      try {
+        authData[fieldKey] =
+          v.startsWith('{') || v.startsWith('[') ? JSON.parse(v) : v;
+      } catch (e) {
+        // If JSON parsing fails, keep as string
+        authData[fieldKey] = v;
+      }
       return authData;
     }, {});
 };
@@ -233,12 +240,26 @@ const resolveInputDataTypes = (inputData, inputFields, timezone) => {
 };
 
 const appendEnv = async (vars, prefix = '') => {
-  await fs.appendFile(
-    '.env',
-    Object.entries(vars)
-      .filter(([k, v]) => v !== undefined)
-      .map(([k, v]) => `${prefix}${k}='${v || ''}'\n`),
-  );
+  const envFile = '.env';
+  let content = Object.entries(vars)
+    .filter(([k, v]) => v !== undefined)
+    .map(
+      ([k, v]) =>
+        `${prefix}${k}='${typeof v === 'object' && v !== null ? JSON.stringify(v) : v || ''}'\n`,
+    )
+    .join('');
+
+  // Check if .env file exists and doesn't end with newline
+  try {
+    const existingContent = await fs.readFile(envFile, 'utf8');
+    if (existingContent.length > 0 && !existingContent.endsWith('\n')) {
+      content = '\n' + content;
+    }
+  } catch (error) {
+    // File doesn't exist or can't be read, proceed as normal
+  }
+
+  await fs.appendFile(envFile, content);
 };
 
 const replaceDoubleCurlies = async (request) => {
@@ -1303,6 +1324,7 @@ class InvokeCommand extends BaseCommand {
         isPopulatingDedupe: this.flags.isPopulatingDedupe,
         limit: this.flags.limit,
         page: this.flags.page,
+        paging_token: this.flags['paging-token'],
         isTestingAuth: false, // legacy property
       };
       const output = await this.invokeAction(
@@ -1382,6 +1404,10 @@ InvokeCommand.flags = buildFlags({
       description:
         'EXPERIMENTAL: Instead of using the local .env file, use the production authentication data with the given authentication ID (aka the "app connection" on Zapier). Find them at https://zapier.com/app/assets/connections (https://zpr.io/z8SjFTdnTFZ2 for instructions) or specify \'-\' to interactively select one from your available authentications. When specified, the code will still run locally, but all outgoing requests will be proxied through Zapier with the production auth data.',
     }),
+    'paging-token': Flags.string({
+      description:
+        'Set bundle.meta.paging_token. Used for search pagination or bulk reads. When used in production, this indicates which page of items you should fetch.',
+    }),
   },
 });
 

package/src/oclif/commands/migrate.js

@@ -1,6 +1,7 @@
 const _ = require('lodash');
 const debug = require('debug')('zapier:migrate');
 const { Args, Flags } = require('@oclif/core');
+const colors = require('colors/safe');
 
 const BaseCommand = require('../ZapierBaseCommand');
 const PromoteCommand = require('./promote');
@@ -118,17 +119,15 @@ class MigrateCommand extends BaseCommand {
 
     await this.run_require_confirmation_pre_checks(app, body);
 
+    let message;
     if (user || account) {
-      this.startSpinner(
-        `Starting migration from ${fromVersion} to ${toVersion} for ${
-          user || account
-        }`,
-      );
+      message = `Requesting migration from ${fromVersion} to ${toVersion} for ${user || account}`;
     } else {
-      this.startSpinner(
-        `Starting migration from ${fromVersion} to ${toVersion} for ${percent}%`,
-      );
+      message = `Requesting migration from ${fromVersion} to ${toVersion} for ${percent}%`;
     }
+
+    this.startSpinner(message);
+
     if (percent) {
       body.job.percent_human = percent;
     }
@@ -137,12 +136,14 @@ class MigrateCommand extends BaseCommand {
 
     try {
       await callAPI(url, { method: 'POST', body });
-    } finally {
-      this.stopSpinner();
+    } catch (err) {
+      this.stopSpinner({ success: false });
+      throw err;
     }
+    this.stopSpinner();
 
     this.log(
-      '\nMigration successfully queued, please check `zapier jobs` to track the status. Migrations usually take between 5-10 minutes.',
+      `\nMigration successfully queued, check ${colors.bold.underline('zapier jobs')} to track the status. Migrations usually take between 5-10 minutes.`,
     );
   }
 }

package/src/oclif/commands/pull.js

@@ -6,10 +6,18 @@ const yeoman = require('yeoman-environment');
 const ZapierBaseCommand = require('../ZapierBaseCommand');
 const { downloadSourceZip } = require('../../utils/api');
 const { ensureDir, makeTempDir, removeDirSync } = require('../../utils/files');
-const { listFiles } = require('../../utils/build');
+const { walkDirWithPresetBlocklist } = require('../../utils/build');
 const { buildFlags } = require('../buildFlags');
 const PullGenerator = require('../../generators/pull');
 
+const listFiles = (dir) => {
+  const relPaths = [];
+  for (const entry of walkDirWithPresetBlocklist(dir)) {
+    relPaths.push(path.join(path.relative(dir, entry.parentPath), entry.name));
+  }
+  return relPaths;
+};
+
 class PullCommand extends ZapierBaseCommand {
   async perform() {
     // Fetch the source zip from API
@@ -28,7 +36,7 @@ class PullCommand extends ZapierBaseCommand {
 
       // Prompt user to confirm overwrite
       const currentDir = process.cwd();
-      const sourceFiles = await listFiles(srcDst);
+      const sourceFiles = listFiles(srcDst);
 
       const env = yeoman.createEnv();
       const namespace = 'zapier:pull';
@@ -45,9 +53,9 @@ class PullCommand extends ZapierBaseCommand {
 }
 
 PullCommand.flags = buildFlags();
-PullCommand.description = `Retrieve and update your local integration files with the latest version.
+PullCommand.description = `Retrieve and update your local integration files with the promoted version (or latest version if not public).
 
-This command updates your local integration files with the latest version. You will be prompted with a confirmation dialog before continuing if there any destructive file changes.
+This command updates your local integration files with the promoted version (or latest version if not public). You will be prompted with a confirmation dialog before continuing if there any destructive file changes.
 
 Zapier may release new versions of your integration with bug fixes or new features. In the event this occurs, you will be unable to do the following until your local files are updated by running \`zapier pull\`:
 

package/src/oclif/commands/scaffold.js

@@ -1,4 +1,3 @@
-/* eslint-disable camelcase */
 // @ts-check
 
 const path = require('path');

package/src/oclif/commands/validate.js

@@ -6,9 +6,14 @@ const { buildFlags } = require('../buildFlags');
 const { flattenCheckResult } = require('../../utils/display');
 const { localAppCommand } = require('../../utils/local');
 const { validateApp } = require('../../utils/api');
+const { maybeRunBuildScript } = require('../../utils/build');
 
 class ValidateCommand extends BaseCommand {
   async perform() {
+    if (!this.flags['skip-build']) {
+      await maybeRunBuildScript({ printProgress: true });
+    }
+
     this.log('Validating project locally');
 
     const errors = await localAppCommand({ command: 'validate' });
@@ -121,6 +126,9 @@ ValidateCommand.flags = buildFlags({
     'without-style': Flags.boolean({
       description: 'Forgo pinging the Zapier server to run further checks.',
     }),
+    'skip-build': Flags.boolean({
+      description: 'Skip running the _zapier-build script before validation.',
+    }),
   },
   opts: {
     format: true,
@@ -130,6 +138,7 @@ ValidateCommand.flags = buildFlags({
 ValidateCommand.examples = [
   'zapier validate',
   'zapier validate --without-style',
+  'zapier validate --skip-build',
   'zapier validate --format json',
 ];
 ValidateCommand.description = `Validate your integration.

package/src/utils/analytics.js

@@ -51,7 +51,7 @@ const recordAnalytics = async (command, isValidCommand, args, flags) => {
     numArgs: argKeys.length,
     appId: linkedAppId,
     argsKeys: argKeys,
-    flagKeys: flagKeys,
+    flagKeys,
     cliVersion: pkg.version,
     os: shouldRecordAnonymously ? undefined : process.platform,
   };

package/src/utils/ast.js

@@ -115,17 +115,23 @@ const registerActionInJsApp = (codeStr, property, varName) => {
 
   // check if this object already has the property at the top level
   const existingProp = objToModify.properties.find(
-    (props) => props.key.name === property,
+    (props) => props.key && props.key.name === property,
   );
   if (existingProp) {
-    // `triggers: myTriggers` means we shouldn't bother
     const value = existingProp.value;
-    if (value.type !== 'ObjectExpression') {
+    if (value.type === 'Identifier') {
+      // Handle shorthand syntax like `creates` instead of `creates: { ... }`
+      // Transform it into an object with spread operator: `creates: { ...creates, [newAction.key]: newAction }`
+      const spreadProperty = j.spreadElement(j.identifier(value.name));
+      existingProp.value = j.objectExpression([spreadProperty, newProperty]);
+      existingProp.shorthand = false; // Disable shorthand since we're changing the value
+    } else if (value.type === 'ObjectExpression') {
+      value.properties.push(newProperty);
+    } else {
       throw new Error(
         `Tried to edit the ${property} key, but the value wasn't an object`,
       );
     }
-    value.properties.push(newProperty);
   } else {
     objToModify.properties.push(
       j.property(
@@ -209,16 +215,23 @@ const registerActionInTsApp = (codeStr, actionTypePlural, identifierName) => {
 
   // Check if this object already has the actionType group inside it.
   const existingProp = appObj.properties.find(
-    (props) => props.key.name === actionTypePlural,
+    (props) => props.key && props.key.name === actionTypePlural,
   );
   if (existingProp) {
     const value = existingProp.value;
-    if (value.type !== 'ObjectExpression') {
+    if (value.type === 'Identifier') {
+      // Handle shorthand syntax like `creates` instead of `creates: { ... }`
+      // Transform it into an object with spread operator: `creates: { ...creates, [newAction.key]: newAction }`
+      const spreadProperty = j.spreadElement(j.identifier(value.name));
+      existingProp.value = j.objectExpression([spreadProperty, newProperty]);
+      existingProp.shorthand = false; // Disable shorthand since we're changing the value
+    } else if (value.type === 'ObjectExpression') {
+      value.properties.push(newProperty);
+    } else {
       throw new Error(
         `Tried to edit the ${actionTypePlural} key, but the value wasn't an object`,
       );
     }
-    value.properties.push(newProperty);
   } else {
     appObj.properties.push(
       j.property(

package/src/utils/build.js

@@ -272,13 +272,28 @@ const countLeadingDoubleDots = (relPath) => {
 // Join all relPaths with workingDir and return the common ancestor directory.
 const findCommonAncestor = (workingDir, relPaths) => {
   let maxLeadingDoubleDots = 0;
-  for (const relPath of relPaths) {
-    maxLeadingDoubleDots = Math.max(
-      maxLeadingDoubleDots,
-      countLeadingDoubleDots(relPath),
-    );
-  }
 
+  if (isWindows()) {
+    for (const relPath of relPaths) {
+      if (relPath.match(/^[a-zA-Z]:/)) {
+        // On Windows, relPath can be absolute if it starts with a different
+        // drive letter than workingDir.
+        return 'C:\\';
+      } else {
+        maxLeadingDoubleDots = Math.max(
+          maxLeadingDoubleDots,
+          countLeadingDoubleDots(relPath),
+        );
+      }
+    }
+  } else {
+    for (const relPath of relPaths) {
+      maxLeadingDoubleDots = Math.max(
+        maxLeadingDoubleDots,
+        countLeadingDoubleDots(relPath),
+      );
+    }
+  }
   let commonAncestor = workingDir;
   for (let i = 0; i < maxLeadingDoubleDots; i++) {
     commonAncestor = path.dirname(commonAncestor);
@@ -286,6 +301,10 @@ const findCommonAncestor = (workingDir, relPaths) => {
   return commonAncestor;
 };
 
+const stripDriveLetterForZip = (pathStr) => {
+  return pathStr.replace(/^[cC]:\\/, '').replace(/^([a-zA-Z]):/, '$1');
+};
+
 const writeBuildZipDumbly = async (workingDir, zip) => {
   for (const entry of walkDirWithPresetBlocklist(workingDir)) {
     const absPath = path.resolve(entry.parentPath, entry.name);
@@ -350,7 +369,7 @@ const writeBuildZipSmartly = async (workingDir, zip) => {
   // Write required files to the zip
   for (const relPath of relPaths) {
     const absPath = path.resolve(workingDir, relPath);
-    const nameInZip = path.relative(zipRoot, absPath);
+    const nameInZip = stripDriveLetterForZip(path.relative(zipRoot, absPath));
     if (nameInZip === 'package.json' && zipRoot !== workingDir) {
       // Ignore workspace root's package.json
       continue;
@@ -388,10 +407,10 @@ const writeBuildZipSmartly = async (workingDir, zip) => {
         symlink.parentPath,
         symlink.name,
       );
-      const nameInZip = path.relative(zipRoot, absPath);
+      const nameInZip = stripDriveLetterForZip(path.relative(zipRoot, absPath));
       const targetInZip = path.relative(
-        symlink.parentPath,
-        fs.realpathSync(absPath),
+        stripDriveLetterForZip(symlink.parentPath),
+        stripDriveLetterForZip(fs.realpathSync(absPath)),
       );
       zip.symlink(nameInZip, targetInZip, 0o644);
     }

package/src/utils/scaffold.js

@@ -126,6 +126,16 @@ const writeTemplateFile = async ({
 const getRelativeRequirePath = (entryFilePath, newFilePath) =>
   path.relative(path.dirname(entryFilePath), newFilePath);
 
+/**
+ * Detect if a JavaScript file uses ES Module syntax (export default) vs CommonJS (module.exports)
+ * @param {string} codeStr - The JavaScript code to check
+ * @returns {boolean} - True if the file uses ESM syntax
+ */
+const isEsmJavaScript = (codeStr) => {
+  // Look for export default statement
+  return /^\s*export\s+default\s/m.test(codeStr);
+};
+
 const isValidEntryFileUpdate = (
   language,
   indexFileResolved,
@@ -193,16 +203,32 @@ const updateEntryFileJs = async ({
   let codeStr = (await readFile(indexFileResolved)).toString();
   const originalCodeStr = codeStr; // untouched copy in case we need to bail
 
-  codeStr = importActionInJsApp(
-    codeStr,
-    actionImportName,
-    actionRelativeImportPath,
-  );
-  codeStr = registerActionInJsApp(
-    codeStr,
-    plural(actionType),
-    actionImportName,
-  );
+  // Check if this JavaScript file uses ESM syntax (export default)
+  // If so, use the TypeScript functions which handle ESM correctly
+  if (isEsmJavaScript(codeStr)) {
+    codeStr = importActionInTsApp(
+      codeStr,
+      actionImportName,
+      actionRelativeImportPath,
+    );
+    codeStr = registerActionInTsApp(
+      codeStr,
+      plural(actionType),
+      actionImportName,
+    );
+  } else {
+    // Use traditional CommonJS functions for module.exports
+    codeStr = importActionInJsApp(
+      codeStr,
+      actionImportName,
+      actionRelativeImportPath,
+    );
+    codeStr = registerActionInJsApp(
+      codeStr,
+      plural(actionType),
+      actionImportName,
+    );
+  }
   await writeFile(indexFileResolved, codeStr);
   return originalCodeStr;
 };
@@ -283,11 +309,22 @@ const createScaffoldingContext = ({
   )}.test.${language}`;
   const testFileLocal = `${path.join(testDirLocal, key)}.${language}`;
   const testFileLocalStem = path.join(testDirLocal, key);
-  const actionRelativeImportPath = `./${getRelativeRequirePath(
+
+  // Generate the relative import path
+  let actionRelativeImportPath = `./${getRelativeRequirePath(
     indexFileResolved,
     actionFileResolvedStem,
   )}`;
 
+  // Normalize path separators to forward slashes for import statements
+  // (ES modules always use forward slashes, regardless of OS)
+  actionRelativeImportPath = actionRelativeImportPath.replace(/\\/g, '/');
+
+  // For TypeScript with ESM, imports must use .js extension
+  if (language === 'ts') {
+    actionRelativeImportPath += '.js';
+  }
+
   return {
     actionType,
     actionTypePlural: plural(actionType),
@@ -324,6 +361,7 @@ module.exports = {
   updateEntryFile,
   isValidEntryFileUpdate,
   writeTemplateFile,
+  isEsmJavaScript,
 };
 
 /**