@thi.ng/geom-io-obj 0.3.87 → 0.3.89

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2023-12-09T19:12:03Z
+- **Last updated**: 2023-12-11T10:07:09Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.

package/api.js

@@ -1 +0,0 @@
-export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/geom-io-obj",
-  "version": "0.3.87",
+  "version": "0.3.89",
   "description": "Wavefront OBJ parser (& exporter soon)",
   "type": "module",
   "module": "./index.js",
@@ -24,7 +24,9 @@
   "author": "Karsten Schmidt (https://thi.ng)",
   "license": "Apache-2.0",
   "scripts": {
-    "build": "yarn clean && tsc --declaration",
+    "build": "yarn build:esbuild && yarn build:decl",
+    "build:decl": "tsc --declaration --emitDeclarationOnly",
+    "build:esbuild": "esbuild --format=esm --platform=neutral --target=es2022 --tsconfig=tsconfig.json --outdir=. src/**/*.ts",
     "clean": "rimraf --glob '*.js' '*.d.ts' '*.map' doc",
     "doc": "typedoc --excludePrivate --excludeInternal --out doc src/index.ts",
     "doc:ae": "mkdir -p .ae/doc .ae/temp && api-extractor run --local --verbose",
@@ -33,12 +35,13 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@thi.ng/api": "^8.9.11",
-    "@thi.ng/errors": "^2.4.5",
-    "@thi.ng/vectors": "^7.8.8"
+    "@thi.ng/api": "^8.9.12",
+    "@thi.ng/errors": "^2.4.6",
+    "@thi.ng/vectors": "^7.8.10"
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.38.3",
+    "esbuild": "^0.19.8",
     "rimraf": "^5.0.5",
     "tools": "^0.0.1",
     "typedoc": "^0.25.4",
@@ -82,5 +85,5 @@
     "status": "alpha",
     "year": 2016
   },
-  "gitHead": "25f2ac8ff795a432a930119661b364d4d93b59a0\n"
+  "gitHead": "22e36fa838e5431d40165384918b395603bbd92f\n"
 }

package/parser.js

@@ -1,176 +1,177 @@
 import { assert } from "@thi.ng/errors/assert";
-export const parseOBJ = (src, opts) => {
-    opts = {
-        normals: true,
-        uvs: true,
-        objects: true,
-        groups: true,
-        comments: false,
-        tessellate: false,
-        ...opts,
-    };
-    const vertices = [];
-    const normals = [];
-    const uvs = [];
-    const result = {
-        vertices,
-        normals,
-        uvs,
-        objects: [],
-        mtlLibs: [],
-        comments: [],
-    };
-    let faces;
-    let currGroup;
-    let nextID = 0;
-    const newGroup = (id, force = false) => {
-        id = id || `group-${nextID++}`;
-        (force || opts.groups) &&
-            result.objects[result.objects.length - 1].groups.push((currGroup = {
-                id,
-                smooth: false,
-                faces: (faces = []),
-                lines: [],
-                mtl: currGroup ? currGroup.mtl : undefined,
-            }));
-    };
-    const newObject = (id, force = false) => {
-        (force || opts.objects) &&
-            result.objects.push({ id: id || `object-${nextID++}`, groups: [] });
-        newGroup("default", force);
-    };
-    const readFace = (line) => {
-        const face = { v: [] };
-        const n = line.length;
-        const nv = vertices.length;
-        const nuv = uvs.length;
-        const nn = normals.length;
-        const items = line[1].split("/");
-        switch (items.length) {
-            case 1:
-                for (let i = 1; i < n; i++) {
-                    addID(face.v, line[i], nv);
-                }
-                break;
-            case 2:
-                opts.uvs && (face.uv = []);
-                for (let i = 1; i < n; i++) {
-                    const f = line[i].split("/");
-                    addID(face.v, f[0], nv);
-                    face.uv && addID(face.uv, f[1], nuv);
-                }
-                break;
-            case 3:
-                opts.uvs && items[1].length && (face.uv = []);
-                opts.normals && items[2].length && (face.n = []);
-                for (let i = 1; i < n; i++) {
-                    const f = line[i].split("/");
-                    addID(face.v, f[0], nv);
-                    face.uv && addID(face.uv, f[1], nuv);
-                    face.n && addID(face.n, f[2], nn);
-                }
-                break;
-            default:
+const parseOBJ = (src, opts) => {
+  opts = {
+    normals: true,
+    uvs: true,
+    objects: true,
+    groups: true,
+    comments: false,
+    tessellate: false,
+    ...opts
+  };
+  const vertices = [];
+  const normals = [];
+  const uvs = [];
+  const result = {
+    vertices,
+    normals,
+    uvs,
+    objects: [],
+    mtlLibs: [],
+    comments: []
+  };
+  let faces;
+  let currGroup;
+  let nextID = 0;
+  const newGroup = (id, force = false) => {
+    id = id || `group-${nextID++}`;
+    (force || opts.groups) && result.objects[result.objects.length - 1].groups.push(
+      currGroup = {
+        id,
+        smooth: false,
+        faces: faces = [],
+        lines: [],
+        mtl: currGroup ? currGroup.mtl : void 0
+      }
+    );
+  };
+  const newObject = (id, force = false) => {
+    (force || opts.objects) && result.objects.push({ id: id || `object-${nextID++}`, groups: [] });
+    newGroup("default", force);
+  };
+  const readFace = (line) => {
+    const face = { v: [] };
+    const n = line.length;
+    const nv = vertices.length;
+    const nuv = uvs.length;
+    const nn = normals.length;
+    const items = line[1].split("/");
+    switch (items.length) {
+      case 1:
+        for (let i = 1; i < n; i++) {
+          addID(face.v, line[i], nv);
         }
-        return face;
-    };
-    const readPolyLine = (items) => {
-        const nv = vertices.length;
-        const verts = [];
-        for (let i = 1, n = items.length; i < n; i++) {
-            addID(verts, items[i], nv);
+        break;
+      case 2:
+        opts.uvs && (face.uv = []);
+        for (let i = 1; i < n; i++) {
+          const f = line[i].split("/");
+          addID(face.v, f[0], nv);
+          face.uv && addID(face.uv, f[1], nuv);
         }
-        return verts;
-    };
-    newObject("default", true);
-    const { xform, xformUV, tessellate, comments } = opts;
-    const lines = src.split(/[\n\r]+/g);
-    for (let i = 0, n = lines.length; i < n; i++) {
-        const l = lines[i];
-        if (!l.length)
-            continue;
-        if (l[0] === "#") {
-            comments && result.comments.push(l.substring(1).trim());
-            continue;
-        }
-        const items = l.trim().split(/\s+/g);
-        const len = items.length;
-        switch (items[0]) {
-            case "v": {
-                assert(len > 3, `invalid vertex @ line ${i}`);
-                const v = readVec3(items);
-                vertices.push(xform ? xform(v) : v);
-                break;
-            }
-            case "vn": {
-                assert(len > 3, `invalid normal @ line ${i}`);
-                const v = readVec3(items);
-                normals.push(xform ? xform(v) : v);
-                break;
-            }
-            case "vt": {
-                assert(len > 2, `invalid uv @ line ${i}`);
-                const v = readVec2(items);
-                uvs.push(xformUV ? xformUV(v) : v);
-                break;
-            }
-            case "f": {
-                assert(len > 3, `invalid face @ line ${i}`);
-                const f = readFace(items);
-                tessellate && f.v.length > 3
-                    ? faces.push(...tessellateFace(f))
-                    : faces.push(f);
-                break;
-            }
-            case "l":
-                assert(len > 2, `invalid polyline @ line ${i}`);
-                currGroup.lines.push(readPolyLine(items));
-                break;
-            case "o":
-                opts.objects && newObject(items[1]);
-                break;
-            case "g":
-                opts.groups && newGroup(items[1]);
-                break;
-            case "s":
-                currGroup.smooth = items[1] !== "0" && items[1] !== "off";
-                break;
-            case "mtllib":
-                result.mtlLibs.push(items[1]);
-                break;
-            case "usemtl":
-                currGroup.mtl = items[1];
-                break;
-            default:
-                console.log(`ignoring token: ${items[0]} @ line ${i}`);
+        break;
+      case 3:
+        opts.uvs && items[1].length && (face.uv = []);
+        opts.normals && items[2].length && (face.n = []);
+        for (let i = 1; i < n; i++) {
+          const f = line[i].split("/");
+          addID(face.v, f[0], nv);
+          face.uv && addID(face.uv, f[1], nuv);
+          face.n && addID(face.n, f[2], nn);
         }
+        break;
+      default:
+    }
+    return face;
+  };
+  const readPolyLine = (items) => {
+    const nv = vertices.length;
+    const verts = [];
+    for (let i = 1, n = items.length; i < n; i++) {
+      addID(verts, items[i], nv);
+    }
+    return verts;
+  };
+  newObject("default", true);
+  const { xform, xformUV, tessellate, comments } = opts;
+  const lines = src.split(/[\n\r]+/g);
+  for (let i = 0, n = lines.length; i < n; i++) {
+    const l = lines[i];
+    if (!l.length)
+      continue;
+    if (l[0] === "#") {
+      comments && result.comments.push(l.substring(1).trim());
+      continue;
     }
-    return result;
+    const items = l.trim().split(/\s+/g);
+    const len = items.length;
+    switch (items[0]) {
+      case "v": {
+        assert(len > 3, `invalid vertex @ line ${i}`);
+        const v = readVec3(items);
+        vertices.push(xform ? xform(v) : v);
+        break;
+      }
+      case "vn": {
+        assert(len > 3, `invalid normal @ line ${i}`);
+        const v = readVec3(items);
+        normals.push(xform ? xform(v) : v);
+        break;
+      }
+      case "vt": {
+        assert(len > 2, `invalid uv @ line ${i}`);
+        const v = readVec2(items);
+        uvs.push(xformUV ? xformUV(v) : v);
+        break;
+      }
+      case "f": {
+        assert(len > 3, `invalid face @ line ${i}`);
+        const f = readFace(items);
+        tessellate && f.v.length > 3 ? faces.push(...tessellateFace(f)) : faces.push(f);
+        break;
+      }
+      case "l":
+        assert(len > 2, `invalid polyline @ line ${i}`);
+        currGroup.lines.push(readPolyLine(items));
+        break;
+      case "o":
+        opts.objects && newObject(items[1]);
+        break;
+      case "g":
+        opts.groups && newGroup(items[1]);
+        break;
+      case "s":
+        currGroup.smooth = items[1] !== "0" && items[1] !== "off";
+        break;
+      case "mtllib":
+        result.mtlLibs.push(items[1]);
+        break;
+      case "usemtl":
+        currGroup.mtl = items[1];
+        break;
+      default:
+        console.log(`ignoring token: ${items[0]} @ line ${i}`);
+    }
+  }
+  return result;
 };
 const addID = (acc, x, num) => {
-    const v = parseInt(x);
-    acc.push(v < 0 ? v + num : v - 1);
+  const v = parseInt(x);
+  acc.push(v < 0 ? v + num : v - 1);
 };
 const readVec2 = (items) => [
-    parseFloat(items[1]),
-    parseFloat(items[2]),
+  parseFloat(items[1]),
+  parseFloat(items[2])
 ];
 const readVec3 = (items) => [
-    parseFloat(items[1]),
-    parseFloat(items[2]),
-    parseFloat(items[3]),
+  parseFloat(items[1]),
+  parseFloat(items[2]),
+  parseFloat(items[3])
 ];
 const tessellateFace = (face) => {
-    const { v, uv, n } = face;
-    const v0 = v[0];
-    const uv0 = uv && uv[0];
-    const n0 = n && n[0];
-    const acc = [];
-    for (let i = 1, num = v.length - 1; i < num; i++) {
-        const tri = { v: [v0, v[i], v[i + 1]] };
-        uv && (tri.uv = [uv0, uv[i], uv[i + 1]]);
-        n && (tri.n = [n0, n[i], n[i + 1]]);
-        acc.push(tri);
-    }
-    return acc;
+  const { v, uv, n } = face;
+  const v0 = v[0];
+  const uv0 = uv && uv[0];
+  const n0 = n && n[0];
+  const acc = [];
+  for (let i = 1, num = v.length - 1; i < num; i++) {
+    const tri = { v: [v0, v[i], v[i + 1]] };
+    uv && (tri.uv = [uv0, uv[i], uv[i + 1]]);
+    n && (tri.n = [n0, n[i], n[i + 1]]);
+    acc.push(tri);
+  }
+  return acc;
+};
+export {
+  parseOBJ
 };