@paroicms/internal-server-lib 1.10.1 → 1.11.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/cron-like.d.ts +1 -1
- package/dist/cron-like.js +2 -6
- package/dist/cron-like.js.map +1 -1
- package/dist/fs-utils.js +6 -11
- package/dist/fs-utils.js.map +1 -1
- package/dist/index.d.ts +11 -11
- package/dist/index.js +12 -28
- package/dist/index.js.map +1 -1
- package/dist/jwt-secret.helpers.js +6 -10
- package/dist/jwt-secret.helpers.js.map +1 -1
- package/dist/pino-app-log.d.ts +1 -1
- package/dist/pino-app-log.js +8 -14
- package/dist/pino-app-log.js.map +1 -1
- package/dist/public.types.js +1 -2
- package/dist/read-configuration.js +9 -12
- package/dist/read-configuration.js.map +1 -1
- package/dist/relative-id-helper.js +1 -4
- package/dist/relative-id-helper.js.map +1 -1
- package/dist/resource-version.js +3 -6
- package/dist/resource-version.js.map +1 -1
- package/dist/sql-logger.d.ts +1 -1
- package/dist/sql-logger.js +1 -4
- package/dist/sql-logger.js.map +1 -1
- package/dist/sqlite-db-init.d.ts +1 -1
- package/dist/sqlite-db-init.js +24 -33
- package/dist/sqlite-db-init.js.map +1 -1
- package/dist/tracker.js +2 -6
- package/dist/tracker.js.map +1 -1
- package/package.json +6 -6
package/dist/cron-like.d.ts
CHANGED
package/dist/cron-like.js
CHANGED
|
@@ -1,11 +1,7 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.startCronLike = startCronLike;
|
|
4
|
-
exports.eachDay = eachDay;
|
|
5
1
|
/**
|
|
6
2
|
* @returns A function to stop the cron-like process.
|
|
7
3
|
*/
|
|
8
|
-
function startCronLike(task, { shouldExecute, immediate, logger }) {
|
|
4
|
+
export function startCronLike(task, { shouldExecute, immediate, logger }) {
|
|
9
5
|
const intervalMs = 15 * 60 * 1000;
|
|
10
6
|
let lastTime;
|
|
11
7
|
let taskPromise;
|
|
@@ -38,7 +34,7 @@ function startCronLike(task, { shouldExecute, immediate, logger }) {
|
|
|
38
34
|
logger.debug("Cron-like is stopped.");
|
|
39
35
|
};
|
|
40
36
|
}
|
|
41
|
-
function eachDay({ hours }) {
|
|
37
|
+
export function eachDay({ hours }) {
|
|
42
38
|
return (lastTime) => {
|
|
43
39
|
const now = new Date();
|
|
44
40
|
if (lastTime && sameDay(lastTime, now))
|
package/dist/cron-like.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cron-like.js","sourceRoot":"","sources":["../src/cron-like.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"cron-like.js","sourceRoot":"","sources":["../src/cron-like.ts"],"names":[],"mappings":"AAUA;;GAEG;AACH,MAAM,UAAU,aAAa,CAC3B,IAAyB,EACzB,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,EAAmB;IAErD,MAAM,UAAU,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAClC,IAAI,QAA0B,CAAC;IAC/B,IAAI,WAAsC,CAAC;IAE3C,MAAM,UAAU,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;QACxC,IAAI,WAAW;YAAE,OAAO;QACxB,IAAI,CAAC;YACH,IAAI,CAAC,QAAQ,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,IAAI,CAAC,SAAS,CAAC;gBAAE,OAAO;YAChF,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAC;YACtB,WAAW,GAAG,IAAI,EAAE,CAAC;YACrB,MAAM,WAAW,CAAC;QACpB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;QACD,WAAW,GAAG,SAAS,CAAC;IAC1B,CAAC,EAAE,UAAU,CAAC,CAAC;IAEf,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAEtC,OAAO,KAAK,IAAI,EAAE;QAChB,aAAa,CAAC,UAAU,CAAC,CAAC;QAC1B,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,CAAC;gBACH,MAAM,WAAW,CAAC;YACpB,CAAC;YAAC,MAAM,CAAC;gBACP,6DAA6D;YAC/D,CAAC;QACH,CAAC;QACD,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;IACxC,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,EAAE,KAAK,EAAqB;IAClD,OAAO,CAAC,QAAc,EAAE,EAAE;QACxB,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,QAAQ,IAAI,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC;YAAE,OAAO,KAAK,CAAC;QACrD,OAAO,GAAG,CAAC,QAAQ,EAAE,KAAK,KAAK,CAAC;IAClC,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,OAAO,CAAC,EAAQ,EAAE,EAAQ;IACjC,OAAO,CACL,EAAE,CAAC,WAAW,EAAE,KAAK,EAAE,CAAC,WAAW,EAAE;QACrC,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE;QAC/B,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,OAAO,EAAE,CAC9B,CAAC;AACJ,CAAC"}
|
package/dist/fs-utils.js
CHANGED
|
@@ -1,24 +1,19 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.pathExists = pathExists;
|
|
4
|
-
exports.fileStatsOrUndef = fileStatsOrUndef;
|
|
5
|
-
exports.ensureDirectory = ensureDirectory;
|
|
6
|
-
const promises_1 = require("node:fs/promises");
|
|
7
|
-
async function pathExists(path) {
|
|
1
|
+
import { mkdir, stat } from "node:fs/promises";
|
|
2
|
+
export async function pathExists(path) {
|
|
8
3
|
return !!(await fileStatsOrUndef(path));
|
|
9
4
|
}
|
|
10
5
|
/**
|
|
11
6
|
* @returns undefined if the file does not exist or can't be accessed
|
|
12
7
|
*/
|
|
13
|
-
async function fileStatsOrUndef(path) {
|
|
8
|
+
export async function fileStatsOrUndef(path) {
|
|
14
9
|
try {
|
|
15
|
-
return await
|
|
10
|
+
return await stat(path);
|
|
16
11
|
}
|
|
17
12
|
catch { }
|
|
18
13
|
}
|
|
19
|
-
async function ensureDirectory(path) {
|
|
14
|
+
export async function ensureDirectory(path) {
|
|
20
15
|
if (!(await pathExists(path))) {
|
|
21
|
-
await
|
|
16
|
+
await mkdir(path);
|
|
22
17
|
}
|
|
23
18
|
}
|
|
24
19
|
//# sourceMappingURL=fs-utils.js.map
|
package/dist/fs-utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fs-utils.js","sourceRoot":"","sources":["../src/fs-utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fs-utils.js","sourceRoot":"","sources":["../src/fs-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAE/C,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,IAAY;IAC3C,OAAO,CAAC,CAAC,CAAC,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;AAC1C,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,IAAY;IACjD,IAAI,CAAC;QACH,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;AACZ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,IAAY;IAChD,IAAI,CAAC,CAAC,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QAC9B,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC;AACH,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import "reflect-metadata";
|
|
2
|
-
export * from "./cron-like";
|
|
3
|
-
export * from "./fs-utils";
|
|
4
|
-
export * from "./jwt-secret.helpers";
|
|
5
|
-
export * from "./pino-app-log";
|
|
6
|
-
export * from "./public.types";
|
|
7
|
-
export * from "./read-configuration";
|
|
8
|
-
export * from "./relative-id-helper";
|
|
9
|
-
export * from "./resource-version";
|
|
10
|
-
export * from "./sql-logger";
|
|
11
|
-
export * from "./sqlite-db-init";
|
|
12
|
-
export * from "./tracker";
|
|
2
|
+
export * from "./cron-like.js";
|
|
3
|
+
export * from "./fs-utils.js";
|
|
4
|
+
export * from "./jwt-secret.helpers.js";
|
|
5
|
+
export * from "./pino-app-log.js";
|
|
6
|
+
export * from "./public.types.js";
|
|
7
|
+
export * from "./read-configuration.js";
|
|
8
|
+
export * from "./relative-id-helper.js";
|
|
9
|
+
export * from "./resource-version.js";
|
|
10
|
+
export * from "./sql-logger.js";
|
|
11
|
+
export * from "./sqlite-db-init.js";
|
|
12
|
+
export * from "./tracker.js";
|
package/dist/index.js
CHANGED
|
@@ -1,29 +1,13 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
-
};
|
|
16
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
require("reflect-metadata"); // needed by TypeORM
|
|
18
|
-
__exportStar(require("./cron-like"), exports);
|
|
19
|
-
__exportStar(require("./fs-utils"), exports);
|
|
20
|
-
__exportStar(require("./jwt-secret.helpers"), exports);
|
|
21
|
-
__exportStar(require("./pino-app-log"), exports);
|
|
22
|
-
__exportStar(require("./public.types"), exports);
|
|
23
|
-
__exportStar(require("./read-configuration"), exports);
|
|
24
|
-
__exportStar(require("./relative-id-helper"), exports);
|
|
25
|
-
__exportStar(require("./resource-version"), exports);
|
|
26
|
-
__exportStar(require("./sql-logger"), exports);
|
|
27
|
-
__exportStar(require("./sqlite-db-init"), exports);
|
|
28
|
-
__exportStar(require("./tracker"), exports);
|
|
1
|
+
import "reflect-metadata"; // needed by TypeORM
|
|
2
|
+
export * from "./cron-like.js";
|
|
3
|
+
export * from "./fs-utils.js";
|
|
4
|
+
export * from "./jwt-secret.helpers.js";
|
|
5
|
+
export * from "./pino-app-log.js";
|
|
6
|
+
export * from "./public.types.js";
|
|
7
|
+
export * from "./read-configuration.js";
|
|
8
|
+
export * from "./relative-id-helper.js";
|
|
9
|
+
export * from "./resource-version.js";
|
|
10
|
+
export * from "./sql-logger.js";
|
|
11
|
+
export * from "./sqlite-db-init.js";
|
|
12
|
+
export * from "./tracker.js";
|
|
29
13
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC,CAAC,oBAAoB;AAE/C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,cAAc,CAAC"}
|
|
@@ -1,15 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.getJwtSecretSync = getJwtSecretSync;
|
|
4
|
-
exports.makeSecret = makeSecret;
|
|
5
|
-
const node_fs_1 = require("node:fs");
|
|
6
|
-
function getJwtSecretSync(file) {
|
|
1
|
+
import { accessSync, readFileSync, writeFileSync } from "node:fs";
|
|
2
|
+
export function getJwtSecretSync(file) {
|
|
7
3
|
if (!pathExistsSync(file)) {
|
|
8
|
-
|
|
4
|
+
writeFileSync(file, makeSecret(50), "utf8");
|
|
9
5
|
}
|
|
10
|
-
return
|
|
6
|
+
return readFileSync(file, "utf8");
|
|
11
7
|
}
|
|
12
|
-
function makeSecret(length) {
|
|
8
|
+
export function makeSecret(length) {
|
|
13
9
|
const characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
|
|
14
10
|
let result = "";
|
|
15
11
|
for (let i = 0; i < length; i++) {
|
|
@@ -19,7 +15,7 @@ function makeSecret(length) {
|
|
|
19
15
|
}
|
|
20
16
|
function pathExistsSync(path) {
|
|
21
17
|
try {
|
|
22
|
-
|
|
18
|
+
accessSync(path);
|
|
23
19
|
return true;
|
|
24
20
|
}
|
|
25
21
|
catch {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwt-secret.helpers.js","sourceRoot":"","sources":["../src/jwt-secret.helpers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"jwt-secret.helpers.js","sourceRoot":"","sources":["../src/jwt-secret.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAElE,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC3C,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1B,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,MAAc;IACvC,MAAM,UAAU,GAAG,gEAAgE,CAAC;IACpF,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAChC,MAAM,IAAI,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;IAC7E,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,cAAc,CAAC,IAAY;IAClC,IAAI,CAAC;QACH,UAAU,CAAC,IAAI,CAAC,CAAC;QACjB,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}
|
package/dist/pino-app-log.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { Obj } from "@paroi/data-formatters-lib";
|
|
2
2
|
import { type LoggerOptions } from "pino";
|
|
3
|
-
import type { BasicAppLogger } from "./public.types";
|
|
3
|
+
import type { BasicAppLogger } from "./public.types.js";
|
|
4
4
|
export interface AppLogger extends BasicAppLogger {
|
|
5
5
|
stats(...messages: any[]): void;
|
|
6
6
|
trace(...messages: any[]): void;
|
package/dist/pino-app-log.js
CHANGED
|
@@ -1,22 +1,16 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.createPlatformLog = createPlatformLog;
|
|
7
|
-
const node_events_1 = require("node:events");
|
|
8
|
-
const async_lib_1 = require("@paroi/async-lib");
|
|
9
|
-
const pino_1 = __importDefault(require("pino"));
|
|
1
|
+
import { promiseToHandle } from "@paroi/async-lib";
|
|
2
|
+
import { EventEmitter } from "node:events";
|
|
3
|
+
import pino from "pino";
|
|
10
4
|
const levels = ["error", "warn", "info", "stats", "debug", "trace"];
|
|
11
5
|
const levelIndexes = new Map(levels.map((l, index) => [l, index]));
|
|
12
|
-
function createPlatformLog({ file, level, transport, reportMessage, }) {
|
|
6
|
+
export function createPlatformLog({ file, level, transport, reportMessage, }) {
|
|
13
7
|
const destination = file
|
|
14
|
-
?
|
|
8
|
+
? pino.destination({
|
|
15
9
|
dest: file,
|
|
16
10
|
sync: false,
|
|
17
11
|
})
|
|
18
12
|
: undefined;
|
|
19
|
-
const emitter = new
|
|
13
|
+
const emitter = new EventEmitter();
|
|
20
14
|
const readyState = destination
|
|
21
15
|
? createReadyState(destination)
|
|
22
16
|
: { ready: true, untilReady: Promise.resolve() };
|
|
@@ -61,7 +55,7 @@ function createPlatformLog({ file, level, transport, reportMessage, }) {
|
|
|
61
55
|
}
|
|
62
56
|
};
|
|
63
57
|
}
|
|
64
|
-
const mainLogger = (
|
|
58
|
+
const mainLogger = pino({
|
|
65
59
|
level,
|
|
66
60
|
customLevels: {
|
|
67
61
|
stats: 25,
|
|
@@ -145,7 +139,7 @@ function emitAppLoggerEvent(ev, emitter) {
|
|
|
145
139
|
}
|
|
146
140
|
function createReadyState(destination) {
|
|
147
141
|
let ready = false;
|
|
148
|
-
const { promise: untilReady, resolve, reject } =
|
|
142
|
+
const { promise: untilReady, resolve, reject } = promiseToHandle();
|
|
149
143
|
destination.on("error", reject);
|
|
150
144
|
destination.on("ready", () => {
|
|
151
145
|
ready = true;
|
package/dist/pino-app-log.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pino-app-log.js","sourceRoot":"","sources":["../src/pino-app-log.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pino-app-log.js","sourceRoot":"","sources":["../src/pino-app-log.ts"],"names":[],"mappings":"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"}
|
package/dist/public.types.js
CHANGED
|
@@ -1,26 +1,23 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
const node_process_1 = require("node:process");
|
|
7
|
-
const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
|
|
8
|
-
function readConfigFileSync({ typeValidator, typeName, defaultFileName, }) {
|
|
1
|
+
import { readFileSync } from "node:fs";
|
|
2
|
+
import { isAbsolute, join } from "node:path";
|
|
3
|
+
import { cwd } from "node:process";
|
|
4
|
+
import { messageOf } from "@paroi/data-formatters-lib";
|
|
5
|
+
export function readConfigFileSync({ typeValidator, typeName, defaultFileName, }) {
|
|
9
6
|
const paramIndex = process.argv.indexOf("--config");
|
|
10
7
|
const hasParam = paramIndex !== -1 && paramIndex + 1 < process.argv.length;
|
|
11
8
|
let confFile = hasParam ? process.argv[paramIndex + 1] : defaultFileName;
|
|
12
9
|
if (!confFile)
|
|
13
10
|
throw new Error("Missing configuration file parameter");
|
|
14
|
-
if (!
|
|
15
|
-
confFile =
|
|
11
|
+
if (!isAbsolute(confFile)) {
|
|
12
|
+
confFile = join(cwd(), confFile);
|
|
16
13
|
}
|
|
17
14
|
let data;
|
|
18
15
|
try {
|
|
19
|
-
const content =
|
|
16
|
+
const content = readFileSync(confFile, "utf8");
|
|
20
17
|
data = JSON.parse(content);
|
|
21
18
|
}
|
|
22
19
|
catch (err) {
|
|
23
|
-
throw new Error(`Cannot load the configuration file '${confFile}': ${
|
|
20
|
+
throw new Error(`Cannot load the configuration file '${confFile}': ${messageOf(err)}`);
|
|
24
21
|
}
|
|
25
22
|
const result = typeValidator.validate(typeName, data);
|
|
26
23
|
if (!result.valid)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-configuration.js","sourceRoot":"","sources":["../src/read-configuration.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"read-configuration.js","sourceRoot":"","sources":["../src/read-configuration.ts"],"names":[],"mappings":"AAAA,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;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AASvD,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"}
|
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
"
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.makeDefaultRelativeId = makeDefaultRelativeId;
|
|
4
|
-
function makeDefaultRelativeId({ smallAlphabet = "023456789", bigAlphabet = "023456789abcdefghijkmnopqrstuvwxyz", size = 3, } = {}) {
|
|
1
|
+
export function makeDefaultRelativeId({ smallAlphabet = "023456789", bigAlphabet = "023456789abcdefghijkmnopqrstuvwxyz", size = 3, } = {}) {
|
|
5
2
|
const flags = Array(size);
|
|
6
3
|
const maxFlagIndex = size - 1;
|
|
7
4
|
while (true) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relative-id-helper.js","sourceRoot":"","sources":["../src/relative-id-helper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"relative-id-helper.js","sourceRoot":"","sources":["../src/relative-id-helper.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,qBAAqB,CAAC,EACpC,aAAa,GAAG,WAAW,EAC3B,WAAW,GAAG,oCAAoC,EAClD,IAAI,GAAG,CAAC,GACT,GAAG,EAAE;IACJ,MAAM,KAAK,GAA8B,KAAK,CAAC,IAAI,CAAC,CAAC;IACrD,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,CAAC;IAE9B,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,SAAS,GAAG,EAAE,CAAC;QACrB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC;YAC9B,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;gBAC3B,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACpB,CAAC;QACH,CAAC;QACD,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;YAAE,MAAM;QAClC,MAAM,cAAc,GAAG,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;QACtD,MAAM,SAAS,GAAG,SAAS,CAAC,cAAc,CAAC,CAAC;QAC5C,KAAK,CAAC,SAAS,CAAC,GAAG,GAAG,CAAC;QACvB,IAAI,SAAS,GAAG,CAAC;YAAE,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC;QAC9C,IAAI,SAAS,GAAG,YAAY;YAAE,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC;IAC3D,CAAC;IAED,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;IACjF,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACzB,CAAC;AAED,SAAS,iBAAiB,CAAC,QAAgB;IACzC,OAAO,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;AAC/D,CAAC;AAED;;GAEG;AACH,SAAS,SAAS,CAAC,GAAW,EAAE,GAAW;IACzC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC;AACvD,CAAC"}
|
package/dist/resource-version.js
CHANGED
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const nanoid_1 = require("nanoid");
|
|
5
|
-
function generateResourceVersion() {
|
|
6
|
-
return (0, nanoid_1.nanoid)();
|
|
1
|
+
import { nanoid } from "nanoid";
|
|
2
|
+
export function generateResourceVersion() {
|
|
3
|
+
return nanoid();
|
|
7
4
|
}
|
|
8
5
|
//# sourceMappingURL=resource-version.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource-version.js","sourceRoot":"","sources":["../src/resource-version.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resource-version.js","sourceRoot":"","sources":["../src/resource-version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,UAAU,uBAAuB;IACrC,OAAO,MAAM,EAAE,CAAC;AAClB,CAAC"}
|
package/dist/sql-logger.d.ts
CHANGED
package/dist/sql-logger.js
CHANGED
|
@@ -1,10 +1,7 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.createSqlLogger = createSqlLogger;
|
|
4
1
|
const noOp = () => {
|
|
5
2
|
// nothing to do
|
|
6
3
|
};
|
|
7
|
-
function createSqlLogger({ logger, dbSchemaName, }) {
|
|
4
|
+
export function createSqlLogger({ logger, dbSchemaName, }) {
|
|
8
5
|
let debugCount = 0;
|
|
9
6
|
const typeOrmLogger = {
|
|
10
7
|
logQuery(query, parameters) {
|
package/dist/sql-logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql-logger.js","sourceRoot":"","sources":["../src/sql-logger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sql-logger.js","sourceRoot":"","sources":["../src/sql-logger.ts"],"names":[],"mappings":"AAGA,MAAM,IAAI,GAAG,GAAG,EAAE;IAChB,gBAAgB;AAClB,CAAC,CAAC;AAOF,MAAM,UAAU,eAAe,CAAC,EAC9B,MAAM,EACN,YAAY,GACqC;IACjD,IAAI,UAAU,GAAG,CAAC,CAAC;IAEnB,MAAM,aAAa,GAAW;QAC5B,QAAQ,CAAC,KAAK,EAAE,UAAU;YACxB,IAAI,UAAU,IAAI,CAAC;gBAAE,OAAO;YAC5B,EAAE,UAAU,CAAC;YACb,MAAM,CAAC,KAAK,CACV,IAAI,YAAY,KAAK,cAAc,CAAC,KAAK,CAAC;gBAClC,UAAU,EAAE,GAAG,CAAC,iBAAiB,CAAC,EAAE,CAC7C,CAAC;QACJ,CAAC;QAED,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU;YACpC,MAAM,CAAC,KAAK,CAAC,IAAI,YAAY,cAAc,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QACzE,CAAC;QAED,YAAY,EAAE,IAAI;QAClB,cAAc,EAAE,IAAI;QACpB,YAAY,EAAE,IAAI;QAClB,GAAG,EAAE,IAAI;KACV,CAAC;IAEF,OAAO;QACL,aAAa;QACb,YAAY,CAAC,KAAK,GAAG,CAAC;YACpB,UAAU,IAAI,KAAK,CAAC;QACtB,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,GAAW;IACjC,OAAO,GAAG,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;AACjC,CAAC;AAED,SAAS,iBAAiB,CAAC,SAAc;IACvC,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO,WAAW,CAAC;IAChD,IAAI,SAAS,KAAK,IAAI;QAAE,OAAO,MAAM,CAAC;IACtC,MAAM,CAAC,GAAG,OAAO,SAAS,CAAC;IAC3B,IAAI,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAC,QAAQ,EAAE,CAAC;IACrF,IAAI,CAAC,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAC,QAAQ,EAAE,CAAC;IAChD,IAAI,CAAC,KAAK,QAAQ;QAChB,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC9F,OAAO,CAAC,CAAC,CAAC,yBAAyB;AACrC,CAAC"}
|
package/dist/sqlite-db-init.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { DataSource, type DataSourceOptions, type Logger, type SelectQueryBuilder } from "typeorm";
|
|
2
|
-
import type { BasicAppLogger } from "./public.types";
|
|
2
|
+
import type { BasicAppLogger } from "./public.types.js";
|
|
3
3
|
export declare const METADATA_TABLE_NAME = "PaMetadata";
|
|
4
4
|
export declare const DB_SCHEMA_VERSION_KEY = "dbSchemaVersion";
|
|
5
5
|
export type DbMigrationReport = MigratedDbReport | NotMigratedDbReport;
|
package/dist/sqlite-db-init.js
CHANGED
|
@@ -1,25 +1,16 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
exports.getMetadataDbSchemaVersion = getMetadataDbSchemaVersion;
|
|
9
|
-
exports.setMetadataDbSchemaVersion = setMetadataDbSchemaVersion;
|
|
10
|
-
const promises_1 = require("node:fs/promises");
|
|
11
|
-
const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
|
|
12
|
-
const typeorm_1 = require("typeorm");
|
|
13
|
-
const fs_utils_1 = require("./fs-utils");
|
|
14
|
-
exports.METADATA_TABLE_NAME = "PaMetadata";
|
|
15
|
-
exports.DB_SCHEMA_VERSION_KEY = "dbSchemaVersion";
|
|
16
|
-
async function createOrOpenSqliteConnection(options) {
|
|
1
|
+
import { nbVal, strVal } from "@paroi/data-formatters-lib";
|
|
2
|
+
import { readFile } from "node:fs/promises";
|
|
3
|
+
import { DataSource } from "typeorm";
|
|
4
|
+
import { pathExists } from "./fs-utils.js";
|
|
5
|
+
export const METADATA_TABLE_NAME = "PaMetadata";
|
|
6
|
+
export const DB_SCHEMA_VERSION_KEY = "dbSchemaVersion";
|
|
7
|
+
export async function createOrOpenSqliteConnection(options) {
|
|
17
8
|
const { sqliteFile, ddlFile, dbSchemaName, canCreate, typeOrmLogger, entities, migrateDb, logger, } = options;
|
|
18
|
-
const isNewDb = !(await
|
|
9
|
+
const isNewDb = !(await pathExists(sqliteFile));
|
|
19
10
|
if (isNewDb && !canCreate) {
|
|
20
11
|
throw new Error(`missing '${dbSchemaName}' database`);
|
|
21
12
|
}
|
|
22
|
-
const cn = await new
|
|
13
|
+
const cn = await new DataSource({
|
|
23
14
|
type: "sqlite",
|
|
24
15
|
database: sqliteFile,
|
|
25
16
|
enableWAL: false,
|
|
@@ -36,8 +27,8 @@ async function createOrOpenSqliteConnection(options) {
|
|
|
36
27
|
await cn.query("PRAGMA foreign_keys = 1"); // after migration scripts
|
|
37
28
|
return { cn, isNewDb, migrationReport };
|
|
38
29
|
}
|
|
39
|
-
async function executeDdl(cn, ddlFile) {
|
|
40
|
-
const ddl = await
|
|
30
|
+
export async function executeDdl(cn, ddlFile) {
|
|
31
|
+
const ddl = await readFile(ddlFile, {
|
|
41
32
|
encoding: "utf-8",
|
|
42
33
|
});
|
|
43
34
|
const queries = ddl
|
|
@@ -59,29 +50,29 @@ function onlySqlComment(sql) {
|
|
|
59
50
|
}
|
|
60
51
|
return true;
|
|
61
52
|
}
|
|
62
|
-
async function getMetadataValue(cn, { dbSchemaName, key }) {
|
|
53
|
+
export async function getMetadataValue(cn, { dbSchemaName, key }) {
|
|
63
54
|
// specific to sqlite
|
|
64
|
-
const [row] = await cn.query(`select val from ${
|
|
55
|
+
const [row] = await cn.query(`select val from ${METADATA_TABLE_NAME} where dbSchema = '${dbSchemaName}' and k = ?`, [key]);
|
|
65
56
|
if (row)
|
|
66
|
-
return
|
|
57
|
+
return strVal(row.val, { varName: "val" });
|
|
67
58
|
}
|
|
68
|
-
async function setMetadataValue(cn, { dbSchemaName, key, value, errorIfMissing, }) {
|
|
59
|
+
export async function setMetadataValue(cn, { dbSchemaName, key, value, errorIfMissing, }) {
|
|
69
60
|
// specific to sqlite
|
|
70
|
-
const result = await cn.query(`update ${
|
|
61
|
+
const result = await cn.query(`update ${METADATA_TABLE_NAME} set val = ? where dbSchema = '${dbSchemaName}' and k = ?`, [value, key]);
|
|
71
62
|
if (result.affectedRows === 0) {
|
|
72
63
|
if (errorIfMissing) {
|
|
73
|
-
throw new Error(`[${dbSchemaName}] missing '${key}' in '${
|
|
64
|
+
throw new Error(`[${dbSchemaName}] missing '${key}' in '${METADATA_TABLE_NAME}'`);
|
|
74
65
|
}
|
|
75
66
|
// specific to sqlite
|
|
76
|
-
await cn.query(`insert into ${
|
|
67
|
+
await cn.query(`insert into ${METADATA_TABLE_NAME} (dbSchema, k, val) values ('${dbSchemaName}', ?, ?)`, [key, value]);
|
|
77
68
|
}
|
|
78
69
|
}
|
|
79
|
-
async function getMetadataDbSchemaVersion(cn, { dbSchemaName }) {
|
|
70
|
+
export async function getMetadataDbSchemaVersion(cn, { dbSchemaName }) {
|
|
80
71
|
let value;
|
|
81
72
|
try {
|
|
82
|
-
value = await getMetadataValue(cn, { dbSchemaName, key:
|
|
73
|
+
value = await getMetadataValue(cn, { dbSchemaName, key: DB_SCHEMA_VERSION_KEY });
|
|
83
74
|
if (value === undefined) {
|
|
84
|
-
throw new Error(`[${dbSchemaName}] missing '${
|
|
75
|
+
throw new Error(`[${dbSchemaName}] missing '${DB_SCHEMA_VERSION_KEY}' in '${METADATA_TABLE_NAME}'`);
|
|
85
76
|
}
|
|
86
77
|
}
|
|
87
78
|
catch (error) {
|
|
@@ -94,10 +85,10 @@ async function getMetadataDbSchemaVersion(cn, { dbSchemaName }) {
|
|
|
94
85
|
}
|
|
95
86
|
return Number(value);
|
|
96
87
|
}
|
|
97
|
-
async function setMetadataDbSchemaVersion(cn, { dbSchemaName, value }) {
|
|
88
|
+
export async function setMetadataDbSchemaVersion(cn, { dbSchemaName, value }) {
|
|
98
89
|
await setMetadataValue(cn, {
|
|
99
90
|
dbSchemaName,
|
|
100
|
-
key:
|
|
91
|
+
key: DB_SCHEMA_VERSION_KEY,
|
|
101
92
|
value: String(value),
|
|
102
93
|
errorIfMissing: true,
|
|
103
94
|
});
|
|
@@ -106,7 +97,7 @@ async function migrateMetadataTable(cn, dbSchemaName) {
|
|
|
106
97
|
const [row] = await cn.query(`select dbVersion from PaDbMetadata where dbSchema = '${dbSchemaName}'`);
|
|
107
98
|
if (!row)
|
|
108
99
|
throw new Error(); // will be catched in the caller
|
|
109
|
-
const version =
|
|
100
|
+
const version = nbVal(row.dbVersion);
|
|
110
101
|
await cn.query(`create table PaMetadata (
|
|
111
102
|
dbSchema varchar(100) not null,
|
|
112
103
|
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":"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"}
|
package/dist/tracker.js
CHANGED
|
@@ -1,8 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.createTracker = createTracker;
|
|
4
|
-
exports.createNoTracker = createNoTracker;
|
|
5
|
-
function createTracker() {
|
|
1
|
+
export function createTracker() {
|
|
6
2
|
const byDatabases = new Map();
|
|
7
3
|
return {
|
|
8
4
|
trackAccess(database, collection, accessType) {
|
|
@@ -32,7 +28,7 @@ function createTracker() {
|
|
|
32
28
|
},
|
|
33
29
|
};
|
|
34
30
|
}
|
|
35
|
-
function createNoTracker() {
|
|
31
|
+
export function createNoTracker() {
|
|
36
32
|
return {
|
|
37
33
|
trackAccess() {
|
|
38
34
|
// nothing to do
|
package/dist/tracker.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracker.js","sourceRoot":"","sources":["../src/tracker.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tracker.js","sourceRoot":"","sources":["../src/tracker.ts"],"names":[],"mappings":"AAaA,MAAM,UAAU,aAAa;IAC3B,MAAM,WAAW,GAAG,IAAI,GAAG,EAAuD,CAAC;IAEnF,OAAO;QACL,WAAW,CAAC,QAAQ,EAAE,UAAU,EAAE,UAAU;YAC1C,IAAI,aAAa,GAAG,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC9C,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,aAAa,GAAG,IAAI,GAAG,EAAE,CAAC;gBAC1B,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;YAC3C,CAAC;YACD,IAAI,aAAa,GAAG,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAClD,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,aAAa,GAAG,IAAI,GAAG,EAAE,CAAC;gBAC1B,aAAa,CAAC,GAAG,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;YAC/C,CAAC;YACD,aAAa,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1E,CAAC;QAED,QAAQ;YACN,MAAM,MAAM,GAAkB,EAAE,CAAC;YACjC,KAAK,MAAM,CAAC,QAAQ,EAAE,aAAa,CAAC,IAAI,WAAW,EAAE,CAAC;gBACpD,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;gBACtB,KAAK,MAAM,CAAC,EAAE,aAAa,CAAC,IAAI,aAAa,EAAE,CAAC;oBAC9C,KAAK,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,aAAa,EAAE,CAAC;wBAChD,MAAM,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC;oBACvC,CAAC;gBACH,CAAC;YACH,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,eAAe;IAC7B,OAAO;QACL,WAAW;YACT,gBAAgB;QAClB,CAAC;QACD,QAAQ;YACN,OAAO,EAAE,CAAC;QACZ,CAAC;KACF,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@paroicms/internal-server-lib",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.11.0",
|
|
4
4
|
"description": "Common utilitaries for the paroicms server.",
|
|
5
5
|
"author": "Paroi Team",
|
|
6
6
|
"keywords": [
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
"directory": "packages/internal-server-lib"
|
|
15
15
|
},
|
|
16
16
|
"license": "MIT",
|
|
17
|
-
"type": "
|
|
17
|
+
"type": "module",
|
|
18
18
|
"main": "dist/index.js",
|
|
19
19
|
"types": "dist/index.d.ts",
|
|
20
20
|
"scripts": {
|
|
@@ -26,10 +26,10 @@
|
|
|
26
26
|
"@typeonly/validator": "~0.6.0",
|
|
27
27
|
"@paroi/async-lib": "~0.3.1",
|
|
28
28
|
"@paroi/data-formatters-lib": "~0.4.0",
|
|
29
|
-
"@paroicms/internal-anywhere-lib": "1.
|
|
30
|
-
"@paroicms/public-anywhere-lib": "0.
|
|
31
|
-
"@paroicms/public-server-lib": "0.
|
|
32
|
-
"nanoid": "~
|
|
29
|
+
"@paroicms/internal-anywhere-lib": "1.22.0",
|
|
30
|
+
"@paroicms/public-anywhere-lib": "0.15.0",
|
|
31
|
+
"@paroicms/public-server-lib": "0.23.0",
|
|
32
|
+
"nanoid": "~5.0.9",
|
|
33
33
|
"pino": "~9.6.0",
|
|
34
34
|
"reflect-metadata": "~0.2.2",
|
|
35
35
|
"typeorm": "~0.3.20",
|