@voidzero-dev/vite-plus-core 0.2.8 → 0.3.0

package/dist/rolldown/shared/{bindingify-input-options-B03y7DfJ.mjs → bindingify-input-options-V9YvAjrr.mjs}

@@ -1,8 +1,8 @@
-import { n as __toESM, t as require_binding } from "./binding-DwUQWZOo.mjs";
+import { n as __toESM, t as require_binding } from "./binding-C__LJDBG.mjs";
 import { i as logFailedValidation, l as logPluginError, n as error, o as logInvalidLogPosition, r as logCycleLoading, t as augmentCodeLocation } from "./logs-DmYCAKcW.mjs";
-import { i as bindingifyManifestPlugin, n as BuiltinPlugin, r as bindingifyBuiltInPlugin, t as normalizedStringOrRegex } from "./normalize-string-or-regex-Cj-DgIV1.mjs";
+import { i as bindingifyManifestPlugin, n as BuiltinPlugin, r as bindingifyBuiltInPlugin, t as normalizedStringOrRegex } from "./normalize-string-or-regex-CFtim40S.mjs";
 import { i as noop, n as isPathFragment, o as unreachable, s as unsupported, t as arraify } from "./misc-DOSKtd97.mjs";
-import { a as bindingifySourcemap, i as unwrapBindingResult, t as aggregateBindingErrorsIntoJsError } from "./error-nLggAzpQ.mjs";
+import { a as bindingifySourcemap, i as unwrapBindingResult, t as aggregateBindingErrorsIntoJsError } from "./error-NcRuXAVN.mjs";
 import { parseAst } from "../parse-ast-index.mjs";
 import fs from "node:fs";
 import path from "node:path";
@@ -10,7 +10,7 @@ import * as filter from "@voidzero-dev/vite-plus-core/rolldown/pluginutils";
 import fsp from "node:fs/promises";
 import { fileURLToPath } from "node:url";
 //#region package.json
-var version = "1.2.2";
+var version = "1.2.5";
 var description = "Fast JavaScript/TypeScript bundler in Rust with Rollup-compatible API.";
 //#endregion
 //#region src/constants/version.ts
@@ -236,7 +236,7 @@ function bindingAssetSource(source) {
 	return { inner: source };
 }
 //#endregion
-//#region \0@oxc-project+runtime@0.142.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.146.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -2342,11 +2342,7 @@ function bindingifyInput(input) {
 }
 function bindingifyWatch(watch) {
 	if (watch) {
-		if (watch.notify) console.warn("The \"watch.notify\" option is deprecated. Please use \"watch.watcher\" instead.");
-		const watcher = {
-			...watch.notify,
-			...watch.watcher
-		};
+		const watcher = watch.watcher ?? {};
 		return {
 			buildDelay: watch.buildDelay,
 			skipWrite: watch.skipWrite,

package/dist/rolldown/shared/{constructors-ALilxAii.d.mts → constructors-CRumnw21.d.mts}

@@ -1,5 +1,5 @@
-import { C as BindingViteJsonPluginConfig, D as BindingViteReporterPluginConfig, E as BindingViteReactRefreshWrapperPluginConfig, O as BindingViteResolvePluginConfig, S as BindingViteImportGlobPluginConfig, T as BindingViteModulePreloadPolyfillPluginConfig, b as BindingViteBuildImportAnalysisPluginConfig, l as BindingIsolatedDeclarationPluginConfig, s as BindingEsmExternalRequirePluginConfig, x as BindingViteDynamicImportVarsPluginConfig } from "./binding-CVtkJvyl.mjs";
-import { Gt as StringOrRegExp, I as BuiltinPlugin } from "./define-config-DSMNXceb.mjs";
+import { C as BindingViteImportGlobPluginConfig, D as BindingViteReactRefreshWrapperPluginConfig, E as BindingViteModulePreloadPolyfillPluginConfig, O as BindingViteReporterPluginConfig, S as BindingViteDynamicImportVarsPluginConfig, k as BindingViteResolvePluginConfig, l as BindingIsolatedDeclarationPluginConfig, s as BindingEsmExternalRequirePluginConfig, w as BindingViteJsonPluginConfig, x as BindingViteBuildImportAnalysisPluginConfig } from "./binding-Bvw14S3g.mjs";
+import { Gt as StringOrRegExp, I as BuiltinPlugin } from "./define-config-DwTNhgWB.mjs";
 //#region src/builtin-plugin/constructors.d.ts
 declare function viteModulePreloadPolyfillPlugin(config?: BindingViteModulePreloadPolyfillPluginConfig): BuiltinPlugin;
 type DynamicImportVarsPluginConfig = Omit<BindingViteDynamicImportVarsPluginConfig, "include" | "exclude"> & {

package/dist/rolldown/shared/{constructors-COwFYQna.mjs → constructors-DklcHr18.mjs}

@@ -1,4 +1,4 @@
-import { a as makeBuiltinPluginCallable, n as BuiltinPlugin, t as normalizedStringOrRegex } from "./normalize-string-or-regex-Cj-DgIV1.mjs";
+import { a as makeBuiltinPluginCallable, n as BuiltinPlugin, t as normalizedStringOrRegex } from "./normalize-string-or-regex-CFtim40S.mjs";
 //#region src/builtin-plugin/constructors.ts
 function viteModulePreloadPolyfillPlugin(config) {
 	return new BuiltinPlugin("builtin:vite-module-preload-polyfill", config);

package/dist/rolldown/shared/{create-bundler-option-B-tSTZRt.mjs → create-bundler-option-DbV2ud0B.mjs}

@@ -1,7 +1,7 @@
-import { n as __toESM, t as require_binding } from "./binding-DwUQWZOo.mjs";
+import { n as __toESM, t as require_binding } from "./binding-C__LJDBG.mjs";
 import { a as logInputHookInOutputPlugin, n as error } from "./logs-DmYCAKcW.mjs";
-import { n as BuiltinPlugin } from "./normalize-string-or-regex-Cj-DgIV1.mjs";
-import { C as LOG_LEVEL_WARN, T as VERSION, _ as getParallelPluginInfo, a as measureIfFunction, b as LOG_LEVEL_DEBUG, c as PluginContextData, d as transformRenderedChunk, g as MinimalPluginContextImpl, i as measureHookCost, l as transformModuleInfo, o as pluginTimingsRecorderFor, p as transformAssetSource, r as OUTPUT_OPTIONS_OWNER, t as bindingifyInputOptions, v as normalizeHook, w as logLevelPriority, y as normalizeLog } from "./bindingify-input-options-B03y7DfJ.mjs";
+import { n as BuiltinPlugin } from "./normalize-string-or-regex-CFtim40S.mjs";
+import { C as LOG_LEVEL_WARN, T as VERSION, _ as getParallelPluginInfo, a as measureIfFunction, b as LOG_LEVEL_DEBUG, c as PluginContextData, d as transformRenderedChunk, g as MinimalPluginContextImpl, i as measureHookCost, l as transformModuleInfo, o as pluginTimingsRecorderFor, p as transformAssetSource, r as OUTPUT_OPTIONS_OWNER, t as bindingifyInputOptions, v as normalizeHook, w as logLevelPriority, y as normalizeLog } from "./bindingify-input-options-V9YvAjrr.mjs";
 import { a as unimplemented } from "./misc-DOSKtd97.mjs";
 import { Worker } from "node:worker_threads";
 import path, { sep } from "node:path";
@@ -1522,7 +1522,8 @@ const ChecksOptionsSchema = /* @__PURE__ */ strictObject({
 	unsupportedTsconfigOption: /* @__PURE__ */ pipe(/* @__PURE__ */ optional(/* @__PURE__ */ boolean()), /* @__PURE__ */ description("Whether to emit warnings when a tsconfig option or combination of options is not supported")),
 	ineffectiveDynamicImport: /* @__PURE__ */ pipe(/* @__PURE__ */ optional(/* @__PURE__ */ boolean()), /* @__PURE__ */ description("Whether to emit warnings when a module is dynamically imported but also statically imported, making the dynamic import ineffective for code splitting")),
 	largeBarrelModules: /* @__PURE__ */ pipe(/* @__PURE__ */ optional(/* @__PURE__ */ boolean()), /* @__PURE__ */ description("Whether to emit info logs when a barrel module has a very large number of re-exports (more than 5000)")),
-	sourcemapBroken: /* @__PURE__ */ pipe(/* @__PURE__ */ optional(/* @__PURE__ */ boolean()), /* @__PURE__ */ description("Whether to emit warnings when a plugin transforms code without generating a sourcemap"))
+	sourcemapBroken: /* @__PURE__ */ pipe(/* @__PURE__ */ optional(/* @__PURE__ */ boolean()), /* @__PURE__ */ description("Whether to emit warnings when a plugin transforms code without generating a sourcemap")),
+	namespaceConflict: /* @__PURE__ */ pipe(/* @__PURE__ */ optional(/* @__PURE__ */ boolean()), /* @__PURE__ */ description("Whether to emit warnings when multiple star re-exports provide the same name from different modules"))
 });
 const MinifyOptionsSchema = /* @__PURE__ */ strictObject({
 	compress: /* @__PURE__ */ optional(/* @__PURE__ */ union([/* @__PURE__ */ boolean(), /* @__PURE__ */ strictObject({

package/dist/rolldown/shared/{define-config-DSMNXceb.d.mts → define-config-DwTNhgWB.d.mts}

@@ -1,5 +1,5 @@
 import { a as RolldownLog, i as RolldownError, n as LogLevelOption, o as RolldownLogWithString, r as LogOrStringHandler, t as LogLevel } from "./logging-xuHO4mAy.mjs";
-import { A as BindingWatcherBundler, B as PreRenderedChunk, F as MinifyOptions$1, P as JsxOptions, W as TransformOptions$1, c as BindingHookResolveIdExtraArgs, d as BindingMagicString, f as BindingPluginContextResolveOptions, g as BindingTransformHookExtraArgs, j as ExternalMemoryStatus, m as BindingRenderedChunk, t as BindingBuiltinPluginName, z as ParserOptions } from "./binding-CVtkJvyl.mjs";
+import { B as ParserOptions, F as JsxOptions, G as TransformOptions$1, I as MinifyOptions$1, M as ExternalMemoryStatus, V as PreRenderedChunk, _ as BindingTransformHookExtraArgs, c as BindingHookResolveIdExtraArgs, d as BindingMagicString, h as BindingRenderedChunk, j as BindingWatcherBundler, p as BindingPluginContextResolveOptions, t as BindingBuiltinPluginName } from "./binding-Bvw14S3g.mjs";
 import { TopLevelFilterExpression } from "@voidzero-dev/vite-plus-core/rolldown/pluginutils";
 import { Program } from "@oxc-project/types";
 //#region src/types/misc.d.ts
@@ -334,7 +334,7 @@ type GlobalsFunction = (name: string) => string;
 type CodeSplittingNameFunction = (moduleId: string, ctx: ChunkingContext) => string | NullValue;
 /** @inline @category Code Splitting */
 type CodeSplittingTestFunction = (id: string) => boolean | undefined | void;
-type MinifyOptions = Omit<MinifyOptions$1, "module" | "sourcemap">;
+type MinifyOptions = Omit<MinifyOptions$1, "module" | "sourcemap" | "mangleProps">;
 interface CommentsOptions {
   /**
    * Comments that contain `@license`, `@preserve` or start with `//!` or `/*!`
@@ -1679,6 +1679,11 @@ interface ChecksOptions {
    * @default true
    * */
   sourcemapBroken?: boolean;
+  /**
+   * Whether to emit warnings when multiple star re-exports provide the same name from different modules.
+   * @default true
+   * */
+  namespaceConflict?: boolean;
 }
 //#endregion
 //#region src/options/transform-options.d.ts
@@ -2608,10 +2613,10 @@ declare const RUNTIME_MODULE_ID = "\0rolldown/runtime.js";
 //#region src/builtin-plugin/utils.d.ts
 declare class BuiltinPlugin {
   name: BindingBuiltinPluginName;
-  _options?: unknown;
+  _options?: unknown | undefined;
   /** Vite-specific option to control plugin ordering */
   enforce?: "pre" | "post";
-  constructor(name: BindingBuiltinPluginName, _options?: unknown);
+  constructor(name: BindingBuiltinPluginName, _options?: unknown | undefined);
 }
 //#endregion
 //#region src/constants/plugin.d.ts
@@ -3376,10 +3381,6 @@ interface WatcherOptions {
    * File watcher options for configuring how file changes are detected.
    */
   watcher?: WatcherFileWatcherOptions;
-  /**
-   * @deprecated Use {@linkcode watcher} instead.
-   */
-  notify?: WatcherFileWatcherOptions;
   /**
    * Filter to limit the file-watching to certain files.
    *
@@ -3983,8 +3984,9 @@ interface InputOptions {
    * Devtools integration options.
    *
    * When enabled, Rolldown writes JSON-lines devtools output under
-   * `node_modules/.rolldown/{session_id}/`. Consumers can parse the output with
-   * `@rolldown/debug` after `await bundle.close()` resolves.
+   * `node_modules/.rolldown/{session_id}/`, resolved against {@linkcode cwd}.
+   * Consumers can parse the output with `@rolldown/debug` after
+   * `await bundle.close()` resolves.
    *
    * @experimental
    */

package/dist/rolldown/shared/{error-nLggAzpQ.mjs → error-NcRuXAVN.mjs}

@@ -1,4 +1,4 @@
-import { t as require_binding } from "./binding-DwUQWZOo.mjs";
+import { t as require_binding } from "./binding-C__LJDBG.mjs";
 //#region src/types/sourcemap.ts
 function bindingifySourcemap(map) {
 	if (map == null) return;

package/dist/rolldown/shared/{load-config-O4G7NVNA.mjs → load-config-Dd7jKGUy.mjs}

@@ -1,4 +1,4 @@
-import { t as rolldown } from "./rolldown-qV_fUwyM.mjs";
+import { t as rolldown } from "./rolldown-Bblizyw1.mjs";
 import fs from "node:fs";
 import path from "node:path";
 import { readdir } from "node:fs/promises";

package/dist/rolldown/shared/{normalize-string-or-regex-Cj-DgIV1.mjs → normalize-string-or-regex-CFtim40S.mjs}

@@ -1,4 +1,4 @@
-import { n as __toESM, t as require_binding } from "./binding-DwUQWZOo.mjs";
+import { n as __toESM, t as require_binding } from "./binding-C__LJDBG.mjs";
 import { l as logPluginError, n as error } from "./logs-DmYCAKcW.mjs";
 //#region src/builtin-plugin/utils.ts
 var import_binding = /* @__PURE__ */ __toESM(require_binding(), 1);

package/dist/rolldown/shared/{parse-CQfUbVuN.mjs → parse-rvxTD36n.mjs}

@@ -1,5 +1,5 @@
-import { n as __toESM, t as require_binding } from "./binding-DwUQWZOo.mjs";
-//#region ../../../node_modules/.pnpm/oxc-parser@0.142.0/node_modules/oxc-parser/src-js/wrap.js
+import { n as __toESM, t as require_binding } from "./binding-C__LJDBG.mjs";
+//#region ../../../node_modules/.pnpm/oxc-parser@0.146.0/node_modules/oxc-parser/src-js/wrap.js
 var import_binding = /* @__PURE__ */ __toESM(require_binding(), 1);
 function wrap(result) {
 	let program, module, comments, errors;

package/dist/rolldown/shared/{resolve-tsconfig-CE3HNSOK.mjs → resolve-tsconfig-D2vSIIkR.mjs}

@@ -1,5 +1,5 @@
-import { n as __toESM, t as require_binding } from "./binding-DwUQWZOo.mjs";
-import { a as bindingifySourcemap, n as normalizeBindingError } from "./error-nLggAzpQ.mjs";
+import { n as __toESM, t as require_binding } from "./binding-C__LJDBG.mjs";
+import { a as bindingifySourcemap, n as normalizeBindingError } from "./error-NcRuXAVN.mjs";
 //#region src/utils/minify.ts
 var import_binding = /* @__PURE__ */ __toESM(require_binding(), 1);
 /**

package/dist/rolldown/shared/{rolldown-qV_fUwyM.mjs → rolldown-Bblizyw1.mjs}

@@ -1,7 +1,7 @@
-import { n as __toESM, t as require_binding } from "./binding-DwUQWZOo.mjs";
-import { f as __decorate, h as PlainObjectLike, m as lazyProp, u as transformToRollupOutput } from "./bindingify-input-options-B03y7DfJ.mjs";
-import { l as PluginDriver, s as validateOption, t as createBundlerOptions } from "./create-bundler-option-B-tSTZRt.mjs";
-import { i as unwrapBindingResult } from "./error-nLggAzpQ.mjs";
+import { n as __toESM, t as require_binding } from "./binding-C__LJDBG.mjs";
+import { f as __decorate, h as PlainObjectLike, m as lazyProp, u as transformToRollupOutput } from "./bindingify-input-options-V9YvAjrr.mjs";
+import { l as PluginDriver, s as validateOption, t as createBundlerOptions } from "./create-bundler-option-DbV2ud0B.mjs";
+import { i as unwrapBindingResult } from "./error-NcRuXAVN.mjs";
 //#region src/types/rolldown-output-impl.ts
 var import_binding = /* @__PURE__ */ __toESM(require_binding(), 1);
 var RolldownOutputImpl = class extends PlainObjectLike {

package/dist/rolldown/shared/{transform-WmU_cI8e.d.mts → transform--WSMLt1x.d.mts}

@@ -1,5 +1,5 @@
 import { a as RolldownLog } from "./logging-xuHO4mAy.mjs";
-import { F as MinifyOptions$1, G as TsconfigCache$1, I as MinifyResult$1, R as ParseResult$1, U as SourceMap, a as BindingEnhancedTransformOptions, o as BindingEnhancedTransformResult, y as BindingTsconfigResult, z as ParserOptions$1 } from "./binding-CVtkJvyl.mjs";
+import { B as ParserOptions$1, I as MinifyOptions$1, K as TsconfigCache$1, L as MinifyResult$1, W as SourceMap, a as BindingEnhancedTransformOptions, b as BindingTsconfigResult, o as BindingEnhancedTransformResult, z as ParseResult$1 } from "./binding-Bvw14S3g.mjs";
 //#region src/utils/resolve-tsconfig.d.ts
 /**
  * Cache for tsconfig resolution to avoid redundant file system operations.

package/dist/rolldown/shared/{watch-BNIsji74.mjs → watch-DPvOlccK.mjs}

@@ -1,9 +1,9 @@
-import { n as __toESM, t as require_binding } from "./binding-DwUQWZOo.mjs";
+import { n as __toESM, t as require_binding } from "./binding-C__LJDBG.mjs";
 import { s as logMultipleWatcherOption } from "./logs-DmYCAKcW.mjs";
-import { C as LOG_LEVEL_WARN } from "./bindingify-input-options-B03y7DfJ.mjs";
+import { C as LOG_LEVEL_WARN } from "./bindingify-input-options-V9YvAjrr.mjs";
 import { t as arraify } from "./misc-DOSKtd97.mjs";
-import { l as PluginDriver, t as createBundlerOptions } from "./create-bundler-option-B-tSTZRt.mjs";
-import { t as aggregateBindingErrorsIntoJsError } from "./error-nLggAzpQ.mjs";
+import { l as PluginDriver, t as createBundlerOptions } from "./create-bundler-option-DbV2ud0B.mjs";
+import { t as aggregateBindingErrorsIntoJsError } from "./error-NcRuXAVN.mjs";
 //#region ../../../node_modules/.pnpm/signal-exit@4.1.0/node_modules/signal-exit/dist/mjs/signals.js
 /**
 * This is not the set of all possible signals.
@@ -327,7 +327,7 @@ function warnMultiplePollingOptions(bundlerOptions) {
 	let found = false;
 	for (const option of bundlerOptions) {
 		const watch = option.inputOptions.watch;
-		const watcher = watch && typeof watch === "object" ? watch.watcher ?? watch.notify : void 0;
+		const watcher = watch && typeof watch === "object" ? watch.watcher : void 0;
 		if (watcher && (watcher.usePolling != null || watcher.pollInterval != null)) {
 			if (found) {
 				option.onLog(LOG_LEVEL_WARN, logMultipleWatcherOption());

package/dist/rolldown/utils-index.d.mts

@@ -1,8 +1,8 @@
-import { _ as BindingTsconfigCompilerOptions, v as BindingTsconfigRawOptions } from "./shared/binding-CVtkJvyl.mjs";
-import { a as MinifyOptions, c as minifySync, d as parse, f as parseSync, i as transformSync, l as ParseResult, n as TransformResult, o as MinifyResult, p as TsconfigCache, r as transform, s as minify, t as TransformOptions, u as ParserOptions } from "./shared/transform-WmU_cI8e.mjs";
+import { v as BindingTsconfigCompilerOptions, y as BindingTsconfigRawOptions } from "./shared/binding-Bvw14S3g.mjs";
+import { a as MinifyOptions, c as minifySync, d as parse, f as parseSync, i as transformSync, l as ParseResult, n as TransformResult, o as MinifyResult, p as TsconfigCache, r as transform, s as minify, t as TransformOptions, u as ParserOptions } from "./shared/transform--WSMLt1x.mjs";
 import * as ESTree from "@oxc-project/types";
 import { Program } from "@oxc-project/types";
-//#region ../../../node_modules/.pnpm/oxc-parser@0.142.0/node_modules/oxc-parser/src-js/generated/visit/visitor.d.ts
+//#region ../../../node_modules/.pnpm/oxc-parser@0.146.0/node_modules/oxc-parser/src-js/generated/visit/visitor.d.ts
 interface VisitorObject$1 {
   DebuggerStatement?: (node: ESTree.DebuggerStatement) => void;
   "DebuggerStatement:exit"?: (node: ESTree.DebuggerStatement) => void;

package/dist/rolldown/utils-index.mjs

@@ -1,6 +1,6 @@
-import { n as parseSync, t as parse } from "./shared/parse-CQfUbVuN.mjs";
-import { a as minify, i as transformSync, o as minifySync, r as transform, t as TsconfigCache } from "./shared/resolve-tsconfig-CE3HNSOK.mjs";
-//#region ../../../node_modules/.pnpm/oxc-parser@0.142.0/node_modules/oxc-parser/src-js/generated/visit/walk.js
+import { n as parseSync, t as parse } from "./shared/parse-rvxTD36n.mjs";
+import { a as minify, i as transformSync, o as minifySync, r as transform, t as TsconfigCache } from "./shared/resolve-tsconfig-D2vSIIkR.mjs";
+//#region ../../../node_modules/.pnpm/oxc-parser@0.146.0/node_modules/oxc-parser/src-js/generated/visit/walk.js
 function walkNode(node, visitors) {
 	if (node == null) return;
 	if (Array.isArray(node)) {
@@ -2008,7 +2008,7 @@ function walkTSUnionType(node, visitors) {
 	exit !== null && exit(node);
 }
 //#endregion
-//#region ../../../node_modules/.pnpm/oxc-parser@0.142.0/node_modules/oxc-parser/src-js/generated/visit/type_ids.js
+//#region ../../../node_modules/.pnpm/oxc-parser@0.146.0/node_modules/oxc-parser/src-js/generated/visit/type_ids.js
 /** Mapping from node type name to node type ID */
 const NODE_TYPE_IDS_MAP = /* @__PURE__ */ new Map([
 	["DebuggerStatement", 0],
@@ -2178,7 +2178,7 @@ const NODE_TYPE_IDS_MAP = /* @__PURE__ */ new Map([
 	["TSUnionType", 164]
 ]);
 //#endregion
-//#region ../../../node_modules/.pnpm/oxc-parser@0.142.0/node_modules/oxc-parser/src-js/visit/visitor.js
+//#region ../../../node_modules/.pnpm/oxc-parser@0.146.0/node_modules/oxc-parser/src-js/visit/visitor.js
 let compiledVisitor;
 function createCompiledVisitor() {
 	compiledVisitor = [];
@@ -2241,14 +2241,16 @@ function addVisitorToCompiled(visitor) {
 		const typeId = NODE_TYPE_IDS_MAP.get(name);
 		if (typeId === void 0) throw new Error(`Unknown node type '${name}' in visitor object`);
 		const existing = compiledVisitor[typeId];
-		if (typeId < 27) if (existing === null) compiledVisitor[typeId] = visitFn;
-		else if (Array.isArray(existing)) if (isExit) existing.push(visitFn);
-		else existing.splice(existing.length - 1, 0, visitFn);
-		else {
-			compiledVisitor[typeId] = isExit ? createVisitFnArray(existing, visitFn) : createVisitFnArray(visitFn, existing);
-			mergedLeafVisitorTypeIds.push(typeId);
-		}
-		else if (existing === null) {
+		if (typeId < 27) {
+			if (existing === null) compiledVisitor[typeId] = visitFn;
+			else if (Array.isArray(existing)) {
+				if (isExit) existing.push(visitFn);
+				else existing.splice(existing.length - 1, 0, visitFn);
+			} else {
+				compiledVisitor[typeId] = isExit ? createVisitFnArray(existing, visitFn) : createVisitFnArray(visitFn, existing);
+				mergedLeafVisitorTypeIds.push(typeId);
+			}
+		} else if (existing === null) {
 			const enterExit = compiledVisitor[typeId] = getEnterExitObject();
 			if (isExit) enterExit.exit = visitFn;
 			else enterExit.enter = visitFn;