@paroicms/server 1.82.0 → 1.83.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paroicms/server",
-  "version": "1.82.0",
+  "version": "1.83.1",
   "description": "The ParoiCMS server",
   "keywords": [
     "cms",
@@ -20,7 +20,7 @@
   "license": "MIT",
   "scripts": {
     "start": "node dist/start.js | npm run _pino-pretty",
-    "build": "tsc",
+    "build": "npm run graphql:generate-types && npm run tsc",
     "tsc": "tsc",
     "nodemon": "NODE_ENV=development nodemon --delay 1 --watch dist --watch config.json --watch site-schema-lib --watch 'sites/*/*.json' --watch '../../packages/[!bo-]*/dist/*' --watch '../../packages/[!bo-]*/dist-cjs/*' --watch '../../plugins/*/*-backend/dist/*' dist/start.js | npm run _pino-pretty",
     "tsc:watch": "tsc --watch --preserveWatchOutput",
@@ -37,15 +37,15 @@
     "@apollo/server": "~4.11.3",
     "@aws-sdk/client-ses": "~3.731.1",
     "@paroi/data-formatters-lib": "~0.4.0",
-    "@paroicms/internal-anywhere-lib": "1.26.0",
-    "@paroicms/bo": "1.64.1",
-    "@paroicms/public-anywhere-lib": "0.20.0",
-    "@paroicms/public-server-lib": "0.30.0",
-    "@paroicms/server-database-media-storage": "1.17.0",
-    "@paroicms/server-image-cache-engine": "1.21.0",
-    "@paroicms/internal-server-lib": "1.14.0",
-    "@paroicms/server-text-cache-system": "1.13.2",
-    "@paroicms/connector": "0.30.1",
+    "@paroicms/internal-anywhere-lib": "1.27.0",
+    "@paroicms/bo": "1.65.1",
+    "@paroicms/public-anywhere-lib": "0.21.0",
+    "@paroicms/public-server-lib": "0.31.0",
+    "@paroicms/server-database-media-storage": "1.18.0",
+    "@paroicms/server-image-cache-engine": "1.22.0",
+    "@paroicms/internal-server-lib": "1.15.0",
+    "@paroicms/server-text-cache-system": "1.14.0",
+    "@paroicms/connector": "0.31.0",
     "@types/express": "~4.17.21",
     "bcrypt": "~5.1.1",
     "compression": "~1.7.5",

package/schema.graphql

@@ -1,3 +1,8 @@
+"""
+A date-time string at UTC, such as 2019-12-03T09:54:33Z, compliant with the date-time format.
+"""
+scalar DateTime
+
 type Query {
   account(id: ID!): Account!
   allAccounts: [Account!]!
@@ -56,11 +61,6 @@ type BreadcrumbItem {
   typeName: String!
 }
 
-"""
-A date-time string at UTC, such as 2019-12-03T09:54:33Z, compliant with the date-time format.
-"""
-scalar DateTime
-
 type Document {
   featuredImage: Media
   featuredImageHandle: String!
@@ -91,13 +91,6 @@ type FieldValuesOfList {
   fieldValues: String!
 }
 
-type Labeling {
-  document(language: String!): TermDocument
-  isLead: Boolean!
-  taxonomyTypeName: String!
-  termId: ID!
-}
-
 type LanguageWithLabel {
   label: String!
   language: ID!
@@ -105,7 +98,6 @@ type LanguageWithLabel {
 
 type Node {
   id: ID!
-  labeledBy: [Labeling!]!
   parentId: ID
   publishDate: DateTime
   relativeId: String!
@@ -233,7 +225,6 @@ type UsedImage {
 }
 
 type Mutation {
-  setLabeling(labeledNodeId: ID!, taxonomyNodeId: ID!, terms: [TermValues!]!): Boolean!
   createAccount(values: CreateAccountValues!): Account!
   createDocumentOnNode(language: String!, nodeId: ID!, values: CreateDocumentValues): Document!
   createNodeWithDocument(parentNodelId: String!, values: CreateNodeWithDocumentValues!): Document!
@@ -255,7 +246,7 @@ type Mutation {
   resetAccountPassword(accountId: ID!): Boolean!
   setAccountPreferences(accountId: ID!, values: AccountPreferencesValues!): String!
   setFieldValues(language: String, nodeId: ID!, values: String!): Boolean!
-  setNodePublishDate(nodeId: ID!, publishDate: DateTime!): Node!
+  setNodePublishDate(nodeId: ID!, publishDate: DateTime): Node!
   setNodelReady(ready: Boolean!, nodelId: ID!): Boolean!
   setSiteFieldValues(language: String, values: String!): Boolean!
   updateAccount(accountId: ID!, values: UpdateAccountValues!): Account!
@@ -287,10 +278,6 @@ input CreateNodeWithDocumentValues {
   typeName: String!
 }
 
-input TermValues {
-  isLead: Boolean
-  termNodeId: ID!
-}
 
 input OrderByItem {
   direction: String!

package/dist/bo-backend/labeling/labeling.queries.d.ts

@@ -1,15 +0,0 @@
-import type { SiteContext } from "../../site-context/site-context.types.js";
-export interface LabelingSeed {
-    termId: string;
-    isLead: boolean;
-    taxonomyTypeName: string;
-}
-export interface TermValues {
-    termNodeId: string;
-    isLead?: boolean;
-}
-export declare function setLabeling(siteContext: SiteContext, { labeledNodeId, taxonomyNodeId, terms, }: {
-    labeledNodeId: string;
-    taxonomyNodeId: string;
-    terms: TermValues[];
-}): Promise<void>;

package/dist/bo-backend/labeling/labeling.queries.js

@@ -1,47 +0,0 @@
-import { invalidateDocumentRelationCache } from "../../common/text-cache.js";
-import { getTypeNameOf } from "../node/node.queries.js";
-export async function setLabeling(siteContext, { labeledNodeId, taxonomyNodeId, terms, }) {
-    const termIds = terms.map((term) => term.termNodeId);
-    const rows = await siteContext
-        .cn("PaNode as l")
-        .select("l.id as id")
-        .whereIn("l.id", termIds)
-        .andWhereNot("l.parentId", taxonomyNodeId);
-    if (rows.length > 0) {
-        const invalidTermIds = rows.map((row) => row.id);
-        throw new Error(`term(s) '${invalidTermIds.join("', '")}' should be in taxonomy '${taxonomyNodeId}'`);
-    }
-    await siteContext.cn.transaction(async (tx) => {
-        await deleteOldLabelings(tx, { labeledNodeId, taxonomyNodeId });
-        await insertNewLabelings(labeledNodeId, {
-            terms,
-            cn: tx,
-        });
-    });
-    await invalidateDocumentRelationCache(siteContext, {
-        nodeId: labeledNodeId,
-        relation: "labeled",
-        taxonomyTypeName: await getTypeNameOf(siteContext, taxonomyNodeId),
-    });
-}
-async function deleteOldLabelings(cn, { labeledNodeId, taxonomyNodeId }) {
-    await cn("PaLabeling")
-        .where("labeledId", labeledNodeId)
-        .whereExists(function () {
-        this.select(1)
-            .from("PaNode as t")
-            .whereRaw("t.id = PaLabeling.termId")
-            .andWhere("t.parentId", taxonomyNodeId);
-    })
-        .delete();
-}
-async function insertNewLabelings(labeledNodeId, { terms, cn }) {
-    for (const term of terms) {
-        await cn("PaLabeling").insert({
-            labeledId: labeledNodeId,
-            termId: term.termNodeId,
-            lead: term.isLead,
-        });
-    }
-}
-//# sourceMappingURL=labeling.queries.js.map

package/dist/bo-backend/labeling/labeling.queries.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"labeling.queries.js","sourceRoot":"","sources":["../../../src/bo-backend/labeling/labeling.queries.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,+BAA+B,EAAE,MAAM,4BAA4B,CAAC;AAE7E,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAaxD,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,WAAwB,EACxB,EACE,aAAa,EACb,cAAc,EACd,KAAK,GAKN;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAErD,MAAM,IAAI,GAAG,MAAM,WAAW;SAC3B,EAAE,CAAC,aAAa,CAAC;SACjB,MAAM,CAAC,YAAY,CAAC;SACpB,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;SACxB,WAAW,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;IAE7C,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACjD,MAAM,IAAI,KAAK,CACb,YAAY,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,4BAA4B,cAAc,GAAG,CACrF,CAAC;IACJ,CAAC;IAED,MAAM,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;QAC5C,MAAM,kBAAkB,CAAC,EAAE,EAAE,EAAE,aAAa,EAAE,cAAc,EAAE,CAAC,CAAC;QAEhE,MAAM,kBAAkB,CAAC,aAAa,EAAE;YACtC,KAAK;YACL,EAAE,EAAE,EAAE;SACP,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,+BAA+B,CAAC,WAAW,EAAE;QACjD,MAAM,EAAE,aAAa;QACrB,QAAQ,EAAE,SAAS;QACnB,gBAAgB,EAAE,MAAM,aAAa,CAAC,WAAW,EAAE,cAAc,CAAC;KACnE,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,kBAAkB,CAC/B,EAAoB,EACpB,EAAE,aAAa,EAAE,cAAc,EAAqD;IAEpF,MAAM,EAAE,CAAC,YAAY,CAAC;SACnB,KAAK,CAAC,WAAW,EAAE,aAAa,CAAC;SACjC,WAAW,CAAC;QACX,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;aACX,IAAI,CAAC,aAAa,CAAC;aACnB,QAAQ,CAAC,0BAA0B,CAAC;aACpC,QAAQ,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;IAC5C,CAAC,CAAC;SACD,MAAM,EAAE,CAAC;AACd,CAAC;AAED,KAAK,UAAU,kBAAkB,CAC/B,aAAqB,EACrB,EAAE,KAAK,EAAE,EAAE,EAAiD;IAE5D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,EAAE,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC;YAC5B,SAAS,EAAE,aAAa;YACxB,MAAM,EAAE,IAAI,CAAC,UAAU;YACvB,IAAI,EAAE,IAAI,CAAC,MAAM;SAClB,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}

package/dist/bo-backend/labeling/labeling.resolver.d.ts

@@ -1,3 +0,0 @@
-import type { GqlResolvers } from "../../graphql/generated-graphql-types.js";
-import type { GraphqlContext } from "../../graphql/graphql.types.js";
-export declare const labelingResolvers: GqlResolvers<GraphqlContext>;

package/dist/bo-backend/labeling/labeling.resolver.js

@@ -1,21 +0,0 @@
-import { authGuard } from "../auth/auth.helper.js";
-import { setLabeling } from "./labeling.queries.js";
-export const labelingResolvers = {
-    Mutation: {
-        setLabeling: async (_parent, { labeledNodeId, taxonomyNodeId, terms }, { siteContext, httpContext }) => {
-            authGuard(httpContext);
-            await setLabeling(siteContext, {
-                labeledNodeId,
-                taxonomyNodeId,
-                terms: terms.map((term) => {
-                    return {
-                        isLead: term.isLead ?? undefined,
-                        termNodeId: term.termNodeId,
-                    };
-                }),
-            });
-            return true;
-        },
-    },
-};
-//# sourceMappingURL=labeling.resolver.js.map

package/dist/bo-backend/labeling/labeling.resolver.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"labeling.resolver.js","sourceRoot":"","sources":["../../../src/bo-backend/labeling/labeling.resolver.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,MAAM,CAAC,MAAM,iBAAiB,GAAiC;IAC7D,QAAQ,EAAE;QACR,WAAW,EAAE,KAAK,EAChB,OAAO,EACP,EAAE,aAAa,EAAE,cAAc,EAAE,KAAK,EAAE,EACxC,EAAE,WAAW,EAAE,WAAW,EAAE,EAC5B,EAAE;YACF,SAAS,CAAC,WAAW,CAAC,CAAC;YACvB,MAAM,WAAW,CAAC,WAAW,EAAE;gBAC7B,aAAa;gBACb,cAAc;gBACd,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;oBACxB,OAAO;wBACL,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,SAAS;wBAChC,UAAU,EAAE,IAAI,CAAC,UAAU;qBAC5B,CAAC;gBACJ,CAAC,CAAC;aACH,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;KACF;CACF,CAAC"}

package/dist/public-payload/taxonomies.queries.d.ts

@@ -1,14 +0,0 @@
-import { type Obj } from "@paroi/data-formatters-lib";
-import type { Tracker } from "@paroicms/internal-server-lib";
-import type { ParsedNodelId } from "@paroicms/public-anywhere-lib";
-import type { SiteContext } from "../site-context/site-context.types.js";
-import type * as publicPayload from "./public-payload.types.js";
-export declare function loadLabeledByTerms(siteContext: SiteContext, tracker: Tracker, { documentId, taxonomyTypeName }: {
-    documentId: ParsedNodelId;
-    taxonomyTypeName: string;
-}): Promise<publicPayload.TermValues[] | undefined>;
-export declare function formatTermValues(row: Obj, { language, nodeId, typeName }?: {
-    language?: string;
-    nodeId?: string;
-    typeName?: string;
-}): publicPayload.TermValues;

package/dist/public-payload/taxonomies.queries.js

@@ -1,42 +0,0 @@
-import { boolVal, strValOrUndef } from "@paroi/data-formatters-lib";
-import { mainDbSchemaName } from "@paroicms/connector";
-import { formatDocValues, querySelectDocValues } from "./doc-values.queries.js";
-export async function loadLabeledByTerms(siteContext, tracker, { documentId, taxonomyTypeName }) {
-    const { cn } = siteContext;
-    const query = cn("PaNode as l");
-    querySelectDocValues(query);
-    query
-        .select("f.lead", "d.nodeId as dNodeId")
-        .innerJoin("PaLabeling as f", "f.termId", "l.id")
-        .innerJoin("PaNode as l2", "l2.id", "l.parentId")
-        .innerJoin("PaNodel as s", {
-        "s.nodeId": "l.id",
-        "s.language": cn.raw("?", [documentId.language]),
-        "s.ready": cn.raw("1"),
-    })
-        .innerJoin("PaDocument as d", {
-        "d.nodeId": "s.nodeId",
-        "d.language": cn.raw("?", [documentId.language]),
-    })
-        .where("f.labeledId", documentId.nodeId)
-        .whereRaw("l.publishDate <= current_timestamp")
-        .where("l2.typeName", taxonomyTypeName)
-        .orderBy("d.title", "asc");
-    const rows = await query;
-    tracker.trackAccess(mainDbSchemaName, "PaLabeling", "read");
-    return rows.map((row) => {
-        return {
-            ...formatDocValues(row, { language: documentId.language }),
-            isLead: boolVal(row.lead),
-            inRightLanguage: strValOrUndef(row.dNodeId) !== undefined,
-        };
-    });
-}
-export function formatTermValues(row, { language, nodeId, typeName } = {}) {
-    return {
-        ...formatDocValues(row, { language, nodeId, typeName }),
-        inRightLanguage: boolVal(row.inRightLanguage),
-        isLead: boolVal(row.inRightLanguage),
-    };
-}
-//# sourceMappingURL=taxonomies.queries.js.map

package/dist/public-payload/taxonomies.queries.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"taxonomies.queries.js","sourceRoot":"","sources":["../../src/public-payload/taxonomies.queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAIvD,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAGhF,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,WAAwB,EACxB,OAAgB,EAChB,EAAE,UAAU,EAAE,gBAAgB,EAA2D;IAEzF,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,CAAC;IAE3B,MAAM,KAAK,GAAG,EAAE,CAAC,aAAa,CAAC,CAAC;IAGhC,oBAAoB,CAAC,KAAK,CAAC,CAAC;IAG5B,KAAK;SACF,MAAM,CAAC,QAAQ,EAAE,qBAAqB,CAAC;SACvC,SAAS,CAAC,iBAAiB,EAAE,UAAU,EAAE,MAAM,CAAC;SAChD,SAAS,CAAC,cAAc,EAAE,OAAO,EAAE,YAAY,CAAC;SAChD,SAAS,CAAC,cAAc,EAAE;QACzB,UAAU,EAAE,MAAM;QAClB,YAAY,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAChD,SAAS,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC;KACvB,CAAC;SACD,SAAS,CAAC,iBAAiB,EAAE;QAC5B,UAAU,EAAE,UAAU;QACtB,YAAY,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;KACjD,CAAC;SACD,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,MAAM,CAAC;SACvC,QAAQ,CAAC,oCAAoC,CAAC;SAC9C,KAAK,CAAC,aAAa,EAAE,gBAAgB,CAAC;SACtC,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAE7B,MAAM,IAAI,GAAU,MAAM,KAAK,CAAC;IAChC,OAAO,CAAC,WAAW,CAAC,gBAAgB,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;IAE5D,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACtB,OAAO;YACL,GAAG,eAAe,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC;YAC1D,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;YACzB,eAAe,EAAE,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,SAAS;SAC1D,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,GAAQ,EACR,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,KAAgE,EAAE;IAE9F,OAAO;QACL,GAAG,eAAe,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;QACvD,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;QAC7C,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;KACrC,CAAC;AACJ,CAAC"}