jazz-tools 0.16.2 → 0.16.4

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> jazz-tools@0.16.2 build /home/runner/_work/jazz/jazz/packages/jazz-tools
+> jazz-tools@0.16.4 build /home/runner/_work/jazz/jazz/packages/jazz-tools
 > tsup && pnpm types && pnpm build:svelte
 
 CLI Building entry: {"index":"src/index.ts","testing":"src/testing.ts"}
@@ -107,81 +107,81 @@
 ESM Build start
 CLI Cleaning output folder
 ESM Build start
-ESM dist/react/ssr.js     688.00 B
-ESM dist/react/ssr.js.map 1.12 KB
-ESM ⚡️ Build success in 16ms
-ESM dist/tiptap/index.js     564.00 B
-ESM dist/tiptap/index.js.map 1.21 KB
-ESM ⚡️ Build success in 14ms
 ESM dist/browser-media-images/index.js     2.55 KB
 ESM dist/browser-media-images/index.js.map 5.46 KB
-ESM ⚡️ Build success in 19ms
+ESM ⚡️ Build success in 25ms
+ESM dist/react/ssr.js     688.00 B
+ESM dist/react/ssr.js.map 1.12 KB
+ESM ⚡️ Build success in 27ms
 ESM dist/worker/index.js     2.31 KB
 ESM dist/worker/index.js.map 4.77 KB
-ESM ⚡️ Build success in 20ms
+ESM ⚡️ Build success in 25ms
+ESM dist/tiptap/index.js     564.00 B
+ESM dist/tiptap/index.js.map 1.21 KB
+ESM ⚡️ Build success in 26ms
+ESM dist/react-native-media-images/index.js     6.19 KB
+ESM dist/react-native-media-images/index.js.map 10.96 KB
+ESM ⚡️ Build success in 30ms
 ESM dist/react-core/index.js              8.42 KB
 ESM dist/react-core/testing.js            1.17 KB
 ESM dist/react-core/chunk-7DYMJ74I.js     279.00 B
-ESM dist/react-core/index.js.map          16.44 KB
-ESM dist/react-core/chunk-7DYMJ74I.js.map 533.00 B
+ESM dist/react-core/index.js.map          20.69 KB
 ESM dist/react-core/testing.js.map        1.82 KB
-ESM ⚡️ Build success in 23ms
-ESM dist/react-native-media-images/index.js     6.19 KB
-ESM dist/react-native-media-images/index.js.map 10.96 KB
-ESM ⚡️ Build success in 21ms
+ESM dist/react-core/chunk-7DYMJ74I.js.map 533.00 B
+ESM ⚡️ Build success in 32ms
+ESM dist/expo/index.js       4.65 KB
+ESM dist/expo/testing.js     112.00 B
+ESM dist/expo/crypto.js      109.00 B
+ESM dist/expo/index.js.map   10.17 KB
+ESM dist/expo/testing.js.map 168.00 B
+ESM dist/expo/crypto.js.map  166.00 B
+ESM ⚡️ Build success in 37ms
 ESM dist/react-native/index.js       2.53 KB
 ESM dist/react-native/testing.js     120.00 B
 ESM dist/react-native/crypto.js      117.00 B
 ESM dist/react-native/index.js.map   5.68 KB
 ESM dist/react-native/testing.js.map 176.00 B
 ESM dist/react-native/crypto.js.map  174.00 B
-ESM ⚡️ Build success in 26ms
+ESM ⚡️ Build success in 41ms
+ESM dist/react/index.js       20.70 KB
+ESM dist/react/testing.js     122.00 B
+ESM dist/react/index.js.map   34.14 KB
+ESM dist/react/testing.js.map 165.00 B
+ESM ⚡️ Build success in 43ms
 ESM dist/browser/index.js     13.43 KB
 ESM dist/browser/index.js.map 28.65 KB
-ESM ⚡️ Build success in 32ms
-ESM dist/expo/index.js       4.65 KB
-ESM dist/expo/testing.js     112.00 B
-ESM dist/expo/crypto.js      109.00 B
-ESM dist/expo/index.js.map   10.17 KB
-ESM dist/expo/testing.js.map 168.00 B
-ESM dist/expo/crypto.js.map  166.00 B
-ESM ⚡️ Build success in 32ms
+ESM ⚡️ Build success in 49ms
 ESM dist/react-native-core/index.js       16.95 KB
 ESM dist/react-native-core/testing.js     119.00 B
 ESM dist/react-native-core/crypto.js      2.10 KB
 ESM dist/react-native-core/index.js.map   33.57 KB
 ESM dist/react-native-core/testing.js.map 175.00 B
 ESM dist/react-native-core/crypto.js.map  4.25 KB
-ESM ⚡️ Build success in 37ms
-ESM dist/react/index.js       20.70 KB
-ESM dist/react/testing.js     122.00 B
-ESM dist/react/index.js.map   34.14 KB
-ESM dist/react/testing.js.map 165.00 B
-ESM ⚡️ Build success in 43ms
+ESM ⚡️ Build success in 54ms
 ESM dist/prosemirror/index.js     76.90 KB
 ESM dist/prosemirror/index.js.map 305.53 KB
-ESM ⚡️ Build success in 45ms
+ESM ⚡️ Build success in 61ms
 ESM dist/inspector/index.js     60.37 KB
 ESM dist/inspector/index.js.map 107.85 KB
-ESM ⚡️ Build success in 70ms
+ESM ⚡️ Build success in 73ms
 ESM dist/testing.js            6.76 KB
 ESM dist/index.js              26.00 KB
-ESM dist/chunk-CL3ROOZM.js     148.99 KB
+ESM dist/chunk-74LZG2M3.js     151.07 KB
 ESM dist/testing.js.map        13.06 KB
 ESM dist/index.js.map          52.65 KB
-ESM dist/chunk-CL3ROOZM.js.map 356.97 KB
-ESM ⚡️ Build success in 77ms
+ESM dist/chunk-74LZG2M3.js.map 362.38 KB
+ESM ⚡️ Build success in 91ms
 ESM dist/inspector/register-custom-element.js     218.00 B
 ESM dist/inspector/register-custom-element.js.map 314.00 B
 ESM dist/inspector/custom-element-TUXKXSZU.js     1.53 MB
 ESM dist/inspector/custom-element-TUXKXSZU.js.map 2.35 MB
-ESM ⚡️ Build success in 115ms
+ESM ⚡️ Build success in 135ms
 
-> jazz-tools@0.16.2 types /home/runner/_work/jazz/jazz/packages/jazz-tools
+> jazz-tools@0.16.4 types /home/runner/_work/jazz/jazz/packages/jazz-tools
 > tsc --outDir dist
 
 
-> jazz-tools@0.16.2 build:svelte /home/runner/_work/jazz/jazz/packages/jazz-tools
+> jazz-tools@0.16.4 build:svelte /home/runner/_work/jazz/jazz/packages/jazz-tools
 > rm -rf dist/svelte && svelte-package -i src/svelte -o dist/svelte --tsconfig tsconfig.svelte.json
 
 src/svelte -> dist/svelte

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # jazz-tools
 
+## 0.16.4
+
+### Patch Changes
+
+- 16764f6: Added `pick()` and `partial()` methods to CoMapSchema
+- Updated dependencies [f9d538f]
+- Updated dependencies [802b5a3]
+  - cojson@0.16.4
+  - cojson-storage-indexeddb@0.16.4
+  - cojson-transport-ws@0.16.4
+
+## 0.16.3
+
+### Patch Changes
+
+- 43d3511: Streamlined CoValue creation:
+  - CoValues can be created with plain JSON objects. Nested CoValues will be automatically created when necessary.
+  - Optional fields can be ommited (i.e. it's no longer necessary to provide an explicit `undefined` value).
+  - cojson@0.16.3
+  - cojson-storage-indexeddb@0.16.3
+  - cojson-transport-ws@0.16.3
+
 ## 0.16.2
 
 ### Patch Changes

package/dist/{chunk-CL3ROOZM.js → chunk-74LZG2M3.js}

@@ -118,11 +118,6 @@ function isAnyCoValueSchema(schema) {
   return "collaborative" in schema && schema.collaborative === true;
 }
 
-// src/tools/coValues/interfaces.ts
-import {
-  emptyKnownState
-} from "cojson";
-
 // src/tools/coValues/CoValueBase.ts
 import { ControlledAccount, RawAccount } from "cojson";
 var CoValueBase = class {
@@ -406,8 +401,17 @@ var _CoMap = class _CoMap extends CoValueBase {
         if (descriptor === "json") {
           rawInit[key] = initValue;
         } else if (isRefEncoded(descriptor)) {
-          if (initValue) {
-            rawInit[key] = initValue.id;
+          if (initValue != null) {
+            let refId = initValue.id;
+            if (!refId) {
+              const coValue = instantiateRefEncodedWithInit(
+                descriptor,
+                initValue,
+                owner
+              );
+              refId = coValue.id;
+            }
+            rawInit[key] = refId;
           }
         } else if ("encoded" in descriptor) {
           rawInit[key] = descriptor.encoded.encode(
@@ -846,7 +850,7 @@ var _CoList = class _CoList extends Array {
     const { owner } = parseCoValueCreateOptions(options);
     const instance = new this({ init: items, owner });
     const raw = owner._raw.createList(
-      toRawItems(items, instance._schema[ItemsSym])
+      toRawItems(items, instance._schema[ItemsSym], owner)
     );
     Object.defineProperties(instance, {
       id: {
@@ -859,14 +863,18 @@ var _CoList = class _CoList extends Array {
   }
   push(...items) {
     this._raw.appendItems(
-      toRawItems(items, this._schema[ItemsSym]),
+      toRawItems(items, this._schema[ItemsSym], this._owner),
       void 0,
       "private"
     );
     return this._raw.entries().length;
   }
   unshift(...items) {
-    for (const item of toRawItems(items, this._schema[ItemsSym])) {
+    for (const item of toRawItems(
+      items,
+      this._schema[ItemsSym],
+      this._owner
+    )) {
       this._raw.prepend(item);
     }
     return this._raw.entries().length;
@@ -893,7 +901,11 @@ var _CoList = class _CoList extends Array {
     for (let idxToDelete = start + deleteCount - 1; idxToDelete >= start; idxToDelete--) {
       this._raw.delete(idxToDelete);
     }
-    const rawItems = toRawItems(items, this._schema[ItemsSym]);
+    const rawItems = toRawItems(
+      items,
+      this._schema[ItemsSym],
+      this._owner
+    );
     if (rawItems.length === 0) {
       return deleted;
     }
@@ -1026,13 +1038,29 @@ var _CoList = class _CoList extends Array {
 };
 _CoList.prototype._type = "CoList";
 var CoList = _CoList;
-function toRawItems(items, itemDescriptor) {
-  const rawItems = itemDescriptor === "json" ? items : "encoded" in itemDescriptor ? items?.map((e) => itemDescriptor.encoded.encode(e)) : isRefEncoded(itemDescriptor) ? items?.map((v) => {
-    if (!v) return null;
-    return v.id;
-  }) : (() => {
+function toRawItems(items, itemDescriptor, owner) {
+  let rawItems = [];
+  if (itemDescriptor === "json") {
+    rawItems = items;
+  } else if ("encoded" in itemDescriptor) {
+    rawItems = items?.map((e) => itemDescriptor.encoded.encode(e));
+  } else if (isRefEncoded(itemDescriptor)) {
+    rawItems = items?.map((value) => {
+      if (value == null) return null;
+      let refId = value.id;
+      if (!refId) {
+        const coValue = instantiateRefEncodedWithInit(
+          itemDescriptor,
+          value,
+          owner
+        );
+        refId = coValue.id;
+      }
+      return refId;
+    });
+  } else {
     throw new Error("Invalid element descriptor");
-  })();
+  }
   return rawItems;
 }
 var CoListProxyHandler = {
@@ -1265,7 +1293,16 @@ var _CoFeed = class _CoFeed extends CoValueBase {
     } else if ("encoded" in itemDescriptor) {
       this._raw.push(itemDescriptor.encoded.encode(item));
     } else if (isRefEncoded(itemDescriptor)) {
-      this._raw.push(item.id);
+      let refId = item.id;
+      if (!refId) {
+        const coValue = instantiateRefEncodedWithInit(
+          itemDescriptor,
+          item,
+          this._owner
+        );
+        refId = coValue.id;
+      }
+      this._raw.push(refId);
     }
   }
   /**
@@ -2696,6 +2733,10 @@ var SchemaUnion = class _SchemaUnion extends CoValueBase {
    **/
   static Of(discriminator) {
     return class SchemaUnionClass extends _SchemaUnion {
+      static create(init, owner) {
+        const ResolvedClass = discriminator(new Map(Object.entries(init)));
+        return ResolvedClass.create(init, owner);
+      }
       static fromRaw(raw) {
         const ResolvedClass = discriminator(
           raw
@@ -2704,13 +2745,15 @@ var SchemaUnion = class _SchemaUnion extends CoValueBase {
       }
     };
   }
+  static create(init, owner) {
+    throw new Error("Not implemented");
+  }
   /**
    * Create an instance from raw data. This is called internally and should not be used directly.
    * Use {@link SchemaUnion.Of} to create a union type instead.
    *
    * @internal
    */
-  // @ts-ignore
   static fromRaw(raw) {
     throw new Error("Not implemented");
   }
@@ -2940,11 +2983,21 @@ function ref(arg, options) {
 function isRefEncoded(schema) {
   return typeof schema === "object" && "ref" in schema && "optional" in schema && typeof schema.ref === "function";
 }
-function instantiateRefEncoded(schema, raw) {
+function instantiateRefEncodedFromRaw(schema, raw) {
   return isCoValueClass(schema.ref) ? schema.ref.fromRaw(raw) : schema.ref(
     raw
   ).fromRaw(raw);
 }
+function instantiateRefEncodedWithInit(schema, init, parentOwner) {
+  if (!isCoValueClass(schema.ref)) {
+    throw Error(
+      `Cannot automatically create CoValue from value: ${JSON.stringify(init)}. Use the CoValue schema's create() method instead.`
+    );
+  }
+  const owner = Group.create();
+  owner.addMember(parentOwner.castAs(Group));
+  return schema.ref.create(init, owner);
+}
 
 // src/tools/lib/migration.ts
 function applyCoValueMigrations(instance) {
@@ -3063,7 +3116,7 @@ function getOwnerFromRawValue(raw) {
   );
 }
 function createCoValue(ref2, raw, subscriptionScope) {
-  const freshValueInstance = instantiateRefEncoded(ref2, raw);
+  const freshValueInstance = instantiateRefEncodedFromRaw(ref2, raw);
   Object.defineProperty(freshValueInstance, "_subscriptionScope", {
     value: subscriptionScope,
     writable: false,
@@ -3138,7 +3191,9 @@ var SubscriptionScope = class _SubscriptionScope {
             return;
           }
           this.migrating = true;
-          applyCoValueMigrations(instantiateRefEncoded(this.schema, value));
+          applyCoValueMigrations(
+            instantiateRefEncodedFromRaw(this.schema, value)
+          );
           this.migrated = true;
           this.handleUpdate(lastUpdate);
           return;
@@ -4003,6 +4058,33 @@ function enrichCoMapSchema(schema, coValueClass) {
     },
     optional: () => {
       return coOptionalDefiner(coValueSchema);
+    },
+    pick: (keys) => {
+      const keysSet = new Set(Object.keys(keys));
+      const pickedShape = {};
+      for (const [key, value] of Object.entries(coValueSchema.shape)) {
+        if (keysSet.has(key)) {
+          pickedShape[key] = value;
+        }
+      }
+      return coMapDefiner(pickedShape);
+    },
+    partial: () => {
+      const partialShape = {};
+      for (const [key, value] of Object.entries(coValueSchema.shape)) {
+        if (isAnyCoValueSchema2(value)) {
+          partialShape[key] = coOptionalDefiner(value);
+        } else {
+          partialShape[key] = z.optional(coValueSchema.shape[key]);
+        }
+      }
+      const partialCoMapSchema = coMapDefiner(partialShape);
+      if (coValueSchema.catchAll) {
+        return partialCoMapSchema.catchall(
+          coValueSchema.catchAll
+        );
+      }
+      return partialCoMapSchema;
     }
   });
   return coValueSchema;
@@ -4182,7 +4264,6 @@ function enrichAccountSchema(schema, coValueClass) {
 }
 
 // src/tools/implementation/zodSchema/unionUtils.ts
-import { RawCoList } from "cojson";
 function schemaUnionDiscriminatorFor(schema) {
   if (isUnionOfCoMapsDeeply(schema)) {
     const definition = schema.getDefinition();
@@ -4216,17 +4297,12 @@ function schemaUnionDiscriminatorFor(schema) {
         );
       }
     }
-    const determineSchema = (_raw) => {
-      if (_raw instanceof RawCoList) {
-        throw new Error(
-          "co.discriminatedUnion() of collaborative types is not supported for CoLists"
-        );
-      }
+    const determineSchema = (discriminable) => {
       for (const option of availableOptions) {
         let match = true;
         for (const key of Object.keys(discriminatorMap)) {
           const discriminatorDef = option.getDefinition().shape[key];
-          const discriminatorValue = _raw.get(key);
+          const discriminatorValue = discriminable.get(key);
           if (discriminatorValue && typeof discriminatorValue === "object") {
             throw new Error("Discriminator must be a primitive value");
           }
@@ -5075,9 +5151,9 @@ function isAccountInstance(instance) {
   return "_type" in instance && instance._type === "Account";
 }
 function parseCoValueCreateOptions(options) {
-  const Group9 = RegisteredSchemas["Group"];
+  const Group10 = RegisteredSchemas["Group"];
   if (!options) {
-    return { owner: Group9.create(), uniqueness: void 0 };
+    return { owner: Group10.create(), uniqueness: void 0 };
   }
   if ("_type" in options) {
     if (options._type === "Account" || options._type === "Group") {
@@ -5086,7 +5162,7 @@ function parseCoValueCreateOptions(options) {
   }
   const uniqueness = options.unique ? { uniqueness: options.unique } : void 0;
   return {
-    owner: options.owner ?? Group9.create(),
+    owner: options.owner ?? Group10.create(),
     uniqueness
   };
 }
@@ -5157,8 +5233,8 @@ function loadContentPiecesFromCoValue(core2, valuesExported, contentPieces) {
       loadContentPiecesFromCoValue(depCoValue, valuesExported, contentPieces);
     }
   }
-  const pieces = core2.verified.newContentSince(emptyKnownState(core2.id));
-  for (const piece of pieces ?? []) {
+  const pieces = core2.verified.newContentSince(void 0) ?? [];
+  for (const piece of pieces) {
     contentPieces.push(piece);
   }
 }
@@ -5211,4 +5287,4 @@ export {
   JazzContextManager
 };
 /* istanbul ignore file -- @preserve */
-//# sourceMappingURL=chunk-CL3ROOZM.js.map
+//# sourceMappingURL=chunk-74LZG2M3.js.map