diff --git a/package-lock.json b/package-lock.json index 0288283..0fe9b74 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,16 +1,16 @@ { "name": "contentstack-cli-tsgen", - "version": "2.2.2", + "version": "2.3.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "contentstack-cli-tsgen", - "version": "2.2.2", + "version": "2.3.0", "license": "MIT", "dependencies": { - "@contentstack/cli-command": "^1.2.13", - "@contentstack/cli-utilities": "^1.5.2", + "@contentstack/cli-command": "^1.2.17", + "@contentstack/cli-utilities": "^1.5.10", "lodash": "^4.17.20", "prettier": "^2.0.5", "tslib": "^1.13.0" @@ -701,11 +701,11 @@ } }, "node_modules/@contentstack/cli-command": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/@contentstack/cli-command/-/cli-command-1.2.13.tgz", - "integrity": "sha512-T01EtJI5hpYIIHdZcrx5faPsBrE1PwIgZz6onx+W9XCV8Or+HIeg1iUojk+CiehpYe2CVOoiAbL1KYnQtVGA6A==", + "version": "1.2.17", + "resolved": "https://registry.npmjs.org/@contentstack/cli-command/-/cli-command-1.2.17.tgz", + "integrity": "sha512-z5DWK+S+fRAXIZc0eZH1aw/Vb84wqICzYlGi4nKtov56H7QMWHwb+dORmzQvBHCUjbT/5/cZc6wpBZkebAUc7Q==", "dependencies": { - "@contentstack/cli-utilities": "~1.5.3", + "@contentstack/cli-utilities": "~1.5.10", "contentstack": "^3.10.1" }, "engines": { @@ -713,13 +713,14 @@ } }, "node_modules/@contentstack/cli-utilities": { - "version": "1.5.7", - "resolved": "https://registry.npmjs.org/@contentstack/cli-utilities/-/cli-utilities-1.5.7.tgz", - "integrity": "sha512-gAM6xtrrAcEcvwx/R6pEImyMNnxBjjEWXe+RNYGaRIS/BfXH542waDWzs/9E8UO9SSZIjomnTd0hVO86+mborg==", + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/@contentstack/cli-utilities/-/cli-utilities-1.5.10.tgz", + "integrity": "sha512-UMypT6q+XqgeKp3mETcZo6WmSl4IVkz/FDWAqm/agnbHturovSvmbxjFxtSNX/8iLNe9E1bQC3n6KPGmxeWtlQ==", "dependencies": { - "@contentstack/management": "~1.12.0", + "@contentstack/management": "~1.13.0", + "@contentstack/marketplace-sdk": "^1.0.1", "@oclif/core": "^2.9.3", - "axios": "^1.6.0", + "axios": "^1.6.4", "chalk": "^4.0.0", "cli-cursor": "^3.1.0", "cli-table": "^0.3.11", @@ -765,11 +766,11 @@ } }, "node_modules/@contentstack/management": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/@contentstack/management/-/management-1.12.0.tgz", - "integrity": "sha512-+L+WVhSYEtfdG9v794TjLT8Fd6fCB8meqoho666mg1kNufzXcsqr7hjubX5cSL7GcZFdKntkDpZ2RaOnTHReJg==", + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/@contentstack/management/-/management-1.13.0.tgz", + "integrity": "sha512-zVApJ9dpZTq6yBvSTdwrTjPxe20PiXy9x5CGU49by2n1V7hWhsKtSpcIK+Fx9jylYfYU4SEM/HQIKq/i0roMew==", "dependencies": { - "axios": "^1.5.1", + "axios": "^1.6.0", "form-data": "^3.0.1", "lodash": "^4.17.21", "qs": "^6.11.2" @@ -778,6 +779,14 @@ "node": ">=8.0.0" } }, + "node_modules/@contentstack/marketplace-sdk": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@contentstack/marketplace-sdk/-/marketplace-sdk-1.0.1.tgz", + "integrity": "sha512-E9amU6qwp4i1AzXiMX4UKYJSZ8wyhncGPx5MGpwGoM2WUfJqGMwH9o1bXLAzOSBu1a8yhOMOkz/ehLwYeq6Ufg==", + "dependencies": { + "axios": "^1.6.0" + } + }, "node_modules/@contentstack/utils": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@contentstack/utils/-/utils-1.2.0.tgz", @@ -2872,9 +2881,9 @@ "dev": true }, "node_modules/@types/triple-beam": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.3.tgz", - "integrity": "sha512-6tOUG+nVHn0cJbVp25JFayS5UE6+xlbcNF9Lo9mU7U0zk3zeUShZied4YEQZjy1JBF043FSkdXw8YkUJuVtB5g==" + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.5.tgz", + "integrity": "sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==" }, "node_modules/@types/vinyl": { "version": "2.0.7", @@ -3442,11 +3451,11 @@ } }, "node_modules/axios": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz", - "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==", + "version": "1.6.5", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.5.tgz", + "integrity": "sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==", "dependencies": { - "follow-redirects": "^1.15.0", + "follow-redirects": "^1.15.4", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" } @@ -6442,9 +6451,9 @@ "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==" }, "node_modules/follow-redirects": { - "version": "1.15.4", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", - "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", + "version": "1.15.5", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", + "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", "funding": [ { "type": "individual", @@ -13853,9 +13862,12 @@ } }, "node_modules/traverse": { - "version": "0.6.7", - "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.7.tgz", - "integrity": "sha512-/y956gpUo9ZNCb99YjxG7OaslxZWHfCHAUUfshwqOXmxUIvqLjVO581BT+gM59+QV9tFe6/CGG53tsA1Y7RSdg==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.8.tgz", + "integrity": "sha512-aXJDbk6SnumuaZSANd21XAo15ucCDE38H4fkqiGsc3MhCK+wOlZvLP9cB/TvpHT0mOyWgC4Z8EwRlzqYSUzdsA==", + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } diff --git a/package.json b/package.json index fdad0c2..9a76d9b 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,12 @@ { "name": "contentstack-cli-tsgen", "description": "Generate TypeScript typings from a Stack.", - "version": "2.2.2", + "version": "2.3.0", "author": "Michael Davis", "bugs": "https://github.com/Contentstack-Solutions/contentstack-cli-tsgen/issues", "dependencies": { - "@contentstack/cli-command": "^1.2.13", - "@contentstack/cli-utilities": "^1.5.2", + "@contentstack/cli-command": "^1.2.17", + "@contentstack/cli-utilities": "^1.5.10", "lodash": "^4.17.20", "prettier": "^2.0.5", "tslib": "^1.13.0" diff --git a/src/lib/stack/client.ts b/src/lib/stack/client.ts index 5a20cc8..7d8e843 100644 --- a/src/lib/stack/client.ts +++ b/src/lib/stack/client.ts @@ -1,6 +1,7 @@ import * as http from 'https' import * as async from 'async' -import {ContentTypeCollection} from 'contentstack' +import { ContentTypeCollection } from 'contentstack' +import { configHandler } from "@contentstack/cli-utilities" type RegionUrlMap = { [prop: string]: string; @@ -37,6 +38,7 @@ export async function stackConnect(client: any, config: StackConnectionConfig, c environment: string, region: string, branch?: string + early_access?: string[] } = { api_key: config.apiKey, delivery_token: config.token, @@ -46,6 +48,12 @@ export async function stackConnect(client: any, config: StackConnectionConfig, c if (config.branch) { clientParams.branch = config.branch } + + const earlyAccessHeaders = configHandler.get(`earlyAccessHeaders`); + if (earlyAccessHeaders && Object.keys(earlyAccessHeaders).length > 0) { + clientParams.early_access = Object.values(earlyAccessHeaders); + } + // eslint-disable-next-line new-cap const stack = client(clientParams) // check and update host if doesn't exists in REGION_URL_MAPPING