@h-rig/core 0.0.0-e2e-live4.20260630092940 → 0.0.0-e2e-live5.20260630094159

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -565,16 +565,24 @@ async function importConfigViaRuntimeBundleUnserialized(configPath) {
565
565
  return;
566
566
  if (packageImport)
567
567
  return { path: args.path, external: true };
568
- const parentCandidates = args.path.startsWith(".") ? [args.importer && isAbsolute(args.importer) ? dirname(args.importer) : null, configDir].filter((value) => Boolean(value)) : [args.importer && isAbsolute(args.importer) ? dirname(args.importer) : configDir];
568
+ const importerDir = args.importer && isAbsolute(args.importer) ? dirname(args.importer) : null;
569
+ if (args.path.startsWith(".") && importerDir) {
570
+ const fromImporter = resolveModulePath(resolve(importerDir, args.path));
571
+ if (fromImporter)
572
+ return { path: fromImporter };
573
+ if (/[\\/]node_modules[\\/]/.test(args.importer ?? ""))
574
+ return;
575
+ }
576
+ const parentCandidates = args.path.startsWith(".") ? [importerDir, configDir].filter((value) => Boolean(value)) : [importerDir ?? configDir];
569
577
  for (const parent2 of parentCandidates) {
570
- const filePath = resolvedFilePath(resolve(parent2, args.path), configDir);
578
+ const filePath = resolvedFilePath(resolve(parent2, args.path), configProjectRoot);
571
579
  if (filePath)
572
580
  return { path: filePath };
573
581
  }
574
582
  const parent = parentCandidates[0] ?? configDir;
575
583
  try {
576
584
  const resolved = bun.resolveSync?.(args.path, parent) ?? resolve(parent, args.path);
577
- const filePath = resolvedFilePath(resolved, configDir);
585
+ const filePath = resolvedFilePath(resolved, configProjectRoot);
578
586
  if (filePath)
579
587
  return { path: filePath };
580
588
  } catch {}
@@ -342,16 +342,24 @@ async function importConfigViaRuntimeBundleUnserialized(configPath) {
342
342
  return;
343
343
  if (packageImport)
344
344
  return { path: args.path, external: true };
345
- const parentCandidates = args.path.startsWith(".") ? [args.importer && isAbsolute(args.importer) ? dirname(args.importer) : null, configDir].filter((value) => Boolean(value)) : [args.importer && isAbsolute(args.importer) ? dirname(args.importer) : configDir];
345
+ const importerDir = args.importer && isAbsolute(args.importer) ? dirname(args.importer) : null;
346
+ if (args.path.startsWith(".") && importerDir) {
347
+ const fromImporter = resolveModulePath(resolve(importerDir, args.path));
348
+ if (fromImporter)
349
+ return { path: fromImporter };
350
+ if (/[\\/]node_modules[\\/]/.test(args.importer ?? ""))
351
+ return;
352
+ }
353
+ const parentCandidates = args.path.startsWith(".") ? [importerDir, configDir].filter((value) => Boolean(value)) : [importerDir ?? configDir];
346
354
  for (const parent2 of parentCandidates) {
347
- const filePath = resolvedFilePath(resolve(parent2, args.path), configDir);
355
+ const filePath = resolvedFilePath(resolve(parent2, args.path), configProjectRoot);
348
356
  if (filePath)
349
357
  return { path: filePath };
350
358
  }
351
359
  const parent = parentCandidates[0] ?? configDir;
352
360
  try {
353
361
  const resolved = bun.resolveSync?.(args.path, parent) ?? resolve(parent, args.path);
354
- const filePath = resolvedFilePath(resolved, configDir);
362
+ const filePath = resolvedFilePath(resolved, configProjectRoot);
355
363
  if (filePath)
356
364
  return { path: filePath };
357
365
  } catch {}
@@ -377,16 +377,24 @@ async function importConfigViaRuntimeBundleUnserialized(configPath) {
377
377
  return;
378
378
  if (packageImport)
379
379
  return { path: args.path, external: true };
380
- const parentCandidates = args.path.startsWith(".") ? [args.importer && isAbsolute(args.importer) ? dirname(args.importer) : null, configDir].filter((value) => Boolean(value)) : [args.importer && isAbsolute(args.importer) ? dirname(args.importer) : configDir];
380
+ const importerDir = args.importer && isAbsolute(args.importer) ? dirname(args.importer) : null;
381
+ if (args.path.startsWith(".") && importerDir) {
382
+ const fromImporter = resolveModulePath(resolve(importerDir, args.path));
383
+ if (fromImporter)
384
+ return { path: fromImporter };
385
+ if (/[\\/]node_modules[\\/]/.test(args.importer ?? ""))
386
+ return;
387
+ }
388
+ const parentCandidates = args.path.startsWith(".") ? [importerDir, configDir].filter((value) => Boolean(value)) : [importerDir ?? configDir];
381
389
  for (const parent2 of parentCandidates) {
382
- const filePath = resolvedFilePath(resolve(parent2, args.path), configDir);
390
+ const filePath = resolvedFilePath(resolve(parent2, args.path), configProjectRoot);
383
391
  if (filePath)
384
392
  return { path: filePath };
385
393
  }
386
394
  const parent = parentCandidates[0] ?? configDir;
387
395
  try {
388
396
  const resolved = bun.resolveSync?.(args.path, parent) ?? resolve(parent, args.path);
389
- const filePath = resolvedFilePath(resolved, configDir);
397
+ const filePath = resolvedFilePath(resolved, configProjectRoot);
390
398
  if (filePath)
391
399
  return { path: filePath };
392
400
  } catch {}
@@ -342,16 +342,24 @@ async function importConfigViaRuntimeBundleUnserialized(configPath) {
342
342
  return;
343
343
  if (packageImport)
344
344
  return { path: args.path, external: true };
345
- const parentCandidates = args.path.startsWith(".") ? [args.importer && isAbsolute(args.importer) ? dirname(args.importer) : null, configDir].filter((value) => Boolean(value)) : [args.importer && isAbsolute(args.importer) ? dirname(args.importer) : configDir];
345
+ const importerDir = args.importer && isAbsolute(args.importer) ? dirname(args.importer) : null;
346
+ if (args.path.startsWith(".") && importerDir) {
347
+ const fromImporter = resolveModulePath(resolve(importerDir, args.path));
348
+ if (fromImporter)
349
+ return { path: fromImporter };
350
+ if (/[\\/]node_modules[\\/]/.test(args.importer ?? ""))
351
+ return;
352
+ }
353
+ const parentCandidates = args.path.startsWith(".") ? [importerDir, configDir].filter((value) => Boolean(value)) : [importerDir ?? configDir];
346
354
  for (const parent2 of parentCandidates) {
347
- const filePath = resolvedFilePath(resolve(parent2, args.path), configDir);
355
+ const filePath = resolvedFilePath(resolve(parent2, args.path), configProjectRoot);
348
356
  if (filePath)
349
357
  return { path: filePath };
350
358
  }
351
359
  const parent = parentCandidates[0] ?? configDir;
352
360
  try {
353
361
  const resolved = bun.resolveSync?.(args.path, parent) ?? resolve(parent, args.path);
354
- const filePath = resolvedFilePath(resolved, configDir);
362
+ const filePath = resolvedFilePath(resolved, configProjectRoot);
355
363
  if (filePath)
356
364
  return { path: filePath };
357
365
  } catch {}
@@ -565,16 +565,24 @@ async function importConfigViaRuntimeBundleUnserialized(configPath) {
565
565
  return;
566
566
  if (packageImport)
567
567
  return { path: args.path, external: true };
568
- const parentCandidates = args.path.startsWith(".") ? [args.importer && isAbsolute(args.importer) ? dirname(args.importer) : null, configDir].filter((value) => Boolean(value)) : [args.importer && isAbsolute(args.importer) ? dirname(args.importer) : configDir];
568
+ const importerDir = args.importer && isAbsolute(args.importer) ? dirname(args.importer) : null;
569
+ if (args.path.startsWith(".") && importerDir) {
570
+ const fromImporter = resolveModulePath(resolve(importerDir, args.path));
571
+ if (fromImporter)
572
+ return { path: fromImporter };
573
+ if (/[\\/]node_modules[\\/]/.test(args.importer ?? ""))
574
+ return;
575
+ }
576
+ const parentCandidates = args.path.startsWith(".") ? [importerDir, configDir].filter((value) => Boolean(value)) : [importerDir ?? configDir];
569
577
  for (const parent2 of parentCandidates) {
570
- const filePath = resolvedFilePath(resolve(parent2, args.path), configDir);
578
+ const filePath = resolvedFilePath(resolve(parent2, args.path), configProjectRoot);
571
579
  if (filePath)
572
580
  return { path: filePath };
573
581
  }
574
582
  const parent = parentCandidates[0] ?? configDir;
575
583
  try {
576
584
  const resolved = bun.resolveSync?.(args.path, parent) ?? resolve(parent, args.path);
577
- const filePath = resolvedFilePath(resolved, configDir);
585
+ const filePath = resolvedFilePath(resolved, configProjectRoot);
578
586
  if (filePath)
579
587
  return { path: filePath };
580
588
  } catch {}
@@ -565,16 +565,24 @@ async function importConfigViaRuntimeBundleUnserialized(configPath) {
565
565
  return;
566
566
  if (packageImport)
567
567
  return { path: args.path, external: true };
568
- const parentCandidates = args.path.startsWith(".") ? [args.importer && isAbsolute(args.importer) ? dirname(args.importer) : null, configDir].filter((value) => Boolean(value)) : [args.importer && isAbsolute(args.importer) ? dirname(args.importer) : configDir];
568
+ const importerDir = args.importer && isAbsolute(args.importer) ? dirname(args.importer) : null;
569
+ if (args.path.startsWith(".") && importerDir) {
570
+ const fromImporter = resolveModulePath(resolve(importerDir, args.path));
571
+ if (fromImporter)
572
+ return { path: fromImporter };
573
+ if (/[\\/]node_modules[\\/]/.test(args.importer ?? ""))
574
+ return;
575
+ }
576
+ const parentCandidates = args.path.startsWith(".") ? [importerDir, configDir].filter((value) => Boolean(value)) : [importerDir ?? configDir];
569
577
  for (const parent2 of parentCandidates) {
570
- const filePath = resolvedFilePath(resolve(parent2, args.path), configDir);
578
+ const filePath = resolvedFilePath(resolve(parent2, args.path), configProjectRoot);
571
579
  if (filePath)
572
580
  return { path: filePath };
573
581
  }
574
582
  const parent = parentCandidates[0] ?? configDir;
575
583
  try {
576
584
  const resolved = bun.resolveSync?.(args.path, parent) ?? resolve(parent, args.path);
577
- const filePath = resolvedFilePath(resolved, configDir);
585
+ const filePath = resolvedFilePath(resolved, configProjectRoot);
578
586
  if (filePath)
579
587
  return { path: filePath };
580
588
  } catch {}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@h-rig/core",
3
- "version": "0.0.0-e2e-live4.20260630092940",
3
+ "version": "0.0.0-e2e-live5.20260630094159",
4
4
  "type": "module",
5
5
  "description": "Config and plugin composition library for Rig's OMP extension ecosystem; not a product host/runtime.",
6
6
  "license": "UNLICENSED",
@@ -181,8 +181,8 @@
181
181
  "module": "./dist/src/index.js",
182
182
  "types": "./dist/src/index.d.ts",
183
183
  "dependencies": {
184
- "@rig/contracts": "npm:@h-rig/contracts@0.0.0-e2e-live4.20260630092940",
185
- "@rig/kernel-seed": "npm:@h-rig/kernel-seed@0.0.0-e2e-live4.20260630092940",
184
+ "@rig/contracts": "npm:@h-rig/contracts@0.0.0-e2e-live5.20260630094159",
185
+ "@rig/kernel-seed": "npm:@h-rig/kernel-seed@0.0.0-e2e-live5.20260630094159",
186
186
  "effect": "4.0.0-beta.90",
187
187
  "smol-toml": "^1.6.0"
188
188
  }