Skip to content

Commit

Permalink
feat: add module specifier start/end index #9
Browse files Browse the repository at this point in the history
  • Loading branch information
@TomerAberbach
TomerAberbach committed May 12, 2024
1 parent 6bb7f7c commit 5ec8727
Show file tree
Hide file tree
Showing 3 changed files with 73 additions and 4 deletions.
2 changes: 2 additions & 0 deletions src/index.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ export type Import = {
isDynamicImport: boolean
moduleSpecifier: {
type: ModuleSpecifierType
startIndex: number
endIndex: number
isConstant: boolean
code: string
value?: string
Expand Down
12 changes: 8 additions & 4 deletions src/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,14 @@ const parseImports = async (code, { resolveFrom } = {}) => {
moduleSpecifierStartIndex,
moduleSpecifierEndIndexExclusive,
)
const moduleSpecifier = parseModuleSpecifier(moduleSpecifierString, {
isDynamicImport,
resolveFrom,
})
const moduleSpecifier = {
startIndex: moduleSpecifierStartIndex,
endIndex: moduleSpecifierEndIndexExclusive,
...parseModuleSpecifier(moduleSpecifierString, {
isDynamicImport,
resolveFrom,
}),
}

let importClause
if (!isDynamicImport) {
Expand Down
63 changes: 63 additions & 0 deletions test/index.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ test.each([
isDynamicImport: false,
moduleSpecifier: {
type: `relative`,
startIndex: 687,
endIndex: 694,
isConstant: true,
code: `'./wow'`,
value: `./wow`,
Expand All @@ -51,6 +53,8 @@ test.each([
isDynamicImport: false,
moduleSpecifier: {
type: `package`,
startIndex: 719,
endIndex: 726,
isConstant: true,
code: `"great"`,
value: `great`,
Expand All @@ -68,6 +72,8 @@ test.each([
isDynamicImport: false,
moduleSpecifier: {
type: `package`,
startIndex: 793,
endIndex: 797,
isConstant: true,
code: `"\\n"`,
value: `\n`,
Expand All @@ -85,6 +91,8 @@ test.each([
isDynamicImport: true,
moduleSpecifier: {
type: `relative`,
startIndex: 848,
endIndex: 861,
isConstant: true,
code: `\`../../hello\``,
value: `../../hello`,
Expand All @@ -98,6 +106,8 @@ test.each([
isDynamicImport: false,
moduleSpecifier: {
type: `builtin`,
startIndex: 906,
endIndex: 914,
isConstant: true,
code: `'module'`,
value: `module`,
Expand All @@ -115,6 +125,8 @@ test.each([
isDynamicImport: false,
moduleSpecifier: {
type: `absolute`,
startIndex: 931,
endIndex: 947,
isConstant: true,
code: `'/absolute/path'`,
value: `/absolute/path`,
Expand All @@ -132,6 +144,8 @@ test.each([
isDynamicImport: false,
moduleSpecifier: {
type: `absolute`,
startIndex: 964,
endIndex: 981,
isConstant: true,
code: `'/absoluter/path'`,
value: `/absoluter/path`,
Expand All @@ -149,6 +163,8 @@ test.each([
isDynamicImport: false,
moduleSpecifier: {
type: `absolute`,
startIndex: 999,
endIndex: 1017,
isConstant: true,
code: `'/absolutest/path'`,
value: `/absolutest/path`,
Expand All @@ -166,6 +182,8 @@ test.each([
isDynamicImport: false,
moduleSpecifier: {
type: `absolute`,
startIndex: 1040,
endIndex: 1060,
isConstant: true,
code: `'/absolutester/path'`,
value: `/absolutester/path`,
Expand All @@ -183,6 +201,8 @@ test.each([
isDynamicImport: false,
moduleSpecifier: {
type: `relative`,
startIndex: 1100,
endIndex: 1105,
isConstant: true,
code: `'./x'`,
value: `./x`,
Expand All @@ -204,6 +224,8 @@ test.each([
isDynamicImport: true,
moduleSpecifier: {
type: `package`,
startIndex: 1124,
endIndex: 1128,
isConstant: true,
code: `'hi'`,
value: `hi`,
Expand All @@ -217,6 +239,8 @@ test.each([
isDynamicImport: true,
moduleSpecifier: {
type: `unknown`,
startIndex: 1150,
endIndex: 1161,
isConstant: false,
code: `'hello' + 2`,
value: undefined,
Expand All @@ -230,6 +254,8 @@ test.each([
isDynamicImport: false,
moduleSpecifier: {
type: `relative`,
startIndex: 1178,
endIndex: 1187,
isConstant: true,
code: `'./hello'`,
value: `./hello`,
Expand All @@ -247,6 +273,8 @@ test.each([
isDynamicImport: false,
moduleSpecifier: {
type: `relative`,
startIndex: 1209,
endIndex: 1230,
isConstant: true,
code: `'../../amazing/sdfsd'`,
value: `../../amazing/sdfsd`,
Expand All @@ -267,6 +295,8 @@ test.each([
isDynamicImport: false,
moduleSpecifier: {
type: `package`,
startIndex: 1247,
endIndex: 1252,
isConstant: true,
code: `"a/b"`,
value: `a/b`,
Expand All @@ -284,6 +314,8 @@ test.each([
isDynamicImport: false,
moduleSpecifier: {
type: `package`,
startIndex: 1283,
endIndex: 1298,
isConstant: true,
code: `'parse-imports'`,
value: `parse-imports`,
Expand All @@ -301,6 +333,8 @@ test.each([
isDynamicImport: false,
moduleSpecifier: {
type: `package`,
startIndex: 1325,
endIndex: 1331,
isConstant: true,
code: `'sdfs'`,
value: `sdfs`,
Expand All @@ -318,6 +352,8 @@ test.each([
isDynamicImport: false,
moduleSpecifier: {
type: `relative`,
startIndex: 1340,
endIndex: 1353,
isConstant: true,
code: `"../sdfsd.js"`,
value: `../sdfsd.js`,
Expand All @@ -335,6 +371,8 @@ test.each([
isDynamicImport: false,
moduleSpecifier: {
type: `absolute`,
startIndex: 1379,
endIndex: 1398,
isConstant: true,
code: `'/absolutely/great'`,
value: `/absolutely/great`,
Expand All @@ -352,6 +390,8 @@ test.each([
isDynamicImport: false,
moduleSpecifier: {
type: `relative`,
startIndex: 1429,
endIndex: 1443,
isConstant: true,
code: `"../\\r\\b130\\""`,
value: `../\r\b130"`,
Expand All @@ -369,6 +409,8 @@ test.each([
isDynamicImport: false,
moduleSpecifier: {
type: `invalid`,
startIndex: 1459,
endIndex: 1461,
isConstant: true,
code: `''`,
value: ``,
Expand Down Expand Up @@ -397,6 +439,8 @@ test.each([
isDynamicImport: false,
moduleSpecifier: {
type: `relative`,
startIndex: 632,
endIndex: 637,
isConstant: true,
code: `'./a'`,
value: `./a`,
Expand All @@ -418,6 +462,8 @@ test.each([
isDynamicImport: false,
moduleSpecifier: {
type: `relative`,
startIndex: 656,
endIndex: 663,
isConstant: true,
code: `'./wow'`,
value: `./wow`,
Expand All @@ -435,6 +481,8 @@ test.each([
isDynamicImport: false,
moduleSpecifier: {
type: `relative`,
startIndex: 678,
endIndex: 683,
isConstant: true,
code: `'./c'`,
value: `./c`,
Expand All @@ -452,6 +500,8 @@ test.each([
isDynamicImport: false,
moduleSpecifier: {
type: `package`,
startIndex: 705,
endIndex: 722,
isConstant: true,
code: `'es-module-lexer'`,
value: `es-module-lexer`,
Expand Down Expand Up @@ -483,6 +533,8 @@ test.each([
isDynamicImport: false,
moduleSpecifier: {
type: `builtin`,
startIndex: 612,
endIndex: 616,
isConstant: true,
code: `'fs'`,
value: `fs`,
Expand All @@ -506,6 +558,8 @@ test.each([
isDynamicImport: false,
moduleSpecifier: {
type: `builtin`,
startIndex: 618,
endIndex: 624,
isConstant: true,
code: `'path'`,
value: `path`,
Expand All @@ -523,6 +577,8 @@ test.each([
isDynamicImport: true,
moduleSpecifier: {
type: `relative`,
startIndex: 683,
endIndex: 688,
isConstant: true,
code: `\`./d\``,
value: `./d`,
Expand All @@ -543,10 +599,17 @@ test.each([
const parsedImports = [...(await parseImports(code, { resolveFrom }))]

console.log(
`imports`,
parsedImports.map(({ startIndex, endIndex }) =>
code.slice(startIndex, endIndex),
),
)
console.log(
`module specifiers`,
parsedImports.map(({ moduleSpecifier: { startIndex, endIndex } }) =>
code.slice(startIndex, endIndex),
),
)
expect(parsedImports).toStrictEqual(expectedImports)
},
)
Expand Down

0 comments on commit 5ec8727

Please sign in to comment.