@a-la/import - npm Package Compare versions

Comparing version 1.6.1 to 1.6.2

build/lib/import-as.js

@@ -1,8 +0,3 @@
-const { replaceRequire, fromRe } = require('.');
+const { replaceRequire, fromRe, getIfEsModule } = require('.');
 
-const makeDefaultIf = (name) => {
-  const i = `if (${name} && ${name}.__esModule) ${name} = ${name}.default;`
-  return i
-}
-
 const importRe = /( *import\s+(?:(.+?)\s*,\s*)?\*\s+as\s+(.+?))/
@@ -24,7 +19,10 @@ const re = new RegExp(`${importRe.source}${fromRe.source}`, 'gm')
     if (defName) {
-      c = `${ws}let ${varName} = ${defName}${r} ${makeDefaultIf(defName)}`
+      c = [
+        `${ws}let ${varName} = ${defName}${r}`,
+        getIfEsModule(defName),
+      ].join('; ')
     } else {
       c = `${ws}const ${varName}${r}`
     }
-    return c
+    return `${c};`
   },
@@ -31,0 +29,0 @@ }

build/lib/index.js

        const getRequire = (quotes, src) => {
-  return `require(${quotes}${src}${quotes});`
+  return `require(${quotes}${src}${quotes})`
 }
 
        const getIfEsModule = (name) => {
-  const s = `if (${name} && ${name}.__esModule) ${name} = ${name}.default;`
+  const s = `if (${name} && ${name}.__esModule) ${name} = ${name}.default`
   return s
@@ -12,5 +12,5 @@ }
   if (!name) return
-  const i = getIfEsModule(name)
-  const s = `${name} = ${req} ${i}`
-  return s
+  const ifES = getIfEsModule(name)
+  const d = `${name} = ${req}`
+  return { d, ifES }
 }
@@ -17,0 +17,0 @@

build/lib/rule.js

@@ -45,11 +45,12 @@ const {
     const source = getSource(s, this.config)
-    const replacedDefault = getDef(defSeg, defName, quotes, source)
+    const { t, ifES } = getDef(defSeg, defName, quotes, source)
     const replacedNamed = getNamed(namedSeg, fromSeg, quotes, source, defName)
     const res = [
-      replacedDefault,
+      t,
       replacedNamed,
+      ifES,
     ]
       .filter(a => a)
-      .join(' ')
-    return res
+      .join('; ')
+    return `${res};`
   },
@@ -59,8 +60,8 @@ }
 const getDef = (defSeg, defName, quotes, src) => {
-  if (!defSeg) return null
+  if (!defSeg) return {}
   const req = getRequire(quotes, src)
-  const dd = getDefault(defName, req)
-  const d = replaceDefault(defSeg, dd)
-  const s = `let${d}`
-  return s
+  const { d, ifES } = getDefault(defName, req)
+  const s = replaceDefault(defSeg, d)
+  const t = `let${s}`
+  return { t, ifES }
 }
@@ -67,0 +68,0 @@

CHANGELOG.md

@@ -0,1 +1,7 @@
+## 20 September 2018
+
+### 1.6.2
+
+- [fix] Rearrange default and named to fix the problem with modules imported from `babel`-transpiled modules.
+
 ## 1 September 2018
@@ -2,0 +8,0 @@

package.json

 {
   "name": "@a-la/import",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "À La Regex to transpile the import statement into a require call.",
@@ -8,3 +8,5 @@ "main": "build",
     "t": "zoroaster -a",
-    "test": "zoroaster -a test/spec",
+    "test": "yarn t test/spec test/mask",
+    "spec": "yarn t test/spec",
+    "mask": "yarn t test/mask",
     "test-build": "ALAMODE_ENV=test-build yarn test",
@@ -60,11 +62,11 @@ "test-all": "yarn-s test test-build",
     "@a-la/context": "1.2.3",
-    "alamode": "1.3.0",
-    "catchment": "3.0.1",
-    "documentary": "1.10.0",
+    "alamode": "1.5.0",
+    "catchment": "3.1.1",
+    "documentary": "1.18.0",
     "eslint-config-artdeco": "1.0.1",
-    "restream": "3.1.1",
+    "restream": "3.2.1",
     "yarn-s": "1.1.0",
-    "zoroaster": "2.4.0"
+    "zoroaster": "3.5.0"
   },
   "dependencies": {}
 }

README.md

@@ -13,2 +13,4 @@ # @a-la/import
 
+<p align="center"><a href="#table-of-contents"><img src=".documentary/section-breaks/0.svg?sanitize=true"></a></p>
+
 ## Table Of Contents
@@ -28,2 +30,4 @@
 
+<p align="center"><a href="#table-of-contents"><img src=".documentary/section-breaks/1.svg?sanitize=true"></a></p>
+
 ## API
@@ -83,3 +87,6 @@
 
+<p align="center"><a href="#table-of-contents"><img src=".documentary/section-breaks/2.svg?sanitize=true"></a></p>
 
+
+
 ## Output Example
@@ -108,5 +115,5 @@
 const { methodC, methodD: aliasD } = require('alamode');
-let defaultALaMode = require('alamode'); if (defaultALaMode && defaultALaMode.__esModule) defaultALaMode = defaultALaMode.default; const {
+let defaultALaMode = require('alamode'); const {
   methodE, methodF,
-} = defaultALaMode
+} = defaultALaMode; if (defaultALaMode && defaultALaMode.__esModule) defaultALaMode = defaultALaMode.default;
 
@@ -116,3 +123,8 @@ let tests = def = require('./tests'); if (def && def.__esModule) def = def.default;
 
+<p align="center"><a href="#table-of-contents"><img src=".documentary/section-breaks/3.svg?sanitize=true"></a></p>
 
+
+
+
+
 ## Lines Preservation
@@ -155,3 +167,3 @@
 ```js
-let def = require('package'); if (def && def.__esModule) def = def.default; const {
+let def = require('package'); const {
   test, test2,
@@ -164,5 +176,7 @@ test3: alias3,
   =
-  def
+  def; if (def && def.__esModule) def = def.default;
 ```
 
+<p align="center"><a href="#table-of-contents"><img src=".documentary/section-breaks/4.svg?sanitize=true"></a></p>
+
 ## Checklist
@@ -181,2 +195,4 @@
 
+<p align="center"><a href="#table-of-contents"><img src=".documentary/section-breaks/5.svg?sanitize=true"></a></p>
+
 ## TODO
@@ -192,1 +208,3 @@
 [1]: https://alamode.cc
+
+<p align="center"><a href="#table-of-contents"><img src=".documentary/section-breaks/-1.svg?sanitize=true"></a></p>

No alert changes

Improved metrics

Total package byte prevSize

28998

increased by3.16%

Number of lines in readme file

201

increased by9.24%

No dependency changes