@symbo.ls/cli 2.11.39 → 2.11.56

package/bin/convert.js

@@ -63,13 +63,13 @@ function convertDomqlModule (domqlModule, desiredFormat, options) {
 
   console.group()
   const uniqueImports = []
-  let first = true
+  const first = true
+  let currentExportIdx = 0
   let removeUseContextImport = false
   const exportCount = Object.keys(domqlModule).length
   for (const key in domqlModule) {
     // Skip if not found in whitelist
-    if (whitelist && !whitelist.includes(key))
-      continue
+    if (whitelist && !whitelist.includes(key)) { continue }
 
     // Skip some components if converting smbls uikit
     if (options.internalUikit &&
@@ -78,35 +78,42 @@ function convertDomqlModule (domqlModule, desiredFormat, options) {
       continue
     }
 
-    console.log(key)
     try {
-    // import('domql-to-mitosis').then(({ convert }) => {
-      if (convert) {
-        console.group()
-        const component = domqlModule[key]
-        component.__name = key
-
-        const out = convert(component, desiredFormat, {
-          verbose: false,
-          exportDefault: exportCount === 1,
-          returnMitosisIR: true,
-          importsToRemove: uniqueImports,
-          removeReactImport: !first,
-          removeUseContextImport
-        })
-
-        convertedStr = convertedStr + out.str + '\n'
-        uniqueImports.push(...out.mitosisIR.imports)
-        first = false
-        if (out.mitosisIR._useContext) { removeUseContextImport = true }
-        console.groupEnd()
-      } else {
-        throw new Error('Convert from `domql-to-mitosis` is not defined. Try to install `domql-to-mitosis` and run this command again.')
-      }
-    // })
+      convert()
     } catch (err) {
       throw new Error('`domql-to-mitosis` is not found.')
     }
+    // import('domql-to-mitosis').then(({ convert }) => {
+    if (convert) {
+      console.group()
+      const component = domqlModule[key]
+      component.__name = key
+
+      const isSingleComponent = exportCount === 1
+      const isFirst = currentExportIdx === 0
+      const isLast = currentExportIdx === exportCount - 1
+
+      const out = convert(component, desiredFormat, {
+        verbose: false,
+        exportDefault: isSingleComponent,
+        returnMitosisIR: true,
+        importsToRemove: uniqueImports,
+        removeReactImport: !isFirst,
+        removeUseContextImport
+      })
+
+      convertedStr = convertedStr + out.str
+      if (options.trailingNewLine && !isLast) {
+        convertedStr += '\n'
+      }
+
+      uniqueImports.push(...out.mitosisIR.imports)
+      if (out.mitosisIR._useContext) { removeUseContextImport = true }
+      console.groupEnd()
+      currentExportIdx++
+    } else {
+      throw new Error('Convert from `domql-to-mitosis` is not defined. Try to install `domql-to-mitosis` and run this command again.')
+    }
   }
   console.groupEnd()
 
@@ -123,7 +130,7 @@ program
   .option('--vue2', 'Convert all DomQL components to Vue2')
   .option('--vue3', 'Convert all DomQL components to Vue3')
   .option('-t, --tmp-dir <path>', `Use this directory for storing intermediate & build files instead of the default (dest/${TMP_DIR_NAME})`)
-  .option('-o, --only <components>', `Only convert these components; comma separated (for example: --only=Flex,Img)`)
+  .option('-o, --only <components>', 'Only convert these components; comma separated (for example: --only=Flex,Img)')
   .option('--internal-uikit', '(For internal use only). Excludes particular components from the conversion')
   .action(async (src, dest, options) => {
     // Desired format
@@ -260,7 +267,7 @@ program
         const convertedStr = convertDomqlModule(
           domqlModule,
           desiredFormat,
-          options
+          { ...options, trailingNewLine: true }
         )
 
         // Write file

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symbo.ls/cli",
-  "version": "2.11.39",
+  "version": "2.11.56",
   "description": "Fetch your Symbols configuration",
   "main": "bin/fetch.js",
   "author": "Symbols",
@@ -27,5 +27,5 @@
   "peerDependencies": {
     "domql-to-mitosis": "latest"
   },
-  "gitHead": "2f40754c45ab3e9132e5335d3f01fcf7d2ac977b"
+  "gitHead": "f69acac1d0a3b53b8c6d7caac06964b830174cec"
 }