@likec4/config 1.39.1 → 1.39.3

package/dist/node/load-config.mjs

@@ -1,6 +1,7 @@
 import { invariant } from "@likec4/core";
-import { bundleNRequire } from "bundle-n-require";
+import { bundleRequire } from "bundle-require";
 import * as fs from "node:fs/promises";
+import { dirname } from "node:path";
 import { defineConfig } from "../define-config.mjs";
 import { isLikeC4JsonConfig, isLikeC4NonJsonConfig } from "../filenames.mjs";
 import { logger } from "../logger.mjs";
@@ -18,8 +19,33 @@ export async function loadConfig(filepath) {
   }
   invariant(isLikeC4NonJsonConfig(filepath.fsPath), `Invalid config file: ${filepath.fsPath}`);
   try {
-    const { mod } = await bundleNRequire(filepath.fsPath, {
-      interopDefault: true
+    const cwd = dirname(filepath.fsPath);
+    const { mod } = await bundleRequire({
+      filepath: filepath.fsPath,
+      cwd,
+      esbuildOptions: {
+        resolveExtensions: [".mjs", ".js", ".ts", ".mts"],
+        plugins: [{
+          name: "likec4-config",
+          setup(build) {
+            build.onResolve({ filter: /^@?likec4\/config$/ }, (args) => ({
+              path: args.path,
+              namespace: "likec4-config"
+            }));
+            build.onLoad({ filter: /.*/, namespace: "likec4-config" }, (args) => {
+              return {
+                contents: `
+function mockDefineConfig(x) { return x }
+export {
+  mockDefineConfig as defineConfig,
+  mockDefineConfig as defineGenerators,
+}`,
+                loader: "js"
+              };
+            });
+          }
+        }]
+      }
     });
     return defineConfig(mod?.default ?? mod);
   } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@likec4/config",
-  "version": "1.39.1",
+  "version": "1.39.3",
   "license": "MIT",
   "homepage": "https://likec4.dev",
   "author": "Denis Davydkov <denis@davydkov.com>",
@@ -54,24 +54,33 @@
     "access": "public"
   },
   "dependencies": {
-    "bundle-n-require": "^1.1.2",
+    "bundle-require": "^5.1.0",
     "defu": "^6.1.4",
     "json5": "^2.2.3",
-    "remeda": "^2.23.1",
-    "type-fest": "^4.41.0",
+    "zod": "^4.0.17"
+  },
+  "peerDependencies": {
+    "esbuild": ">=0.25",
     "vscode-uri": "3.1.0",
-    "zod": "^4.0.17",
-    "@likec4/core": "1.39.1",
-    "@likec4/log": "1.39.1"
+    "@likec4/core": "1.39.3",
+    "@likec4/log": "1.39.3"
+  },
+  "peerDependenciesMeta": {
+    "@likec4/core": {
+      "optional": true
+    },
+    "vscode-uri": {
+      "optional": true
+    }
   },
   "devDependencies": {
     "@types/node": "~20.19.11",
-    "tsx": "4.20.3",
+    "tsx": "4.20.5",
     "turbo": "2.5.6",
     "typescript": "5.9.2",
     "unbuild": "3.5.0",
     "vitest": "3.2.4",
-    "@likec4/tsconfig": "1.39.1"
+    "@likec4/tsconfig": "1.39.3"
   },
   "scripts": {
     "generate": "tsx scripts/generate.mts",
@@ -80,5 +89,7 @@
     "lint:package": "pnpx publint ./package.tgz",
     "clean": "pnpm rimraf dist lib",
     "pack": "pnpm pack"
-  }
+  },
+  "types": "./dist/index.d.ts",
+  "module": "./dist/index.mjs"
 }

package/src/node/load-config.ts

@@ -1,6 +1,7 @@
 import { invariant } from '@likec4/core'
-import { bundleNRequire } from 'bundle-n-require'
+import { bundleRequire } from 'bundle-require'
 import * as fs from 'node:fs/promises'
+import { dirname } from 'node:path'
 import type { URI } from 'vscode-uri'
 import { defineConfig } from '../define-config'
 import { isLikeC4JsonConfig, isLikeC4NonJsonConfig } from '../filenames'
@@ -25,8 +26,39 @@ export async function loadConfig(filepath: URI): Promise<LikeC4ProjectConfig> {
 
   invariant(isLikeC4NonJsonConfig(filepath.fsPath), `Invalid config file: ${filepath.fsPath}`)
   try {
-    const { mod } = await bundleNRequire(filepath.fsPath, {
-      interopDefault: true,
+    const cwd = dirname(filepath.fsPath)
+    const { mod } = await bundleRequire({
+      filepath: filepath.fsPath,
+      cwd,
+      esbuildOptions: {
+        resolveExtensions: ['.mjs', '.js', '.ts', '.mts'],
+        plugins: [{
+          name: 'likec4-config',
+          setup(build) {
+            /**
+             * Intercept @likec4/config imports
+             */
+            build.onResolve({ filter: /^@?likec4\/config$/ }, (args) => ({
+              path: args.path,
+              namespace: 'likec4-config',
+            }))
+            /**
+             * Mock implementation, this allows to skip redundant bundling @likec4/config
+             */
+            build.onLoad({ filter: /.*/, namespace: 'likec4-config' }, (args) => {
+              return {
+                contents: `
+function mockDefineConfig(x) { return x }
+export {
+  mockDefineConfig as defineConfig,
+  mockDefineConfig as defineGenerators,
+}`,
+                loader: 'js',
+              }
+            })
+          },
+        }],
+      },
     })
     return defineConfig(mod?.default ?? mod)
   } catch (err) {