Merge pull request #14 from contentstack/bug/security

Bug/security

Author: uttamukkoji

.npmignore

@@ -2,4 +2,5 @@ src
 tsconfig.json
 tslint.json
 .prettierrc
-jestconfig.json
+jestconfig.json
+CODEOWNERS

babel.config.js

@@ -0,0 +1 @@
+module.exports = {presets: ['@babel/preset-env']}

jestconfig.json

@@ -1,12 +1,17 @@
 {
+    "preset": "ts-jest",
     "transform": {
-      "^.+\\.(t|j)sx?$": "ts-jest"
+      "^.+\\.(t|j)sx?$": "ts-jest",
+      "^.+\\.(ts|tsx|js|jsx)$": "babel-jest"
     },
     "testMatch": [
       "**/__test__/**/?(*.)+(spec|test).[jt]s?(x)"
     ],
     "moduleFileExtensions": ["ts", "tsx", "js", "jsx", "json", "node"],
-
+    "moduleDirectories": ["node_modules", "src"],
+    "transformIgnorePatterns": [
+      "node_modules/(?!@ngrx|(?!deck.gl)|ng-dynamic)"
+    ],
     "collectCoverage": true,
     "coverageReporters": [
       "json", 

package-lock.json

@@ -18,7 +18,7 @@
     "url": "https://github.com/contentstack/contentstack-utils-javascript.git"
   },
   "scripts": {
-    "test": "jest --config jestconfig.json",
+    "test": "jest --config jestconfig.json ",
     "test:badges": "npm run test && jest-coverage-badges --output ./badges",
     "test:debug": "jest --watchAll --config jestconfig.json --runInBand",
     "prebuild": "rimraf dist",
@@ -35,8 +35,10 @@
   "author": "Contentstack",
   "license": "MIT",
   "devDependencies": {
+    "@babel/preset-env": "^7.15.8",
     "@types/jest": "^26.0.13",
     "babel-core": "^6.26.3",
+    "babel-jest": "^27.3.1",
     "babel-loader": "8.1.0",
     "babel-preset-es2015": "^6.24.1",
     "eslint": "^8.0.1",

package.json

@@ -1,6 +1,5 @@
 import StyleType from '../embedded-types/style-type';
-import TextNode from '../nodes/text';
-import { EmbeddedItem } from './embedded-object';
+import TextNode from '../nodes/text-node';
 export interface Metadata {
   text: string
   attributes: Attributes

src/Models/metadata-model.ts

@@ -2,7 +2,7 @@ import { EntryModel } from ".";
 
 export function addTags(entry: EntryModel, contentTypeUid: string, tagsAsObject: boolean, locale: string = 'en-us') : void {  
     if (entry)  
-        entry["$"] = getTag(entry, `${contentTypeUid}.${entry.uid}.${locale}`, tagsAsObject, locale)        
+        entry.$ = getTag(entry, `${contentTypeUid}.${entry.uid}.${locale}`, tagsAsObject, locale)        
 }
 
 function getTag(content: object, prefix: string, tagsAsObject: boolean, locale: string): object {
@@ -13,18 +13,18 @@ function getTag(content: object, prefix: string, tagsAsObject: boolean, locale:
                 if (Array.isArray(value)) {
                     value.forEach((obj, index) => {
                         if ((typeof obj !== 'undefined' || obj !== null) && obj._content_type_uid !== undefined && obj.uid !== undefined) {
-                            value[index]['$'] = getTag(obj, `${obj._content_type_uid}.${obj.uid}.${obj.locale || locale}`, tagsAsObject, locale)
+                            value[index].$ = getTag(obj, `${obj._content_type_uid}.${obj.uid}.${obj.locale || locale}`, tagsAsObject, locale)
                         }else {
                             if (typeof obj === "object") {
-                                obj['$'] = getTag(obj, `${prefix}.${key}.${index}`, tagsAsObject, locale)
+                                obj.$ = getTag(obj, `${prefix}.${key}.${index}`, tagsAsObject, locale)
                             } else {
                                 tags[key] = getTagsValue(`${prefix}.${key}`, tagsAsObject)
                             }
                         }
                     })
                 }else {
                     if (value) {
-                        value["$"] = getTag(value, `${prefix}.${key}`, tagsAsObject, locale)
+                        value.$ = getTag(value, `${prefix}.${key}`, tagsAsObject, locale)
                     }
                 }
                 break;

src/entry-editable.ts

@@ -1,5 +1,5 @@
 import { elementToJson } from '../helper/html-to-json';
-import { EntryAttributes, AssetAttributes, Metadata, createMetadata, Attributes } from '../Models/metadata-model';
+import { Metadata, createMetadata, Attributes } from '../Models/metadata-model';
 import { parse } from 'node-html-parser';
 const frameflag = 'documentfragmentcontainer';
 

src/extensions/index.ts

@@ -1,5 +1,5 @@
 import Node from './nodes/node';
-import TextNode from './nodes/text';
+import TextNode from './nodes/text-node';
 import { RenderOption } from './options';
 import { JsonRTE } from './Models/json-rte-model';
 import { Metadata } from './Models/metadata-model';
@@ -35,7 +35,7 @@ function enumerateKeys(option: {
 }) {
     for (const key of option.paths) {
         findRenderContent(key, 
-            option.entry as EntryEmbedable, 
+            option.entry, 
             ((content: JsonRTE) => {
             if (content && content.json) {
                 const edges = content.embedded_itemsConnection ? content.embedded_itemsConnection.edges : []

src/gql.ts

@@ -2,7 +2,7 @@ import { AnyNode } from "../json-to-html";
 import { EmbeddedItem, EntryEmbedable } from "../Models/embedded-object";
 import { Metadata, nodeToMetadata } from "../Models/metadata-model";
 import MarkType from "../nodes/mark-type";
-import TextNode from "../nodes/text";
+import TextNode from "../nodes/text-node";
 import Node from '../nodes/node'
 import Document from '../nodes/document'
 import { Next, RenderMark, RenderNode, RenderOption } from "../options";
@@ -96,6 +96,10 @@ function nodeToHTML(
         return referenceToHTML(node, renderOption, renderEmbed)
     }else {
         const next: Next = nodes => nodeChildrenToHTML(nodes, renderOption, renderEmbed)
-        return (renderOption[node.type] as RenderNode)(node, next)
+        if (renderOption[node.type] !== undefined) {
+            return (renderOption[node.type] as RenderNode)(node, next)
+        }else {
+            return (renderOption.default as RenderNode)(node, next)
+        }
     }
 }