@symbo.ls/create 2.10.165 → 2.10.168

package/index.js

@@ -1,29 +1,22 @@
 'use strict'
 
 import DOM from 'domql'
-import { transformDOMQLEmotion } from '@domql/emotion'
-import { router as defaultRouter } from '@domql/router'
-
-import * as utils from '@symbo.ls/utils'
-import * as domqlUtils from '@domql/utils'
+import { deepMerge, isObject, isString } from '@domql/utils'
 
+import * as utils from './utilImports'
 import * as uikit from '@symbo.ls/uikit'
-import { init, updateReset } from '@symbo.ls/init'
-import { set } from '@symbo.ls/scratch'
 
-import { emotion as defaultEmotion, createEmotion } from '@symbo.ls/emotion'
-import { defaultDefine } from './define'
+import { emotion as defaultEmotion } from '@symbo.ls/emotion'
 
-import DYNAMIC_JSON from '@symbo.ls/init/dynamic.json'
-
-import { deepMerge, isObject } from '@domql/utils'
+import { defaultDefine } from './define'
 import { initRouter } from './router'
 import { fetchAsync, fetchSync } from './ferchOnCreate'
+import { initEmotion } from './initEmotion'
 
+import DYNAMIC_JSON from '@symbo.ls/init/dynamic.json'
 const SYMBOLS_KEY = process.env.SYMBOLS_KEY
-const smblsUtils = { init, set, updateReset } 
 
-const defaultOptions = {
+export const DEFAULT_CREATE_OPTIONS = {
   editor: {
     endpoint: 'api.symbols.app'
   },
@@ -52,29 +45,17 @@ const mergeWithLocalFile = (options, RC_FILE) => {
   return deepMerge(options, rcfile)
 }
 
-export const create = async (App, options = defaultOptions, RC_FILE) => {
-  const appIsKey = domqlUtils.isString(App)
+export const create = async (App, options = DEFAULT_CREATE_OPTIONS, RC_FILE) => {
+  const appIsKey = isString(App)
   options = mergeWithLocalFile(options, RC_FILE)
   const key = options.key || SYMBOLS_KEY || (appIsKey ? App : '')
 
   if (appIsKey) App = {}
   await fetchSync(key, options)
 
-  const initOptions = options.initOptions || {}
-  const emotion = initOptions.emotion || defaultEmotion || createEmotion()
-  if (!initOptions.emotion) initOptions.emotion = emotion
-  const emotionDefine = options.registry || transformDOMQLEmotion(initOptions.emotion, options)
-
   const doc = options.parent || options.document || document
 
-  const scratchSystem = init(options.designSystem || {}, {
-    key,
-    emotion,
-    verbose: options.verbose,
-    document: doc,
-    ...defaultOptions.designSystem,
-    ...initOptions
-  })
+  const [scratchSystem, emotion, registry] = initEmotion(key, options)
 
   initRouter(App, options.routerOptions)
 
@@ -82,8 +63,7 @@ export const create = async (App, options = defaultOptions, RC_FILE) => {
   const pages =  options.pages || {}
   const components = options.components ? { ...uikit, ...options.components } : uikit
   const designSystem = scratchSystem || {}
-  const snippets = { ...utils, ...domqlUtils, ...smblsUtils, ...(options.snippets || {})}
-  const router = options.router || defaultRouter
+  const snippets = { ...utils, ...(options.snippets || {})}
   const define = options.define || defaultDefine
 
   const domqlApp = DOM.create({
@@ -99,8 +79,7 @@ export const create = async (App, options = defaultOptions, RC_FILE) => {
       snippets,
       utils: snippets,
       define,
-      registry: emotionDefine,
-      router,
+      registry,
       emotion,
       document: doc
     }

package/initEmotion.js

@@ -0,0 +1,25 @@
+'use strict'
+
+import { transformDOMQLEmotion } from '@domql/emotion'
+import { emotion as defaultEmotion } from '@symbo.ls/emotion'
+import { init } from '@symbo.ls/init'
+import { DEFAULT_CREATE_OPTIONS } from '.'
+
+export const initEmotion = (key, options = DEFAULT_CREATE_OPTIONS) => {
+  const doc = options.parent || options.document || document
+  const initOptions = options.initOptions || {}
+  const emotion = initOptions.emotion || defaultEmotion
+  if (!initOptions.emotion) initOptions.emotion = emotion
+  const registry = options.registry || transformDOMQLEmotion(initOptions.emotion, options)
+
+  const scratchSystem = init(options.designSystem || {}, {
+    key,
+    emotion,
+    verbose: options.verbose,
+    document: doc,
+    ...DEFAULT_CREATE_OPTIONS.designSystem,
+    ...initOptions
+  })
+
+  return [scratchSystem, emotion, registry]
+}

package/package.json

@@ -1,16 +1,19 @@
 {
   "name": "@symbo.ls/create",
-  "version": "2.10.165",
+  "version": "2.10.168",
   "license": "MIT",
-  "gitHead": "30fbc4dc26682e15d1d7eb2b6312bce6d9f07ec2",
+  "gitHead": "c9937422aa846691fa6187c7a3975c313114617a",
   "source": "index.js",
   "main": "index.js",
   "dependencies": {
+    "@domql/cookie": "latest",
     "@domql/emotion": "latest",
+    "@domql/report": "latest",
     "@domql/router": "latest",
     "@domql/utils": "latest",
     "@symbo.ls/fetch": "latest",
     "@symbo.ls/init": "latest",
+    "@symbo.ls/scratch": "latest",
     "@symbo.ls/uikit": "latest",
     "@symbo.ls/utils": "latest",
     "domql": "latest"

package/router.js

@@ -10,10 +10,13 @@ const DEFAULT_ROUTING_OPTIONS = {
 }
 
 export const initRouter = (root, options = DEFAULT_ROUTING_OPTIONS) => {
+  if (options === false) return
   if (options === true) options = DEFAULT_ROUTING_OPTIONS
 
+  console.log(options)
+
   const onRender = (el, s) => {
-    router(el, window.location.pathname, {})
+    if (el.routes) router(el, window.location.pathname, {})
   }
 
   if (options.initRouter) {

package/utilImports.js

@@ -0,0 +1,12 @@
+'use strict'
+
+export * from '@domql/utils'
+export * from '@symbo.ls/utils'
+export { set } from '@symbo.ls/scratch'
+export * from '@symbo.ls/scratch/src/utils'
+export * from '@symbo.ls/scratch/src/system'
+export { init, updateReset } from '@symbo.ls/init'
+
+export * from '@domql/cookie'
+export * from '@domql/report'
+export * from '@domql/router'