@phensley/cldr-schema - npm Package Compare versions

Comparing version 1.0.9 to 1.1.0

lib-es/code/calendars.js

@@ -1,19 +0,19 @@
-import { field, scope, vector1, vector2, KeyIndexImpl } from '../instructions';
+import { field, scope, vector, KeyIndexImpl } from '../instructions';
 import { BuddhistEraIndex, DateTimePatternFieldValues, DayPeriodValues, EraWidthValues, FieldWidthValues, FormatWidthValues, GregorianEraIndex, GregorianMonthsIndex, JapaneseEraIndex, PersianEraIndex, QuarterValues, WeekdayValues, } from '../schema';
 var formats = function (name, rename, month) { return scope(name, rename, [
-    vector2('weekdays', 'field-width', 'weekday'),
-    vector2('months', 'field-width', month + "-month"),
-    vector2('quarters', 'field-width', 'quarter'),
-    vector2('dayPeriods', 'field-width', 'day-period'),
+    vector('weekdays', ['field-width', 'weekday']),
+    vector('months', ['field-width', month + "-month"]),
+    vector('quarters', ['field-width', 'quarter']),
+    vector('dayPeriods', ['field-width', 'day-period', 'day-period-alt-key']),
 ]); };
 var calendarScope = function (name, scopeName) { return scope(scopeName, scopeName, [
-    vector2('eras', 'era-type', name + "-era"),
+    vector('eras', ['era-type', name + "-era", 'era-alt-key']),
     formats('format', 'format', name),
     formats('standAlone', 'standAlone', name),
-    vector1('availableFormats', name + "-available-format"),
-    vector2('pluralFormats', 'plural-key', name + "-plural-format"),
-    vector2('intervalFormats', 'date-time-pattern-field', name + "-interval-format"),
-    vector1('dateFormats', 'format-width'),
-    vector1('timeFormats', 'format-width'),
-    vector1('dateTimeFormats', 'format-width'),
+    vector('availableFormats', [name + "-available-format"]),
+    vector('pluralFormats', ['plural-key', name + "-plural-format"]),
+    vector('intervalFormats', ['date-time-pattern-field', name + "-interval-format"]),
+    vector('dateFormats', ['format-width']),
+    vector('timeFormats', ['format-width']),
+    vector('dateTimeFormats', ['format-width']),
     field('intervalFormatFallback')
@@ -20,0 +20,0 @@ ]); };

lib-es/code/currencies.js

@@ -1,8 +0,8 @@
-import { scope, vector1, vector2 } from '../instructions';
+import { scope, vector } from '../instructions';
 export var CURRENCIES = scope('Currencies', 'Currencies', [
-    vector1('displayName', 'currency-id'),
-    vector1('decimal', 'currency-id'),
-    vector2('pluralName', 'plural-key', 'currency-id'),
-    vector2('symbol', 'alt-key', 'currency-id')
+    vector('displayName', ['currency-id']),
+    vector('decimal', ['currency-id']),
+    vector('pluralName', ['plural-key', 'currency-id']),
+    vector('symbol', ['alt-key', 'currency-id'])
 ]);
 //# sourceMappingURL=currencies.js.map

lib-es/code/datefields.js

@@ -1,7 +0,7 @@
-import { scope, vector1, vector2 } from '../instructions';
+import { scope, vector } from '../instructions';
 import { DateFieldIndex, DateFieldWidthIndex, RelativeTimeFieldIndex } from '../schema';
 var prevNext = ['previous2', 'previous', 'current', 'next', 'next2']
-    .map(function (k) { return vector1(k, 'relative-time-field'); });
+    .map(function (k) { return vector(k, ['relative-time-field']); });
 var futurePast = ['future', 'past']
-    .map(function (k) { return vector2(k, 'plural-key', 'relative-time-field'); });
+    .map(function (k) { return vector(k, ['plural-key', 'relative-time-field']); });
 var relativeTimeBody = prevNext.concat(futurePast);
@@ -15,3 +15,3 @@ var relativeTimes = function (width) { return scope(width, width, relativeTimeBody); };
     ]),
-    vector2('displayName', 'date-field', 'date-field-width')
+    vector('displayName', ['date-field', 'date-field-width'])
 ]);
@@ -18,0 +18,0 @@ export var DATEFIELDS_INDICES = {

lib-es/code/general.js

@@ -1,2 +0,2 @@
-import { field, scope, vector1 } from '../instructions';
+import { field, scope, vector } from '../instructions';
 import { ContextTransformFieldIndex, ListPatternPositionIndex } from '../schema/general';
@@ -7,3 +7,3 @@ export var LAYOUT = scope('Layout', 'Layout', [
 ]);
-var listPattern = function (name) { return vector1(name, 'list-pattern-position'); };
+var listPattern = function (name) { return vector(name, ['list-pattern-position']); };
 export var LIST_PATTERNS = scope('ListPatterns', 'ListPatterns', [
@@ -22,4 +22,4 @@ listPattern('and'),
 export var CONTEXT_TRANSFORM = scope('ContextTransforms', 'ContextTransforms', [
-    vector1('contextTransforms', 'context-transform-field')
+    vector('contextTransforms', ['context-transform-field'])
 ]);
 //# sourceMappingURL=general.js.map

lib-es/code/index.js

@@ -11,3 +11,3 @@ import { __assign } from "tslib";
 import { UNITS } from './units';
-import { AltIndex, PluralIndex } from '../schema';
+import { AltIndex, DayPeriodAltIndex, EraAltIndex, PluralIndex } from '../schema';
 var EMPTY_INDEX = new KeyIndexImpl([]);
@@ -38,3 +38,3 @@ var emptyCalendarIndex = function (name) {
         this.config = config;
-        this.indices = __assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({ 'alt-key': AltIndex, 'plural-key': PluralIndex }, CALENDAR_INDICES), GREGORIAN_INDICES), emptyCalendarIndex('buddhist')), emptyCalendarIndex('japanese')), emptyCalendarIndex('persian')), DATEFIELDS_INDICES), GENERAL_INDICES), NUMBERS_INDICES), TIMEZONE_INDICES);
+        this.indices = __assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({ 'alt-key': AltIndex, 'day-period-alt-key': DayPeriodAltIndex, 'era-alt-key': EraAltIndex, 'plural-key': PluralIndex }, CALENDAR_INDICES), GREGORIAN_INDICES), emptyCalendarIndex('buddhist')), emptyCalendarIndex('japanese')), emptyCalendarIndex('persian')), DATEFIELDS_INDICES), GENERAL_INDICES), NUMBERS_INDICES), TIMEZONE_INDICES);
     }
@@ -41,0 +41,0 @@ /**

lib-es/code/names.js

@@ -1,13 +0,13 @@
-import { scope, vector2 } from '../instructions';
+import { scope, vector } from '../instructions';
 export var NAMES = scope('Names', 'Names', [
     scope('languages', 'languages', [
-        vector2('displayName', 'alt-key', 'language-id')
+        vector('displayName', ['alt-key', 'language-id'])
     ]),
     scope('scripts', 'scripts', [
-        vector2('displayName', 'alt-key', 'script-id')
+        vector('displayName', ['alt-key', 'script-id'])
     ]),
     scope('regions', 'regions', [
-        vector2('displayName', 'alt-key', 'region-id')
+        vector('displayName', ['alt-key', 'region-id'])
     ])
 ]);
 //# sourceMappingURL=names.js.map

lib-es/code/numbers.js

@@ -1,8 +0,8 @@
-import { digits, field, scope, scopemap, vector1, vector2 } from '../instructions';
+import { digits, field, scope, scopemap, vector } from '../instructions';
 import { CurrencySpacingPatternIndex, CurrencySpacingPosIndex, NumberMiscPatternIndex, NumberSymbolIndex, NumberSystemsIndex, PluralDigitValues, } from '../schema/numbers';
 export var NUMBERS = scope('Numbers', 'Numbers', [
     field('minimumGroupingDigits'),
-    vector1('numberSystems', 'number-system'),
+    vector('numberSystems', ['number-system']),
     scopemap('numberSystem', 'number-system-name', [
-        vector1('symbols', 'number-symbol'),
+        vector('symbols', ['number-symbol']),
         scope('currencyFormats', 'currencyFormats', [
@@ -12,4 +12,4 @@ field('standard'),
             digits('short', 'plural-key', PluralDigitValues),
-            vector2('spacing', 'currency-spacing-pos', 'currency-spacing-pattern'),
-            vector1('unitPattern', 'plural-key')
+            vector('spacing', ['currency-spacing-pos', 'currency-spacing-pattern']),
+            vector('unitPattern', ['plural-key'])
         ]),
@@ -23,3 +23,3 @@ scope('decimalFormats', 'decimalFormats', [
         field('scientificFormat'),
-        vector1('miscPatterns', 'number-misc-pattern')
+        vector('miscPatterns', ['number-misc-pattern'])
     ])
@@ -26,0 +26,0 @@ ]);

lib-es/code/timezones.js

@@ -1,9 +0,9 @@
-import { field, scope, vector1, vector2 } from '../instructions';
+import { field, scope, vector } from '../instructions';
 import { MetaZoneIndex, TimeZoneTypeIndex, } from '../schema/timezones';
 export var TIMEZONE = scope('TimeZoneNames', 'TimeZones', [
     scope('metaZones', 'metaZones', [
-        vector2('short', 'timezone-type', 'metazone'),
-        vector2('long', 'timezone-type', 'metazone')
+        vector('short', ['timezone-type', 'metazone']),
+        vector('long', ['timezone-type', 'metazone'])
     ]),
-    vector1('exemplarCity', 'timezone-id'),
+    vector('exemplarCity', ['timezone-id']),
     field('gmtFormat'),
@@ -10,0 +10,0 @@ field('hourFormat'),

lib-es/code/units.js

@@ -1,6 +0,6 @@
-import { field, scope, vector1, vector2 } from '../instructions';
+import { field, scope, vector } from '../instructions';
 var unitInfo = function (width) { return scope(width, width, [
-    vector2('unitPattern', 'plural-key', 'unit-id'),
-    vector1('displayName', 'unit-id'),
-    vector1('perUnitPattern', 'unit-id'),
+    vector('unitPattern', ['plural-key', 'unit-id']),
+    vector('displayName', ['unit-id']),
+    vector('perUnitPattern', ['unit-id']),
     field('perPattern'),
@@ -7,0 +7,0 @@ field('timesPattern')

lib-es/instructions.d.ts

@@ -13,2 +13,3 @@ import { KeyIndex } from '@phensley/cldr-types';
     readonly size: number;
+    readonly last: number;
     constructor(keys: T[]);
@@ -81,6 +82,6 @@ get(key: T): number;
  */
-export interface Vector1 {
-    readonly type: 'vector1';
+export interface Vector {
+    readonly type: 'vector';
     readonly name: string;
-    readonly dim0: string;
+    readonly dims: string[];
 }
@@ -90,13 +91,4 @@ /**
  */
-export interface Vector2 {
-    readonly type: 'vector2';
-    readonly name: string;
-    readonly dim0: string;
-    readonly dim1: string;
-}
+export declare type Instruction = Digits | Field | Origin | Scope | ScopeMap | Vector;
 /**
- * @public
- */
-export declare type Instruction = Digits | Field | Origin | Scope | ScopeMap | Vector1 | Vector2;
-/**
  * @internal
@@ -126,6 +118,2 @@ */
  */
-export declare const vector1: (name: string, dim0: string) => Vector1;
-/**
- * @internal
- */
-export declare const vector2: (name: string, dim0: string, dim1: string) => Vector2;
+export declare const vector: (name: string, dims: string[]) => Vector;

lib-es/instructions.js

@@ -12,2 +12,3 @@ /**
         this.size = keys.length;
+        this.last = this.size - 1;
         var i = 0;
@@ -89,11 +90,5 @@ while (i < keys.length) {
  */
-export var vector1 = function (name, dim0) {
-    return ({ type: 'vector1', name: name, dim0: dim0 });
+export var vector = function (name, dims) {
+    return ({ type: 'vector', name: name, dims: dims });
 };
-/**
- * @internal
- */
-export var vector2 = function (name, dim0, dim1) {
-    return ({ type: 'vector2', name: name, dim0: dim0, dim1: dim1 });
-};
 //# sourceMappingURL=instructions.js.map

lib-es/schema/arrows.d.ts

@@ -1,2 +0,2 @@
-import { DigitsArrow, FieldArrow, KeyIndex, PrimitiveBundle, ScopeArrow, Vector1Arrow, Vector2Arrow } from '@phensley/cldr-types';
+import { DigitsArrow, FieldArrow, KeyIndex, PrimitiveBundle, ScopeArrow } from '@phensley/cldr-types';
 /**
@@ -37,32 +37,18 @@ * @public
 /**
+ * Generalized multi-dimensional vector arrow.
+ *
  * @public
  */
-export declare class Vector1ArrowImpl<T extends string> implements Vector1Arrow<T> {
-    readonly index: KeyIndex<T>;
+export declare class VectorArrowImpl {
+    readonly keysets: KeyIndex<string>[];
+    readonly offset: number;
     readonly len: number;
-    readonly offset: number;
-    constructor(offset: number, index: KeyIndex<T>);
+    private last;
+    private factors;
+    constructor(offset: number, keysets: KeyIndex<string>[]);
     exists(bundle: PrimitiveBundle): boolean;
-    get(bundle: PrimitiveBundle, key: T): string;
-    mapping(bundle: PrimitiveBundle): {
-        [P in T]: string;
-    };
+    get(bundle: PrimitiveBundle, ...keys: (string | string[])[]): string;
+    mapping(bundle: PrimitiveBundle): any;
+    private _get;
+    private _mapping;
 }
-/**
- * @public
- */
-export declare class Vector2ArrowImpl<T extends string, S extends string> implements Vector2Arrow<T, S> {
-    readonly index1: KeyIndex<T>;
-    readonly index2: KeyIndex<S>;
-    readonly size: number;
-    readonly size2: number;
-    readonly offset: number;
-    constructor(offset: number, index1: KeyIndex<T>, index2: KeyIndex<S>);
-    exists(bundle: PrimitiveBundle): boolean;
-    get(bundle: PrimitiveBundle, key1: T, key2: S): string;
-    mapping(bundle: PrimitiveBundle): {
-        [P in T]: {
-            [Q in S]: string;
-        };
-    };
-}

lib-es/schema/arrows.js

@@ -59,105 +59,90 @@ /**
 /**
+ * Generalized multi-dimensional vector arrow.
+ *
  * @public
  */
-var Vector1ArrowImpl = /** @class */ (function () {
-    function Vector1ArrowImpl(offset, index) {
-        this.index = index;
-        this.len = index.keys.length;
-        this.offset = offset + 1; // skip header
+var VectorArrowImpl = /** @class */ (function () {
+    function VectorArrowImpl(offset, keysets) {
+        this.keysets = keysets;
+        this.offset = offset + 1; // skip over header
+        this.len = keysets.length;
+        this.last = this.len - 1;
+        this.factors = new Array(this.len);
+        // Pre-compute the address factor for each dimension:
+        //  1-dim:        [ index0 ]
+        //  2-dim:        [ (index0 * size1), index1 ]
+        //  3-dim:        [ (index0 * size1 * size2), (index1 * size), index2 ]
+        //  ...
+        for (var i = 0; i < this.len; i++) {
+            var k = 1;
+            for (var j = i + 1; j < this.len; j++) {
+                k *= this.keysets[j].size;
+            }
+            this.factors[i] = k;
+        }
     }
-    Vector1ArrowImpl.prototype.exists = function (bundle) {
+    VectorArrowImpl.prototype.exists = function (bundle) {
         return bundle.get(this.offset - 1) === 'E';
     };
-    Vector1ArrowImpl.prototype.get = function (bundle, key) {
-        var exists = bundle.get(this.offset - 1) === 'E';
-        if (exists) {
-            var i = this.index.get(key);
-            return i === -1 ? '' : bundle.get(this.offset + i);
+    VectorArrowImpl.prototype.get = function (bundle) {
+        var keys = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            keys[_i - 1] = arguments[_i];
         }
-        return '';
-    };
-    Vector1ArrowImpl.prototype.mapping = function (bundle) {
-        var len = this.len;
-        var offset = this.offset;
-        var keys = this.index.keys;
-        /* tslint:disable-next-line */
-        var res = Object.create(null);
-        var exists = bundle.get(offset - 1) === 'E';
-        if (!exists) {
-            return res;
+        if (keys.length !== this.len) {
+            // Impossible lookup, will never reach a valid field
+            throw new Error("Warning: impossible vector lookup with keys " + JSON.stringify(keys));
         }
-        for (var i = 0; i < len; i++) {
-            var s = bundle.get(offset + i);
-            if (s) {
-                var k = keys[i];
-                res[k] = s;
-            }
+        if (!this.exists(bundle)) {
+            return '';
         }
-        return res;
+        return this._get(bundle, keys, 0, this.offset);
     };
-    return Vector1ArrowImpl;
-}());
-export { Vector1ArrowImpl };
-/**
- * @public
- */
-var Vector2ArrowImpl = /** @class */ (function () {
-    function Vector2ArrowImpl(offset, index1, index2) {
-        this.index1 = index1;
-        this.index2 = index2;
-        this.size = index1.size * index2.size;
-        this.size2 = index2.size;
-        this.offset = offset + 1; // skip header
-    }
-    Vector2ArrowImpl.prototype.exists = function (bundle) {
-        return bundle.get(this.offset - 1) === 'E';
+    VectorArrowImpl.prototype.mapping = function (bundle) {
+        return this.exists(bundle) ? this._mapping(bundle, 0, 0) : {};
     };
-    Vector2ArrowImpl.prototype.get = function (bundle, key1, key2) {
-        var exists = bundle.get(this.offset - 1) === 'E';
-        if (exists) {
-            var i = this.index1.get(key1);
-            if (i !== -1) {
-                var j = this.index2.get(key2);
-                if (j !== -1) {
-                    var k = this.offset + (i * this.size2) + j;
-                    return bundle.get(k);
+    VectorArrowImpl.prototype._get = function (bundle, keys, ix, k) {
+        var key = keys[ix];
+        var args = typeof key === 'string' ? [key] : key;
+        var last = args.length - 1;
+        for (var i = 0; i < args.length; i++) {
+            var arg = args[i];
+            var j = this.keysets[ix].get(arg);
+            if (j === -1) {
+                if (i !== last) {
+                    continue;
                 }
+                return '';
             }
+            var kk = k + j * this.factors[ix];
+            var val = ix === this.last ? bundle.get(kk) : this._get(bundle, keys, ix + 1, kk);
+            if (!!val) {
+                return val;
+            }
         }
         return '';
     };
-    Vector2ArrowImpl.prototype.mapping = function (bundle) {
-        var offset = this.offset;
-        /* tslint:disable-next-line */
-        var res = Object.create(null);
-        var exists = bundle.get(offset - 1) === 'E';
-        if (!exists) {
-            return res;
-        }
-        var size2 = this.size2;
-        var keys1 = this.index1.keys;
-        var keys2 = this.index2.keys;
-        for (var i = 0; i < keys1.length; i++) {
-            exists = false;
-            /* tslint:disable-next-line */
-            var o = Object.create(null);
-            for (var j = 0; j < keys2.length; j++) {
-                var k = offset + (i * size2) + j;
-                var s = bundle.get(k);
-                if (s) {
-                    exists = true;
-                    var key2 = keys2[j];
-                    o[key2] = s;
+    VectorArrowImpl.prototype._mapping = function (bundle, k, ix) {
+        var o = {};
+        var keys = this.keysets[k].keys;
+        var last = k === this.last;
+        for (var i = 0; i < keys.length; i++) {
+            var key = keys[i];
+            if (last) {
+                // We're at the value level of the map, so lookup the corresponding string
+                var val = bundle.get(this.offset + i + ix);
+                if (val) {
+                    o[key] = val;
                 }
             }
-            if (exists) {
-                var key1 = keys1[i];
-                res[key1] = o;
+            else {
+                // Drill one level deeper
+                o[key] = this._mapping(bundle, k + 1, ix + (i * this.factors[k]));
             }
         }
-        return res;
+        return o;
     };
-    return Vector2ArrowImpl;
+    return VectorArrowImpl;
 }());
-export { Vector2ArrowImpl };
+export { VectorArrowImpl };
 //# sourceMappingURL=arrows.js.map

lib-es/schema/autogen.context.js

 //
 // WARNING: this file was auto-generated by @phensley/cldr-compiler. DO NOT EDIT.
 //
-/* tslint:disable:max-line-length */
+/* tslint:disable:max-line-length whitespace */
 /** @public */
 export var ContextTransformFieldValues = ('calendar-field currencyName day-format-except-narrow day-standalone-except-narrow era-abbr era-name keyValue languages month-format-except-narrow month-standalone-except-narrow number-spellout relative script typographicNames').split(' ');
 //# sourceMappingURL=autogen.context.js.map

lib-es/schema/autogen.timezones.js

 //
 // WARNING: this file was auto-generated by @phensley/cldr-compiler. DO NOT EDIT.
 //
-/* tslint:disable:max-line-length */
+/* tslint:disable:max-line-length whitespace */
 /** @public */
 export var TimeZoneStableIds = ('Africa/Abidjan Africa/Accra Africa/Addis_Ababa Africa/Algiers Africa/Asmera Africa/Bamako Africa/Bangui Africa/Banjul Africa/Bissau Africa/Blantyre Africa/Brazzaville Africa/Bujumbura Africa/Cairo Africa/Casablanca Africa/Ceuta Africa/Conakry Africa/Dakar Africa/Dar_es_Salaam Africa/Djibouti Africa/Douala Africa/El_Aaiun Africa/Freetown Africa/Gaborone Africa/Harare Africa/Johannesburg Africa/Juba Africa/Kampala Africa/Khartoum Africa/Kigali Africa/Kinshasa Africa/Lagos Africa/Libreville Africa/Lome Africa/Luanda Africa/Lubumbashi Africa/Lusaka Africa/Malabo Africa/Maputo Africa/Maseru Africa/Mbabane Africa/Mogadishu Africa/Monrovia Africa/Nairobi Africa/Ndjamena Africa/Niamey Africa/Nouakchott Africa/Ouagadougou Africa/Porto-Novo Africa/Sao_Tome Africa/Tripoli Africa/Tunis Africa/Windhoek America/Adak America/Anchorage America/Anguilla America/Antigua America/Araguaina America/Argentina/La_Rioja America/Argentina/Rio_Gallegos America/Argentina/Salta America/Argentina/San_Juan America/Argentina/San_Luis America/Argentina/Tucuman America/Argentina/Ushuaia America/Aruba America/Asuncion America/Bahia America/Bahia_Banderas America/Barbados America/Belem America/Belize America/Blanc-Sablon America/Boa_Vista America/Bogota America/Boise America/Buenos_Aires America/Cambridge_Bay America/Campo_Grande America/Cancun America/Caracas America/Catamarca America/Cayenne America/Cayman America/Chicago America/Chihuahua America/Coral_Harbour America/Cordoba America/Costa_Rica America/Creston America/Cuiaba America/Curacao America/Danmarkshavn America/Dawson America/Dawson_Creek America/Denver America/Detroit America/Dominica America/Edmonton America/Eirunepe America/El_Salvador America/Fort_Nelson America/Fortaleza America/Glace_Bay America/Godthab America/Goose_Bay America/Grand_Turk America/Grenada America/Guadeloupe America/Guatemala America/Guayaquil America/Guyana America/Halifax America/Havana America/Hermosillo America/Indiana/Knox America/Indiana/Marengo America/Indiana/Petersburg America/Indiana/Tell_City America/Indiana/Vevay America/Indiana/Vincennes America/Indiana/Winamac America/Indianapolis America/Inuvik America/Iqaluit America/Jamaica America/Jujuy America/Juneau America/Kentucky/Monticello America/Kralendijk America/La_Paz America/Lima America/Los_Angeles America/Louisville America/Lower_Princes America/Maceio America/Managua America/Manaus America/Marigot America/Martinique America/Matamoros America/Mazatlan America/Mendoza America/Menominee America/Merida America/Metlakatla America/Mexico_City America/Miquelon America/Moncton America/Monterrey America/Montevideo America/Montserrat America/Nassau America/New_York America/Nipigon America/Nome America/Noronha America/North_Dakota/Beulah America/North_Dakota/Center America/North_Dakota/New_Salem America/Ojinaga America/Panama America/Pangnirtung America/Paramaribo America/Phoenix America/Port-au-Prince America/Port_of_Spain America/Porto_Velho America/Puerto_Rico America/Punta_Arenas America/Rainy_River America/Rankin_Inlet America/Recife America/Regina America/Resolute America/Rio_Branco America/Santa_Isabel America/Santarem America/Santiago America/Santo_Domingo America/Sao_Paulo America/Scoresbysund America/Sitka America/St_Barthelemy America/St_Johns America/St_Kitts America/St_Lucia America/St_Thomas America/St_Vincent America/Swift_Current America/Tegucigalpa America/Thule America/Thunder_Bay America/Tijuana America/Toronto America/Tortola America/Vancouver America/Whitehorse America/Winnipeg America/Yakutat America/Yellowknife Antarctica/Casey Antarctica/Davis Antarctica/DumontDUrville Antarctica/Macquarie Antarctica/Mawson Antarctica/McMurdo Antarctica/Palmer Antarctica/Rothera Antarctica/Syowa Antarctica/Troll Antarctica/Vostok Arctic/Longyearbyen Asia/Aden Asia/Almaty Asia/Amman Asia/Anadyr Asia/Aqtau Asia/Aqtobe Asia/Ashgabat Asia/Atyrau Asia/Baghdad Asia/Bahrain Asia/Baku Asia/Bangkok Asia/Barnaul Asia/Beirut Asia/Bishkek Asia/Brunei Asia/Calcutta Asia/Chita Asia/Choibalsan Asia/Colombo Asia/Damascus Asia/Dhaka Asia/Dili Asia/Dubai Asia/Dushanbe Asia/Famagusta Asia/Gaza Asia/Hebron Asia/Hong_Kong Asia/Hovd Asia/Irkutsk Asia/Jakarta Asia/Jayapura Asia/Jerusalem Asia/Kabul Asia/Kamchatka Asia/Karachi Asia/Katmandu Asia/Khandyga Asia/Krasnoyarsk Asia/Kuala_Lumpur Asia/Kuching Asia/Kuwait Asia/Macau Asia/Magadan Asia/Makassar Asia/Manila Asia/Muscat Asia/Nicosia Asia/Novokuznetsk Asia/Novosibirsk Asia/Omsk Asia/Oral Asia/Phnom_Penh Asia/Pontianak Asia/Pyongyang Asia/Qatar Asia/Qostanay Asia/Qyzylorda Asia/Rangoon Asia/Riyadh Asia/Saigon Asia/Sakhalin Asia/Samarkand Asia/Seoul Asia/Shanghai Asia/Singapore Asia/Srednekolymsk Asia/Taipei Asia/Tashkent Asia/Tbilisi Asia/Tehran Asia/Thimphu Asia/Tokyo Asia/Tomsk Asia/Ulaanbaatar Asia/Urumqi Asia/Ust-Nera Asia/Vientiane Asia/Vladivostok Asia/Yakutsk Asia/Yekaterinburg Asia/Yerevan Atlantic/Azores Atlantic/Bermuda Atlantic/Canary Atlantic/Cape_Verde Atlantic/Faeroe Atlantic/Madeira Atlantic/Reykjavik Atlantic/South_Georgia Atlantic/St_Helena Atlantic/Stanley Australia/Adelaide Australia/Brisbane Australia/Broken_Hill Australia/Currie Australia/Darwin Australia/Eucla Australia/Hobart Australia/Lindeman Australia/Lord_Howe Australia/Melbourne Australia/Perth Australia/Sydney Etc/UTC Etc/Unknown Europe/Amsterdam Europe/Andorra Europe/Astrakhan Europe/Athens Europe/Belgrade Europe/Berlin Europe/Bratislava Europe/Brussels Europe/Bucharest Europe/Budapest Europe/Busingen Europe/Chisinau Europe/Copenhagen Europe/Dublin Europe/Gibraltar Europe/Guernsey Europe/Helsinki Europe/Isle_of_Man Europe/Istanbul Europe/Jersey Europe/Kaliningrad Europe/Kiev Europe/Kirov Europe/Lisbon Europe/Ljubljana Europe/London Europe/Luxembourg Europe/Madrid Europe/Malta Europe/Mariehamn Europe/Minsk Europe/Monaco Europe/Moscow Europe/Oslo Europe/Paris Europe/Podgorica Europe/Prague Europe/Riga Europe/Rome Europe/Samara Europe/San_Marino Europe/Sarajevo Europe/Saratov Europe/Simferopol Europe/Skopje Europe/Sofia Europe/Stockholm Europe/Tallinn Europe/Tirane Europe/Ulyanovsk Europe/Uzhgorod Europe/Vaduz Europe/Vatican Europe/Vienna Europe/Vilnius Europe/Volgograd Europe/Warsaw Europe/Zagreb Europe/Zaporozhye Europe/Zurich Indian/Antananarivo Indian/Chagos Indian/Christmas Indian/Cocos Indian/Comoro Indian/Kerguelen Indian/Mahe Indian/Maldives Indian/Mauritius Indian/Mayotte Indian/Reunion Pacific/Apia Pacific/Auckland Pacific/Bougainville Pacific/Chatham Pacific/Easter Pacific/Efate Pacific/Enderbury Pacific/Fakaofo Pacific/Fiji Pacific/Funafuti Pacific/Galapagos Pacific/Gambier Pacific/Guadalcanal Pacific/Guam Pacific/Honolulu Pacific/Johnston Pacific/Kiritimati Pacific/Kosrae Pacific/Kwajalein Pacific/Majuro Pacific/Marquesas Pacific/Midway Pacific/Nauru Pacific/Niue Pacific/Norfolk Pacific/Noumea Pacific/Pago_Pago Pacific/Palau Pacific/Pitcairn Pacific/Ponape Pacific/Port_Moresby Pacific/Rarotonga Pacific/Saipan Pacific/Tahiti Pacific/Tarawa Pacific/Tongatapu Pacific/Truk Pacific/Wake Pacific/Wallis').split(' ');
-/* tslint:disable:max-line-length */
+/* tslint:disable:max-line-length whitespace */
 /** @public */
 export var MetaZoneValues = ('Acre Afghanistan Africa_Central Africa_Eastern Africa_Southern Africa_Western Alaska Almaty Amazon America_Central America_Eastern America_Mountain America_Pacific Anadyr Apia Aqtau Aqtobe Arabian Argentina Argentina_Western Armenia Atlantic Australia_Central Australia_CentralWestern Australia_Eastern Australia_Western Azerbaijan Azores Bangladesh Bhutan Bolivia Brasilia Brunei Cape_Verde Casey Chamorro Chatham Chile China Choibalsan Christmas Cocos Colombia Cook Cuba Davis DumontDUrville East_Timor Easter Ecuador Europe_Central Europe_Eastern Europe_Further_Eastern Europe_Western Falkland Fiji French_Guiana French_Southern GMT Galapagos Gambier Georgia Gilbert_Islands Greenland_Eastern Greenland_Western Guam Gulf Guyana Hawaii_Aleutian Hong_Kong Hovd India Indian_Ocean Indochina Indonesia_Central Indonesia_Eastern Indonesia_Western Iran Irkutsk Israel Japan Kamchatka Kazakhstan_Eastern Kazakhstan_Western Korea Kosrae Krasnoyarsk Kyrgystan Lanka Line_Islands Lord_Howe Macau Macquarie Magadan Malaysia Maldives Marquesas Marshall_Islands Mauritius Mawson Mexico_Northwest Mexico_Pacific Mongolia Moscow Myanmar Nauru Nepal New_Caledonia New_Zealand Newfoundland Niue Norfolk Noronha North_Mariana Novosibirsk Omsk Pakistan Palau Papua_New_Guinea Paraguay Peru Philippines Phoenix_Islands Pierre_Miquelon Pitcairn Ponape Pyongyang Qyzylorda Reunion Rothera Sakhalin Samara Samoa Seychelles Singapore Solomon South_Georgia Suriname Syowa Tahiti Taipei Tajikistan Tokelau Tonga Truk Turkmenistan Tuvalu Uruguay Uzbekistan Vanuatu Venezuela Vladivostok Volgograd Vostok Wake Wallis Yakutsk Yekaterinburg').split(' ');
 //# sourceMappingURL=autogen.timezones.js.map

lib-es/schema/enums.d.ts

@@ -11,1 +11,9 @@ import { PluralType } from '@phensley/cldr-types';
 export declare const AltIndex: KeyIndexImpl<import("../../../cldr-types/lib").AltType>;
+/**
+ * @public
+ */
+export declare const EraAltIndex: KeyIndexImpl<import("../../../cldr-types/lib").EraAltType>;
+/**
+ * @public
+ */
+export declare const DayPeriodAltIndex: KeyIndexImpl<import("../../../cldr-types/lib").DayPeriodAltType>;

lib-es/schema/enums.js

@@ -10,2 +10,10 @@ import { KeyIndexImpl } from '../instructions';
 export var AltIndex = new KeyIndexImpl(['none', 'short', 'narrow', 'variant', 'stand-alone', 'long', 'menu']);
+/**
+ * @public
+ */
+export var EraAltIndex = new KeyIndexImpl(['none', 'sensitive']);
+/**
+ * @public
+ */
+export var DayPeriodAltIndex = new KeyIndexImpl(['none', 'casing']);
 //# sourceMappingURL=enums.js.map

lib/code/calendars.js

@@ -6,17 +6,17 @@ "use strict";
 var formats = function (name, rename, month) { return instructions_1.scope(name, rename, [
-    instructions_1.vector2('weekdays', 'field-width', 'weekday'),
-    instructions_1.vector2('months', 'field-width', month + "-month"),
-    instructions_1.vector2('quarters', 'field-width', 'quarter'),
-    instructions_1.vector2('dayPeriods', 'field-width', 'day-period'),
+    instructions_1.vector('weekdays', ['field-width', 'weekday']),
+    instructions_1.vector('months', ['field-width', month + "-month"]),
+    instructions_1.vector('quarters', ['field-width', 'quarter']),
+    instructions_1.vector('dayPeriods', ['field-width', 'day-period', 'day-period-alt-key']),
 ]); };
 var calendarScope = function (name, scopeName) { return instructions_1.scope(scopeName, scopeName, [
-    instructions_1.vector2('eras', 'era-type', name + "-era"),
+    instructions_1.vector('eras', ['era-type', name + "-era", 'era-alt-key']),
     formats('format', 'format', name),
     formats('standAlone', 'standAlone', name),
-    instructions_1.vector1('availableFormats', name + "-available-format"),
-    instructions_1.vector2('pluralFormats', 'plural-key', name + "-plural-format"),
-    instructions_1.vector2('intervalFormats', 'date-time-pattern-field', name + "-interval-format"),
-    instructions_1.vector1('dateFormats', 'format-width'),
-    instructions_1.vector1('timeFormats', 'format-width'),
-    instructions_1.vector1('dateTimeFormats', 'format-width'),
+    instructions_1.vector('availableFormats', [name + "-available-format"]),
+    instructions_1.vector('pluralFormats', ['plural-key', name + "-plural-format"]),
+    instructions_1.vector('intervalFormats', ['date-time-pattern-field', name + "-interval-format"]),
+    instructions_1.vector('dateFormats', ['format-width']),
+    instructions_1.vector('timeFormats', ['format-width']),
+    instructions_1.vector('dateTimeFormats', ['format-width']),
     instructions_1.field('intervalFormatFallback')
@@ -23,0 +23,0 @@ ]); };

lib/code/currencies.js

@@ -5,7 +5,7 @@ "use strict";
 exports.CURRENCIES = instructions_1.scope('Currencies', 'Currencies', [
-    instructions_1.vector1('displayName', 'currency-id'),
-    instructions_1.vector1('decimal', 'currency-id'),
-    instructions_1.vector2('pluralName', 'plural-key', 'currency-id'),
-    instructions_1.vector2('symbol', 'alt-key', 'currency-id')
+    instructions_1.vector('displayName', ['currency-id']),
+    instructions_1.vector('decimal', ['currency-id']),
+    instructions_1.vector('pluralName', ['plural-key', 'currency-id']),
+    instructions_1.vector('symbol', ['alt-key', 'currency-id'])
 ]);
 //# sourceMappingURL=currencies.js.map

lib/code/datefields.js

@@ -6,5 +6,5 @@ "use strict";
 var prevNext = ['previous2', 'previous', 'current', 'next', 'next2']
-    .map(function (k) { return instructions_1.vector1(k, 'relative-time-field'); });
+    .map(function (k) { return instructions_1.vector(k, ['relative-time-field']); });
 var futurePast = ['future', 'past']
-    .map(function (k) { return instructions_1.vector2(k, 'plural-key', 'relative-time-field'); });
+    .map(function (k) { return instructions_1.vector(k, ['plural-key', 'relative-time-field']); });
 var relativeTimeBody = prevNext.concat(futurePast);
@@ -18,3 +18,3 @@ var relativeTimes = function (width) { return instructions_1.scope(width, width, relativeTimeBody); };
     ]),
-    instructions_1.vector2('displayName', 'date-field', 'date-field-width')
+    instructions_1.vector('displayName', ['date-field', 'date-field-width'])
 ]);
@@ -21,0 +21,0 @@ exports.DATEFIELDS_INDICES = {

lib/code/general.js

@@ -9,3 +9,3 @@ "use strict";
 ]);
-var listPattern = function (name) { return instructions_1.vector1(name, 'list-pattern-position'); };
+var listPattern = function (name) { return instructions_1.vector(name, ['list-pattern-position']); };
 exports.LIST_PATTERNS = instructions_1.scope('ListPatterns', 'ListPatterns', [
@@ -24,4 +24,4 @@ listPattern('and'),
 exports.CONTEXT_TRANSFORM = instructions_1.scope('ContextTransforms', 'ContextTransforms', [
-    instructions_1.vector1('contextTransforms', 'context-transform-field')
+    instructions_1.vector('contextTransforms', ['context-transform-field'])
 ]);
 //# sourceMappingURL=general.js.map

lib/code/index.js

@@ -39,3 +39,3 @@ "use strict";
         this.config = config;
-        this.indices = tslib_1.__assign(tslib_1.__assign(tslib_1.__assign(tslib_1.__assign(tslib_1.__assign(tslib_1.__assign(tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({ 'alt-key': schema_1.AltIndex, 'plural-key': schema_1.PluralIndex }, calendars_1.CALENDAR_INDICES), calendars_1.GREGORIAN_INDICES), emptyCalendarIndex('buddhist')), emptyCalendarIndex('japanese')), emptyCalendarIndex('persian')), datefields_1.DATEFIELDS_INDICES), general_1.GENERAL_INDICES), numbers_1.NUMBERS_INDICES), timezones_1.TIMEZONE_INDICES);
+        this.indices = tslib_1.__assign(tslib_1.__assign(tslib_1.__assign(tslib_1.__assign(tslib_1.__assign(tslib_1.__assign(tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({ 'alt-key': schema_1.AltIndex, 'day-period-alt-key': schema_1.DayPeriodAltIndex, 'era-alt-key': schema_1.EraAltIndex, 'plural-key': schema_1.PluralIndex }, calendars_1.CALENDAR_INDICES), calendars_1.GREGORIAN_INDICES), emptyCalendarIndex('buddhist')), emptyCalendarIndex('japanese')), emptyCalendarIndex('persian')), datefields_1.DATEFIELDS_INDICES), general_1.GENERAL_INDICES), numbers_1.NUMBERS_INDICES), timezones_1.TIMEZONE_INDICES);
     }
@@ -42,0 +42,0 @@ /**

lib/code/names.js

@@ -6,11 +6,11 @@ "use strict";
     instructions_1.scope('languages', 'languages', [
-        instructions_1.vector2('displayName', 'alt-key', 'language-id')
+        instructions_1.vector('displayName', ['alt-key', 'language-id'])
     ]),
     instructions_1.scope('scripts', 'scripts', [
-        instructions_1.vector2('displayName', 'alt-key', 'script-id')
+        instructions_1.vector('displayName', ['alt-key', 'script-id'])
     ]),
     instructions_1.scope('regions', 'regions', [
-        instructions_1.vector2('displayName', 'alt-key', 'region-id')
+        instructions_1.vector('displayName', ['alt-key', 'region-id'])
     ])
 ]);
 //# sourceMappingURL=names.js.map

lib/code/numbers.js

@@ -7,5 +7,5 @@ "use strict";
     instructions_1.field('minimumGroupingDigits'),
-    instructions_1.vector1('numberSystems', 'number-system'),
+    instructions_1.vector('numberSystems', ['number-system']),
     instructions_1.scopemap('numberSystem', 'number-system-name', [
-        instructions_1.vector1('symbols', 'number-symbol'),
+        instructions_1.vector('symbols', ['number-symbol']),
         instructions_1.scope('currencyFormats', 'currencyFormats', [
@@ -15,4 +15,4 @@ instructions_1.field('standard'),
             instructions_1.digits('short', 'plural-key', numbers_1.PluralDigitValues),
-            instructions_1.vector2('spacing', 'currency-spacing-pos', 'currency-spacing-pattern'),
-            instructions_1.vector1('unitPattern', 'plural-key')
+            instructions_1.vector('spacing', ['currency-spacing-pos', 'currency-spacing-pattern']),
+            instructions_1.vector('unitPattern', ['plural-key'])
         ]),
@@ -26,3 +26,3 @@ instructions_1.scope('decimalFormats', 'decimalFormats', [
         instructions_1.field('scientificFormat'),
-        instructions_1.vector1('miscPatterns', 'number-misc-pattern')
+        instructions_1.vector('miscPatterns', ['number-misc-pattern'])
     ])
@@ -29,0 +29,0 @@ ]);

lib/code/timezones.js

@@ -7,6 +7,6 @@ "use strict";
     instructions_1.scope('metaZones', 'metaZones', [
-        instructions_1.vector2('short', 'timezone-type', 'metazone'),
-        instructions_1.vector2('long', 'timezone-type', 'metazone')
+        instructions_1.vector('short', ['timezone-type', 'metazone']),
+        instructions_1.vector('long', ['timezone-type', 'metazone'])
     ]),
-    instructions_1.vector1('exemplarCity', 'timezone-id'),
+    instructions_1.vector('exemplarCity', ['timezone-id']),
     instructions_1.field('gmtFormat'),
@@ -13,0 +13,0 @@ instructions_1.field('hourFormat'),

lib/code/units.js

@@ -5,5 +5,5 @@ "use strict";
 var unitInfo = function (width) { return instructions_1.scope(width, width, [
-    instructions_1.vector2('unitPattern', 'plural-key', 'unit-id'),
-    instructions_1.vector1('displayName', 'unit-id'),
-    instructions_1.vector1('perUnitPattern', 'unit-id'),
+    instructions_1.vector('unitPattern', ['plural-key', 'unit-id']),
+    instructions_1.vector('displayName', ['unit-id']),
+    instructions_1.vector('perUnitPattern', ['unit-id']),
     instructions_1.field('perPattern'),
@@ -10,0 +10,0 @@ instructions_1.field('timesPattern')

lib/instructions.d.ts

@@ -13,2 +13,3 @@ import { KeyIndex } from '@phensley/cldr-types';
     readonly size: number;
+    readonly last: number;
     constructor(keys: T[]);
@@ -81,6 +82,6 @@ get(key: T): number;
  */
-export interface Vector1 {
-    readonly type: 'vector1';
+export interface Vector {
+    readonly type: 'vector';
     readonly name: string;
-    readonly dim0: string;
+    readonly dims: string[];
 }
@@ -90,13 +91,4 @@ /**
  */
-export interface Vector2 {
-    readonly type: 'vector2';
-    readonly name: string;
-    readonly dim0: string;
-    readonly dim1: string;
-}
+export declare type Instruction = Digits | Field | Origin | Scope | ScopeMap | Vector;
 /**
- * @public
- */
-export declare type Instruction = Digits | Field | Origin | Scope | ScopeMap | Vector1 | Vector2;
-/**
  * @internal
@@ -126,6 +118,2 @@ */
  */
-export declare const vector1: (name: string, dim0: string) => Vector1;
-/**
- * @internal
- */
-export declare const vector2: (name: string, dim0: string, dim1: string) => Vector2;
+export declare const vector: (name: string, dims: string[]) => Vector;

lib/instructions.js

@@ -14,2 +14,3 @@ "use strict";
         this.size = keys.length;
+        this.last = this.size - 1;
         var i = 0;
@@ -91,11 +92,5 @@ while (i < keys.length) {
  */
-exports.vector1 = function (name, dim0) {
-    return ({ type: 'vector1', name: name, dim0: dim0 });
+exports.vector = function (name, dims) {
+    return ({ type: 'vector', name: name, dims: dims });
 };
-/**
- * @internal
- */
-exports.vector2 = function (name, dim0, dim1) {
-    return ({ type: 'vector2', name: name, dim0: dim0, dim1: dim1 });
-};
 //# sourceMappingURL=instructions.js.map

lib/schema/arrows.d.ts

@@ -1,2 +0,2 @@
-import { DigitsArrow, FieldArrow, KeyIndex, PrimitiveBundle, ScopeArrow, Vector1Arrow, Vector2Arrow } from '@phensley/cldr-types';
+import { DigitsArrow, FieldArrow, KeyIndex, PrimitiveBundle, ScopeArrow } from '@phensley/cldr-types';
 /**
@@ -37,32 +37,18 @@ * @public
 /**
+ * Generalized multi-dimensional vector arrow.
+ *
  * @public
  */
-export declare class Vector1ArrowImpl<T extends string> implements Vector1Arrow<T> {
-    readonly index: KeyIndex<T>;
+export declare class VectorArrowImpl {
+    readonly keysets: KeyIndex<string>[];
+    readonly offset: number;
     readonly len: number;
-    readonly offset: number;
-    constructor(offset: number, index: KeyIndex<T>);
+    private last;
+    private factors;
+    constructor(offset: number, keysets: KeyIndex<string>[]);
     exists(bundle: PrimitiveBundle): boolean;
-    get(bundle: PrimitiveBundle, key: T): string;
-    mapping(bundle: PrimitiveBundle): {
-        [P in T]: string;
-    };
+    get(bundle: PrimitiveBundle, ...keys: (string | string[])[]): string;
+    mapping(bundle: PrimitiveBundle): any;
+    private _get;
+    private _mapping;
 }
-/**
- * @public
- */
-export declare class Vector2ArrowImpl<T extends string, S extends string> implements Vector2Arrow<T, S> {
-    readonly index1: KeyIndex<T>;
-    readonly index2: KeyIndex<S>;
-    readonly size: number;
-    readonly size2: number;
-    readonly offset: number;
-    constructor(offset: number, index1: KeyIndex<T>, index2: KeyIndex<S>);
-    exists(bundle: PrimitiveBundle): boolean;
-    get(bundle: PrimitiveBundle, key1: T, key2: S): string;
-    mapping(bundle: PrimitiveBundle): {
-        [P in T]: {
-            [Q in S]: string;
-        };
-    };
-}

lib/schema/arrows.js

@@ -61,105 +61,90 @@ "use strict";
 /**
+ * Generalized multi-dimensional vector arrow.
+ *
  * @public
  */
-var Vector1ArrowImpl = /** @class */ (function () {
-    function Vector1ArrowImpl(offset, index) {
-        this.index = index;
-        this.len = index.keys.length;
-        this.offset = offset + 1; // skip header
+var VectorArrowImpl = /** @class */ (function () {
+    function VectorArrowImpl(offset, keysets) {
+        this.keysets = keysets;
+        this.offset = offset + 1; // skip over header
+        this.len = keysets.length;
+        this.last = this.len - 1;
+        this.factors = new Array(this.len);
+        // Pre-compute the address factor for each dimension:
+        //  1-dim:        [ index0 ]
+        //  2-dim:        [ (index0 * size1), index1 ]
+        //  3-dim:        [ (index0 * size1 * size2), (index1 * size), index2 ]
+        //  ...
+        for (var i = 0; i < this.len; i++) {
+            var k = 1;
+            for (var j = i + 1; j < this.len; j++) {
+                k *= this.keysets[j].size;
+            }
+            this.factors[i] = k;
+        }
     }
-    Vector1ArrowImpl.prototype.exists = function (bundle) {
+    VectorArrowImpl.prototype.exists = function (bundle) {
         return bundle.get(this.offset - 1) === 'E';
     };
-    Vector1ArrowImpl.prototype.get = function (bundle, key) {
-        var exists = bundle.get(this.offset - 1) === 'E';
-        if (exists) {
-            var i = this.index.get(key);
-            return i === -1 ? '' : bundle.get(this.offset + i);
+    VectorArrowImpl.prototype.get = function (bundle) {
+        var keys = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            keys[_i - 1] = arguments[_i];
         }
-        return '';
-    };
-    Vector1ArrowImpl.prototype.mapping = function (bundle) {
-        var len = this.len;
-        var offset = this.offset;
-        var keys = this.index.keys;
-        /* tslint:disable-next-line */
-        var res = Object.create(null);
-        var exists = bundle.get(offset - 1) === 'E';
-        if (!exists) {
-            return res;
+        if (keys.length !== this.len) {
+            // Impossible lookup, will never reach a valid field
+            throw new Error("Warning: impossible vector lookup with keys " + JSON.stringify(keys));
         }
-        for (var i = 0; i < len; i++) {
-            var s = bundle.get(offset + i);
-            if (s) {
-                var k = keys[i];
-                res[k] = s;
-            }
+        if (!this.exists(bundle)) {
+            return '';
         }
-        return res;
+        return this._get(bundle, keys, 0, this.offset);
     };
-    return Vector1ArrowImpl;
-}());
-exports.Vector1ArrowImpl = Vector1ArrowImpl;
-/**
- * @public
- */
-var Vector2ArrowImpl = /** @class */ (function () {
-    function Vector2ArrowImpl(offset, index1, index2) {
-        this.index1 = index1;
-        this.index2 = index2;
-        this.size = index1.size * index2.size;
-        this.size2 = index2.size;
-        this.offset = offset + 1; // skip header
-    }
-    Vector2ArrowImpl.prototype.exists = function (bundle) {
-        return bundle.get(this.offset - 1) === 'E';
+    VectorArrowImpl.prototype.mapping = function (bundle) {
+        return this.exists(bundle) ? this._mapping(bundle, 0, 0) : {};
     };
-    Vector2ArrowImpl.prototype.get = function (bundle, key1, key2) {
-        var exists = bundle.get(this.offset - 1) === 'E';
-        if (exists) {
-            var i = this.index1.get(key1);
-            if (i !== -1) {
-                var j = this.index2.get(key2);
-                if (j !== -1) {
-                    var k = this.offset + (i * this.size2) + j;
-                    return bundle.get(k);
+    VectorArrowImpl.prototype._get = function (bundle, keys, ix, k) {
+        var key = keys[ix];
+        var args = typeof key === 'string' ? [key] : key;
+        var last = args.length - 1;
+        for (var i = 0; i < args.length; i++) {
+            var arg = args[i];
+            var j = this.keysets[ix].get(arg);
+            if (j === -1) {
+                if (i !== last) {
+                    continue;
                 }
+                return '';
             }
+            var kk = k + j * this.factors[ix];
+            var val = ix === this.last ? bundle.get(kk) : this._get(bundle, keys, ix + 1, kk);
+            if (!!val) {
+                return val;
+            }
         }
         return '';
     };
-    Vector2ArrowImpl.prototype.mapping = function (bundle) {
-        var offset = this.offset;
-        /* tslint:disable-next-line */
-        var res = Object.create(null);
-        var exists = bundle.get(offset - 1) === 'E';
-        if (!exists) {
-            return res;
-        }
-        var size2 = this.size2;
-        var keys1 = this.index1.keys;
-        var keys2 = this.index2.keys;
-        for (var i = 0; i < keys1.length; i++) {
-            exists = false;
-            /* tslint:disable-next-line */
-            var o = Object.create(null);
-            for (var j = 0; j < keys2.length; j++) {
-                var k = offset + (i * size2) + j;
-                var s = bundle.get(k);
-                if (s) {
-                    exists = true;
-                    var key2 = keys2[j];
-                    o[key2] = s;
+    VectorArrowImpl.prototype._mapping = function (bundle, k, ix) {
+        var o = {};
+        var keys = this.keysets[k].keys;
+        var last = k === this.last;
+        for (var i = 0; i < keys.length; i++) {
+            var key = keys[i];
+            if (last) {
+                // We're at the value level of the map, so lookup the corresponding string
+                var val = bundle.get(this.offset + i + ix);
+                if (val) {
+                    o[key] = val;
                 }
             }
-            if (exists) {
-                var key1 = keys1[i];
-                res[key1] = o;
+            else {
+                // Drill one level deeper
+                o[key] = this._mapping(bundle, k + 1, ix + (i * this.factors[k]));
             }
         }
-        return res;
+        return o;
     };
-    return Vector2ArrowImpl;
+    return VectorArrowImpl;
 }());
-exports.Vector2ArrowImpl = Vector2ArrowImpl;
+exports.VectorArrowImpl = VectorArrowImpl;
 //# sourceMappingURL=arrows.js.map

lib/schema/autogen.context.js

@@ -6,5 +6,5 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-/* tslint:disable:max-line-length */
+/* tslint:disable:max-line-length whitespace */
 /** @public */
 exports.ContextTransformFieldValues = ('calendar-field currencyName day-format-except-narrow day-standalone-except-narrow era-abbr era-name keyValue languages month-format-except-narrow month-standalone-except-narrow number-spellout relative script typographicNames').split(' ');
 //# sourceMappingURL=autogen.context.js.map

lib/schema/autogen.timezones.js

@@ -6,8 +6,8 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-/* tslint:disable:max-line-length */
+/* tslint:disable:max-line-length whitespace */
 /** @public */
 exports.TimeZoneStableIds = ('Africa/Abidjan Africa/Accra Africa/Addis_Ababa Africa/Algiers Africa/Asmera Africa/Bamako Africa/Bangui Africa/Banjul Africa/Bissau Africa/Blantyre Africa/Brazzaville Africa/Bujumbura Africa/Cairo Africa/Casablanca Africa/Ceuta Africa/Conakry Africa/Dakar Africa/Dar_es_Salaam Africa/Djibouti Africa/Douala Africa/El_Aaiun Africa/Freetown Africa/Gaborone Africa/Harare Africa/Johannesburg Africa/Juba Africa/Kampala Africa/Khartoum Africa/Kigali Africa/Kinshasa Africa/Lagos Africa/Libreville Africa/Lome Africa/Luanda Africa/Lubumbashi Africa/Lusaka Africa/Malabo Africa/Maputo Africa/Maseru Africa/Mbabane Africa/Mogadishu Africa/Monrovia Africa/Nairobi Africa/Ndjamena Africa/Niamey Africa/Nouakchott Africa/Ouagadougou Africa/Porto-Novo Africa/Sao_Tome Africa/Tripoli Africa/Tunis Africa/Windhoek America/Adak America/Anchorage America/Anguilla America/Antigua America/Araguaina America/Argentina/La_Rioja America/Argentina/Rio_Gallegos America/Argentina/Salta America/Argentina/San_Juan America/Argentina/San_Luis America/Argentina/Tucuman America/Argentina/Ushuaia America/Aruba America/Asuncion America/Bahia America/Bahia_Banderas America/Barbados America/Belem America/Belize America/Blanc-Sablon America/Boa_Vista America/Bogota America/Boise America/Buenos_Aires America/Cambridge_Bay America/Campo_Grande America/Cancun America/Caracas America/Catamarca America/Cayenne America/Cayman America/Chicago America/Chihuahua America/Coral_Harbour America/Cordoba America/Costa_Rica America/Creston America/Cuiaba America/Curacao America/Danmarkshavn America/Dawson America/Dawson_Creek America/Denver America/Detroit America/Dominica America/Edmonton America/Eirunepe America/El_Salvador America/Fort_Nelson America/Fortaleza America/Glace_Bay America/Godthab America/Goose_Bay America/Grand_Turk America/Grenada America/Guadeloupe America/Guatemala America/Guayaquil America/Guyana America/Halifax America/Havana America/Hermosillo America/Indiana/Knox America/Indiana/Marengo America/Indiana/Petersburg America/Indiana/Tell_City America/Indiana/Vevay America/Indiana/Vincennes America/Indiana/Winamac America/Indianapolis America/Inuvik America/Iqaluit America/Jamaica America/Jujuy America/Juneau America/Kentucky/Monticello America/Kralendijk America/La_Paz America/Lima America/Los_Angeles America/Louisville America/Lower_Princes America/Maceio America/Managua America/Manaus America/Marigot America/Martinique America/Matamoros America/Mazatlan America/Mendoza America/Menominee America/Merida America/Metlakatla America/Mexico_City America/Miquelon America/Moncton America/Monterrey America/Montevideo America/Montserrat America/Nassau America/New_York America/Nipigon America/Nome America/Noronha America/North_Dakota/Beulah America/North_Dakota/Center America/North_Dakota/New_Salem America/Ojinaga America/Panama America/Pangnirtung America/Paramaribo America/Phoenix America/Port-au-Prince America/Port_of_Spain America/Porto_Velho America/Puerto_Rico America/Punta_Arenas America/Rainy_River America/Rankin_Inlet America/Recife America/Regina America/Resolute America/Rio_Branco America/Santa_Isabel America/Santarem America/Santiago America/Santo_Domingo America/Sao_Paulo America/Scoresbysund America/Sitka America/St_Barthelemy America/St_Johns America/St_Kitts America/St_Lucia America/St_Thomas America/St_Vincent America/Swift_Current America/Tegucigalpa America/Thule America/Thunder_Bay America/Tijuana America/Toronto America/Tortola America/Vancouver America/Whitehorse America/Winnipeg America/Yakutat America/Yellowknife Antarctica/Casey Antarctica/Davis Antarctica/DumontDUrville Antarctica/Macquarie Antarctica/Mawson Antarctica/McMurdo Antarctica/Palmer Antarctica/Rothera Antarctica/Syowa Antarctica/Troll Antarctica/Vostok Arctic/Longyearbyen Asia/Aden Asia/Almaty Asia/Amman Asia/Anadyr Asia/Aqtau Asia/Aqtobe Asia/Ashgabat Asia/Atyrau Asia/Baghdad Asia/Bahrain Asia/Baku Asia/Bangkok Asia/Barnaul Asia/Beirut Asia/Bishkek Asia/Brunei Asia/Calcutta Asia/Chita Asia/Choibalsan Asia/Colombo Asia/Damascus Asia/Dhaka Asia/Dili Asia/Dubai Asia/Dushanbe Asia/Famagusta Asia/Gaza Asia/Hebron Asia/Hong_Kong Asia/Hovd Asia/Irkutsk Asia/Jakarta Asia/Jayapura Asia/Jerusalem Asia/Kabul Asia/Kamchatka Asia/Karachi Asia/Katmandu Asia/Khandyga Asia/Krasnoyarsk Asia/Kuala_Lumpur Asia/Kuching Asia/Kuwait Asia/Macau Asia/Magadan Asia/Makassar Asia/Manila Asia/Muscat Asia/Nicosia Asia/Novokuznetsk Asia/Novosibirsk Asia/Omsk Asia/Oral Asia/Phnom_Penh Asia/Pontianak Asia/Pyongyang Asia/Qatar Asia/Qostanay Asia/Qyzylorda Asia/Rangoon Asia/Riyadh Asia/Saigon Asia/Sakhalin Asia/Samarkand Asia/Seoul Asia/Shanghai Asia/Singapore Asia/Srednekolymsk Asia/Taipei Asia/Tashkent Asia/Tbilisi Asia/Tehran Asia/Thimphu Asia/Tokyo Asia/Tomsk Asia/Ulaanbaatar Asia/Urumqi Asia/Ust-Nera Asia/Vientiane Asia/Vladivostok Asia/Yakutsk Asia/Yekaterinburg Asia/Yerevan Atlantic/Azores Atlantic/Bermuda Atlantic/Canary Atlantic/Cape_Verde Atlantic/Faeroe Atlantic/Madeira Atlantic/Reykjavik Atlantic/South_Georgia Atlantic/St_Helena Atlantic/Stanley Australia/Adelaide Australia/Brisbane Australia/Broken_Hill Australia/Currie Australia/Darwin Australia/Eucla Australia/Hobart Australia/Lindeman Australia/Lord_Howe Australia/Melbourne Australia/Perth Australia/Sydney Etc/UTC Etc/Unknown Europe/Amsterdam Europe/Andorra Europe/Astrakhan Europe/Athens Europe/Belgrade Europe/Berlin Europe/Bratislava Europe/Brussels Europe/Bucharest Europe/Budapest Europe/Busingen Europe/Chisinau Europe/Copenhagen Europe/Dublin Europe/Gibraltar Europe/Guernsey Europe/Helsinki Europe/Isle_of_Man Europe/Istanbul Europe/Jersey Europe/Kaliningrad Europe/Kiev Europe/Kirov Europe/Lisbon Europe/Ljubljana Europe/London Europe/Luxembourg Europe/Madrid Europe/Malta Europe/Mariehamn Europe/Minsk Europe/Monaco Europe/Moscow Europe/Oslo Europe/Paris Europe/Podgorica Europe/Prague Europe/Riga Europe/Rome Europe/Samara Europe/San_Marino Europe/Sarajevo Europe/Saratov Europe/Simferopol Europe/Skopje Europe/Sofia Europe/Stockholm Europe/Tallinn Europe/Tirane Europe/Ulyanovsk Europe/Uzhgorod Europe/Vaduz Europe/Vatican Europe/Vienna Europe/Vilnius Europe/Volgograd Europe/Warsaw Europe/Zagreb Europe/Zaporozhye Europe/Zurich Indian/Antananarivo Indian/Chagos Indian/Christmas Indian/Cocos Indian/Comoro Indian/Kerguelen Indian/Mahe Indian/Maldives Indian/Mauritius Indian/Mayotte Indian/Reunion Pacific/Apia Pacific/Auckland Pacific/Bougainville Pacific/Chatham Pacific/Easter Pacific/Efate Pacific/Enderbury Pacific/Fakaofo Pacific/Fiji Pacific/Funafuti Pacific/Galapagos Pacific/Gambier Pacific/Guadalcanal Pacific/Guam Pacific/Honolulu Pacific/Johnston Pacific/Kiritimati Pacific/Kosrae Pacific/Kwajalein Pacific/Majuro Pacific/Marquesas Pacific/Midway Pacific/Nauru Pacific/Niue Pacific/Norfolk Pacific/Noumea Pacific/Pago_Pago Pacific/Palau Pacific/Pitcairn Pacific/Ponape Pacific/Port_Moresby Pacific/Rarotonga Pacific/Saipan Pacific/Tahiti Pacific/Tarawa Pacific/Tongatapu Pacific/Truk Pacific/Wake Pacific/Wallis').split(' ');
-/* tslint:disable:max-line-length */
+/* tslint:disable:max-line-length whitespace */
 /** @public */
 exports.MetaZoneValues = ('Acre Afghanistan Africa_Central Africa_Eastern Africa_Southern Africa_Western Alaska Almaty Amazon America_Central America_Eastern America_Mountain America_Pacific Anadyr Apia Aqtau Aqtobe Arabian Argentina Argentina_Western Armenia Atlantic Australia_Central Australia_CentralWestern Australia_Eastern Australia_Western Azerbaijan Azores Bangladesh Bhutan Bolivia Brasilia Brunei Cape_Verde Casey Chamorro Chatham Chile China Choibalsan Christmas Cocos Colombia Cook Cuba Davis DumontDUrville East_Timor Easter Ecuador Europe_Central Europe_Eastern Europe_Further_Eastern Europe_Western Falkland Fiji French_Guiana French_Southern GMT Galapagos Gambier Georgia Gilbert_Islands Greenland_Eastern Greenland_Western Guam Gulf Guyana Hawaii_Aleutian Hong_Kong Hovd India Indian_Ocean Indochina Indonesia_Central Indonesia_Eastern Indonesia_Western Iran Irkutsk Israel Japan Kamchatka Kazakhstan_Eastern Kazakhstan_Western Korea Kosrae Krasnoyarsk Kyrgystan Lanka Line_Islands Lord_Howe Macau Macquarie Magadan Malaysia Maldives Marquesas Marshall_Islands Mauritius Mawson Mexico_Northwest Mexico_Pacific Mongolia Moscow Myanmar Nauru Nepal New_Caledonia New_Zealand Newfoundland Niue Norfolk Noronha North_Mariana Novosibirsk Omsk Pakistan Palau Papua_New_Guinea Paraguay Peru Philippines Phoenix_Islands Pierre_Miquelon Pitcairn Ponape Pyongyang Qyzylorda Reunion Rothera Sakhalin Samara Samoa Seychelles Singapore Solomon South_Georgia Suriname Syowa Tahiti Taipei Tajikistan Tokelau Tonga Truk Turkmenistan Tuvalu Uruguay Uzbekistan Vanuatu Venezuela Vladivostok Volgograd Vostok Wake Wallis Yakutsk Yekaterinburg').split(' ');
 //# sourceMappingURL=autogen.timezones.js.map

lib/schema/enums.d.ts

@@ -11,1 +11,9 @@ import { PluralType } from '@phensley/cldr-types';
 export declare const AltIndex: KeyIndexImpl<import("../../../cldr-types/lib").AltType>;
+/**
+ * @public
+ */
+export declare const EraAltIndex: KeyIndexImpl<import("../../../cldr-types/lib").EraAltType>;
+/**
+ * @public
+ */
+export declare const DayPeriodAltIndex: KeyIndexImpl<import("../../../cldr-types/lib").DayPeriodAltType>;

lib/schema/enums.js

@@ -12,2 +12,10 @@ "use strict";
 exports.AltIndex = new instructions_1.KeyIndexImpl(['none', 'short', 'narrow', 'variant', 'stand-alone', 'long', 'menu']);
+/**
+ * @public
+ */
+exports.EraAltIndex = new instructions_1.KeyIndexImpl(['none', 'sensitive']);
+/**
+ * @public
+ */
+exports.DayPeriodAltIndex = new instructions_1.KeyIndexImpl(['none', 'casing']);
 //# sourceMappingURL=enums.js.map

package.json

 {
   "name": "@phensley/cldr-schema",
-  "version": "1.0.9",
+  "version": "1.1.0",
   "description": "Schema for @phensley/cldr",
@@ -38,18 +38,18 @@ "main": "lib/index.js",
   "dependencies": {
-    "@phensley/cldr-types": "1.0.9",
+    "@phensley/cldr-types": "1.1.0",
     "tslib": "^1.11.1"
   },
   "devDependencies": {
-    "@microsoft/api-extractor": "^7.7.8",
-    "@types/jest": "^25.1.3",
-    "@types/node": "^13.9.2",
+    "@microsoft/api-extractor": "^7.7.13",
+    "@types/jest": "^25.2.1",
+    "@types/node": "^13.11.1",
     "beautify-benchmark": "^0.2.4",
     "benchmark": "^2.1.4",
-    "chalk": "^2.3.2",
-    "jest": "^25.1.0",
-    "rimraf": "^3.0.0",
-    "ts-jest": "^25.2.1",
-    "tslint": "^6.1.0",
+    "chalk": "^4.0.0",
+    "jest": "^25.3.0",
+    "rimraf": "^3.0.2",
+    "ts-jest": "^25.3.1",
+    "tslint": "^6.1.1",
     "tslint-no-circular-imports": "^0.7.0",
-    "typescript": "^3.8.x"
+    "typescript": "^3.8.3"
   },
@@ -69,3 +69,3 @@ "jest": {
   },
-  "gitHead": "3c5f9737f7ca1034d3e87121e5d5b378595ca1ed"
+  "gitHead": "6aeccdd49b8740c95f97edae93a063306c271c57"
 }

No alert changes

Worsened metrics

Total package byte prevSize

162781

decreased by-0.39%

Lines of code

2607

decreased by-2.21%

Dependency changes

• + Added@phensley/cldr-types@1.1.0(transitive)

• - Removed@phensley/cldr-types@1.0.9(transitive)

• Updated@phensley/cldr-types@1.1.0