@loaders.gl/tile-converter 4.0.0-alpha.18 → 4.0.0-alpha.20

package/dist/deps-installer/deps-installer.d.ts

@@ -12,7 +12,8 @@ export declare class DepsInstaller {
      *    This path is '' by default and is not used by tile-converter.
      *    It is used in tests to prevent rewriting actual workers during tests running
      */
-    install(path?: string, workersPath?: string): Promise<void>;
-    private installWorker;
+    install(path?: string): Promise<void>;
+    private installFromNpm;
+    private installFromUrl;
 }
 //# sourceMappingURL=deps-installer.d.ts.map

package/dist/deps-installer/deps-installer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deps-installer.d.ts","sourceRoot":"","sources":["../../src/deps-installer/deps-installer.ts"],"names":[],"mappings":"AAWA;;;;;GAKG;AACH,qBAAa,aAAa;IACxB;;;;;;OAMG;IACG,OAAO,CAAC,IAAI,GAAE,MAAW,EAAE,WAAW,GAAE,MAAW,GAAG,OAAO,CAAC,IAAI,CAAC;YAmC3D,aAAa;CAW5B"}
+{"version":3,"file":"deps-installer.d.ts","sourceRoot":"","sources":["../../src/deps-installer/deps-installer.ts"],"names":[],"mappings":"AAaA;;;;;GAKG;AACH,qBAAa,aAAa;IACxB;;;;;;OAMG;IACG,OAAO,CAAC,IAAI,GAAE,MAAW,GAAG,OAAO,CAAC,IAAI,CAAC;YAoEjC,cAAc;YAYd,cAAc;CAS7B"}

package/dist/deps-installer/deps-installer.js

@@ -6,6 +6,8 @@ const zip_1 = require("@loaders.gl/zip");
 const file_utils_1 = require("../lib/utils/file-utils");
 const path_1 = require("path");
 const worker_utils_1 = require("@loaders.gl/worker-utils");
+const draco_1 = require("@loaders.gl/draco");
+const textures_1 = require("@loaders.gl/textures");
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
 const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'beta';
 const PGM_LINK = 'https://raw.githubusercontent.com/visgl/deck.gl-data/master/egm/egm2008-5.zip';
@@ -23,7 +25,7 @@ class DepsInstaller {
      *    This path is '' by default and is not used by tile-converter.
      *    It is used in tests to prevent rewriting actual workers during tests running
      */
-    async install(path = '', workersPath = '') {
+    async install(path = '') {
         console.log('Installing "EGM2008-5" model...'); // eslint-disable-line no-console
         const fileMap = await (0, core_1.load)(PGM_LINK, zip_1.ZipLoader, {});
         let depsPath = process.cwd();
@@ -31,12 +33,27 @@ class DepsInstaller {
             depsPath = (0, path_1.join)(depsPath, path);
         }
         await (0, file_utils_1.writeFile)(depsPath, new Uint8Array(fileMap['geoids/egm2008-5.pgm']), 'egm2008-5.pgm');
-        console.log('Installing "I3S Content Loader worker"'); // eslint-disable-line no-console
-        await this.installWorker('i3s', 'i3s-content-worker-node.js', workersPath);
-        console.log('Installing "Draco Loader worker"'); // eslint-disable-line no-console
-        await this.installWorker('draco', 'draco-worker-node.js', workersPath);
-        console.log('Installing "Basis Loader worker"'); // eslint-disable-line no-console
-        await this.installWorker('textures', 'basis-worker-node.js', workersPath);
+        console.log('Installing "I3S Content Loader" worker'); // eslint-disable-line no-console
+        await this.installFromNpm('i3s', 'i3s-content-worker-node.js');
+        console.log('Installing "Draco Loader" worker'); // eslint-disable-line no-console
+        await this.installFromNpm('draco', 'draco-worker-node.js');
+        console.log('Installing "Draco Writer" worker'); // eslint-disable-line no-console
+        await this.installFromNpm('draco', 'draco-writer-worker-node.js');
+        console.log('Installing "Basis Loader" worker'); // eslint-disable-line no-console
+        await this.installFromNpm('textures', 'basis-worker-node.js');
+        console.log('Installing "KTX2 Basis Writer" worker'); // eslint-disable-line no-console
+        await this.installFromNpm('textures', 'ktx2-basis-writer-worker-node.js');
+        console.log('Installing "Draco decoder" library'); // eslint-disable-line no-console
+        await this.installFromUrl(draco_1.DRACO_EXTERNAL_LIBRARY_URLS[draco_1.DRACO_EXTERNAL_LIBRARIES.DECODER], 'draco', draco_1.DRACO_EXTERNAL_LIBRARIES.DECODER);
+        await this.installFromUrl(draco_1.DRACO_EXTERNAL_LIBRARY_URLS[draco_1.DRACO_EXTERNAL_LIBRARIES.DECODER_WASM], 'draco', draco_1.DRACO_EXTERNAL_LIBRARIES.DECODER_WASM);
+        console.log('Installing "Draco encoder" library'); // eslint-disable-line no-console
+        await this.installFromUrl(draco_1.DRACO_EXTERNAL_LIBRARY_URLS[draco_1.DRACO_EXTERNAL_LIBRARIES.ENCODER], 'draco', draco_1.DRACO_EXTERNAL_LIBRARIES.ENCODER);
+        console.log('Installing "Basis transcoder" library'); // eslint-disable-line no-console
+        await this.installFromNpm('textures', textures_1.BASIS_EXTERNAL_LIBRARIES.TRANSCODER, 'libs');
+        await this.installFromNpm('textures', textures_1.BASIS_EXTERNAL_LIBRARIES.TRANSCODER_WASM, 'libs');
+        console.log('Installing "Basis encoder" library'); // eslint-disable-line no-console
+        await this.installFromNpm('textures', textures_1.BASIS_EXTERNAL_LIBRARIES.ENCODER, 'libs');
+        await this.installFromNpm('textures', textures_1.BASIS_EXTERNAL_LIBRARIES.ENCODER_WASM, 'libs');
         console.log('Installing "join-images" npm package');
         const childProcess = new worker_utils_1.ChildProcessProxy();
         await childProcess.start({
@@ -50,13 +67,22 @@ class DepsInstaller {
         });
         console.log('All dependencies were installed succesfully.'); // eslint-disable-line no-console
     }
-    async installWorker(module, name, extraPath) {
-        const fileResponse = await (0, core_1.fetchFile)(`https://unpkg.com/@loaders.gl/${module}@${VERSION}/dist/${name}`);
+    async installFromNpm(module, name, extraPath = '') {
+        const fileResponse = await (0, core_1.fetchFile)(`https://unpkg.com/@loaders.gl/${module}@${VERSION}/dist/${extraPath}/${name}`);
         const fileData = await fileResponse.arrayBuffer();
         if (!fileData) {
             return;
         }
-        const path = (0, path_1.join)(process.cwd(), extraPath, 'modules', module, 'dist');
+        const path = (0, path_1.join)(process.cwd(), 'modules', module, 'dist', extraPath);
+        await (0, file_utils_1.writeFile)(path, fileData, name);
+    }
+    async installFromUrl(url, module, name) {
+        const fileResponse = await (0, core_1.fetchFile)(url);
+        const fileData = await fileResponse.arrayBuffer();
+        if (!fileData) {
+            return;
+        }
+        const path = (0, path_1.join)(process.cwd(), 'modules', module, 'dist', 'libs');
         await (0, file_utils_1.writeFile)(path, fileData, name);
     }
 }