@lion/ui 0.0.2 → 0.0.3

package/components/core/test/SlotMixin.test.js

@@ -1,14 +1,21 @@
 import sinon from 'sinon';
-import { defineCE, expect, fixture } from '@open-wc/testing';
+import { defineCE, expect, fixture, unsafeStatic, html } from '@open-wc/testing';
 import { ScopedElementsMixin } from '@open-wc/scoped-elements';
 import { SlotMixin } from '@lion/ui/core.js';
-import { LitElement, html } from 'lit';
+import { LitElement } from 'lit';
 
+const mockedRenderTarget = document.createElement('div');
 function mockScopedRegistry() {
+  const outputObj = { createElementCallCount: 0 };
   // @ts-expect-error wait for browser support
-  ShadowRoot.prototype.createElement = () => {};
+  ShadowRoot.prototype.createElement = () => {
+    outputObj.createElementCallCount += 1;
+    // Return an element that lit can use as render target
+    return mockedRenderTarget;
+  };
   // @ts-expect-error wait for browser support
   window.CustomElementRegistry = class {};
+  return outputObj;
 }
 
 function unMockScopedRegistry() {
@@ -211,13 +218,12 @@ describe('SlotMixin', () => {
     expect(slot.tagName).to.equal('SPAN');
   });
 
-  // TODO: @Thijs is this still needed?
-  it.skip('supports scoped elements when polyfill loaded', async () => {
-    mockScopedRegistry();
+  it('supports scoped elements when polyfill loaded', async () => {
+    const outputObj = mockScopedRegistry();
 
     class ScopedEl extends LitElement {}
 
-    const tag = defineCE(
+    const tagName = defineCE(
       class extends ScopedElementsMixin(SlotMixin(LitElement)) {
         static get scopedElements() {
           return {
@@ -240,16 +246,10 @@ describe('SlotMixin', () => {
       },
     );
 
-    let error = '';
-    try {
-      // @ts-ignore
-      await fixture(html`<${tag}></${tag}>`, { scopedElements: true });
-    } catch (e) {
-      // @ts-ignore
-      error = e.toString();
-    }
-    // it throws when it uses our temp mock (error is browser specific, so we check overlapping part)
-    expect(error).to.include('.importNode is not a function');
+    const tag = unsafeStatic(tagName);
+    await fixture(html`<${tag}></${tag}>`);
+
+    expect(outputObj.createElementCallCount).to.equal(1);
 
     unMockScopedRegistry();
   });
@@ -257,7 +257,7 @@ describe('SlotMixin', () => {
   it('does not scope elements when polyfill not loaded', async () => {
     class ScopedEl extends LitElement {}
 
-    const tag = defineCE(
+    const tagName = defineCE(
       class extends ScopedElementsMixin(SlotMixin(LitElement)) {
         static get scopedElements() {
           return {
@@ -280,10 +280,17 @@ describe('SlotMixin', () => {
       },
     );
 
+    const renderTarget = document.createElement('div');
+    const el = document.createElement(tagName);
+
+    // We don't use fixture, so we limit the amount of calls to document.createElement
     const docSpy = sinon.spy(document, 'createElement');
-    await fixture(html`<${tag}></${tag}>`);
-    // one for the fixture, one for the scoped slot
-    expect(docSpy).to.have.been.calledTwice;
+    document.body.appendChild(renderTarget);
+    renderTarget.appendChild(el);
+
+    expect(docSpy.callCount).to.equal(2);
+
+    document.body.removeChild(renderTarget);
     docSpy.restore();
   });
 });

package/components/localize/src/number/parseNumber.js

@@ -1,56 +1,35 @@
 import { getDecimalSeparator } from './getDecimalSeparator.js';
 
-/**
- * @param {string} value to evaluate
- * @return {boolean} true if value equal . or ,
- */
-function isDecimalSeparator(value) {
-  return value === '.' || value === ',';
-}
-
 /**
  * Determines the best possible parsing mode.
  *
- * - If there is only one separator (withLocale)
- * - 1,23 => xxx1.23 (heuristic)
- * - else parse mode depends mostly on the last 4 chars
- * - 1234 => xxx1234 (heuristic)
- * - [space]123 => xxx123 (heuristic)
- * - ,123 => unclear
- *   - if 1.000,123 (we find a different separator) => 1000.123 (heuristic)
- *   - if 1,000,123 (we find only same separators) => 1000123 (unparseable)
- *   - if 100,123 (we find no more separators) => unclear
- *     - if en => 100123 (withLocale)
- *     - if nl => 100.123 (withLocale)
- *
- * See also {@link parseAmount}
+ * It has 3 "methods" of returning numbers
+ * - 'unparseable': becomes just numbers
+ * - 'withLocale': result depends on given or global locale
+ * - 'heuristic': result depends on considering separators
  *
  * @example
- * getParseMode('1.234') => 'withLocale'
+ * parseNumber('1.234.567'); // method: unparseable => 1234567
+ * parseNumber('1.234'); // method: withLocale => depending on locale 1234 or 1.234
+ * parseNumber('1.234,56'); // method: heuristic => 1234.56
+ * parseNumber('1 234.56'); // method: heuristic => 1234.56
+ * parseNumber('1,234.56'); // method: heuristic => 1234.56
  *
  * @param {string} value Clean number (only [0-9 ,.]) to be parsed
+ * @param {object} options
+ * @param {string?} [options.mode] auto|pasted
  * @return {string} unparseable|withLocale|heuristic
  */
 function getParseMode(value, { mode = 'auto' } = {}) {
   const separators = value.match(/[., ]/g);
 
-  if (mode === 'auto' && separators && separators.length === 1) {
+  if (!separators || (mode === 'auto' && separators.length === 1)) {
     return 'withLocale';
   }
-
-  if (value.length > 4) {
-    const charAtLastSeparatorPosition = value[value.length - 4];
-    if (isDecimalSeparator(charAtLastSeparatorPosition)) {
-      const firstPart = value.substring(0, value.length - 4);
-      const otherSeparators = firstPart.match(/[., ]/g);
-      if (otherSeparators) {
-        const lastSeparator = charAtLastSeparatorPosition;
-        return otherSeparators.indexOf(lastSeparator) === -1 ? 'heuristic' : 'unparseable';
-      }
-      return 'withLocale';
-    }
+  if (separators.length === 1 || separators[0] !== separators[separators.length - 1]) {
+    return 'heuristic';
   }
-  return 'heuristic';
+  return 'unparseable';
 }
 
 /**

package/components/localize/test/number/parseNumber.test.js

@@ -72,19 +72,10 @@ describe('parseNumber()', () => {
     expect(parseNumber('123456.78', { mode: 'pasted' })).to.equal(123456.78);
   });
 
-  it('detects separators heuristically when there are 2 same ones e.g. 1.234.56', () => {
-    expect(parseNumber('1.234.5')).to.equal(1234.5);
-    expect(parseNumber('1,234,5')).to.equal(1234.5);
-
-    expect(parseNumber('1.234.56')).to.equal(1234.56);
-    expect(parseNumber('1,234,56')).to.equal(1234.56);
+  it('detects separators unparseable when there are 2 same ones e.g. 1.234.56', () => {
+    expect(parseNumber('1.234.56')).to.equal(123456);
+    expect(parseNumber('1,234,56')).to.equal(123456);
     expect(parseNumber('1 234 56')).to.equal(123456);
-
-    expect(parseNumber('1.234.5678')).to.equal(1234.5678);
-    expect(parseNumber('1,234,5678')).to.equal(1234.5678);
-
-    expect(parseNumber('1.234.56789')).to.equal(1234.56789);
-    expect(parseNumber('1,234,56789')).to.equal(1234.56789);
   });
 
   it('uses locale to parse amount if there is only one separator e.g. 1.234', () => {

package/dist-types/components/localize/src/number/parseNumber.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parseNumber.d.ts","sourceRoot":"","sources":["../../../../../components/localize/src/number/parseNumber.js"],"names":[],"mappings":"AAuGA;;;;;;;;;;;;;;;;;;GAkBG;AACH,mCAHW,MAAM,6GA6BhB"}
+{"version":3,"file":"parseNumber.d.ts","sourceRoot":"","sources":["../../../../../components/localize/src/number/parseNumber.js"],"names":[],"mappings":"AAkFA;;;;;;;;;;;;;;;;;;GAkBG;AACH,mCAHW,MAAM,6GA6BhB"}