@rytass/cms-base-nestjs-graphql-module 0.0.5 → 0.0.7

package/decorators/language.decorator.d.ts

@@ -1 +1,2 @@
+export declare const LANGUAGE_HEADER_KEY = "x-language";
 export declare const Language: (...dataOrPipes: unknown[]) => ParameterDecorator;

package/decorators/language.decorator.js

@@ -1,25 +1,32 @@
 import { createParamDecorator } from '@nestjs/common';
+import { DEFAULT_LANGUAGE } from '@rytass/cms-base-nestjs-module';
 
+const LANGUAGE_HEADER_KEY = 'x-language';
 const Language = createParamDecorator(async (data, context)=>{
     const contextType = context.getType();
-    let language;
     switch(contextType){
         case 'graphql':
             {
                 const { GqlExecutionContext } = await import('@nestjs/graphql');
                 const ctx = GqlExecutionContext.create(context).getContext();
-                language = (ctx.req.headers['accept-language'] ?? '').trim();
-                break;
+                const headers = ctx.req.headers;
+                const requestLanguage = headers[LANGUAGE_HEADER_KEY];
+                if (typeof requestLanguage === 'string') return requestLanguage;
+                const acceptLanguage = headers['accept-language'] ?? '';
+                if (!acceptLanguage || typeof acceptLanguage !== 'string') return DEFAULT_LANGUAGE;
+                return acceptLanguage.split(',')[0].split(';')[0].trim();
             }
         case 'http':
         default:
-            language = (context.switchToHttp().getRequest().headers['accept-language'] ?? '').trim();
-            break;
-    }
-    if (!language) {
-        return 'zh-tw';
+            {
+                const headers = context.switchToHttp().getRequest().headers;
+                const requestLanguage = headers[LANGUAGE_HEADER_KEY];
+                if (typeof requestLanguage === 'string') return requestLanguage;
+                const acceptLanguage = headers['accept-language'] ?? '';
+                if (!acceptLanguage || typeof acceptLanguage !== 'string') return DEFAULT_LANGUAGE;
+                return acceptLanguage.split(',')[0].split(';')[0].trim();
+            }
     }
-    return language.split(',')[0].split(';')[0].trim().toLowerCase();
 });
 
-export { Language };
+export { LANGUAGE_HEADER_KEY, Language };

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

@@ -0,0 +1,6 @@
+export declare class ArticleVersionContentInput {
+    language?: string | null;
+    title: string;
+    description?: string | null;
+    content: string;
+}

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

@@ -0,0 +1,42 @@
+import { Field, InputType } from '@nestjs/graphql';
+
+function _ts_decorate(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);
+    else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+function _ts_metadata(k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+}
+class ArticleVersionContentInput {
+    language;
+    title;
+    description;
+    content;
+}
+_ts_decorate([
+    Field(()=>String, {
+        nullable: true
+    }),
+    _ts_metadata("design:type", Object)
+], ArticleVersionContentInput.prototype, "language", void 0);
+_ts_decorate([
+    Field(()=>String),
+    _ts_metadata("design:type", String)
+], ArticleVersionContentInput.prototype, "title", void 0);
+_ts_decorate([
+    Field(()=>String, {
+        nullable: true
+    }),
+    _ts_metadata("design:type", Object)
+], ArticleVersionContentInput.prototype, "description", void 0);
+_ts_decorate([
+    Field(()=>String),
+    _ts_metadata("design:type", String)
+], ArticleVersionContentInput.prototype, "content", void 0);
+ArticleVersionContentInput = _ts_decorate([
+    InputType('ArticleVersionContentInput')
+], ArticleVersionContentInput);
+
+export { ArticleVersionContentInput };

package/dto/article.dto.js

@@ -1,6 +1,6 @@
 import { Field, ObjectType } from '@nestjs/graphql';
 import { BaseArticleDto } from './base-article.dto.js';
-import { QuadratsContentScalar } from '../quadrats-element.scalar.js';
+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;

package/dto/category-backstage.dto.js

@@ -10,11 +10,7 @@ function _ts_decorate(decorators, target, key, desc) {
 class CategoryBackstageDto extends BaseCategoryDto {
 }
 CategoryBackstageDto = _ts_decorate([
-    ObjectType('CategoryBackstage', {
-        implements: ()=>[
-                BaseCategoryDto
-            ]
-    })
+    ObjectType('CategoryBackstage')
 ], CategoryBackstageDto);
 
 export { CategoryBackstageDto };

package/dto/category-multi-language-name.input.d.ts

@@ -0,0 +1,4 @@
+export declare class CategoryMultiLanguageNameInput {
+    language?: string | null;
+    name: string;
+}

package/dto/category-multi-language-name.input.js

@@ -0,0 +1,30 @@
+import { Field, InputType } from '@nestjs/graphql';
+
+function _ts_decorate(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);
+    else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+function _ts_metadata(k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+}
+class CategoryMultiLanguageNameInput {
+    language;
+    name;
+}
+_ts_decorate([
+    Field(()=>String, {
+        nullable: true
+    }),
+    _ts_metadata("design:type", Object)
+], CategoryMultiLanguageNameInput.prototype, "language", void 0);
+_ts_decorate([
+    Field(()=>String),
+    _ts_metadata("design:type", String)
+], CategoryMultiLanguageNameInput.prototype, "name", void 0);
+CategoryMultiLanguageNameInput = _ts_decorate([
+    InputType('CategoryMultiLanguageNameInput')
+], CategoryMultiLanguageNameInput);
+
+export { CategoryMultiLanguageNameInput };

package/dto/create-article.args.d.ts

@@ -1,3 +1,4 @@
+import { ArticleVersionContentInput } from './article-version-content.input';
 export declare class CreateArticleArgs {
     categoryIds: string[];
     tags: string[];
@@ -6,9 +7,3 @@ export declare class CreateArticleArgs {
     submitted?: boolean | null;
     signatureLevel?: string | null;
 }
-export declare class ArticleVersionContentInput {
-    language?: string | null;
-    title: string;
-    description?: string | null;
-    content: string;
-}

package/dto/create-article.args.js

@@ -1,4 +1,5 @@
-import { Field, ID, ArgsType, InputType } from '@nestjs/graphql';
+import { Field, ID, ArgsType } from '@nestjs/graphql';
+import { ArticleVersionContentInput } from './article-version-content.input.js';
 
 function _ts_decorate(decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc, d;
@@ -56,34 +57,5 @@ _ts_decorate([
 CreateArticleArgs = _ts_decorate([
     ArgsType()
 ], CreateArticleArgs);
-class ArticleVersionContentInput {
-    language;
-    title;
-    description;
-    content;
-}
-_ts_decorate([
-    Field(()=>String, {
-        nullable: true
-    }),
-    _ts_metadata("design:type", Object)
-], ArticleVersionContentInput.prototype, "language", void 0);
-_ts_decorate([
-    Field(()=>String),
-    _ts_metadata("design:type", String)
-], ArticleVersionContentInput.prototype, "title", void 0);
-_ts_decorate([
-    Field(()=>String, {
-        nullable: true
-    }),
-    _ts_metadata("design:type", Object)
-], ArticleVersionContentInput.prototype, "description", void 0);
-_ts_decorate([
-    Field(()=>String),
-    _ts_metadata("design:type", String)
-], ArticleVersionContentInput.prototype, "content", void 0);
-ArticleVersionContentInput = _ts_decorate([
-    InputType()
-], ArticleVersionContentInput);
 
-export { ArticleVersionContentInput, CreateArticleArgs };
+export { CreateArticleArgs };

package/dto/create-category.args.d.ts

@@ -1,11 +1,5 @@
+import { CategoryMultiLanguageNameInput } from './category-multi-language-name.input';
 export declare class CreateCategoryArgs {
     parentIds?: string[] | null;
     multiLanguageNames: CategoryMultiLanguageNameInput[];
 }
-export declare class CategoryMultiLanguageNameInput {
-    language?: string | null;
-    name: string;
-}
-export declare class UpdateCategoryArgs extends CreateCategoryArgs {
-    id: string;
-}

package/dto/create-category.args.js

@@ -1,4 +1,5 @@
-import { Field, ID, ArgsType, InputType } from '@nestjs/graphql';
+import { Field, ID, ArgsType } from '@nestjs/graphql';
+import { CategoryMultiLanguageNameInput } from './category-multi-language-name.input.js';
 
 function _ts_decorate(decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc, d;
@@ -30,32 +31,5 @@ _ts_decorate([
 CreateCategoryArgs = _ts_decorate([
     ArgsType()
 ], CreateCategoryArgs);
-class CategoryMultiLanguageNameInput {
-    language;
-    name;
-}
-_ts_decorate([
-    Field(()=>String, {
-        nullable: true
-    }),
-    _ts_metadata("design:type", Object)
-], CategoryMultiLanguageNameInput.prototype, "language", void 0);
-_ts_decorate([
-    Field(()=>String),
-    _ts_metadata("design:type", String)
-], CategoryMultiLanguageNameInput.prototype, "name", void 0);
-CategoryMultiLanguageNameInput = _ts_decorate([
-    InputType()
-], CategoryMultiLanguageNameInput);
-class UpdateCategoryArgs extends CreateCategoryArgs {
-    id;
-}
-_ts_decorate([
-    Field(()=>ID),
-    _ts_metadata("design:type", String)
-], UpdateCategoryArgs.prototype, "id", void 0);
-UpdateCategoryArgs = _ts_decorate([
-    ArgsType()
-], UpdateCategoryArgs);
 
-export { CategoryMultiLanguageNameInput, CreateCategoryArgs, UpdateCategoryArgs };
+export { CreateCategoryArgs };

package/dto/update-category.args.d.ts

@@ -0,0 +1,4 @@
+import { CreateCategoryArgs } from './create-category.args';
+export declare class UpdateCategoryArgs extends CreateCategoryArgs {
+    id: string;
+}

package/dto/update-category.args.js

@@ -0,0 +1,24 @@
+import { Field, ID, ArgsType } from '@nestjs/graphql';
+import { CreateCategoryArgs } from './create-category.args.js';
+
+function _ts_decorate(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);
+    else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+function _ts_metadata(k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+}
+class UpdateCategoryArgs extends CreateCategoryArgs {
+    id;
+}
+_ts_decorate([
+    Field(()=>ID),
+    _ts_metadata("design:type", String)
+], UpdateCategoryArgs.prototype, "id", void 0);
+UpdateCategoryArgs = _ts_decorate([
+    ArgsType()
+], UpdateCategoryArgs);
+
+export { UpdateCategoryArgs };

package/index.cjs.js

@@ -6,13 +6,13 @@ var graphql = require('@nestjs/graphql');
 var memberBaseNestjsModule = require('@rytass/member-base-nestjs-module');
 var graphql$1 = require('graphql');
 
-function _ts_decorate$i(decorators, target, key, desc) {
+function _ts_decorate$l(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);
     else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-function _ts_metadata$g(k, v) {
+function _ts_metadata$j(k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
 class BaseArticleDto {
@@ -20,58 +20,97 @@ class BaseArticleDto {
     tags;
     createdAt;
 }
-_ts_decorate$i([
+_ts_decorate$l([
     graphql.Field(()=>graphql.ID),
-    _ts_metadata$g("design:type", String)
+    _ts_metadata$j("design:type", String)
 ], BaseArticleDto.prototype, "id", void 0);
-_ts_decorate$i([
+_ts_decorate$l([
     graphql.Field(()=>[
             String
         ]),
-    _ts_metadata$g("design:type", Array)
+    _ts_metadata$j("design:type", Array)
 ], BaseArticleDto.prototype, "tags", void 0);
-_ts_decorate$i([
+_ts_decorate$l([
     graphql.Field(()=>Date),
-    _ts_metadata$g("design:type", typeof Date === "undefined" ? Object : Date)
+    _ts_metadata$j("design:type", typeof Date === "undefined" ? Object : Date)
 ], BaseArticleDto.prototype, "createdAt", void 0);
-BaseArticleDto = _ts_decorate$i([
+BaseArticleDto = _ts_decorate$l([
     graphql.ObjectType('BaseArticle')
 ], BaseArticleDto);
 
-function _ts_decorate$h(decorators, target, key, desc) {
+function _ts_decorate$k(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);
     else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-function _ts_metadata$f(k, v) {
+function _ts_metadata$i(k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
 class ArticleBackstageDto extends BaseArticleDto {
     version;
     deletedAt;
 }
-_ts_decorate$h([
+_ts_decorate$k([
     graphql.Field(()=>graphql.Int),
-    _ts_metadata$f("design:type", Number)
+    _ts_metadata$i("design:type", Number)
 ], ArticleBackstageDto.prototype, "version", void 0);
-_ts_decorate$h([
+_ts_decorate$k([
     graphql.Field(()=>Date, {
         nullable: true
     }),
-    _ts_metadata$f("design:type", Object)
+    _ts_metadata$i("design:type", Object)
 ], ArticleBackstageDto.prototype, "deletedAt", void 0);
-ArticleBackstageDto = _ts_decorate$h([
+ArticleBackstageDto = _ts_decorate$k([
     graphql.ObjectType('ArticleBackstage')
 ], ArticleBackstageDto);
 
-function _ts_decorate$g(decorators, target, key, desc) {
+function _ts_decorate$j(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);
     else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-function _ts_metadata$e(k, v) {
+function _ts_metadata$h(k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+}
+class ArticleVersionContentInput {
+    language;
+    title;
+    description;
+    content;
+}
+_ts_decorate$j([
+    graphql.Field(()=>String, {
+        nullable: true
+    }),
+    _ts_metadata$h("design:type", Object)
+], ArticleVersionContentInput.prototype, "language", void 0);
+_ts_decorate$j([
+    graphql.Field(()=>String),
+    _ts_metadata$h("design:type", String)
+], ArticleVersionContentInput.prototype, "title", void 0);
+_ts_decorate$j([
+    graphql.Field(()=>String, {
+        nullable: true
+    }),
+    _ts_metadata$h("design:type", Object)
+], ArticleVersionContentInput.prototype, "description", void 0);
+_ts_decorate$j([
+    graphql.Field(()=>String),
+    _ts_metadata$h("design:type", String)
+], ArticleVersionContentInput.prototype, "content", void 0);
+ArticleVersionContentInput = _ts_decorate$j([
+    graphql.InputType('ArticleVersionContentInput')
+], ArticleVersionContentInput);
+
+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);
+    else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+function _ts_metadata$g(k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
 class CreateArticleArgs {
@@ -82,102 +121,73 @@ class CreateArticleArgs {
     submitted;
     signatureLevel;
 }
-_ts_decorate$g([
+_ts_decorate$i([
     graphql.Field(()=>[
             graphql.ID
         ]),
-    _ts_metadata$e("design:type", Array)
+    _ts_metadata$g("design:type", Array)
 ], CreateArticleArgs.prototype, "categoryIds", void 0);
-_ts_decorate$g([
+_ts_decorate$i([
     graphql.Field(()=>[
             String
         ]),
-    _ts_metadata$e("design:type", Array)
+    _ts_metadata$g("design:type", Array)
 ], CreateArticleArgs.prototype, "tags", void 0);
-_ts_decorate$g([
+_ts_decorate$i([
     graphql.Field(()=>[
             ArticleVersionContentInput
         ]),
-    _ts_metadata$e("design:type", Array)
+    _ts_metadata$g("design:type", Array)
 ], CreateArticleArgs.prototype, "multiLanguageContents", void 0);
-_ts_decorate$g([
+_ts_decorate$i([
     graphql.Field(()=>Date, {
         nullable: true
     }),
-    _ts_metadata$e("design:type", Object)
+    _ts_metadata$g("design:type", Object)
 ], CreateArticleArgs.prototype, "releasedAt", void 0);
-_ts_decorate$g([
+_ts_decorate$i([
     graphql.Field(()=>Boolean, {
         nullable: true
     }),
-    _ts_metadata$e("design:type", Object)
+    _ts_metadata$g("design:type", Object)
 ], CreateArticleArgs.prototype, "submitted", void 0);
-_ts_decorate$g([
+_ts_decorate$i([
     graphql.Field(()=>String, {
         nullable: true
     }),
-    _ts_metadata$e("design:type", Object)
+    _ts_metadata$g("design:type", Object)
 ], CreateArticleArgs.prototype, "signatureLevel", void 0);
-CreateArticleArgs = _ts_decorate$g([
+CreateArticleArgs = _ts_decorate$i([
     graphql.ArgsType()
 ], CreateArticleArgs);
-class ArticleVersionContentInput {
-    language;
-    title;
-    description;
-    content;
-}
-_ts_decorate$g([
-    graphql.Field(()=>String, {
-        nullable: true
-    }),
-    _ts_metadata$e("design:type", Object)
-], ArticleVersionContentInput.prototype, "language", void 0);
-_ts_decorate$g([
-    graphql.Field(()=>String),
-    _ts_metadata$e("design:type", String)
-], ArticleVersionContentInput.prototype, "title", void 0);
-_ts_decorate$g([
-    graphql.Field(()=>String, {
-        nullable: true
-    }),
-    _ts_metadata$e("design:type", Object)
-], ArticleVersionContentInput.prototype, "description", void 0);
-_ts_decorate$g([
-    graphql.Field(()=>String),
-    _ts_metadata$e("design:type", String)
-], ArticleVersionContentInput.prototype, "content", void 0);
-ArticleVersionContentInput = _ts_decorate$g([
-    graphql.InputType()
-], ArticleVersionContentInput);
 
-function _ts_decorate$f(decorators, target, key, desc) {
+function _ts_decorate$h(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);
     else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-function _ts_metadata$d(k, v) {
+function _ts_metadata$f(k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
 class UpdateArticleArgs extends CreateArticleArgs {
     id;
 }
-_ts_decorate$f([
+_ts_decorate$h([
     graphql.Field(()=>graphql.ID),
-    _ts_metadata$d("design:type", String)
+    _ts_metadata$f("design:type", String)
 ], UpdateArticleArgs.prototype, "id", void 0);
-UpdateArticleArgs = _ts_decorate$f([
+UpdateArticleArgs = _ts_decorate$h([
     graphql.ArgsType()
 ], UpdateArticleArgs);
 
-function _ts_decorate$e(decorators, target, key, desc) {
+function _ts_decorate$g(decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-function _ts_metadata$c(k, v) {
+function _ts_metadata$e(k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
 function _ts_param$3(paramIndex, decorator) {
@@ -256,43 +266,43 @@ class ArticleMutations {
         return this.articleService.withdraw(id);
     }
 }
-_ts_decorate$e([
+_ts_decorate$g([
     graphql.Mutation(()=>ArticleBackstageDto),
     memberBaseNestjsModule.IsPublic(),
     _ts_param$3(0, memberBaseNestjsModule.MemberId()),
     _ts_param$3(1, graphql.Args()),
-    _ts_metadata$c("design:type", Function),
-    _ts_metadata$c("design:paramtypes", [
+    _ts_metadata$e("design:type", Function),
+    _ts_metadata$e("design:paramtypes", [
         String,
         typeof CreateArticleArgs === "undefined" ? Object : CreateArticleArgs
     ]),
-    _ts_metadata$c("design:returntype", Promise)
+    _ts_metadata$e("design:returntype", Promise)
 ], ArticleMutations.prototype, "createArticle", null);
-_ts_decorate$e([
+_ts_decorate$g([
     graphql.Mutation(()=>ArticleBackstageDto),
     memberBaseNestjsModule.IsPublic(),
     _ts_param$3(0, memberBaseNestjsModule.MemberId()),
     _ts_param$3(1, graphql.Args()),
-    _ts_metadata$c("design:type", Function),
-    _ts_metadata$c("design:paramtypes", [
+    _ts_metadata$e("design:type", Function),
+    _ts_metadata$e("design:paramtypes", [
         String,
         typeof UpdateArticleArgs === "undefined" ? Object : UpdateArticleArgs
     ]),
-    _ts_metadata$c("design:returntype", Promise)
+    _ts_metadata$e("design:returntype", Promise)
 ], ArticleMutations.prototype, "updateArticle", null);
-_ts_decorate$e([
+_ts_decorate$g([
     graphql.Mutation(()=>Boolean),
     memberBaseNestjsModule.IsPublic(),
     _ts_param$3(0, graphql.Args('id', {
         type: ()=>graphql.ID
     })),
-    _ts_metadata$c("design:type", Function),
-    _ts_metadata$c("design:paramtypes", [
+    _ts_metadata$e("design:type", Function),
+    _ts_metadata$e("design:paramtypes", [
         String
     ]),
-    _ts_metadata$c("design:returntype", Promise)
+    _ts_metadata$e("design:returntype", Promise)
 ], ArticleMutations.prototype, "deleteArticle", null);
-_ts_decorate$e([
+_ts_decorate$g([
     graphql.Mutation(()=>ArticleBackstageDto),
     memberBaseNestjsModule.IsPublic(),
     _ts_param$3(0, memberBaseNestjsModule.MemberId()),
@@ -302,27 +312,27 @@ _ts_decorate$e([
     _ts_param$3(2, graphql.Args('version', {
         type: ()=>graphql.Int
     })),
-    _ts_metadata$c("design:type", Function),
-    _ts_metadata$c("design:paramtypes", [
+    _ts_metadata$e("design:type", Function),
+    _ts_metadata$e("design:paramtypes", [
         String,
         String,
         Number
     ]),
-    _ts_metadata$c("design:returntype", Promise)
+    _ts_metadata$e("design:returntype", Promise)
 ], ArticleMutations.prototype, "submitArticle", null);
-_ts_decorate$e([
+_ts_decorate$g([
     graphql.Mutation(()=>ArticleBackstageDto),
     memberBaseNestjsModule.IsPublic(),
     _ts_param$3(0, graphql.Args('id', {
         type: ()=>graphql.ID
     })),
-    _ts_metadata$c("design:type", Function),
-    _ts_metadata$c("design:paramtypes", [
+    _ts_metadata$e("design:type", Function),
+    _ts_metadata$e("design:paramtypes", [
         String
     ]),
-    _ts_metadata$c("design:returntype", Promise)
+    _ts_metadata$e("design:returntype", Promise)
 ], ArticleMutations.prototype, "approveArticle", null);
-_ts_decorate$e([
+_ts_decorate$g([
     graphql.Mutation(()=>ArticleBackstageDto),
     memberBaseNestjsModule.IsPublic(),
     _ts_param$3(0, graphql.Args('id', {
@@ -332,14 +342,14 @@ _ts_decorate$e([
         type: ()=>String,
         nullable: true
     })),
-    _ts_metadata$c("design:type", Function),
-    _ts_metadata$c("design:paramtypes", [
+    _ts_metadata$e("design:type", Function),
+    _ts_metadata$e("design:paramtypes", [
         String,
         Object
     ]),
-    _ts_metadata$c("design:returntype", Promise)
+    _ts_metadata$e("design:returntype", Promise)
 ], ArticleMutations.prototype, "rejectArticle", null);
-_ts_decorate$e([
+_ts_decorate$g([
     graphql.Mutation(()=>ArticleBackstageDto),
     memberBaseNestjsModule.IsPublic(),
     _ts_param$3(0, memberBaseNestjsModule.MemberId()),
@@ -349,99 +359,99 @@ _ts_decorate$e([
     _ts_param$3(2, graphql.Args('releasedAt', {
         type: ()=>Date
     })),
-    _ts_metadata$c("design:type", Function),
-    _ts_metadata$c("design:paramtypes", [
+    _ts_metadata$e("design:type", Function),
+    _ts_metadata$e("design:paramtypes", [
         String,
         String,
         typeof Date === "undefined" ? Object : Date
     ]),
-    _ts_metadata$c("design:returntype", typeof Promise === "undefined" ? Object : Promise)
+    _ts_metadata$e("design:returntype", typeof Promise === "undefined" ? Object : Promise)
 ], ArticleMutations.prototype, "releaseArticle", null);
-_ts_decorate$e([
+_ts_decorate$g([
     graphql.Mutation(()=>ArticleBackstageDto),
     memberBaseNestjsModule.IsPublic(),
     _ts_param$3(0, graphql.Args('id', {
         type: ()=>graphql.ID
     })),
-    _ts_metadata$c("design:type", Function),
-    _ts_metadata$c("design:paramtypes", [
+    _ts_metadata$e("design:type", Function),
+    _ts_metadata$e("design:paramtypes", [
         String
     ]),
-    _ts_metadata$c("design:returntype", typeof Promise === "undefined" ? Object : Promise)
+    _ts_metadata$e("design:returntype", typeof Promise === "undefined" ? Object : Promise)
 ], ArticleMutations.prototype, "withdrawArticle", null);
-ArticleMutations = _ts_decorate$e([
+ArticleMutations = _ts_decorate$g([
     graphql.Resolver(),
-    _ts_metadata$c("design:type", Function),
-    _ts_metadata$c("design:paramtypes", [
+    _ts_metadata$e("design:type", Function),
+    _ts_metadata$e("design:paramtypes", [
         typeof cmsBaseNestjsModule.ArticleBaseService === "undefined" ? Object : cmsBaseNestjsModule.ArticleBaseService
     ])
 ], ArticleMutations);
 
-function _ts_decorate$d(decorators, target, key, desc) {
+function _ts_decorate$f(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);
     else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-function _ts_metadata$b(k, v) {
+function _ts_metadata$d(k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+}
+class CategoryMultiLanguageNameInput {
+    language;
+    name;
+}
+_ts_decorate$f([
+    graphql.Field(()=>String, {
+        nullable: true
+    }),
+    _ts_metadata$d("design:type", Object)
+], CategoryMultiLanguageNameInput.prototype, "language", void 0);
+_ts_decorate$f([
+    graphql.Field(()=>String),
+    _ts_metadata$d("design:type", String)
+], CategoryMultiLanguageNameInput.prototype, "name", void 0);
+CategoryMultiLanguageNameInput = _ts_decorate$f([
+    graphql.InputType('CategoryMultiLanguageNameInput')
+], CategoryMultiLanguageNameInput);
+
+function _ts_decorate$e(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);
+    else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+function _ts_metadata$c(k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
 class CreateCategoryArgs {
     parentIds;
     multiLanguageNames;
 }
-_ts_decorate$d([
+_ts_decorate$e([
     graphql.Field(()=>[
             graphql.ID
         ], {
         nullable: true
     }),
-    _ts_metadata$b("design:type", Object)
+    _ts_metadata$c("design:type", Object)
 ], CreateCategoryArgs.prototype, "parentIds", void 0);
-_ts_decorate$d([
+_ts_decorate$e([
     graphql.Field(()=>[
             CategoryMultiLanguageNameInput
         ]),
-    _ts_metadata$b("design:type", Array)
+    _ts_metadata$c("design:type", Array)
 ], CreateCategoryArgs.prototype, "multiLanguageNames", void 0);
-CreateCategoryArgs = _ts_decorate$d([
+CreateCategoryArgs = _ts_decorate$e([
     graphql.ArgsType()
 ], CreateCategoryArgs);
-class CategoryMultiLanguageNameInput {
-    language;
-    name;
-}
-_ts_decorate$d([
-    graphql.Field(()=>String, {
-        nullable: true
-    }),
-    _ts_metadata$b("design:type", Object)
-], CategoryMultiLanguageNameInput.prototype, "language", void 0);
-_ts_decorate$d([
-    graphql.Field(()=>String),
-    _ts_metadata$b("design:type", String)
-], CategoryMultiLanguageNameInput.prototype, "name", void 0);
-CategoryMultiLanguageNameInput = _ts_decorate$d([
-    graphql.InputType()
-], CategoryMultiLanguageNameInput);
-class UpdateCategoryArgs extends CreateCategoryArgs {
-    id;
-}
-_ts_decorate$d([
-    graphql.Field(()=>graphql.ID),
-    _ts_metadata$b("design:type", String)
-], UpdateCategoryArgs.prototype, "id", void 0);
-UpdateCategoryArgs = _ts_decorate$d([
-    graphql.ArgsType()
-], UpdateCategoryArgs);
 
-function _ts_decorate$c(decorators, target, key, desc) {
+function _ts_decorate$d(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);
     else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-function _ts_metadata$a(k, v) {
+function _ts_metadata$b(k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
 class BaseCategoryDto {
@@ -449,23 +459,23 @@ class BaseCategoryDto {
     createdAt;
     updatedAt;
 }
-_ts_decorate$c([
+_ts_decorate$d([
     graphql.Field(()=>graphql.ID),
-    _ts_metadata$a("design:type", String)
+    _ts_metadata$b("design:type", String)
 ], BaseCategoryDto.prototype, "id", void 0);
-_ts_decorate$c([
+_ts_decorate$d([
     graphql.Field(()=>Date),
-    _ts_metadata$a("design:type", typeof Date === "undefined" ? Object : Date)
+    _ts_metadata$b("design:type", typeof Date === "undefined" ? Object : Date)
 ], BaseCategoryDto.prototype, "createdAt", void 0);
-_ts_decorate$c([
+_ts_decorate$d([
     graphql.Field(()=>Date),
-    _ts_metadata$a("design:type", typeof Date === "undefined" ? Object : Date)
+    _ts_metadata$b("design:type", typeof Date === "undefined" ? Object : Date)
 ], BaseCategoryDto.prototype, "updatedAt", void 0);
-BaseCategoryDto = _ts_decorate$c([
+BaseCategoryDto = _ts_decorate$d([
     graphql.ObjectType('BaseCategory')
 ], BaseCategoryDto);
 
-function _ts_decorate$b(decorators, target, key, desc) {
+function _ts_decorate$c(decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
@@ -473,14 +483,30 @@ function _ts_decorate$b(decorators, target, key, desc) {
 }
 class CategoryBackstageDto extends BaseCategoryDto {
 }
-CategoryBackstageDto = _ts_decorate$b([
-    graphql.ObjectType('CategoryBackstage', {
-        implements: ()=>[
-                BaseCategoryDto
-            ]
-    })
+CategoryBackstageDto = _ts_decorate$c([
+    graphql.ObjectType('CategoryBackstage')
 ], CategoryBackstageDto);
 
+function _ts_decorate$b(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);
+    else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+function _ts_metadata$a(k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+}
+class UpdateCategoryArgs extends CreateCategoryArgs {
+    id;
+}
+_ts_decorate$b([
+    graphql.Field(()=>graphql.ID),
+    _ts_metadata$a("design:type", String)
+], UpdateCategoryArgs.prototype, "id", void 0);
+UpdateCategoryArgs = _ts_decorate$b([
+    graphql.ArgsType()
+], UpdateCategoryArgs);
+
 function _ts_decorate$a(decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -618,26 +644,32 @@ graphql.registerEnumType(cmsBaseNestjsModule.ArticleStage, {
     name: 'ArticleStage'
 });
 
+const LANGUAGE_HEADER_KEY = 'x-language';
 const Language = common.createParamDecorator(async (data, context)=>{
     const contextType = context.getType();
-    let language;
     switch(contextType){
         case 'graphql':
             {
                 const { GqlExecutionContext } = await import('@nestjs/graphql');
                 const ctx = GqlExecutionContext.create(context).getContext();
-                language = (ctx.req.headers['accept-language'] ?? '').trim();
-                break;
+                const headers = ctx.req.headers;
+                const requestLanguage = headers[LANGUAGE_HEADER_KEY];
+                if (typeof requestLanguage === 'string') return requestLanguage;
+                const acceptLanguage = headers['accept-language'] ?? '';
+                if (!acceptLanguage || typeof acceptLanguage !== 'string') return cmsBaseNestjsModule.DEFAULT_LANGUAGE;
+                return acceptLanguage.split(',')[0].split(';')[0].trim();
             }
         case 'http':
         default:
-            language = (context.switchToHttp().getRequest().headers['accept-language'] ?? '').trim();
-            break;
-    }
-    if (!language) {
-        return 'zh-tw';
+            {
+                const headers = context.switchToHttp().getRequest().headers;
+                const requestLanguage = headers[LANGUAGE_HEADER_KEY];
+                if (typeof requestLanguage === 'string') return requestLanguage;
+                const acceptLanguage = headers['accept-language'] ?? '';
+                if (!acceptLanguage || typeof acceptLanguage !== 'string') return cmsBaseNestjsModule.DEFAULT_LANGUAGE;
+                return acceptLanguage.split(',')[0].split(';')[0].trim();
+            }
     }
-    return language.split(',')[0].split(';')[0].trim().toLowerCase();
 });
 
 function _ts_decorate$8(decorators, target, key, desc) {
@@ -795,18 +827,20 @@ function _ts_param$1(paramIndex, decorator) {
 }
 class ArticleQueries {
     articleService;
-    constructor(articleService){
+    multiLanguage;
+    constructor(articleService, multiLanguage){
         this.articleService = articleService;
+        this.multiLanguage = multiLanguage;
     }
     article(id, language = cmsBaseNestjsModule.DEFAULT_LANGUAGE) {
         return this.articleService.findById(id, {
-            language: language ?? cmsBaseNestjsModule.DEFAULT_LANGUAGE
+            language: this.multiLanguage ? language ?? cmsBaseNestjsModule.DEFAULT_LANGUAGE : undefined
         });
     }
     async articles(args, language = cmsBaseNestjsModule.DEFAULT_LANGUAGE) {
         return this.articleService.findCollection({
             ...args,
-            language
+            language: this.multiLanguage ? language ?? cmsBaseNestjsModule.DEFAULT_LANGUAGE : undefined
         });
     }
     backstageArticle(id) {
@@ -866,9 +900,11 @@ _ts_decorate$4([
 ], ArticleQueries.prototype, "backstageArticles", null);
 ArticleQueries = _ts_decorate$4([
     graphql.Resolver(),
+    _ts_param$1(1, common.Inject(cmsBaseNestjsModule.MULTIPLE_LANGUAGE_MODE)),
     _ts_metadata$3("design:type", Function),
     _ts_metadata$3("design:paramtypes", [
-        typeof cmsBaseNestjsModule.ArticleBaseService === "undefined" ? Object : cmsBaseNestjsModule.ArticleBaseService
+        typeof cmsBaseNestjsModule.ArticleBaseService === "undefined" ? Object : cmsBaseNestjsModule.ArticleBaseService,
+        Boolean
     ])
 ], ArticleQueries);
 

package/mutations/category.mutations.d.ts

@@ -1,6 +1,7 @@
 import { CategoryBaseService } from '@rytass/cms-base-nestjs-module';
-import { CreateCategoryArgs, UpdateCategoryArgs } from '../dto/create-category.args';
+import { CreateCategoryArgs } from '../dto/create-category.args';
 import { CategoryBackstageDto } from '../dto/category-backstage.dto';
+import { UpdateCategoryArgs } from '../dto/update-category.args';
 export declare class CategoryMutations {
     private readonly categoryService;
     constructor(categoryService: CategoryBaseService);

package/mutations/category.mutations.js

@@ -1,8 +1,9 @@
 import { Mutation, Args, ID, Resolver } from '@nestjs/graphql';
 import { CategoryBaseService } from '@rytass/cms-base-nestjs-module';
-import { CreateCategoryArgs, UpdateCategoryArgs } from '../dto/create-category.args.js';
+import { CreateCategoryArgs } from '../dto/create-category.args.js';
 import { IsPublic } from '@rytass/member-base-nestjs-module';
 import { CategoryBackstageDto } from '../dto/category-backstage.dto.js';
+import { UpdateCategoryArgs } from '../dto/update-category.args.js';
 
 function _ts_decorate(decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;

package/package.json

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

package/queries/article.queries.d.ts

@@ -6,7 +6,8 @@ import { ArticleBackstageDto } from '../dto/article-backstage.dto';
 import { ArticleBackstageCollectionDto } from '../dto/article-backstage-collection.dto';
 export declare class ArticleQueries {
     private readonly articleService;
-    constructor(articleService: ArticleBaseService);
+    private readonly multiLanguage;
+    constructor(articleService: ArticleBaseService, multiLanguage: boolean);
     article(id: string, language?: string): Promise<ArticleDto>;
     articles(args: ArticlesArgs, language?: string): Promise<ArticleCollectionDto>;
     backstageArticle(id: string): Promise<ArticleBackstageDto>;

package/queries/article.queries.js

@@ -1,5 +1,5 @@
 import { Query, Args, ID, Resolver } from '@nestjs/graphql';
-import { ArticleBaseService, DEFAULT_LANGUAGE } from '@rytass/cms-base-nestjs-module';
+import { MULTIPLE_LANGUAGE_MODE, ArticleBaseService, DEFAULT_LANGUAGE } from '@rytass/cms-base-nestjs-module';
 import { ArticlesArgs } from '../dto/articles.args.js';
 import { IsPublic } from '@rytass/member-base-nestjs-module';
 import { Language } from '../decorators/language.decorator.js';
@@ -7,6 +7,7 @@ import { ArticleCollectionDto } from '../dto/article-collection.dto.js';
 import { ArticleDto } from '../dto/article.dto.js';
 import { ArticleBackstageDto } from '../dto/article-backstage.dto.js';
 import { ArticleBackstageCollectionDto } from '../dto/article-backstage-collection.dto.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;
@@ -24,18 +25,20 @@ function _ts_param(paramIndex, decorator) {
 }
 class ArticleQueries {
     articleService;
-    constructor(articleService){
+    multiLanguage;
+    constructor(articleService, multiLanguage){
         this.articleService = articleService;
+        this.multiLanguage = multiLanguage;
     }
     article(id, language = DEFAULT_LANGUAGE) {
         return this.articleService.findById(id, {
-            language: language ?? DEFAULT_LANGUAGE
+            language: this.multiLanguage ? language ?? DEFAULT_LANGUAGE : undefined
         });
     }
     async articles(args, language = DEFAULT_LANGUAGE) {
         return this.articleService.findCollection({
             ...args,
-            language
+            language: this.multiLanguage ? language ?? DEFAULT_LANGUAGE : undefined
         });
     }
     backstageArticle(id) {
@@ -95,9 +98,11 @@ _ts_decorate([
 ], ArticleQueries.prototype, "backstageArticles", null);
 ArticleQueries = _ts_decorate([
     Resolver(),
+    _ts_param(1, Inject(MULTIPLE_LANGUAGE_MODE)),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
-        typeof ArticleBaseService === "undefined" ? Object : ArticleBaseService
+        typeof ArticleBaseService === "undefined" ? Object : ArticleBaseService,
+        Boolean
     ])
 ], ArticleQueries);
 

package/dto/category-multi-language-name.dto.d.ts

@@ -1,4 +0,0 @@
-export declare class CategoryMultiLanguageName {
-    language: string;
-    name: string;
-}