@takeshape/cli 8.199.0 → 8.200.0

package/dist/commands/import/index.d.ts

@@ -1,6 +1,7 @@
 import { ProjectImportFlags } from './project-import';
 import { SchemaImportFlags } from './schema-import';
+import { RolesImportFlags } from './roles-import';
 import { Handler } from '../../types';
-declare const commandHandler: Handler<ProjectImportFlags | SchemaImportFlags>;
+declare const commandHandler: Handler<ProjectImportFlags | SchemaImportFlags | RolesImportFlags>;
 export default commandHandler;
 //# sourceMappingURL=index.d.ts.map

package/dist/commands/import/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/import/index.ts"],"names":[],"mappings":"AAAA,OAAsB,EAAC,kBAAkB,EAAC,MAAM,kBAAkB,CAAC;AACnE,OAAqB,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAC,OAAO,EAAC,MAAM,aAAa,CAAC;AAEpC,QAAA,MAAM,cAAc,EAAE,OAAO,CAAC,kBAAkB,GAAG,iBAAiB,CAMnE,CAAC;AAEF,eAAe,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/import/index.ts"],"names":[],"mappings":"AAAA,OAAsB,EAAC,kBAAkB,EAAC,MAAM,kBAAkB,CAAC;AACnE,OAAqB,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAChE,OAAoB,EAAC,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAC,OAAO,EAAC,MAAM,aAAa,CAAC;AAEpC,QAAA,MAAM,cAAc,EAAE,OAAO,CAAC,kBAAkB,GAAG,iBAAiB,GAAG,gBAAgB,CActF,CAAC;AAEF,eAAe,cAAc,CAAC"}

package/dist/commands/import/index.js

@@ -9,6 +9,8 @@ var _projectImport = _interopRequireDefault(require("./project-import"));
 
 var _schemaImport = _interopRequireDefault(require("./schema-import"));
 
+var _rolesImport = _interopRequireDefault(require("./roles-import"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const commandHandler = async (command, params, flags) => {
@@ -16,6 +18,10 @@ const commandHandler = async (command, params, flags) => {
     return (0, _schemaImport.default)(command, params, flags);
   }
 
+  if ('roles' in flags) {
+    return (0, _rolesImport.default)(command, params, flags);
+  }
+
   return (0, _projectImport.default)(command, params, flags);
 };
 

package/dist/commands/import/roles-import.d.ts

@@ -0,0 +1,7 @@
+export interface RolesImportFlags {
+    roles: true;
+    from: string;
+}
+declare const _default: import("../../types").Handler<RolesImportFlags>;
+export default _default;
+//# sourceMappingURL=roles-import.d.ts.map

package/dist/commands/import/roles-import.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"roles-import.d.ts","sourceRoot":"","sources":["../../../../src/commands/import/roles-import.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,IAAI,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd;;AAED,wBAoBG"}

package/dist/commands/import/roles-import.js

@@ -0,0 +1,51 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _fatalError = require("../../util/fatal-error");
+
+var _linkedCommand = require("../../util/linked-command");
+
+var _fsExtra = _interopRequireDefault(require("fs-extra"));
+
+var _log = require("../../log");
+
+var _api = _interopRequireDefault(require("../../util/api"));
+
+var _chalk = _interopRequireDefault(require("chalk"));
+
+var _schema = require("@takeshape/schema");
+
+var _fs = require("../../util/fs");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var _default = (0, _linkedCommand.linkedCommand)(async (_, params, flags) => {
+  if (!flags.from) {
+    return (0, _fatalError.fatalError)('No roles file provided. Use `--from path/to/file` or `--from directory`.');
+  }
+
+  const {
+    exists,
+    file
+  } = (0, _fs.resolveFromFlag)(flags.from, 'roles.json');
+
+  if (!exists) {
+    return (0, _fatalError.fatalError)(`Roles file does not exist: ${file}`);
+  }
+
+  try {
+    const roles = JSON.parse(_fsExtra.default.readFileSync(file).toString());
+    const validatedRoles = (0, _schema.validateRoleImport)(roles);
+    (0, _log.log)(`Uploading roles from ${file}…\n`);
+    await (0, _api.default)(params, 'POST', `/project/${params.projectId}/roles`, validatedRoles);
+    (0, _log.log)(_chalk.default.green('Success!'), 'Roles updated.');
+  } catch (e) {
+    return (0, _fatalError.fatalError)(e.message);
+  }
+});
+
+exports.default = _default;

package/dist/commands/import/schema-import.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema-import.d.ts","sourceRoot":"","sources":["../../../../src/commands/import/schema-import.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,IAAI,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;;AAWD,wBAiCG"}
+{"version":3,"file":"schema-import.d.ts","sourceRoot":"","sources":["../../../../src/commands/import/schema-import.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,IAAI,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;;AAWD,wBA0BG"}

package/dist/commands/import/schema-import.js

@@ -19,10 +19,10 @@ var _schema = require("@takeshape/schema");
 
 var _linkedCommand = require("../../util/linked-command");
 
-var _path = _interopRequireDefault(require("path"));
-
 var _formatValidationResult = require("../../util/format-validation-result");
 
+var _fs = require("../../util/fs");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /*
@@ -42,18 +42,13 @@ var _default = (0, _linkedCommand.linkedCommand)(async (_, params, flags) => {
     return (0, _fatalError.fatalError)('No schema file provided. Use `--from path/to/file` or `--from directory`.');
   }
 
-  if (!_fsExtra.default.existsSync(flags.from)) {
-    return (0, _fatalError.fatalError)(`${flags.from} does not exist`);
-  }
-
-  let file = flags.from;
-
-  if (!_fsExtra.default.lstatSync(file).isFile()) {
-    file = _path.default.join(flags.from, 'schema.json');
+  const {
+    exists,
+    file
+  } = (0, _fs.resolveFromFlag)(flags.from, 'schema.json');
 
-    if (!_fsExtra.default.existsSync(file) || !_fsExtra.default.lstatSync(file).isFile()) {
-      return (0, _fatalError.fatalError)(`Schema file does not exist: ${file}`);
-    }
+  if (!exists) {
+    return (0, _fatalError.fatalError)(`Schema file does not exist: ${file}`);
   }
 
   try {

package/dist/index.js

@@ -41,21 +41,22 @@ const help = `
       --watchContent,  -W  rebuild on content change (watch only)
 
     import Options
-      --schema   import a takeshape schema from a directory or JSON file to the currently linked project
-                 use either --schema or --project not both, must be combined with --from
-      --project  import a takeshape project from given directory, zip or url
-                 use either --project or --schema not both, must be combined with --from
-      --from     specifies the file, directory, zip or url to import
+      One of
+        --project  import a takeshape project from given directory, zip or url
+        --schema   import a takeshape schema from a directory or JSON file to the currently linked project
+        --roles    import roles from a directory or JSON file to the currently linked project
+
+      --from     specifies the file, directory, zip or url to import (required)
       --to       either "new-project" or "current-project" (default "new-project")
       --name     for use with --project specifies a new name for the imported project
 
     export Options
-      --schema       export a takeshape schema from a directory or JSON file
-                     use either --schema or --project not both, must be combined with --to
-      --project      export a takeshape project zip
-                     use either --project or --schema not both, must be combined with --to
+      One of
+        --schema       export a takeshape schema from a directory or JSON file
+        --project      export a takeshape project zip
+
+      --to           specifies the directory to write the exported data to (required)
       --withoutData  when using --project skip exporting the data
-      --to           specifies the directory to write the exported data to
 
     validate Options
       --path         path to the schema file to validate, or the directory it is in (default "./schema.json")

package/dist/util/api.d.ts

@@ -1,5 +1,5 @@
 import { CliConfig } from '../types';
 export declare function isJWT(str: string): boolean;
 export declare function getAuthHeader(authToken?: string): Record<string, string>;
-export default function api<T = any>(params: CliConfig, method: string, path: string, body?: any): Promise<T>;
+export default function api(params: CliConfig, method: string, path: string, body?: any): Promise<any>;
 //# sourceMappingURL=api.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../src/util/api.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,SAAS,EAAC,MAAM,UAAU,CAAC;AAanC,wBAAgB,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAG1C;AAED,wBAAgB,aAAa,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAMxE;AAED,wBAA8B,GAAG,CAAC,CAAC,GAAG,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,CAqBlH"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../src/util/api.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,SAAS,EAAC,MAAM,UAAU,CAAC;AAanC,wBAAgB,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAG1C;AAED,wBAAgB,aAAa,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAMxE;AAED,wBAA8B,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAyB3G"}

package/dist/util/api.js

@@ -59,6 +59,10 @@ async function api(params, method, path, body) {
   const res = await (0, _nodeFetch.default)(endpoint, requestParams);
 
   if (res.ok) {
+    if (res.size === 0) {
+      return;
+    }
+
     return res.json();
   }
 

package/dist/util/fs.d.ts

@@ -0,0 +1,5 @@
+export declare function resolveFromFlag(from: string, expectedFilename: string): {
+    exists: boolean;
+    file: string;
+};
+//# sourceMappingURL=fs.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"fs.d.ts","sourceRoot":"","sources":["../../../src/util/fs.ts"],"names":[],"mappings":"AAGA,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM;;;EAerE"}

package/dist/util/fs.js

@@ -0,0 +1,42 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.resolveFromFlag = resolveFromFlag;
+
+var _fsExtra = _interopRequireDefault(require("fs-extra"));
+
+var _path = _interopRequireDefault(require("path"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function resolveFromFlag(from, expectedFilename) {
+  if (!_fsExtra.default.existsSync(from)) {
+    return {
+      exists: false,
+      file: from
+    };
+  }
+
+  if (_fsExtra.default.lstatSync(from).isFile()) {
+    return {
+      exists: true,
+      file: from
+    };
+  }
+
+  const file = _path.default.join(from, expectedFilename);
+
+  if (_fsExtra.default.existsSync(file) && _fsExtra.default.lstatSync(file).isFile()) {
+    return {
+      exists: true,
+      file
+    };
+  }
+
+  return {
+    exists: false,
+    file
+  };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/cli",
-  "version": "8.199.0",
+  "version": "8.200.0",
   "description": "TakeShape CLI",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -25,10 +25,10 @@
     "@graphql-codegen/typescript": "^2.4.5",
     "@graphql-tools/graphql-file-loader": "^7.3.3",
     "@graphql-tools/load": "^7.5.1",
-    "@takeshape/schema": "8.199.0",
-    "@takeshape/ssg": "8.199.0",
-    "@takeshape/streams": "8.199.0",
-    "@takeshape/util": "8.199.0",
+    "@takeshape/schema": "8.200.0",
+    "@takeshape/ssg": "8.200.0",
+    "@takeshape/streams": "8.200.0",
+    "@takeshape/util": "8.200.0",
     "archiver": "^1.3.0",
     "async-retry": "^1.2.1",
     "bluebird": "^3.4.6",