@forgeax/engine-pack 0.1.32 → 0.1.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forgeax/engine-pack",
-  "version": "0.1.32",
+  "version": "0.1.33",
   "private": false,
   "type": "module",
   "license": "Apache-2.0",
@@ -128,7 +128,7 @@
     }
   },
   "dependencies": {
-    "@forgeax/engine-types": "0.1.32",
+    "@forgeax/engine-types": "0.1.33",
     "@noble/hashes": "^2.2.0",
     "fast-glob": "^3.3.3",
     "typescript": "^5.8.3",

package/src/__tests__/pack-authoring-gateway.unit.test.ts

@@ -1,4 +1,4 @@
-import { mkdtemp, readFile, rm } from 'node:fs/promises';
+import { mkdtemp, readFile, rm, writeFile } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { afterEach, describe, expect, it } from 'vitest';
@@ -296,3 +296,73 @@ describe('Pack authoring gateway', () => {
     expect(verified).toMatchObject({ ok: true, value: { summary: { assetCount: 1 } } });
   });
 });
+
+it('inspects the exact source revision used by rebuild conflict checks', async () => {
+  const root = await mkdtemp(join(tmpdir(), 'forgeax-inspect-revision-'));
+  roots.push(root);
+  const outputs = [
+    {
+      packageId: SOURCE_PACKAGE,
+      sourceKey: 'mesh/main',
+      guid: AssetGuid.format(AssetGuid.derive(packageId(SOURCE_PACKAGE), 'mesh/main')),
+      kind: 'mesh',
+      sourcePath: 'assets/source.pack.ts',
+      ready: true,
+    },
+  ];
+  let published = false;
+  const gateway = createFileSystemPackAuthoringGateway({
+    gameRoot: root,
+    materialized: () => (published ? outputs : []),
+    rebuild: async () => ({ ok: true, value: undefined }),
+  });
+  const created = await gateway.execute({
+    operation: 'asset-source.create',
+    requestId: 'create',
+    targetPath: 'assets/source.pack.ts',
+    format: 'pack.ts',
+    packageId: SOURCE_PACKAGE,
+  });
+  expect(created.ok).toBe(true);
+  if (!created.ok) return;
+  published = true;
+  const inspected = await gateway.execute({
+    operation: 'asset.inspect',
+    subject: 'assets/source.pack.ts',
+    requestId: 'inspect',
+  });
+  expect(inspected).toMatchObject({
+    ok: true,
+    value: {
+      revision: created.value.revision,
+      sourcePath: 'assets/source.pack.ts',
+      assets: outputs,
+    },
+  });
+  const rebuilt = await gateway.execute({
+    operation: 'asset-source.rebuild',
+    sourcePath: 'assets/source.pack.ts',
+    expectedRevision: created.value.revision,
+    requestId: 'rebuild',
+  });
+  expect(rebuilt).toMatchObject({
+    ok: true,
+    value: { assets: outputs, revision: created.value.revision },
+  });
+  const path = join(root, 'assets/source.pack.ts');
+  await writeFile(path, `${await readFile(path, 'utf8')}\n// source edit\n`);
+  const changed = await gateway.execute({
+    operation: 'asset.inspect',
+    subject: 'assets/source.pack.ts',
+    requestId: 'inspect-edited',
+  });
+  expect(changed.ok).toBe(true);
+  if (changed.ok) expect(changed.value.revision).not.toBe(created.value.revision);
+  const stale = await gateway.execute({
+    operation: 'asset-source.rebuild',
+    sourcePath: 'assets/source.pack.ts',
+    expectedRevision: created.value.revision,
+    requestId: 'stale',
+  });
+  expect(stale).toMatchObject({ ok: false, error: { code: 'pack-source-revision-conflict' } });
+});

package/src/pack-authoring-node.ts

@@ -817,6 +817,19 @@ async function inspectAsset(
   const selected = subjectFor(gameRoot, snapshot, operation);
   if (!selected.ok) return selected;
   const subject = selected.value;
+  const source = await readConfined({ gameRoot }, operation, subject.relativePath);
+  if (!source.ok) return source;
+  const inspectedSource = {
+    ...sourceResult(subject, operation),
+    revision: source.value.revision,
+    ...(subject.format === 'source'
+      ? {
+          assets: snapshot.materialized
+            .filter((asset) => asset.packageId === packageKey(subject.packageId))
+            .map((asset) => ({ ...asset })),
+        }
+      : {}),
+  };
   if (operation.sourceKey !== undefined) {
     if (!isValidPackSourceKey(operation.sourceKey)) {
       return err(
@@ -851,7 +864,7 @@ async function inspectAsset(
           candidate.sourceKey === operation.sourceKey,
       );
       return ok({
-        ...sourceResult(subject, operation),
+        ...inspectedSource,
         sourceKey: asset.sourceKey,
         guid: asset.guid,
         kind: asset.kind,
@@ -871,7 +884,7 @@ async function inspectAsset(
           candidate.sourceKey === operation.sourceKey,
       );
       return ok({
-        ...sourceResult(subject, operation),
+        ...inspectedSource,
         sourceKey: operation.sourceKey,
         guid,
         ...(materialized === undefined
@@ -897,7 +910,7 @@ async function inspectAsset(
     const resolved = await resolveInstance(snapshot, subject);
     if (!resolved.ok) return resolved;
     return ok({
-      ...sourceResult(subject, operation),
+      ...inspectedSource,
       parameters: resolved.value.parameters.map((parameter) => ({
         name: parameter.name,
         type: parameter.type,
@@ -911,7 +924,7 @@ async function inspectAsset(
       parentChain: resolved.value.parentChain,
     });
   }
-  return ok(sourceResult(subject, operation));
+  return ok(inspectedSource);
 }
 
 function listAssets(
@@ -2188,6 +2201,9 @@ async function executeRaw(
       selected.value.packageId,
       {
         format: refreshed.value.relative.endsWith('.pack.json') ? 'pack.json' : 'pack.ts',
+        assets: refreshedSnapshot.value.materialized
+          .filter((asset) => asset.packageId === packageKey(selected.value.packageId))
+          .map((asset) => ({ ...asset })),
       },
     );
   }