@nx-ddd/notion 5.14.0 → 6.0.3
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.
- package/_testing/entity.js +1 -1
- package/_testing/entity.js.map +1 -1
- package/converter/converter.d.ts +4 -5
- package/converter/converter.js +7 -6
- package/converter/converter.js.map +1 -1
- package/decorators/decorators.d.ts +2 -1
- package/decorators/decorators.js +2 -1
- package/decorators/decorators.js.map +1 -1
- package/package.json +9 -11
- package/query/query.d.ts +1 -7
- package/query/query.js.map +1 -1
- package/repository/repository.d.ts +10 -1
- package/repository/repository.js +38 -11
- package/repository/repository.js.map +1 -1
- package/utils.d.ts +11 -2
- package/utils.js +10 -0
- package/utils.js.map +1 -1
package/_testing/entity.js
CHANGED
|
@@ -9,6 +9,7 @@ class Entity {
|
|
|
9
9
|
return Object.assign(new Entity(), Object.assign({}, obj));
|
|
10
10
|
}
|
|
11
11
|
}
|
|
12
|
+
exports.Entity = Entity;
|
|
12
13
|
tslib_1.__decorate([
|
|
13
14
|
(0, decorators_1.Title)('タイトル'),
|
|
14
15
|
tslib_1.__metadata("design:type", String)
|
|
@@ -33,7 +34,6 @@ tslib_1.__decorate([
|
|
|
33
34
|
(0, decorators_1.RichText)('discordChannelId'),
|
|
34
35
|
tslib_1.__metadata("design:type", String)
|
|
35
36
|
], Entity.prototype, "discordChannelId", void 0);
|
|
36
|
-
exports.Entity = Entity;
|
|
37
37
|
class EntityConverter extends converter_1.NotionConverter {
|
|
38
38
|
constructor() {
|
|
39
39
|
super(...arguments);
|
package/_testing/entity.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity.js","sourceRoot":"","sources":["../../../../../packages/@nx-ddd/notion/src/lib/_testing/entity.ts"],"names":[],"mappings":";;;;AAAA,4CAA+C;AAC/C,8CAA2E;AAE3E,MAAa,MAAM;IAmBjB,MAAM,CAAC,IAAI,CAAC,GAAoB;QAC9B,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,MAAM,EAAE,oBAAM,GAAG,EAAE,CAAC;IAC/C,CAAC;CACF;
|
|
1
|
+
{"version":3,"file":"entity.js","sourceRoot":"","sources":["../../../../../packages/@nx-ddd/notion/src/lib/_testing/entity.ts"],"names":[],"mappings":";;;;AAAA,4CAA+C;AAC/C,8CAA2E;AAE3E,MAAa,MAAM;IAmBjB,MAAM,CAAC,IAAI,CAAC,GAAoB;QAC9B,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,MAAM,EAAE,oBAAM,GAAG,EAAE,CAAC;IAC/C,CAAC;CACF;AAtBD,wBAsBC;AApBC;IADC,IAAA,kBAAK,EAAC,MAAM,CAAC;;qCACA;AAGd;IADC,IAAA,mBAAM,EAAC,OAAO,CAAC;;sCACD;AAGf;IADC,IAAA,qBAAQ,EAAC,MAAM,CAAC;;iDACW;AAG5B;IADC,IAAA,oBAAO,EAAC,kBAAkB,CAAC;;4DACS;AAGrC;IADC,IAAA,oBAAO,EAAC,kBAAkB,CAAC;;6DACU;AAGtC;IADC,IAAA,qBAAQ,EAAC,kBAAkB,CAAC;;gDACJ;AAO3B,MAAa,eAAgB,SAAQ,2BAAuB;IAA5D;;QACY,WAAM,GAAG,MAAM,CAAC;IAC5B,CAAC;CAAA;AAFD,0CAEC"}
|
package/converter/converter.d.ts
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import { PageObjectResponse, PartialPageObjectResponse } from "@notionhq/client/build/src/api-endpoints";
|
|
2
|
-
|
|
3
|
-
export declare abstract class NotionConverter<E> extends Converter<E> {
|
|
1
|
+
import { PageObjectResponse, PartialPageObjectResponse, PartialDatabaseObjectResponse, DatabaseObjectResponse } from "@notionhq/client/build/src/api-endpoints";
|
|
2
|
+
export declare abstract class NotionConverter<E> {
|
|
4
3
|
protected abstract Entity: any;
|
|
5
|
-
|
|
6
|
-
|
|
4
|
+
fromNotion(page: PageObjectResponse | PartialPageObjectResponse | PartialDatabaseObjectResponse | DatabaseObjectResponse): E;
|
|
5
|
+
toNotion(entity: Partial<E>): object;
|
|
7
6
|
}
|
|
8
7
|
export declare function createConverter<E = any>(Entity: any): NotionConverter<E>;
|
package/converter/converter.js
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createConverter = exports.NotionConverter = void 0;
|
|
4
|
-
const converter_1 = require("@nx-ddd/common/infrastructure/converter");
|
|
5
4
|
const utils_1 = require("../utils");
|
|
6
5
|
const decorators_1 = require("../decorators");
|
|
7
6
|
const lodash_1 = require("lodash");
|
|
8
|
-
class NotionConverter
|
|
9
|
-
|
|
10
|
-
|
|
7
|
+
class NotionConverter {
|
|
8
|
+
fromNotion(page) {
|
|
9
|
+
var _a;
|
|
10
|
+
const annotations = (_a = this.Entity[decorators_1.NOTION_ANNOTATIONS]) !== null && _a !== void 0 ? _a : [];
|
|
11
11
|
const obj = annotations.reduce((obj, annotation) => {
|
|
12
12
|
const value = page['properties'][annotation.fieldName]
|
|
13
13
|
? utils_1.NotionUtils.fromNotionValue(page['properties'][annotation.fieldName], annotation)
|
|
@@ -16,8 +16,9 @@ class NotionConverter extends converter_1.Converter {
|
|
|
16
16
|
}, { id: page.id });
|
|
17
17
|
return this.Entity.from(obj);
|
|
18
18
|
}
|
|
19
|
-
|
|
20
|
-
|
|
19
|
+
toNotion(entity) {
|
|
20
|
+
var _a;
|
|
21
|
+
const annotations = (_a = this.Entity[decorators_1.NOTION_ANNOTATIONS]) !== null && _a !== void 0 ? _a : [];
|
|
21
22
|
const data = annotations.reduce((obj, annotation) => (Object.assign(Object.assign({}, obj), { [annotation.fieldName]: utils_1.NotionUtils.toNotionValue(entity[annotation.propName], annotation) })), {});
|
|
22
23
|
return (0, lodash_1.omitBy)(data, (value) => typeof value === 'undefined');
|
|
23
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"converter.js","sourceRoot":"","sources":["../../../../../packages/@nx-ddd/notion/src/lib/converter/converter.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"converter.js","sourceRoot":"","sources":["../../../../../packages/@nx-ddd/notion/src/lib/converter/converter.ts"],"names":[],"mappings":";;;AACA,oCAAuC;AACvC,8CAAqE;AACrE,mCAAgC;AAEhC,MAAsB,eAAe;IAGnC,UAAU,CAAC,IAA6G;;QACtH,MAAM,WAAW,GAAuB,MAAA,IAAI,CAAC,MAAM,CAAC,+BAAkB,CAAC,mCAAI,EAAE,CAAC;QAC9E,MAAM,GAAG,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE;YACjD,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC;gBACpD,CAAC,CAAC,mBAAW,CAAC,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,UAAU,CAAC;gBACnF,CAAC,CAAC,SAAS,CAAC;YACd,uCAAW,GAAG,KAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,KAAK,IAAE;QAChD,CAAC,EAAE,EAAC,EAAE,EAAE,IAAI,CAAC,EAAE,EAAC,CAAC,CAAC;QAClB,OAAQ,IAAI,CAAC,MAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACxC,CAAC;IAED,QAAQ,CAAC,MAAkB;;QACzB,MAAM,WAAW,GAAuB,MAAA,IAAI,CAAC,MAAM,CAAC,+BAAkB,CAAC,mCAAI,EAAE,CAAC;QAC9E,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC,iCAChD,GAAG,KAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,mBAAW,CAAC,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,UAAU,CAAC,IAClG,EAAE,EAAE,CAAC,CAAC;QACR,OAAO,IAAA,eAAM,EAAC,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,KAAK,KAAK,WAAW,CAAC,CAAC;IAC/D,CAAC;CACF;AArBD,0CAqBC;AAED,SAAgB,eAAe,CAAU,MAAW;IAClD,MAAM,SAAU,SAAQ,eAAkB;QAA1C;;YACY,WAAM,GAAG,MAAM,CAAC;QAC5B,CAAC;KAAA;IAED,OAAO,IAAI,SAAS,EAAE,CAAC;AACzB,CAAC;AAND,0CAMC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export declare const NOTION_ANNOTATIONS = "notion_annotations";
|
|
2
|
-
export type NotionFieldType = 'title' | 'url' | 'rich_text' | 'relation' | 'status' | 'formula' | 'rollup' | 'timestamp' | 'number' | 'created_time' | 'last_edited_time' | 'date' | 'select' | 'phone_number' | 'email' | 'checkbox' | 'created_by' | 'files' | 'last_edited_by' | 'multi_select' | 'people';
|
|
2
|
+
export type NotionFieldType = 'title' | 'url' | 'rich_text' | 'relation' | 'status' | 'formula' | 'rollup' | 'timestamp' | 'number' | 'created_time' | 'last_edited_time' | 'date' | 'select' | 'phone_number' | 'email' | 'checkbox' | 'created_by' | 'files' | 'last_edited_by' | 'multi_select' | 'people' | 'unique_id';
|
|
3
3
|
export interface NotionAnnotation<T extends object = undefined> {
|
|
4
4
|
type: NotionFieldType;
|
|
5
5
|
fieldName: string;
|
|
@@ -25,3 +25,4 @@ export declare const Date: (name?: string, options?: undefined) => (target: any,
|
|
|
25
25
|
export declare const Select: (name?: string, options?: undefined) => (target: any, propName: string) => void;
|
|
26
26
|
export declare const PhoneNumber: (name?: string, options?: undefined) => (target: any, propName: string) => void;
|
|
27
27
|
export declare const Email: (name?: string, options?: undefined) => (target: any, propName: string) => void;
|
|
28
|
+
export declare const UniqueID: (name?: string, options?: undefined) => (target: any, propName: string) => void;
|
package/decorators/decorators.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.Email = exports.PhoneNumber = exports.Select = exports.Date = exports.LastEditedTime = exports.CreatedTime = exports.Number = exports.Timestamp = exports.Rollup = exports.Formula = exports.Status = exports.Relation = exports.RichText = exports.Url = exports.Title = exports.NOTION_ANNOTATIONS = void 0;
|
|
3
|
+
exports.UniqueID = exports.Email = exports.PhoneNumber = exports.Select = exports.Date = exports.LastEditedTime = exports.CreatedTime = exports.Number = exports.Timestamp = exports.Rollup = exports.Formula = exports.Status = exports.Relation = exports.RichText = exports.Url = exports.Title = exports.NOTION_ANNOTATIONS = void 0;
|
|
4
4
|
exports.NOTION_ANNOTATIONS = 'notion_annotations';
|
|
5
5
|
;
|
|
6
6
|
function createDecorator(type, defaultOptions) {
|
|
@@ -30,6 +30,7 @@ exports.Date = createDecorator('date');
|
|
|
30
30
|
exports.Select = createDecorator('select');
|
|
31
31
|
exports.PhoneNumber = createDecorator('phone_number');
|
|
32
32
|
exports.Email = createDecorator('email');
|
|
33
|
+
exports.UniqueID = createDecorator('unique_id');
|
|
33
34
|
// Not implemented below props!
|
|
34
35
|
// export const Checkbox = createDecorator('checkbox');
|
|
35
36
|
// export const CreatedBy = createDecorator('created_by');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../../../../packages/@nx-ddd/notion/src/lib/decorators/decorators.ts"],"names":[],"mappings":";;;AAAa,QAAA,kBAAkB,GAAG,oBAAoB,CAAC;AAWtD,CAAC;AAEF,SAAS,eAAe,CAA+B,IAAqB,EAAE,cAAkB;IAC9F,OAAO,CAAC,IAAa,EAAE,OAAoB,EAAE,EAAE;QAC7C,OAAO,CAAC,MAAW,EAAE,QAAgB,EAAE,EAAE;;;YACvC,MAAM,SAAS,GAAG,IAAI,IAAI,QAAQ,CAAC;YACnC,MAAM,UAAU,GAAwB,EAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,kCAAM,cAAc,GAAK,OAAO,CAAC,EAAC,CAAC;YAC9G,YAAA,MAAM,CAAC,WAAW,EAAC,0BAAkB,wCAAlB,0BAAkB,IAAM,EAAE,EAAC;YAC9C,MAAM,CAAC,WAAW,CAAC,0BAAkB,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC1D,CAAC,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAEY,QAAA,KAAK,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;AACjC,QAAA,GAAG,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;AAC7B,QAAA,QAAQ,GAAG,eAAe,CAAC,WAAW,CAAC,CAAC;AACxC,QAAA,QAAQ,GAAG,eAAe,CAAmB,UAAU,EAAE,EAAC,KAAK,EAAE,KAAK,EAAC,CAAC,CAAC;AACzE,QAAA,MAAM,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;AACnC,QAAA,OAAO,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;AACrC,QAAA,MAAM,GAAG,eAAe,CAAmB,QAAQ,EAAE,EAAC,KAAK,EAAE,KAAK,EAAC,CAAC,CAAC;AACrE,QAAA,SAAS,GAAG,eAAe,CAAC,WAAW,CAAC,CAAC;AACzC,QAAA,MAAM,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;AACnC,QAAA,WAAW,GAAG,eAAe,CAAC,cAAc,CAAC,CAAC;AAC9C,QAAA,cAAc,GAAG,eAAe,CAAC,kBAAkB,CAAC,CAAC;AACrD,QAAA,IAAI,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;AAC/B,QAAA,MAAM,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;AACnC,QAAA,WAAW,GAAG,eAAe,CAAC,cAAc,CAAC,CAAC;AAC9C,QAAA,KAAK,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../../../../packages/@nx-ddd/notion/src/lib/decorators/decorators.ts"],"names":[],"mappings":";;;AAAa,QAAA,kBAAkB,GAAG,oBAAoB,CAAC;AAWtD,CAAC;AAEF,SAAS,eAAe,CAA+B,IAAqB,EAAE,cAAkB;IAC9F,OAAO,CAAC,IAAa,EAAE,OAAoB,EAAE,EAAE;QAC7C,OAAO,CAAC,MAAW,EAAE,QAAgB,EAAE,EAAE;;;YACvC,MAAM,SAAS,GAAG,IAAI,IAAI,QAAQ,CAAC;YACnC,MAAM,UAAU,GAAwB,EAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,kCAAM,cAAc,GAAK,OAAO,CAAC,EAAC,CAAC;YAC9G,YAAA,MAAM,CAAC,WAAW,EAAC,0BAAkB,wCAAlB,0BAAkB,IAAM,EAAE,EAAC;YAC9C,MAAM,CAAC,WAAW,CAAC,0BAAkB,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC1D,CAAC,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAEY,QAAA,KAAK,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;AACjC,QAAA,GAAG,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;AAC7B,QAAA,QAAQ,GAAG,eAAe,CAAC,WAAW,CAAC,CAAC;AACxC,QAAA,QAAQ,GAAG,eAAe,CAAmB,UAAU,EAAE,EAAC,KAAK,EAAE,KAAK,EAAC,CAAC,CAAC;AACzE,QAAA,MAAM,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;AACnC,QAAA,OAAO,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;AACrC,QAAA,MAAM,GAAG,eAAe,CAAmB,QAAQ,EAAE,EAAC,KAAK,EAAE,KAAK,EAAC,CAAC,CAAC;AACrE,QAAA,SAAS,GAAG,eAAe,CAAC,WAAW,CAAC,CAAC;AACzC,QAAA,MAAM,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;AACnC,QAAA,WAAW,GAAG,eAAe,CAAC,cAAc,CAAC,CAAC;AAC9C,QAAA,cAAc,GAAG,eAAe,CAAC,kBAAkB,CAAC,CAAC;AACrD,QAAA,IAAI,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;AAC/B,QAAA,MAAM,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;AACnC,QAAA,WAAW,GAAG,eAAe,CAAC,cAAc,CAAC,CAAC;AAC9C,QAAA,KAAK,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;AACjC,QAAA,QAAQ,GAAG,eAAe,CAAC,WAAW,CAAC,CAAC;AACrD,+BAA+B;AAC/B,uDAAuD;AACvD,0DAA0D;AAC1D,iDAAiD;AACjD,iEAAiE;AACjE,8DAA8D;AAC9D,mDAAmD"}
|
package/package.json
CHANGED
|
@@ -1,18 +1,16 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx-ddd/notion",
|
|
3
|
-
"version": "
|
|
4
|
-
"main": "./index.js",
|
|
3
|
+
"version": "6.0.3",
|
|
4
|
+
"main": "./src/lib/index.js",
|
|
5
5
|
"types": "./index.d.ts",
|
|
6
|
-
"
|
|
6
|
+
"peerDependencies": {
|
|
7
7
|
"@notionhq/client": "^2.2.2",
|
|
8
|
-
"
|
|
9
|
-
"
|
|
8
|
+
"@nx-ddd/common": "6.0.3",
|
|
9
|
+
"@nx-ddd/core": "6.0.3",
|
|
10
|
+
"dayjs": "1.11.10",
|
|
10
11
|
"lodash": "4.17.21",
|
|
11
|
-
"reflect-metadata": "^0.1.13"
|
|
12
|
-
},
|
|
13
|
-
"peerDependencies": {
|
|
14
|
-
"@nx-ddd/common": "5.14.0",
|
|
15
|
-
"@nx-ddd/core": "5.14.0",
|
|
16
12
|
"tslib": "^2.3.0"
|
|
17
|
-
}
|
|
13
|
+
},
|
|
14
|
+
"dependencies": {},
|
|
15
|
+
"type": "commonjs"
|
|
18
16
|
}
|
package/query/query.d.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { Entity } from "@nx-ddd/common/domain/models";
|
|
2
1
|
type Evaluation = '==' | '>' | '>=' | '<' | '<=' | '!=' | 'in';
|
|
3
2
|
export declare class N {
|
|
4
3
|
static RollupPropQuery(property: string, evaluation: Evaluation, value: string | number): {
|
|
@@ -160,12 +159,7 @@ export declare class NotionOr extends NotionBaseQuery {
|
|
|
160
159
|
})[];
|
|
161
160
|
};
|
|
162
161
|
}
|
|
163
|
-
export declare const Query: <
|
|
164
|
-
new (): Entity<any>;
|
|
165
|
-
from<E extends Entity<string> = any>(obj: Partial<import("@nx-ddd/common/domain/models").OmitGetter<E>>): E;
|
|
166
|
-
fromObj<T extends Entity<string> = Entity<string>>(obj: object): T;
|
|
167
|
-
toObj(entity: Entity<string>): Entity<string>;
|
|
168
|
-
}>(Entity: E_1) => {
|
|
162
|
+
export declare const Query: <E = any>(Entity: E) => {
|
|
169
163
|
Filter: (_propName: string, evaluation: Evaluation, value: string | number) => NotionFilter;
|
|
170
164
|
OrderBy: (_propName: string, direction: 'asc' | 'desc') => NotionSort;
|
|
171
165
|
And: (...args: NotionFilter[]) => NotionAnd;
|
package/query/query.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../../../packages/@nx-ddd/notion/src/lib/query/query.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../../../packages/@nx-ddd/notion/src/lib/query/query.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,16 @@ export declare abstract class NotionRepository<E extends Entity> extends Reposit
|
|
|
18
18
|
database_id: string;
|
|
19
19
|
};
|
|
20
20
|
constructor(token: string);
|
|
21
|
-
|
|
21
|
+
query(filterQuery?: NotionBaseQuery, sortQuery?: NotionBaseQuery, startCursor?: string, pageSize?: number): Promise<{
|
|
22
|
+
results: E[];
|
|
23
|
+
nextCursor: string;
|
|
24
|
+
hasMore: boolean;
|
|
25
|
+
}>;
|
|
26
|
+
queryV2(args?: any): Promise<{
|
|
27
|
+
results: E[];
|
|
28
|
+
nextCursor: string;
|
|
29
|
+
hasMore: boolean;
|
|
30
|
+
}>;
|
|
22
31
|
list(): Promise<E[]>;
|
|
23
32
|
get({ id }: {
|
|
24
33
|
id: string;
|
package/repository/repository.js
CHANGED
|
@@ -8,7 +8,7 @@ const di_1 = require("@nx-ddd/core/di");
|
|
|
8
8
|
const query_builder_1 = require("../query-builder");
|
|
9
9
|
exports.NOTION_ACCESS_TOKEN = new di_1.InjectionToken('[@nx-ddd/notion] Notion Access Token');
|
|
10
10
|
exports.NOTION_DATABASE_ID = new di_1.InjectionToken('[@nx-ddd/notion] Notion Database Id');
|
|
11
|
-
let NotionRepository = class NotionRepository extends repository_1.Repository {
|
|
11
|
+
let NotionRepository = exports.NotionRepository = class NotionRepository extends repository_1.Repository {
|
|
12
12
|
get parent() {
|
|
13
13
|
return { type: 'database_id', database_id: this.databaseId };
|
|
14
14
|
}
|
|
@@ -18,12 +18,31 @@ let NotionRepository = class NotionRepository extends repository_1.Repository {
|
|
|
18
18
|
this.client = new client_1.Client({ auth: this.token });
|
|
19
19
|
this.queryBuilder = new query_builder_1.NotionQueryBuilder();
|
|
20
20
|
}
|
|
21
|
-
query(filterQuery, sortQuery) {
|
|
21
|
+
query(filterQuery, sortQuery, startCursor, pageSize) {
|
|
22
22
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
23
23
|
try {
|
|
24
24
|
const obj = this.queryBuilder.build(filterQuery, sortQuery);
|
|
25
|
-
const
|
|
26
|
-
return
|
|
25
|
+
const res = yield this.client.databases.query(Object.assign(Object.assign({ database_id: this.databaseId }, obj), { start_cursor: startCursor, page_size: pageSize }));
|
|
26
|
+
return {
|
|
27
|
+
results: res.results.map(result => this.converter.fromNotion(result)),
|
|
28
|
+
nextCursor: res.next_cursor,
|
|
29
|
+
hasMore: res.has_more,
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
catch (error) {
|
|
33
|
+
throw error;
|
|
34
|
+
}
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
queryV2(args) {
|
|
38
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
39
|
+
try {
|
|
40
|
+
const res = yield this.client.databases.query(Object.assign({ database_id: this.databaseId }, (args !== null && args !== void 0 ? args : {})));
|
|
41
|
+
return {
|
|
42
|
+
results: res.results.map(result => this.converter.fromNotion(result)),
|
|
43
|
+
nextCursor: res.next_cursor,
|
|
44
|
+
hasMore: res.has_more,
|
|
45
|
+
};
|
|
27
46
|
}
|
|
28
47
|
catch (error) {
|
|
29
48
|
throw error;
|
|
@@ -32,13 +51,22 @@ let NotionRepository = class NotionRepository extends repository_1.Repository {
|
|
|
32
51
|
}
|
|
33
52
|
list() {
|
|
34
53
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
35
|
-
|
|
54
|
+
const orders = [];
|
|
55
|
+
let nextCursor;
|
|
56
|
+
while (true) {
|
|
57
|
+
const res = yield this.query(undefined, undefined, nextCursor, 100);
|
|
58
|
+
orders.push(...res.results);
|
|
59
|
+
nextCursor = res.nextCursor;
|
|
60
|
+
if (!res.hasMore)
|
|
61
|
+
break;
|
|
62
|
+
}
|
|
63
|
+
return orders;
|
|
36
64
|
});
|
|
37
65
|
}
|
|
38
66
|
get({ id }) {
|
|
39
67
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
40
68
|
const data = yield this.client.pages.retrieve({ page_id: id });
|
|
41
|
-
return this.converter.
|
|
69
|
+
return this.converter.fromNotion(data);
|
|
42
70
|
});
|
|
43
71
|
}
|
|
44
72
|
create(entity) {
|
|
@@ -46,9 +74,9 @@ let NotionRepository = class NotionRepository extends repository_1.Repository {
|
|
|
46
74
|
try {
|
|
47
75
|
const res = yield this.client.pages.create({
|
|
48
76
|
parent: this.parent,
|
|
49
|
-
properties: Object.assign({}, this.converter.
|
|
77
|
+
properties: Object.assign({}, this.converter.toNotion(entity)),
|
|
50
78
|
});
|
|
51
|
-
return this.converter.
|
|
79
|
+
return this.converter.fromNotion(res);
|
|
52
80
|
}
|
|
53
81
|
catch (error) {
|
|
54
82
|
throw error;
|
|
@@ -59,7 +87,7 @@ let NotionRepository = class NotionRepository extends repository_1.Repository {
|
|
|
59
87
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
60
88
|
const data = {
|
|
61
89
|
page_id: entity.id,
|
|
62
|
-
properties: Object.assign({}, this.converter.
|
|
90
|
+
properties: Object.assign({}, this.converter.toNotion(entity)),
|
|
63
91
|
};
|
|
64
92
|
yield this.client.pages.update(data);
|
|
65
93
|
});
|
|
@@ -70,10 +98,9 @@ let NotionRepository = class NotionRepository extends repository_1.Repository {
|
|
|
70
98
|
});
|
|
71
99
|
}
|
|
72
100
|
};
|
|
73
|
-
NotionRepository = tslib_1.__decorate([
|
|
101
|
+
exports.NotionRepository = NotionRepository = tslib_1.__decorate([
|
|
74
102
|
(0, di_1.Injectable)(),
|
|
75
103
|
tslib_1.__param(0, (0, di_1.Inject)(exports.NOTION_ACCESS_TOKEN)),
|
|
76
104
|
tslib_1.__metadata("design:paramtypes", [String])
|
|
77
105
|
], NotionRepository);
|
|
78
|
-
exports.NotionRepository = NotionRepository;
|
|
79
106
|
//# sourceMappingURL=repository.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../../../packages/@nx-ddd/notion/src/lib/repository/repository.ts"],"names":[],"mappings":";;;;AAAA,6CAA0C;AAE1C,iEAA8D;AAC9D,wCAAqE;AAGrE,oDAAsD;AAEzC,QAAA,mBAAmB,GAAG,IAAI,mBAAc,CAAC,sCAAsC,CAAC,CAAC;AACjF,QAAA,kBAAkB,GAAG,IAAI,mBAAc,CAAC,qCAAqC,CAAC,CAAC;AAGrF,IAAe,gBAAgB,
|
|
1
|
+
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../../../packages/@nx-ddd/notion/src/lib/repository/repository.ts"],"names":[],"mappings":"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"}
|
package/utils.d.ts
CHANGED
|
@@ -66,7 +66,7 @@ export type NotionFormula = {
|
|
|
66
66
|
export type NotionRollup = {
|
|
67
67
|
id: string;
|
|
68
68
|
type: 'rollup';
|
|
69
|
-
rollup: NotionArray;
|
|
69
|
+
rollup: NotionArray | NotionNumber;
|
|
70
70
|
};
|
|
71
71
|
export type NotionCreatedTime = {
|
|
72
72
|
id: string;
|
|
@@ -102,7 +102,15 @@ export type NotionEmail = {
|
|
|
102
102
|
type: 'email';
|
|
103
103
|
email: string;
|
|
104
104
|
};
|
|
105
|
-
export type
|
|
105
|
+
export type NotionID = {
|
|
106
|
+
id: string;
|
|
107
|
+
type: 'unique_id';
|
|
108
|
+
unique_id: {
|
|
109
|
+
prefix: string | null;
|
|
110
|
+
number: number;
|
|
111
|
+
};
|
|
112
|
+
};
|
|
113
|
+
export type NotionValue = NotionTitle | NotionUrl | NotionRichText | NotionNumber | NotionRelation | NotionStatus | NotionFormula | NotionRollup | NotionCreatedTime | NotionLastEditedTime | NotionDate | NotionSelect | NotionPhoneNumber | NotionEmail | NotionID;
|
|
106
114
|
export declare class NotionUtils {
|
|
107
115
|
static toNotionValue(value: any, annotation: NotionAnnotation): void | {
|
|
108
116
|
type: string;
|
|
@@ -232,5 +240,6 @@ export declare class NotionUtils {
|
|
|
232
240
|
static fromSelect(notionSelect: NotionSelect): string;
|
|
233
241
|
static fromPhoneNumber(notionPhoneNumber: NotionPhoneNumber): string;
|
|
234
242
|
static fromEmail(notionEmail: NotionEmail): string;
|
|
243
|
+
static fromUniqueID(value: NotionID): number;
|
|
235
244
|
}
|
|
236
245
|
export {};
|
package/utils.js
CHANGED
|
@@ -95,6 +95,7 @@ class NotionUtils {
|
|
|
95
95
|
case 'select': return this.fromSelect(value);
|
|
96
96
|
case 'phone_number': return this.fromPhoneNumber(value);
|
|
97
97
|
case 'email': return this.fromEmail(value);
|
|
98
|
+
case 'unique_id': return this.fromUniqueID(value);
|
|
98
99
|
}
|
|
99
100
|
}
|
|
100
101
|
static fromTitle(notionTitle) {
|
|
@@ -125,10 +126,16 @@ class NotionUtils {
|
|
|
125
126
|
}
|
|
126
127
|
static fromRollup(notionRollup) {
|
|
127
128
|
var _a, _b;
|
|
129
|
+
if (notionRollup.rollup.type === 'number') {
|
|
130
|
+
return this.fromNumber(notionRollup.rollup);
|
|
131
|
+
}
|
|
128
132
|
return (_b = (_a = this.fromRollupMulti(notionRollup)) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : null;
|
|
129
133
|
}
|
|
130
134
|
static fromRollupMulti(notionRollup) {
|
|
131
135
|
var _a;
|
|
136
|
+
if (notionRollup.rollup.type === 'number') {
|
|
137
|
+
return [];
|
|
138
|
+
}
|
|
132
139
|
return ((_a = notionRollup.rollup.array) !== null && _a !== void 0 ? _a : []).map(notionValue => {
|
|
133
140
|
var _a, _b;
|
|
134
141
|
if (notionValue.type === 'rich_text') {
|
|
@@ -166,6 +173,9 @@ class NotionUtils {
|
|
|
166
173
|
var _a;
|
|
167
174
|
return (_a = notionEmail.email) !== null && _a !== void 0 ? _a : null;
|
|
168
175
|
}
|
|
176
|
+
static fromUniqueID(value) {
|
|
177
|
+
return value.unique_id.number;
|
|
178
|
+
}
|
|
169
179
|
}
|
|
170
180
|
exports.NotionUtils = NotionUtils;
|
|
171
181
|
//# sourceMappingURL=utils.js.map
|
package/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../packages/@nx-ddd/notion/src/lib/utils.ts"],"names":[],"mappings":";;;;AAAA,0DAA0B;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../packages/@nx-ddd/notion/src/lib/utils.ts"],"names":[],"mappings":"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"}
|