wrangler 2.1.4 → 2.1.6
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/miniflare-dist/index.mjs +4 -1
- package/package.json +1 -1
- package/src/__tests__/api-dev.test.ts +3 -3
- package/src/__tests__/api-devregistry.test.js +56 -0
- package/src/__tests__/configuration.test.ts +3 -0
- package/src/__tests__/dev.test.tsx +39 -1
- package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +1 -0
- package/src/__tests__/helpers/{hello-world-worker.js → worker-scripts/hello-world-worker.js} +0 -0
- package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +1 -0
- package/src/__tests__/helpers/worker-scripts/parent-worker.js +8 -0
- package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +5 -0
- package/src/__tests__/init.test.ts +72 -0
- package/src/__tests__/middleware.scheduled.test.ts +135 -0
- package/src/__tests__/middleware.test.ts +703 -745
- package/src/__tests__/pages.test.ts +35 -40
- package/src/__tests__/publish.test.ts +57 -1
- package/src/api/dev.ts +2 -0
- package/src/bundle.ts +14 -16
- package/src/config/config.ts +12 -0
- package/src/config/validation.ts +9 -0
- package/src/create-worker-upload-form.ts +3 -2
- package/src/dev/dev.tsx +12 -21
- package/src/dev/local.tsx +1 -0
- package/src/dev/remote.tsx +38 -50
- package/src/dev/start-server.ts +43 -8
- package/src/dev/use-esbuild.ts +4 -0
- package/src/dev-registry.tsx +30 -0
- package/src/dev.tsx +21 -3
- package/src/index.tsx +8 -1
- package/src/init.ts +3 -1
- package/src/inspect.ts +26 -26
- package/src/miniflare-cli/assets.ts +8 -1
- package/src/pages/constants.ts +2 -1
- package/src/pages/dev.tsx +133 -10
- package/src/pages/errors.ts +48 -4
- package/src/pages/functions/routes-transformation.ts +1 -14
- package/src/pages/functions/routes-validation.test.ts +403 -0
- package/src/pages/functions/routes-validation.ts +202 -0
- package/src/pages/functions.tsx +4 -18
- package/src/pages/publish.tsx +6 -22
- package/src/publish.ts +3 -1
- package/src/worker.ts +1 -1
- package/templates/middleware/middleware-scheduled.ts +2 -1
- package/templates/pages-dev-pipeline.ts +35 -0
- package/wrangler-dist/cli.d.ts +2 -0
- package/wrangler-dist/cli.js +611 -353
package/src/pages/errors.ts
CHANGED
|
@@ -1,3 +1,15 @@
|
|
|
1
|
+
import {
|
|
2
|
+
MAX_FUNCTIONS_ROUTES_RULES,
|
|
3
|
+
MAX_FUNCTIONS_ROUTES_RULE_LENGTH,
|
|
4
|
+
ROUTES_SPEC_VERSION,
|
|
5
|
+
} from "./constants";
|
|
6
|
+
import { RoutesValidationError } from "./functions/routes-validation";
|
|
7
|
+
|
|
8
|
+
/**
|
|
9
|
+
* Exit code for `pages functions build` when no routes are found.
|
|
10
|
+
*/
|
|
11
|
+
export const EXIT_CODE_FUNCTIONS_NO_ROUTES_ERROR = 156;
|
|
12
|
+
|
|
1
13
|
/**
|
|
2
14
|
* Pages error when no routes are found in the functions directory
|
|
3
15
|
*/
|
|
@@ -6,12 +18,10 @@ export class FunctionsNoRoutesError extends Error {
|
|
|
6
18
|
super(message);
|
|
7
19
|
}
|
|
8
20
|
}
|
|
21
|
+
|
|
9
22
|
/**
|
|
10
|
-
*
|
|
23
|
+
* Warning message for when buildFunctions throws FunctionsNoRoutesError
|
|
11
24
|
*/
|
|
12
|
-
export const EXIT_CODE_FUNCTIONS_NO_ROUTES_ERROR = 156;
|
|
13
|
-
|
|
14
|
-
/** Warning message for when buildFunctions throws FunctionsNoRoutesError */
|
|
15
25
|
export function getFunctionsNoRoutesWarning(
|
|
16
26
|
functionsDirectory: string,
|
|
17
27
|
suffix?: string
|
|
@@ -20,3 +30,37 @@ export function getFunctionsNoRoutesWarning(
|
|
|
20
30
|
suffix ? " - " + suffix : ""
|
|
21
31
|
}`;
|
|
22
32
|
}
|
|
33
|
+
|
|
34
|
+
export function getRoutesValidationErrorMessage(
|
|
35
|
+
errorCode: RoutesValidationError,
|
|
36
|
+
routesPath: string
|
|
37
|
+
): string {
|
|
38
|
+
switch (errorCode) {
|
|
39
|
+
case RoutesValidationError.NO_INCLUDE_RULES:
|
|
40
|
+
return `Invalid _routes.json file found at: ${routesPath}
|
|
41
|
+
Routes must have at least 1 include rule, but no include rules were detected.`;
|
|
42
|
+
case RoutesValidationError.TOO_MANY_RULES:
|
|
43
|
+
return `Invalid _routes.json file found at: ${routesPath}
|
|
44
|
+
Detected rules that are over the ${MAX_FUNCTIONS_ROUTES_RULES} rule limit. Please make sure you have a total of ${MAX_FUNCTIONS_ROUTES_RULES} include and exclude rules combined.`;
|
|
45
|
+
case RoutesValidationError.RULE_TOO_LONG:
|
|
46
|
+
return `Invalid _routes.json file found at: ${routesPath}
|
|
47
|
+
Detected rules the are over the ${MAX_FUNCTIONS_ROUTES_RULE_LENGTH} character limit. Please make sure that each include and exclude routing rule is at most ${MAX_FUNCTIONS_ROUTES_RULE_LENGTH} characters long.`;
|
|
48
|
+
case RoutesValidationError.INVALID_RULES:
|
|
49
|
+
return `Invalid _routes.json file found at: ${routesPath}
|
|
50
|
+
All rules must start with '/'.`;
|
|
51
|
+
case RoutesValidationError.OVERLAPPING_RULES:
|
|
52
|
+
return `Invalid _routes.json file found at: ${routesPath}
|
|
53
|
+
Overlapping rules found. Please make sure that rules ending with a splat (eg. "/api/*") don't overlap any other rules (eg. "/api/foo"). This applies to both include and exclude rules individually.`;
|
|
54
|
+
case RoutesValidationError.INVALID_JSON_SPEC:
|
|
55
|
+
default:
|
|
56
|
+
return `Invalid _routes.json file found at: ${routesPath}
|
|
57
|
+
Please make sure the JSON object has the following format:
|
|
58
|
+
{
|
|
59
|
+
version: ${ROUTES_SPEC_VERSION};
|
|
60
|
+
include: string[];
|
|
61
|
+
exclude: string[];
|
|
62
|
+
}
|
|
63
|
+
and that at least one include rule is provided.
|
|
64
|
+
`;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
@@ -9,7 +9,7 @@ import { consolidateRoutes } from "./routes-consolidation";
|
|
|
9
9
|
import type { RouteConfig } from "./routes";
|
|
10
10
|
|
|
11
11
|
/** Interface for _routes.json */
|
|
12
|
-
interface RoutesJSONSpec {
|
|
12
|
+
export interface RoutesJSONSpec {
|
|
13
13
|
version: typeof ROUTES_SPEC_VERSION;
|
|
14
14
|
description?: string;
|
|
15
15
|
include: string[];
|
|
@@ -113,16 +113,3 @@ export function compareRoutes(routeA: string, routeB: string) {
|
|
|
113
113
|
// all else equal, just sort the paths lexicographically
|
|
114
114
|
return routeA.localeCompare(routeB);
|
|
115
115
|
}
|
|
116
|
-
|
|
117
|
-
export function isRoutesJSONSpec(data: unknown): data is RoutesJSONSpec {
|
|
118
|
-
return (
|
|
119
|
-
(typeof data === "object" &&
|
|
120
|
-
data &&
|
|
121
|
-
"version" in data &&
|
|
122
|
-
typeof (data as RoutesJSONSpec).version === "number" &&
|
|
123
|
-
(data as RoutesJSONSpec).version === ROUTES_SPEC_VERSION &&
|
|
124
|
-
Array.isArray((data as RoutesJSONSpec).include) &&
|
|
125
|
-
Array.isArray((data as RoutesJSONSpec).exclude)) ||
|
|
126
|
-
false
|
|
127
|
-
);
|
|
128
|
-
}
|
|
@@ -0,0 +1,403 @@
|
|
|
1
|
+
import { FatalError } from "../../errors";
|
|
2
|
+
import {
|
|
3
|
+
MAX_FUNCTIONS_ROUTES_RULES,
|
|
4
|
+
MAX_FUNCTIONS_ROUTES_RULE_LENGTH,
|
|
5
|
+
ROUTES_SPEC_VERSION,
|
|
6
|
+
} from "../constants";
|
|
7
|
+
import { getRoutesValidationErrorMessage } from "../errors";
|
|
8
|
+
import {
|
|
9
|
+
isRoutesJSONSpec,
|
|
10
|
+
RoutesValidationError,
|
|
11
|
+
validateRoutes,
|
|
12
|
+
} from "./routes-validation";
|
|
13
|
+
import type { RoutesJSONSpec } from "./routes-transformation";
|
|
14
|
+
|
|
15
|
+
describe("routes-validation", () => {
|
|
16
|
+
describe("isRoutesJSONSpec", () => {
|
|
17
|
+
it("should return true if the given routes are in a valid RoutesJSONSpec format", () => {
|
|
18
|
+
const routes = {
|
|
19
|
+
version: ROUTES_SPEC_VERSION,
|
|
20
|
+
description: "Test routes Object",
|
|
21
|
+
include: [],
|
|
22
|
+
exclude: [],
|
|
23
|
+
};
|
|
24
|
+
const routesWithoutDescription = {
|
|
25
|
+
version: ROUTES_SPEC_VERSION,
|
|
26
|
+
include: [],
|
|
27
|
+
exclude: [],
|
|
28
|
+
};
|
|
29
|
+
|
|
30
|
+
expect(isRoutesJSONSpec(routes)).toBeTruthy();
|
|
31
|
+
expect(isRoutesJSONSpec(routesWithoutDescription)).toBeTruthy();
|
|
32
|
+
});
|
|
33
|
+
|
|
34
|
+
it("should return false otherwise", () => {
|
|
35
|
+
const routesWithMissingVersion = {
|
|
36
|
+
include: [],
|
|
37
|
+
exclude: [],
|
|
38
|
+
};
|
|
39
|
+
const routesWithIncorrectVersionNumber = {
|
|
40
|
+
version: 1000,
|
|
41
|
+
include: [],
|
|
42
|
+
exclude: [],
|
|
43
|
+
};
|
|
44
|
+
const routesWithIncorrectVersionType = {
|
|
45
|
+
version: "1000",
|
|
46
|
+
include: [],
|
|
47
|
+
exclude: [],
|
|
48
|
+
};
|
|
49
|
+
const routesWithMissingInclude = {
|
|
50
|
+
version: ROUTES_SPEC_VERSION,
|
|
51
|
+
exclude: [],
|
|
52
|
+
};
|
|
53
|
+
const routesWithMissingExclude = {
|
|
54
|
+
version: ROUTES_SPEC_VERSION,
|
|
55
|
+
include: [],
|
|
56
|
+
};
|
|
57
|
+
const routesWithIncorrectIncludeType = {
|
|
58
|
+
version: ROUTES_SPEC_VERSION,
|
|
59
|
+
include: "[]",
|
|
60
|
+
exclude: [],
|
|
61
|
+
};
|
|
62
|
+
const routesWithIncorrectExcludeType = {
|
|
63
|
+
version: ROUTES_SPEC_VERSION,
|
|
64
|
+
include: [],
|
|
65
|
+
exclude: { route: "/hello" },
|
|
66
|
+
};
|
|
67
|
+
|
|
68
|
+
expect(isRoutesJSONSpec(null)).toBeFalsy();
|
|
69
|
+
expect(isRoutesJSONSpec({})).toBeFalsy();
|
|
70
|
+
expect(isRoutesJSONSpec([])).toBeFalsy();
|
|
71
|
+
expect(isRoutesJSONSpec(routesWithMissingVersion)).toBeFalsy();
|
|
72
|
+
expect(isRoutesJSONSpec(routesWithIncorrectVersionNumber)).toBeFalsy();
|
|
73
|
+
expect(isRoutesJSONSpec(routesWithIncorrectVersionType)).toBeFalsy();
|
|
74
|
+
expect(isRoutesJSONSpec(routesWithMissingInclude)).toBeFalsy();
|
|
75
|
+
expect(isRoutesJSONSpec(routesWithMissingExclude)).toBeFalsy();
|
|
76
|
+
expect(isRoutesJSONSpec(routesWithIncorrectIncludeType)).toBeFalsy();
|
|
77
|
+
expect(isRoutesJSONSpec(routesWithIncorrectExcludeType)).toBeFalsy();
|
|
78
|
+
});
|
|
79
|
+
});
|
|
80
|
+
|
|
81
|
+
describe("validateRoutes", () => {
|
|
82
|
+
const testRoutesPath = "/public";
|
|
83
|
+
|
|
84
|
+
const generateUniqueRoutingRules = (count: number): string[] => {
|
|
85
|
+
let counter = 0;
|
|
86
|
+
return Array(count)
|
|
87
|
+
.fill("/abc")
|
|
88
|
+
.map((route) => `${route}${counter++}`);
|
|
89
|
+
};
|
|
90
|
+
|
|
91
|
+
const generateRoutingRule = (charCount: number): string => {
|
|
92
|
+
return `/${Array(charCount).fill("a").join("")}`;
|
|
93
|
+
};
|
|
94
|
+
|
|
95
|
+
it("should return if the given routes are valid", () => {
|
|
96
|
+
const routes: RoutesJSONSpec = {
|
|
97
|
+
version: ROUTES_SPEC_VERSION,
|
|
98
|
+
description: "Test routes Object",
|
|
99
|
+
include: ["/*"],
|
|
100
|
+
exclude: [],
|
|
101
|
+
};
|
|
102
|
+
const routesWithoutDescription: RoutesJSONSpec = {
|
|
103
|
+
version: ROUTES_SPEC_VERSION,
|
|
104
|
+
include: ["/hello"],
|
|
105
|
+
exclude: [],
|
|
106
|
+
};
|
|
107
|
+
|
|
108
|
+
expect(() => validateRoutes(routes, testRoutesPath)).not.toThrow();
|
|
109
|
+
expect(() =>
|
|
110
|
+
validateRoutes(routesWithoutDescription, testRoutesPath)
|
|
111
|
+
).not.toThrow();
|
|
112
|
+
});
|
|
113
|
+
|
|
114
|
+
it("should throw a fatal error if the routes are not a valid RoutesJSONSpec object", () => {
|
|
115
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
116
|
+
// @ts-ignore: sanity check
|
|
117
|
+
const routesWithoutVersion: RoutesJSONSpec = {
|
|
118
|
+
include: ["/*"],
|
|
119
|
+
exclude: [],
|
|
120
|
+
};
|
|
121
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
122
|
+
// @ts-ignore: sanity check
|
|
123
|
+
const routesWithoutInclude: RoutesJSONSpec = {
|
|
124
|
+
version: ROUTES_SPEC_VERSION,
|
|
125
|
+
exclude: [],
|
|
126
|
+
};
|
|
127
|
+
|
|
128
|
+
expect(() =>
|
|
129
|
+
// wrap the code in a function, otherwise the error will not be caught
|
|
130
|
+
// and the assertion will fail
|
|
131
|
+
validateRoutes(routesWithoutVersion, testRoutesPath)
|
|
132
|
+
).toThrow(FatalError);
|
|
133
|
+
expect(() =>
|
|
134
|
+
validateRoutes(routesWithoutVersion, testRoutesPath)
|
|
135
|
+
).toThrow(
|
|
136
|
+
getRoutesValidationErrorMessage(
|
|
137
|
+
RoutesValidationError.INVALID_JSON_SPEC,
|
|
138
|
+
testRoutesPath
|
|
139
|
+
)
|
|
140
|
+
);
|
|
141
|
+
|
|
142
|
+
expect(() =>
|
|
143
|
+
validateRoutes(routesWithoutInclude, testRoutesPath)
|
|
144
|
+
).toThrow(FatalError);
|
|
145
|
+
expect(() =>
|
|
146
|
+
validateRoutes(routesWithoutInclude, testRoutesPath)
|
|
147
|
+
).toThrow(
|
|
148
|
+
getRoutesValidationErrorMessage(
|
|
149
|
+
RoutesValidationError.INVALID_JSON_SPEC,
|
|
150
|
+
testRoutesPath
|
|
151
|
+
)
|
|
152
|
+
);
|
|
153
|
+
});
|
|
154
|
+
|
|
155
|
+
it("should throw a fatal error if there are no include routing rules", () => {
|
|
156
|
+
const routesWithoutIncludeRules: RoutesJSONSpec = {
|
|
157
|
+
version: ROUTES_SPEC_VERSION,
|
|
158
|
+
description: "Test routes Object",
|
|
159
|
+
include: [],
|
|
160
|
+
exclude: [],
|
|
161
|
+
};
|
|
162
|
+
|
|
163
|
+
expect(() =>
|
|
164
|
+
validateRoutes(routesWithoutIncludeRules, testRoutesPath)
|
|
165
|
+
).toThrow(FatalError);
|
|
166
|
+
expect(() =>
|
|
167
|
+
validateRoutes(routesWithoutIncludeRules, testRoutesPath)
|
|
168
|
+
).toThrow(
|
|
169
|
+
getRoutesValidationErrorMessage(
|
|
170
|
+
RoutesValidationError.NO_INCLUDE_RULES,
|
|
171
|
+
testRoutesPath
|
|
172
|
+
)
|
|
173
|
+
);
|
|
174
|
+
});
|
|
175
|
+
|
|
176
|
+
it("should throw a fatal error if there are more than MAX_FUNCTIONS_ROUTES_RULES include and exclude routing rules combined", () => {
|
|
177
|
+
const routesWithMaxIncludeRules: RoutesJSONSpec = {
|
|
178
|
+
version: ROUTES_SPEC_VERSION,
|
|
179
|
+
description: "Test routes Object",
|
|
180
|
+
include: generateUniqueRoutingRules(MAX_FUNCTIONS_ROUTES_RULES + 1),
|
|
181
|
+
exclude: [],
|
|
182
|
+
};
|
|
183
|
+
const routesWithMaxExcludeRules: RoutesJSONSpec = {
|
|
184
|
+
version: ROUTES_SPEC_VERSION,
|
|
185
|
+
description: "Test routes Object",
|
|
186
|
+
include: ["/hello"],
|
|
187
|
+
exclude: generateUniqueRoutingRules(MAX_FUNCTIONS_ROUTES_RULES + 1),
|
|
188
|
+
};
|
|
189
|
+
const routesWithMaxIncludeExcludeRulesCombined: RoutesJSONSpec = {
|
|
190
|
+
version: ROUTES_SPEC_VERSION,
|
|
191
|
+
description: "Test routes Object",
|
|
192
|
+
include: generateUniqueRoutingRules(
|
|
193
|
+
Math.floor(MAX_FUNCTIONS_ROUTES_RULES / 2) + 1
|
|
194
|
+
),
|
|
195
|
+
exclude: generateUniqueRoutingRules(
|
|
196
|
+
Math.floor(MAX_FUNCTIONS_ROUTES_RULES / 2)
|
|
197
|
+
),
|
|
198
|
+
};
|
|
199
|
+
|
|
200
|
+
expect(() =>
|
|
201
|
+
validateRoutes(routesWithMaxIncludeRules, testRoutesPath)
|
|
202
|
+
).toThrow(FatalError);
|
|
203
|
+
expect(() =>
|
|
204
|
+
validateRoutes(routesWithMaxIncludeRules, testRoutesPath)
|
|
205
|
+
).toThrow(
|
|
206
|
+
getRoutesValidationErrorMessage(
|
|
207
|
+
RoutesValidationError.TOO_MANY_RULES,
|
|
208
|
+
testRoutesPath
|
|
209
|
+
)
|
|
210
|
+
);
|
|
211
|
+
|
|
212
|
+
expect(() =>
|
|
213
|
+
validateRoutes(routesWithMaxExcludeRules, testRoutesPath)
|
|
214
|
+
).toThrow(FatalError);
|
|
215
|
+
expect(() =>
|
|
216
|
+
validateRoutes(routesWithMaxExcludeRules, testRoutesPath)
|
|
217
|
+
).toThrow(
|
|
218
|
+
getRoutesValidationErrorMessage(
|
|
219
|
+
RoutesValidationError.TOO_MANY_RULES,
|
|
220
|
+
testRoutesPath
|
|
221
|
+
)
|
|
222
|
+
);
|
|
223
|
+
|
|
224
|
+
expect(() =>
|
|
225
|
+
validateRoutes(routesWithMaxIncludeExcludeRulesCombined, testRoutesPath)
|
|
226
|
+
).toThrow(FatalError);
|
|
227
|
+
expect(() =>
|
|
228
|
+
validateRoutes(routesWithMaxIncludeExcludeRulesCombined, testRoutesPath)
|
|
229
|
+
).toThrow(
|
|
230
|
+
getRoutesValidationErrorMessage(
|
|
231
|
+
RoutesValidationError.TOO_MANY_RULES,
|
|
232
|
+
testRoutesPath
|
|
233
|
+
)
|
|
234
|
+
);
|
|
235
|
+
});
|
|
236
|
+
|
|
237
|
+
it("should throw a fatal error if any include or exclude routing rule is more than MAX_FUNCTIONS_ROUTES_RULE_LENGTH chars long", () => {
|
|
238
|
+
const routesWithMaxCharLengthIncludeRules: RoutesJSONSpec = {
|
|
239
|
+
version: ROUTES_SPEC_VERSION,
|
|
240
|
+
description: "Test routes Object",
|
|
241
|
+
include: [generateRoutingRule(MAX_FUNCTIONS_ROUTES_RULE_LENGTH + 1)],
|
|
242
|
+
exclude: [],
|
|
243
|
+
};
|
|
244
|
+
const routesWithMaxCharLengthExcludeRules: RoutesJSONSpec = {
|
|
245
|
+
version: ROUTES_SPEC_VERSION,
|
|
246
|
+
description: "Test routes Object",
|
|
247
|
+
include: ["/*"],
|
|
248
|
+
exclude: [generateRoutingRule(MAX_FUNCTIONS_ROUTES_RULE_LENGTH + 1)],
|
|
249
|
+
};
|
|
250
|
+
const routesWithMaxCharLengthRules: RoutesJSONSpec = {
|
|
251
|
+
version: ROUTES_SPEC_VERSION,
|
|
252
|
+
description: "Test routes Object",
|
|
253
|
+
include: [generateRoutingRule(MAX_FUNCTIONS_ROUTES_RULE_LENGTH + 1)],
|
|
254
|
+
exclude: [generateRoutingRule(MAX_FUNCTIONS_ROUTES_RULE_LENGTH + 1)],
|
|
255
|
+
};
|
|
256
|
+
|
|
257
|
+
expect(() =>
|
|
258
|
+
validateRoutes(routesWithMaxCharLengthIncludeRules, testRoutesPath)
|
|
259
|
+
).toThrow(FatalError);
|
|
260
|
+
expect(() =>
|
|
261
|
+
validateRoutes(routesWithMaxCharLengthIncludeRules, testRoutesPath)
|
|
262
|
+
).toThrow(
|
|
263
|
+
getRoutesValidationErrorMessage(
|
|
264
|
+
RoutesValidationError.RULE_TOO_LONG,
|
|
265
|
+
testRoutesPath
|
|
266
|
+
)
|
|
267
|
+
);
|
|
268
|
+
|
|
269
|
+
expect(() =>
|
|
270
|
+
validateRoutes(routesWithMaxCharLengthExcludeRules, testRoutesPath)
|
|
271
|
+
).toThrow(FatalError);
|
|
272
|
+
expect(() =>
|
|
273
|
+
validateRoutes(routesWithMaxCharLengthExcludeRules, testRoutesPath)
|
|
274
|
+
).toThrow(
|
|
275
|
+
getRoutesValidationErrorMessage(
|
|
276
|
+
RoutesValidationError.RULE_TOO_LONG,
|
|
277
|
+
testRoutesPath
|
|
278
|
+
)
|
|
279
|
+
);
|
|
280
|
+
|
|
281
|
+
expect(() =>
|
|
282
|
+
validateRoutes(routesWithMaxCharLengthRules, testRoutesPath)
|
|
283
|
+
).toThrow(FatalError);
|
|
284
|
+
expect(() =>
|
|
285
|
+
validateRoutes(routesWithMaxCharLengthRules, testRoutesPath)
|
|
286
|
+
).toThrow(
|
|
287
|
+
getRoutesValidationErrorMessage(
|
|
288
|
+
RoutesValidationError.RULE_TOO_LONG,
|
|
289
|
+
testRoutesPath
|
|
290
|
+
)
|
|
291
|
+
);
|
|
292
|
+
});
|
|
293
|
+
|
|
294
|
+
it("should throw a fatal error if any include or exclude routing rule does not start with a `/`", () => {
|
|
295
|
+
const routesWithInvalidIncludeRules: RoutesJSONSpec = {
|
|
296
|
+
version: ROUTES_SPEC_VERSION,
|
|
297
|
+
description: "Test routes Object",
|
|
298
|
+
include: ["hello"],
|
|
299
|
+
exclude: [],
|
|
300
|
+
};
|
|
301
|
+
const routesWithInvalidExcludeRules: RoutesJSONSpec = {
|
|
302
|
+
version: ROUTES_SPEC_VERSION,
|
|
303
|
+
description: "Test routes Object",
|
|
304
|
+
include: ["/*"],
|
|
305
|
+
exclude: ["hello"],
|
|
306
|
+
};
|
|
307
|
+
const routesWithInvalidRules: RoutesJSONSpec = {
|
|
308
|
+
version: ROUTES_SPEC_VERSION,
|
|
309
|
+
description: "Test routes Object",
|
|
310
|
+
include: ["hello"],
|
|
311
|
+
exclude: ["goodbye"],
|
|
312
|
+
};
|
|
313
|
+
|
|
314
|
+
expect(() =>
|
|
315
|
+
validateRoutes(routesWithInvalidIncludeRules, testRoutesPath)
|
|
316
|
+
).toThrow(FatalError);
|
|
317
|
+
expect(() =>
|
|
318
|
+
validateRoutes(routesWithInvalidIncludeRules, testRoutesPath)
|
|
319
|
+
).toThrow(
|
|
320
|
+
getRoutesValidationErrorMessage(
|
|
321
|
+
RoutesValidationError.INVALID_RULES,
|
|
322
|
+
testRoutesPath
|
|
323
|
+
)
|
|
324
|
+
);
|
|
325
|
+
|
|
326
|
+
expect(() =>
|
|
327
|
+
validateRoutes(routesWithInvalidExcludeRules, testRoutesPath)
|
|
328
|
+
).toThrow(FatalError);
|
|
329
|
+
expect(() =>
|
|
330
|
+
validateRoutes(routesWithInvalidExcludeRules, testRoutesPath)
|
|
331
|
+
).toThrow(
|
|
332
|
+
getRoutesValidationErrorMessage(
|
|
333
|
+
RoutesValidationError.INVALID_RULES,
|
|
334
|
+
testRoutesPath
|
|
335
|
+
)
|
|
336
|
+
);
|
|
337
|
+
|
|
338
|
+
expect(() =>
|
|
339
|
+
validateRoutes(routesWithInvalidRules, testRoutesPath)
|
|
340
|
+
).toThrow(FatalError);
|
|
341
|
+
expect(() =>
|
|
342
|
+
validateRoutes(routesWithInvalidRules, testRoutesPath)
|
|
343
|
+
).toThrow(
|
|
344
|
+
getRoutesValidationErrorMessage(
|
|
345
|
+
RoutesValidationError.INVALID_RULES,
|
|
346
|
+
testRoutesPath
|
|
347
|
+
)
|
|
348
|
+
);
|
|
349
|
+
});
|
|
350
|
+
|
|
351
|
+
it("should throw a fatal error if there are overlapping include rules or overlapping exclude rules", () => {
|
|
352
|
+
const routesWithOverlappingIncludeRules: RoutesJSONSpec = {
|
|
353
|
+
version: ROUTES_SPEC_VERSION,
|
|
354
|
+
include: [
|
|
355
|
+
"/greeting/hello",
|
|
356
|
+
"/api/time",
|
|
357
|
+
"/date",
|
|
358
|
+
"/greeting/*",
|
|
359
|
+
"/greeting/goodbye",
|
|
360
|
+
"/api/*",
|
|
361
|
+
],
|
|
362
|
+
exclude: [],
|
|
363
|
+
};
|
|
364
|
+
const routesWithOverlappingExcludeRules: RoutesJSONSpec = {
|
|
365
|
+
version: ROUTES_SPEC_VERSION,
|
|
366
|
+
include: ["/hello"],
|
|
367
|
+
exclude: [
|
|
368
|
+
"/greeting/hello",
|
|
369
|
+
"/api/time",
|
|
370
|
+
"/date",
|
|
371
|
+
"/*",
|
|
372
|
+
"/greeting/*",
|
|
373
|
+
"/greeting/goodbye",
|
|
374
|
+
"/api/*",
|
|
375
|
+
],
|
|
376
|
+
};
|
|
377
|
+
|
|
378
|
+
expect(() =>
|
|
379
|
+
validateRoutes(routesWithOverlappingIncludeRules, testRoutesPath)
|
|
380
|
+
).toThrow(FatalError);
|
|
381
|
+
expect(() =>
|
|
382
|
+
validateRoutes(routesWithOverlappingIncludeRules, testRoutesPath)
|
|
383
|
+
).toThrow(
|
|
384
|
+
getRoutesValidationErrorMessage(
|
|
385
|
+
RoutesValidationError.OVERLAPPING_RULES,
|
|
386
|
+
testRoutesPath
|
|
387
|
+
)
|
|
388
|
+
);
|
|
389
|
+
|
|
390
|
+
expect(() =>
|
|
391
|
+
validateRoutes(routesWithOverlappingExcludeRules, testRoutesPath)
|
|
392
|
+
).toThrow(FatalError);
|
|
393
|
+
expect(() =>
|
|
394
|
+
validateRoutes(routesWithOverlappingExcludeRules, testRoutesPath)
|
|
395
|
+
).toThrow(
|
|
396
|
+
getRoutesValidationErrorMessage(
|
|
397
|
+
RoutesValidationError.OVERLAPPING_RULES,
|
|
398
|
+
testRoutesPath
|
|
399
|
+
)
|
|
400
|
+
);
|
|
401
|
+
});
|
|
402
|
+
});
|
|
403
|
+
});
|
|
@@ -0,0 +1,202 @@
|
|
|
1
|
+
import { FatalError } from "../../errors";
|
|
2
|
+
import {
|
|
3
|
+
MAX_FUNCTIONS_ROUTES_RULES,
|
|
4
|
+
MAX_FUNCTIONS_ROUTES_RULE_LENGTH,
|
|
5
|
+
ROUTES_SPEC_VERSION,
|
|
6
|
+
} from "../constants";
|
|
7
|
+
import { getRoutesValidationErrorMessage } from "../errors";
|
|
8
|
+
import type { RoutesJSONSpec } from "./routes-transformation";
|
|
9
|
+
|
|
10
|
+
/* eslint-disable-next-line no-shadow */
|
|
11
|
+
export enum RoutesValidationError {
|
|
12
|
+
INVALID_JSON_SPEC,
|
|
13
|
+
NO_INCLUDE_RULES,
|
|
14
|
+
INVALID_RULES,
|
|
15
|
+
TOO_MANY_RULES,
|
|
16
|
+
RULE_TOO_LONG,
|
|
17
|
+
OVERLAPPING_RULES,
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
/**
|
|
21
|
+
* Check if given routes data is a valid RoutesJSONSpec
|
|
22
|
+
*/
|
|
23
|
+
export function isRoutesJSONSpec(data: unknown): data is RoutesJSONSpec {
|
|
24
|
+
return (
|
|
25
|
+
(typeof data === "object" &&
|
|
26
|
+
data &&
|
|
27
|
+
"version" in data &&
|
|
28
|
+
typeof (data as RoutesJSONSpec).version === "number" &&
|
|
29
|
+
(data as RoutesJSONSpec).version === ROUTES_SPEC_VERSION &&
|
|
30
|
+
Array.isArray((data as RoutesJSONSpec).include) &&
|
|
31
|
+
Array.isArray((data as RoutesJSONSpec).exclude)) ||
|
|
32
|
+
false
|
|
33
|
+
);
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
export function validateRoutes(routesJSON: RoutesJSONSpec, routesPath: string) {
|
|
37
|
+
if (!isRoutesJSONSpec(routesJSON)) {
|
|
38
|
+
throw new FatalError(
|
|
39
|
+
getRoutesValidationErrorMessage(
|
|
40
|
+
RoutesValidationError.INVALID_JSON_SPEC,
|
|
41
|
+
routesPath
|
|
42
|
+
),
|
|
43
|
+
1
|
|
44
|
+
);
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
if (!hasIncludeRules(routesJSON)) {
|
|
48
|
+
throw new FatalError(
|
|
49
|
+
getRoutesValidationErrorMessage(
|
|
50
|
+
RoutesValidationError.NO_INCLUDE_RULES,
|
|
51
|
+
routesPath
|
|
52
|
+
),
|
|
53
|
+
1
|
|
54
|
+
);
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
if (!hasValidRulesCount(routesJSON)) {
|
|
58
|
+
throw new FatalError(
|
|
59
|
+
getRoutesValidationErrorMessage(
|
|
60
|
+
RoutesValidationError.TOO_MANY_RULES,
|
|
61
|
+
routesPath
|
|
62
|
+
),
|
|
63
|
+
1
|
|
64
|
+
);
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
if (!hasValidRuleCharCount(routesJSON)) {
|
|
68
|
+
throw new FatalError(
|
|
69
|
+
getRoutesValidationErrorMessage(
|
|
70
|
+
RoutesValidationError.RULE_TOO_LONG,
|
|
71
|
+
routesPath
|
|
72
|
+
),
|
|
73
|
+
1
|
|
74
|
+
);
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
if (!hasValidRules(routesJSON)) {
|
|
78
|
+
throw new FatalError(
|
|
79
|
+
getRoutesValidationErrorMessage(
|
|
80
|
+
RoutesValidationError.INVALID_RULES,
|
|
81
|
+
routesPath
|
|
82
|
+
),
|
|
83
|
+
1
|
|
84
|
+
);
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
if (
|
|
88
|
+
hasOverlappingRules(routesJSON.include) ||
|
|
89
|
+
hasOverlappingRules(routesJSON.exclude)
|
|
90
|
+
) {
|
|
91
|
+
throw new FatalError(
|
|
92
|
+
getRoutesValidationErrorMessage(
|
|
93
|
+
RoutesValidationError.OVERLAPPING_RULES,
|
|
94
|
+
routesPath
|
|
95
|
+
),
|
|
96
|
+
1
|
|
97
|
+
);
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
/**
|
|
102
|
+
* Returns true if the given `routingSpec` object contains at least
|
|
103
|
+
* `MIN_FUNCTIONS_ROUTES_INCLUDE_RULES` include routing rules
|
|
104
|
+
*/
|
|
105
|
+
function hasIncludeRules(routesJSON: RoutesJSONSpec): boolean {
|
|
106
|
+
// sanity check
|
|
107
|
+
// this should never be the case, because of the context from which these validation fns are
|
|
108
|
+
// called, but let's not assume anything
|
|
109
|
+
if (!routesJSON || !routesJSON.include) {
|
|
110
|
+
throw new Error(
|
|
111
|
+
"Function `hasIncludeRules` was called out of context. Attempting to validate include rules for routes that are undefined or an invalid RoutesJSONSpec"
|
|
112
|
+
);
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
return routesJSON?.include?.length > 0;
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
/**
|
|
119
|
+
* Returns true if the given `routesJSON` object contains at most MAX_FUNCTIONS_ROUTES_RULES
|
|
120
|
+
* include and exclude routing rules, combined
|
|
121
|
+
*/
|
|
122
|
+
function hasValidRulesCount(routesJSON: RoutesJSONSpec): boolean {
|
|
123
|
+
// sanity check
|
|
124
|
+
if (!routesJSON || !routesJSON.include || !routesJSON.exclude) {
|
|
125
|
+
throw new Error(
|
|
126
|
+
"Function `hasValidRulesCount` was called out of context. Attempting to validate maximum rules count for routes that are undefined or an invalid RoutesJSONSpec"
|
|
127
|
+
);
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
return (
|
|
131
|
+
routesJSON.include.length + routesJSON.exclude.length <=
|
|
132
|
+
MAX_FUNCTIONS_ROUTES_RULES
|
|
133
|
+
);
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
/**
|
|
137
|
+
* Returns true if each individual routing rule of the given `routesJSON` object is at most
|
|
138
|
+
* MAX_FUNCTIONS_ROUTES_RULE_LENGTH characters long
|
|
139
|
+
*/
|
|
140
|
+
function hasValidRuleCharCount(routesJSON: RoutesJSONSpec): boolean {
|
|
141
|
+
// sanity check
|
|
142
|
+
if (!routesJSON || !routesJSON.include || !routesJSON.exclude) {
|
|
143
|
+
throw new Error(
|
|
144
|
+
"Function `hasValidRuleCharCount` was called out of context. Attempting to validate rules maximum character count for routes that are undefined or an invalid RoutesJSONSpec"
|
|
145
|
+
);
|
|
146
|
+
}
|
|
147
|
+
|
|
148
|
+
const rules = [...routesJSON.include, ...routesJSON.exclude];
|
|
149
|
+
return (
|
|
150
|
+
rules.filter((rule) => rule.length > MAX_FUNCTIONS_ROUTES_RULE_LENGTH)
|
|
151
|
+
.length === 0
|
|
152
|
+
);
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
/**
|
|
156
|
+
* Returns true if each individual routing rule of the given `routesJSON` object is valid.
|
|
157
|
+
* We consider a rule to be valid if it is prefixed by slash ('/')
|
|
158
|
+
*/
|
|
159
|
+
function hasValidRules(routesJSON: RoutesJSONSpec): boolean {
|
|
160
|
+
// sanity check
|
|
161
|
+
if (!routesJSON || !routesJSON.include || !routesJSON.exclude) {
|
|
162
|
+
throw new Error(
|
|
163
|
+
"Function `hasValidRules` was called out of context. Attempting to validate rules for routes that are undefined or an invalid RoutesJSONSpec"
|
|
164
|
+
);
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
const rules = [...routesJSON.include, ...routesJSON.exclude];
|
|
168
|
+
return rules.filter((rule) => !rule.match(/^\//)).length === 0;
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
/**
|
|
172
|
+
* Returns true if the given routes array has overlapping routing rules (eg. ["/api/*"", "/api/foo"])
|
|
173
|
+
*
|
|
174
|
+
* based on `consolidateRoutes()`
|
|
175
|
+
* 🚨 O(n2) time complexity 🚨
|
|
176
|
+
*/
|
|
177
|
+
function hasOverlappingRules(routes: string[]): boolean {
|
|
178
|
+
if (!routes) {
|
|
179
|
+
throw new Error(
|
|
180
|
+
"Function `hasverlappingRules` was called out of context. Attempting to validate rules for routes that are undefined"
|
|
181
|
+
);
|
|
182
|
+
}
|
|
183
|
+
|
|
184
|
+
// Find routes that might render other routes redundant
|
|
185
|
+
const endingSplatRoutes = routes.filter((route) => route.endsWith("/*"));
|
|
186
|
+
|
|
187
|
+
for (let i = 0; i < endingSplatRoutes.length; i++) {
|
|
188
|
+
const crrRoute = endingSplatRoutes[i];
|
|
189
|
+
// Remove splat at the end, leaving the /
|
|
190
|
+
// eg. /api/* -> /api/
|
|
191
|
+
const crrRouteTrimmed = crrRoute.substring(0, crrRoute.length - 1);
|
|
192
|
+
|
|
193
|
+
for (let j = 0; j < routes.length; j++) {
|
|
194
|
+
const nextRoute = routes[j];
|
|
195
|
+
if (nextRoute !== crrRoute && nextRoute.startsWith(crrRouteTrimmed)) {
|
|
196
|
+
return true;
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
|
|
201
|
+
return false;
|
|
202
|
+
}
|