@aethervtt/shard-texture 0.2.0 → 0.2.2

package/dist/basis.js

@@ -1,15 +1,15 @@
 import { ShardError } from "@aethervtt/shard-core";
+import { commonJsContext, readCodecAsset } from "@aethervtt/shard-platform-node/codecs";
 const modules = /* @__PURE__ */ new Map();
+const vendorUrls = {
+  "basis_encoder.js": new URL("../vendor/basis/basis_encoder.js", import.meta.url),
+  "basis_encoder.wasm": new URL("../vendor/basis/basis_encoder.wasm", import.meta.url),
+  "basis_transcoder.js": new URL("../vendor/basis/basis_transcoder.js", import.meta.url),
+  "basis_transcoder.wasm": new URL("../vendor/basis/basis_transcoder.wasm", import.meta.url)
+};
 async function readVendor(file) {
-  const url = new URL(`../vendor/basis/${file}`, import.meta.url);
-  if (url.protocol === "file:") {
-    const { readFile } = await import("node:fs/promises");
-    const data = await readFile(url);
-    return file.endsWith(".js") ? { text: data.toString("utf8") } : { bytes: new Uint8Array(data) };
-  }
-  const res = await fetch(url);
-  if (!res.ok) throw new ShardError("texture/transcoder-unavailable", `Couldn't fetch ${url}`);
-  return file.endsWith(".js") ? { text: await res.text() } : { bytes: new Uint8Array(await res.arrayBuffer()) };
+  const data = await readCodecAsset(vendorUrls[file]);
+  return file.endsWith(".js") ? { text: new TextDecoder().decode(data) } : { bytes: data };
 }
 function load(name) {
   let pending = modules.get(name);
@@ -20,14 +20,7 @@ function load(name) {
           readVendor(`${name}.js`),
           readVendor(`${name}.wasm`)
         ]);
-        let require2;
-        let dirname = "";
-        if (typeof process !== "undefined" && process.versions?.node) {
-          const { createRequire } = await import("node:module");
-          const { fileURLToPath } = await import("node:url");
-          require2 = createRequire(import.meta.url);
-          dirname = fileURLToPath(new URL("../vendor/basis/", import.meta.url));
-        }
+        const { require: require2, dirname, filename } = commonJsContext(vendorUrls[`${name}.js`]);
         const factory = new Function(
           "module",
           "exports",
@@ -36,7 +29,7 @@ function load(name) {
           "__filename",
           `${text}
 return BASIS`
-        )(void 0, void 0, require2, dirname, `${dirname}${name}.js`);
+        )(void 0, void 0, require2, dirname, filename);
         const quiet = () => {
         };
         const mod = await factory({ wasmBinary: bytes, print: quiet, printErr: quiet });
@@ -63,7 +56,7 @@ async function encodeBasis(rgba, width, height, usage, mode, mipmaps) {
   try {
     enc.setCreateKTX2File(true);
     const format = mode === "uastc" ? basis.basis_tex_format.cUASTC_LDR_4x4 : basis.basis_tex_format.cETC1S;
-    enc.setFormatModeAndQualityEffort(format.value, -1, -1, true);
+    enc.setFormatModeAndQualityEffort(format.value, mode === "etc1s" ? 128 : -1, -1, true);
     enc.setKTX2UASTCSupercompression(mode === "uastc");
     const color = usage === "color";
     enc.setPerceptual(color);

package/dist/decode/webp.js

@@ -1,15 +1,16 @@
 import { ShardError } from "@aethervtt/shard-core";
+import { nodeCodecs, readCodecDependency } from "@aethervtt/shard-platform-node/codecs";
 let ready;
 function decoder() {
   ready ??= (async () => {
-    const mod = await import("@jsquash/webp/decode");
-    if (typeof process !== "undefined" && process.versions?.node) {
-      const wasmUrl = new URL(
+    const mod = await import("@jsquash/webp/decode.js");
+    if (nodeCodecs) {
+      const bytes = await readCodecDependency(
+        "@jsquash/webp/decode.js",
         "./codec/dec/webp_dec.wasm",
-        import.meta.resolve("@jsquash/webp/decode")
+        import.meta.url
       );
-      const { readFile } = await import("node:fs/promises");
-      await mod.init(await WebAssembly.compile(await readFile(wasmUrl)));
+      await mod.init(await WebAssembly.compile(bytes));
     }
     return mod.default;
   })();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aethervtt/shard-texture",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -18,11 +18,12 @@
   ],
   "dependencies": {
     "@jsquash/webp": "^1.5.0",
-    "@aethervtt/shard-assets": "0.2.0",
-    "@aethervtt/shard-core": "0.2.0",
+    "@aethervtt/shard-assets": "0.2.2",
+    "@aethervtt/shard-core": "0.2.2",
     "fzstd": "^0.1.1",
     "jpeg-js": "^0.4.4",
-    "ktx-parse": "^2.0.0"
+    "ktx-parse": "^2.0.0",
+    "@aethervtt/shard-platform-node": "0.2.2"
   },
   "repository": {
     "type": "git",
@@ -34,6 +35,6 @@
     "provenance": true
   },
   "shard": {
-    "buildSha": "32c22a3944ed23f5d1baa90bf7cc9fae724f5fd8"
+    "buildSha": "c92ccf813334ab40ce73d5f4ad98680bf1dcf9e4"
   }
 }