Merge pull request #62 from rwjblue/use-gt

Fix for beta versions with svelte.

Author: rwjblue

src/utils/normalize-options.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const satisfies = require('semver').satisfies;
+const gte = require('semver').gte;
 
 function normalizeOptions(options) {
   let features = options.features || [];
@@ -32,10 +32,7 @@ function normalizeOptions(options) {
 
       if (svelte !== undefined && typeof value === 'string' && svelte[name]) {
         hasSvelteBuild = true;
-        flags[flagName] = svelteMap[featuresSource][flagName] = satisfies(
-          value,
-          `>=${svelte[name]}`
-        );
+        flags[flagName] = svelteMap[featuresSource][flagName] = gte(value, svelte[name]);
       } else if (typeof value === 'boolean' || value === null) {
         flags[flagName] = featuresMap[featuresSource][flagName] = value;
       } else {

tests/normalize-options-test.js

@@ -0,0 +1,92 @@
+'use strict';
+
+const normalizeOptions = require('../src/utils/normalize-options').normalizeOptions;
+
+describe('normalizeOptions', function() {
+  it('sets flag to false when svelte version is higher than flag version', function() {
+    let actual = normalizeOptions({
+      debugTools: {
+        source: 'whatever',
+      },
+      envFlags: {
+        flags: {
+          DEBUG: true,
+        },
+      },
+      svelte: { foo: '1.2.0' },
+      features: [{ name: 'foo', source: 'foo/features', flags: { ABC: '1.1.0' } }],
+    });
+
+    let expected = {
+      debugTools: { assertPredicateIndex: undefined, debugToolsImport: 'whatever' },
+      envFlags: { envFlagsImport: undefined, flags: { DEBUG: true } },
+      externalizeHelpers: undefined,
+      featureSources: ['foo/features'],
+      features: [{ flags: { ABC: false }, name: 'foo', source: 'foo/features' }],
+      featuresMap: { 'foo/features': {} },
+      hasSvelteBuild: true,
+      svelte: { foo: '1.2.0' },
+      svelteMap: { 'foo/features': { ABC: false } },
+    };
+
+    expect(actual).toEqual(expected);
+  });
+
+  it('sets flag to true when svelte version is lower than flag version', function() {
+    let actual = normalizeOptions({
+      debugTools: {
+        source: 'whatever',
+      },
+      envFlags: {
+        flags: {
+          DEBUG: true,
+        },
+      },
+      svelte: { foo: '1.0.0' },
+      features: [{ name: 'foo', source: 'foo/features', flags: { ABC: '1.1.0' } }],
+    });
+
+    let expected = {
+      debugTools: { assertPredicateIndex: undefined, debugToolsImport: 'whatever' },
+      envFlags: { envFlagsImport: undefined, flags: { DEBUG: true } },
+      externalizeHelpers: undefined,
+      featureSources: ['foo/features'],
+      features: [{ flags: { ABC: true }, name: 'foo', source: 'foo/features' }],
+      featuresMap: { 'foo/features': {} },
+      hasSvelteBuild: true,
+      svelte: { foo: '1.0.0' },
+      svelteMap: { 'foo/features': { ABC: true } },
+    };
+
+    expect(actual).toEqual(expected);
+  });
+
+  it('sets flag to true when svelte version is a beta version higher than flag version', function() {
+    let actual = normalizeOptions({
+      debugTools: {
+        source: 'whatever',
+      },
+      envFlags: {
+        flags: {
+          DEBUG: true,
+        },
+      },
+      svelte: { foo: '1.2.0' },
+      features: [{ name: 'foo', source: 'foo/features', flags: { ABC: '1.1.0-beta.1' } }],
+    });
+
+    let expected = {
+      debugTools: { assertPredicateIndex: undefined, debugToolsImport: 'whatever' },
+      envFlags: { envFlagsImport: undefined, flags: { DEBUG: true } },
+      externalizeHelpers: undefined,
+      featureSources: ['foo/features'],
+      features: [{ flags: { ABC: false }, name: 'foo', source: 'foo/features' }],
+      featuresMap: { 'foo/features': {} },
+      hasSvelteBuild: true,
+      svelte: { foo: '1.2.0' },
+      svelteMap: { 'foo/features': { ABC: false } },
+    };
+
+    expect(actual).toEqual(expected);
+  });
+});