@takeshape/cli 7.208.1 → 7.209.0

package/lib/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":"AASA,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,IAAI,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;;AAWD,wBAoCE"}
+{"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,wBAkCE"}

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

@@ -21,6 +21,8 @@ var _linkedCommand = require("../../util/linked-command");
 
 var _path = _interopRequireDefault(require("path"));
 
+var _formatValidationResult = require("../../util/format-validation-result");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /*
@@ -54,13 +56,10 @@ var _default = (0, _linkedCommand.linkedCommand)(async (_, params, flags) => {
 
   try {
     const newSchema = JSON.parse(_fsExtra.default.readFileSync(file).toString());
-    const {
-      valid,
-      errors
-    } = (0, _schema.validateSchema)(newSchema);
+    const validationString = (0, _formatValidationResult.formatValidationResult)((0, _schema.validateSchema)(newSchema));
 
-    if (!valid && errors) {
-      return (0, _fatalError.fatalError)(`Invalid schema:\n  ${errors.map(e => `${e.type}: ${e.message} at ${e.path.join('/')}`).join('\n  ')}`);
+    if (validationString) {
+      return (0, _fatalError.fatalError)(validationString);
     }
 
     (0, _log.default)(`Uploading schema from ${file}…\n`);

package/lib/commands/validate.d.ts

@@ -0,0 +1,7 @@
+import { CliConfig } from '../types';
+interface ValidateFlags {
+    path?: string;
+}
+declare const _default: (_command: string, _params: CliConfig, flags: ValidateFlags) => Promise<void>;
+export default _default;
+//# sourceMappingURL=validate.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../src/commands/validate.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,SAAS,EAAC,MAAM,UAAU,CAAC;AAMnC,UAAU,aAAa;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;mCAE+B,MAAM,WAAW,SAAS,SAAS,aAAa,KAAG,QAAQ,IAAI,CAAC;AAAhG,wBA6BE"}

package/lib/commands/validate.js

@@ -0,0 +1,53 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _fsExtra = _interopRequireDefault(require("fs-extra"));
+
+var _log = _interopRequireDefault(require("../log"));
+
+var _fatalError = require("../util/fatal-error");
+
+var _path = _interopRequireDefault(require("path"));
+
+var _formatValidationResult = require("../util/format-validation-result");
+
+var _schema = require("@takeshape/schema");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var _default = async (_command, _params, flags) => {
+  let schemaPath;
+
+  if (flags.path) {
+    if (_fsExtra.default.existsSync(flags.path) && _fsExtra.default.statSync(flags.path).isDirectory()) {
+      schemaPath = _path.default.join(flags.path, 'schema.json');
+    } else {
+      schemaPath = flags.path;
+    }
+  } else {
+    schemaPath = _path.default.join('.', 'schema.json');
+  }
+
+  if (!_fsExtra.default.existsSync(schemaPath)) {
+    return (0, _fatalError.fatalError)(`${schemaPath} does not exist. You can download a project schema with 'takeshape export --schema'` + ` or specify a path with 'takeshape validate --path=/path/to/schema.json'`);
+  }
+
+  try {
+    const schema = JSON.parse(_fsExtra.default.readFileSync(schemaPath).toString());
+    const validationString = (0, _formatValidationResult.formatValidationResult)((0, _schema.validateSchema)(schema));
+
+    if (validationString) {
+      return (0, _fatalError.fatalError)(validationString);
+    }
+  } catch (e) {
+    return (0, _fatalError.fatalError)(e.message);
+  }
+
+  (0, _log.default)(`${schemaPath} is valid.`);
+};
+
+exports.default = _default;

package/lib/index.js

@@ -26,6 +26,7 @@ const help = `
       status
       import
       export
+      validate
 
     Options
       --token,         -t  TakeShape API auth token
@@ -55,6 +56,9 @@ const help = `
       --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")
+
     Examples
       $ takeshape build --file path/to/tsg.yml
 

package/lib/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/main.js"],"names":[],"mappings":"AAgBA,qFAQC"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/main.js"],"names":[],"mappings":"AAiBA,qFAQC"}

package/lib/main.js

@@ -20,7 +20,8 @@ const commandPath = {
   schema: 'schema',
   status: 'status',
   import: 'import',
-  export: 'export'
+  export: 'export',
+  validate: 'validate'
 };
 
 async function _default(command, params, cli) {

package/lib/util/format-validation-result.d.ts

@@ -0,0 +1,3 @@
+import { SchemaValidationResult } from '@takeshape/schema';
+export declare function formatValidationResult(schemaValidationResult: SchemaValidationResult): string | undefined;
+//# sourceMappingURL=format-validation-result.d.ts.map

package/lib/util/format-validation-result.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"format-validation-result.d.ts","sourceRoot":"","sources":["../../../src/util/format-validation-result.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,sBAAsB,EAAC,MAAM,mBAAmB,CAAC;AAEzD,wBAAgB,sBAAsB,CAAC,sBAAsB,EAAE,sBAAsB,GAAG,MAAM,GAAG,SAAS,CAKzG"}

package/lib/util/format-validation-result.js

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.formatValidationResult = formatValidationResult;
+
+function formatValidationResult(schemaValidationResult) {
+  const {
+    valid,
+    errors
+  } = schemaValidationResult;
+
+  if (!valid && errors) {
+    return `Invalid schema:\n  ${errors.map(e => `${e.type}: ${e.message} at ${e.path.join('/')}`).join('\n  ')}`;
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/cli",
-  "version": "7.208.1",
+  "version": "7.209.0",
   "description": "TakeShape CLI",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -20,10 +20,10 @@
     "lib"
   ],
   "dependencies": {
-    "@takeshape/schema": "7.208.1",
-    "@takeshape/ssg": "7.208.1",
-    "@takeshape/streams": "7.208.1",
-    "@takeshape/util": "7.208.1",
+    "@takeshape/schema": "7.209.0",
+    "@takeshape/ssg": "7.209.0",
+    "@takeshape/streams": "7.209.0",
+    "@takeshape/util": "7.209.0",
     "archiver": "^1.3.0",
     "async-retry": "^1.2.1",
     "bluebird": "^3.4.6",