@utoo/pack 0.0.1-alpha.16 → 0.0.1-alpha.18

package/cjs/binding.d.ts

@@ -136,7 +136,7 @@ export interface NapiEntrypoints {
 }
 export declare function projectWriteAllEntrypointsToDisk(project: { __napiType: "Project" }): Promise<TurbopackResult>
 export declare function projectEntrypointsSubscribe(project: { __napiType: "Project" }, func: (...args: any[]) => any): { __napiType: "RootTask" }
-export declare function projectHmrEvents(project: { __napiType: "Project" }, identifier: string, func: (...args: any[]) => any): { __napiType: "RootTask" }
+export declare function projectHmrEvents(project: { __napiType: "Project" }, identifier: RcStr, func: (...args: any[]) => any): { __napiType: "RootTask" }
 export interface HmrIdentifiers {
   identifiers: Array<string>
 }
@@ -166,16 +166,18 @@ export declare function projectUpdateInfoSubscribe(project: { __napiType: "Proje
 export interface StackFrame {
   isServer: boolean
   isInternal?: boolean
-  originalFile?: string
-  file: string
+  originalFile?: RcStr
+  file: RcStr
+  /** 1-indexed, unlike source map tokens */
   line?: number
+  /** 1-indexed, unlike source map tokens */
   column?: number
-  methodName?: string
+  methodName?: RcStr
 }
 export declare function projectTraceSource(project: { __napiType: "Project" }, frame: StackFrame, currentDirectoryFileUrl: string): Promise<StackFrame | null>
 export declare function projectGetSourceForAsset(project: { __napiType: "Project" }, filePath: string): Promise<string | null>
-export declare function projectGetSourceMap(project: { __napiType: "Project" }, filePath: string): Promise<string | null>
-export declare function projectGetSourceMapSync(project: { __napiType: "Project" }, filePath: string): string | null
+export declare function projectGetSourceMap(project: { __napiType: "Project" }, filePath: RcStr): Promise<string | null>
+export declare function projectGetSourceMapSync(project: { __napiType: "Project" }, filePath: RcStr): string | null
 export declare function rootTaskDispose(rootTask: { __napiType: "RootTask" }): void
 export interface NapiIssue {
   severity: string
@@ -186,7 +188,7 @@ export interface NapiIssue {
   detail?: any
   source?: NapiIssueSource
   documentationLink: string
-  subIssues: Array<NapiIssue>
+  importTraces: any
 }
 export interface NapiIssueSource {
   source: NapiSource

package/cjs/types.d.ts

@@ -10,6 +10,7 @@ declare global {
     export type ExternalEndpoint = {
         readonly __tag: unique symbol;
     };
+    export type RcStr = string;
 }
 export interface BaseUpdate {
     resource: {

package/cjs/webpackCompat.js

@@ -94,44 +94,135 @@ compatDefine.pluginName = "DefinePlugin";
 function compatDefine(maybeWebpackPluginInstance) {
     return maybeWebpackPluginInstance === null || maybeWebpackPluginInstance === void 0 ? void 0 : maybeWebpackPluginInstance.definitions;
 }
-function compatExternals(webpackExternal) {
+function compatExternals(webpackExternals) {
+    if (!webpackExternals) {
+        return undefined;
+    }
     let externals = {};
-    switch (typeof webpackExternal) {
-        case "string":
-            externals[webpackExternal] = webpackExternal;
+    switch (typeof webpackExternals) {
+        case "string": {
+            // Single string external: "lodash" -> { "lodash": "lodash" }
+            externals[webpackExternals] = webpackExternals;
             break;
-        case "object":
-            if (webpackExternal instanceof RegExp) {
-                throw "regex enternal not supported yet";
-            }
-            else if (Array.isArray(webpackExternal)) {
-                webpackExternal.forEach((k) => {
-                    switch (typeof k) {
-                        case "string":
-                            externals[k] = k;
-                            break;
-                        default:
-                            throw "non string external item not supported yet";
+        }
+        case "object": {
+            if (Array.isArray(webpackExternals)) {
+                // Array of externals: ["lodash", "react"] -> { "lodash": "lodash", "react": "react" }
+                externals = webpackExternals.reduce((acc, external) => {
+                    if (typeof external === "string") {
+                        acc[external] = external;
                     }
-                });
+                    else if (typeof external === "object" && external !== null) {
+                        Object.assign(acc, compatExternals(external));
+                    }
+                    return acc;
+                }, {});
+            }
+            else if (webpackExternals instanceof RegExp) {
+                throw "regex external not supported yet";
             }
             else {
-                if ("byLayer" in webpackExternal) {
+                if ("byLayer" in webpackExternals) {
                     throw "by layer external item not supported yet";
                 }
-                Object.entries(webpackExternal).forEach(([k, v]) => {
-                    switch (typeof v) {
-                        case "string":
-                            externals[k] = v;
-                            break;
-                        default:
-                            throw "non string external item not supported yet";
+                Object.entries(webpackExternals).forEach(([key, value]) => {
+                    if (typeof value === "string") {
+                        // Check if it's a script type with shorthand syntax: "global@https://example.com/script.js"
+                        if (value.includes("@") &&
+                            (value.startsWith("script ") || value.includes("://"))) {
+                            const match = value.match(/^(?:script\s+)?(.+?)@(.+)$/);
+                            if (match) {
+                                const [, globalName, scriptUrl] = match;
+                                // Use utoo-pack string format: "script globalName@url"
+                                externals[key] = `script ${globalName}@${scriptUrl}`;
+                            }
+                            else {
+                                externals[key] = value;
+                            }
+                        }
+                        else {
+                            // Simple string mapping: { "react": "React" }
+                            externals[key] = value;
+                        }
+                    }
+                    else if (Array.isArray(value)) {
+                        // Array format handling
+                        if (value.length >= 2) {
+                            const [first, second] = value;
+                            // Check if it's a script type array: ["https://example.com/script.js", "GlobalName"]
+                            if (typeof first === "string" &&
+                                first.includes("://") &&
+                                typeof second === "string") {
+                                // Use utoo-pack object format for script
+                                externals[key] = {
+                                    root: second,
+                                    type: "script",
+                                    script: first,
+                                };
+                            }
+                            else if (typeof first === "string" &&
+                                typeof second === "string") {
+                                // Handle type prefix formats
+                                if (first.startsWith("commonjs")) {
+                                    externals[key] = `commonjs ${second}`;
+                                }
+                                else if (first === "module") {
+                                    externals[key] = `esm ${second}`;
+                                }
+                                else if (first === "var" ||
+                                    first === "global" ||
+                                    first === "window") {
+                                    externals[key] = second;
+                                }
+                                else if (first === "script") {
+                                    // Script type without URL in array format - treat as regular script prefix
+                                    externals[key] = `script ${second}`;
+                                }
+                                else {
+                                    externals[key] = `${first} ${second}`;
+                                }
+                            }
+                            else {
+                                externals[key] = value[0] || key;
+                            }
+                        }
+                        else {
+                            externals[key] = value[0] || key;
+                        }
+                    }
+                    else if (typeof value === "object" && value !== null) {
+                        // Object format: handle complex configurations
+                        if ("root" in value || "commonjs" in value || "amd" in value) {
+                            // Standard webpack externals object format
+                            if (value.commonjs) {
+                                externals[key] = `commonjs ${value.commonjs}`;
+                            }
+                            else if (value.root) {
+                                externals[key] = value.root;
+                            }
+                            else if (value.amd) {
+                                externals[key] = value.amd;
+                            }
+                            else {
+                                externals[key] = key;
+                            }
+                        }
+                        else {
+                            // Treat as utoo-pack specific configuration (might already be in correct format)
+                            externals[key] = value;
+                        }
+                    }
+                    else {
+                        // Fallback to key name
+                        externals[key] = key;
                     }
                 });
             }
             break;
-        case "function":
+        }
+        case "function": {
             throw "functional external not supported yet";
+        }
         default:
             break;
     }

package/esm/binding.d.ts

@@ -136,7 +136,7 @@ export interface NapiEntrypoints {
 }
 export declare function projectWriteAllEntrypointsToDisk(project: { __napiType: "Project" }): Promise<TurbopackResult>
 export declare function projectEntrypointsSubscribe(project: { __napiType: "Project" }, func: (...args: any[]) => any): { __napiType: "RootTask" }
-export declare function projectHmrEvents(project: { __napiType: "Project" }, identifier: string, func: (...args: any[]) => any): { __napiType: "RootTask" }
+export declare function projectHmrEvents(project: { __napiType: "Project" }, identifier: RcStr, func: (...args: any[]) => any): { __napiType: "RootTask" }
 export interface HmrIdentifiers {
   identifiers: Array<string>
 }
@@ -166,16 +166,18 @@ export declare function projectUpdateInfoSubscribe(project: { __napiType: "Proje
 export interface StackFrame {
   isServer: boolean
   isInternal?: boolean
-  originalFile?: string
-  file: string
+  originalFile?: RcStr
+  file: RcStr
+  /** 1-indexed, unlike source map tokens */
   line?: number
+  /** 1-indexed, unlike source map tokens */
   column?: number
-  methodName?: string
+  methodName?: RcStr
 }
 export declare function projectTraceSource(project: { __napiType: "Project" }, frame: StackFrame, currentDirectoryFileUrl: string): Promise<StackFrame | null>
 export declare function projectGetSourceForAsset(project: { __napiType: "Project" }, filePath: string): Promise<string | null>
-export declare function projectGetSourceMap(project: { __napiType: "Project" }, filePath: string): Promise<string | null>
-export declare function projectGetSourceMapSync(project: { __napiType: "Project" }, filePath: string): string | null
+export declare function projectGetSourceMap(project: { __napiType: "Project" }, filePath: RcStr): Promise<string | null>
+export declare function projectGetSourceMapSync(project: { __napiType: "Project" }, filePath: RcStr): string | null
 export declare function rootTaskDispose(rootTask: { __napiType: "RootTask" }): void
 export interface NapiIssue {
   severity: string
@@ -186,7 +188,7 @@ export interface NapiIssue {
   detail?: any
   source?: NapiIssueSource
   documentationLink: string
-  subIssues: Array<NapiIssue>
+  importTraces: any
 }
 export interface NapiIssueSource {
   source: NapiSource

package/esm/types.d.ts

@@ -10,6 +10,7 @@ declare global {
     export type ExternalEndpoint = {
         readonly __tag: unique symbol;
     };
+    export type RcStr = string;
 }
 export interface BaseUpdate {
     resource: {

package/esm/webpackCompat.js

@@ -91,44 +91,135 @@ compatDefine.pluginName = "DefinePlugin";
 function compatDefine(maybeWebpackPluginInstance) {
     return maybeWebpackPluginInstance === null || maybeWebpackPluginInstance === void 0 ? void 0 : maybeWebpackPluginInstance.definitions;
 }
-function compatExternals(webpackExternal) {
+function compatExternals(webpackExternals) {
+    if (!webpackExternals) {
+        return undefined;
+    }
     let externals = {};
-    switch (typeof webpackExternal) {
-        case "string":
-            externals[webpackExternal] = webpackExternal;
+    switch (typeof webpackExternals) {
+        case "string": {
+            // Single string external: "lodash" -> { "lodash": "lodash" }
+            externals[webpackExternals] = webpackExternals;
             break;
-        case "object":
-            if (webpackExternal instanceof RegExp) {
-                throw "regex enternal not supported yet";
-            }
-            else if (Array.isArray(webpackExternal)) {
-                webpackExternal.forEach((k) => {
-                    switch (typeof k) {
-                        case "string":
-                            externals[k] = k;
-                            break;
-                        default:
-                            throw "non string external item not supported yet";
+        }
+        case "object": {
+            if (Array.isArray(webpackExternals)) {
+                // Array of externals: ["lodash", "react"] -> { "lodash": "lodash", "react": "react" }
+                externals = webpackExternals.reduce((acc, external) => {
+                    if (typeof external === "string") {
+                        acc[external] = external;
                     }
-                });
+                    else if (typeof external === "object" && external !== null) {
+                        Object.assign(acc, compatExternals(external));
+                    }
+                    return acc;
+                }, {});
+            }
+            else if (webpackExternals instanceof RegExp) {
+                throw "regex external not supported yet";
             }
             else {
-                if ("byLayer" in webpackExternal) {
+                if ("byLayer" in webpackExternals) {
                     throw "by layer external item not supported yet";
                 }
-                Object.entries(webpackExternal).forEach(([k, v]) => {
-                    switch (typeof v) {
-                        case "string":
-                            externals[k] = v;
-                            break;
-                        default:
-                            throw "non string external item not supported yet";
+                Object.entries(webpackExternals).forEach(([key, value]) => {
+                    if (typeof value === "string") {
+                        // Check if it's a script type with shorthand syntax: "global@https://example.com/script.js"
+                        if (value.includes("@") &&
+                            (value.startsWith("script ") || value.includes("://"))) {
+                            const match = value.match(/^(?:script\s+)?(.+?)@(.+)$/);
+                            if (match) {
+                                const [, globalName, scriptUrl] = match;
+                                // Use utoo-pack string format: "script globalName@url"
+                                externals[key] = `script ${globalName}@${scriptUrl}`;
+                            }
+                            else {
+                                externals[key] = value;
+                            }
+                        }
+                        else {
+                            // Simple string mapping: { "react": "React" }
+                            externals[key] = value;
+                        }
+                    }
+                    else if (Array.isArray(value)) {
+                        // Array format handling
+                        if (value.length >= 2) {
+                            const [first, second] = value;
+                            // Check if it's a script type array: ["https://example.com/script.js", "GlobalName"]
+                            if (typeof first === "string" &&
+                                first.includes("://") &&
+                                typeof second === "string") {
+                                // Use utoo-pack object format for script
+                                externals[key] = {
+                                    root: second,
+                                    type: "script",
+                                    script: first,
+                                };
+                            }
+                            else if (typeof first === "string" &&
+                                typeof second === "string") {
+                                // Handle type prefix formats
+                                if (first.startsWith("commonjs")) {
+                                    externals[key] = `commonjs ${second}`;
+                                }
+                                else if (first === "module") {
+                                    externals[key] = `esm ${second}`;
+                                }
+                                else if (first === "var" ||
+                                    first === "global" ||
+                                    first === "window") {
+                                    externals[key] = second;
+                                }
+                                else if (first === "script") {
+                                    // Script type without URL in array format - treat as regular script prefix
+                                    externals[key] = `script ${second}`;
+                                }
+                                else {
+                                    externals[key] = `${first} ${second}`;
+                                }
+                            }
+                            else {
+                                externals[key] = value[0] || key;
+                            }
+                        }
+                        else {
+                            externals[key] = value[0] || key;
+                        }
+                    }
+                    else if (typeof value === "object" && value !== null) {
+                        // Object format: handle complex configurations
+                        if ("root" in value || "commonjs" in value || "amd" in value) {
+                            // Standard webpack externals object format
+                            if (value.commonjs) {
+                                externals[key] = `commonjs ${value.commonjs}`;
+                            }
+                            else if (value.root) {
+                                externals[key] = value.root;
+                            }
+                            else if (value.amd) {
+                                externals[key] = value.amd;
+                            }
+                            else {
+                                externals[key] = key;
+                            }
+                        }
+                        else {
+                            // Treat as utoo-pack specific configuration (might already be in correct format)
+                            externals[key] = value;
+                        }
+                    }
+                    else {
+                        // Fallback to key name
+                        externals[key] = key;
                     }
                 });
             }
             break;
-        case "function":
+        }
+        case "function": {
             throw "functional external not supported yet";
+        }
         default:
             break;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@utoo/pack",
-  "version": "0.0.1-alpha.16",
+  "version": "0.0.1-alpha.18",
   "main": "cjs/index.js",
   "module": "esm/index.js",
   "exports": {
@@ -81,12 +81,12 @@
   },
   "repository": "git@github.com:umijs/mako.git",
   "optionalDependencies": {
-    "@utoo/pack-darwin-arm64": "0.0.1-alpha.16",
-    "@utoo/pack-darwin-x64": "0.0.1-alpha.16",
-    "@utoo/pack-linux-arm64-gnu": "0.0.1-alpha.16",
-    "@utoo/pack-linux-arm64-musl": "0.0.1-alpha.16",
-    "@utoo/pack-linux-x64-gnu": "0.0.1-alpha.16",
-    "@utoo/pack-linux-x64-musl": "0.0.1-alpha.16",
-    "@utoo/pack-win32-x64-msvc": "0.0.1-alpha.16"
+    "@utoo/pack-darwin-arm64": "0.0.1-alpha.18",
+    "@utoo/pack-darwin-x64": "0.0.1-alpha.18",
+    "@utoo/pack-linux-arm64-gnu": "0.0.1-alpha.18",
+    "@utoo/pack-linux-arm64-musl": "0.0.1-alpha.18",
+    "@utoo/pack-linux-x64-gnu": "0.0.1-alpha.18",
+    "@utoo/pack-linux-x64-musl": "0.0.1-alpha.18",
+    "@utoo/pack-win32-x64-msvc": "0.0.1-alpha.18"
   }
 }