@symbo.ls/cli 2.10.121 → 2.10.123

package/bin/convert.js

@@ -14,6 +14,17 @@ global.document = window.document
 
 const TMP_DIR_NAME = ".smbls_convert_tmp"
 
+async function mkdirp(dir) {
+  try {
+    return await fs.promises.mkdir(dir)
+  } catch (err) {
+    if (err.code !== 'EEXIST') {
+      throw err
+    }
+  }
+  return null
+}
+
 program
   .command('convert')
   .description('Recursively convert and copy all DomQL components under a directory')
@@ -36,18 +47,12 @@ program
 
     // Resolve source & destination directories
     const srcPath = path.resolve(src || './src')
-    const destPath = path.resolve(dest || './dist')
+    const destPath = path.resolve(dest || desiredFormat)
     const tmpDirPath = path.resolve(path.dirname(destPath), TMP_DIR_NAME)
 
-    // Make tmp directory
-    try {
-      await fs.promises.mkdir(tmpDirPath)
-    } catch (err) {
-      if (err.code !== 'EEXIST') {
-        console.log(err)
-        return 1;
-      }
-    }
+    // Make tmp and dist directories
+    await mkdirp(tmpDirPath)
+    await mkdirp(destPath)
 
     const origFiles = await fs.promises.readdir(srcPath)
 
@@ -62,24 +67,48 @@ program
     })
 
     // Convert components
-    const files = await fs.promises.readdir(tmpDirPath)
-    for (const file of files) {
-      if (file === 'Atoms') continue
-
-      let filePath = path.join(tmpDirPath, file)
-
-      if ((await fs.promises.stat(filePath)).isDirectory()) {
-        const importPath = `${filePath}/index.js`
+    const componentDirs = await fs.promises.readdir(tmpDirPath)
+    for (const componentDir of componentDirs) {
+      if (componentDir === 'Atoms') continue
+      let importDir = path.join(tmpDirPath, componentDir)
+      if ((await fs.promises.stat(importDir)).isDirectory()) {
+        // Import the module
+        const importPath = `${importDir}/index.js`
         console.log(`importing ${importPath}`)
         const domqlModule = (await import(importPath)).default
         console.log(domqlModule)
+
+        // Create directory for component in dest dir
+        const destComponentDirPath = `${destPath}/${componentDir}`
+        await mkdirp(destComponentDirPath)
+
+        // Convert & append each exported domql object
+        const uniqueImports = []
+        let fileContents = ""
+        let first = true
         for (const key in domqlModule) {
           const component = domqlModule[key]
-          const gen = convert(component, desiredFormat, {
+          component.__name = key
+          const out = convert(component, desiredFormat, {
             verbose: false,
-            exportDefault: domqlModule.length === 1
+            exportDefault: false,
+            returnMitosisIR: true,
+            importsToRemove: uniqueImports,
+            removeReactImport: !first
           })
-          //console.log(gen)
+
+          fileContents = fileContents + out.str + '\n'
+          uniqueImports.push(...out.mitosisIR.imports)
+          first = false
+        }
+        console.log(uniqueImports)
+
+        // Write file
+        if (fileContents.length > 0) {
+          const fh = await fs.promises
+                .open(`${destComponentDirPath}/index.js`, 'w')
+          await fh.writeFile(fileContents, 'utf8')
+          await fh.close()
         }
       }
     }

package/bin/fetch.js

@@ -1,17 +1,19 @@
 #!/usr/bin/env node
 
 import fs from 'fs'
-import fetch from 'node-fetch'
 import chalk from 'chalk'
 import { loadModule } from './require.js'
 import { exec } from 'child_process'
 import { program } from './program.js'
 
+import * as fetch from '@symbo.ls/fetch'
+const { fetchRemote } = fetch
+
 const PACKAGE_PATH = process.cwd() + '/package.json'
 const RC_PATH = process.cwd() + '/symbols.json'
 const LOCAL_CONFIG_PATH = process.cwd() + '/node_modules/@symbo.ls/init/dynamic.json'
 const DEFAULT_REMOTE_REPOSITORY = 'https://github.com/symbo-ls/default-config/'
-const DEFAULT_REMOTE_CONFIG_PATH = 'https://raw.githubusercontent.com/symbo-ls/default-config/main/src/config.json'
+const DEFAULT_REMOTE_CONFIG_PATH = 'https://api.symbols.dev/'
 
 const API_URL = 'https://api.symbols.dev/' // eslint-disable-line
 
@@ -19,6 +21,11 @@ const pkg = loadModule(PACKAGE_PATH)
 const rc_file = loadModule(RC_PATH) // eslint-disable-line
 const local_config = loadModule(LOCAL_CONFIG_PATH) // eslint-disable-line
 
+let rc = {}
+try {
+  rc = loadModule(RC_PATH) // eslint-disable-line
+} catch (e) { console.error('Please include symbols.json to your root of respository') }
+
 program
   .version(pkg.version)
 
@@ -65,31 +72,38 @@ program
 program
   .command('fetch [destination]')
   .description('Fetch symbols')
-  .action(async (source, destination) => {
-    const response = await fetch(DEFAULT_REMOTE_CONFIG_PATH)
-    const body = await response.json()
-    const { version, ...config } = body
-
-    console.log(chalk.dim('- Default config from:'), chalk.dim.underline(DEFAULT_REMOTE_REPOSITORY))
-    console.log('')
-    console.log(chalk.bold('Symbols'), 'config fetched:', chalk.green(version))
-
-    console.log(chalk.dim('- symbols.json created:'), chalk.dim.underline(LOCAL_CONFIG_PATH))
-    console.log('')
-
-    const bodyString = JSON.stringify(body)
-    fs.writeFile(LOCAL_CONFIG_PATH, bodyString, err => {
-      if (err) {
-        console.log('Error writing file', err)
-      } else {
-        console.log('Successfully wrote file')
+  .action(async (options) => {
+    rc.then(async data => {
+      const opts = { ...data, ...options }
+      const key = data.key || options.key
+
+      const body = await fetchRemote(key, { endpoint: 'api.symbols.dev' })
+      const { version, ...config } = body
+
+      console.log(chalk.bold('Symbols'), 'config fetched:')
+      if (key) console.log(chalk.green(key))
+      else console.log(chalk.dim('- Default config from:'), chalk.dim.underline(DEFAULT_REMOTE_REPOSITORY))
+      console.log('')
+
+      console.log(chalk.dim('- symbols.json created:'), chalk.dim.underline(LOCAL_CONFIG_PATH))
+      console.log('')
+
+      for (const t in config) {
+        const type = config[t]
+        console.log(chalk.bold(t))
+        const arr = []
+        for (const v in type) arr.push(v)
+        console.log('  ', chalk.dim(arr.join(', ')))
       }
-    })
 
-    for (const t in config) {
-      const type = config[t]
-      console.log(chalk.bold(t))
-      for (const v in type) console.log('  ', chalk.dim(v))
-      console.log(Object.keys(type))
-    }
+      const bodyString = JSON.stringify(body)
+      fs.writeFile(LOCAL_CONFIG_PATH, bodyString, err => {
+        console.log('')
+        if (err) {
+          console.log('Error writing file', err)
+        } else {
+          console.log('Successfully wrote file')
+        }
+      })
+    })
   })

package/bin/sync.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 
+import { updateDynamycFile } from '@symbo.ls/socket'
 import * as asd from '@symbo.ls/socket/client.js'
 import { program } from './program.js'
 import { loadModule } from './require.js'
@@ -18,12 +19,32 @@ program
   .action(async (options) => {
     rc.then(data => {
       const opts = { ...data, ...options }
-      const key = rc.key || options.key
+      const key = data.key || options.key
       asd.connect(key, {
-        socketUrl: 'socket.symbols.app',
         onConnect: (id, socket) => {
           console.log(id)
-        }
+        },
+        onChange: (event, data) => {
+          data = JSON.parse(data)
+          let d = {}
+          const { 
+            PROJECT_SYSTEM,
+            PROJECT_STATE,
+            PROJECT_COMPONENTS,
+            PROJECT_SNIPPETS,
+            PROJECT_PAGES
+          } = data
+          if (PROJECT_SYSTEM) d.system = PROJECT_SYSTEM
+          if (PROJECT_STATE) d.system = PROJECT_STATE
+          if (PROJECT_COMPONENTS) d.system = PROJECT_COMPONENTS
+          if (PROJECT_SNIPPETS) d.system = PROJECT_SNIPPETS
+          if (PROJECT_PAGES) d.system = PROJECT_PAGES
+          if (Object.keys(d).length) updateDynamycFile(d)
+        },
+        onError: (err, socket) => {
+          console.log(err)
+        },
+        ...opts
       })
     })
   })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symbo.ls/cli",
-  "version": "2.10.121",
+  "version": "2.10.123",
   "description": "Fetch your Symbols configuration",
   "main": "bin/fetch.js",
   "author": "Symbols",
@@ -27,5 +27,5 @@
   "standard": {
     "parser": "babel-eslint"
   },
-  "gitHead": "056cc9dcdadcc2022ec2b400eb1a8a3909d42380"
+  "gitHead": "8e7c8dada6686b012c70e414cada2dd249790ab2"
 }