roamjs-components 0.76.0 → 0.76.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "roamjs-components",
   "description": "Expansive toolset, utilities, & components for developing RoamJS extensions.",
-  "version": "0.76.0",
+  "version": "0.76.2",
   "main": "index.js",
   "types": "index.d.ts",
   "scripts": {
@@ -10,7 +10,6 @@
     "build": "tsc",
     "preversion": "npm run lint",
     "version": "npm run format && git add -A src",
-    "postversion": "git push origin main && git push --tags",
     "test": "playwright test",
     "prestart:new": "node scripts/build.js",
     "start:new": "http-server -p 8000 build",
@@ -46,6 +45,8 @@
     "tslib": "2.2.0"
   },
   "dependencies": {
+    "@samepage/scripts": "^0.56.7",
+    "@testing-library/react": "^12.1.5",
     "aws-sdk-plus": "^0.5.3",
     "color": "^4.0.1",
     "date-fns": "^2.27.0",
@@ -53,13 +54,10 @@
     "fuzzy": "^0.1.3",
     "hast-util-to-html": "^7.1.3",
     "refractor": "^3.3.1",
-    "roamjs-scripts": "^0.26.23",
     "xregexp": "^5.0.1"
   },
   "devDependencies": {
     "@esbuild-plugins/node-modules-polyfill": "^0.1.4",
-    "@testing-library/react": "^11.2.7",
-    "@testing-library/user-event": "^13.1.9",
     "@types/aws-lambda": "^8.10.89",
     "@types/color": "^3.0.2",
     "@types/mime-types": "^2.1.1",

package/scripts/index.js

@@ -23,6 +23,5 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-process.argv.push("--labs");
-Promise.resolve().then(() => __importStar(require("roamjs-scripts")));
+Promise.resolve().then(() => __importStar(require("@samepage/scripts/cli")));
 //# sourceMappingURL=index.js.map

package/scripts/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/scripts/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AAC5B,kDAAO,gBAAgB,IAAE"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/scripts/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAO,uBAAuB,IAAE"}

package/types/index.d.ts

@@ -1,5 +1,5 @@
 import { AddPullWatch, PullBlock, SidebarAction, SidebarWindow, SidebarWindowInput, WriteAction } from "./native";
-import { RegisterSelection, ParseQuery, FireQuery, ConditionToDatalog, RegisterDatalogTranslator, ResultsViewComponent, QueryEditorComponent, ExportDialogComponent, QueryPageComponent, RunQuery, ListActiveQueries } from "./query-builder";
+import { RunQuery, ListActiveQueries } from "./query-builder";
 import { RegisterCommand, UnregisterCommand } from "./smartblocks";
 import type marked from "marked";
 import type Markdown from "marked-react";
@@ -205,19 +205,6 @@ declare global {
             loaded: Set<string>;
             extension: {
                 queryBuilder?: {
-                    ExportDialog: ExportDialogComponent;
-                    QueryEditor: QueryEditorComponent;
-                    QueryPage: QueryPageComponent;
-                    ResultsView: ResultsViewComponent;
-                    fireQuery: FireQuery;
-                    parseQuery: ParseQuery;
-                    conditionToDatalog: ConditionToDatalog;
-                    getConditionLabels: () => string[];
-                    registerDatalogTranslator: RegisterDatalogTranslator;
-                    unregisterDatalogTranslator: (args: {
-                        key: string;
-                    }) => void;
-                    registerSelection: RegisterSelection;
                     runQuery: RunQuery;
                     listActiveQueries: ListActiveQueries;
                 };

package/types/index.js.map

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

package/types/query-builder.d.ts

@@ -1,122 +1,3 @@
-/// <reference types="react" />
-import { DatalogClause, PullBlock, RoamBasicNode } from "./native";
-import type { Filters } from "../components/Filter";
-declare type QBBase = {
-    uid: string;
-};
-export declare type QBClauseData = {
-    relation: string;
-    source: string;
-    target: string;
-    not?: boolean;
-} & QBBase;
-export declare type QBNestedData = {
-    conditions: Condition[][];
-} & QBBase;
-export declare type QBClause = QBClauseData & {
-    type: "clause";
-};
-export declare type QBNot = QBClauseData & {
-    type: "not";
-};
-export declare type QBOr = QBNestedData & {
-    type: "or";
-};
-export declare type QBNor = QBNestedData & {
-    type: "not or";
-};
-export declare type Condition = QBClause | QBNot | QBOr | QBNor;
-export declare type Selection = {
-    text: string;
-    label: string;
-    uid: string;
-};
-export declare type ExportTypes = {
-    name: string;
-    callback: (args: {
-        filename: string;
-        graph: string;
-        isBackendEnabled: boolean;
-    }) => Promise<{
-        title: string;
-        content: string;
-    }[]>;
-}[];
-export declare type RegisterSelection = (args: {
-    test: RegExp;
-    pull: (a: {
-        returnNode: string;
-        match: RegExpExecArray;
-        where: DatalogClause[];
-    }) => string;
-    mapper: (r: PullBlock, key: string, result: Result) => Result[string] | Record<string, Result[string]> | Promise<Result[string] | Record<string, Result[string]>>;
-}) => void;
-export declare type ResultsViewComponent = (props: {
-    parentUid: string;
-    header?: React.ReactNode;
-    results: Result[];
-    hideResults?: boolean;
-    resultFilter?: (r: Result) => boolean;
-    ctrlClick?: (e: Result) => void;
-    preventSavingSettings?: boolean;
-    preventExport?: boolean;
-    onEdit?: () => void;
-    onRefresh?: () => void;
-    getExportTypes?: (r: Result[]) => ExportTypes;
-    onResultsInViewChange?: (r: Result[]) => void;
-    globalFiltersData?: Record<string, Filters>;
-    globalPageSize?: number;
-}) => JSX.Element;
-export declare type ExportDialogComponent = (props: {
-    onClose: () => void;
-    isOpen: boolean;
-    exportTypes: ExportTypes;
-    results: Result[] | ((isBackendEnabled: boolean) => Promise<Result[]>);
-}) => JSX.Element;
-export declare type QueryEditorComponent = (props: {
-    parentUid: string;
-    onQuery?: () => void;
-    defaultReturnNode?: string;
-}) => JSX.Element;
-export declare type QueryPageComponent = (props: {
-    pageUid: string;
-    configUid?: string;
-    defaultReturnNode?: string;
-    getExportTypes?: (r: Result[]) => ExportTypes;
-    globalFiltersData?: Record<string, Filters>;
-    globalPageSize?: number;
-    hideMetadata?: boolean;
-}) => JSX.Element;
-export declare type ParseQuery = (q: RoamBasicNode | string) => {
-    returnNode: string;
-    conditions: Condition[];
-    selections: Selection[];
-    customNode: string;
-    returnNodeUid: string;
-    conditionsNodesUid: string;
-    selectionsNodesUid: string;
-    customNodeUid: string;
-    isCustomEnabled: boolean;
-    isBackendEnabled: boolean;
-};
-export declare type FireQuery = (query: {
-    returnNode: string;
-    conditions: Condition[];
-    selections: Selection[];
-    isBackendEnabled: boolean;
-}) => Promise<Result[]>;
-export declare type ConditionToDatalog = (condition: Condition) => DatalogClause[];
-export declare type RegisterDatalogTranslator = (args: {
-    key: string;
-    callback: (args: {
-        source: string;
-        target: string;
-        uid: string;
-    }) => DatalogClause[];
-    targetOptions?: string[] | ((source: string) => string[]);
-    placeholder?: string;
-    isVariable?: true;
-}) => void;
 export declare type Result = {
     text: string;
     uid: string;
@@ -125,4 +6,3 @@ export declare type RunQuery = (parentUid: string) => Promise<Result[]>;
 export declare type ListActiveQueries = () => {
     uid: string;
 }[];
-export {};

package/types/smartblocks.d.ts

@@ -27,6 +27,7 @@ export declare type RegisterCommand = (args: {
     help?: string;
     handler: (c: Pick<SmartBlocksContext, "targetUid" | "variables"> & {
         proccessBlockText: (s: string) => Promise<InputTextNode[]>;
+        processBlock: (s: InputTextNode) => Promise<InputTextNode[]>;
     }) => CommandHandler;
     delayArgs?: true;
 }) => () => void;

package/util/env.js

@@ -1,5 +1,5 @@
 "use strict";
-// Some developers may use roamjs-components without roamjs-scripts, in which case
+// Some developers may use roamjs-components without RoamJS scripting, in which case
 // envs wont be interpolated. best way to deal with that afaik is to try to get the value
 // catch defaulting to a known value
 Object.defineProperty(exports, "__esModule", { value: true });

package/util/env.js.map

@@ -1 +1 @@
-{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/util/env.ts"],"names":[],"mappings":";AAAA,kFAAkF;AAClF,yFAAyF;AACzF,oCAAoC;;;AAEpC,wFAAwF;AACxF,0BAA0B;AAEnB,MAAM,UAAU,GAAG,CAAC,YAAY,GAAG,YAAY,EAAE,EAAE;IACxD,IAAI;QACF,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,YAAY,CAAC;KAC7C;IAAC,WAAM;QACN,OAAO,YAAY,CAAC;KACrB;AACH,CAAC,CAAC;AANW,QAAA,UAAU,cAMrB;AAEK,MAAM,mBAAmB,GAAG,GAAG,EAAE;IACtC,IAAI;QACF,OAAO,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,IAAA,kBAAU,EAAC,EAAE,CAAC,CAAC;KAC5E;IAAC,WAAM;QACN,OAAO,IAAA,kBAAU,EAAC,EAAE,CAAC,CAAC;KACvB;AACH,CAAC,CAAC;AANW,QAAA,mBAAmB,uBAM9B;AAEK,MAAM,YAAY,GAAG,GAAG,EAAE;IAC/B,MAAM,YAAY,GAChB,IAAA,kBAAU,GAAE,KAAK,YAAY;QAC3B,CAAC,CAAC,2BAA2B;QAC7B,CAAC,CAAC,uBAAuB,CAAC;IAC9B,IAAI;QACF,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,YAAY,CAAC;KAC5C;IAAC,WAAM;QACN,OAAO,YAAY,CAAC;KACrB;AACH,CAAC,CAAC;AAVW,QAAA,YAAY,gBAUvB;AAEK,MAAM,qBAAqB,GAAG,GAAG,EAAE;IACxC,IAAI;QACF,OAAO,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,EAAE,CAAC;KAC3C;IAAC,WAAM;QACN,OAAO,EAAE,CAAC;KACX;AACH,CAAC,CAAC;AANW,QAAA,qBAAqB,yBAMhC;AAEK,MAAM,eAAe,GAAG,GAAG,EAAE;IAClC,IAAI;QACF,OAAO,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC;KACrC;IAAC,WAAM;QACN,OAAO,EAAE,CAAC;KACX;AACH,CAAC,CAAC;AANW,QAAA,eAAe,mBAM1B;AAEK,MAAM,uBAAuB,GAAG,GAAG,EAAE;IAC1C,IAAI;QACF,OAAO,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,QAAQ,CAAC;KACpD;IAAC,WAAM;QACN,OAAO,QAAQ,CAAC;KACjB;AACH,CAAC,CAAC;AANW,QAAA,uBAAuB,2BAMlC"}
+{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/util/env.ts"],"names":[],"mappings":";AAAA,oFAAoF;AACpF,yFAAyF;AACzF,oCAAoC;;;AAEpC,wFAAwF;AACxF,0BAA0B;AAEnB,MAAM,UAAU,GAAG,CAAC,YAAY,GAAG,YAAY,EAAE,EAAE;IACxD,IAAI;QACF,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,YAAY,CAAC;KAC7C;IAAC,WAAM;QACN,OAAO,YAAY,CAAC;KACrB;AACH,CAAC,CAAC;AANW,QAAA,UAAU,cAMrB;AAEK,MAAM,mBAAmB,GAAG,GAAG,EAAE;IACtC,IAAI;QACF,OAAO,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,IAAA,kBAAU,EAAC,EAAE,CAAC,CAAC;KAC5E;IAAC,WAAM;QACN,OAAO,IAAA,kBAAU,EAAC,EAAE,CAAC,CAAC;KACvB;AACH,CAAC,CAAC;AANW,QAAA,mBAAmB,uBAM9B;AAEK,MAAM,YAAY,GAAG,GAAG,EAAE;IAC/B,MAAM,YAAY,GAChB,IAAA,kBAAU,GAAE,KAAK,YAAY;QAC3B,CAAC,CAAC,2BAA2B;QAC7B,CAAC,CAAC,uBAAuB,CAAC;IAC9B,IAAI;QACF,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,YAAY,CAAC;KAC5C;IAAC,WAAM;QACN,OAAO,YAAY,CAAC;KACrB;AACH,CAAC,CAAC;AAVW,QAAA,YAAY,gBAUvB;AAEK,MAAM,qBAAqB,GAAG,GAAG,EAAE;IACxC,IAAI;QACF,OAAO,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,EAAE,CAAC;KAC3C;IAAC,WAAM;QACN,OAAO,EAAE,CAAC;KACX;AACH,CAAC,CAAC;AANW,QAAA,qBAAqB,yBAMhC;AAEK,MAAM,eAAe,GAAG,GAAG,EAAE;IAClC,IAAI;QACF,OAAO,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC;KACrC;IAAC,WAAM;QACN,OAAO,EAAE,CAAC;KACX;AACH,CAAC,CAAC;AANW,QAAA,eAAe,mBAM1B;AAEK,MAAM,uBAAuB,GAAG,GAAG,EAAE;IAC1C,IAAI;QACF,OAAO,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,QAAQ,CAAC;KACpD;IAAC,WAAM;QACN,OAAO,QAAQ,CAAC;KACjB;AACH,CAAC,CAAC;AANW,QAAA,uBAAuB,2BAMlC"}