@js-joda/core 5.4.1 → 5.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@js-joda/core",
-  "version": "5.4.1",
+  "version": "5.5.0",
   "description": "a date and time library for javascript",
   "repository": {
     "type": "git",
@@ -31,9 +31,9 @@
     "test": "NODE_ENV=test npx mocha --timeout 5000 --require @babel/register ./test/*Test_mochaOnly.js ./test/*Test.js ./test/**/*Test.js ./test/**/**/*Test.js",
     "test-coverage": "NODE_ENV=test COVERAGE=1 npx nyc --report-dir=build/coverage --reporter=lcov --reporter html npx mocha --timeout 5000 --require @babel/register --reporter progress ./test/*Test.js ./test/**/*Test.js ./test/**/**/*Test.js",
     "test-browser": "npx karma start --reporters=dots --single-run",
-    "test-saucelabs": "npx karma start --reporters=\"dots,saucelabs\" --browsers=\"sl_chrome,sl_ie,sl_firefox,sl_ios_simulator\" --single-run=true",
+    "test-saucelabs": "npx karma start --reporters=\"dots,saucelabs\" --browsers=\"sl_chrome,sl_ie,sl_firefox\" --single-run=true",
     "test-ci": "npm run build-dist && npm run test && npm run test-browser && npm run test-ts-definitions && npm run test-coverage",
-    "test-ts-definitions": "TS_NODE_PROJECT='test/typescript_definitions/tsconfig.json' NODE_ENV=test mocha --timeout 5000 --require ts-node/register ./test/typescript_definitions/*.ts",
+    "test-ts-definitions": "TS_NODE_PROJECT='../../shared/ts-test-config.json' NODE_ENV=test mocha --timeout 5000 --require ts-node/register ./test/typescript_definitions/*.ts",
     "build-dist": "npx rollup -c rollup.config.js",
     "build-md-toc": "npx markdown-toc -i CheatSheet.md",
     "build-gz-check": "gzip -kf dist/js-joda.min.js && ls -alh ./dist/js-joda.min.js*",
@@ -47,5 +47,6 @@
   "nyc": {
     "sourceMap": false,
     "instrument": false
-  }
+  },
+  "gitHead": "7388db45c1ac3aee66730d764075ede1429c38db"
 }

package/src/js-joda.js

@@ -59,6 +59,7 @@ import { ValueRange } from './temporal/ValueRange';
 import { DateTimeFormatter } from './format/DateTimeFormatter';
 import { DateTimeFormatterBuilder } from './format/DateTimeFormatterBuilder';
 import { DecimalStyle } from './format/DecimalStyle';
+import { ParsePosition } from './format/ParsePosition';
 import { ResolverStyle } from './format/ResolverStyle';
 import { SignStyle } from './format/SignStyle';
 import { TextStyle } from './format/TextStyle';
@@ -76,7 +77,7 @@ import { StringBuilder } from './format/StringBuilder';
 import * as assert from './assert';
 
 import { convert } from './convert';
-import { nativeJs } from './temporal/NativeJsTemporal';
+import { nativeJs } from './nativeJs';
 import { bindUse } from './use';
 
 const _ = {
@@ -111,6 +112,7 @@ const jsJodaExports = {
     OffsetDateTime,
     Month,
     MonthDay,
+    ParsePosition,
     Period,
     Year,
     YearConstants,
@@ -179,6 +181,7 @@ export {
     OffsetTime,
     OffsetDateTime,
     Period,
+    ParsePosition,
     Year,
     YearConstants,
     YearMonth,

package/src/nativeJs.js

@@ -0,0 +1,27 @@
+/*
+ * @copyright (c) 2015-present, Philipp Thürwächter, Pattrick Hüper & js-joda contributors
+ * @license BSD-3-Clause (see LICENSE in the root directory of this source tree)
+ */
+
+import { requireNonNull } from './assert';
+import { IllegalArgumentException } from './errors';
+import { Instant, ZoneId } from './js-joda';
+
+/**
+ * Creates ZonedDateTime from a javascript Date or a moment instance.
+ * @param {!(Date|moment)} date - a javascript Date or a moment instance
+ * @param {ZoneId} [zone = ZoneId.systemDefault()] - the zone of the returned ZonedDateTime, defaults to ZoneId.systemDefault()
+ * @returns {ZonedDateTime}
+ */
+export function nativeJs(date, zone = ZoneId.systemDefault()) {
+    requireNonNull(date, 'date');
+    requireNonNull(zone, 'zone');
+    switch (date.constructor.name) {
+        case 'Date':
+            return Instant.ofEpochMilli(date.getTime()).atZone(zone);
+        case 'Moment':
+            return Instant.ofEpochMilli(date.valueOf()).atZone(zone);
+        default:
+            throw new IllegalArgumentException('date must be a javascript Date or a moment instance');
+    }
+}

package/src/temporal/IsoFields.js

@@ -812,7 +812,7 @@ class Unit extends TemporalUnit {
     }
 
     toString() {
-        return name;
+        return this._name;
     }
 }
 

package/typings/js-joda.d.ts

@@ -2478,7 +2478,7 @@ export abstract class ChronoZonedDateTime extends Temporal {
 //   SUPPORT
 // ----------------------------------------------------------------------------
 
-export function nativeJs(date: Date | any, zone?: ZoneId): TemporalAccessor;
+export function nativeJs(date: Date | any, zone?: ZoneId): ZonedDateTime;
 
 export function convert(
     temporal: LocalDate | LocalDateTime | ZonedDateTime | Instant,

package/src/temporal/NativeJsTemporal.js

@@ -1,105 +0,0 @@
-/*
- * @copyright (c) 2016, Philipp Thürwächter & Pattrick Hüper
- * @license BSD-3-Clause (see LICENSE in the root directory of this source tree)
- */
-
-import { assert, requireNonNull } from '../assert';
-import { UnsupportedTemporalTypeException } from '../errors';
-
-import { Instant } from '../Instant';
-import { LocalDate } from '../LocalDate';
-import { LocalTime } from '../LocalTime';
-import { MathUtil } from '../MathUtil';
-import { ZoneId } from '../ZoneId';
-
-import { ChronoField } from './ChronoField';
-import { TemporalQueries } from './TemporalQueries';
-import { TemporalAccessor } from './TemporalAccessor';
-
-/**
- * A wrapper around a native javascript Date instance that
- * implements TemporalAccessor functionality
- */
-class NativeJsTemporal extends TemporalAccessor {
-
-    /**
-     * @param {!(Date|moment)} date - a javascript Date or a moment instance
-     * @param {ZoneId} [zone=ZoneId.systemDefault()] - the zone of the temporal, defaults to ZoneId.systemDefault()
-     * @private
-     */
-    constructor(date, zone=ZoneId.systemDefault()){
-        super();
-        this._zone = zone;
-        if(date instanceof Date) {
-            this._epochMilli = date.getTime();
-            return;
-        } else if(typeof date.toDate === 'function' &&  date.toDate() instanceof Date) {
-            // it's a moment
-            this._epochMilli = date.toDate().getTime();
-            return;
-        }
-        assert(false, 'date must be either a javascript date or a moment');
-    }
-
-    /**
-     * @param {TemporalQuery} query  the query to invoke, not null
-     * @return {*} the query result, null may be returned (defined by the query)
-     * @throws DateTimeException if unable to query
-     */
-    query(query) {
-        requireNonNull(query, 'query');
-        if (query === TemporalQueries.localDate()) {
-            return LocalDate.ofInstant(Instant.ofEpochMilli(this._epochMilli), this._zone);
-        } else if(query === TemporalQueries.localTime()){
-            return LocalTime.ofInstant(Instant.ofEpochMilli(this._epochMilli), this._zone);
-        } else if(query === TemporalQueries.zone()){
-            return this._zone;
-        }
-        return super.query(query);
-    }
-
-    /**
-     *
-     * @param {TemporalField} field
-     * @returns {number}
-     */
-    get(field) {
-        return this.getLong(field);
-    }
-
-    /**
-     *
-     * @param {!TemporalField} field
-     * @returns {number}
-     */
-    getLong(field) {
-        requireNonNull(field, 'field');
-        if (field instanceof ChronoField) {
-            switch (field) {
-                case ChronoField.NANO_OF_SECOND: return MathUtil.floorMod(this._epochMilli, 1000) * 1000000;
-                case ChronoField.INSTANT_SECONDS: return MathUtil.floorDiv(this._epochMilli, 1000);
-            }
-            throw new UnsupportedTemporalTypeException(`Unsupported field: ${field}`);
-        }
-        return field.getFrom(this);
-    }
-
-    /**
-     *
-     * @param {TemporalField} field
-     * @returns {boolean}
-     */
-    isSupported(field){
-        return field === ChronoField.INSTANT_SECONDS || field === ChronoField.NANO_OF_SECOND;
-    }
-}
-
-/**
- *
- * @param {!(Date|moment)} date - a javascript Date or a moment instance
- * @param {ZoneId} [zone=ZoneId.systemDefault()] - the zone of the temporal, defaults to ZoneId.systemDefault()
- * @returns {NativeJsTemporal}
- */
-export function nativeJs(date, zone){
-    return new NativeJsTemporal(date, zone);
-}