@plasmicpkgs/plasmic-contentful 0.0.175 → 0.0.177

package/dist/index.d.mts

@@ -1,54 +1,9 @@
 import registerComponent from '@plasmicapp/host/registerComponent';
 import registerGlobalContext from '@plasmicapp/host/registerGlobalContext';
-import { GlobalContextMeta, ComponentMeta } from '@plasmicapp/host';
-import React, { ReactNode } from 'react';
-
-declare function ensure<T>(x: T | null | undefined, msg?: string): T;
-interface ContentfulCredentialsProviderProps {
-    space: string;
-    accessToken: string;
-    environment?: string;
-}
-declare const ContentfulCredentialsProviderMeta: GlobalContextMeta<ContentfulCredentialsProviderProps>;
-declare function ContentfulCredentialsProvider({ accessToken, space, environment, children, }: React.PropsWithChildren<ContentfulCredentialsProviderProps>): React.JSX.Element;
-interface ContentfulControlContextData {
-    types?: {
-        name: string;
-        id: string;
-    }[];
-    fields?: string[];
-    queryOptions?: [];
-}
-interface ContentfulFetcherProps {
-    contentType: string;
-    children?: ReactNode;
-    className?: string;
-    limit?: number;
-    include?: number;
-    order?: string;
-    reverseOrder?: boolean;
-    filterField?: string;
-    searchParameter?: string;
-    filterValue?: string | number;
-    noAutoRepeat?: boolean;
-    noLayout?: boolean;
-    setControlContextData?: (data: ContentfulControlContextData) => void;
-}
-declare const ContentfulFetcherMeta: ComponentMeta<ContentfulFetcherProps>;
-declare function ContentfulFetcher({ filterField, filterValue, searchParameter, noAutoRepeat, contentType, children, className, order, reverseOrder, limit, include, noLayout, setControlContextData, }: ContentfulFetcherProps): React.JSX.Element;
-interface ContentfulFieldProps {
-    className?: string;
-    objectPath?: (string | number)[];
-    setControlContextData?: (data: {
-        data: object;
-    }) => void;
-}
-declare const ContentfulFieldMeta: ComponentMeta<ContentfulFieldProps>;
-declare function ContentfulField({ className, objectPath, setControlContextData, }: ContentfulFieldProps): React.JSX.Element;
 
 declare function registerAll(loader?: {
     registerComponent: typeof registerComponent;
     registerGlobalContext: typeof registerGlobalContext;
 }): void;
 
-export { ContentfulCredentialsProvider, ContentfulCredentialsProviderMeta, ContentfulFetcher, ContentfulFetcherMeta, ContentfulField, ContentfulFieldMeta, ensure, registerAll };
+export { registerAll };

package/dist/index.d.ts

@@ -1,54 +1,9 @@
 import registerComponent from '@plasmicapp/host/registerComponent';
 import registerGlobalContext from '@plasmicapp/host/registerGlobalContext';
-import { GlobalContextMeta, ComponentMeta } from '@plasmicapp/host';
-import React, { ReactNode } from 'react';
-
-declare function ensure<T>(x: T | null | undefined, msg?: string): T;
-interface ContentfulCredentialsProviderProps {
-    space: string;
-    accessToken: string;
-    environment?: string;
-}
-declare const ContentfulCredentialsProviderMeta: GlobalContextMeta<ContentfulCredentialsProviderProps>;
-declare function ContentfulCredentialsProvider({ accessToken, space, environment, children, }: React.PropsWithChildren<ContentfulCredentialsProviderProps>): React.JSX.Element;
-interface ContentfulControlContextData {
-    types?: {
-        name: string;
-        id: string;
-    }[];
-    fields?: string[];
-    queryOptions?: [];
-}
-interface ContentfulFetcherProps {
-    contentType: string;
-    children?: ReactNode;
-    className?: string;
-    limit?: number;
-    include?: number;
-    order?: string;
-    reverseOrder?: boolean;
-    filterField?: string;
-    searchParameter?: string;
-    filterValue?: string | number;
-    noAutoRepeat?: boolean;
-    noLayout?: boolean;
-    setControlContextData?: (data: ContentfulControlContextData) => void;
-}
-declare const ContentfulFetcherMeta: ComponentMeta<ContentfulFetcherProps>;
-declare function ContentfulFetcher({ filterField, filterValue, searchParameter, noAutoRepeat, contentType, children, className, order, reverseOrder, limit, include, noLayout, setControlContextData, }: ContentfulFetcherProps): React.JSX.Element;
-interface ContentfulFieldProps {
-    className?: string;
-    objectPath?: (string | number)[];
-    setControlContextData?: (data: {
-        data: object;
-    }) => void;
-}
-declare const ContentfulFieldMeta: ComponentMeta<ContentfulFieldProps>;
-declare function ContentfulField({ className, objectPath, setControlContextData, }: ContentfulFieldProps): React.JSX.Element;
 
 declare function registerAll(loader?: {
     registerComponent: typeof registerComponent;
     registerGlobalContext: typeof registerGlobalContext;
 }): void;
 
-export { ContentfulCredentialsProvider, ContentfulCredentialsProviderMeta, ContentfulFetcher, ContentfulFetcherMeta, ContentfulField, ContentfulFieldMeta, ensure, registerAll };
+export { registerAll };

package/dist/index.js

@@ -30,13 +30,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.tsx
 var src_exports = {};
 __export(src_exports, {
-  ContentfulCredentialsProvider: () => ContentfulCredentialsProvider,
-  ContentfulCredentialsProviderMeta: () => ContentfulCredentialsProviderMeta,
-  ContentfulFetcher: () => ContentfulFetcher,
-  ContentfulFetcherMeta: () => ContentfulFetcherMeta,
-  ContentfulField: () => ContentfulField,
-  ContentfulFieldMeta: () => ContentfulFieldMeta,
-  ensure: () => ensure,
   registerAll: () => registerAll
 });
 module.exports = __toCommonJS(src_exports);
@@ -47,6 +40,7 @@ var import_registerGlobalContext = __toESM(require("@plasmicapp/host/registerGlo
 var import_rich_text_html_renderer = require("@contentful/rich-text-html-renderer");
 var import_host = require("@plasmicapp/host");
 var import_query = require("@plasmicapp/query");
+var import_contentful = require("@plasmicpkgs/contentful");
 var import_change_case = require("change-case");
 var import_dlv = __toESM(require("dlv"));
 var import_react = __toESM(require("react"));
@@ -70,16 +64,8 @@ var searchParameters = [
     label: "Greater than or equal "
   }
 ];
-var uniq = (xs) => Array.from(new Set(xs));
 
 // src/contentful.tsx
-function ensure(x, msg) {
-  if (x === null || x === void 0) {
-    throw new Error(msg != null ? msg : `Value must not be undefined or null`);
-  } else {
-    return x;
-  }
-}
 var modulePath = "@plasmicpkgs/plasmic-contentful";
 var makeDataProviderName = (contentType) => `currentContentful${(0, import_change_case.pascalCase)(contentType)}Item`;
 var CredentialsContext = import_react.default.createContext(void 0);
@@ -251,7 +237,7 @@ function ContentfulFetcher({
   setControlContextData
 }) {
   var _a, _b, _c, _d, _e, _f, _g;
-  const creds = ensure(
+  const creds = (0, import_contentful._ensure)(
     (0, import_react.useContext)(CredentialsContext),
     "Could not find context with current credentials"
   );
@@ -366,7 +352,7 @@ function ContentfulFetcher({
   setControlContextData == null ? void 0 : setControlContextData({
     queryOptions: operators != null ? operators : [],
     types: (_b = contentTypes == null ? void 0 : contentTypes.items) != null ? _b : [],
-    fields: uniq(filterFields != null ? filterFields : [])
+    fields: (0, import_contentful._uniq)(filterFields != null ? filterFields : [])
   });
   if (filterField) {
     if (!searchParameter) {
@@ -376,99 +362,13 @@ function ContentfulFetcher({
       return /* @__PURE__ */ import_react.default.createElement("div", null, "Please specify a Filter value");
     }
   }
-  function denormalizeData(data) {
-    if (!(data == null ? void 0 : data.items) || !(data == null ? void 0 : data.includes)) {
-      return data;
-    }
-    const entryMap = {};
-    if (data.includes.Entry) {
-      data.includes.Entry.forEach((entry) => {
-        entryMap[entry.sys.id] = entry;
-      });
-    }
-    const processedFields = /* @__PURE__ */ new Set();
-    const denormalizeField = (fieldValue) => {
-      var _a2, _b2;
-      if (Array.isArray(fieldValue)) {
-        const updatedArray = fieldValue.map((arrayItem) => {
-          return denormalizeField(arrayItem);
-        });
-        return updatedArray;
-      } else if (fieldValue && typeof fieldValue === "object") {
-        if (data.includes.Asset && "sys" in fieldValue && fieldValue.sys.linkType === "Asset") {
-          const fieldId = fieldValue.sys.id;
-          const asset = data.includes.Asset.find(
-            (a) => a.sys.id === fieldId
-          );
-          if (asset) {
-            fieldValue = {
-              ...fieldValue,
-              url: "https:" + ((_b2 = (_a2 = asset.fields) == null ? void 0 : _a2.file) == null ? void 0 : _b2.url)
-            };
-          } else {
-            console.log(`Asset URL not found for ID: ${fieldId}`);
-          }
-        } else if (data.includes.Entry && "sys" in fieldValue && fieldValue.sys.linkType === "Entry") {
-          const fieldId = fieldValue.sys.id;
-          if (entryMap[fieldId]) {
-            if (processedFields.has(fieldId)) {
-              console.warn(
-                `Circular reference detected for Entry ID: ${fieldId}.`
-              );
-            } else {
-              fieldValue = {
-                ...fieldValue,
-                fields: denormalizeItem(entryMap[fieldId]).fields
-              };
-            }
-          } else {
-            console.log(`Entry not found for ID: ${fieldId}`);
-          }
-        }
-        fieldValue = Object.entries(fieldValue).reduce((obj, [key, value]) => {
-          if (key === "sys" || key === "fields") {
-            obj[key] = value;
-          } else {
-            obj[key] = denormalizeField(value);
-          }
-          return obj;
-        }, {});
-      }
-      return fieldValue;
-    };
-    const denormalizeItem = (item) => {
-      var _a2;
-      const itemId = (_a2 = item.sys) == null ? void 0 : _a2.id;
-      if (itemId) {
-        processedFields.add(itemId);
-      }
-      const updatedFields = {};
-      for (const fieldName in item.fields) {
-        updatedFields[fieldName] = denormalizeField(item.fields[fieldName]);
-      }
-      if (itemId) {
-        processedFields.delete(itemId);
-      }
-      return {
-        ...item,
-        fields: updatedFields != null ? updatedFields : void 0
-      };
-    };
-    const itemsWithDenormalizedFields = data.items.map((item) => {
-      return denormalizeItem(item);
-    });
-    return {
-      ...data,
-      items: itemsWithDenormalizedFields
-    };
-  }
   let renderedData;
-  const fixedData = entriesData ? denormalizeData(entriesData) : void 0;
+  const fixedData = entriesData ? (0, import_contentful._denormalizeData)(entriesData) : void 0;
   if (filteredData) {
     if (((_c = filteredData == null ? void 0 : filteredData.items) == null ? void 0 : _c.length) === 0) {
       return /* @__PURE__ */ import_react.default.createElement("div", { className }, "No published entry found");
     }
-    renderedData = noAutoRepeat ? children : (_e = (_d = denormalizeData(filteredData)) == null ? void 0 : _d.items) == null ? void 0 : _e.map(
+    renderedData = noAutoRepeat ? children : (_e = (_d = (0, import_contentful._denormalizeData)(filteredData)) == null ? void 0 : _d.items) == null ? void 0 : _e.map(
       (item, index) => {
         var _a2;
         return /* @__PURE__ */ import_react.default.createElement(
@@ -588,12 +488,5 @@ function registerAll(loader) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  ContentfulCredentialsProvider,
-  ContentfulCredentialsProviderMeta,
-  ContentfulFetcher,
-  ContentfulFetcherMeta,
-  ContentfulField,
-  ContentfulFieldMeta,
-  ensure,
   registerAll
 });

package/dist/index.mjs

@@ -10,6 +10,11 @@ import {
   useSelector
 } from "@plasmicapp/host";
 import { usePlasmicQueryData } from "@plasmicapp/query";
+import {
+  _denormalizeData as denormalizeData,
+  _ensure as ensure,
+  _uniq as uniq
+} from "@plasmicpkgs/contentful";
 import { pascalCase } from "change-case";
 import get from "dlv";
 import React, { useContext } from "react";
@@ -33,16 +38,8 @@ var searchParameters = [
     label: "Greater than or equal "
   }
 ];
-var uniq = (xs) => Array.from(new Set(xs));
 
 // src/contentful.tsx
-function ensure(x, msg) {
-  if (x === null || x === void 0) {
-    throw new Error(msg != null ? msg : `Value must not be undefined or null`);
-  } else {
-    return x;
-  }
-}
 var modulePath = "@plasmicpkgs/plasmic-contentful";
 var makeDataProviderName = (contentType) => `currentContentful${pascalCase(contentType)}Item`;
 var CredentialsContext = React.createContext(void 0);
@@ -339,92 +336,6 @@ function ContentfulFetcher({
       return /* @__PURE__ */ React.createElement("div", null, "Please specify a Filter value");
     }
   }
-  function denormalizeData(data) {
-    if (!(data == null ? void 0 : data.items) || !(data == null ? void 0 : data.includes)) {
-      return data;
-    }
-    const entryMap = {};
-    if (data.includes.Entry) {
-      data.includes.Entry.forEach((entry) => {
-        entryMap[entry.sys.id] = entry;
-      });
-    }
-    const processedFields = /* @__PURE__ */ new Set();
-    const denormalizeField = (fieldValue) => {
-      var _a2, _b2;
-      if (Array.isArray(fieldValue)) {
-        const updatedArray = fieldValue.map((arrayItem) => {
-          return denormalizeField(arrayItem);
-        });
-        return updatedArray;
-      } else if (fieldValue && typeof fieldValue === "object") {
-        if (data.includes.Asset && "sys" in fieldValue && fieldValue.sys.linkType === "Asset") {
-          const fieldId = fieldValue.sys.id;
-          const asset = data.includes.Asset.find(
-            (a) => a.sys.id === fieldId
-          );
-          if (asset) {
-            fieldValue = {
-              ...fieldValue,
-              url: "https:" + ((_b2 = (_a2 = asset.fields) == null ? void 0 : _a2.file) == null ? void 0 : _b2.url)
-            };
-          } else {
-            console.log(`Asset URL not found for ID: ${fieldId}`);
-          }
-        } else if (data.includes.Entry && "sys" in fieldValue && fieldValue.sys.linkType === "Entry") {
-          const fieldId = fieldValue.sys.id;
-          if (entryMap[fieldId]) {
-            if (processedFields.has(fieldId)) {
-              console.warn(
-                `Circular reference detected for Entry ID: ${fieldId}.`
-              );
-            } else {
-              fieldValue = {
-                ...fieldValue,
-                fields: denormalizeItem(entryMap[fieldId]).fields
-              };
-            }
-          } else {
-            console.log(`Entry not found for ID: ${fieldId}`);
-          }
-        }
-        fieldValue = Object.entries(fieldValue).reduce((obj, [key, value]) => {
-          if (key === "sys" || key === "fields") {
-            obj[key] = value;
-          } else {
-            obj[key] = denormalizeField(value);
-          }
-          return obj;
-        }, {});
-      }
-      return fieldValue;
-    };
-    const denormalizeItem = (item) => {
-      var _a2;
-      const itemId = (_a2 = item.sys) == null ? void 0 : _a2.id;
-      if (itemId) {
-        processedFields.add(itemId);
-      }
-      const updatedFields = {};
-      for (const fieldName in item.fields) {
-        updatedFields[fieldName] = denormalizeField(item.fields[fieldName]);
-      }
-      if (itemId) {
-        processedFields.delete(itemId);
-      }
-      return {
-        ...item,
-        fields: updatedFields != null ? updatedFields : void 0
-      };
-    };
-    const itemsWithDenormalizedFields = data.items.map((item) => {
-      return denormalizeItem(item);
-    });
-    return {
-      ...data,
-      items: itemsWithDenormalizedFields
-    };
-  }
   let renderedData;
   const fixedData = entriesData ? denormalizeData(entriesData) : void 0;
   if (filteredData) {
@@ -550,12 +461,5 @@ function registerAll(loader) {
   _registerComponent(ContentfulField, ContentfulFieldMeta);
 }
 export {
-  ContentfulCredentialsProvider,
-  ContentfulCredentialsProviderMeta,
-  ContentfulFetcher,
-  ContentfulFetcherMeta,
-  ContentfulField,
-  ContentfulFieldMeta,
-  ensure,
   registerAll
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plasmicpkgs/plasmic-contentful",
-  "version": "0.0.175",
+  "version": "0.0.177",
   "description": "Plasmic Contentful components.",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -34,6 +34,7 @@
   "devDependencies": {
     "@plasmicapp/host": "1.0.231",
     "@plasmicapp/query": "0.1.81",
+    "@plasmicpkgs/contentful": "0.0.4",
     "@types/dlv": "^1.1.2",
     "@types/react": "^18.0.27",
     "@types/react-dom": "^18.0.10",
@@ -42,7 +43,7 @@
     "react-dom": "^18.2.0",
     "tslib": "^2.3.1",
     "tsup": "^7.2.0",
-    "typescript": "^5.2.2"
+    "typescript": "^5.7.3"
   },
   "dependencies": {
     "@contentful/rich-text-html-renderer": "^15.13.1",
@@ -50,5 +51,5 @@
     "change-case": "^4.1.2",
     "dlv": "^1.1.3"
   },
-  "gitHead": "6b9428c7b4f35d9b84241981523e746e18e2abb7"
+  "gitHead": "2c9c29a9dbf8ed52d84b51d8b1347661cbbbe3d2"
 }