Skip to content

Commit 6f59a04

Browse files
taeoldtaeold
committed
style: format code with prettier
1 parent 6fe0fd8 commit 6f59a04

File tree

2 files changed

+110
-37
lines changed

2 files changed

+110
-37
lines changed

‎src/functions/env.spec.ts

Lines changed: 105 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -310,19 +310,33 @@ FOO=foo
310310
it("never affects the filesystem if the list of keys to write is empty", () => {
311311
env.writeUserEnvs(
312312
{},
313-
{ projectId: "project", projectAlias: "alias", functionsSource: tmpdir, codebase: "default" },
313+
{
314+
projectId: "project",
315+
projectAlias: "alias",
316+
functionsSource: tmpdir,
317+
codebase: "default",
318+
},
314319
);
315320
env.writeUserEnvs(
316321
{},
317-
{ projectId: "project", projectAlias: "alias", functionsSource: tmpdir, isEmulator: true, codebase: "default" },
322+
{
323+
projectId: "project",
324+
projectAlias: "alias",
325+
functionsSource: tmpdir,
326+
isEmulator: true,
327+
codebase: "default",
328+
},
318329
);
319330
expect(() => fs.statSync(path.join(tmpdir, ".env.alias"))).to.throw;
320331
expect(() => fs.statSync(path.join(tmpdir, ".env.project"))).to.throw;
321332
expect(() => fs.statSync(path.join(tmpdir, ".env.local"))).to.throw;
322333
});
323334

324335
it("touches .env.projectId if it doesn't already exist", () => {
325-
env.writeUserEnvs({ FOO: "bar" }, { projectId: "project", functionsSource: tmpdir, codebase: "default" });
336+
env.writeUserEnvs(
337+
{ FOO: "bar" },
338+
{ projectId: "project", functionsSource: tmpdir, codebase: "default" },
339+
);
326340
expect(() => fs.statSync(path.join(tmpdir, ".env.alias"))).to.throw;
327341
expect(!!fs.statSync(path.join(tmpdir, ".env.project"))).to.be.true;
328342
expect(() => fs.statSync(path.join(tmpdir, ".env.local"))).to.throw;
@@ -343,7 +357,10 @@ FOO=foo
343357
[".env.project"]: "FOO=foo",
344358
});
345359
expect(() =>
346-
env.writeUserEnvs({ FOO: "bar" }, { projectId: "project", functionsSource: tmpdir, codebase: "default" }),
360+
env.writeUserEnvs(
361+
{ FOO: "bar" },
362+
{ projectId: "project", functionsSource: tmpdir, codebase: "default" },
363+
),
347364
).to.throw(FirebaseError);
348365
});
349366

@@ -373,7 +390,12 @@ FOO=foo
373390
expect(() =>
374391
env.writeUserEnvs(
375392
{ FOO: "baz" },
376-
{ projectId: "project", projectAlias: "alias", functionsSource: tmpdir, codebase: "default" },
393+
{
394+
projectId: "project",
395+
projectAlias: "alias",
396+
functionsSource: tmpdir,
397+
codebase: "default",
398+
},
377399
),
378400
).to.throw(FirebaseError);
379401
});
@@ -384,7 +406,13 @@ FOO=foo
384406
});
385407
env.writeUserEnvs(
386408
{ FOO: "baz" },
387-
{ projectId: "project", projectAlias: "alias", functionsSource: tmpdir, isEmulator: true, codebase: "default" },
409+
{
410+
projectId: "project",
411+
projectAlias: "alias",
412+
functionsSource: tmpdir,
413+
isEmulator: true,
414+
codebase: "default",
415+
},
388416
);
389417
expect(
390418
env.loadUserEnvs({
@@ -413,32 +441,55 @@ FOO=foo
413441
expect(() =>
414442
env.writeUserEnvs(
415443
{ lowercase: "bar" },
416-
{ projectId: "project", projectAlias: "alias", functionsSource: tmpdir, codebase: "default" },
444+
{
445+
projectId: "project",
446+
projectAlias: "alias",
447+
functionsSource: tmpdir,
448+
codebase: "default",
449+
},
417450
),
418451
).to.throw(env.KeyValidationError);
419452
expect(() =>
420453
env.writeUserEnvs(
421454
{ GCP_PROJECT: "bar" },
422-
{ projectId: "project", projectAlias: "alias", functionsSource: tmpdir, codebase: "default" },
455+
{
456+
projectId: "project",
457+
projectAlias: "alias",
458+
functionsSource: tmpdir,
459+
codebase: "default",
460+
},
423461
),
424462
).to.throw(env.KeyValidationError);
425463
expect(() =>
426464
env.writeUserEnvs(
427465
{ FIREBASE_KEY: "bar" },
428-
{ projectId: "project", projectAlias: "alias", functionsSource: tmpdir, codebase: "default" },
466+
{
467+
projectId: "project",
468+
projectAlias: "alias",
469+
functionsSource: tmpdir,
470+
codebase: "default",
471+
},
429472
),
430473
).to.throw(env.KeyValidationError);
431474
});
432475

433476
it("writes the specified key to a .env.projectId that it created", () => {
434477
env.writeUserEnvs(
435478
{ FOO: "bar" },
436-
{ projectId: "project", projectAlias: "alias", functionsSource: tmpdir, codebase: "default" },
479+
{
480+
projectId: "project",
481+
projectAlias: "alias",
482+
functionsSource: tmpdir,
483+
codebase: "default",
484+
},
437485
);
438486
expect(
439-
env.loadUserEnvs({ projectId: "project", projectAlias: "alias", functionsSource: tmpdir, codebase: "default" })[
440-
"FOO"
441-
],
487+
env.loadUserEnvs({
488+
projectId: "project",
489+
projectAlias: "alias",
490+
functionsSource: tmpdir,
491+
codebase: "default",
492+
})["FOO"],
442493
).to.equal("bar");
443494
});
444495

@@ -448,19 +499,32 @@ FOO=foo
448499
});
449500
env.writeUserEnvs(
450501
{ FOO: "bar" },
451-
{ projectId: "project", projectAlias: "alias", functionsSource: tmpdir, codebase: "default" },
502+
{
503+
projectId: "project",
504+
projectAlias: "alias",
505+
functionsSource: tmpdir,
506+
codebase: "default",
507+
},
452508
);
453509
expect(
454-
env.loadUserEnvs({ projectId: "project", projectAlias: "alias", functionsSource: tmpdir, codebase: "default" })[
455-
"FOO"
456-
],
510+
env.loadUserEnvs({
511+
projectId: "project",
512+
projectAlias: "alias",
513+
functionsSource: tmpdir,
514+
codebase: "default",
515+
})["FOO"],
457516
).to.equal("bar");
458517
});
459518

460519
it("writes multiple keys at once", () => {
461520
env.writeUserEnvs(
462521
{ FOO: "foo", BAR: "bar" },
463-
{ projectId: "project", projectAlias: "alias", functionsSource: tmpdir, codebase: "default" },
522+
{
523+
projectId: "project",
524+
projectAlias: "alias",
525+
functionsSource: tmpdir,
526+
codebase: "default",
527+
},
464528
);
465529
const envs = env.loadUserEnvs({
466530
projectId: "project",
@@ -479,7 +543,12 @@ FOO=foo
479543
WITH_SLASHES: "\n\\\r\\\t\\\v",
480544
QUOTES: "'\"'",
481545
},
482-
{ projectId: "project", projectAlias: "alias", functionsSource: tmpdir, codebase: "default" },
546+
{
547+
projectId: "project",
548+
projectAlias: "alias",
549+
functionsSource: tmpdir,
550+
codebase: "default",
551+
},
483552
);
484553
const envs = env.loadUserEnvs({
485554
projectId: "project",
@@ -501,8 +570,11 @@ FOO=foo
501570
} catch (err: any) {
502571
// no-op
503572
}
504-
expect(env.loadUserEnvs({ projectId: "project", functionsSource: tmpdir, codebase: "default" })["FOO"]).to.be
505-
.undefined;
573+
expect(
574+
env.loadUserEnvs({ projectId: "project", functionsSource: tmpdir, codebase: "default" })[
575+
"FOO"
576+
],
577+
).to.be.undefined;
506578
});
507579
});
508580

@@ -721,9 +793,9 @@ FOO=foo
721793
});
722794

723795
expect(env.loadUserEnvs({ ...projectInfo, functionsSource: tmpdir })).to.be.deep.equal({
724-
FOO: "project", // project overrides codebase
725-
BAR: "codebase", // codebase overrides global
726-
BAZ: "global", // only defined in global
796+
FOO: "project", // project overrides codebase
797+
BAR: "codebase", // codebase overrides global
798+
BAZ: "global", // only defined in global
727799
});
728800
});
729801

@@ -735,9 +807,9 @@ FOO=foo
735807
});
736808

737809
expect(env.loadUserEnvs({ ...projectInfo, functionsSource: tmpdir })).to.be.deep.equal({
738-
FOO: "alias", // alias overrides codebase
739-
BAR: "codebase", // codebase overrides global
740-
BAZ: "global", // only defined in global
810+
FOO: "alias", // alias overrides codebase
811+
BAR: "codebase", // codebase overrides global
812+
BAZ: "global", // only defined in global
741813
});
742814
});
743815

@@ -748,7 +820,9 @@ FOO=foo
748820
".env.profile-pics-resizer": "FOO=custom-codebase\nCUSTOM=value",
749821
});
750822

751-
expect(env.loadUserEnvs({ ...customProjectInfo, functionsSource: tmpdir })).to.be.deep.equal({
823+
expect(
824+
env.loadUserEnvs({ ...customProjectInfo, functionsSource: tmpdir }),
825+
).to.be.deep.equal({
752826
FOO: "custom-codebase",
753827
CUSTOM: "value",
754828
});
@@ -765,12 +839,11 @@ FOO=foo
765839
expect(
766840
env.loadUserEnvs({ ...projectInfo, functionsSource: tmpdir, isEmulator: true }),
767841
).to.be.deep.equal({
768-
FOO: "local", // .env.local has highest precedence in emulator
769-
BAR: "codebase", // codebase overrides global
770-
BAZ: "global", // only defined in global
842+
FOO: "local", // .env.local has highest precedence in emulator
843+
BAR: "codebase", // codebase overrides global
844+
BAZ: "global", // only defined in global
771845
});
772846
});
773-
774847
});
775848
});
776849

‎src/functions/projectConfig.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ export function validatePrefix(prefix: string): void {
4444
if (prefix.length > 30) {
4545
throw new FirebaseError("Invalid prefix. Prefix must be 30 characters or less.");
4646
}
47-
if (!/^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/.test(prefix)) {
48-
throw new FirebaseError(
49-
"Invalid prefix. Prefix can contain only lowercase letters, numeric characters, and dashes, and cannot start or end with a dash.",
50-
);
51-
}
47+
if (!/^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/.test(prefix)) {
48+
throw new FirebaseError(
49+
"Invalid prefix. Prefix can contain only lowercase letters, numeric characters, and dashes, and cannot start or end with a dash.",
50+
);
51+
}
5252
}
5353

5454
function validateSingle(config: FunctionConfig): ValidatedSingle {

0 commit comments

Comments
 (0)