@kids-reporter/cms-core 1.0.16 → 1.0.18

package/lib/custom-fields/rich-text-editor/index.js

@@ -4,14 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.richTextEditor = void 0;
-var _types = require("@keystone-6/core/types");
 var _core = require("@keystone-6/core");
+var _types = require("@keystone-6/core/types");
 const richTextEditor = ({
   defaultValue = null,
   disabledButtons = [],
   ...config
-} = {}) => meta => {
-  var _config$db;
+}) => meta => {
   if (config.isIndexed === 'unique') {
     throw Error("isIndexed: 'unique' is not a supported option for field type textEditor");
   }
@@ -45,7 +44,7 @@ const richTextEditor = ({
       kind: 'literal',
       value: JSON.stringify(defaultValue)
     },
-    map: (_config$db = config.db) === null || _config$db === void 0 ? void 0 : _config$db.map
+    map: config.db?.map
   });
 };
 exports.richTextEditor = richTextEditor;

package/lib/custom-fields/rich-text-editor/views/index.js

@@ -4,12 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.controller = exports.Field = exports.Cell = exports.CardValue = void 0;
-var _react = _interopRequireDefault(require("react"));
+var _components = require("@keystone-6/core/admin-ui/components");
 var _core = require("@keystone-ui/core");
 var _fields = require("@keystone-ui/fields");
-var _components = require("@keystone-6/core/admin-ui/components");
-var _draftJs = require("draft-js");
 var _draftEditor = require("@kids-reporter/draft-editor");
+var _draftJs = require("draft-js");
+var _react = _interopRequireDefault(require("react"));
+var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // eslint-disable-line
 
@@ -19,11 +20,17 @@ const Field = ({
   onChange,
   autoFocus // eslint-disable-line
 }) => {
-  return /*#__PURE__*/_react.default.createElement(_fields.FieldContainer, null, /*#__PURE__*/_react.default.createElement(_fields.FieldLabel, null, field.label, /*#__PURE__*/_react.default.createElement(_core.Stack, null, /*#__PURE__*/_react.default.createElement(_draftEditor.RichTextEditor, {
-    disabledButtons: field.disabledButtons,
-    editorState: value,
-    onChange: editorState => onChange === null || onChange === void 0 ? void 0 : onChange(editorState)
-  }))));
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_fields.FieldContainer, {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_fields.FieldLabel, {
+      children: [field.label, /*#__PURE__*/(0, _jsxRuntime.jsx)(_core.Stack, {
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_draftEditor.RichTextEditor, {
+          disabledButtons: field.disabledButtons,
+          editorState: value,
+          onChange: editorState => onChange?.(editorState)
+        })
+      })]
+    })
+  });
 };
 exports.Field = Field;
 const Cell = ({
@@ -32,7 +39,12 @@ const Cell = ({
   linkTo
 }) => {
   const value = item[field.path] + '';
-  return linkTo ? /*#__PURE__*/_react.default.createElement(_components.CellLink, linkTo, value) : /*#__PURE__*/_react.default.createElement(_components.CellContainer, null, value);
+  return linkTo ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.CellLink, {
+    ...linkTo,
+    children: value
+  }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.CellContainer, {
+    children: value
+  });
 };
 exports.Cell = Cell;
 Cell.supportsLinkTo = true;
@@ -40,14 +52,17 @@ const CardValue = ({
   item,
   field
 }) => {
-  return /*#__PURE__*/_react.default.createElement(_fields.FieldContainer, null, /*#__PURE__*/_react.default.createElement(_fields.FieldLabel, null, field.label), item[field.path]);
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_fields.FieldContainer, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_fields.FieldLabel, {
+      children: field.label
+    }), item[field.path]]
+  });
 };
 exports.CardValue = CardValue;
 const controller = config => {
-  var _config$fieldMeta;
   return {
     description: '',
-    disabledButtons: ((_config$fieldMeta = config.fieldMeta) === null || _config$fieldMeta === void 0 ? void 0 : _config$fieldMeta.disabledButtons) ?? [],
+    disabledButtons: config.fieldMeta?.disabledButtons ?? [],
     path: config.path,
     label: config.label,
     graphqlSelection: config.path,

package/lib/index.js

@@ -11,10 +11,12 @@ Object.defineProperty(exports, "richTextEditorButtonNames", {
   }
 });
 exports.utils = void 0;
-var _manualOrderRelationship = _interopRequireDefault(require("./utils/manual-order-relationship"));
 var _richTextEditor = require("./custom-fields/rich-text-editor");
+var _manualOrderRelationship = _interopRequireDefault(require("./utils/manual-order-relationship"));
 var _draftEditor = require("@kids-reporter/draft-editor");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+// @ts-ignore: draft-editor is not typed
+
 const customFields = exports.customFields = {
   richTextEditor: _richTextEditor.richTextEditor
 };

package/lib/local-types/kids-reporter__draft-editor.d.js

@@ -0,0 +1 @@
+"use strict";

package/lib/utils/manual-order-relationship.js

@@ -53,10 +53,8 @@ var _fields = require("@keystone-6/core/fields");
  *  `authorsInInputOrder` is a virtual field, which means its value is computed on-the-fly, not stored in the database. This virtual field combines relationship field `authors` and monitoring field `manualOrderOfAuthors` to sort the authors in specific input order.
  */
 function addManualOrderRelationshipFields(manualOrderFields = [], list) {
-  var _list$hooks;
   manualOrderFields.forEach(mo => {
-    var _list$fields;
-    if (!((_list$fields = list.fields) !== null && _list$fields !== void 0 && _list$fields[mo.fieldName])) {
+    if (!list.fields?.[mo.fieldName]) {
       list.fields[mo.fieldName] = (0, _fields.json)({
         label: mo.fieldLabel,
         ui: {
@@ -73,7 +71,7 @@ function addManualOrderRelationshipFields(manualOrderFields = [], list) {
 
   // decorate `resolveInput` hook
   list.hooks = list.hooks || {};
-  const originResolveInput = (_list$hooks = list.hooks) === null || _list$hooks === void 0 ? void 0 : _list$hooks.resolveInput;
+  const originResolveInput = list.hooks?.resolveInput;
   list.hooks.resolveInput = async props => {
     let resolvedData = props.resolvedData;
     if (typeof originResolveInput === 'function') {
@@ -87,7 +85,6 @@ function addManualOrderRelationshipFields(manualOrderFields = [], list) {
     // check if create/update item has the fields
     // we want to monitor
     for (let i = 0; i < manualOrderFields.length; i++) {
-      var _resolvedData;
       const {
         targetFieldName,
         fieldName,
@@ -96,17 +93,15 @@ function addManualOrderRelationshipFields(manualOrderFields = [], list) {
       } = manualOrderFields[i];
 
       // if create/update operation creates/modifies the `${targetFieldName}` field
-      if ((_resolvedData = resolvedData) !== null && _resolvedData !== void 0 && _resolvedData[targetFieldName]) {
-        var _resolvedData$targetF2;
+      if (resolvedData?.[targetFieldName]) {
         let currentOrder = [];
 
         // update operation due to `item` not being `undefiend`
         if (item) {
-          var _resolvedData$targetF;
           const previousOrder = Array.isArray(item[fieldName]) ? item[fieldName] : [];
 
           // user disconnects/removes some relationship items.
-          const disconnectIds = ((_resolvedData$targetF = resolvedData[targetFieldName]) === null || _resolvedData$targetF === void 0 || (_resolvedData$targetF = _resolvedData$targetF.disconnect) === null || _resolvedData$targetF === void 0 ? void 0 : _resolvedData$targetF.map(obj => obj.id.toString())) || [];
+          const disconnectIds = resolvedData[targetFieldName]?.disconnect?.map(obj => obj.id.toString()) || [];
 
           // filtered out to-be-disconnected relationship items
           currentOrder = previousOrder.filter(({
@@ -117,7 +112,7 @@ function addManualOrderRelationshipFields(manualOrderFields = [], list) {
         }
 
         // user connects/adds some relationship item.
-        const connectedIds = ((_resolvedData$targetF2 = resolvedData[targetFieldName]) === null || _resolvedData$targetF2 === void 0 || (_resolvedData$targetF2 = _resolvedData$targetF2.connect) === null || _resolvedData$targetF2 === void 0 ? void 0 : _resolvedData$targetF2.map(obj => obj.id.toString())) || [];
+        const connectedIds = resolvedData[targetFieldName]?.connect?.map(obj => obj.id.toString()) || [];
         if (connectedIds.length > 0) {
           // Query relationship items from the database.
           // Therefore, we can have other fields to record in the monitoring field
@@ -178,12 +173,10 @@ function addVirtualFieldToReturnItemsInInputOrder(list, manualOrderField) {
   const virtualFieldName = `${manualOrderField.targetFieldName}InInputOrder`;
   list.fields[virtualFieldName] = (0, _fields.virtual)({
     field: lists => {
-      var _lists$manualOrderFie;
       return _core.graphql.field({
-        type: _core.graphql.list(lists === null || lists === void 0 || (_lists$manualOrderFie = lists[manualOrderField.targetListName]) === null || _lists$manualOrderFie === void 0 ? void 0 : _lists$manualOrderFie.types.output),
+        type: _core.graphql.list(lists?.[manualOrderField.targetListName]?.types.output),
         async resolve(item, args, context) {
-          var _context$db;
-          const manualOrderFieldValue = (item === null || item === void 0 ? void 0 : item[manualOrderField.fieldName]) || [];
+          const manualOrderFieldValue = item?.[manualOrderField.fieldName] || [];
           if (!Array.isArray(manualOrderFieldValue)) {
             return [];
           }
@@ -192,18 +185,18 @@ function addVirtualFieldToReturnItemsInInputOrder(list, manualOrderField) {
           const ids = manualOrderFieldValue.map(value => value.id);
 
           // query items from database
-          const unorderedItems = await ((_context$db = context.db) === null || _context$db === void 0 ? void 0 : _context$db[manualOrderField.targetListName].findMany({
+          const unorderedItems = await context.db?.[manualOrderField.targetListName].findMany({
             where: {
               id: {
                 in: ids
               }
             }
-          }));
+          });
           const orderedItems = [];
 
           // sort items according to input order
           manualOrderFieldValue.forEach(value => {
-            const writer = unorderedItems.find(ui => `${ui === null || ui === void 0 ? void 0 : ui.id}` === `${value === null || value === void 0 ? void 0 : value.id}`);
+            const writer = unorderedItems.find(ui => `${ui?.id}` === `${value?.id}`);
             if (writer) {
               orderedItems.push(writer);
             }

package/package.json

@@ -1,13 +1,15 @@
 {
   "name": "@kids-reporter/cms-core",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "description": "",
   "main": "lib/index.js",
   "types": "src/index.ts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "make build",
-    "clean": "make clean"
+    "clean": "make clean",
+    "lint:check": "eslint src --ext .ts,.tsx,.js,.jsx",
+    "type-check": "tsc --noEmit"
   },
   "repository": {
     "type": "git",
@@ -25,7 +27,7 @@
   ],
   "license": "MIT",
   "peerDependencies": {
-    "@keystone-6/core": "5.2.0"
+    "@keystone-6/core": "6.5.1"
   },
   "dependencies": {
     "@google-cloud/storage": "^5.18.0",
@@ -33,7 +35,7 @@
     "@keystone-ui/fields": "^7.2.0",
     "@keystone-ui/modals": "^6.0.3",
     "@twreporter/errors": "^1.1.1",
-    "@kids-reporter/draft-editor": "1.0.16",
+    "@kids-reporter/draft-editor": "^1.0.18",
     "axios": "^0.26.0",
     "draft-convert": "^2.1.12",
     "draft-js": "^0.11.7",
@@ -41,7 +43,7 @@
     "immutable": "^4.0.0",
     "lodash": "^4.17.21",
     "shortid": "^2.2.16",
-    "styled-components": "5.3.5",
+    "styled-components": "6.1.19",
     "zlib": "^1.0.5"
   },
   "files": [

package/src/custom-fields/rich-text-editor/index.ts

@@ -1,11 +1,11 @@
+import { graphql } from '@keystone-6/core'
 import {
   BaseListTypeInfo,
-  JSONValue,
-  FieldTypeFunc,
   CommonFieldConfig,
+  FieldTypeFunc,
   jsonFieldTypePolyfilledForSQLite,
+  JSONValue,
 } from '@keystone-6/core/types'
-import { graphql } from '@keystone-6/core'
 
 export type JsonFieldConfig<ListTypeInfo extends BaseListTypeInfo> =
   CommonFieldConfig<ListTypeInfo> & {
@@ -19,7 +19,7 @@ export const richTextEditor =
     defaultValue = null,
     disabledButtons = [],
     ...config
-  }: JsonFieldConfig<ListTypeInfo> = {}): FieldTypeFunc<ListTypeInfo> =>
+  }: JsonFieldConfig<ListTypeInfo>): FieldTypeFunc<ListTypeInfo> =>
   (meta) => {
     if ((config as any).isIndexed === 'unique') {
       throw Error(

package/src/custom-fields/rich-text-editor/views/index.tsx

@@ -1,6 +1,4 @@
-import React from 'react'
-import { jsx, Stack } from '@keystone-ui/core'; // eslint-disable-line
-import { FieldContainer, FieldLabel } from '@keystone-ui/fields'
+import { CellContainer, CellLink } from '@keystone-6/core/admin-ui/components'
 import {
   CardValueComponent,
   CellComponent,
@@ -9,9 +7,11 @@ import {
   FieldProps,
   JSONValue,
 } from '@keystone-6/core/types'
-import { CellContainer, CellLink } from '@keystone-6/core/admin-ui/components'
-import { EditorState, convertFromRaw, convertToRaw } from 'draft-js'
+import { jsx, Stack } from '@keystone-ui/core' // eslint-disable-line
+import { FieldContainer, FieldLabel } from '@keystone-ui/fields'
 import { RichTextEditor } from '@kids-reporter/draft-editor'
+import { convertFromRaw, convertToRaw, EditorState } from 'draft-js'
+import React from 'react'
 
 export const Field = ({
   field,

package/src/index.ts

@@ -1,6 +1,7 @@
-import addManualOrderRelationshipFields from './utils/manual-order-relationship'
 import { richTextEditor } from './custom-fields/rich-text-editor'
+import addManualOrderRelationshipFields from './utils/manual-order-relationship'
 
+// @ts-ignore: draft-editor is not typed
 export { buttonNames as richTextEditorButtonNames } from '@kids-reporter/draft-editor'
 
 export const customFields = {

package/src/local-types/kids-reporter__draft-editor.d.ts

@@ -0,0 +1,11 @@
+declare module '@kids-reporter/draft-editor' {
+  export const RichTextEditor: any
+  export const buttonNames: any
+
+  const defaultExport: {
+    RichTextEditor: any
+    buttonNames: any
+  }
+
+  export default defaultExport
+}

package/src/utils/manual-order-relationship.ts

@@ -1,6 +1,6 @@
-import { BaseItem } from '@keystone-6/core/types'
-import { ListConfig, graphql } from '@keystone-6/core'
+import { graphql, ListConfig } from '@keystone-6/core'
 import { json, virtual } from '@keystone-6/core/fields'
+import { BaseItem } from '@keystone-6/core/types'
 
 type ManualOrderFieldConfig = {
   fieldName: string
@@ -58,7 +58,7 @@ type ManualOrderFieldConfig = {
  */
 function addManualOrderRelationshipFields(
   manualOrderFields: ManualOrderFieldConfig[] = [],
-  list: ListConfig<any, any>
+  list: ListConfig<any>
 ) {
   manualOrderFields.forEach((mo) => {
     if (!list.fields?.[mo.fieldName]) {
@@ -110,9 +110,9 @@ function addManualOrderRelationshipFields(
 
           // user disconnects/removes some relationship items.
           const disconnectIds =
-            resolvedData[
-              targetFieldName
-            ]?.disconnect?.map((obj: { id: number }) => obj.id.toString()) || []
+            resolvedData[targetFieldName]?.disconnect?.map(
+              (obj: { id: number }) => obj.id.toString()
+            ) || []
 
           // filtered out to-be-disconnected relationship items
           currentOrder = previousOrder.filter(({ id }: { id: string }) => {
@@ -179,7 +179,7 @@ function addManualOrderRelationshipFields(
  *  And the GQL resolver will be defined in `resolve` function.
  */
 function addVirtualFieldToReturnItemsInInputOrder(
-  list: ListConfig<any, any>,
+  list: ListConfig<any>,
   manualOrderField: ManualOrderFieldConfig
 ) {
   const virtualFieldName = `${manualOrderField.targetFieldName}InInputOrder`