Skip to content

Commit abeac73

Browse files
Import externals shorter syntax
1 parent 16e720d commit abeac73

12 files changed

+30
-13
lines changed

src/parsing/import-specifiers.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,20 @@ export function Specifiers(
5757
}
5858

5959
export function FormatSpecifiers(specifiers: Specifiers, name: string): string {
60-
let formatted: string = 'import ';
60+
const hasDefault = specifiers.default !== null;
61+
const hasSpecifics = specifiers.specific.length > 0;
62+
let formatted: string = 'import';
6163
let values: Array<string> = [];
6264

63-
if (specifiers.default !== null) {
64-
values.push(specifiers.default);
65+
if (hasDefault) {
66+
values.push(`${specifiers.default}`);
6567
}
66-
if (specifiers.specific.length > 0) {
68+
if (hasSpecifics) {
6769
values.push(`{${specifiers.specific.join(',')}}`);
6870
}
69-
formatted += `${values.join(',')} from '${name}';`;
71+
formatted += `${hasDefault ? ' ' : ''}${values.join(',')}${
72+
hasSpecifics ? '' : ' '
73+
}from'${name}';`;
7074

7175
return formatted;
7276
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import j from 'lodash3';import {thing,thing2} from 'lodash2';import _,{foo,bar} from 'lodash';console.log("lodash",_,foo,bar,thing,thing2,j);
1+
import j from'lodash3';import{thing,thing2}from'lodash2';import _,{foo,bar}from'lodash';console.log("lodash",_,foo,bar,thing,thing2,j);
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import j from 'lodash3';import {thing,thing2} from 'lodash2';import _,{foo,bar} from 'lodash';console.log("lodash",_,foo,bar,thing,thing2,j);
1+
import j from'lodash3';import{thing,thing2}from'lodash2';import _,{foo,bar}from'lodash';console.log("lodash",_,foo,bar,thing,thing2,j);
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import j from 'lodash3';import {thing,thing2} from 'lodash2';import _,{foo,bar} from 'lodash';console.log("lodash",_,foo,bar,thing,thing2,j);
1+
import j from'lodash3';import{thing,thing2}from'lodash2';import _,{foo,bar}from'lodash';console.log("lodash",_,foo,bar,thing,thing2,j);
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
function ɵɵbar(){console.log("bar")};function baz(){console.log("baz")};function ɵɵfoo(){console.log("foo")};export{ɵɵbar as a,baz as b,ɵɵfoo as ɵ}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
import{a as ɵɵbar}from'./utf8-common-38fdc940.js';\u0275\u0275bar();
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import {a as ɵɵbar} from './utf8-common-38fdc940.js';\u0275\u0275bar();
1+
import{a as ɵɵbar}from'./utf8-common-38fdc940.js';\u0275\u0275bar();
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import {a as ɵɵbar} from './utf8-common-38fdc940.js';\u0275\u0275bar();
1+
import{a as ɵɵbar}from'./utf8-common-38fdc940.js';\u0275\u0275bar();
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
import{ɵ as ɵɵfoo,b as baz}from'./utf8-common-38fdc940.js';\u0275\u0275foo();baz();import("./utf8-lazy-d5bcdc27.js");
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import {ɵ as ɵɵfoo,b as baz} from './utf8-common-38fdc940.js';\u0275\u0275foo();baz();import("./utf8-lazy-d5bcdc27.js");
1+
import{ɵ as ɵɵfoo,b as baz}from'./utf8-common-38fdc940.js';\u0275\u0275foo();baz();import("./utf8-lazy-d5bcdc27.js");

0 commit comments

Comments
 (0)