sandstone-cli 2.4.0 → 2.4.1

package/lib/index.js

@@ -8045,8 +8045,8 @@ var require_adm_zip = __commonJS((exports, module) => {
       return null;
     }
     function fixPath(zipPath) {
-      const { join: join2, normalize, sep } = pth.posix;
-      return join2(".", normalize(sep + zipPath.split("\\").join(sep) + sep));
+      const { join, normalize, sep } = pth.posix;
+      return join(".", normalize(sep + zipPath.split("\\").join(sep) + sep));
     }
     function filenameFilter(filterfn) {
       if (filterfn instanceof RegExp) {
@@ -24421,7 +24421,7 @@ var {
 import figlet from "figlet";
 
 // src/version.ts
-var CLI_VERSION = "2.4.0";
+var CLI_VERSION = "2.4.1";
 
 // src/commands/build/index.ts
 var import_fs_extra4 = __toESM(require_lib(), 1);
@@ -24999,11 +24999,14 @@ async function logWorkerMain(level, ...args) {
     return;
   }
   const chunks = [];
-  chunks.push(`[${new Date().toISOString()}]${level !== false ? ` [${level}]` : ""} `);
+  const prefix = `[${new Date().toISOString()}]${level !== false ? ` [${level}]` : ""} `;
+  chunks.push(prefix);
   for (let i = 0;i < args.length; i++) {
     const arg = args[i];
     if (typeof arg === "string") {
-      chunks.push(stripVTControlCharacters(arg));
+      chunks.push(stripVTControlCharacters(arg).replaceAll(`
+`, `
+${" ".repeat(prefix.length)}`));
     } else if (Buffer.isBuffer(arg) || arg instanceof Uint8Array) {
       chunks.push(arg);
     } else if (arg instanceof ArrayBuffer) {
@@ -25011,7 +25014,9 @@ async function logWorkerMain(level, ...args) {
     } else if (arg instanceof Blob) {
       chunks.push(new Uint8Array(await arg.arrayBuffer()));
     } else {
-      chunks.push(format("%O", arg));
+      chunks.push(stripVTControlCharacters(format("%O", arg)).replaceAll(`
+`, `
+${" ".repeat(prefix.length)}`));
     }
     if (i < args.length - 1) {
       chunks.push(" ");
@@ -25184,15 +25189,15 @@ var $SourceMapConsumer = require_source_map_consumer().SourceMapConsumer;
 var $SourceNode = require_source_node().SourceNode;
 
 // src/utils/source-map.ts
-import { readFile } from "fs/promises";
+import { readFileSync } from "fs";
 import { dirname, resolve } from "path";
 var sourceMapCache = new Map;
-async function loadSourceMap(jsFilePath) {
+function loadSourceMapSync(jsFilePath) {
   if (sourceMapCache.has(jsFilePath)) {
     return sourceMapCache.get(jsFilePath) ?? null;
   }
   try {
-    const jsContent = await readFile(jsFilePath, "utf8");
+    const jsContent = readFileSync(jsFilePath, "utf8");
     const match = jsContent.match(/\/\/[#@]\s*sourceMappingURL=(.+)$/m);
     if (!match) {
       sourceMapCache.set(jsFilePath, null);
@@ -25200,21 +25205,18 @@ async function loadSourceMap(jsFilePath) {
     }
     const sourceMappingURL = match[1].trim();
     let mapPath;
+    let mapContent;
     if (sourceMappingURL.startsWith("data:")) {
       const base64Match = sourceMappingURL.match(/base64,(.+)/);
       if (!base64Match) {
         sourceMapCache.set(jsFilePath, null);
         return null;
       }
-      const mapContent2 = Buffer.from(base64Match[1], "base64").toString("utf8");
-      const rawMap2 = JSON.parse(mapContent2);
-      const consumer2 = new $SourceMapConsumer(rawMap2);
-      sourceMapCache.set(jsFilePath, consumer2);
-      return consumer2;
+      mapContent = Buffer.from(base64Match[1], "base64").toString("utf8");
     } else {
       mapPath = resolve(dirname(jsFilePath), sourceMappingURL);
+      mapContent = readFileSync(mapPath, "utf8");
     }
-    const mapContent = await readFile(mapPath, "utf8");
     const rawMap = JSON.parse(mapContent);
     const consumer = new $SourceMapConsumer(rawMap);
     sourceMapCache.set(jsFilePath, consumer);
@@ -25253,7 +25255,7 @@ function parseStackLine(line) {
   }
   return { original: line };
 }
-async function resolveStackFrame(frame) {
+function resolveStackFrame(frame) {
   if (!frame.filePath || !frame.line || !frame.column) {
     return frame.original;
   }
@@ -25261,7 +25263,7 @@ async function resolveStackFrame(frame) {
     return frame.original;
   }
   try {
-    const consumer = await loadSourceMap(frame.filePath);
+    const consumer = loadSourceMapSync(frame.filePath);
     if (!consumer) {
       return frame.original;
     }
@@ -25282,14 +25284,14 @@ async function resolveStackFrame(frame) {
   } catch {}
   return frame.original;
 }
-async function resolveStackTrace(stack) {
+function resolveStackTrace(stack) {
   const lines = stack.split(`
 `);
   const resolvedLines = [];
   for (const line of lines) {
     if (line.trimStart().startsWith("at ")) {
       const frame = parseStackLine(line);
-      const resolved = await resolveStackFrame(frame);
+      const resolved = resolveStackFrame(frame);
       resolvedLines.push(resolved);
     } else {
       resolvedLines.push(line);
@@ -25851,7 +25853,7 @@ async function _buildCommand(opts, _folder, existingContext, watching = false) {
     const traceStart = stackLines.findIndex((line) => line.trimStart().startsWith("at "));
     const stackTrace = traceStart >= 0 ? stackLines.slice(traceStart).join(`
 `) : "";
-    const resolvedStackTrace = stackTrace ? await resolveStackTrace(stackTrace) : "";
+    const resolvedStackTrace = stackTrace ? resolveStackTrace(stackTrace) : "";
     const formattedError = resolvedStackTrace ? `${errorMessage}
 ${resolvedStackTrace}` : errorMessage;
     return {
@@ -25887,7 +25889,7 @@ async function buildCommand(opts, _folder, silent2 = false) {
     const traceStart = stackLines.findIndex((line) => line.trimStart().startsWith("at "));
     const stackTrace = traceStart >= 0 ? stackLines.slice(traceStart).join(`
 `) : "";
-    const resolvedStackTrace = stackTrace ? await resolveStackTrace(stackTrace) : "";
+    const resolvedStackTrace = stackTrace ? resolveStackTrace(stackTrace) : "";
     const formattedError = resolvedStackTrace ? `${errorMessage}
 ${resolvedStackTrace}` : errorMessage;
     if (!silent2) {
@@ -26466,7 +26468,7 @@ async function createCommand2(_project, opts) {
     default: false
   }) === true ? "library" : "pack";
   const sv = (v) => new import_semver.SemVer(v);
-  const versions = [[sv("1.0.0-beta.4"), sv(CLI_VERSION)], [sv("1.0.0-beta.3"), sv("2.3.2")]];
+  const versions = [[sv("1.0.0-beta.5"), sv(CLI_VERSION)]];
   const version = await select({
     message: "Which version of Sandstone do you want to use? These are the only supported versions for new projects.",
     choices: versions.map((v) => {
@@ -32645,7 +32647,7 @@ globalThis.hot = hot;
 
 // src/commands/watch.ts
 var import_fs_extra7 = __toESM(require_lib(), 1);
-import { join as join3, relative } from "path";
+import { join as join2, relative } from "path";
 var originalConsole = globalThis.console;
 var consoleWrapped = false;
 function enableConsoleCapture() {
@@ -32661,8 +32663,14 @@ function enableConsoleCapture() {
     const traceObj = { stack: "" };
     Error.captureStackTrace(traceObj, globalThis.console.trace);
     const cleanedStack = traceObj.stack.replace(/^Error\n/, "").replace(/\?hot-hook=\d+/g, "").replace(/file:\/\/\/?/g, "");
+    const stackLines = cleanedStack.split(`
+`);
+    const traceStart = stackLines.findIndex((line) => line.trimStart().startsWith("at "));
+    const stackTrace = traceStart >= 0 ? stackLines.slice(traceStart).join(`
+`) : "";
+    const resolvedStack = stackTrace ? resolveStackTrace(stackTrace) : cleanedStack;
     logTrace(...args, `
-` + cleanedStack);
+` + resolvedStack);
   };
 }
 function disableConsoleCapture() {
@@ -32681,7 +32689,7 @@ async function watchCommand(opts) {
   let buildContext;
   let hotInitialized = false;
   let lastBuildFailed = false;
-  const folder = opts.library ? join3(opts.path, "test") : opts.path;
+  const folder = opts.library ? join2(opts.path, "test") : opts.path;
   let subscription;
   initLogger(folder);
   setLiveLogCallback((level, args) => {
@@ -32728,7 +32736,7 @@ async function watchCommand(opts) {
     }
     if (!hotInitialized) {
       await hot.init({
-        root: join3(folder, JSON.parse(await import_fs_extra7.default.readFile(join3(folder, "package.json"), "utf-8"))["module"]),
+        root: join2(folder, JSON.parse(await import_fs_extra7.default.readFile(join2(folder, "package.json"), "utf-8"))["module"]),
         globalSingletons: ["**/node_modules/sandstone/**", "**/sandstone/dist/**"],
         watch: false
       });
@@ -32761,9 +32769,9 @@ async function watchCommand(opts) {
         hot.notifyFileChange(change.path);
       }
       if (libChanges.length !== 0) {
-        const libModuleFiles = await import_fs_extra7.default.readdir(join3(opts.path, "lib"), { recursive: true });
+        const libModuleFiles = await import_fs_extra7.default.readdir(join2(opts.path, "lib"), { recursive: true });
         for (const file of libModuleFiles) {
-          hot.notifyFileChange(join3(opts.path, "lib", file));
+          hot.notifyFileChange(join2(opts.path, "lib", file));
         }
       }
       if (changes.length > 0) {
@@ -32964,4 +32972,4 @@ CLI.command("uninstall").alias("remove").description("Uninstall Vanilla Smithed
 CLI.command("refresh").description("Clear & update cached Smithed libraries. \u26CF").action(refreshCommand);
 CLI.parse(process.argv);
 
-//# debugId=8C70F595B134AADB64756E2164756E21
+//# debugId=CA02D3AA5926561C64756E2164756E21