@rytass/cms-base-nestjs-graphql-module 0.0.20 → 0.0.22

package/dto/article-version-content.input.d.ts

@@ -1,6 +1,7 @@
+import { QuadratsElement } from '@quadrats/core';
 export declare class ArticleVersionContentInput {
     language?: string | null;
     title: string;
     description?: string | null;
-    content: string;
+    content: QuadratsElement[];
 }

package/dto/article-version-content.input.js

@@ -1,4 +1,5 @@
 import { Field, InputType } from '@nestjs/graphql';
+import { QuadratsContentScalar } from '../scalars/quadrats-element.scalar.js';
 
 function _ts_decorate(decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc, d;
@@ -32,8 +33,8 @@ _ts_decorate([
     _ts_metadata("design:type", Object)
 ], ArticleVersionContentInput.prototype, "description", void 0);
 _ts_decorate([
-    Field(()=>String),
-    _ts_metadata("design:type", String)
+    Field(()=>QuadratsContentScalar),
+    _ts_metadata("design:type", Array)
 ], ArticleVersionContentInput.prototype, "content", void 0);
 ArticleVersionContentInput = _ts_decorate([
     InputType('ArticleVersionContentInput')

package/index.cjs.js

@@ -3,8 +3,8 @@
 var common = require('@nestjs/common');
 var cmsBaseNestjsModule = require('@rytass/cms-base-nestjs-module');
 var graphql = require('@nestjs/graphql');
-var memberBaseNestjsModule = require('@rytass/member-base-nestjs-module');
 var graphql$1 = require('graphql');
+var memberBaseNestjsModule = require('@rytass/member-base-nestjs-module');
 var DataLoader = require('dataloader');
 var lruCache = require('lru-cache');
 var typeorm = require('typeorm');
@@ -87,6 +87,49 @@ BackstageArticleDto = _ts_decorate$v([
     graphql.ObjectType('BackstageArticle')
 ], BackstageArticleDto);
 
+const QuadratsContentScalar = new graphql$1.GraphQLScalarType({
+    name: 'QuadratsContent',
+    description: 'QuadratsContent custom scalar type (as JSON string)',
+    parseValue: (value)=>{
+        if (typeof value === 'string') {
+            let parsedValue;
+            try {
+                parsedValue = JSON.parse(value);
+            } catch (error) {
+                common.Logger.error(`Error parsing QuadratsContent (parseValue): ${error}`);
+                throw new common.InternalServerErrorException('Invalid QuadratsElement value');
+            }
+            if (!Array.isArray(parsedValue)) {
+                throw new common.BadRequestException('Expected a JSON string for QuadratsContent');
+            }
+            return parsedValue;
+        }
+        throw new common.BadRequestException('Expected a JSON string for QuadratsContent');
+    },
+    serialize: (value)=>{
+        if (typeof value === 'string') {
+            return value;
+        }
+        try {
+            return JSON.stringify(value);
+        } catch (error) {
+            common.Logger.error(`Error serializing QuadratsContent: ${error}`);
+            throw new common.InternalServerErrorException('Error serializing QuadratsElement');
+        }
+    },
+    parseLiteral: (ast)=>{
+        try {
+            if (ast.kind === graphql$1.Kind.STRING) {
+                return JSON.parse(ast.value);
+            }
+        } catch (error) {
+            common.Logger.error(`Error parsing QuadratsContent (parseLiteral): ${error}`);
+            throw new common.InternalServerErrorException('Invalid QuadratsElement value');
+        }
+        throw new Error('Expected string literal for QuadratsContent');
+    }
+});
+
 function _ts_decorate$u(decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -119,8 +162,8 @@ _ts_decorate$u([
     _ts_metadata$s("design:type", Object)
 ], ArticleVersionContentInput.prototype, "description", void 0);
 _ts_decorate$u([
-    graphql.Field(()=>String),
-    _ts_metadata$s("design:type", String)
+    graphql.Field(()=>QuadratsContentScalar),
+    _ts_metadata$s("design:type", Array)
 ], ArticleVersionContentInput.prototype, "content", void 0);
 ArticleVersionContentInput = _ts_decorate$u([
     graphql.InputType('ArticleVersionContentInput')
@@ -218,74 +261,93 @@ function _ts_param$8(paramIndex, decorator) {
     };
 }
 class ArticleMutations {
+    multiLanguage;
     articleService;
-    constructor(articleService){
+    constructor(multiLanguage, articleService){
+        this.multiLanguage = multiLanguage;
         this.articleService = articleService;
     }
-    async createArticle(memberId, args) {
-        return this.articleService.create({
+    resolveCreateArticleArgs(args) {
+        const basePayload = {
             categoryIds: args.categoryIds,
             tags: args.tags,
-            multiLanguageContents: args.multiLanguageContents.reduce((vars, content)=>({
-                    ...vars,
-                    [content.language ?? cmsBaseNestjsModule.DEFAULT_LANGUAGE]: {
-                        title: content.title,
-                        description: content.description,
-                        content: content.content
-                    }
-                }), {}),
-            userId: memberId,
             submitted: args.submitted ?? undefined,
             signatureLevel: args.signatureLevel ?? null,
             releasedAt: args.releasedAt ?? null
+        };
+        if (!this.multiLanguage) {
+            const [content] = args.multiLanguageContents;
+            return {
+                ...basePayload,
+                title: content.title,
+                content: content.content,
+                description: content.description ?? undefined
+            };
+        }
+        const multiLanguageContents = args.multiLanguageContents.reduce((vars, content)=>({
+                ...vars,
+                [content.language ?? cmsBaseNestjsModule.DEFAULT_LANGUAGE]: {
+                    title: content.title,
+                    description: content.description,
+                    content: content.content
+                }
+            }), {});
+        return {
+            ...basePayload,
+            multiLanguageContents
+        };
+    }
+    async createArticle(memberId, args) {
+        return this.articleService.create({
+            ...this.resolveCreateArticleArgs(args),
+            userId: memberId
         });
     }
     async updateArticle(memberId, args) {
         return this.articleService.addVersion(args.id, {
-            categoryIds: args.categoryIds,
-            tags: args.tags,
-            multiLanguageContents: args.multiLanguageContents.reduce((vars, content)=>({
-                    ...vars,
-                    [content.language ?? cmsBaseNestjsModule.DEFAULT_LANGUAGE]: {
-                        title: content.title,
-                        description: content.description,
-                        content: content.content
-                    }
-                }), {}),
-            userId: memberId,
-            submitted: args.submitted ?? undefined,
-            signatureLevel: args.signatureLevel ?? null,
-            releasedAt: args.releasedAt ?? null
+            ...this.resolveCreateArticleArgs(args),
+            userId: memberId
         });
     }
     async deleteArticle(id) {
         await this.articleService.archive(id);
         return true;
     }
-    async submitArticle(memberId, id, version) {
+    async deleteArticleVersion(id, version) {
+        await this.articleService.deleteVersion(id, version);
+        return true;
+    }
+    async submitArticle(memberId, id) {
         return this.articleService.submit(id, {
-            version,
             userId: memberId
         });
     }
-    async approveArticle(id) {
+    async putBackArticle(memberId, id) {
+        return this.articleService.putBack(id);
+    }
+    async approveArticle(id, version) {
         const article = await this.articleService.findById(id);
-        return this.articleService.approveVersion(article);
+        return this.articleService.approveVersion({
+            id,
+            version: version ?? article.version
+        });
     }
     async rejectArticle(id, reason) {
-        const article = await this.articleService.findById(id);
-        return this.articleService.rejectVersion(article, {
+        return this.articleService.rejectVersion({
+            id
+        }, {
             reason
         });
     }
-    releaseArticle(userId, id, releasedAt) {
+    releaseArticle(userId, id, releasedAt, version) {
         return this.articleService.release(id, {
             releasedAt,
-            userId
+            userId,
+            version: version ?? undefined
         });
     }
-    withdrawArticle(id) {
-        return this.articleService.withdraw(id);
+    withdrawArticle(id, version) {
+        return this.articleService.withdraw(id, version);
     }
 }
 _ts_decorate$r([
@@ -325,34 +387,65 @@ _ts_decorate$r([
     _ts_metadata$p("design:returntype", Promise)
 ], ArticleMutations.prototype, "deleteArticle", null);
 _ts_decorate$r([
-    graphql.Mutation(()=>BackstageArticleDto),
+    graphql.Mutation(()=>Boolean),
     memberBaseNestjsModule.IsPublic(),
-    _ts_param$8(0, memberBaseNestjsModule.MemberId()),
-    _ts_param$8(1, graphql.Args('id', {
+    _ts_param$8(0, graphql.Args('id', {
         type: ()=>graphql.ID
     })),
-    _ts_param$8(2, graphql.Args('version', {
+    _ts_param$8(1, graphql.Args('version', {
         type: ()=>graphql.Int
     })),
     _ts_metadata$p("design:type", Function),
     _ts_metadata$p("design:paramtypes", [
-        String,
         String,
         Number
     ]),
     _ts_metadata$p("design:returntype", Promise)
+], ArticleMutations.prototype, "deleteArticleVersion", null);
+_ts_decorate$r([
+    graphql.Mutation(()=>BackstageArticleDto),
+    memberBaseNestjsModule.IsPublic(),
+    _ts_param$8(0, memberBaseNestjsModule.MemberId()),
+    _ts_param$8(1, graphql.Args('id', {
+        type: ()=>graphql.ID
+    })),
+    _ts_metadata$p("design:type", Function),
+    _ts_metadata$p("design:paramtypes", [
+        String,
+        String
+    ]),
+    _ts_metadata$p("design:returntype", Promise)
 ], ArticleMutations.prototype, "submitArticle", null);
 _ts_decorate$r([
     graphql.Mutation(()=>BackstageArticleDto),
     memberBaseNestjsModule.IsPublic(),
-    _ts_param$8(0, graphql.Args('id', {
+    _ts_param$8(0, memberBaseNestjsModule.MemberId()),
+    _ts_param$8(1, graphql.Args('id', {
         type: ()=>graphql.ID
     })),
     _ts_metadata$p("design:type", Function),
     _ts_metadata$p("design:paramtypes", [
+        String,
         String
     ]),
     _ts_metadata$p("design:returntype", Promise)
+], ArticleMutations.prototype, "putBackArticle", null);
+_ts_decorate$r([
+    graphql.Mutation(()=>BackstageArticleDto),
+    memberBaseNestjsModule.IsPublic(),
+    _ts_param$8(0, graphql.Args('id', {
+        type: ()=>graphql.ID
+    })),
+    _ts_param$8(1, graphql.Args('version', {
+        type: ()=>graphql.Int,
+        nullable: true
+    })),
+    _ts_metadata$p("design:type", Function),
+    _ts_metadata$p("design:paramtypes", [
+        String,
+        Object
+    ]),
+    _ts_metadata$p("design:returntype", Promise)
 ], ArticleMutations.prototype, "approveArticle", null);
 _ts_decorate$r([
     graphql.Mutation(()=>BackstageArticleDto),
@@ -381,11 +474,16 @@ _ts_decorate$r([
     _ts_param$8(2, graphql.Args('releasedAt', {
         type: ()=>Date
     })),
+    _ts_param$8(3, graphql.Args('version', {
+        type: ()=>graphql.Int,
+        nullable: true
+    })),
     _ts_metadata$p("design:type", Function),
     _ts_metadata$p("design:paramtypes", [
         String,
         String,
-        typeof Date === "undefined" ? Object : Date
+        typeof Date === "undefined" ? Object : Date,
+        Object
     ]),
     _ts_metadata$p("design:returntype", typeof Promise === "undefined" ? Object : Promise)
 ], ArticleMutations.prototype, "releaseArticle", null);
@@ -395,16 +493,22 @@ _ts_decorate$r([
     _ts_param$8(0, graphql.Args('id', {
         type: ()=>graphql.ID
     })),
+    _ts_param$8(1, graphql.Args('version', {
+        type: ()=>graphql.Int
+    })),
     _ts_metadata$p("design:type", Function),
     _ts_metadata$p("design:paramtypes", [
-        String
+        String,
+        Number
     ]),
     _ts_metadata$p("design:returntype", typeof Promise === "undefined" ? Object : Promise)
 ], ArticleMutations.prototype, "withdrawArticle", null);
 ArticleMutations = _ts_decorate$r([
     graphql.Resolver(),
+    _ts_param$8(0, common.Inject(cmsBaseNestjsModule.MULTIPLE_LANGUAGE_MODE)),
     _ts_metadata$p("design:type", Function),
     _ts_metadata$p("design:paramtypes", [
+        Boolean,
         typeof cmsBaseNestjsModule.ArticleBaseService === "undefined" ? Object : cmsBaseNestjsModule.ArticleBaseService
     ])
 ], ArticleMutations);
@@ -714,46 +818,6 @@ Collection = _ts_decorate$j([
     graphql.ObjectType('Collection')
 ], Collection);
 
-const QuadratsContentScalar = new graphql$1.GraphQLScalarType({
-    name: 'QuadratsContent',
-    description: 'QuadratsContent custom scalar type (as JSON string)',
-    parseValue: (value)=>{
-        if (typeof value === 'string') {
-            let parsedValue;
-            try {
-                parsedValue = JSON.parse(value);
-            } catch (error) {
-                common.Logger.error(`Error parsing QuadratsContent (parseValue): ${error}`);
-                throw new common.InternalServerErrorException('Invalid QuadratsElement value');
-            }
-            if (!Array.isArray(parsedValue)) {
-                throw new common.BadRequestException('Expected a JSON string for QuadratsContent');
-            }
-            return parsedValue;
-        }
-        throw new common.BadRequestException('Expected a JSON string for QuadratsContent');
-    },
-    serialize: (value)=>{
-        try {
-            return JSON.stringify(value);
-        } catch (error) {
-            common.Logger.error(`Error serializing QuadratsContent: ${error}`);
-            throw new common.InternalServerErrorException('Error serializing QuadratsElement');
-        }
-    },
-    parseLiteral: (ast)=>{
-        try {
-            if (ast.kind === graphql$1.Kind.STRING) {
-                return JSON.parse(ast.value);
-            }
-        } catch (error) {
-            common.Logger.error(`Error parsing QuadratsContent (parseLiteral): ${error}`);
-            throw new common.InternalServerErrorException('Invalid QuadratsElement value');
-        }
-        throw new Error('Expected string literal for QuadratsContent');
-    }
-});
-
 function _ts_decorate$i(decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -1270,6 +1334,9 @@ class ArticleResolver {
         this.articleDataloader = articleDataloader;
         this.multiLanguage = multiLanguage;
     }
+    articleId(article) {
+        return article.id.split(':')[0];
+    }
     releasedBy(article) {
         return article.releasedBy ? this.memberDataloader.loader.load(article.releasedBy) : null;
     }
@@ -1280,6 +1347,16 @@ class ArticleResolver {
         });
     }
 }
+_ts_decorate$7([
+    graphql.ResolveField(()=>String),
+    memberBaseNestjsModule.IsPublic(),
+    _ts_param$2(0, graphql.Root()),
+    _ts_metadata$6("design:type", Function),
+    _ts_metadata$6("design:paramtypes", [
+        typeof ArticleBaseDto === "undefined" ? Object : ArticleBaseDto
+    ]),
+    _ts_metadata$6("design:returntype", String)
+], ArticleResolver.prototype, "articleId", null);
 _ts_decorate$7([
     graphql.ResolveField(()=>UserDto, {
         nullable: true
@@ -1481,6 +1558,9 @@ class BackstageArticleResolver {
     id(article) {
         return `${article.id}:${article.version}`;
     }
+    articleId(article) {
+        return article.id;
+    }
     submittedBy(article) {
         return article.submittedBy ? this.memberDataloader.loader.load(article.submittedBy) : null;
     }
@@ -1564,6 +1644,16 @@ _ts_decorate$3([
     ]),
     _ts_metadata$2("design:returntype", String)
 ], BackstageArticleResolver.prototype, "id", null);
+_ts_decorate$3([
+    graphql.ResolveField(()=>String),
+    memberBaseNestjsModule.IsPublic(),
+    _ts_param$1(0, graphql.Root()),
+    _ts_metadata$2("design:type", Function),
+    _ts_metadata$2("design:paramtypes", [
+        typeof ArticleBaseDto === "undefined" ? Object : ArticleBaseDto
+    ]),
+    _ts_metadata$2("design:returntype", String)
+], BackstageArticleResolver.prototype, "articleId", null);
 _ts_decorate$3([
     graphql.ResolveField(()=>UserDto, {
         nullable: true

package/mutations/article.mutations.d.ts

@@ -3,14 +3,18 @@ import { BackstageArticleDto } from '../dto/backstage-article.dto';
 import { CreateArticleArgs } from '../dto/create-article.args';
 import { UpdateArticleArgs } from '../dto/update-article.args';
 export declare class ArticleMutations {
+    private readonly multiLanguage;
     private readonly articleService;
-    constructor(articleService: ArticleBaseService);
+    constructor(multiLanguage: boolean, articleService: ArticleBaseService);
+    private resolveCreateArticleArgs;
     createArticle(memberId: string, args: CreateArticleArgs): Promise<BackstageArticleDto>;
     updateArticle(memberId: string, args: UpdateArticleArgs): Promise<BackstageArticleDto>;
     deleteArticle(id: string): Promise<boolean>;
-    submitArticle(memberId: string, id: string, version: number): Promise<BackstageArticleDto>;
-    approveArticle(id: string): Promise<BackstageArticleDto>;
+    deleteArticleVersion(id: string, version: number): Promise<boolean>;
+    submitArticle(memberId: string, id: string): Promise<BackstageArticleDto>;
+    putBackArticle(memberId: string, id: string): Promise<BackstageArticleDto>;
+    approveArticle(id: string, version?: number | null): Promise<BackstageArticleDto>;
     rejectArticle(id: string, reason?: string | null): Promise<BackstageArticleDto>;
-    releaseArticle(userId: string, id: string, releasedAt: Date): Promise<BackstageArticleDto>;
-    withdrawArticle(id: string): Promise<BackstageArticleDto>;
+    releaseArticle(userId: string, id: string, releasedAt: Date, version?: number | null): Promise<BackstageArticleDto>;
+    withdrawArticle(id: string, version: number): Promise<BackstageArticleDto>;
 }

package/mutations/article.mutations.js

@@ -1,9 +1,10 @@
-import { ArticleBaseService, DEFAULT_LANGUAGE } from '@rytass/cms-base-nestjs-module';
+import { MULTIPLE_LANGUAGE_MODE, ArticleBaseService, DEFAULT_LANGUAGE } from '@rytass/cms-base-nestjs-module';
 import { Mutation, Args, ID, Int, Resolver } from '@nestjs/graphql';
 import { BackstageArticleDto } from '../dto/backstage-article.dto.js';
 import { CreateArticleArgs } from '../dto/create-article.args.js';
 import { IsPublic, MemberId } from '@rytass/member-base-nestjs-module';
 import { UpdateArticleArgs } from '../dto/update-article.args.js';
+import { Inject } from '@nestjs/common';
 
 function _ts_decorate(decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -20,74 +21,93 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 class ArticleMutations {
+    multiLanguage;
     articleService;
-    constructor(articleService){
+    constructor(multiLanguage, articleService){
+        this.multiLanguage = multiLanguage;
         this.articleService = articleService;
     }
-    async createArticle(memberId, args) {
-        return this.articleService.create({
+    resolveCreateArticleArgs(args) {
+        const basePayload = {
             categoryIds: args.categoryIds,
             tags: args.tags,
-            multiLanguageContents: args.multiLanguageContents.reduce((vars, content)=>({
-                    ...vars,
-                    [content.language ?? DEFAULT_LANGUAGE]: {
-                        title: content.title,
-                        description: content.description,
-                        content: content.content
-                    }
-                }), {}),
-            userId: memberId,
             submitted: args.submitted ?? undefined,
             signatureLevel: args.signatureLevel ?? null,
             releasedAt: args.releasedAt ?? null
+        };
+        if (!this.multiLanguage) {
+            const [content] = args.multiLanguageContents;
+            return {
+                ...basePayload,
+                title: content.title,
+                content: content.content,
+                description: content.description ?? undefined
+            };
+        }
+        const multiLanguageContents = args.multiLanguageContents.reduce((vars, content)=>({
+                ...vars,
+                [content.language ?? DEFAULT_LANGUAGE]: {
+                    title: content.title,
+                    description: content.description,
+                    content: content.content
+                }
+            }), {});
+        return {
+            ...basePayload,
+            multiLanguageContents
+        };
+    }
+    async createArticle(memberId, args) {
+        return this.articleService.create({
+            ...this.resolveCreateArticleArgs(args),
+            userId: memberId
         });
     }
     async updateArticle(memberId, args) {
         return this.articleService.addVersion(args.id, {
-            categoryIds: args.categoryIds,
-            tags: args.tags,
-            multiLanguageContents: args.multiLanguageContents.reduce((vars, content)=>({
-                    ...vars,
-                    [content.language ?? DEFAULT_LANGUAGE]: {
-                        title: content.title,
-                        description: content.description,
-                        content: content.content
-                    }
-                }), {}),
-            userId: memberId,
-            submitted: args.submitted ?? undefined,
-            signatureLevel: args.signatureLevel ?? null,
-            releasedAt: args.releasedAt ?? null
+            ...this.resolveCreateArticleArgs(args),
+            userId: memberId
         });
     }
     async deleteArticle(id) {
         await this.articleService.archive(id);
         return true;
     }
-    async submitArticle(memberId, id, version) {
+    async deleteArticleVersion(id, version) {
+        await this.articleService.deleteVersion(id, version);
+        return true;
+    }
+    async submitArticle(memberId, id) {
         return this.articleService.submit(id, {
-            version,
             userId: memberId
         });
     }
-    async approveArticle(id) {
+    async putBackArticle(memberId, id) {
+        return this.articleService.putBack(id);
+    }
+    async approveArticle(id, version) {
         const article = await this.articleService.findById(id);
-        return this.articleService.approveVersion(article);
+        return this.articleService.approveVersion({
+            id,
+            version: version ?? article.version
+        });
     }
     async rejectArticle(id, reason) {
-        const article = await this.articleService.findById(id);
-        return this.articleService.rejectVersion(article, {
+        return this.articleService.rejectVersion({
+            id
+        }, {
             reason
         });
     }
-    releaseArticle(userId, id, releasedAt) {
+    releaseArticle(userId, id, releasedAt, version) {
         return this.articleService.release(id, {
             releasedAt,
-            userId
+            userId,
+            version: version ?? undefined
         });
     }
-    withdrawArticle(id) {
-        return this.articleService.withdraw(id);
+    withdrawArticle(id, version) {
+        return this.articleService.withdraw(id, version);
     }
 }
 _ts_decorate([
@@ -127,34 +147,65 @@ _ts_decorate([
     _ts_metadata("design:returntype", Promise)
 ], ArticleMutations.prototype, "deleteArticle", null);
 _ts_decorate([
-    Mutation(()=>BackstageArticleDto),
+    Mutation(()=>Boolean),
     IsPublic(),
-    _ts_param(0, MemberId()),
-    _ts_param(1, Args('id', {
+    _ts_param(0, Args('id', {
         type: ()=>ID
     })),
-    _ts_param(2, Args('version', {
+    _ts_param(1, Args('version', {
         type: ()=>Int
     })),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
-        String,
         String,
         Number
     ]),
     _ts_metadata("design:returntype", Promise)
+], ArticleMutations.prototype, "deleteArticleVersion", null);
+_ts_decorate([
+    Mutation(()=>BackstageArticleDto),
+    IsPublic(),
+    _ts_param(0, MemberId()),
+    _ts_param(1, Args('id', {
+        type: ()=>ID
+    })),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        String,
+        String
+    ]),
+    _ts_metadata("design:returntype", Promise)
 ], ArticleMutations.prototype, "submitArticle", null);
 _ts_decorate([
     Mutation(()=>BackstageArticleDto),
     IsPublic(),
-    _ts_param(0, Args('id', {
+    _ts_param(0, MemberId()),
+    _ts_param(1, Args('id', {
         type: ()=>ID
     })),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
+        String,
         String
     ]),
     _ts_metadata("design:returntype", Promise)
+], ArticleMutations.prototype, "putBackArticle", null);
+_ts_decorate([
+    Mutation(()=>BackstageArticleDto),
+    IsPublic(),
+    _ts_param(0, Args('id', {
+        type: ()=>ID
+    })),
+    _ts_param(1, Args('version', {
+        type: ()=>Int,
+        nullable: true
+    })),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        String,
+        Object
+    ]),
+    _ts_metadata("design:returntype", Promise)
 ], ArticleMutations.prototype, "approveArticle", null);
 _ts_decorate([
     Mutation(()=>BackstageArticleDto),
@@ -183,11 +234,16 @@ _ts_decorate([
     _ts_param(2, Args('releasedAt', {
         type: ()=>Date
     })),
+    _ts_param(3, Args('version', {
+        type: ()=>Int,
+        nullable: true
+    })),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
         String,
         String,
-        typeof Date === "undefined" ? Object : Date
+        typeof Date === "undefined" ? Object : Date,
+        Object
     ]),
     _ts_metadata("design:returntype", typeof Promise === "undefined" ? Object : Promise)
 ], ArticleMutations.prototype, "releaseArticle", null);
@@ -197,16 +253,22 @@ _ts_decorate([
     _ts_param(0, Args('id', {
         type: ()=>ID
     })),
+    _ts_param(1, Args('version', {
+        type: ()=>Int
+    })),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
-        String
+        String,
+        Number
     ]),
     _ts_metadata("design:returntype", typeof Promise === "undefined" ? Object : Promise)
 ], ArticleMutations.prototype, "withdrawArticle", null);
 ArticleMutations = _ts_decorate([
     Resolver(),
+    _ts_param(0, Inject(MULTIPLE_LANGUAGE_MODE)),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
+        Boolean,
         typeof ArticleBaseService === "undefined" ? Object : ArticleBaseService
     ])
 ], ArticleMutations);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rytass/cms-base-nestjs-graphql-module",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "description": "Rytass Content Management System NestJS Base GraphQL Module",
   "keywords": [
     "rytass",
@@ -26,7 +26,7 @@
     "typeorm": "*"
   },
   "dependencies": {
-    "@rytass/cms-base-nestjs-module": "^0.1.91",
+    "@rytass/cms-base-nestjs-module": "^0.1.93",
     "@rytass/member-base-nestjs-module": "^0.1.65",
     "dataloader": "^2.2.2",
     "lru-cache": "^11.0.2"

package/resolvers/article.resolver.d.ts

@@ -8,6 +8,7 @@ export declare class ArticleResolver {
     private readonly articleDataloader;
     private readonly multiLanguage;
     constructor(memberDataloader: MemberDataLoader, articleDataloader: ArticleDataLoader, multiLanguage: boolean);
+    articleId(article: ArticleBaseDto): string;
     releasedBy(article: ArticleBaseDto): Promise<UserDto | null> | null;
     categories(article: ArticleBaseDto, language?: string): Promise<CategoryDto[]>;
 }

package/resolvers/article.resolver.js

@@ -32,6 +32,9 @@ class ArticleResolver {
         this.articleDataloader = articleDataloader;
         this.multiLanguage = multiLanguage;
     }
+    articleId(article) {
+        return article.id.split(':')[0];
+    }
     releasedBy(article) {
         return article.releasedBy ? this.memberDataloader.loader.load(article.releasedBy) : null;
     }
@@ -42,6 +45,16 @@ class ArticleResolver {
         });
     }
 }
+_ts_decorate([
+    ResolveField(()=>String),
+    IsPublic(),
+    _ts_param(0, Root()),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        typeof ArticleBaseDto === "undefined" ? Object : ArticleBaseDto
+    ]),
+    _ts_metadata("design:returntype", String)
+], ArticleResolver.prototype, "articleId", null);
 _ts_decorate([
     ResolveField(()=>UserDto, {
         nullable: true

package/resolvers/backstage-article.resolver.d.ts

@@ -17,6 +17,7 @@ export declare class BackstageArticleResolver {
     private readonly versionSignaturesLoader;
     constructor(memberDataloader: MemberDataLoader, articleDataloader: ArticleDataLoader, multiLanguage: boolean, articleVersionDataLoader: ArticleVersionDataLoader, moduleArticleDataLoader: ModuleArticleDataLoader, versionSignaturesLoader: ArticleSignatureDataLoader);
     id(article: ArticleBaseDto): string;
+    articleId(article: ArticleBaseDto): string;
     submittedBy(article: ArticleBaseDto): Promise<UserDto | null> | null;
     lastEditor(article: ArticleBaseDto): Promise<UserDto | null> | null;
     releasedBy(article: ArticleBaseDto): Promise<UserDto | null> | null;

package/resolvers/backstage-article.resolver.js

@@ -45,6 +45,9 @@ class BackstageArticleResolver {
     id(article) {
         return `${article.id}:${article.version}`;
     }
+    articleId(article) {
+        return article.id;
+    }
     submittedBy(article) {
         return article.submittedBy ? this.memberDataloader.loader.load(article.submittedBy) : null;
     }
@@ -128,6 +131,16 @@ _ts_decorate([
     ]),
     _ts_metadata("design:returntype", String)
 ], BackstageArticleResolver.prototype, "id", null);
+_ts_decorate([
+    ResolveField(()=>String),
+    IsPublic(),
+    _ts_param(0, Root()),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        typeof ArticleBaseDto === "undefined" ? Object : ArticleBaseDto
+    ]),
+    _ts_metadata("design:returntype", String)
+], BackstageArticleResolver.prototype, "articleId", null);
 _ts_decorate([
     ResolveField(()=>UserDto, {
         nullable: true

package/scalars/quadrats-element.scalar.js

@@ -21,6 +21,9 @@ const QuadratsContentScalar = new GraphQLScalarType({
         throw new BadRequestException('Expected a JSON string for QuadratsContent');
     },
     serialize: (value)=>{
+        if (typeof value === 'string') {
+            return value;
+        }
         try {
             return JSON.stringify(value);
         } catch (error) {