@loaders.gl/shapefile 4.0.1 → 4.0.3

package/dist/dbf-worker.js

@@ -372,7 +372,7 @@
   }
 
   // src/dbf-loader.ts
-  var VERSION = true ? "4.0.1" : "latest";
+  var VERSION = true ? "4.0.3" : "latest";
   var DBFWorkerLoader = {
     name: "DBF",
     id: "dbf",
@@ -433,61 +433,69 @@
   }
 
   // ../worker-utils/src/lib/worker-farm/worker-body.ts
-  function getParentPort() {
+  async function getParentPort() {
     let parentPort;
     try {
       eval("globalThis.parentPort = require('worker_threads').parentPort");
       parentPort = globalThis.parentPort;
     } catch {
+      try {
+        eval("globalThis.workerThreadsPromise = import('worker_threads')");
+        const workerThreads = await globalThis.workerThreadsPromise;
+        parentPort = workerThreads.parentPort;
+      } catch (error) {
+        console.error(error.message);
+      }
     }
     return parentPort;
   }
   var onMessageWrapperMap = /* @__PURE__ */ new Map();
   var WorkerBody = class {
     /** Check that we are actually in a worker thread */
-    static inWorkerThread() {
-      return typeof self !== "undefined" || Boolean(getParentPort());
+    static async inWorkerThread() {
+      return typeof self !== "undefined" || Boolean(await getParentPort());
     }
     /*
      * (type: WorkerMessageType, payload: WorkerMessagePayload) => any
      */
     static set onmessage(onMessage) {
-      function handleMessage(message) {
-        const parentPort3 = getParentPort();
-        const { type, payload } = parentPort3 ? message : message.data;
+      async function handleMessage(message) {
+        const parentPort2 = await getParentPort();
+        const { type, payload } = parentPort2 ? message : message.data;
         onMessage(type, payload);
       }
-      const parentPort2 = getParentPort();
-      if (parentPort2) {
-        parentPort2.on("message", handleMessage);
-        parentPort2.on("exit", () => console.debug("Node worker closing"));
-      } else {
-        globalThis.onmessage = handleMessage;
-      }
+      getParentPort().then((parentPort2) => {
+        if (parentPort2) {
+          parentPort2.on("message", handleMessage);
+          parentPort2.on("exit", () => console.debug("Node worker closing"));
+        } else {
+          globalThis.onmessage = handleMessage;
+        }
+      });
     }
-    static addEventListener(onMessage) {
+    static async addEventListener(onMessage) {
       let onMessageWrapper = onMessageWrapperMap.get(onMessage);
       if (!onMessageWrapper) {
-        onMessageWrapper = (message) => {
+        onMessageWrapper = async (message) => {
           if (!isKnownMessage(message)) {
             return;
           }
-          const parentPort3 = getParentPort();
+          const parentPort3 = await getParentPort();
           const { type, payload } = parentPort3 ? message : message.data;
           onMessage(type, payload);
         };
       }
-      const parentPort2 = getParentPort();
+      const parentPort2 = await getParentPort();
       if (parentPort2) {
         console.error("not implemented");
       } else {
         globalThis.addEventListener("message", onMessageWrapper);
       }
     }
-    static removeEventListener(onMessage) {
+    static async removeEventListener(onMessage) {
       const onMessageWrapper = onMessageWrapperMap.get(onMessage);
       onMessageWrapperMap.delete(onMessage);
-      const parentPort2 = getParentPort();
+      const parentPort2 = await getParentPort();
       if (parentPort2) {
         console.error("not implemented");
       } else {
@@ -499,10 +507,10 @@
      * @param type
      * @param payload
      */
-    static postMessage(type, payload) {
+    static async postMessage(type, payload) {
       const data = { source: "loaders.gl", type, payload };
       const transferList = getTransferList(payload);
-      const parentPort2 = getParentPort();
+      const parentPort2 = await getParentPort();
       if (parentPort2) {
         parentPort2.postMessage(data, transferList);
       } else {
@@ -517,8 +525,8 @@
 
   // ../loader-utils/src/lib/worker-loader-utils/create-loader-worker.ts
   var requestId = 0;
-  function createLoaderWorker(loader) {
-    if (!WorkerBody.inWorkerThread()) {
+  async function createLoaderWorker(loader) {
+    if (!await WorkerBody.inWorkerThread()) {
       return;
     }
     WorkerBody.onmessage = async (type, payload) => {

package/dist/shp-worker.js

@@ -480,7 +480,7 @@
   }
 
   // src/shp-loader.ts
-  var VERSION = true ? "4.0.1" : "latest";
+  var VERSION = true ? "4.0.3" : "latest";
   var SHP_MAGIC_NUMBER2 = [0, 0, 39, 10];
   var SHPWorkerLoader = {
     name: "SHP",
@@ -542,61 +542,69 @@
   }
 
   // ../worker-utils/src/lib/worker-farm/worker-body.ts
-  function getParentPort() {
+  async function getParentPort() {
     let parentPort;
     try {
       eval("globalThis.parentPort = require('worker_threads').parentPort");
       parentPort = globalThis.parentPort;
     } catch {
+      try {
+        eval("globalThis.workerThreadsPromise = import('worker_threads')");
+        const workerThreads = await globalThis.workerThreadsPromise;
+        parentPort = workerThreads.parentPort;
+      } catch (error) {
+        console.error(error.message);
+      }
     }
     return parentPort;
   }
   var onMessageWrapperMap = /* @__PURE__ */ new Map();
   var WorkerBody = class {
     /** Check that we are actually in a worker thread */
-    static inWorkerThread() {
-      return typeof self !== "undefined" || Boolean(getParentPort());
+    static async inWorkerThread() {
+      return typeof self !== "undefined" || Boolean(await getParentPort());
     }
     /*
      * (type: WorkerMessageType, payload: WorkerMessagePayload) => any
      */
     static set onmessage(onMessage) {
-      function handleMessage(message) {
-        const parentPort3 = getParentPort();
-        const { type, payload } = parentPort3 ? message : message.data;
+      async function handleMessage(message) {
+        const parentPort2 = await getParentPort();
+        const { type, payload } = parentPort2 ? message : message.data;
         onMessage(type, payload);
       }
-      const parentPort2 = getParentPort();
-      if (parentPort2) {
-        parentPort2.on("message", handleMessage);
-        parentPort2.on("exit", () => console.debug("Node worker closing"));
-      } else {
-        globalThis.onmessage = handleMessage;
-      }
+      getParentPort().then((parentPort2) => {
+        if (parentPort2) {
+          parentPort2.on("message", handleMessage);
+          parentPort2.on("exit", () => console.debug("Node worker closing"));
+        } else {
+          globalThis.onmessage = handleMessage;
+        }
+      });
     }
-    static addEventListener(onMessage) {
+    static async addEventListener(onMessage) {
       let onMessageWrapper = onMessageWrapperMap.get(onMessage);
       if (!onMessageWrapper) {
-        onMessageWrapper = (message) => {
+        onMessageWrapper = async (message) => {
           if (!isKnownMessage(message)) {
             return;
           }
-          const parentPort3 = getParentPort();
+          const parentPort3 = await getParentPort();
           const { type, payload } = parentPort3 ? message : message.data;
           onMessage(type, payload);
         };
       }
-      const parentPort2 = getParentPort();
+      const parentPort2 = await getParentPort();
       if (parentPort2) {
         console.error("not implemented");
       } else {
         globalThis.addEventListener("message", onMessageWrapper);
       }
     }
-    static removeEventListener(onMessage) {
+    static async removeEventListener(onMessage) {
       const onMessageWrapper = onMessageWrapperMap.get(onMessage);
       onMessageWrapperMap.delete(onMessage);
-      const parentPort2 = getParentPort();
+      const parentPort2 = await getParentPort();
       if (parentPort2) {
         console.error("not implemented");
       } else {
@@ -608,10 +616,10 @@
      * @param type
      * @param payload
      */
-    static postMessage(type, payload) {
+    static async postMessage(type, payload) {
       const data = { source: "loaders.gl", type, payload };
       const transferList = getTransferList(payload);
-      const parentPort2 = getParentPort();
+      const parentPort2 = await getParentPort();
       if (parentPort2) {
         parentPort2.postMessage(data, transferList);
       } else {
@@ -626,8 +634,8 @@
 
   // ../loader-utils/src/lib/worker-loader-utils/create-loader-worker.ts
   var requestId = 0;
-  function createLoaderWorker(loader) {
-    if (!WorkerBody.inWorkerThread()) {
+  async function createLoaderWorker(loader) {
+    if (!await WorkerBody.inWorkerThread()) {
       return;
     }
     WorkerBody.onmessage = async (type, payload) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@loaders.gl/shapefile",
   "description": "Loader for the Shapefile Format",
-  "version": "4.0.1",
+  "version": "4.0.3",
   "license": "MIT",
   "type": "module",
   "publishConfig": {
@@ -44,10 +44,10 @@
     "build-worker-dbf": "esbuild src/workers/dbf-worker.ts --bundle --outfile=dist/dbf-worker.js --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/gis": "4.0.1",
-    "@loaders.gl/loader-utils": "4.0.1",
-    "@loaders.gl/schema": "4.0.1",
+    "@loaders.gl/gis": "4.0.3",
+    "@loaders.gl/loader-utils": "4.0.3",
+    "@loaders.gl/schema": "4.0.3",
     "@math.gl/proj4": "^4.0.0"
   },
-  "gitHead": "765e5a26a6bf3f2cc02cabffc4a1e3665ec92a53"
+  "gitHead": "03c871839b36c997249dabae1844df53a35d3760"
 }