@things-factory/attachment-base 8.0.0-alpha.23 → 8.0.0-alpha.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/attachment-base",
-  "version": "8.0.0-alpha.23",
+  "version": "8.0.0-alpha.25",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -29,11 +29,11 @@
     "@aws-sdk/s3-presigned-post": "^3.46.0",
     "@azure/storage-blob": "^12.18.0",
     "@koa/multer": "^3.0.0",
-    "@things-factory/auth-base": "^8.0.0-alpha.22",
+    "@things-factory/auth-base": "^8.0.0-alpha.24",
     "@things-factory/env": "^8.0.0-alpha.8",
     "@things-factory/shell": "^8.0.0-alpha.22",
     "mime": "^3.0.0",
     "multer": "^1.4.5-lts.1"
   },
-  "gitHead": "1ebbf45197acd1b0a8f27e9f21672d5cbef172ea"
+  "gitHead": "126c290973df223812311e21599224f527449b34"
 }

package/server/service/attachment/attachment-query.ts

@@ -22,21 +22,8 @@ export class AttachmentQuery {
       params,
       domain,
       alias: 'attachment',
-      searchables: ['name', 'description', 'tags']
-    }).addSelect([
-      'attachment.domain',
-      'attachment.id',
-      'attachment.name',
-      'attachment.path',
-      'attachment.size',
-      'attachment.mimetype',
-      'attachment.encoding',
-      'attachment.category',
-      'attachment.updatedAt',
-      'attachment.updater',
-      'attachment.createdAt',
-      'attachment.creator'
-    ])
+      searchables: ['id', 'name', 'description', 'tags']
+    })
 
     const [items, total] = await queryBuilder.getManyAndCount()
 

package/server/service/attachment/attachment.ts

@@ -75,7 +75,10 @@ export class Attachment {
   @Field()
   path?: string
 
-  @Column()
+  @Column({
+    nullable: true,
+    type: DATABASE_TYPE == 'mssql' ? 'bigint' : undefined
+  })
   @Field()
   size?: string
 

package/server/storage-database.ts

@@ -11,7 +11,9 @@ const crypto = require('crypto')
 if (STORAGE && STORAGE.type == 'database') {
   STORAGE.uploadFile = async ({ id, file, context }) => {
     var { createReadStream, filename, mimetype, encoding } = await file
-    filename = Buffer.from(filename, 'latin1').toString('utf-8') /* Because busboy uses latin1 encoding */
+    filename = Buffer.from(filename, 'latin1')
+      .toString('utf-8')
+      .normalize('NFC') /* Because busboy uses latin1 encoding */
 
     const stream = createReadStream()
 

package/server/storage-file.ts

@@ -14,7 +14,9 @@ if (STORAGE && STORAGE.type == 'file') {
 
   STORAGE.uploadFile = async ({ id, file }) => {
     var { createReadStream, filename, mimetype, encoding } = await file
-    filename = Buffer.from(filename, 'latin1').toString('utf-8') /* Because busboy uses latin1 encoding */
+    filename = Buffer.from(filename, 'latin1')
+      .toString('utf-8')
+      .normalize('NFC') /* Because busboy uses latin1 encoding */
 
     const stream = createReadStream()
 

package/server/storage-s3.ts

@@ -36,7 +36,9 @@ if (STORAGE && STORAGE.type == 's3') {
   /* upload file */
   STORAGE.uploadFile = async ({ id, file }) => {
     var { createReadStream, filename, mimetype, encoding } = await file
-    filename = Buffer.from(filename, 'latin1').toString('utf-8') /* Because busboy uses latin1 encoding */
+    filename = Buffer.from(filename, 'latin1')
+      .toString('utf-8')
+      .normalize('NFC') /* Because busboy uses latin1 encoding */
 
     const stream = createReadStream()
     id = id || crypto.randomUUID()