@symbo.ls/cli 2.10.122 → 2.10.123

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.122",
+  "version": "2.10.123",
   "description": "Fetch your Symbols configuration",
   "main": "bin/fetch.js",
   "author": "Symbols",
@@ -27,5 +27,5 @@
   "standard": {
     "parser": "babel-eslint"
   },
-  "gitHead": "6d969a3ea842c89f518ca5c43636ddb06055e8ba"
+  "gitHead": "8e7c8dada6686b012c70e414cada2dd249790ab2"
 }