@plasmicpkgs/plasmic-cms 0.0.7 → 0.0.13

package/dist/api.d.ts

@@ -12,6 +12,10 @@ export interface QueryParams {
     desc: boolean;
     limit: number;
 }
+export declare class HttpError extends Error {
+    status: number;
+    constructor(status: number, message: string);
+}
 declare class API {
     private config;
     constructor(config: DatabaseConfig);

package/dist/components.d.ts

@@ -3,6 +3,9 @@ import { CanvasComponentProps } from "@plasmicapp/host/registerComponent";
 import React from "react";
 import { DatabaseConfig, QueryParams } from "./api";
 import { ApiCmsTable } from "./schema";
+interface FetcherComponentProps {
+    hideIfNotFound?: boolean;
+}
 interface CmsDataProviderProps extends DatabaseConfig {
     children?: React.ReactNode;
 }
@@ -16,7 +19,7 @@ interface CmsQueryLoaderProps extends QueryParams, CanvasComponentProps<TablesCo
     table?: string;
 }
 export declare const cmsQueryLoaderMeta: ComponentMeta<CmsQueryLoaderProps>;
-export declare function CmsQueryLoader({ table, children, setControlContextData, ...params }: CmsQueryLoaderProps): JSX.Element;
+export declare function CmsQueryLoader({ table, children, setControlContextData, ...params }: CmsQueryLoaderProps): React.ReactElement<any, string | ((props: any) => React.ReactElement<any, any> | null) | (new (props: any) => React.Component<any, any, any>)> | null;
 interface CmsRowRepeaterProps extends CanvasComponentProps<TablesContextData> {
     children?: React.ReactNode;
     table?: string;
@@ -42,12 +45,12 @@ interface CmsRowLinkProps extends CanvasComponentProps<TablesContextData & {
 }
 export declare const cmsRowLinkMeta: ComponentMeta<CmsRowLinkProps>;
 export declare function CmsRowLink({ table, field, hrefProp, children, setControlContextData, }: CmsRowLinkProps): JSX.Element;
-interface CmsRowLoaderProps extends CanvasComponentProps<TablesContextData> {
+interface CmsRowLoaderProps extends CanvasComponentProps<TablesContextData>, FetcherComponentProps {
     table: string;
     row: string;
     children: React.ReactNode;
     useDraft: boolean;
 }
 export declare const cmsRowLoaderMeta: ComponentMeta<CmsRowLoaderProps>;
-export declare function CmsRowLoader({ table, row, children, useDraft, setControlContextData, }: CmsRowLoaderProps): JSX.Element;
+export declare function CmsRowLoader({ table, row, children, useDraft, hideIfNotFound, setControlContextData, }: CmsRowLoaderProps): React.ReactElement<any, string | ((props: any) => React.ReactElement<any, any> | null) | (new (props: any) => React.Component<any, any, any>)> | null;
 export {};

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { registerComponent as hostRegisterComponent, registerContext as hostRegisterContext } from "@plasmicapp/host";
+import registerComponent from "@plasmicapp/host/registerComponent";
 export declare function registerAll(loader?: {
-    registerComponent: typeof hostRegisterComponent;
-    registerContext: typeof hostRegisterContext;
+    registerComponent: typeof registerComponent;
 }): void;
+export * from "./components";

package/dist/plasmic-cms.cjs.development.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
 
+var registerComponent = _interopDefault(require('@plasmicapp/host/registerComponent'));
 var host = require('@plasmicapp/host');
 var query = require('@plasmicapp/query');
 var React = _interopDefault(require('react'));
@@ -45,6 +46,115 @@ function _asyncToGenerator(fn) {
   };
 }
 
+function _extends() {
+  _extends = Object.assign || function (target) {
+    for (var i = 1; i < arguments.length; i++) {
+      var source = arguments[i];
+
+      for (var key in source) {
+        if (Object.prototype.hasOwnProperty.call(source, key)) {
+          target[key] = source[key];
+        }
+      }
+    }
+
+    return target;
+  };
+
+  return _extends.apply(this, arguments);
+}
+
+function _inheritsLoose(subClass, superClass) {
+  subClass.prototype = Object.create(superClass.prototype);
+  subClass.prototype.constructor = subClass;
+
+  _setPrototypeOf(subClass, superClass);
+}
+
+function _getPrototypeOf(o) {
+  _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) {
+    return o.__proto__ || Object.getPrototypeOf(o);
+  };
+  return _getPrototypeOf(o);
+}
+
+function _setPrototypeOf(o, p) {
+  _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
+    o.__proto__ = p;
+    return o;
+  };
+
+  return _setPrototypeOf(o, p);
+}
+
+function _isNativeReflectConstruct() {
+  if (typeof Reflect === "undefined" || !Reflect.construct) return false;
+  if (Reflect.construct.sham) return false;
+  if (typeof Proxy === "function") return true;
+
+  try {
+    Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));
+    return true;
+  } catch (e) {
+    return false;
+  }
+}
+
+function _construct(Parent, args, Class) {
+  if (_isNativeReflectConstruct()) {
+    _construct = Reflect.construct;
+  } else {
+    _construct = function _construct(Parent, args, Class) {
+      var a = [null];
+      a.push.apply(a, args);
+      var Constructor = Function.bind.apply(Parent, a);
+      var instance = new Constructor();
+      if (Class) _setPrototypeOf(instance, Class.prototype);
+      return instance;
+    };
+  }
+
+  return _construct.apply(null, arguments);
+}
+
+function _isNativeFunction(fn) {
+  return Function.toString.call(fn).indexOf("[native code]") !== -1;
+}
+
+function _wrapNativeSuper(Class) {
+  var _cache = typeof Map === "function" ? new Map() : undefined;
+
+  _wrapNativeSuper = function _wrapNativeSuper(Class) {
+    if (Class === null || !_isNativeFunction(Class)) return Class;
+
+    if (typeof Class !== "function") {
+      throw new TypeError("Super expression must either be null or a function");
+    }
+
+    if (typeof _cache !== "undefined") {
+      if (_cache.has(Class)) return _cache.get(Class);
+
+      _cache.set(Class, Wrapper);
+    }
+
+    function Wrapper() {
+      return _construct(Class, arguments, _getPrototypeOf(this).constructor);
+    }
+
+    Wrapper.prototype = Object.create(Class.prototype, {
+      constructor: {
+        value: Wrapper,
+        enumerable: false,
+        writable: true,
+        configurable: true
+      }
+    });
+    return _setPrototypeOf(Wrapper, Class);
+  };
+
+  return _wrapNativeSuper(Class);
+}
+
 function _objectWithoutPropertiesLoose(source, excluded) {
   if (source == null) return {};
   var target = {};
@@ -869,6 +979,20 @@ function queryParamsToApi(params) {
   };
 }
 
+var HttpError = /*#__PURE__*/function (_Error) {
+  _inheritsLoose(HttpError, _Error);
+
+  function HttpError(status, message) {
+    var _this;
+
+    _this = _Error.call(this, message) || this;
+    _this.status = status;
+    return _this;
+  }
+
+  return HttpError;
+}( /*#__PURE__*/_wrapNativeSuper(Error));
+
 var API = /*#__PURE__*/function () {
   function API(config) {
     this.config = config;
@@ -878,7 +1002,8 @@ var API = /*#__PURE__*/function () {
 
   _proto.get = /*#__PURE__*/function () {
     var _get = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee(endpoint, params) {
-      var url, response;
+      var url, response, message, _yield$response$json, _yield$response$json$;
+
       return runtime_1.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -901,18 +1026,61 @@ var API = /*#__PURE__*/function () {
 
             case 5:
               response = _context.sent;
-              _context.next = 8;
+
+              if (!(response.status !== 200)) {
+                _context.next = 25;
+                break;
+              }
+
+              _context.prev = 7;
+              _context.next = 10;
               return response.json();
 
-            case 8:
+            case 10:
+              _context.t0 = _yield$response$json = _context.sent;
+
+              if (!(_context.t0 == null)) {
+                _context.next = 15;
+                break;
+              }
+
+              _context.t1 = void 0;
+              _context.next = 16;
+              break;
+
+            case 15:
+              _context.t1 = (_yield$response$json$ = _yield$response$json.error) == null ? void 0 : _yield$response$json$.message;
+
+            case 16:
+              message = _context.t1;
+              _context.next = 24;
+              break;
+
+            case 19:
+              _context.prev = 19;
+              _context.t2 = _context["catch"](7);
+              _context.next = 23;
+              return response.text();
+
+            case 23:
+              message = _context.sent;
+
+            case 24:
+              throw new HttpError(response.status, message);
+
+            case 25:
+              _context.next = 27;
+              return response.json();
+
+            case 27:
               return _context.abrupt("return", _context.sent);
 
-            case 9:
+            case 28:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, this);
+      }, _callee, this, [[7, 19]]);
     }));
 
     function get(_x, _x2) {
@@ -941,7 +1109,7 @@ var API = /*#__PURE__*/function () {
               _context2.prev = 7;
               _context2.t0 = _context2["catch"](0);
               console.error(_context2.t0);
-              throw new Error("Cannot fetch CMS models.");
+              throw _context2.t0;
 
             case 11:
             case "end":
@@ -980,7 +1148,7 @@ var API = /*#__PURE__*/function () {
               _context3.prev = 7;
               _context3.t0 = _context3["catch"](0);
               console.error(_context3.t0);
-              throw new Error("Query returned invalid response.");
+              throw _context3.t0;
 
             case 11:
             case "end":
@@ -1005,7 +1173,7 @@ var API = /*#__PURE__*/function () {
           switch (_context4.prev = _context4.next) {
             case 0:
               _context4.prev = 0;
-              maybeUseDraft = useDraft ? "?useDraft=1" : "";
+              maybeUseDraft = useDraft ? "?draft=1" : "";
               _context4.next = 4;
               return this.get("/tables/" + table + "/rows/" + row + maybeUseDraft);
 
@@ -1017,7 +1185,7 @@ var API = /*#__PURE__*/function () {
               _context4.prev = 8;
               _context4.t0 = _context4["catch"](0);
               console.error(_context4.t0);
-              throw new Error("Query returned invalid response.");
+              throw _context4.t0;
 
             case 12:
             case "end":
@@ -1228,9 +1396,11 @@ function mkFieldOptions(tables, tableId) {
   }
 
   return table.schema.fields.map(function (f) {
+    var _f$name;
+
     return {
       value: f.identifier,
-      label: f.name
+      label: (_f$name = f.name) != null ? _f$name : f.identifier
     };
   });
 }
@@ -1239,12 +1409,27 @@ var _excluded = ["children"],
     _excluded2 = ["table", "children", "setControlContextData"];
 var modulePath = "@plasmicpkgs/plasmic-cms";
 var componentPrefix = "hostless-plasmic-cms";
+var fetcherComponentPropMetas = {
+  hideIfNotFound: {
+    type: "boolean",
+    defaultValue: false,
+    description: "Whether to show an error if no result is found"
+  }
+};
 
-function renderMaybeData(maybeData, renderFn) {
+function renderMaybeData(maybeData, renderFn, loaderProps) {
   if ("error" in maybeData) {
-    var _maybeData$error;
+    var error = maybeData.error;
 
-    return React.createElement("div", null, "Error: ", (_maybeData$error = maybeData.error) == null ? void 0 : _maybeData$error.message);
+    if (error && error instanceof HttpError && error.status === 404) {
+      if (loaderProps.hideIfNotFound) {
+        return null;
+      } else {
+        return React.createElement("div", null, "Error: Data not found");
+      }
+    } else {
+      return React.createElement("div", null, "Error: ", error == null ? void 0 : error.message);
+    }
   }
 
   if (!("data" in maybeData)) {
@@ -1329,6 +1514,8 @@ function TablesFetcher(_ref2) {
     return React.createElement(TablesProvider, {
       tables: tables
     }, children);
+  }, {
+    hideIfNotFound: false
   });
 }
 
@@ -1446,6 +1633,8 @@ function CmsQueryLoader(_ref5) {
       table: table,
       rows: rows
     }, children);
+  }, {
+    hideIfNotFound: false
   });
 }
 var cmsRowRepeaterMeta = {
@@ -1688,7 +1877,7 @@ var cmsRowLoaderMeta = {
   displayName: "CMS Row Loader",
   importName: "CmsRowLoader",
   importPath: modulePath,
-  props: {
+  props: /*#__PURE__*/_extends({
     children: {
       type: "slot",
       defaultValue: {
@@ -1715,13 +1904,14 @@ var cmsRowLoaderMeta = {
       description: "If set, also query unpublished content.",
       defaultValue: false
     }
-  }
+  }, fetcherComponentPropMetas)
 };
 function CmsRowLoader(_ref12) {
   var table = _ref12.table,
       row = _ref12.row,
       children = _ref12.children,
       useDraft = _ref12.useDraft,
+      hideIfNotFound = _ref12.hideIfNotFound,
       setControlContextData = _ref12.setControlContextData;
   var databaseConfig = useDatabase();
   var tables = useTables();
@@ -1744,9 +1934,29 @@ function CmsRowLoader(_ref12) {
       while (1) {
         switch (_context3.prev = _context3.next) {
           case 0:
-            return _context3.abrupt("return", mkApi(databaseConfig).fetchRow(table, row, useDraft));
+            if (table) {
+              _context3.next = 2;
+              break;
+            }
 
-          case 1:
+            throw new Error("You must specify a model to fetch from.");
+
+          case 2:
+            if (row) {
+              _context3.next = 4;
+              break;
+            }
+
+            throw new Error("You must specify an entry name to fetch.");
+
+          case 4:
+            _context3.next = 6;
+            return mkApi(databaseConfig).fetchRow(table, row, useDraft);
+
+          case 6:
+            return _context3.abrupt("return", _context3.sent);
+
+          case 7:
           case "end":
             return _context3.stop();
         }
@@ -1758,22 +1968,46 @@ function CmsRowLoader(_ref12) {
       table: table,
       row: row
     }, children);
+  }, {
+    hideIfNotFound: hideIfNotFound
   });
 }
 
 function registerAll(loader) {
-  var _loader$registerCompo;
-
   //const registerContext = loader?.registerContext ?? hostRegisterContext;
   //registerContext(CmsDataProvider, cmsDataProviderMeta);
-  var registerComponent = (_loader$registerCompo = loader == null ? void 0 : loader.registerComponent.bind(loader)) != null ? _loader$registerCompo : host.registerComponent;
-  registerComponent(CmsDataProvider, cmsDataProviderMeta);
-  registerComponent(CmsQueryLoader, cmsQueryLoaderMeta);
-  registerComponent(CmsRowRepeater, cmsRowRepeaterMeta);
-  registerComponent(CmsRowField, cmsRowFieldMeta);
-  registerComponent(CmsRowLink, cmsRowLinkMeta);
-  registerComponent(CmsRowLoader, cmsRowLoaderMeta);
+  var _registerComponent = function _registerComponent(Component, defaultMeta) {
+    if (loader) {
+      loader.registerComponent(Component, defaultMeta);
+    } else {
+      registerComponent(Component, defaultMeta);
+    }
+  };
+
+  _registerComponent(CmsDataProvider, cmsDataProviderMeta);
+
+  _registerComponent(CmsQueryLoader, cmsQueryLoaderMeta);
+
+  _registerComponent(CmsRowRepeater, cmsRowRepeaterMeta);
+
+  _registerComponent(CmsRowField, cmsRowFieldMeta);
+
+  _registerComponent(CmsRowLink, cmsRowLinkMeta);
+
+  _registerComponent(CmsRowLoader, cmsRowLoaderMeta);
 }
 
+exports.CmsDataProvider = CmsDataProvider;
+exports.CmsQueryLoader = CmsQueryLoader;
+exports.CmsRowField = CmsRowField;
+exports.CmsRowLink = CmsRowLink;
+exports.CmsRowLoader = CmsRowLoader;
+exports.CmsRowRepeater = CmsRowRepeater;
+exports.cmsDataProviderMeta = cmsDataProviderMeta;
+exports.cmsQueryLoaderMeta = cmsQueryLoaderMeta;
+exports.cmsRowFieldMeta = cmsRowFieldMeta;
+exports.cmsRowLinkMeta = cmsRowLinkMeta;
+exports.cmsRowLoaderMeta = cmsRowLoaderMeta;
+exports.cmsRowRepeaterMeta = cmsRowRepeaterMeta;
 exports.registerAll = registerAll;
 //# sourceMappingURL=plasmic-cms.cjs.development.js.map