@forgeax/engine-import 0.1.31 → 0.1.33

package/dist/source-package-publication.d.ts.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forgeax/engine-import",
-  "version": "0.1.31",
+  "version": "0.1.33",
   "private": false,
   "type": "module",
   "license": "Apache-2.0",
@@ -27,13 +27,13 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@forgeax/engine-ddc": "0.1.31",
-    "@forgeax/engine-ecs": "0.1.31",
-    "@forgeax/engine-geometry": "0.1.31",
-    "@forgeax/engine-pack": "0.1.31",
-    "@forgeax/engine-scene": "0.1.31",
-    "@forgeax/engine-shader": "0.1.31",
-    "@forgeax/engine-types": "0.1.31",
+    "@forgeax/engine-ddc": "0.1.33",
+    "@forgeax/engine-ecs": "0.1.33",
+    "@forgeax/engine-geometry": "0.1.33",
+    "@forgeax/engine-pack": "0.1.33",
+    "@forgeax/engine-scene": "0.1.33",
+    "@forgeax/engine-shader": "0.1.33",
+    "@forgeax/engine-types": "0.1.33",
     "@noble/hashes": "^2.2.0"
   },
   "devDependencies": {

package/src/__tests__/source-package-publication.integration.test.ts

@@ -2,7 +2,7 @@ import { createHash } from 'node:crypto';
 import { mkdtemp, readdir, readFile, rm } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
-import { DdcEntryStore } from '@forgeax/engine-ddc';
+import { DdcEntryStore, ddcOutputDigest } from '@forgeax/engine-ddc';
 import { afterEach, describe, expect, it } from 'vitest';
 import {
   commitImportPublication,
@@ -160,6 +160,145 @@ describe('source package publication concurrency', () => {
     });
   });
 
+  it('reuses the runtime Pack body when its semantic output is unchanged', async () => {
+    const root = await mkdtemp(join(tmpdir(), 'forgeax-source-publication-'));
+    roots.push(root);
+    const pack = {
+      ...(input(root).pack as {
+        readonly assets: readonly unknown[];
+        readonly schemaVersion: '2.0.0';
+      }),
+      kind: 'internal-text-package' as const,
+      scopeId: 'editor-main',
+      generation: 17,
+      digest: 'sha256:semantic',
+      outputSetDigest: 'sha256:outputs',
+    };
+    const staged = await stageImportPublication({ ...input(root), pack });
+    expect(staged.ok).toBe(true);
+    if (!staged.ok) return;
+    await expect(commitImportPublication(staged.candidate)).resolves.toMatchObject({ ok: true });
+
+    const entry = await new DdcEntryStore(root).read(KEY);
+    expect(entry?.payload).toEqual({
+      schemaVersion: '2.0.0',
+      kind: 'internal-text-package',
+      assets: (pack as unknown as { readonly assets: unknown }).assets,
+      digest: pack.digest,
+      outputSetDigest: pack.outputSetDigest,
+    });
+    expect(entry?.receipt.publicationGeneration).toBe(pack.generation);
+  });
+
+  it('keeps fresh DDC payload bytes independent from publication generation', async () => {
+    const firstRoot = await mkdtemp(join(tmpdir(), 'forgeax-source-publication-'));
+    const secondRoot = await mkdtemp(join(tmpdir(), 'forgeax-source-publication-'));
+    roots.push(firstRoot, secondRoot);
+    const basePack = input(firstRoot).pack as Record<string, unknown>;
+    const firstPack = {
+      ...basePack,
+      kind: 'internal-text-package' as const,
+      scopeId: 'first-scope',
+      generation: 1114181571,
+      digest: 'sha256:semantic',
+      outputSetDigest: 'sha256:outputs',
+    };
+    const secondPack = { ...firstPack, scopeId: 'second-scope', generation: 2018541951 };
+
+    const first = await stageImportPublication({ ...input(firstRoot), pack: firstPack });
+    const second = await stageImportPublication({ ...input(secondRoot), pack: secondPack });
+    expect(first.ok).toBe(true);
+    expect(second.ok).toBe(true);
+    if (!first.ok || !second.ok) return;
+    await expect(commitImportPublication(first.candidate)).resolves.toMatchObject({ ok: true });
+    await expect(commitImportPublication(second.candidate)).resolves.toMatchObject({ ok: true });
+
+    const firstEntry = await new DdcEntryStore(firstRoot).read(KEY);
+    const secondEntry = await new DdcEntryStore(secondRoot).read(KEY);
+    expect(firstEntry?.payload).toEqual(secondEntry?.payload);
+    expect(firstEntry?.payload).not.toHaveProperty('scopeId');
+    expect(firstEntry?.payload).not.toHaveProperty('generation');
+    expect(firstEntry?.receipt.publicationGeneration).toBe(firstPack.generation);
+    expect(secondEntry?.receipt.publicationGeneration).toBe(secondPack.generation);
+    expect(firstEntry?.receipt.outputDigest).toBe(secondEntry?.receipt.outputDigest);
+  });
+
+  it('accepts concurrent semantic candidates with different publication generations', async () => {
+    const root = await mkdtemp(join(tmpdir(), 'forgeax-source-publication-'));
+    roots.push(root);
+    const basePack = input(root).pack as Record<string, unknown>;
+    const firstPack = {
+      ...basePack,
+      kind: 'internal-text-package' as const,
+      scopeId: 'first-scope',
+      generation: 1114181571,
+      digest: 'sha256:semantic',
+      outputSetDigest: 'sha256:outputs',
+    };
+    const secondPack = { ...firstPack, scopeId: 'second-scope', generation: 2018541951 };
+    const first = await stageImportPublication({ ...input(root), pack: firstPack });
+    const second = await stageImportPublication({ ...input(root), pack: secondPack });
+    expect(first.ok).toBe(true);
+    expect(second.ok).toBe(true);
+    if (!first.ok || !second.ok) return;
+
+    const winner = await commitImportPublication(second.candidate);
+    const loser = await commitImportPublication(first.candidate);
+    expect(winner).toMatchObject({ ok: true });
+    expect(loser).toMatchObject({ ok: true });
+    await expect(new DdcEntryStore(root).read(KEY)).resolves.toMatchObject({
+      payload: expect.not.objectContaining({
+        scopeId: expect.anything(),
+        generation: expect.anything(),
+      }),
+    });
+  });
+
+  it('reuses a legacy runtime payload when only its publication generation changes', async () => {
+    const root = await mkdtemp(join(tmpdir(), 'forgeax-source-publication-'));
+    roots.push(root);
+    const oldPack = {
+      ...(input(root).pack as {
+        readonly assets: readonly unknown[];
+        readonly schemaVersion: '2.0.0';
+      }),
+      kind: 'internal-text-package' as const,
+      scopeId: 'old-scope',
+      generation: 1114181571,
+      digest: 'sha256:semantic',
+      outputSetDigest: 'sha256:outputs',
+    };
+    await expect(
+      new DdcEntryStore(root).write({
+        key: KEY,
+        guid: GUID,
+        payload: oldPack,
+        refs: [],
+        artifacts: {},
+        receipt: {
+          guid: GUID,
+          key: KEY,
+          producer: 'engine-import/source-package-publication',
+          inputFingerprint: KEY,
+          outputDigest: ddcOutputDigest({
+            guid: GUID,
+            payload: oldPack,
+            refs: [],
+            artifacts: {},
+          }),
+        },
+      }),
+    ).resolves.toMatchObject({ result: 'published' });
+
+    const nextPack = { ...oldPack, scopeId: 'new-scope', generation: 2018541951 };
+    const second = await stageImportPublication({ ...input(root), pack: nextPack });
+    expect(second.ok).toBe(true);
+    if (!second.ok) return;
+    await expect(commitImportPublication(second.candidate)).resolves.toMatchObject({ ok: true });
+
+    await expect(new DdcEntryStore(root).read(KEY)).resolves.toMatchObject({ payload: oldPack });
+  });
+
   it.each([
     {
       label: 'missing body',

package/src/source-package-publication.ts

@@ -4,6 +4,7 @@ import { dirname } from 'node:path';
 import {
   type DdcArtifact,
   type DdcEntry,
+  DdcEntryStore,
   type DdcGenerationEntryCandidate,
   DdcGenerationSession,
   type DdcHead,
@@ -11,6 +12,7 @@ import {
   ddcOutputDigest,
 } from '@forgeax/engine-ddc';
 import { canonicalDdcJson } from '@forgeax/engine-ddc/key';
+import { stripRuntimePackLifecycle } from '@forgeax/engine-pack/build';
 import {
   type CatalogEntry,
   err,
@@ -36,6 +38,11 @@ interface StagedSourcePackageDdc extends DdcGenerationEntryCandidate {
   readonly context: SourcePackageErrorContext;
 }
 
+interface ImmutablePackSelection {
+  readonly payload: unknown;
+  readonly publicationGeneration?: number;
+}
+
 export interface ImportPublicationInput {
   readonly root: string;
   readonly guid: string;
@@ -138,6 +145,43 @@ async function stageSourcePackageDdc(
   }
 }
 
+/**
+ * DDC identity is semantic Pack content. Fresh entries keep the publication
+ * generation in receipt metadata; an existing matching entry reuses its exact
+ * body so a generation change remains an idempotent cache hit.
+ */
+async function immutablePackPayload(
+  input: ImportPublicationInput,
+): Promise<ImmutablePackSelection> {
+  const semantic = stripRuntimePackLifecycle(input.pack);
+  const existing = await new DdcEntryStore(input.root).read(input.desiredKey);
+  if (
+    existing !== null &&
+    existing.guid.toLowerCase() === input.guid.toLowerCase() &&
+    canonicalDdcJson(stripRuntimePackLifecycle(existing.payload)) === canonicalDdcJson(semantic)
+  ) {
+    return {
+      payload: existing.payload,
+      ...(existing.receipt.publicationGeneration === undefined
+        ? {}
+        : { publicationGeneration: existing.receipt.publicationGeneration }),
+    };
+  }
+  const publicationGeneration =
+    input.pack !== null &&
+    typeof input.pack === 'object' &&
+    !Array.isArray(input.pack) &&
+    typeof (input.pack as { readonly generation?: unknown }).generation === 'number' &&
+    Number.isSafeInteger((input.pack as { readonly generation: number }).generation) &&
+    (input.pack as { readonly generation: number }).generation > 0
+      ? (input.pack as { readonly generation: number }).generation
+      : undefined;
+  return {
+    payload: semantic,
+    ...(publicationGeneration === undefined ? {} : { publicationGeneration }),
+  };
+}
+
 async function commitSourcePackageDdc(
   candidate: StagedSourcePackageDdc,
 ): Promise<Result<DdcHead, SourcePackageError>> {
@@ -469,12 +513,14 @@ export async function stageImportPublication(
     };
   }
   const artifacts = validatedArtifacts.value;
+  const selected = await immutablePackPayload(input);
+  const { payload } = selected;
   const staged = await stageSourcePackageDdc({
     root: input.root,
     entry: {
       key: input.desiredKey,
       guid: input.guid,
-      payload: input.pack,
+      payload,
       refs: [],
       artifacts,
       receipt: {
@@ -482,9 +528,12 @@ export async function stageImportPublication(
         key: input.desiredKey,
         producer: 'engine-import/source-package-publication',
         inputFingerprint: input.desiredKey,
+        ...(selected.publicationGeneration === undefined
+          ? {}
+          : { publicationGeneration: selected.publicationGeneration }),
         outputDigest: ddcOutputDigest({
           guid: input.guid,
-          payload: input.pack,
+          payload,
           refs: [],
           artifacts,
         }),