@paroicms/internal-server-lib 1.17.0 → 1.18.0
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/pino-logger.d.ts +1 -1
- package/dist/read-configuration.js +1 -1
- package/dist/read-configuration.js.map +1 -1
- package/dist/sqlite-db-init.js +12 -5
- package/dist/sqlite-db-init.js.map +1 -1
- package/dist/sqlite-utils.d.ts +2 -0
- package/dist/sqlite-utils.js +11 -0
- package/dist/sqlite-utils.js.map +1 -1
- package/dist/url.helpers.d.ts +1 -1
- package/package.json +6 -6
package/dist/pino-logger.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { Obj } from "@
|
|
1
|
+
import type { Obj } from "@paroicms/public-anywhere-lib";
|
|
2
2
|
import { type LoggerOptions } from "pino";
|
|
3
3
|
import type { BasicAppLogger } from "./public.types.js";
|
|
4
4
|
export interface AppLogger extends BasicAppLogger {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-configuration.js","sourceRoot":"","sources":["../src/read-configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"read-configuration.js","sourceRoot":"","sources":["../src/read-configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAQnC,MAAM,UAAU,kBAAkB,CAAI,EACpC,aAAa,EACb,QAAQ,EACR,eAAe,GACO;IACtB,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACpD,MAAM,QAAQ,GAAG,UAAU,KAAK,CAAC,CAAC,IAAI,UAAU,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;IAC3E,IAAI,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC;IACzE,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IACvE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1B,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC;IACnC,CAAC;IACD,IAAI,IAAS,CAAC;IACd,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC/C,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,uCAAuC,QAAQ,MAAM,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACzF,CAAC;IACD,MAAM,MAAM,GAAG,aAAa,CAAC,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACtD,IAAI,CAAC,MAAM,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,MAAM,CAAC,KAAK,IAAI,mBAAmB,EAAE,CAAC,CAAC;IAClG,OAAO,IAAI,CAAC;AACd,CAAC"}
|
package/dist/sqlite-db-init.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { type } from "arktype";
|
|
2
2
|
import knex from "knex";
|
|
3
3
|
import { readFile } from "node:fs/promises";
|
|
4
4
|
import { pathExists } from "./fs-utils.js";
|
|
@@ -58,12 +58,15 @@ function onlySqlComment(sql) {
|
|
|
58
58
|
}
|
|
59
59
|
return true;
|
|
60
60
|
}
|
|
61
|
+
const GetMetadataValueAT = type({ val: "string", "+": "reject" });
|
|
61
62
|
export async function getMetadataValue(cn, { dbSchemaName, key }) {
|
|
62
63
|
const row = await cn(METADATA_TABLE_NAME)
|
|
64
|
+
.select("val")
|
|
63
65
|
.where({ dbSchema: dbSchemaName, k: key })
|
|
64
66
|
.first();
|
|
65
|
-
if (row)
|
|
66
|
-
return
|
|
67
|
+
if (row) {
|
|
68
|
+
return GetMetadataValueAT.assert(row).val;
|
|
69
|
+
}
|
|
67
70
|
}
|
|
68
71
|
export async function setMetadataValue(cn, { dbSchemaName, key, value, errorIfMissing, }) {
|
|
69
72
|
const affectedRows = await cn(METADATA_TABLE_NAME)
|
|
@@ -106,11 +109,15 @@ export async function setMetadataDbSchemaVersion(cn, { dbSchemaName, value }) {
|
|
|
106
109
|
errorIfMissing: true,
|
|
107
110
|
});
|
|
108
111
|
}
|
|
112
|
+
const MigrateMetadataTableAT = type({ dbVersion: "number", "+": "reject" });
|
|
109
113
|
async function migrateMetadataTable(cn, dbSchemaName) {
|
|
110
|
-
const row = await cn("PaDbMetadata")
|
|
114
|
+
const row = await cn("PaDbMetadata")
|
|
115
|
+
.select("dbVersion")
|
|
116
|
+
.where({ dbSchema: dbSchemaName })
|
|
117
|
+
.first();
|
|
111
118
|
if (!row)
|
|
112
119
|
throw new Error(); // will be catched in the caller
|
|
113
|
-
const version =
|
|
120
|
+
const version = MigrateMetadataTableAT.assert(row).dbVersion;
|
|
114
121
|
await cn.raw(`create table PaMetadata (
|
|
115
122
|
dbSchema varchar(100) not null,
|
|
116
123
|
k varchar(100) not null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlite-db-init.js","sourceRoot":"","sources":["../src/sqlite-db-init.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sqlite-db-init.js","sourceRoot":"","sources":["../src/sqlite-db-init.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,IAAmB,MAAM,MAAM,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAG3C,MAAM,CAAC,MAAM,mBAAmB,GAAG,YAAY,CAAC;AAChD,MAAM,CAAC,MAAM,qBAAqB,GAAG,iBAAiB,CAAC;AAcvD,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAAC,OAQlD;IACC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAEhG,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;IACtD,IAAI,aAAa,IAAI,CAAC,SAAS,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CAAC,YAAY,YAAY,YAAY,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,EAAE,GAAG,IAAI,CAAC;QACd,MAAM,EAAE,SAAS;QACjB,UAAU,EAAE;YACV,QAAQ,EAAE,UAAU;SACrB;QACD,gBAAgB,EAAE,IAAI;QACtB,KAAK,EAAE,IAAI,EAAE,yCAAyC;QACtD,gBAAgB,EAAE,IAAI,EAAE,yCAAyC;QACjE,GAAG,EAAE,UAAU;QAEf,IAAI,EAAE;YACJ,WAAW,EAAE,CAAC,QAAa,EAAE,IAAS,EAAE,EAAE;gBACxC,gCAAgC;gBAChC,QAAQ,CAAC,GAAG,CAAC,yBAAyB,EAAE,IAAI,CAAC,CAAC;YAChD,CAAC;YACD,GAAG,EAAE,CAAC;YACN,iBAAiB,EAAE,MAAM;SAC1B;KACF,CAAC,CAAC;IAEH,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,UAAU,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,YAAY,YAAY,YAAY,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,eAAe,GAAG,MAAM,SAAS,CAAC,EAAE,CAAC,CAAC;IAE5C,OAAO,EAAE,EAAE,EAAE,aAAa,EAAE,eAAe,EAAE,CAAC;AAChD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,EAAQ,EAAE,OAAe;IACxD,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,OAAO,EAAE;QAClC,QAAQ,EAAE,OAAO;KAClB,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,GAAG;SAChB,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;SAC5B,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC;IACnC,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3B,MAAM,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,GAAW;IACjC,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACpC,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE,CAAC;QACvB,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QACnB,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YAAE,OAAO,KAAK,CAAC;IACnD,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,kBAAkB,GAAG,IAAI,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;AAElE,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,EAAQ,EACR,EAAE,YAAY,EAAE,GAAG,EAAyC;IAE5D,MAAM,GAAG,GAAoB,MAAM,EAAE,CAAC,mBAAmB,CAAC;SACvD,MAAM,CAAC,KAAK,CAAC;SACb,KAAK,CAAC,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC;SACzC,KAAK,EAAE,CAAC;IAEX,IAAI,GAAG,EAAE,CAAC;QACR,OAAO,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC;IAC5C,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,EAAQ,EACR,EACE,YAAY,EACZ,GAAG,EACH,KAAK,EACL,cAAc,GACiE;IAEjF,MAAM,YAAY,GAAG,MAAM,EAAE,CAAC,mBAAmB,CAAC;SAC/C,KAAK,CAAC,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC;SACzC,MAAM,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;IAE1B,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;QACvB,IAAI,cAAc,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,IAAI,YAAY,cAAc,GAAG,SAAS,mBAAmB,GAAG,CAAC,CAAC;QACpF,CAAC;QAED,MAAM,EAAE,CAAC,mBAAmB,CAAC,CAAC,MAAM,CAAC;YACnC,QAAQ,EAAE,YAAY;YACtB,CAAC,EAAE,GAAG;YACN,GAAG,EAAE,KAAK;SACX,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,EAAQ,EACR,EAAE,YAAY,EAA4B;IAE1C,IAAI,KAAyB,CAAC;IAC9B,IAAI,CAAC;QACH,KAAK,GAAG,MAAM,gBAAgB,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,qBAAqB,EAAE,CAAC,CAAC;QACjF,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CACb,IAAI,YAAY,cAAc,qBAAqB,SAAS,mBAAmB,GAAG,CACnF,CAAC;QACJ,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC;YACH,KAAK,GAAG,MAAM,oBAAoB,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC;QACvD,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,EAAQ,EACR,EAAE,YAAY,EAAE,KAAK,EAA2C;IAEhE,MAAM,gBAAgB,CAAC,EAAE,EAAE;QACzB,YAAY;QACZ,GAAG,EAAE,qBAAqB;QAC1B,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;QACpB,cAAc,EAAE,IAAI;KACrB,CAAC,CAAC;AACL,CAAC;AAED,MAAM,sBAAsB,GAAG,IAAI,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;AAE5E,KAAK,UAAU,oBAAoB,CAAC,EAAQ,EAAE,YAAoB;IAChE,MAAM,GAAG,GAAoB,MAAM,EAAE,CAAC,cAAc,CAAC;SAClD,MAAM,CAAC,WAAW,CAAC;SACnB,KAAK,CAAC,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC;SACjC,KAAK,EAAE,CAAC;IAEX,IAAI,CAAC,GAAG;QAAE,MAAM,IAAI,KAAK,EAAE,CAAC,CAAC,gCAAgC;IAC7D,MAAM,OAAO,GAAG,sBAAsB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC;IAE7D,MAAM,EAAE,CAAC,GAAG,CAAC;;;;;EAKb,CAAC,CAAC;IAEF,MAAM,EAAE,CAAC,mBAAmB,CAAC,CAAC,MAAM,CAAC;QACnC,QAAQ,EAAE,YAAY;QACtB,CAAC,EAAE,iBAAiB;QACpB,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC;KACrB,CAAC,CAAC;IAEH,MAAM,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAE1C,OAAO,CAAC,IAAI,CAAC,IAAI,YAAY,mDAAmD,CAAC,CAAC;IAClF,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC"}
|
package/dist/sqlite-utils.d.ts
CHANGED
package/dist/sqlite-utils.js
CHANGED
|
@@ -3,4 +3,15 @@ export function sqliteDateTime(date) {
|
|
|
3
3
|
// SQLite expects the date in the format 'YYYY-MM-DD HH:MM:SS'
|
|
4
4
|
return dt.toISOString().slice(0, 19).replace("T", " ");
|
|
5
5
|
}
|
|
6
|
+
export function parseSqliteDateTime(val) {
|
|
7
|
+
if (!val)
|
|
8
|
+
return;
|
|
9
|
+
if (typeof val === "number")
|
|
10
|
+
return new Date(val);
|
|
11
|
+
if (typeof val === "string") {
|
|
12
|
+
const gmtDt = `${val.substring(0, 10)}T${val.substring(11, 19)}Z`;
|
|
13
|
+
return new Date(gmtDt);
|
|
14
|
+
}
|
|
15
|
+
return val;
|
|
16
|
+
}
|
|
6
17
|
//# sourceMappingURL=sqlite-utils.js.map
|
package/dist/sqlite-utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlite-utils.js","sourceRoot":"","sources":["../src/sqlite-utils.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,cAAc,CAAC,IAAmB;IAChD,MAAM,EAAE,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5D,8DAA8D;IAC9D,OAAO,EAAE,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AACzD,CAAC"}
|
|
1
|
+
{"version":3,"file":"sqlite-utils.js","sourceRoot":"","sources":["../src/sqlite-utils.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,cAAc,CAAC,IAAmB;IAChD,MAAM,EAAE,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5D,8DAA8D;IAC9D,OAAO,EAAE,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AACzD,CAAC;AAID,MAAM,UAAU,mBAAmB,CAAC,GAAkC;IACpE,IAAI,CAAC,GAAG;QAAE,OAAO;IACjB,IAAI,OAAO,GAAG,KAAK,QAAQ;QAAE,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC;IAClD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,MAAM,KAAK,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC;QAClE,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}
|
package/dist/url.helpers.d.ts
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@paroicms/internal-server-lib",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.18.0",
|
|
4
4
|
"description": "Common utilitaries for the paroicms server.",
|
|
5
5
|
"author": "Paroi Team",
|
|
6
6
|
"keywords": [
|
|
@@ -23,12 +23,12 @@
|
|
|
23
23
|
"dev": "tsc --watch --preserveWatchOutput"
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
|
-
"@typeonly/validator": "~1.0.1",
|
|
27
26
|
"@paroi/async-lib": "~0.3.1",
|
|
28
|
-
"@
|
|
29
|
-
"@paroicms/
|
|
30
|
-
"@paroicms/public-
|
|
31
|
-
"@
|
|
27
|
+
"@paroicms/internal-anywhere-lib": "1.31.0",
|
|
28
|
+
"@paroicms/public-anywhere-lib": "0.25.0",
|
|
29
|
+
"@paroicms/public-server-lib": "0.37.0",
|
|
30
|
+
"@typeonly/validator": "~1.0.1",
|
|
31
|
+
"arktype": "~2.1.20",
|
|
32
32
|
"knex": "~3.1.0",
|
|
33
33
|
"nanoid": "~5.1.5",
|
|
34
34
|
"pino": "~9.7.0",
|