♻️ Move localization-strings under localization service (ampproject#34945)

* Make #services/localization a submodule

* Move localized-strings closer to localization service

* Update owners

* Drop index exports for cleaner deps

* Update imports

* Update dep-check config

Author: rcebulko

Diff for: build-system/test-configs/dep-check-config.js

@@ -425,8 +425,10 @@ exports.rules = [
       'extensions/amp-link-rewriter/0.1/amp-link-rewriter.js->' +
         'src/service/navigation.js',
       // For localization.
-      'extensions/amp-story/1.0/amp-story-localization-service.js->src/service/localization.js',
-      'extensions/amp-story-auto-ads/0.1/story-ad-localization.js->src/service/localization.js',
+      'extensions/amp-story/1.0/amp-story-localization-service.js->src/service/localization/index.js',
+      'extensions/amp-story*/**/*.js->src/service/localization/strings.js',
+      'extensions/amp-story-auto-ads/0.1/story-ad-localization.js->src/service/localization/index.js',
+
       // Accessing calculateScriptBaseUrl() for vendor config URLs
       'extensions/amp-analytics/0.1/config.js->' +
         'src/service/extension-script.js',

Diff for: extensions/amp-story-360/0.1/amp-story-360.js

@@ -25,7 +25,7 @@ import {
 } from '../../amp-story/1.0/amp-story-store-service';
 import {CSS} from '../../../build/amp-story-360-0.1.css';
 import {CommonSignals} from '#core/constants/common-signals';
-import {LocalizedStringId} from '../../../src/localized-strings';
+import {LocalizedStringId} from '#service/localization/strings';
 import {Matrix, Renderer} from '#third_party/zuho/zuho';
 import {Services} from '#service';
 import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout';

Diff for: extensions/amp-story-auto-ads/0.1/story-ad-localization.js

@@ -18,7 +18,7 @@ import {LocalizationService} from '#service/localization';
 import {
   LocalizedStringId,
   createPseudoLocale,
-} from '../../../src/localized-strings';
+} from '#service/localization/strings';
 import {Services} from '#service';
 import {registerServiceBuilderForDoc} from '../../../src/service-helpers';
 import LocalizedStringsAr from './_locales/ar.json' assert {type: 'json'}; // lgtm[js/syntax-error]
@@ -102,7 +102,7 @@ export class StoryAdLocalization {
   }
 
   /**
-   * @param {!../../../src/localized-strings.LocalizedStringId} id
+   * @param {!../../../src/service/localization/strings.LocalizedStringId} id
    * @return {?string}
    */
   getLocalizedString(id) {

Diff for: extensions/amp-story-auto-ads/0.1/test/test-story-ad-localization-strings.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {LocalizedStringId} from '../../../../src/localized-strings';
+import {LocalizedStringId} from '#service/localization/strings';
 import localesObjs from '../_locales';
 
 describes.fakeWin('amp-story-ad-localization-strings', {amp: true}, () => {

Diff for: extensions/amp-story-education/0.1/amp-story-education.js

@@ -21,7 +21,7 @@ import {
 } from '../../amp-story/1.0/amp-story-store-service';
 import {CSS} from '../../../build/amp-story-education-0.1.css';
 import {Layout} from '#core/dom/layout';
-import {LocalizedStringId} from '../../../src/localized-strings';
+import {LocalizedStringId} from '#service/localization/strings';
 import {Services} from '#service';
 import {createShadowRootWithStyle} from '../../amp-story/1.0/utils';
 import {dev} from '../../../src/log';

Diff for: extensions/amp-story-interactive/0.1/amp-story-interactive-quiz.js

@@ -19,7 +19,7 @@ import {
   InteractiveType,
 } from './amp-story-interactive-abstract';
 import {CSS} from '../../../build/amp-story-interactive-quiz-0.1.css';
-import {LocalizedStringId} from '../../../src/localized-strings';
+import {LocalizedStringId} from '#service/localization/strings';
 import {htmlFor} from '#core/dom/static-template';
 import {setStyle} from '#core/dom/style';
 import objstr from 'obj-str';

Diff for: extensions/amp-story-interactive/0.1/interactive-disclaimer.js

@@ -22,7 +22,7 @@
  * submit a PR with a new entry on the DisclaimerBackendList and tag @ampproject/wg-stories to review it.
  */
 
-import {LocalizedStringId} from '../../../src/localized-strings';
+import {LocalizedStringId} from '#service/localization/strings';
 import {htmlFor} from '#core/dom/static-template';
 import DisclaimerBackendsList from './disclaimer-backends-list.json' assert {type: 'json'}; // lgtm[js/syntax-error]
 

Diff for: extensions/amp-story/1.0/amp-story-consent.js

@@ -22,7 +22,7 @@ import {
 import {ActionTrust} from '#core/constants/action-constants';
 import {CSS} from '../../../build/amp-story-consent-1.0.css';
 import {Layout} from '#core/dom/layout';
-import {LocalizedStringId} from '../../../src/localized-strings';
+import {LocalizedStringId} from '#service/localization/strings';
 import {Services} from '#service';
 import {assertAbsoluteHttpOrHttpsUrl, assertHttpsUrl} from '../../../src/url';
 import {

Diff for: extensions/amp-story/1.0/amp-story-draggable-drawer.js

@@ -22,7 +22,7 @@ import {
 } from './amp-story-store-service';
 import {CSS} from '../../../build/amp-story-draggable-drawer-header-1.0.css';
 import {Layout} from '#core/dom/layout';
-import {LocalizedStringId} from '../../../src/localized-strings';
+import {LocalizedStringId} from '#service/localization/strings';
 import {Services} from '#service';
 import {closest} from '#core/dom/query';
 import {createShadowRootWithStyle} from './utils';

Diff for: extensions/amp-story/1.0/amp-story-embedded-component.js

@@ -30,7 +30,7 @@ import {
 import {CSS} from '../../../build/amp-story-tooltip-1.0.css';
 import {EventType, dispatch} from './events';
 import {Keys} from '#core/constants/key-codes';
-import {LocalizedStringId} from '../../../src/localized-strings';
+import {LocalizedStringId} from '#service/localization/strings';
 import {Services} from '#service';
 import {addAttributesToElement, tryFocus} from '#core/dom';
 import {closest, matches} from '#core/dom/query';

Diff for: extensions/amp-story/1.0/amp-story-hint.js

@@ -21,7 +21,7 @@ import {
   UIType,
   getStoreService,
 } from './amp-story-store-service';
-import {LocalizedStringId} from '../../../src/localized-strings';
+import {LocalizedStringId} from '#service/localization/strings';
 import {Services} from '#service';
 import {createShadowRootWithStyle} from './utils';
 import {dict} from '#core/types/object';

Diff for: extensions/amp-story/1.0/amp-story-info-dialog.js

@@ -25,7 +25,7 @@ import {
   getStoreService,
 } from './amp-story-store-service';
 import {CSS} from '../../../build/amp-story-info-dialog-1.0.css';
-import {LocalizedStringId} from '../../../src/localized-strings';
+import {LocalizedStringId} from '#service/localization/strings';
 import {Services} from '#service';
 import {assertAbsoluteHttpOrHttpsUrl} from '../../../src/url';
 import {closest, matches} from '#core/dom/query';

Diff for: extensions/amp-story/1.0/amp-story-open-page-attachment.js

@@ -18,7 +18,7 @@
  * @fileoverview Helper for amp-story rendering of page-attachment UI.
  */
 import {AttachmentTheme} from './amp-story-page-attachment';
-import {LocalizedStringId} from '../../../src/localized-strings';
+import {LocalizedStringId} from '#service/localization/strings';
 import {Services} from '#service';
 import {computedStyle, setImportantStyles} from '#core/dom/style';
 import {getLocalizationService} from './amp-story-localization-service';

Diff for: extensions/amp-story/1.0/amp-story-page-attachment.js

@@ -17,7 +17,7 @@
 import {Action, StateProperty, UIType} from './amp-story-store-service';
 import {DraggableDrawer, DrawerState} from './amp-story-draggable-drawer';
 import {HistoryState, setHistoryState} from './history';
-import {LocalizedStringId} from '../../../src/localized-strings';
+import {LocalizedStringId} from '#service/localization/strings';
 import {Services} from '#service';
 import {StoryAnalyticsEvent, getAnalyticsService} from './story-analytics';
 import {buildOpenAttachmentElementLinkIcon} from './amp-story-open-page-attachment';

Diff for: extensions/amp-story/1.0/amp-story-page.js

@@ -48,7 +48,7 @@ import {Deferred} from '#core/data-structures/promise';
 import {EventType, dispatch} from './events';
 import {Layout} from '#core/dom/layout';
 import {LoadingSpinner} from './loading-spinner';
-import {LocalizedStringId} from '../../../src/localized-strings';
+import {LocalizedStringId} from '#service/localization/strings';
 import {MediaPool} from './media-pool';
 import {Services} from '#service';
 import {StoryAdSegmentTimes} from '#experiments/story-ad-progress-segment';

Diff for: extensions/amp-story/1.0/amp-story-share-menu.js

@@ -27,7 +27,7 @@ import {
 } from './amp-story-store-service';
 import {CSS} from '../../../build/amp-story-share-menu-1.0.css';
 import {Keys} from '#core/constants/key-codes';
-import {LocalizedStringId} from '../../../src/localized-strings';
+import {LocalizedStringId} from '#service/localization/strings';
 import {Services} from '#service';
 import {ShareWidget} from './amp-story-share';
 import {closest} from '#core/dom/query';

Diff for: extensions/amp-story/1.0/amp-story-share.js

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {LocalizedStringId} from '../../../src/localized-strings';
+import {LocalizedStringId} from '#service/localization/strings';
 import {Services} from '#service';
 import {Toast} from './toast';
 import {

Diff for: extensions/amp-story/1.0/amp-story-system-layer.js

@@ -26,7 +26,7 @@ import {
   DevelopmentModeLog,
   DevelopmentModeLogButtonSet,
 } from './development-ui';
-import {LocalizedStringId} from '../../../src/localized-strings';
+import {LocalizedStringId} from '#service/localization/strings';
 import {ProgressBar} from './progress-bar';
 import {Services} from '#service';
 import {closest, matches, scopedQuerySelector} from '#core/dom/query';

Diff for: extensions/amp-story/1.0/amp-story-unsupported-browser-layer.js

@@ -16,7 +16,7 @@
 
 import {Action, getStoreService} from './amp-story-store-service';
 import {CSS} from '../../../build/amp-story-unsupported-browser-layer-1.0.css';
-import {LocalizedStringId} from '../../../src/localized-strings';
+import {LocalizedStringId} from '#service/localization/strings';
 import {createShadowRootWithStyle} from './utils';
 import {dict} from '#core/types/object';
 import {removeElement} from '#core/dom';

Diff for: extensions/amp-story/1.0/amp-story-viewport-warning-layer.js

@@ -15,7 +15,7 @@
  */
 
 import {CSS} from '../../../build/amp-story-viewport-warning-layer-1.0.css';
-import {LocalizedStringId} from '../../../src/localized-strings';
+import {LocalizedStringId} from '#service/localization/strings';
 import {Services} from '#service';
 import {
   StateProperty,

Diff for: extensions/amp-story/1.0/amp-story.js

@@ -83,7 +83,7 @@ import {
   scopedQuerySelectorAll,
 } from '#core/dom/query';
 import {computedStyle, setImportantStyles, toggle} from '#core/dom/style';
-import {createPseudoLocale} from '../../../src/localized-strings';
+import {createPseudoLocale} from '#service/localization/strings';
 import {debounce} from '#core/types/function';
 import {dev, devAssert, user} from '../../../src/log';
 import {dict, map} from '#core/types/object';

Diff for: extensions/amp-story/1.0/pagination-buttons.js

@@ -21,7 +21,7 @@ import {
 } from './amp-story-store-service';
 import {AdvancementMode} from './story-analytics';
 import {EventType, dispatch} from './events';
-import {LocalizedStringId} from '../../../src/localized-strings';
+import {LocalizedStringId} from '#service/localization/strings';
 import {Services} from '#service';
 import {dev, devAssert} from '../../../src/log';
 

Diff for: extensions/amp-story/1.0/simple-template.js

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {LocalizedStringId} from '../../../src/localized-strings'; // eslint-disable-line no-unused-vars
+import {LocalizedStringId} from '#service/localization/strings'; // eslint-disable-line no-unused-vars
 import {createElementWithAttributes} from '#core/dom';
 import {devAssert} from '../../../src/log';
 import {getLocalizationService} from './amp-story-localization-service';

Diff for: extensions/amp-story/1.0/test/test-amp-story-localization-strings.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {LocalizedStringId} from '../../../../src/localized-strings';
+import {LocalizedStringId} from '#service/localization/strings';
 import localesObjs from '../_locales';
 
 describes.fakeWin('amp-story-localization-strings', {amp: true}, () => {

Diff for: src/OWNERS

@@ -33,30 +33,5 @@
         {name: 'ampproject/wg-components'},
       ],
     },
-    {
-      pattern: 'localized-strings.js',
-      owners: [
-        {
-          name: 'gmajoulet',
-          notify: true,
-        },
-        {
-          name: 'newmuis',
-          notify: true,
-        },
-        {
-          name: 'enriqe',
-        },
-        {
-          name: 'processprocess',
-        },
-        {
-          name: 'mszylkowski',
-        },
-        {
-          name: 'raxsha',
-        },
-      ],
-    },
   ],
 }

Diff for: src/service/localization/OWNERS

@@ -0,0 +1,32 @@
+// For an explanation of the OWNERS rules and syntax, see:
+// https://github.com/ampproject/amp-github-apps/blob/main/owners/OWNERS.example
+
+{
+  rules: [
+    {
+      pattern: 'strings.js',
+      owners: [
+        {
+          name: 'gmajoulet',
+          notify: true,
+        },
+        {
+          name: 'newmuis',
+          notify: true,
+        },
+        {
+          name: 'enriqe',
+        },
+        {
+          name: 'processprocess',
+        },
+        {
+          name: 'mszylkowski',
+        },
+        {
+          name: 'raxsha',
+        },
+      ],
+    },
+  ],
+}

Diff for: src/service/localization.js renamed to src/service/localization/index.js

@@ -17,7 +17,7 @@
 // compiler does not output types for enums, but we want to distinguish between
 // LocalizedStringId enum values and any other strings.
 // eslint-disable-next-line no-unused-vars
-import {LocalizedStringId} from '../localized-strings';
+import {LocalizedStringBundleDef, LocalizedStringId} from './strings';
 import {Services} from '#service';
 import {closest} from '#core/dom/query';
 
@@ -35,7 +35,7 @@ const LANGUAGE_CODE_CHUNK_REGEX = /\w+/gi;
 /**
  * Gets the string matching the specified localized string ID in the language
  * specified.
- * @param {!Object<string, !../localized-strings.LocalizedStringBundleDef>} localizedStringBundles
+ * @param {!Object<string, !LocalizedStringBundleDef>} localizedStringBundles
  * @param {!Array<string>} languageCodes
  * @param {!LocalizedStringId} localizedStringId
  * @return {?string}
@@ -102,7 +102,7 @@ export class LocalizationService {
 
     /**
      * A mapping of language code to localized string bundle.
-     * @private @const {!Object<string, !../localized-strings.LocalizedStringBundleDef>}
+     * @private @const {!Object<string, !LocalizedStringBundleDef>}
      */
     this.localizedStringBundles_ = {};
   }
@@ -127,7 +127,7 @@ export class LocalizationService {
   /**
    * @param {string} languageCode The language code to associate with the
    *     specified localized string bundle.
-   * @param {!../localized-strings.LocalizedStringBundleDef} localizedStringBundle
+   * @param {!LocalizedStringBundleDef} localizedStringBundle
    *     The localized string bundle to register.
    * @return {!LocalizationService} For chaining.
    */

Diff for: src/localized-strings.js renamed to src/service/localization/strings.js

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {parseJson} from './core/types/object/json';
+import {parseJson} from '#core/types/object/json';
 
 /**
  * A unique identifier for each localized string.  Localized string IDs should:

Diff for: test/unit/test-localization.js

@@ -21,7 +21,8 @@ import {
 import {
   LocalizedStringId,
   createPseudoLocale,
-} from '../../src/localized-strings';
+} from '#service/localization/strings';
+
 import {Services} from '#service';
 
 describes.fakeWin('localization', {amp: true}, (env) => {