@graffy/common 0.16.0-alpha.4 → 0.16.0-alpha.6

package/index.cjs

@@ -869,7 +869,7 @@ function insertRange(current, change, result, start = 0) {
   const { key, end } = change;
   const keyIx = findFirst(current, key, start);
   const endIx = findLast(current, end, keyIx);
-  if (keyIx === endIx && !(current[keyIx] && cmp(current[keyIx].key, key) <= 0 && cmp(current[keyIx].end, end) >= 0)) {
+  if (keyIx === endIx && !(current[keyIx] && cmp(current[keyIx].key, end) <= 0 && cmp(current[keyIx].end || current[keyIx].key, key) >= 0)) {
     return keyIx;
   }
   const appliedChange = [];
@@ -1398,8 +1398,12 @@ const props = [
   "children"
 ];
 function serializeKey(key) {
-  if (key[0] === STR)
-    return decode$4(key);
+  if (key[0] === STR) {
+    const last = key[key.length - 1];
+    if (cmp(last, MIN_KEY) !== 0 && cmp(last, MAX_KEY) !== 0) {
+      return decode$4(key);
+    }
+  }
   return "\0" + encode$1(key);
 }
 function deserializeKey(key) {
@@ -1407,7 +1411,9 @@ function deserializeKey(key) {
     return decode(key.slice(1));
   return encode$4(key);
 }
-function serializeNodes(children, parentVersion) {
+function pack(children, parentVersion) {
+  if (!Array.isArray(children))
+    return children;
   const array = children.map(
     (node) => props.reduce(
       (array2, prop, i) => {
@@ -1417,7 +1423,7 @@ function serializeNodes(children, parentVersion) {
         if (prop === "version" && value === parentVersion)
           return array2;
         if (prop === "children")
-          value = serializeNodes(value, node.version);
+          value = pack(value, node.version);
         if (prop === "end")
           value = serializeKey(value);
         if (prop === "path")
@@ -1431,7 +1437,9 @@ function serializeNodes(children, parentVersion) {
   );
   return array;
 }
-function deserializeNodes(children, parentVersion) {
+function unpack(children, parentVersion) {
+  if (!Array.isArray(children))
+    return children;
   const node = children.map(
     ([key, type, ...values]) => props.reduce(
       (node2, prop, i) => {
@@ -1439,7 +1447,7 @@ function deserializeNodes(children, parentVersion) {
           return node2;
         let value = values.shift();
         if (prop === "children")
-          value = deserializeNodes(value, node2.version);
+          value = unpack(value, node2.version);
         if (prop === "end")
           value = deserializeKey(value);
         if (prop === "path")
@@ -1452,12 +1460,6 @@ function deserializeNodes(children, parentVersion) {
   );
   return node;
 }
-function serialize(payload) {
-  return JSON.stringify(serializeNodes(payload));
-}
-function deserialize(str) {
-  return deserializeNodes(JSON.parse(str));
-}
 const ROOT_KEY = Symbol();
 function encode(value, { version, isGraph } = {}) {
   var _a;
@@ -1711,7 +1713,6 @@ exports.decodePath = decode$2;
 exports.decodeQuery = decodeQuery;
 exports.decodeValue = decode$4;
 exports.decorate = decorate;
-exports.deserialize = deserialize;
 exports.encodeArgs = encode$3;
 exports.encodeGraph = encodeGraph;
 exports.encodePath = encode$2;
@@ -1744,13 +1745,14 @@ exports.makeWatcher = makeWatcher;
 exports.merge = merge;
 exports.mergeObject = mergeObject;
 exports.mergeStreams = mergeStreams;
+exports.pack = pack;
 exports.remove = remove;
-exports.serialize = serialize;
 exports.setVersion = setVersion;
 exports.sieve = sieve;
 exports.slice = slice;
 exports.splitArgs = splitArgs;
 exports.splitRef = splitRef;
+exports.unpack = unpack;
 exports.unwrap = unwrap;
 exports.unwrapObject = unwrapObject;
 exports.wrap = wrap;

package/index.mjs

@@ -864,7 +864,7 @@ function insertRange(current, change, result, start = 0) {
   const { key, end } = change;
   const keyIx = findFirst(current, key, start);
   const endIx = findLast(current, end, keyIx);
-  if (keyIx === endIx && !(current[keyIx] && cmp(current[keyIx].key, key) <= 0 && cmp(current[keyIx].end, end) >= 0)) {
+  if (keyIx === endIx && !(current[keyIx] && cmp(current[keyIx].key, end) <= 0 && cmp(current[keyIx].end || current[keyIx].key, key) >= 0)) {
     return keyIx;
   }
   const appliedChange = [];
@@ -1393,8 +1393,12 @@ const props = [
   "children"
 ];
 function serializeKey(key) {
-  if (key[0] === STR)
-    return decode$4(key);
+  if (key[0] === STR) {
+    const last = key[key.length - 1];
+    if (cmp(last, MIN_KEY) !== 0 && cmp(last, MAX_KEY) !== 0) {
+      return decode$4(key);
+    }
+  }
   return "\0" + encode$1(key);
 }
 function deserializeKey(key) {
@@ -1402,7 +1406,9 @@ function deserializeKey(key) {
     return decode(key.slice(1));
   return encode$4(key);
 }
-function serializeNodes(children, parentVersion) {
+function pack(children, parentVersion) {
+  if (!Array.isArray(children))
+    return children;
   const array = children.map(
     (node) => props.reduce(
       (array2, prop, i) => {
@@ -1412,7 +1418,7 @@ function serializeNodes(children, parentVersion) {
         if (prop === "version" && value === parentVersion)
           return array2;
         if (prop === "children")
-          value = serializeNodes(value, node.version);
+          value = pack(value, node.version);
         if (prop === "end")
           value = serializeKey(value);
         if (prop === "path")
@@ -1426,7 +1432,9 @@ function serializeNodes(children, parentVersion) {
   );
   return array;
 }
-function deserializeNodes(children, parentVersion) {
+function unpack(children, parentVersion) {
+  if (!Array.isArray(children))
+    return children;
   const node = children.map(
     ([key, type, ...values]) => props.reduce(
       (node2, prop, i) => {
@@ -1434,7 +1442,7 @@ function deserializeNodes(children, parentVersion) {
           return node2;
         let value = values.shift();
         if (prop === "children")
-          value = deserializeNodes(value, node2.version);
+          value = unpack(value, node2.version);
         if (prop === "end")
           value = deserializeKey(value);
         if (prop === "path")
@@ -1447,12 +1455,6 @@ function deserializeNodes(children, parentVersion) {
   );
   return node;
 }
-function serialize(payload) {
-  return JSON.stringify(serializeNodes(payload));
-}
-function deserialize(str) {
-  return deserializeNodes(JSON.parse(str));
-}
 const ROOT_KEY = Symbol();
 function encode(value, { version, isGraph } = {}) {
   var _a;
@@ -1707,7 +1709,6 @@ export {
   decodeQuery,
   decode$4 as decodeValue,
   decorate,
-  deserialize,
   encode$3 as encodeArgs,
   encodeGraph,
   encode$2 as encodePath,
@@ -1740,13 +1741,14 @@ export {
   merge,
   mergeObject,
   mergeStreams,
+  pack,
   remove,
-  serialize,
   setVersion,
   sieve,
   slice,
   splitArgs,
   splitRef,
+  unpack,
   unwrap,
   unwrapObject,
   wrap,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graffy/common",
   "description": "Common libraries that used by various Graffy modules.",
   "author": "aravind (https://github.com/aravindet)",
-  "version": "0.16.0-alpha.4",
+  "version": "0.16.0-alpha.6",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -18,6 +18,6 @@
   "dependencies": {
     "lodash": "^4.17.19",
     "merge-async-iterators": "^0.2.1",
-    "@graffy/stream": "0.16.0-alpha.4"
+    "@graffy/stream": "0.16.0-alpha.6"
   }
 }

package/types/coding/index.d.ts

@@ -1,6 +1,6 @@
 export { default as makeId } from "./id.js";
 export { default as decorate } from "./decorate.js";
-export * from "./serialize.js";
+export * from "./pack.js";
 export * from "./encodeTree.js";
 export * from "./decodeTree.js";
 export { encode as encodeValue, decode as decodeValue } from "./struct.js";

package/types/coding/pack.d.ts

@@ -0,0 +1,2 @@
+export function pack(children: any, parentVersion: any): any;
+export function unpack(children: any, parentVersion: any): any;

package/types/coding/serialize.d.ts

@@ -1,2 +0,0 @@
-export function serialize(payload: any): string;
-export function deserialize(str: any): any;