zapier-platform-cli 17.3.1 → 17.5.0

package/src/generators/templates/authTests/session.test.ts

@@ -0,0 +1,36 @@
+import { describe, expect, it } from 'vitest';
+import zapier from 'zapier-platform-core';
+
+import App from '../index.js';
+const appTester = zapier.createAppTester(App);
+
+describe('session auth app', () => {
+  it('has an exchange for username/password', async () => {
+    const bundle = {
+      authData: {
+        username: 'bryan',
+        password: 'hunter2',
+      },
+    };
+
+    const newAuthData = await appTester(
+      App.authentication.sessionConfig.perform,
+      bundle
+    );
+
+    expect(newAuthData.sessionKey).toBe('secret');
+  });
+
+  it('has auth details added to every request', async () => {
+    const bundle = {
+      authData: {
+        sessionKey: 'secret',
+      },
+    };
+
+    const response = await appTester(App.authentication.test, bundle);
+
+    expect(response.status).toBe(200);
+    expect(response.request.headers['X-API-Key']).toBe('secret');
+  });
+});

package/src/generators/templates/index.template.js

@@ -1,9 +1,6 @@
 <% if (hasAuth) { %>
-const {
-  config: authentication,
-  befores = [],
-  afters = [],
-} = require('./authentication');
+const authentication = require('./authentication');
+const { befores = [], afters = [] } = require('./middleware');
 <% } %>
 
 module.exports = {

package/src/generators/templates/index.template.ts

@@ -1,24 +1,21 @@
-import { version as platformVersion, defineApp } from 'zapier-platform-core';
+import zapier, { defineApp } from 'zapier-platform-core';
 
-import packageJson from '../package.json';
+import packageJson from '../package.json' with { type: 'json' };
 
-import MovieCreate from './creates/movie';
-import MovieTrigger from './triggers/movie';
-import authentication from './authentication';
-import { addBearerHeader } from './middleware';
+import authentication from './authentication.js';
+import { befores, afters } from './middleware.js';
 
 export default defineApp({
   version: packageJson.version,
-  platformVersion,
+  platformVersion: zapier.version,
 
   authentication,
-  beforeRequest: [addBearerHeader],
+  beforeRequest: [...befores],
+  afterResponse: [...afters],
 
-  triggers: {
-    [MovieTrigger.key]: MovieTrigger,
-  },
+  // Add your triggers here for them to show up!
+  triggers: {},
 
-  creates: {
-    [MovieCreate.key]: MovieCreate,
-  },
+  // Add your creates here for them to show up!
+  creates: {},
 });

package/src/generators/templates/tsconfig.template.json

@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+      "target": "ESNext",
+      "module": "NodeNext",
+      "moduleResolution": "NodeNext",
+      "resolveJsonModule": true,
+      "esModuleInterop": true,
+      "noUncheckedIndexedAccess": true,
+      "isolatedModules": true,
+      "noImplicitAny": false,
+      "skipLibCheck": true,
+      "outDir": "./dist",
+      "rootDir": "./src",
+      "strict": true
+    },
+    "include": ["./src/**/*.ts"],
+    "exclude": ["./**/*.test.ts"]
+  }

package/src/oclif/commands/init.js

@@ -10,12 +10,12 @@ const { TEMPLATE_CHOICES, ProjectGenerator } = require('../../generators');
 class InitCommand extends BaseCommand {
   async perform() {
     const { path } = this.args;
-    const { template, module } = this.flags;
+    const { template, module, language } = this.flags;
 
     const env = yeoman.createEnv();
     env.registerStub(ProjectGenerator, 'zapier:integration');
 
-    await env.run('zapier:integration', { path, template, module });
+    await env.run('zapier:integration', { path, template, module, language });
 
     this.log();
     this.log(`A new integration has been created in directory "${path}".`);
@@ -36,6 +36,12 @@ InitCommand.flags = buildFlags({
         'Choose module type: CommonJS or ES Modules. Only enabled for Typescript and Minimal templates.',
       options: ['commonjs', 'esm'],
     }),
+    language: Flags.string({
+      char: 'l',
+      description:
+        'Choose the language to use for your new integration. Defaults to JavaScript.',
+      options: ['javascript', 'typescript'],
+    }),
   },
 });
 InitCommand.args = {
@@ -49,6 +55,7 @@ InitCommand.examples = [
   'zapier init myapp',
   'zapier init ./path/myapp --template oauth2',
   'zapier init ./path/myapp --template minimal --module esm',
+  'zapier init ./path/myapp --template oauth2 --language typescript',
 ];
 InitCommand.description = `Initialize a new Zapier integration with a project template.
 

package/src/oclif/commands/invoke.js

@@ -982,6 +982,7 @@ class InvokeCommand extends BaseCommand {
       method: methodName,
       bundle: {
         inputData,
+        inputDataRaw: inputData, // At this point, inputData hasn't been transformed yet
         authData,
         meta,
       },
@@ -1013,6 +1014,8 @@ class InvokeCommand extends BaseCommand {
       );
     }
 
+    // Preserve original inputData as inputDataRaw before type resolution
+    const inputDataRaw = { ...inputData };
     inputData = resolveInputDataTypes(inputData, inputFields, timezone);
     methodName = `${actionTypePlural}.${action.key}.operation.perform`;
 
@@ -1022,6 +1025,7 @@ class InvokeCommand extends BaseCommand {
       method: methodName,
       bundle: {
         inputData,
+        inputDataRaw,
         authData,
         meta,
       },

package/src/oclif/commands/versions.js

@@ -1,4 +1,3 @@
-const colors = require('colors/safe');
 const { Flags } = require('@oclif/core');
 const BaseCommand = require('../ZapierBaseCommand');
 const { buildFlags } = require('../buildFlags');
@@ -34,29 +33,6 @@ class VersionCommand extends BaseCommand {
         'No versions to show. Try adding one with the `zapier push` command',
     });
 
-    this.logTable({
-      headers: [],
-      rows: [
-        {
-          version: `- ${colors.bold('Errors')}`,
-          platform_version:
-            'Issues that will prevent your integration from functioning properly. They block you from pushing.',
-        },
-        {
-          version: `- ${colors.bold('Publishing Tasks')}`,
-          platform_version:
-            'To-dos that must be addressed before your integration can be included in the App Directory. They block you from promoting and publishing.',
-        },
-        {
-          version: `- ${colors.bold('Warnings')}`,
-          platform_version:
-            "Issues and recommendations that need human reviews by Zapier before publishing your integration. They don't block.",
-        },
-      ],
-      hasBorder: false,
-      style: { head: [], 'padding-left': 0, 'padding-right': 0 },
-    });
-
     if (versions.map((v) => v.user_count).filter((c) => c === null).length) {
       this.warn(
         'Some user counts are still being calculated - run this command again in ~10 seconds (or longer if your integration has lots of users).',