Merge pull request #154 from iLib-js/development

Merge to master to create release v14.1.1
iLib-js · Oct 26, 2018 · 039d8ef · 039d8ef
2 parents f6c40df + b10254c
commit 039d8ef
Show file tree

Hide file tree

Showing 77 changed files with 234 additions and 106 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -25,8 +25,8 @@ script:
   # [Error] QFontDatabase: Cannot find font directory /usr/lib/x86_64-linux-gnu/fonts - is Qt installed correctly?
   - sudo ln -s /usr/share/fonts /usr/lib/x86_64-linux-gnu/fonts
 
-  # iLib Full builde / Running nodeunit test.
-  - ant test
+  # iLib full build / Run nodeunit tests
+  - ant clean test
   #- which qmake
   #- which qmlscene
   #- cd qt/NodeunitTest

diff --git a/build.properties b/build.properties
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=14.1.0
+version=14.1.1
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
@@ -1,6 +1,25 @@
 Release Notes for Version 14
 ============================
 
+Build 003
+-------
+Published as version 14.1.1
+
+Bug Fixes:
+* Worked around a problem with uglifyjs which optimized out a block
+  of code that contained the comment that the ilib-webpack-loader was
+  looking for. The loader would replace that comment with dependencies on
+  the webpacked locale data files. Without that comment, no dependencies,
+  and therefore no locale data and no WebpackLoader code would be
+  included in the final webpack bundle.
+* Added the full file name including the file extension for requires
+  of `index.js`. If file name extension is missing, QT cannot load that
+  file properly.
+* Added missing `index.js` require statement in MeasurementFactory
+* AddressFmt.getFormatInfo would throw an exception for locales where the locale data was not available. Now,
+  it does not, and instead, it returns some hard-coded info by default that is roughly similar to the en-US
+  settings.
+
 Build 002
 -------
 Published as version 14.1.0
@@ -14,7 +33,7 @@ New Features:
     * Allows ilib to run in node or within a webpack bundle without changes
     * Allows clients to just require ilib classes directly without first requiring the loader installer
 
-Bug Fixes
+Bug Fixes:
 * Restored a missing mapping from the the native name for "Japan" to the ISO code "JP" in the nativecountries.json
     * Fixes address parsing for Japan
 

diff --git a/js/build.xml b/js/build.xml
@@ -342,6 +342,7 @@ limitations under the License.
             <fileset dir="${build.lib}">
                 <include name="ilib-node*"/>
                 <include name="ilib-qt*"/>
+                <include name="ilib-webpack*"/>
                 <include name="ilib-unpack.js"/>
             </fileset>
             <fileset dir="${build.base}">
@@ -359,7 +360,7 @@ limitations under the License.
 			<arg value="-c"/>
 			<arg value="-v"/>
 			<fileset dir="${build.lib}" includes="*.js"  excludes="ilib.js,ilib-*.js,runner.js,externs.js,datefmtstr.js"/>
-			<fileset dir="${build.lib}" includes="ilib-node*.js,ilib-stubs*,ilib-web.js,ilib-qt.js"/>
+			<fileset dir="${build.lib}" includes="ilib-node*.js,ilib-webpack.js,ilib-stubs*,ilib-web.js,ilib-qt.js"/>
 			<mapper type="glob" from="*.js" to="*.js"/>
 		</apply>
 		<apply osfamily="unix" executable="node" dest="${build.output.dyncode}" parallel="false" force="true">

diff --git a/js/index.js b/js/index.js
@@ -21,13 +21,7 @@ var ilib = require("./lib/ilib.js");
 
 if (!ilib._platform || (typeof(ilib._dyndata) !== 'boolean' && typeof(ilib._dyncode) !== 'boolean')) {
     if (typeof(__webpack_require__) !== 'undefined') {
-        // The following will either require and then install the
-        // WebpackLoader to dynamically load locale data bundles,
-        // or it will statically require all of the locale data that
-        // this build needs so that it can be included into this
-        // webpack bundle.
-
-        // !defineLocaleData
+        require("./lib/ilib-webpack.js");
     } else {
         switch (ilib._getPlatform()) {
             case 'webos':
@@ -37,7 +31,7 @@ if (!ilib._platform || (typeof(ilib._dyndata) !== 'boolean' && typeof(ilib._dync
 
             case 'qt':
                 require("./lib/ilib-qt.js");
-
+                break;
             case 'rhino':
                 require("./lib/ilib-rhino.js");
                 break;

diff --git a/js/lib/Address.js b/js/lib/Address.js
@@ -21,7 +21,7 @@
 
 // !data address countries nativecountries ctrynames
 
-var ilib = require("../index");
+var ilib = require("../index.js");
 var Utils = require("./Utils.js");
 var JSUtils = require("./JSUtils.js");
 var Locale = require("./Locale.js");

diff --git a/js/lib/AddressFmt.js b/js/lib/AddressFmt.js
@@ -19,7 +19,7 @@
 
 // !data address addressres regionnames
 
-var ilib = require("../index");
+var ilib = require("../index.js");
 var Utils = require("./Utils.js");
 var JSUtils = require("./JSUtils.js");
 
@@ -28,6 +28,42 @@ var Address = require("./Address.js");
 var IString = require("./IString.js");
 var ResBundle = require("./ResBundle.js");
 
+// default generic data
+var defaultData = {
+    formats: {
+        "default": "{streetAddress}\n{locality} {region} {postalCode}\n{country}",
+        "nocountry": "{streetAddress}\n{locality} {region} {postalCode}"
+    },
+    startAt: "end",
+    fields: [
+        {
+            "name": "postalCode",
+            "line": "startAtLast",
+            "pattern": "[0-9]+",
+            "matchGroup": 0
+        },
+        {
+            "name": "region",
+            "line": "last",
+            "pattern": "([A-zÀÁÈÉÌÍÑÒÓÙÚÜàáèéìíñòóùúü\\.\\-\\']+\\s*){1,2}$",
+            "matchGroup": 0
+        },
+        {
+            "name": "locality",
+            "line": "last",
+            "pattern": "([A-zÀÁÈÉÌÍÑÒÓÙÚÜàáèéìíñòóùúü\\.\\-\\']+\\s*){1,2}$",
+            "matchGroup": 0
+        }
+    ],
+    fieldNames: {
+        "streetAddress": "Street Address",
+        "locality": "City",
+        "postalCode": "Zip Code",
+        "region": "State",
+        "country": "Country"
+    }
+};
+
 /**
  * @class
  * Create a new formatter object to format physical addresses in a particular way.
@@ -128,10 +164,16 @@ var AddressFmt = function(options) {
  * @private
  */
 AddressFmt.prototype._init = function () {
-    this.style = this.info && this.info.formats && this.info.formats[this.styleName];
+    if (!this.info) this.info = defaultData;
+
+    this.style = this.info.formats && this.info.formats[this.styleName];
 
     // use generic default -- should not happen, but just in case...
-    this.style = this.style || (this.info && this.info.formats && this.info.formats["default"]) || "{streetAddress}\n{locality} {region} {postalCode}\n{country}";
+    this.style = this.style || (this.info.formats && this.info.formats["default"]) || defaultData.formats["default"];
+
+    if (!this.info.fieldNames) {
+        this.info.fieldNames = defaultData.fieldNames;
+    }
 };
 
 /**
@@ -369,7 +411,7 @@ AddressFmt.prototype.getFormatInfo = function(locale, sync, callback) {
                 sync: this.sync,
                 loadParams: this.loadParams,
                 onLoad: ilib.bind(this, function (rb) {
-                    var type, format, fields = this.info.fields;
+                    var type, format, fields = this.info.fields || defaultData.fields;
                     if (this.info.multiformat) {
                         type = isAsianLocale(this.locale) ? "asian" : "latin";
                         fields = this.info.fields[type];

diff --git a/js/lib/AlphabeticIndex.js b/js/lib/AlphabeticIndex.js
@@ -19,7 +19,7 @@
 
 // !data nfc nfkd
 
-var ilib = require("../index");
+var ilib = require("../index.js");
 var Utils = require("./Utils.js");
 var Locale = require("./Locale.js");
 var CType = require("./CType.js");

diff --git a/js/lib/Astro.js b/js/lib/Astro.js
@@ -25,7 +25,7 @@
  * September 1999.
  */
 
-var ilib = require("../index");
+var ilib = require("../index.js");
 var Utils = require("./Utils.js");
 var SearchUtils = require("./SearchUtils.js");
 

diff --git a/js/lib/CType.js b/js/lib/CType.js
@@ -19,7 +19,7 @@
 
 // !data ctype
 
-var ilib = require("../index");
+var ilib = require("../index.js");
 var SearchUtils = require("./SearchUtils.js");
 var Utils = require("./Utils.js");
 var IString = require("./IString.js");

diff --git a/js/lib/CalendarFactory.js b/js/lib/CalendarFactory.js
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-var ilib = require("../index");
+var ilib = require("../index.js");
 var Locale = require("./Locale.js");
 var LocaleInfo = require("./LocaleInfo.js");
 var Calendar = require("./Calendar.js");

diff --git a/js/lib/CaseMapper.js b/js/lib/CaseMapper.js
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-var ilib = require("../index");
+var ilib = require("../index.js");
 
 var Locale = require("./Locale.js");
 var IString = require("./IString.js");

diff --git a/js/lib/Charmap.js b/js/lib/Charmap.js
@@ -19,7 +19,7 @@
 
 // !data charmaps charset/US-ASCII charset/ISO-10646-UCS-2 charset/ISO-8859-1 charset/ISO-8859-15 charmaps/ISO-8859-15 charmaps/ISO-8859-1 charset/ISO-8859-1
 
-var ilib = require("../index");
+var ilib = require("../index.js");
 var JSUtils = require("./JSUtils.js");
 var IString = require("./IString.js");
 

diff --git a/js/lib/CharmapFactory.js b/js/lib/CharmapFactory.js
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-var ilib = require("../index");
+var ilib = require("../index.js");
 var JSUtils = require("./JSUtils.js");
 
 var Charset = require("./Charset.js");

diff --git a/js/lib/CharmapTable.js b/js/lib/CharmapTable.js
@@ -19,7 +19,7 @@
 
 // !data charmaps/ISO-8859-15 charset/ISO-8859-15
 
-var ilib = require("../index");
+var ilib = require("../index.js");
 var Utils = require("./Utils.js");
 var Charset = require("./Charset.js");
 var Charmap = require("./Charmap.js");

diff --git a/js/lib/Charset.js b/js/lib/Charset.js
@@ -19,7 +19,7 @@
 
 // !data charset charsetaliases charset/ISO-8859-1 charset/ISO-8859-15 charset/UTF-8
 
-var ilib = require("../index");
+var ilib = require("../index.js");
 var Utils = require("./Utils.js");
 
 /**

diff --git a/js/lib/Collator.js b/js/lib/Collator.js
@@ -19,7 +19,7 @@
 
 // !data collation
 
-var ilib = require("../index");
+var ilib = require("../index.js");
 var Utils = require("./Utils.js");
 var JSUtils = require("./JSUtils.js");
 var Locale = require("./Locale.js");

diff --git a/js/lib/CopticDate.js b/js/lib/CopticDate.js
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-var ilib = require("../index");
+var ilib = require("../index.js");
 var MathUtils = require("./MathUtils.js");
 
 var Locale = require("./Locale.js");

diff --git a/js/lib/Country.js b/js/lib/Country.js
@@ -19,7 +19,7 @@
 
 // !data ctryreverse
 
-var ilib = require("../index");
+var ilib = require("../index.js");
 var Utils = require("./Utils.js");
 var Locale = require("./Locale.js");
 var LocaleInfo = require("./LocaleInfo.js");

diff --git a/js/lib/Currency.js b/js/lib/Currency.js
@@ -19,7 +19,7 @@
 
 // !data currency
 
-var ilib = require("../index");
+var ilib = require("../index.js");
 var Utils = require("./Utils.js");
 var Locale = require("./Locale.js");
 var LocaleInfo = require("./LocaleInfo.js");

diff --git a/js/lib/DateFactory.js b/js/lib/DateFactory.js
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-var ilib = require("../index");
+var ilib = require("../index.js");
 var JSUtils = require("./JSUtils.js");
 
 var Locale = require("./Locale.js");

diff --git a/js/lib/DateFmt.js b/js/lib/DateFmt.js
@@ -19,7 +19,7 @@
 
 // !data dateformats sysres
 
-var ilib = require("../index");
+var ilib = require("../index.js");
 var Utils = require("./Utils.js");
 var JSUtils = require("./JSUtils.js");
 

diff --git a/js/lib/DateRngFmt.js b/js/lib/DateRngFmt.js
@@ -19,7 +19,7 @@
 
 // !data dateformats sysres
 
-var ilib = require("../index");
+var ilib = require("../index.js");
 var JSUtils = require("./JSUtils.js");
 
 var Locale = require("./Locale.js");

diff --git a/js/lib/DurationFmt.js b/js/lib/DurationFmt.js
@@ -19,7 +19,7 @@
 
 // !data dateformats sysres
 
-var ilib = require("../index");
+var ilib = require("../index.js");
 var JSUtils = require("./JSUtils.js");
 var Locale = require("./Locale.js");
 var LocaleInfo = require("./LocaleInfo.js");

diff --git a/js/lib/EthiopicDate.js b/js/lib/EthiopicDate.js
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-var ilib = require("../index");
+var ilib = require("../index.js");
 var MathUtils = require("./MathUtils.js");
 
 var EthiopicRataDie = require("./EthiopicRataDie.js");

diff --git a/js/lib/GlyphString.js b/js/lib/GlyphString.js
@@ -20,7 +20,7 @@
 
 // !data ccc nfc ctype_m
 
-var ilib = require("../index");
+var ilib = require("../index.js");
 var Utils = require("./Utils.js");
 var JSUtils = require("./JSUtils.js");
 

diff --git a/js/lib/GregorianDate.js b/js/lib/GregorianDate.js
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-var ilib = require("../index");
+var ilib = require("../index.js");
 var SearchUtils = require("./SearchUtils.js");
 var MathUtils = require("./MathUtils.js");
 

diff --git a/js/lib/HanCal.js b/js/lib/HanCal.js
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-var ilib = require("../index");
+var ilib = require("../index.js");
 var MathUtils = require("./MathUtils.js");
 
 var Calendar = require("./Calendar.js");

diff --git a/js/lib/HanDate.js b/js/lib/HanDate.js
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-var ilib = require("../index");
+var ilib = require("../index.js");
 var JSUtils = require("./JSUtils.js");
 var MathUtils = require("./MathUtils.js");
 

diff --git a/js/lib/HanRataDie.js b/js/lib/HanRataDie.js
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-var ilib = require("../index");
+var ilib = require("../index.js");
 var MathUtils = require("./MathUtils.js");
 var HanCal = require("./HanCal.js");
 var RataDie = require("./RataDie.js");

diff --git a/js/lib/HebrewDate.js b/js/lib/HebrewDate.js
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-var ilib = require("../index");
+var ilib = require("../index.js");
 var MathUtils = require("./MathUtils.js");
 
 var Locale = require("./Locale.js");