@swell/apps-sdk 1.0.146 → 1.0.148

package/dist/index.cjs

@@ -535,17 +535,18 @@ function toEnumerable(val) {
   if (isArray(val)) return val;
   if (isString(val) && val.length > 0) return [val];
   if (isIterable(val)) return Array.from(val);
-  if (isObject(val))
+  if (isObject(val)) {
     return Object.entries(val).reduce((acc, [key, value]) => {
       acc.push({ id: key, ...value });
       return acc;
     }, []);
+  }
   return [];
 }
 async function resolveEnumerable(val) {
   if (val instanceof SwellStorefrontCollection) {
-    await val._get();
-    return [...val];
+    const iterator = await val.iterator();
+    return [...iterator];
   } else if (val instanceof import_liquidjs.Drop && Symbol.iterator in val) {
     const iterFn = val[Symbol.iterator];
     if (typeof iterFn === "function") {
@@ -767,12 +768,13 @@ var StorefrontResource = class {
       return Promise.resolve().then(getter).then((result) => {
         return this._transformResult(result);
       }).then((result) => {
-        this._result = result;
+        this._result = result ?? null;
         if (result) {
           Object.assign(this, result);
         }
         return result;
       }).catch((err) => {
+        this._result = null;
         logger.error(err);
         return null;
       });
@@ -841,12 +843,14 @@ var StorefrontResource = class {
 };
 function cloneStorefrontResource(input) {
   const resourceName = input._resourceName;
-  const clone = new StorefrontResource(input._getter);
-  clone._params = input._params;
-  clone._transformResult = input._transformResult.bind(clone);
-  Object.defineProperty(clone.constructor, "name", {
+  const ClonedClass = class extends StorefrontResource {
+  };
+  Object.defineProperty(ClonedClass, "name", {
     value: resourceName
   });
+  const clone = new ClonedClass(input._getter);
+  clone._params = input._params;
+  clone._transformResult = input._transformResult.bind(clone);
   Object.defineProperty(clone, "_resourceName", {
     value: resourceName
   });
@@ -874,8 +878,12 @@ var SwellStorefrontResource = class extends StorefrontResource {
     if (_swell && _collection.startsWith("content/")) {
       const type = _collection.split("/")[1]?.replace(/\/$/, "").trim();
       this._resource = {
-        list: (query) => _swell.storefront.content.list(type, query),
-        get: (id, query) => _swell.storefront.content.get(type, id, query)
+        list(query) {
+          return _swell.storefront.content.list(type, query);
+        },
+        get(id, query) {
+          return _swell.storefront.content.get(type, id, query);
+        }
       };
     }
     if (!this._resource?.get) {
@@ -944,7 +952,7 @@ var SwellStorefrontCollection = class _SwellStorefrontCollection extends SwellSt
         getter,
         isResourceCacheble(this._collection)
       ).then((result) => {
-        this._result = result;
+        this._result = result ?? null;
         if (result) {
           Object.assign(this, result, {
             length: result.results?.length || 0
@@ -952,16 +960,29 @@ var SwellStorefrontCollection = class _SwellStorefrontCollection extends SwellSt
         }
         return result;
       }).catch((err) => {
+        this._result = null;
         logger.error(err);
         return null;
       });
     }
     return this._result;
   }
+  get size() {
+    if (this._result !== void 0) {
+      return this.length;
+    }
+    return this._resolve().then(() => this.length);
+  }
   [Symbol.iterator]() {
     return this.iterator();
   }
   iterator() {
+    if (this._result !== void 0) {
+      return this.makeIterator();
+    }
+    return this._resolve().then(() => this.makeIterator());
+  }
+  makeIterator() {
     return (this.results || []).values();
   }
   _clone(newProps) {
@@ -15264,7 +15285,7 @@ function ShopifyAddress(instance, address, account) {
       address,
       (address2) => address2.first_name || account?.first_name
     ),
-    id: defer(() => address.id),
+    id: defer(() => address.id || address.account_address_id),
     last_name: deferWith(
       address,
       (address2) => address2.last_name || account?.last_name
@@ -15292,7 +15313,10 @@ function ShopifyAddress(instance, address, account) {
         address2.country
       )
     ),
-    url: deferWith(address, (address2) => `/account/addresses/${address2.id}`),
+    url: deferWith(
+      address,
+      (address2) => `/account/addresses/${address2.id || address2.account_address_id}`
+    ),
     zip: defer(() => address.zip)
   });
 }