casualos 4.2.3 → 4.2.4-alpha.25071757716

package/dist/cli.js

@@ -149486,7 +149486,7 @@ var trace = TraceAPI.getInstance();
 function hashLowEntropyPasswordWithSalt2(password, salt) {
   const tracer = trace.getTracer(
     "InstrumentedHashHelpers",
-    false ? void 0 : "v4.2.3"
+    false ? void 0 : "v4.2.4-alpha.25071757716"
   );
   return tracer.startActiveSpan(
     "hashLowEntropyPasswordWithSalt",
@@ -149504,7 +149504,7 @@ function hashLowEntropyPasswordWithSalt2(password, salt) {
 function hashHighEntropyPasswordWithSalt2(password, salt) {
   const tracer = trace.getTracer(
     "InstrumentedHashHelpers",
-    false ? void 0 : "v4.2.3"
+    false ? void 0 : "v4.2.4-alpha.25071757716"
   );
   return tracer.startActiveSpan(
     "hashHighEntropyPasswordWithSalt",
@@ -149522,7 +149522,7 @@ function hashHighEntropyPasswordWithSalt2(password, salt) {
 function verifyPasswordAgainstHashes2(password, salt, hashes) {
   const tracer = trace.getTracer(
     "InstrumentedHashHelpers",
-    false ? void 0 : "v4.2.3"
+    false ? void 0 : "v4.2.4-alpha.25071757716"
   );
   return tracer.startActiveSpan(
     "verifyPasswordAgainstHashes",
@@ -157123,7 +157123,7 @@ function traced(tracerName, options = {}, metricOptions = {}) {
   }
   const tracer = trace.getTracer(
     tracerName,
-    false ? void 0 : "v4.2.3"
+    false ? void 0 : "v4.2.4-alpha.25071757716"
   );
   return function(target, propertyKey, descriptor) {
     const originalMethod = descriptor.value;
@@ -157209,7 +157209,7 @@ function getHistogram(meter) {
   }
   return metrics.getMeter(
     meter.meter,
-    false ? void 0 : "v4.2.3"
+    false ? void 0 : "v4.2.4-alpha.25071757716"
   ).createHistogram(meter.name, meter.options);
 }
 function getCounter(meter) {
@@ -157218,7 +157218,7 @@ function getCounter(meter) {
   }
   return metrics.getMeter(
     meter.meter,
-    false ? void 0 : "v4.2.3"
+    false ? void 0 : "v4.2.4-alpha.25071757716"
   ).createCounter(meter.name, meter.options);
 }
 function traceHttpResponse(options = {}) {
@@ -171392,7 +171392,7 @@ var RecordsServer = class {
     this._viewTemplateRenderer = viewTemplateRenderer;
     this._tracer = trace.getTracer(
       "RecordsServer",
-      false ? void 0 : "v4.2.3"
+      false ? void 0 : "v4.2.4-alpha.25071757716"
     );
     this._purchasableItems = purchasableItemsController;
     this._procedures = this._createProcedures();
@@ -175448,8 +175448,8 @@ var RecordsServer = class {
         return {
           success: true,
           ...metadata,
-          version: true ? "v4.2.3" : void 0,
-          versionHash: true ? "12ca409bb4c3323ae13ec2f8de61e753565d569d" : void 0
+          version: true ? "v4.2.4-alpha.25071757716" : void 0,
+          versionHash: true ? "c213ddc7d74c64cf69e0d1ab1dcbcb9d86cb8ef2" : void 0
         };
       }),
       getPurchasableItem: procedure().origins(true).http("GET", "/api/v2/records/purchasableItems").inputs(
@@ -220623,13 +220623,8 @@ function replaceMacros(text) {
   return text;
 }
 var Transpiler = class {
-  get forceSync() {
-    return this._forceSync;
-  }
-  set forceSync(value) {
-    this._forceSync = value;
-  }
   constructor(options) {
+    this._jsxPreserveWhitespace = false;
     this._insertEnergyChecks = options?.insertEnergyChecks ?? true;
     this._cache = new import_lru_cache.default({
       max: 1e3
@@ -220656,6 +220651,12 @@ var Transpiler = class {
     this._exportFactory = options?.exportFactory ?? "exports";
     this._forceSync = options?.forceSync ?? false;
   }
+  get forceSync() {
+    return this._forceSync;
+  }
+  set forceSync(value) {
+    this._forceSync = value;
+  }
   parse(code) {
     const macroed = replaceMacros(code);
     const node = this._parse(macroed);
@@ -220724,6 +220725,7 @@ var Transpiler = class {
     if (cached2) {
       return cached2;
     }
+    this._jsxPreserveWhitespace = directives.jsxPreserveWhitespace ?? false;
     const macroed = replaceMacros(code);
     const node = this._parse(macroed);
     const isAsync = directives.isAsync || this._isAsyncNode(node);
@@ -221940,27 +221942,57 @@ await ${this._exportFactory}({ `;
   _replaceJSXElementChildren(node, children, doc, text, metadata) {
     const version3 = { "0": getClock2(doc, 0) };
     for (let child of children) {
-      const pos = createRelativePositionFromStateVector2(
-        text,
-        version3,
-        child.end,
-        void 0,
-        true
-      );
-      this._replace(child, doc, text, metadata);
-      doc.clientID += 1;
-      const absoluteEnd = createAbsolutePositionFromRelativePosition(
-        pos,
-        doc
-      );
-      text.insert(absoluteEnd.index, ",");
+      let changed = false;
+      const changeHandler = () => {
+        changed = true;
+      };
+      try {
+        text.observe(changeHandler);
+        const pos = createRelativePositionFromStateVector2(
+          text,
+          version3,
+          child.end,
+          void 0,
+          true
+        );
+        this._replace(child, doc, text, metadata);
+        if (!changed) {
+          continue;
+        }
+        doc.clientID += 1;
+        const absoluteEnd = createAbsolutePositionFromRelativePosition(
+          pos,
+          doc
+        );
+        text.insert(absoluteEnd.index, ",");
+      } finally {
+        text.unobserve(changeHandler);
+      }
     }
   }
   _replaceJSXText(node, doc, text) {
     doc.clientID += 1;
     const version3 = { "0": getClock2(doc, 0) };
-    const startIndex = node.start;
-    const endIndex = node.end;
+    let startIndex;
+    let endIndex;
+    if (!this._jsxPreserveWhitespace) {
+      const isMultiLine = /\r|\n/.test(node.raw);
+      if (isMultiLine) {
+        const startMatch = /\S/.exec(node.raw);
+        if (!startMatch) {
+          return;
+        }
+        startIndex = startMatch.index + node.start;
+        const endMatch = /\S\s*$/.exec(node.raw);
+        endIndex = endMatch.index + 1 + node.start;
+      } else {
+        startIndex = node.start;
+        endIndex = node.end;
+      }
+    } else {
+      startIndex = node.start;
+      endIndex = node.end;
+    }
     const absoluteStart = createAbsolutePositionFromStateVector(
       doc,
       text,
@@ -222266,6 +222298,8 @@ function parseDirectives(code) {
       directives.isAsync = true;
     } else if (part === "module") {
       directives.isModule = true;
+    } else if (part === "jsx-preserve-whitespace") {
+      directives.jsxPreserveWhitespace = true;
     }
   }
   return directives;
@@ -222285,6 +222319,9 @@ function addDirectives(code, directives) {
   if (directives.isModule) {
     directiveString += "module ";
   }
+  if (directives.jsxPreserveWhitespace) {
+    directiveString += "jsx-preserve-whitespace ";
+  }
   directiveString = directiveString.trim() + '";';
   return directiveString + code;
 }
@@ -232812,7 +232849,7 @@ var config2 = new Conf({
   projectName: "casualos-cli"
 });
 var program2 = new Command();
-program2.name("casualos").description("A CLI for CasualOS").version("v4.2.3").option(
+program2.name("casualos").description("A CLI for CasualOS").version("v4.2.4-alpha.25071757716").option(
   "-e, --endpoint <url>",
   "The endpoint to use for queries. Can be used to override the current endpoint."
 ).option(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "casualos",
-  "version": "4.2.3",
+  "version": "4.2.4-alpha.25071757716",
   "description": "Command line interface for CasualOS.",
   "main": "./dist/index.js",
   "types": "index.d.ts",
@@ -28,10 +28,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@casual-simulation/aux-common": "^4.2.3",
-    "@casual-simulation/aux-records": "^4.2.3",
-    "@casual-simulation/aux-runtime": "^4.2.3",
-    "@casual-simulation/aux-vm": "^4.2.3",
+    "@casual-simulation/aux-common": "^4.2.4-alpha.25071757716",
+    "@casual-simulation/aux-records": "^4.2.4-alpha.25071757716",
+    "@casual-simulation/aux-runtime": "^4.2.4-alpha.25071757716",
+    "@casual-simulation/aux-vm": "^4.2.4-alpha.25071757716",
     "@octokit/app": "^15.1.0",
     "@octokit/auth-oauth-device": "^7.1.1",
     "@octokit/core": "^6.1.2",