@pimlico/alto 0.0.18 → 0.0.20

package/esm/cli/deploySimulationsContract.js

@@ -1,5 +1,17 @@
-import { DETERMINISTIC_DEPLOYER_TRANSACTION, pimlicoEntrypointSimulationsV7DeployBytecode, pimlicoEntrypointSimulationsSalt, pimlicoEntrypointSimulationsV8DeployBytecode } from "../types/index.js";
-import { createWalletClient, getContractAddress, http, concat } from "viem";
+import { http, concat, createWalletClient, getContractAddress, keccak256 } from "viem";
+import entrypointSimulationsJsonV7 from "../contracts/EntryPointSimulations.sol/EntryPointSimulations07.json" with {
+    type: "json"
+};
+import entrypointSimulationsJsonV8 from "../contracts/EntryPointSimulations.sol/EntryPointSimulations08.json" with {
+    type: "json"
+};
+import entrypointSimulationsJsonV9 from "../contracts/EntryPointSimulations.sol/EntryPointSimulations09.json" with {
+    type: "json"
+};
+import pimlicoSimulationsJson from "../contracts/PimlicoSimulations.sol/PimlicoSimulations.json" with {
+    type: "json"
+};
+export const DETERMINISTIC_DEPLOYER_TRANSACTION = "0xf8a58V85174876e80V830186aV8V80b853604580600e600039806000f350fe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600V81602V82378035828234f58015156039578182fd5b8V82525050506014600cf31ba02222222222222222222222222222222222222222222222222222222222222222a02222222222222222222222222222222222222222222222222222222222222222";
 const isContractDeployed = async ({ publicClient, address }) => {
     const code = await publicClient.getCode({
         address
@@ -7,46 +19,57 @@ const isContractDeployed = async ({ publicClient, address }) => {
     return code !== undefined && code !== "0x";
 };
 export const deploySimulationsContract = async ({ logger, args, publicClient }) => {
-    const contractAddressV7 = getContractAddress({
+    const utilityPrivateKey = args.utilityPrivateKey;
+    if (!utilityPrivateKey) {
+        throw new Error("Cannot deploy entryPoint simulations without utility-private-key");
+    }
+    const salt = keccak256(utilityPrivateKey.address);
+    const pimlicoSimulations = getContractAddress({
+        opcode: "CREATE2",
+        bytecode: pimlicoSimulationsJson.bytecode.object,
+        salt,
+        from: args.deterministicDeployerAddress
+    });
+    const epSimulationsV7 = getContractAddress({
+        opcode: "CREATE2",
+        bytecode: entrypointSimulationsJsonV7.bytecode.object,
+        salt,
+        from: args.deterministicDeployerAddress
+    });
+    const epSimulationsV8 = getContractAddress({
         opcode: "CREATE2",
-        bytecode: pimlicoEntrypointSimulationsV7DeployBytecode,
-        salt: pimlicoEntrypointSimulationsSalt,
+        bytecode: entrypointSimulationsJsonV8.bytecode.object,
+        salt,
         from: args.deterministicDeployerAddress
     });
-    const contractAddressV8 = getContractAddress({
+    const epSimulationsV9 = getContractAddress({
         opcode: "CREATE2",
-        bytecode: pimlicoEntrypointSimulationsV8DeployBytecode,
-        salt: pimlicoEntrypointSimulationsSalt,
+        bytecode: entrypointSimulationsJsonV9.bytecode.object,
+        salt,
         from: args.deterministicDeployerAddress
     });
-    const [isV7Deployed, isV8Deployed, isDeterministicDeployerDeployed] = await Promise.all([
-        isContractDeployed({ publicClient, address: contractAddressV7 }),
-        isContractDeployed({ publicClient, address: contractAddressV8 }),
+    const [isPimlicoDeployed, isDeployedV7, isDeployedV8, isDeployedV9, isDeterministicDeployerDeployed] = await Promise.all([
+        isContractDeployed({ publicClient, address: pimlicoSimulations }),
+        isContractDeployed({ publicClient, address: epSimulationsV7 }),
+        isContractDeployed({ publicClient, address: epSimulationsV8 }),
+        isContractDeployed({ publicClient, address: epSimulationsV9 }),
         isContractDeployed({
             publicClient,
             address: args.deterministicDeployerAddress
         })
     ]);
-    if (isV7Deployed && isV8Deployed && isDeterministicDeployerDeployed) {
+    if (isDeployedV7 &&
+        isDeployedV8 &&
+        isDeployedV9 &&
+        isPimlicoDeployed &&
+        isDeterministicDeployerDeployed) {
         return {
-            entrypointSimulationContractV7: contractAddressV7,
-            entrypointSimulationContractV8: contractAddressV8
+            pimlicoSimulationContract: pimlicoSimulations,
+            entrypointSimulationContractV7: epSimulationsV7,
+            entrypointSimulationContractV8: epSimulationsV8,
+            entrypointSimulationContractV9: epSimulationsV9
         };
     }
-    const utilityPrivateKey = args.utilityPrivateKey;
-    if (!utilityPrivateKey) {
-        throw new Error("Cannot deploy entryPoint simulations without utility-private-key");
-    }
-    // if (args.entrypointSimulationContract) {
-    //     if (
-    //         await isContractDeployed({
-    //             publicClient,
-    //             address: args.entrypointSimulationContract
-    //         })
-    //     ) {
-    //         return args.entrypointSimulationContract
-    //     }
-    // }
     const walletClient = createWalletClient({
         transport: http(args.rpcUrl),
         account: utilityPrivateKey
@@ -59,27 +82,45 @@ export const deploySimulationsContract = async ({ logger, args, publicClient })
             hash: deterministicDeployHash
         });
     }
-    if (!isV7Deployed) {
+    if (!isPimlicoDeployed) {
+        try {
+            const deployHash = await walletClient.sendTransaction({
+                chain: publicClient.chain,
+                to: args.deterministicDeployerAddress,
+                data: concat([
+                    salt,
+                    pimlicoSimulationsJson.bytecode.object
+                ])
+            });
+            await publicClient.waitForTransactionReceipt({
+                hash: deployHash
+            });
+        }
+        catch {
+            logger.error("Failed to deploy PimlicoSimulations contract");
+        }
+    }
+    if (!isDeployedV7) {
         const deployHash = await walletClient.sendTransaction({
             chain: publicClient.chain,
             to: args.deterministicDeployerAddress,
             data: concat([
-                pimlicoEntrypointSimulationsSalt,
-                pimlicoEntrypointSimulationsV7DeployBytecode
+                salt,
+                entrypointSimulationsJsonV7.bytecode.object
             ])
         });
         await publicClient.waitForTransactionReceipt({
             hash: deployHash
         });
     }
-    if (!isV8Deployed) {
+    if (!isDeployedV8) {
         try {
             const deployHash = await walletClient.sendTransaction({
                 chain: publicClient.chain,
                 to: args.deterministicDeployerAddress,
                 data: concat([
-                    pimlicoEntrypointSimulationsSalt,
-                    pimlicoEntrypointSimulationsV8DeployBytecode
+                    salt,
+                    entrypointSimulationsJsonV8.bytecode.object
                 ])
             });
             await publicClient.waitForTransactionReceipt({
@@ -90,17 +131,44 @@ export const deploySimulationsContract = async ({ logger, args, publicClient })
             logger.error("Failed to deploy simulationsContract V8");
         }
     }
+    if (!isDeployedV9) {
+        try {
+            const deployHash = await walletClient.sendTransaction({
+                chain: publicClient.chain,
+                to: args.deterministicDeployerAddress,
+                data: concat([
+                    salt,
+                    entrypointSimulationsJsonV9.bytecode.object
+                ])
+            });
+            await publicClient.waitForTransactionReceipt({
+                hash: deployHash
+            });
+        }
+        catch {
+            logger.error("Failed to deploy simulationsContract V9");
+        }
+    }
     const deployStatus = await Promise.all([
-        isContractDeployed({ publicClient, address: contractAddressV7 }),
-        isContractDeployed({ publicClient, address: contractAddressV8 })
+        isContractDeployed({ publicClient, address: pimlicoSimulations }),
+        isContractDeployed({ publicClient, address: epSimulationsV7 }),
+        isContractDeployed({ publicClient, address: epSimulationsV8 }),
+        isContractDeployed({ publicClient, address: epSimulationsV9 })
     ]);
-    if (!deployStatus[1]) {
-        logger.error("Failed to deploy simulationsContract V8");
+    // EntryPointSimulationsV8 is optional as not all chains support cancun.
+    if (!deployStatus[2]) {
+        logger.error("Failed to deploy simulationsContract 0.7");
+    }
+    // EntryPointSimulationsV8 is optional as not all chains support cancun.
+    if (!deployStatus[3]) {
+        logger.error("Failed to deploy simulationsContract 0.9");
     }
     if (deployStatus[0]) {
         return {
-            entrypointSimulationContractV7: contractAddressV7,
-            entrypointSimulationContractV8: contractAddressV8
+            entrypointSimulationContractV7: epSimulationsV7,
+            entrypointSimulationContractV8: epSimulationsV8,
+            entrypointSimulationContractV9: epSimulationsV9,
+            pimlicoSimulationContract: pimlicoSimulations
         };
     }
     throw new Error("Failed to deploy simulationsContract");

package/esm/cli/deploySimulationsContract.js.map

@@ -1 +1 @@
-{"version":3,"file":"deploySimulationsContract.js","sourceRoot":"","sources":["../../cli/deploySimulationsContract.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"deploySimulationsContract.js","sourceRoot":"","sources":["../../cli/deploySimulationsContract.ts"],"names":[],"mappings":"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"}

package/esm/cli/handler.js

@@ -1,15 +1,24 @@
 import { GasPriceManager } from "../handlers/index.js";
 import { createMetrics, initDebugLogger, initProductionLogger } from "../utils/index.js";
 import { Registry } from "prom-client";
-import { createPublicClient, createWalletClient, formatEther, fallback, publicActions } from "viem";
-import { customTransport } from "./customTransport.js";
-import { setupServer } from "./setupServer.js";
+import { createPublicClient, createWalletClient, fallback, formatEther, publicActions } from "viem";
+import * as chains from "viem/chains";
 import { createConfig } from "../createConfig.js";
-import { parseArgs } from "./parseArgs.js";
-import { deploySimulationsContract } from "./deploySimulationsContract.js";
 import { getSenderManager } from "../executor/senderManager/index.js";
 import { UtilityWalletMonitor } from "../executor/utilityWalletMonitor.js";
+import { customTransport } from "./customTransport.js";
+import { deploySimulationsContract } from "./deploySimulationsContract.js";
+import { parseArgs } from "./parseArgs.js";
+import { setupServer } from "./setupServer.js";
 const preFlightChecks = async (config) => {
+    // Check horizontal scaling configuration
+    if (config.enableHorizontalScaling && !config.redisEndpoint) {
+        throw new Error("Horizontal scaling is enabled but redis-endpoint is not configured.");
+    }
+    // Check Redis receipt cache configuration
+    if (config.enableRedisReceiptCache && !config.redisEndpoint) {
+        throw new Error("Redis receipt cache is enabled but redis-endpoint is not configured.");
+    }
     for (const entrypoint of config.entrypoints) {
         const entryPointCode = await config.publicClient.getCode({
             address: entrypoint
@@ -18,13 +27,22 @@ const preFlightChecks = async (config) => {
             throw new Error(`entry point ${entrypoint} does not exist`);
         }
     }
+    if (config.pimlicoSimulationContract) {
+        const address = config.pimlicoSimulationContract;
+        const code = await config.publicClient.getCode({
+            address: address
+        });
+        if (code === undefined || code === "0x") {
+            throw new Error(`PimlicoSimulations contract ${address} does not exist`);
+        }
+    }
     if (config.entrypointSimulationContractV7) {
-        const simulations = config.entrypointSimulationContractV7;
-        const simulationsCode = await config.publicClient.getCode({
-            address: simulations
+        const address = config.entrypointSimulationContractV7;
+        const code = await config.publicClient.getCode({
+            address
         });
-        if (simulationsCode === undefined || simulationsCode === "0x") {
-            throw new Error(`EntryPointSimulationsV7 contract ${simulations} does not exist`);
+        if (code === undefined || code === "0x") {
+            throw new Error(`EntryPointSimulationsV7 contract ${address} does not exist`);
         }
     }
     // if (config.entrypointSimulationContractV8) {
@@ -38,6 +56,17 @@ const preFlightChecks = async (config) => {
     //         )
     //     }
     // }
+    // if (config.entrypointSimulationContractV9) {
+    //     const simulations = config.entrypointSimulationContractV9
+    //     const simulationsCode = await config.publicClient.getCode({
+    //         address: simulations
+    //     })
+    //     if (simulationsCode === undefined || simulationsCode === "0x") {
+    //         throw new Error(
+    //             `EntryPointSimulationsV9 contract ${simulations} does not exist`
+    //         )
+    //     }
+    // }
     if (config.refillHelperContract) {
         const refillHelper = config.refillHelperContract;
         const refillHelperCode = await config.publicClient.getCode({
@@ -48,8 +77,24 @@ const preFlightChecks = async (config) => {
         }
     }
 };
+const getViemChain = ({ chainId, args }) => {
+    for (const chain of Object.values(chains)) {
+        if (chain.id === chainId) {
+            return {
+                ...chain,
+                blockTime: chain.blockTime ?? args.blockTime,
+                rpcUrls: {
+                    default: { http: [args.rpcUrl] },
+                    public: { http: [args.rpcUrl] }
+                }
+            };
+        }
+    }
+    return null;
+};
 export async function bundlerHandler(args_) {
     const args = parseArgs(args_);
+    const enableCors = args.enableCors;
     const logger = args.json
         ? initProductionLogger(args.logLevel)
         : initDebugLogger(args.logLevel);
@@ -64,7 +109,9 @@ export async function bundlerHandler(args_) {
         return await client.getChainId();
     };
     const chainId = await getChainId();
-    const chain = {
+    // let us assume that the block time is at least 2x the polling interval
+    const viemChain = getViemChain({ chainId, args });
+    const chain = viemChain ?? {
         id: chainId,
         name: "chain-name", // isn't important, never used
         nativeCurrency: {
@@ -72,10 +119,12 @@ export async function bundlerHandler(args_) {
             symbol: "ETH",
             decimals: 18
         },
+        blockTime: args.blockTime,
         rpcUrls: {
             default: { http: [args.rpcUrl] },
             public: { http: [args.rpcUrl] }
-        }
+        },
+        experimental_preconfirmationTime: args.flashblocksPreconfirmationTime
     };
     let publicClient = createPublicClient({
         transport: customTransport(args.rpcUrl, {
@@ -83,6 +132,7 @@ export async function bundlerHandler(args_) {
                 level: args.publicClientLogLevel || args.logLevel
             })
         }),
+        pollingInterval: args.blockTime / 4,
         chain
     });
     // Some permissioned chains require a whitelisted address to make deployments.
@@ -101,15 +151,21 @@ export async function bundlerHandler(args_) {
     const createWalletTransport = (url) => customTransport(url, {
         logger: logger.child({ module: "wallet_client" }, { level: args.walletClientLogLevel || args.logLevel })
     });
-    const walletClient = createWalletClient({
-        transport: args.sendTransactionRpcUrl
-            ? fallback([
-                createWalletTransport(args.sendTransactionRpcUrl),
-                createWalletTransport(args.rpcUrl)
-            ], { rank: false })
-            : createWalletTransport(args.rpcUrl),
-        chain
-    });
+    const walletClients = {
+        private: args.sendTransactionRpcUrl
+            ? createWalletClient({
+                transport: fallback([
+                    createWalletTransport(args.sendTransactionRpcUrl),
+                    createWalletTransport(args.rpcUrl)
+                ], { rank: false }),
+                chain
+            })
+            : undefined,
+        public: createWalletClient({
+            transport: createWalletTransport(args.rpcUrl),
+            chain
+        })
+    };
     // if flag is set, use utility wallet to deploy the simulations contract
     if (args.deploySimulationsContract) {
         const deployedContracts = await deploySimulationsContract({
@@ -121,8 +177,24 @@ export async function bundlerHandler(args_) {
             deployedContracts.entrypointSimulationContractV7;
         args.entrypointSimulationContractV8 =
             deployedContracts.entrypointSimulationContractV8;
+        args.entrypointSimulationContractV9 =
+            deployedContracts.entrypointSimulationContractV9;
+        args.pimlicoSimulationContract =
+            deployedContracts.pimlicoSimulationContract;
+        logger.info({
+            entrypointSimulationContractV7: deployedContracts.entrypointSimulationContractV7,
+            entrypointSimulationContractV8: deployedContracts.entrypointSimulationContractV8,
+            entrypointSimulationContractV9: deployedContracts.entrypointSimulationContractV9,
+            pimlicoSimulationContract: deployedContracts.pimlicoSimulationContract
+        }, "Contracts used for simulation");
     }
-    const config = createConfig({ ...args, logger, publicClient, walletClient });
+    const config = createConfig({
+        ...args,
+        logger,
+        publicClient,
+        walletClients,
+        enableCors
+    });
     const gasPriceManager = new GasPriceManager(config);
     await gasPriceManager.init();
     const registry = new Registry();

package/esm/cli/handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../cli/handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../cli/handler.ts"],"names":[],"mappings":"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"}

package/esm/cli/instrumentation.js

@@ -1,13 +1,18 @@
+import module from "node:module";
 import { SpanKind } from "@opentelemetry/api";
 import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-proto";
 import { FastifyInstrumentation } from "@opentelemetry/instrumentation-fastify";
 import { HttpInstrumentation } from "@opentelemetry/instrumentation-http";
 import { PinoInstrumentation } from "@opentelemetry/instrumentation-pino";
 import { UndiciInstrumentation } from "@opentelemetry/instrumentation-undici";
-import { ViemInstrumentation } from "@pimlico/opentelemetry-instrumentation-viem";
 import { NodeSDK } from "@opentelemetry/sdk-node";
 import { ParentBasedSampler, SamplingDecision } from "@opentelemetry/sdk-trace-base";
 import { SemanticAttributes } from "@opentelemetry/semantic-conventions";
+import { ViemInstrumentation } from "@pimlico/opentelemetry-instrumentation-viem";
+import { createAddHookMessageChannel } from "import-in-the-middle";
+const { registerOptions, waitForAllMessagesAcknowledged } = createAddHookMessageChannel();
+// @ts-ignore —  @types/node needs to be updated first
+module.register("import-in-the-middle/hook.mjs", import.meta.url, registerOptions);
 class CustomSampler {
     shouldSample(_context, _traceId, _spanName, spanKind, attributes) {
         const ignoredRoutes = ["/metrics", "/health"];
@@ -42,4 +47,5 @@ const sdk = new NodeSDK({
     sampler: new ParentBasedSampler({ root: new CustomSampler() })
 });
 sdk.start();
+await waitForAllMessagesAcknowledged();
 //# sourceMappingURL=instrumentation.js.map

package/esm/cli/instrumentation.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentation.js","sourceRoot":"","sources":["../../cli/instrumentation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiC,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAC5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAA;AAC5E,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAA;AAC/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAA;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAA;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAA;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAA;AACjF,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAA;AACjD,OAAO,EACH,kBAAkB,EAElB,gBAAgB,EACnB,MAAM,+BAA+B,CAAA;AACtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAA;AAExE,MAAM,aAAa;IACf,YAAY,CACR,QAAiB,EACjB,QAAgB,EAChB,SAAiB,EACjB,QAAkB,EAClB,UAAsB;QAEtB,MAAM,aAAa,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC,CAAA;QAE7C,MAAM,UAAU,GAAG,UAAU,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAA;QAE7D,IACI,QAAQ,KAAK,QAAQ,CAAC,MAAM;YAC5B,UAAU;YACV,aAAa,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,EAC/C,CAAC;YACC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,CAAC,UAAU,EAAE,CAAA;QACpD,CAAC;QACD,WAAW;QACX,OAAO,EAAE,QAAQ,EAAE,gBAAgB,CAAC,kBAAkB,EAAE,CAAA;IAC5D,CAAC;IACD,QAAQ;QACJ,OAAO,eAAe,CAAA;IAC1B,CAAC;CACJ;AAED,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC;IACpB,aAAa,EAAE,IAAI,iBAAiB,EAAE;IACtC,gBAAgB,EAAE;QACd,IAAI,mBAAmB,CAAC;YACpB,6BAA6B,EAAE,IAAI;SACtC,CAAC;QACF,IAAI,qBAAqB,CAAC;YACtB,qBAAqB,EAAE,IAAI;SAC9B,CAAC;QACF,IAAI,sBAAsB,EAAE;QAC5B,IAAI,mBAAmB,EAAE;QACzB,IAAI,mBAAmB,CAAC;YACpB,sBAAsB,EAAE,IAAI;SAC/B,CAAC;KACL;IACD,OAAO,EAAE,IAAI,kBAAkB,CAAC,EAAE,IAAI,EAAE,IAAI,aAAa,EAAE,EAAE,CAAC;CACjE,CAAC,CAAA;AAEF,GAAG,CAAC,KAAK,EAAE,CAAA"}
+{"version":3,"file":"instrumentation.js","sourceRoot":"","sources":["../../cli/instrumentation.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAA;AAChC,OAAO,EAAiC,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAC5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAA;AAC5E,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAA;AAC/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAA;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAA;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAA;AAC7E,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAA;AACjD,OAAO,EACH,kBAAkB,EAElB,gBAAgB,EACnB,MAAM,+BAA+B,CAAA;AACtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAA;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAA;AACjF,OAAO,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAA;AAElE,MAAM,EAAE,eAAe,EAAE,8BAA8B,EAAE,GACrD,2BAA2B,EAAE,CAAA;AACjC,sDAAsD;AACtD,MAAM,CAAC,QAAQ,CACX,+BAA+B,EAC/B,MAAM,CAAC,IAAI,CAAC,GAAG,EACf,eAAe,CAClB,CAAA;AAED,MAAM,aAAa;IACf,YAAY,CACR,QAAiB,EACjB,QAAgB,EAChB,SAAiB,EACjB,QAAkB,EAClB,UAAsB;QAEtB,MAAM,aAAa,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC,CAAA;QAE7C,MAAM,UAAU,GAAG,UAAU,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAA;QAE7D,IACI,QAAQ,KAAK,QAAQ,CAAC,MAAM;YAC5B,UAAU;YACV,aAAa,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,EAC/C,CAAC;YACC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,CAAC,UAAU,EAAE,CAAA;QACpD,CAAC;QACD,WAAW;QACX,OAAO,EAAE,QAAQ,EAAE,gBAAgB,CAAC,kBAAkB,EAAE,CAAA;IAC5D,CAAC;IACD,QAAQ;QACJ,OAAO,eAAe,CAAA;IAC1B,CAAC;CACJ;AAED,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC;IACpB,aAAa,EAAE,IAAI,iBAAiB,EAAE;IACtC,gBAAgB,EAAE;QACd,IAAI,mBAAmB,CAAC;YACpB,6BAA6B,EAAE,IAAI;SACtC,CAAC;QACF,IAAI,qBAAqB,CAAC;YACtB,qBAAqB,EAAE,IAAI;SAC9B,CAAC;QACF,IAAI,sBAAsB,EAAE;QAC5B,IAAI,mBAAmB,EAAE;QACzB,IAAI,mBAAmB,CAAC;YACpB,sBAAsB,EAAE,IAAI;SAC/B,CAAC;KACL;IACD,OAAO,EAAE,IAAI,kBAAkB,CAAC,EAAE,IAAI,EAAE,IAAI,aAAa,EAAE,EAAE,CAAC;CACjE,CAAC,CAAA;AAEF,GAAG,CAAC,KAAK,EAAE,CAAA;AACX,MAAM,8BAA8B,EAAE,CAAA"}

package/esm/cli/parseArgs.js.map

@@ -1 +1 @@
-{"version":3,"file":"parseArgs.js","sourceRoot":"","sources":["../../cli/parseArgs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,gBAAgB,EAAsB,MAAM,WAAW,CAAA;AAC/E,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAanD,SAAS,WAAW,CAAC,GAAW;IAC5B,OAAO,GAAG,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,KAAK,EAAE,EAAE,CAC5C,KAAK,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CACxD,CAAA;AACL,CAAC;AAED,SAAS,sBAAsB,CAC3B,GAAM;IAEN,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAC1B,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACT,MAAM,YAAY,GAAG,WAAW,CAC5B,GAAG,CAC2B,CACjC;QAAC,GAAW,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,GAAc,CAAC,CAAA;QAEjD,OAAO,GAAG,CAAA;IACd,CAAC,EACD,EAA6B,CAChC,CAAA;AACL,CAAC;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,CACrB,IAAmB,EACW,EAAE;IAChC,MAAM,OAAO,GAAG,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAChD,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QACnB,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QACzC,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IAClC,CAAC;IAED,OAAO,sBAAsB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAC/C,CAAC,CAAA"}
+{"version":3,"file":"parseArgs.js","sourceRoot":"","sources":["../../cli/parseArgs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqC,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAC/E,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAanD,SAAS,WAAW,CAAC,GAAW;IAC5B,OAAO,GAAG,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,KAAK,EAAE,EAAE,CAC5C,KAAK,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CACxD,CAAA;AACL,CAAC;AAED,SAAS,sBAAsB,CAC3B,GAAM;IAEN,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAC1B,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACT,MAAM,YAAY,GAAG,WAAW,CAC5B,GAAG,CAC2B,CACjC;QAAC,GAAW,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,GAAc,CAAC,CAAA;QAEjD,OAAO,GAAG,CAAA;IACd,CAAC,EACD,EAA6B,CAChC,CAAA;AACL,CAAC;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,CACrB,IAAmB,EACW,EAAE;IAChC,MAAM,OAAO,GAAG,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAChD,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QACnB,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QACzC,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IAClC,CAAC;IAED,OAAO,sBAAsB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAC/C,CAAC,CAAA"}