jazz-tools 0.19.0 → 0.19.1

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> jazz-tools@0.19.0 build /home/runner/_work/jazz/jazz/packages/jazz-tools
+> jazz-tools@0.19.1 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","tools/ssr":"src/tools/ssr/index.ts"}
@@ -107,29 +107,12 @@
 ESM Build start
 CLI Cleaning output folder
 ESM Build start
-ESM dist/tiptap/index.js     564.00 B
-ESM dist/tiptap/index.js.map 1.21 KB
-ESM ⚡️ Build success in 47ms
-ESM dist/worker/index.js           3.19 KB
-ESM dist/worker/napi-crypto.js     110.00 B
-ESM dist/worker/edge-wasm.js       215.00 B
-ESM dist/worker/index.js.map       6.24 KB
-ESM dist/worker/napi-crypto.js.map 162.00 B
-ESM dist/worker/edge-wasm.js.map   434.00 B
-ESM ⚡️ Build success in 48ms
 ESM dist/better-auth/auth/client.js     4.50 KB
 ESM dist/better-auth/auth/server.js     8.36 KB
 ESM dist/better-auth/auth/react.js      799.00 B
 ESM dist/better-auth/auth/client.js.map 8.32 KB
 ESM dist/better-auth/auth/server.js.map 15.31 KB
 ESM dist/better-auth/auth/react.js.map  2.04 KB
-ESM ⚡️ Build success in 42ms
-ESM dist/react-native/index.js       2.53 KB
-ESM dist/react-native/testing.js     120.00 B
-ESM dist/react-native/crypto.js      161.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  197.00 B
 ESM ⚡️ Build success in 45ms
 ESM dist/media/index.js              236.00 B
 ESM dist/media/index.browser.js      2.79 KB
@@ -141,71 +124,88 @@
 ESM dist/media/index.native.js.map   8.10 KB
 ESM dist/media/index.server.js.map   6.37 KB
 ESM dist/media/chunk-3LKBM3G3.js.map 16.99 KB
-ESM ⚡️ Build success in 52ms
-ESM dist/browser/index.js     14.06 KB
-ESM dist/browser/index.js.map 29.94 KB
-ESM ⚡️ Build success in 79ms
-ESM dist/expo/index.js       4.68 KB
-ESM dist/expo/crypto.js      153.00 B
-ESM dist/expo/testing.js     112.00 B
-ESM dist/expo/index.js.map   10.23 KB
-ESM dist/expo/crypto.js.map  189.00 B
-ESM dist/expo/testing.js.map 168.00 B
-ESM ⚡️ Build success in 69ms
-ESM dist/react-core/testing.js            1.22 KB
+ESM ⚡️ Build success in 51ms
+ESM dist/tiptap/index.js     564.00 B
+ESM dist/tiptap/index.js.map 1.21 KB
+ESM ⚡️ Build success in 58ms
 ESM dist/react-core/index.js              14.37 KB
+ESM dist/react-core/testing.js            1.22 KB
 ESM dist/react-core/chunk-7DYMJ74I.js     279.00 B
-ESM dist/react-core/testing.js.map        1.86 KB
 ESM dist/react-core/index.js.map          40.54 KB
+ESM dist/react-core/testing.js.map        1.86 KB
 ESM dist/react-core/chunk-7DYMJ74I.js.map 533.00 B
-ESM ⚡️ Build success in 75ms
-ESM dist/react/testing.js     122.00 B
-ESM dist/react/index.js       25.74 KB
-ESM dist/react/ssr.js         697.00 B
-ESM dist/react/testing.js.map 165.00 B
-ESM dist/react/index.js.map   55.43 KB
-ESM dist/react/ssr.js.map     1.11 KB
+ESM ⚡️ Build success in 49ms
+ESM dist/worker/index.js           3.19 KB
+ESM dist/worker/edge-wasm.js       215.00 B
+ESM dist/worker/napi-crypto.js     110.00 B
+ESM dist/worker/index.js.map       6.24 KB
+ESM dist/worker/napi-crypto.js.map 162.00 B
+ESM dist/worker/edge-wasm.js.map   434.00 B
+ESM ⚡️ Build success in 55ms
+ESM dist/react-native/index.js       2.53 KB
+ESM dist/react-native/testing.js     120.00 B
+ESM dist/react-native/crypto.js      161.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  197.00 B
 ESM ⚡️ Build success in 65ms
 ESM dist/better-auth/database-adapter/index.js     26.65 KB
 ESM dist/better-auth/database-adapter/index.js.map 58.26 KB
-ESM ⚡️ Build success in 64ms
+ESM ⚡️ Build success in 58ms
+ESM dist/browser/index.js     14.06 KB
+ESM dist/browser/index.js.map 29.94 KB
+ESM ⚡️ Build success in 73ms
+ESM dist/prosemirror/index.js     77.76 KB
+ESM dist/prosemirror/index.js.map 307.20 KB
+ESM ⚡️ Build success in 70ms
+ESM dist/expo/index.js       4.68 KB
+ESM dist/expo/testing.js     112.00 B
+ESM dist/expo/crypto.js      153.00 B
+ESM dist/expo/index.js.map   10.23 KB
+ESM dist/expo/testing.js.map 168.00 B
+ESM dist/expo/crypto.js.map  189.00 B
+ESM ⚡️ Build success in 71ms
 ESM dist/react-native-core/index.js       18.97 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   38.60 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 88ms
-ESM dist/prosemirror/index.js     77.76 KB
-ESM dist/prosemirror/index.js.map 307.20 KB
-ESM ⚡️ Build success in 93ms
+ESM ⚡️ Build success in 74ms
+ESM dist/react/index.js       25.74 KB
+ESM dist/react/testing.js     122.00 B
+ESM dist/react/ssr.js         697.00 B
+ESM dist/react/index.js.map   55.43 KB
+ESM dist/react/testing.js.map 165.00 B
+ESM dist/react/ssr.js.map     1.11 KB
+ESM ⚡️ Build success in 75ms
 ESM dist/inspector/index.js     97.51 KB
 ESM dist/inspector/index.js.map 171.35 KB
 ESM ⚡️ Build success in 95ms
-ESM dist/index.js              29.09 KB
 ESM dist/testing.js            8.51 KB
-ESM dist/chunk-P3YLNFN4.js     199.68 KB
+ESM dist/index.js              29.09 KB
 ESM dist/tools/ssr.js          156.00 B
 ESM dist/chunk-M2HGBOXS.js     694.00 B
 ESM dist/chunk-PZ5AY32C.js     233.00 B
-ESM dist/index.js.map          60.08 KB
+ESM dist/chunk-NCNM6UDZ.js     200.80 KB
 ESM dist/testing.js.map        16.17 KB
-ESM dist/chunk-P3YLNFN4.js.map 470.44 KB
+ESM dist/index.js.map          60.08 KB
 ESM dist/tools/ssr.js.map      71.00 B
 ESM dist/chunk-M2HGBOXS.js.map 1.10 KB
 ESM dist/chunk-PZ5AY32C.js.map 71.00 B
-ESM ⚡️ Build success in 111ms
+ESM dist/chunk-NCNM6UDZ.js.map 473.58 KB
+ESM ⚡️ Build success in 112ms
 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-QESCMFY7.js     1.57 MB
 ESM dist/inspector/custom-element-QESCMFY7.js.map 2.41 MB
-ESM ⚡️ Build success in 162ms
+ESM ⚡️ Build success in 164ms
 
-> jazz-tools@0.19.0 types /home/runner/_work/jazz/jazz/packages/jazz-tools
+> jazz-tools@0.19.1 types /home/runner/_work/jazz/jazz/packages/jazz-tools
 > tsc --outDir dist
 
 
-> jazz-tools@0.19.0 build:svelte /home/runner/_work/jazz/jazz/packages/jazz-tools
+> jazz-tools@0.19.1 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,15 @@
 # jazz-tools
 
+## 0.19.1
+
+### Patch Changes
+
+- f444bd9: Add `resolve` support for `co.discriminatedUnion`
+- Updated dependencies [afd2ded]
+  - cojson@0.19.1
+  - cojson-storage-indexeddb@0.19.1
+  - cojson-transport-ws@0.19.1
+
 ## 0.19.0
 
 ### Minor Changes

package/dist/{chunk-P3YLNFN4.js → chunk-NCNM6UDZ.js}

@@ -3340,8 +3340,6 @@ var SchemaUnion = class _SchemaUnion extends CoValueBase {
   /**
    * Load a `SchemaUnion` with a given ID, as a given account.
    *
-   * Note: The `resolve` option is not supported for `SchemaUnion`s due to https://github.com/garden-co/jazz/issues/2639
-   *
    * @category Subscription & Loading
    */
   static load(id, options) {
@@ -4177,6 +4175,7 @@ var SubscriptionScope = class _SubscriptionScope {
     this.autoloadedKeys = /* @__PURE__ */ new Set();
     this.skipInvalidKeys = /* @__PURE__ */ new Set();
     this.totalValidTransactions = 0;
+    this.version = 0;
     this.migrated = false;
     this.migrating = false;
     this.closed = false;
@@ -4283,9 +4282,7 @@ var SubscriptionScope = class _SubscriptionScope {
       this.updateValue(createCoValue(this.schema, update, this));
       this.loadChildren();
     } else {
-      const hasChanged = update.totalValidTransactions !== this.totalValidTransactions || // Checking the identity of the raw value makes us cover the cases where the group
-      // has been updated and the coValues that don't update the totalValidTransactions value (e.g. FileStream)
-      this.value.value.$jazz.raw !== update;
+      const hasChanged = update.totalValidTransactions !== this.totalValidTransactions || update.version !== this.version;
       if (this.loadChildren()) {
         this.updateValue(createCoValue(this.schema, update, this));
       } else if (hasChanged) {
@@ -4293,6 +4290,7 @@ var SubscriptionScope = class _SubscriptionScope {
       }
     }
     this.totalValidTransactions = update.totalValidTransactions;
+    this.version = update.version;
     this.silenceUpdates = false;
     this.triggerUpdate();
   }
@@ -4547,17 +4545,6 @@ var SubscriptionScope = class _SubscriptionScope {
     const id = map.$jazz.raw.get(key);
     const descriptor = map.$jazz.getDescriptor(key);
     if (!descriptor) {
-      this.childErrors.set(
-        key,
-        new JazzError(void 0, CoValueLoadingState.UNAVAILABLE, [
-          {
-            code: "validationError",
-            message: `The ref ${key} requested on ${map.constructor.name} is not defined in the schema`,
-            params: {},
-            path: [key]
-          }
-        ])
-      );
       return void 0;
     }
     if (isRefEncoded(descriptor)) {
@@ -4889,19 +4876,32 @@ function createAnonymousJazzContext({
 }
 
 // src/tools/implementation/zodSchema/schemaTypes/CoDiscriminatedUnionSchema.ts
-var CoDiscriminatedUnionSchema = class {
+var CoDiscriminatedUnionSchema = class _CoDiscriminatedUnionSchema {
   constructor(coreSchema, coValueClass) {
     this.coValueClass = coValueClass;
     this.collaborative = true;
     this.builtin = "CoDiscriminatedUnion";
+    /**
+     * Default resolve query to be used when loading instances of this schema.
+     * This resolve query will be used when no resolve query is provided to the load method.
+     * @default true
+     */
     this.resolveQuery = true;
     this.getDefinition = coreSchema.getDefinition;
   }
   load(id, options) {
-    return this.coValueClass.load(id, options);
+    return this.coValueClass.load(
+      id,
+      // @ts-expect-error
+      withSchemaResolveQuery(options, this.resolveQuery)
+    );
   }
   subscribe(id, options, listener) {
-    return this.coValueClass.subscribe(id, options, listener);
+    return this.coValueClass.subscribe(
+      id,
+      withSchemaResolveQuery(options, this.resolveQuery),
+      listener
+    );
   }
   getCoValueClass() {
     return this.coValueClass;
@@ -4909,6 +4909,23 @@ var CoDiscriminatedUnionSchema = class {
   optional() {
     return coOptionalDefiner(this);
   }
+  /**
+   * Adds a default resolve query to be used when loading instances of this schema.
+   * This resolve query will be used when no resolve query is provided to the load method.
+   */
+  resolved(resolveQuery) {
+    const definition = this.getDefinition();
+    const coreSchema = createCoreCoDiscriminatedUnionSchema(
+      definition.discriminator,
+      definition.options
+    );
+    const copy = new _CoDiscriminatedUnionSchema(
+      coreSchema,
+      this.coValueClass
+    );
+    copy.resolveQuery = resolveQuery;
+    return copy;
+  }
 };
 function createCoreCoDiscriminatedUnionSchema(discriminator, schemas) {
   return {
@@ -5728,10 +5745,20 @@ function schemaUnionDiscriminatorFor(schema) {
       }
     }
     const determineSchema = (discriminable) => {
+      const allNestedRefKeys = /* @__PURE__ */ new Set();
+      for (const option of availableOptions) {
+        const coMapShape = option.getDefinition().shape;
+        for (const [key, value] of Object.entries(coMapShape)) {
+          if (isAnyCoValueSchema2(value)) {
+            allNestedRefKeys.add(key);
+          }
+        }
+      }
       for (const option of availableOptions) {
         let match = true;
+        const optionDef = option.getDefinition();
         for (const key of Object.keys(discriminatorMap)) {
-          const discriminatorDef = option.getDefinition().shape[key];
+          const discriminatorDef = optionDef.shape[key];
           const discriminatorValue = discriminable.get(key);
           if (discriminatorValue && typeof discriminatorValue === "object") {
             throw new Error("Discriminator must be a primitive value");
@@ -5755,7 +5782,19 @@ function schemaUnionDiscriminatorFor(schema) {
         }
         if (match) {
           const coValueSchema = hydrateCoreCoValueSchema(option);
-          return coValueSchema.getCoValueClass();
+          const coValueClass = coValueSchema.getCoValueClass();
+          const dummyFieldNames = allNestedRefKeys.keys().filter((key) => !optionDef.shape[key]).toArray();
+          if (dummyFieldNames.length === 0) {
+            return coValueClass;
+          }
+          return class extends coValueClass {
+            constructor(...args) {
+              super(...args);
+              for (const key of dummyFieldNames) {
+                this[key] = coField.null;
+              }
+            }
+          };
         }
       }
       throw new Error(
@@ -6907,4 +6946,4 @@ export {
   JazzContextManager
 };
 /* istanbul ignore file -- @preserve */
-//# sourceMappingURL=chunk-P3YLNFN4.js.map
+//# sourceMappingURL=chunk-NCNM6UDZ.js.map