@symbo.ls/cli 2.11.365 → 2.11.369

package/bin/fetch.js

@@ -18,8 +18,8 @@ const LOCAL_CONFIG_PATH =
 const DEFAULT_REMOTE_REPOSITORY = 'https://github.com/symbo-ls/default-config/'
 const DEFAULT_REMOTE_CONFIG_PATH = "https://api.symbols.app/"; // eslint-disable-line
 
-const API_URL_LOCAL = 'http://localhost:13335/get/'
-const API_URL = 'https://api.symbols.app/get/'
+const API_URL_LOCAL = 'http://localhost:13335/get'
+const API_URL = 'https://api.symbols.app/get'
 
 const rcFile = loadModule(RC_PATH); // eslint-disable-line
 const localConfig = loadModule(LOCAL_CONFIG_PATH); // eslint-disable-line
@@ -36,16 +36,19 @@ try {
 }
 
 export const fetchFromCli = async (opts) => {
-  const { dev, verbose, prettify, convert: convertOpt, update } = opts
+  const { dev, verbose, prettify, convert: convertOpt, metadata: metadataOpt, update } = opts
   await rc.then(async (data) => {
-    const { key, framework, distDir } = data
+    const { key, framework, distDir, metadata } = data
 
     const endpoint = dev ? API_URL_LOCAL : API_URL
 
     console.log('\nFetching from:', chalk.bold(endpoint), '\n')
 
+    console.log('metadata')
+    console.log(metadata, metadataOpt)
     const body = await fetchRemote(key, {
       endpoint,
+      metadata: metadata || metadataOpt,
       onError: (e) => {
         console.log(chalk.red('Failed to fetch:'), key)
         if (verbose) console.error(e)
@@ -111,15 +114,14 @@ export const fetchFromCli = async (opts) => {
       else console.log(debugMsg)
     }
 
-    console.log(convertOpt)
     if (body.components && convertOpt && framework) {
       convertFromCli(body.components, { ...opts, framework })
     }
 
     if (update) {
-      createFs(body, distDir, update)
+      createFs(body, distDir, { update: true, metadata })
     } else {
-      createFs(body, distDir)
+      createFs(body, distDir, { metadata })
     }
   })
 }
@@ -130,6 +132,7 @@ program
   .option('-d, --dev', 'Running from local server')
   .option('-v, --verbose', 'Verbose errors and warnings')
   .option('--convert', 'Verbose errors and warnings', true)
+  .option('--metadata', 'Include metadata', false)
   .option('--update', 'overriding changes from platform')
   .option('--verbose-code', 'Verbose errors and warnings')
   .action(fetchFromCli)

package/bin/fs.js

@@ -5,27 +5,35 @@ import utils from '@domql/utils'
 import * as smblsUtils from '@symbo.ls/utils'
 import inquirer from 'inquirer'
 import { createPatch } from 'diff'
+import { fileURLToPath } from 'url'
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url))
 
 const { removeChars, toCamelCase } = smblsUtils.default
-const { deepDestringify, objectToString, joinArrays, isString } = utils
+const { deepDestringify, objectToString, joinArrays, isString, removeValueFromArray } = utils
 
-const LOCAL_CONFIG_PATH =
-  process.cwd() + '/node_modules/@symbo.ls/init/dynamic.json'
+const LOCAL_CONFIG_PATH = path.resolve(__dirname, '/node_modules/@symbo.ls/init/dynamic.json')
+const LOCAL_CONFIG_PATH2 = process.cwd() + '/symbols.json'
 
+let singleFileKeys = ['designSystem', 'state']
 const keys = ['components', 'snippets', 'pages']
-const singleFileKeys = ['designSystem', 'state']
-const defaultExports = ['pages', 'designSystem', 'state']
+const defaultExports = ['pages', 'designSystem', 'state', 'schema']
 
 export async function createFs (
   body,
-  distDir = path.join(process.cwd(), 'dist'),
-  update = false
+  distDir = path.join(process.cwd(), 'smbls'),
+  opts = {}
 ) {
   if (!body) {
     console.error('No JSON object provided. Exiting.')
     return
   }
 
+  const { update, metadata } = opts
+
+  singleFileKeys = removeValueFromArray(singleFileKeys, 'schema')
+  if (metadata) singleFileKeys.push('schema')
+
   const targetDir = distDir
 
   const filesExist = fs.existsSync(targetDir)
@@ -177,6 +185,8 @@ export async function createFs (
   // fs.writeFileSync(destPath, genStr)
   // }
 
+  console.log(LOCAL_CONFIG_PATH)
+  console.log(LOCAL_CONFIG_PATH2)
   await fs.writeFileSync(LOCAL_CONFIG_PATH, '{}')
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symbo.ls/cli",
-  "version": "2.11.365",
+  "version": "2.11.369",
   "description": "Fetch your Symbols configuration",
   "main": "bin/fetch.js",
   "author": "Symbols",
@@ -26,5 +26,5 @@
     "node-fetch": "^3.1.0",
     "v8-compile-cache": "^2.3.0"
   },
-  "gitHead": "27ab0a87d9a8ccf8eb50512b96b3015e15610910"
+  "gitHead": "556bcf2a422abe3d198bc8499255aaf5f0db7e45"
 }