@inizioevoke/veeva-astroclm-core 1.3.9 → 1.4.0

package/dist/lib/utils.js

@@ -2,7 +2,7 @@ export function formatExtId(...ids) {
     return ids.map((id) => { return id.toUpperCase(); }).join('_');
 }
 export function pathToSlideZip(path) {
-    return `${flattenPath(path, { slashes: false })}.zip`;
+    return `${flattenPath(path, { slashes: false }).replace(/\.zip$/i, '')}.zip`;
 }
 export function flattenPath(path, { slashes = true } = {}) {
     return `${slashes ? '/' : ''}${path.toLowerCase().split('/').filter(s => s !== '').join('-')}${slashes ? '/' : ''}`;

package/dist/tasks/create-csv.js

@@ -152,7 +152,7 @@ function createSlideRow(headers, config, slide, additional) {
     addColumn(headers, row, HEADER_SLIDE_REACTIONS, disable.has('Reactions') ? ',a,b,c' : '');
     disable.delete('Reactions');
     addColumn(headers, row, HEADER_SLIDE_DISABLE_ACTIONS, [...disable].join(','));
-    addColumn(headers, row, HEADER_SLIDE_FILE_NAME, pathToSlideZip(slide.path));
+    addColumn(headers, row, HEADER_SLIDE_FILE_NAME, pathToSlideZip(slide.zipFileName ?? slide.path));
     addColumn(headers, row, HEADER_SLIDE_RELATED_SHARED, config.presentation.shared?.externalId ?? '');
     addColumn(headers, row, HEADER_SLIDE_CLM_CONTENT, VEEVA_YES);
     addColumn(headers, row, HEADER_PRESENTATION, config.presentation.externalId);
@@ -180,7 +180,7 @@ function createSharedRow(headers, config, additional) {
     addColumn(headers, row, HEADER_SLIDE_PRODUCT, config.presentation.product);
     addColumn(headers, row, HEADER_SLIDE_COUNTRY, config.presentation.country);
     addColumn(headers, row, HEADER_SLIDE_MEDIA_TYPE, shared.mediaType ?? VEEVA_MEDIATYPE_HTML);
-    addColumn(headers, row, HEADER_SLIDE_FILE_NAME, pathToSlideZip(shared.path ?? 'shared'));
+    addColumn(headers, row, HEADER_SLIDE_FILE_NAME, pathToSlideZip(shared.zipFileName ?? shared.path ?? 'shared'));
     addColumn(headers, row, HEADER_SLIDE_CLM_CONTENT, VEEVA_YES);
     addColumn(headers, row, HEADER_SLIDE_CRM_SHARED, VEEVA_YES);
     addColumn(headers, row, HEADER_LIFECYCLE, VEEVA_LIFECYCLE_CRM_CONTENT);

package/dist/tasks/generate-thumbs.js

@@ -1,5 +1,5 @@
 import { writeFile } from "node:fs/promises";
-import { join } from "node:path";
+import { extname, join } from "node:path";
 import puppeteer from "puppeteer";
 import sharp from 'sharp';
 import logger from '../lib/logger.js';
@@ -18,9 +18,13 @@ export default async function ({ config, root, deployDir, server }) {
     });
     try {
         for (const slide of config.presentation.slides) {
+            if (!slide.thumbnails || !slide.thumbnails.settings)
+                continue;
             for (const settings of slide.thumbnails.settings) {
-                logger.info(`Generating /${settings.path ?? slide.path}/`);
-                const url = `${server.protocol ?? 'http'}://${server.host}:${server.port}/${settings.path ?? slide.path}/${settings.queryStringParams ? `?${objToQS(settings.queryStringParams)}` : ''}`;
+                const settingsPath = settings.path ?? slide.path;
+                const urlPath = `${settingsPath.startsWith('/') ? '' : '/'}${settingsPath}${extname(settingsPath) !== '' ? '' : '/'}`;
+                logger.info(`Generating ${urlPath}`);
+                const url = `${server.protocol ?? 'http'}://${server.host}:${server.port}${urlPath}${settings.queryStringParams ? `?${objToQS(settings.queryStringParams)}` : ''}`;
                 await page.goto(url, {
                     waitUntil: 'networkidle0'
                 });
@@ -165,6 +169,8 @@ function initThumbSettings(config) {
     //   }
     // }
     for (const slide of config.presentation.slides) {
+        if (slide.thumbnails === false)
+            continue;
         if (!slide.thumbnails) {
             slide.thumbnails = {};
         }

package/dist/tasks/update-shared.js

@@ -1,4 +1,5 @@
 import { readdir, readFile, writeFile } from 'node:fs/promises';
+import { existsSync } from 'node:fs';
 import { join, extname } from 'node:path';
 import logger from '../lib/logger.js';
 export default async function ({ deployDir }) {
@@ -29,13 +30,19 @@ async function handleShared(deployDir, dir) {
     }
 }
 async function handleHTML(deployDir, dir) {
-    await updateSharedPath(join(deployDir, dir, 'index.html'));
+    const index = join(deployDir, dir, 'index.html');
+    if (!existsSync(index))
+        return;
+    await updateSharedPath(index);
 }
 async function updateSharedPath(filepath) {
     const str = await readFile(filepath, 'utf8');
     let shared = './shared/';
-    if (extname(filepath) === '.css') { // relative paths inside a css
-        shared = './';
+    switch (extname(filepath)) {
+        case '.css':
+        case '.js':
+            shared = './';
+            break;
     }
     await writeFile(filepath, str.replace(/(?:\.*\/)*shared\//g, shared));
 }

package/dist/types/config.d.ts

@@ -37,12 +37,14 @@ export interface ISlideThumbnailSettings {
 export interface IVeevaConfigSlide extends IVeevaClmSlide {
   path: string;
   enableActions?: Actions[];
-  thumbnails?: ISlideThumbnailSettings;
+  thumbnails?: false | ISlideThumbnailSettings;
+  zipFileName?: string;
 }
 
 export interface IVeevaConfigPresentation extends IVeevaClmPresentation {
   shared?: IVeevaClmSharedResource & {
     path?: string;
+    zipFileName?: string;
   },
   slides: IVeevaConfigSlide[]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inizioevoke/veeva-astroclm-core",
-  "version": "1.3.9",
+  "version": "1.4.0",
   "description": "",
   "license": "ISC",
   "author": "",

package/src/lib/utils.ts

@@ -5,7 +5,7 @@ export function formatExtId(...ids: string[]) {
 }
 
 export function pathToSlideZip(path: string) {
-  return `${flattenPath(path, { slashes: false })}.zip`;
+  return `${flattenPath(path, { slashes: false }).replace(/\.zip$/i,'')}.zip`;
 }
 
 export function flattenPath(path: string, { slashes = true }: { slashes?: boolean } = {}) {

package/src/tasks/create-csv.ts

@@ -229,7 +229,7 @@ function createSlideRow(headers: string[], config: IVeevaConfig, slide: IVeevaCo
   disable.delete('Reactions');
   addColumn(headers, row, HEADER_SLIDE_DISABLE_ACTIONS, [...disable].join(','));
   
-  addColumn(headers, row, HEADER_SLIDE_FILE_NAME, pathToSlideZip(slide.path));
+  addColumn(headers, row, HEADER_SLIDE_FILE_NAME, pathToSlideZip(slide.zipFileName ?? slide.path));
   addColumn(headers, row, HEADER_SLIDE_RELATED_SHARED, config.presentation.shared?.externalId ?? '');
   addColumn(headers, row, HEADER_SLIDE_CLM_CONTENT, VEEVA_YES);
   addColumn(headers, row, HEADER_PRESENTATION, config.presentation.externalId);
@@ -260,7 +260,7 @@ function createSharedRow(headers: string[], config: IVeevaConfig, additional?: A
   addColumn(headers, row, HEADER_SLIDE_PRODUCT, config.presentation.product);
   addColumn(headers, row, HEADER_SLIDE_COUNTRY, config.presentation.country);
   addColumn(headers, row, HEADER_SLIDE_MEDIA_TYPE, shared.mediaType ?? VEEVA_MEDIATYPE_HTML);
-  addColumn(headers, row, HEADER_SLIDE_FILE_NAME, pathToSlideZip(shared.path ?? 'shared'));
+  addColumn(headers, row, HEADER_SLIDE_FILE_NAME, pathToSlideZip(shared.zipFileName ?? shared.path ?? 'shared'));
   addColumn(headers, row, HEADER_SLIDE_CLM_CONTENT, VEEVA_YES);
   addColumn(headers, row, HEADER_SLIDE_CRM_SHARED, VEEVA_YES);
   addColumn(headers, row, HEADER_LIFECYCLE, VEEVA_LIFECYCLE_CRM_CONTENT);

package/src/tasks/generate-thumbs.ts

@@ -1,5 +1,5 @@
 import { writeFile } from "node:fs/promises";
-import { join } from "node:path";
+import { extname, join } from "node:path";
 import puppeteer, { type Viewport } from "puppeteer";
 import sharp from 'sharp';
 
@@ -34,9 +34,13 @@ export default async function({ config, root, deployDir, server }: Params) {
 
   try {
     for (const slide of config.presentation.slides) {
-      for (const settings of slide.thumbnails!.settings!) {
-        logger.info(`Generating /${settings.path ?? slide.path}/`);
-        const url = `${server.protocol ?? 'http'}://${server.host}:${server.port}/${settings.path ?? slide.path}/${settings.queryStringParams ? `?${objToQS(settings.queryStringParams)}` : ''}`
+      if (!slide.thumbnails || !slide.thumbnails.settings) continue;
+
+      for (const settings of slide.thumbnails.settings) {
+        const settingsPath = settings.path ?? slide.path;
+        const urlPath = `${settingsPath.startsWith('/') ? '' : '/'}${settingsPath}${extname(settingsPath) !== '' ? '' : '/'}`;
+        logger.info(`Generating ${urlPath}`);
+        const url = `${server.protocol ?? 'http'}://${server.host}:${server.port}${urlPath}${settings.queryStringParams ? `?${objToQS(settings.queryStringParams)}` : ''}`
 
         await page.goto(url, { 
           waitUntil: 'networkidle0'
@@ -189,6 +193,8 @@ function initThumbSettings(config: IVeevaConfig) {
   // }
 
   for (const slide of config.presentation.slides) {
+    if (slide.thumbnails === false) continue;
+
     if (!slide.thumbnails) {
       slide.thumbnails = {};
     }

package/src/tasks/update-shared.ts

@@ -1,4 +1,5 @@
 import { readdir, readFile, writeFile } from 'node:fs/promises';
+import { existsSync } from 'node:fs';
 import { join, extname } from 'node:path';
 
 import logger from '../lib/logger.js';
@@ -36,14 +37,19 @@ async function handleShared(deployDir: string, dir: string) {
 }
 
 async function handleHTML(deployDir: string, dir: string) {
-  await updateSharedPath(join(deployDir, dir, 'index.html'));
+  const index = join(deployDir, dir, 'index.html');
+  if (!existsSync(index)) return;
+  await updateSharedPath(index);
 }
 
 async function updateSharedPath(filepath: string) {
   const str = await readFile(filepath, 'utf8');
   let shared = './shared/';
-  if (extname(filepath) === '.css') { // relative paths inside a css
-    shared = './';
+  switch (extname(filepath)) {
+    case '.css':
+    case '.js':
+      shared = './';
+      break;
   }
   await writeFile(filepath, str.replace(/(?:\.*\/)*shared\//g, shared));
 }

package/src/types/config.d.ts

@@ -37,12 +37,14 @@ export interface ISlideThumbnailSettings {
 export interface IVeevaConfigSlide extends IVeevaClmSlide {
   path: string;
   enableActions?: Actions[];
-  thumbnails?: ISlideThumbnailSettings;
+  thumbnails?: false | ISlideThumbnailSettings;
+  zipFileName?: string;
 }
 
 export interface IVeevaConfigPresentation extends IVeevaClmPresentation {
   shared?: IVeevaClmSharedResource & {
     path?: string;
+    zipFileName?: string;
   },
   slides: IVeevaConfigSlide[]
 }