Merge branch 'master' into fix/update_apify

# Conflicts:
#	pnpm-lock.yaml

Author: drobnikj

.github/workflows/pull-request-checks.yaml

@@ -96,6 +96,8 @@ jobs:
           format: 'csv'
       # NOTE: These steps are kept in this workflow to avoid re-rerunning the rest of the lint job
       # in the Components Checks workflow 
+      - name: Build TypeScript Components
+        run: pnpm build
       - name: Check component keys
         run: node scripts/findBadKeys.js ${{ steps.changed_files.outputs.added_modified }} ${{ steps.changed_files.outputs.renamed }}
       - name: Check component app prop

.gitignore

@@ -20,3 +20,5 @@ components/**/package-lock.json
 /packages/sdk/examples/.next/
 
 **/.claude/settings.local.json
+
+.cursor

components/_2markdown/_2markdown.app.mjs

@@ -6,8 +6,8 @@ export default {
   propDefinitions: {
     filePath: {
       type: "string",
-      label: "File Path",
-      description: "The path to an HTML file in the `/tmp` directory. [See the documentation on working with files](https://pipedream.com/docs/code/nodejs/working-with-files/#writing-a-file-to-tmp)",
+      label: "File Path or URL",
+      description: "An HTML file. Provide either a file URL or a path to a file in the `/tmp` directory (for example, `/tmp/myFile.html`)",
     },
   },
   methods: {

components/_2markdown/actions/html-file-to-markdown/html-file-to-markdown.mjs

@@ -1,12 +1,12 @@
 import _2markdown from "../../_2markdown.app.mjs";
-import fs from "fs";
+import { getFileStreamAndMetadata } from "@pipedream/platform";
 import FormData from "form-data";
 
 export default {
   key: "_2markdown-html-file-to-markdown",
   name: "HTML File to Markdown",
   description: "Convert an HTML file to Markdown format. [See the documentation](https://2markdown.com/docs#file2md)",
-  version: "0.0.1",
+  version: "0.1.0",
   type: "action",
   props: {
     _2markdown,
@@ -20,9 +20,14 @@ export default {
   async run({ $ }) {
     const form = new FormData();
 
-    form.append("document", fs.createReadStream(this.filePath.includes("tmp/")
-      ? this.filePath
-      : `/tmp/${this.filePath}`));
+    const {
+      stream, metadata,
+    } = await getFileStreamAndMetadata(this.filePath);
+    form.append("document", stream, {
+      contentType: metadata.contentType,
+      knownLength: metadata.size,
+      filename: metadata.name,
+    });
 
     const response = await this._2markdown.htmlFileToMarkdown({
       $,

components/_2markdown/actions/pdf-to-markdown/pdf-to-markdown.mjs

@@ -1,12 +1,12 @@
 import _2markdown from "../../_2markdown.app.mjs";
-import fs from "fs";
+import { getFileStreamAndMetadata } from "@pipedream/platform";
 import FormData from "form-data";
 
 export default {
   key: "_2markdown-pdf-to-markdown",
   name: "PDF to Markdown",
   description: "Convert a PDF document to Markdown format. [See the documentation](https://2markdown.com/docs#pdf2md)",
-  version: "0.0.1",
+  version: "0.1.0",
   type: "action",
   props: {
     _2markdown,
@@ -15,7 +15,7 @@ export default {
         _2markdown,
         "filePath",
       ],
-      description: "The path to a PDF file in the `/tmp` directory. [See the documentation on working with files](https://pipedream.com/docs/code/nodejs/working-with-files/#writing-a-file-to-tmp)",
+      description: "A PDF file. Provide either a file URL or a path to a file in the `/tmp` directory (for example, `/tmp/myFile.pdf`)",
     },
     waitForCompletion: {
       type: "boolean",
@@ -27,9 +27,14 @@ export default {
   async run({ $ }) {
     const form = new FormData();
 
-    form.append("document", fs.createReadStream(this.filePath.includes("tmp/")
-      ? this.filePath
-      : `/tmp/${this.filePath}`));
+    const {
+      stream, metadata,
+    } = await getFileStreamAndMetadata(this.filePath);
+    form.append("document", stream, {
+      contentType: metadata.contentType,
+      knownLength: metadata.size,
+      filename: metadata.name,
+    });
 
     let response = await this._2markdown.pdfToMarkdown({
       $,

components/_2markdown/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pipedream/_2markdown",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Pipedream 2markdown Components",
   "main": "_2markdown.app.mjs",
   "keywords": [
@@ -13,7 +13,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@pipedream/platform": "^3.0.3",
+    "@pipedream/platform": "^3.1.0",
     "form-data": "^4.0.1"
   }
 }

components/scalr/app/scalr.app.ts renamed to components/action1/action1.app.mjs

@@ -1,13 +1,11 @@
-import { defineApp } from "@pipedream/types";
-
-export default defineApp({
+export default {
   type: "app",
-  app: "scalr",
+  app: "action1",
   propDefinitions: {},
   methods: {
     // this.$auth contains connected account data
     authKeys() {
       console.log(Object.keys(this.$auth));
     },
   },
-});
+};

components/action1/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "@pipedream/action1",
+  "version": "0.0.1",
+  "description": "Pipedream Action1 Components",
+  "main": "action1.app.mjs",
+  "keywords": [
+    "pipedream",
+    "action1"
+  ],
+  "homepage": "https://pipedream.com/apps/action1",
+  "author": "Pipedream <[email protected]> (https://pipedream.com/)",
+  "publishConfig": {
+    "access": "public"
+  }
+}

components/acuity_scheduling/actions/add-blocked-off-time/add-blocked-off-time.mjs

@@ -4,7 +4,7 @@ export default {
   key: "acuity_scheduling-add-blocked-off-time",
   name: "Add Blocked Off Time",
   description: "Blocks a specific time slot on your schedule to prevent the scheduling of any appointments during this particular time range. [See the documentation](https://developers.acuityscheduling.com/reference/post-blocks)",
-  version: "0.0.1",
+  version: "0.0.2",
   type: "action",
   props: {
     acuityScheduling,

components/acuity_scheduling/actions/book-appointment/book-appointment.mjs

@@ -0,0 +1,202 @@
+import acuityScheduling from "../../acuity_scheduling.app.mjs";
+import { ConfigurationError } from "@pipedream/platform";
+
+export default {
+  key: "acuity_scheduling-book-appointment",
+  name: "Book Appointment",
+  description: "Book an appointment. [See the documentation](https://developers.acuityscheduling.com/reference/post-appointments)",
+  version: "0.0.1",
+  type: "action",
+  props: {
+    acuityScheduling,
+    datetime: {
+      type: "string",
+      label: "Datetime",
+      description: "Date and time of the appointment. E.g. `2016-02-03T14:00:00-0800`",
+    },
+    appointmentTypeId: {
+      propDefinition: [
+        acuityScheduling,
+        "appointmentTypeId",
+      ],
+      description: "The type of appointment to book",
+    },
+    firstName: {
+      type: "string",
+      label: "First Name",
+      description: "First name of the client",
+    },
+    lastName: {
+      type: "string",
+      label: "Last Name",
+      description: "Last name of the client",
+    },
+    isAdmin: {
+      type: "boolean",
+      label: "Is Admin",
+      description: "By default appointments are created as if they are being booked by a client. Booking as an admin disables availability and attribute validations, and allows setting the notes attribute. This also requires a valid `calendarID` to be included in the request.",
+      optional: true,
+    },
+    email: {
+      type: "string",
+      label: "Email",
+      description: "Email address of the client",
+      optional: true,
+    },
+    calendarId: {
+      propDefinition: [
+        acuityScheduling,
+        "calendarId",
+      ],
+      description: "The calendar to book the appointment on. If not provided we'll try to find an available calendar automatically.",
+      optional: true,
+    },
+    phone: {
+      type: "string",
+      label: "Phone",
+      description: "Phone number of the client",
+      optional: true,
+    },
+    timezone: {
+      propDefinition: [
+        acuityScheduling,
+        "timezone",
+      ],
+    },
+    certificate: {
+      propDefinition: [
+        acuityScheduling,
+        "certificate",
+        (c) => ({
+          appointmentTypeId: c.appointmentTypeId,
+        }),
+      ],
+      optional: true,
+    },
+    notes: {
+      type: "string",
+      label: "Notes",
+      description: "Notes to be added to the appointment. Settable when booking as an admin.",
+      optional: true,
+    },
+    labelId: {
+      propDefinition: [
+        acuityScheduling,
+        "labelId",
+      ],
+      optional: true,
+    },
+    smsOptin: {
+      type: "boolean",
+      label: "SMS Opt-in",
+      description: "Indicates whether the client has explicitly given their permission to receive SMS messages. This parameter is only applicable to Appointments with an Appointment Type that requires Opt In and can be omitted (and will be ignored) for all other Appointments. If omitted or set to false on an applicable Appointment, an SMS reminder will not be sent. For more information on SMS Opt In settings for Appointment Types, see the article in our [Knowledge Base](https://support.squarespace.com/hc/en-us/articles/360040093611).",
+      optional: true,
+    },
+    formId: {
+      propDefinition: [
+        acuityScheduling,
+        "formId",
+      ],
+      optional: true,
+      reloadProps: true,
+    },
+  },
+  async additionalProps() {
+    const props = {};
+    if (!this.formId) {
+      return props;
+    }
+    const forms = await this.acuityScheduling.listForms();
+    const form = forms.find((f) => f.id === this.formId);
+    const { fields } = form;
+    for (const field of fields) {
+      props[`${field.id}`] = {
+        type: "string",
+        label: field.name,
+      };
+      if (field.options) {
+        props[`${field.id}`].options = field.options;
+      }
+    }
+    return props;
+  },
+  async run({ $ }) {
+    const {
+      acuityScheduling,
+      datetime,
+      appointmentTypeId,
+      firstName,
+      lastName,
+      isAdmin,
+      email,
+      calendarId,
+      phone,
+      timezone,
+      certificate,
+      notes,
+      labelId,
+      smsOptin,
+      formId,
+      ...fieldValues
+    } = this;
+
+    if (isAdmin && !calendarId) {
+      throw new ConfigurationError("`calendarID` is required when booking as an admin");
+    }
+
+    if (!isAdmin && !email) {
+      throw new ConfigurationError("`email` is required when booking as a client");
+    }
+
+    if (!isAdmin && notes) {
+      throw new ConfigurationError("`notes` is only available when booking as an admin");
+    }
+
+    if (formId && !appointmentTypeId) {
+      throw new ConfigurationError("`formId` is required when booking an appointment with a form");
+    }
+
+    const fields = [];
+    if (Object.keys(fieldValues).length > 0) {
+      for (const [
+        fieldId,
+        value,
+      ] of Object.entries(fieldValues)) {
+        fields.push({
+          id: fieldId,
+          value,
+        });
+      }
+    }
+
+    const response = await acuityScheduling.createAppointment({
+      $,
+      params: {
+        admin: isAdmin,
+      },
+      data: {
+        datetime,
+        appointmentTypeID: appointmentTypeId,
+        firstName,
+        lastName,
+        email,
+        calendarID: calendarId,
+        phone,
+        timezone,
+        certificate,
+        notes,
+        labels: labelId
+          ? [
+            {
+              id: labelId,
+            },
+          ]
+          : undefined,
+        smsOptin,
+        fields,
+      },
+    });
+    $.export("$summary", `Successfully booked appointment with ID: ${response.id}`);
+    return response;
+  },
+};