roamjs-components 0.74.19 → 0.74.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -11,6 +11,23 @@ const endOfWeek_1 = tslib_1.__importDefault(require("date-fns/endOfWeek"));
11
11
  const endOfMonth_1 = tslib_1.__importDefault(require("date-fns/endOfMonth"));
12
12
  const endOfYear_1 = tslib_1.__importDefault(require("date-fns/endOfYear"));
13
13
  const chrono = tslib_1.__importStar(require("chrono-node"));
14
+ const getCurrentUserUid_1 = tslib_1.__importDefault(require("../queries/getCurrentUserUid"));
15
+ const startOfWeek = (date) => {
16
+ var _a, _b;
17
+ const weekStartsOn = (_b = (_a = window.roamAlphaAPI.pull("[:user/settings]", [
18
+ ":user/uid",
19
+ (0, getCurrentUserUid_1.default)(),
20
+ ])) === null || _a === void 0 ? void 0 : _a[":user/settings"]) === null || _b === void 0 ? void 0 : _b[":first-day-of-week"];
21
+ return (0, startOfWeek_1.default)(date, weekStartsOn ? { weekStartsOn } : undefined);
22
+ };
23
+ const endOfWeek = (date) => {
24
+ var _a, _b;
25
+ const weekStartsOn = (_b = (_a = window.roamAlphaAPI.pull("[:user/settings]", [
26
+ ":user/uid",
27
+ (0, getCurrentUserUid_1.default)(),
28
+ ])) === null || _a === void 0 ? void 0 : _a[":user/settings"]) === null || _b === void 0 ? void 0 : _b[":first-day-of-week"];
29
+ return (0, endOfWeek_1.default)(date, weekStartsOn ? { weekStartsOn } : undefined);
30
+ };
14
31
  const ORDINAL_WORD_DICTIONARY = {
15
32
  first: 1,
16
33
  second: 2,
@@ -137,7 +154,7 @@ customDateNlp.refiners.unshift({
137
154
  if (/start of/i.test(modifier.text)) {
138
155
  const dateObj = date.date();
139
156
  if (/week/i.test(date.text)) {
140
- const newDateObj = (0, startOfWeek_1.default)(dateObj);
157
+ const newDateObj = startOfWeek(dateObj);
141
158
  assignDay(date.start, newDateObj);
142
159
  }
143
160
  if (/month/i.test(date.text)) {
@@ -152,7 +169,7 @@ customDateNlp.refiners.unshift({
152
169
  else if (/end of/i.test(modifier.text)) {
153
170
  const dateObj = date.date();
154
171
  if (/week/i.test(date.text)) {
155
- const newDateObj = (0, endOfWeek_1.default)(dateObj);
172
+ const newDateObj = endOfWeek(dateObj);
156
173
  assignDay(date.start, newDateObj);
157
174
  }
158
175
  if (/month/i.test(date.text)) {
@@ -176,7 +193,7 @@ customDateNlp.refiners.unshift({
176
193
  if (/month/i.test(d.text)) {
177
194
  const startOfMonthDate = (0, startOfMonth_1.default)(dateObj);
178
195
  const originalMonth = startOfMonthDate.getMonth();
179
- const startOfWeekDate = (0, startOfWeek_1.default)(startOfMonthDate);
196
+ const startOfWeekDate = startOfWeek(startOfMonthDate);
180
197
  const dayOfWeekDate = (0, addDays_1.default)(startOfWeekDate, date.start.get("weekday") || 0);
181
198
  const newDateObj = (0, addWeeks_1.default)(dayOfWeekDate, num - (originalMonth === dayOfWeekDate.getMonth() ? 1 : 0));
182
199
  assignDay(d.start, newDateObj);
@@ -184,7 +201,7 @@ customDateNlp.refiners.unshift({
184
201
  else if (/year/i.test(d.text)) {
185
202
  const startOfYearDate = (0, startOfYear_1.default)(dateObj);
186
203
  const originalYear = startOfYearDate.getFullYear();
187
- const startOfWeekDate = (0, startOfWeek_1.default)(startOfYearDate);
204
+ const startOfWeekDate = startOfWeek(startOfYearDate);
188
205
  const dayOfWeekDate = (0, addDays_1.default)(startOfWeekDate, date.start.get("weekday") || 0);
189
206
  const newDateObj = (0, addWeeks_1.default)(dayOfWeekDate, num - (originalYear === dayOfWeekDate.getFullYear() ? 1 : 0));
190
207
  assignDay(d.start, newDateObj);
@@ -1 +1 @@
1
- {"version":3,"file":"parseNlpDate.js","sourceRoot":"","sources":["../../src/date/parseNlpDate.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"parseNlpDate.js","sourceRoot":"","sources":["../../src/date/parseNlpDate.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "roamjs-components",
3
3
  "description": "Expansive toolset, utilities, & components for developing RoamJS extensions.",
4
- "version": "0.74.19",
4
+ "version": "0.74.21",
5
5
  "main": "index.js",
6
6
  "types": "index.d.ts",
7
7
  "scripts": {
@@ -1,14 +1,14 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- const tslib_1 = require("tslib");
4
3
  const sortBasicNodes = (c) => c
5
- .sort(({ order: a }, { order: b }) => a - b)
6
- .map((_a) => {
7
- var { order: _, children = [] } = _a, node = tslib_1.__rest(_a, ["order", "children"]);
8
- return (Object.assign({ children: sortBasicNodes(children) }, node));
9
- });
10
- const getBasicTreeByParentUid = (uid) => sortBasicNodes(window.roamAlphaAPI
11
- .q(`[:find (pull ?c [[:block/string :as "text"] :block/uid :block/order {:block/children ...}]) :where [?b :block/uid "${uid}"] [?b :block/children ?c]]`)
4
+ .sort((a, b) => (a[":block/order"] || 0) - (b[":block/order"] || 0))
5
+ .map((node) => ({
6
+ children: sortBasicNodes(node[":block/children"] || []),
7
+ uid: node[":block/uid"] || "",
8
+ text: node[":block/string"] || "",
9
+ }));
10
+ const getBasicTreeByParentUid = (uid) => sortBasicNodes(window.roamAlphaAPI.data.fast
11
+ .q(`[:find (pull ?c [:block/string :block/uid :block/order {:block/children ...}]) :where [?b :block/uid "${uid}"] [?b :block/children ?c]]`)
12
12
  .map((a) => a[0]));
13
13
  exports.default = getBasicTreeByParentUid;
14
14
  //# sourceMappingURL=getBasicTreeByParentUid.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"getBasicTreeByParentUid.js","sourceRoot":"","sources":["../../src/queries/getBasicTreeByParentUid.ts"],"names":[],"mappings":";;;AAEA,MAAM,cAAc,GAAG,CAAC,CAA2B,EAAmB,EAAE,CACtE,CAAC;KACE,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;KAC3C,GAAG,CAAC,CAAC,EAAoC,EAAE,EAAE;QAAxC,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,GAAG,EAAE,OAAW,EAAN,IAAI,sBAAlC,qBAAoC,CAAF;IAAO,OAAA,iBAC7C,QAAQ,EAAE,cAAc,CAAC,QAAQ,CAAC,IAC/B,IAAI,EACP,CAAA;CAAA,CAAC,CAAC;AAER,MAAM,uBAAuB,GAAG,CAAC,GAAW,EAAmB,EAAE,CAC/D,cAAc,CACZ,MAAM,CAAC,YAAY;KAChB,CAAC,CACA,sHAAsH,GAAG,6BAA6B,CACvJ;KACA,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAA2B,CAAC,CAC9C,CAAC;AAEJ,kBAAe,uBAAuB,CAAC"}
1
+ {"version":3,"file":"getBasicTreeByParentUid.js","sourceRoot":"","sources":["../../src/queries/getBasicTreeByParentUid.ts"],"names":[],"mappings":";;AAEA,MAAM,cAAc,GAAG,CAAC,CAAc,EAAmB,EAAE,CACzD,CAAC;KACE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;KACnE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACd,QAAQ,EAAE,cAAc,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC;IACvD,GAAG,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE;IAC7B,IAAI,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE;CAClC,CAAC,CAAC,CAAC;AAER,MAAM,uBAAuB,GAAG,CAAC,GAAW,EAAmB,EAAE,CAC/D,cAAc,CACZ,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI;KAC1B,CAAC,CACA,yGAAyG,GAAG,6BAA6B,CAC1I;KACA,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAc,CAAC,CACjC,CAAC;AAEJ,kBAAe,uBAAuB,CAAC"}
package/types/native.d.ts CHANGED
@@ -100,12 +100,6 @@ export declare type RoamBasicNode = {
100
100
  uid: string;
101
101
  children: RoamBasicNode[];
102
102
  };
103
- export declare type RoamUnorderedBasicNode = {
104
- text: string;
105
- uid: string;
106
- order: number;
107
- children?: RoamUnorderedBasicNode[];
108
- };
109
103
  export declare type RoamPull = {
110
104
  "block/children"?: RoamNode[];
111
105
  "block/heading"?: number;
@@ -125,9 +119,9 @@ export declare type RoamPull = {
125
119
  "node/title"?: string;
126
120
  } & RoamNode;
127
121
  export declare type PullBlock = {
128
- ":block/children"?: {
122
+ ":block/children"?: ({
129
123
  ":db/id": number;
130
- }[];
124
+ } | PullBlock)[];
131
125
  ":block/heading"?: number;
132
126
  ":block/open"?: boolean;
133
127
  ":block/order"?: number;
@@ -184,6 +178,7 @@ export declare type PullBlock = {
184
178
  };
185
179
  ":showing-own-icons?": boolean;
186
180
  ":showing-user-icons?": boolean;
181
+ ":first-day-of-week"?: 0 | 1 | 2 | 3 | 4 | 5 | 6;
187
182
  };
188
183
  ":user/uid"?: string;
189
184
  };