@utoo/pack 1.2.12 → 1.2.13

package/cjs/binding.d.ts

@@ -9,6 +9,22 @@ export declare class ExternalObject<T> {
     [K: symbol]: T
   }
 }
+/** Arguments for `NapiTurbopackCallbacks::throw_turbopack_internal_error`. */
+export interface TurbopackInternalErrorOpts {
+  message: string
+  anonymizedLocation?: string
+}
+export interface NapiTurbopackCallbacksJsObject {
+  /**
+   * Called when we've encountered a bug in Turbopack and not in the user's code. Constructs and
+   * throws a `TurbopackInternalError` type. Logs to anonymized telemetry.
+   *
+   * As a result of the use of `ErrorStrategy::CalleeHandled`, the first argument is an error if
+   * there's a runtime conversion error. This should never happen, but if it does, the function
+   * can throw it instead.
+   */
+  throwTurbopackInternalError: (conversionError: Error | null, opts: TurbopackInternalErrorOpts) => never
+}
 export declare function registerWorkerScheduler(creator: (arg: NapiWorkerCreation) => any, terminator: (arg: NapiWorkerTermination) => any): void
 export declare function workerCreated(workerId: number): void
 export interface NapiWorkerCreation {
@@ -133,7 +149,7 @@ export interface NapiTurboEngineOptions {
   /** Track dependencies between tasks. If false, any change during build will error. */
   dependencyTracking?: boolean
 }
-export declare function projectNew(options: NapiProjectOptions, turboEngineOptions: NapiTurboEngineOptions): Promise<{ __napiType: "Project" }>
+export declare function projectNew(options: NapiProjectOptions, turboEngineOptions: NapiTurboEngineOptions, napiCallbacks: NapiTurbopackCallbacksJsObject): Promise<{ __napiType: "Project" }>
 export declare function projectUpdate(project: { __napiType: "Project" }, options: NapiPartialProjectOptions): Promise<void>
 /**
  * Runs exit handlers for the project registered using the [`ExitHandler`] API.
@@ -198,6 +214,23 @@ export declare function projectTraceSource(project: { __napiType: "Project" }, f
 export declare function projectGetSourceForAsset(project: { __napiType: "Project" }, filePath: string): Promise<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
+/**
+ * A version of [`NapiTurbopackCallbacks`] that can accepted as an argument to a napi function.
+ *
+ * This can be converted into a [`NapiTurbopackCallbacks`] with
+ * [`NapiTurbopackCallbacks::from_js`].
+ */
+export interface NapiTurbopackCallbacksJsObject {
+  /**
+   * Called when we've encountered a bug in Turbopack and not in the user's code. Constructs and
+   * throws a `TurbopackInternalError` type. Logs to anonymized telemetry.
+   *
+   * As a result of the use of `ErrorStrategy::CalleeHandled`, the first argument is an error if
+   * there's a runtime conversion error. This should never happen, but if it does, the function
+   * can throw it instead.
+   */
+  throwTurbopackInternalError: (conversionError: Error | null, opts: TurbopackInternalErrorOpts) => never
+}
 export declare function rootTaskDispose(rootTask: { __napiType: "RootTask" }): void
 export interface NapiIssue {
   severity: string

package/cjs/core/project.d.ts

@@ -1,9 +1,16 @@
-import type { HmrIdentifiers, NapiUpdateMessage, NapiWrittenEndpoint, StackFrame } from "../binding";
+import type { HmrIdentifiers, NapiUpdateMessage, NapiWrittenEndpoint, StackFrame, TurbopackInternalErrorOpts } from "../binding";
 import * as binding from "../binding";
 import { ProjectOptions, RawEntrypoints, Update } from "./types";
+/**
+ * An error caused by a bug in Turbopack, and not the user's code (e.g. a Rust panic). These should
+ * be written to a log file and details should not be shown to the user.
+ *
+ * These are constructed in Turbopack by calling `throwTurbopackInternalError`.
+ */
 export declare class TurbopackInternalError extends Error {
     name: string;
-    constructor(cause: Error);
+    location: string | undefined;
+    constructor({ message, anonymizedLocation }: TurbopackInternalErrorOpts);
 }
 export declare function projectFactory(): (options: Required<ProjectOptions>, turboEngineOptions: binding.NapiTurboEngineOptions) => Promise<{
     readonly _nativeProject: {

package/cjs/core/project.js

@@ -40,20 +40,38 @@ const util_1 = require("util");
 const binding = __importStar(require("../binding"));
 const common_1 = require("../utils/common");
 const loaderWorkerPool_1 = require("./loaderWorkerPool");
+/**
+ * An error caused by a bug in Turbopack, and not the user's code (e.g. a Rust panic). These should
+ * be written to a log file and details should not be shown to the user.
+ *
+ * These are constructed in Turbopack by calling `throwTurbopackInternalError`.
+ */
 class TurbopackInternalError extends Error {
-    constructor(cause) {
-        super(cause.message);
+    constructor({ message, anonymizedLocation }) {
+        super(message);
         this.name = "TurbopackInternalError";
-        this.stack = cause.stack;
+        this.location = anonymizedLocation;
     }
 }
 exports.TurbopackInternalError = TurbopackInternalError;
+/**
+ * A helper used by the napi Rust entrypoints to construct and throw a `TurbopackInternalError`.
+ */
+function throwTurbopackInternalError(conversionError, opts) {
+    if (conversionError != null) {
+        throw new Error("NAPI type conversion error in throwTurbopackInternalError", { cause: conversionError });
+    }
+    throw new TurbopackInternalError(opts);
+}
 async function withErrorCause(fn) {
+    var _a;
     try {
         return await fn();
     }
     catch (nativeError) {
-        throw new TurbopackInternalError(nativeError);
+        throw new TurbopackInternalError({
+            message: (_a = nativeError === null || nativeError === void 0 ? void 0 : nativeError.message) !== null && _a !== void 0 ? _a : String(nativeError),
+        });
     }
 }
 async function serializeConfig(config) {
@@ -253,7 +271,7 @@ function projectFactory() {
                 if (e === cancel)
                     return;
                 if (e instanceof Error) {
-                    throw new TurbopackInternalError(e);
+                    throw new TurbopackInternalError({ message: e.message });
                 }
                 throw e;
             }
@@ -351,6 +369,8 @@ function projectFactory() {
         };
     }
     return async function createProject(options, turboEngineOptions) {
-        return new ProjectImpl(await binding.projectNew(await rustifyProjectOptions(options), turboEngineOptions || {}));
+        return new ProjectImpl(await binding.projectNew(await rustifyProjectOptions(options), turboEngineOptions || {}, {
+            throwTurbopackInternalError,
+        }));
     };
 }

package/cjs/defineConfig.d.ts

@@ -0,0 +1,16 @@
+import type { UserConfig } from "./config/types";
+/**
+ * Type-safe config helper for utoopack.config.mjs / utoopack.config.js.
+ * Provides type inference and editor support, similar to Vite/Rollup defineConfig.
+ *
+ * @example
+ * ```ts
+ * // utoopack.config.mjs
+ * import { defineConfig } from '@utoo/pack';
+ * export default defineConfig({
+ *   entry: [{ import: './src/index.ts', html: { template: './index.html' } }],
+ *   output: { path: './dist', clean: true },
+ * });
+ * ```
+ */
+export declare function defineConfig(config: UserConfig): UserConfig;

package/cjs/defineConfig.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.defineConfig = defineConfig;
+/**
+ * Type-safe config helper for utoopack.config.mjs / utoopack.config.js.
+ * Provides type inference and editor support, similar to Vite/Rollup defineConfig.
+ *
+ * @example
+ * ```ts
+ * // utoopack.config.mjs
+ * import { defineConfig } from '@utoo/pack';
+ * export default defineConfig({
+ *   entry: [{ import: './src/index.ts', html: { template: './index.html' } }],
+ *   output: { path: './dist', clean: true },
+ * });
+ * ```
+ */
+function defineConfig(config) {
+    return config;
+}

package/cjs/index.d.ts

@@ -3,6 +3,7 @@ import { serve } from "./commands/dev";
 import * as webpackCompat from "./config/webpackCompat";
 export { build };
 export { serve };
+export { defineConfig } from "./defineConfig";
 declare const utoopack: {
     build: typeof build;
     serve: typeof serve;

package/cjs/index.js

@@ -14,11 +14,13 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serve = exports.build = void 0;
+exports.defineConfig = exports.serve = exports.build = void 0;
 const build_1 = require("./commands/build");
 Object.defineProperty(exports, "build", { enumerable: true, get: function () { return build_1.build; } });
 const dev_1 = require("./commands/dev");
 Object.defineProperty(exports, "serve", { enumerable: true, get: function () { return dev_1.serve; } });
+var defineConfig_1 = require("./defineConfig");
+Object.defineProperty(exports, "defineConfig", { enumerable: true, get: function () { return defineConfig_1.defineConfig; } });
 const utoopack = { build: build_1.build, serve: dev_1.serve };
 exports.default = utoopack;
 __exportStar(require("./config/types"), exports);

package/esm/binding.d.ts

@@ -9,6 +9,22 @@ export declare class ExternalObject<T> {
     [K: symbol]: T
   }
 }
+/** Arguments for `NapiTurbopackCallbacks::throw_turbopack_internal_error`. */
+export interface TurbopackInternalErrorOpts {
+  message: string
+  anonymizedLocation?: string
+}
+export interface NapiTurbopackCallbacksJsObject {
+  /**
+   * Called when we've encountered a bug in Turbopack and not in the user's code. Constructs and
+   * throws a `TurbopackInternalError` type. Logs to anonymized telemetry.
+   *
+   * As a result of the use of `ErrorStrategy::CalleeHandled`, the first argument is an error if
+   * there's a runtime conversion error. This should never happen, but if it does, the function
+   * can throw it instead.
+   */
+  throwTurbopackInternalError: (conversionError: Error | null, opts: TurbopackInternalErrorOpts) => never
+}
 export declare function registerWorkerScheduler(creator: (arg: NapiWorkerCreation) => any, terminator: (arg: NapiWorkerTermination) => any): void
 export declare function workerCreated(workerId: number): void
 export interface NapiWorkerCreation {
@@ -133,7 +149,7 @@ export interface NapiTurboEngineOptions {
   /** Track dependencies between tasks. If false, any change during build will error. */
   dependencyTracking?: boolean
 }
-export declare function projectNew(options: NapiProjectOptions, turboEngineOptions: NapiTurboEngineOptions): Promise<{ __napiType: "Project" }>
+export declare function projectNew(options: NapiProjectOptions, turboEngineOptions: NapiTurboEngineOptions, napiCallbacks: NapiTurbopackCallbacksJsObject): Promise<{ __napiType: "Project" }>
 export declare function projectUpdate(project: { __napiType: "Project" }, options: NapiPartialProjectOptions): Promise<void>
 /**
  * Runs exit handlers for the project registered using the [`ExitHandler`] API.
@@ -198,6 +214,23 @@ export declare function projectTraceSource(project: { __napiType: "Project" }, f
 export declare function projectGetSourceForAsset(project: { __napiType: "Project" }, filePath: string): Promise<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
+/**
+ * A version of [`NapiTurbopackCallbacks`] that can accepted as an argument to a napi function.
+ *
+ * This can be converted into a [`NapiTurbopackCallbacks`] with
+ * [`NapiTurbopackCallbacks::from_js`].
+ */
+export interface NapiTurbopackCallbacksJsObject {
+  /**
+   * Called when we've encountered a bug in Turbopack and not in the user's code. Constructs and
+   * throws a `TurbopackInternalError` type. Logs to anonymized telemetry.
+   *
+   * As a result of the use of `ErrorStrategy::CalleeHandled`, the first argument is an error if
+   * there's a runtime conversion error. This should never happen, but if it does, the function
+   * can throw it instead.
+   */
+  throwTurbopackInternalError: (conversionError: Error | null, opts: TurbopackInternalErrorOpts) => never
+}
 export declare function rootTaskDispose(rootTask: { __napiType: "RootTask" }): void
 export interface NapiIssue {
   severity: string

package/esm/core/project.d.ts

@@ -1,9 +1,16 @@
-import type { HmrIdentifiers, NapiUpdateMessage, NapiWrittenEndpoint, StackFrame } from "../binding";
+import type { HmrIdentifiers, NapiUpdateMessage, NapiWrittenEndpoint, StackFrame, TurbopackInternalErrorOpts } from "../binding";
 import * as binding from "../binding";
 import { ProjectOptions, RawEntrypoints, Update } from "./types";
+/**
+ * An error caused by a bug in Turbopack, and not the user's code (e.g. a Rust panic). These should
+ * be written to a log file and details should not be shown to the user.
+ *
+ * These are constructed in Turbopack by calling `throwTurbopackInternalError`.
+ */
 export declare class TurbopackInternalError extends Error {
     name: string;
-    constructor(cause: Error);
+    location: string | undefined;
+    constructor({ message, anonymizedLocation }: TurbopackInternalErrorOpts);
 }
 export declare function projectFactory(): (options: Required<ProjectOptions>, turboEngineOptions: binding.NapiTurboEngineOptions) => Promise<{
     readonly _nativeProject: {

package/esm/core/project.js

@@ -3,19 +3,37 @@ import { isDeepStrictEqual } from "util";
 import * as binding from "../binding.js";
 import { getPackPath, rustifyEnv } from "../utils/common.js";
 import { runLoaderWorkerPool } from "./loaderWorkerPool.js";
+/**
+ * An error caused by a bug in Turbopack, and not the user's code (e.g. a Rust panic). These should
+ * be written to a log file and details should not be shown to the user.
+ *
+ * These are constructed in Turbopack by calling `throwTurbopackInternalError`.
+ */
 export class TurbopackInternalError extends Error {
-    constructor(cause) {
-        super(cause.message);
+    constructor({ message, anonymizedLocation }) {
+        super(message);
         this.name = "TurbopackInternalError";
-        this.stack = cause.stack;
+        this.location = anonymizedLocation;
     }
 }
+/**
+ * A helper used by the napi Rust entrypoints to construct and throw a `TurbopackInternalError`.
+ */
+function throwTurbopackInternalError(conversionError, opts) {
+    if (conversionError != null) {
+        throw new Error("NAPI type conversion error in throwTurbopackInternalError", { cause: conversionError });
+    }
+    throw new TurbopackInternalError(opts);
+}
 async function withErrorCause(fn) {
+    var _a;
     try {
         return await fn();
     }
     catch (nativeError) {
-        throw new TurbopackInternalError(nativeError);
+        throw new TurbopackInternalError({
+            message: (_a = nativeError === null || nativeError === void 0 ? void 0 : nativeError.message) !== null && _a !== void 0 ? _a : String(nativeError),
+        });
     }
 }
 async function serializeConfig(config) {
@@ -215,7 +233,7 @@ export function projectFactory() {
                 if (e === cancel)
                     return;
                 if (e instanceof Error) {
-                    throw new TurbopackInternalError(e);
+                    throw new TurbopackInternalError({ message: e.message });
                 }
                 throw e;
             }
@@ -313,6 +331,8 @@ export function projectFactory() {
         };
     }
     return async function createProject(options, turboEngineOptions) {
-        return new ProjectImpl(await binding.projectNew(await rustifyProjectOptions(options), turboEngineOptions || {}));
+        return new ProjectImpl(await binding.projectNew(await rustifyProjectOptions(options), turboEngineOptions || {}, {
+            throwTurbopackInternalError,
+        }));
     };
 }

package/esm/defineConfig.d.ts

@@ -0,0 +1,16 @@
+import type { UserConfig } from "./config/types";
+/**
+ * Type-safe config helper for utoopack.config.mjs / utoopack.config.js.
+ * Provides type inference and editor support, similar to Vite/Rollup defineConfig.
+ *
+ * @example
+ * ```ts
+ * // utoopack.config.mjs
+ * import { defineConfig } from '@utoo/pack';
+ * export default defineConfig({
+ *   entry: [{ import: './src/index.ts', html: { template: './index.html' } }],
+ *   output: { path: './dist', clean: true },
+ * });
+ * ```
+ */
+export declare function defineConfig(config: UserConfig): UserConfig;

package/esm/defineConfig.js

@@ -0,0 +1,17 @@
+/**
+ * Type-safe config helper for utoopack.config.mjs / utoopack.config.js.
+ * Provides type inference and editor support, similar to Vite/Rollup defineConfig.
+ *
+ * @example
+ * ```ts
+ * // utoopack.config.mjs
+ * import { defineConfig } from '@utoo/pack';
+ * export default defineConfig({
+ *   entry: [{ import: './src/index.ts', html: { template: './index.html' } }],
+ *   output: { path: './dist', clean: true },
+ * });
+ * ```
+ */
+export function defineConfig(config) {
+    return config;
+}

package/esm/index.d.ts

@@ -3,6 +3,7 @@ import { serve } from "./commands/dev";
 import * as webpackCompat from "./config/webpackCompat";
 export { build };
 export { serve };
+export { defineConfig } from "./defineConfig";
 declare const utoopack: {
     build: typeof build;
     serve: typeof serve;

package/esm/index.js

@@ -2,6 +2,7 @@ import { build } from "./commands/build.js";
 import { serve } from "./commands/dev.js";
 export { build };
 export { serve };
+export { defineConfig } from "./defineConfig.js";
 const utoopack = { build, serve };
 export default utoopack;
 export * from "./config/types.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@utoo/pack",
-  "version": "1.2.12",
+  "version": "1.2.13",
   "main": "cjs/index.js",
   "module": "esm/index.js",
   "types": "esm/index.d.ts",
@@ -39,7 +39,7 @@
   "dependencies": {
     "@babel/code-frame": "7.22.5",
     "@swc/helpers": "0.5.15",
-    "@utoo/pack-shared": "1.2.12",
+    "@utoo/pack-shared": "1.2.13",
     "@utoo/style-loader": "^1.0.0",
     "domparser-rs": "^0.0.7",
     "find-up": "4.1.0",
@@ -86,12 +86,12 @@
   },
   "repository": "git@github.com:utooland/utoo.git",
   "optionalDependencies": {
-    "@utoo/pack-darwin-arm64": "1.2.12",
-    "@utoo/pack-darwin-x64": "1.2.12",
-    "@utoo/pack-linux-arm64-gnu": "1.2.12",
-    "@utoo/pack-linux-arm64-musl": "1.2.12",
-    "@utoo/pack-linux-x64-gnu": "1.2.12",
-    "@utoo/pack-linux-x64-musl": "1.2.12",
-    "@utoo/pack-win32-x64-msvc": "1.2.12"
+    "@utoo/pack-darwin-arm64": "1.2.13",
+    "@utoo/pack-darwin-x64": "1.2.13",
+    "@utoo/pack-linux-arm64-gnu": "1.2.13",
+    "@utoo/pack-linux-arm64-musl": "1.2.13",
+    "@utoo/pack-linux-x64-gnu": "1.2.13",
+    "@utoo/pack-linux-x64-musl": "1.2.13",
+    "@utoo/pack-win32-x64-msvc": "1.2.13"
   }
 }