subpath imports for explicit 1:1, concat prefix + suffix scenarios an…

…d conditionals

Cargo.toml

@@ -6,7 +6,7 @@ members = [
 [workspace.dependencies]
 anyhow = "1.0.92"
 serde = { version = "1.0.213", features = ["derive"] }
-serde_json = "1.0.132"
+serde_json = { version = "1.0.132", features = ["preserve_order"] }
 swc = "4.0.0"
 swc_common = { version = "3.0.0", features = ["concurrent"] }
 swc_ecma_ast = "3.0.0"

fn_build/Cargo.toml

@@ -8,14 +8,14 @@ repository = { workspace = true }
 [dependencies]
 anyhow = { workspace = true }
 serde = { workspace = true }
+serde_json = { workspace = true }
 swc = { workspace = true }
 swc_common = { workspace = true }
 swc_ecma_ast = { workspace = true }
 swc_ecma_parser = { workspace = true }
 swc_ecma_visit = { workspace = true }
-thiserror = "1.0.67"
+thiserror = "2.0.0"
 tokio = { workspace = true }
 
 [dev-dependencies]
-serde_json = { workspace = true }
 temp-dir = { workspace = true }

fn_build/fixtures/node/js/http_route/.fixture/parse.json

@@ -0,0 +1,9 @@
+{
+  "dependencies": "unused",
+  "sources": [
+    {
+      "imports": [],
+      "path": "routes/data/lambda.js"
+    }
+  ]
+}

fn_build/fixtures/node/js/relative_import/.fixture/parse.json

@@ -0,0 +1,17 @@
+{
+  "dependencies": "unused",
+  "sources": [
+    {
+      "imports": [],
+      "path": "lib/data.js"
+    },
+    {
+      "imports": [
+        {
+          "relativeSource": "lib/data.js"
+        }
+      ],
+      "path": "routes/data/lambda.js"
+    }
+  ]
+}

fn_build/fixtures/node/js/subpath_import/conditional_explicit/.fixture/build_debug.json

@@ -0,0 +1,10 @@
+[
+  {
+    "path": "lib/tla-log.js",
+    "result": "identical"
+  },
+  {
+    "path": "routes/data/lambda.js",
+    "result": "identical"
+  }
+]

fn_build/fixtures/node/js/subpath_import/conditional_explicit/.fixture/build_release.json

@@ -0,0 +1,14 @@
+[
+  {
+    "path": "lib/tla-log.js",
+    "result": {
+      "content": "export function getLog(){return\"log\"}"
+    }
+  },
+  {
+    "path": "routes/data/lambda.js",
+    "result": {
+      "content": "import{getData as o}from\"#data\";import{getLog as t}from\"#log\";export const GET=()=>{console[t()](\"got\",o())};"
+    }
+  }
+]

fn_build/fixtures/node/js/subpath_import/conditional_explicit/.fixture/parse.json

@@ -0,0 +1,23 @@
+{
+  "dependencies": "required",
+  "sources": [
+    {
+      "imports": [],
+      "path": "lib/tla-log.js"
+    },
+    {
+      "imports": [
+        {
+          "packageDependency": {
+            "package": "data-dep",
+            "subpath": null
+          }
+        },
+        {
+          "relativeSource": "lib/tla-log.js"
+        }
+      ],
+      "path": "routes/data/lambda.js"
+    }
+  ]
+}

fn_build/fixtures/node/js/subpath_import/conditional_explicit/.fixture/spec.json

@@ -0,0 +1,3 @@
+{
+  "entrypoint": "routes/data/lambda.js"
+}

fn_build/fixtures/node/js/subpath_import/conditional_explicit/lib/data-polyfill.js

@@ -0,0 +1,3 @@
+export function getData() {
+    return []
+}

fn_build/fixtures/node/js/subpath_import/conditional_explicit/lib/tla-log.js

@@ -0,0 +1,3 @@
+export function getLog() {
+    return 'log'
+}

fn_build/fixtures/node/js/subpath_import/conditional_explicit/package.json

@@ -0,0 +1,13 @@
+{
+  "type": "module",
+  "imports": {
+    "#data": {
+      "node": "data-dep",
+      "default": "./lib/data-polyfill.js"
+    },
+    "#log": {
+      "node": "./lib/tla-log.js",
+      "module-sync": "log-dep"
+    }
+  }
+}

fn_build/fixtures/node/js/subpath_import/conditional_explicit/routes/data/lambda.js

@@ -0,0 +1,6 @@
+import {getData} from '#data'
+import {getLog} from '#log'
+
+export const GET = () => {
+    console[getLog()]('got', getData())
+}

fn_build/fixtures/node/js/subpath_import/conditional_nested/.fixture/build_debug.json

@@ -0,0 +1,10 @@
+[
+  {
+    "path": "lib/tla-log.js",
+    "result": "identical"
+  },
+  {
+    "path": "routes/data/lambda.js",
+    "result": "identical"
+  }
+]

fn_build/fixtures/node/js/subpath_import/conditional_nested/.fixture/build_release.json

@@ -0,0 +1,14 @@
+[
+  {
+    "path": "lib/tla-log.js",
+    "result": {
+      "content": "export function getLog(){return\"log\"}"
+    }
+  },
+  {
+    "path": "routes/data/lambda.js",
+    "result": {
+      "content": "import{getData as o}from\"#data\";import{getLog as t}from\"#log\";export const GET=()=>{console[t()](\"got\",o())};"
+    }
+  }
+]

fn_build/fixtures/node/js/subpath_import/conditional_nested/.fixture/parse.json

@@ -0,0 +1,23 @@
+{
+  "dependencies": "required",
+  "sources": [
+    {
+      "imports": [],
+      "path": "lib/tla-log.js"
+    },
+    {
+      "imports": [
+        {
+          "packageDependency": {
+            "package": "data-dep",
+            "subpath": null
+          }
+        },
+        {
+          "relativeSource": "lib/tla-log.js"
+        }
+      ],
+      "path": "routes/data/lambda.js"
+    }
+  ]
+}

fn_build/fixtures/node/js/subpath_import/conditional_nested/.fixture/spec.json

@@ -0,0 +1,3 @@
+{
+  "entrypoint": "routes/data/lambda.js"
+}

fn_build/fixtures/node/js/subpath_import/conditional_nested/lib/data-polyfill.js

@@ -0,0 +1,3 @@
+export function getData() {
+    return []
+}

fn_build/fixtures/node/js/subpath_import/conditional_nested/lib/tla-log.js

@@ -0,0 +1,3 @@
+export function getLog() {
+    return 'log'
+}

fn_build/fixtures/node/js/subpath_import/conditional_nested/package.json

@@ -0,0 +1,21 @@
+{
+  "type": "module",
+  "imports": {
+    "#data": {
+      "default": "./lib/data-polyfill.js",
+      "module-sync": "./lib/data-polyfill.js",
+      "node": {
+        "module-sync": "data-dep",
+        "default": "./lib/data-polyfill.js"
+      }
+    },
+    "#log": {
+      "default": "log-dep",
+      "module-sync": "log-dep",
+      "node": {
+        "module-sync": "./lib/tla-log.js",
+        "default": "log-dep"
+      }
+    }
+  }
+}

fn_build/fixtures/node/js/subpath_import/conditional_nested/routes/data/lambda.js

@@ -0,0 +1,6 @@
+import {getData} from '#data'
+import {getLog} from '#log'
+
+export const GET = () => {
+    console[getLog()]('got', getData())
+}

fn_build/fixtures/node/js/subpath_import/explicit_dependency/.fixture/build_debug.json

@@ -0,0 +1,6 @@
+[
+  {
+    "path": "routes/data/lambda.js",
+    "result": "identical"
+  }
+]

fn_build/fixtures/node/js/subpath_import/explicit_dependency/.fixture/build_release.json

@@ -0,0 +1,8 @@
+[
+  {
+    "path": "routes/data/lambda.js",
+    "result": {
+      "content": "import{getData as o}from\"#lib/data.js\";export const GET=()=>{console.log(\"got\",o())};"
+    }
+  }
+]

fn_build/fixtures/node/js/subpath_import/explicit_dependency/.fixture/parse.json

@@ -0,0 +1,16 @@
+{
+  "dependencies": "required",
+  "sources": [
+    {
+      "imports": [
+        {
+          "packageDependency": {
+            "package": "data-dep",
+            "subpath": null
+          }
+        }
+      ],
+      "path": "routes/data/lambda.js"
+    }
+  ]
+}

fn_build/fixtures/node/js/subpath_import/explicit_dependency/.fixture/spec.json

@@ -0,0 +1,3 @@
+{
+  "entrypoint": "routes/data/lambda.js"
+}