@loaders.gl/tile-converter 4.0.0-alpha.10 → 4.0.0-alpha.11

package/dist/converter-cli.js

@@ -5,6 +5,7 @@ require("@loaders.gl/polyfills");
 const path_1 = require("path");
 const tile_converter_1 = require("@loaders.gl/tile-converter");
 const deps_installer_1 = require("./deps-installer/deps-installer");
+const cli_utils_1 = require("./lib/utils/cli-utils");
 const TILESET_TYPE = {
     I3S: 'I3S',
     _3DTILES: '3DTILES'
@@ -18,7 +19,7 @@ async function main() {
     if (args.length === 0) {
         printHelp();
     }
-    const validatedOptionsArr = validateOptionsWithEqual(args);
+    const validatedOptionsArr = (0, cli_utils_1.validateOptionsWithEqual)(args);
     const options = parseOptions(validatedOptionsArr);
     if (options.installDependencies) {
         const depthInstaller = new deps_installer_1.DepsInstaller();
@@ -129,18 +130,6 @@ function validateOptions(options) {
     }
     return options;
 }
-function validateOptionsWithEqual(args) {
-    return args.reduce((acc, curr) => {
-        const equalSignIndex = curr.indexOf('=');
-        const beforeEqual = curr.slice(0, equalSignIndex);
-        const afterEqual = curr.slice(equalSignIndex + 1, curr.length);
-        const condition = curr.includes('=') && curr.startsWith('--') && afterEqual;
-        if (condition) {
-            return acc.concat(beforeEqual, afterEqual);
-        }
-        return acc.concat(curr);
-    }, []);
-}
 /**
  * Parse option from the cli arguments array
  * @param args
@@ -165,52 +154,52 @@ function parseOptions(args) {
         if (arg.indexOf('--') === 0) {
             switch (arg) {
                 case '--input-type':
-                    opts.inputType = getStringValue(index, args);
+                    opts.inputType = (0, cli_utils_1.getStringValue)(index, args);
                     break;
                 case '--tileset':
-                    opts.tileset = getURLValue(index, args);
+                    opts.tileset = (0, cli_utils_1.getURLValue)(index, args);
                     break;
                 case '--name':
-                    opts.name = getStringValue(index, args);
+                    opts.name = (0, cli_utils_1.getStringValue)(index, args);
                     break;
                 case '--output':
-                    opts.output = getStringValue(index, args);
+                    opts.output = (0, cli_utils_1.getStringValue)(index, args);
                     break;
                 case '--instant-node-writing':
-                    opts.instantNodeWriting = getBooleanValue(index, args);
+                    opts.instantNodeWriting = (0, cli_utils_1.getBooleanValue)(index, args);
                     break;
                 case '--split-nodes':
-                    opts.mergeMaterials = getBooleanValue(index, args);
+                    opts.mergeMaterials = (0, cli_utils_1.getBooleanValue)(index, args);
                     break;
                 case '--max-depth':
-                    opts.maxDepth = getIntegerValue(index, args);
+                    opts.maxDepth = (0, cli_utils_1.getIntegerValue)(index, args);
                     break;
                 case '--slpk':
-                    opts.slpk = getBooleanValue(index, args);
+                    opts.slpk = (0, cli_utils_1.getBooleanValue)(index, args);
                     break;
                 case '--7zExe':
-                    opts.sevenZipExe = getStringValue(index, args);
+                    opts.sevenZipExe = (0, cli_utils_1.getStringValue)(index, args);
                     break;
                 case '--egm':
-                    opts.egm = getStringValue(index, args);
+                    opts.egm = (0, cli_utils_1.getStringValue)(index, args);
                     break;
                 case '--token':
-                    opts.token = getStringValue(index, args);
+                    opts.token = (0, cli_utils_1.getStringValue)(index, args);
                     break;
                 case '--no-draco':
-                    opts.draco = getBooleanValue(index, args);
+                    opts.draco = (0, cli_utils_1.getBooleanValue)(index, args);
                     break;
                 case '--validate':
-                    opts.validate = getBooleanValue(index, args);
+                    opts.validate = (0, cli_utils_1.getBooleanValue)(index, args);
                     break;
                 case '--install-dependencies':
-                    opts.installDependencies = getBooleanValue(index, args);
+                    opts.installDependencies = (0, cli_utils_1.getBooleanValue)(index, args);
                     break;
                 case '--generate-textures':
-                    opts.generateTextures = getBooleanValue(index, args);
+                    opts.generateTextures = (0, cli_utils_1.getBooleanValue)(index, args);
                     break;
                 case '--generate-bounding-volumes':
-                    opts.generateBoundingVolumes = getBooleanValue(index, args);
+                    opts.generateBoundingVolumes = (0, cli_utils_1.getBooleanValue)(index, args);
                     break;
                 case '--help':
                     printHelp();
@@ -223,58 +212,3 @@ function parseOptions(args) {
     });
     return opts;
 }
-/**
- * Get string option value from cli arguments
- * @param index - option's name index in the argument's array.
- *                The value of the option should be next to name of the option.
- * @param args - cli arguments array
- * @returns - string value of the option
- */
-function getStringValue(index, args) {
-    if (index + 1 >= args.length) {
-        return '';
-    }
-    const value = args[index + 1];
-    if (value.indexOf('--') === 0) {
-        return '';
-    }
-    return value;
-}
-/**
- * Modyfy URL path to be compatible with fetch
- * @param index - option's name index in the argument's array.
- *                The value of the option should be next to name of the option.
- * @param args - cli arguments array
- * @returns - string value of the option
- */
-function getURLValue(index, args) {
-    const value = getStringValue(index, args);
-    console.log(`Input tileset value: ${value}`);
-    console.log(`Modified tileset value: ${value.replace(/\\/g, '/')}`);
-    return value.replace(/\\/g, '/');
-}
-/**
- * Get integer option value from cli arguments
- * @param index - option's name index in the argument's array
- *                The value of the option should be next to name of the option.
- * @param args - cli arguments array
- * @returns - number value of the option
- */
-function getIntegerValue(index, args) {
-    const stringValue = getStringValue(index, args);
-    const result = Number.parseInt(stringValue);
-    if (isFinite(result)) {
-        return result;
-    }
-    return NaN;
-}
-function getBooleanValue(index, args) {
-    const stringValue = getStringValue(index, args).toLowerCase().trim();
-    if (['--no-draco', '--split-nodes'].includes(args[index]) && !stringValue) {
-        return false;
-    }
-    if (!stringValue || stringValue === 'true') {
-        return true;
-    }
-    return false;
-}