@normed/bundle 4.2.1 → 4.3.0

package/CHANGELOG.md

@@ -6,6 +6,17 @@ Given a version number MAJOR.MINOR.PATCH, increment the:
 2. MINOR version when you add functionality in a backwards compatible manner, and
 3. PATCH version when you make backwards compatible bug fixes.
 
+# 4.3.0
+
+* MINOR: Adds the escape filter (:escape) which escapes HTML.
+
+# 4.2.2
+
+* PATCH: Fixes bug where pug files will not build if they have a `script` element with no attributes.
+* PATCH: Prints errors from the TS build.
+* PATCH: Updates some dependencies.
+* PATCH: Corrects internal collection SetMap to support the Disposable interface.
+
 # 4.2.1
 
 * PATCH: Fixes missing path in load_less.

package/bundles/SetMap.d.ts

@@ -13,11 +13,12 @@ export declare class SetMap<KT, V, K extends Set<KT> = Set<KT>> implements Map<K
     delete(key: K): boolean;
     get(key: K): V | undefined;
     has(key: K): boolean;
-    keys(): IterableIterator<K>;
-    values(): IterableIterator<V>;
-    entries(): IterableIterator<[K, V]>;
-    [Symbol.iterator](): IterableIterator<[K, V]>;
+    keys(): MapIterator<K>;
+    values(): MapIterator<V>;
+    entries(): MapIterator<[K, V]>;
+    [Symbol.iterator](): MapIterator<[K, V]>;
     [Symbol.toStringTag]: string;
+    [Symbol.dispose](): void;
     forEach(callbackfn: (value: V, key: K, map: SetMap<KT, V, K>) => void, thisArg?: any): void;
     /** Array likes */
     every(callbackfn: (value: V, key: K, map: SetMap<KT, V, K>) => boolean, thisArg?: any): boolean;

package/bundles/bin/cli.js

@@ -34664,15 +34664,15 @@ var require_pug_parser = __commonJS({
           column: tok.loc.start.column,
           filename: this.filename
         };
-        var filters = [];
+        var filters2 = [];
         while (this.peek().type === "filter") {
-          filters.push(this.parseIncludeFilter());
+          filters2.push(this.parseIncludeFilter());
         }
         var path12 = this.expect("path");
         node.file.path = path12.val.trim();
         node.file.line = path12.loc.start.line;
         node.file.column = path12.loc.start.column;
-        if ((/\.jade$/.test(node.file.path) || /\.pug$/.test(node.file.path)) && !filters.length) {
+        if ((/\.jade$/.test(node.file.path) || /\.pug$/.test(node.file.path)) && !filters2.length) {
           node.block = "indent" == this.peek().type ? this.block() : this.emptyBlock(tok.loc.start.line);
           if (/\.jade$/.test(node.file.path)) {
             console.warn(
@@ -34681,7 +34681,7 @@ var require_pug_parser = __commonJS({
           }
         } else {
           node.type = "RawInclude";
-          node.filters = filters;
+          node.filters = filters2;
           if (this.peek().type === "indent") {
             this.error(
               "RAW_INCLUDE_BLOCK",
@@ -65893,14 +65893,14 @@ var require_handle_filters = __commonJS({
     var error = require_lib5();
     var runFilter = require_run_filter();
     module2.exports = handleFilters;
-    function handleFilters(ast, filters, options2, filterAliases) {
+    function handleFilters(ast, filters2, options2, filterAliases) {
       options2 = options2 || {};
       walk(
         ast,
         function(node) {
           var dir = node.filename ? dirname(node.filename) : null;
           if (node.type === "Filter") {
-            handleNestedFilters(node, filters, options2, filterAliases);
+            handleNestedFilters(node, filters2, options2, filterAliases);
             var text = getBodyAsText(node);
             var attrs = getAttributes(node, options2);
             attrs.filename = node.filename;
@@ -65928,8 +65928,8 @@ var require_handle_filters = __commonJS({
           function filterWithFallback(filter2, text2, attrs2, funcName) {
             try {
               var filterName = getFilterName(filter2);
-              if (filters && filters[filterName]) {
-                return filters[filterName](text2, attrs2);
+              if (filters2 && filters2[filterName]) {
+                return filters2[filterName](text2, attrs2);
               } else {
                 return runFilter(filterName, text2, attrs2, dir, funcName);
               }
@@ -65942,11 +65942,11 @@ var require_handle_filters = __commonJS({
           }
           function filterFileWithFallback(filter2, filename2, file, attrs2) {
             var filterName = getFilterName(filter2);
-            if (filters && filters[filterName]) {
-              if (filters[filterName].renderBuffer) {
-                return filters[filterName].renderBuffer(file.raw, attrs2);
+            if (filters2 && filters2[filterName]) {
+              if (filters2[filterName].renderBuffer) {
+                return filters2[filterName].renderBuffer(file.raw, attrs2);
               } else {
-                return filters[filterName](file.str, attrs2);
+                return filters2[filterName](file.str, attrs2);
               }
             } else {
               return filterWithFallback(filter2, filename2, attrs2, "renderFile");
@@ -65971,11 +65971,11 @@ var require_handle_filters = __commonJS({
       }
       return ast;
     }
-    function handleNestedFilters(node, filters, options2, filterAliases) {
+    function handleNestedFilters(node, filters2, options2, filterAliases) {
       if (node.block.nodes[0] && node.block.nodes[0].type === "Filter") {
         node.block.nodes[0] = handleFilters(
           node.block,
-          filters,
+          filters2,
           options2,
           filterAliases
         ).nodes[0];
@@ -68089,7 +68089,7 @@ var require_lib14 = __commonJS({
     var stripComments = require_pug_strip_comments();
     var parse = require_pug_parser();
     var load = require_pug_load();
-    var filters = require_pug_filters();
+    var filters2 = require_pug_filters();
     var link = require_pug_linker();
     var generateCode = require_pug_code_gen();
     var runtime = require_pug_runtime();
@@ -68210,7 +68210,7 @@ var require_lib14 = __commonJS({
           filtersSet[key] = options2.filters[key];
         });
       }
-      ast = filters.handleFilters(
+      ast = filters2.handleFilters(
         ast,
         filtersSet,
         options2.filterOptions,
@@ -69132,6 +69132,11 @@ var load_less_default = plugin;
 var import_pug = __toESM(require_lib14());
 var import_fs4 = __toESM(require("fs"));
 var import_path5 = __toESM(require("path"));
+var filters = {
+  escape: (str) => {
+    return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+  }
+};
 function pugTransformer(test, onFound) {
   return {
     preCodeGen(ast) {
@@ -69154,7 +69159,7 @@ function pugTransformer(test, onFound) {
   };
 }
 function isScriptNodeWithSrcAttr(node) {
-  return node.name === "script" && node.attrs.some((attr) => attr.name === "src");
+  return node.name === "script" && node.attrs?.some((attr) => attr.name === "src");
 }
 async function loadAsText2(_filepath) {
   return {
@@ -69168,7 +69173,8 @@ async function loadAsJS2(filepath, options2) {
   const contents = "export default " + import_pug.default.compileClient(fileData, {
     name: "render",
     filename: filepath,
-    basedir: options2.outbase
+    basedir: options2.outbase,
+    filters
   });
   return {
     contents,
@@ -69185,7 +69191,8 @@ async function loadAsHtml(filepath, options2) {
       pugTransformer(isScriptNodeWithSrcAttr, (nodes) => {
         nodes;
       })
-    ]
+    ],
+    filters
   });
   return {
     contents,
@@ -69202,7 +69209,8 @@ async function loadAsEntrypoint(filepath, options2) {
       pugTransformer(isScriptNodeWithSrcAttr, (nodes) => {
         nodes;
       })
-    ]
+    ],
+    filters
   });
   return {
     contents,
@@ -69214,7 +69222,8 @@ async function loadAsFile(filepath, options2) {
   const contents = import_pug.default.render(fileData, {
     name: "render",
     filename: filepath,
-    basedir: options2.outbase
+    basedir: options2.outbase,
+    filters
   });
   return {
     contents,
@@ -69544,6 +69553,8 @@ var esbuilder = {
           log_default.error(
             `Build failed with ${errors.length} errors and ${warnings.length} warnings.`
           );
+          log_default.error(`Errors:`, errors);
+          log_default.warn(`Warnings:`, warnings);
           throw [...errors, ...warnings];
         }
       });
@@ -69974,6 +69985,9 @@ var SetMap = class _SetMap {
     return this.entries();
   }
   [Symbol.toStringTag] = "SetMap";
+  [Symbol.dispose]() {
+    this.clear();
+  }
   forEach(callbackfn, thisArg) {
     for (const [key, value] of this.entries()) {
       callbackfn.call(thisArg, value, key, this);