fix(rich-text-types): resolve generated JSON schemas (#294)

packages/rich-text-types/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentful/rich-text-types",
   "version": "15.9.0",
-  "main": "dist/rich-text-types.es5.js",
+  "main": "dist/index.js",
   "typings": "dist/types/index.d.ts",
   "files": [
     "dist"
@@ -30,7 +30,6 @@
   "devDependencies": {
     "@types/jest": "^27.0.1",
     "@types/node": "^14.17.14",
-    "core-js": "^3.17.2",
     "faker": "^4.1.0",
     "jest": "^27.1.0",
     "rimraf": "^2.6.3",

packages/rich-text-types/rollup.config.js

@@ -8,11 +8,18 @@ const customConfig = () => {
 
   return {
     ...baseConfig,
+    output: {
+      // Maintain the same file names & folders structure as "src"
+      // This is necessary to resolve generated JSON schema files
+      //
+      // https://rollupjs.org/guide/en/#outputpreservemodules
+      preserveModules: true,
+    },
     plugins: [
       ...baseConfig.plugins,
       copy({
         targets: {
-          'src/schemas/generated': 'dist/lib/schemas/generated',
+          'src/schemas/generated': 'dist/schemas/generated',
         },
       }),
     ],

packages/rich-text-types/src/helpers.ts

@@ -2,18 +2,32 @@ import { Node, Block, Inline, Text } from './types';
 import { BLOCKS } from './blocks';
 import { INLINES } from './inlines';
 
+/**
+ * Tiny replacement for Object.values(object).includes(key) to
+ * avoid including CoreJS polyfills
+ */
+function hasValue(obj: Record<string, unknown>, value: unknown) {
+  for (const key of Object.keys(obj)) {
+    if (value === obj[key]) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
 /**
  * Checks if the node is an instance of Inline.
  */
 export function isInline(node: Node): node is Inline {
-  return Object.values(INLINES).includes(node.nodeType as INLINES);
+  return hasValue(INLINES, node.nodeType);
 }
 
 /**
  * Checks if the node is an instance of Block.
  */
 export function isBlock(node: Node): node is Block {
-  return Object.values(BLOCKS).includes(node.nodeType as BLOCKS);
+  return hasValue(BLOCKS, node.nodeType);
 }
 
 /**

packages/rich-text-types/src/index.ts

@@ -1,6 +1,3 @@
-import 'core-js/features/object/values';
-import 'core-js/features/array/includes';
-
 export { BLOCKS } from './blocks';
 export { INLINES } from './inlines';
 export { default as MARKS } from './marks';

packages/rich-text-types/src/schemas/__test__/helpers.test.ts

@@ -0,0 +1,23 @@
+import { BLOCKS } from '../../blocks';
+import { INLINES } from '../../inlines';
+import { isBlock, isInline } from '../../helpers';
+
+test('isBlock', () => {
+  const block: any = { nodeType: BLOCKS.PARAGRAPH };
+  const nonBlock: any = { nodeType: 'Paragraph' };
+  const nonBlock2: any = { nodeType: undefined };
+
+  expect(isBlock(block)).toBe(true);
+  expect(isBlock(nonBlock)).toBe(false);
+  expect(isBlock(nonBlock2)).toBe(false);
+});
+
+test('isInline', () => {
+  const inline: any = { nodeType: INLINES.HYPERLINK };
+  const noninline: any = { nodeType: 'Hyperlink' };
+  const noninline2: any = { nodeType: undefined };
+
+  expect(isInline(inline)).toBe(true);
+  expect(isInline(noninline)).toBe(false);
+  expect(isInline(noninline2)).toBe(false);
+});

packages/rich-text-types/tsconfig.json

@@ -2,7 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "declarationDir": "dist/types",
-    "outDir": "dist/lib",
+    "outDir": "dist",
     "typeRoots": ["../../node_modules/@types", "node_modules/@types", "src/typings"],
     "types": ["jest", "node"]
   },