@xsai/stream-object 0.5.0-beta.2 → 0.5.0-beta.3

package/dist/index.d.ts

@@ -603,6 +603,31 @@ type SimpleMerge<Destination, Source> = Simplify<{
 /**
 Merge two types into a new type. Keys of the second type overrides keys of the first type.
 
+This is different from the TypeScript `&` (intersection) operator. With `&`, conflicting property types are intersected, which often results in `never`. For example, `{a: string} & {a: number}` makes `a` become `string & number`, which resolves to `never`. With `Merge`, the second type's keys cleanly override the first, so `Merge<{a: string}, {a: number}>` gives `{a: number}` as expected. `Merge` also produces a flattened type (via `Simplify`), making it more readable in IDE tooltips compared to `A & B`.
+
+@example
+```
+import type {Merge} from 'type-fest';
+
+type Foo = {
+	a: string;
+	b: number;
+};
+
+type Bar = {
+	a: number; // Conflicts with Foo['a']
+	c: boolean;
+};
+
+// With `&`, `a` becomes `string & number` which is `never`. Not what you want.
+type WithIntersection = (Foo & Bar)['a'];
+//=> never
+
+// With `Merge`, `a` is cleanly overridden to `number`.
+type WithMerge = Merge<Foo, Bar>['a'];
+//=> number
+```
+
 @example
 ```
 import type {Merge} from 'type-fest';

package/dist/index.js

@@ -21,7 +21,7 @@ function requireParse () {
 	hasRequiredParse = 1;
 	(function (exports$1) {
 		Object.defineProperty(exports$1, "__esModule", { value: true });
-		exports$1.parse = exports$1.enableErrorLogging = exports$1.disableErrorLogging = exports$1.setErrorLogger = void 0;
+		exports$1.parse = exports$1.stripComments = exports$1.enableErrorLogging = exports$1.disableErrorLogging = exports$1.setErrorLogger = void 0;
 		let logError = console.error;
 		function setErrorLogger(logger) {
 		  logError = logger;
@@ -36,6 +36,99 @@ function requireParse () {
 		  logError = console.error;
 		}
 		exports$1.enableErrorLogging = enableErrorLogging;
+		function stripComments(text) {
+		  const buffer = [];
+		  let in_string = false;
+		  let string_char = "";
+		  let string_escaped = false;
+		  let in_inline_comment = false;
+		  let in_block_comment = false;
+		  let saw_star = false;
+		  let in_html_comment = false;
+		  let saw_hyphen = 0;
+		  for (const char of text) {
+		    if (in_string) {
+		      if (string_escaped) {
+		        string_escaped = false;
+		        buffer.push(char);
+		        continue;
+		      }
+		      if (char === "\\") {
+		        string_escaped = true;
+		        buffer.push(char);
+		        continue;
+		      }
+		      if (char === string_char) {
+		        in_string = false;
+		        buffer.push(char);
+		        continue;
+		      }
+		      buffer.push(char);
+		      continue;
+		    }
+		    if (in_inline_comment) {
+		      if (char === "\n") {
+		        in_inline_comment = false;
+		        continue;
+		      }
+		      continue;
+		    }
+		    const buffer_length = buffer.length;
+		    const last_char = buffer_length === 0 ? "" : buffer[buffer_length - 1];
+		    if (in_block_comment) {
+		      if (char === "*") {
+		        saw_star = true;
+		        continue;
+		      }
+		      if (saw_star && char === "/") {
+		        in_block_comment = false;
+		        continue;
+		      }
+		      saw_star = false;
+		      continue;
+		    }
+		    if (in_html_comment) {
+		      if (char === "-") {
+		        saw_hyphen++;
+		        continue;
+		      }
+		      if (saw_hyphen >= 2 && char === ">") {
+		        in_html_comment = false;
+		        continue;
+		      }
+		      saw_hyphen = 0;
+		      continue;
+		    }
+		    if (last_char === "/" && char === "/") {
+		      buffer.pop();
+		      in_inline_comment = true;
+		      continue;
+		    }
+		    if (last_char === "/" && char === "*") {
+		      buffer.pop();
+		      in_block_comment = true;
+		      saw_star = false;
+		      continue;
+		    }
+		    if (char === '"' || char === "'" || char === "`") {
+		      in_string = true;
+		      string_char = char;
+		      string_escaped = false;
+		      buffer.push(char);
+		      continue;
+		    }
+		    if (buffer_length >= 4 && char === "-" && buffer[buffer_length - 1] === "-" && buffer[buffer_length - 2] === "!" && buffer[buffer_length - 3] === "<") {
+		      in_html_comment = true;
+		      buffer.pop();
+		      buffer.pop();
+		      buffer.pop();
+		      continue;
+		    }
+		    buffer.push(char);
+		  }
+		  return buffer.join("");
+		}
+		exports$1.stripComments = stripComments;
 		function parse(s) {
 		  if (s === void 0) {
 		    return void 0;
@@ -46,6 +139,7 @@ function requireParse () {
 		  if (s === "") {
 		    return "";
 		  }
+		  s = stripComments(s);
 		  s = s.replace(/\\+$/, (match) => match.length % 2 === 0 ? match : match.slice(0, -1));
 		  try {
 		    return JSON.parse(s);
@@ -87,6 +181,9 @@ function requireParse () {
 		  if (s[0] === "'") {
 		    return parseSingleQuoteString(s);
 		  }
+		  if (s[0] === "`") {
+		    return parseBacktickString(s);
+		  }
 		  return parseStringWithoutQuote(s, e, delimiters);
 		}
 		const parsers = {};
@@ -182,6 +279,32 @@ function requireParse () {
 		  }
 		  return [JSON.parse('"' + fixEscapedCharacters(s.slice(1)) + '"'), ""];
 		}
+		parsers["`"] = parseBacktickString;
+		function parseBacktickString(s) {
+		  const buffer = [];
+		  let is_escaped = false;
+		  let escape_count = 0;
+		  for (let i = 1; i < s.length; i++) {
+		    const c = s[i];
+		    if (is_escaped) {
+		      buffer.push(c);
+		      is_escaped = false;
+		      continue;
+		    }
+		    if (c === "\\") {
+		      is_escaped = true;
+		      escape_count++;
+		      continue;
+		    }
+		    if (c === "`") {
+		      const str = buffer.join("");
+		      s = s.substring(str.length + escape_count + 2);
+		      return [str, s];
+		    }
+		    buffer.push(c);
+		  }
+		  return [buffer.join(""), s.slice(1)];
+		}
 		function parseStringWithoutQuote(s, e, delimiters = [" "]) {
 		  const index = Math.min(...delimiters.map((delimiter) => {
 		    const index2 = s.indexOf(delimiter);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@xsai/stream-object",
   "type": "module",
-  "version": "0.5.0-beta.2",
+  "version": "0.5.0-beta.3",
   "description": "extra-small AI SDK.",
   "author": "Moeru AI",
   "license": "MIT",
@@ -29,13 +29,13 @@
     "dist"
   ],
   "dependencies": {
-    "@xsai/stream-text": "~0.5.0-beta.2",
-    "xsschema": "~0.5.0-beta.2"
+    "@xsai/stream-text": "0.5.0-beta.3",
+    "xsschema": "0.5.0-beta.3"
   },
   "devDependencies": {
     "@valibot/to-json-schema": "^1.0.0",
-    "best-effort-json-parser": "^1.2.1",
-    "type-fest": "^5.4.3",
+    "best-effort-json-parser": "^1.4.0",
+    "type-fest": "^5.5.0",
     "valibot": "^1.0.0"
   },
   "scripts": {