@secondlayer/cli 3.5.3 → 3.5.4

package/dist/cli.js

@@ -13466,10 +13466,10 @@ var init_manager = __esm(() => {
 });
 
 // src/services/indexer.ts
-import { dirname as dirname4, resolve as resolve4 } from "node:path";
+import { dirname as dirname5, resolve as resolve4 } from "node:path";
 async function startIndexer(options2) {
   const port = options2.port ?? 3700;
-  const rootDir = dirname4(dirname4(dirname4(dirname4(import.meta.dir))));
+  const rootDir = dirname5(dirname5(dirname5(dirname5(import.meta.dir))));
   const indexerPath = resolve4(rootDir, "packages/indexer/src/index.ts");
   await serviceManager.start(SERVICE_NAME, ["bun", "run", "--watch", indexerPath], {
     port,
@@ -13486,9 +13486,9 @@ var init_indexer = __esm(() => {
 });
 
 // src/services/worker.ts
-import { dirname as dirname5, resolve as resolve5 } from "node:path";
+import { dirname as dirname6, resolve as resolve5 } from "node:path";
 async function startWorker(options2) {
-  const rootDir = dirname5(dirname5(dirname5(dirname5(import.meta.dir))));
+  const rootDir = dirname6(dirname6(dirname6(dirname6(import.meta.dir))));
   const workerPath = resolve5(rootDir, "packages/worker/src/index.ts");
   await serviceManager.start(SERVICE_NAME2, ["bun", "run", "--watch", workerPath], {
     onStdout: options2.onLog,
@@ -13501,10 +13501,10 @@ var init_worker = __esm(() => {
 });
 
 // src/services/api.ts
-import { dirname as dirname6, resolve as resolve6 } from "node:path";
+import { dirname as dirname7, resolve as resolve6 } from "node:path";
 async function startApi(options2) {
   const port = options2.port ?? 3800;
-  const rootDir = dirname6(dirname6(dirname6(dirname6(import.meta.dir))));
+  const rootDir = dirname7(dirname7(dirname7(dirname7(import.meta.dir))));
   const apiPath = resolve6(rootDir, "packages/api/src/index.ts");
   await serviceManager.start(SERVICE_NAME3, ["bun", "run", "--watch", apiPath], {
     port,
@@ -13521,9 +13521,9 @@ var init_api2 = __esm(() => {
 });
 
 // src/services/subgraph-processor.ts
-import { dirname as dirname7, resolve as resolve7 } from "node:path";
+import { dirname as dirname8, resolve as resolve7 } from "node:path";
 async function startSubgraphProcessor(options2) {
-  const rootDir = dirname7(dirname7(dirname7(dirname7(import.meta.dir))));
+  const rootDir = dirname8(dirname8(dirname8(dirname8(import.meta.dir))));
   const servicePath = resolve7(rootDir, "packages/subgraphs/src/service.ts");
   await serviceManager.start(SERVICE_NAME4, ["bun", "run", "--watch", servicePath], {
     env: {
@@ -13559,7 +13559,7 @@ __export(exports_dev_impl, {
   isDevAlreadyRunning: () => isDevAlreadyRunning
 });
 import { mkdirSync as mkdirSync3 } from "node:fs";
-import { dirname as dirname8, join as join7, resolve as resolve8 } from "node:path";
+import { dirname as dirname9, join as join8, resolve as resolve8 } from "node:path";
 async function isDevAlreadyRunning() {
   if (await isDevRunning()) {
     const running = await getRunningServices();
@@ -13637,7 +13637,7 @@ async function runBackground(options2) {
     startedAt: new Date().toISOString()
   };
   try {
-    const packagesDir = dirname8(dirname8(dirname8(dirname8(import.meta.dir))));
+    const packagesDir = dirname9(dirname9(dirname9(dirname9(import.meta.dir))));
     const env = { DATABASE_URL: databaseUrl, DEV_MODE: "true" };
     const apiLogFile = getLogFile("api");
     const apiProc = Bun.spawn(["bun", "run", resolve8(packagesDir, "packages/api/src/index.ts")], {
@@ -13984,7 +13984,7 @@ async function restartDev() {
   await clearDevState();
   await clearLogs();
   const config = await loadConfig();
-  const packagesDir = dirname8(dirname8(dirname8(dirname8(import.meta.dir))));
+  const packagesDir = dirname9(dirname9(dirname9(dirname9(import.meta.dir))));
   const env = state.env;
   const newState = {
     services: {},
@@ -14165,7 +14165,7 @@ async function ensureDevPostgres(dataDir) {
   if (check.stdout.toString().trim()) {
     return false;
   }
-  const pgDataDir = join7(dataDir, "postgres");
+  const pgDataDir = join8(dataDir, "postgres");
   mkdirSync3(pgDataDir, { recursive: true });
   const stopped = await Bun.$`docker ps -aq -f name=secondlayer-dev-postgres`.quiet().nothrow();
   if (stopped.stdout.toString().trim()) {
@@ -14181,7 +14181,7 @@ async function ensureDevPostgres(dataDir) {
   throw new Error("PostgreSQL failed to start");
 }
 async function runMigrations(databaseUrl) {
-  const packagesDir = dirname8(dirname8(dirname8(dirname8(import.meta.dir))));
+  const packagesDir = dirname9(dirname9(dirname9(dirname9(import.meta.dir))));
   const migrateScript = resolve8(packagesDir, "packages/shared/src/db/migrate.ts");
   const result = await Bun.$`DATABASE_URL=${databaseUrl} bun run ${migrateScript}`.quiet().nothrow();
   if (result.exitCode !== 0) {
@@ -21909,7 +21909,7 @@ var init_commands = __esm(() => {
 });
 
 // ../../node_modules/@antfu/ni/dist/shared/ni.B5qNAuoI.mjs
-import path3, { join as join8, dirname as dirname9, resolve as resolve9 } from "node:path";
+import path3, { join as join9, dirname as dirname10, resolve as resolve9 } from "node:path";
 import process$1 from "node:process";
 import require$$0 from "readline";
 import require$$2 from "events";
@@ -24924,7 +24924,7 @@ function requireLib() {
     return lib;
   hasRequiredLib = 1;
   const { isexe, sync: isexeSync } = requireCjs();
-  const { join: join9, delimiter, sep, posix: posix2 } = require$$1$2;
+  const { join: join10, delimiter, sep, posix: posix2 } = require$$1$2;
   const isWindows = process.platform === "win32";
   const rSlash = new RegExp(`[${posix2.sep}${sep === posix2.sep ? "" : sep}]`.replace(/(\\)/g, "\\$1"));
   const rRel = new RegExp(`^\\.${rSlash.source}`);
@@ -24951,7 +24951,7 @@ function requireLib() {
   const getPathPart = (raw, cmd) => {
     const pathPart = /^".*"$/.test(raw) ? raw.slice(1, -1) : raw;
     const prefix = !pathPart && rRel.test(cmd) ? cmd.slice(0, 2) : "";
-    return prefix + join9(pathPart, cmd);
+    return prefix + join10(pathPart, cmd);
   };
   const which = async (cmd, opt = {}) => {
     const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt);
@@ -25100,7 +25100,7 @@ var init_ni_B5qNAuoI = __esm(() => {
   options2 = {};
   libExports = requireLib();
   which = /* @__PURE__ */ getDefaultExportFromCjs(libExports);
-  CLI_TEMP_DIR = join8(os4.tmpdir(), "antfu-ni");
+  CLI_TEMP_DIR = join9(os4.tmpdir(), "antfu-ni");
   customRcPath = process$1.env.NI_CONFIG_FILE;
   home = process$1.platform === "win32" ? process$1.env.USERPROFILE : process$1.env.HOME;
   defaultRcPath = path3.join(home || "~/", ".nirc");
@@ -25137,14 +25137,14 @@ function isPlainObject2(value) {
 }
 
 // ../../node_modules/execa/lib/arguments/file-url.js
-import { fileURLToPath as fileURLToPath2 } from "node:url";
+import { fileURLToPath as fileURLToPath3 } from "node:url";
 var safeNormalizeFileUrl = (file, name) => {
   const fileString = normalizeFileUrl(normalizeDenoExecPath(file));
   if (typeof fileString !== "string") {
     throw new TypeError(`${name} must be a string or a file URL: ${fileString}.`);
   }
   return fileString;
-}, normalizeDenoExecPath = (file) => isDenoExecPath(file) ? file.toString() : file, isDenoExecPath = (file) => typeof file !== "string" && file && Object.getPrototypeOf(file) === String.prototype, normalizeFileUrl = (file) => file instanceof URL ? fileURLToPath2(file) : file;
+}, normalizeDenoExecPath = (file) => isDenoExecPath(file) ? file.toString() : file, isDenoExecPath = (file) => typeof file !== "string" && file && Object.getPrototypeOf(file) === String.prototype, normalizeFileUrl = (file) => file instanceof URL ? fileURLToPath3(file) : file;
 var init_file_url = () => {};
 
 // ../../node_modules/execa/lib/methods/parameters.js
@@ -26440,9 +26440,9 @@ function pathKey(options3 = {}) {
 import { promisify as promisify4 } from "node:util";
 import { execFile as execFileCallback, execFileSync as execFileSyncOriginal } from "node:child_process";
 import path4 from "node:path";
-import { fileURLToPath as fileURLToPath3 } from "node:url";
+import { fileURLToPath as fileURLToPath4 } from "node:url";
 function toPath(urlOrPath) {
-  return urlOrPath instanceof URL ? fileURLToPath3(urlOrPath) : urlOrPath;
+  return urlOrPath instanceof URL ? fileURLToPath4(urlOrPath) : urlOrPath;
 }
 function traversePathUp(startPath) {
   return {
@@ -28824,7 +28824,7 @@ var init_stdio_option = __esm(() => {
 });
 
 // ../../node_modules/execa/lib/stdio/native.js
-import { readFileSync as readFileSync2 } from "node:fs";
+import { readFileSync as readFileSync3 } from "node:fs";
 import tty3 from "node:tty";
 var handleNativeStream = ({ stdioItem, stdioItem: { type }, isStdioArray, fdNumber, direction, isSync }) => {
   if (!isStdioArray || type !== "native") {
@@ -28856,7 +28856,7 @@ var handleNativeStream = ({ stdioItem, stdioItem: { type }, isStdioArray, fdNumb
   if (tty3.isatty(targetFdNumber)) {
     throw new TypeError(`The \`${optionName}: ${serializeOptionValue(value)}\` option is invalid: it cannot be a TTY with synchronous methods.`);
   }
-  return { type: "uint8Array", value: bufferToUint8Array(readFileSync2(targetFdNumber)), optionName };
+  return { type: "uint8Array", value: bufferToUint8Array(readFileSync3(targetFdNumber)), optionName };
 }, getTargetFdNumber = (value, fdNumber) => {
   if (value === "inherit") {
     return fdNumber;
@@ -29159,7 +29159,7 @@ var init_handle = __esm(() => {
 });
 
 // ../../node_modules/execa/lib/stdio/handle-sync.js
-import { readFileSync as readFileSync3 } from "node:fs";
+import { readFileSync as readFileSync4 } from "node:fs";
 var handleStdioSync = (options3, verboseInfo) => handleStdio(addPropertiesSync, options3, verboseInfo, true), forbiddenIfSync = ({ type, optionName }) => {
   throwInvalidSyncValue(optionName, TYPE_TO_MESSAGE[type]);
 }, forbiddenNativeIfSync = ({ optionName, value }) => {
@@ -29187,8 +29187,8 @@ var init_handle_sync = __esm(() => {
   addPropertiesSync = {
     input: {
       ...addProperties,
-      fileUrl: ({ value }) => ({ contents: [bufferToUint8Array(readFileSync3(value))] }),
-      filePath: ({ value: { file } }) => ({ contents: [bufferToUint8Array(readFileSync3(file))] }),
+      fileUrl: ({ value }) => ({ contents: [bufferToUint8Array(readFileSync4(value))] }),
+      filePath: ({ value: { file } }) => ({ contents: [bufferToUint8Array(readFileSync4(file))] }),
       fileNumber: forbiddenIfSync,
       iterable: ({ value }) => ({ contents: [...value] }),
       string: ({ value }) => ({ contents: [value] }),
@@ -29557,7 +29557,7 @@ var init_output2 = __esm(() => {
 });
 
 // ../../node_modules/execa/lib/io/output-sync.js
-import { writeFileSync as writeFileSync2, appendFileSync } from "node:fs";
+import { writeFileSync as writeFileSync3, appendFileSync } from "node:fs";
 var transformOutputSync = ({ fileDescriptors, syncResult: { output }, options: options3, isMaxBuffer, verboseInfo }) => {
   if (output === null) {
     return { output: Array.from({ length: 3 }) };
@@ -29650,7 +29650,7 @@ var transformOutputSync = ({ fileDescriptors, syncResult: { output }, options: o
       appendFileSync(path9, serializedResult);
     } else {
       outputFiles.add(pathString);
-      writeFileSync2(path9, serializedResult);
+      writeFileSync3(path9, serializedResult);
     }
   }
 };
@@ -32439,7 +32439,7 @@ var {
 // package.json
 var package_default = {
   name: "@secondlayer/cli",
-  version: "3.5.3",
+  version: "3.5.4",
   description: "CLI for subgraphs and blockchain indexing on Stacks",
   type: "module",
   bin: {
@@ -32483,7 +32483,7 @@ var package_default = {
     "@inquirer/prompts": "^8.2.0",
     "@secondlayer/bundler": "^0.3.2",
     "@secondlayer/sdk": "^3.2.2",
-    "@secondlayer/shared": "^4.3.3",
+    "@secondlayer/shared": "^4.3.4",
     "@secondlayer/stacks": "^2.0.0",
     "@secondlayer/subgraphs": "^1.3.2",
     "@biomejs/js-api": "^0.7.0",
@@ -33196,6 +33196,7 @@ async function createSubscription(name, opts) {
     TASK_ID: `${subgraph}-${table}`
   });
   let signingSecret = null;
+  let provisioningFailed = false;
   if (!opts.skipApi) {
     try {
       if (!sl)
@@ -33213,8 +33214,9 @@ async function createSubscription(name, opts) {
       signingSecret = res.signingSecret;
       success(`Subscription provisioned: ${blue(res.subscription.id)}`);
     } catch (err) {
+      provisioningFailed = true;
       warn(`Subscription provisioning failed: ${err instanceof Error ? err.message : String(err)}`);
-      info("Template copied — fix auth + run again, or provision via dashboard.");
+      info("Template copied, but the subscription was not created. Provision it in the dashboard, or remove the template directory and rerun this command after fixing the API error.");
     }
   }
   if (signingSecret) {
@@ -33236,6 +33238,10 @@ ${dim("  ")}${signingSecret}`);
     }
   }
   console.log();
+  if (provisioningFailed) {
+    error("Subscription was not created.");
+    process.exit(1);
+  }
   success(`Done. Next:
   cd ${name}
   bun install
@@ -34309,8 +34315,15 @@ async function resyncDatabase(skipConfirm, backfill) {
   }
 }
 // src/commands/subgraphs.ts
-import { existsSync as existsSync3, mkdirSync as mkdirSync2, watch } from "node:fs";
-import { resolve as resolve3 } from "node:path";
+import {
+  existsSync as existsSync3,
+  mkdirSync as mkdirSync2,
+  readFileSync as readFileSync2,
+  watch,
+  writeFileSync as writeFileSync2
+} from "node:fs";
+import { dirname as dirname4, join as join7, resolve as resolve3 } from "node:path";
+import { fileURLToPath as fileURLToPath2 } from "node:url";
 import { confirm as confirm3 } from "@inquirer/prompts";
 
 // src/generators/subgraph-scaffold.ts
@@ -34585,6 +34598,45 @@ function parseStartBlockOption(value) {
   }
   return parsed;
 }
+function readCliSubgraphsDependency() {
+  const here = dirname4(fileURLToPath2(import.meta.url));
+  const candidates = [
+    resolve3(here, "..", "..", "package.json"),
+    resolve3(here, "..", "package.json")
+  ];
+  for (const candidate of candidates) {
+    if (!existsSync3(candidate))
+      continue;
+    const pkg = JSON.parse(readFileSync2(candidate, "utf8"));
+    const dep = pkg.dependencies?.["@secondlayer/subgraphs"];
+    if (dep)
+      return dep;
+  }
+  return "^1.3.2";
+}
+function ensureScaffoldPackageJson(dir) {
+  const packagePath = join7(dir, "package.json");
+  const subgraphsDep = readCliSubgraphsDependency();
+  if (!existsSync3(packagePath)) {
+    writeFileSync2(packagePath, `${JSON.stringify({
+      type: "module",
+      dependencies: {
+        "@secondlayer/subgraphs": subgraphsDep
+      }
+    }, null, 2)}
+`, "utf8");
+    return;
+  }
+  const pkg = JSON.parse(readFileSync2(packagePath, "utf8"));
+  if (pkg.dependencies?.["@secondlayer/subgraphs"])
+    return;
+  pkg.dependencies = {
+    ...pkg.dependencies ?? {},
+    "@secondlayer/subgraphs": subgraphsDep
+  };
+  writeFileSync2(packagePath, `${JSON.stringify(pkg, null, 2)}
+`, "utf8");
+}
 function createSubgraphDeployPreview(def, options2 = {}) {
   const tableColumns = Object.entries(def.schema).map(([table, schema]) => `${table}: ${Object.keys(schema.columns).join(", ") || "(no columns)"}`);
   return {
@@ -34773,6 +34825,7 @@ Stopped watching.`);
           sources: effectiveDef.sources,
           schema: effectiveDef.schema,
           handlerCode,
+          sourceCode: source,
           ...startBlock !== undefined ? { startBlock } : {}
         });
         if (result.action === "unchanged") {
@@ -35086,6 +35139,7 @@ ${rows.length} row(s)`));
       if (!existsSync3(dir))
         mkdirSync2(dir, { recursive: true });
       await writeTextFile(outPath, content);
+      ensureScaffoldPackageJson(dir);
       success(`Created ${outPath}`);
       info(`Next: sl subgraphs deploy ${options2.output}`);
     } catch (err) {
@@ -36528,5 +36582,5 @@ registerLocalCommand(program);
 registerAccountCommand(program);
 program.parse();
 
-//# debugId=BE2AD99915C01F0964756E2164756E21
+//# debugId=96B7A917235EEA4164756E2164756E21
 //# sourceMappingURL=cli.js.map