@plasmicpkgs/plasmic-strapi 0.1.156 → 0.1.159

package/dist/index.js

@@ -98,6 +98,16 @@ var queryParameters = [
   }
 ];
 var uniq = (xs) => Array.from(new Set(xs));
+var getAttributes = (item) => {
+  if (!item) {
+    return void 0;
+  }
+  if (item.attributes) {
+    return item.attributes;
+  }
+  const { documentId: _documentId, locale: _locale, ...rest } = item;
+  return rest;
+};
 
 // src/StrapiCredentialsProvider.tsx
 var StrapiCredentialsContext = import_react.default.createContext(void 0);
@@ -275,18 +285,18 @@ function StrapiCollection({
     return /* @__PURE__ */ import_react2.default.createElement("div", null, "Please specify a valid collection.");
   }
   const collectionData = (0, import_dlv.default)(data.data, ["data"]);
-  const filterFieds = collectionData.flatMap((item) => {
-    const attributes = (0, import_dlv.default)(item, ["attributes"]);
+  const filterFields = collectionData.flatMap((item) => {
+    const attributes = getAttributes(item);
     const displayableFields = Object.keys(attributes).filter((field) => {
-      var _a, _b;
+      var _a;
       const value = attributes[field];
-      const maybeMime = (_b = (_a = value == null ? void 0 : value.data) == null ? void 0 : _a.attributes) == null ? void 0 : _b.mime;
+      const maybeMime = (_a = getAttributes(value == null ? void 0 : value.data)) == null ? void 0 : _a.mime;
       return typeof value !== "object" || typeof maybeMime === "string" && maybeMime.startsWith("image");
     });
     return displayableFields;
   });
   setControlContextData == null ? void 0 : setControlContextData({
-    strapiFields: uniq(filterFieds != null ? filterFieds : [])
+    strapiFields: uniq(filterFields != null ? filterFields : [])
   });
   if (filterParameter && !filterValue && !filterField) {
     return /* @__PURE__ */ import_react2.default.createElement("div", null, "Please specify a Filter Field and a Filter Value");
@@ -310,16 +320,19 @@ function StrapiCollection({
   if (collection.length === 0) {
     return /* @__PURE__ */ import_react2.default.createElement("div", null, "No collection found ");
   }
-  const repElements = noAutoRepeat ? children : collection.map((item, index) => /* @__PURE__ */ import_react2.default.createElement(
-    import_host.DataProvider,
-    {
-      key: item.id,
-      name: "strapiItem",
-      data: item,
-      hidden: true
-    },
-    /* @__PURE__ */ import_react2.default.createElement(import_host.DataProvider, { name: makeDataProviderName(name), data: item }, (0, import_host.repeatedElement)(index, children))
-  ));
+  const repElements = noAutoRepeat ? children : collection.map((item, index) => {
+    var _a;
+    return /* @__PURE__ */ import_react2.default.createElement(
+      import_host.DataProvider,
+      {
+        key: (_a = item.documentId) != null ? _a : item.id,
+        name: "strapiItem",
+        data: item,
+        hidden: true
+      },
+      /* @__PURE__ */ import_react2.default.createElement(import_host.DataProvider, { name: makeDataProviderName(name), data: item }, (0, import_host.repeatedElement)(index, children))
+    );
+  });
   return /* @__PURE__ */ import_react2.default.createElement(import_host.DataProvider, { name: "strapiItems", data: collection }, noLayout ? /* @__PURE__ */ import_react2.default.createElement(import_react2.default.Fragment, null, " ", repElements, " ") : /* @__PURE__ */ import_react2.default.createElement("div", { className }, " ", repElements, " "));
 }
 
@@ -349,15 +362,16 @@ function StrapiField({
   path,
   setControlContextData
 }) {
-  var _a, _b;
+  var _a;
   const item = (0, import_host2.useSelector)("strapiItem");
   if (!item) {
     return /* @__PURE__ */ import_react3.default.createElement("div", null, "StrapiField must be used within a StrapiCollection");
   }
-  const attributes = (0, import_dlv2.default)(item, ["attributes"]);
+  const attributes = getAttributes(item);
   const displayableFields = Object.keys(attributes).filter((field) => {
+    var _a2;
     const value = attributes[field];
-    const maybeMime2 = (0, import_dlv2.default)(value, "data.attributes.mime");
+    const maybeMime2 = (_a2 = getAttributes(value == null ? void 0 : value.data)) == null ? void 0 : _a2.mime;
     return typeof value !== "object" || typeof maybeMime2 === "string" && maybeMime2.startsWith("image");
   });
   setControlContextData == null ? void 0 : setControlContextData({
@@ -367,8 +381,8 @@ function StrapiField({
   if (!path) {
     return /* @__PURE__ */ import_react3.default.createElement("div", null, "StrapiField must specify a field name.");
   }
-  const data = (0, import_dlv2.default)(item, ["attributes", path]);
-  const maybeMime = (_b = (_a = data == null ? void 0 : data.data) == null ? void 0 : _a.attributes) == null ? void 0 : _b.mime;
+  const data = (0, import_dlv2.default)(attributes, [path]);
+  const maybeMime = (_a = getAttributes(data == null ? void 0 : data.data)) == null ? void 0 : _a.mime;
   setControlContextData == null ? void 0 : setControlContextData({
     fields: displayableFields,
     isImage: typeof maybeMime === "string" && maybeMime.startsWith("image")
@@ -377,7 +391,7 @@ function StrapiField({
     return /* @__PURE__ */ import_react3.default.createElement("div", null, "Please specify a valid field name.");
   } else if (typeof maybeMime === "string" && maybeMime.startsWith("image")) {
     const creds = useStrapiCredentials();
-    const attrs = data.data.attributes;
+    const attrs = getAttributes(data.data);
     const img_url = attrs.url.startsWith("http") ? attrs.url : creds.host + attrs.url;
     const img_width = attrs.width;
     const img_height = attrs.height;

package/dist/index.mjs

@@ -58,6 +58,16 @@ var queryParameters = [
   }
 ];
 var uniq = (xs) => Array.from(new Set(xs));
+var getAttributes = (item) => {
+  if (!item) {
+    return void 0;
+  }
+  if (item.attributes) {
+    return item.attributes;
+  }
+  const { documentId: _documentId, locale: _locale, ...rest } = item;
+  return rest;
+};
 
 // src/StrapiCredentialsProvider.tsx
 var StrapiCredentialsContext = React.createContext(void 0);
@@ -235,18 +245,18 @@ function StrapiCollection({
     return /* @__PURE__ */ React2.createElement("div", null, "Please specify a valid collection.");
   }
   const collectionData = get(data.data, ["data"]);
-  const filterFieds = collectionData.flatMap((item) => {
-    const attributes = get(item, ["attributes"]);
+  const filterFields = collectionData.flatMap((item) => {
+    const attributes = getAttributes(item);
     const displayableFields = Object.keys(attributes).filter((field) => {
-      var _a, _b;
+      var _a;
       const value = attributes[field];
-      const maybeMime = (_b = (_a = value == null ? void 0 : value.data) == null ? void 0 : _a.attributes) == null ? void 0 : _b.mime;
+      const maybeMime = (_a = getAttributes(value == null ? void 0 : value.data)) == null ? void 0 : _a.mime;
       return typeof value !== "object" || typeof maybeMime === "string" && maybeMime.startsWith("image");
     });
     return displayableFields;
   });
   setControlContextData == null ? void 0 : setControlContextData({
-    strapiFields: uniq(filterFieds != null ? filterFieds : [])
+    strapiFields: uniq(filterFields != null ? filterFields : [])
   });
   if (filterParameter && !filterValue && !filterField) {
     return /* @__PURE__ */ React2.createElement("div", null, "Please specify a Filter Field and a Filter Value");
@@ -270,16 +280,19 @@ function StrapiCollection({
   if (collection.length === 0) {
     return /* @__PURE__ */ React2.createElement("div", null, "No collection found ");
   }
-  const repElements = noAutoRepeat ? children : collection.map((item, index) => /* @__PURE__ */ React2.createElement(
-    DataProvider,
-    {
-      key: item.id,
-      name: "strapiItem",
-      data: item,
-      hidden: true
-    },
-    /* @__PURE__ */ React2.createElement(DataProvider, { name: makeDataProviderName(name), data: item }, repeatedElement(index, children))
-  ));
+  const repElements = noAutoRepeat ? children : collection.map((item, index) => {
+    var _a;
+    return /* @__PURE__ */ React2.createElement(
+      DataProvider,
+      {
+        key: (_a = item.documentId) != null ? _a : item.id,
+        name: "strapiItem",
+        data: item,
+        hidden: true
+      },
+      /* @__PURE__ */ React2.createElement(DataProvider, { name: makeDataProviderName(name), data: item }, repeatedElement(index, children))
+    );
+  });
   return /* @__PURE__ */ React2.createElement(DataProvider, { name: "strapiItems", data: collection }, noLayout ? /* @__PURE__ */ React2.createElement(React2.Fragment, null, " ", repElements, " ") : /* @__PURE__ */ React2.createElement("div", { className }, " ", repElements, " "));
 }
 
@@ -309,15 +322,16 @@ function StrapiField({
   path,
   setControlContextData
 }) {
-  var _a, _b;
+  var _a;
   const item = useSelector("strapiItem");
   if (!item) {
     return /* @__PURE__ */ React3.createElement("div", null, "StrapiField must be used within a StrapiCollection");
   }
-  const attributes = get2(item, ["attributes"]);
+  const attributes = getAttributes(item);
   const displayableFields = Object.keys(attributes).filter((field) => {
+    var _a2;
     const value = attributes[field];
-    const maybeMime2 = get2(value, "data.attributes.mime");
+    const maybeMime2 = (_a2 = getAttributes(value == null ? void 0 : value.data)) == null ? void 0 : _a2.mime;
     return typeof value !== "object" || typeof maybeMime2 === "string" && maybeMime2.startsWith("image");
   });
   setControlContextData == null ? void 0 : setControlContextData({
@@ -327,8 +341,8 @@ function StrapiField({
   if (!path) {
     return /* @__PURE__ */ React3.createElement("div", null, "StrapiField must specify a field name.");
   }
-  const data = get2(item, ["attributes", path]);
-  const maybeMime = (_b = (_a = data == null ? void 0 : data.data) == null ? void 0 : _a.attributes) == null ? void 0 : _b.mime;
+  const data = get2(attributes, [path]);
+  const maybeMime = (_a = getAttributes(data == null ? void 0 : data.data)) == null ? void 0 : _a.mime;
   setControlContextData == null ? void 0 : setControlContextData({
     fields: displayableFields,
     isImage: typeof maybeMime === "string" && maybeMime.startsWith("image")
@@ -337,7 +351,7 @@ function StrapiField({
     return /* @__PURE__ */ React3.createElement("div", null, "Please specify a valid field name.");
   } else if (typeof maybeMime === "string" && maybeMime.startsWith("image")) {
     const creds = useStrapiCredentials();
-    const attrs = data.data.attributes;
+    const attrs = getAttributes(data.data);
     const img_url = attrs.url.startsWith("http") ? attrs.url : creds.host + attrs.url;
     const img_width = attrs.width;
     const img_height = attrs.height;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plasmicpkgs/plasmic-strapi",
-  "version": "0.1.156",
+  "version": "0.1.159",
   "description": "Plasmic Strapi components.",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -38,7 +38,7 @@
     "qs": "^6.11.0"
   },
   "devDependencies": {
-    "@plasmicapp/host": "1.0.208",
+    "@plasmicapp/host": "1.0.209",
     "@plasmicapp/query": "0.1.79",
     "@size-limit/preset-small-lib": "^7.0.8",
     "@types/dlv": "^1.1.2",
@@ -53,5 +53,5 @@
     "tsup": "^7.2.0",
     "typescript": "^5.2.2"
   },
-  "gitHead": "879304149b902b453a47fe674997fcad01ae4af8"
+  "gitHead": "a68b0dbe021bc38f355643251cf4150d949f92c6"
 }