@bubblelab/bubble-runtime 0.1.12 → 0.1.14
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/extraction/BubbleParser.d.ts +7 -0
- package/dist/extraction/BubbleParser.d.ts.map +1 -1
- package/dist/extraction/BubbleParser.js +239 -14
- package/dist/extraction/BubbleParser.js.map +1 -1
- package/dist/extraction/index.js +0 -1
- package/dist/index.js +0 -1
- package/dist/injection/BubbleInjector.d.ts +4 -4
- package/dist/injection/BubbleInjector.d.ts.map +1 -1
- package/dist/injection/BubbleInjector.js +23 -14
- package/dist/injection/BubbleInjector.js.map +1 -1
- package/dist/injection/LoggerInjector.d.ts +6 -0
- package/dist/injection/LoggerInjector.d.ts.map +1 -1
- package/dist/injection/LoggerInjector.js +27 -5
- package/dist/injection/LoggerInjector.js.map +1 -1
- package/dist/injection/index.js +0 -1
- package/dist/parse/BubbleScript.d.ts +9 -4
- package/dist/parse/BubbleScript.d.ts.map +1 -1
- package/dist/parse/BubbleScript.js +76 -17
- package/dist/parse/BubbleScript.js.map +1 -1
- package/dist/parse/index.js +0 -1
- package/dist/parse/traceDependencies.js +15 -1
- package/dist/parse/traceDependencies.js.map +1 -1
- package/dist/runtime/BubbleRunner.d.ts +1 -0
- package/dist/runtime/BubbleRunner.d.ts.map +1 -1
- package/dist/runtime/BubbleRunner.js +36 -31
- package/dist/runtime/BubbleRunner.js.map +1 -1
- package/dist/runtime/index.js +0 -1
- package/dist/runtime/types.js +0 -1
- package/dist/types/index.js +0 -1
- package/dist/utils/bubble-helper.js +0 -1
- package/dist/utils/error-sanitizer.d.ts +16 -0
- package/dist/utils/error-sanitizer.d.ts.map +1 -0
- package/dist/utils/error-sanitizer.js +111 -0
- package/dist/utils/error-sanitizer.js.map +1 -0
- package/dist/utils/parameter-formatter.d.ts.map +1 -1
- package/dist/utils/parameter-formatter.js +36 -9
- package/dist/utils/parameter-formatter.js.map +1 -1
- package/dist/validation/BubbleValidator.d.ts.map +1 -1
- package/dist/validation/BubbleValidator.js +3 -0
- package/dist/validation/BubbleValidator.js.map +1 -1
- package/dist/validation/index.d.ts +3 -1
- package/dist/validation/index.d.ts.map +1 -1
- package/dist/validation/index.js +46 -3
- package/dist/validation/index.js.map +1 -1
- package/package.json +5 -5
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ParsedBubbleWithInfo } from '@bubblelab/shared-schemas';
|
|
1
|
+
import type { ParsedBubbleWithInfo, CredentialType, BubbleTrigger } from '@bubblelab/shared-schemas';
|
|
2
2
|
import { BubbleFactory } from '@bubblelab/bubble-core';
|
|
3
3
|
export interface ValidationResult {
|
|
4
4
|
valid: boolean;
|
|
@@ -7,6 +7,8 @@ export interface ValidationResult {
|
|
|
7
7
|
export interface ValidationAndExtractionResult extends ValidationResult {
|
|
8
8
|
bubbleParameters?: Record<number, ParsedBubbleWithInfo>;
|
|
9
9
|
inputSchema?: Record<string, unknown>;
|
|
10
|
+
trigger?: BubbleTrigger;
|
|
11
|
+
requiredCredentials?: Record<string, CredentialType[]>;
|
|
10
12
|
}
|
|
11
13
|
/**
|
|
12
14
|
* Validates a BubbleFlow TypeScript code
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/validation/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/validation/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EACpB,cAAc,EACd,aAAa,EACd,MAAM,2BAA2B,CAAC;AAInC,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAGvD,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,MAAM,WAAW,6BAA8B,SAAQ,gBAAgB;IACrE,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;IACxD,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC;CACxD;AAED;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,gBAAgB,CAAC,CAqC3B;AAED;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,6BAA6B,CAAC,CAsDxC"}
|
package/dist/validation/index.js
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { validateScript } from './BubbleValidator.js';
|
|
2
2
|
import { BubbleScript } from '../parse/BubbleScript.js';
|
|
3
|
+
import { BubbleInjector } from '../injection/BubbleInjector.js';
|
|
4
|
+
import { validateCronExpression } from '@bubblelab/shared-schemas';
|
|
3
5
|
/**
|
|
4
6
|
* Validates a BubbleFlow TypeScript code
|
|
5
7
|
* This focuses purely on validation without extraction
|
|
@@ -13,7 +15,9 @@ export async function validateBubbleFlow(code) {
|
|
|
13
15
|
// Step 1: Basic syntax and structure validation
|
|
14
16
|
const validationResult = validateScript(code);
|
|
15
17
|
if (!validationResult.success) {
|
|
16
|
-
|
|
18
|
+
if (validationResult.errors) {
|
|
19
|
+
errors.push(...Object.entries(validationResult.errors).map(([lineNumber, errorMessage]) => `line ${lineNumber}: ${errorMessage}`));
|
|
20
|
+
}
|
|
17
21
|
}
|
|
18
22
|
// Step 2: Validate BubbleFlow class requirements
|
|
19
23
|
const structuralErrors = validateBubbleFlowStructure(code);
|
|
@@ -48,13 +52,36 @@ export async function validateAndExtract(code, bubbleFactory) {
|
|
|
48
52
|
if (!validationResult.valid) {
|
|
49
53
|
return validationResult;
|
|
50
54
|
}
|
|
51
|
-
//
|
|
55
|
+
// After script validation passes, extract bubble parameters and validate trigger event
|
|
52
56
|
try {
|
|
53
57
|
const script = new BubbleScript(code, bubbleFactory);
|
|
58
|
+
// Step 4: Validate trigger event
|
|
59
|
+
const triggerEventErrors = validateTriggerEvent(script);
|
|
60
|
+
if (triggerEventErrors.length > 0) {
|
|
61
|
+
return {
|
|
62
|
+
valid: false,
|
|
63
|
+
errors: triggerEventErrors,
|
|
64
|
+
};
|
|
65
|
+
}
|
|
66
|
+
const bubbleParameters = script.getParsedBubbles();
|
|
67
|
+
// Extract required credentials from bubble parameters
|
|
68
|
+
const requiredCredentials = {};
|
|
69
|
+
const injector = new BubbleInjector(script);
|
|
70
|
+
const credentials = injector.findCredentials();
|
|
71
|
+
for (const [varId, credentialTypes] of Object.entries(credentials)) {
|
|
72
|
+
const bubble = bubbleParameters[Number(varId)];
|
|
73
|
+
if (bubble && credentialTypes.length > 0) {
|
|
74
|
+
requiredCredentials[bubble.bubbleName] = credentialTypes;
|
|
75
|
+
}
|
|
76
|
+
}
|
|
54
77
|
return {
|
|
55
78
|
...validationResult,
|
|
56
|
-
bubbleParameters
|
|
79
|
+
bubbleParameters,
|
|
57
80
|
inputSchema: script.getPayloadJsonSchema() || {},
|
|
81
|
+
trigger: script.getBubbleTriggerEventType() || undefined,
|
|
82
|
+
requiredCredentials: Object.keys(requiredCredentials).length > 0
|
|
83
|
+
? requiredCredentials
|
|
84
|
+
: undefined,
|
|
58
85
|
};
|
|
59
86
|
}
|
|
60
87
|
catch (error) {
|
|
@@ -65,6 +92,22 @@ export async function validateAndExtract(code, bubbleFactory) {
|
|
|
65
92
|
};
|
|
66
93
|
}
|
|
67
94
|
}
|
|
95
|
+
function validateTriggerEvent(bubbleScript) {
|
|
96
|
+
const errors = [];
|
|
97
|
+
const triggerEvent = bubbleScript.getBubbleTriggerEventType();
|
|
98
|
+
if (!triggerEvent) {
|
|
99
|
+
errors.push('Missing trigger event');
|
|
100
|
+
}
|
|
101
|
+
if (triggerEvent?.type === 'schedule/cron') {
|
|
102
|
+
if (!triggerEvent.cronSchedule) {
|
|
103
|
+
errors.push("Missing cron schedule, please define it with the readonly cronSchedule property inside the BubbleFlow class. Ex. readonly cronSchedule = '0 0 * * *';");
|
|
104
|
+
}
|
|
105
|
+
if (!validateCronExpression(triggerEvent.cronSchedule).valid) {
|
|
106
|
+
errors.push("Invalid cron schedule, please define it with the readonly cronSchedule property inside the BubbleFlow class. Ex. readonly cronSchedule = '0 0 * * *';");
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
return errors;
|
|
110
|
+
}
|
|
68
111
|
/**
|
|
69
112
|
* Validates BubbleFlow class structure requirements
|
|
70
113
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/validation/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/validation/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@bubblelab/bubble-runtime",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.14",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -24,11 +24,11 @@
|
|
|
24
24
|
"dependencies": {
|
|
25
25
|
"@typescript-eslint/typescript-estree": "=8.43.0",
|
|
26
26
|
"patch-package": "^8.0.0",
|
|
27
|
-
"typescript": "^5.
|
|
27
|
+
"typescript": "^5.8.3",
|
|
28
28
|
"zod": "=3.25.76",
|
|
29
|
-
"@bubblelab/
|
|
30
|
-
"@bubblelab/shared-schemas": "0.1.
|
|
31
|
-
"@bubblelab/
|
|
29
|
+
"@bubblelab/bubble-core": "0.1.10",
|
|
30
|
+
"@bubblelab/shared-schemas": "0.1.10",
|
|
31
|
+
"@bubblelab/ts-scope-manager": "0.1.10"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
34
|
"@types/bun": "^1.2.21",
|