@notifiles/sdk 1.1.1 → 1.1.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@notifiles/sdk",
   "type": "module",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "",
   "author": {
     "name": "adoucoure",

package/src/lib/cloudLibrary/minio/index.js

@@ -2,4 +2,5 @@ export { default as isValid } from './isValid.js'
 export { default as upload } from './upload.js'
 export { default as syncFolder } from './syncFolder.js'
 export { default as remove } from './remove.js'
+export { default as previewRemoteUrl } from './previewRemoteUrl.js'
 // export { default as uploadFolder } from './uploadFolder.js'

package/src/lib/cloudLibrary/minio/previewRemoteUrl.js

@@ -0,0 +1,20 @@
+export default async ({
+  filename,
+  auth,
+  // contentType = 'image/png'
+}) => {
+
+  try {
+    const {
+      endPoint,
+      bucketName
+    } = auth
+
+    const url = `https://${endPoint}/${bucketName}/${filename}`
+    return { url }
+
+  } catch (e) {
+    console.error(e)
+  }
+  return null
+}

package/src/template/cloudify/lib/email/image/index.js

@@ -16,27 +16,28 @@ export default async ({ child,
     src: _url,
   } } = child
 
-
+  //#region CACHE
   let _activity = await getActivity({ path })
-  if (!settings.forceUploadAssets) {
-    const codeActivity = _activity[entry.code]
-    if (codeActivity) {
-      const files = codeActivity.files
-      if (files && files[_url]) {
-        const cache = files[_url]
-        return {
-          ...child,
-          properties: {
-            ...child.properties,
-            src: cache.url
-          }
-        }
-      }
-    }
-  }
+  // if (!settings.forceUploadAssets) {
+  //   const codeActivity = _activity[entry.code]
+  //   if (codeActivity) {
+  //     const files = codeActivity.files
+  //     if (files && files[_url]) {
+  //       const cache = files[_url]
+  //       return {
+  //         ...child,
+  //         properties: {
+  //           ...child.properties,
+  //           src: cache.url
+  //         }
+  //       }
+  //     }
+  //   }
+  // }
+  //#endregion
 
   let result
-  const destination = `${path}/.assets`
+  const destination = buildPaths.email.assetsContainer
   if (isLocal(_url)) {
     result = await treatLocalFile({ url: _url, path, destination })
   }
@@ -53,7 +54,7 @@ export default async ({ child,
     uploadResult = await upload({
       id: cloud.id,
       sourceUrl,
-      filename: `${buildPaths.email.assetsContainer}/${filename}`,
+      filename: `${buildPaths.email.assetsContainerRemote}/${filename}`,
       auth: cloud.auth,
       settings
     })

package/src/template/cloudify/lib/email/index.js

@@ -14,9 +14,7 @@ export default async (props) => {
     buildPaths
   })
 
-  // let md = await mdastToMarkdown({ mdast })
   let body = hastToHtml({ data: _hast })
-  // await fs.promises.writeFile(`${path}/.build/html/email.cloud.html`, html)
 
   await fs.promises.writeFile(
     buildPaths.email.body,

package/src/template/consolidate/lib/email.js

@@ -7,12 +7,11 @@ export default async (props) => {
   const { entry } = props
   const { path, email: { hast }, buildPaths } = entry
 
-  const destination = `${path}/.assets`
-  await ensureDirectoryExists(destination, false)
 
   const _hast = await perform({
     child: hast,
     path,
+    buildPaths
 
   })
 
@@ -36,7 +35,7 @@ export default async (props) => {
 }
 
 const perform = async (props) => {
-  const { child, path } = props
+  const { child, path, buildPaths } = props
   let _child = { ...child }
 
   if (child.properties && child.properties.dataNotifilesDoNotConsolidate) {
@@ -47,7 +46,8 @@ const perform = async (props) => {
     case 'img': {
       _child = await treatImage({
         child: _child,
-        path
+        path,
+        buildPaths
       })
     } break
     default:

package/src/template/consolidate/lib/image/index.js

@@ -1,15 +1,17 @@
 import isLocal from 'is-local'
 import treatLocalFile from './treatLocalFile.js'
 import treatRemoteFile from './treatRemoteFile.js'
+import ensureDirectoryExists from '../../../../lib/fs/ensureDirectoryExists.js'
 
 export default async ({ child,
-  path, entry }) => {
+  path, buildPaths }) => {
   const { properties: {
     src: url,
   } } = child
 
   let result
-  const destination = `${path}/.assets`
+  const destination = buildPaths.email.assetsContainer
+  await ensureDirectoryExists(destination)
 
   if (isLocal(url)) {
     if (url.indexOf(destination) !== 0) {
@@ -23,7 +25,8 @@ export default async ({ child,
   }
 
   let filename = result.filename
-  const newUrl = `.assets/${filename}`
+  // const newUrl = `.assets/${filename}`
+  const newUrl = result.path
   return {
     ...child,
     properties: {

package/src/template/consolidate/lib/image/treatLocalFile.js

@@ -10,5 +10,6 @@ export default async ({
   await fs.promises.cp(sourceUrl, _destination)
   return {
     filename,
+    path: _destination
   }
 }

package/src/template/consolidate/lib/image/treatRemoteFile.js

@@ -16,7 +16,8 @@ export default async ({ url,
     const filename = fsPath.basename(item.filename)
 
     return {
-      filename
+      filename,
+      path: `${destination}/${filename}`
     }
   }
   catch (e) {

package/src/template/format/entry.js

@@ -29,7 +29,8 @@ export default async ({
           textFileName: `${entry.slug}/email/${code}/text.txt`,
           subject: `${path}/.build/email/${code}/subject.txt`,
           subjectFileName: `${entry.slug}/email/${code}/subject.txt`,
-          assetsContainer: `${entry.slug}/email/${code}/assets`,
+          assetsContainer: `${path}/.build/email/${code}/assets`,
+          assetsContainerRemote: `${entry.slug}/email/${code}/assets`,
           attachmentsContainer: `${entry.slug}/email/${code}/attachments`,
           manifestFileNameBuilt: `${path}/.build/email/${code}/manifest.json`,
           manifestFileName: `${entry.slug}/email/${code}/manifest.json`,
@@ -39,7 +40,8 @@ export default async ({
           containerRemote: `${entry.slug}/textmessage/${code}`,
           text: `${path}/.build/textmessage/${code}/textmessage.txt`,
           textFileName: `${entry.slug}/textmessage/${code}/textmessage.txt`,
-          assetsContainer: `${entry.slug}/textmessage/${code}/assets`,
+          assetsContainer: `${path}/.build/textmessage/${code}/assets`,
+          assetsContainerRemote: `${entry.slug}/textmessage/${code}/assets`,
           manifestFileNameBuilt: `${path}/.build/textmessage/${code}/manifest.json`,
           manifestFileName: `${entry.slug}/textmessage/${code}/manifest.json`,
         },
@@ -48,7 +50,8 @@ export default async ({
           containerRemote: `${entry.slug}/pushnotification/${code}`,
           text: `${path}/.build/pushnotification/${code}/pushnotification.txt`,
           textFileName: `${entry.slug}/pushnotification/${code}/pushnotification.txt`,
-          assetsContainer: `${entry.slug}/pushnotification/${code}/assets`,
+          assetsContainer: `${path}/.build/pushnotification/${code}/assets`,
+          assetsContainerRemote: `${entry.slug}/pushnotification/${code}/assets`,
           manifestFileNameBuilt: `${path}/.build/pushnotification/${code}/manifest.json`,
           manifestFileName: `${entry.slug}/pushnotification/${code}/manifest.json`,
         },

package/src/template/optimize/lib/email.js

@@ -8,7 +8,8 @@ export default async (props) => {
 
   let _hast = await perform({
     child: hast,
-    path
+    path,
+    buildPaths
   })
 
   let body = hastToHtml({ data: _hast })
@@ -31,7 +32,7 @@ export default async (props) => {
 }
 
 const perform = async (props) => {
-  const { child, path } = props
+  const { child, path, buildPaths } = props
   let _child = { ...child }
 
   if (child.properties && _child.properties.dataNotifilesDoNotOptimize) {
@@ -42,7 +43,8 @@ const perform = async (props) => {
     case 'img': {
       _child = await treatImage({
         child: _child,
-        path
+        path,
+        buildPaths
       })
     } break
     default:

package/src/template/optimize/lib/image/index.js

@@ -2,9 +2,10 @@ import fsPath from 'path'
 import isLocal from 'is-local'
 import isRelative from 'is-relative'
 import sharp from 'sharp'
+import fs from 'fs'
 
 export default async ({ child,
-  path, }) => {
+  path, buildPaths }) => {
   const { properties: {
     src: url,
   } } = child
@@ -22,14 +23,17 @@ export default async ({ child,
     default: break
   }
 
-  const filename = `_${fsPath.parse(sourceUrl).name}.webp`
-  const destination = `${path}/.assets/${filename}`
+  const filename = `${fsPath.parse(sourceUrl).name}_optimized.webp`
+  const destination = `${buildPaths.email.assetsContainer}/${filename}`
 
   await sharp(sourceUrl)
     .webp({ quality: 90 })
     .toFile(destination)
 
-  const newUrl = `.assets/${filename}`
+  await fs.promises.rm(sourceUrl)
+
+  // const newUrl = `assets/${filename}`
+  const newUrl = destination
   return {
     ...child,
     properties: {