@lwrjs/nunjucks-view-provider 0.6.4 → 0.7.0-alpha.2

package/build/cjs/nunjucks-env-utils.cjs

@@ -31,15 +31,13 @@ var import_fs = __toModule(require("fs"));
 var import_path = __toModule(require("path"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_nunjucks = __toModule(require("nunjucks"));
-var NunjucksCustomLoader = import_nunjucks.default.Loader.extend({
-  init({contentDir, layoutsDir, rootDir, sourceDir}) {
-    this.contentDir = contentDir;
-    this.layoutsDir = layoutsDir;
-    this.rootDir = rootDir;
-    this.sourceDir = sourceDir;
-  },
+var NunjucksCustomLoader = class extends import_nunjucks.Loader {
+  constructor(config) {
+    super();
+    this.config = config;
+  }
   getSource(templatePath) {
-    const {rootDir, layoutsDir, contentDir} = this;
+    const {rootDir, layoutsDir, contentDir, sourceDir} = this.config;
     templatePath = (0, import_shared_utils.normalizeResourcePath)(templatePath, {
       rootDir,
       layoutsDir,
@@ -48,7 +46,7 @@ var NunjucksCustomLoader = import_nunjucks.default.Loader.extend({
     });
     const isAbsolute = import_path.default.isAbsolute(templatePath);
     const isRelative = templatePath.startsWith("./");
-    const fullTemplatePath = isAbsolute ? templatePath : isRelative ? import_path.default.join(this.sourceDir, templatePath) : import_path.default.join(rootDir, templatePath);
+    const fullTemplatePath = isAbsolute ? templatePath : isRelative ? import_path.default.join(sourceDir, templatePath) : import_path.default.join(rootDir, templatePath);
     if (!import_fs.default.existsSync(fullTemplatePath)) {
       throw new Error(`Unable to resolve nunjucks template. File not found on: "${fullTemplatePath}"`);
     }
@@ -60,7 +58,7 @@ var NunjucksCustomLoader = import_nunjucks.default.Loader.extend({
       noCache: true
     };
   }
-});
+};
 function addHelperMethods(nunjucksEnv) {
   nunjucksEnv.addGlobal("startsWith", "function (s, sw) { return s.startsWith( sw )}");
 }

package/build/es/index.js

@@ -55,7 +55,7 @@ export default class NunJucksViewProvider {
         const { content, data } = grayMatter(viewSource.originalSource);
         const { contentDir, layoutsDir, rootDir, watcher } = this;
         // In order to resolve relative paths for Nunjucks, we need to create a CustomLoader per View discovered
-        // Altough we could reuse it, the perf is negligible and the code its cleaner this way
+        // Although we could reuse it, the perf is negligible and the code its cleaner this way
         const nunjucksCustomLoader = new NunjucksCustomLoader({ contentDir, layoutsDir, rootDir, sourceDir });
         if (watcher) {
             nunjucksCustomLoader.on('import', (importFile) => this.watchView(importFile, viewId));

package/build/es/nunjucks-env-utils.d.ts

@@ -1,4 +1,15 @@
-import { Environment } from 'nunjucks';
-export declare const NunjucksCustomLoader: any;
+import { LoaderSource, Environment, Loader, ILoader } from 'nunjucks';
+interface NunjucksLoaderConfig {
+    contentDir: string;
+    layoutsDir: string;
+    rootDir: string;
+    sourceDir: string;
+}
+export declare class NunjucksCustomLoader extends Loader implements ILoader {
+    config: NunjucksLoaderConfig;
+    constructor(config: NunjucksLoaderConfig);
+    getSource(templatePath: string): LoaderSource;
+}
 export declare function addHelperMethods(nunjucksEnv: Environment): void;
+export {};
 //# sourceMappingURL=nunjucks-env-utils.d.ts.map

package/build/es/nunjucks-env-utils.js

@@ -1,18 +1,14 @@
 import fs from 'fs';
 import path from 'path';
 import { normalizeResourcePath } from '@lwrjs/shared-utils';
-import nunjucks from 'nunjucks';
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-export const NunjucksCustomLoader = nunjucks.Loader.extend({
-    init({ contentDir, layoutsDir, rootDir, sourceDir }) {
-        this.contentDir = contentDir;
-        this.layoutsDir = layoutsDir;
-        this.rootDir = rootDir;
-        this.sourceDir = sourceDir;
-    },
+import { Loader } from 'nunjucks';
+export class NunjucksCustomLoader extends Loader {
+    constructor(config) {
+        super();
+        this.config = config;
+    }
     getSource(templatePath) {
-        const { rootDir, layoutsDir, contentDir } = this;
+        const { rootDir, layoutsDir, contentDir, sourceDir } = this.config;
         templatePath = normalizeResourcePath(templatePath, {
             rootDir,
             layoutsDir,
@@ -24,7 +20,7 @@ export const NunjucksCustomLoader = nunjucks.Loader.extend({
         const fullTemplatePath = isAbsolute
             ? templatePath
             : isRelative
-                ? path.join(this.sourceDir, templatePath)
+                ? path.join(sourceDir, templatePath)
                 : path.join(rootDir, templatePath);
         if (!fs.existsSync(fullTemplatePath)) {
             throw new Error(`Unable to resolve nunjucks template. File not found on: "${fullTemplatePath}"`);
@@ -36,8 +32,8 @@ export const NunjucksCustomLoader = nunjucks.Loader.extend({
             path: fullTemplatePath,
             noCache: true,
         };
-    },
-});
+    }
+}
 export function addHelperMethods(nunjucksEnv) {
     nunjucksEnv.addGlobal('startsWith', 'function (s, sw) { return s.startsWith( sw )}');
 }

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.6.4",
+    "version": "0.7.0-alpha.2",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -30,17 +30,17 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/base-template-engine": "0.6.4",
-        "@lwrjs/shared-utils": "0.6.4",
+        "@lwrjs/base-template-engine": "0.7.0-alpha.2",
+        "@lwrjs/shared-utils": "0.7.0-alpha.2",
         "gray-matter": "^4.0.2",
         "nunjucks": "^3.2.2",
         "parse5-sax-parser": "^6.0.1"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.6.4"
+        "@lwrjs/types": "0.7.0-alpha.2"
     },
     "engines": {
         "node": ">=14.15.4 <17"
     },
-    "gitHead": "80b73fe4558dc3db0afcdbe80eb17f5a1464e34e"
+    "gitHead": "fc3a13d1c5440833eb2ec17fbf0e294554bafa08"
 }