@_linked/translation 0.6.0 → 0.8.0

package/lib/esm/shapes/TranslationProvider.js

@@ -208,6 +208,7 @@ export function groupTranslationEntries(keyRows = [], unitRows = [], versionRows
             format: row.format === 'icu' ? 'icu' : 'simple',
             ofShape: iri(row.ofShape),
             ofProperty: iri(row.ofProperty),
+            ofResource: iri(row.ofResource),
             fromPackage: row.fromPackage || undefined,
             overridden: row.overridden === true || row.overridden === 'true'
                 ? true
@@ -287,6 +288,7 @@ export async function listTranslationKeys(data) {
         k.ofField,
         k.ofShape,
         k.ofProperty,
+        k.ofResource,
         k.fromPackage,
         k.overridden,
         k.format,
@@ -310,6 +312,7 @@ export async function listTranslationEntries(data) {
             k.format,
             k.ofShape,
             k.ofProperty,
+            k.ofResource,
             k.fromPackage,
             k.overridden,
             k.currentVersion,
@@ -846,7 +849,7 @@ export async function decideTranslationProposal(data, reviewer) {
  * Source drift marks every existing language unit stale before returning.
  */
 export async function upsertTranslationKey(data, authorship = {}) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
     const appId = requireText(data.appId, 'appId');
     const key = requireText(data.key, 'key');
     requireText(data.sourceText, 'sourceText');
@@ -862,29 +865,52 @@ export async function upsertTranslationKey(data, authorship = {}) {
         ofField: data.ofField,
         ofShape: data.ofShape ? { id: data.ofShape } : undefined,
         ofProperty: data.ofProperty ? { id: data.ofProperty } : undefined,
+        ofResource: data.ofResource ? { id: data.ofResource } : undefined,
         fromPackage: data.fromPackage,
-        overridden: data.overridden === true ? true : undefined,
+        overridden: data.overridden,
         format: (_c = data.format) !== null && _c !== void 0 ? _c : 'simple',
     };
+    // No catch: a failed read is not permission to create or overwrite the key.
     const existing = await TranslationKey.select((k) => [
         k.sourceText,
         k.format,
         k.ofShape,
+        k.ofProperty,
+        k.ofResource,
+        k.fromPackage,
         k.overridden,
         k.currentVersion,
     ])
         .where((k) => k.equals({ id }))
-        .one()
-        .catch(() => null);
+        .one();
     if (existing) {
         const sourceChanged = existing.sourceText !== data.sourceText;
+        const formatChanged = ((_d = existing.format) !== null && _d !== void 0 ? _d : 'simple') !== ((_e = data.format) !== null && _e !== void 0 ? _e : 'simple');
         const wasOverridden = existing.overridden === true;
-        // AD-N override rule: editing the source of a SHAPE-owned key through the
-        // per-app path (this write) marks the app copy `overridden`, so shape-route
-        // propagation won't clobber the app's local wording. An explicit
-        // `data.overridden` (e.g. the installer clearing it) always wins.
-        const isShapeKey = !!existing.ofShape || !!data.ofShape;
-        if (data.overridden === undefined && isShapeKey && sourceChanged) {
+        if (authorship.source === 'declaration-sync' && wasOverridden) {
+            const versionId = iri(existing.currentVersion);
+            if (!versionId)
+                throw new Error(`Translation override ${id} has no current version; refresh refused without changing its source.`);
+            // No key write, version creation or unit invalidation. The declaration
+            // inventory still records the package's current source independently.
+            return { id, versionId, versionCreated: false, preservedOverride: true };
+        }
+        // AD-N ownership also covers property/resource/package declarations (help,
+        // actions, groups), not only shapes. App edits preserve the first canonical
+        // wording in the existing shapeSource carrier. Only an explicit app edit
+        // may clear the override; automatic discovery cannot clear it by payload.
+        const isDeclaredKey = !!(existing.ofShape ||
+            existing.ofProperty ||
+            existing.ofResource ||
+            existing.fromPackage ||
+            data.ofShape ||
+            data.ofProperty ||
+            data.ofResource ||
+            data.fromPackage);
+        if (authorship.source !== 'declaration-sync' &&
+            data.overridden === undefined &&
+            isDeclaredKey &&
+            (sourceChanged || formatChanged)) {
             values.overridden = true;
             // Snapshot the canonical at FIRST divergence so "clear override" has a
             // value to revert to even for a single-app project. Later edits keep the
@@ -896,28 +922,33 @@ export async function upsertTranslationKey(data, authorship = {}) {
             appId,
             keyId: id,
             currentVersion: existing.currentVersion,
-            sourceLanguage: (_d = data.sourceLanguage) !== null && _d !== void 0 ? _d : 'en',
-            sourceText: (_e = existing.sourceText) !== null && _e !== void 0 ? _e : '',
+            sourceLanguage: (_f = data.sourceLanguage) !== null && _f !== void 0 ? _f : 'en',
+            sourceText: (_g = existing.sourceText) !== null && _g !== void 0 ? _g : '',
             format: existing.format === 'icu' ? 'icu' : 'simple',
             createdBy: authorship.createdBy,
         });
         const decision = classifyKeyVersion(currentVersion, {
             sourceText: data.sourceText,
-            format: (_f = data.format) !== null && _f !== void 0 ? _f : 'simple',
+            format: (_h = data.format) !== null && _h !== void 0 ? _h : 'simple',
         });
         const nextVersion = decision.action === 'create-version'
             ? await createTranslationKeyVersion({
                 appId,
                 keyId: id,
-                sourceLanguage: (_h = (_g = data.sourceLanguage) !== null && _g !== void 0 ? _g : currentVersion.sourceLanguage) !== null && _h !== void 0 ? _h : 'en',
+                sourceLanguage: (_k = (_j = data.sourceLanguage) !== null && _j !== void 0 ? _j : currentVersion.sourceLanguage) !== null && _k !== void 0 ? _k : 'en',
                 sourceText: data.sourceText,
-                format: (_j = data.format) !== null && _j !== void 0 ? _j : 'simple',
+                format: (_l = data.format) !== null && _l !== void 0 ? _l : 'simple',
                 supersedes: currentVersion.id,
                 createdBy: authorship.createdBy,
             })
             : currentVersion;
         values.currentVersion = { id: nextVersion.id };
-        await TranslationKey.update(values).for({ id });
+        // In the Linked mutation DSL an explicitly present `undefined` removes
+        // that predicate. A partial source edit has not requested removal of the
+        // declaration owner, help description, or existing override flag. Omit
+        // untouched fields; an explicit false (reset) remains a real write.
+        const patch = Object.fromEntries(Object.entries(values).filter(([, value]) => value !== undefined));
+        await TranslationKey.update(patch).for({ id });
         if (decision.action === 'create-version') {
             await TranslationUnit.update({ state: 'stale' }).where((u) => u.ofKey.equals({ id }));
         }
@@ -931,9 +962,9 @@ export async function upsertTranslationKey(data, authorship = {}) {
     const firstVersion = await createTranslationKeyVersion({
         appId,
         keyId: id,
-        sourceLanguage: (_k = data.sourceLanguage) !== null && _k !== void 0 ? _k : 'en',
+        sourceLanguage: (_m = data.sourceLanguage) !== null && _m !== void 0 ? _m : 'en',
         sourceText: data.sourceText,
-        format: (_l = data.format) !== null && _l !== void 0 ? _l : 'simple',
+        format: (_o = data.format) !== null && _o !== void 0 ? _o : 'simple',
         createdBy: authorship.createdBy,
     });
     await TranslationKey.update({
@@ -1215,7 +1246,7 @@ export class TranslationProvider extends ShapeProvider {
     }
     /**
      * Authoring gate. Reads `linkedAuth` off the request the LINKED server already
-     * populates, so this stays portable (no Create Now import, AD-G).
+     * populates, so this stays portable (no host-application import, AD-G).
      *
      * Every method except `getMessages` resolves the caller once, synchronously,
      * before its first `await`, and uses that value for both the permission check