gtx-cli 1.1.16 → 1.1.17

package/dist/config/generateSettings.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateSettings = generateSettings;
-const generaltranslation_1 = require("generaltranslation");
 const console_1 = require("../console/console");
 const warnings_1 = require("../console/warnings");
 const loadConfig_1 = __importDefault(require("../fs/config/loadConfig"));
@@ -13,13 +12,14 @@ const fs_1 = __importDefault(require("fs"));
 const setupConfig_1 = __importDefault(require("../fs/config/setupConfig"));
 const parseFilesConfig_1 = require("../fs/config/parseFilesConfig");
 const findFilepath_1 = require("../fs/findFilepath");
+const validateSettings_1 = require("./validateSettings");
 /**
  * Generates settings from any
  * @param options - The options to generate settings from
  * @returns The generated settings
  */
 function generateSettings(options) {
-    var _a, _b;
+    var _a;
     // Load config file
     let gtConfig = {};
     if (options.config && !options.config.endsWith('.json')) {
@@ -70,18 +70,6 @@ function generateSettings(options) {
     mergedOptions.src =
         mergedOptions.src ||
             (0, findFilepath_1.findFilepaths)(['./src', './app', './pages', './components']);
-    // Check locales
-    if (mergedOptions.defaultLocale &&
-        !(0, generaltranslation_1.isValidLocale)(mergedOptions.defaultLocale)) {
-        console.error(`defaultLocale: ${mergedOptions.defaultLocale} is not a valid locale!`);
-        process.exit(1);
-    }
-    for (const locale of mergedOptions.locales) {
-        if (!(0, generaltranslation_1.isValidLocale)(locale)) {
-            console.error(`Provided locales: "${(_a = mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.locales) === null || _a === void 0 ? void 0 : _a.join()}", ${locale} is not a valid locale!`);
-            process.exit(1);
-        }
-    }
     // Resolve all glob patterns in the files object
     mergedOptions.files = (0, parseFilesConfig_1.resolveFiles)(mergedOptions.files || {}, mergedOptions.defaultLocale);
     // if there's no existing config file, creates one
@@ -90,8 +78,9 @@ function generateSettings(options) {
         (0, setupConfig_1.default)(mergedOptions.config, {
             projectId: mergedOptions.projectId,
             defaultLocale: mergedOptions.defaultLocale,
-            locales: ((_b = mergedOptions.locales) === null || _b === void 0 ? void 0 : _b.length) > 0 ? mergedOptions.locales : undefined,
+            locales: ((_a = mergedOptions.locales) === null || _a === void 0 ? void 0 : _a.length) > 0 ? mergedOptions.locales : undefined,
         });
     }
+    (0, validateSettings_1.validateSettings)(mergedOptions);
     return mergedOptions;
 }

package/dist/config/validateSettings.d.ts

@@ -0,0 +1,2 @@
+import { Settings } from '../types';
+export declare function validateSettings(settings: Settings): void;

package/dist/config/validateSettings.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateSettings = validateSettings;
+const generaltranslation_1 = require("generaltranslation");
+function validateSettings(settings) {
+    var _a;
+    // Validate locales
+    for (const locale of settings.locales) {
+        if (!(0, generaltranslation_1.isValidLocale)(locale)) {
+            console.error(`Provided locales: "${(_a = settings === null || settings === void 0 ? void 0 : settings.locales) === null || _a === void 0 ? void 0 : _a.join()}", ${locale} is not a valid locale!`);
+            process.exit(1);
+        }
+    }
+    if (settings.defaultLocale && !(0, generaltranslation_1.isValidLocale)(settings.defaultLocale)) {
+        console.error(`defaultLocale: ${settings.defaultLocale} is not a valid locale!`);
+        process.exit(1);
+    }
+    // defaultLocale cannot be a superset of any other locale
+    if (settings.defaultLocale &&
+        settings.locales.some((locale) => (0, generaltranslation_1.isSupersetLocale)(settings.defaultLocale, locale))) {
+        const locale = settings.locales.find((locale) => (0, generaltranslation_1.isSupersetLocale)(settings.defaultLocale, locale));
+        console.error(`defaultLocale: ${settings.defaultLocale} is a superset of another locale (${locale})! Please change the defaultLocale to a more specific locale.`);
+        process.exit(1);
+    }
+}

package/dist/fs/config/updateConfig.js

@@ -12,7 +12,7 @@ const console_1 = require("../../console/console");
  */
 function updateConfig({ configFilepath, projectId, _versionId, locales, }) {
     // Filter out empty string values from the config object
-    const newContent = Object.assign(Object.assign(Object.assign({}, (projectId && { projectId })), (_versionId && { _versionId })), (locales && { locales }));
+    const newContent = Object.assign(Object.assign({}, (projectId && { projectId })), (_versionId && { _versionId }));
     try {
         // if file exists
         let oldContent = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtx-cli",
-  "version": "1.1.16",
+  "version": "1.1.17",
   "main": "dist/index.js",
   "bin": "dist/main.js",
   "scripts": {
@@ -54,7 +54,7 @@
     "esbuild": "^0.23.1",
     "fast-glob": "^3.3.3",
     "form-data": "^4.0.2",
-    "generaltranslation": "^6.2.3",
+    "generaltranslation": "^6.2.4",
     "ora": "^8.2.0"
   },
   "devDependencies": {