Merge pull request #60 from contentstack/next

Feat: NRP support, Audit logs, Type correction for User and CScollection added

Author: nadeem-cs

.jsdoc.json

@@ -17,6 +17,8 @@
             "lib/stack/asset/index.js",
             "lib/stack/asset/folders/index.js",
             "lib/stack/branch/index.js",
+            "lib/stack/branch/compare.js",
+            "lib/stack/branch/mergeQueue.js",
             "lib/stack/branchAlias/index.js",
             "lib/stack/bulkOperation/index.js",
             "lib/stack/extension/index.js",
@@ -27,15 +29,23 @@
             "lib/stack/environment/index.js",
             "lib/stack/deliveryToken/index.js",
             "lib/stack/roles/index.js",
-            "lib/stack/webhook/index.js",
             "lib/stack/workflow/index.js",
-            "lib/stack/workflow/publishRules/index.js"
+            "lib/stack/workflow/publishRules/index.js",
+            "lib/marketplace/app/oauth/index.js",
+            "lib/marketplace/app/index.js",
+            "lib/marketplace/app/hosting/deployment.js",
+            "lib/marketplace/app/hosting/index.js",
+            "lib/marketplace/index.js",
+            "lib/marketplace/installation/index.js",
+            "lib/marketplace/installation/webhooks/index.js",
+            "lib/marketplace/apprequest/index.js",
+            "lib/marketplace/authorization/index.js"
 
         ],
         "excludePattern": "(node_modules/|jsdocs)"
     },
     "opts": {
-        "template": "docdash-template",
+        "template": "./node_modules/docdash",
         "destination": "./jsdocs/",
         "encoding": "utf8",
         "private": true,

README.md

@@ -104,7 +104,7 @@ contentstackClient.stack({ api_key: 'API_KEY' }).asset().create({ asset })
 -   [Content Management API Docs](https://www.contentstack.com/docs/developers/apis/content-management-api)
 
 ### The MIT License (MIT)
-Copyright © 2012-2022  [Contentstack](https://www.contentstack.com/). All Rights Reserved
+Copyright © 2012-2023  [Contentstack](https://www.contentstack.com/). All Rights Reserved
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

lib/app/installation/index.js

@@ -93,29 +93,6 @@ export const create = ({ http, params }) => {
   }
 }
 
-export const exportObject = ({ http }) => {
-  return async function (param) {
-    const headers = {
-      params: {
-        ...cloneDeep(param)
-      },
-      headers: {
-        ...cloneDeep(this.stackHeaders)
-      }
-    } || {}
-    try {
-      const response = await http.get(this.urlPath, headers)
-      if (response.data) {
-        return new this.constructor(http, parseData(response, this.stackHeaders, this.content_type_uid))
-      } else {
-        throw error(response)
-      }
-    } catch (err) {
-      throw error(err)
-    }
-  }
-}
-
 export const query = ({ http, wrapperCollection }) => {
   return function (params = {}) {
     const headers = {
@@ -181,9 +158,7 @@ export const deleteEntity = (http, force = false, params = {}) => {
     try {
       const headers = {
         headers: { ...cloneDeep(this.stackHeaders), ...cloneDeep(params) },
-        params: {
-          ...cloneDeep(param)
-        }
+        params: { ...cloneDeep(param) }
       } || {}
       if (force === true) {
         headers.params.force = true
@@ -288,4 +263,4 @@ export async function get (http, url, params, data) {
   } catch (err) {
     throw error(err)
   }
-}
+}

lib/entity.js

@@ -1,6 +1,6 @@
 import cloneDeep from 'lodash/cloneDeep'
-import ContentstackCollection from '../../contentstackCollection'
-import error from '../../core/contentstackError'
+import ContentstackCollection from '../../../contentstackCollection'
+import error from '../../../core/contentstackError'
 
 export function Deployment (http, data, params) {
   http.defaults.versioningStrategy = undefined

lib/app/hosting/deployment.js renamed to lib/marketplace/app/hosting/deployment.js

@@ -1,5 +1,5 @@
 import cloneDeep from 'lodash/cloneDeep'
-import error from '../../core/contentstackError'
+import error from '../../../core/contentstackError'
 import { Deployment } from './deployment'
 
 export function Hosting (http, data, params) {