prostgles-server 4.2.627 → 4.2.629
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/Audit/getAuditTableRules.js +4 -4
- package/dist/Audit/getAuditTableRules.js.map +1 -1
- package/dist/DBSchemaBuilder/DBSchemaBuilder.d.ts +4 -4
- package/dist/DBSchemaBuilder/DBSchemaBuilder.d.ts.map +1 -1
- package/dist/DBSchemaBuilder/getClientDBGeneratedSchemas.js +1 -1
- package/dist/DBSchemaBuilder/getClientDBGeneratedSchemas.js.map +1 -1
- package/dist/PublishParser/getPublishSchemas.d.ts.map +1 -1
- package/dist/PublishParser/getPublishSchemas.js +1 -1
- package/dist/PublishParser/getPublishSchemas.js.map +1 -1
- package/dist/PublishParser/getPublishedObjectFromResult.d.ts +1 -1
- package/dist/PublishParser/getPublishedObjectFromResult.d.ts.map +1 -1
- package/dist/PublishParser/getPublishedObjectFromResult.js +8 -6
- package/dist/PublishParser/getPublishedObjectFromResult.js.map +1 -1
- package/dist/StorageClient/fileVersionUtils.d.ts +3 -3
- package/dist/StorageClient/fileVersionUtils.d.ts.map +1 -1
- package/dist/StorageClient/fileVersionUtils.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/typeTests/DBOFullyTyped.spec.js.map +1 -1
- package/lib/Audit/getAuditTableRules.ts +5 -5
- package/lib/DBSchemaBuilder/DBSchemaBuilder.ts +6 -7
- package/lib/DBSchemaBuilder/getClientDBGeneratedSchemas.ts +1 -1
- package/lib/PublishParser/getPublishSchemas.ts +1 -0
- package/lib/PublishParser/getPublishedObjectFromResult.ts +11 -5
- package/lib/StorageClient/fileVersionUtils.ts +3 -3
- package/lib/index.ts +5 -1
- package/lib/typeTests/DBOFullyTyped.spec.ts +1 -1
- package/package.json +2 -2
|
@@ -13,9 +13,9 @@ const getAuditTableRules = async function (audit, auditTablePublishRules, client
|
|
|
13
13
|
if (resolvedPublishObject && Object.hasOwn(resolvedPublishObject, audit.tableName)) {
|
|
14
14
|
return auditTablePublishRules;
|
|
15
15
|
}
|
|
16
|
-
const
|
|
16
|
+
const auditedTableEntries = Object.entries(audit.tables).filter(([tableName]) => canSelect(resolvedPublishObject?.[tableName]) || this.dbo[tableName]?.is_media);
|
|
17
17
|
const auditTableHandler = this.dbo[audit.tableName];
|
|
18
|
-
const auditedTableRules = (await Promise.all(
|
|
18
|
+
const auditedTableRules = (await Promise.all(auditedTableEntries.map(async ([tableName, { idColumns, excludeColumns }]) => {
|
|
19
19
|
const tableHandler = this.dbo[tableName];
|
|
20
20
|
if (!tableHandler)
|
|
21
21
|
return;
|
|
@@ -31,8 +31,8 @@ const getAuditTableRules = async function (audit, auditTablePublishRules, client
|
|
|
31
31
|
}
|
|
32
32
|
return {
|
|
33
33
|
handler: tableHandler,
|
|
34
|
-
additionalForcedCondition: await getSourceAuditCondition(tableHandler, rules.select.forcedFilter,
|
|
35
|
-
tableColumnOverrides: getAuditRowColumnOverrides(tableHandler.parseFieldFilter(rules.select.fields),
|
|
34
|
+
additionalForcedCondition: await getSourceAuditCondition(tableHandler, rules.select.forcedFilter, excludeColumns),
|
|
35
|
+
tableColumnOverrides: getAuditRowColumnOverrides(tableHandler.parseFieldFilter(rules.select.fields), idColumns),
|
|
36
36
|
};
|
|
37
37
|
}))).filter(prostgles_types_1.isDefined);
|
|
38
38
|
if (!auditedTableRules.length) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAuditTableRules.js","sourceRoot":"","sources":["../../lib/Audit/getAuditTableRules.ts"],"names":[],"mappings":";;;AAAA,2CAAgC;AAChC,qDAAoF;AAIpF,8EAAgF;AAOhF,6CAA4E;AAE5E,yEAAsE;AAE/D,MAAM,kBAAkB,GAAG,KAAK,WAErC,KAA0B,EAC1B,sBAAsD,EACtD,SAAwC,EACxC,UAAyC,EACzC,KAAuC,EACvC,qBAAgD;IAEhD,IAAI,sBAAsB,EAAE,MAAM,EAAE,CAAC;QACnC,OAAO,sBAAsB,CAAC;IAChC,CAAC;IACD,IAAI,qBAAqB,IAAI,MAAM,CAAC,MAAM,CAAC,qBAAqB,EAAE,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;QACnF,OAAO,sBAAsB,CAAC;IAChC,CAAC;IAED,MAAM,
|
|
1
|
+
{"version":3,"file":"getAuditTableRules.js","sourceRoot":"","sources":["../../lib/Audit/getAuditTableRules.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { DBSchema, TableHandler } from "prostgles-types";
|
|
2
2
|
import type { TX } from "../DboBuilder/DboBuilderTypes";
|
|
3
3
|
import type { PublishAllOrNothing, PublishTableRule } from "../PublishParser/PublishParser";
|
|
4
4
|
import { type PublishObject } from "../PublishParser/PublishParser";
|
|
5
|
-
export type ServerTableHandler<
|
|
5
|
+
export type ServerTableHandler<Schema extends DBSchema = DBSchema, TName extends keyof Schema = keyof Schema> = TableHandler<Schema, TName> & {
|
|
6
6
|
isView: boolean;
|
|
7
7
|
};
|
|
8
8
|
export type DBTableHandlersFromSchema<Schema = void> = Schema extends DBSchema ? {
|
|
9
|
-
[tov_name in keyof Schema]: ServerTableHandler<Schema
|
|
9
|
+
[tov_name in keyof Schema]: ServerTableHandler<Schema, tov_name>;
|
|
10
10
|
} : Record<string, Partial<ServerTableHandler>>;
|
|
11
11
|
export type DBHandlerServerWithTx<TH = Record<string, Partial<ServerTableHandler>>, WithTransactions = true> = WithTransactions extends true ? {
|
|
12
12
|
tx: TX<TH>;
|
|
@@ -14,7 +14,7 @@ export type DBHandlerServerWithTx<TH = Record<string, Partial<ServerTableHandler
|
|
|
14
14
|
export type DBOFullyTyped<Schema = void, WithTransactions = true> = DBTableHandlersFromSchema<Schema> & DBHandlerServerWithTx<DBTableHandlersFromSchema<Schema>, WithTransactions>;
|
|
15
15
|
/** Publish-aware server wrappers for client requests; transactions and isView are unavailable. */
|
|
16
16
|
export type DBOFullyTypedClient<Schema = void> = Schema extends DBSchema ? {
|
|
17
|
-
[TName in keyof Schema]: TableHandler<Schema
|
|
17
|
+
[TName in keyof Schema]: TableHandler<Schema, TName> | (Schema[TName] extends {
|
|
18
18
|
optional: true;
|
|
19
19
|
} ? undefined : never);
|
|
20
20
|
} : Record<string, Partial<TableHandler>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DBSchemaBuilder.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/DBSchemaBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"DBSchemaBuilder.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/DBSchemaBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAC5F,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAEpE,MAAM,MAAM,kBAAkB,CAC5B,MAAM,SAAS,QAAQ,GAAG,QAAQ,EAClC,KAAK,SAAS,MAAM,MAAM,GAAG,MAAM,MAAM,IACvC,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG;IAAE,MAAM,EAAE,OAAO,CAAA;CAAE,CAAC;AAEtD,MAAM,MAAM,yBAAyB,CAAC,MAAM,GAAG,IAAI,IACjD,MAAM,SAAS,QAAQ,GACrB;KACG,QAAQ,IAAI,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,EAAE,QAAQ,CAAC;CACjE,GACD,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC;AAEhD,MAAM,MAAM,qBAAqB,CAC/B,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC,EAChD,gBAAgB,GAAG,IAAI,IACrB,gBAAgB,SAAS,IAAI,GAAG;IAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAE3E,MAAM,MAAM,aAAa,CACvB,MAAM,GAAG,IAAI,EACb,gBAAgB,GAAG,IAAI,IACrB,yBAAyB,CAAC,MAAM,CAAC,GACnC,qBAAqB,CAAC,yBAAyB,CAAC,MAAM,CAAC,EAAE,gBAAgB,CAAC,CAAC;AAE7E,kGAAkG;AAClG,MAAM,MAAM,mBAAmB,CAAC,MAAM,GAAG,IAAI,IAC3C,MAAM,SAAS,QAAQ,GACrB;KACG,KAAK,IAAI,MAAM,MAAM,GAClB,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,GAC3B,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS;QAAE,QAAQ,EAAE,IAAI,CAAA;KAAE,GAAG,SAAS,GAAG,KAAK,CAAC;CACnE,GACD,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;AAE1C,MAAM,MAAM,iBAAiB,CAAC,MAAM,GAAG,IAAI,IACzC,MAAM,SAAS,QAAQ,GACrB;KACG,QAAQ,IAAI,MAAM,OAAO,CAAC,MAAM,CAAC,GAC9B,mBAAmB,GACnB,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC1D,GACD,aAAa,CAAC"}
|
|
@@ -59,7 +59,7 @@ const getClientDBGeneratedSchemas = (profiles, tables, config) => {
|
|
|
59
59
|
.sort();
|
|
60
60
|
const updateInput = !updating.length ? "never" : ([
|
|
61
61
|
updateAllowed.length ?
|
|
62
|
-
`Partial<
|
|
62
|
+
`Partial<Pick<${tableType}["columns"], ${keys(updateAllowed)}>>`
|
|
63
63
|
: "",
|
|
64
64
|
updateExcluded.length ? `{ ${updateExcluded.join("; ")} }` : "",
|
|
65
65
|
]
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getClientDBGeneratedSchemas.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getClientDBGeneratedSchemas.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"getClientDBGeneratedSchemas.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getClientDBGeneratedSchemas.ts"],"names":[],"mappings":";;;AAEA,2CAAiD;AAK1C,MAAM,2BAA2B,GAAG,CACzC,QAA8B,EAC9B,MAAqB,EACrB,MAA+B,EACvB,EAAE;IACV,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;IAChF,IAAI,CAAC,OAAO,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IAC/B,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;QACrC,IAAA,gCAAwB,EAAC,IAAI,CAAC,CAAC;QAC/B,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;YACvC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,CAAC;YACvD,IAAI,CAAC,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;gBACrF,MAAM,IAAI,KAAK,CAAC,mBAAmB,IAAI,gCAAgC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC;YACxF,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAE,OAAuC,EAAE,EAAE;QACzE,MAAM,WAAW,GAAG,MAAM;aACvB,KAAK,EAAE;aACP,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;aAC5C,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACjB,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;YACvF,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC;gBAAE,OAAO,EAAE,CAAC;YACxC,MAAM,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;YACjE,MAAM,SAAS,GAAG,GAAG,8BAAkB,CAAC,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;YAChF,MAAM,QAAQ,GAAa,EAAE,CAAC;YAC9B,MAAM,QAAQ,GAAa,EAAE,CAAC;YAC9B,MAAM,QAAQ,GAAa,EAAE,CAAC;YAC9B,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;gBACxF,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAC5B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,CAChE,CAAC;gBACF,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;oBAC5B,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBAC1D,CAAC;qBAAM,IACL,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC;oBACxB,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,YAAY,KAAK,MAAM,CAAC,IAAI,EAC9D,CAAC;oBACD,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAC7B,CAAC;qBAAM,CAAC;oBACN,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAC7B,CAAC;YACH,CAAC;YACD,MAAM,KAAK,GACT,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAC5B;gBACE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,SAAS,gBAAgB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;gBACzE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,gBAAgB,SAAS,gBAAgB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;gBAClF,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;aACpD;iBACE,MAAM,CAAC,OAAO,CAAC;iBACf,IAAI,CAAC,KAAK,CAAC,IAAI,uBAAuB,CAC1C,CAAC;YACJ,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;YAChE,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO;iBAChC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CACjB,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CACjF;iBACA,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC;iBAC5B,IAAI,EAAE,CAAC;YACV,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO;iBACjC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;iBACxD,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;iBACzD,IAAI,EAAE,CAAC;YACV,MAAM,WAAW,GACf,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAC3B;gBACE,aAAa,CAAC,MAAM,CAAC,CAAC;oBACpB,gBAAgB,SAAS,gBAAgB,IAAI,CAAC,aAAa,CAAC,IAAI;oBAClE,CAAC,CAAC,EAAE;gBACJ,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;aAChE;iBACE,MAAM,CAAC,OAAO,CAAC;iBACf,IAAI,CAAC,KAAK,CAAC,IAAI,uBAAuB,CAC1C,CAAC;YACJ,MAAM,aAAa,GAAG,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC;YACzE,OAAO;gBACL,KAAK,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,SAAS,uBAAuB,KAAK,oBAAoB,WAAW,IAAI,aAAa,KAAK;aAC/H,CAAC;QACJ,CAAC,CAAC,CAAC;QACL,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;YACxB,OAAO,eAAe,IAAI,2BAA2B,CAAC;QACxD,CAAC;QACD,OAAO,eAAe,IAAI,SAAS,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;IAClE,CAAC,CAAC;IAEF,OAAO;QACL,wGAAwG;QACxG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QAC5D,0GAA0G;QAC1G,QAAQ,CACN,8BAAkB,CAAC,aAAa,EAChC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CACpC;KACF,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACjB,CAAC,CAAC;AAhGW,QAAA,2BAA2B,+BAgGtC;AAEF,MAAM,IAAI,GAAG,CAAC,KAAe,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACxF,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,8BAAkB,CAAa,CAAC,CAAC;AAEtE,MAAM,wBAAwB,GAAG,CAAC,IAAY,EAAE,EAAE;IACvD,sFAAsF;IACtF,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3C,MAAM,IAAI,KAAK,CACb,+BAA+B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,uCAAuC,CAC3F,CAAC;IACJ,CAAC;IACD,IAAI,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CACb,+BAA+B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,oFAAoF,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAChL,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AAZW,QAAA,wBAAwB,4BAYnC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPublishSchemas.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/getPublishSchemas.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gDAAgD,CAAC;AAI3F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,eAAO,MAAM,iBAAiB,GAC5B,eAAe,aAAa,KAC3B,OAAO,CAAC,oBAAoB,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"getPublishSchemas.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/getPublishSchemas.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gDAAgD,CAAC;AAI3F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,eAAO,MAAM,iBAAiB,GAC5B,eAAe,aAAa,KAC3B,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAsC1C,CAAC"}
|
|
@@ -14,7 +14,7 @@ const getPublishSchemas = async (publishParser) => {
|
|
|
14
14
|
const entries = publishParser.parsedPublish;
|
|
15
15
|
const { tablesOrViews = [] } = publishParser.prostgles.dboBuilder;
|
|
16
16
|
const profiles = (0, prostgles_types_1.fromEntries)(await Promise.all(entries.map(async ({ name, publish }) => {
|
|
17
|
-
const resolvedPublishObject = (0, getPublishedObjectFromResult_1.getPublishedObjectFromResult)(publish, tablesOrViews, undefined);
|
|
17
|
+
const resolvedPublishObject = (0, getPublishedObjectFromResult_1.getPublishedObjectFromResult)(publish, tablesOrViews, undefined, "schemaGeneration");
|
|
18
18
|
const tableNames = (0, getPublishedTableNames_1.getPublishedTableNames)(publishParser, resolvedPublishObject);
|
|
19
19
|
const tableSchema = [];
|
|
20
20
|
for (const tableName of tableNames) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPublishSchemas.js","sourceRoot":"","sources":["../../lib/PublishParser/getPublishSchemas.ts"],"names":[],"mappings":";;;AAAA,qDAAkE;AAClE,yDAAyD;AACzD,qEAAkE;AAElE,0CAAyC;AACzC,iFAA8E;AAC9E,qEAAkE;AAG3D,MAAM,iBAAiB,GAAG,KAAK,EACpC,aAA4B,EACe,EAAE;IAC7C,IAAI,CAAC,IAAA,eAAO,EAAC,aAAa,CAAC,aAAa,CAAC,EAAE,CAAC;QAC1C,OAAO;IACT,CAAC;IACD,MAAM,OAAO,GAAG,aAAa,CAAC,aAAa,CAAC;IAC5C,MAAM,EAAE,aAAa,GAAG,EAAE,EAAE,GAAG,aAAa,CAAC,SAAS,CAAC,UAAU,CAAC;IAClE,MAAM,QAAQ,GAAyB,IAAA,6BAAW,EAChD,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE;QACtC,MAAM,qBAAqB,GAAG,IAAA,2DAA4B,EACxD,OAAO,EACP,aAAa,EACb,SAAS,
|
|
1
|
+
{"version":3,"file":"getPublishSchemas.js","sourceRoot":"","sources":["../../lib/PublishParser/getPublishSchemas.ts"],"names":[],"mappings":";;;AAAA,qDAAkE;AAClE,yDAAyD;AACzD,qEAAkE;AAElE,0CAAyC;AACzC,iFAA8E;AAC9E,qEAAkE;AAG3D,MAAM,iBAAiB,GAAG,KAAK,EACpC,aAA4B,EACe,EAAE;IAC7C,IAAI,CAAC,IAAA,eAAO,EAAC,aAAa,CAAC,aAAa,CAAC,EAAE,CAAC;QAC1C,OAAO;IACT,CAAC;IACD,MAAM,OAAO,GAAG,aAAa,CAAC,aAAa,CAAC;IAC5C,MAAM,EAAE,aAAa,GAAG,EAAE,EAAE,GAAG,aAAa,CAAC,SAAS,CAAC,UAAU,CAAC;IAClE,MAAM,QAAQ,GAAyB,IAAA,6BAAW,EAChD,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE;QACtC,MAAM,qBAAqB,GAAG,IAAA,2DAA4B,EACxD,OAAO,EACP,aAAa,EACb,SAAS,EACT,kBAAkB,CACnB,CAAC;QACF,MAAM,UAAU,GAAG,IAAA,+CAAsB,EAAC,aAAa,EAAE,qBAAqB,CAAC,CAAC;QAChF,MAAM,WAAW,GAAoB,EAAE,CAAC;QACxC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACnC,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,aAAa,CAAC;gBAC9C,SAAS;gBACT,qBAAqB;gBACrB,SAAS,EAAE,SAAS;gBACpB,UAAU,EAAE,SAAS;gBACrB,KAAK,EAAE,SAAS;aACjB,CAAC,CAAC;YACH,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;gBAAE,SAAS;YAC5D,MAAM,KAAK,GAAG,aAAa,CAAC,GAAG,CAAC,SAAS,CAAE,CAAC;YAC5C,WAAW,CAAC,IAAI,CAAC;gBACf,GAAG,uBAAU,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,CAAC;gBAC3C,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,MAAM,0BAAa,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,CAAC;aACtE,CAAC,CAAC;QACL,CAAC;QACD,OAAO,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;IACjC,CAAC,CAAC,CACH,CACF,CAAC;IACF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAxCW,QAAA,iBAAiB,qBAwC5B"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { type TableSchema } from "prostgles-types";
|
|
2
2
|
import type { PublishedResult, PublishObject, PublishParams } from "./publishTypesAndUtils";
|
|
3
|
-
export declare const getPublishedObjectFromResult: (publish: PublishedResult | undefined, tablesOrViews: TableSchema[], publishParams: PublishParams | undefined) => PublishObject;
|
|
3
|
+
export declare const getPublishedObjectFromResult: (publish: PublishedResult | undefined, tablesOrViews: TableSchema[], publishParams: PublishParams | undefined, contextReplacementMode?: "runtime" | "schemaGeneration") => PublishObject;
|
|
4
4
|
//# sourceMappingURL=getPublishedObjectFromResult.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPublishedObjectFromResult.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/getPublishedObjectFromResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,WAAW,EACjB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAEV,eAAe,EACf,aAAa,EACb,aAAa,EACd,MAAM,wBAAwB,CAAC;AAEhC,eAAO,MAAM,4BAA4B,GACvC,SAAS,eAAe,GAAG,SAAS,EACpC,eAAe,WAAW,EAAE,EAC5B,eAAe,aAAa,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"getPublishedObjectFromResult.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/getPublishedObjectFromResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,WAAW,EACjB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAEV,eAAe,EACf,aAAa,EACb,aAAa,EACd,MAAM,wBAAwB,CAAC;AAEhC,eAAO,MAAM,4BAA4B,GACvC,SAAS,eAAe,GAAG,SAAS,EACpC,eAAe,WAAW,EAAE,EAC5B,eAAe,aAAa,GAAG,SAAS,EACxC,yBAAwB,SAAS,GAAG,kBAA8B,KACjE,aAmCF,CAAC"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getPublishedObjectFromResult = void 0;
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
5
|
const utils_1 = require("../utils/utils");
|
|
6
|
-
const getPublishedObjectFromResult = (publish, tablesOrViews, publishParams) => {
|
|
6
|
+
const getPublishedObjectFromResult = (publish, tablesOrViews, publishParams, contextReplacementMode = "runtime") => {
|
|
7
7
|
if (!publish)
|
|
8
8
|
return {};
|
|
9
9
|
if (publish === "*") {
|
|
@@ -30,15 +30,15 @@ const getPublishedObjectFromResult = (publish, tablesOrViews, publishParams) =>
|
|
|
30
30
|
return [table.name, table.is_view ? (0, prostgles_types_1.pickKeys)(allTableRules, ["select"]) : allTableRules];
|
|
31
31
|
}));
|
|
32
32
|
}
|
|
33
|
-
return replaceContextPlaceholders(publish, publishParams);
|
|
33
|
+
return replaceContextPlaceholders(publish, publishParams, contextReplacementMode);
|
|
34
34
|
};
|
|
35
35
|
exports.getPublishedObjectFromResult = getPublishedObjectFromResult;
|
|
36
|
-
const replaceContextPlaceholders = (publish, publishParams) => {
|
|
36
|
+
const replaceContextPlaceholders = (publish, publishParams, mode) => {
|
|
37
37
|
const context = { user: publishParams?.user };
|
|
38
|
-
if (!publishParams)
|
|
38
|
+
if (!publishParams && mode === "runtime")
|
|
39
39
|
return publish;
|
|
40
40
|
if ((0, utils_1.isArray)(publish)) {
|
|
41
|
-
return publish.map((item) => replaceContextPlaceholders(item, publishParams));
|
|
41
|
+
return publish.map((item) => replaceContextPlaceholders(item, publishParams, mode));
|
|
42
42
|
}
|
|
43
43
|
if ((0, prostgles_types_1.isObject)(publish) && isPlainObject(publish)) {
|
|
44
44
|
const { data } = (0, prostgles_types_1.getJSONBSchemaValidationError)({
|
|
@@ -50,6 +50,8 @@ const replaceContextPlaceholders = (publish, publishParams) => {
|
|
|
50
50
|
}, publish, { allowExtraProperties: false });
|
|
51
51
|
if (data) {
|
|
52
52
|
data;
|
|
53
|
+
if (mode === "schemaGeneration")
|
|
54
|
+
return null;
|
|
53
55
|
const { objectName, objectPropertyName } = data["$prostglesContext"];
|
|
54
56
|
const contextObject = (0, prostgles_types_1.getProperty)(context, objectName);
|
|
55
57
|
if (!contextObject) {
|
|
@@ -63,7 +65,7 @@ const replaceContextPlaceholders = (publish, publishParams) => {
|
|
|
63
65
|
}
|
|
64
66
|
return Object.fromEntries(Object.entries(publish).map(([key, value]) => [
|
|
65
67
|
key,
|
|
66
|
-
replaceContextPlaceholders(value, publishParams),
|
|
68
|
+
replaceContextPlaceholders(value, publishParams, mode),
|
|
67
69
|
]));
|
|
68
70
|
}
|
|
69
71
|
return publish;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPublishedObjectFromResult.js","sourceRoot":"","sources":["../../lib/PublishParser/getPublishedObjectFromResult.ts"],"names":[],"mappings":";;;AAAA,qDAOyB;AACzB,0CAAyC;AAQlC,MAAM,4BAA4B,GAAG,CAC1C,OAAoC,EACpC,aAA4B,EAC5B,aAAwC,
|
|
1
|
+
{"version":3,"file":"getPublishedObjectFromResult.js","sourceRoot":"","sources":["../../lib/PublishParser/getPublishedObjectFromResult.ts"],"names":[],"mappings":";;;AAAA,qDAOyB;AACzB,0CAAyC;AAQlC,MAAM,4BAA4B,GAAG,CAC1C,OAAoC,EACpC,aAA4B,EAC5B,aAAwC,EACxC,yBAAyD,SAAS,EACnD,EAAE;IACjB,IAAI,CAAC,OAAO;QAAE,OAAO,EAAE,CAAC;IACxB,IAAI,OAAO,KAAK,GAAG,EAAE,CAAC;QACpB,OAAO,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IAC7E,CAAC;IAED,IAAI,IAAA,eAAO,EAAC,OAAO,CAAC,EAAE,CAAC;QACrB,MAAM,UAAU,GAAG,IAAA,+CAA6B,EAC9C;YACE,KAAK,EAAE;gBACL,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE;gBACf;oBACE,MAAM,EAAE;wBACN,QAAQ,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAU;wBAC3D,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE;wBACpC,OAAO,EAAE,IAAI;qBACd;iBACF;aACF;SACO,EACV,OAAO,CACR,CAAC;QACF,IAAI,UAAU,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,+BAA+B,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;QACrE,CAAC;QAED,MAAM,CAAC,CAAC,EAAE,aAAa,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC;QAC3C,OAAO,IAAA,6BAAW,EAChB,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YAC1B,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,0BAAQ,EAAC,aAAa,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;QAC3F,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAED,OAAO,0BAA0B,CAAC,OAAO,EAAE,aAAa,EAAE,sBAAsB,CAAC,CAAC;AACpF,CAAC,CAAC;AAxCW,QAAA,4BAA4B,gCAwCvC;AAEF,MAAM,0BAA0B,GAAG,CACjC,OAAU,EACV,aAAwC,EACxC,IAAoC,EACjC,EAAE;IACL,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;IAC9C,IAAI,CAAC,aAAa,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,OAAO,CAAC;IACzD,IAAI,IAAA,eAAO,EAAC,OAAO,CAAC,EAAE,CAAC;QACrB,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,0BAA0B,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,CAAC,CAAM,CAAC;IAC3F,CAAC;IACD,IAAI,IAAA,0BAAQ,EAAC,OAAO,CAAC,IAAI,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;QAChD,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,+CAA6B,EAC5C;YACE,IAAI,EAAE;gBACJ,iBAAiB,EAAE;oBACjB,IAAI,EAAE,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,CAAC,MAAM,CAAU,EAAE,EAAE,kBAAkB,EAAE,QAAQ,EAAE;iBAChF;aACF;SACF,EACD,OAAO,EACP,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAChC,CAAC;QACF,IAAI,IAAI,EAAE,CAAC;YACT,IAAkC,CAAC;YACnC,IAAI,IAAI,KAAK,kBAAkB;gBAAE,OAAO,IAAS,CAAC;YAClD,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,GAAG,IAAI,CAAC,mBAAmB,CAAC,CAAC;YACrE,MAAM,aAAa,GAAG,IAAA,6BAAW,EAAC,OAAO,EAAE,UAAU,CAAC,CAAC;YACvD,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,MAAM,IAAI,KAAK,CAAC,mBAAmB,UAAU,aAAa,CAAC,CAAC;YAC9D,CAAC;YACD,MAAM,eAAe,GAAG,IAAA,6BAAW,EAAC,aAAa,EAAE,kBAAkB,CAAC,CAAC;YACvE,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;gBAClC,MAAM,IAAI,KAAK,CACb,qBAAqB,kBAAkB,4CAA4C,UAAU,GAAG,CACjG,CAAC;YACJ,CAAC;YACD,OAAO,eAAoB,CAAC;QAC9B,CAAC;QACD,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;YAC5C,GAAG;YACH,0BAA0B,CAAC,KAAK,EAAE,aAAa,EAAE,IAAI,CAAC;SACvD,CAAC,CACE,CAAC;IACT,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AACF,MAAM,aAAa,GAAG,CAAC,KAAc,EAAoC,EAAE;IACzE,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IACtD,MAAM,SAAS,GAAG,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAC/C,OAAO,SAAS,KAAK,MAAM,CAAC,SAAS,IAAI,SAAS,KAAK,IAAI,CAAC;AAC9D,CAAC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { TableHandler } from "prostgles-types";
|
|
1
|
+
import type { TableHandler, TableHandlerForColumns } from "prostgles-types";
|
|
2
2
|
import type { TableHandlers } from "../DboBuilder/DboBuilder";
|
|
3
3
|
import type { FileTableConfig } from "../ProstglesTypes";
|
|
4
4
|
import type { FileTableRow, FileVersionTableInsertRow, FileVersionTableRow } from "./fileTableDefinitions";
|
|
@@ -12,7 +12,7 @@ export declare const getFileVersionTableName: (config: FileTableConfig) => strin
|
|
|
12
12
|
export declare const isFileVersionTable: (config: FileTableConfig | undefined, tableName: string) => config is FileTableConfig & {
|
|
13
13
|
versioning: NonNullable<FileTableConfig["versioning"]>;
|
|
14
14
|
};
|
|
15
|
-
export declare const getFileTableHandler: (dbo: TableHandlers, config: FileTableConfig) =>
|
|
16
|
-
export declare const getFileRevisionsTableHandler: (dbo: TableHandlers, config: FileTableConfig) => TableHandler<
|
|
15
|
+
export declare const getFileTableHandler: (dbo: TableHandlers, config: FileTableConfig) => TableHandlerForColumns<FileTableRow>;
|
|
16
|
+
export declare const getFileRevisionsTableHandler: (dbo: TableHandlers, config: FileTableConfig) => TableHandler<FileVersionTableSchema, "fileVersions">;
|
|
17
17
|
export {};
|
|
18
18
|
//# sourceMappingURL=fileVersionUtils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fileVersionUtils.d.ts","sourceRoot":"","sources":["../../lib/StorageClient/fileVersionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"fileVersionUtils.d.ts","sourceRoot":"","sources":["../../lib/StorageClient/fileVersionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAC5E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,KAAK,EACV,YAAY,EACZ,yBAAyB,EACzB,mBAAmB,EACpB,MAAM,wBAAwB,CAAC;AAEhC,KAAK,sBAAsB,GAAG;IAC5B,YAAY,EAAE;QACZ,OAAO,EAAE,mBAAmB,CAAC;QAC7B,aAAa,EAAE,yBAAyB,CAAC;KAC1C,CAAC;CACH,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAI,QAAQ,eAAe,WACC,CAAC;AAEjE,eAAO,MAAM,kBAAkB,GAC7B,QAAQ,eAAe,GAAG,SAAS,EACnC,WAAW,MAAM,KAChB,MAAM,IAAI,eAAe,GAAG;IAAE,UAAU,EAAE,WAAW,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,CAAA;CACT,CAAC;AAE/E,eAAO,MAAM,mBAAmB,GAAI,KAAK,aAAa,EAAE,QAAQ,eAAe,yCAI9E,CAAC;AAEF,eAAO,MAAM,4BAA4B,GAAI,KAAK,aAAa,EAAE,QAAQ,eAAe,yDAKvF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fileVersionUtils.js","sourceRoot":"","sources":["../../lib/StorageClient/fileVersionUtils.ts"],"names":[],"mappings":";;;AAgBO,MAAM,uBAAuB,GAAG,CAAC,MAAuB,EAAE,EAAE,CACjE,MAAM,CAAC,UAAU,EAAE,SAAS,IAAI,GAAG,MAAM,CAAC,SAAS,WAAW,CAAC;AADpD,QAAA,uBAAuB,2BAC6B;AAE1D,MAAM,kBAAkB,GAAG,CAChC,MAAmC,EACnC,SAAiB,EACuE,EAAE,CAC1F,OAAO,CAAC,MAAM,EAAE,UAAU,IAAI,IAAA,+BAAuB,EAAC,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC;AAJlE,QAAA,kBAAkB,sBAIgD;AAExE,MAAM,mBAAmB,GAAG,CAAC,GAAkB,EAAE,MAAuB,EAAE,EAAE;IACjF,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,SAAS,
|
|
1
|
+
{"version":3,"file":"fileVersionUtils.js","sourceRoot":"","sources":["../../lib/StorageClient/fileVersionUtils.ts"],"names":[],"mappings":";;;AAgBO,MAAM,uBAAuB,GAAG,CAAC,MAAuB,EAAE,EAAE,CACjE,MAAM,CAAC,UAAU,EAAE,SAAS,IAAI,GAAG,MAAM,CAAC,SAAS,WAAW,CAAC;AADpD,QAAA,uBAAuB,2BAC6B;AAE1D,MAAM,kBAAkB,GAAG,CAChC,MAAmC,EACnC,SAAiB,EACuE,EAAE,CAC1F,OAAO,CAAC,MAAM,EAAE,UAAU,IAAI,IAAA,+BAAuB,EAAC,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC;AAJlE,QAAA,kBAAkB,sBAIgD;AAExE,MAAM,mBAAmB,GAAG,CAAC,GAAkB,EAAE,MAAuB,EAAE,EAAE;IACjF,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,SAAS,CAAqD,CAAC;IAC1F,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;IAC3E,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAJW,QAAA,mBAAmB,uBAI9B;AAEK,MAAM,4BAA4B,GAAG,CAAC,GAAkB,EAAE,MAAuB,EAAE,EAAE;IAC1F,MAAM,OAAO,GAAG,GAAG,CAAC,IAAA,+BAAuB,EAAC,MAAM,CAAC,CACe,CAAC;IACnE,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;IAC3E,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AALW,QAAA,4BAA4B,gCAKvC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -13,7 +13,7 @@ export type { DBHandlerServer } from "./Prostgles";
|
|
|
13
13
|
export type { StorageClient as CloudClient } from "./StorageClient/StorageClientTypes";
|
|
14
14
|
export * from "./StorageClient/getLocalStorageClient";
|
|
15
15
|
export type { ContextCleanup, CreateContext, CreateContextParams, DB, InitResult, OnReadyParams, } from "./initProstgles";
|
|
16
|
-
export type { ProstglesInitOptions } from "./ProstglesTypes";
|
|
16
|
+
export type { FileTableConfig, ProstglesInitOptions, TableConfigMigrations, } from "./ProstglesTypes";
|
|
17
17
|
export type * from "./TableConfig/TableConfigTypes";
|
|
18
18
|
export type * from "./Audit/AuditTypes";
|
|
19
19
|
export type * from "./TableHooks/TableHooks";
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAwB,MAAM,iBAAiB,CAAC;AAExE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAE7D,iBAAS,SAAS,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,SAAS,WAAW,GAAG,WAAW,EAAE,OAAO,GAAG,SAAS,EACvF,MAAM,EAAE,oBAAoB,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,GAK9B,OAAO,CAAC,UAAU,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,CACxD;AAED,qFAAqF;AACrF,eAAO,MAAM,eAAe,GAAI,CAAC,GAAG,IAAI,EAAE,KAAK,SAAS,WAAW,GAAG,WAAW,QACvE,OAAO,GAAG,SAAS,EAAE,QAAQ,oBAAoB,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,2CAE7E,CAAC;AACF,cAAc,sCAAsC,CAAC;AACrD,cAAc,kBAAkB,CAAC;AAEjC,YAAY,EACV,mBAAmB,EACnB,OAAO,EACP,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,mBAAmB,EACnB,iBAAiB,EACjB,kBAAkB,EAClB,cAAc,EACd,aAAa,GACd,MAAM,sCAAsC,CAAC;AAC9C,YAAY,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAC5F,YAAY,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,YAAY,EAAE,aAAa,IAAI,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACvF,cAAc,uCAAuC,CAAC;AACtD,YAAY,EACV,cAAc,EACd,aAAa,EACb,mBAAmB,EACnB,EAAE,EACF,UAAU,EACV,aAAa,GACd,MAAM,iBAAiB,CAAC;AACzB,YAAY,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAwB,MAAM,iBAAiB,CAAC;AAExE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAE7D,iBAAS,SAAS,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,SAAS,WAAW,GAAG,WAAW,EAAE,OAAO,GAAG,SAAS,EACvF,MAAM,EAAE,oBAAoB,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,GAK9B,OAAO,CAAC,UAAU,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,CACxD;AAED,qFAAqF;AACrF,eAAO,MAAM,eAAe,GAAI,CAAC,GAAG,IAAI,EAAE,KAAK,SAAS,WAAW,GAAG,WAAW,QACvE,OAAO,GAAG,SAAS,EAAE,QAAQ,oBAAoB,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,2CAE7E,CAAC;AACF,cAAc,sCAAsC,CAAC;AACrD,cAAc,kBAAkB,CAAC;AAEjC,YAAY,EACV,mBAAmB,EACnB,OAAO,EACP,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,mBAAmB,EACnB,iBAAiB,EACjB,kBAAkB,EAClB,cAAc,EACd,aAAa,GACd,MAAM,sCAAsC,CAAC;AAC9C,YAAY,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAC5F,YAAY,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,YAAY,EAAE,aAAa,IAAI,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACvF,cAAc,uCAAuC,CAAC;AACtD,YAAY,EACV,cAAc,EACd,aAAa,EACb,mBAAmB,EACnB,EAAE,EACF,UAAU,EACV,aAAa,GACd,MAAM,iBAAiB,CAAC;AACzB,YAAY,EACV,eAAe,EACf,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,kBAAkB,CAAC;AAC1B,mBAAmB,gCAAgC,CAAC;AACpD,mBAAmB,oBAAoB,CAAC;AACxC,mBAAmB,yBAAyB,CAAC;AAC7C,cAAc,2CAA2C,CAAC;AAC1D,YAAY,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC/E,eAAe,SAAS,CAAC;AACzB,YAAY,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAC3F,OAAO,EAAE,UAAU,EAAE,CAAC;AACtB,OAAO,EACL,8BAA8B,EAC9B,wBAAwB,EACxB,mBAAmB,EACnB,KAAK,mBAAmB,EACxB,KAAK,aAAa,GACnB,MAAM,oBAAoB,CAAC"}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qDAA6C;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qDAA6C;AA2DpC,2FA3DA,4BAAU,OA2DA;AAxDnB,2CAAwC;AAGxC,SAAS,SAAS,CAChB,MAA+C;IAE/C,MAAM,IAAI,GAAG,IAAI,qBAAS,CAAC,MAAiE,CAAC,CAAC;IAC9F,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAA0C,EAAE;QAClE,IAAI,EAAE,MAAM;KACb,CAAsD,CAAC;AAC1D,CAAC;AAED,qFAAqF;AAC9E,MAAM,eAAe,GAAG,GAAsD,EAAE;IACrF,OAAO,CAAsB,MAA+C,EAAE,EAAE,CAC9E,SAAS,CAAoB,MAAM,CAAC,CAAC;AACzC,CAAC,CAAC;AAHW,QAAA,eAAe,mBAG1B;AACF,uEAAqD;AACrD,mDAAiC;AAiBjC,wEAAsD;AAiBtD,4EAA0D;AAE1D,kBAAe,SAAS,CAAC;AAGzB,iDAM4B;AAL1B,4HAAA,8BAA8B,OAAA;AAC9B,sHAAA,wBAAwB,OAAA;AACxB,iHAAA,mBAAmB,OAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DBOFullyTyped.spec.js","sourceRoot":"","sources":["../../lib/typeTests/DBOFullyTyped.spec.ts"],"names":[],"mappings":";;AAAA,yCAA2C;AAuB3C,KAAK,IAAA,oBAAQ,EAAC,oBAAoB,EAAE,KAAK,IAAI,EAAE;IAC7C,MAAM,IAAA,gBAAI,EAAC,WAAW,EAAE,GAAG,EAAE;QAC3B,MAAM,CAAC,GAAG,KAAK,IAAI,EAAE;YACnB,MAAM,GAAG,GAAG,EAAmB,CAAC;YAChC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC;YAEpB,MAAM,IAAI,GAAG,EAAqB,CAAC;YACnC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC;YAEb,MAAM,EAAE,GAAG,EAAsC,CAAC;YAElD,0CAA0C;YAC1C,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE;gBACjC,OAAO,MAAe,CAAC;YACzB,CAAC,CAAC,CAAC;YACH,KAAsB,CAAC;YAEvB,6DAA6D;YAC7D,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC;YAEf,MAAM,CAAC,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,CAC5B,EAAE,EACF;gBACE,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE;gBACjB,OAAO,EAAE;oBACP,EAAE,EAAE,CAAC;iBACN;aACF,CACF,CAAC;YAEF,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;YAET,kBAAkB;YAClB,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC;YAEd,MAAM,GAAG,GAAG,
|
|
1
|
+
{"version":3,"file":"DBOFullyTyped.spec.js","sourceRoot":"","sources":["../../lib/typeTests/DBOFullyTyped.spec.ts"],"names":[],"mappings":";;AAAA,yCAA2C;AAuB3C,KAAK,IAAA,oBAAQ,EAAC,oBAAoB,EAAE,KAAK,IAAI,EAAE;IAC7C,MAAM,IAAA,gBAAI,EAAC,WAAW,EAAE,GAAG,EAAE;QAC3B,MAAM,CAAC,GAAG,KAAK,IAAI,EAAE;YACnB,MAAM,GAAG,GAAG,EAAmB,CAAC;YAChC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC;YAEpB,MAAM,IAAI,GAAG,EAAqB,CAAC;YACnC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC;YAEb,MAAM,EAAE,GAAG,EAAsC,CAAC;YAElD,0CAA0C;YAC1C,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE;gBACjC,OAAO,MAAe,CAAC;YACzB,CAAC,CAAC,CAAC;YACH,KAAsB,CAAC;YAEvB,6DAA6D;YAC7D,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC;YAEf,MAAM,CAAC,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,CAC5B,EAAE,EACF;gBACE,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE;gBACjB,OAAO,EAAE;oBACP,EAAE,EAAE,CAAC;iBACN;aACF,CACF,CAAC;YAEF,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;YAET,kBAAkB;YAClB,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC;YAEd,MAAM,GAAG,GAAG,EAAoC,CAAC;YACjD,KAAK,GAAG,CAAC,IAAI,CACX,EAAE,EACF;gBACE,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE;gBACjB,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;aACvB,CACF,CAAC;YAEF,KAAK,GAAG,CAAC,IAAI,CACX,EAAE,EACF;gBACE,kBAAkB;gBAClB,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE;aACvB,CACF,CAAC;YAEF,KAAK,GAAG,CAAC,IAAI,CACX,EAAE,EACF;gBACE,kBAAkB;gBAClB,OAAO,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE;aACxB,CACF,CAAC;YAEF,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAGzE,CAAC;YAEJ,MAAM,OAAO,GAA+B;gBAC1C,KAAK,EAAE;oBACL,MAAM,EAAE;wBACN,MAAM,EAAE;4BACN,IAAI,EAAE,CAAC;4BACP,kBAAkB;4BAClB,OAAO,EAAE,CAAC;yBACX;wBACD,QAAQ,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;4BAClB,GAAG,GAAG;4BACN,CAAC,EAAE,CAAC,EAAE,CAAC;yBACR,CAAC;qBACH;iBACF;aACF,CAAC;YACF,OAAO,CAAC;QACV,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -30,15 +30,15 @@ export const getAuditTableRules = async function (
|
|
|
30
30
|
return auditTablePublishRules;
|
|
31
31
|
}
|
|
32
32
|
|
|
33
|
-
const
|
|
34
|
-
(tableName) => canSelect(resolvedPublishObject?.[tableName]) || this.dbo[tableName]?.is_media,
|
|
33
|
+
const auditedTableEntries = Object.entries(audit.tables).filter(
|
|
34
|
+
([tableName]) => canSelect(resolvedPublishObject?.[tableName]) || this.dbo[tableName]?.is_media,
|
|
35
35
|
);
|
|
36
36
|
|
|
37
37
|
const auditTableHandler = this.dbo[audit.tableName]!;
|
|
38
38
|
|
|
39
39
|
const auditedTableRules = (
|
|
40
40
|
await Promise.all(
|
|
41
|
-
|
|
41
|
+
auditedTableEntries.map(async ([tableName, { idColumns, excludeColumns }]) => {
|
|
42
42
|
const tableHandler = this.dbo[tableName];
|
|
43
43
|
if (!tableHandler) return;
|
|
44
44
|
|
|
@@ -59,11 +59,11 @@ export const getAuditTableRules = async function (
|
|
|
59
59
|
additionalForcedCondition: await getSourceAuditCondition(
|
|
60
60
|
tableHandler,
|
|
61
61
|
rules.select.forcedFilter,
|
|
62
|
-
|
|
62
|
+
excludeColumns,
|
|
63
63
|
),
|
|
64
64
|
tableColumnOverrides: getAuditRowColumnOverrides(
|
|
65
65
|
tableHandler.parseFieldFilter(rules.select.fields),
|
|
66
|
-
|
|
66
|
+
idColumns,
|
|
67
67
|
),
|
|
68
68
|
};
|
|
69
69
|
}),
|
|
@@ -1,18 +1,17 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { DBSchema, TableHandler } from "prostgles-types";
|
|
2
2
|
import type { TX } from "../DboBuilder/DboBuilderTypes";
|
|
3
3
|
import type { PublishAllOrNothing, PublishTableRule } from "../PublishParser/PublishParser";
|
|
4
4
|
import { type PublishObject } from "../PublishParser/PublishParser";
|
|
5
5
|
|
|
6
6
|
export type ServerTableHandler<
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
> = TableHandler<T, Schema, TName> & { isView: boolean };
|
|
7
|
+
Schema extends DBSchema = DBSchema,
|
|
8
|
+
TName extends keyof Schema = keyof Schema,
|
|
9
|
+
> = TableHandler<Schema, TName> & { isView: boolean };
|
|
11
10
|
|
|
12
11
|
export type DBTableHandlersFromSchema<Schema = void> =
|
|
13
12
|
Schema extends DBSchema ?
|
|
14
13
|
{
|
|
15
|
-
[tov_name in keyof Schema]: ServerTableHandler<Schema
|
|
14
|
+
[tov_name in keyof Schema]: ServerTableHandler<Schema, tov_name>;
|
|
16
15
|
}
|
|
17
16
|
: Record<string, Partial<ServerTableHandler>>;
|
|
18
17
|
|
|
@@ -32,7 +31,7 @@ export type DBOFullyTypedClient<Schema = void> =
|
|
|
32
31
|
Schema extends DBSchema ?
|
|
33
32
|
{
|
|
34
33
|
[TName in keyof Schema]:
|
|
35
|
-
| TableHandler<Schema
|
|
34
|
+
| TableHandler<Schema, TName>
|
|
36
35
|
| (Schema[TName] extends { optional: true } ? undefined : never);
|
|
37
36
|
}
|
|
38
37
|
: Record<string, Partial<TableHandler>>;
|
|
@@ -74,7 +74,7 @@ export const getClientDBGeneratedSchemas = (
|
|
|
74
74
|
!updating.length ? "never" : (
|
|
75
75
|
[
|
|
76
76
|
updateAllowed.length ?
|
|
77
|
-
`Partial<
|
|
77
|
+
`Partial<Pick<${tableType}["columns"], ${keys(updateAllowed)}>>`
|
|
78
78
|
: "",
|
|
79
79
|
updateExcluded.length ? `{ ${updateExcluded.join("; ")} }` : "",
|
|
80
80
|
]
|
|
@@ -18,6 +18,7 @@ export const getPublishedObjectFromResult = (
|
|
|
18
18
|
publish: PublishedResult | undefined,
|
|
19
19
|
tablesOrViews: TableSchema[],
|
|
20
20
|
publishParams: PublishParams | undefined,
|
|
21
|
+
contextReplacementMode: "runtime" | "schemaGeneration" = "runtime",
|
|
21
22
|
): PublishObject => {
|
|
22
23
|
if (!publish) return {};
|
|
23
24
|
if (publish === "*") {
|
|
@@ -52,14 +53,18 @@ export const getPublishedObjectFromResult = (
|
|
|
52
53
|
);
|
|
53
54
|
}
|
|
54
55
|
|
|
55
|
-
return replaceContextPlaceholders(publish, publishParams);
|
|
56
|
+
return replaceContextPlaceholders(publish, publishParams, contextReplacementMode);
|
|
56
57
|
};
|
|
57
58
|
|
|
58
|
-
const replaceContextPlaceholders = <T>(
|
|
59
|
+
const replaceContextPlaceholders = <T>(
|
|
60
|
+
publish: T,
|
|
61
|
+
publishParams: PublishParams | undefined,
|
|
62
|
+
mode: "runtime" | "schemaGeneration",
|
|
63
|
+
): T => {
|
|
59
64
|
const context = { user: publishParams?.user };
|
|
60
|
-
if (!publishParams) return publish;
|
|
65
|
+
if (!publishParams && mode === "runtime") return publish;
|
|
61
66
|
if (isArray(publish)) {
|
|
62
|
-
return publish.map((item) => replaceContextPlaceholders(item, publishParams)) as T;
|
|
67
|
+
return publish.map((item) => replaceContextPlaceholders(item, publishParams, mode)) as T;
|
|
63
68
|
}
|
|
64
69
|
if (isObject(publish) && isPlainObject(publish)) {
|
|
65
70
|
const { data } = getJSONBSchemaValidationError(
|
|
@@ -75,6 +80,7 @@ const replaceContextPlaceholders = <T>(publish: T, publishParams: PublishParams
|
|
|
75
80
|
);
|
|
76
81
|
if (data) {
|
|
77
82
|
data satisfies PublishContextValue;
|
|
83
|
+
if (mode === "schemaGeneration") return null as T;
|
|
78
84
|
const { objectName, objectPropertyName } = data["$prostglesContext"];
|
|
79
85
|
const contextObject = getProperty(context, objectName);
|
|
80
86
|
if (!contextObject) {
|
|
@@ -91,7 +97,7 @@ const replaceContextPlaceholders = <T>(publish: T, publishParams: PublishParams
|
|
|
91
97
|
return Object.fromEntries(
|
|
92
98
|
Object.entries(publish).map(([key, value]) => [
|
|
93
99
|
key,
|
|
94
|
-
replaceContextPlaceholders(value, publishParams),
|
|
100
|
+
replaceContextPlaceholders(value, publishParams, mode),
|
|
95
101
|
]),
|
|
96
102
|
) as T;
|
|
97
103
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { TableHandler } from "prostgles-types";
|
|
1
|
+
import type { TableHandler, TableHandlerForColumns } from "prostgles-types";
|
|
2
2
|
import type { TableHandlers } from "../DboBuilder/DboBuilder";
|
|
3
3
|
import type { FileTableConfig } from "../ProstglesTypes";
|
|
4
4
|
import type {
|
|
@@ -24,14 +24,14 @@ export const isFileVersionTable = (
|
|
|
24
24
|
Boolean(config?.versioning && getFileVersionTableName(config) === tableName);
|
|
25
25
|
|
|
26
26
|
export const getFileTableHandler = (dbo: TableHandlers, config: FileTableConfig) => {
|
|
27
|
-
const handler = dbo[config.tableName] as
|
|
27
|
+
const handler = dbo[config.tableName] as TableHandlerForColumns<FileTableRow> | undefined;
|
|
28
28
|
if (!handler) throw new Error(`File table not found: ${config.tableName}`);
|
|
29
29
|
return handler;
|
|
30
30
|
};
|
|
31
31
|
|
|
32
32
|
export const getFileRevisionsTableHandler = (dbo: TableHandlers, config: FileTableConfig) => {
|
|
33
33
|
const handler = dbo[getFileVersionTableName(config)] as
|
|
34
|
-
TableHandler<
|
|
34
|
+
TableHandler<FileVersionTableSchema, "fileVersions"> | undefined;
|
|
35
35
|
if (!handler) throw new Error(`File table not found: ${config.tableName}`);
|
|
36
36
|
return handler;
|
|
37
37
|
};
|
package/lib/index.ts
CHANGED
|
@@ -45,7 +45,11 @@ export type {
|
|
|
45
45
|
InitResult,
|
|
46
46
|
OnReadyParams,
|
|
47
47
|
} from "./initProstgles";
|
|
48
|
-
export type {
|
|
48
|
+
export type {
|
|
49
|
+
FileTableConfig,
|
|
50
|
+
ProstglesInitOptions,
|
|
51
|
+
TableConfigMigrations,
|
|
52
|
+
} from "./ProstglesTypes";
|
|
49
53
|
export type * from "./TableConfig/TableConfigTypes";
|
|
50
54
|
export type * from "./Audit/AuditTypes";
|
|
51
55
|
export type * from "./TableHooks/TableHooks";
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "prostgles-server",
|
|
3
|
-
"version": "4.2.
|
|
3
|
+
"version": "4.2.629",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
"pg": "^8.23.0",
|
|
58
58
|
"pg-cursor": "^2.22.0",
|
|
59
59
|
"pg-promise": "^12.7.1",
|
|
60
|
-
"prostgles-types": "^4.0.
|
|
60
|
+
"prostgles-types": "^4.0.290"
|
|
61
61
|
},
|
|
62
62
|
"devDependencies": {
|
|
63
63
|
"@eslint/js": "^9.22.0",
|