nango 0.40.1 → 0.40.3
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/cli.d.ts +3 -3
- package/dist/cli.js +49 -93
- package/dist/cli.js.map +1 -1
- package/dist/constants.d.ts +0 -1
- package/dist/constants.js +0 -1
- package/dist/constants.js.map +1 -1
- package/dist/index.js +15 -10
- package/dist/index.js.map +1 -1
- package/dist/services/compile.service.d.ts +5 -6
- package/dist/services/compile.service.js +40 -51
- package/dist/services/compile.service.js.map +1 -1
- package/dist/services/compile.service.unit.test.js +3 -3
- package/dist/services/compile.service.unit.test.js.map +1 -1
- package/dist/services/config.service.d.ts +16 -7
- package/dist/services/config.service.js +84 -54
- package/dist/services/config.service.js.map +1 -1
- package/dist/services/config.service.unit.test.d.ts +1 -0
- package/dist/services/config.service.unit.test.js +147 -0
- package/dist/services/config.service.unit.test.js.map +1 -0
- package/dist/services/deploy.service.d.ts +3 -3
- package/dist/services/deploy.service.js +76 -66
- package/dist/services/deploy.service.js.map +1 -1
- package/dist/services/dryrun.service.js +10 -10
- package/dist/services/dryrun.service.js.map +1 -1
- package/dist/services/migration.service.js +23 -26
- package/dist/services/migration.service.js.map +1 -1
- package/dist/services/model.service.d.ts +38 -11
- package/dist/services/model.service.js +129 -174
- package/dist/services/model.service.js.map +1 -1
- package/dist/services/model.service.unit.test.d.ts +1 -0
- package/dist/services/model.service.unit.test.js +138 -0
- package/dist/services/model.service.unit.test.js.map +1 -0
- package/dist/services/parser.service.d.ts +1 -2
- package/dist/services/parser.service.js +3 -4
- package/dist/services/parser.service.js.map +1 -1
- package/dist/services/verification.service.d.ts +1 -1
- package/dist/services/verification.service.js +11 -11
- package/dist/services/verification.service.js.map +1 -1
- package/dist/sync.unit.cli-test.js +65 -143
- package/dist/sync.unit.cli-test.js.map +1 -1
- package/dist/templates/action.ejs +2 -47
- package/dist/templates/sync.ejs +1 -4
- package/dist/utils/layoutMode.d.ts +7 -0
- package/dist/utils/layoutMode.js +41 -0
- package/dist/utils/layoutMode.js.map +1 -0
- package/dist/utils.d.ts +0 -3
- package/dist/utils.js +4 -127
- package/dist/utils.js.map +1 -1
- package/lib/nango.yaml.schema.v2.json +183 -178
- package/package.json +7 -6
- package/dist/nango-sync.d.ts +0 -299
|
@@ -1,187 +1,142 @@
|
|
|
1
|
-
import fs from 'fs';
|
|
2
|
-
import
|
|
1
|
+
import fs from 'node:fs';
|
|
2
|
+
import path from 'node:path';
|
|
3
|
+
import { resolve } from 'import-meta-resolve';
|
|
3
4
|
import chalk from 'chalk';
|
|
4
|
-
import {
|
|
5
|
-
import { printDebug
|
|
6
|
-
import { TYPES_FILE_NAME
|
|
7
|
-
import
|
|
8
|
-
import
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
const syncData = syncObject[syncName];
|
|
16
|
-
if (syncData.returns) {
|
|
17
|
-
const syncReturns = Array.isArray(syncData.returns) ? syncData.returns : [syncData.returns];
|
|
18
|
-
syncReturns.forEach((modelName) => {
|
|
19
|
-
if (!acc.includes(modelName)) {
|
|
20
|
-
acc.push(modelName);
|
|
21
|
-
}
|
|
22
|
-
});
|
|
23
|
-
}
|
|
24
|
-
}
|
|
25
|
-
return acc;
|
|
26
|
-
}, []);
|
|
27
|
-
if (!models) {
|
|
28
|
-
return null;
|
|
29
|
-
}
|
|
30
|
-
const interfaceDefinitions = Object.keys(models).map((modelName) => {
|
|
31
|
-
const fields = models[modelName];
|
|
32
|
-
// we only care that models that are returned have an ID field
|
|
33
|
-
// if the model is not returned from a sync script then it must be a
|
|
34
|
-
// helper model that is used to build the returned models
|
|
35
|
-
const syncForModel = Object.keys(integrations).find((providerConfigKey) => {
|
|
36
|
-
const syncObject = integrations[providerConfigKey];
|
|
37
|
-
const syncNames = Object.keys(syncObject);
|
|
38
|
-
for (const syncName of syncNames) {
|
|
39
|
-
const syncData = syncObject[syncName];
|
|
40
|
-
if (syncData.returns && syncData.type !== SyncConfigType.ACTION) {
|
|
41
|
-
return syncData.returns.includes(modelName);
|
|
42
|
-
}
|
|
43
|
-
}
|
|
44
|
-
return false;
|
|
45
|
-
});
|
|
46
|
-
if (returnedModels.includes(modelName) && !fields['id'] && syncForModel) {
|
|
47
|
-
throw new Error(`Model "${modelName}" doesn't have an id field. This is required to be able to uniquely identify the data record.`);
|
|
48
|
-
}
|
|
49
|
-
const interfaceName = `${modelName.charAt(0).toUpperCase()}${modelName.slice(1)}`;
|
|
50
|
-
let extendsClause = '';
|
|
51
|
-
const fieldDefinitions = Object.keys(fields)
|
|
52
|
-
.filter((fieldName) => {
|
|
53
|
-
if (fieldName === '__extends') {
|
|
54
|
-
const fieldModel = fields[fieldName];
|
|
55
|
-
const multipleExtends = fieldModel.split(',').map((e) => e.trim());
|
|
56
|
-
extendsClause = ` extends ${multipleExtends.join(', ')}`;
|
|
57
|
-
return false;
|
|
58
|
-
}
|
|
59
|
-
return true;
|
|
60
|
-
})
|
|
61
|
-
.map((fieldName) => {
|
|
62
|
-
const fieldModel = fields[fieldName];
|
|
63
|
-
const fieldType = this.getFieldType(fieldModel, debug, modelName, models);
|
|
64
|
-
if (fieldName === '__string') {
|
|
65
|
-
const dynamicName = fields[fieldName];
|
|
66
|
-
return ` [key: string]: ${dynamicName};`;
|
|
67
|
-
}
|
|
68
|
-
return ` ${fieldName}: ${fieldType};`;
|
|
69
|
-
})
|
|
70
|
-
.join('\n');
|
|
71
|
-
const interfaceDefinition = `export interface ${interfaceName}${extendsClause} {\n${fieldDefinitions}\n}\n`;
|
|
72
|
-
return interfaceDefinition;
|
|
73
|
-
});
|
|
74
|
-
return interfaceDefinitions;
|
|
5
|
+
import { NANGO_VERSION } from '@nangohq/shared';
|
|
6
|
+
import { printDebug } from '../utils.js';
|
|
7
|
+
import { TYPES_FILE_NAME } from '../constants.js';
|
|
8
|
+
import { load } from './config.service.js';
|
|
9
|
+
import { shouldQuote } from '@nangohq/nango-yaml';
|
|
10
|
+
/**
|
|
11
|
+
* Load nango.yaml and generate model.ts
|
|
12
|
+
*/
|
|
13
|
+
export function loadYamlAndGeneratedModel({ fullPath, debug = false }) {
|
|
14
|
+
if (debug) {
|
|
15
|
+
printDebug(`Generating ${TYPES_FILE_NAME} file`);
|
|
75
16
|
}
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
}
|
|
81
|
-
let field = rawField;
|
|
82
|
-
let hasNull = false;
|
|
83
|
-
let hasUndefined = false;
|
|
84
|
-
let tsType = '';
|
|
85
|
-
if (field.includes('null')) {
|
|
86
|
-
field = field.replace(/\s*\|\s*null\s*/g, '');
|
|
87
|
-
hasNull = true;
|
|
88
|
-
}
|
|
89
|
-
if (field === 'undefined') {
|
|
90
|
-
if (debug) {
|
|
91
|
-
printDebug(`Field is defined undefined which isn't recommended.`);
|
|
92
|
-
}
|
|
93
|
-
return 'undefined';
|
|
94
|
-
}
|
|
95
|
-
if (field.includes('undefined')) {
|
|
96
|
-
field = field.replace(/\s*\|\s*undefined\s*/g, '');
|
|
97
|
-
hasUndefined = true;
|
|
98
|
-
}
|
|
99
|
-
switch (field) {
|
|
100
|
-
case 'boolean':
|
|
101
|
-
case 'bool':
|
|
102
|
-
tsType = 'boolean';
|
|
103
|
-
break;
|
|
104
|
-
case 'string':
|
|
105
|
-
tsType = 'string';
|
|
106
|
-
break;
|
|
107
|
-
case 'char':
|
|
108
|
-
tsType = 'string';
|
|
109
|
-
break;
|
|
110
|
-
case 'integer':
|
|
111
|
-
case 'int':
|
|
112
|
-
case 'number':
|
|
113
|
-
tsType = 'number';
|
|
114
|
-
break;
|
|
115
|
-
case 'date':
|
|
116
|
-
tsType = 'Date';
|
|
117
|
-
break;
|
|
118
|
-
default:
|
|
119
|
-
tsType = field;
|
|
120
|
-
}
|
|
121
|
-
if (hasNull) {
|
|
122
|
-
tsType = `${tsType} | null`;
|
|
123
|
-
}
|
|
124
|
-
if (hasUndefined) {
|
|
125
|
-
tsType = `${tsType} | undefined`;
|
|
126
|
-
}
|
|
127
|
-
if (tsType.includes('|')) {
|
|
128
|
-
const types = tsType.split('|');
|
|
129
|
-
const hasStringLiteral = types.some((type) => !isJsOrTsType(type.trim()) && !Object.keys(models).includes(type.replace(/\[\]/g, '').trim()));
|
|
130
|
-
if (hasStringLiteral) {
|
|
131
|
-
const enumValues = tsType
|
|
132
|
-
.split('|')
|
|
133
|
-
.map((e) => (isJsOrTsType(e.trim()) || Object.keys(models).includes(e.trim()) ? e.trim() : `'${e.trim()}'`))
|
|
134
|
-
.join(' | ');
|
|
135
|
-
tsType = enumValues;
|
|
136
|
-
}
|
|
137
|
-
}
|
|
138
|
-
return tsType;
|
|
17
|
+
const fp = path.resolve(fullPath, TYPES_FILE_NAME);
|
|
18
|
+
if (!fs.existsSync(fp)) {
|
|
19
|
+
if (debug) {
|
|
20
|
+
printDebug('First compilation');
|
|
139
21
|
}
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
.join('\n');
|
|
145
|
-
return `{\n${nestedFields}\n}`;
|
|
146
|
-
}
|
|
147
|
-
catch (_) {
|
|
148
|
-
// eslint-disable-next-line no-console
|
|
149
|
-
console.log(chalk.red(`Failed to parse field ${JSON.stringify(rawField)} so just returning it back as a string`));
|
|
150
|
-
return String(rawField);
|
|
151
|
-
}
|
|
22
|
+
}
|
|
23
|
+
else {
|
|
24
|
+
if (debug) {
|
|
25
|
+
printDebug(`File already exists, replacing`);
|
|
152
26
|
}
|
|
153
27
|
}
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
28
|
+
const { success, error, response: parsed } = load(fullPath, debug);
|
|
29
|
+
if (!success || !parsed) {
|
|
30
|
+
console.log(chalk.red(error?.message));
|
|
31
|
+
return { success: false, error: null, response: null };
|
|
32
|
+
}
|
|
33
|
+
const modelTs = buildModelsTS({ parsed });
|
|
34
|
+
fs.writeFileSync(fp, modelTs);
|
|
35
|
+
if (debug) {
|
|
36
|
+
printDebug(`${TYPES_FILE_NAME} generated`);
|
|
37
|
+
}
|
|
38
|
+
return { success: true, error: null, response: parsed };
|
|
39
|
+
}
|
|
40
|
+
/**
|
|
41
|
+
* Build models.ts
|
|
42
|
+
*/
|
|
43
|
+
export function buildModelsTS({ parsed }) {
|
|
44
|
+
return `// ---------------------------
|
|
45
|
+
// This file was generated by Nango (v${NANGO_VERSION})
|
|
46
|
+
// It's recommended to version this file
|
|
47
|
+
// https://nango.dev
|
|
48
|
+
// ---------------------------
|
|
49
|
+
|
|
50
|
+
// ------ Models
|
|
51
|
+
${generateInterfaces({ parsed }).join('\n\n')}
|
|
52
|
+
// ------ /Models
|
|
53
|
+
|
|
54
|
+
// ------ SDK
|
|
55
|
+
${generateSDKTypes()}
|
|
56
|
+
// ------ /SDK
|
|
57
|
+
|
|
58
|
+
// ------ Flows
|
|
59
|
+
export const NangoFlows = ${JSON.stringify(parsed.integrations, null, 2)} as const;
|
|
60
|
+
// ------ /Flows
|
|
61
|
+
`;
|
|
62
|
+
}
|
|
63
|
+
export function generateInterfaces({ parsed }) {
|
|
64
|
+
const interfaces = [];
|
|
65
|
+
for (const [, model] of parsed.models) {
|
|
66
|
+
interfaces.push(modelToTypescript({ model }));
|
|
67
|
+
}
|
|
68
|
+
return interfaces;
|
|
69
|
+
}
|
|
70
|
+
/**
|
|
71
|
+
* Transform a JSON model to its Typescript equivalent
|
|
72
|
+
*/
|
|
73
|
+
export function modelToTypescript({ model }) {
|
|
74
|
+
const output = [];
|
|
75
|
+
if (model.isAnon) {
|
|
76
|
+
output.push(`/** @deprecated It is recommended to use a Model */`);
|
|
77
|
+
output.push(`export type ${model.name} = ${fieldToTypescript({ field: model.fields[0] })}`);
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
output.push(`export interface ${model.name} {`);
|
|
81
|
+
output.push(...fieldsToTypescript({ fields: model.fields }));
|
|
82
|
+
output.push(`};`);
|
|
83
|
+
}
|
|
84
|
+
return output.join('\n');
|
|
85
|
+
}
|
|
86
|
+
export function fieldsToTypescript({ fields }) {
|
|
87
|
+
const output = [];
|
|
88
|
+
const dynamic = fields.find((field) => field.dynamic);
|
|
89
|
+
// Insert dynamic key at the beginning
|
|
90
|
+
if (dynamic) {
|
|
91
|
+
if (!Array.isArray(dynamic.value)) {
|
|
92
|
+
output.push(` [key: string]: ${fieldToTypescript({ field: dynamic })};`);
|
|
161
93
|
}
|
|
162
|
-
|
|
163
|
-
|
|
94
|
+
else {
|
|
95
|
+
output.push(` [key: string]: {${fieldsToTypescript({ fields: dynamic.value }).join('\n')}};`);
|
|
164
96
|
}
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
97
|
+
}
|
|
98
|
+
// Regular fields
|
|
99
|
+
for (const field of fields) {
|
|
100
|
+
if (field.dynamic) {
|
|
101
|
+
continue;
|
|
169
102
|
}
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
103
|
+
output.push(` ${shouldQuote(field.name) ? `"${field.name}"` : field.name}${field.optional ? '?' : ''}: ${fieldToTypescript({ field: field })};`);
|
|
104
|
+
}
|
|
105
|
+
return output;
|
|
106
|
+
}
|
|
107
|
+
/**
|
|
108
|
+
* Transform a field definition to its typescript equivalent
|
|
109
|
+
*/
|
|
110
|
+
export function fieldToTypescript({ field }) {
|
|
111
|
+
if (Array.isArray(field.value)) {
|
|
112
|
+
if (field.union) {
|
|
113
|
+
return field.value.map((f) => fieldToTypescript({ field: f })).join(' | ');
|
|
176
114
|
}
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
if (notify) {
|
|
180
|
-
// eslint-disable-next-line no-console
|
|
181
|
-
console.log(chalk.green(`The ${nangoConfigFile} was updated. The interface file (${TYPES_FILE_NAME}) was updated to reflect the updated config`));
|
|
115
|
+
if (field.array) {
|
|
116
|
+
return `(${field.value.map((f) => fieldToTypescript({ field: f })).join(' | ')})[]`;
|
|
182
117
|
}
|
|
118
|
+
return `{${fieldsToTypescript({ fields: field.value }).join('\n')}}`;
|
|
119
|
+
}
|
|
120
|
+
if (field.model || field.tsType) {
|
|
121
|
+
return `${field.value}${field.array ? '[]' : ''}`;
|
|
122
|
+
}
|
|
123
|
+
if (field.value === null) {
|
|
124
|
+
return 'null';
|
|
183
125
|
}
|
|
126
|
+
if (typeof field.value === 'string') {
|
|
127
|
+
return `'${field.value}${field.array ? '[]' : ''}'`;
|
|
128
|
+
}
|
|
129
|
+
return `${field.value}${field.array ? '[]' : ''}`;
|
|
130
|
+
}
|
|
131
|
+
/**
|
|
132
|
+
* Generate SDK types
|
|
133
|
+
*/
|
|
134
|
+
export function generateSDKTypes() {
|
|
135
|
+
const filePath = resolve('@nangohq/shared/dist/sdk/sync.d.ts', import.meta.url);
|
|
136
|
+
const typesContent = fs.readFileSync(filePath.replace('file://', ''), 'utf8');
|
|
137
|
+
return `
|
|
138
|
+
${typesContent}
|
|
139
|
+
|
|
140
|
+
`;
|
|
184
141
|
}
|
|
185
|
-
const modelService = new ModelService();
|
|
186
|
-
export default modelService;
|
|
187
142
|
//# sourceMappingURL=model.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.service.js","sourceRoot":"","sources":["../../lib/services/model.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"model.service.js","sourceRoot":"","sources":["../../lib/services/model.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,138 @@
|
|
|
1
|
+
import { describe, expect, it } from 'vitest';
|
|
2
|
+
import { buildModelsTS, fieldToTypescript, fieldsToTypescript } from './model.service.js';
|
|
3
|
+
function removeVersion(res) {
|
|
4
|
+
return res.replace(/(v[0-9.]+)/, 'vTest');
|
|
5
|
+
}
|
|
6
|
+
describe('buildModelTs', () => {
|
|
7
|
+
it('should return empty (with sdk)', () => {
|
|
8
|
+
const res = buildModelsTS({ parsed: { yamlVersion: 'v2', integrations: [], models: new Map() } });
|
|
9
|
+
expect(removeVersion(res)).toMatchSnapshot('');
|
|
10
|
+
});
|
|
11
|
+
it('should output all interfaces', () => {
|
|
12
|
+
const models = [
|
|
13
|
+
{
|
|
14
|
+
name: 'Foo',
|
|
15
|
+
fields: [
|
|
16
|
+
{ name: '__string', value: 'string', tsType: true, dynamic: true },
|
|
17
|
+
{ name: 'id', value: 'number', tsType: true }
|
|
18
|
+
]
|
|
19
|
+
},
|
|
20
|
+
{
|
|
21
|
+
name: 'Bar',
|
|
22
|
+
fields: [
|
|
23
|
+
{ name: 'value', value: null, tsType: true },
|
|
24
|
+
{ name: 'top', value: 'boolean', tsType: true, array: true },
|
|
25
|
+
{ name: 'ref', value: 'Foo', tsType: false, model: true, optional: true },
|
|
26
|
+
{
|
|
27
|
+
name: 'union',
|
|
28
|
+
union: true,
|
|
29
|
+
value: [
|
|
30
|
+
{ name: '0', value: 'literal1' },
|
|
31
|
+
{ name: '1', value: 'literal2' }
|
|
32
|
+
],
|
|
33
|
+
tsType: false
|
|
34
|
+
},
|
|
35
|
+
{
|
|
36
|
+
name: 'array',
|
|
37
|
+
array: true,
|
|
38
|
+
value: [
|
|
39
|
+
{ name: '0', value: 'arr1' },
|
|
40
|
+
{ name: '1', value: 'arr2' }
|
|
41
|
+
],
|
|
42
|
+
tsType: false
|
|
43
|
+
},
|
|
44
|
+
{
|
|
45
|
+
name: 'obj',
|
|
46
|
+
value: [{ name: 'nes', value: 'ted' }]
|
|
47
|
+
}
|
|
48
|
+
]
|
|
49
|
+
},
|
|
50
|
+
{
|
|
51
|
+
name: 'Anonymous_unauthenticated_action_returnType_input',
|
|
52
|
+
fields: [{ name: 'input', value: 'number', tsType: true }],
|
|
53
|
+
isAnon: true
|
|
54
|
+
}
|
|
55
|
+
];
|
|
56
|
+
const res = buildModelsTS({
|
|
57
|
+
parsed: {
|
|
58
|
+
yamlVersion: 'v2',
|
|
59
|
+
models: new Map(Object.entries(models)),
|
|
60
|
+
integrations: []
|
|
61
|
+
}
|
|
62
|
+
});
|
|
63
|
+
expect(removeVersion(res.split('\n').slice(0, 25).join('\n'))).toMatchSnapshot('');
|
|
64
|
+
});
|
|
65
|
+
});
|
|
66
|
+
describe('fieldsToTypescript', () => {
|
|
67
|
+
it.each(['a-b', 'a!b', 'a@', 'a&', 'a#', 'a(', 'a)', 'a%'])('should handle exotic key name', (val) => {
|
|
68
|
+
const res = fieldsToTypescript({ fields: [{ name: val, value: 'string' }] });
|
|
69
|
+
expect(res[0]).toStrictEqual(` "${val}": 'string';`);
|
|
70
|
+
});
|
|
71
|
+
});
|
|
72
|
+
describe('fieldToTypescript', () => {
|
|
73
|
+
it('should correctly interpret a string union literal type', () => {
|
|
74
|
+
expect(fieldToTypescript({
|
|
75
|
+
field: {
|
|
76
|
+
name: 'test',
|
|
77
|
+
union: true,
|
|
78
|
+
value: [
|
|
79
|
+
{ name: '0', value: 'male' },
|
|
80
|
+
{ name: '1', value: 'female' }
|
|
81
|
+
]
|
|
82
|
+
}
|
|
83
|
+
})).toStrictEqual("'male' | 'female'");
|
|
84
|
+
});
|
|
85
|
+
it('should correctly interpret a union literal type with all types', () => {
|
|
86
|
+
expect(fieldToTypescript({
|
|
87
|
+
field: {
|
|
88
|
+
name: 'test',
|
|
89
|
+
union: true,
|
|
90
|
+
value: [
|
|
91
|
+
{ name: '0', value: 'male' },
|
|
92
|
+
{ name: '1', value: 'string', tsType: true },
|
|
93
|
+
{ name: '1', value: null, tsType: true },
|
|
94
|
+
{ name: '2', value: undefined, tsType: true },
|
|
95
|
+
{ name: '3', value: 1, tsType: true },
|
|
96
|
+
{ name: '4', value: true, tsType: true }
|
|
97
|
+
]
|
|
98
|
+
}
|
|
99
|
+
})).toStrictEqual("'male' | string | null | undefined | 1 | true");
|
|
100
|
+
});
|
|
101
|
+
it('should correctly interpret a union literal with models', () => {
|
|
102
|
+
expect(fieldToTypescript({
|
|
103
|
+
field: {
|
|
104
|
+
name: 'test',
|
|
105
|
+
union: true,
|
|
106
|
+
value: [
|
|
107
|
+
{ name: '0', value: 'User', model: true },
|
|
108
|
+
{ name: '1', value: 'Account', model: true }
|
|
109
|
+
]
|
|
110
|
+
}
|
|
111
|
+
})).toStrictEqual('User | Account');
|
|
112
|
+
});
|
|
113
|
+
it('should correctly interpret a literal array', () => {
|
|
114
|
+
expect(fieldToTypescript({
|
|
115
|
+
field: {
|
|
116
|
+
name: 'test',
|
|
117
|
+
array: true,
|
|
118
|
+
value: [
|
|
119
|
+
{ name: '0', value: 'User', model: true },
|
|
120
|
+
{ name: '1', value: 'Account', model: true }
|
|
121
|
+
]
|
|
122
|
+
}
|
|
123
|
+
})).toStrictEqual('(User | Account)[]');
|
|
124
|
+
});
|
|
125
|
+
it('should correctly interpret a literal array', () => {
|
|
126
|
+
expect(fieldToTypescript({
|
|
127
|
+
field: {
|
|
128
|
+
name: 'test',
|
|
129
|
+
union: true,
|
|
130
|
+
value: [
|
|
131
|
+
{ name: '0', value: 'User', model: true, array: true },
|
|
132
|
+
{ name: '1', value: 'string', tsType: true }
|
|
133
|
+
]
|
|
134
|
+
}
|
|
135
|
+
})).toStrictEqual('User[] | string');
|
|
136
|
+
});
|
|
137
|
+
});
|
|
138
|
+
//# sourceMappingURL=model.service.unit.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"model.service.unit.test.js","sourceRoot":"","sources":["../../lib/services/model.service.unit.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import { SyncConfigType } from '@nangohq/shared';
|
|
2
1
|
declare class ParserService {
|
|
3
2
|
getImportedFiles(filePath: string): string[];
|
|
4
|
-
callsAreUsedCorrectly(filePath: string, type:
|
|
3
|
+
callsAreUsedCorrectly(filePath: string, type: string | undefined, modelNames: string[]): boolean;
|
|
5
4
|
}
|
|
6
5
|
declare const parserService: ParserService;
|
|
7
6
|
export default parserService;
|
|
@@ -3,7 +3,6 @@ import chalk from 'chalk';
|
|
|
3
3
|
import traverse from '@babel/traverse';
|
|
4
4
|
import * as t from '@babel/types';
|
|
5
5
|
import parser from '@babel/parser';
|
|
6
|
-
import { SyncConfigType } from '@nangohq/shared';
|
|
7
6
|
class ParserService {
|
|
8
7
|
getImportedFiles(filePath) {
|
|
9
8
|
const code = fs.readFileSync(filePath, 'utf-8');
|
|
@@ -18,7 +17,7 @@ class ParserService {
|
|
|
18
17
|
});
|
|
19
18
|
return importedFiles;
|
|
20
19
|
}
|
|
21
|
-
callsAreUsedCorrectly(filePath, type =
|
|
20
|
+
callsAreUsedCorrectly(filePath, type = 'sync', modelNames) {
|
|
22
21
|
let areAwaited = true;
|
|
23
22
|
let usedCorrectly = true;
|
|
24
23
|
let noReturnUsed = true;
|
|
@@ -61,7 +60,7 @@ class ParserService {
|
|
|
61
60
|
if (deprecatedCalls[callee.property.name]) {
|
|
62
61
|
console.warn(chalk.yellow(`nango.${callee.property.name}() used at line ${lineNumber} is deprecated. Use nango.${deprecatedCalls[callee.property.name]}() instead.`));
|
|
63
62
|
}
|
|
64
|
-
if (type ===
|
|
63
|
+
if (type === 'action') {
|
|
65
64
|
if (disallowedActionCalls.includes(callee.property.name)) {
|
|
66
65
|
disallowedMessage(callee.property.name, lineNumber);
|
|
67
66
|
usedCorrectly = false;
|
|
@@ -130,7 +129,7 @@ class ParserService {
|
|
|
130
129
|
return returnsValue;
|
|
131
130
|
}
|
|
132
131
|
if (t.isFunctionDeclaration(declaration) || t.isFunctionExpression(declaration) || t.isArrowFunctionExpression(declaration)) {
|
|
133
|
-
if (functionReturnsValue(declaration) && type ===
|
|
132
|
+
if (functionReturnsValue(declaration) && type === 'sync') {
|
|
134
133
|
const lineNumber = declaration.loc?.start.line || 'unknown';
|
|
135
134
|
console.log(chalk.red(`The default exported function fetchData at "${filePath}:${lineNumber}" must not return a value. Sync scripts should not return but rather use batchSave to save data.`));
|
|
136
135
|
noReturnUsed = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.service.js","sourceRoot":"","sources":["../../lib/services/parser.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,QAAQ,MAAM,iBAAiB,CAAC;AACvC,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAClC,OAAO,MAAM,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"parser.service.js","sourceRoot":"","sources":["../../lib/services/parser.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,QAAQ,MAAM,iBAAiB,CAAC;AACvC,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAClC,OAAO,MAAM,MAAM,eAAe,CAAC;AAEnC,MAAM,aAAa;IACR,gBAAgB,CAAC,QAAgB;QACpC,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAChD,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QAClF,MAAM,aAAa,GAAa,EAAE,CAAC;QACnC,MAAM,UAAU,GAAI,QAAgB,CAAC,OAAO,IAAI,QAAQ,CAAC;QAEzD,UAAU,CAAC,GAAG,EAAE;YACZ,iBAAiB,CAAC,IAAmC;gBACjD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;gBAC1C,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACnC,CAAC;SACJ,CAAC,CAAC;QAEH,OAAO,aAAa,CAAC;IACzB,CAAC;IAEM,qBAAqB,CAAC,QAAgB,EAAE,IAAI,GAAG,MAAM,EAAE,UAAoB;QAC9E,IAAI,UAAU,GAAG,IAAI,CAAC;QACtB,IAAI,aAAa,GAAG,IAAI,CAAC;QACzB,IAAI,YAAY,GAAG,IAAI,CAAC;QACxB,IAAI,oBAAoB,GAAG,IAAI,CAAC;QAEhC,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAChD,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QAClF,MAAM,UAAU,GAAI,QAAgB,CAAC,OAAO,IAAI,QAAQ,CAAC;QAEzD,MAAM,YAAY,GAAG,CAAC,IAAY,EAAE,UAAkB,EAAE,EAAE,CACtD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,IAAI,gCAAgC,QAAQ,IAAI,UAAU,iDAAiD,CAAC,CAAC,CAAC;QAEjJ,MAAM,iBAAiB,GAAG,CAAC,IAAY,EAAE,UAAkB,EAAE,EAAE,CAC3D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,IAAI,sEAAsE,QAAQ,IAAI,UAAU,IAAI,CAAC,CAAC,CAAC;QAE1I,MAAM,UAAU,GAAG;YACf,WAAW;YACX,WAAW;YACX,aAAa;YACb,KAAK;YACL,iBAAiB;YACjB,iBAAiB;YACjB,aAAa;YACb,aAAa;YACb,KAAK;YACL,MAAM;YACN,KAAK;YACL,OAAO;YACP,QAAQ;YACR,eAAe;YACf,yBAAyB;YACzB,eAAe;SAClB,CAAC;QAEF,MAAM,qBAAqB,GAAG,CAAC,WAAW,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;QAExE,MAAM,eAAe,GAA2B;YAC5C,SAAS,EAAE,WAAW;YACtB,eAAe,EAAE,aAAa;YAC9B,eAAe,EAAE,aAAa;SACjC,CAAC;QAEF,MAAM,6BAA6B,GAAG,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QAEnE,UAAU,CAAC,GAAG,EAAE;YACZ,cAAc,CAAC,IAAgC;gBAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAc,CAAC;gBACvD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,MAA4B,CAAC;gBACtD,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,KAAK,YAAY,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,OAAO,IAAI,MAAM,CAAC,QAAQ,EAAE,IAAI,KAAK,YAAY,EAAE,CAAC;oBACnH,IAAI,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;wBACxC,OAAO,CAAC,IAAI,CACR,KAAK,CAAC,MAAM,CACR,SAAS,MAAM,CAAC,QAAQ,CAAC,IAAI,mBAAmB,UAAU,6BACtD,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CACxC,aAAa,CAChB,CACJ,CAAC;oBACN,CAAC;oBACD,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;wBACpB,IAAI,qBAAqB,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;4BACvD,iBAAiB,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;4BACpD,aAAa,GAAG,KAAK,CAAC;wBAC1B,CAAC;oBACL,CAAC;oBAED,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,iBAAiB,EAAE,CAAC,CAAC;oBAClF,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CACjC,CAAC,UAAU,EAAE,EAAE,CACX,CAAC,CAAC,kBAAkB,CAAC,UAAU,CAAC,IAAI,CAAC;wBACrC,CAAC,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAClI,CAAC;oBAEF,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,iBAAiB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;oBAElG,IAAI,CAAC,SAAS,IAAI,CAAC,aAAa,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;wBAC3F,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;wBAC/C,UAAU,GAAG,KAAK,CAAC;oBACvB,CAAC;oBAED,IAAI,6BAA6B,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;wBAC/D,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,SAA2B,CAAC;wBACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;wBACvC,IAAI,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;4BACtE,OAAO,CAAC,GAAG,CACP,KAAK,CAAC,GAAG,CACL,IACI,QAAQ,CAAC,KACb,8CAA8C,QAAQ,IAAI,UAAU,oCAAoC,UAAU,CAAC,IAAI,CACnH,IAAI,CACP,EAAE,CACN,CACJ,CAAC;4BACF,aAAa,GAAG,KAAK,CAAC;wBAC1B,CAAC;oBACL,CAAC;oBACD,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;oBAC1C,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;wBACrE,IAAI,oBAAoB,GAAG,KAAK,CAAC;wBACjC,IAAI,oBAAoB,GAAG,KAAK,CAAC;wBACjC,aAAa,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,IAAyD,EAAE,EAAE;4BAC9F,IAAI,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;gCAC3B,IAAI,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;oCAC1D,oBAAoB,GAAG,IAAI,CAAC;gCAChC,CAAC;gCACD,IAAI,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;oCAC1D,oBAAoB,GAAG,IAAI,CAAC;gCAChC,CAAC;4BACL,CAAC;wBACL,CAAC,CAAC,CAAC;wBAEH,IAAI,CAAC,oBAAoB,IAAI,oBAAoB,EAAE,CAAC;4BAChD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAc,CAAC;4BACvD,OAAO,CAAC,GAAG,CACP,KAAK,CAAC,GAAG,CACL,4CAA4C,QAAQ,IAAI,UAAU,0DAA0D,CAC/H,CACJ,CAAC;4BACF,oBAAoB,GAAG,KAAK,CAAC;wBACjC,CAAC;oBACL,CAAC;gBACL,CAAC;YACL,CAAC;YACD,wBAAwB,CAAC,IAA0C;gBAC/D,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC;gBAC1C,SAAS,oBAAoB,CAAC,QAAkF;oBAC5G,IAAI,YAAY,GAAG,KAAK,CAAC;oBAEzB,UAAU,CAAC,QAAQ,CAAC,IAAI,EAAE;wBACtB,eAAe,CAAC,IAAiC;4BAC7C,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;gCAC9B,YAAY,GAAG,IAAI,CAAC;gCACpB,IAAI,CAAC,IAAI,EAAE,CAAC;4BAChB,CAAC;wBACL,CAAC;wBACD,mBAAmB,CAAC,IAAqC;4BACrD,IAAI,CAAC,IAAI,EAAE,CAAC;wBAChB,CAAC;wBACD,kBAAkB,CAAC,IAAoC;4BACnD,IAAI,CAAC,IAAI,EAAE,CAAC;wBAChB,CAAC;wBACD,uBAAuB,CAAC,IAAyC;4BAC7D,IAAI,CAAC,IAAI,EAAE,CAAC;wBAChB,CAAC;wBACD,OAAO,EAAE,IAAI;qBAChB,CAAC,CAAC;oBAEH,OAAO,YAAY,CAAC;gBACxB,CAAC;gBAED,IAAI,CAAC,CAAC,qBAAqB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,oBAAoB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,yBAAyB,CAAC,WAAW,CAAC,EAAE,CAAC;oBAC1H,IAAI,oBAAoB,CAAC,WAAW,CAAC,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;wBACvD,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,IAAI,SAAS,CAAC;wBAC5D,OAAO,CAAC,GAAG,CACP,KAAK,CAAC,GAAG,CACL,+CAA+C,QAAQ,IAAI,UAAU,kGAAkG,CAC1K,CACJ,CAAC;wBACF,YAAY,GAAG,KAAK,CAAC;oBACzB,CAAC;gBACL,CAAC;YACL,CAAC;SACJ,CAAC,CAAC;QAEH,OAAO,UAAU,IAAI,aAAa,IAAI,YAAY,IAAI,oBAAoB,CAAC;IAC/E,CAAC;CACJ;AAED,MAAM,aAAa,GAAG,IAAI,aAAa,EAAE,CAAC;AAC1C,eAAe,aAAa,CAAC"}
|