n8n-nodes-base 0.228.2 → 0.229.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/build.tsbuildinfo +1 -1
- package/dist/nodes/Code/Code.node.js +6 -1
- package/dist/nodes/Code/Code.node.js.map +1 -1
- package/dist/nodes/Code/test/Code.workflow.json +61 -30
- package/dist/nodes/Google/Sheet/GoogleSheets.node.js +2 -1
- package/dist/nodes/Google/Sheet/GoogleSheets.node.js.map +1 -1
- package/dist/nodes/Google/Sheet/v2/GoogleSheetsV2.node.d.ts +2 -1
- package/dist/nodes/Google/Sheet/v2/GoogleSheetsV2.node.js +1 -0
- package/dist/nodes/Google/Sheet/v2/GoogleSheetsV2.node.js.map +1 -1
- package/dist/nodes/Google/Sheet/v2/actions/sheet/append.operation.js +47 -2
- package/dist/nodes/Google/Sheet/v2/actions/sheet/append.operation.js.map +1 -1
- package/dist/nodes/Google/Sheet/v2/actions/sheet/appendOrUpdate.operation.js +89 -23
- package/dist/nodes/Google/Sheet/v2/actions/sheet/appendOrUpdate.operation.js.map +1 -1
- package/dist/nodes/Google/Sheet/v2/actions/sheet/update.operation.js +89 -23
- package/dist/nodes/Google/Sheet/v2/actions/sheet/update.operation.js.map +1 -1
- package/dist/nodes/Google/Sheet/v2/actions/versionDescription.js +1 -1
- package/dist/nodes/Google/Sheet/v2/actions/versionDescription.js.map +1 -1
- package/dist/nodes/Google/Sheet/v2/helpers/GoogleSheets.utils.js +15 -5
- package/dist/nodes/Google/Sheet/v2/helpers/GoogleSheets.utils.js.map +1 -1
- package/dist/nodes/Google/Sheet/v2/methods/index.d.ts +1 -0
- package/dist/nodes/Google/Sheet/v2/methods/index.js +2 -1
- package/dist/nodes/Google/Sheet/v2/methods/index.js.map +1 -1
- package/dist/nodes/Google/Sheet/v2/methods/resourceMapping.d.ts +3 -0
- package/dist/nodes/Google/Sheet/v2/methods/resourceMapping.js +33 -0
- package/dist/nodes/Google/Sheet/v2/methods/resourceMapping.js.map +1 -0
- package/dist/nodes/Postgres/Postgres.node.js +2 -1
- package/dist/nodes/Postgres/Postgres.node.js.map +1 -1
- package/dist/nodes/Postgres/v2/PostgresV2.node.d.ts +2 -1
- package/dist/nodes/Postgres/v2/PostgresV2.node.js +1 -1
- package/dist/nodes/Postgres/v2/PostgresV2.node.js.map +1 -1
- package/dist/nodes/Postgres/v2/actions/database/insert.operation.js +50 -4
- package/dist/nodes/Postgres/v2/actions/database/insert.operation.js.map +1 -1
- package/dist/nodes/Postgres/v2/actions/database/update.operation.js +110 -14
- package/dist/nodes/Postgres/v2/actions/database/update.operation.js.map +1 -1
- package/dist/nodes/Postgres/v2/actions/database/upsert.operation.js +72 -14
- package/dist/nodes/Postgres/v2/actions/database/upsert.operation.js.map +1 -1
- package/dist/nodes/Postgres/v2/actions/versionDescription.js +1 -1
- package/dist/nodes/Postgres/v2/actions/versionDescription.js.map +1 -1
- package/dist/nodes/Postgres/v2/helpers/interfaces.d.ts +6 -0
- package/dist/nodes/Postgres/v2/helpers/utils.d.ts +6 -2
- package/dist/nodes/Postgres/v2/helpers/utils.js +36 -2
- package/dist/nodes/Postgres/v2/helpers/utils.js.map +1 -1
- package/dist/nodes/Postgres/v2/methods/index.d.ts +1 -0
- package/dist/nodes/Postgres/v2/methods/index.js +2 -1
- package/dist/nodes/Postgres/v2/methods/index.js.map +1 -1
- package/dist/nodes/Postgres/v2/methods/resourceMapping.d.ts +2 -0
- package/dist/nodes/Postgres/v2/methods/resourceMapping.js +83 -0
- package/dist/nodes/Postgres/v2/methods/resourceMapping.js.map +1 -0
- package/dist/package.json +1 -1
- package/dist/types/nodes.json +9 -7
- package/package.json +3 -3
|
@@ -94,6 +94,12 @@ class Code {
|
|
|
94
94
|
const getSandbox = (index = 0) => {
|
|
95
95
|
const code = this.getNodeParameter(codeParameterName, index);
|
|
96
96
|
const context = Sandbox_1.getSandboxContext.call(this, index);
|
|
97
|
+
if (nodeMode === 'runOnceForAllItems') {
|
|
98
|
+
context.items = context.$input.all();
|
|
99
|
+
}
|
|
100
|
+
else {
|
|
101
|
+
context.item = context.$input.item;
|
|
102
|
+
}
|
|
97
103
|
if (language === 'python') {
|
|
98
104
|
const modules = this.getNodeParameter('modules', index);
|
|
99
105
|
const moduleImports = modules ? modules.split(',').map((m) => m.trim()) : [];
|
|
@@ -101,7 +107,6 @@ class Code {
|
|
|
101
107
|
return new PythonSandbox_1.PythonSandbox(context, code, moduleImports, index, this.helpers);
|
|
102
108
|
}
|
|
103
109
|
else {
|
|
104
|
-
context.items = context.$input.all();
|
|
105
110
|
const sandbox = new JavaScriptSandbox_1.JavaScriptSandbox(context, code, index, workflowMode, this.helpers);
|
|
106
111
|
if (workflowMode === 'manual') {
|
|
107
112
|
sandbox.vm.on('console.log', this.sendMessageToUI);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Code.node.js","sourceRoot":"","sources":["../../../nodes/Code/Code.node.ts"],"names":[],"mappings":";;;AAQA,wFAAqF;AACrF,gFAA6E;AAC7E,2DAAwD;AACxD,mDAAgD;AAChD,uCAA8C;AAC9C,mCAA4C;AAC5C,qDAAsD;AAEtD,MAAa,IAAI;IAAjB;QACC,gBAAW,GAAyB;YACnC,WAAW,EAAE,MAAM;YACnB,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,CAAC,WAAW,CAAC;YACpB,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;YACf,cAAc,EAAE,yBAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACrC,WAAW,EAAE,4BAA4B;YACzC,QAAQ,EAAE;gBACT,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,SAAS;aAChB;YACD,MAAM,EAAE,CAAC,MAAM,CAAC;YAChB,OAAO,EAAE,CAAC,MAAM,CAAC;YACjB,aAAa,EAAE,MAAM;YACrB,UAAU,EAAE;gBACX;oBACC,WAAW,EAAE,MAAM;oBACnB,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,SAAS;oBACf,gBAAgB,EAAE,IAAI;oBACtB,OAAO,EAAE;wBACR;4BACC,IAAI,EAAE,wBAAwB;4BAC9B,KAAK,EAAE,oBAAoB;4BAC3B,WAAW,EAAE,mEAAmE;yBAChF;wBACD;4BACC,IAAI,EAAE,wBAAwB;4BAC9B,KAAK,EAAE,oBAAoB;4BAC3B,WAAW,EAAE,sDAAsD;yBACnE;qBACD;oBACD,OAAO,EAAE,oBAAoB;iBAC7B;gBACD;oBACC,WAAW,EAAE,UAAU;oBACvB,IAAI,EAAE,UAAU;oBAChB,IAAI,EAAE,SAAS;oBACf,gBAAgB,EAAE,IAAI;oBACtB,cAAc,EAAE;wBACf,IAAI,EAAE;4BACL,UAAU,EAAE,CAAC,CAAC,CAAC;yBACf;qBACD;oBACD,OAAO,EAAE;wBACR;4BACC,IAAI,EAAE,YAAY;4BAClB,KAAK,EAAE,YAAY;yBACnB;wBACD;4BACC,IAAI,EAAE,eAAe;4BACrB,KAAK,EAAE,QAAQ;yBACf;qBACD;oBACD,OAAO,EAAE,YAAY;iBACrB;gBACD;oBACC,WAAW,EAAE,UAAU;oBACvB,IAAI,EAAE,UAAU;oBAChB,IAAI,EAAE,QAAQ;oBACd,cAAc,EAAE;wBACf,IAAI,EAAE;4BACL,UAAU,EAAE,CAAC,CAAC,CAAC;yBACf;qBACD;oBACD,OAAO,EAAE,YAAY;iBACrB;gBAED,GAAG,qDAAyB;gBAC5B,GAAG,6CAAqB;aACxB;SACD,CAAC;
|
|
1
|
+
{"version":3,"file":"Code.node.js","sourceRoot":"","sources":["../../../nodes/Code/Code.node.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,56 +1,64 @@
|
|
|
1
1
|
{
|
|
2
|
-
"name": "My workflow 24",
|
|
3
2
|
"nodes": [
|
|
4
3
|
{
|
|
5
4
|
"parameters": {},
|
|
6
|
-
"id": "
|
|
5
|
+
"id": "33eede8d-2ab0-42ab-b79a-a069d8549ab0",
|
|
7
6
|
"name": "When clicking \"Execute Workflow\"",
|
|
8
7
|
"type": "n8n-nodes-base.manualTrigger",
|
|
9
8
|
"typeVersion": 1,
|
|
10
|
-
"position": [
|
|
11
|
-
-960,
|
|
12
|
-
600
|
|
13
|
-
]
|
|
9
|
+
"position": [-40, 580]
|
|
14
10
|
},
|
|
15
11
|
{
|
|
16
12
|
"parameters": {
|
|
17
13
|
"jsCode": "return[\n { value: 1 },\n { value: 2 },\n]"
|
|
18
14
|
},
|
|
19
|
-
"id": "
|
|
15
|
+
"id": "a5913b52-24dc-4f81-bb7f-f90e61dad978",
|
|
20
16
|
"name": "Sample Data",
|
|
21
17
|
"type": "n8n-nodes-base.code",
|
|
22
18
|
"typeVersion": 1,
|
|
23
|
-
"position": [
|
|
24
|
-
-720,
|
|
25
|
-
600
|
|
26
|
-
]
|
|
19
|
+
"position": [200, 580]
|
|
27
20
|
},
|
|
28
21
|
{
|
|
29
22
|
"parameters": {
|
|
30
23
|
"jsCode": "// Loop over input items and add a new field\n// called 'myNewField' to the JSON of each one\nlet sum = 0;\nfor (const item of $input.all()) {\n sum += item.json.value;\n}\n\nreturn [ {sum} ];"
|
|
31
24
|
},
|
|
32
|
-
"id": "
|
|
25
|
+
"id": "c4ad4913-5af3-42bc-a784-69182f1facdd",
|
|
33
26
|
"name": "Run Once for All Items",
|
|
34
27
|
"type": "n8n-nodes-base.code",
|
|
35
28
|
"typeVersion": 1,
|
|
36
|
-
"position": [
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
29
|
+
"position": [460, 320]
|
|
30
|
+
},
|
|
31
|
+
{
|
|
32
|
+
"parameters": {
|
|
33
|
+
"jsCode": "// Loop over input items and add a new field\n// called 'myNewField' to the JSON of each one\nlet sum = 0;\nfor (const item of items) {\n sum += item.json.value;\n}\n\nreturn [ {sum} ];"
|
|
34
|
+
},
|
|
35
|
+
"id": "34cbd204-4335-4790-92cd-c3df617eee21",
|
|
36
|
+
"name": "Run Once for All Items (Legacy Syntax)",
|
|
37
|
+
"type": "n8n-nodes-base.code",
|
|
38
|
+
"typeVersion": 1,
|
|
39
|
+
"position": [460, 500]
|
|
40
40
|
},
|
|
41
41
|
{
|
|
42
42
|
"parameters": {
|
|
43
43
|
"mode": "runOnceForEachItem",
|
|
44
44
|
"jsCode": "// Add a new field called 'myNewField' to the\n// JSON of the item\n$input.item.json.myNewField = $input.item.json.value;\n\nreturn $input.item;"
|
|
45
45
|
},
|
|
46
|
-
"id": "
|
|
46
|
+
"id": "f67d29bf-554a-4572-8867-4456182dec24",
|
|
47
47
|
"name": "Run Once for Each Item",
|
|
48
48
|
"type": "n8n-nodes-base.code",
|
|
49
49
|
"typeVersion": 1,
|
|
50
|
-
"position": [
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
50
|
+
"position": [460, 680]
|
|
51
|
+
},
|
|
52
|
+
{
|
|
53
|
+
"parameters": {
|
|
54
|
+
"mode": "runOnceForEachItem",
|
|
55
|
+
"jsCode": "// Add a new field called 'myNewField' to the\n// JSON of the item\nitem.json.myNewField = item.json.value;\n\nreturn item;"
|
|
56
|
+
},
|
|
57
|
+
"id": "6f4bf149-e84e-4e0d-802a-7eaf7a42b18c",
|
|
58
|
+
"name": "Run Once for Each Item (Legacy Syntax)",
|
|
59
|
+
"type": "n8n-nodes-base.code",
|
|
60
|
+
"typeVersion": 1,
|
|
61
|
+
"position": [460, 860]
|
|
54
62
|
}
|
|
55
63
|
],
|
|
56
64
|
"pinData": {
|
|
@@ -74,6 +82,27 @@
|
|
|
74
82
|
"myNewField": 2
|
|
75
83
|
}
|
|
76
84
|
}
|
|
85
|
+
],
|
|
86
|
+
"Run Once for All Items (Legacy Syntax)": [
|
|
87
|
+
{
|
|
88
|
+
"json": {
|
|
89
|
+
"sum": 3
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
],
|
|
93
|
+
"Run Once for Each Item (Legacy Syntax)": [
|
|
94
|
+
{
|
|
95
|
+
"json": {
|
|
96
|
+
"value": 1,
|
|
97
|
+
"myNewField": 1
|
|
98
|
+
}
|
|
99
|
+
},
|
|
100
|
+
{
|
|
101
|
+
"json": {
|
|
102
|
+
"value": 2,
|
|
103
|
+
"myNewField": 2
|
|
104
|
+
}
|
|
105
|
+
}
|
|
77
106
|
]
|
|
78
107
|
},
|
|
79
108
|
"connections": {
|
|
@@ -100,17 +129,19 @@
|
|
|
100
129
|
"node": "Run Once for Each Item",
|
|
101
130
|
"type": "main",
|
|
102
131
|
"index": 0
|
|
132
|
+
},
|
|
133
|
+
{
|
|
134
|
+
"node": "Run Once for All Items (Legacy Syntax)",
|
|
135
|
+
"type": "main",
|
|
136
|
+
"index": 0
|
|
137
|
+
},
|
|
138
|
+
{
|
|
139
|
+
"node": "Run Once for Each Item (Legacy Syntax)",
|
|
140
|
+
"type": "main",
|
|
141
|
+
"index": 0
|
|
103
142
|
}
|
|
104
143
|
]
|
|
105
144
|
]
|
|
106
145
|
}
|
|
107
|
-
}
|
|
108
|
-
"active": false,
|
|
109
|
-
"settings": {},
|
|
110
|
-
"versionId": "b0d8ec77-92ab-4fa7-93b1-8a2e3543059d",
|
|
111
|
-
"id": "181",
|
|
112
|
-
"meta": {
|
|
113
|
-
"instanceId": "104a4d08d8897b8bdeb38aaca515021075e0bd8544c983c2bb8c86e6a8e6081c"
|
|
114
|
-
},
|
|
115
|
-
"tags": []
|
|
146
|
+
}
|
|
116
147
|
}
|
|
@@ -11,7 +11,7 @@ class GoogleSheets extends n8n_workflow_1.VersionedNodeType {
|
|
|
11
11
|
name: 'googleSheets',
|
|
12
12
|
icon: 'file:googleSheets.svg',
|
|
13
13
|
group: ['input', 'output'],
|
|
14
|
-
defaultVersion:
|
|
14
|
+
defaultVersion: 4,
|
|
15
15
|
subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
|
|
16
16
|
description: 'Read, update and write data to Google Sheets',
|
|
17
17
|
};
|
|
@@ -19,6 +19,7 @@ class GoogleSheets extends n8n_workflow_1.VersionedNodeType {
|
|
|
19
19
|
1: new GoogleSheetsV1_node_1.GoogleSheetsV1(baseDescription),
|
|
20
20
|
2: new GoogleSheetsV1_node_1.GoogleSheetsV1(baseDescription),
|
|
21
21
|
3: new GoogleSheetsV2_node_1.GoogleSheetsV2(baseDescription),
|
|
22
|
+
4: new GoogleSheetsV2_node_1.GoogleSheetsV2(baseDescription),
|
|
22
23
|
};
|
|
23
24
|
super(nodeVersions, baseDescription);
|
|
24
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GoogleSheets.node.js","sourceRoot":"","sources":["../../../../nodes/Google/Sheet/GoogleSheets.node.ts"],"names":[],"mappings":";;;AACA,+CAAiD;AAEjD,kEAA0D;AAC1D,kEAA0D;AAE1D,MAAa,YAAa,SAAQ,gCAAiB;IAClD;QACC,MAAM,eAAe,GAA6B;YACjD,WAAW,EAAE,gBAAgB;YAC7B,IAAI,EAAE,cAAc;YACpB,IAAI,EAAE,uBAAuB;YAC7B,KAAK,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC;YAC1B,cAAc,EAAE,CAAC;YACjB,QAAQ,EAAE,8DAA8D;YACxE,WAAW,EAAE,8CAA8C;SAC3D,CAAC;QAEF,MAAM,YAAY,GAAuC;YACxD,CAAC,EAAE,IAAI,oCAAc,CAAC,eAAe,CAAC;YACtC,CAAC,EAAE,IAAI,oCAAc,CAAC,eAAe,CAAC;YACtC,CAAC,EAAE,IAAI,oCAAc,CAAC,eAAe,CAAC;SACtC,CAAC;QAEF,KAAK,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC;IACtC,CAAC;CACD;
|
|
1
|
+
{"version":3,"file":"GoogleSheets.node.js","sourceRoot":"","sources":["../../../../nodes/Google/Sheet/GoogleSheets.node.ts"],"names":[],"mappings":";;;AACA,+CAAiD;AAEjD,kEAA0D;AAC1D,kEAA0D;AAE1D,MAAa,YAAa,SAAQ,gCAAiB;IAClD;QACC,MAAM,eAAe,GAA6B;YACjD,WAAW,EAAE,gBAAgB;YAC7B,IAAI,EAAE,cAAc;YACpB,IAAI,EAAE,uBAAuB;YAC7B,KAAK,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC;YAC1B,cAAc,EAAE,CAAC;YACjB,QAAQ,EAAE,8DAA8D;YACxE,WAAW,EAAE,8CAA8C;SAC3D,CAAC;QAEF,MAAM,YAAY,GAAuC;YACxD,CAAC,EAAE,IAAI,oCAAc,CAAC,eAAe,CAAC;YACtC,CAAC,EAAE,IAAI,oCAAc,CAAC,eAAe,CAAC;YACtC,CAAC,EAAE,IAAI,oCAAc,CAAC,eAAe,CAAC;YACtC,CAAC,EAAE,IAAI,oCAAc,CAAC,eAAe,CAAC;SACtC,CAAC;QAEF,KAAK,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC;IACtC,CAAC;CACD;AArBD,oCAqBC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { IExecuteFunctions, INodeType, INodeTypeBaseDescription, INodeTypeDescription } from 'n8n-workflow';
|
|
2
|
-
import { credentialTest, listSearch, loadOptions } from './methods';
|
|
2
|
+
import { credentialTest, listSearch, loadOptions, resourceMapping } from './methods';
|
|
3
3
|
export declare class GoogleSheetsV2 implements INodeType {
|
|
4
4
|
description: INodeTypeDescription;
|
|
5
5
|
constructor(baseDescription: INodeTypeBaseDescription);
|
|
@@ -7,6 +7,7 @@ export declare class GoogleSheetsV2 implements INodeType {
|
|
|
7
7
|
loadOptions: typeof loadOptions;
|
|
8
8
|
credentialTest: typeof credentialTest;
|
|
9
9
|
listSearch: typeof listSearch;
|
|
10
|
+
resourceMapping: typeof resourceMapping;
|
|
10
11
|
};
|
|
11
12
|
execute(this: IExecuteFunctions): Promise<import("n8n-workflow").INodeExecutionData[][]>;
|
|
12
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GoogleSheetsV2.node.js","sourceRoot":"","sources":["../../../../../nodes/Google/Sheet/v2/GoogleSheetsV2.node.ts"],"names":[],"mappings":";;;AAMA,qEAAkE;AAClE,
|
|
1
|
+
{"version":3,"file":"GoogleSheetsV2.node.js","sourceRoot":"","sources":["../../../../../nodes/Google/Sheet/v2/GoogleSheetsV2.node.ts"],"names":[],"mappings":";;;AAMA,qEAAkE;AAClE,uCAAqF;AACrF,6CAA0C;AAE1C,MAAa,cAAc;IAG1B,YAAY,eAAyC;QAOrD,YAAO,GAAG;YACT,WAAW,EAAX,qBAAW;YACX,cAAc,EAAd,wBAAc;YACd,UAAU,EAAV,oBAAU;YACV,eAAe,EAAf,yBAAe;SACf,CAAC;QAXD,IAAI,CAAC,WAAW,GAAG;YAClB,GAAG,eAAe;YAClB,GAAG,uCAAkB;SACrB,CAAC;IACH,CAAC;IASD,KAAK,CAAC,OAAO;QACZ,OAAO,eAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CACD;AApBD,wCAoBC"}
|
|
@@ -29,6 +29,7 @@ exports.description = [
|
|
|
29
29
|
show: {
|
|
30
30
|
resource: ['sheet'],
|
|
31
31
|
operation: ['append'],
|
|
32
|
+
'@version': [3],
|
|
32
33
|
},
|
|
33
34
|
hide: {
|
|
34
35
|
...GoogleSheets_utils_1.untilSheetSelected,
|
|
@@ -46,6 +47,7 @@ exports.description = [
|
|
|
46
47
|
show: {
|
|
47
48
|
operation: ['append'],
|
|
48
49
|
dataMode: ['autoMapInputData'],
|
|
50
|
+
'@version': [3],
|
|
49
51
|
},
|
|
50
52
|
hide: {
|
|
51
53
|
...GoogleSheets_utils_1.untilSheetSelected,
|
|
@@ -66,6 +68,7 @@ exports.description = [
|
|
|
66
68
|
resource: ['sheet'],
|
|
67
69
|
operation: ['append'],
|
|
68
70
|
dataMode: ['defineBelow'],
|
|
71
|
+
'@version': [3],
|
|
69
72
|
},
|
|
70
73
|
hide: {
|
|
71
74
|
...GoogleSheets_utils_1.untilSheetSelected,
|
|
@@ -98,6 +101,40 @@ exports.description = [
|
|
|
98
101
|
},
|
|
99
102
|
],
|
|
100
103
|
},
|
|
104
|
+
{
|
|
105
|
+
displayName: 'Columns',
|
|
106
|
+
name: 'columns',
|
|
107
|
+
type: 'resourceMapper',
|
|
108
|
+
noDataExpression: true,
|
|
109
|
+
default: {
|
|
110
|
+
mappingMode: 'defineBelow',
|
|
111
|
+
value: null,
|
|
112
|
+
},
|
|
113
|
+
required: true,
|
|
114
|
+
typeOptions: {
|
|
115
|
+
loadOptionsDependsOn: ['sheetName.value'],
|
|
116
|
+
resourceMapper: {
|
|
117
|
+
resourceMapperMethod: 'getMappingColumns',
|
|
118
|
+
mode: 'add',
|
|
119
|
+
fieldWords: {
|
|
120
|
+
singular: 'column',
|
|
121
|
+
plural: 'columns',
|
|
122
|
+
},
|
|
123
|
+
addAllFields: true,
|
|
124
|
+
multiKeyMatch: false,
|
|
125
|
+
},
|
|
126
|
+
},
|
|
127
|
+
displayOptions: {
|
|
128
|
+
show: {
|
|
129
|
+
resource: ['sheet'],
|
|
130
|
+
operation: ['append'],
|
|
131
|
+
'@version': [4],
|
|
132
|
+
},
|
|
133
|
+
hide: {
|
|
134
|
+
...GoogleSheets_utils_1.untilSheetSelected,
|
|
135
|
+
},
|
|
136
|
+
},
|
|
137
|
+
},
|
|
101
138
|
{
|
|
102
139
|
displayName: 'Options',
|
|
103
140
|
name: 'options',
|
|
@@ -147,7 +184,10 @@ exports.description = [
|
|
|
147
184
|
async function execute(sheet, sheetName, sheetId) {
|
|
148
185
|
var _a;
|
|
149
186
|
const items = this.getInputData();
|
|
150
|
-
const
|
|
187
|
+
const nodeVersion = this.getNode().typeVersion;
|
|
188
|
+
const dataMode = nodeVersion < 4
|
|
189
|
+
? this.getNodeParameter('dataMode', 0)
|
|
190
|
+
: this.getNodeParameter('columns.mappingMode', 0);
|
|
151
191
|
if (!items.length || dataMode === 'nothing')
|
|
152
192
|
return [];
|
|
153
193
|
const options = this.getNodeParameter('options', 0, {});
|
|
@@ -170,7 +210,12 @@ async function execute(sheet, sheetName, sheetId) {
|
|
|
170
210
|
await sheet.appendEmptyRowsOrColumns(sheetId, 1, 0);
|
|
171
211
|
}
|
|
172
212
|
await sheet.appendSheetData(setData, sheetName, headerRow, options.cellFormat || 'RAW', false);
|
|
173
|
-
|
|
213
|
+
if (nodeVersion < 4 || dataMode === 'autoMapInputData') {
|
|
214
|
+
return items;
|
|
215
|
+
}
|
|
216
|
+
else {
|
|
217
|
+
return this.helpers.returnJsonArray(setData);
|
|
218
|
+
}
|
|
174
219
|
}
|
|
175
220
|
exports.execute = execute;
|
|
176
221
|
//# sourceMappingURL=append.operation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"append.operation.js","sourceRoot":"","sources":["../../../../../../../nodes/Google/Sheet/v2/actions/sheet/append.operation.ts"],"names":[],"mappings":";;;AAGA,yEAAmG;AACnG,2DAAoE;AAEvD,QAAA,WAAW,GAAoB;IAC3C;QACC,WAAW,EAAE,WAAW;QACxB,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,SAAS;QACf,OAAO,EAAE;YACR;gBACC,IAAI,EAAE,gCAAgC;gBACtC,KAAK,EAAE,kBAAkB;gBACzB,WAAW,EAAE,+DAA+D;aAC5E;YACD;gBACC,IAAI,EAAE,uBAAuB;gBAC7B,KAAK,EAAE,aAAa;gBACpB,WAAW,EAAE,2CAA2C;aACxD;YACD;gBACC,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,SAAS;gBAChB,WAAW,EAAE,sBAAsB;aACnC;SACD;QACD,cAAc,EAAE;YACf,IAAI,EAAE;gBACL,QAAQ,EAAE,CAAC,OAAO,CAAC;gBACnB,SAAS,EAAE,CAAC,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"append.operation.js","sourceRoot":"","sources":["../../../../../../../nodes/Google/Sheet/v2/actions/sheet/append.operation.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,6 +30,7 @@ exports.description = [
|
|
|
30
30
|
show: {
|
|
31
31
|
resource: ['sheet'],
|
|
32
32
|
operation: ['appendOrUpdate'],
|
|
33
|
+
'@version': [3],
|
|
33
34
|
},
|
|
34
35
|
hide: {
|
|
35
36
|
...GoogleSheets_utils_1.untilSheetSelected,
|
|
@@ -53,6 +54,7 @@ exports.description = [
|
|
|
53
54
|
show: {
|
|
54
55
|
resource: ['sheet'],
|
|
55
56
|
operation: ['appendOrUpdate'],
|
|
57
|
+
'@version': [3],
|
|
56
58
|
},
|
|
57
59
|
hide: {
|
|
58
60
|
...GoogleSheets_utils_1.untilSheetSelected,
|
|
@@ -69,6 +71,7 @@ exports.description = [
|
|
|
69
71
|
resource: ['sheet'],
|
|
70
72
|
operation: ['appendOrUpdate'],
|
|
71
73
|
dataMode: ['defineBelow'],
|
|
74
|
+
'@version': [3],
|
|
72
75
|
},
|
|
73
76
|
hide: {
|
|
74
77
|
...GoogleSheets_utils_1.untilSheetSelected,
|
|
@@ -88,6 +91,7 @@ exports.description = [
|
|
|
88
91
|
resource: ['sheet'],
|
|
89
92
|
operation: ['appendOrUpdate'],
|
|
90
93
|
dataMode: ['defineBelow'],
|
|
94
|
+
'@version': [3],
|
|
91
95
|
},
|
|
92
96
|
hide: {
|
|
93
97
|
...GoogleSheets_utils_1.untilSheetSelected,
|
|
@@ -131,6 +135,40 @@ exports.description = [
|
|
|
131
135
|
},
|
|
132
136
|
],
|
|
133
137
|
},
|
|
138
|
+
{
|
|
139
|
+
displayName: 'Columns',
|
|
140
|
+
name: 'columns',
|
|
141
|
+
type: 'resourceMapper',
|
|
142
|
+
noDataExpression: true,
|
|
143
|
+
default: {
|
|
144
|
+
mappingMode: 'defineBelow',
|
|
145
|
+
value: null,
|
|
146
|
+
},
|
|
147
|
+
required: true,
|
|
148
|
+
typeOptions: {
|
|
149
|
+
loadOptionsDependsOn: ['sheetName.value'],
|
|
150
|
+
resourceMapper: {
|
|
151
|
+
resourceMapperMethod: 'getMappingColumns',
|
|
152
|
+
mode: 'upsert',
|
|
153
|
+
fieldWords: {
|
|
154
|
+
singular: 'column',
|
|
155
|
+
plural: 'columns',
|
|
156
|
+
},
|
|
157
|
+
addAllFields: true,
|
|
158
|
+
multiKeyMatch: false,
|
|
159
|
+
},
|
|
160
|
+
},
|
|
161
|
+
displayOptions: {
|
|
162
|
+
show: {
|
|
163
|
+
resource: ['sheet'],
|
|
164
|
+
operation: ['appendOrUpdate'],
|
|
165
|
+
'@version': [4],
|
|
166
|
+
},
|
|
167
|
+
hide: {
|
|
168
|
+
...GoogleSheets_utils_1.untilSheetSelected,
|
|
169
|
+
},
|
|
170
|
+
},
|
|
171
|
+
},
|
|
134
172
|
{
|
|
135
173
|
displayName: 'Options',
|
|
136
174
|
name: 'options',
|
|
@@ -173,14 +211,20 @@ async function execute(sheet, sheetName, sheetId) {
|
|
|
173
211
|
throw new n8n_workflow_1.NodeOperationError(this.getNode(), `Could not retrieve the column names from row ${headerRow + 1}`);
|
|
174
212
|
}
|
|
175
213
|
columnNames = sheetData[headerRow];
|
|
214
|
+
const nodeVersion = this.getNode().typeVersion;
|
|
176
215
|
const newColumns = new Set();
|
|
177
|
-
const
|
|
178
|
-
|
|
216
|
+
const columnsToMatchOn = nodeVersion < 4
|
|
217
|
+
? [this.getNodeParameter('columnToMatchOn', 0)]
|
|
218
|
+
: this.getNodeParameter('columns.matchingColumns', 0);
|
|
219
|
+
const dataMode = nodeVersion < 4
|
|
220
|
+
? this.getNodeParameter('dataMode', 0)
|
|
221
|
+
: this.getNodeParameter('columns.mappingMode', 0);
|
|
222
|
+
const keyIndex = columnNames.indexOf(columnsToMatchOn[0]);
|
|
179
223
|
const columnValues = await sheet.getColumnValues(range, keyIndex, firstDataRow, valueRenderMode, sheetData);
|
|
180
224
|
const updateData = [];
|
|
181
225
|
const appendData = [];
|
|
226
|
+
const mappedValues = [];
|
|
182
227
|
for (let i = 0; i < items.length; i++) {
|
|
183
|
-
const dataMode = this.getNodeParameter('dataMode', i);
|
|
184
228
|
if (dataMode === 'nothing')
|
|
185
229
|
continue;
|
|
186
230
|
const data = [];
|
|
@@ -210,31 +254,48 @@ async function execute(sheet, sheetName, sheetId) {
|
|
|
210
254
|
}
|
|
211
255
|
}
|
|
212
256
|
else {
|
|
213
|
-
const valueToMatchOn =
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
const columnName = entry.columnName;
|
|
221
|
-
if (!columnNames.includes(columnName)) {
|
|
222
|
-
newColumns.add(columnName);
|
|
223
|
-
}
|
|
224
|
-
acc[columnName] = entry.fieldValue;
|
|
257
|
+
const valueToMatchOn = nodeVersion < 4
|
|
258
|
+
? this.getNodeParameter('valueToMatchOn', i)
|
|
259
|
+
: this.getNodeParameter(`columns.value[${columnsToMatchOn[0]}]`, i);
|
|
260
|
+
if (nodeVersion < 4) {
|
|
261
|
+
const valuesToSend = this.getNodeParameter('fieldsUi.values', i, []);
|
|
262
|
+
if (!(valuesToSend === null || valuesToSend === void 0 ? void 0 : valuesToSend.length)) {
|
|
263
|
+
throw new n8n_workflow_1.NodeOperationError(this.getNode(), "At least one value has to be added under 'Values to Send'");
|
|
225
264
|
}
|
|
226
|
-
|
|
227
|
-
|
|
265
|
+
const fields = valuesToSend.reduce((acc, entry) => {
|
|
266
|
+
if (entry.column === 'newColumn') {
|
|
267
|
+
const columnName = entry.columnName;
|
|
268
|
+
if (!columnNames.includes(columnName)) {
|
|
269
|
+
newColumns.add(columnName);
|
|
270
|
+
}
|
|
271
|
+
acc[columnName] = entry.fieldValue;
|
|
272
|
+
}
|
|
273
|
+
else {
|
|
274
|
+
acc[entry.column] = entry.fieldValue;
|
|
275
|
+
}
|
|
276
|
+
return acc;
|
|
277
|
+
}, {});
|
|
278
|
+
fields[columnsToMatchOn[0]] = valueToMatchOn;
|
|
279
|
+
data.push(fields);
|
|
280
|
+
}
|
|
281
|
+
else {
|
|
282
|
+
const mappingValues = this.getNodeParameter('columns.value', i);
|
|
283
|
+
if (Object.keys(mappingValues).length === 0) {
|
|
284
|
+
throw new n8n_workflow_1.NodeOperationError(this.getNode(), "At least one value has to be added under 'Values to Send'");
|
|
228
285
|
}
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
286
|
+
Object.keys(mappingValues).forEach((key) => {
|
|
287
|
+
if (mappingValues[key] === undefined || mappingValues[key] === null) {
|
|
288
|
+
mappingValues[key] = '';
|
|
289
|
+
}
|
|
290
|
+
});
|
|
291
|
+
data.push(mappingValues);
|
|
292
|
+
mappedValues.push(mappingValues);
|
|
293
|
+
}
|
|
233
294
|
}
|
|
234
295
|
if (newColumns.size) {
|
|
235
296
|
await sheet.updateRows(sheetName, [columnNames.concat([...newColumns])], options.cellFormat || 'RAW', headerRow + 1);
|
|
236
297
|
}
|
|
237
|
-
const preparedData = await sheet.prepareDataForUpdateOrUpsert(data,
|
|
298
|
+
const preparedData = await sheet.prepareDataForUpdateOrUpsert(data, columnsToMatchOn[0], range, headerRow, firstDataRow, valueRenderMode, true, [columnNames.concat([...newColumns])], columnValues);
|
|
238
299
|
updateData.push(...preparedData.updateData);
|
|
239
300
|
appendData.push(...preparedData.appendData);
|
|
240
301
|
}
|
|
@@ -246,7 +307,12 @@ async function execute(sheet, sheetName, sheetId) {
|
|
|
246
307
|
const lastRow = sheetData.length + 1;
|
|
247
308
|
await sheet.appendSheetData(appendData, range, headerRow + 1, valueInputMode, false, [columnNames.concat([...newColumns])], lastRow);
|
|
248
309
|
}
|
|
249
|
-
|
|
310
|
+
if (nodeVersion < 4 || dataMode === 'autoMapInputData') {
|
|
311
|
+
return items;
|
|
312
|
+
}
|
|
313
|
+
else {
|
|
314
|
+
return this.helpers.returnJsonArray(mappedValues);
|
|
315
|
+
}
|
|
250
316
|
}
|
|
251
317
|
exports.execute = execute;
|
|
252
318
|
//# sourceMappingURL=appendOrUpdate.operation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appendOrUpdate.operation.js","sourceRoot":"","sources":["../../../../../../../nodes/Google/Sheet/v2/actions/sheet/appendOrUpdate.operation.ts"],"names":[],"mappings":";;;AAOA,+CAAkD;AAElD,yEAAsE;AACtE,2DAAoF;AAEvE,QAAA,WAAW,GAAoB;IAC3C;QACC,WAAW,EAAE,WAAW;QACxB,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,SAAS;QACf,OAAO,EAAE;YACR;gBACC,IAAI,EAAE,gCAAgC;gBACtC,KAAK,EAAE,kBAAkB;gBACzB,WAAW,EAAE,+DAA+D;aAC5E;YACD;gBACC,IAAI,EAAE,uBAAuB;gBAC7B,KAAK,EAAE,aAAa;gBACpB,WAAW,EAAE,2CAA2C;aACxD;YACD;gBACC,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,SAAS;gBAChB,WAAW,EAAE,sBAAsB;aACnC;SACD;QACD,cAAc,EAAE;YACf,IAAI,EAAE;gBACL,QAAQ,EAAE,CAAC,OAAO,CAAC;gBACnB,SAAS,EAAE,CAAC,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"appendOrUpdate.operation.js","sourceRoot":"","sources":["../../../../../../../nodes/Google/Sheet/v2/actions/sheet/appendOrUpdate.operation.ts"],"names":[],"mappings":"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"}
|