Merge pull request #47 from singerla/main

merge from main

Author: singerla

__tests__/modify-by-creation-id.test.ts

@@ -1,9 +1,11 @@
 import Automizer, { modify } from '../src/index';
+import { vd } from '../src/helper/general-helper';
 
 test('create presentation, add and modify an existing table by creation id.', async () => {
   const automizer = new Automizer({
     templateDir: `${__dirname}/pptx-templates`,
     outputDir: `${__dirname}/pptx-output`,
+    useCreationIds: true,
   });
 
   const data1 = {
@@ -18,19 +20,21 @@ test('create presentation, add and modify an existing table by creation id.', as
     .loadRoot(`RootTemplate.pptx`)
     .load(`SlideWithTables.pptx`, 'tables');
 
-  const creationIds = await pres.setCreationIds()
+  const creationIds = await pres.setCreationIds();
+  // vd(creationIds);
 
   const result = await pres
     .addSlide('tables', 1950777067, (slide) => {
-      slide.modifyElement(
-        '{EFC74B4C-D832-409B-9CF4-73C1EFF132D8}',
-        [modify.setTableData(data1)]);
+      slide.modifyElement('{EFC74B4C-D832-409B-9CF4-73C1EFF132D8}', [
+        modify.setTableData(data1),
+      ]);
 
       slide.addElement(
         'tables',
         1950777067,
         '{EFC74B4C-D832-409B-9CF4-73C1EFF132D8}',
-        [modify.setTableData(data1)]);
+        [modify.setTableData(data1)],
+      );
     })
     .write(`modify-existing-table.test.pptx`);
 

jest.config.ts

@@ -1,4 +1,5 @@
 module.exports = {
   preset: 'ts-jest',
   testEnvironment: 'node',
-};
+  collectCoverageFrom: ['src/helper/{!(pretty),}.js'],
+};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pptx-automizer",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "A template based pptx generator",
   "repository": {
     "type": "git",
@@ -18,11 +18,6 @@
     "lint": "eslint '*/**/*.{js,ts,tsx}' --fix",
     "prettier": "prettier --config .prettierrc 'src/**/*.ts' --write"
   },
-  "jest": {
-    "collectCoverageFrom": [
-      "src/helper/{!(pretty),}.js"
-    ]
-  },
   "files": [
     "dist",
     "README"
@@ -45,24 +40,24 @@
     "presentations"
   ],
   "devDependencies": {
-    "@types/jest": "^26.0.20",
-    "@types/node": "^14.14.33",
+    "@types/jest": "^29.4.0",
+    "@types/node": "^18.11.18",
     "@types/xmldom": "^0.1.30",
-    "@typescript-eslint/eslint-plugin": "^4.18.0",
-    "@typescript-eslint/parser": "^4.18.0",
-    "eslint": "^7.22.0",
-    "eslint-config-prettier": "^8.1.0",
-    "eslint-plugin-prettier": "^3.3.1",
-    "jest": "^26.6.3",
+    "@typescript-eslint/eslint-plugin": "^5.49.0",
+    "@typescript-eslint/parser": "^5.49.0",
+    "eslint": "^8.32.0",
+    "eslint-config-prettier": "^8.6.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "jest": "^29.4.0",
     "nodemon": "^2.0.20",
-    "prettier": "^2.2.1",
-    "ts-jest": "^26.5.2",
-    "ts-node": "^9.1.1",
-    "typedoc": "^0.22.15",
-    "typescript": "^4.2.3"
+    "prettier": "^2.8.3",
+    "ts-jest": "^29.0.5",
+    "ts-node": "^10.9.1",
+    "typedoc": "^0.23.24",
+    "typescript": "^4.9.4"
   },
   "dependencies": {
-    "@xmldom/xmldom": "^0.8.2",
+    "@xmldom/xmldom": "^0.8.6",
     "extract-zip": "^2.0.1",
     "jszip": "^3.10.1",
     "regexp.escape": "^1.1.0"

src/automizer.ts

@@ -197,6 +197,7 @@ export default class Automizer implements IPresentationProps {
     for (const template of this.templates) {
       const creationIds =
         template.creationIds || (await template.setCreationIds());
+      template.useCreationIds = this.params.useCreationIds;
       templateCreationId.push({
         name: template.name,
         slides: creationIds,

src/classes/slide.ts

@@ -143,7 +143,10 @@ export class Slide implements ISlide {
     template: PresTemplate,
     slideIdentifier: SourceSlideIdentifier,
   ): number {
-    if (template.creationIds !== undefined) {
+    if (
+      template.useCreationIds === true &&
+      template.creationIds !== undefined
+    ) {
       const matchCreationId = template.creationIds.find(
         (slideInfo) => slideInfo.id === Number(slideIdentifier),
       );
@@ -159,6 +162,7 @@ export class Slide implements ISlide {
         template.name
       );
     }
+
     return slideIdentifier as number;
   }
 
@@ -368,8 +372,9 @@ export class Slide implements ISlide {
     const sourcePath = `ppt/slides/slide${slideNumber}.xml`;
 
     const sourceArchive = await template.archive;
-    const hasCreationId = template.creationIds !== undefined;
-    const method = hasCreationId
+    const useCreationIds =
+      template.useCreationIds === true && template.creationIds !== undefined;
+    const method = useCreationIds
       ? 'findByElementCreationId'
       : 'findByElementName';
 
@@ -399,7 +404,7 @@ export class Slide implements ISlide {
     return {
       mode: importElement.mode,
       name: importElement.selector,
-      hasCreationId: hasCreationId,
+      hasCreationId: useCreationIds,
       sourceArchive,
       sourceSlideNumber: slideNumber,
       sourceElement,

src/helper/archive/archive-jszip.ts

@@ -51,6 +51,10 @@ export default class ArchiveJszip extends Archive implements IArchive {
       await this.initialize();
     }
 
+    if (!this.archive.files[file]) {
+      throw 'Could not find file ' + file;
+    }
+
     return this.archive.files[file].async(type || 'string');
   }
 

src/helper/xml-helper.ts

@@ -11,7 +11,6 @@ import {
 import { TargetByRelIdMap } from '../constants/constants';
 import { XmlPrettyPrint } from './xml-pretty-print';
 import { GetRelationshipsCallback, Target } from '../types/types';
-import _ from 'lodash';
 import { vd } from './general-helper';
 import { contentTracker } from './content-tracker';
 import IArchive from '../interfaces/iarchive';
@@ -190,10 +189,12 @@ export class XmlHelper {
     const file = element.getAttribute('Target');
     const rId = element.getAttribute('Id');
 
-    const subtype = _.last(prefix.split('/'));
-    const relType = _.last(type.split('/'));
-    const filename = _.last(file.split('/'));
-    const filenameExt = _.last(filename.split('.'));
+    const last = (arr: string[]): string => arr[arr.length - 1];
+
+    const subtype = last(prefix.split('/'));
+    const relType = last(type.split('/'));
+    const filename = last(file.split('/'));
+    const filenameExt = last(filename.split('.'));
     const filenameMatch = filename
       .replace('.' + filenameExt, '')
       .match(/^(.+?)(\d+)*$/);

src/interfaces/pres-template.ts

@@ -5,4 +5,5 @@ export interface PresTemplate extends ITemplate {
   name: string;
   setCreationIds(): Promise<SlideInfo[]>;
   creationIds?: SlideInfo[];
+  useCreationIds?: boolean;
 }