@openusd-wasm/utils 0.0.3 → 0.0.5

package/README.md

@@ -24,6 +24,7 @@ metadata, fetch same-origin relative assets, and return virtual filesystem
 entries that can be written next to the root layer before opening or packaging
 with OpenUSD.
 
-`findPackageRootLayer`, `createPackageTextureResolver`, and
-`createTextureResolverFromEntries` help inspect stored USDZ packages and map
-packaged image entries to object URLs.
+`extractPackageEntries`, `findPackageRootLayer`, `createPackageTextureResolver`,
+and `createTextureResolverFromEntries` help inspect USDZ packages already
+written to the pxr virtual filesystem via `pxr.Sdf.ZipFile`, then map packaged
+image entries to object URLs.

package/dist/openusd_utils.d.ts

@@ -30,10 +30,11 @@ declare function createTextureResolverFromEntries(entries: Map<string, Uint8Arra
   resolve: USDTextureResolver;
   urls: Map<string, string>;
 } | null;
-declare function createPackageTextureResolver(data: Uint8Array): {
+declare function extractPackageEntries(pxr: Pxr, filePath: string, tempDirectory?: string): Map<string, Uint8Array>;
+declare function createPackageTextureResolver(pxr: Pxr, filePath: string, tempDirectory?: string): {
   resolve: USDTextureResolver;
   urls: Map<string, string>;
 } | null;
-declare function findPackageRootLayer(data: Uint8Array): string | null;
+declare function findPackageRootLayer(pxr: Pxr, filePath: string): string | null;
 //#endregion
-export { type USDAssetResolverOptions, type USDAssetValue, type USDTextureResolver, type USDTextureResolverContext, autoResolveAssetFiles, autoResolveTextureFiles, createPackageTextureResolver, createTextureResolverFromEntries, findPackageRootLayer, toLayerRelativeAssetPath };
+export { type USDAssetResolverOptions, type USDAssetValue, type USDTextureResolver, type USDTextureResolverContext, autoResolveAssetFiles, autoResolveTextureFiles, createPackageTextureResolver, createTextureResolverFromEntries, extractPackageEntries, findPackageRootLayer, toLayerRelativeAssetPath };

package/dist/openusd_utils.js

@@ -26,7 +26,7 @@ const DEFAULT_ASSET_SEARCH_ROOTS = [
 	"material",
 	"materials"
 ];
-const DEFAULT_MAX_ASSET_REFERENCES = 80;
+const DEFAULT_MAX_ASSET_REFERENCES = 512;
 const DEFAULT_MAX_ASSET_REFERENCE_DEPTH = 4;
 const DEFAULT_PACKAGE_REMAP_ALIAS_COUNT = 16;
 const USD_LAYER_EXTENSIONS = new Set([
@@ -108,18 +108,6 @@ function toArrayBuffer(data) {
 	new Uint8Array(buffer).set(data);
 	return buffer;
 }
-function trimAssetReference(value) {
-	let ref = value.trim();
-	if (!ref || ref.length > 220) return null;
-	ref = ref.replace(/^[@<"']+/, "").replace(/[@>"')\]},;]+$/g, "");
-	if (!ref || ref.startsWith("#") || ref.startsWith("$")) return null;
-	if (/^[A-Za-z]:[\\/]/.test(ref)) return null;
-	if (/^[A-Za-z][A-Za-z0-9+.-]*:/.test(ref)) return null;
-	if (ref.startsWith("/")) return null;
-	if (/[\0\r\n\t\f\v]/.test(ref)) return null;
-	if (!/^[ A-Za-z0-9._~!$&'()+,;=@/-]+$/.test(ref)) return null;
-	return ref;
-}
 function buildExtensionVariants(path, searchExtensions) {
 	const normalized = normalizeFsRelativePath(path);
 	if (!normalized) return [];
@@ -233,13 +221,6 @@ async function fetchBinary(url) {
 		return null;
 	}
 }
-function extractedAssetReferences(extracted) {
-	return unique([
-		...extracted.subLayers,
-		...extracted.references,
-		...extracted.payloads
-	].map((ref) => trimAssetReference(ref)).filter((ref) => !!ref));
-}
 function isQueueableUsdLayer(path) {
 	return USD_LAYER_EXTENSIONS.has(extensionOf(path));
 }
@@ -251,6 +232,12 @@ function existingFsPath(pxr, directory, relativePaths, files) {
 	for (const relativePath of relativePaths) if (files[relativePath] || pxr.FS.exists(joinFsPath(directory, relativePath))) return relativePath;
 	return null;
 }
+function writeQueueableLayer(pxr, directory, files, relativePath, data) {
+	if (!isQueueableUsdLayer(relativePath)) return;
+	const filePath = joinFsPath(directory, relativePath);
+	if (!files[relativePath]) files[relativePath] = data;
+	pxr.FS.writeFile(filePath, data);
+}
 function urlForSourceRelativePath(sourceRelativePath, rootSourceUrl) {
 	try {
 		return new URL(sourceRelativePath, rootSourceUrl).href;
@@ -302,7 +289,7 @@ async function autoResolveAssetFiles(pxr, rootFilePath, options) {
 	while (queue.length > 0 && uniqueFileCount(files) < maxFiles) {
 		const item = queue.shift();
 		if (!item || item.depth > maxDepth) continue;
-		const refs = extractedAssetReferences(pxr.UsdUtils.ExtractExternalReferences(item.filePath)).filter((ref) => shouldFetchAssetReference(ref, searchExtensions));
+		const refs = pxr.UsdUtils.ExtractSanitizedExternalReferences(item.filePath).filter((ref) => shouldFetchAssetReference(ref, searchExtensions));
 		const itemSearchRoots = unique([
 			...item.searchRoots,
 			...inferReferencedSearchRoots(refs, configuredSearchRoots),
@@ -311,7 +298,7 @@ async function autoResolveAssetFiles(pxr, rootFilePath, options) {
 		for (const ref of refs) {
 			if (uniqueFileCount(files) >= maxFiles) break;
 			for (const attempt of buildFetchAttempts(ref, item.sourceUrl, item.sourceRelativePath, searchExtensions, item.rootSourceUrl, itemSearchRoots)) {
-				const existingPath = existingFsPath(pxr, directory, [attempt.sourceRelativePath], files);
+				const existingPath = existingFsPath(pxr, directory, [attempt.sourceRelativePath, ...attempt.fsPaths], files);
 				if (existingPath) {
 					if (item.depth < maxDepth) queueUsdLayer(queue, queuedLayers, pxr, directory, existingPath, urlForSourceRelativePath(existingPath, item.rootSourceUrl), item.rootSourceUrl, itemSearchRoots, item.depth + 1);
 					break;
@@ -320,10 +307,11 @@ async function autoResolveAssetFiles(pxr, rootFilePath, options) {
 				fetchedUrls.add(attempt.url);
 				const data = await fetchBinary(attempt.url);
 				if (!data) continue;
+				writeQueueableLayer(pxr, directory, files, attempt.sourceRelativePath, data);
 				for (const fsPath of attempt.fsPaths) {
 					ownedPackageAliases.delete(fsPath);
 					files[fsPath] = data;
-					if (isQueueableUsdLayer(fsPath)) pxr.FS.writeFile(joinFsPath(directory, fsPath), data);
+					writeQueueableLayer(pxr, directory, files, fsPath, data);
 				}
 				addPackageRemapAliases(files, attempt.packageRemapAliases, data, ownedPackageAliases, packageAliasConflicts);
 				if (item.depth < maxDepth) queueUsdLayer(queue, queuedLayers, pxr, directory, attempt.sourceRelativePath, attempt.url, item.rootSourceUrl, itemSearchRoots, item.depth + 1);
@@ -388,29 +376,6 @@ async function autoResolveTextureFiles(metadata, existingFiles, options) {
 	}
 	return files;
 }
-function readZipEntryName(data, start, length) {
-	return new TextDecoder().decode(data.subarray(start, start + length));
-}
-function extractStoredZipEntries(data) {
-	const view = new DataView(data.buffer, data.byteOffset, data.byteLength);
-	const entries = /* @__PURE__ */ new Map();
-	let offset = 0;
-	while (offset + 30 <= data.byteLength) {
-		if (view.getUint32(offset, true) !== 67324752) break;
-		const method = view.getUint16(offset + 8, true);
-		const compressedSize = view.getUint32(offset + 18, true);
-		const fileNameLength = view.getUint16(offset + 26, true);
-		const extraLength = view.getUint16(offset + 28, true);
-		const nameStart = offset + 30;
-		const dataStart = nameStart + fileNameLength + extraLength;
-		const dataEnd = dataStart + compressedSize;
-		if (dataEnd > data.byteLength) break;
-		const name = normalizeFsRelativePath(readZipEntryName(data, nameStart, fileNameLength));
-		if (name && method === 0) entries.set(name, data.slice(dataStart, dataEnd));
-		offset = dataEnd;
-	}
-	return entries;
-}
 function createTextureResolverFromEntries(entries) {
 	if (typeof Blob === "undefined" || typeof URL === "undefined" || typeof URL.createObjectURL !== "function") return null;
 	const imageEntries = new Map([...entries].filter(([path]) => [
@@ -455,12 +420,17 @@ function createTextureResolverFromEntries(entries) {
 		}
 	};
 }
-function createPackageTextureResolver(data) {
-	return createTextureResolverFromEntries(extractStoredZipEntries(data));
+function extractPackageEntries(pxr, filePath, tempDirectory) {
+	const entries = /* @__PURE__ */ new Map();
+	for (const item of pxr.UsdUtils.GetPackageEntries(filePath, tempDirectory ?? "/tmp/openusd-wasm-package-entries", DEFAULT_MAX_ASSET_REFERENCE_DEPTH)) if (typeof item.path === "string" && item.data instanceof Uint8Array) entries.set(item.path, item.data);
+	return entries;
+}
+function createPackageTextureResolver(pxr, filePath, tempDirectory) {
+	return createTextureResolverFromEntries(extractPackageEntries(pxr, filePath, tempDirectory));
 }
-function findPackageRootLayer(data) {
-	for (const path of extractStoredZipEntries(data).keys()) if (USD_LAYER_EXTENSIONS.has(extensionOf(path))) return path;
-	return null;
+function findPackageRootLayer(pxr, filePath) {
+	const path = pxr.UsdUtils.FindPackageRootLayer(filePath);
+	return typeof path === "string" && path ? path : null;
 }
 //#endregion
-export { autoResolveAssetFiles, autoResolveTextureFiles, createPackageTextureResolver, createTextureResolverFromEntries, findPackageRootLayer, toLayerRelativeAssetPath };
+export { autoResolveAssetFiles, autoResolveTextureFiles, createPackageTextureResolver, createTextureResolverFromEntries, extractPackageEntries, findPackageRootLayer, toLayerRelativeAssetPath };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openusd-wasm/utils",
   "type": "module",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "Shared OpenUSD WebAssembly utilities for asset resolution and USDZ packaging workflows.",
   "license": "MIT",
   "homepage": "https://github.com/openusd-wasm/openusd-pxr-wasm",
@@ -24,7 +24,7 @@
     "dist"
   ],
   "dependencies": {
-    "@openusd-wasm/pxr": "0.0.3"
+    "@openusd-wasm/pxr": "0.0.5"
   },
   "devDependencies": {
     "@types/node": "^25.6.2",