fix(core): Resolve issue wih invalid module prefix

Author: sullivanpj

packages/core/src/lib/unplugin/module-resolution.ts

@@ -20,13 +20,12 @@ import { isSetObject } from "@stryke/type-checks/is-set-object";
 import { isSetString } from "@stryke/type-checks/is-set-string";
 import { LoadResult } from "rollup";
 import type {
-  ExternalIdResult,
   UnpluginBuildContext,
   UnpluginContext,
   UnpluginOptions
 } from "unplugin";
 import { UNSAFE_PluginContext } from "../../types/_internal";
-import { PluginContext } from "../../types/context";
+import { PluginContext, ResolveResult } from "../../types/context";
 
 export interface CreateUnpluginModuleResolutionFunctionsOptions {
   /**
@@ -75,7 +74,7 @@ export function createUnpluginModuleResolutionFunctions<
       opts: {
         isEntry: boolean;
       } = { isEntry: false }
-    ): Promise<string | ExternalIdResult | null | undefined> {
+    ): Promise<string | ResolveResult | null | undefined> {
       let result = await ctx.$$internal.callHook(
         "resolveId",
         {
@@ -88,11 +87,11 @@ export function createUnpluginModuleResolutionFunctions<
         opts
       );
       if (isSetString(result)) {
-        return `${prefix}${result}`;
+        return result;
       } else if (isSetObject(result)) {
         return {
           ...result,
-          id: `${prefix}${result.id}`
+          id: result.virtual ? `${prefix}${result.id}` : result.id
         };
       }
 
@@ -108,21 +107,19 @@ export function createUnpluginModuleResolutionFunctions<
         opts
       );
       if (isSetString(result)) {
-        return `${prefix}${result}`;
+        return result;
       } else if (isSetObject(result)) {
         return {
           ...result,
-          id: `${prefix}${result.id}`
+          id: result.virtual ? `${prefix}${result.id}` : result.id
         };
       }
 
       result = await ctx.resolve(id, importer, { isFile: true, ...opts });
-      if (isSetString(result)) {
-        return `${prefix}${result}`;
-      } else if (isSetObject(result)) {
+      if (isSetObject(result)) {
         return {
           ...result,
-          id: `${prefix}${result.id}`
+          id: result.virtual ? `${prefix}${result.id}` : result.id
         };
       }
 
@@ -138,11 +135,11 @@ export function createUnpluginModuleResolutionFunctions<
         opts
       );
       if (isSetString(result)) {
-        return `${prefix}${result}`;
+        return result;
       } else if (isSetObject(result)) {
         return {
           ...result,
-          id: `${prefix}${result.id}`
+          id: result.virtual ? `${prefix}${result.id}` : result.id
         };
       }
 

packages/core/src/types/context.ts

@@ -193,6 +193,13 @@ export interface EmitOptions extends WriteOptions {
 export type EmitEntryOptions = EmitOptions &
   Omit<ResolvedEntryTypeDefinition, "file">;
 
+export interface ResolveResult extends ExternalIdResult {
+  /**
+   * A flag indicating whether the resolved module is part of the generated runtime modules
+   */
+  virtual?: boolean;
+}
+
 /**
  * The unresolved Powerlines context.
  *
@@ -423,7 +430,7 @@ export interface UnresolvedContext<
     id: string,
     importer?: string,
     options?: ResolveOptions
-  ) => Promise<ExternalIdResult | undefined>;
+  ) => Promise<ResolveResult | undefined>;
 
   /**
    * A helper function to load modules using the Jiti resolver

packages/core/src/types/plugin.ts

@@ -19,7 +19,7 @@
 import type { ArrayValues } from "@stryke/types/array";
 import type { AnyFunction, MaybePromise } from "@stryke/types/base";
 import { LoadResult } from "rollup";
-import type { ExternalIdResult, HookFilter, TransformResult } from "unplugin";
+import type { HookFilter, TransformResult } from "unplugin";
 import {
   KNOWN_PLUGIN_FIELDS,
   PLUGIN_NON_HOOK_FIELDS
@@ -34,6 +34,7 @@ import type {
 import type {
   BuildPluginContext,
   PluginContext,
+  ResolveResult,
   UnresolvedContext
 } from "./context";
 import type { BuilderVariant, UnpluginBuilderVariant } from "./unplugin";
@@ -192,7 +193,7 @@ export interface Hooks<TContext extends PluginContext> {
     id: string,
     importer: string | undefined,
     options: { isEntry: boolean }
-  ) => MaybePromise<string | ExternalIdResult | null | undefined>;
+  ) => MaybePromise<string | ResolveResult | null | undefined>;
 
   /**
    * A hook that is called to write the bundle to disk.

packages/powerlines/src/context/context.ts

@@ -62,11 +62,7 @@ import {
   Response,
   setGlobalDispatcher
 } from "undici";
-import {
-  ExternalIdResult,
-  UnpluginBuildContext,
-  UnpluginMessage
-} from "unplugin";
+import { UnpluginBuildContext, UnpluginMessage } from "unplugin";
 import { getPrefixedRootHash } from "../_internal/helpers/meta";
 import {
   createResolver,
@@ -101,6 +97,7 @@ import type {
   ResolvedEntryTypeDefinition,
   ResolveOptions,
   Resolver,
+  ResolveResult,
   TransformResult,
   VirtualFile,
   VirtualFileSystemInterface,
@@ -792,7 +789,7 @@ export class PowerlinesContext<
     id: string,
     importer?: string,
     options: ResolveOptions = {}
-  ): Promise<ExternalIdResult | undefined> {
+  ): Promise<ResolveResult | undefined> {
     let moduleId = id;
     if (this.config.resolve.alias) {
       if (Array.isArray(this.config.resolve.alias)) {
@@ -841,7 +838,8 @@ export class PowerlinesContext<
             (this.fs.isVirtual(moduleId) &&
               this.config.projectType !== "application") ||
             (this.config.resolve.skipNodeModulesBundle &&
-              !/^[A-Z]:[/\\]|^\.{0,2}\/|^\.{1,2}$/.test(moduleId)))
+              !/^[A-Z]:[/\\]|^\.{0,2}\/|^\.{1,2}$/.test(moduleId))),
+        virtual: this.fs.isVirtual(moduleId)
       };
     }
 
@@ -857,14 +855,15 @@ export class PowerlinesContext<
         match(moduleId, this.config.resolve.external) ||
         moduleId.startsWith("node:")
       ) {
-        return { id: moduleId, external: true };
+        return { id: moduleId, external: true, virtual: false };
       }
 
       // Exclude any other import that looks like a Node module
       if (!/^[A-Z]:[/\\]|^\.{0,2}\/|^\.{1,2}$/.test(moduleId)) {
         return {
           id: moduleId,
-          external: true
+          external: true,
+          virtual: false
         };
       }
     } else {
@@ -876,7 +875,7 @@ export class PowerlinesContext<
         match(moduleId, this.config.resolve.external) ||
         moduleId.startsWith("node:")
       ) {
-        return { id: moduleId, external: true };
+        return { id: moduleId, external: true, virtual: false };
       }
     }