@social-mail/social-mail-client 1.2.490 → 1.2.492
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/dist/admin/AdminAppIndex.pack.js +3 -2
- package/dist/admin/AdminAppIndex.pack.js.map +1 -1
- package/dist/admin/AdminAppIndex.pack.min.js +2 -2
- package/dist/admin/AdminAppIndex.pack.min.js.map +1 -1
- package/dist/common/pages/stores/products/EditProductDetailPage.d.ts.map +1 -1
- package/dist/common/pages/stores/products/EditProductDetailPage.js +2 -1
- package/dist/common/pages/stores/products/EditProductDetailPage.js.map +1 -1
- package/dist/public/channel/ChannelView.pack.js +1 -1
- package/dist/public/channel/ChannelView.pack.js.map +1 -1
- package/dist/public/channel/ChannelView.pack.min.js +1 -1
- package/dist/public/channel/ChannelView.pack.min.js.map +1 -1
- package/dist/public/contact-us/ContactUsApp.pack.js +1 -1
- package/dist/public/contact-us/ContactUsApp.pack.js.map +1 -1
- package/dist/public/contact-us/ContactUsApp.pack.min.js +1 -1
- package/dist/public/contact-us/ContactUsApp.pack.min.js.map +1 -1
- package/dist/public/preview/pdf/PreviewPDF.pack.js +1 -1
- package/dist/public/preview/pdf/PreviewPDF.pack.js.map +1 -1
- package/dist/public/preview/pdf/PreviewPDF.pack.min.js +1 -1
- package/dist/public/preview/pdf/PreviewPDF.pack.min.js.map +1 -1
- package/dist/public/store/Store.pack.js +140 -76
- package/dist/public/store/Store.pack.js.map +1 -1
- package/dist/public/store/Store.pack.min.js +139 -76
- package/dist/public/store/Store.pack.min.js.map +1 -1
- package/dist/public/store/StoreApp.pack.js +1 -1
- package/dist/public/store/StoreApp.pack.js.map +1 -1
- package/dist/public/store/StoreApp.pack.min.js +1 -1
- package/dist/public/store/StoreApp.pack.min.js.map +1 -1
- package/dist/public/store/StoreItemListView.d.ts.map +1 -1
- package/dist/public/store/StoreItemListView.js +139 -75
- package/dist/public/store/StoreItemListView.js.map +1 -1
- package/dist/public/store/cart/ShoppingCart.pack.js +1 -1
- package/dist/public/store/cart/ShoppingCart.pack.js.map +1 -1
- package/dist/public/store/cart/ShoppingCart.pack.min.js +1 -1
- package/dist/public/store/cart/ShoppingCart.pack.min.js.map +1 -1
- package/dist/services/LoginService.d.ts.map +1 -1
- package/dist/services/LoginService.js.map +1 -1
- package/dist/services/local-db/LocalDbService.d.ts +7 -6
- package/dist/services/local-db/LocalDbService.d.ts.map +1 -1
- package/dist/services/local-db/LocalDbService.js +46 -22
- package/dist/services/local-db/LocalDbService.js.map +1 -1
- package/dist/services/local-db/contact/LocalContact.d.ts +8 -0
- package/dist/services/local-db/contact/LocalContact.d.ts.map +1 -0
- package/dist/services/local-db/contact/LocalContact.js +25 -0
- package/dist/services/local-db/contact/LocalContact.js.map +1 -0
- package/dist/services/local-db/core/LocalTable.d.ts +14 -3
- package/dist/services/local-db/core/LocalTable.d.ts.map +1 -1
- package/dist/services/local-db/core/LocalTable.js +131 -15
- package/dist/services/local-db/core/LocalTable.js.map +1 -1
- package/dist/services/local-db/core/SqlDbFactory.d.ts +39 -0
- package/dist/services/local-db/core/SqlDbFactory.d.ts.map +1 -0
- package/dist/services/local-db/core/SqlDbFactory.js +112 -0
- package/dist/services/local-db/core/SqlDbFactory.js.map +1 -0
- package/dist/services/local-db/core/TemplateQuery.d.ts.map +1 -1
- package/dist/services/local-db/core/TemplateQuery.js +6 -5
- package/dist/services/local-db/core/TemplateQuery.js.map +1 -1
- package/dist/services/local-db/mailboxes/LocalMailbox.d.ts +0 -1
- package/dist/services/local-db/mailboxes/LocalMailbox.d.ts.map +1 -1
- package/dist/services/local-db/mailboxes/LocalMailbox.js +3 -40
- package/dist/services/local-db/mailboxes/LocalMailbox.js.map +1 -1
- package/dist/site-editor/SiteEditorApp.pack.js +1 -1
- package/dist/site-editor/SiteEditorApp.pack.js.map +1 -1
- package/dist/site-editor/SiteEditorApp.pack.min.js +1 -1
- package/dist/site-editor/SiteEditorApp.pack.min.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/web/AppIndex.pack.js +3 -2
- package/dist/web/AppIndex.pack.js.map +1 -1
- package/dist/web/AppIndex.pack.min.js +2 -2
- package/dist/web/AppIndex.pack.min.js.map +1 -1
- package/node_modules/@web-atoms/module-loader/package.json +1 -1
- package/node_modules/@web-atoms/module-loader/umd/src/AmdLoader.ts +1 -1
- package/node_modules/@web-atoms/module-loader/umd.js +1 -1
- package/node_modules/@web-atoms/module-loader/umd.js.map +1 -1
- package/package.json +2 -2
- package/sqlite-loader.mjs +4 -4
- package/src/common/pages/stores/products/EditProductDetailPage.tsx +1 -0
- package/src/public/store/StoreItemListView.tsx +141 -77
- package/src/services/LoginService.ts +2 -1
- package/src/services/local-db/LocalDbService.ts +47 -20
- package/src/services/local-db/contact/LocalContact.ts +11 -0
- package/src/services/local-db/core/LocalTable.ts +131 -16
- package/src/services/local-db/core/SqlDbFactory.ts +173 -0
- package/src/services/local-db/core/TemplateQuery.ts +10 -5
- package/src/services/local-db/mailboxes/LocalMailbox.ts +0 -37
|
@@ -15,92 +15,156 @@ import { ContentPage } from "@web-atoms/web-controls/dist/mobile-app/MobileApp";
|
|
|
15
15
|
import { storeItemLink } from "./storeItemLink";
|
|
16
16
|
import Action from "@web-atoms/core/dist/view-model/Action";
|
|
17
17
|
|
|
18
|
-
|
|
18
|
+
styled.css`
|
|
19
19
|
|
|
20
|
-
|
|
21
|
-
|
|
20
|
+
display:grid;
|
|
21
|
+
grid-template-rows: auto 1fr auto;
|
|
22
|
+
background-color: var(--hover-color);
|
|
22
23
|
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
24
|
+
& > header {
|
|
25
|
+
grid-row:1;
|
|
26
|
+
padding: 10px;
|
|
27
|
+
display: flex;
|
|
28
|
+
flex-direction: column;
|
|
29
|
+
gap: 10px;
|
|
30
|
+
|
|
31
|
+
& > .search {
|
|
32
|
+
width: 100%;
|
|
33
|
+
text-indent: 15px;
|
|
34
|
+
height: 42px;
|
|
35
|
+
font-weight: 400;
|
|
36
|
+
font-size: var(--font-xs);
|
|
37
|
+
border: 1px solid var(--border-color, #d3d3d3);
|
|
38
|
+
outline: none;
|
|
39
|
+
background-color: var(--accent-text-color);
|
|
40
|
+
|
|
41
|
+
}
|
|
42
|
+
& > .tags {
|
|
43
|
+
display: flex;
|
|
44
|
+
flex-wrap: wrap;
|
|
45
|
+
flex-wrap: wrap;
|
|
46
|
+
gap: 12px;
|
|
47
|
+
padding: 10px;
|
|
48
|
+
justify-content: start;
|
|
49
|
+
& > * {
|
|
50
|
+
cursor: pointer;
|
|
51
|
+
font-size: 15px;
|
|
52
|
+
font-weight: 600;
|
|
53
|
+
padding: 8px 16px;
|
|
54
|
+
border-radius: 25px;
|
|
55
|
+
border: 1px solid transparent;
|
|
56
|
+
cursor: pointer;
|
|
57
|
+
transition: all 0.3s ease;
|
|
58
|
+
text-decoration: none;
|
|
59
|
+
background-color: var(--accent-text-color);
|
|
60
|
+
&:hover {
|
|
61
|
+
transform: translateY(-3px);
|
|
44
62
|
}
|
|
45
63
|
}
|
|
64
|
+
}
|
|
65
|
+
}
|
|
46
66
|
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
& .store-item {
|
|
56
|
-
display: inline-grid;
|
|
57
|
-
padding: 10px;
|
|
58
|
-
border-radius: 10px;
|
|
59
|
-
border: solid 1px lightgray;
|
|
60
|
-
grid-template-columns: 1fr 1fr;
|
|
61
|
-
grid-template-rows: auto 1fr auto auto;
|
|
62
|
-
gap: 10px;
|
|
63
|
-
& > .name {
|
|
64
|
-
grid-column: 1 / span 2;
|
|
65
|
-
grid-row: 1;
|
|
66
|
-
max-width:200px;
|
|
67
|
-
overflow: hidden;
|
|
68
|
-
text-overflow: ellipsis;
|
|
69
|
-
white-space: nowrap;
|
|
70
|
-
}
|
|
71
|
-
& > img {
|
|
72
|
-
grid-column: 1 / span 2;
|
|
73
|
-
grid-row: 2;
|
|
74
|
-
object-fit: contain;
|
|
75
|
-
width: 200px;
|
|
76
|
-
height: 200px;
|
|
77
|
-
}
|
|
78
|
-
& > .description {
|
|
79
|
-
grid-column: 1 / span 2;
|
|
80
|
-
grid-row: 3;
|
|
81
|
-
max-width: 200px;
|
|
82
|
-
height: 3ch;
|
|
83
|
-
overflow: hidden;
|
|
84
|
-
text-overflow: ellipsis;
|
|
85
|
-
white-space: nowrap;
|
|
86
|
-
}
|
|
87
|
-
& > .buy {
|
|
88
|
-
grid-column: 2;
|
|
89
|
-
grid-row: 4;
|
|
90
|
-
}
|
|
91
|
-
& > .price {
|
|
92
|
-
grid-column: 1;
|
|
93
|
-
grid-row: 4;
|
|
94
|
-
}
|
|
95
|
-
}
|
|
67
|
+
& > section {
|
|
68
|
+
grid-row: 2;
|
|
69
|
+
padding: 10px;
|
|
70
|
+
display: flex;
|
|
71
|
+
flex-direction: row;
|
|
72
|
+
flex-wrap: wrap;
|
|
73
|
+
justify-content: center;
|
|
74
|
+
gap: 10px;
|
|
96
75
|
|
|
76
|
+
& .store-item {
|
|
77
|
+
display: inline-grid;
|
|
78
|
+
padding: 8px 12px;
|
|
79
|
+
border-radius: 5px;
|
|
80
|
+
background-color: var(--accent-text-color);
|
|
81
|
+
grid-template-columns: 1fr 1fr;
|
|
82
|
+
grid-template-rows: auto 1fr auto auto;
|
|
83
|
+
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
|
|
84
|
+
gap: 10px;
|
|
85
|
+
& > .name {
|
|
86
|
+
grid-column: 1 / span 2;
|
|
87
|
+
grid-row: 1;
|
|
88
|
+
max-width:200px;
|
|
89
|
+
overflow: hidden;
|
|
90
|
+
text-overflow: ellipsis;
|
|
91
|
+
white-space: nowrap;
|
|
92
|
+
color: var(--primary-color);
|
|
93
|
+
text-decoration: none;
|
|
97
94
|
}
|
|
98
|
-
|
|
99
|
-
|
|
95
|
+
& > img {
|
|
96
|
+
grid-column: 1 / span 2;
|
|
97
|
+
grid-row: 2;
|
|
98
|
+
object-fit: contain;
|
|
99
|
+
width: 200px;
|
|
100
|
+
height: 200px;
|
|
101
|
+
}
|
|
102
|
+
& > .description {
|
|
103
|
+
grid-column: 1 / span 2;
|
|
100
104
|
grid-row: 3;
|
|
105
|
+
max-width: 200px;
|
|
106
|
+
height: 3ch;
|
|
107
|
+
overflow: hidden;
|
|
108
|
+
text-overflow: ellipsis;
|
|
109
|
+
white-space: nowrap;
|
|
110
|
+
color: var(--primary-color);
|
|
111
|
+
text-decoration: none;
|
|
112
|
+
}
|
|
113
|
+
& > .buy {
|
|
114
|
+
grid-column: 1 / span 2;
|
|
115
|
+
grid-row: 5;
|
|
116
|
+
display: inline-flex;
|
|
117
|
+
-webkit-box-align: center;
|
|
118
|
+
align-items: center;
|
|
119
|
+
-webkit-box-pack: center;
|
|
120
|
+
justify-content: center;
|
|
121
|
+
position: relative;
|
|
122
|
+
box-sizing: border-box;
|
|
123
|
+
-webkit-tap-highlight-color: transparent;
|
|
124
|
+
cursor: pointer;
|
|
125
|
+
user-select: none;
|
|
126
|
+
vertical-align: middle;
|
|
127
|
+
appearance: none;
|
|
128
|
+
line-height: 1.75;
|
|
129
|
+
text-transform: uppercase;
|
|
130
|
+
min-width: 64px;
|
|
131
|
+
width: 100%;
|
|
132
|
+
font-weight: bold;
|
|
133
|
+
font-size: 14px;
|
|
134
|
+
font-family: Mulish, sans-serif;
|
|
135
|
+
background-color: var(--accent-color);
|
|
136
|
+
color: var(--accent-text-color);
|
|
137
|
+
outline: 0px;
|
|
138
|
+
border-width: 0px;
|
|
139
|
+
border-style: initial;
|
|
140
|
+
border-color: initial;
|
|
141
|
+
border-image: initial;
|
|
142
|
+
margin: 0px;
|
|
143
|
+
text-decoration: none;
|
|
144
|
+
padding: 6px 16px;
|
|
145
|
+
border-radius: 4px;
|
|
146
|
+
transition: background-color 250ms cubic-bezier(0.4, 0, 0.2, 1), box-shadow 250ms cubic-bezier(0.4, 0, 0.2, 1), border-color 250ms cubic-bezier(0.4, 0, 0.2, 1), color 250ms cubic-bezier(0.4, 0, 0.2, 1);
|
|
147
|
+
|
|
101
148
|
}
|
|
149
|
+
& > .price {
|
|
150
|
+
grid-column: 1/ span 2;
|
|
151
|
+
grid-row: 4;
|
|
152
|
+
text-align: center;
|
|
153
|
+
font-weight: 700;
|
|
154
|
+
font-size: var(--font-xs);
|
|
155
|
+
text-align: center;
|
|
156
|
+
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
& > footer {
|
|
163
|
+
grid-row: 3;
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
`.installGlobal("[data-shopping-cart-list=shopping-cart-list]");
|
|
102
167
|
|
|
103
|
-
`.installGlobal("[data-shopping-cart-list=shopping-cart-list]");
|
|
104
168
|
|
|
105
169
|
|
|
106
170
|
export default class StoreItemListView extends AtomControl {
|
|
@@ -131,7 +195,7 @@ export default class StoreItemListView extends AtomControl {
|
|
|
131
195
|
items={this.tags}
|
|
132
196
|
itemRenderer={(x) => <div data-layout="row"> <label text={`${x.tag.label} (${x.count})`}/> <i data-click-event="remove-tag" class="fas fa-times-circle"/> </div>}
|
|
133
197
|
/>
|
|
134
|
-
<input type="search" value={Bind.twoWaysImmediate(() => this.search)}/>
|
|
198
|
+
<input type="search" class="search" value={Bind.twoWaysImmediate(() => this.search)}/>
|
|
135
199
|
<AtomRepeater
|
|
136
200
|
class="tags"
|
|
137
201
|
items={Bind.oneWayAsync((c, e, cancelToken) => this.searchTags(this.search, cancelToken, this.version), { default: [] })}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
/* eslint-disable no-console */
|
|
1
2
|
import DISingleton from "@web-atoms/core/dist/di/DISingleton";
|
|
2
3
|
import { Inject } from "@web-atoms/core/dist/di/Inject";
|
|
3
4
|
import EntityService from "./EntityService";
|
|
@@ -26,7 +27,7 @@ export default class LoginService {
|
|
|
26
27
|
SocialMailApp.user = this.user;
|
|
27
28
|
if (this.user?.userID) {
|
|
28
29
|
// let start syncing...
|
|
29
|
-
// this.app.resolve(LocalDbService).
|
|
30
|
+
// this.app.resolve(LocalDbService).syncAll(this.user.userID).catch(console.error);
|
|
30
31
|
}
|
|
31
32
|
return this.user;
|
|
32
33
|
}
|
|
@@ -1,54 +1,81 @@
|
|
|
1
1
|
/* eslint-disable no-console */
|
|
2
2
|
import DISingleton from "@web-atoms/core/dist/di/DISingleton";
|
|
3
3
|
import LocalMailbox from "./mailboxes/LocalMailbox";
|
|
4
|
-
import { UMD } from "@web-atoms/core/dist/core/types";
|
|
5
|
-
import Modules from "../../common/Modules";
|
|
6
4
|
import { Inject } from "@web-atoms/core/dist/di/Inject";
|
|
7
5
|
import EntityService from "../EntityService";
|
|
8
6
|
import TemplateQuery from "./core/TemplateQuery";
|
|
7
|
+
import SqlDbFactory, { ISqlResult } from "./core/SqlDbFactory";
|
|
8
|
+
import LocalContact from "./contact/LocalContact";
|
|
9
|
+
import LocalTable from "./core/LocalTable";
|
|
9
10
|
|
|
10
|
-
const
|
|
11
|
+
const dbVersion = 1.1;
|
|
11
12
|
|
|
12
|
-
export interface IResult<T> {
|
|
13
|
-
rows: T[];
|
|
14
|
-
affectedRows: number;
|
|
15
|
-
}
|
|
16
13
|
|
|
17
14
|
@DISingleton()
|
|
18
15
|
export default class LocalDbService {
|
|
19
16
|
|
|
17
|
+
|
|
20
18
|
@Inject
|
|
21
19
|
entityService: EntityService;
|
|
22
20
|
|
|
23
21
|
public mailboxes = new LocalMailbox(this);
|
|
24
22
|
|
|
23
|
+
public contacts = new LocalContact(this);
|
|
24
|
+
|
|
25
|
+
private userID: any;
|
|
26
|
+
|
|
27
|
+
async syncAll(userID?) {
|
|
28
|
+
if (userID) {
|
|
29
|
+
this.userID = userID;
|
|
30
|
+
}
|
|
31
|
+
// start syncing
|
|
32
|
+
for (const key in this) {
|
|
33
|
+
if (Object.prototype.hasOwnProperty.call(this, key)) {
|
|
34
|
+
const element = this[key];
|
|
35
|
+
if (element instanceof LocalTable) {
|
|
36
|
+
await element.sync();
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
|
|
25
42
|
sync() {
|
|
26
|
-
this.
|
|
43
|
+
this.syncAll().catch(console.error);
|
|
27
44
|
}
|
|
28
45
|
|
|
29
46
|
ready() {
|
|
30
47
|
const w = (async () => {
|
|
31
|
-
const { default: pg }= await Modules.import(pgWorker);
|
|
32
48
|
|
|
33
|
-
|
|
49
|
+
const existing = Number(localStorage.getItem("dbVersion") ?? "0.1");
|
|
50
|
+
if (existing) {
|
|
34
51
|
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
const
|
|
39
|
-
|
|
40
|
-
|
|
52
|
+
if (existing < dbVersion) {
|
|
53
|
+
// delete all indexed dbs...
|
|
54
|
+
const dbs = await window.indexedDB.databases();
|
|
55
|
+
for (const r of dbs) {
|
|
56
|
+
await new Promise<any>((resolve) => {
|
|
57
|
+
const req = indexedDB.deleteDatabase(r.name);
|
|
58
|
+
req.onsuccess = resolve;
|
|
59
|
+
});
|
|
41
60
|
}
|
|
61
|
+
console.log(`Cleared local db versions`);
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
if (existing > dbVersion) {
|
|
65
|
+
location.reload();
|
|
42
66
|
}
|
|
43
67
|
}
|
|
44
68
|
|
|
45
|
-
|
|
69
|
+
localStorage.setItem("dbVersion", dbVersion.toString());
|
|
70
|
+
|
|
71
|
+
const db = await SqlDbFactory.load(`sm-${this.userID}`);
|
|
72
|
+
Object.defineProperty(this, "ready", { value: () => Promise.resolve(db) });
|
|
73
|
+
return db;
|
|
46
74
|
})();
|
|
47
|
-
Object.defineProperty(this, "ready", { value: () => w });
|
|
48
75
|
return w;
|
|
49
76
|
}
|
|
50
77
|
|
|
51
|
-
async query<T>(a: TemplateStringsArray | TemplateQuery, ... args: any[]): Promise<
|
|
78
|
+
async query<T = any>(a: TemplateStringsArray | TemplateQuery, ... args: any[]): Promise<ISqlResult<T>> {
|
|
52
79
|
let q;
|
|
53
80
|
try {
|
|
54
81
|
const pg = await this.ready();
|
|
@@ -56,7 +83,7 @@ export default class LocalDbService {
|
|
|
56
83
|
a = TemplateQuery.create(a, ... args);
|
|
57
84
|
}
|
|
58
85
|
q = a.toQuery();
|
|
59
|
-
console.log (q);
|
|
86
|
+
// console.log (q);
|
|
60
87
|
return await pg.query(q.text, q.values);
|
|
61
88
|
} catch (error) {
|
|
62
89
|
console.error(`Failed executing ${q.text}`);
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { IMailboxContact, MailboxContact } from "../../../model/model";
|
|
2
|
+
import LocalTable from "../core/LocalTable";
|
|
3
|
+
import TemplateQuery from "../core/TemplateQuery";
|
|
4
|
+
|
|
5
|
+
export default class LocalContact extends LocalTable<IMailboxContact> {
|
|
6
|
+
|
|
7
|
+
name = TemplateQuery.literal("contacts");
|
|
8
|
+
|
|
9
|
+
model = MailboxContact;
|
|
10
|
+
|
|
11
|
+
}
|
|
@@ -1,13 +1,20 @@
|
|
|
1
1
|
import { IModel, IModelSchema, Model } from "@web-atoms/entity/dist/services/BaseEntityService";
|
|
2
2
|
import type LocalDbService from "../LocalDbService";
|
|
3
3
|
import TemplateQuery from "./TemplateQuery";
|
|
4
|
-
import {
|
|
4
|
+
import { ISqlResult } from "./SqlDbFactory";
|
|
5
|
+
import DateTime from "@web-atoms/date-time/dist/DateTime";
|
|
5
6
|
|
|
6
7
|
export default abstract class LocalTable<T> {
|
|
7
8
|
|
|
8
9
|
name: TemplateQuery;
|
|
9
10
|
model: IModel<T>;
|
|
10
11
|
|
|
12
|
+
get dateColumns() {
|
|
13
|
+
const dt = this.model.schema.properties.filter((x) => /datetime/i.test(x.dataType));
|
|
14
|
+
Object.defineProperty(this, "dateColumns", { value: dt});
|
|
15
|
+
return dt;
|
|
16
|
+
}
|
|
17
|
+
|
|
11
18
|
constructor(
|
|
12
19
|
protected readonly service: LocalDbService
|
|
13
20
|
) {
|
|
@@ -20,12 +27,17 @@ export default abstract class LocalTable<T> {
|
|
|
20
27
|
await this.startSync();
|
|
21
28
|
delete this.sync;
|
|
22
29
|
})();
|
|
23
|
-
Object.defineProperty(this, "sync", { value: () => s});
|
|
30
|
+
Object.defineProperty(this, "sync", { enumerable: true, configurable: true, value: () => s});
|
|
24
31
|
return s;
|
|
25
32
|
}
|
|
26
33
|
|
|
27
34
|
|
|
28
|
-
public
|
|
35
|
+
public async startSync() {
|
|
36
|
+
console.log(`Syncing ${this.model.name}`);
|
|
37
|
+
await this.syncTableDesc({});
|
|
38
|
+
await this.syncTableAsc({});
|
|
39
|
+
console.log(`Synced ${this.model.name}`);
|
|
40
|
+
};
|
|
29
41
|
|
|
30
42
|
public async afterInit() {
|
|
31
43
|
|
|
@@ -38,15 +50,29 @@ export default abstract class LocalTable<T> {
|
|
|
38
50
|
keys = keys.add `${TemplateQuery.literal(name)} ${TemplateQuery.literal(this.toPgType(dataType, length))}`;
|
|
39
51
|
pKeys = pKeys.add `${TemplateQuery.literal(name)}`;
|
|
40
52
|
}
|
|
41
|
-
await this.query `CREATE TABLE IF NOT EXISTS ${this.name} (${keys}, PRIMARY KEY (${pKeys}))`;
|
|
53
|
+
await this.service.query `CREATE TABLE IF NOT EXISTS ${this.name} (${keys}, PRIMARY KEY (${pKeys}))`;
|
|
54
|
+
|
|
55
|
+
const { rows } = await this.service.query `PRAGMA table_info(${this.name});`;
|
|
56
|
+
|
|
42
57
|
for (const { name, dataType, length } of this.model.schema.properties) {
|
|
43
|
-
|
|
58
|
+
if (rows.some((r) => r.name === name)) {
|
|
59
|
+
continue;
|
|
60
|
+
}
|
|
61
|
+
await this.addColumn(name, dataType, length);
|
|
44
62
|
}
|
|
45
63
|
await this.afterInit();
|
|
46
64
|
}
|
|
47
65
|
|
|
48
|
-
public query(a: TemplateStringsArray | TemplateQuery, ... args: any[]) {
|
|
49
|
-
|
|
66
|
+
public async query(a: TemplateStringsArray | TemplateQuery, ... args: any[]) {
|
|
67
|
+
const results = await this.service.query(a, ... args);
|
|
68
|
+
for (const element of results.rows) {
|
|
69
|
+
// change date time...
|
|
70
|
+
for (const { name } of this.dateColumns) {
|
|
71
|
+
const time = element[name];
|
|
72
|
+
element[name] = new Date(Number(time));
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
return results;
|
|
50
76
|
}
|
|
51
77
|
|
|
52
78
|
async save(element: T, retry = 3) {
|
|
@@ -62,8 +88,8 @@ export default abstract class LocalTable<T> {
|
|
|
62
88
|
fields = fields.add `${TemplateQuery.literal(field.name)} = ${element[field.name]}`;
|
|
63
89
|
}
|
|
64
90
|
|
|
65
|
-
const {
|
|
66
|
-
if (
|
|
91
|
+
const { updated } = await this.service.query `UPDATE ${this.name} SET ${fields} WHERE ${where}`;
|
|
92
|
+
if (updated === 1) {
|
|
67
93
|
return;
|
|
68
94
|
}
|
|
69
95
|
|
|
@@ -71,10 +97,14 @@ export default abstract class LocalTable<T> {
|
|
|
71
97
|
let values = TemplateQuery.fragments(" , ");
|
|
72
98
|
let columns = TemplateQuery.fragments(" , ");
|
|
73
99
|
for(const key of this.model.schema.keys) {
|
|
74
|
-
columns = columns.add `${
|
|
100
|
+
columns = columns.add `${ TemplateQuery.literal(key.name)}`;
|
|
101
|
+
values = values.add `${element[key.name]}`;
|
|
102
|
+
}
|
|
103
|
+
for(const key of this.model.schema.properties) {
|
|
104
|
+
columns = columns.add `${ TemplateQuery.literal(key.name)}`;
|
|
75
105
|
values = values.add `${element[key.name]}`;
|
|
76
106
|
}
|
|
77
|
-
await this.query `INSERT INTO ${this.name} (${columns}) VALUES (${values}) `;
|
|
107
|
+
await this.service.query `INSERT INTO ${this.name} (${columns}) VALUES (${values}) `;
|
|
78
108
|
} catch (error) {
|
|
79
109
|
if (-- retry) {
|
|
80
110
|
await this.save(element, retry);
|
|
@@ -85,6 +115,94 @@ export default abstract class LocalTable<T> {
|
|
|
85
115
|
|
|
86
116
|
}
|
|
87
117
|
|
|
118
|
+
async syncTableDesc({
|
|
119
|
+
field = "dateUpdated",
|
|
120
|
+
max = DateTime.now
|
|
121
|
+
}) {
|
|
122
|
+
const es = this.service.entityService;
|
|
123
|
+
|
|
124
|
+
|
|
125
|
+
const fieldLiteral = TemplateQuery.literal(field);
|
|
126
|
+
|
|
127
|
+
|
|
128
|
+
do {
|
|
129
|
+
// get last max updated...
|
|
130
|
+
// forward
|
|
131
|
+
let q = es.query(this.model as any);
|
|
132
|
+
|
|
133
|
+
const { rows:[first] } = await this.query `SELECT * FROM ${this.name} ORDER BY ${fieldLiteral} DESC LIMIT 1`;
|
|
134
|
+
if (first) {
|
|
135
|
+
console.log(first);
|
|
136
|
+
max = first[field];
|
|
137
|
+
for (const element of this.model.schema.keys) {
|
|
138
|
+
q = q.where({ key: first[element.name] }, (p) => `(x) => x.${element.name} !== p.key` as any);
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
q = q.where({ max}, (p) => `(x) => x.${field} > p.max` as any);
|
|
142
|
+
const result = await q.orderByDescending({}, (p) => `(x) => x.${field}` as any )
|
|
143
|
+
.toPagedList({
|
|
144
|
+
start: 0,
|
|
145
|
+
size: 200,
|
|
146
|
+
count: false
|
|
147
|
+
});
|
|
148
|
+
|
|
149
|
+
if (!result.items.length) {
|
|
150
|
+
break;
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
for (const element of result.items) {
|
|
154
|
+
await this.save(element as any);
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
} while(true);
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
async syncTableAsc({
|
|
161
|
+
field = "dateUpdated",
|
|
162
|
+
min = new Date(0)
|
|
163
|
+
}) {
|
|
164
|
+
const es = this.service.entityService;
|
|
165
|
+
|
|
166
|
+
|
|
167
|
+
const fieldLiteral = TemplateQuery.literal(field);
|
|
168
|
+
|
|
169
|
+
|
|
170
|
+
do {
|
|
171
|
+
let q = es.query(this.model as any);
|
|
172
|
+
// get last max updated...
|
|
173
|
+
// forward
|
|
174
|
+
const { rows:[first] } = await this.query `SELECT * FROM ${this.name} ORDER BY ${fieldLiteral} ASC LIMIT 1`;
|
|
175
|
+
if (first) {
|
|
176
|
+
console.log(first);
|
|
177
|
+
min = first[field];
|
|
178
|
+
for (const element of this.model.schema.keys) {
|
|
179
|
+
q = q.where({ key: first[element.name] }, (p) => `(x) => x.${element.name} !== p.key` as any);
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
q = q.where({ min}, (p) => `(x) => x.${field} < p.min` as any);
|
|
183
|
+
const result = await q.orderBy({}, (p) => `(x) => x.${field}` as any )
|
|
184
|
+
.toPagedList({
|
|
185
|
+
start: 0,
|
|
186
|
+
size: 200,
|
|
187
|
+
count: false
|
|
188
|
+
});
|
|
189
|
+
|
|
190
|
+
if (!result.items.length) {
|
|
191
|
+
break;
|
|
192
|
+
}
|
|
193
|
+
|
|
194
|
+
for (const element of result.items) {
|
|
195
|
+
await this.save(element as any);
|
|
196
|
+
}
|
|
197
|
+
} while(true);
|
|
198
|
+
}
|
|
199
|
+
|
|
200
|
+
protected addColumn(name: string, dataType: string, length: number) {
|
|
201
|
+
return this.service.query`ALTER TABLE ${this.name} ADD COLUMN ${TemplateQuery.literal(name)} ${TemplateQuery.literal(this.toPgColumn(dataType, length))}`;
|
|
202
|
+
}
|
|
203
|
+
|
|
204
|
+
|
|
205
|
+
|
|
88
206
|
private toPgColumn(type: string, length: number) {
|
|
89
207
|
const pgType = this.toPgType(type, length);
|
|
90
208
|
return pgType + " NULL";
|
|
@@ -93,20 +211,17 @@ export default abstract class LocalTable<T> {
|
|
|
93
211
|
private toPgType(type: string, length: number): string {
|
|
94
212
|
switch(type) {
|
|
95
213
|
case "Integer":
|
|
96
|
-
return "int";
|
|
97
214
|
case "BigInt":
|
|
98
|
-
return "bigint";
|
|
99
215
|
case "Boolean":
|
|
100
216
|
case "Bool":
|
|
101
|
-
return "bool";
|
|
102
217
|
case "DateTime":
|
|
103
|
-
return "
|
|
218
|
+
return "integer";
|
|
104
219
|
case "Decimal":
|
|
105
220
|
case "Double":
|
|
106
221
|
return "real";
|
|
107
222
|
}
|
|
108
223
|
if (length) {
|
|
109
|
-
return `
|
|
224
|
+
return `text`;
|
|
110
225
|
}
|
|
111
226
|
return "text";
|
|
112
227
|
}
|