Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .fern/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
"testFramework": "jest",
"enableForwardCompatibleEnums": true
},
"sdkVersion": "4.0.1"
"sdkVersion": "4.0.2"
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mergeapi/merge-node-client",
"version": "4.0.1",
"version": "4.0.2",
"private": false,
"repository": {
"type": "git",
Expand Down
2 changes: 2 additions & 0 deletions reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -15427,6 +15427,7 @@ const pageableResponse = await client.accounting.projects.list({
includeDeletedData: true,
includeRemoteData: true,
includeShellData: true,
isActive: "is_active",
modifiedAfter: new Date("2024-01-15T09:30:00.000Z"),
modifiedBefore: new Date("2024-01-15T09:30:00.000Z"),
pageSize: 1,
Expand All @@ -15445,6 +15446,7 @@ let page = await client.accounting.projects.list({
includeDeletedData: true,
includeRemoteData: true,
includeShellData: true,
isActive: "is_active",
modifiedAfter: new Date("2024-01-15T09:30:00.000Z"),
modifiedBefore: new Date("2024-01-15T09:30:00.000Z"),
pageSize: 1,
Expand Down
4 changes: 2 additions & 2 deletions src/BaseClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ export function normalizeClientOptions<T extends BaseClientOptions = BaseClientO
{
"X-Fern-Language": "JavaScript",
"X-Fern-SDK-Name": "@mergeapi/merge-node-client",
"X-Fern-SDK-Version": "4.0.1",
"User-Agent": "@mergeapi/merge-node-client/4.0.1",
"X-Fern-SDK-Version": "4.0.2",
"User-Agent": "@mergeapi/merge-node-client/4.0.2",
"X-Fern-Runtime": core.RUNTIME.type,
"X-Fern-Runtime-Version": core.RUNTIME.version,
"X-Account-Token": options?.accountToken,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export class ProjectsClient {
* includeDeletedData: true,
* includeRemoteData: true,
* includeShellData: true,
* isActive: "is_active",
* modifiedAfter: new Date("2024-01-15T09:30:00.000Z"),
* modifiedBefore: new Date("2024-01-15T09:30:00.000Z"),
* pageSize: 1,
Expand All @@ -61,6 +62,7 @@ export class ProjectsClient {
includeDeletedData,
includeRemoteData,
includeShellData,
isActive,
modifiedAfter,
modifiedBefore,
pageSize,
Expand All @@ -85,6 +87,7 @@ export class ProjectsClient {
include_deleted_data: includeDeletedData,
include_remote_data: includeRemoteData,
include_shell_data: includeShellData,
is_active: isActive,
modified_after: modifiedAfter?.toISOString(),
modified_before: modifiedBefore?.toISOString(),
page_size: pageSize,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import type * as Merge from "../../../../../../index";
* includeDeletedData: true,
* includeRemoteData: true,
* includeShellData: true,
* isActive: "is_active",
* modifiedAfter: new Date("2024-01-15T09:30:00.000Z"),
* modifiedBefore: new Date("2024-01-15T09:30:00.000Z"),
* pageSize: 1,
Expand All @@ -35,6 +36,8 @@ export interface ProjectsListRequest {
includeRemoteData?: boolean;
/** Whether to include shell records. Shell records are empty records (they may contain some metadata but all other fields are null). */
includeShellData?: boolean;
/** If provided, will only return projects with this value for is_active. */
isActive?: string;
/** If provided, only objects synced by Merge after this date time will be returned. */
modifiedAfter?: Date;
/** If provided, only objects synced by Merge before this date time will be returned. */
Expand Down
2 changes: 2 additions & 0 deletions src/api/resources/accounting/types/InvoiceLineItem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,8 @@ export interface InvoiceLineItem {
company?: string;
/** Indicates whether or not this object has been deleted in the third party platform. Full coverage deletion detection is a premium add-on. Native deletion detection is offered for free with limited coverage. [Learn more](https://docs.merge.dev/integrations/hris/supported-features/). */
remoteWasDeleted?: boolean;
/** Indicates if the line item can be charged to the client/customer. */
isBillable?: boolean;
fieldMappings?: Record<string, unknown>;
remoteFields?: Merge.accounting.RemoteField[];
}
2 changes: 2 additions & 0 deletions src/api/resources/accounting/types/InvoiceLineItemRequest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,8 @@ export interface InvoiceLineItemRequest {
trackingCategories?: (Merge.accounting.InvoiceLineItemRequestTrackingCategoriesItem | undefined)[];
/** The company the invoice belongs to. */
company?: string;
/** Indicates if the line item can be charged to the client/customer. */
isBillable?: boolean;
integrationParams?: Record<string, unknown>;
linkedAccountParams?: Record<string, unknown>;
remoteFields?: Merge.accounting.RemoteFieldRequest[];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ export const InvoiceLineItem: core.serialization.ObjectSchema<
),
company: core.serialization.string().optional(),
remoteWasDeleted: core.serialization.property("remote_was_deleted", core.serialization.boolean().optional()),
isBillable: core.serialization.property("is_billable", core.serialization.boolean().optional()),
fieldMappings: core.serialization.property(
"field_mappings",
core.serialization.record(core.serialization.string(), core.serialization.unknown()).optional(),
Expand Down Expand Up @@ -68,6 +69,7 @@ export declare namespace InvoiceLineItem {
tracking_categories?: (InvoiceLineItemTrackingCategoriesItem.Raw | null | undefined)[] | null;
company?: string | null;
remote_was_deleted?: boolean | null;
is_billable?: boolean | null;
field_mappings?: Record<string, unknown> | null;
remote_fields?: RemoteField.Raw[] | null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export const InvoiceLineItemRequest: core.serialization.ObjectSchema<
core.serialization.list(InvoiceLineItemRequestTrackingCategoriesItem.optional()).optional(),
),
company: core.serialization.string().optional(),
isBillable: core.serialization.property("is_billable", core.serialization.boolean().optional()),
integrationParams: core.serialization.property(
"integration_params",
core.serialization.record(core.serialization.string(), core.serialization.unknown()).optional(),
Expand Down Expand Up @@ -67,6 +68,7 @@ export declare namespace InvoiceLineItemRequest {
tracking_category?: InvoiceLineItemRequestTrackingCategory.Raw | null;
tracking_categories?: (InvoiceLineItemRequestTrackingCategoriesItem.Raw | null | undefined)[] | null;
company?: string | null;
is_billable?: boolean | null;
integration_params?: Record<string, unknown> | null;
linked_account_params?: Record<string, unknown> | null;
remote_fields?: RemoteFieldRequest.Raw[] | null;
Expand Down
2 changes: 1 addition & 1 deletion src/version.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const SDK_VERSION = "4.0.1";
export const SDK_VERSION = "4.0.2";
8 changes: 8 additions & 0 deletions tests/wire/Accounting/invoices.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ describe("InvoicesClient", () => {
"a47e11b6-c73b-4a0c-be31-130fc48177fa",
],
company: "595c8f97-2ac4-45b7-b000-41bdf43240b5",
is_billable: true,
field_mappings: {
organization_defined_targets: { custom_key: "custom_value" },
linked_account_defined_targets: { custom_key: "custom_value" },
Expand Down Expand Up @@ -198,6 +199,7 @@ describe("InvoicesClient", () => {
"a47e11b6-c73b-4a0c-be31-130fc48177fa",
],
company: "595c8f97-2ac4-45b7-b000-41bdf43240b5",
isBillable: true,
fieldMappings: {
organization_defined_targets: {
custom_key: "custom_value",
Expand Down Expand Up @@ -360,6 +362,7 @@ describe("InvoicesClient", () => {
"a47e11b6-c73b-4a0c-be31-130fc48177fa",
],
company: "595c8f97-2ac4-45b7-b000-41bdf43240b5",
is_billable: true,
field_mappings: {
organization_defined_targets: { custom_key: "custom_value" },
linked_account_defined_targets: { custom_key: "custom_value" },
Expand Down Expand Up @@ -510,6 +513,7 @@ describe("InvoicesClient", () => {
"a47e11b6-c73b-4a0c-be31-130fc48177fa",
],
company: "595c8f97-2ac4-45b7-b000-41bdf43240b5",
isBillable: true,
fieldMappings: {
organization_defined_targets: {
custom_key: "custom_value",
Expand Down Expand Up @@ -681,6 +685,7 @@ describe("InvoicesClient", () => {
],
company: "595c8f97-2ac4-45b7-b000-41bdf43240b5",
remote_was_deleted: true,
is_billable: true,
field_mappings: {
organization_defined_targets: { custom_key: "custom_value" },
linked_account_defined_targets: { custom_key: "custom_value" },
Expand Down Expand Up @@ -801,6 +806,7 @@ describe("InvoicesClient", () => {
],
company: "595c8f97-2ac4-45b7-b000-41bdf43240b5",
remoteWasDeleted: true,
isBillable: true,
fieldMappings: {
organization_defined_targets: {
custom_key: "custom_value",
Expand Down Expand Up @@ -944,6 +950,7 @@ describe("InvoicesClient", () => {
"a47e11b6-c73b-4a0c-be31-130fc48177fa",
],
company: "595c8f97-2ac4-45b7-b000-41bdf43240b5",
is_billable: true,
field_mappings: {
organization_defined_targets: { custom_key: "custom_value" },
linked_account_defined_targets: { custom_key: "custom_value" },
Expand Down Expand Up @@ -1094,6 +1101,7 @@ describe("InvoicesClient", () => {
"a47e11b6-c73b-4a0c-be31-130fc48177fa",
],
company: "595c8f97-2ac4-45b7-b000-41bdf43240b5",
isBillable: true,
fieldMappings: {
organization_defined_targets: {
custom_key: "custom_value",
Expand Down
1 change: 1 addition & 0 deletions tests/wire/Accounting/projects.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ describe("ProjectsClient", () => {
includeDeletedData: true,
includeRemoteData: true,
includeShellData: true,
isActive: "is_active",
modifiedAfter: new Date("2024-01-15T09:30:00.000Z"),
modifiedBefore: new Date("2024-01-15T09:30:00.000Z"),
pageSize: 1,
Expand Down