@loaders.gl/draco 3.1.8 → 3.2.0-alpha.3

package/dist/index.d.ts

@@ -5,6 +5,21 @@ import { DracoLoader as DracoWorkerLoader } from './draco-loader';
 export type { DracoMesh, DracoLoaderData };
 export type { DracoWriterOptions } from './draco-writer';
 export { DracoWriter } from './draco-writer';
+/**
+ * Browser worker doesn't work because of issue during "draco_encoder.js" loading.
+ * Refused to execute script from 'https://raw.githubusercontent.com/google/draco/1.4.1/javascript/draco_encoder.js' because its MIME type ('') is not executable.
+ */
+export declare const DracoWriterWorker: {
+    id: string;
+    name: string;
+    module: string;
+    version: any;
+    worker: boolean;
+    options: {
+        draco: {};
+        source: null;
+    };
+};
 export type { DracoLoaderOptions };
 export { DracoWorkerLoader };
 /**

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAC,SAAS,EAAE,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAClE,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAAC,WAAW,IAAI,iBAAiB,EAAC,MAAM,gBAAgB,CAAC;AAMhE,YAAY,EAAC,SAAS,EAAE,eAAe,EAAC,CAAC;AAIzC,YAAY,EAAC,kBAAkB,EAAC,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAI3C,YAAY,EAAC,kBAAkB,EAAC,CAAC;AACjC,OAAO,EAAC,iBAAiB,EAAC,CAAC;AAE3B;;GAEG;AACH,eAAO,MAAM,WAAW;;;;;;;;;;;;;CAGvB,CAAC;AAEF,iBAAe,KAAK,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,SAAS,CAAC,CAQ/F;AAGD,eAAO,MAAM,qBAAqB,EAAE,gBAA8B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAC,SAAS,EAAE,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAClE,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAAC,WAAW,IAAI,iBAAiB,EAAC,MAAM,gBAAgB,CAAC;AAQhE,YAAY,EAAC,SAAS,EAAE,eAAe,EAAC,CAAC;AAIzC,YAAY,EAAC,kBAAkB,EAAC,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAE3C;;;GAGG;AACH,eAAO,MAAM,iBAAiB;;;;;;;;;;CAU7B,CAAC;AAIF,YAAY,EAAC,kBAAkB,EAAC,CAAC;AACjC,OAAO,EAAC,iBAAiB,EAAC,CAAC;AAE3B;;GAEG;AACH,eAAO,MAAM,WAAW;;;;;;;;;;;;;CAGvB,CAAC;AAEF,iBAAe,KAAK,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,SAAS,CAAC,CAQ/F;AAGD,eAAO,MAAM,qBAAqB,EAAE,gBAA8B,CAAC"}

package/dist/index.js

@@ -3,13 +3,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._TypecheckDracoLoader = exports.DracoLoader = exports.DracoWorkerLoader = exports.DracoWriter = void 0;
+exports._TypecheckDracoLoader = exports.DracoLoader = exports.DracoWorkerLoader = exports.DracoWriterWorker = exports.DracoWriter = void 0;
 const draco_loader_1 = require("./draco-loader");
 Object.defineProperty(exports, "DracoWorkerLoader", { enumerable: true, get: function () { return draco_loader_1.DracoLoader; } });
 const draco_parser_1 = __importDefault(require("./lib/draco-parser"));
 const draco_module_loader_1 = require("./lib/draco-module-loader");
+const version_1 = require("./lib/utils/version");
+const worker_utils_1 = require("@loaders.gl/worker-utils");
 var draco_writer_1 = require("./draco-writer");
 Object.defineProperty(exports, "DracoWriter", { enumerable: true, get: function () { return draco_writer_1.DracoWriter; } });
+/**
+ * Browser worker doesn't work because of issue during "draco_encoder.js" loading.
+ * Refused to execute script from 'https://raw.githubusercontent.com/google/draco/1.4.1/javascript/draco_encoder.js' because its MIME type ('') is not executable.
+ */
+exports.DracoWriterWorker = {
+    id: worker_utils_1.isBrowser ? 'draco-writer' : 'draco-writer-nodejs',
+    name: 'Draco compressed geometry writer',
+    module: 'draco',
+    version: version_1.VERSION,
+    worker: true,
+    options: {
+        draco: {},
+        source: null
+    }
+};
 /**
  * Loader for Draco3D compressed geometries
  */

package/dist/workers/draco-writer-nodejs-worker.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=draco-writer-nodejs-worker.d.ts.map

package/dist/workers/draco-writer-nodejs-worker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"draco-writer-nodejs-worker.d.ts","sourceRoot":"","sources":["../../src/workers/draco-writer-nodejs-worker.ts"],"names":[],"mappings":""}

package/dist/workers/draco-writer-nodejs-worker.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const worker_utils_1 = require("@loaders.gl/worker-utils");
+const draco_writer_nodejs_1 = require("../draco-writer-nodejs");
+(() => {
+    // Check that we are actually in a worker thread
+    if (!worker_utils_1.WorkerBody.inWorkerThread()) {
+        return;
+    }
+    worker_utils_1.WorkerBody.onmessage = async (type, payload) => {
+        switch (type) {
+            case 'process':
+                try {
+                    const { input, options } = payload;
+                    const result = await draco_writer_nodejs_1.DracoWriterNodeJS.encode(input, options);
+                    worker_utils_1.WorkerBody.postMessage('done', { result });
+                }
+                catch (error) {
+                    const message = error instanceof Error ? error.message : '';
+                    worker_utils_1.WorkerBody.postMessage('error', { error: message });
+                }
+                break;
+            default:
+        }
+    };
+})();

package/dist/workers/draco-writer-worker.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=draco-writer-worker.d.ts.map

package/dist/workers/draco-writer-worker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"draco-writer-worker.d.ts","sourceRoot":"","sources":["../../src/workers/draco-writer-worker.ts"],"names":[],"mappings":""}

package/dist/workers/draco-writer-worker.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const worker_utils_1 = require("@loaders.gl/worker-utils");
+const draco_writer_1 = require("../draco-writer");
+(() => {
+    // Check that we are actually in a worker thread
+    if (!worker_utils_1.WorkerBody.inWorkerThread()) {
+        return;
+    }
+    worker_utils_1.WorkerBody.onmessage = async (type, payload) => {
+        switch (type) {
+            case 'process':
+                try {
+                    const { input, options } = payload;
+                    const result = await draco_writer_1.DracoWriter.encode(input, options);
+                    worker_utils_1.WorkerBody.postMessage('done', { result });
+                }
+                catch (error) {
+                    const message = error instanceof Error ? error.message : '';
+                    worker_utils_1.WorkerBody.postMessage('error', { error: message });
+                }
+                break;
+            default:
+        }
+    };
+})();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/draco",
-  "version": "3.1.8",
+  "version": "3.2.0-alpha.3",
   "description": "Framework-independent loader and writer for Draco compressed meshes and point clouds",
   "license": "MIT",
   "publishConfig": {
@@ -34,14 +34,20 @@
   "scripts": {
     "pre-build": "npm run build-bundle && npm run build-worker",
     "build-bundle": "esbuild src/bundle.ts --outfile=dist/dist.min.js --bundle --minify --sourcemap",
-    "build-worker": "esbuild src/workers/draco-worker.ts --outfile=dist/draco-worker.js --bundle --minify --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\""
+    "build-loader-worker": "esbuild src/workers/draco-worker.ts --outfile=dist/draco-worker.js --bundle --minify --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\"",
+    "build-writer-worker": "esbuild src/workers/draco-writer-worker.ts --outfile=dist/draco-writer-worker.js --minify --bundle --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\"",
+    "build-writer-worker-nodejs": "esbuild src/workers/draco-writer-nodejs-worker.ts --outfile=dist/draco-writer-nodejs-worker.js --platform=node --target=esnext,node12 --minify --bundle --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\"",
+    "build-worker": "yarn build-loader-worker && yarn build-writer-worker && yarn build-writer-worker-nodejs"
   },
   "dependencies": {
     "@babel/runtime": "^7.3.1",
-    "@loaders.gl/loader-utils": "3.1.8",
-    "@loaders.gl/schema": "3.1.8",
-    "@loaders.gl/worker-utils": "3.1.8",
+    "@loaders.gl/loader-utils": "3.2.0-alpha.3",
+    "@loaders.gl/schema": "3.2.0-alpha.3",
+    "@loaders.gl/worker-utils": "3.2.0-alpha.3",
     "draco3d": "1.4.1"
   },
-  "gitHead": "0ef07b4e9fc20f5a882224cf241c6fd1bad898d8"
+  "devDependencies": {
+    "@loaders.gl/polyfills": "3.2.0-alpha.3"
+  },
+  "gitHead": "f0d4b801efeb7094283106352ee759eccfb21f10"
 }

package/src/draco-writer-nodejs.ts

@@ -0,0 +1,4 @@
+// Polyfills increases the bundle size significantly. Use it for NodeJS worker only
+import '@loaders.gl/polyfills';
+
+export {DracoWriter as DracoWriterNodeJS} from './draco-writer';

package/src/draco-writer.ts

@@ -1,11 +1,15 @@
-import type {Writer} from '@loaders.gl/loader-utils';
+import type {Writer, WriterOptions} from '@loaders.gl/loader-utils';
 import type {DracoMesh} from './lib/draco-types';
 import type {DracoBuildOptions} from './lib/draco-builder';
 import DRACOBuilder from './lib/draco-builder';
 import {loadDracoEncoderModule} from './lib/draco-module-loader';
 import {VERSION} from './lib/utils/version';
 
-export type DracoWriterOptions = DracoBuildOptions & {};
+export type DracoWriterOptions = WriterOptions & {
+  draco?: DracoBuildOptions & {
+    attributeNameEntry: string;
+  };
+};
 
 const DEFAULT_DRACO_OPTIONS = {
   pointcloud: false, // Set to true if pointcloud (mode: 0, no indices)
@@ -33,10 +37,7 @@ export const DracoWriter: Writer = {
   }
 };
 
-async function encode(
-  data: DracoMesh,
-  options: {draco?: DracoWriterOptions} = {}
-): Promise<ArrayBuffer> {
+async function encode(data: DracoMesh, options: DracoWriterOptions = {}): Promise<ArrayBuffer> {
   // Dynamically load draco
   const {draco} = await loadDracoEncoderModule(options);
   const dracoBuilder = new DRACOBuilder(draco);

package/src/index.ts

@@ -4,6 +4,8 @@ import type {DracoLoaderOptions} from './draco-loader';
 import {DracoLoader as DracoWorkerLoader} from './draco-loader';
 import DracoParser from './lib/draco-parser';
 import {loadDracoDecoderModule} from './lib/draco-module-loader';
+import {VERSION} from './lib/utils/version';
+import {isBrowser} from '@loaders.gl/worker-utils';
 
 // Draco data types
 
@@ -14,6 +16,22 @@ export type {DracoMesh, DracoLoaderData};
 export type {DracoWriterOptions} from './draco-writer';
 export {DracoWriter} from './draco-writer';
 
+/**
+ * Browser worker doesn't work because of issue during "draco_encoder.js" loading.
+ * Refused to execute script from 'https://raw.githubusercontent.com/google/draco/1.4.1/javascript/draco_encoder.js' because its MIME type ('') is not executable.
+ */
+export const DracoWriterWorker = {
+  id: isBrowser ? 'draco-writer' : 'draco-writer-nodejs',
+  name: 'Draco compressed geometry writer',
+  module: 'draco',
+  version: VERSION,
+  worker: true,
+  options: {
+    draco: {},
+    source: null
+  }
+};
+
 // Draco Loader
 
 export type {DracoLoaderOptions};

package/src/workers/draco-writer-nodejs-worker.ts

@@ -0,0 +1,25 @@
+import {WorkerBody, WorkerMessagePayload} from '@loaders.gl/worker-utils';
+import {DracoWriterNodeJS} from '../draco-writer-nodejs';
+
+(() => {
+  // Check that we are actually in a worker thread
+  if (!WorkerBody.inWorkerThread()) {
+    return;
+  }
+
+  WorkerBody.onmessage = async (type, payload: WorkerMessagePayload) => {
+    switch (type) {
+      case 'process':
+        try {
+          const {input, options} = payload;
+          const result = await DracoWriterNodeJS.encode!(input, options);
+          WorkerBody.postMessage('done', {result});
+        } catch (error) {
+          const message = error instanceof Error ? error.message : '';
+          WorkerBody.postMessage('error', {error: message});
+        }
+        break;
+      default:
+    }
+  };
+})();

package/src/workers/draco-writer-worker.ts

@@ -0,0 +1,25 @@
+import {WorkerBody, WorkerMessagePayload} from '@loaders.gl/worker-utils';
+import {DracoWriter} from '../draco-writer';
+
+(() => {
+  // Check that we are actually in a worker thread
+  if (!WorkerBody.inWorkerThread()) {
+    return;
+  }
+
+  WorkerBody.onmessage = async (type, payload: WorkerMessagePayload) => {
+    switch (type) {
+      case 'process':
+        try {
+          const {input, options} = payload;
+          const result = await DracoWriter.encode!(input, options);
+          WorkerBody.postMessage('done', {result});
+        } catch (error) {
+          const message = error instanceof Error ? error.message : '';
+          WorkerBody.postMessage('error', {error: message});
+        }
+        break;
+      default:
+    }
+  };
+})();