ldr 0.33.13 → 0.33.15

package/dist/cli.js

@@ -1,18 +1,18 @@
 #!/usr/bin/env node
 
-// ../../../../../../../tmp/ldr-build-DCpOVo/src/cli.ts
+// ../../../../../../../tmp/ldr-build-uD3Q4M/src/cli.ts
 import fs4 from "node:fs";
 import zlib from "node:zlib";
 
-// ../../../../../../../tmp/ldr-build-DCpOVo/src/node/build-pack.ts
+// ../../../../../../../tmp/ldr-build-uD3Q4M/src/node/build-pack.ts
 import fs3 from "node:fs";
 import path3 from "node:path";
 
-// ../../../../../../../tmp/ldr-build-DCpOVo/src/node/resolver.ts
+// ../../../../../../../tmp/ldr-build-uD3Q4M/src/node/resolver.ts
 import fs from "node:fs";
 import path from "node:path";
 
-// ../../../../../../../tmp/ldr-build-DCpOVo/src/spec.ts
+// ../../../../../../../tmp/ldr-build-uD3Q4M/src/spec.ts
 var norm = (s) => s.trim().toLowerCase().replace(/\\/g, "/").replace(/\/+/g, "/");
 var COLOUR_ID_RE = /^[A-Za-z][A-Za-z0-9_]*$/;
 var namedCodes = new Map;
@@ -124,27 +124,54 @@ var b64 = (s) => {
     out[i] = bin.charCodeAt(i);
   return out;
 };
-function type1Fast(line) {
+function type1Fast(line, files) {
   const n = line.length;
   let i = 1;
   const ws = (c) => c === 32 || c === 9;
-  const next = () => {
+  const num = () => {
     while (i < n && ws(line.charCodeAt(i)))
       i++;
     const a = i;
+    let c = line.charCodeAt(i);
+    const neg = c === 45;
+    if (neg)
+      c = line.charCodeAt(++i);
+    let v = 0, d = 0;
+    while (c >= 48 && c <= 57) {
+      v = v * 10 + (c - 48);
+      d++;
+      c = line.charCodeAt(++i);
+    }
+    if (d > 0 && d <= 15 && (i >= n || ws(c)))
+      return neg ? -v : v;
     while (i < n && !ws(line.charCodeAt(i)))
       i++;
-    return a < i ? line.slice(a, i) : null;
+    return a < i ? +line.slice(a, i) : NaN;
   };
-  const ct = next();
-  if (ct === null)
+  while (i < n && ws(line.charCodeAt(i)))
+    i++;
+  const a0 = i;
+  if (i >= n)
     return null;
+  let c = line.charCodeAt(i), neg = c === 45, color = 0, d = 0;
+  if (neg)
+    c = line.charCodeAt(++i);
+  while (c >= 48 && c <= 57) {
+    color = color * 10 + (c - 48);
+    d++;
+    c = line.charCodeAt(++i);
+  }
+  if (d > 0 && d <= 15 && (i >= n || ws(c))) {
+    if (neg)
+      color = -color;
+  } else {
+    while (i < n && !ws(line.charCodeAt(i)))
+      i++;
+    color = parseColor(line.slice(a0, i));
+  }
   const m = new Array(12);
   for (let k = 0;k < 12; k++) {
-    const t = next();
-    if (t === null)
-      return null;
-    const v = +t;
+    const v = num();
     if (!Number.isFinite(v))
       return null;
     m[k] = v;
@@ -154,11 +181,14 @@ function type1Fast(line) {
   if (i >= n)
     return null;
   const rest = line.slice(i);
-  const file = /[ \t]{2,}|\t/.test(rest) ? rest.split(/\s+/).join(" ") : rest;
-  const color = parseColor(ct);
+  let file = files.get(rest);
+  if (file === undefined) {
+    file = norm(/[ \t]{2,}|\t/.test(rest) ? rest.split(/\s+/).join(" ") : rest);
+    files.set(rest, file);
+  }
   if (!Number.isFinite(color))
     return null;
-  return { t: 1, color, m, file: norm(file) };
+  return { t: 1, color, m, file };
 }
 var NUMS = [0, 12, 6, 9, 12, 12];
 function geomLine(tk) {
@@ -204,6 +234,7 @@ function parse(src, name = "main.ldr", popts = {}) {
     (data ??= new Map).set(norm(dataCur.name), { name: dataCur.name, bytes, ...png ? { mime: "image/png" } : {} });
     dataCur = null;
   };
+  const t1Files = new Map;
   let inHeader = true;
   const start = (n) => {
     closeData();
@@ -293,7 +324,7 @@ function parse(src, name = "main.ldr", popts = {}) {
       }
     }
     if (line.charCodeAt(0) === 49 && (line.charCodeAt(1) === 32 || line.charCodeAt(1) === 9) && !dataCur && !skip) {
-      const g = type1Fast(line);
+      const g = type1Fast(line, t1Files);
       if (g) {
         if (!cur)
           start(name);
@@ -817,7 +848,7 @@ function fileStepViews(f) {
   return out;
 }
 
-// ../../../../../../../tmp/ldr-build-DCpOVo/src/model.ts
+// ../../../../../../../tmp/ldr-build-uD3Q4M/src/model.ts
 class ModelLimitError extends Error {
   limit;
   code = "ldr-model-limit";
@@ -1259,7 +1290,7 @@ function blendedColourHex(code) {
   return "#" + [0, 1, 2].map((k) => (a[k] + b[k] >> 1).toString(16).padStart(2, "0")).join("").toUpperCase();
 }
 
-// ../../../../../../../tmp/ldr-build-DCpOVo/src/node/resolver.ts
+// ../../../../../../../tmp/ldr-build-uD3Q4M/src/node/resolver.ts
 var TOP_STUD_RE = /^(stud|studa|stud2|stud2a|stud6|stud6a|stud10|stud15|stud2s|stud2s2|stud-logo\d*|stud2-logo\d*)\.dat$/i;
 var UNDER_STUD_RE = /^(stud3|stud3a|stud4.*|stud12|stud16.*|stud18a)\.dat$/i;
 var norm2 = (ref) => ref.trim().replace(/\\/g, "/").toLowerCase();
@@ -1586,11 +1617,11 @@ function collectDeps(lib, refs) {
   return out;
 }
 
-// ../../../../../../../tmp/ldr-build-DCpOVo/src/node/compile.ts
+// ../../../../../../../tmp/ldr-build-uD3Q4M/src/node/compile.ts
 import fs2 from "node:fs";
 import path2 from "node:path";
 
-// ../../../../../../../tmp/ldr-build-DCpOVo/src/node/lod.ts
+// ../../../../../../../tmp/ldr-build-uD3Q4M/src/node/lod.ts
 import { MeshoptSimplifier, MeshoptEncoder } from "meshoptimizer";
 await Promise.all([MeshoptSimplifier.ready, MeshoptEncoder.ready]);
 function reorderMesh(P, N, C, I) {
@@ -1896,7 +1927,7 @@ function levelLines(P, I, E, err, always, tol = 0.01) {
   return out;
 }
 
-// ../../../../../../../tmp/ldr-build-DCpOVo/src/node/compile.ts
+// ../../../../../../../tmp/ldr-build-uD3Q4M/src/node/compile.ts
 class BfcState {
   accum;
   ccw = true;
@@ -2840,7 +2871,7 @@ function encodePack(parts, studKinds, weld, extra, options = {}) {
   return Buffer.concat([head, ...chunks.map((c) => new Uint8Array(c.buffer, c.byteOffset, c.byteLength))]);
 }
 
-// ../../../../../../../tmp/ldr-build-DCpOVo/src/node/build-pack.ts
+// ../../../../../../../tmp/ldr-build-uD3Q4M/src/node/build-pack.ts
 function packCompilerOpts(o) {
   return { studs: o.studs ?? "low", prims: o.primitives ?? "full", weld: o.weld ?? true, separateStuds: true, cond: !!o.cond, tex: !!o.textures, ...o.partWorkLimit ? { workLimit: o.partWorkLimit } : {} };
 }
@@ -2913,7 +2944,7 @@ function buildPack(o) {
   return { data: encodePack(parts, kinds, comp.opts.weld, extra, { texture, lod: o.lod !== false, reorder: !!o.reorder }), parts: parts.size, studKinds: kinds.size, missing: [...missing], ...warnings.length ? { warnings } : {} };
 }
 
-// ../../../../../../../tmp/ldr-build-DCpOVo/src/cli.ts
+// ../../../../../../../tmp/ldr-build-uD3Q4M/src/cli.ts
 var HELP = `ldr pack — build a parts pack for the ldr three.js renderer
 
 Usage: