Ensure ordering is respected

Author: manzt

packages/core/src/codecs/bytes.ts

@@ -4,12 +4,7 @@ import type {
 	DataType,
 	TypedArrayConstructor,
 } from "../metadata.js";
-import {
-	byteswap_inplace,
-	get_array_order,
-	get_ctr,
-	get_strides,
-} from "../util.js";
+import { byteswap_inplace, get_ctr, get_strides } from "../util.js";
 
 const LITTLE_ENDIAN_OS = system_is_little_endian();
 

packages/core/src/hierarchy.ts

@@ -5,6 +5,7 @@ import type {
 	ArrayMetadata,
 	Attributes,
 	Chunk,
+	CodecMetadata,
 	DataType,
 	GroupMetadata,
 	Scalar,
@@ -19,7 +20,6 @@ import {
 import {
 	create_chunk_key_encoder,
 	ensure_correct_scalar,
-	get_array_order,
 	get_ctr,
 	get_strides,
 } from "./util.js";
@@ -28,7 +28,7 @@ export class Location<Store> {
 	constructor(
 		public readonly store: Store,
 		public readonly path: AbsolutePath = "/",
-	) {}
+	) { }
 
 	resolve(path: string): Location<Store> {
 		// reuse URL resolution logic built into the browser
@@ -63,6 +63,14 @@ export class Group<Store extends Readable> extends Location<Store> {
 	}
 }
 
+function get_array_order(
+	codecs: CodecMetadata[],
+): "C" | "F" | globalThis.Array<number> {
+	const maybe_transpose_codec = codecs.find((c) => c.name === "transpose");
+	// @ts-expect-error - TODO: Should validate?
+	return maybe_transpose_codec?.configuration?.order ?? "C";
+}
+
 const CONTEXT_MARKER = Symbol("zarrita.context");
 
 export function get_context<T>(obj: { [CONTEXT_MARKER]: T }): T {

packages/core/src/util.ts

@@ -121,21 +121,14 @@ export function create_chunk_key_encoder({
 	throw new Error(`Unknown chunk key encoding: ${name}`);
 }
 
-export function get_array_order(codecs: CodecMetadata[]): "C" | "F" {
-	const maybe_transpose_codec = codecs.find((c) => c.name === "transpose");
-	return maybe_transpose_codec?.configuration?.order === "F" ? "F" : "C";
-}
-
-const endian_regex = /^([<|>])(.*)$/;
-
 function coerce_dtype(
 	dtype: string,
 ): { data_type: DataType } | { data_type: DataType; endian: "little" | "big" } {
 	if (dtype === "|O") {
 		return { data_type: "v2:object" };
 	}
 
-	let match = dtype.match(endian_regex);
+	let match = dtype.match(/^([<|>])(.*)$/);
 	assert(match, `Invalid dtype: ${dtype}`);
 
 	let [, endian, rest] = match;