@symbo.ls/create 2.11.208 → 2.11.210

package/dist/cjs/index.js

@@ -51,7 +51,7 @@ const mergeWithLocalFile = (options, optionsExternalFile) => {
 };
 const create = async (App, options = import_options.default, optionsExternalFile) => {
   const appIsKey = (0, import_utils.isString)(App);
-  options = (0, import_utils.deepMerge)(mergeWithLocalFile(options, optionsExternalFile), import_options.default);
+  options = { ...import_options.default, ...mergeWithLocalFile(options, optionsExternalFile) };
   const key = options.key || SYMBOLS_KEY || (appIsKey ? App : "");
   if (appIsKey)
     App = {};
@@ -64,17 +64,15 @@ const create = async (App, options = import_options.default, optionsExternalFile
     document = window.document;
   }
   const doc = options.parent || options.document || document;
-  const [scratchSystem, emotion, registry] = (0, import_initEmotion.initEmotion)(key, options);
-  let state;
+  const [scratcDesignhSystem, emotion, registry] = (0, import_initEmotion.initEmotion)(key, options);
+  const state = {};
   if (options.state)
-    state = options.state;
-  else if (App && App.state)
-    state = App.state;
-  else
-    state = {};
+    (0, import_utils.deepMerge)(state, options.state);
+  if (App && App.state)
+    (0, import_utils.deepMerge)(state, App.state);
   const pages = options.pages || {};
   const components = options.components ? { ...uikit, ...options.components } : uikit;
-  const designSystem = scratchSystem || {};
+  const designSystem = scratcDesignhSystem || {};
   const snippets = { ...utils, ...utils.scratchUtils, ...options.snippets || {} };
   const define = options.define || import_define.defaultDefine;
   const routerOptions = (0, import_router.initRouter)(App, options);
@@ -132,7 +130,7 @@ const createSync = (App, options = import_options.default, optionsExternalFile)
     parent = options.document;
   else
     parent = document.body;
-  const [scratchSystem, emotion, registry] = (0, import_initEmotion.initEmotion)(key, options);
+  const [scratcDesignhSystem, emotion, registry] = (0, import_initEmotion.initEmotion)(key, options);
   let state;
   if (options.state)
     state = options.state;
@@ -142,7 +140,7 @@ const createSync = (App, options = import_options.default, optionsExternalFile)
     state = {};
   const pages = options.pages || {};
   const components = options.components ? { ...uikit, ...options.components } : uikit;
-  const designSystem = scratchSystem || {};
+  const designSystem = scratcDesignhSystem || {};
   const snippets = { ...utils, ...utils.scratchUtils, ...options.snippets || {} };
   const define = options.define || import_define.defaultDefine;
   const extend = (0, import_syncExtend.applySyncDebug)([App], options);

package/dist/cjs/initEmotion.js

@@ -35,14 +35,14 @@ var import_emotion = require("@domql/emotion");
 var import_emotion2 = require("@symbo.ls/emotion");
 var import_init = require("@symbo.ls/init");
 var import_utils = require("@domql/utils");
-var import_options = __toESM(require("./options"), 1);
+var import_options = require("./options");
 var import_default_config = __toESM(require("@symbo.ls/default-config"), 1);
-const initEmotion = (key, options = import_options.default) => {
+const initEmotion = (key, options = import_options.DESIGN_SYSTEM_OPTIONS) => {
   const doc = options.parent || options.document || document;
   const initOptions = options.initOptions || {};
-  const emotion = initOptions.emotion || import_emotion2.emotion;
+  const emotion = initOptions.emotion;
   if (!initOptions.emotion)
-    initOptions.emotion = emotion;
+    initOptions.emotion = import_emotion2.emotion;
   const registry = options.registry || (0, import_emotion.transformDOMQLEmotion)(initOptions.emotion, options);
   const designSystem = options.designSystem || (options.defaultConfig ? (0, import_utils.deepClone)(import_default_config.default) : {});
   const scratchSystem = (0, import_init.init)(designSystem, {
@@ -50,7 +50,7 @@ const initEmotion = (key, options = import_options.default) => {
     emotion,
     verbose: options.verbose,
     document: doc,
-    ...import_options.default.designSystem,
+    ...import_options.DESIGN_SYSTEM_OPTIONS,
     ...initOptions
   });
   return [scratchSystem, emotion, registry];

package/dist/cjs/options.js

@@ -18,28 +18,25 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var options_exports = {};
 __export(options_exports, {
+  CREATE_OPTIONS: () => CREATE_OPTIONS,
+  DESIGN_SYSTEM_OPTIONS: () => DESIGN_SYSTEM_OPTIONS,
   default: () => options_default
 });
 module.exports = __toCommonJS(options_exports);
 var import_define = require("./define");
-var import_emotion = require("@symbo.ls/emotion");
-var options_default = {
-  editor: {},
+const DESIGN_SYSTEM_OPTIONS = {
+  useReset: true,
+  useVariable: true,
+  useIconSprite: true,
+  useSvgSprite: true,
+  useDocumentTheme: true,
+  useFontImport: true
+};
+const CREATE_OPTIONS = {
+  defaultConfig: true,
   state: {},
   pages: {},
-  defaultConfig: true,
-  designSystem: {
-    useReset: true,
-    useVariable: true,
-    useIconSprite: true,
-    useSvgSprite: true,
-    useDocumentTheme: true,
-    useFontImport: true
-  },
   components: {},
-  initOptions: {
-    emotion: import_emotion.emotion
-  },
   router: {
     initRouter: true,
     popState: true,
@@ -47,3 +44,4 @@ var options_default = {
   },
   define: import_define.defaultDefine
 };
+var options_default = CREATE_OPTIONS;

package/dist/cjs/router.js

@@ -32,11 +32,13 @@ const DEFAULT_ROUTING_OPTIONS = {
   popState: true
 };
 const initRouter = (element, options) => {
-  let routerOptions = (0, import_utils.merge)(options.router || {}, DEFAULT_ROUTING_OPTIONS);
-  if (routerOptions === false)
+  if (options.router === false)
     return;
-  if (routerOptions === true)
-    routerOptions = DEFAULT_ROUTING_OPTIONS;
+  else if (options.router === true)
+    options.router = DEFAULT_ROUTING_OPTIONS;
+  else
+    (0, import_utils.merge)(options.router || {}, DEFAULT_ROUTING_OPTIONS);
+  const routerOptions = options.router;
   const router = options.snippets && options.snippets.router ? options.snippets.router : import_router.router;
   const onRouterRenderDefault = (el, s) => {
     const { pathname, hash } = import_utils.window.location;

package/dist/cjs/syncExtend.js

@@ -29,9 +29,9 @@ const applySyncDebug = (extend, options) => {
   if (!editor)
     return extend;
   const inspect = (0, import_utils.isUndefined)(editor.inspect) ? (0, import_utils.isDevelopment)() : editor.inspect;
-  const liveSync = (0, import_utils.isUndefined)(editor.liveSync) ? (0, import_utils.isDevelopment)() : editor.liveSync;
   if (inspect)
     extend.push(import_socket_ui.DevFocus);
+  const liveSync = (0, import_utils.isUndefined)(editor.liveSync) ? (0, import_utils.isDevelopment)() : editor.liveSync;
   if (liveSync)
     extend.push(import_socket_ui.Sync);
   return extend;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@symbo.ls/create",
-  "version": "2.11.208",
+  "version": "2.11.210",
   "license": "MIT",
-  "gitHead": "a81b741e63bbb9a0b3b74773eb7a4f86b01d08f3",
+  "gitHead": "45ec4a9a2ab3233c83b705202980d45b0c3cb91e",
   "files": [
     "src",
     "dist"

package/src/index.js

@@ -24,7 +24,7 @@ const mergeWithLocalFile = (options, optionsExternalFile) => {
 
 export const create = async (App, options = DEFAULT_CREATE_OPTIONS, optionsExternalFile) => {
   const appIsKey = isString(App)
-  options = deepMerge(mergeWithLocalFile(options, optionsExternalFile), DEFAULT_CREATE_OPTIONS)
+  options = { ...DEFAULT_CREATE_OPTIONS, ...mergeWithLocalFile(options, optionsExternalFile) }
 
   const key = options.key || SYMBOLS_KEY || (appIsKey ? App : '')
 
@@ -37,16 +37,15 @@ export const create = async (App, options = DEFAULT_CREATE_OPTIONS, optionsExter
     document = window.document // eslint-disable-line
   }
   const doc = options.parent || options.document || document
-  const [scratchSystem, emotion, registry] = initEmotion(key, options)
+  const [scratcDesignhSystem, emotion, registry] = initEmotion(key, options)
 
-  let state
-  if (options.state) state = options.state
-  else if (App && App.state) state = App.state
-  else state = {}
+  const state = {}
+  if (options.state) deepMerge(state, options.state)
+  if (App && App.state) deepMerge(state, App.state)
 
   const pages = options.pages || {}
   const components = options.components ? { ...uikit, ...options.components } : uikit
-  const designSystem = scratchSystem || {}
+  const designSystem = scratcDesignhSystem || {}
   const snippets = { ...utils, ...utils.scratchUtils, ...(options.snippets || {}) }
   const define = options.define || defaultDefine
 
@@ -107,7 +106,7 @@ export const createSync = (App, options = DEFAULT_CREATE_OPTIONS, optionsExterna
   else if (options.document) parent = options.document
   else parent = document.body
 
-  const [scratchSystem, emotion, registry] = initEmotion(key, options)
+  const [scratcDesignhSystem, emotion, registry] = initEmotion(key, options)
 
   let state
   if (options.state) state = options.state
@@ -116,7 +115,7 @@ export const createSync = (App, options = DEFAULT_CREATE_OPTIONS, optionsExterna
 
   const pages = options.pages || {}
   const components = options.components ? { ...uikit, ...options.components } : uikit
-  const designSystem = scratchSystem || {}
+  const designSystem = scratcDesignhSystem || {}
   const snippets = { ...utils, ...utils.scratchUtils, ...(options.snippets || {}) }
   const define = options.define || defaultDefine
 

package/src/initEmotion.js

@@ -5,16 +5,17 @@ import { emotion as defaultEmotion } from '@symbo.ls/emotion'
 import { init } from '@symbo.ls/init'
 import { deepClone } from '@domql/utils'
 
-import DEFAULT_CREATE_OPTIONS from './options'
+import { DESIGN_SYSTEM_OPTIONS } from './options'
 import DEFAULT_CONFIG from '@symbo.ls/default-config'
 
-export const initEmotion = (key, options = DEFAULT_CREATE_OPTIONS) => {
+export const initEmotion = (key, options = DESIGN_SYSTEM_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 emotion = initOptions.emotion
+
+  if (!initOptions.emotion) initOptions.emotion = defaultEmotion
 
+  const registry = options.registry || transformDOMQLEmotion(initOptions.emotion, options)
   const designSystem = options.designSystem || (options.defaultConfig ? deepClone(DEFAULT_CONFIG) : {})
 
   const scratchSystem = init(designSystem, {
@@ -22,7 +23,7 @@ export const initEmotion = (key, options = DEFAULT_CREATE_OPTIONS) => {
     emotion,
     verbose: options.verbose,
     document: doc,
-    ...DEFAULT_CREATE_OPTIONS.designSystem,
+    ...DESIGN_SYSTEM_OPTIONS,
     ...initOptions
   })
 

package/src/options.js

@@ -1,25 +1,21 @@
 'use strict'
 
 import { defaultDefine } from './define'
-import { emotion as defaultEmotion } from '@symbo.ls/emotion'
 
-export default {
-  editor: {},
+export const DESIGN_SYSTEM_OPTIONS = {
+  useReset: true,
+  useVariable: true,
+  useIconSprite: true,
+  useSvgSprite: true,
+  useDocumentTheme: true,
+  useFontImport: true
+}
+
+export const CREATE_OPTIONS = {
+  defaultConfig: true,
   state: {},
   pages: {},
-  defaultConfig: true,
-  designSystem: {
-    useReset: true,
-    useVariable: true,
-    useIconSprite: true,
-    useSvgSprite: true,
-    useDocumentTheme: true,
-    useFontImport: true
-  },
   components: {},
-  initOptions: {
-    emotion: defaultEmotion
-  },
   router: {
     initRouter: true,
     popState: true,
@@ -27,3 +23,5 @@ export default {
   },
   define: defaultDefine
 }
+
+export default CREATE_OPTIONS

package/src/router.js

@@ -11,11 +11,11 @@ const DEFAULT_ROUTING_OPTIONS = {
 }
 
 export const initRouter = (element, options) => {
-  let routerOptions = merge(options.router || {}, DEFAULT_ROUTING_OPTIONS)
-
-  if (routerOptions === false) return
-  if (routerOptions === true) routerOptions = DEFAULT_ROUTING_OPTIONS
+  if (options.router === false) return
+  else if (options.router === true) options.router = DEFAULT_ROUTING_OPTIONS
+  else merge(options.router || {}, DEFAULT_ROUTING_OPTIONS)
 
+  const routerOptions = options.router
   const router = (options.snippets && options.snippets.router) ? options.snippets.router : defaultRouter
 
   const onRouterRenderDefault = (el, s) => {

package/src/syncExtend.js

@@ -7,8 +7,8 @@ export const applySyncDebug = (extend, options) => {
   const { editor } = options
   if (!editor) return extend
   const inspect = isUndefined(editor.inspect) ? isDevelopment() : editor.inspect
-  const liveSync = isUndefined(editor.liveSync) ? isDevelopment() : editor.liveSync
   if (inspect) extend.push(DevFocus)
+  const liveSync = isUndefined(editor.liveSync) ? isDevelopment() : editor.liveSync
   if (liveSync) extend.push(Sync)
   return extend
 }