@loaders.gl/shapefile 4.0.1 → 4.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/dbf-worker.js +32 -24
  2. package/dist/shp-worker.js +32 -24
  3. package/package.json +5 -5
package/dist/dbf-worker.js CHANGED
@@ -372,7 +372,7 @@
372
372
  }
373
373
 
374
374
  // src/dbf-loader.ts
375
- var VERSION = true ? "4.0.1" : "latest";
375
+ var VERSION = true ? "4.0.2" : "latest";
376
376
  var DBFWorkerLoader = {
377
377
  name: "DBF",
378
378
  id: "dbf",
@@ -433,61 +433,69 @@
433
433
  }
434
434
 
435
435
  // ../worker-utils/src/lib/worker-farm/worker-body.ts
436
- function getParentPort() {
436
+ async function getParentPort() {
437
437
  let parentPort;
438
438
  try {
439
439
  eval("globalThis.parentPort = require('worker_threads').parentPort");
440
440
  parentPort = globalThis.parentPort;
441
441
  } catch {
442
+ try {
443
+ eval("globalThis.workerThreadsPromise = import('worker_threads')");
444
+ const workerThreads = await globalThis.workerThreadsPromise;
445
+ parentPort = workerThreads.parentPort;
446
+ } catch (error) {
447
+ console.error(error.message);
448
+ }
442
449
  }
443
450
  return parentPort;
444
451
  }
445
452
  var onMessageWrapperMap = /* @__PURE__ */ new Map();
446
453
  var WorkerBody = class {
447
454
  /** Check that we are actually in a worker thread */
448
- static inWorkerThread() {
449
- return typeof self !== "undefined" || Boolean(getParentPort());
455
+ static async inWorkerThread() {
456
+ return typeof self !== "undefined" || Boolean(await getParentPort());
450
457
  }
451
458
  /*
452
459
  * (type: WorkerMessageType, payload: WorkerMessagePayload) => any
453
460
  */
454
461
  static set onmessage(onMessage) {
455
- function handleMessage(message) {
456
- const parentPort3 = getParentPort();
457
- const { type, payload } = parentPort3 ? message : message.data;
462
+ async function handleMessage(message) {
463
+ const parentPort2 = await getParentPort();
464
+ const { type, payload } = parentPort2 ? message : message.data;
458
465
  onMessage(type, payload);
459
466
  }
460
- const parentPort2 = getParentPort();
461
- if (parentPort2) {
462
- parentPort2.on("message", handleMessage);
463
- parentPort2.on("exit", () => console.debug("Node worker closing"));
464
- } else {
465
- globalThis.onmessage = handleMessage;
466
- }
467
+ getParentPort().then((parentPort2) => {
468
+ if (parentPort2) {
469
+ parentPort2.on("message", handleMessage);
470
+ parentPort2.on("exit", () => console.debug("Node worker closing"));
471
+ } else {
472
+ globalThis.onmessage = handleMessage;
473
+ }
474
+ });
467
475
  }
468
- static addEventListener(onMessage) {
476
+ static async addEventListener(onMessage) {
469
477
  let onMessageWrapper = onMessageWrapperMap.get(onMessage);
470
478
  if (!onMessageWrapper) {
471
- onMessageWrapper = (message) => {
479
+ onMessageWrapper = async (message) => {
472
480
  if (!isKnownMessage(message)) {
473
481
  return;
474
482
  }
475
- const parentPort3 = getParentPort();
483
+ const parentPort3 = await getParentPort();
476
484
  const { type, payload } = parentPort3 ? message : message.data;
477
485
  onMessage(type, payload);
478
486
  };
479
487
  }
480
- const parentPort2 = getParentPort();
488
+ const parentPort2 = await getParentPort();
481
489
  if (parentPort2) {
482
490
  console.error("not implemented");
483
491
  } else {
484
492
  globalThis.addEventListener("message", onMessageWrapper);
485
493
  }
486
494
  }
487
- static removeEventListener(onMessage) {
495
+ static async removeEventListener(onMessage) {
488
496
  const onMessageWrapper = onMessageWrapperMap.get(onMessage);
489
497
  onMessageWrapperMap.delete(onMessage);
490
- const parentPort2 = getParentPort();
498
+ const parentPort2 = await getParentPort();
491
499
  if (parentPort2) {
492
500
  console.error("not implemented");
493
501
  } else {
@@ -499,10 +507,10 @@
499
507
  * @param type
500
508
  * @param payload
501
509
  */
502
- static postMessage(type, payload) {
510
+ static async postMessage(type, payload) {
503
511
  const data = { source: "loaders.gl", type, payload };
504
512
  const transferList = getTransferList(payload);
505
- const parentPort2 = getParentPort();
513
+ const parentPort2 = await getParentPort();
506
514
  if (parentPort2) {
507
515
  parentPort2.postMessage(data, transferList);
508
516
  } else {
@@ -517,8 +525,8 @@
517
525
 
518
526
  // ../loader-utils/src/lib/worker-loader-utils/create-loader-worker.ts
519
527
  var requestId = 0;
520
- function createLoaderWorker(loader) {
521
- if (!WorkerBody.inWorkerThread()) {
528
+ async function createLoaderWorker(loader) {
529
+ if (!await WorkerBody.inWorkerThread()) {
522
530
  return;
523
531
  }
524
532
  WorkerBody.onmessage = async (type, payload) => {
package/dist/shp-worker.js CHANGED
@@ -480,7 +480,7 @@
480
480
  }
481
481
 
482
482
  // src/shp-loader.ts
483
- var VERSION = true ? "4.0.1" : "latest";
483
+ var VERSION = true ? "4.0.2" : "latest";
484
484
  var SHP_MAGIC_NUMBER2 = [0, 0, 39, 10];
485
485
  var SHPWorkerLoader = {
486
486
  name: "SHP",
@@ -542,61 +542,69 @@
542
542
  }
543
543
 
544
544
  // ../worker-utils/src/lib/worker-farm/worker-body.ts
545
- function getParentPort() {
545
+ async function getParentPort() {
546
546
  let parentPort;
547
547
  try {
548
548
  eval("globalThis.parentPort = require('worker_threads').parentPort");
549
549
  parentPort = globalThis.parentPort;
550
550
  } catch {
551
+ try {
552
+ eval("globalThis.workerThreadsPromise = import('worker_threads')");
553
+ const workerThreads = await globalThis.workerThreadsPromise;
554
+ parentPort = workerThreads.parentPort;
555
+ } catch (error) {
556
+ console.error(error.message);
557
+ }
551
558
  }
552
559
  return parentPort;
553
560
  }
554
561
  var onMessageWrapperMap = /* @__PURE__ */ new Map();
555
562
  var WorkerBody = class {
556
563
  /** Check that we are actually in a worker thread */
557
- static inWorkerThread() {
558
- return typeof self !== "undefined" || Boolean(getParentPort());
564
+ static async inWorkerThread() {
565
+ return typeof self !== "undefined" || Boolean(await getParentPort());
559
566
  }
560
567
  /*
561
568
  * (type: WorkerMessageType, payload: WorkerMessagePayload) => any
562
569
  */
563
570
  static set onmessage(onMessage) {
564
- function handleMessage(message) {
565
- const parentPort3 = getParentPort();
566
- const { type, payload } = parentPort3 ? message : message.data;
571
+ async function handleMessage(message) {
572
+ const parentPort2 = await getParentPort();
573
+ const { type, payload } = parentPort2 ? message : message.data;
567
574
  onMessage(type, payload);
568
575
  }
569
- const parentPort2 = getParentPort();
570
- if (parentPort2) {
571
- parentPort2.on("message", handleMessage);
572
- parentPort2.on("exit", () => console.debug("Node worker closing"));
573
- } else {
574
- globalThis.onmessage = handleMessage;
575
- }
576
+ getParentPort().then((parentPort2) => {
577
+ if (parentPort2) {
578
+ parentPort2.on("message", handleMessage);
579
+ parentPort2.on("exit", () => console.debug("Node worker closing"));
580
+ } else {
581
+ globalThis.onmessage = handleMessage;
582
+ }
583
+ });
576
584
  }
577
- static addEventListener(onMessage) {
585
+ static async addEventListener(onMessage) {
578
586
  let onMessageWrapper = onMessageWrapperMap.get(onMessage);
579
587
  if (!onMessageWrapper) {
580
- onMessageWrapper = (message) => {
588
+ onMessageWrapper = async (message) => {
581
589
  if (!isKnownMessage(message)) {
582
590
  return;
583
591
  }
584
- const parentPort3 = getParentPort();
592
+ const parentPort3 = await getParentPort();
585
593
  const { type, payload } = parentPort3 ? message : message.data;
586
594
  onMessage(type, payload);
587
595
  };
588
596
  }
589
- const parentPort2 = getParentPort();
597
+ const parentPort2 = await getParentPort();
590
598
  if (parentPort2) {
591
599
  console.error("not implemented");
592
600
  } else {
593
601
  globalThis.addEventListener("message", onMessageWrapper);
594
602
  }
595
603
  }
596
- static removeEventListener(onMessage) {
604
+ static async removeEventListener(onMessage) {
597
605
  const onMessageWrapper = onMessageWrapperMap.get(onMessage);
598
606
  onMessageWrapperMap.delete(onMessage);
599
- const parentPort2 = getParentPort();
607
+ const parentPort2 = await getParentPort();
600
608
  if (parentPort2) {
601
609
  console.error("not implemented");
602
610
  } else {
@@ -608,10 +616,10 @@
608
616
  * @param type
609
617
  * @param payload
610
618
  */
611
- static postMessage(type, payload) {
619
+ static async postMessage(type, payload) {
612
620
  const data = { source: "loaders.gl", type, payload };
613
621
  const transferList = getTransferList(payload);
614
- const parentPort2 = getParentPort();
622
+ const parentPort2 = await getParentPort();
615
623
  if (parentPort2) {
616
624
  parentPort2.postMessage(data, transferList);
617
625
  } else {
@@ -626,8 +634,8 @@
626
634
 
627
635
  // ../loader-utils/src/lib/worker-loader-utils/create-loader-worker.ts
628
636
  var requestId = 0;
629
- function createLoaderWorker(loader) {
630
- if (!WorkerBody.inWorkerThread()) {
637
+ async function createLoaderWorker(loader) {
638
+ if (!await WorkerBody.inWorkerThread()) {
631
639
  return;
632
640
  }
633
641
  WorkerBody.onmessage = async (type, payload) => {
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@loaders.gl/shapefile",
3
3
  "description": "Loader for the Shapefile Format",
4
- "version": "4.0.1",
4
+ "version": "4.0.2",
5
5
  "license": "MIT",
6
6
  "type": "module",
7
7
  "publishConfig": {
@@ -44,10 +44,10 @@
44
44
  "build-worker-dbf": "esbuild src/workers/dbf-worker.ts --bundle --outfile=dist/dbf-worker.js --define:__VERSION__=\\\"$npm_package_version\\\""
45
45
  },
46
46
  "dependencies": {
47
- "@loaders.gl/gis": "4.0.1",
48
- "@loaders.gl/loader-utils": "4.0.1",
49
- "@loaders.gl/schema": "4.0.1",
47
+ "@loaders.gl/gis": "4.0.2",
48
+ "@loaders.gl/loader-utils": "4.0.2",
49
+ "@loaders.gl/schema": "4.0.2",
50
50
  "@math.gl/proj4": "^4.0.0"
51
51
  },
52
- "gitHead": "765e5a26a6bf3f2cc02cabffc4a1e3665ec92a53"
52
+ "gitHead": "471058d109d5652f28c32c1f296fd632f9a5c806"
53
53
  }