roamjs-components 0.57.4 → 0.57.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "roamjs-components",
   "description": "Description for roamjs-components",
-  "version": "0.57.4",
+  "version": "0.57.7",
   "main": "index.js",
   "types": "index.d.ts",
   "scripts": {

package/types/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { ClientParams, DatalogClause, PullBlock, RoamBasicNode, RoamBlock, SidebarAction, SidebarWindow, SidebarWindowInput, WriteAction } from "./native";
 import { Condition as QueryBuilderCondition, Selection as QueryBuilderSelection, Result as QueryBuilderResult, ExportTypes } from "./query-builder";
-import { CommandHandler, SmartBlocksContext } from "./smartblocks";
+import { RegisterCommand } from "./smartblocks";
 export * from "./native";
 declare type json = string | number | boolean | null | {
     toJSON: () => string;
@@ -222,8 +222,9 @@ declare global {
                         pull: (a: {
                             returnNode: string;
                             match: RegExpExecArray;
+                            where: DatalogClause[];
                         }) => string;
-                        mapper: (r: PullBlock, key: string) => QueryBuilderResult[string];
+                        mapper: (r: PullBlock, key: string) => QueryBuilderResult[string] | Record<string, QueryBuilderResult[string]> | Promise<QueryBuilderResult[string] | Record<string, QueryBuilderResult[string]>>;
                     }) => void;
                 };
                 versioning?: {
@@ -233,12 +234,7 @@ declare global {
                     }) => void;
                 };
                 smartblocks?: {
-                    registerCommand: (args: {
-                        text: string;
-                        help?: string;
-                        handler: (c: Pick<SmartBlocksContext, "targetUid" | "variables">) => CommandHandler;
-                        delayArgs?: true;
-                    }) => void;
+                    registerCommand: RegisterCommand;
                     triggerSmartblock: (args: {
                         srcName?: string;
                         srcUid?: string;

package/types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/types/index.ts"],"names":[],"mappings":";;;AAQA,wDAAyB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/types/index.ts"],"names":[],"mappings":";;;AAkBA,wDAAyB"}

package/types/smartblocks.d.ts

@@ -22,4 +22,12 @@ export declare type SmartBlocksContext = {
     refMapping: Record<string, string>;
     afterWorkflowMethods: (() => void | Promise<void>)[];
 };
+export declare type RegisterCommand = (args: {
+    text: string;
+    help?: string;
+    handler: (c: Pick<SmartBlocksContext, "targetUid" | "variables"> & {
+        proccessBlockText: (s: string) => Promise<InputTextNode[]>;
+    }) => CommandHandler;
+    delayArgs?: true;
+}) => void;
 export {};

package/util/registerSmartBlocksCommand.d.ts

@@ -1,6 +1,3 @@
-import { CommandHandler } from "../types/smartblocks";
-declare const registerSmartBlocksCommand: ({ text: inputText, handler, }: {
-    text: string;
-    handler: (u: unknown) => CommandHandler;
-}) => void;
+import { RegisterCommand } from "../types/smartblocks";
+declare const registerSmartBlocksCommand: RegisterCommand;
 export default registerSmartBlocksCommand;

package/util/registerSmartBlocksCommand.js

@@ -1,25 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const registerSmartBlocksCommand = ({ text: inputText, handler, }) => {
-    const text = inputText.toUpperCase();
-    const register = (retry) => {
-        var _a, _b;
-        return ((_b = (_a = window.roamjs) === null || _a === void 0 ? void 0 : _a.extension) === null || _b === void 0 ? void 0 : _b.smartblocks)
-            ? window.roamjs.extension.smartblocks.registerCommand({
-                text,
-                handler,
-            })
-            : retry === 120 && window.roamjs
-                ? !(window.roamjs = Object.assign(Object.assign({}, window.roamjs), { extension: Object.assign(Object.assign({}, window.roamjs.extension), { [text]: Object.assign(Object.assign({}, window.roamjs.extension[text]), { registerSmartBlocksCommand: () => {
-                                var _a, _b;
-                                (_b = (_a = window.roamjs) === null || _a === void 0 ? void 0 : _a.extension.smartblocks) === null || _b === void 0 ? void 0 : _b.registerCommand({
-                                    text,
-                                    handler,
-                                });
-                            } }) }) }))
-                : window.setTimeout(() => register(retry + 1), 1000);
-    };
-    register(0);
+const registerSmartBlocksCommand = (args) => {
+    var _a, _b;
+    if ((_b = (_a = window.roamjs) === null || _a === void 0 ? void 0 : _a.extension) === null || _b === void 0 ? void 0 : _b.smartblocks) {
+        window.roamjs.extension.smartblocks.registerCommand(args);
+    }
+    else {
+        document.body.addEventListener(`roamjs:smartblocks:loaded`, () => {
+            var _a;
+            return ((_a = window.roamjs) === null || _a === void 0 ? void 0 : _a.extension.smartblocks) &&
+                window.roamjs.extension.smartblocks.registerCommand(args);
+        });
+    }
 };
 exports.default = registerSmartBlocksCommand;
 //# sourceMappingURL=registerSmartBlocksCommand.js.map

package/util/registerSmartBlocksCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"registerSmartBlocksCommand.js","sourceRoot":"","sources":["../src/util/registerSmartBlocksCommand.ts"],"names":[],"mappings":";;AAEA,MAAM,0BAA0B,GAAG,CAAC,EAClC,IAAI,EAAE,SAAS,EACf,OAAO,GAIR,EAAQ,EAAE;IACT,MAAM,IAAI,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;IACrC,MAAM,QAAQ,GAAG,CAAC,KAAa,EAAyB,EAAE;;QACxD,OAAA,CAAA,MAAA,MAAA,MAAM,CAAC,MAAM,0CAAE,SAAS,0CAAE,WAAW;YACnC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,eAAe,CAAC;gBAClD,IAAI;gBACJ,OAAO;aACR,CAAC;YACJ,CAAC,CAAC,KAAK,KAAK,GAAG,IAAI,MAAM,CAAC,MAAM;gBAChC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,mCACV,MAAM,CAAC,MAAM,KAChB,SAAS,kCACJ,MAAM,CAAC,MAAM,CAAC,SAAS,KAC1B,CAAC,IAAI,CAAC,kCACD,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,KAChC,0BAA0B,EAAE,GAAG,EAAE;;gCAC/B,MAAA,MAAA,MAAM,CAAC,MAAM,0CAAE,SAAS,CAAC,WAAW,0CAAE,eAAe,CAAC;oCACpD,IAAI;oCACJ,OAAO;iCACR,CAAC,CAAC;4BACL,CAAC,SAGN,CAAC;gBACJ,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,CAAA;KAAA,CAAC;IACzD,QAAQ,CAAC,CAAC,CAAC,CAAC;AACd,CAAC,CAAC;AAEF,kBAAe,0BAA0B,CAAC"}
+{"version":3,"file":"registerSmartBlocksCommand.js","sourceRoot":"","sources":["../src/util/registerSmartBlocksCommand.ts"],"names":[],"mappings":";;AAEA,MAAM,0BAA0B,GAAoB,CAAC,IAAI,EAAE,EAAE;;IAC3D,IAAI,MAAA,MAAA,MAAM,CAAC,MAAM,0CAAE,SAAS,0CAAE,WAAW,EAAE;QACzC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;KAC3D;SAAM;QACL,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAC5B,2BAA2B,EAC3B,GAAG,EAAE;;YACH,OAAA,CAAA,MAAA,MAAM,CAAC,MAAM,0CAAE,SAAS,CAAC,WAAW;gBACpC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;SAAA,CAC5D,CAAC;KACH;AACH,CAAC,CAAC;AAEF,kBAAe,0BAA0B,CAAC"}