@drayman/core 1.5.4 → 1.8.0

package/dist/component-processor.js

@@ -97,14 +97,14 @@ const serializeComponentInstanceOptions = (options) => {
     return serialized;
 };
 const renderedComps = {};
-const initializeComponentInstance = async ({ componentInstanceId, browserCommands = [], extensionsPath, extensionsOptions, componentRootDir, componentName, componentOptions, componentNamePrefix = '' }) => {
+const initializeComponentInstance = async ({ componentInstanceId, browserCommands = [], serverCommands = [], extensionsPath, extensionsOptions, componentRootDir, componentName, componentOptions, componentNamePrefix = '' }) => {
     ComponentInstance.id = componentInstanceId;
     if (extensionsPath) {
         extensions = await require(path_1.default.join(process.cwd(), extensionsPath))(extensionsOptions);
     }
     const Browser = {};
     for (const command of browserCommands) {
-        Browser[command] = async (data = {}, element) => new Promise((resolve, reject) => {
+        Browser[command] = async (data = {}, elements) => new Promise((resolve, reject) => {
             const newData = {};
             for (const key of Object.keys(data || {})) {
                 if (typeof data[key] === 'function') {
@@ -124,7 +124,32 @@ const initializeComponentInstance = async ({ componentInstanceId, browserCommand
                 callback: (response) => resolve(response),
                 once: true,
             };
-            sendMessage({ type: 'browserCommand', payload: { data: newData, callbackId, command, element } });
+            sendMessage({ type: 'browserCommand', payload: { data: newData, callbackId, command, elements } });
+        });
+    }
+    const Server = {};
+    for (const command of serverCommands) {
+        Server[command] = async (data = {}) => new Promise((resolve, reject) => {
+            const newData = {};
+            for (const key of Object.keys(data || {})) {
+                if (typeof data[key] === 'function') {
+                    const callbackId = shortid_1.default.generate();
+                    newData[key] = callbackId;
+                    browserCallbacks[callbackId] = {
+                        callback: async (response) => await data[key](response),
+                        once: false,
+                    };
+                }
+                else {
+                    newData[key] = data[key];
+                }
+            }
+            const callbackId = shortid_1.default.generate();
+            browserCallbacks[callbackId] = {
+                callback: (response) => resolve(response),
+                once: true,
+            };
+            sendMessage({ type: 'serverCommand', payload: { data: newData, callbackId, command, } });
         });
     }
     props = componentOptions || {};
@@ -163,6 +188,7 @@ const initializeComponentInstance = async ({ componentInstanceId, browserCommand
             EventHub,
             Components,
             Browser,
+            Server,
             ComponentInstance,
             ...extensions.importable,
         });
@@ -234,6 +260,7 @@ const initializeComponentInstance = async ({ componentInstanceId, browserCommand
         EventHub,
         Components,
         Browser,
+        Server,
         ComponentInstance,
         ...extensions.importable,
     });

package/dist/index.d.ts

@@ -27,7 +27,7 @@ export declare const saveComponent: ({ script, outputFile }: {
     script: any;
     outputFile: any;
 }) => Promise<void>;
-export declare const onInitializeComponentInstance: ({ namespaceId, extensionsPath, extensionsOptions, componentNamePrefix, componentName, componentRootDir, componentInstanceId, componentOptions, connectionId, emit, onComponentInstanceConsole, browserCommands, }: {
+export declare const onInitializeComponentInstance: ({ namespaceId, extensionsPath, extensionsOptions, componentNamePrefix, componentName, componentRootDir, componentInstanceId, componentOptions, connectionId, emit, onComponentInstanceConsole, browserCommands, serverCommands, }: {
     namespaceId?: any;
     extensionsPath?: any;
     extensionsOptions?: any;
@@ -40,6 +40,7 @@ export declare const onInitializeComponentInstance: ({ namespaceId, extensionsPa
     emit: any;
     onComponentInstanceConsole: any;
     browserCommands: any;
+    serverCommands: any;
 }) => Promise<void>;
 export declare const onDisconnect: ({ connectionId }: {
     connectionId: any;

package/dist/index.js

@@ -74,7 +74,7 @@ const saveComponent = async ({ script, outputFile }) => {
     await fs_extra_1.default.outputFile(outputFile, transpiledComponentScript.outputText);
 };
 exports.saveComponent = saveComponent;
-const onInitializeComponentInstance = async ({ namespaceId = null, extensionsPath = null, extensionsOptions = null, componentNamePrefix = '', componentName, componentRootDir, componentInstanceId, componentOptions, connectionId, emit, onComponentInstanceConsole, browserCommands, }) => {
+const onInitializeComponentInstance = async ({ namespaceId = null, extensionsPath = null, extensionsOptions = null, componentNamePrefix = '', componentName, componentRootDir, componentInstanceId, componentOptions, connectionId, emit, onComponentInstanceConsole, browserCommands, serverCommands, }) => {
     if (componentOptions && typeof componentOptions === 'string') {
         componentOptions = JSON.parse(componentOptions);
     }
@@ -119,7 +119,7 @@ const onInitializeComponentInstance = async ({ namespaceId = null, extensionsPat
             emit({ type, payload, componentInstanceId });
         }
     });
-    worker.initializeComponentInstance({ browserCommands, componentNamePrefix, componentName, componentRootDir, componentOptions, componentInstanceId, extensionsPath, extensionsOptions });
+    worker.initializeComponentInstance({ browserCommands, serverCommands, componentNamePrefix, componentName, componentRootDir, componentOptions, componentInstanceId, extensionsPath, extensionsOptions });
     await clearGarbage();
 };
 exports.onInitializeComponentInstance = onInitializeComponentInstance;

package/dist/utils.js

@@ -25,7 +25,7 @@ const render = async (raw, childRenderer = null, renderedArr = [], events = {},
                 //     item = { ...rendered };
                 // }
                 item = { ...await parseFnType(item) };
-                const result = await childRenderer?.(item.type, `${parent}/${renderedArr.length}/${item.type}`, item.props);
+                const result = await childRenderer?.(item.type, item.key ? `${parent}/${item.key}/${item.type}` : `${parent}/${renderedArr.length}/${item.type}`, item.props);
                 if (result) {
                     await exports.render(result, childRenderer, renderedArr, events, `${parent}`);
                 }

package/jsx-runtime.js

@@ -1,5 +1,5 @@
-function jsx(type, props) {
-    return { type: type ? type : '$$fragment', props };
+function jsx(type, props, key) {
+    return { type: type ? type : '$$fragment', props, key };
 }
 
 module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drayman/core",
-  "version": "1.5.4",
+  "version": "1.8.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -22,7 +22,7 @@
     "@babel/preset-env": "^7.13.15",
     "@babel/preset-react": "^7.13.13",
     "@babel/preset-typescript": "^7.13.0",
-    "@drayman/types": "^1.5.0",
+    "@drayman/types": "^1.8.0",
     "@types/jest": "^26.0.22",
     "@types/node": "^14.14.39",
     "babel-jest": "^26.6.3",
@@ -39,5 +39,5 @@
     "ts-node": "^9.1.1",
     "typescript": "~4.1.5"
   },
-  "gitHead": "35eb1654d0b51b220a60b4cb2add5ff85e02d484"
+  "gitHead": "01664c9380658f5f29e2f2ac185f5daa4921b435"
 }