@walkeros/cli 4.4.0 → 4.5.0

package/dist/index.js

@@ -1280,6 +1280,127 @@ var init_structural_validators = __esm({
   }
 });
 
+// src/core/step-packages.ts
+import { packageNameToVariable } from "@walkeros/core";
+function getFlowSection(flow, section) {
+  switch (section) {
+    case "sources":
+      return flow.sources;
+    case "destinations":
+      return flow.destinations;
+    case "transformers":
+      return flow.transformers;
+    case "stores":
+      return flow.stores;
+  }
+}
+function parsePackageSpec(spec) {
+  const at = spec.lastIndexOf("@");
+  if (at <= 0) return { name: spec };
+  const version = spec.slice(at + 1);
+  return version ? { name: spec.slice(0, at), version } : { name: spec.slice(0, at) };
+}
+function detectStepPackages(flowSettings, section) {
+  const packages = /* @__PURE__ */ new Set();
+  const steps = getFlowSection(flowSettings, section);
+  if (steps) {
+    for (const [, stepConfig] of Object.entries(steps)) {
+      if (typeof stepConfig !== "object" || stepConfig === null) continue;
+      if (typeof stepConfig.package === "string") {
+        packages.add(stepConfig.package);
+      }
+    }
+  }
+  return packages;
+}
+function collectAllStepPackages(flowSettings) {
+  const allPackages = /* @__PURE__ */ new Set();
+  const sections = [
+    "sources",
+    "destinations",
+    "transformers",
+    "stores"
+  ];
+  for (const section of sections) {
+    for (const pkg of detectStepPackages(flowSettings, section)) {
+      allPackages.add(pkg);
+    }
+  }
+  return allPackages;
+}
+function applyStepPackages(flowSettings, packages, logger) {
+  const stepPackages = collectAllStepPackages(flowSettings);
+  const originalPins = /* @__PURE__ */ new Map();
+  const inlineSeen = /* @__PURE__ */ new Map();
+  const rewriteSteps = (from, to) => {
+    for (const section of [
+      "sources",
+      "destinations",
+      "transformers",
+      "stores"
+    ]) {
+      const steps = getFlowSection(flowSettings, section);
+      if (!steps) continue;
+      for (const step of Object.values(steps)) {
+        if (step.package === from) {
+          step.package = to;
+        }
+      }
+    }
+  };
+  for (const pkg of stepPackages) {
+    const isLocalPath = pkg.startsWith(".") || pkg.startsWith("/");
+    if (isLocalPath) {
+      const varName = packageNameToVariable(pkg);
+      if (!packages[varName]) {
+        packages[varName] = {
+          path: pkg
+        };
+      }
+      rewriteSteps(pkg, varName);
+      continue;
+    }
+    const { name, version } = parsePackageSpec(pkg);
+    if (!originalPins.has(name)) {
+      const entry = packages[name];
+      originalPins.set(
+        name,
+        entry?.version !== void 0 || entry?.path !== void 0
+      );
+    }
+    const hasBundlePin = originalPins.get(name) === true;
+    if (name !== pkg) {
+      rewriteSteps(pkg, name);
+    }
+    if (version && !hasBundlePin) {
+      const seen = inlineSeen.get(name);
+      if (seen !== void 0 && seen !== version) {
+        throw new Error(
+          `Conflicting inline versions for ${name}: "${seen}" and "${version}" are declared by different steps. Pin one version in config.bundle.packages.`
+        );
+      }
+      inlineSeen.set(name, version);
+    }
+    const existing = packages[name];
+    if (!existing) {
+      packages[name] = version ? { version } : {};
+    } else if (version && !existing.path) {
+      if (!existing.version) {
+        existing.version = version;
+      } else if (existing.version !== version) {
+        logger.warn(
+          `Package ${name}: config.bundle.packages pins ${existing.version}; a step declares ${version} inline. Using the bundle pin.`
+        );
+      }
+    }
+  }
+}
+var init_step_packages = __esm({
+  "src/core/step-packages.ts"() {
+    "use strict";
+  }
+});
+
 // src/core/cache-utils.ts
 import { getHashServer } from "@walkeros/server-core";
 import semver from "semver";
@@ -1318,7 +1439,7 @@ var init_cache_utils = __esm({
   }
 });
 
-// src/commands/bundle/package-manager.ts
+// src/core/package-manager.ts
 import pacote from "pacote";
 import path8 from "path";
 import fs7 from "fs-extra";
@@ -1867,9 +1988,9 @@ Each package must use the same version across all declarations. Please update yo
 }
 var PACOTE_OPTS, PACOTE_RETRY_ATTEMPTS, PACOTE_PER_ATTEMPT_TIMEOUT_MS, PACOTE_MAX_TOTAL_MS, MIN_ATTEMPT_BUDGET_MS, BASE_BACKOFF_MS, JITTER, PERMANENT_ERROR_CODES, SOURCE_PRIORITY;
 var init_package_manager = __esm({
-  "src/commands/bundle/package-manager.ts"() {
+  "src/core/package-manager.ts"() {
     "use strict";
-    init_core();
+    init_local_packages();
     init_cache_utils();
     init_tmp();
     PACOTE_OPTS = {
@@ -2188,7 +2309,7 @@ import { builtinModules } from "module";
 import path12 from "path";
 import fs11 from "fs-extra";
 import {
-  packageNameToVariable,
+  packageNameToVariable as packageNameToVariable2,
   ENV_MARKER_PREFIX,
   SECRET_MARKER_PREFIX as SECRET_MARKER_PREFIX2,
   isPathStepEntry,
@@ -2198,18 +2319,6 @@ import { getHashServer as getHashServer3 } from "@walkeros/server-core";
 function isInlineCode2(code) {
   return code !== null && typeof code === "object" && !Array.isArray(code) && "push" in code;
 }
-function getFlowSection(flow, section) {
-  switch (section) {
-    case "sources":
-      return flow.sources;
-    case "destinations":
-      return flow.destinations;
-    case "transformers":
-      return flow.transformers;
-    case "stores":
-      return flow.stores;
-  }
-}
 function hasCodeReference2(code) {
   return isInlineCode2(code) || typeof code === "string";
 }
@@ -2674,19 +2783,6 @@ function createEsbuildOptions(buildOptions, entryPath, outputPath, tempDir, pack
   baseOptions.target = resolveTarget(buildOptions);
   return baseOptions;
 }
-function detectStepPackages(flowSettings, section) {
-  const packages = /* @__PURE__ */ new Set();
-  const steps = getFlowSection(flowSettings, section);
-  if (steps) {
-    for (const [, stepConfig] of Object.entries(steps)) {
-      if (typeof stepConfig !== "object" || stepConfig === null) continue;
-      if (typeof stepConfig.package === "string") {
-        packages.add(stepConfig.package);
-      }
-    }
-  }
-  return packages;
-}
 function getNodeExternals() {
   const externals = [];
   for (const mod of builtinModules) {
@@ -2746,84 +2842,6 @@ async function runNftServerPath(outputPath, flowSettings, buildOptions, tempDir,
     `nft-trace: copied ${result.copied} file(s); wrote ${sidecarPath}`
   );
 }
-function collectAllStepPackages(flowSettings) {
-  const allPackages = /* @__PURE__ */ new Set();
-  const sections = [
-    "sources",
-    "destinations",
-    "transformers",
-    "stores"
-  ];
-  for (const section of sections) {
-    for (const pkg of detectStepPackages(flowSettings, section)) {
-      allPackages.add(pkg);
-    }
-  }
-  return allPackages;
-}
-function applyStepPackages(flowSettings, packages, logger) {
-  const stepPackages = collectAllStepPackages(flowSettings);
-  const originalVersions = /* @__PURE__ */ new Map();
-  const inlineSeen = /* @__PURE__ */ new Map();
-  const rewriteSteps = (from, to) => {
-    for (const section of [
-      "sources",
-      "destinations",
-      "transformers",
-      "stores"
-    ]) {
-      const steps = getFlowSection(flowSettings, section);
-      if (!steps) continue;
-      for (const step of Object.values(steps)) {
-        if (step.package === from) {
-          step.package = to;
-        }
-      }
-    }
-  };
-  for (const pkg of stepPackages) {
-    const isLocalPath = pkg.startsWith(".") || pkg.startsWith("/");
-    if (isLocalPath) {
-      const varName = packageNameToVariable(pkg);
-      if (!packages[varName]) {
-        packages[varName] = {
-          path: pkg
-        };
-      }
-      rewriteSteps(pkg, varName);
-      continue;
-    }
-    const { name, version } = parsePackageSpec(pkg);
-    if (!originalVersions.has(name)) {
-      originalVersions.set(name, packages[name]?.version);
-    }
-    const bundlePinnedVersion = originalVersions.get(name);
-    if (name !== pkg) {
-      rewriteSteps(pkg, name);
-    }
-    if (version && !bundlePinnedVersion) {
-      const seen = inlineSeen.get(name);
-      if (seen !== void 0 && seen !== version) {
-        throw new Error(
-          `Conflicting inline versions for ${name}: "${seen}" and "${version}" are declared by different steps. Pin one version in config.bundle.packages.`
-        );
-      }
-      inlineSeen.set(name, version);
-    }
-    const existing = packages[name];
-    if (!existing) {
-      packages[name] = version ? { version } : {};
-    } else if (version) {
-      if (!existing.version) {
-        existing.version = version;
-      } else if (existing.version !== version) {
-        logger.warn(
-          `Package ${name}: config.bundle.packages pins ${existing.version}; a step declares ${version} inline. Using the bundle pin.`
-        );
-      }
-    }
-  }
-}
 function detectNamedImports(flowSettings) {
   const namedImports = /* @__PURE__ */ new Map();
   const addNamed = (pkg, importName) => {
@@ -2857,7 +2875,7 @@ async function generateImportStatements(packages, destinationPackages, sourcePac
     const hasNamed = namedImports.has(packageName);
     const namedImportsToGenerate = [];
     if (isUsedByDestOrSource && !hasNamed) {
-      const varName = packageNameToVariable(packageName);
+      const varName = packageNameToVariable2(packageName);
       importStatements.push(`import ${varName} from '${packageName}';`);
     }
     if (hasNamed) {
@@ -2912,12 +2930,6 @@ async function computeDevPackages(usedPackages, packagePaths) {
   }
   return devPackages;
 }
-function parsePackageSpec(spec) {
-  const at = spec.lastIndexOf("@");
-  if (at <= 0) return { name: spec };
-  const version = spec.slice(at + 1);
-  return version ? { name: spec.slice(0, at), version } : { name: spec.slice(0, at) };
-}
 function packageSpecName(spec) {
   return parsePackageSpec(spec).name;
 }
@@ -3068,7 +3080,7 @@ function buildSplitConfigObject(flowSettings, namedImports) {
     if (typeof step.import === "string" && step.package) {
       return step.import;
     }
-    return packageNameToVariable(step.package);
+    return packageNameToVariable2(step.package);
   }
   function getStepProps(step) {
     const props = {};
@@ -3528,6 +3540,7 @@ var init_bundler = __esm({
     init_config_classifier();
     init_structural_validators();
     init_structural_validators();
+    init_step_packages();
     init_package_manager();
     init_nft_trace();
     init_assert_consumer_deps();
@@ -8249,7 +8262,7 @@ function validateMapping(input) {
 // src/commands/validate/validators/entry.ts
 import Ajv from "ajv";
 import { fetchPackageSchema } from "@walkeros/core";
-var CLIENT_HEADER = "walkeros-cli/4.4.0";
+var CLIENT_HEADER = "walkeros-cli/4.5.0";
 var SECTIONS = ["destinations", "sources", "transformers"];
 function resolveEntry(path20, flowConfig) {
   const flows = flowConfig.flows;
@@ -8815,7 +8828,7 @@ init_config_file();
 import { createHash } from "crypto";
 import semver4 from "semver";
 var bakedContractVersion = true ? "4.3.0" : PLACEHOLDER;
-var bakedContractHash = true ? "921ca196fc71f3bf88bb0104338240438eb9411b274641d35c82b1462b4865b5" : "";
+var bakedContractHash = true ? "78d9f32be512ebb51e8c6c262aab05dd4eda28a84269fc53ff87b88e41940e6d" : "";
 function isRecord3(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }