revert to cjs module re: syntax-tree/hastscript#16

see syntax-tree/unist#72
helmturner · Jul 8, 2022 · 07b9df9 · 07b9df9
1 parent 7acd460
commit 07b9df9
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 16 deletions.
diff --git a/index.d.ts.map b/index.d.ts.map
diff --git a/index.js b/index.js
@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MultiError = void 0;
-const unist_util_visit_1 = require("unist-util-visit");
-class MultiError extends Error {
+import { visit } from "unist-util-visit";
+export class MultiError extends Error {
     constructor(errors) {
         super(`Multiple Errors Occured:`);
         Object.defineProperty(this, "errors", {
@@ -15,7 +12,6 @@ class MultiError extends Error {
         this.errors = errors;
     }
 }
-exports.MultiError = MultiError;
 /**
  * Parses, stores, and optionally validates the contents of frontmatter blocks pasred by remark-frontmatter.
  *
@@ -39,11 +35,10 @@ const remarkMorematter = function (settings) {
         for (const key in handlers) {
             const { parser, validator, name = key } = handlers[key];
             const results = [];
-            (0, unist_util_visit_1.visit)(tree, key, (node, index, parent) => {
+            visit(tree, key, (node, index, parent) => {
                 throwOnInvalidNodeType(node.type);
                 //@ts-expect-error: We've already excluded invalid node types
                 const value = parser(node.value);
-                node.type;
                 try {
                     validator && validator(value);
                 }
@@ -54,9 +49,10 @@ const remarkMorematter = function (settings) {
                 }
                 results.push(value);
                 // Remove this node from the tree
-                parent && index && parent.children.splice(index, 1);
+                !!parent && !!index && parent.children.splice(index, 1);
                 // Since we removed a node, continue visiting at the same index to avoid skipping nodes
-                return index;
+                if (index)
+                    return ++index;
             });
             file.data[name] = results;
         }
@@ -93,4 +89,4 @@ function throwOnInvalidNodeType(type) {
         throw new Error(`remark-morematter: handling ${type} node types is not supported`);
     }
 }
-exports.default = remarkMorematter;
+export default remarkMorematter;
diff --git a/package.json b/package.json
@@ -1,6 +1,7 @@
 {
     "name": "remark-morematter",
     "version": "1.0.0",
+    "type": "module",
     "engines": {
       "node": ">=14.16"
     },

diff --git a/src/index.ts b/src/index.ts
@@ -72,7 +72,6 @@ const remarkMorematter: Plugin<[Options|null], Root, Root> = function (
         throwOnInvalidNodeType(node.type);
         //@ts-expect-error: We've already excluded invalid node types
         const value = parser(node.value);
-        node.type;
         try {
           validator && validator(value);
         } catch (error) {
@@ -82,9 +81,9 @@ const remarkMorematter: Plugin<[Options|null], Root, Root> = function (
         }
         results.push(value);
         // Remove this node from the tree
-        parent && index && parent.children.splice(index, 1);
+        !!parent && !!index && parent.children.splice(index, 1);
         // Since we removed a node, continue visiting at the same index to avoid skipping nodes
-        return index;
+        if (index) return ++index;
       });
       file.data[name] = results;
     }

diff --git a/tsconfig.json b/tsconfig.json
@@ -24,7 +24,7 @@
     // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
 
     /* Modules */
-    "module": "node16",                                /* Specify what module code is generated. */
+    "module": "ES2015",                                /* Specify what module code is generated. */
     // "rootDir": "./",                                  /* Specify the root folder within your source files. */
     "moduleResolution": "node",                       /* Specify how TypeScript looks up a file from a given module specifier. */
     // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */