Merge pull request #14 from contentstack/bug/security

uttamukkoji · web-flow · commit d2da344d9f72 · 2021-12-06T12:08:03.000+05:30
Bug/security
diff --git a/.npmignore b/.npmignore
@@ -2,4 +2,5 @@ src
 tsconfig.json
 tslint.json
 .prettierrc
-jestconfig.json
+jestconfig.json
+CODEOWNERS
diff --git a/__test__/node/node-initialise.test.ts b/__test__/node/node-initialise.test.ts
@@ -1,6 +1,6 @@
 import Node from '../../src/nodes/node'
 import NodeType from '../../src/nodes/node-type'
-import TextNode from '../../src/nodes/text'
+import TextNode from '../../src/nodes/text-node'
 import { paragraphJson } from '../mock/json-element-mock'
 import Document from '../../src/nodes/document'
 describe('Node parser', () => {
diff --git a/__test__/text-node-to-html.test.ts b/__test__/text-node-to-html.test.ts
@@ -1,6 +1,6 @@
 import { textNodeToHTML } from "../src/helper/enumerate-entries"
 import NodeType from "../src/nodes/node-type"
-import TextNode from "../src/nodes/text"
+import TextNode from "../src/nodes/text-node"
 import { defaultNodeOption } from "../src/options/default-node-options"
 
 const textNode: TextNode = {
diff --git a/babel.config.js b/babel.config.js
@@ -0,0 +1 @@
+module.exports = {presets: ['@babel/preset-env']}
diff --git a/jestconfig.json b/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", 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.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",
diff --git a/src/Models/metadata-model.ts b/src/Models/metadata-model.ts
@@ -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
diff --git a/src/entry-editable.ts b/src/entry-editable.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;
diff --git a/src/extensions/index.ts b/src/extensions/index.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';
 
diff --git a/src/gql.ts b/src/gql.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 : []
diff --git a/src/helper/enumerate-entries.ts b/src/helper/enumerate-entries.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)
+        }
     }
 }
diff --git a/src/helper/find-embeded-object.ts b/src/helper/find-embeded-object.ts
@@ -1,7 +1,7 @@
+import { defaultOptions } from '../options/default-options';
 import { EntryEmbedable, EmbeddedItem } from '../Models/embedded-object';
 import { RenderOption, RenderContentType, RenderItem } from '../options/index';
 import { EntryAttributes, Metadata } from '../Models/metadata-model';
-import { defaultOptions } from '../options/default-options';
 import { EntryNode } from '../Models/json-rte-model';
 
 // This function will find Embedded object present in string
diff --git a/src/index.ts b/src/index.ts
@@ -9,7 +9,7 @@ export { default as NodeType } from './nodes/node-type'
 export { default as MarkType } from './nodes/mark-type'
 export { default as Node} from './nodes/node'
 export { default as Document } from './nodes/document'
-export { default as TextNode } from './nodes/text';
+export { default as TextNode } from './nodes/text-node';
 export { jsonToHTML } from './json-to-html'
 export { GQL } from './gql'
 export { addTags as addEditableTags } from './entry-editable'
diff --git a/src/json-to-html.ts b/src/json-to-html.ts
@@ -1,5 +1,5 @@
 import Node from './nodes/node';
-import TextNode from './nodes/text';
+import TextNode from './nodes/text-node';
 import Document from './nodes/document';
 import { Metadata } from './Models/metadata-model';
 import { EntryEmbedable } from './Models/embedded-object';
@@ -34,7 +34,7 @@ function enumerateKeys(option: {
     renderOption?: RenderOption,
 }) {
     for (const key of option.paths) {
-        findRenderContent(key, option.entry as EntryEmbedable, ((content: Document | Document[]) => {
+        findRenderContent(key, option.entry, ((content: Document | Document[]) => {
             return enumerateContents(content, option.renderOption, (metadata: Metadata) => {
                 return findEmbeddedItems(metadata, option.entry)[0]
             })
diff --git a/src/nodes/text-node.ts b/src/nodes/text-node.ts
diff --git a/src/options/default-node-options.ts b/src/options/default-node-options.ts
@@ -1,5 +1,4 @@
 import { Next, RenderOption } from ".";
-import { attributeToString } from "../Models/metadata-model";
 import MarkType from "../nodes/mark-type";
 import Node from "../nodes/node";
 import NodeType from "../nodes/node-type";
@@ -81,6 +80,9 @@ export const defaultNodeOption: RenderOption = {
     ['reference']:(node: Node, next: Next) => {
         return ``
     },
+    ['default']:(node: Node, next: Next) => {
+        return next(node.children)
+    },
 
     [MarkType.BOLD]:(text: string) => {
         return `<strong>${text}</strong>`
diff --git a/src/render-embedded-objects.ts b/src/render-embedded-objects.ts
@@ -41,7 +41,7 @@ export function render(option: {
             findAndRender(entry)
         })
     }else {
-        findAndRender(option.entry as EntryEmbedable)
+        findAndRender(option.entry)
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+module.exports = {presets: ['@babel/preset-env']}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ import { EntryModel } from ".";`
`2`	`2`
`3`	`3`	`export function addTags(entry: EntryModel, contentTypeUid: string, tagsAsObject: boolean, locale: string = 'en-us') : void {`
`4`	`4`	`if (entry)`
`5`		- entry["$"] = getTag(entry, `${contentTypeUid}.${entry.uid}.${locale}`, tagsAsObject, locale)
	`5`	+ entry.$ = getTag(entry, `${contentTypeUid}.${entry.uid}.${locale}`, tagsAsObject, locale)
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`function getTag(content: object, prefix: string, tagsAsObject: boolean, locale: string): object {`
`@@ -13,18 +13,18 @@ function getTag(content: object, prefix: string, tagsAsObject: boolean, locale:`
`13`	`13`	`if (Array.isArray(value)) {`
`14`	`14`	`value.forEach((obj, index) => {`
`15`	`15`	`if ((typeof obj !== 'undefined' \|\| obj !== null) && obj._content_type_uid !== undefined && obj.uid !== undefined) {`
`16`		- value[index]['$'] = getTag(obj, `${obj._content_type_uid}.${obj.uid}.${obj.locale \|\| locale}`, tagsAsObject, locale)
	`16`	+ value[index].$ = getTag(obj, `${obj._content_type_uid}.${obj.uid}.${obj.locale \|\| locale}`, tagsAsObject, locale)
`17`	`17`	`}else {`
`18`	`18`	`if (typeof obj === "object") {`
`19`		- obj['$'] = getTag(obj, `${prefix}.${key}.${index}`, tagsAsObject, locale)
	`19`	+ obj.$ = getTag(obj, `${prefix}.${key}.${index}`, tagsAsObject, locale)
`20`	`20`	`} else {`
`21`	`21`	tags[key] = getTagsValue(`${prefix}.${key}`, tagsAsObject)
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`	`})`
`25`	`25`	`}else {`
`26`	`26`	`if (value) {`
`27`		- value["$"] = getTag(value, `${prefix}.${key}`, tagsAsObject, locale)
	`27`	+ value.$ = getTag(value, `${prefix}.${key}`, tagsAsObject, locale)
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`break;`