@amagaki/amagaki 1.10.0 → 1.10.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,12 @@
1
1
  # Changelog
2
2
 
3
+ ### [1.10.1](https://www.github.com/blinkk/amagaki/compare/v1.10.0...v1.10.1) (2022-02-10)
4
+
5
+
6
+ ### Bug Fixes
7
+
8
+ * support document-level defaultLocale ([f5cfdc1](https://www.github.com/blinkk/amagaki/commit/f5cfdc1487cae1db763a0636be422231e41b30a0))
9
+
3
10
  ## [1.10.0](https://www.github.com/blinkk/amagaki/compare/v1.9.1...v1.10.0) (2022-01-31)
4
11
 
5
12
 
@@ -110,7 +110,7 @@ export declare class Document {
110
110
  * `$localization?defaultLocale` field within the document's fields, the
111
111
  * collection's `_collection.yaml`, or the pod's `amagaki.ts`.
112
112
  */
113
- get defaultLocale(): Locale;
113
+ get defaultLocale(): any;
114
114
  /**
115
115
  * Resolves any async fields. This is commonly used in conjunction with async
116
116
  * YAML types. For example, if a YAML type fetches data from an API or loads
@@ -168,8 +168,8 @@ class Document {
168
168
  * collection's `_collection.yaml`, or the pod's `amagaki.ts`.
169
169
  */
170
170
  get defaultLocale() {
171
- // TODO: Allow docs and collections to override default locales.
172
- return this.pod.defaultLocale;
171
+ var _a, _b, _c, _d, _e, _f, _g;
172
+ return ((_g = (_c = (_b = (_a = this.fields) === null || _a === void 0 ? void 0 : _a['$localization']) === null || _b === void 0 ? void 0 : _b['defaultLocale']) !== null && _c !== void 0 ? _c : (_f = (_e = (_d = this.collection) === null || _d === void 0 ? void 0 : _d.fields) === null || _e === void 0 ? void 0 : _e['$localization']) === null || _f === void 0 ? void 0 : _f['defaultLocale']) !== null && _g !== void 0 ? _g : this.pod.defaultLocale);
173
173
  }
174
174
  /**
175
175
  * Resolves any async fields. This is commonly used in conjunction with async
@@ -277,9 +277,14 @@ class Document {
277
277
  */
278
278
  get pathFormat() {
279
279
  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
280
- // TODO: See if this is what we want to do, or if we want path formats to be
281
- // exclusively defined by the router.
282
- if (this.locale.id === this.pod.defaultLocale.id) {
280
+ // NOTE: Documents currently always define their own path format. This
281
+ // requires a lookup of all documents in order to to determine the full list
282
+ // of routes. An alternate design could involve having a central router that
283
+ // maps paths to documents, which would not require documents to be loaded
284
+ // before serving.
285
+ // If this document's locale is the default locale, match the base `$path`,
286
+ // otherwise, refer to the path defined in the `$localization?path` key.
287
+ if (this.locale.id === this.defaultLocale.id) {
283
288
  return (_b = (_a = this.fields) === null || _a === void 0 ? void 0 : _a['$path']) !== null && _b !== void 0 ? _b : (_d = (_c = this.collection) === null || _c === void 0 ? void 0 : _c.fields) === null || _d === void 0 ? void 0 : _d['$path'];
284
289
  }
285
290
  return ((_g = (_f = (_e = this.fields) === null || _e === void 0 ? void 0 : _e['$localization']) === null || _f === void 0 ? void 0 : _f['path']) !== null && _g !== void 0 ? _g : (_k = (_j = (_h = this.collection) === null || _h === void 0 ? void 0 : _h.fields) === null || _j === void 0 ? void 0 : _j['$localization']) === null || _k === void 0 ? void 0 : _k['path']);
@@ -1 +1 @@
1
- {"version":3,"file":"document.js","sourceRoot":"","sources":["../../src/document.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"document.js","sourceRoot":"","sources":["../../src/document.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@amagaki/amagaki",
3
- "version": "1.10.0",
3
+ "version": "1.10.1",
4
4
  "license": "MIT",
5
5
  "homepage": "https://amagaki.dev",
6
6
  "repository": {