@danielx/civet 0.5.45 → 0.5.47

package/dist/browser.js

@@ -517,13 +517,13 @@ ${input.slice(result.pos)}
         BindingPattern,
         ObjectBindingPattern,
         ObjectBindingPatternContent,
+        BindingPropertyList,
         ArrayBindingPattern,
         ArrayBindingPatternContent,
         Elision,
         NestedBindingProperties,
-        NestedBindingProperty,
+        NestedBindingPropertyList,
         BindingProperty,
-        NestedBindingRestProperty,
         BindingRestProperty,
         NestedBindingElements,
         NestedBindingElement,
@@ -3817,21 +3817,11 @@ ${input.slice(result.pos)}
         }
       }
       var ObjectBindingPatternContent$0 = NestedBindingProperties;
-      var ObjectBindingPatternContent$1 = $TS($S($Q(BindingProperty), $E(BindingRestProperty), $Q(BindingProperty)), function($skip, $loc, $0, $1, $2, $3) {
-        var props = $1;
-        var rest = $2;
-        var after = $3;
-        const names = props.flatMap((p) => p.names);
-        const children = [...props];
-        if (rest) {
-          [rest, after] = module.reorderBindingRestProperty(rest, after);
-          children.push(...after, rest);
-          names.push(...after.flatMap((p) => p.names), ...rest.names);
-        }
-        return {
-          names,
-          children
-        };
+      var ObjectBindingPatternContent$1 = $TV($E(BindingPropertyList), function($skip, $loc, $0, $1) {
+        var props = $0;
+        if (!props)
+          return { children: [], names: [] };
+        return module.reorderBindingRestProperty(props);
       });
       function ObjectBindingPatternContent(state) {
         let eventData;
@@ -3855,6 +3845,37 @@ ${input.slice(result.pos)}
           return result;
         }
       }
+      var BindingPropertyList$0 = $TV($P($S(BindingProperty, ObjectPropertyDelimiter)), function($skip, $loc, $0, $1) {
+        var props = $0;
+        return props.map(([prop, delim]) => {
+          return {
+            ...prop,
+            children: [...prop.children, delim]
+          };
+        });
+      });
+      function BindingPropertyList(state) {
+        let eventData;
+        if (state.events) {
+          const result = state.events.enter?.("BindingPropertyList", state);
+          if (result) {
+            if (result.cache)
+              return result.cache;
+            eventData = result.data;
+          }
+        }
+        if (state.tokenize) {
+          const result = $TOKEN("BindingPropertyList", state, BindingPropertyList$0(state));
+          if (state.events)
+            state.events.exit?.("BindingPropertyList", state, result, eventData);
+          return result;
+        } else {
+          const result = BindingPropertyList$0(state);
+          if (state.events)
+            state.events.exit?.("BindingPropertyList", state, result, eventData);
+          return result;
+        }
+      }
       var ArrayBindingPattern$0 = $TS($S(OpenBracket, ArrayBindingPatternContent, __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
         var c = $2;
         return {
@@ -3962,23 +3983,12 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var NestedBindingProperties$0 = $TS($S(PushIndent, $Q(NestedBindingProperty), $E(NestedBindingRestProperty), $Q(NestedBindingProperty), PopIndent), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var NestedBindingProperties$0 = $TS($S(PushIndent, $Q(NestedBindingPropertyList), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
         var props = $2;
-        var rest = $3;
-        var after = $4;
-        if (!(props.length || rest))
+        if (!props.length)
           return $skip;
-        const names = props.flatMap((p) => p.names);
-        const children = [...props];
-        if (rest) {
-          [rest, after] = module.reorderBindingRestProperty(rest, after);
-          children.push(...after, rest);
-          names.push(...after.flatMap((p) => p.names), ...rest.names);
-        }
-        return {
-          children,
-          names
-        };
+        props = props.flat();
+        return module.reorderBindingRestProperty(props);
       });
       function NestedBindingProperties(state) {
         let eventData;
@@ -4002,18 +4012,22 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var NestedBindingProperty$0 = $TS($S(Nested, BindingProperty), function($skip, $loc, $0, $1, $2) {
-        var indent = $1;
-        var prop = $2;
-        return {
-          ...prop,
-          children: [...indent, ...prop.children]
-        };
+      var NestedBindingPropertyList$0 = $TS($S(Nested, BindingPropertyList), function($skip, $loc, $0, $1, $2) {
+        var ws = $1;
+        var props = $2;
+        return props.map((prop, i) => {
+          if (i > 0)
+            return prop;
+          return {
+            ...prop,
+            children: [ws, ...prop.children]
+          };
+        });
       });
-      function NestedBindingProperty(state) {
+      function NestedBindingPropertyList(state) {
         let eventData;
         if (state.events) {
-          const result = state.events.enter?.("NestedBindingProperty", state);
+          const result = state.events.enter?.("NestedBindingPropertyList", state);
           if (result) {
             if (result.cache)
               return result.cache;
@@ -4021,25 +4035,26 @@ ${input.slice(result.pos)}
           }
         }
         if (state.tokenize) {
-          const result = $TOKEN("NestedBindingProperty", state, NestedBindingProperty$0(state));
+          const result = $TOKEN("NestedBindingPropertyList", state, NestedBindingPropertyList$0(state));
           if (state.events)
-            state.events.exit?.("NestedBindingProperty", state, result, eventData);
+            state.events.exit?.("NestedBindingPropertyList", state, result, eventData);
           return result;
         } else {
-          const result = NestedBindingProperty$0(state);
+          const result = NestedBindingPropertyList$0(state);
           if (state.events)
-            state.events.exit?.("NestedBindingProperty", state, result, eventData);
+            state.events.exit?.("NestedBindingPropertyList", state, result, eventData);
           return result;
         }
       }
-      var BindingProperty$0 = $TS($S(__, PropertyName, __, Colon, $C(BindingIdentifier, BindingPattern), $E(Initializer), ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+      var BindingProperty$0 = BindingRestProperty;
+      var BindingProperty$1 = $TS($S($E(_), PropertyName, __, Colon, $C(BindingIdentifier, BindingPattern), $E(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
         var b = $5;
         return {
           names: b.names,
           children: $0
         };
       });
-      var BindingProperty$1 = $TS($S(BindingIdentifier, $E(Initializer), ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3) {
+      var BindingProperty$2 = $TS($S(BindingIdentifier, $E(Initializer)), function($skip, $loc, $0, $1, $2) {
         var b = $1;
         if (b.type === "AtBinding") {
           return {
@@ -4065,65 +4080,35 @@ ${input.slice(result.pos)}
           }
         }
         if (state.tokenize) {
-          const result = $TOKEN("BindingProperty", state, BindingProperty$0(state) || BindingProperty$1(state));
+          const result = $TOKEN("BindingProperty", state, BindingProperty$0(state) || BindingProperty$1(state) || BindingProperty$2(state));
           if (state.events)
             state.events.exit?.("BindingProperty", state, result, eventData);
           return result;
         } else {
-          const result = BindingProperty$0(state) || BindingProperty$1(state);
+          const result = BindingProperty$0(state) || BindingProperty$1(state) || BindingProperty$2(state);
           if (state.events)
             state.events.exit?.("BindingProperty", state, result, eventData);
           return result;
         }
       }
-      var NestedBindingRestProperty$0 = $TS($S(Nested, BindingRestProperty), function($skip, $loc, $0, $1, $2) {
-        var indent = $1;
-        var prop = $2;
-        return {
-          ...prop,
-          children: [indent, ...prop.children]
-        };
-      });
-      function NestedBindingRestProperty(state) {
-        let eventData;
-        if (state.events) {
-          const result = state.events.enter?.("NestedBindingRestProperty", state);
-          if (result) {
-            if (result.cache)
-              return result.cache;
-            eventData = result.data;
-          }
-        }
-        if (state.tokenize) {
-          const result = $TOKEN("NestedBindingRestProperty", state, NestedBindingRestProperty$0(state));
-          if (state.events)
-            state.events.exit?.("NestedBindingRestProperty", state, result, eventData);
-          return result;
-        } else {
-          const result = NestedBindingRestProperty$0(state);
-          if (state.events)
-            state.events.exit?.("NestedBindingRestProperty", state, result, eventData);
-          return result;
-        }
-      }
-      var BindingRestProperty$0 = $TS($S(__, DotDotDot, BindingIdentifier, ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var BindingRestProperty$0 = $TS($S($E(_), DotDotDot, BindingIdentifier), function($skip, $loc, $0, $1, $2, $3) {
         var ws = $1;
         var dots = $2;
         var id = $3;
-        var delimiter = $4;
         return {
           ...id,
-          children: [...ws, dots, ...id.children, delimiter]
+          type: "BindingRestProperty",
+          children: [...ws || [], dots, ...id.children]
         };
       });
-      var BindingRestProperty$1 = $TS($S(__, BindingIdentifier, DotDotDot, ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var BindingRestProperty$1 = $TS($S($E(_), BindingIdentifier, DotDotDot), function($skip, $loc, $0, $1, $2, $3) {
         var ws = $1;
         var id = $2;
         var dots = $3;
-        var delimiter = $4;
         return {
           ...id,
-          children: [...ws, dots, ...id.children, delimiter]
+          type: "BindingRestProperty",
+          children: [...ws || [], dots, ...id.children]
         };
       });
       function BindingRestProperty(state) {
@@ -17320,13 +17305,39 @@ ${input.slice(result.pos)}
             token: str
           };
         };
-        module.reorderBindingRestProperty = function(rest, after) {
-          if (after.length) {
-            const [restDelim] = rest.children.slice(-1), lastAfterProp = after[after.length - 1], lastAfterChildren = lastAfterProp.children, [lastDelim] = lastAfterChildren.slice(-1);
-            rest = { ...rest, children: [...rest.children.slice(0, -1), lastDelim] };
-            after = [...after.slice(0, -1), { ...lastAfterProp, children: [...lastAfterChildren.slice(0, -1), restDelim] }];
+        module.reorderBindingRestProperty = function(props) {
+          const names = props.flatMap((p) => p.names);
+          let restIndex = -1;
+          let restCount = 0;
+          props.forEach(({ type }, i) => {
+            if (type === "BindingRestProperty") {
+              if (restIndex < 0)
+                restIndex = i;
+              restCount++;
+            }
+          });
+          if (restCount === 0) {
+            const children = [...props];
+            return {
+              children,
+              names
+            };
+          } else if (restCount === 1) {
+            let after = props.slice(restIndex + 1);
+            let rest = props[restIndex];
+            props = props.slice(0, restIndex);
+            if (after.length) {
+              const [restDelim] = rest.children.slice(-1), lastAfterProp = after[after.length - 1], lastAfterChildren = lastAfterProp.children, [lastDelim] = lastAfterChildren.slice(-1);
+              rest = { ...rest, children: [...rest.children.slice(0, -1), lastDelim] };
+              after = [...after.slice(0, -1), { ...lastAfterProp, children: [...lastAfterChildren.slice(0, -1), restDelim] }];
+            }
+            const children = [...props, ...after, rest];
+            return {
+              children,
+              names
+            };
           }
-          return [rest, after];
+          throw new Error("Multiple rest properties in object pattern");
         };
         function gatherNodes(node, predicate) {
           if (node == null)

package/dist/bun-civet.mjs

@@ -0,0 +1,22 @@
+import {
+  plugin
+} from "bun";
+await plugin({
+  name: "Civet loader",
+  setup: async function(builder) {
+    var compile, readFileSync;
+    ({ compile } = await import("./main.mjs"));
+    ({ readFileSync } = await import("fs"));
+    return builder.onLoad({
+      filter: /\.civet$/
+    }, function({ path }) {
+      var contents, source;
+      source = readFileSync(path, "utf8");
+      contents = compile(source);
+      return {
+        contents,
+        loader: "js"
+      };
+    });
+  }
+});

package/dist/civet

@@ -65,7 +65,7 @@ parseArgs = function(args = process.argv.slice(2)) {
     }
     if (options.run) {
       filenames.push(args[j]);
-      return scriptArgs = args.slice(j);
+      return scriptArgs = args.slice(j + 1);
     } else {
       return filenames.push(...args.slice(j));
     }

package/dist/main.js

@@ -516,13 +516,13 @@ ${input.slice(result.pos)}
       BindingPattern,
       ObjectBindingPattern,
       ObjectBindingPatternContent,
+      BindingPropertyList,
       ArrayBindingPattern,
       ArrayBindingPatternContent,
       Elision,
       NestedBindingProperties,
-      NestedBindingProperty,
+      NestedBindingPropertyList,
       BindingProperty,
-      NestedBindingRestProperty,
       BindingRestProperty,
       NestedBindingElements,
       NestedBindingElement,
@@ -3816,21 +3816,11 @@ ${input.slice(result.pos)}
       }
     }
     var ObjectBindingPatternContent$0 = NestedBindingProperties;
-    var ObjectBindingPatternContent$1 = $TS($S($Q(BindingProperty), $E(BindingRestProperty), $Q(BindingProperty)), function($skip, $loc, $0, $1, $2, $3) {
-      var props = $1;
-      var rest = $2;
-      var after = $3;
-      const names = props.flatMap((p) => p.names);
-      const children = [...props];
-      if (rest) {
-        [rest, after] = module2.reorderBindingRestProperty(rest, after);
-        children.push(...after, rest);
-        names.push(...after.flatMap((p) => p.names), ...rest.names);
-      }
-      return {
-        names,
-        children
-      };
+    var ObjectBindingPatternContent$1 = $TV($E(BindingPropertyList), function($skip, $loc, $0, $1) {
+      var props = $0;
+      if (!props)
+        return { children: [], names: [] };
+      return module2.reorderBindingRestProperty(props);
     });
     function ObjectBindingPatternContent(state) {
       let eventData;
@@ -3854,6 +3844,37 @@ ${input.slice(result.pos)}
         return result;
       }
     }
+    var BindingPropertyList$0 = $TV($P($S(BindingProperty, ObjectPropertyDelimiter)), function($skip, $loc, $0, $1) {
+      var props = $0;
+      return props.map(([prop, delim]) => {
+        return {
+          ...prop,
+          children: [...prop.children, delim]
+        };
+      });
+    });
+    function BindingPropertyList(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("BindingPropertyList", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("BindingPropertyList", state, BindingPropertyList$0(state));
+        if (state.events)
+          state.events.exit?.("BindingPropertyList", state, result, eventData);
+        return result;
+      } else {
+        const result = BindingPropertyList$0(state);
+        if (state.events)
+          state.events.exit?.("BindingPropertyList", state, result, eventData);
+        return result;
+      }
+    }
     var ArrayBindingPattern$0 = $TS($S(OpenBracket, ArrayBindingPatternContent, __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
       var c = $2;
       return {
@@ -3961,23 +3982,12 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var NestedBindingProperties$0 = $TS($S(PushIndent, $Q(NestedBindingProperty), $E(NestedBindingRestProperty), $Q(NestedBindingProperty), PopIndent), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var NestedBindingProperties$0 = $TS($S(PushIndent, $Q(NestedBindingPropertyList), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
       var props = $2;
-      var rest = $3;
-      var after = $4;
-      if (!(props.length || rest))
+      if (!props.length)
         return $skip;
-      const names = props.flatMap((p) => p.names);
-      const children = [...props];
-      if (rest) {
-        [rest, after] = module2.reorderBindingRestProperty(rest, after);
-        children.push(...after, rest);
-        names.push(...after.flatMap((p) => p.names), ...rest.names);
-      }
-      return {
-        children,
-        names
-      };
+      props = props.flat();
+      return module2.reorderBindingRestProperty(props);
     });
     function NestedBindingProperties(state) {
       let eventData;
@@ -4001,18 +4011,22 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var NestedBindingProperty$0 = $TS($S(Nested, BindingProperty), function($skip, $loc, $0, $1, $2) {
-      var indent = $1;
-      var prop = $2;
-      return {
-        ...prop,
-        children: [...indent, ...prop.children]
-      };
+    var NestedBindingPropertyList$0 = $TS($S(Nested, BindingPropertyList), function($skip, $loc, $0, $1, $2) {
+      var ws = $1;
+      var props = $2;
+      return props.map((prop, i) => {
+        if (i > 0)
+          return prop;
+        return {
+          ...prop,
+          children: [ws, ...prop.children]
+        };
+      });
     });
-    function NestedBindingProperty(state) {
+    function NestedBindingPropertyList(state) {
       let eventData;
       if (state.events) {
-        const result = state.events.enter?.("NestedBindingProperty", state);
+        const result = state.events.enter?.("NestedBindingPropertyList", state);
         if (result) {
           if (result.cache)
             return result.cache;
@@ -4020,25 +4034,26 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("NestedBindingProperty", state, NestedBindingProperty$0(state));
+        const result = $TOKEN("NestedBindingPropertyList", state, NestedBindingPropertyList$0(state));
         if (state.events)
-          state.events.exit?.("NestedBindingProperty", state, result, eventData);
+          state.events.exit?.("NestedBindingPropertyList", state, result, eventData);
         return result;
       } else {
-        const result = NestedBindingProperty$0(state);
+        const result = NestedBindingPropertyList$0(state);
         if (state.events)
-          state.events.exit?.("NestedBindingProperty", state, result, eventData);
+          state.events.exit?.("NestedBindingPropertyList", state, result, eventData);
         return result;
       }
     }
-    var BindingProperty$0 = $TS($S(__, PropertyName, __, Colon, $C(BindingIdentifier, BindingPattern), $E(Initializer), ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+    var BindingProperty$0 = BindingRestProperty;
+    var BindingProperty$1 = $TS($S($E(_), PropertyName, __, Colon, $C(BindingIdentifier, BindingPattern), $E(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
       var b = $5;
       return {
         names: b.names,
         children: $0
       };
     });
-    var BindingProperty$1 = $TS($S(BindingIdentifier, $E(Initializer), ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3) {
+    var BindingProperty$2 = $TS($S(BindingIdentifier, $E(Initializer)), function($skip, $loc, $0, $1, $2) {
       var b = $1;
       if (b.type === "AtBinding") {
         return {
@@ -4064,65 +4079,35 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("BindingProperty", state, BindingProperty$0(state) || BindingProperty$1(state));
+        const result = $TOKEN("BindingProperty", state, BindingProperty$0(state) || BindingProperty$1(state) || BindingProperty$2(state));
         if (state.events)
           state.events.exit?.("BindingProperty", state, result, eventData);
         return result;
       } else {
-        const result = BindingProperty$0(state) || BindingProperty$1(state);
+        const result = BindingProperty$0(state) || BindingProperty$1(state) || BindingProperty$2(state);
         if (state.events)
           state.events.exit?.("BindingProperty", state, result, eventData);
         return result;
       }
     }
-    var NestedBindingRestProperty$0 = $TS($S(Nested, BindingRestProperty), function($skip, $loc, $0, $1, $2) {
-      var indent = $1;
-      var prop = $2;
-      return {
-        ...prop,
-        children: [indent, ...prop.children]
-      };
-    });
-    function NestedBindingRestProperty(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("NestedBindingRestProperty", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("NestedBindingRestProperty", state, NestedBindingRestProperty$0(state));
-        if (state.events)
-          state.events.exit?.("NestedBindingRestProperty", state, result, eventData);
-        return result;
-      } else {
-        const result = NestedBindingRestProperty$0(state);
-        if (state.events)
-          state.events.exit?.("NestedBindingRestProperty", state, result, eventData);
-        return result;
-      }
-    }
-    var BindingRestProperty$0 = $TS($S(__, DotDotDot, BindingIdentifier, ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var BindingRestProperty$0 = $TS($S($E(_), DotDotDot, BindingIdentifier), function($skip, $loc, $0, $1, $2, $3) {
       var ws = $1;
       var dots = $2;
       var id = $3;
-      var delimiter = $4;
       return {
         ...id,
-        children: [...ws, dots, ...id.children, delimiter]
+        type: "BindingRestProperty",
+        children: [...ws || [], dots, ...id.children]
       };
     });
-    var BindingRestProperty$1 = $TS($S(__, BindingIdentifier, DotDotDot, ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var BindingRestProperty$1 = $TS($S($E(_), BindingIdentifier, DotDotDot), function($skip, $loc, $0, $1, $2, $3) {
       var ws = $1;
       var id = $2;
       var dots = $3;
-      var delimiter = $4;
       return {
         ...id,
-        children: [...ws, dots, ...id.children, delimiter]
+        type: "BindingRestProperty",
+        children: [...ws || [], dots, ...id.children]
       };
     });
     function BindingRestProperty(state) {
@@ -17319,13 +17304,39 @@ ${input.slice(result.pos)}
           token: str
         };
       };
-      module2.reorderBindingRestProperty = function(rest, after) {
-        if (after.length) {
-          const [restDelim] = rest.children.slice(-1), lastAfterProp = after[after.length - 1], lastAfterChildren = lastAfterProp.children, [lastDelim] = lastAfterChildren.slice(-1);
-          rest = { ...rest, children: [...rest.children.slice(0, -1), lastDelim] };
-          after = [...after.slice(0, -1), { ...lastAfterProp, children: [...lastAfterChildren.slice(0, -1), restDelim] }];
+      module2.reorderBindingRestProperty = function(props) {
+        const names = props.flatMap((p) => p.names);
+        let restIndex = -1;
+        let restCount = 0;
+        props.forEach(({ type }, i) => {
+          if (type === "BindingRestProperty") {
+            if (restIndex < 0)
+              restIndex = i;
+            restCount++;
+          }
+        });
+        if (restCount === 0) {
+          const children = [...props];
+          return {
+            children,
+            names
+          };
+        } else if (restCount === 1) {
+          let after = props.slice(restIndex + 1);
+          let rest = props[restIndex];
+          props = props.slice(0, restIndex);
+          if (after.length) {
+            const [restDelim] = rest.children.slice(-1), lastAfterProp = after[after.length - 1], lastAfterChildren = lastAfterProp.children, [lastDelim] = lastAfterChildren.slice(-1);
+            rest = { ...rest, children: [...rest.children.slice(0, -1), lastDelim] };
+            after = [...after.slice(0, -1), { ...lastAfterProp, children: [...lastAfterChildren.slice(0, -1), restDelim] }];
+          }
+          const children = [...props, ...after, rest];
+          return {
+            children,
+            names
+          };
         }
-        return [rest, after];
+        throw new Error("Multiple rest properties in object pattern");
       };
       function gatherNodes(node, predicate) {
         if (node == null)

package/dist/main.mjs

@@ -514,13 +514,13 @@ ${input.slice(result.pos)}
       BindingPattern,
       ObjectBindingPattern,
       ObjectBindingPatternContent,
+      BindingPropertyList,
       ArrayBindingPattern,
       ArrayBindingPatternContent,
       Elision,
       NestedBindingProperties,
-      NestedBindingProperty,
+      NestedBindingPropertyList,
       BindingProperty,
-      NestedBindingRestProperty,
       BindingRestProperty,
       NestedBindingElements,
       NestedBindingElement,
@@ -3814,21 +3814,11 @@ ${input.slice(result.pos)}
       }
     }
     var ObjectBindingPatternContent$0 = NestedBindingProperties;
-    var ObjectBindingPatternContent$1 = $TS($S($Q(BindingProperty), $E(BindingRestProperty), $Q(BindingProperty)), function($skip, $loc, $0, $1, $2, $3) {
-      var props = $1;
-      var rest = $2;
-      var after = $3;
-      const names = props.flatMap((p) => p.names);
-      const children = [...props];
-      if (rest) {
-        [rest, after] = module.reorderBindingRestProperty(rest, after);
-        children.push(...after, rest);
-        names.push(...after.flatMap((p) => p.names), ...rest.names);
-      }
-      return {
-        names,
-        children
-      };
+    var ObjectBindingPatternContent$1 = $TV($E(BindingPropertyList), function($skip, $loc, $0, $1) {
+      var props = $0;
+      if (!props)
+        return { children: [], names: [] };
+      return module.reorderBindingRestProperty(props);
     });
     function ObjectBindingPatternContent(state) {
       let eventData;
@@ -3852,6 +3842,37 @@ ${input.slice(result.pos)}
         return result;
       }
     }
+    var BindingPropertyList$0 = $TV($P($S(BindingProperty, ObjectPropertyDelimiter)), function($skip, $loc, $0, $1) {
+      var props = $0;
+      return props.map(([prop, delim]) => {
+        return {
+          ...prop,
+          children: [...prop.children, delim]
+        };
+      });
+    });
+    function BindingPropertyList(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("BindingPropertyList", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("BindingPropertyList", state, BindingPropertyList$0(state));
+        if (state.events)
+          state.events.exit?.("BindingPropertyList", state, result, eventData);
+        return result;
+      } else {
+        const result = BindingPropertyList$0(state);
+        if (state.events)
+          state.events.exit?.("BindingPropertyList", state, result, eventData);
+        return result;
+      }
+    }
     var ArrayBindingPattern$0 = $TS($S(OpenBracket, ArrayBindingPatternContent, __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
       var c = $2;
       return {
@@ -3959,23 +3980,12 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var NestedBindingProperties$0 = $TS($S(PushIndent, $Q(NestedBindingProperty), $E(NestedBindingRestProperty), $Q(NestedBindingProperty), PopIndent), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var NestedBindingProperties$0 = $TS($S(PushIndent, $Q(NestedBindingPropertyList), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
       var props = $2;
-      var rest = $3;
-      var after = $4;
-      if (!(props.length || rest))
+      if (!props.length)
         return $skip;
-      const names = props.flatMap((p) => p.names);
-      const children = [...props];
-      if (rest) {
-        [rest, after] = module.reorderBindingRestProperty(rest, after);
-        children.push(...after, rest);
-        names.push(...after.flatMap((p) => p.names), ...rest.names);
-      }
-      return {
-        children,
-        names
-      };
+      props = props.flat();
+      return module.reorderBindingRestProperty(props);
     });
     function NestedBindingProperties(state) {
       let eventData;
@@ -3999,18 +4009,22 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var NestedBindingProperty$0 = $TS($S(Nested, BindingProperty), function($skip, $loc, $0, $1, $2) {
-      var indent = $1;
-      var prop = $2;
-      return {
-        ...prop,
-        children: [...indent, ...prop.children]
-      };
+    var NestedBindingPropertyList$0 = $TS($S(Nested, BindingPropertyList), function($skip, $loc, $0, $1, $2) {
+      var ws = $1;
+      var props = $2;
+      return props.map((prop, i) => {
+        if (i > 0)
+          return prop;
+        return {
+          ...prop,
+          children: [ws, ...prop.children]
+        };
+      });
     });
-    function NestedBindingProperty(state) {
+    function NestedBindingPropertyList(state) {
       let eventData;
       if (state.events) {
-        const result = state.events.enter?.("NestedBindingProperty", state);
+        const result = state.events.enter?.("NestedBindingPropertyList", state);
         if (result) {
           if (result.cache)
             return result.cache;
@@ -4018,25 +4032,26 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("NestedBindingProperty", state, NestedBindingProperty$0(state));
+        const result = $TOKEN("NestedBindingPropertyList", state, NestedBindingPropertyList$0(state));
         if (state.events)
-          state.events.exit?.("NestedBindingProperty", state, result, eventData);
+          state.events.exit?.("NestedBindingPropertyList", state, result, eventData);
         return result;
       } else {
-        const result = NestedBindingProperty$0(state);
+        const result = NestedBindingPropertyList$0(state);
         if (state.events)
-          state.events.exit?.("NestedBindingProperty", state, result, eventData);
+          state.events.exit?.("NestedBindingPropertyList", state, result, eventData);
         return result;
       }
     }
-    var BindingProperty$0 = $TS($S(__, PropertyName, __, Colon, $C(BindingIdentifier, BindingPattern), $E(Initializer), ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+    var BindingProperty$0 = BindingRestProperty;
+    var BindingProperty$1 = $TS($S($E(_), PropertyName, __, Colon, $C(BindingIdentifier, BindingPattern), $E(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
       var b = $5;
       return {
         names: b.names,
         children: $0
       };
     });
-    var BindingProperty$1 = $TS($S(BindingIdentifier, $E(Initializer), ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3) {
+    var BindingProperty$2 = $TS($S(BindingIdentifier, $E(Initializer)), function($skip, $loc, $0, $1, $2) {
       var b = $1;
       if (b.type === "AtBinding") {
         return {
@@ -4062,65 +4077,35 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("BindingProperty", state, BindingProperty$0(state) || BindingProperty$1(state));
+        const result = $TOKEN("BindingProperty", state, BindingProperty$0(state) || BindingProperty$1(state) || BindingProperty$2(state));
         if (state.events)
           state.events.exit?.("BindingProperty", state, result, eventData);
         return result;
       } else {
-        const result = BindingProperty$0(state) || BindingProperty$1(state);
+        const result = BindingProperty$0(state) || BindingProperty$1(state) || BindingProperty$2(state);
         if (state.events)
           state.events.exit?.("BindingProperty", state, result, eventData);
         return result;
       }
     }
-    var NestedBindingRestProperty$0 = $TS($S(Nested, BindingRestProperty), function($skip, $loc, $0, $1, $2) {
-      var indent = $1;
-      var prop = $2;
-      return {
-        ...prop,
-        children: [indent, ...prop.children]
-      };
-    });
-    function NestedBindingRestProperty(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("NestedBindingRestProperty", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("NestedBindingRestProperty", state, NestedBindingRestProperty$0(state));
-        if (state.events)
-          state.events.exit?.("NestedBindingRestProperty", state, result, eventData);
-        return result;
-      } else {
-        const result = NestedBindingRestProperty$0(state);
-        if (state.events)
-          state.events.exit?.("NestedBindingRestProperty", state, result, eventData);
-        return result;
-      }
-    }
-    var BindingRestProperty$0 = $TS($S(__, DotDotDot, BindingIdentifier, ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var BindingRestProperty$0 = $TS($S($E(_), DotDotDot, BindingIdentifier), function($skip, $loc, $0, $1, $2, $3) {
       var ws = $1;
       var dots = $2;
       var id = $3;
-      var delimiter = $4;
       return {
         ...id,
-        children: [...ws, dots, ...id.children, delimiter]
+        type: "BindingRestProperty",
+        children: [...ws || [], dots, ...id.children]
       };
     });
-    var BindingRestProperty$1 = $TS($S(__, BindingIdentifier, DotDotDot, ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var BindingRestProperty$1 = $TS($S($E(_), BindingIdentifier, DotDotDot), function($skip, $loc, $0, $1, $2, $3) {
       var ws = $1;
       var id = $2;
       var dots = $3;
-      var delimiter = $4;
       return {
         ...id,
-        children: [...ws, dots, ...id.children, delimiter]
+        type: "BindingRestProperty",
+        children: [...ws || [], dots, ...id.children]
       };
     });
     function BindingRestProperty(state) {
@@ -17317,13 +17302,39 @@ ${input.slice(result.pos)}
           token: str
         };
       };
-      module.reorderBindingRestProperty = function(rest, after) {
-        if (after.length) {
-          const [restDelim] = rest.children.slice(-1), lastAfterProp = after[after.length - 1], lastAfterChildren = lastAfterProp.children, [lastDelim] = lastAfterChildren.slice(-1);
-          rest = { ...rest, children: [...rest.children.slice(0, -1), lastDelim] };
-          after = [...after.slice(0, -1), { ...lastAfterProp, children: [...lastAfterChildren.slice(0, -1), restDelim] }];
+      module.reorderBindingRestProperty = function(props) {
+        const names = props.flatMap((p) => p.names);
+        let restIndex = -1;
+        let restCount = 0;
+        props.forEach(({ type }, i) => {
+          if (type === "BindingRestProperty") {
+            if (restIndex < 0)
+              restIndex = i;
+            restCount++;
+          }
+        });
+        if (restCount === 0) {
+          const children = [...props];
+          return {
+            children,
+            names
+          };
+        } else if (restCount === 1) {
+          let after = props.slice(restIndex + 1);
+          let rest = props[restIndex];
+          props = props.slice(0, restIndex);
+          if (after.length) {
+            const [restDelim] = rest.children.slice(-1), lastAfterProp = after[after.length - 1], lastAfterChildren = lastAfterProp.children, [lastDelim] = lastAfterChildren.slice(-1);
+            rest = { ...rest, children: [...rest.children.slice(0, -1), lastDelim] };
+            after = [...after.slice(0, -1), { ...lastAfterProp, children: [...lastAfterChildren.slice(0, -1), restDelim] }];
+          }
+          const children = [...props, ...after, rest];
+          return {
+            children,
+            names
+          };
         }
-        return [rest, after];
+        throw new Error("Multiple rest properties in object pattern");
       };
       function gatherNodes(node, predicate) {
         if (node == null)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danielx/civet",
-  "version": "0.5.45",
+  "version": "0.5.47",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",
@@ -11,6 +11,7 @@
     },
     "./esm": "./dist/esm.mjs",
     "./esbuild-plugin": "./dist/esbuild-plugin.js",
+    "./bun-civet": "./dist/bun-civet.mjs",
     "./register": "./register.js",
     "./*": "./*",
     "./dist/*": "./dist/*"