@tolgee/cli 2.11.0 → 2.12.1

package/dist/commands/push.js

@@ -190,6 +190,6 @@ export default (config) => {
         .addOption(new Option('-l, --languages <languages...>', 'Specifies which languages should be pushed (see push.files in config).').default((_g = config.push) === null || _g === void 0 ? void 0 : _g.languages))
         .addOption(new Option('-n, --namespaces <namespaces...>', 'Specifies which namespaces should be pushed (see push.files in config).').default((_h = config.push) === null || _h === void 0 ? void 0 : _h.namespaces))
         .addOption(new Option('--tag-new-keys <tags...>', 'Specify tags that will be added to newly created keys.').default((_j = config.push) === null || _j === void 0 ? void 0 : _j.tagNewKeys))
-        .addOption(new Option('--remove-other-keys', 'Remove keys which are not present in the import.').default((_k = config.push) === null || _k === void 0 ? void 0 : _k.removeOtherKeys))
+        .addOption(new Option('--remove-other-keys', 'Remove keys which are not present in the import (within imported namespaces).').default((_k = config.push) === null || _k === void 0 ? void 0 : _k.removeOtherKeys))
         .action(pushHandler(config));
 };

package/dist/config/tolgeerc.js

@@ -8,13 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { cosmiconfig, defaultLoaders } from 'cosmiconfig';
-import { Validator } from 'jsonschema';
 import { readFile } from 'fs/promises';
 import { fileURLToPath } from 'url';
 import { dirname, join, resolve } from 'path';
 import { error, exitWithError } from '../utils/logger.js';
 import { existsSync } from 'fs';
 import { valueToArray } from '../utils/valueToArray.js';
+import { Ajv } from 'ajv';
 const explorer = cosmiconfig('tolgee', {
     loaders: {
         noExt: defaultLoaders['.json'],
@@ -34,7 +34,7 @@ function parseConfig(input, configDir) {
     if (rc.projectId !== undefined) {
         rc.projectId = Number(rc.projectId); // Number("") returns 0
         if (!Number.isInteger(rc.projectId) || rc.projectId <= 0) {
-            throw new Error('Invalid config: projectId should be an integer representing your project Id');
+            throw new Error("Invalid config: 'projectId' should be an integer representing your project Id");
         }
     }
     // convert relative paths in config to absolute
@@ -70,6 +70,7 @@ function getSchema() {
 }
 export default function loadTolgeeRc(path) {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         let res;
         if (path) {
             try {
@@ -86,12 +87,12 @@ export default function loadTolgeeRc(path) {
         if (!res || res.isEmpty)
             return null;
         const config = parseConfig(res.config, dirname(path || '.'));
-        const validator = new Validator();
-        const schema = yield getSchema();
-        const result = validator.validate(config, schema);
-        if (result.errors.length) {
-            const { message, property } = result.errors[0];
-            const errMessage = `Tolgee config: '${property.replace('instance.', '')}' ${message}`;
+        const ajv = new Ajv({ allowUnionTypes: true });
+        const validate = ajv.compile(yield getSchema());
+        validate(config);
+        const firstErr = (_a = validate.errors) === null || _a === void 0 ? void 0 : _a[0];
+        if (firstErr) {
+            const errMessage = `Tolgee config: '${firstErr.instancePath.replaceAll('/', '.').replace(/^\./, '')}' ${firstErr.message}`;
             exitWithError(errMessage);
         }
         return config;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/cli",
-  "version": "2.11.0",
+  "version": "2.12.1",
   "type": "module",
   "description": "A tool to interact with the Tolgee Platform through CLI",
   "repository": {
@@ -30,12 +30,13 @@
   "author": "Jan Cizmar",
   "license": "MIT",
   "dependencies": {
+    "ajv": "^8.17.1",
     "ansi-colors": "^4.1.3",
     "base32-decode": "^1.0.0",
     "commander": "^12.1.0",
     "cosmiconfig": "^9.0.0",
     "json5": "^2.2.3",
-    "jsonschema": "^1.4.1",
+    "jsonschema": "^1.5.0",
     "openapi-fetch": "0.13.1",
     "tinyglobby": "^0.2.12",
     "unescape-js": "^1.1.4",

package/schema.json

@@ -88,7 +88,7 @@
           }
         },
         "removeOtherKeys": {
-          "description": "Remove keys which are not present in the import.",
+          "description": "Remove keys which are not present in the import (within imported namespaces).",
           "type": "boolean"
         }
       }