@takeshape/cli 9.84.1 → 9.86.4

package/dist/commands/validate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../src/commands/validate.ts"],"names":[],"mappings":"AAMA,OAAO,EAAC,OAAO,EAAC,MAAM,UAAU,CAAC;AAEjC,QAAA,MAAM,QAAQ,EAAE,OA+Bf,CAAC;AAEF,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../src/commands/validate.ts"],"names":[],"mappings":"AAMA,OAAO,EAAC,OAAO,EAAC,MAAM,UAAU,CAAC;AAIjC,QAAA,MAAM,QAAQ,EAAE,OAwDf,CAAC;AAEF,eAAe,QAAQ,CAAC"}

package/dist/commands/validate.js

@@ -10,8 +10,10 @@ var _fatalError = require("../util/fatal-error");
 var _path = _interopRequireDefault(require("path"));
 var _formatValidationResult = require("../util/format-validation-result");
 var _schema = require("@takeshape/schema");
+var _graphql = require("../graphql");
+var _data = require("../util/data");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const validate = async cli => {
+const validate = async (cli, params) => {
   const {
     flags
   } = cli;
@@ -30,7 +32,31 @@ const validate = async cli => {
   }
   try {
     const schema = JSON.parse(_fsExtra.default.readFileSync(schemaPath).toString());
-    const validationString = (0, _formatValidationResult.formatValidationResult)(await (0, _schema.validateSchema)({}, schema));
+    let project;
+    if (params.authToken) {
+      try {
+        var _response$data;
+        const client = (0, _graphql.createAdminConnector)(params, params.authToken, {
+          environment: 'PRODUCTION',
+          projectId: schema.projectId
+        });
+        const response = await client({
+          query: _data.getProjectQuery,
+          variables: {
+            id: schema.projectId
+          }
+        });
+        project = (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.project;
+      } catch {
+        // Eat the error and use default entitlements
+      }
+    }
+    if (!project) {
+      (0, _log.default)('Using default entitlements.');
+    }
+    const validationString = (0, _formatValidationResult.formatValidationResult)(await (0, _schema.validateSchema)({
+      entitlements: project ? project.status.billing.entitlements : {}
+    }, schema));
     if (validationString) {
       return (0, _fatalError.fatalError)(validationString);
     }

package/dist/index.js

@@ -9,7 +9,7 @@ var _options = require("./options");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const help = `
     Usage
-      $ takeshape <comand>
+      $ takeshape <command>
 
     Commands
       login
@@ -53,7 +53,7 @@ const help = `
         $ takeshape branch promote --name my-feature
         $ takeshape branch url --production
         $ takeshape branch tagVersion --name my-feature --tag my-tag
-        $ takeshape brance merge --head my-feature
+        $ takeshape branch merge --head my-feature
 
     Options
       --token,         -t  TakeShape API auth token

package/dist/util/data.d.ts

@@ -3,6 +3,7 @@ import { LoggedInCliConfig, CliConfig } from '../types';
 import { Choice } from '../prompt';
 export declare const projectListQuery = "\n    {\n       projects: tsGetProjectList {\n          value: id\n          name\n          invite\n        }\n    }\n";
 export declare const siteListQuery = "\n    {\n       sites: getTSStaticSiteList {\n          items {\n            value: _id\n            name: title\n          }\n        }\n    }\n";
+export declare const getProjectQuery = "\n  query($id: ID!) {\n    project: tsGetProject(id: $id) {\n      status\n    }\n  }\n";
 export interface ProjectChoice extends Choice {
     invite: unknown;
 }

package/dist/util/data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../src/util/data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsD,iBAAiB,EAAC,MAAM,YAAY,CAAC;AAElG,OAAO,EAAC,iBAAiB,EAAE,SAAS,EAAC,MAAM,UAAU,CAAC;AACtD,OAAO,EAAC,MAAM,EAAC,MAAM,WAAW,CAAC;AAGjC,eAAO,MAAM,gBAAgB,4HAQ5B,CAAC;AAEF,eAAO,MAAM,aAAa,sJASzB,CAAC;AAEF,MAAM,WAAW,aAAc,SAAQ,MAAM;IAC3C,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,wBAAsB,aAAa,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAQhF;AAED,eAAO,MAAM,SAAS;;;CAA6C,CAAC;AAEpE,wBAAsB,UAAU,CAAC,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAS5G;AAED,MAAM,WAAW,mBAAmB;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,WAAW,MAAM;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,iCAAiC;UAAuB,MAAM;kCAOzE,CAAC;AAEH,eAAO,MAAM,4BAA4B;UAAuB,MAAM;qBAOpE,CAAC;AAEH,eAAO,MAAM,iCAAiC;QAAqB,MAAM;sBAIvE,CAAC;AAEH,eAAO,MAAM,oBAAoB;QAAqB,MAAM;sBAI1D,CAAC;AAMH,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAOhH;AAED,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,iBAAiB,oBAWxE;AAED,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,CAOpH;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,oBAO5G"}
+{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../src/util/data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsD,iBAAiB,EAAC,MAAM,YAAY,CAAC;AAElG,OAAO,EAAC,iBAAiB,EAAE,SAAS,EAAC,MAAM,UAAU,CAAC;AACtD,OAAO,EAAC,MAAM,EAAC,MAAM,WAAW,CAAC;AAGjC,eAAO,MAAM,gBAAgB,4HAQ5B,CAAC;AAEF,eAAO,MAAM,aAAa,sJASzB,CAAC;AAEF,eAAO,MAAM,eAAe,4FAM3B,CAAC;AAEF,MAAM,WAAW,aAAc,SAAQ,MAAM;IAC3C,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,wBAAsB,aAAa,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAQhF;AAED,eAAO,MAAM,SAAS;;;CAA6C,CAAC;AAEpE,wBAAsB,UAAU,CAAC,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAS5G;AAED,MAAM,WAAW,mBAAmB;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,WAAW,MAAM;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,iCAAiC;UAAuB,MAAM;kCAOzE,CAAC;AAEH,eAAO,MAAM,4BAA4B;UAAuB,MAAM;qBAOpE,CAAC;AAEH,eAAO,MAAM,iCAAiC;QAAqB,MAAM;sBAIvE,CAAC;AAEH,eAAO,MAAM,oBAAoB;QAAqB,MAAM;sBAI1D,CAAC;AAMH,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAOhH;AAED,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,iBAAiB,oBAWxE;AAED,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,CAOpH;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,oBAO5G"}

package/dist/util/data.js

@@ -13,7 +13,7 @@ exports.deletePersonalAccessToken = deletePersonalAccessToken;
 exports.deletePersonalAccessTokenMutation = void 0;
 exports.fetchProjects = fetchProjects;
 exports.fetchSites = fetchSites;
-exports.siteListQuery = exports.projectListQuery = exports.laterSite = void 0;
+exports.siteListQuery = exports.projectListQuery = exports.laterSite = exports.getProjectQuery = void 0;
 var _graphql = require("../graphql");
 var _errors = require("../errors");
 var _os = _interopRequireDefault(require("os"));
@@ -39,6 +39,14 @@ const siteListQuery = `
     }
 `;
 exports.siteListQuery = siteListQuery;
+const getProjectQuery = `
+  query($id: ID!) {
+    project: tsGetProject(id: $id) {
+      status
+    }
+  }
+`;
+exports.getProjectQuery = getProjectQuery;
 async function fetchProjects(params) {
   try {
     const client = (0, _graphql.createAdminConnector)(params, params.authToken);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/cli",
-  "version": "9.84.1",
+  "version": "9.86.4",
   "description": "TakeShape CLI",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -54,11 +54,11 @@
     "semver": "^6.3.0",
     "stream-to-promise": "^2.2.0",
     "tmp": "^0.0.33",
-    "@takeshape/branches": "9.84.1",
-    "@takeshape/ssg": "9.84.1",
-    "@takeshape/streams": "9.84.1",
-    "@takeshape/util": "9.84.1",
-    "@takeshape/schema": "9.84.1"
+    "@takeshape/schema": "9.86.4",
+    "@takeshape/branches": "9.86.4",
+    "@takeshape/util": "9.86.4",
+    "@takeshape/ssg": "9.86.4",
+    "@takeshape/streams": "9.86.4"
   },
   "devDependencies": {
     "@types/archiver": "^3.1.0",
@@ -80,7 +80,7 @@
     "graphql": "16.6.0",
     "nock": "^13.2.9",
     "unzipper": "^0.10.11",
-    "@takeshape/typescript-jest-junit-reporter": "9.84.1"
+    "@takeshape/typescript-jest-junit-reporter": "9.86.4"
   },
   "engines": {
     "node": ">=16"