@forgeax/engine-import 0.1.6 → 0.1.19

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { ok, validateSourceOverrideMap, ImportError, IMPORT_ERROR_HINTS, canonicalizeSourceOverrides, err, AssetError, MATERIAL_TEXTURE_SLOTS } from '@forgeax/engine-types';
 export { IMPORT_ERROR_HINTS, ImportError } from '@forgeax/engine-types';
-import { resolve, dirname } from 'path';
-import { upgradeLegacyAuthoredPack, loadAssetConfig, resolveAssetSource, finalizePackageTransportSource, projectCookedPackageEntry, buildCatalogProjection, createRuntimePackPublication, metaPathForGuid } from '@forgeax/engine-pack/build';
+import { resolve, isAbsolute, relative, dirname } from 'path';
+import { upgradeLegacyAuthoredPack, loadAssetConfig, resolveAssetSource, finalizePackageTransportSource, catalogSourcePathFor, projectCookedPackageEntry, buildCatalogProjection, createRuntimePackPublication, metaPathForGuid } from '@forgeax/engine-pack/build';
 import { createHash } from 'crypto';
 import { stat, mkdir, writeFile, rename, rm } from 'fs/promises';
 import { createAcceptedPublication, ddcOutputDigest, DdcGenerationSession, DdcLifecycle } from '@forgeax/engine-ddc';
@@ -178,6 +178,9 @@ function normalizeDependencyPath(path) {
   }
   return parts.join("/");
 }
+function dependencyIdentity(fs, sourcePath) {
+  return normalizeDependencyPath(fs.sourceIdentityFor?.(sourcePath) ?? sourcePath);
+}
 function errResult(error) {
   return { ok: false, error };
 }
@@ -315,7 +318,7 @@ async function runImport(meta, registry, fs) {
   }
   const dependencies = /* @__PURE__ */ new Set();
   const readSource = async (sourcePath) => {
-    dependencies.add(normalizeDependencyPath(sourcePath));
+    dependencies.add(dependencyIdentity(fs, sourcePath));
     try {
       return await fs.readSource(sourcePath);
     } catch (error) {
@@ -326,7 +329,7 @@ async function runImport(meta, registry, fs) {
     let inner;
     try {
       if (fs.readSibling) {
-        dependencies.add(normalizeDependencyPath(joinSiblingPath(meta.source, uri)));
+        dependencies.add(dependencyIdentity(fs, joinSiblingPath(meta.source, uri)));
         inner = await fs.readSibling(meta.source, uri);
       } else {
         inner = await readSource(joinSiblingPath(meta.source, uri));
@@ -1740,11 +1743,13 @@ function canonicalScriptableSourcePath(sourcePath) {
   const markerIndex = normalized.indexOf(marker);
   return markerIndex < 0 ? normalized : normalized.slice(markerIndex + 1);
 }
-function scriptablePackInputs(sourcePaths, declarations, cwd, generationFor, policyFor) {
+function scriptablePackInputs(sourcePaths, declarations, cwd, generationFor, policyFor, sourceIdentityFor) {
   return sourcePaths.flatMap((sourcePath) => {
     const declaration = declarations.get(resolve(cwd, sourcePath));
     if (declaration?.format !== "pack.ts") return [];
-    const displaySourcePath = canonicalScriptableSourcePath(sourcePath);
+    const projected = sourceIdentityFor?.(sourcePath);
+    const catalogSourcePath = projected === void 0 || isAbsolute(projected) ? relative(cwd, sourcePath) : projected;
+    const displaySourcePath = canonicalScriptableSourcePath(catalogSourcePath);
     return [
       {
         sourcePath: resolve(cwd, sourcePath),
@@ -2097,6 +2102,22 @@ async function produceScriptablePackProducts(sources, declaredExternalOutputs =
   }
   return ok(prepared);
 }
+function normalizeCatalogPath(path) {
+  return path.replaceAll("\\", "/").replace(/^\.\//, "");
+}
+function sourceDeclarationForCatalogPath(sourcePath, declarations, sourceIdentityFor, cwd = process.cwd()) {
+  const normalized = normalizeCatalogPath(sourcePath);
+  const direct = declarations.get(resolve(cwd, sourcePath));
+  if (direct !== void 0) {
+    return { sourcePath: resolve(cwd, sourcePath), declaration: direct };
+  }
+  for (const [physicalPath, declaration] of declarations) {
+    if (catalogSourcePathFor(cwd, physicalPath, sourceIdentityFor) === normalized) {
+      return { sourcePath: physicalPath, declaration };
+    }
+  }
+  return void 0;
+}
 
 // src/build-production.ts
 function scriptableArtifactPath(guid, key) {
@@ -2114,11 +2135,7 @@ function runtimePublicationFor(context, input) {
   });
 }
 async function buildAuthoredPackages(context) {
-  const scriptableSources = [
-    ...new Set(
-      context.inventory.entries.filter((entry) => entry.sourcePath.endsWith(".pack.ts")).map((entry) => entry.sourcePath)
-    )
-  ];
+  const scriptableSources = [...context.inventory.sourceDeclarations.entries()].filter(([, declaration]) => declaration.format === "pack.ts").map(([sourcePath]) => sourcePath);
   if (scriptableSources.length === 0) return /* @__PURE__ */ new Map();
   const inputs = scriptablePackInputs(
     scriptableSources,
@@ -2129,7 +2146,8 @@ async function buildAuthoredPackages(context) {
       base: context.basePrefix === "" ? "/" : context.basePrefix,
       packagePath: `assets/${product.anchorGuid}.pack.json`,
       artifactPath: scriptableArtifactPath
-    })
+    }),
+    context.fsForImport.sourceIdentityFor
   );
   const preparedResult = await produceScriptablePackProducts(
     inputs,
@@ -2207,7 +2225,7 @@ async function buildAuthoredPackages(context) {
   }
   return result;
 }
-function updateImportedEntries(entries, guids, packageUrl, projection = {}, refsByGuid, publication) {
+function updateImportedEntries(entries, guids, packageUrl, projection = {}, refsByGuid, publication, sourcePath) {
   const selected = new Set(guids.map((guid) => guid.toLowerCase()));
   for (let index = 0; index < entries.length; index += 1) {
     const entry = entries[index];
@@ -2217,6 +2235,7 @@ function updateImportedEntries(entries, guids, packageUrl, projection = {}, refs
       ...entry,
       packageUrl,
       ...projection,
+      ...sourcePath === void 0 ? {} : { sourcePath },
       ...publication === void 0 ? {} : { publication },
       ...refs === void 0 ? {} : { refs }
     };
@@ -2243,13 +2262,20 @@ async function emitPackDocument(work, options) {
     packageUrl,
     options.projection,
     options.refsByGuid,
-    options.publication
+    options.publication,
+    options.sourcePath
   );
   return packageUrl;
 }
 async function emitAuthoredPack(work, guidSeen, entry) {
-  const packPath = resolve(work.context.cwd, entry.sourcePath);
-  const declaration = work.context.inventory.sourceDeclarations.get(packPath);
+  const sourceDeclaration = sourceDeclarationForCatalogPath(
+    entry.sourcePath,
+    work.context.inventory.sourceDeclarations,
+    work.context.fsForImport.sourceIdentityFor,
+    work.context.cwd
+  );
+  const packPath = sourceDeclaration?.sourcePath ?? resolve(work.context.cwd, entry.sourcePath);
+  const declaration = sourceDeclaration?.declaration;
   if (declaration?.format !== "pack.json") {
     throw work.context.fail({
       code: "catalog-declaration-missing",
@@ -2272,8 +2298,8 @@ async function emitAuthoredPack(work, guidSeen, entry) {
   const authoredPack = prepared.finalized?.pack ?? prepared.pack;
   const runtimePublication = authoredPack.assets === void 0 || authoredPack.assets.length === 0 ? void 0 : runtimePublicationFor(work.context, {
     pack: { assets: authoredPack.assets },
-    sourcePath: packPath,
-    sourceRevision: prepared.finalized?.sourceRevision ?? entry.sourcePath,
+    sourcePath: entry.sourcePath,
+    sourceRevision: declaration.sourceRevision,
     packageUrl: prepared.finalized?.packageUrl ?? `${work.context.basePrefix === "/" ? "" : work.context.basePrefix}/assets/${outputGuid}.pack.json`,
     ...prepared.finalized?.digest === void 0 ? {} : { digest: prepared.finalized.digest }
   });
@@ -2291,7 +2317,7 @@ async function emitAuthoredPack(work, guidSeen, entry) {
     guidSeen.add(guid.toLowerCase());
   }
 }
-async function emitFinalizedOwner(work, metaPath, subAssets, sourcePackage, ownerFinalizer) {
+async function emitFinalizedOwner(work, metaPath, sourcePath, subAssets, sourcePackage, ownerFinalizer) {
   const ownerGuid = subAssets[0]?.guid;
   if (ownerGuid === void 0) return;
   const artifactPaths = /* @__PURE__ */ new Map();
@@ -2334,7 +2360,10 @@ async function emitFinalizedOwner(work, metaPath, subAssets, sourcePackage, owne
   );
   const runtimePublication = runtimePublicationFor(work.context, {
     pack: { assets: ownerPackage.pack.assets },
-    sourcePath: metaPath,
+    // The Catalog entry identifies the imported source, while metaPath is the
+    // sidecar declaration that drove the import. Keep publication fences on
+    // the Catalog identity in production just as the dev importer does.
+    sourcePath,
     sourceRevision: ownerPackage.sourceRevision,
     packageUrl: ownerPackage.packageUrl,
     digest: ownerPackage.digest
@@ -2352,7 +2381,8 @@ async function emitFinalizedOwner(work, metaPath, subAssets, sourcePackage, owne
         asset.refs.map((ref2) => ref2.guid)
       ])
     ),
-    publication: runtimePublication.publication
+    publication: runtimePublication.publication,
+    sourcePath
   });
 }
 async function emitBuildEntry(work, guidSeen, entry) {
@@ -2383,7 +2413,14 @@ async function emitBuildEntry(work, guidSeen, entry) {
   if (!sourcePackage.ok) throw work.context.fail(sourcePackage.error);
   const ownerFinalizer = work.context.importerRegistry.get(runMeta.importer)?.finalize;
   if (ownerFinalizer !== void 0) {
-    await emitFinalizedOwner(work, metaPath, subAssets, sourcePackage.value, ownerFinalizer);
+    await emitFinalizedOwner(
+      work,
+      metaPath,
+      canonicalScriptableSourcePath(entry.sourcePath),
+      subAssets,
+      sourcePackage.value,
+      ownerFinalizer
+    );
     return;
   }
   const finalized = await finalizePackageTransportSource(
@@ -2397,9 +2434,12 @@ async function emitBuildEntry(work, guidSeen, entry) {
     }
   );
   const productByGuid = sourcePackageAssetsByGuid(sourcePackage.value);
+  const canonicalSourcePath = canonicalScriptableSourcePath(entry.sourcePath);
   const runtimePublication = runtimePublicationFor(work.context, {
     pack: { assets: finalized.pack.assets },
-    sourcePath: metaPath,
+    // See emitFinalizedOwner: the sidecar path is an import driver, not the
+    // stable source identity carried by the Catalog row.
+    sourcePath: canonicalSourcePath,
     sourceRevision: finalized.sourceRevision,
     packageUrl: finalized.packageUrl,
     digest: finalized.digest
@@ -2414,7 +2454,8 @@ async function emitBuildEntry(work, guidSeen, entry) {
     refsByGuid: new Map(
       [...productByGuid].map(([guid2, asset]) => [guid2, asset.refs.map((ref2) => ref2.guid)])
     ),
-    publication: runtimePublication.publication
+    publication: runtimePublication.publication,
+    sourcePath: canonicalSourcePath
   });
 }
 async function produceBuildAssets(context) {
@@ -2481,12 +2522,13 @@ function catalogImporterPolicy(importer, hostImporterKeys) {
     hint: "wire the provider through the host importer registry before building the Catalog"
   };
 }
-async function buildCatalogResult(roots, base = "/", registeredImporterKeys = /* @__PURE__ */ new Set(), scanOptions = {}, catalogVisibility = () => true) {
+async function buildCatalogResult(roots, base = "/", registeredImporterKeys = /* @__PURE__ */ new Set(), scanOptions = {}, catalogVisibility = () => true, sourceIdentityFor) {
   const options = {
     base,
     scanOptions,
     importerPolicy: (importer) => catalogImporterPolicy(importer, registeredImporterKeys),
-    visibility: catalogVisibility
+    visibility: catalogVisibility,
+    ...sourceIdentityFor === void 0 ? {} : { sourceIdentityFor }
   };
   return buildCatalogProjection(roots, options);
 }
@@ -2615,7 +2657,38 @@ function importFailureCode(error) {
       return "source-package-conversion-failed";
   }
 }
+var IMPORT_ERROR_CODES = /* @__PURE__ */ new Set([
+  "importer-not-registered",
+  "source-read-failed",
+  "import-produced-no-assets",
+  "guid-mismatch",
+  "mesh-material-slot-topology-change",
+  "import-internal-error",
+  "source-validation-failed",
+  "unknown-source-key",
+  "duplicate-source-key",
+  "invalid-source-overrides",
+  "invalid-source-override-payload"
+]);
+function findNormalizableCause(error, seen = /* @__PURE__ */ new Set()) {
+  if (error === null || typeof error !== "object" || seen.has(error)) return void 0;
+  seen.add(error);
+  if (isSourcePackageError(error) || isScriptablePackFailure(error) || isImportError(error)) {
+    return error;
+  }
+  const cause = error.cause;
+  return cause === void 0 ? void 0 : findNormalizableCause(cause, seen);
+}
+function containsSourcePackageError(error, seen = /* @__PURE__ */ new Set()) {
+  if (error === null || typeof error !== "object" || seen.has(error)) return false;
+  seen.add(error);
+  if (isSourcePackageError(error) || isImportError(error)) return true;
+  const cause = error.cause;
+  return cause !== void 0 && containsSourcePackageError(cause, seen);
+}
 function normalizeSourcePackageError(error, context) {
+  const cause = findNormalizableCause(error);
+  if (cause !== void 0 && cause !== error) return normalizeSourcePackageError(cause, context);
   if (isSourcePackageError(error)) return error;
   if (isScriptablePackFailure(error)) {
     return sourcePackageError("source-package-conversion-failed", context, {
@@ -2644,7 +2717,7 @@ function contextErrorStage(error) {
   return error instanceof SyntaxError ? "source-package-meta-invalid" : "source-package-conversion-failed";
 }
 function isImportError(error) {
-  return error !== null && typeof error === "object" && "code" in error && "expected" in error && "hint" in error && "detail" in error;
+  return error !== null && typeof error === "object" && "code" in error && typeof error.code === "string" && IMPORT_ERROR_CODES.has(error.code) && "expected" in error && "hint" in error && "detail" in error;
 }
 function isScriptablePackFailure(error) {
   return error !== null && typeof error === "object" && "code" in error && typeof error.code === "string" && error.code.startsWith("pack-source-") && "expected" in error && typeof error.expected === "string" && "hint" in error && typeof error.hint === "string" && "detail" in error;
@@ -2652,6 +2725,19 @@ function isScriptablePackFailure(error) {
 function inspectHead(root, guid, desiredKey) {
   return new DdcLifecycle(root).inspect(guid, desiredKey);
 }
+var PUBLICATION_SETTLE_TIMEOUT_MS = 5e3;
+var PUBLICATION_SETTLE_POLL_MS = 10;
+async function inspectAfterSupersededCommit(candidate) {
+  let head = await inspectHead(candidate.root, candidate.lease.guid, candidate.lease.desiredKey);
+  if (head.state === "current" && head.currentKey === candidate.lease.desiredKey) return head;
+  const deadline = Date.now() + PUBLICATION_SETTLE_TIMEOUT_MS;
+  while (Date.now() < deadline && head.activeLease !== void 0 && head.activeLease.attempt !== candidate.lease.attempt && head.activeLease.desiredKey === candidate.lease.desiredKey) {
+    await new Promise((resolve4) => setTimeout(resolve4, PUBLICATION_SETTLE_POLL_MS));
+    head = await inspectHead(candidate.root, candidate.lease.guid, candidate.lease.desiredKey);
+    if (head.state === "current" && head.currentKey === candidate.lease.desiredKey) return head;
+  }
+  return head;
+}
 async function stageSourcePackageDdc(input) {
   const session = new DdcGenerationSession(input.root, { generation: 1 });
   try {
@@ -2670,6 +2756,10 @@ async function commitSourcePackageDdc(candidate) {
   try {
     const commit = await candidate.session.commitEntry(candidate, candidate.lease.desiredKey);
     if (commit.result !== "current") {
+      const head = await inspectAfterSupersededCommit(candidate);
+      if (head.state === "current" && head.currentKey === candidate.lease.desiredKey) {
+        return ok(head);
+      }
       return err(
         sourcePackageError("source-package-ddc-failed", candidate.context, {
           stage: "ddc",
@@ -2827,6 +2917,6 @@ async function restoreImportPublication(candidate) {
   await candidate.ddc.session.restoreEntry(candidate.ddc);
 }
 
-export { AssetOutputProducerRegistry, DEFAULT_CATALOG_IMPORTER_KEYS, ImporterRegistry, SHADER_RESERVED_IMPORTER_KEY, buildCatalogResult, buildScriptablePack, canonicalScriptableSourcePath, catalogImporterPolicy, commitImportPublication, createImportProduct, createSceneAssetOutputProducer, createScriptablePackStagedAssetSnapshotSource, createStandardAssetOutputProducerRegistry, declaredPackExternalOutputs, discardImportPublication, finalizeImportProducts, finalizeSourcePackage, materialAssetOutputProducer, materializePreparedScriptablePack, meshAssetOutputProducer, normaliseForPack, normalizeSourcePackageError, packMeshBinV4, parseProducerReadiness, prepareAuthoredPackTransport, produceBuildAssets, produceScriptablePackProducts, produceScriptableSourcePackage, produceSourcePackage, projectImportProductForBuild, projectScriptablePackPublication, publishImportPublication, readCookedAuthoredPack, restoreImportPublication, runImport, scriptablePackInputs, sourcePackageAssetsByGuid, sourcePackageError, stageImportPublication };
+export { AssetOutputProducerRegistry, DEFAULT_CATALOG_IMPORTER_KEYS, ImporterRegistry, SHADER_RESERVED_IMPORTER_KEY, buildCatalogResult, buildScriptablePack, canonicalScriptableSourcePath, catalogImporterPolicy, commitImportPublication, containsSourcePackageError, createImportProduct, createSceneAssetOutputProducer, createScriptablePackStagedAssetSnapshotSource, createStandardAssetOutputProducerRegistry, declaredPackExternalOutputs, discardImportPublication, finalizeImportProducts, finalizeSourcePackage, materialAssetOutputProducer, materializePreparedScriptablePack, meshAssetOutputProducer, normaliseForPack, normalizeSourcePackageError, packMeshBinV4, parseProducerReadiness, prepareAuthoredPackTransport, produceBuildAssets, produceScriptablePackProducts, produceScriptableSourcePackage, produceSourcePackage, projectImportProductForBuild, projectScriptablePackPublication, publishImportPublication, readCookedAuthoredPack, restoreImportPublication, runImport, scriptablePackInputs, sourceDeclarationForCatalogPath, sourcePackageAssetsByGuid, sourcePackageError, stageImportPublication };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map