@loaders.gl/scene 5.0.0-beta.1 → 5.0.0-beta.10

package/dist/obj/obj-loader.cjs

@@ -20,47 +20,36 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/obj/obj-loader.ts
 var obj_loader_exports = {};
 __export(obj_loader_exports, {
+  OBJColumnLoader: () => OBJColumnLoader,
   OBJLoaderWithParser: () => OBJLoaderWithParser
 });
 module.exports = __toCommonJS(obj_loader_exports);
-var import_loader_utils = require("@loaders.gl/core/loader-utils");
-var import_arrow_transport = require("@loaders.gl/core/schema-utils/arrow-transport");
 var import_schema_utils = require("@loaders.gl/core/schema-utils");
+var import_loader_utils = require("@loaders.gl/core/loader-utils");
+var import_arrow_worker_transport = require("@loaders.gl/core/arrow-worker-transport");
+var import_schema_utils2 = require("@loaders.gl/core/schema-utils");
 var import_get_obj_schema = require("./lib/get-obj-schema.cjs");
 var import_parse_obj = require("./lib/parse-obj.cjs");
 var import_obj_loader_types = require("./obj-loader-types.cjs");
 var { preload: _OBJLoaderPreload, ...OBJLoaderMetadataWithoutPreload } = import_obj_loader_types.OBJLoader;
 function convertOBJMesh(mesh, options) {
-  const table = (0, import_schema_utils.convertMeshToTable)(mesh, "arrow-table");
-  return options?.obj?.shape === "mesh" ? (0, import_schema_utils.convertTableToMesh)(table) : table;
+  const table = (0, import_schema_utils2.convertMeshToArrowTableWrapper)(mesh);
+  return options?.obj?.shape === "mesh" ? (0, import_schema_utils2.convertTableToMesh)(table) : table;
 }
-var OBJLoaderWithParser = {
+var OBJColumnLoader = {
   ...OBJLoaderMetadataWithoutPreload,
+  dataType: null,
+  batchType: null,
   parse: async (arrayBuffer, options) => convertOBJMesh((0, import_parse_obj.parseOBJ)(new TextDecoder().decode(arrayBuffer), options), options),
   parseTextSync: (text, options) => convertOBJMesh((0, import_parse_obj.parseOBJ)(text, options), options),
-  parseInBatches: async function* (arrayBuffer, options) {
-    const batchSize = getNumericBatchSize(options);
-    if (options?.obj?.pointCloud) {
-      const textIterator = (0, import_loader_utils.makeTextDecoderIterator)(arrayBuffer);
-      const lineIterator = (0, import_loader_utils.makeLineIterator)(textIterator);
-      yield* parseOBJPointCloudLinesInBatches(lineIterator, options, batchSize);
-      return;
-    }
-    const data = await (0, import_loader_utils.concatenateArrayBuffersAsync)(arrayBuffer);
-    const text = new TextDecoder().decode(data);
-    if (hasOBJGeometryRecords(text)) {
-      yield makeOBJBatch((0, import_parse_obj.parseOBJ)(text, options), options);
-      return;
-    }
-    yield* parseOBJPointCloudInBatches(text, options, batchSize);
-  },
-  serializeWorkerResult: import_arrow_transport.serializeArrowWorkerTable,
+  parseInBatches: (input, options) => (0, import_schema_utils.refineArrowTableBatches)(parseOBJWithMetadataInBatches(input, options)),
+  serializeWorkerResult: import_arrow_worker_transport.serializeArrowWorkerTable,
   deserializeWorkerResult: deserializeOBJWorkerResult,
-  serializeWorkerBatch: import_arrow_transport.serializeArrowWorkerTable,
+  serializeWorkerBatch: import_arrow_worker_transport.serializeArrowWorkerTable,
   deserializeWorkerBatch: deserializeOBJWorkerBatch
 };
 function getNumericBatchSize(options) {
-  const batchSize = options?.batchSize ?? options?.core?.batchSize;
+  const batchSize = options?.core?.batchSize;
   return typeof batchSize === "number" ? batchSize : void 0;
 }
 function hasOBJGeometryRecords(text) {
@@ -113,7 +102,7 @@ function parseOBJPointCloudMesh(vertexLines) {
       size: 3
     }
   };
-  const boundingBox = (0, import_schema_utils.getMeshBoundingBox)(attributes);
+  const boundingBox = (0, import_schema_utils2.getMeshBoundingBox)(attributes);
   return {
     loaderData: {
       header: {}
@@ -132,9 +121,9 @@ function parseOBJPointCloudMesh(vertexLines) {
   };
 }
 function makeOBJBatch(mesh, options) {
-  const table = (0, import_schema_utils.convertMeshToTable)(mesh, "arrow-table");
+  const table = (0, import_schema_utils2.convertMeshToArrowTableWrapper)(mesh);
   if (options?.obj?.shape === "mesh") {
-    const convertedMesh = (0, import_schema_utils.convertTableToMesh)(table);
+    const convertedMesh = (0, import_schema_utils2.convertTableToMesh)(table);
     return {
       shape: "mesh",
       batchType: "data",
@@ -145,17 +134,60 @@ function makeOBJBatch(mesh, options) {
   return (0, import_loader_utils.makeTableScanBatch)(table);
 }
 function deserializeOBJWorkerResult(result, options) {
-  const table = (0, import_arrow_transport.deserializeArrowWorkerTable)(result);
-  return options?.obj?.shape === "mesh" ? (0, import_schema_utils.convertTableToMesh)(table) : table;
+  const table = (0, import_arrow_worker_transport.deserializeArrowWorkerTable)(result);
+  return options?.obj?.shape === "mesh" ? (0, import_schema_utils2.convertTableToMesh)(table) : table;
 }
 function deserializeOBJWorkerBatch(result, options) {
-  const table = (0, import_arrow_transport.deserializeArrowWorkerTable)(result);
+  const table = (0, import_arrow_worker_transport.deserializeArrowWorkerTable)(result);
   if (options?.obj?.shape !== "mesh") return table;
-  const mesh = (0, import_schema_utils.convertTableToMesh)(table);
+  const mesh = (0, import_schema_utils2.convertTableToMesh)(table);
   return { shape: "mesh", batchType: "data", data: mesh, length: table.length };
 }
+async function* parseOBJWithMetadataInBatches(arrayBuffer, options) {
+  const batchSize = getNumericBatchSize(options);
+  if (options?.obj?.pointCloud) {
+    const textIterator = (0, import_loader_utils.makeTextDecoderIterator)(arrayBuffer);
+    const lineIterator = (0, import_loader_utils.makeLineIterator)(textIterator);
+    yield* parseOBJPointCloudLinesInBatches(lineIterator, options, batchSize);
+    return;
+  }
+  const data = await (0, import_loader_utils.concatenateArrayBuffersAsync)(arrayBuffer);
+  const text = new TextDecoder().decode(data);
+  if (hasOBJGeometryRecords(text)) {
+    yield makeOBJBatch((0, import_parse_obj.parseOBJ)(text, options), options);
+    return;
+  }
+  yield* parseOBJPointCloudInBatches(text, options, batchSize);
+}
+var OBJLoaderWithParser = {
+  ...OBJColumnLoader,
+  dataType: import_obj_loader_types.OBJLoader.dataType,
+  batchType: import_obj_loader_types.OBJLoader.batchType,
+  parse: async (input, options) => unwrapOBJTable(await OBJColumnLoader.parse(input, options)),
+  parseTextSync: (input, options) => unwrapOBJTable(OBJColumnLoader.parseTextSync(input, options)),
+  async *parseInBatches(input, options) {
+    for await (const batch of OBJColumnLoader.parseInBatches(input, options)) {
+      if ("shape" in batch && batch.shape === "arrow-table") {
+        if (batch.data.batches.length) yield* batch.data.batches;
+        else yield (0, import_schema_utils.makeArrowMetadataBatch)(batch.data.schema);
+      } else yield batch;
+    }
+  },
+  deserializeWorkerResult: (result, options) => unwrapOBJTable(OBJColumnLoader.deserializeWorkerResult(result, options)),
+  deserializeWorkerBatch(result, options) {
+    const batch = OBJColumnLoader.deserializeWorkerBatch(result, options);
+    return "shape" in batch && batch.shape === "arrow-table" ? batch.data.batches[0] ?? (0, import_schema_utils.makeArrowMetadataBatch)(batch.data.schema) : batch;
+  }
+};
+function unwrapOBJTable(result) {
+  if ("shape" in result && result.shape === "arrow-table") {
+    return result.data;
+  }
+  return result;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  OBJColumnLoader,
   OBJLoaderWithParser
 });
 //# sourceMappingURL=obj-loader.cjs.map

package/dist/obj/obj-loader.cjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/obj/obj-loader.ts"],
-  "sourcesContent": ["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport type {OBJLoaderOptions, OBJParsedBatch} from './obj-loader-types';\n\nimport {\n  concatenateArrayBuffersAsync,\n  makeLineIterator,\n  makeTextDecoderIterator,\n  makeTableScanBatch,\n  type LoaderWithParser\n} from '@loaders.gl/core/loader-utils';\nimport type {Mesh, MeshArrowTable} from '@loaders.gl/core/schema';\nimport {\n  deserializeArrowWorkerTable,\n  serializeArrowWorkerTable\n} from '@loaders.gl/core/schema-utils/arrow-transport';\nimport {\n  convertMeshToTable,\n  convertTableToMesh,\n  getMeshBoundingBox\n} from '@loaders.gl/core/schema-utils';\nimport {getOBJSchema} from './lib/get-obj-schema';\nimport {parseOBJ} from './lib/parse-obj';\nimport {OBJLoader as OBJLoaderMetadata} from './obj-loader-types';\n\nconst {preload: _OBJLoaderPreload, ...OBJLoaderMetadataWithoutPreload} = OBJLoaderMetadata;\n\nfunction convertOBJMesh(mesh: Mesh, options?: OBJLoaderOptions): Mesh | MeshArrowTable {\n  const table = convertMeshToTable(mesh, 'arrow-table');\n  return options?.obj?.shape === 'mesh' ? convertTableToMesh(table) : table;\n}\n\n// OBJLoaderWithParser\n\n/**\n * Loader for the OBJ geometry format\n */\nexport const OBJLoaderWithParser = {\n  ...OBJLoaderMetadataWithoutPreload,\n  parse: async (arrayBuffer: ArrayBuffer, options?: OBJLoaderOptions) =>\n    convertOBJMesh(parseOBJ(new TextDecoder().decode(arrayBuffer), options), options),\n  parseTextSync: (text: string, options?: OBJLoaderOptions) =>\n    convertOBJMesh(parseOBJ(text, options), options),\n  parseInBatches: async function* (\n    arrayBuffer:\n      | AsyncIterable<ArrayBufferLike | ArrayBufferView>\n      | Iterable<ArrayBufferLike | ArrayBufferView>,\n    options\n  ): AsyncIterable<OBJParsedBatch> {\n    const batchSize = getNumericBatchSize(options);\n    if (options?.obj?.pointCloud) {\n      const textIterator = makeTextDecoderIterator(arrayBuffer as AsyncIterable<ArrayBuffer>);\n      const lineIterator = makeLineIterator(textIterator);\n      yield* parseOBJPointCloudLinesInBatches(lineIterator, options, batchSize);\n      return;\n    }\n\n    const data = await concatenateArrayBuffersAsync(arrayBuffer);\n    const text = new TextDecoder().decode(data);\n    if (hasOBJGeometryRecords(text)) {\n      yield makeOBJBatch(parseOBJ(text, options), options);\n      return;\n    }\n\n    yield* parseOBJPointCloudInBatches(text, options, batchSize);\n  },\n  serializeWorkerResult: serializeArrowWorkerTable,\n  deserializeWorkerResult: deserializeOBJWorkerResult,\n  serializeWorkerBatch: serializeArrowWorkerTable,\n  deserializeWorkerBatch: deserializeOBJWorkerBatch\n} as const satisfies LoaderWithParser<Mesh | MeshArrowTable, OBJParsedBatch, OBJLoaderOptions>;\n\n/** Returns a numeric batch size when batching has an explicit row count. */\nfunction getNumericBatchSize(options?: OBJLoaderOptions): number | undefined {\n  const batchSize = options?.batchSize ?? options?.core?.batchSize;\n  return typeof batchSize === 'number' ? batchSize : undefined;\n}\n\nfunction hasOBJGeometryRecords(text: string): boolean {\n  return text.split(/\\r?\\n/).some(line => {\n    const trimmedLine = line.trimStart();\n    return trimmedLine.startsWith('f ') || trimmedLine.startsWith('l ');\n  });\n}\n\nfunction* parseOBJPointCloudInBatches(\n  text: string,\n  options?: OBJLoaderOptions,\n  batchSize?: number\n): Iterable<OBJParsedBatch> {\n  const vertexLines = text.split(/\\r?\\n/).filter(line => line.trimStart().startsWith('v '));\n  yield* makeOBJPointCloudBatches(vertexLines, options, batchSize);\n}\n\nasync function* parseOBJPointCloudLinesInBatches(\n  lines: AsyncIterable<string>,\n  options?: OBJLoaderOptions,\n  batchSize?: number\n): AsyncIterable<OBJParsedBatch> {\n  const normalizedBatchSize = batchSize || 1000;\n  let vertexLines: string[] = [];\n\n  for await (const line of lines) {\n    if (!line.trimStart().startsWith('v ')) {\n      continue;\n    }\n    vertexLines.push(line);\n    if (vertexLines.length >= normalizedBatchSize) {\n      yield makeOBJBatch(parseOBJPointCloudMesh(vertexLines), options);\n      vertexLines = [];\n    }\n  }\n\n  if (vertexLines.length > 0) {\n    yield makeOBJBatch(parseOBJPointCloudMesh(vertexLines), options);\n  }\n}\n\nfunction* makeOBJPointCloudBatches(\n  vertexLines: string[],\n  options?: OBJLoaderOptions,\n  batchSize?: number\n): Iterable<OBJParsedBatch> {\n  const normalizedBatchSize = batchSize || vertexLines.length || 1;\n\n  for (let rowIndex = 0; rowIndex < vertexLines.length; rowIndex += normalizedBatchSize) {\n    const mesh = parseOBJPointCloudMesh(\n      vertexLines.slice(rowIndex, rowIndex + normalizedBatchSize)\n    );\n    yield makeOBJBatch(mesh, options);\n  }\n}\n\n/** Builds a point-list mesh directly from OBJ `v` records. */\nfunction parseOBJPointCloudMesh(vertexLines: string[]): Mesh {\n  const positions = new Float32Array(vertexLines.length * 3);\n\n  for (let vertexIndex = 0; vertexIndex < vertexLines.length; vertexIndex++) {\n    const values = vertexLines[vertexIndex].trim().split(/\\s+/);\n    positions[vertexIndex * 3 + 0] = Number(values[1]);\n    positions[vertexIndex * 3 + 1] = Number(values[2]);\n    positions[vertexIndex * 3 + 2] = Number(values[3]);\n  }\n\n  const attributes = {\n    POSITION: {\n      value: positions,\n      size: 3\n    }\n  };\n  const boundingBox = getMeshBoundingBox(attributes);\n\n  return {\n    loaderData: {\n      header: {}\n    },\n    schema: getOBJSchema(attributes, {\n      mode: 0,\n      boundingBox: boundingBox ?? undefined\n    }),\n    header: {\n      vertexCount: vertexLines.length,\n      boundingBox: boundingBox ?? undefined\n    },\n    mode: 0,\n    topology: 'point-list',\n    attributes\n  };\n}\n\nfunction makeOBJBatch(mesh: Mesh, options?: OBJLoaderOptions): OBJParsedBatch {\n  const table = convertMeshToTable(mesh, 'arrow-table');\n  if (options?.obj?.shape === 'mesh') {\n    const convertedMesh = convertTableToMesh(table);\n    return {\n      shape: 'mesh',\n      batchType: 'data',\n      data: convertedMesh,\n      length: convertedMesh.header?.vertexCount || 0\n    };\n  }\n\n  return makeTableScanBatch(table);\n}\n\n/** Hydrates worker columns before applying the requested legacy mesh shape on the caller. */\nfunction deserializeOBJWorkerResult(\n  result: unknown,\n  options?: OBJLoaderOptions\n): Mesh | MeshArrowTable {\n  const table = deserializeArrowWorkerTable(result);\n  return options?.obj?.shape === 'mesh' ? convertTableToMesh(table) : table;\n}\n\n/** Restores the OBJ mesh batch envelope after caller-side conversion. */\nfunction deserializeOBJWorkerBatch(result: unknown, options?: OBJLoaderOptions): OBJParsedBatch {\n  const table = deserializeArrowWorkerTable(result);\n  if (options?.obj?.shape !== 'mesh') return table;\n  const mesh = convertTableToMesh(table);\n  return {shape: 'mesh', batchType: 'data', data: mesh, length: table.length};\n}\n"],
-  "mappings": "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",
-  "names": ["OBJLoaderMetadata"]
+  "sourcesContent": ["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport {refineArrowTableBatches, makeArrowMetadataBatch} from '@loaders.gl/core/schema-utils';\nimport type {Table} from 'apache-arrow';\nimport type {OBJLoaderOptions, OBJMeshBatch, OBJParsedBatch} from './obj-loader-types';\n\nimport {\n  concatenateArrayBuffersAsync,\n  makeLineIterator,\n  makeTextDecoderIterator,\n  makeTableScanBatch,\n  type LoaderWithParser\n} from '@loaders.gl/core/loader-utils';\nimport type {Mesh, MeshArrowTable, ArrowTableBatch} from '@loaders.gl/core/schema';\nimport {\n  deserializeArrowWorkerTable,\n  serializeArrowWorkerTable\n} from '@loaders.gl/core/arrow-worker-transport';\nimport {\n  convertMeshToArrowTableWrapper,\n  convertTableToMesh,\n  getMeshBoundingBox\n} from '@loaders.gl/core/schema-utils';\nimport {getOBJSchema} from './lib/get-obj-schema';\nimport {parseOBJ} from './lib/parse-obj';\nimport {OBJLoader as OBJLoaderMetadata} from './obj-loader-types';\n\nconst {preload: _OBJLoaderPreload, ...OBJLoaderMetadataWithoutPreload} = OBJLoaderMetadata;\n\nfunction convertOBJMesh(mesh: Mesh, options?: OBJLoaderOptions): Mesh | MeshArrowTable {\n  const table = convertMeshToArrowTableWrapper(mesh);\n  return options?.obj?.shape === 'mesh' ? convertTableToMesh(table) : table;\n}\n\n// OBJLoaderWithParser\n\n/**\n * Loader for the OBJ geometry format\n */\nexport const OBJColumnLoader = {\n  ...OBJLoaderMetadataWithoutPreload,\n  dataType: null as unknown as Mesh | MeshArrowTable,\n  batchType: null as unknown as OBJMeshBatch | ArrowTableBatch,\n  parse: async (arrayBuffer: ArrayBuffer, options?: OBJLoaderOptions) =>\n    convertOBJMesh(parseOBJ(new TextDecoder().decode(arrayBuffer), options), options),\n  parseTextSync: (text: string, options?: OBJLoaderOptions) =>\n    convertOBJMesh(parseOBJ(text, options), options),\n  parseInBatches: (input, options) =>\n    refineArrowTableBatches(parseOBJWithMetadataInBatches(input, options)),\n  serializeWorkerResult: serializeArrowWorkerTable,\n  deserializeWorkerResult: deserializeOBJWorkerResult,\n  serializeWorkerBatch: serializeArrowWorkerTable,\n  deserializeWorkerBatch: deserializeOBJWorkerBatch\n} as const satisfies LoaderWithParser<\n  Mesh | MeshArrowTable,\n  OBJMeshBatch | ArrowTableBatch,\n  OBJLoaderOptions\n>;\n\n/** Returns a numeric batch size when batching has an explicit row count. */\nfunction getNumericBatchSize(options?: OBJLoaderOptions): number | undefined {\n  const batchSize = options?.core?.batchSize;\n  return typeof batchSize === 'number' ? batchSize : undefined;\n}\n\nfunction hasOBJGeometryRecords(text: string): boolean {\n  return text.split(/\\r?\\n/).some(line => {\n    const trimmedLine = line.trimStart();\n    return trimmedLine.startsWith('f ') || trimmedLine.startsWith('l ');\n  });\n}\n\nfunction* parseOBJPointCloudInBatches(\n  text: string,\n  options?: OBJLoaderOptions,\n  batchSize?: number\n): Iterable<OBJMeshBatch | ArrowTableBatch> {\n  const vertexLines = text.split(/\\r?\\n/).filter(line => line.trimStart().startsWith('v '));\n  yield* makeOBJPointCloudBatches(vertexLines, options, batchSize);\n}\n\nasync function* parseOBJPointCloudLinesInBatches(\n  lines: AsyncIterable<string>,\n  options?: OBJLoaderOptions,\n  batchSize?: number\n): AsyncIterable<OBJMeshBatch | ArrowTableBatch> {\n  const normalizedBatchSize = batchSize || 1000;\n  let vertexLines: string[] = [];\n\n  for await (const line of lines) {\n    if (!line.trimStart().startsWith('v ')) {\n      continue;\n    }\n    vertexLines.push(line);\n    if (vertexLines.length >= normalizedBatchSize) {\n      yield makeOBJBatch(parseOBJPointCloudMesh(vertexLines), options);\n      vertexLines = [];\n    }\n  }\n\n  if (vertexLines.length > 0) {\n    yield makeOBJBatch(parseOBJPointCloudMesh(vertexLines), options);\n  }\n}\n\nfunction* makeOBJPointCloudBatches(\n  vertexLines: string[],\n  options?: OBJLoaderOptions,\n  batchSize?: number\n): Iterable<OBJMeshBatch | ArrowTableBatch> {\n  const normalizedBatchSize = batchSize || vertexLines.length || 1;\n\n  for (let rowIndex = 0; rowIndex < vertexLines.length; rowIndex += normalizedBatchSize) {\n    const mesh = parseOBJPointCloudMesh(\n      vertexLines.slice(rowIndex, rowIndex + normalizedBatchSize)\n    );\n    yield makeOBJBatch(mesh, options);\n  }\n}\n\n/** Builds a point-list mesh directly from OBJ `v` records. */\nfunction parseOBJPointCloudMesh(vertexLines: string[]): Mesh {\n  const positions = new Float32Array(vertexLines.length * 3);\n\n  for (let vertexIndex = 0; vertexIndex < vertexLines.length; vertexIndex++) {\n    const values = vertexLines[vertexIndex].trim().split(/\\s+/);\n    positions[vertexIndex * 3 + 0] = Number(values[1]);\n    positions[vertexIndex * 3 + 1] = Number(values[2]);\n    positions[vertexIndex * 3 + 2] = Number(values[3]);\n  }\n\n  const attributes = {\n    POSITION: {\n      value: positions,\n      size: 3\n    }\n  };\n  const boundingBox = getMeshBoundingBox(attributes);\n\n  return {\n    loaderData: {\n      header: {}\n    },\n    schema: getOBJSchema(attributes, {\n      mode: 0,\n      boundingBox: boundingBox ?? undefined\n    }),\n    header: {\n      vertexCount: vertexLines.length,\n      boundingBox: boundingBox ?? undefined\n    },\n    mode: 0,\n    topology: 'point-list',\n    attributes\n  };\n}\n\nfunction makeOBJBatch(mesh: Mesh, options?: OBJLoaderOptions): OBJMeshBatch | ArrowTableBatch {\n  const table = convertMeshToArrowTableWrapper(mesh);\n  if (options?.obj?.shape === 'mesh') {\n    const convertedMesh = convertTableToMesh(table);\n    return {\n      shape: 'mesh',\n      batchType: 'data',\n      data: convertedMesh,\n      length: convertedMesh.header?.vertexCount || 0\n    };\n  }\n\n  return makeTableScanBatch(table);\n}\n\n/** Hydrates worker columns before applying the requested legacy mesh shape on the caller. */\nfunction deserializeOBJWorkerResult(\n  result: unknown,\n  options?: OBJLoaderOptions\n): Mesh | MeshArrowTable {\n  const table = deserializeArrowWorkerTable(result);\n  return options?.obj?.shape === 'mesh' ? convertTableToMesh(table) : table;\n}\n\n/** Restores the OBJ mesh batch envelope after caller-side conversion. */\nfunction deserializeOBJWorkerBatch(\n  result: unknown,\n  options?: OBJLoaderOptions\n): OBJMeshBatch | ArrowTableBatch {\n  const table = deserializeArrowWorkerTable(result);\n  if (options?.obj?.shape !== 'mesh') return table;\n  const mesh = convertTableToMesh(table);\n  return {shape: 'mesh', batchType: 'data', data: mesh, length: table.length};\n}\n\n/** Parses OBJ batches before shared cumulative metadata refinement. */\nasync function* parseOBJWithMetadataInBatches(\n  arrayBuffer:\n    | AsyncIterable<ArrayBufferLike | ArrayBufferView>\n    | Iterable<ArrayBufferLike | ArrayBufferView>,\n  options?: OBJLoaderOptions\n): AsyncIterable<OBJMeshBatch | ArrowTableBatch> {\n  const batchSize = getNumericBatchSize(options);\n  if (options?.obj?.pointCloud) {\n    const textIterator = makeTextDecoderIterator(arrayBuffer as AsyncIterable<ArrayBuffer>);\n    const lineIterator = makeLineIterator(textIterator);\n    yield* parseOBJPointCloudLinesInBatches(lineIterator, options, batchSize);\n    return;\n  }\n\n  const data = await concatenateArrayBuffersAsync(arrayBuffer);\n  const text = new TextDecoder().decode(data);\n  if (hasOBJGeometryRecords(text)) {\n    yield makeOBJBatch(parseOBJ(text, options), options);\n    return;\n  }\n\n  yield* parseOBJPointCloudInBatches(text, options, batchSize);\n}\n\n/** Exposes native Arrow output while retaining the worker's column protocol. */\nexport const OBJLoaderWithParser = {\n  ...OBJColumnLoader,\n  dataType: OBJLoaderMetadata.dataType,\n  batchType: OBJLoaderMetadata.batchType,\n  parse: async (input: ArrayBuffer, options?: OBJLoaderOptions) =>\n    unwrapOBJTable(await OBJColumnLoader.parse(input, options)),\n  parseTextSync: (input: string, options?: OBJLoaderOptions) =>\n    unwrapOBJTable(OBJColumnLoader.parseTextSync(input, options)),\n  async *parseInBatches(input, options) {\n    for await (const batch of OBJColumnLoader.parseInBatches(input, options)) {\n      if ('shape' in batch && batch.shape === 'arrow-table') {\n        if (batch.data.batches.length) yield* batch.data.batches;\n        else yield makeArrowMetadataBatch(batch.data.schema);\n      } else yield batch;\n    }\n  },\n  deserializeWorkerResult: (result: unknown, options?: OBJLoaderOptions) =>\n    unwrapOBJTable(OBJColumnLoader.deserializeWorkerResult(result, options)),\n  deserializeWorkerBatch(result: unknown, options?: OBJLoaderOptions) {\n    const batch = OBJColumnLoader.deserializeWorkerBatch(result, options);\n    return 'shape' in batch && batch.shape === 'arrow-table'\n      ? (batch.data.batches[0] ?? makeArrowMetadataBatch(batch.data.schema))\n      : batch;\n  }\n} as const satisfies LoaderWithParser<Mesh | Table, OBJParsedBatch, OBJLoaderOptions>;\n\n/** Returns the Arrow table with its file metadata or the requested mesh. */\nfunction unwrapOBJTable(result: Mesh | MeshArrowTable): Mesh | Table {\n  if ('shape' in result && result.shape === 'arrow-table') {\n    return result.data;\n  }\n  return result as Mesh;\n}\n"],
+  "mappings": "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",
+  "names": ["import_schema_utils", "OBJLoaderMetadata"]
 }

package/dist/obj/obj-loader.d.ts

@@ -1,19 +1,20 @@
-import type { OBJLoaderOptions, OBJParsedBatch } from "./obj-loader-types.js";
-import type { Mesh, MeshArrowTable } from '@loaders.gl/core/schema';
-import { serializeArrowWorkerTable } from '@loaders.gl/core/schema-utils/arrow-transport';
+import type { Table } from 'apache-arrow';
+import type { OBJLoaderOptions, OBJMeshBatch, OBJParsedBatch } from "./obj-loader-types.js";
+import type { Mesh, MeshArrowTable, ArrowTableBatch } from '@loaders.gl/core/schema';
+import { serializeArrowWorkerTable } from '@loaders.gl/core/arrow-worker-transport';
 /**
  * Loader for the OBJ geometry format
  */
-export declare const OBJLoaderWithParser: {
+export declare const OBJColumnLoader: {
+    readonly dataType: Mesh | MeshArrowTable;
+    readonly batchType: OBJMeshBatch | ArrowTableBatch;
     readonly parse: (arrayBuffer: ArrayBuffer, options?: OBJLoaderOptions) => Promise<Mesh | MeshArrowTable>;
     readonly parseTextSync: (text: string, options?: OBJLoaderOptions) => Mesh | MeshArrowTable;
-    readonly parseInBatches: (arrayBuffer: AsyncIterable<ArrayBufferLike | ArrayBufferView> | Iterable<ArrayBufferLike | ArrayBufferView>, options: OBJLoaderOptions | undefined) => AsyncIterable<OBJParsedBatch>;
+    readonly parseInBatches: (input: AsyncIterable<ArrayBufferLike | ArrayBufferView<ArrayBufferLike>> | Iterable<ArrayBufferLike | ArrayBufferView<ArrayBufferLike>>, options: OBJLoaderOptions | undefined) => AsyncIterable<OBJMeshBatch | ArrowTableBatch>;
     readonly serializeWorkerResult: typeof serializeArrowWorkerTable;
     readonly deserializeWorkerResult: typeof deserializeOBJWorkerResult;
     readonly serializeWorkerBatch: typeof serializeArrowWorkerTable;
     readonly deserializeWorkerBatch: typeof deserializeOBJWorkerBatch;
-    readonly dataType: Mesh | MeshArrowTable;
-    readonly batchType: OBJParsedBatch;
     readonly version: any;
     readonly worker: true;
     readonly workerInBatches: true;
@@ -21,7 +22,7 @@ export declare const OBJLoaderWithParser: {
     readonly testText: (text: string) => boolean;
     readonly options: {
         readonly obj: {
-            readonly shape: "arrow-table";
+            readonly shape: "arrow";
         };
     };
     readonly name: "OBJ";
@@ -31,10 +32,43 @@ export declare const OBJLoaderWithParser: {
     readonly format: "obj";
     readonly extensions: ["obj"];
     readonly mimeTypes: ["text/plain"];
+    readonly defaultShape: "arrow";
+    readonly supportsNativeArrow: true;
 };
 /** Hydrates worker columns before applying the requested legacy mesh shape on the caller. */
 declare function deserializeOBJWorkerResult(result: unknown, options?: OBJLoaderOptions): Mesh | MeshArrowTable;
 /** Restores the OBJ mesh batch envelope after caller-side conversion. */
-declare function deserializeOBJWorkerBatch(result: unknown, options?: OBJLoaderOptions): OBJParsedBatch;
+declare function deserializeOBJWorkerBatch(result: unknown, options?: OBJLoaderOptions): OBJMeshBatch | ArrowTableBatch;
+/** Exposes native Arrow output while retaining the worker's column protocol. */
+export declare const OBJLoaderWithParser: {
+    readonly dataType: Mesh | Table<any>;
+    readonly batchType: OBJParsedBatch;
+    readonly parse: (input: ArrayBuffer, options?: OBJLoaderOptions) => Promise<Mesh | Table<any>>;
+    readonly parseTextSync: (input: string, options?: OBJLoaderOptions) => Mesh | Table<any>;
+    readonly parseInBatches: (input: AsyncIterable<ArrayBufferLike | ArrayBufferView<ArrayBufferLike>> | Iterable<ArrayBufferLike | ArrayBufferView<ArrayBufferLike>>, options: OBJLoaderOptions | undefined) => AsyncGenerator<OBJMeshBatch | import("apache-arrow").RecordBatch<any>, void, unknown>;
+    readonly deserializeWorkerResult: (result: unknown, options?: OBJLoaderOptions) => Mesh | Table<any>;
+    readonly deserializeWorkerBatch: (result: unknown, options?: OBJLoaderOptions) => OBJMeshBatch | import("apache-arrow").RecordBatch<any>;
+    readonly serializeWorkerResult: typeof serializeArrowWorkerTable;
+    readonly serializeWorkerBatch: typeof serializeArrowWorkerTable;
+    readonly version: any;
+    readonly worker: true;
+    readonly workerInBatches: true;
+    readonly text: true;
+    readonly testText: (text: string) => boolean;
+    readonly options: {
+        readonly obj: {
+            readonly shape: "arrow";
+        };
+    };
+    readonly name: "OBJ";
+    readonly id: "obj";
+    readonly module: "scene";
+    readonly encoding: "text";
+    readonly format: "obj";
+    readonly extensions: ["obj"];
+    readonly mimeTypes: ["text/plain"];
+    readonly defaultShape: "arrow";
+    readonly supportsNativeArrow: true;
+};
 export {};
 //# sourceMappingURL=obj-loader.d.ts.map

package/dist/obj/obj-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"obj-loader.d.ts","sourceRoot":"","sources":["../../src/obj/obj-loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,gBAAgB,EAAE,cAAc,EAAC,8BAA2B;AASzE,OAAO,KAAK,EAAC,IAAI,EAAE,cAAc,EAAC,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAEL,yBAAyB,EAC1B,MAAM,+CAA+C,CAAC;AAmBvD;;GAEG;AACH,eAAO,MAAM,mBAAmB;kCAEH,WAAW,YAAY,gBAAgB;mCAE5C,MAAM,YAAY,gBAAgB;2CAIlD,aAAa,CAAC,eAAe,GAAG,eAAe,CAAC,GAChD,QAAQ,CAAC,eAAe,GAAG,eAAe,CAAC,4CAE9C,aAAa,CAAC,cAAc,CAAC;;;;;;;;;;;;;;;;;;;;;;;;CAsB4D,CAAC;AAmH/F,6FAA6F;AAC7F,iBAAS,0BAA0B,CACjC,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,gBAAgB,GACzB,IAAI,GAAG,cAAc,CAGvB;AAED,yEAAyE;AACzE,iBAAS,yBAAyB,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,cAAc,CAK9F"}
+{"version":3,"file":"obj-loader.d.ts","sourceRoot":"","sources":["../../src/obj/obj-loader.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,EAAC,gBAAgB,EAAE,YAAY,EAAE,cAAc,EAAC,8BAA2B;AASvF,OAAO,KAAK,EAAC,IAAI,EAAE,cAAc,EAAE,eAAe,EAAC,MAAM,yBAAyB,CAAC;AACnF,OAAO,EAEL,yBAAyB,EAC1B,MAAM,yCAAyC,CAAC;AAmBjD;;GAEG;AACH,eAAO,MAAM,eAAe;uBAEG,IAAI,GAAG,cAAc;wBACpB,YAAY,GAAG,eAAe;kCACjC,WAAW,YAAY,gBAAgB;mCAE5C,MAAM,YAAY,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;CAYzD,CAAC;AAmHF,6FAA6F;AAC7F,iBAAS,0BAA0B,CACjC,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,gBAAgB,GACzB,IAAI,GAAG,cAAc,CAGvB;AAED,yEAAyE;AACzE,iBAAS,yBAAyB,CAChC,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,gBAAgB,GACzB,YAAY,GAAG,eAAe,CAKhC;AA2BD,gFAAgF;AAChF,eAAO,MAAM,mBAAmB;;;4BAIT,WAAW,YAAY,gBAAgB;oCAErC,MAAM,YAAY,gBAAgB;;+CAUvB,OAAO,YAAY,gBAAgB;8CAEtC,OAAO,YAAY,gBAAgB;;;;;;;;;;;;;;;;;;;;;;CAMiB,CAAC"}

package/dist/obj/obj-loader.js

@@ -1,41 +1,29 @@
 // loaders.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
+import { refineArrowTableBatches, makeArrowMetadataBatch } from '@loaders.gl/core/schema-utils';
 import { concatenateArrayBuffersAsync, makeLineIterator, makeTextDecoderIterator, makeTableScanBatch } from '@loaders.gl/core/loader-utils';
-import { deserializeArrowWorkerTable, serializeArrowWorkerTable } from '@loaders.gl/core/schema-utils/arrow-transport';
-import { convertMeshToTable, convertTableToMesh, getMeshBoundingBox } from '@loaders.gl/core/schema-utils';
+import { deserializeArrowWorkerTable, serializeArrowWorkerTable } from '@loaders.gl/core/arrow-worker-transport';
+import { convertMeshToArrowTableWrapper, convertTableToMesh, getMeshBoundingBox } from '@loaders.gl/core/schema-utils';
 import { getOBJSchema } from "./lib/get-obj-schema.js";
 import { parseOBJ } from "./lib/parse-obj.js";
 import { OBJLoader as OBJLoaderMetadata } from "./obj-loader-types.js";
 const { preload: _OBJLoaderPreload, ...OBJLoaderMetadataWithoutPreload } = OBJLoaderMetadata;
 function convertOBJMesh(mesh, options) {
-    const table = convertMeshToTable(mesh, 'arrow-table');
+    const table = convertMeshToArrowTableWrapper(mesh);
     return options?.obj?.shape === 'mesh' ? convertTableToMesh(table) : table;
 }
 // OBJLoaderWithParser
 /**
  * Loader for the OBJ geometry format
  */
-export const OBJLoaderWithParser = {
+export const OBJColumnLoader = {
     ...OBJLoaderMetadataWithoutPreload,
+    dataType: null,
+    batchType: null,
     parse: async (arrayBuffer, options) => convertOBJMesh(parseOBJ(new TextDecoder().decode(arrayBuffer), options), options),
     parseTextSync: (text, options) => convertOBJMesh(parseOBJ(text, options), options),
-    parseInBatches: async function* (arrayBuffer, options) {
-        const batchSize = getNumericBatchSize(options);
-        if (options?.obj?.pointCloud) {
-            const textIterator = makeTextDecoderIterator(arrayBuffer);
-            const lineIterator = makeLineIterator(textIterator);
-            yield* parseOBJPointCloudLinesInBatches(lineIterator, options, batchSize);
-            return;
-        }
-        const data = await concatenateArrayBuffersAsync(arrayBuffer);
-        const text = new TextDecoder().decode(data);
-        if (hasOBJGeometryRecords(text)) {
-            yield makeOBJBatch(parseOBJ(text, options), options);
-            return;
-        }
-        yield* parseOBJPointCloudInBatches(text, options, batchSize);
-    },
+    parseInBatches: (input, options) => refineArrowTableBatches(parseOBJWithMetadataInBatches(input, options)),
     serializeWorkerResult: serializeArrowWorkerTable,
     deserializeWorkerResult: deserializeOBJWorkerResult,
     serializeWorkerBatch: serializeArrowWorkerTable,
@@ -43,7 +31,7 @@ export const OBJLoaderWithParser = {
 };
 /** Returns a numeric batch size when batching has an explicit row count. */
 function getNumericBatchSize(options) {
-    const batchSize = options?.batchSize ?? options?.core?.batchSize;
+    const batchSize = options?.core?.batchSize;
     return typeof batchSize === 'number' ? batchSize : undefined;
 }
 function hasOBJGeometryRecords(text) {
@@ -114,7 +102,7 @@ function parseOBJPointCloudMesh(vertexLines) {
     };
 }
 function makeOBJBatch(mesh, options) {
-    const table = convertMeshToTable(mesh, 'arrow-table');
+    const table = convertMeshToArrowTableWrapper(mesh);
     if (options?.obj?.shape === 'mesh') {
         const convertedMesh = convertTableToMesh(table);
         return {
@@ -139,4 +127,55 @@ function deserializeOBJWorkerBatch(result, options) {
     const mesh = convertTableToMesh(table);
     return { shape: 'mesh', batchType: 'data', data: mesh, length: table.length };
 }
+/** Parses OBJ batches before shared cumulative metadata refinement. */
+async function* parseOBJWithMetadataInBatches(arrayBuffer, options) {
+    const batchSize = getNumericBatchSize(options);
+    if (options?.obj?.pointCloud) {
+        const textIterator = makeTextDecoderIterator(arrayBuffer);
+        const lineIterator = makeLineIterator(textIterator);
+        yield* parseOBJPointCloudLinesInBatches(lineIterator, options, batchSize);
+        return;
+    }
+    const data = await concatenateArrayBuffersAsync(arrayBuffer);
+    const text = new TextDecoder().decode(data);
+    if (hasOBJGeometryRecords(text)) {
+        yield makeOBJBatch(parseOBJ(text, options), options);
+        return;
+    }
+    yield* parseOBJPointCloudInBatches(text, options, batchSize);
+}
+/** Exposes native Arrow output while retaining the worker's column protocol. */
+export const OBJLoaderWithParser = {
+    ...OBJColumnLoader,
+    dataType: OBJLoaderMetadata.dataType,
+    batchType: OBJLoaderMetadata.batchType,
+    parse: async (input, options) => unwrapOBJTable(await OBJColumnLoader.parse(input, options)),
+    parseTextSync: (input, options) => unwrapOBJTable(OBJColumnLoader.parseTextSync(input, options)),
+    async *parseInBatches(input, options) {
+        for await (const batch of OBJColumnLoader.parseInBatches(input, options)) {
+            if ('shape' in batch && batch.shape === 'arrow-table') {
+                if (batch.data.batches.length)
+                    yield* batch.data.batches;
+                else
+                    yield makeArrowMetadataBatch(batch.data.schema);
+            }
+            else
+                yield batch;
+        }
+    },
+    deserializeWorkerResult: (result, options) => unwrapOBJTable(OBJColumnLoader.deserializeWorkerResult(result, options)),
+    deserializeWorkerBatch(result, options) {
+        const batch = OBJColumnLoader.deserializeWorkerBatch(result, options);
+        return 'shape' in batch && batch.shape === 'arrow-table'
+            ? (batch.data.batches[0] ?? makeArrowMetadataBatch(batch.data.schema))
+            : batch;
+    }
+};
+/** Returns the Arrow table with its file metadata or the requested mesh. */
+function unwrapOBJTable(result) {
+    if ('shape' in result && result.shape === 'arrow-table') {
+        return result.data;
+    }
+    return result;
+}
 //# sourceMappingURL=obj-loader.js.map

package/dist/obj/obj-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"obj-loader.js","sourceRoot":"","sources":["../../src/obj/obj-loader.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"obj-loader.js","sourceRoot":"","sources":["../../src/obj/obj-loader.ts"],"names":[],"mappings":"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"}

package/dist/obj/obj-writer.cjs

@@ -25,7 +25,7 @@ __export(obj_writer_exports, {
 module.exports = __toCommonJS(obj_writer_exports);
 var import_schema_utils = require("@loaders.gl/core/schema-utils");
 var import_obj_format = require("./obj-format.cjs");
-var VERSION = true ? "5.0.0-beta.1" : "latest";
+var VERSION = true ? "5.0.0-beta.10" : "latest";
 var OBJWriter = {
   ...import_obj_format.OBJFormat,
   dataType: null,
@@ -113,10 +113,10 @@ function encodeOBJ(data, options) {
 `;
 }
 function normalizeMeshArrowTable(data) {
-  if ("shape" in data && data.shape === "arrow-table") {
+  if (!("attributes" in data)) {
     return data;
   }
-  return (0, import_schema_utils.convertMeshToTable)(data, "arrow-table");
+  return (0, import_schema_utils.convertMeshToArrowTableWrapper)(data);
 }
 function getRequiredAttribute(mesh, attributeName) {
   const attribute = mesh.attributes[attributeName];

package/dist/obj/obj-writer.cjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/obj/obj-writer.ts"],
-  "sourcesContent": ["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport type {WriterOptions, WriterWithEncoder} from '@loaders.gl/core/loader-utils';\nimport type {Mesh, MeshArrowTable, MeshAttribute} from '@loaders.gl/core/schema';\nimport {convertMeshToTable, convertTableToMesh} from '@loaders.gl/core/schema-utils';\nimport {OBJFormat} from './obj-format';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\n/** Options for `OBJWriter`. */\nexport type OBJWriterOptions = WriterOptions & {\n  /** Reserved for future OBJ writer options. */\n  obj?: Record<string, never>;\n};\n\n/**\n * Writer for the OBJ geometry format.\n */\nexport const OBJWriter = {\n  ...OBJFormat,\n  dataType: null as unknown as Mesh | MeshArrowTable,\n  batchType: null as never,\n  version: VERSION,\n  options: {\n    obj: {}\n  },\n  text: true,\n  encode: async (data, options) => encodeOBJSync(data, options),\n  encodeSync: encodeOBJSync,\n  encodeTextSync: encodeOBJ\n} as const satisfies WriterWithEncoder<Mesh | MeshArrowTable, never, OBJWriterOptions>;\n\n/** Encode mesh category data as OBJ bytes. */\nfunction encodeOBJSync(data: Mesh | MeshArrowTable, options?: OBJWriterOptions): ArrayBuffer {\n  const text = encodeOBJ(data, options);\n  return new TextEncoder().encode(text).buffer;\n}\n\n/** Encode mesh category data as OBJ text. */\nfunction encodeOBJ(data: Mesh | MeshArrowTable, options?: OBJWriterOptions): string {\n  const mesh = convertTableToMesh(normalizeMeshArrowTable(data));\n  const positionAttribute = getRequiredAttribute(mesh, 'POSITION');\n  const normalAttribute = mesh.attributes.NORMAL;\n  const textureCoordinateAttribute = mesh.attributes.TEXCOORD_0;\n  const colorAttribute = mesh.attributes.COLOR_0;\n  const vertexCount = positionAttribute.value.length / positionAttribute.size;\n  const lines: string[] = ['# loaders.gl OBJ'];\n\n  for (let vertexIndex = 0; vertexIndex < vertexCount; vertexIndex++) {\n    const vertex = [\n      getComponent(positionAttribute, vertexIndex, 0),\n      getComponent(positionAttribute, vertexIndex, 1),\n      getComponent(positionAttribute, vertexIndex, 2)\n    ];\n\n    if (colorAttribute) {\n      vertex.push(\n        getColorComponent(colorAttribute, vertexIndex, 0),\n        getColorComponent(colorAttribute, vertexIndex, 1),\n        getColorComponent(colorAttribute, vertexIndex, 2)\n      );\n    }\n\n    lines.push(`v ${vertex.join(' ')}`);\n  }\n\n  if (textureCoordinateAttribute) {\n    for (let vertexIndex = 0; vertexIndex < vertexCount; vertexIndex++) {\n      lines.push(\n        `vt ${getComponent(textureCoordinateAttribute, vertexIndex, 0)} ${getComponent(\n          textureCoordinateAttribute,\n          vertexIndex,\n          1\n        )}`\n      );\n    }\n  }\n\n  if (normalAttribute) {\n    for (let vertexIndex = 0; vertexIndex < vertexCount; vertexIndex++) {\n      lines.push(\n        `vn ${getComponent(normalAttribute, vertexIndex, 0)} ${getComponent(\n          normalAttribute,\n          vertexIndex,\n          1\n        )} ${getComponent(normalAttribute, vertexIndex, 2)}`\n      );\n    }\n  }\n\n  const triangleIndices = getTriangleIndices(mesh, vertexCount);\n  for (let triangleIndex = 0; triangleIndex < triangleIndices.length; triangleIndex += 3) {\n    const face = [\n      getFaceVertex(\n        triangleIndices[triangleIndex],\n        Boolean(textureCoordinateAttribute),\n        Boolean(normalAttribute)\n      ),\n      getFaceVertex(\n        triangleIndices[triangleIndex + 1],\n        Boolean(textureCoordinateAttribute),\n        Boolean(normalAttribute)\n      ),\n      getFaceVertex(\n        triangleIndices[triangleIndex + 2],\n        Boolean(textureCoordinateAttribute),\n        Boolean(normalAttribute)\n      )\n    ];\n    lines.push(`f ${face.join(' ')}`);\n  }\n\n  return `${lines.join('\\n')}\\n`;\n}\n\n/** Return mesh data as a MeshArrowTable, converting plain Mesh data first. */\nfunction normalizeMeshArrowTable(data: Mesh | MeshArrowTable): MeshArrowTable {\n  if ('shape' in data && data.shape === 'arrow-table') {\n    return data;\n  }\n  return convertMeshToTable(data as Mesh, 'arrow-table');\n}\n\n/** Return a required mesh attribute or throw a format-specific error. */\nfunction getRequiredAttribute(mesh: Mesh, attributeName: string): MeshAttribute {\n  const attribute = mesh.attributes[attributeName];\n  if (!attribute) {\n    throw new Error(`OBJWriter: ${attributeName} attribute is required`);\n  }\n  return attribute;\n}\n\n/** Return a single attribute component with 0 as the missing component fallback. */\nfunction getComponent(\n  attribute: MeshAttribute,\n  vertexIndex: number,\n  componentIndex: number\n): number {\n  return attribute.value[vertexIndex * attribute.size + componentIndex] || 0;\n}\n\n/** Return a color component normalized for OBJ vertex colors. */\nfunction getColorComponent(\n  attribute: MeshAttribute,\n  vertexIndex: number,\n  componentIndex: number\n): number {\n  const value = getComponent(attribute, vertexIndex, componentIndex);\n  return attribute.normalized || value > 1 ? value / 255 : value;\n}\n\n/** Return triangle indices for indexed or sequential triangle-list meshes. */\nfunction getTriangleIndices(mesh: Mesh, vertexCount: number): number[] {\n  if (mesh.indices?.value?.length) {\n    return Array.from(mesh.indices.value);\n  }\n\n  if (mesh.mode !== 4 && mesh.topology !== 'triangle-list') {\n    return [];\n  }\n\n  const triangleIndices: number[] = [];\n  for (let vertexIndex = 0; vertexIndex + 2 < vertexCount; vertexIndex += 3) {\n    triangleIndices.push(vertexIndex, vertexIndex + 1, vertexIndex + 2);\n  }\n  return triangleIndices;\n}\n\n/** Return an OBJ face vertex reference. */\nfunction getFaceVertex(\n  vertexIndex: number,\n  hasTextureCoordinates: boolean,\n  hasNormals: boolean\n): string {\n  const faceIndex = vertexIndex + 1;\n  if (hasTextureCoordinates && hasNormals) {\n    return `${faceIndex}/${faceIndex}/${faceIndex}`;\n  }\n  if (hasTextureCoordinates) {\n    return `${faceIndex}/${faceIndex}`;\n  }\n  if (hasNormals) {\n    return `${faceIndex}//${faceIndex}`;\n  }\n  return String(faceIndex);\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport type {Table} from 'apache-arrow';\nimport type {WriterOptions, WriterWithEncoder} from '@loaders.gl/core/loader-utils';\nimport type {Mesh, MeshArrowTable, MeshAttribute} from '@loaders.gl/core/schema';\nimport {convertMeshToArrowTableWrapper, convertTableToMesh} from '@loaders.gl/core/schema-utils';\nimport {OBJFormat} from './obj-format';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\n/** Options for `OBJWriter`. */\nexport type OBJWriterOptions = WriterOptions & {\n  /** Reserved for future OBJ writer options. */\n  obj?: Record<string, never>;\n};\n\n/**\n * Writer for the OBJ geometry format.\n */\nexport const OBJWriter = {\n  ...OBJFormat,\n  dataType: null as unknown as Mesh | MeshArrowTable | Table,\n  batchType: null as never,\n  version: VERSION,\n  options: {\n    obj: {}\n  },\n  text: true,\n  encode: async (data, options) => encodeOBJSync(data, options),\n  encodeSync: encodeOBJSync,\n  encodeTextSync: encodeOBJ\n} as const satisfies WriterWithEncoder<Mesh | MeshArrowTable | Table, never, OBJWriterOptions>;\n\n/** Encode mesh category data as OBJ bytes. */\nfunction encodeOBJSync(\n  data: Mesh | MeshArrowTable | Table,\n  options?: OBJWriterOptions\n): ArrayBuffer {\n  const text = encodeOBJ(data, options);\n  return new TextEncoder().encode(text).buffer;\n}\n\n/** Encode mesh category data as OBJ text. */\nfunction encodeOBJ(data: Mesh | MeshArrowTable | Table, options?: OBJWriterOptions): string {\n  const mesh = convertTableToMesh(normalizeMeshArrowTable(data));\n  const positionAttribute = getRequiredAttribute(mesh, 'POSITION');\n  const normalAttribute = mesh.attributes.NORMAL;\n  const textureCoordinateAttribute = mesh.attributes.TEXCOORD_0;\n  const colorAttribute = mesh.attributes.COLOR_0;\n  const vertexCount = positionAttribute.value.length / positionAttribute.size;\n  const lines: string[] = ['# loaders.gl OBJ'];\n\n  for (let vertexIndex = 0; vertexIndex < vertexCount; vertexIndex++) {\n    const vertex = [\n      getComponent(positionAttribute, vertexIndex, 0),\n      getComponent(positionAttribute, vertexIndex, 1),\n      getComponent(positionAttribute, vertexIndex, 2)\n    ];\n\n    if (colorAttribute) {\n      vertex.push(\n        getColorComponent(colorAttribute, vertexIndex, 0),\n        getColorComponent(colorAttribute, vertexIndex, 1),\n        getColorComponent(colorAttribute, vertexIndex, 2)\n      );\n    }\n\n    lines.push(`v ${vertex.join(' ')}`);\n  }\n\n  if (textureCoordinateAttribute) {\n    for (let vertexIndex = 0; vertexIndex < vertexCount; vertexIndex++) {\n      lines.push(\n        `vt ${getComponent(textureCoordinateAttribute, vertexIndex, 0)} ${getComponent(\n          textureCoordinateAttribute,\n          vertexIndex,\n          1\n        )}`\n      );\n    }\n  }\n\n  if (normalAttribute) {\n    for (let vertexIndex = 0; vertexIndex < vertexCount; vertexIndex++) {\n      lines.push(\n        `vn ${getComponent(normalAttribute, vertexIndex, 0)} ${getComponent(\n          normalAttribute,\n          vertexIndex,\n          1\n        )} ${getComponent(normalAttribute, vertexIndex, 2)}`\n      );\n    }\n  }\n\n  const triangleIndices = getTriangleIndices(mesh, vertexCount);\n  for (let triangleIndex = 0; triangleIndex < triangleIndices.length; triangleIndex += 3) {\n    const face = [\n      getFaceVertex(\n        triangleIndices[triangleIndex],\n        Boolean(textureCoordinateAttribute),\n        Boolean(normalAttribute)\n      ),\n      getFaceVertex(\n        triangleIndices[triangleIndex + 1],\n        Boolean(textureCoordinateAttribute),\n        Boolean(normalAttribute)\n      ),\n      getFaceVertex(\n        triangleIndices[triangleIndex + 2],\n        Boolean(textureCoordinateAttribute),\n        Boolean(normalAttribute)\n      )\n    ];\n    lines.push(`f ${face.join(' ')}`);\n  }\n\n  return `${lines.join('\\n')}\\n`;\n}\n\n/** Return mesh data as a MeshArrowTable, converting plain Mesh data first. */\nfunction normalizeMeshArrowTable(data: Mesh | MeshArrowTable | Table): MeshArrowTable | Table {\n  if (!('attributes' in data)) {\n    return data;\n  }\n  return convertMeshToArrowTableWrapper(data as Mesh);\n}\n\n/** Return a required mesh attribute or throw a format-specific error. */\nfunction getRequiredAttribute(mesh: Mesh, attributeName: string): MeshAttribute {\n  const attribute = mesh.attributes[attributeName];\n  if (!attribute) {\n    throw new Error(`OBJWriter: ${attributeName} attribute is required`);\n  }\n  return attribute;\n}\n\n/** Return a single attribute component with 0 as the missing component fallback. */\nfunction getComponent(\n  attribute: MeshAttribute,\n  vertexIndex: number,\n  componentIndex: number\n): number {\n  return attribute.value[vertexIndex * attribute.size + componentIndex] || 0;\n}\n\n/** Return a color component normalized for OBJ vertex colors. */\nfunction getColorComponent(\n  attribute: MeshAttribute,\n  vertexIndex: number,\n  componentIndex: number\n): number {\n  const value = getComponent(attribute, vertexIndex, componentIndex);\n  return attribute.normalized || value > 1 ? value / 255 : value;\n}\n\n/** Return triangle indices for indexed or sequential triangle-list meshes. */\nfunction getTriangleIndices(mesh: Mesh, vertexCount: number): number[] {\n  if (mesh.indices?.value?.length) {\n    return Array.from(mesh.indices.value);\n  }\n\n  if (mesh.mode !== 4 && mesh.topology !== 'triangle-list') {\n    return [];\n  }\n\n  const triangleIndices: number[] = [];\n  for (let vertexIndex = 0; vertexIndex + 2 < vertexCount; vertexIndex += 3) {\n    triangleIndices.push(vertexIndex, vertexIndex + 1, vertexIndex + 2);\n  }\n  return triangleIndices;\n}\n\n/** Return an OBJ face vertex reference. */\nfunction getFaceVertex(\n  vertexIndex: number,\n  hasTextureCoordinates: boolean,\n  hasNormals: boolean\n): string {\n  const faceIndex = vertexIndex + 1;\n  if (hasTextureCoordinates && hasNormals) {\n    return `${faceIndex}/${faceIndex}/${faceIndex}`;\n  }\n  if (hasTextureCoordinates) {\n    return `${faceIndex}/${faceIndex}`;\n  }\n  if (hasNormals) {\n    return `${faceIndex}//${faceIndex}`;\n  }\n  return String(faceIndex);\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/obj/obj-writer.d.ts

@@ -1,3 +1,4 @@
+import type { Table } from 'apache-arrow';
 import type { WriterOptions } from '@loaders.gl/core/loader-utils';
 import type { Mesh, MeshArrowTable } from '@loaders.gl/core/schema';
 /** Options for `OBJWriter`. */
@@ -9,14 +10,14 @@ export type OBJWriterOptions = WriterOptions & {
  * Writer for the OBJ geometry format.
  */
 export declare const OBJWriter: {
-    readonly dataType: Mesh | MeshArrowTable;
+    readonly dataType: Mesh | MeshArrowTable | Table;
     readonly batchType: never;
     readonly version: any;
     readonly options: {
         readonly obj: {};
     };
     readonly text: true;
-    readonly encode: (data: Mesh | MeshArrowTable, options: OBJWriterOptions | undefined) => Promise<ArrayBuffer>;
+    readonly encode: (data: Mesh | Table<any> | MeshArrowTable, options: OBJWriterOptions | undefined) => Promise<ArrayBuffer>;
     readonly encodeSync: typeof encodeOBJSync;
     readonly encodeTextSync: typeof encodeOBJ;
     readonly name: "OBJ";
@@ -28,8 +29,8 @@ export declare const OBJWriter: {
     readonly mimeTypes: ["text/plain"];
 };
 /** Encode mesh category data as OBJ bytes. */
-declare function encodeOBJSync(data: Mesh | MeshArrowTable, options?: OBJWriterOptions): ArrayBuffer;
+declare function encodeOBJSync(data: Mesh | MeshArrowTable | Table, options?: OBJWriterOptions): ArrayBuffer;
 /** Encode mesh category data as OBJ text. */
-declare function encodeOBJ(data: Mesh | MeshArrowTable, options?: OBJWriterOptions): string;
+declare function encodeOBJ(data: Mesh | MeshArrowTable | Table, options?: OBJWriterOptions): string;
 export {};
 //# sourceMappingURL=obj-writer.d.ts.map

package/dist/obj/obj-writer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"obj-writer.d.ts","sourceRoot":"","sources":["../../src/obj/obj-writer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,aAAa,EAAoB,MAAM,+BAA+B,CAAC;AACpF,OAAO,KAAK,EAAC,IAAI,EAAE,cAAc,EAAgB,MAAM,yBAAyB,CAAC;AAQjF,+BAA+B;AAC/B,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,8CAA8C;IAC9C,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;CAC7B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS;uBAES,IAAI,GAAG,cAAc;wBAC/B,KAAK;;;;;;;;;;;;;;;;CAS4D,CAAC;AAEvF,8CAA8C;AAC9C,iBAAS,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,cAAc,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,WAAW,CAG3F;AAED,6CAA6C;AAC7C,iBAAS,SAAS,CAAC,IAAI,EAAE,IAAI,GAAG,cAAc,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,MAAM,CA0ElF"}
+{"version":3,"file":"obj-writer.d.ts","sourceRoot":"","sources":["../../src/obj/obj-writer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,EAAC,aAAa,EAAoB,MAAM,+BAA+B,CAAC;AACpF,OAAO,KAAK,EAAC,IAAI,EAAE,cAAc,EAAgB,MAAM,yBAAyB,CAAC;AAQjF,+BAA+B;AAC/B,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,8CAA8C;IAC9C,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;CAC7B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS;uBAES,IAAI,GAAG,cAAc,GAAG,KAAK;wBACvC,KAAK;;;;;;;;;;;;;;;;CASoE,CAAC;AAE/F,8CAA8C;AAC9C,iBAAS,aAAa,CACpB,IAAI,EAAE,IAAI,GAAG,cAAc,GAAG,KAAK,EACnC,OAAO,CAAC,EAAE,gBAAgB,GACzB,WAAW,CAGb;AAED,6CAA6C;AAC7C,iBAAS,SAAS,CAAC,IAAI,EAAE,IAAI,GAAG,cAAc,GAAG,KAAK,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,MAAM,CA0E1F"}

package/dist/obj/obj-writer.js

@@ -1,11 +1,11 @@
 // loaders.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { convertMeshToTable, convertTableToMesh } from '@loaders.gl/core/schema-utils';
+import { convertMeshToArrowTableWrapper, convertTableToMesh } from '@loaders.gl/core/schema-utils';
 import { OBJFormat } from "./obj-format.js";
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const VERSION = typeof "5.0.0-beta.1" !== 'undefined' ? "5.0.0-beta.1" : 'latest';
+const VERSION = typeof "5.0.0-beta.10" !== 'undefined' ? "5.0.0-beta.10" : 'latest';
 /**
  * Writer for the OBJ geometry format.
  */
@@ -70,10 +70,10 @@ function encodeOBJ(data, options) {
 }
 /** Return mesh data as a MeshArrowTable, converting plain Mesh data first. */
 function normalizeMeshArrowTable(data) {
-    if ('shape' in data && data.shape === 'arrow-table') {
+    if (!('attributes' in data)) {
         return data;
     }
-    return convertMeshToTable(data, 'arrow-table');
+    return convertMeshToArrowTableWrapper(data);
 }
 /** Return a required mesh attribute or throw a format-specific error. */
 function getRequiredAttribute(mesh, attributeName) {